clean up GT++ code (#589)

* yeet big reactor support

* yeet IC2 classic support

* yeet pneumaticraft support

* yeet More Planets support

* yeet Immersive Engineering support

* yeet Psychedilicraft support

* yeet Beyond Reality Core support

* sort mods to see what must be purged

* yeet simply jetpacks

* yeet RFTools

* yeet xReliquary

* yeet RedTech

* yeet Mekanism

* yeet GrowthCraft

* yeet ihl

* leftover cleaning

* yeet thermal fondation support

* yeet compact windmills support

* spotless

* remove constants from LoadedMods (part 1 / 2)

* spotless

* remove constants from LoadedMods (part 2 / 2)

* use mod id enum instead of strings + optimize imports

* Loaded.isModLoaded -> enum

* restore RA init

* missing !

* start organizing recipes stuff

* fix crash on world load in dev

* remove unused class

* remove HazmatUtils.java

* move all the removals

* remove enableHarderRecipesForHighTierCasings and usages(disabled in the pack)

* move some pyrolyse oven recipes to its own file

* sa

* bump GT version

* bump GT5U version

* spotless apply

* use Everglades entry from the mod enum

---------

Co-authored-by: miozune <miozune@gmail.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>

6 files changed, 25 insertions, 22 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
index fb77c4c2e0..8af5b97b00 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
@@ -17,7 +17,7 @@ import net.minecraftforge.common.ChestGenHooks;
 import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.registry.GameRegistry;
 import forestry.core.utils.StringUtil;
-import gtPlusPlus.core.lib.LoadedMods;
+import gregtech.api.enums.Mods;
 
 public class FR_ItemRegistry {
 
@@ -45,7 +45,7 @@ public class FR_ItemRegistry {
     public static MB_ItemFrame hiveFrameStalilize;
     public static MB_ItemFrame hiveFrameArborist;
 
-    @Optional.Method(modid = "Forestry")
+    @Optional.Method(modid = Mods.Names.FORESTRY)
     public static void Register() {
 
         // Forestry Frames
@@ -93,15 +93,6 @@ public class FR_ItemRegistry {
                 ChestGenHooks.DUNGEON_CHEST,
                 new WeightedRandomChestContent(new ItemStack(hiveFrameMutagenic), 1, 3, 12));
 
-        // Extra Bee like Frames
-        if (!LoadedMods.ExtraBees) {
-            hiveFrameCocoa = new MB_ItemFrame(MB_FrameType.COCOA, EnumRarity.common, "");
-            hiveFrameCaged = new MB_ItemFrame(MB_FrameType.CAGE, EnumRarity.common, "");
-            hiveFrameSoul = new MB_ItemFrame(MB_FrameType.SOUL, EnumRarity.common, "");
-            hiveFrameClay = new MB_ItemFrame(MB_FrameType.CLAY, EnumRarity.common, "");
-            hiveFrameNova = new MB_ItemFrame(MB_FrameType.NOVA, EnumRarity.epic, "A Creative Only Frame.");
-        }
-
         // Frame Items added by bartimaeusnek
         hiveFrameDecay = new MB_ItemFrame(
                 MB_FrameType.DECAYING,
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java
index d2f3747cc3..70856235dd 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.xmod.forestry.bees.items;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -12,9 +14,12 @@ import net.minecraft.util.EnumChatFormatting;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import forestry.api.apiculture.*;
+import forestry.api.apiculture.IBee;
+import forestry.api.apiculture.IBeeGenome;
+import forestry.api.apiculture.IBeeHousing;
+import forestry.api.apiculture.IBeeModifier;
+import forestry.api.apiculture.IHiveFrame;
 import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
 
 public class MB_ItemFrame extends Item implements IHiveFrame {
 
@@ -49,7 +54,7 @@ public class MB_ItemFrame extends Item implements IHiveFrame {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerIcons(final IIconRegister par1IconRegister) {
-        this.itemIcon = par1IconRegister.registerIcon(CORE.MODID + ":frame" + this.type.getName());
+        this.itemIcon = par1IconRegister.registerIcon(GTPlusPlus.ID + ":frame" + this.type.getName());
     }
 
     // --------- IHiveFrame functions -----------------------------------------
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java
index 9ca749e599..6b075c2b60 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java
@@ -1,5 +1,8 @@
 package gtPlusPlus.xmod.forestry.bees.items.output;
 
+import static gregtech.api.enums.Mods.Forestry;
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -31,7 +34,7 @@ public class GTPP_Comb extends Item {
         this.setCreativeTab(Tabs.tabApiculture);
         this.setHasSubtypes(true);
         this.setUnlocalizedName("gtpp.comb");
-        GameRegistry.registerItem(this, "gtpp.comb", CORE.MODID);
+        GameRegistry.registerItem(this, "gtpp.comb", GTPlusPlus.ID);
     }
 
     public ItemStack getStackForType(GTPP_CombType type) {
@@ -96,13 +99,13 @@ public class GTPP_Comb extends Item {
 
         addChemicalRecipe(
                 GTPP_CombType.DRAGONBLOOD,
-                new ItemStack[] { GT_ModHandler.getModItem("Forestry", "refractoryWax", 1L, 0),
+                new ItemStack[] { GT_ModHandler.getModItem(Forestry.ID, "refractoryWax", 1L, 0),
                         GTPP_Bees.propolis.getStackForType(GTPP_PropolisType.DRAGONBLOOD),
                         GTPP_Bees.drop.getStackForType(GTPP_DropType.DRAGONBLOOD) },
                 new int[] { 3000, 1500, 500 });
         addChemicalRecipe(
                 GTPP_CombType.FORCE,
-                new ItemStack[] { GT_ModHandler.getModItem("Forestry", "beeswax", 1L, 0),
+                new ItemStack[] { GT_ModHandler.getModItem(Forestry.ID, "beeswax", 1L, 0),
                         GTPP_Bees.propolis.getStackForType(GTPP_PropolisType.FORCE),
                         GTPP_Bees.drop.getStackForType(GTPP_DropType.FORCE) },
                 new int[] { 5000, 3000, 1000 });
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java
index 873c2859c8..f9fef391e8 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.xmod.forestry.bees.items.output;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -15,7 +17,6 @@ import cpw.mods.fml.relauncher.SideOnly;
 import forestry.api.core.Tabs;
 import gregtech.api.enums.GT_Values;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.forestry.bees.handler.GTPP_DropType;
 import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
 
@@ -29,7 +30,7 @@ public class GTPP_Drop extends Item {
         this.setCreativeTab(Tabs.tabApiculture);
         this.setHasSubtypes(true);
         this.setUnlocalizedName("gtpp.drop");
-        GameRegistry.registerItem(this, "gtpp.drop", CORE.MODID);
+        GameRegistry.registerItem(this, "gtpp.drop", GTPlusPlus.ID);
     }
 
     public ItemStack getStackForType(GTPP_DropType type) {
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java
index ffd1ec7cbb..f8f403ed38 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.xmod.forestry.bees.items.output;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -12,7 +14,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import forestry.api.core.Tabs;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PollenType;
 
 public class GTPP_Pollen extends Item {
@@ -25,7 +26,7 @@ public class GTPP_Pollen extends Item {
         this.setCreativeTab(Tabs.tabApiculture);
         this.setHasSubtypes(true);
         this.setUnlocalizedName("gtpp.pollen");
-        GameRegistry.registerItem(this, "gtpp.pollen", CORE.MODID);
+        GameRegistry.registerItem(this, "gtpp.pollen", GTPlusPlus.ID);
     }
 
     public ItemStack getStackForType(GTPP_PollenType type) {
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java
index 78425a96d0..d2ce94ce54 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.xmod.forestry.bees.items.output;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -27,7 +29,7 @@ public class GTPP_Propolis extends Item {
         this.setCreativeTab(Tabs.tabApiculture);
         this.setHasSubtypes(true);
         this.setUnlocalizedName("gtpp.propolis");
-        GameRegistry.registerItem(this, "gtpp.propolis", CORE.MODID);
+        GameRegistry.registerItem(this, "gtpp.propolis", GTPlusPlus.ID);
     }
 
     public ItemStack getStackForType(GTPP_PropolisType type) {