use GT enum, no loadedlist

GTNewHorizons · Jan 11, 2024 · 3daba2f · 3daba2f
1 parent 3e7d98a
commit 3daba2f
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 60 deletions.
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaSmeltery.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaSmeltery.java
@@ -2,6 +2,7 @@
 
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
 import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO;
+import static gregtech.api.enums.Mods.ThaumicBases;
 import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
 
 import java.util.ArrayList;
@@ -26,7 +27,6 @@
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
 import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_TooltipMultiBlockBase_EM;
-import goodgenerator.crossmod.LoadedList;
 import goodgenerator.loader.Loaders;
 import goodgenerator.util.DescTextLocalization;
 import gregtech.api.enums.GT_HatchElement;
@@ -158,7 +158,8 @@ public IStructureDefinition<? extends GT_MetaTileEntity_MultiblockBase_EM> getSt
                     .addElement('D', ofBlock(ConfigBlocks.blockCosmeticOpaque, 2))
                     .addElement(
                             'F',
-                            LoadedList.THAUMIC_BASES ? ofBlock(Block.getBlockFromName("thaumicbases:advAlchFurnace"), 0)
+                            ThaumicBases.isModLoaded()
+                                    ? ofBlock(Block.getBlockFromName("thaumicbases:advAlchFurnace"), 0)
                                     : ofBlock(ConfigBlocks.blockStoneDevice, 0))
                     .addElement(
                             'E',

diff --git a/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java b/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java
@@ -3,6 +3,7 @@
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
 import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO;
+import static gregtech.api.enums.Mods.GTPlusPlus;
 import static gregtech.api.enums.Textures.BlockIcons.*;
 import static gregtech.api.util.GT_Utility.filterValidMTEs;
 
@@ -25,7 +26,6 @@
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
 import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_TooltipMultiBlockBase_EM;
-import goodgenerator.crossmod.LoadedList;
 import goodgenerator.loader.Loaders;
 import goodgenerator.util.DescTextLocalization;
 import gregtech.api.GregTech_API;
@@ -239,7 +239,7 @@ protected GT_Multiblock_Tooltip_Builder createTooltip() {
             return CheckRecipeResultRegistry.GENERATING;
         }
 
-        if (LoadedList.GTPP) {
+        if (GTPlusPlus.isModLoaded()) {
             for (GT_Recipe recipe : GTPPRecipeMaps.rocketFuels.getAllRecipes()) {
                 FluidStack tFuel = findFuel(recipe);
                 if (tFuel == null) continue;

diff --git a/src/main/java/goodgenerator/crossmod/LoadedList.java b/src/main/java/goodgenerator/crossmod/LoadedList.java
diff --git a/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java b/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java
@@ -1,5 +1,11 @@
 package goodgenerator.crossmod.thaumcraft;
 
+import static gregtech.api.enums.Mods.Automagy;
+import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
+import static gregtech.api.enums.Mods.ThaumicBases;
+import static gregtech.api.enums.Mods.ThaumicEnergistics;
+import static gregtech.api.enums.Mods.ThaumicTinkerer;
+import static gregtech.api.enums.Mods.WitchingGadgets;
 import static thaumcraft.api.ThaumcraftApi.addArcaneCraftingRecipe;
 
 import java.util.Arrays;
@@ -12,7 +18,6 @@
 import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry;
 import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
 
-import goodgenerator.crossmod.LoadedList;
 import goodgenerator.util.DescTextLocalization;
 import goodgenerator.util.ItemRefer;
 import gregtech.api.GregTech_API;
@@ -186,7 +191,7 @@ public static void addResearch() {
                                         new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 256),
                                         new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 128))) });
         ItemStack broad = new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6);
-        if (LoadedList.GTNH_CORE) broad = GT_ModHandler.getModItem("dreamcraft", "item.ArcaneSlate", 1);
+        if (NewHorizonsCoreMod.isModLoaded()) broad = GT_ModHandler.getModItem("dreamcraft", "item.ArcaneSlate", 1);
         GregTech_API.sThaumcraftCompat
                 .addResearch(
                         "ESSENTIA_UPGRADE_BLANK",
@@ -332,7 +337,7 @@ Ic2Items.industrialTnt, new ItemStack(ItemRegistry.DESTRUCTOPACK) },
                                         new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 128))),
                         "research.ESSENTIA_UPGRADE_UNSTABLE.page.1", "research.ESSENTIA_UPGRADE_UNSTABLE.page.2" });
         ItemStack meatDust = GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 1);
-        if (LoadedList.GTNH_CORE) meatDust = GT_ModHandler.getModItem("dreamcraft", "GTNHBioItems", 1, 2);
+        if (NewHorizonsCoreMod.isModLoaded()) meatDust = GT_ModHandler.getModItem("dreamcraft", "GTNHBioItems", 1, 2);
         GregTech_API.sThaumcraftCompat.addResearch(
                 "ESSENTIA_UPGRADE_VICTUS",
                 "Essentia: VICTUS",
@@ -537,19 +542,21 @@ Ic2Items.industrialTnt, new ItemStack(ItemRegistry.DESTRUCTOPACK) },
                                 Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 32768))),
                         "research.ESSENTIA_UPGRADE_ELECTRIC.page.1" });
 
