Deprecate GregTech_API#mAE2 (#2288)

4 files changed, 37 insertions, 54 deletions

diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java
index a3b0f02d89..d164c60f3f 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java
@@ -6,7 +6,6 @@ import static gregtech.api.util.GT_RecipeBuilder.TICKS;
 import net.minecraft.item.ItemStack;
 
 import appeng.core.Api;
-import gregtech.GT_Mod;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
@@ -46,10 +45,8 @@ public class ProcessingRound implements gregtech.api.interfaces.IOreRecipeRegist
                     new Object[] { "fXh", 'X', OrePrefixes.ingot.get(aMaterial) });
             }
         }
-        if (GT_Mod.gregtechproxy.mAE2Integration) {
-            Api.INSTANCE.registries()
-                .matterCannon()
-                .registerAmmo(GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), aMaterial.getMass());
-        }
+        Api.INSTANCE.registries()
+            .matterCannon()
+            .registerAmmo(GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), aMaterial.getMass());
     }
 }
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java
index 84440609e4..62ffb2e84b 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java
@@ -16,7 +16,6 @@ import net.minecraft.item.ItemStack;
 
 import appeng.api.config.TunnelType;
 import appeng.core.Api;
-import gregtech.GT_Mod;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
@@ -47,13 +46,11 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
     @Override
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
         ItemStack aStack) {
-        if (GT_Mod.gregtechproxy.mAE2Integration) {
-            if (tt == TunnelType.ME) {
-                try {
-                    tt = TunnelType.valueOf("GT_POWER");
-                } catch (IllegalArgumentException ignored) {
-                    tt = TunnelType.IC2_POWER;
-                }
+        if (tt == TunnelType.ME) {
+            try {
+                tt = TunnelType.valueOf("GT_POWER");
+            } catch (IllegalArgumentException ignored) {
+                tt = TunnelType.IC2_POWER;
             }
         }
 
@@ -223,9 +220,7 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
                             new Object[] { OrePrefixes.wireGt12.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial) });
                     }
 
-                    if (GT_Mod.gregtechproxy.mAE2Integration) {
-                        AE2addNewAttunement(aStack);
-                    }
+                    AE2addNewAttunement(aStack);
                 }
             }
             default -> {
@@ -479,15 +474,14 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
                 .addTo(sUnboxinatorRecipes);
         }
 
