Resolve Cyclic Dependancy with miscutils

+ also made gradle wait for deps by default.

(cherry picked from commit 79442ef9d74e6f73cd89ee19de1330f94be5fbe5 [formerly 059918559c472d2c1f17a0806916bc9543415ac9])


Former-commit-id: 3c549f350f8c81bc34b6ff5ca524965073143eb9

2 files changed, 25 insertions, 4 deletions

diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java b/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java
index ee6f09d4ee..0faf2ea561 100644
--- a/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java
+++ b/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java
@@ -28,7 +28,6 @@ import com.github.bartimaeusnek.crossmod.GTpp.loader.RadioHatchCompat;
 import com.github.bartimaeusnek.crossmod.galacticraft.GalacticraftProxy;
 import com.github.bartimaeusnek.crossmod.tectech.TecTechResearchLoader;
 import com.github.bartimaeusnek.crossmod.tectech.tileentites.multi.GT_Replacement.*;
-import com.github.bartimaeusnek.crossmod.tgregworks.MaterialsInjector;
 import com.github.bartimaeusnek.crossmod.thaumcraft.CustomAspects;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
@@ -89,8 +88,6 @@ public class BartWorksCrossmod {
 
             new BW_TT_HeatExchanger(null, null);
         }
-        if (LoaderReference.TGregworks)
-            MaterialsInjector.run();
     }
 
     @Mod.EventHandler
diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tgregworks/MaterialsInjector.java b/src/main/java/com/github/bartimaeusnek/crossmod/tgregworks/MaterialsInjector.java
index 2234347045..a4cff256bb 100644
--- a/src/main/java/com/github/bartimaeusnek/crossmod/tgregworks/MaterialsInjector.java
+++ b/src/main/java/com/github/bartimaeusnek/crossmod/tgregworks/MaterialsInjector.java
@@ -1,8 +1,11 @@
 package com.github.bartimaeusnek.crossmod.tgregworks;
 
+import com.github.bartimaeusnek.bartworks.API.LoaderReference;
 import com.github.bartimaeusnek.bartworks.MainMod;
 import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
 import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.Mod;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import net.minecraftforge.common.config.Property;
@@ -18,8 +21,21 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.HashMap;
 
+@Mod(
+        modid = MaterialsInjector.MOD_ID, name = MaterialsInjector.NAME, version = MaterialsInjector.VERSION,
+        dependencies = "required-after:IC2; "
+                + "required-after:gregtech; "
+                + "required-after:bartworks;"
+                + "before:TGregworks;"
+                + "before:miscutils; "
+)
 @SuppressWarnings("unchecked")
 public class MaterialsInjector {
+
+    public static final String NAME = "BartWorks Mod Additions - TGregworks Container";
+    public static final String VERSION = MainMod.VERSION;
+    public static final String MOD_ID = "bartworkscrossmodtgregworkscontainer";
+
     private static HashMap<Materials, Property> configProps;
     private static ArrayList<Integer> configIDs;
     private static Method getGlobalMultiplierMethod;
@@ -29,7 +45,15 @@ public class MaterialsInjector {
     private static Method getReinforcedLevelMethod;
     private static Method getStoneboundLevelMethod;
 
-    static {
+    @Mod.EventHandler
+    public void init(FMLInitializationEvent init) {
+        if (LoaderReference.TGregworks) {
+            MaterialsInjector.preinit();
+            MaterialsInjector.run();
+        }
+    }
+
+    private static void preinit() {
         try {
             getFields();
             getMethodes();