Mod load check refactors (#2621)

* deprecate LoaderReference

* replace all uses of LoaderReference

* delete loaderreference

* mod loaded checks in gagreg

* remove modloaded checks for merged mods

9 files changed, 680 insertions, 728 deletions

diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
index d5c7d63f8d..7997865ebe 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
@@ -54,7 +54,6 @@ import com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool;
 import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.PlatinumSludgeOverHaul;
 import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
 
-import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.registry.GameRegistry;
 import goodgenerator.items.MyMaterial;
 import gregtech.api.enums.GT_Values;
@@ -3454,105 +3453,103 @@ public class RecipeLoader {
 
         GT_Log.out.print("Electrolyzer (PA) done!\n");
 
-        if (Loader.isModLoaded("miscutils")) {
-            // For Simple Washer
-            for (GT_Recipe recipe : simpleWasherRecipes.getAllRecipes()) {
-                ItemStack input = recipe.mInputs[0];
-                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")) {
-                            GT_Recipe tRecipe = recipe.copy();
-                            for (int i = 0; i < tRecipe.mOutputs.length; i++) {
-                                if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue;
-                                if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) {
-                                    tRecipe.mOutputs[i] = GT_Utility.copyAmount(
-                                        tRecipe.mOutputs[i].stackSize,
-                                        WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1));
-                                } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1))) {
-                                    tRecipe.mOutputs[i] = GT_Utility.copyAmount(
-                                        tRecipe.mOutputs[i].stackSize,
-                                        WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1));
-                                }
-                            }
-                            if (!tRecipe.equals(recipe)) {
-                                reAdd.add(tRecipe);
-                                remove.add(recipe);
+        // For Simple Washer
+        for (GT_Recipe recipe : simpleWasherRecipes.getAllRecipes()) {
+            ItemStack input = recipe.mInputs[0];
+            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")) {
+                        GT_Recipe tRecipe = recipe.copy();
+                        for (int i = 0; i < tRecipe.mOutputs.length; i++) {
+                            if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue;
+                            if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) {
+                                tRecipe.mOutputs[i] = GT_Utility.copyAmount(
+                                    tRecipe.mOutputs[i].stackSize,
+                                    WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1));
+                            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1))) {
+                                tRecipe.mOutputs[i] = GT_Utility.copyAmount(
+                                    tRecipe.mOutputs[i].stackSize,
+                                    WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1));
                             }
-                            break;
                         }
+                        if (!tRecipe.equals(recipe)) {
+                            reAdd.add(tRecipe);
+                            remove.add(recipe);
+                        }
+                        break;
                     }
                 }
             }
-            simpleWasherRecipes.getBackend()
-                .removeRecipes(remove);
-            reAdd.forEach(simpleWasherRecipes::add);
-            simpleWasherRecipes.getBackend()
-                .reInit();
+        }
+        simpleWasherRecipes.getBackend()
+            .removeRecipes(remove);
+        reAdd.forEach(simpleWasherRecipes::add);
+        simpleWasherRecipes.getBackend()
+            .reInit();
 
-            GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + "! ");
+        GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + "! ");
 
-            remove.clear();
-            reAdd.clear();
+        remove.clear();
+        reAdd.clear();
 
-            GT_Log.out.print("Simple Washer done!\n");
+        GT_Log.out.print("Simple Washer done!\n");
 