-        if (GT_Mod.gregtechproxy.mAE2Integration
-            && GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L) != null) {
+        if (GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L) != null) {
             AE2AddNetAttunementCable(aStack, correspondingCable, aMaterial);
         }
     }
 
     // region AE2 compat
     static {
-        if (GT_Mod.gregtechproxy.mAE2Integration) setAE2Field();
+        setAE2Field();
     }
 
     private static void setAE2Field() {
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
index 5e72c6421c..3d7f5774db 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
@@ -1862,36 +1862,32 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
     }
 
     private static void registerAE2Hatches() {
-        if (GregTech_API.mAE2) {
-            ItemList.Hatch_Output_Bus_ME.set(
-                new GT_MetaTileEntity_Hatch_OutputBus_ME(OUTPUT_BUS_ME.ID, "hatch.output_bus.me", "Output Bus (ME)")
-                    .getStackForm(1L));
-            ItemList.Hatch_Input_Bus_ME.set(
-                new GT_MetaTileEntity_Hatch_InputBus_ME(
-                    INPUT_BUS_ME.ID,
-                    "hatch.input_bus.me",
-                    "Stocking Input Bus (ME)").getStackForm(1L));
-            ItemList.Hatch_Output_ME.set(
-                new GT_MetaTileEntity_Hatch_Output_ME(OUTPUT_HATCH_ME.ID, "hatch.output.me", "Output Hatch (ME)")
-                    .getStackForm(1L));
-            ItemList.Hatch_CraftingInput_Bus_ME.set(
-                new GT_MetaTileEntity_Hatch_CraftingInput_ME(
-                    CRAFTING_INPUT_ME.ID,
-                    "hatch.crafting_input.me",
-                    "Crafting Input Buffer (ME)",
-                    true).getStackForm(1L));
-            ItemList.Hatch_CraftingInput_Bus_ME_ItemOnly.set(
-                new GT_MetaTileEntity_Hatch_CraftingInput_ME(
-                    CRAFTING_INPUT_ME_BUS.ID,
-                    "hatch.crafting_input.me.item_only",
-                    "Crafting Input Bus (ME)",
-                    false).getStackForm(1L));
-            ItemList.Hatch_CraftingInput_Bus_Slave.set(
-                new GT_MetaTileEntity_Hatch_CraftingInput_Slave(
-                    CRAFTING_INPUT_SLAVE.ID,
-                    "hatch.crafting_input.slave",
-                    "Crafting Input Slave").getStackForm(1L));
-        }
+        ItemList.Hatch_Output_Bus_ME.set(
+            new GT_MetaTileEntity_Hatch_OutputBus_ME(OUTPUT_BUS_ME.ID, "hatch.output_bus.me", "Output Bus (ME)")
+                .getStackForm(1L));
+        ItemList.Hatch_Input_Bus_ME.set(
+            new GT_MetaTileEntity_Hatch_InputBus_ME(INPUT_BUS_ME.ID, "hatch.input_bus.me", "Stocking Input Bus (ME)")
+                .getStackForm(1L));
+        ItemList.Hatch_Output_ME.set(
+            new GT_MetaTileEntity_Hatch_Output_ME(OUTPUT_HATCH_ME.ID, "hatch.output.me", "Output Hatch (ME)")
+                .getStackForm(1L));
+        ItemList.Hatch_CraftingInput_Bus_ME.set(
+            new GT_MetaTileEntity_Hatch_CraftingInput_ME(
+                CRAFTING_INPUT_ME.ID,
+                "hatch.crafting_input.me",
+                "Crafting Input Buffer (ME)",
+                true).getStackForm(1L));
+        ItemList.Hatch_CraftingInput_Bus_ME_ItemOnly.set(
+            new GT_MetaTileEntity_Hatch_CraftingInput_ME(
+                CRAFTING_INPUT_ME_BUS.ID,
+                "hatch.crafting_input.me.item_only",
+                "Crafting Input Bus (ME)",
+                false).getStackForm(1L));
+        ItemList.Hatch_CraftingInput_Bus_Slave.set(
+            new GT_MetaTileEntity_Hatch_CraftingInput_Slave(
+                CRAFTING_INPUT_SLAVE.ID,
+                "hatch.crafting_input.slave",
+                "Crafting Input Slave").getStackForm(1L));
     }
 
     private static void registerInputBus() {
diff --git a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java
index e1ac1c7346..730aba52a0 100644
--- a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java
+++ b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java
@@ -1,7 +1,6 @@
 package gregtech.loaders.preload;
 
 import static gregtech.GT_Mod.GT_FML_LOGGER;
-import static gregtech.api.enums.Mods.AppliedEnergistics2;
 import static gregtech.api.enums.Mods.Avaritia;
 import static gregtech.api.enums.Mods.CraftTweaker;
 import static gregtech.api.enums.Mods.EnderIO;
@@ -137,7 +136,6 @@ public class GT_PreLoad {
         GregTech_API.mTranslocator = Translocator.isModLoaded();
         GregTech_API.mTConstruct = TinkerConstruct.isModLoaded();
         GregTech_API.mGalacticraft = GalacticraftCore.isModLoaded();
-        GregTech_API.mAE2 = AppliedEnergistics2.isModLoaded();
         GregTech_API.mHodgepodge = HodgePodge.isModLoaded();
         GregTech_API.mAvaritia = Avaritia.isModLoaded();
     }
@@ -513,8 +511,6 @@ public class GT_PreLoad {
             .getBoolean(true);
         GT_Mod.gregtechproxy.mAchievements = tMainConfig.get(GT_Mod.aTextGeneral, "EnableAchievements", true)
             .getBoolean(true);
-        GT_Mod.gregtechproxy.mAE2Integration = GregTech_API.sSpecialFile
-            .get(ConfigCategories.general, "EnableAE2Integration", GregTech_API.mAE2);
         GT_Mod.gregtechproxy.mNerfedCombs = tMainConfig.get(GT_Mod.aTextGeneral, "NerfCombs", true)
             .getBoolean(true);
         GT_Mod.gregtechproxy.mNerfedCrops = tMainConfig.get(GT_Mod.aTextGeneral, "NerfCrops", true)