Faster dev boot times (120s --> 80s while profiling) (#2866)

* Faster dev boot times (120s --> 80s while profiling)
* Clean up sloppy hard deps and properly gate them behind isModLoaded() checks.
* Include CoreTweaks as runtime only non publishable for faster boot as well

4 files changed, 24 insertions, 10 deletions

diff --git a/src/main/java/common/Blocks.java b/src/main/java/common/Blocks.java
index 4003e8e9e4..ffab6a0716 100644
--- a/src/main/java/common/Blocks.java
+++ b/src/main/java/common/Blocks.java
@@ -10,6 +10,7 @@ import common.blocks.Block_TFFTStorageField;
 import common.blocks.Block_ThaumiumReinforcedJar;
 import common.blocks.Block_YSZUnit;
 
+import gregtech.api.enums.Mods;
 import kekztech.KekzCore;
 
 public class Blocks {
@@ -28,7 +29,9 @@ public class Blocks {
 
         registerBlocks_SOFC();
         registerBlocks_TFFT();
-        registerBlocks_Jars();
+        if (Mods.Thaumcraft.isModLoaded()) {
+            registerBlocks_Jars();
+        }
         registerBlocks_LSC();
         registerBlocks_Cosmetics();
 
diff --git a/src/main/java/common/CommonProxy.java b/src/main/java/common/CommonProxy.java
index 777a8af268..0687f109be 100644
--- a/src/main/java/common/CommonProxy.java
+++ b/src/main/java/common/CommonProxy.java
@@ -7,6 +7,7 @@ import common.tileentities.GTMTE_TFFTHatch;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import gregtech.api.enums.Mods;
 import kekztech.Items;
 
 public class CommonProxy {
@@ -22,8 +23,10 @@ public class CommonProxy {
         Blocks.preInit();
         // TileEntities
         TileEntities.preInit();
-        // TC Research
-        Researches.preInit();
+        if (Mods.Thaumcraft.isModLoaded() && Mods.ThaumicTinkerer.isModLoaded()) {
+            // TC Research
+            Researches.preInit();
+        }
     }
 
     public void init(final FMLInitializationEvent e) {
@@ -34,8 +37,10 @@ public class CommonProxy {
     public void postInit(final FMLPostInitializationEvent e) {
         // Recipes
         Recipes.postInit();
-        // Research
-        Researches.postInit();
+        if (Mods.Thaumcraft.isModLoaded() && Mods.ThaumicTinkerer.isModLoaded()) {
+            // Research
+            Researches.postInit();
+        }
 
         GTMTE_TFFTHatch.registerAEIntegration();
     }
diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java
index 2560e8dc37..ba8876ff2e 100644
--- a/src/main/java/common/Recipes.java
+++ b/src/main/java/common/Recipes.java
@@ -18,6 +18,7 @@ import common.recipeLoaders.Unpackager;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.enums.Materials;
+import gregtech.api.enums.Mods;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
@@ -45,7 +46,9 @@ public class Recipes {
         new ResearchableAssemblyLine().run();
         new Unpackager().run();
 
-        registerRecipes_Jars();
+        if (Mods.Thaumcraft.isModLoaded()) {
+            registerRecipes_Jars();
+        }
 
         KekzCore.LOGGER.info("Finished registering recipes");
     }
diff --git a/src/main/java/common/TileEntities.java b/src/main/java/common/TileEntities.java
index 3a7026d429..8d1b288c7c 100644
--- a/src/main/java/common/TileEntities.java
+++ b/src/main/java/common/TileEntities.java
@@ -12,6 +12,7 @@ import common.tileentities.TE_ThaumiumReinforcedVoidJar;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.enums.MetaTileEntityIDs;
+import gregtech.api.enums.Mods;
 
 public class TileEntities {
 
@@ -25,10 +26,12 @@ public class TileEntities {
     public static GTMTE_TFFTHatch tfftHatch;
 
     public static void preInit() {
-        GameRegistry.registerTileEntity(TE_ThaumiumReinforcedJar.class, "kekztech_thaumiumreinforcedjar");
-        GameRegistry.registerTileEntity(TE_ThaumiumReinforcedVoidJar.class, "kekztech_thaumiumreinforcedvoidjar");
-        GameRegistry.registerTileEntity(TE_IchorJar.class, "kekztech_ichorjar");
-        GameRegistry.registerTileEntity(TE_IchorVoidJar.class, "kekztech_ichorvoidjar");
+        if (Mods.Thaumcraft.isModLoaded()) {
+            GameRegistry.registerTileEntity(TE_ThaumiumReinforcedJar.class, "kekztech_thaumiumreinforcedjar");
+            GameRegistry.registerTileEntity(TE_ThaumiumReinforcedVoidJar.class, "kekztech_thaumiumreinforcedvoidjar");
+            GameRegistry.registerTileEntity(TE_IchorJar.class, "kekztech_ichorjar");
+            GameRegistry.registerTileEntity(TE_IchorVoidJar.class, "kekztech_ichorvoidjar");
+        }
     }
 
     public static void init() {