-            // Dehydrator
-            for (GT_Recipe recipe : chemicalDehydratorRecipes.getAllRecipes()) {
-                if (recipe.mInputs.length == 0) {
-                    continue;
-                }
-                ItemStack input = recipe.mInputs[0];
+        // Dehydrator
+        for (GT_Recipe recipe : chemicalDehydratorRecipes.getAllRecipes()) {
+            if (recipe.mInputs.length == 0) {
+                continue;
+            }
+            ItemStack input = recipe.mInputs[0];
 
-                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")) {
-                            GT_Recipe tRecipe = recipe.copy();
-                            for (int i = 0; i < tRecipe.mOutputs.length; i++) {
-                                if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue;
-                                if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) {
-                                    tRecipe.mOutputs[i] = GT_Utility.copyAmount(
-                                        tRecipe.mOutputs[i].stackSize,
-                                        WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1));
-                                }
-                            }
-                            if (!tRecipe.equals(recipe)) {
-                                reAdd.add(tRecipe);
-                                remove.add(recipe);
+            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")) {
+                        GT_Recipe tRecipe = recipe.copy();
+                        for (int i = 0; i < tRecipe.mOutputs.length; i++) {
+                            if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue;
+                            if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) {
+                                tRecipe.mOutputs[i] = GT_Utility.copyAmount(
+                                    tRecipe.mOutputs[i].stackSize,
+                                    WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1));
                             }
-                            break;
                         }
+                        if (!tRecipe.equals(recipe)) {
+                            reAdd.add(tRecipe);
+                            remove.add(recipe);
+                        }
+                        break;
                     }
                 }
             }
+        }
 
-            chemicalDehydratorRecipes.getBackend()
-                .removeRecipes(remove);
-            reAdd.forEach(chemicalDehydratorRecipes::add);
-            chemicalDehydratorRecipes.getBackend()
-                .reInit();
+        chemicalDehydratorRecipes.getBackend()
+            .removeRecipes(remove);
+        reAdd.forEach(chemicalDehydratorRecipes::add);
+        chemicalDehydratorRecipes.getBackend()
+            .reInit();
 
-            GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + "! ");
+        GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + "! ");
 
-            remove.clear();
-            reAdd.clear();
+        remove.clear();
+        reAdd.clear();
 
