From 71c9c339aaa2074fb8e4851a206d6b2140294d19 Mon Sep 17 00:00:00 2001
From: chochem <40274384+chochem@users.noreply.github.com>
Date: Tue, 23 Jan 2024 18:19:03 +0000
Subject: 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
---
 .../java/goodgenerator/blocks/tileEntity/LargeEssentiaSmeltery.java  | 5 +++--
 .../goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/main/java/goodgenerator/blocks')

diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaSmeltery.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaSmeltery.java
index bd2e471e3e..023f43844a 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaSmeltery.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaSmeltery.java
@@ -2,6 +2,7 @@ package goodgenerator.blocks.tileEntity;
 
 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.ISurvivalBuildEnvironment;
 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 class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa
                     .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
index 112185efad..00e892fd62 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java
@@ -3,6 +3,7 @@ package goodgenerator.blocks.tileEntity;
 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.ISurvivalBuildEnvironment;
 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 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB
             return CheckRecipeResultRegistry.GENERATING;
         }
 
-        if (LoadedList.GTPP) {
+        if (GTPlusPlus.isModLoaded()) {
             for (GT_Recipe recipe : GTPPRecipeMaps.rocketFuels.getAllRecipes()) {
                 FluidStack tFuel = findFuel(recipe);
                 if (tFuel == null) continue;
-- 
cgit