-        ItemStack nodeLinkDevice = LoadedList.THAUMIC_BASES
+        ItemStack nodeLinkDevice = ThaumicBases.isModLoaded()
                 ? GT_ModHandler.getModItem("thaumicbases", "nodeLinker", 1, 0)
                 : new ItemStack(ConfigBlocks.blockStoneDevice, 1, 11);
-        ItemStack alchemicalFurnace = LoadedList.THAUMIC_BASES
+        ItemStack alchemicalFurnace = ThaumicBases.isModLoaded()
                 ? GT_ModHandler.getModItem("thaumicbases", "advAlchFurnace", 1, 0)
                 : new ItemStack(ConfigBlocks.blockStoneDevice, 1, 0);
-        ItemStack nitor = LoadedList.THAUMIC_TINKERER ? GT_ModHandler.getModItem("ThaumicTinkerer", "brightNitor", 1, 0)
+        ItemStack nitor = ThaumicTinkerer.isModLoaded()
+                ? GT_ModHandler.getModItem("ThaumicTinkerer", "brightNitor", 1, 0)
                 : new ItemStack(ConfigItems.itemResource, 1, 1);
-        ItemStack alchemicalBoiler = LoadedList.AUTOMAGY ? GT_ModHandler.getModItem("Automagy", "blockBoiler", 1, 0)
+        ItemStack alchemicalBoiler = Automagy.isModLoaded() ? GT_ModHandler.getModItem("Automagy", "blockBoiler", 1, 0)
                 : new ItemStack(ConfigBlocks.blockStoneDevice, 1, 1);
-        ItemStack essentiaLocus = LoadedList.AUTOMAGY ? GT_ModHandler.getModItem("Automagy", "blockEssentiaLocus", 1, 0)
+        ItemStack essentiaLocus = Automagy.isModLoaded()
+                ? GT_ModHandler.getModItem("Automagy", "blockEssentiaLocus", 1, 0)
                 : new ItemStack(ConfigBlocks.blockJar, 1, 1);
-        ItemStack thauminiteBlock = LoadedList.THAUMIC_BASES
+        ItemStack thauminiteBlock = ThaumicBases.isModLoaded()
                 ? GT_ModHandler.getModItem("thaumicbases", "thauminiteBlock", 1, 0)
                 : new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 4);
         GregTech_API.sThaumcraftCompat.addResearch(
@@ -627,11 +634,11 @@ Ic2Items.industrialTnt, new ItemStack(ItemRegistry.DESTRUCTOPACK) },
                                 'F',
                                 thauminiteBlock) });
 