-            GT_Log.out.print("Dehydrator done!\n");
-        }
+        GT_Log.out.print("Dehydrator done!\n");
 
         /*
          * DOES NOT WORK, something to do with load times for sifter recipes or some shit //Sifter for (GT_Recipe recipe
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java
index f8e4bbfe7b..415b5af36c 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java
@@ -17,7 +17,6 @@ import static com.github.bartimaeusnek.bartworks.common.loaders.BioRecipeLoader.
 import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.removeIC2Recipes;
 import static gregtech.api.enums.GT_Values.VN;
 import static gregtech.api.enums.Mods.BartWorks;
-import static gregtech.api.enums.Mods.GTPlusPlus;
 
 import java.io.IOException;
 import java.util.Map;
@@ -113,9 +112,7 @@ public final class MainMod {
 
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent preinit) {
-        if (GTPlusPlus.isModLoaded()) {
-            MainMod.LOGGER.info("Found GT++, continuing");
-        }
+        MainMod.LOGGER.info("Found GT++, continuing");
 
         if (API_ConfigValues.debugLog) {
             try {
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/GTNHBlocks.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/GTNHBlocks.java
index 329d73023f..977ebf19e0 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/GTNHBlocks.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/GTNHBlocks.java
@@ -128,9 +128,7 @@ public class GTNHBlocks {
             }
         }
 
-        if (TecTech.isModLoaded()) {
-            BioVatLogicAdder.BioVatGlass.addCustomGlass(TecTech.ID, "tile.quantumGlass", 0, 8);
-        }
+        BioVatLogicAdder.BioVatGlass.addCustomGlass(TecTech.ID, "tile.quantumGlass", 0, 8);
 
         if (Witchery.isModLoaded()) {
             for (int i = 0; i < 16; i++) {
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 499686e6e0..1a655ab4fa 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
@@ -16,7 +16,6 @@ package com.github.bartimaeusnek.bartworks.common.loaders;
 import static com.github.bartimaeusnek.bartworks.MainMod.BWT;
 import static com.github.bartimaeusnek.bartworks.MainMod.GT2;
 import static gregtech.api.enums.Mods.GalactiGreg;
-import static gregtech.api.enums.Mods.TecTech;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -409,44 +408,42 @@ public class ItemRegistry {
                 "VoidMiner1",
                 "Void Miner I").getStackForm(1L);
         }
-        if (TecTech.isModLoaded()) {
-            TecTechPipeEnergyLowPower = new TT_MetaTileEntity_Pipe_Energy_LowPower(
-                ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 14,
-                "pipe.lowpowerlaser",
-                "Low Power Laser Pipe").getStackForm(1L);
-            int startID = ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 15;
-            for (int amps = 32; amps <= 128; amps += 32) {
-                for (int tier = 4; tier < 8; tier++) {
-                    TecTechLaserAdditions[0][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserBox(
-                        startID,
-                        GT_Values.VN[tier] + "_LPLaser_Converter_" + amps,
-                        GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Converter",
-                        tier,
-                        amps).getStackForm(1L);
-                    startID++;
-                }
+        TecTechPipeEnergyLowPower = new TT_MetaTileEntity_Pipe_Energy_LowPower(
+            ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 14,
+            "pipe.lowpowerlaser",
+            "Low Power Laser Pipe").getStackForm(1L);
+        int startID = ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 15;
+        for (int amps = 32; amps <= 128; amps += 32) {
+            for (int tier = 4; tier < 8; tier++) {
+                TecTechLaserAdditions[0][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserBox(
+                    startID,
+                    GT_Values.VN[tier] + "_LPLaser_Converter_" + amps,
+                    GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Converter",
+                    tier,
+                    amps).getStackForm(1L);
+                startID++;
             }
-            for (int amps = 32; amps <= 128; amps += 32) {
-                for (int tier = 4; tier < 8; tier++) {
-                    TecTechLaserAdditions[1][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserHatch(
-                        startID,
-                        GT_Values.VN[tier] + "_LPLaser_Hatch_" + amps,
-                        GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Target Hatch",
-                        tier,
-                        amps).getStackForm(1L);
-                    startID++;
-                }
+        }
+        for (int amps = 32; amps <= 128; amps += 32) {
+            for (int tier = 4; tier < 8; tier++) {
+                TecTechLaserAdditions[1][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserHatch(
+                    startID,
+                    GT_Values.VN[tier] + "_LPLaser_Hatch_" + amps,
+                    GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Target Hatch",
+                    tier,
+                    amps).getStackForm(1L);
+                startID++;
             }
-            for (int amps = 32; amps <= 128; amps += 32) {
-                for (int tier = 4; tier < 8; tier++) {
-                    TecTechLaserAdditions[2][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserDynamo(
-                        startID,
-                        GT_Values.VN[tier] + "_LPLaser_Dynamo_" + amps,
-                        GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Source Hatch",
-                        tier,
-                        amps).getStackForm(1L);
-                    startID++;
-                }
+        }
+        for (int amps = 32; amps <= 128; amps += 32) {
+            for (int tier = 4; tier < 8; tier++) {
+                TecTechLaserAdditions[2][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserDynamo(
+                    startID,
+                    GT_Values.VN[tier] + "_LPLaser_Dynamo_" + amps,
+                    GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Source Hatch",
+                    tier,
+                    amps).getStackForm(1L);
+                startID++;
             }
         }
     }
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java
index ba08d083c2..85f66beec6 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java
@@ -976,7 +976,7 @@ public class PlatinumSludgeOverHaul {
             if (obj instanceof ShapedRecipes || obj instanceof ShapelessRecipes) {
                 inputName = "recipeOutput";
                 inputItemName = "recipeItems";
-            } else if (GTPlusPlus.isModLoaded()) {
+            } else {
                 try {
                     if (Class.forName("gtPlusPlus.api.objects.minecraft.ShapedRecipe")
                         .isAssignableFrom(obj.getClass()))
@@ -1109,33 +1109,33 @@ public class PlatinumSludgeOverHaul {
             }
         }
 
-        if (GTPlusPlus.isModLoaded()) {
-            try {
-                if (Class.forName("gtPlusPlus.core.item.base.BaseItemComponent")
-                    .isAssignableFrom(
-                        stack.getItem()
-                            .getClass())
-                    && !stack.getUnlocalizedName()
-                        .contains("dust")
-                    && !stack.getUnlocalizedName()
-                        .contains("Dust"))
-                    return true;
-                if (Class.forName("gtPlusPlus.core.block.base.BlockBaseModular")
-                    .isAssignableFrom(
-                        Block.getBlockFromItem(stack.getItem())
-                            .getClass()))
-                    return true;
-            } catch (ClassNotFoundException e) {
-                e.printStackTrace();
-            }
-            if (stack.getItem() == GT_ModHandler.getModItem(GTPlusPlus.ID, "itemDustHeLiCoPtEr", 1L)
-                .getItem()) {
+        try {
+            if (Class.forName("gtPlusPlus.core.item.base.BaseItemComponent")
+                .isAssignableFrom(
+                    stack.getItem()
+                        .getClass())
+                && !stack.getUnlocalizedName()
+                    .contains("dust")
+                && !stack.getUnlocalizedName()
+                    .contains("Dust")) {
                 return true;
             }
-            if (stack.getItem() == GT_ModHandler.getModItem(GTPlusPlus.ID, "itemDustWhiteMetal", 1L)
-                .getItem()) {
+            if (Class.forName("gtPlusPlus.core.block.base.BlockBaseModular")
+                .isAssignableFrom(
+                    Block.getBlockFromItem(stack.getItem())
+                        .getClass())) {
                 return true;
             }
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+        if (stack.getItem() == GT_ModHandler.getModItem(GTPlusPlus.ID, "itemDustHeLiCoPtEr", 1L)
+            .getItem()) {
+            return true;
+        }
+        if (stack.getItem() == GT_ModHandler.getModItem(GTPlusPlus.ID, "itemDustWhiteMetal", 1L)
+            .getItem()) {
+            return true;
         }
         if (GalaxySpace.isModLoaded()) {
             if (stack.getItem() == GT_ModHandler.getModItem(GalaxySpace.ID, "metalsblock", 1L, 7)
diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java b/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java
index 0502c121fd..704b4ed8cb 100644
--- a/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java
+++ b/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java
@@ -13,9 +13,7 @@
 
 package com.github.bartimaeusnek.crossmod;
 
-import static gregtech.api.enums.Mods.GTPlusPlus;
 import static gregtech.api.enums.Mods.GalacticraftCore;
-import static gregtech.api.enums.Mods.TecTech;
 
 import java.io.StringReader;
 
@@ -79,20 +77,14 @@ public class BartWorksCrossmod {
         if (GalacticraftCore.isModLoaded()) {
             GalacticraftProxy.postInit(init);
         }
-        if (GTPlusPlus.isModLoaded()) {
-            RadioHatchCompat.run();
-        }
-        if (TecTech.isModLoaded()) {
-            TecTechResearchLoader.runResearches();
-        }
+        RadioHatchCompat.run();
+        TecTechResearchLoader.runResearches();
     }
 
     @Mod.EventHandler
     public void onFMLServerStart(FMLServerStartingEvent event) {
-        if (GTPlusPlus.isModLoaded()) {
-            for (Object s : RadioHatchCompat.TranslateSet) {
-                StringTranslate.inject(new ReaderInputStream(new StringReader((String) s)));
-            }
+        for (Object s : RadioHatchCompat.TranslateSet) {
+            StringTranslate.inject(new ReaderInputStream(new StringReader((String) s)));
         }
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java b/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java
index 7467343599..8ead1ca4b0 100644
--- a/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java
+++ b/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java
@@ -890,85 +890,82 @@ public class Assembler implements Runnable {
         }
 
         // Buck Converter IV-UIV
-        if (BartWorks.isModLoaded()) {
-            // Buck Converter IV
-            GT_Values.RA.addAssemblerRecipe(
-                new ItemStack[] { ItemList.Transformer_LuV_IV.get(1), getItemContainer("Display").get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 4),
-                    getModItem(BartWorks.ID, "BW_GlasBlocks", 2L, 2) },
-                Materials.TungstenSteel.getMolten(288),
-                CustomItemList.Machine_BuckConverter_IV.get(1),
-                100,
-                7680);
+        // Buck Converter IV
+        GT_Values.RA.addAssemblerRecipe(
+            new ItemStack[] { ItemList.Transformer_LuV_IV.get(1), getItemContainer("Display").get(1),
+                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 2),
+                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2),
+                GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 4),
+                getModItem(BartWorks.ID, "BW_GlasBlocks", 2L, 2) },
+            Materials.TungstenSteel.getMolten(288),
+            CustomItemList.Machine_BuckConverter_IV.get(1),
+            100,
+            7680);
 
-            // Buck Converter LuV
-            GT_Values.RA.addAssemblerRecipe(
-                new ItemStack[] { ItemList.Transformer_ZPM_LuV.get(1), getItemContainer("Display").get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2),
-                    GT_OreDictUnificator
-                        .get(OrePrefixes.plate, getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 2),
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NiobiumTitanium, 4),
-                    getModItem(BartWorks.ID, "BW_GlasBlocks", 2L, 3) },
-                new FluidStack(FluidRegistry.getFluid("molten.rhodium-plated palladium"), 288),
-                CustomItemList.Machine_BuckConverter_LuV.get(1),
-                100,
-                30720);
+        // Buck Converter LuV
+        GT_Values.RA.addAssemblerRecipe(
+            new ItemStack[] { ItemList.Transformer_ZPM_LuV.get(1), getItemContainer("Display").get(1),
+                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2),
+                GT_OreDictUnificator
+                    .get(OrePrefixes.plate, getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 2),
+                GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NiobiumTitanium, 4),
+                getModItem(BartWorks.ID, "BW_GlasBlocks", 2L, 3) },
+            new FluidStack(FluidRegistry.getFluid("molten.rhodium-plated palladium"), 288),
+            CustomItemList.Machine_BuckConverter_LuV.get(1),
+            100,
+            30720);
 
-            // Buck Converter ZPM
-            GT_Values.RA.addAssemblerRecipe(
-                new ItemStack[] { ItemList.Transformer_UV_ZPM.get(1), getItemContainer("Display").get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 4),
-                    getModItem(BartWorks.ID, "BW_GlasBlocks", 2L, 4) },
-                Materials.Iridium.getMolten(288),
-                CustomItemList.Machine_BuckConverter_ZPM.get(1),
-                100,
-                122880);
+        // Buck Converter ZPM
+        GT_Values.RA.addAssemblerRecipe(
+            new ItemStack[] { ItemList.Transformer_UV_ZPM.get(1), getItemContainer("Display").get(1),
+                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 2),
+                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2),
+                GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 4),
+                getModItem(BartWorks.ID, "BW_GlasBlocks", 2L, 4) },
+            Materials.Iridium.getMolten(288),
+            CustomItemList.Machine_BuckConverter_ZPM.get(1),
+            100,
+            122880);
 
-            // Buck Converter UV
-            GT_Values.RA.addAssemblerRecipe(
-                new ItemStack[] { ItemList.Transformer_MAX_UV.get(1), getItemContainer("Display").get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.SuperconductorUHV, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Naquadah, 4),
-                    getModItem(BartWorks.ID, "BW_GlasBlocks", 2L, 5) },
-                Materials.Osmium.getMolten(288),
-                CustomItemList.Machine_BuckConverter_UV.get(1),
-                100,
-                500000);
-
-            // Buck Converter UHV
-            GT_Values.RA.addAssemblerRecipe(
-                new ItemStack[] { getItemContainer("Transformer_UEV_UHV").get(1), getItemContainer("Display").get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Infinite, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2),
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.ElectrumFlux, 4),
-                    getModItem(BartWorks.ID, "BW_GlasBlocks", 4L, 5) },
-                Materials.Neutronium.getMolten(288),
-                CustomItemList.Machine_BuckConverter_UHV.get(1),
-                100,
-                2000000);
-
-            // Buck Converter UEV
-            GT_Values.RA
-                .addAssemblerRecipe(
-                    new ItemStack[] { getItemContainer("Transformer_UIV_UEV").get(1),
-                        getItemContainer("Display").get(1),
-                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Bio, 2),
-                        GT_OreDictUnificator
-                            .get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 2),
-                        GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Bedrockium, 4),
-                        getModItem(BartWorks.ID, "BW_GlasBlocks", 8L, 5) },
-                    getOrDefault("Bedrockium", Materials.Neutronium).getMolten(288),
-                    CustomItemList.Machine_BuckConverter_UEV.get(1),
-                    100,
-                    8000000);
+        // Buck Converter UV
+        GT_Values.RA.addAssemblerRecipe(
+            new ItemStack[] { ItemList.Transformer_MAX_UV.get(1), getItemContainer("Display").get(1),
+                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.SuperconductorUHV, 2),
+                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2),
+                GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Naquadah, 4),
+                getModItem(BartWorks.ID, "BW_GlasBlocks", 2L, 5) },
+            Materials.Osmium.getMolten(288),
+            CustomItemList.Machine_BuckConverter_UV.get(1),
+            100,
+            500000);
 
-            // Buck Converter UIV
-            GT_Values.RA.addAssemblerRecipe(
+        // Buck Converter UHV
+        GT_Values.RA.addAssemblerRecipe(
+            new ItemStack[] { getItemContainer("Transformer_UEV_UHV").get(1), getItemContainer("Display").get(1),
+                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Infinite, 2),
+                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2),
+                GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.ElectrumFlux, 4),
+                getModItem(BartWorks.ID, "BW_GlasBlocks", 4L, 5) },
+            Materials.Neutronium.getMolten(288),
+            CustomItemList.Machine_BuckConverter_UHV.get(1),
+            100,
+            2000000);
+
+        // Buck Converter UEV
+        GT_Values.RA.addAssemblerRecipe(
+            new ItemStack[] { getItemContainer("Transformer_UIV_UEV").get(1), getItemContainer("Display").get(1),
+                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Bio, 2),
+                GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 2),
+                GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Bedrockium, 4),
+                getModItem(BartWorks.ID, "BW_GlasBlocks", 8L, 5) },
+            getOrDefault("Bedrockium", Materials.Neutronium).getMolten(288),
+            CustomItemList.Machine_BuckConverter_UEV.get(1),
+            100,
+            8000000);
+
+        // Buck Converter UIV
+        GT_Values.RA
+            .addAssemblerRecipe(
                 new ItemStack[] { getItemContainer("Transformer_UMV_UIV").get(1), getItemContainer("Display").get(1),
                     GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Optical, 2),
                     GT_OreDictUnificator
@@ -979,7 +976,6 @@ public class Assembler implements Runnable {
                 CustomItemList.Machine_BuckConverter_UIV.get(1),
                 200,
                 8000000);
-        }
 
         // Laser Dynamo
         {
diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/Godforge.java b/src/main/java/com/github/technus/tectech/loader/recipe/Godforge.java
index 4df4e4f209..f2d5a65926 100644
--- a/src/main/java/com/github/technus/tectech/loader/recipe/Godforge.java
+++ b/src/main/java/com/github/technus/tectech/loader/recipe/Godforge.java
@@ -1,7 +1,6 @@
 package com.github.technus.tectech.loader.recipe;
 
 import static com.github.technus.tectech.util.GodforgeMath.getRandomIntInRange;
-import static gregtech.api.enums.Mods.GTPlusPlus;
 import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
 
 import java.util.ArrayList;
@@ -36,281 +35,271 @@ public class Godforge implements Runnable {
     @Override
     public void run() {
 
-        if (GTPlusPlus.isModLoaded()) {
-            // Solid to plasma recipes
+        // Solid to plasma recipes
+        {
+            // Fusion tier 1-3
             {
-                // Fusion tier 1-3
-                {
-                    // Single step
-                    ItemStack[] solids_t0_1step = { Materials.Aluminium.getDust(1), Materials.Iron.getDust(1),
-                        Materials.Calcium.getDust(1), Materials.Sulfur.getDust(1), Materials.Zinc.getDust(1),
-                        Materials.Niobium.getDust(1), Materials.Tin.getDust(1), Materials.Titanium.getDust(1),
-                        Materials.Nickel.getDust(1), Materials.Silver.getDust(1), Materials.Americium.getDust(1),
-                        Materials.Antimony.getDust(1), Materials.Ardite.getDust(1), Materials.Arsenic.getDust(1),
-                        Materials.Barium.getDust(1), Materials.Beryllium.getDust(1), Materials.Caesium.getDust(1),
-                        Materials.Cadmium.getDust(1), Materials.Carbon.getDust(1), Materials.Cerium.getDust(1),
-                        Materials.Cobalt.getDust(1), Materials.Copper.getDust(1), Materials.Desh.getDust(1),
-                        Materials.Dysprosium.getDust(1), Materials.Erbium.getDust(1), Materials.Europium.getDust(1),
-                        Materials.Gadolinium.getDust(1), Materials.Gallium.getDust(1), Materials.Gold.getDust(1),
-                        Materials.Holmium.getDust(1), Materials.Indium.getDust(1), Materials.Lanthanum.getDust(1),
-                        Materials.Lithium.getDust(1), Materials.Lutetium.getDust(1), Materials.Magnesium.getDust(1),
-                        Materials.Manganese.getDust(1), Materials.MeteoricIron.getDust(1),
-                        Materials.Molybdenum.getDust(1), Materials.Neodymium.getDust(1),
-                        Materials.Oriharukon.getDust(1), Materials.Palladium.getDust(1),
-                        Materials.Phosphorus.getDust(1), Materials.Potassium.getDust(1),
-                        Materials.Praseodymium.getDust(1), Materials.Promethium.getDust(1),
-                        Materials.Rubidium.getDust(1), Materials.Samarium.getDust(1), Materials.Silicon.getDust(1),
-                        Materials.Sodium.getDust(1), Materials.Strontium.getDust(1), Materials.Tantalum.getDust(1),
-                        Materials.Tellurium.getDust(1), Materials.Terbium.getDust(1), Materials.Thulium.getDust(1),
-                        Materials.Tungsten.getDust(1), Materials.Uranium.getDust(1), Materials.Uranium235.getDust(1),
-                        Materials.Vanadium.getDust(1), Materials.Ytterbium.getDust(1), Materials.Yttrium.getDust(1),
-                        ELEMENT.getInstance().ZIRCONIUM.getDust(1), ELEMENT.getInstance().THORIUM232.getDust(1),
-                        ELEMENT.getInstance().GERMANIUM.getDust(1), ELEMENT.getInstance().THALLIUM.getDust(1),
-                        ELEMENT.getInstance().RUTHENIUM.getDust(1), ELEMENT.getInstance().RHENIUM.getDust(1),
-                        ELEMENT.getInstance().RHODIUM.getDust(1), ELEMENT.getInstance().IODINE.getDust(1),
-                        ELEMENT.getInstance().HAFNIUM.getDust(1), ELEMENT.getInstance().CURIUM.getDust(1) };
-                    FluidStack[] solid_plasmas_t0_1step = { Materials.Aluminium.getPlasma(144),
-                        Materials.Iron.getPlasma(144), Materials.Calcium.getPlasma(144),
-                        Materials.Sulfur.getPlasma(144), Materials.Zinc.getPlasma(144),
-                        Materials.Niobium.getPlasma(144), Materials.Tin.getPlasma(144),
-                        Materials.Titanium.getPlasma(144), Materials.Nickel.getPlasma(144),
-                        Materials.Silver.getPlasma(144), Materials.Americium.getPlasma(144),
-                        Materials.Antimony.getPlasma(144), Materials.Ardite.getPlasma(144),
-                        Materials.Arsenic.getPlasma(144), Materials.Barium.getPlasma(1