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>

17 files changed, 131 insertions, 133 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java b/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java
index 1ad9fbad13..0b9702acb1 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java
@@ -1,5 +1,8 @@
 package gtPlusPlus.xmod.forestry;
 
+import static gregtech.api.enums.Mods.ExtraTrees;
+import static gregtech.api.enums.Mods.Forestry;
+
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
@@ -13,7 +16,7 @@ import forestry.api.arboriculture.EnumGermlingType;
 import forestry.api.arboriculture.EnumWoodType;
 import forestry.api.arboriculture.TreeManager;
 import forestry.arboriculture.genetics.TreeDefinition;
-import gtPlusPlus.core.lib.LoadedMods;
+import gregtech.api.enums.Mods;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry;
 import gtPlusPlus.xmod.forestry.bees.recipe.FR_Gregtech_Recipes;
@@ -23,39 +26,35 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.Gr
 public class HANDLER_FR {
 
     public static void preInit() {
-        if (LoadedMods.Forestry) {
+        if (Forestry.isModLoaded()) {
             FR_ItemRegistry.Register();
         }
     }
 
-    public static void Init() {
-        if (LoadedMods.Forestry) {}
-    }
-
     public static void postInit() {
-        if (LoadedMods.Forestry) {
+        if (Forestry.isModLoaded()) {
             FR_Gregtech_Recipes.registerItems();
             new GTPP_Bees();
             mapForestrySaplingToLog();
         }
 
-        if (LoadedMods.ExtraTrees) {
+        if (ExtraTrees.isModLoaded()) {
             mapExtraTreesSaplingToLog();
         }
     }
 
     public static boolean createBlockBreakParticles(final World world, final int x, final int y, final int z,
             final Block block) {
-        if (LoadedMods.Forestry) {
+        if (Forestry.isModLoaded()) {
             createBlockBreakParticles_INTERNAL(world, x, y, z, block);
         }
         return false;
     }
 
-    @Optional.Method(modid = "Forestry")
+    @Optional.Method(modid = Mods.Names.FORESTRY)
     private static void createBlockBreakParticles_INTERNAL(final World world, final int x, final int y, final int z,
             final Block block) {
-        if (LoadedMods.Forestry) {
+        if (Forestry.isModLoaded()) {
             Class oClass;
             try {
                 oClass = ReflectionUtils.getClass("forestry.core.proxy.ProxyCommon");
@@ -77,7 +76,7 @@ public class HANDLER_FR {
         }
     }
 
-    @Optional.Method(modid = "Forestry")
+    @Optional.Method(modid = Mods.Names.FORESTRY)
     private static void mapForestrySaplingToLog() {
         for (TreeDefinition value : TreeDefinition.values()) {
             ItemStack aSaplingStack = value.getMemberStack(EnumGermlingType.SAPLING);
@@ -100,7 +99,7 @@ public class HANDLER_FR {
         }
     }
 
-    @Optional.Method(modid = "ExtraTrees")
+    @Optional.Method(modid = Mods.Names.EXTRA_TREES)
     private static void mapExtraTreesSaplingToLog() {
         for (ExtraTreeSpecies value : ExtraTreeSpecies.values()) {
             ItemStack aSaplingStack = TreeManager.treeRoot
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java
index 00799a1030..4c8912b21e 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java
@@ -10,12 +10,22 @@ import net.minecraftforge.common.BiomeDictionary.Type;
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.commons.lang3.text.WordUtils;
 
-import forestry.api.apiculture.*;
+import forestry.api.apiculture.BeeManager;
+import forestry.api.apiculture.EnumBeeChromosome;
+import forestry.api.apiculture.EnumBeeType;
+import forestry.api.apiculture.IAlleleBeeSpecies;
+import forestry.api.apiculture.IAlleleBeeSpeciesCustom;
+import forestry.api.apiculture.IBee;
+import forestry.api.apiculture.IBeeGenome;
+import forestry.api.apiculture.IBeeMutationCustom;
 import forestry.api.core.EnumHumidity;
 import forestry.api.core.EnumTemperature;
 import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IAllele;
-import forestry.apiculture.genetics.*;
+import forestry.apiculture.genetics.Bee;
+import forestry.apiculture.genetics.BeeDefinition;
+import forestry.apiculture.genetics.BeeVariation;
+import forestry.apiculture.genetics.IBeeDefinition;
 import forestry.core.genetics.alleles.AlleleHelper;
 import gregtech.loaders.misc.GT_BeeDefinition;
 import gtPlusPlus.api.objects.Logger;
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
index f5d37817ff..d27f478169 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.xmod.forestry.bees.custom;
 
+import static gregtech.api.enums.Mods.Forestry;
+
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -10,9 +12,6 @@ import net.minecraftforge.fluids.FluidStack;
 
 import org.apache.commons.lang3.reflect.FieldUtils;
 
-import cpw.mods.fml.common.Loader;
-import forestry.api.genetics.AlleleManager;
-import forestry.api.genetics.IAllele;
 import gregtech.GT_Mod;
 import gregtech.api.enums.Materials;
 import gtPlusPlus.api.objects.Logger;
@@ -48,15 +47,7 @@ public class GTPP_Bees {
     // public static GTPP_Branch_Definition definition;
 
     public GTPP_Bees() {
-        if (Loader.isModLoaded("Forestry") /* && tryGetBeesBoolean() */) {
-
-            for (IAllele o : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) {
-                // Utils.LOG_DEBUG_BEES(" ==================================================");
-                // Utils.LOG_DEBUG_BEES(" Name: "+o.getName());
-                // Utils.LOG_DEBUG_BEES(" Name: "+o.getUnlocalizedName());
-                // Utils.LOG_DEBUG_BEES(" getUID: "+o.getUID());
-                // Utils.LOG_DEBUG_BEES(" isDominant: "+o.isDominant());
-            }
+        if (Forestry.isModLoaded()) {
 
             // Set Materials and Comb stacks from GT via Reflection
             setMaterials();
@@ -75,20 +66,13 @@ public class GTPP_Bees {
 
     private void setCustomItems() {
         dropForceGem = new BaseItemMisc("Force", new short[] { 250, 250, 20 }, 64, MiscTypes.GEM, null);
-        // MaterialUtils.tryEnableMaterial(Materials.Force);
-        // MaterialUtils.tryEnableMaterialPart(OrePrefixes.dust, Materials.Force);
-        // MaterialUtils.tryEnableMaterialPart(OrePrefixes.ingot, Materials.Force);
         dropBiomassBlob = new BaseItemMisc("Biomass", new short[] { 33, 225, 24 }, 64, MiscTypes.DROP, null);
         dropEthanolBlob = new BaseItemMisc("Ethanol", new short[] { 255, 128, 0 }, 64, MiscTypes.DROP, null);
 
         // Nikolite may not exist, so lets make it.
         dropNikoliteDust = ItemUtils
                 .generateSpecialUseDusts("Nikolite", "Nikolite", Utils.rgbtoHexValue(60, 180, 200))[2];
-        // MaterialUtils.tryEnableMaterial(Materials.Nikolite);
-        // MaterialUtils.tryEnableMaterialPart(OrePrefixes.dust, Materials.Nikolite);
-        // MaterialUtils.tryEnableMaterialPart(OrePrefixes.ingot, Materials.Nikolite);
-        // MaterialUtils.tryEnableMaterialPart(OrePrefixes.plate, Materials.Nikolite);
-        // MaterialUtils.tryEnableMaterial(Materials.BlueAlloy);
+
         if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotNikolite", 1) == null) {
             new BaseItemIngot_OLD("itemIngotNikolite", "Nikolite", Utils.rgbtoHexValue(60, 180, 200), 0);
         }
@@ -160,9 +144,6 @@ public class GTPP_Bees {
             if (Comb_Stone == null) {
                 Comb_Stone = (ItemStack) getStackForType.invoke(gtBees, gtCombTypeStone);
             }
-            /*
-             * } else { Utils.LOG_BEES("oCombObject was not an instance of gregtech.common.items.ItemComb"); }
-             */
 
         } catch (NullPointerException | ClassNotFoundException | IllegalArgumentException | IllegalAccessException
                 | NoSuchMethodException | SecurityException | InvocationTargetException e) {
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java
index 43ab2fb191..a7896ab662 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.xmod.forestry.bees.custom;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -13,10 +15,12 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import forestry.api.core.Tabs;
 import gregtech.GT_Mod;
-import gregtech.api.enums.*;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class ItemCustomComb extends Item {
@@ -29,7 +33,7 @@ public class ItemCustomComb 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(CustomCombs type) {
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java
index eac0e5f7b6..31671afaa1 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java
@@ -14,7 +14,11 @@ import java.util.Collection;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
-import forestry.api.apiculture.*;
+import forestry.api.apiculture.BeeManager;
+import forestry.api.apiculture.IBee;
+import forestry.api.apiculture.IBeeHousing;
+import forestry.api.apiculture.IBeekeepingMode;
+import forestry.api.apiculture.IHiveFrame;
 import forestry.apiculture.InventoryBeeHousing;
 import forestry.apiculture.inventory.IApiaryInventory;
 import forestry.core.access.IAccessHandler;
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) {
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
index 3ba28fd98c..f16abb573d 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
@@ -1,10 +1,11 @@
 package gtPlusPlus.xmod.forestry.bees.recipe;
 
+import static gregtech.api.enums.Mods.MagicBees;
+
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
 import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry;
@@ -64,7 +65,7 @@ public class FR_Gregtech_Recipes {
                 rod_Uranium,
                 rod_Uranium,
                 hiveFrameMutagenic);
-        if (LoadedMods.MagicBees) {
+        if (MagicBees.isModLoaded()) {
             RecipeUtils.addShapelessGregtechRecipe(
                     new ItemStack[] { hiveFrameVoid },
                     ItemUtils.getCorrectStacktype("MagicBees:frameOblivion", 1));
@@ -81,57 +82,6 @@ public class FR_Gregtech_Recipes {
                 "stickBlueSteel",
                 hiveFrameBusy);
 
-        if (!LoadedMods.ExtraBees) {
-            // Extra Bee Like Frames
-            RecipeUtils.addShapedRecipe(
-                    null,
-                    itemCocoaBeans,
-                    null,
-                    itemCocoaBeans,
-                    hiveFrameImpregnated,
-                    itemCocoaBeans,
-                    null,
-                    itemCocoaBeans,
-                    null,
-                    hiveFrameCocoa);
-
-            RecipeUtils.addShapedRecipe(
-                    hiveFrameImpregnated,
-                    blockIronBars,
-                    null,
-                    null,
-                    null,
-                    null,
-                    null,
-                    null,
-                    null,
-                    hiveFrameCaged);
-
-            RecipeUtils.addShapedRecipe(
-                    hiveFrameImpregnated,
-                    blockSoulSand,
-                    null,
-                    null,
-                    null,
-                    null,
-                    null,
-                    null,
-                    null,
-                    hiveFrameSoul);
-
-            RecipeUtils.addShapedRecipe(
-                    null,
-                    itemClayDust,
-                    null,
-                    itemClayDust,
-                    hiveFrameImpregnated,
-                    itemClayDust,
-                    null,
-                    itemClayDust,
-                    null,
-                    hiveFrameClay);
-        }
-
         // Frame Items added by bartimaeusnek
         RecipeUtils.addShapedGregtechRecipe(
                 ItemUtils.getItemStackOfAmountFromOreDict("stickLongTumbaga", 1),
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java
index fef7d1fe7e..ee3d8d05ef 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java
@@ -1,7 +1,12 @@
 package gtPlusPlus.xmod.forestry.bees.registry;
 
-import static forestry.api.apiculture.EnumBeeChromosome.*;
+import static forestry.api.apiculture.EnumBeeChromosome.EFFECT;
+import static forestry.api.apiculture.EnumBeeChromosome.HUMIDITY_TOLERANCE;
+import static forestry.api.apiculture.EnumBeeChromosome.LIFESPAN;
+import static forestry.api.apiculture.EnumBeeChromosome.SPECIES;
+import static forestry.api.apiculture.EnumBeeChromosome.TEMPERATURE_TOLERANCE;
 import static forestry.api.core.EnumHumidity.ARID;
+import static gregtech.api.enums.Mods.Forestry;
 
 import java.lang.reflect.Field;
 import java.util.Arrays;
@@ -13,16 +18,25 @@ import net.minecraftforge.common.BiomeDictionary.Type;
 
 import org.apache.commons.lang3.text.WordUtils;
 
-import forestry.api.apiculture.*;
+import forestry.api.apiculture.BeeManager;
+import forestry.api.apiculture.EnumBeeType;
+import forestry.api.apiculture.IAlleleBeeEffect;
+import forestry.api.apiculture.IAlleleBeeSpecies;
+import forestry.api.apiculture.IBee;
+import forestry.api.apiculture.IBeeGenome;
+import forestry.api.apiculture.IBeeMutationCustom;
 import forestry.api.core.EnumHumidity;
 import forestry.api.core.EnumTemperature;
-import forestry.api.genetics.*;
-import forestry.apiculture.genetics.*;
+import forestry.api.genetics.AlleleManager;
+import forestry.api.genetics.IAllele;
+import forestry.api.genetics.IAlleleFlowers;
+import forestry.apiculture.genetics.Bee;
+import forestry.apiculture.genetics.BeeVariation;
+import forestry.apiculture.genetics.IBeeDefinition;
 import forestry.apiculture.genetics.alleles.AlleleEffect;
 import forestry.core.genetics.alleles.AlleleHelper;
 import forestry.core.genetics.alleles.EnumAllele.Lifespan;
 import forestry.core.genetics.alleles.EnumAllele.Tolerance;
-import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_ModHandler;
@@ -39,7 +53,7 @@ public enum GTPP_BeeDefinition implements IBeeDefinition {
 
     DRAGONBLOOD(GTPP_BranchDefinition.LEGENDARY, "Dragon Blood", STANDALONE.DRAGON_METAL, true,
             Utils.rgbtoHexValue(220, 20, 20), Utils.rgbtoHexValue(20, 20, 20), beeSpecies -> {
-                beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f);
+                beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f);
                 beeSpecies.addSpecialty(GTPP_Bees.combs.getStackForType(GTPP_CombType.DRAGONBLOOD), 0.10f);
                 beeSpecies.setHumidity(ARID);
                 beeSpecies.setTemperature(EnumTemperature.NORMAL);
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bee_Mutation.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bee_Mutation.java
index 75b43ff8f1..a5d351ea09 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bee_Mutation.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bee_Mutation.java
@@ -8,7 +8,11 @@ import net.minecraft.world.World;
 
 import org.apache.commons.lang3.reflect.FieldUtils;
 
-import forestry.api.apiculture.*;
+import forestry.api.apiculture.BeeManager;
+import forestry.api.apiculture.IAlleleBeeSpecies;
+import forestry.api.apiculture.IBeeGenome;
+import forestry.api.apiculture.IBeeHousing;
+import forestry.api.apiculture.IBeeModifier;
 import forestry.api.core.IClimateProvider;
 import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IGenome;
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java
index 56383192c0..69d9319884 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java
@@ -1,16 +1,21 @@
 package gtPlusPlus.xmod.forestry.bees.registry;
 
-import static gregtech.api.enums.GT_Values.MOD_ID_FR;
+import static gregtech.api.enums.Mods.Forestry;
 
 import java.util.HashMap;
 
-import cpw.mods.fml.common.Loader;
 import gregtech.GT_Mod;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.forestry.bees.handler.*;
-import gtPlusPlus.xmod.forestry.bees.items.output.*;
+import gtPlusPlus.xmod.forestry.bees.handler.GTPP_CombType;
+import gtPlusPlus.xmod.forestry.bees.handler.GTPP_DropType;
+import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PollenType;
+import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PropolisType;
+import gtPlusPlus.xmod.forestry.bees.items.output.GTPP_Comb;
+import gtPlusPlus.xmod.forestry.bees.items.output.GTPP_Drop;
+import gtPlusPlus.xmod.forestry.bees.items.output.GTPP_Pollen;
+import gtPlusPlus.xmod.forestry.bees.items.output.GTPP_Propolis;
 
 public class GTPP_Bees {
 
@@ -32,7 +37,7 @@ public class GTPP_Bees {
     public static HashMap<Integer, GTPP_CombType> sCombMappings = new HashMap<Integer, GTPP_CombType>();
 
     public GTPP_Bees() {
-        if (Loader.isModLoaded(MOD_ID_FR) && GT_Mod.gregtechproxy.mGTBees) {
+        if (Forestry.isModLoaded() && GT_Mod.gregtechproxy.mGTBees) {
             Logger.BEES("Creating required items.");
             propolis = new GTPP_Propolis();
             pollen = new GTPP_Pollen();
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BranchDefinition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BranchDefinition.java
index a55330b5df..4c367e25d4 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BranchDefinition.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BranchDefinition.java
@@ -1,6 +1,17 @@
 package gtPlusPlus.xmod.forestry.bees.registry;
 
-import static forestry.api.apiculture.EnumBeeChromosome.*;
+import static forestry.api.apiculture.EnumBeeChromosome.CAVE_DWELLING;
+import static forestry.api.apiculture.EnumBeeChromosome.EFFECT;