Convert GG to RA2 (#232)

* convert assembler recipes to RA2 * deprecate custom builders * clean up and RA2 solder assembler recipes * use GT for mod load checks * should be safe to remove * RA2 remaining assembler recipes * RA2 mixer recipes * RA2 compressor recipes * RA2 forming press * ra2 electrolyzer * ra2 extruder * RA2 autoclave * ra2 vac freezer and remove duplicate * RA2 canner * RA2 unpacking * ra2 chembath * fluidextractor ra2 * use GT enum, no loadedlist * RA2 Bender * RA2 forgehammer * RA2 remaining chem bath * RA2 Implosion * RA2 EBF * RA2 centrifuge * RA2 fuel * RA2 macerator * RA2 single chem * RA2 multi chem * RA2 wiremill * RA2 fluid solidifier * RA2 fluid canner * RA2 universal chem * ra2 distillery * ra2 DT * RA2 universal dist * RA2 AL part 1 * RA2 AL part 2 * add missing modloaded check * RA2 fusion * ra2 plasma forge * ra2 cracking * fix BW overwrites for atomicseparationcatalyst * fix shirabon freezing
GTNewHorizons · Jan 23, 2024 · 71c9c33 · 71c9c33
1 parent fb42cd4
commit 71c9c33
Show file tree

Hide file tree

Showing 12 changed files with 2,526 additions and 3,042 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/items/MyMaterial.java b/src/main/java/goodgenerator/items/MyMaterial.java
@@ -252,7 +252,7 @@ public class MyMaterial implements Runnable {
             new short[] { 0xe8, 0x5e, 0x0c },
             "Atomic Separation Catalyst",
             "the melting core...",
-            new Werkstoff.Stats().setMeltingPoint(5000).setBlastFurnace(true),
+            new Werkstoff.Stats().setMeltingPoint(5000),
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems()
                     .addSimpleMetalWorkingItems().addCraftingMetalWorkingItems().addMultipleIngotMetalWorkingItems(),
@@ -1252,8 +1252,8 @@ public class MyMaterial implements Runnable {
             new short[] { 0xe0, 0x15, 0x6d },
             "Shirabon",
             "Sh" + CharExchanger.shifter(9191),
-            new Werkstoff.Stats().setBlastFurnace(true).setProtons(500).setMass(750).setMeltingPoint(13000)
-                    .setSpeedOverride(640.0F).setDurOverride(15728640).setQualityOverride((byte) 26),
+            new Werkstoff.Stats().setProtons(500).setMass(750).setMeltingPoint(13000).setSpeedOverride(640.0F)
+                    .setDurOverride(15728640).setQualityOverride((byte) 26),
             Werkstoff.Types.ELEMENT,
             new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems()
                     .addSimpleMetalWorkingItems().addMultipleIngotMetalWorkingItems()