-        if (LoadedList.THAUMIC_ENERGISTICS) {
-            ItemStack essentiaPump = LoadedList.WITCHING_GADGETS
+        if (ThaumicEnergistics.isModLoaded()) {
+            ItemStack essentiaPump = WitchingGadgets.isModLoaded()
                     ? GT_ModHandler.getModItem("WitchingGadgets", "WG_MetalDevice", 1, 0)
                     : new ItemStack(ConfigBlocks.blockTube, 1, 4);
-            ItemStack inter = LoadedList.THAUMIC_TINKERER
+            ItemStack inter = ThaumicTinkerer.isModLoaded()
                     ? GT_ModHandler.getModItem("ThaumicTinkerer", "interface", 1, 0)
                     : new ItemStack(ConfigItems.itemResource, 1, 15);
             GregTech_API.sThaumcraftCompat.addResearch(

diff --git a/src/main/java/goodgenerator/loader/Loaders.java b/src/main/java/goodgenerator/loader/Loaders.java
@@ -1,6 +1,7 @@
 package goodgenerator.loader;
 
 import static goodgenerator.util.DescTextLocalization.addText;
+import static gregtech.api.enums.Mods.GTPlusPlus;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
@@ -41,7 +42,6 @@
 import goodgenerator.blocks.tileEntity.UniversalChemicalFuelEngine;
 import goodgenerator.blocks.tileEntity.YottaFluidTank;
 import goodgenerator.client.render.BlockRenderHandler;
-import goodgenerator.crossmod.LoadedList;
 import goodgenerator.crossmod.ic2.CropsLoader;
 import goodgenerator.crossmod.nei.NEI_Config;
 import goodgenerator.crossmod.thaumcraft.LargeEssentiaEnergyData;
@@ -308,7 +308,7 @@ public static void GTMetaTileRegister() {
                 IDOffset + 20,
                 "LargeFusionComputer3",
                 "Compact Fusion Computer MK-III").getStackForm(1L);
-        if (LoadedList.GTPP) {
+        if (GTPlusPlus.isModLoaded()) {
             Loaders.LFC[3] = new LargeFusionComputer4(
                     IDOffset + 21,
                     "LargeFusionComputer4",
@@ -458,7 +458,6 @@ public static void preInitLoad() {
         compactMod();
         FluidsBuilder.Register();
         FuelRodLoader.RegisterRod();
-        LoadedList.init();
     }
 
     public static void initLoad() {

diff --git a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
@@ -34,6 +34,7 @@
 import static goodgenerator.items.MyMaterial.triniumSulphate;
 import static goodgenerator.items.MyMaterial.wasteLiquid;
 import static goodgenerator.main.GG_Config_Loader.EnableNaquadahRework;
+import static gregtech.api.enums.Mods.GTPlusPlus;
 import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes;
 import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
 import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes;
@@ -64,7 +65,6 @@
 import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.PlatinumSludgeOverHaul;
 import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
 
-import goodgenerator.crossmod.LoadedList;
 import goodgenerator.main.GoodGenerator;
 import goodgenerator.util.ItemRefer;
 import goodgenerator.util.MyRecipeAdder;
@@ -90,7 +90,7 @@ public static void RecipeLoad() {
 
         if (!EnableNaquadahRework) return;
 
-        if (LoadedList.GTPP) {
+        if (GTPlusPlus.isModLoaded()) {
             try {
                 // Naquadah (UEV)
                 CORE.RA.addQuantumTransformerRecipe(
@@ -1101,7 +1101,7 @@ public static void Remover() {
 
         GT_Log.out.print("Multi Chemical Reactor done!\n");
 
-        if (LoadedList.GTPP) {
+        if (GTPlusPlus.isModLoaded()) {
             // For Gt++ Multi Centrifuge
             // Apparently NEI will break down if one modifies the hash list directly.
             // GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mRecipeList.clear();

diff --git a/src/main/java/goodgenerator/loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java
@@ -1,5 +1,6 @@
 package goodgenerator.loader;
 
+import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
 import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes;
 import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
@@ -19,7 +20,6 @@
 
 import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
 
-import goodgenerator.crossmod.LoadedList;
 import goodgenerator.items.MyMaterial;
 import goodgenerator.util.CrackRecipeAdder;
 import goodgenerator.util.ItemRefer;
@@ -586,7 +586,7 @@ public static void RecipeLoad() {
                 500,
                 65536);
 
-        if (LoadedList.GTNH_CORE) {
+        if (NewHorizonsCoreMod.isModLoaded()) {
             GT_Values.RA.addAssemblylineRecipe(
                     MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingot),
                     300000,
@@ -950,7 +950,7 @@ public static void RecipeLoad() {
                             GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Aluminium, 8))
                     .fluidInputs(tMat.getMolten(144 * tMultiplier)).itemOutputs(ItemRefer.Inverter.get(1))
                     .duration(12 * SECONDS).eut(TierEU.RECIPE_MV).addTo(assemblerRecipes);
-            if (LoadedList.GTNH_CORE) {
+            if (NewHorizonsCoreMod.isModLoaded()) {
                 GT_Values.RA.stdBuilder()
                         .itemInputs(
                                 ItemList.Circuit_Board_Multifiberglass_Elite.get(1),

diff --git a/src/main/java/goodgenerator/loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader_02.java
@@ -1,5 +1,7 @@
 package goodgenerator.loader;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
 import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes;
 import static gregtech.api.recipe.RecipeMaps.cannerRecipes;
@@ -20,7 +22,6 @@
 import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
 import com.github.technus.tectech.recipe.TT_recipeAdder;
 
-import goodgenerator.crossmod.LoadedList;
 import goodgenerator.items.MyMaterial;
 import goodgenerator.util.CrackRecipeAdder;
 import goodgenerator.util.ItemRefer;
@@ -687,7 +688,7 @@ public static void RecipeLoad() {
                     .eut(TierEU.RECIPE_MV).addTo(fluidExtractionRecipes);
         }
 
-        if (LoadedList.GTPP) {
+        if (GTPlusPlus.isModLoaded()) {
             GT_Values.RA.addDistilleryRecipe(
                     24,
                     FluidRegistry.getFluidStack("fluid.coaltaroil", 100),
@@ -774,7 +775,7 @@ public static void RecipeLoad() {
                 600,
                 120);
 
-        if (LoadedList.GTPP) {
+        if (GTPlusPlus.isModLoaded()) {
             GT_Values.RA.addMultiblockChemicalRecipe(
                     new ItemStack[] { MyMaterial.ferrocene.get(OrePrefixes.dust, 4),
                             Materials.SodiumHydroxide.getDust(8) },
@@ -972,7 +973,7 @@ public static void RecipeLoad() {
                 100,
                 30);
 
-        if (LoadedList.GTNH_CORE) {
+        if (NewHorizonsCoreMod.isModLoaded()) {
             GT_Values.RA.stdBuilder()
                     .itemInputs(
                             ItemList.Robot_Arm_IV.get(4),
@@ -1187,7 +1188,7 @@ public static void RecipeLoad() {
                 90000);
 
         // Compact MK4 Fusion Coil
-        if (LoadedList.GTPP) {
+        if (GTPlusPlus.isModLoaded()) {
             MyRecipeAdder.instance.addPreciseAssemblerRecipe(
                     new ItemStack[] { GT_ModHandler.getModItem("miscutils", "gtplusplus.blockcasings.3", 3, 13),
                             ItemRefer.HiC_T5.get(1),