Fix crash with Quark

MinerArcana · Dec 2, 2019 · c00fcfd · c00fcfd
1 parent 43dff8f
commit c00fcfd
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 
-version = '0.4.6'
+version = '0.4.7'
 group = 'com.alan199921.astral' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'astral'
 
@@ -71,18 +71,36 @@ minecraft {
 
 dependencies {
     minecraft 'net.minecraftforge:forge:1.14.4-28.1.96'
+    compile fg.deobf("vazkii.arl:AutoRegLib:1.4-35.69")
+    compile fg.deobf("vazkii.quark:Quark:r2.0-200.835")
+
+    compileOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.18:api")
+    runtimeOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.18")
+}
+
+repositories {
+    maven {
+        // for AutoRegLib
+        name "blamejared"
+        url "http://maven.blamejared.com/"
+    }
+    maven {
+        // for JEI
+        name "progwml6"
+        url "http://dvs1.progwml6.com/files/maven"
+    }
 }
 
 jar {
     manifest {
         attributes([
-            "Specification-Title": "astral",
-            "Specification-Vendor": "minerarcana",
-            "Specification-Version": "1", // We are version 1 of ourselves
-            "Implementation-Title": project.name,
-            "Implementation-Version": "${version}",
-            "Implementation-Vendor" :"minerarcana",
-            "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
+                "Specification-Title"     : "astral",
+                "Specification-Vendor"    : "minerarcana",
+                "Specification-Version"   : "1", // We are version 1 of ourselves
+                "Implementation-Title"    : project.name,
+                "Implementation-Version"  : "${version}",
+                "Implementation-Vendor"   : "minerarcana",
+                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
         ])
     }
 }

diff --git a/build.properties b/build.properties
diff --git a/src/main/java/com/alan199921/astral/Astral.java b/src/main/java/com/alan199921/astral/Astral.java
@@ -42,7 +42,6 @@ public Astral() {
         ModLoadingContext modLoadingContext = ModLoadingContext.get();
         modLoadingContext.registerConfig(ModConfig.Type.COMMON, AstralConfig.initialize());
         AstralConfig.loadConfig(AstralConfig.getInstance().getSpec(), FMLPaths.CONFIGDIR.get().resolve("astral-common.toml"));
-
     }
 
     private void setup(final FMLCommonSetupEvent event) {

diff --git a/src/main/java/com/alan199921/astral/effects/AstralEffects.java b/src/main/java/com/alan199921/astral/effects/AstralEffects.java
@@ -10,8 +10,12 @@
 @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD)
 public class AstralEffects {
 
+    /*
+    Instantiation is required for it to not crash with Quark since effects are registered after items and the effect
+    on Travelling Medicine would be null
+    */
     @ObjectHolder("astral:astral_travel")
-    public static final Effect astralTravelEffect = null;
+    public static final Effect astralTravelEffect = new AstralTravelEffect();
 
 
     @SubscribeEvent