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, 59 insertions, 59 deletions

diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
index 3889a8ffad..19c258d429 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
@@ -3666,13 +3666,9 @@ public class RecipeLoader {
             if (GT_Utility.isStackValid(input)) {
                 int[] oreDict = OreDictionary.getOreIDs(input);
                 for (int oreDictID : oreDict) {
-                    if ((OreDictionary.getOreName(oreDictID)
-                        .startsWith("ore")
-                        || OreDictionary.getOreName(oreDictID)
-                            .startsWith("rawOre")
-                        || OreDictionary.getOreName(oreDictID)
-                            .startsWith("crushed"))) {
-                        GT_Log.out.print(OreDictionary.getOreName(oreDictID));
+                    final String oreName = OreDictionary.getOreName(oreDictID);
+                    if ((oreName.startsWith("ore") || oreName.startsWith("rawOre") || oreName.startsWith("crushed"))) {
+                        GT_Log.out.print(oreName);
                         GT_Recipe tRecipe = recipe.copy();
                         boolean modified = false;
                         for (int i = 0; i < tRecipe.mOutputs.length; i++) {
@@ -3814,17 +3810,15 @@ public class RecipeLoader {
             if (GT_Utility.isStackValid(input)) {
                 int[] oreDict = OreDictionary.getOreIDs(input);
                 for (int oreDictID : oreDict) {
-                    if (OreDictionary.getOreName(oreDictID)
-                        .startsWith("dust")
-                        && (!OreDictionary.getOreName(oreDictID)
-                            .contains(
-                                "Dephosphated")) /*
-                                                  * OreDictionary.getOreName(oreDictID).startsWith("dustPureCerium")
-                                                  * || OreDictionary.getOreName(oreDictID).startsWith(
-                                                  * "dustImpureCerium") ||
-                                                  * OreDictionary.getOreName(oreDictID).startsWith("dustSpace") ||
-                                                  * OreDictionary.getOreName(oreDictID).startsWith("dustCerium")
-                                                  */) {
+                    final String oreName = OreDictionary.getOreName(oreDictID);
+                    if (oreName.startsWith("dust")
+                        && (!oreName.contains("Dephosphated")) /*
+                                                                * oreName.startsWith("dustPureCerium")
+                                                                * || oreName.startsWith(
+                                                                * "dustImpureCerium") ||
+                                                                * oreName.startsWith("dustSpace") ||
+                                                                * oreName.startsWith("dustCerium")
+                                                                */) {
                         GT_Recipe tRecipe = recipe.copy();
                         boolean modified = false;
                         for (int i = 0; i < tRecipe.mOutputs.length; i++) {
@@ -3899,10 +3893,8 @@ public class RecipeLoader {
             if (GT_Utility.isStackValid(input)) {
                 int[] oreDict = OreDictionary.getOreIDs(input);
                 for (int oreDictID : oreDict) {
-                    if (OreDictionary.getOreName(oreDictID)
-                        .startsWith("dust")
-                        && (!OreDictionary.getOreName(oreDictID)
-                            .contains("Dephosphated"))) {
+                    final String oreName = OreDictionary.getOreName(oreDictID);
+                    if (oreName.startsWith("dust") && (!oreName.contains("Dephosphated"))) {
                         GT_Recipe tRecipe = recipe.copy();
                         boolean modified = false;
                         for (int i = 0; i < tRecipe.mOutputs.length; i++) {
@@ -3967,8 +3959,8 @@ public class RecipeLoader {
             if (GT_Utility.isStackValid(input)) {
                 int[] oreDict = OreDictionary.getOreIDs(input);
                 for (int oreDictID : oreDict) {
-                    if (OreDictionary.getOreName(oreDictID)
-                        .startsWith("crushed") /* && OreDictionary.getOreName(oreDictID).contains("Cerium") */) {
+                    final String oreName = OreDictionary.getOreName(oreDictID);
+                    if (oreName.startsWith("crushed") /* && oreName.contains("Cerium") */) {
                         GT_Recipe tRecipe = recipe.copy();
                         boolean modified = false;
                         for (int i = 0; i < tRecipe.mOutputs.length; i++) {
@@ -4014,13 +4006,14 @@ public class RecipeLoader {
                     GT_Log.out.print(input.getDisplayName() + "\n");
                     int[] oreDict = OreDictionary.getOreIDs(input);
                     for (int oreDictID : oreDict) {
-                        String oreName = OreDictionary.getOreName(oreDictID);
-                        if (oreName.equals("dustHibonite") || oreName.equals("dustLanthaniteCe")
-                            || oreName.equals("dustZirconolite")
-                            || oreName.equals("dustYttrocerite")
-                            || oreName.equals("dustXenotime")
-                            || oreName.equals("dustBastnasite")
-                            || oreName.equals("dustFlorencite")) {
+                        final String oreName = OreDictionary.getOreName(oreDictID);
+                        if (oreName.startsWith("dust")
+                            && (oreName.equals("dustHibonite") || oreName.equals("dustLanthaniteCe")
+                                || oreName.equals("dustZirconolite")
+                                || oreName.equals("dustYttrocerite")
+                                || oreName.equals("dustXenotime")
+                                || oreName.equals("dustBastnasite")
+                                || oreName.equals("dustFlorencite"))) {
                             GT_Recipe tRecipe = recipe.copy();
                             boolean modified = false;
                             for (int i = 0; i < tRecipe.mOutputs.length; i++) {
@@ -4068,13 +4061,14 @@ public class RecipeLoader {
                     GT_Log.out.print(input.getDisplayName() + "\n");
                     int[] oreDict = OreDictionary.getOreIDs(input);
                     for (int oreDictID : oreDict) {
-                        String oreName = OreDictionary.getOreName(oreDictID);
-                        if (oreName.equals("dustHibonite") || oreName.equals("dustLanthaniteCe")
-                            || oreName.equals("dustZirconolite")
-                            || oreName.equals("dustYttrocerite")
-                            || oreName.equals("dustXenotime")
-                            || oreName.equals("dustBastnasite")
-                            || oreName.equals("dustFlorencite")) {
+                        final String oreName = OreDictionary.getOreName(oreDictID);
+                        if (oreName.startsWith("dust")
+                            && (oreName.equals("dustHibonite") || oreName.equals("dustLanthaniteCe")
+                                || oreName.equals("dustZirconolite")
+                                || oreName.equals("dustYttrocerite")
+                                || oreName.equals("dustXenotime")
+                                || oreName.equals("dustBastnasite")
+                                || oreName.equals("dustFlorencite"))) {
                             GT_Recipe tRecipe = recipe.copy();
                             boolean modified = false;
                             for (int i = 0; i < tRecipe.mOutputs.length; i++) {
@@ -4121,14 +4115,10 @@ public class RecipeLoader {
             if (GT_Utility.isStackValid(input)) {
                 int[] oreDict = OreDictionary.getOreIDs(input);
                 for (int oreDictID : oreDict) {
-                    if (OreDictionary.getOreName(oreDictID)
-                        .startsWith("dustImpureCerium")
-                        || OreDictionary.getOreName(oreDictID)
-                            .startsWith("dustImpureSamarium")
-                        || OreDictionary.getOreName(oreDictID)
-                            .startsWith("dustPureSamarium")
-                        || OreDictionary.getOreName(oreDictID)
-                            .startsWith("dustPureCerium")) {
+                    final String oreName = OreDictionary.getOreName(oreDictID);
+                    if (oreName.startsWith("dustImpureCerium") || oreName.startsWith("dustImpureSamarium")
+                        || oreName.startsWith("dustPureSamarium")
+                        || oreName.startsWith("dustPureCerium")) {
                         GT_Recipe tRecipe = recipe.copy();
                         for (int i = 0; i < tRecipe.mOutputs.length; i++) {
                             if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue;
@@ -4174,13 +4164,14 @@ public class RecipeLoader {
             if (GT_Utility.isStackValid(input)) {
                 int[] oreDict = OreDictionary.getOreIDs(input);
                 for (int oreDictID : oreDict) {
-                    String oreName = OreDictionary.getOreName(oreDictID);
-                    if (oreName.equals("dustCerite") || oreName.equals("dustFluorcaphite")
-                        || oreName.equals("dustZirkelite")
-                        || oreName.equals("dustGadoliniteCe")
-                        || oreName.equals("dustGadoliniteY")
-                        || oreName.equals("dustPolycrase")
-                        || oreName.equals("dustBastnasite")) {
+                    final String oreName = OreDictionary.getOreName(oreDictID);
+                    if (oreName.startsWith("dust")
+                        && (oreName.equals("dustCerite") || oreName.equals("dustFluorcaphite")
+                            || oreName.equals("dustZirkelite")
+                            || oreName.equals("dustGadoliniteCe")
+                            || oreName.equals("dustGadoliniteY")
+                            || oreName.equals("dustPolycrase")
+                            || oreName.equals("dustBastnasite"))) {
                         GT_Recipe tRecipe = recipe.copy();
                         for (int i = 0; i < tRecipe.mOutputs.length; i++) {
                             if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue;
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java
index bf57b641e4..841066a893 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java
@@ -71,6 +71,7 @@ import fox.spiteful.avaritia.blocks.LudicrousBlocks;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
+import gregtech.api.enums.Mods;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_OreDictUnificator;
 import ic2.api.item.IKineticRotor;
@@ -274,9 +275,11 @@ public class ItemRegistry {
         bitmask = GregTech_API.sMachineIDs.getOrDefault(GregTech_API.sBlockMetal9, 0) | 1 << 3 | 1 << 4 | 1 << 8;
         GregTech_API.registerMachineBlock(GregTech_API.sBlockMetal9, bitmask);
 
-        // Also infinity
-        bitmask = GregTech_API.sMachineIDs.getOrDefault(LudicrousBlocks.resource_block, 0) | 1 << 1;
-        GregTech_API.registerMachineBlock(LudicrousBlocks.resource_block, bitmask);
+        if (Mods.Avaritia.isModLoaded()) {
+            // Also infinity
+            bitmask = GregTech_API.sMachineIDs.getOrDefault(LudicrousBlocks.resource_block, 0) | 1 << 1;
+            GregTech_API.registerMachineBlock(LudicrousBlocks.resource_block, bitmask);
+        }
 
         ItemRegistry.THTR = new GT_TileEntity_THTR(
             ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 5,
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ElectricImplosionCompressor.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ElectricImplosionCompressor.java
index fd88673208..14b6b5e172 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ElectricImplosionCompressor.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ElectricImplosionCompressor.java
@@ -74,6 +74,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import fox.spiteful.avaritia.blocks.LudicrousBlocks;
 import gregtech.api.GregTech_API;
+import gregtech.api.enums.Mods;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -206,7 +207,9 @@ public class GT_TileEntity_ElectricImplosionCompressor
 
             {
                 this.add(Pair.of(GregTech_API.sBlockMetal5, 2));
-                this.add(Pair.of(LudicrousBlocks.resource_block, 1));
+                if (Mods.Avaritia.isModLoaded()) {
+                    this.add(Pair.of(LudicrousBlocks.resource_block, 1));
+                }
                 this.add(Pair.of(GregTech_API.sBlockMetal9, 4));
                 this.add(Pair.of(GregTech_API.sBlockMetal9, 3));
                 this.add(Pair.of(GregTech_API.sBlockMetal9, 8));
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java
index 50a38869b8..d7937dbfcb 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java
@@ -49,6 +49,7 @@ import cpw.mods.fml.common.Loader;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.FluidState;
 import gregtech.api.enums.Materials;
+import gregtech.api.enums.Mods;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SubTag;
 import gregtech.api.enums.TC_Aspects;
@@ -733,10 +734,12 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer {
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.rawOre, 0b1000);
 
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.cell, 0b10000);
-            Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.capsule, 0b10000);
+            if (Mods.Forestry.isModLoaded()) {
+                Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.capsule, 0b10000);
+                Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.capsuleMolten, 0b1000000);
+            }
             // Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.bottle,0b10000);
 
-            Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.capsuleMolten, 0b1000000);
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.cellMolten, 0b1000000);
 
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.plate, 0b10000000);