Deprecate GregTech_API#mAE2 (#2288)

2 files changed, 26 insertions, 34 deletions

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)