The Great Renaming (#3014)

* move kekztech to a single root dir

* move detrav to a single root dir

* move gtnh-lanthanides to a single root dir

* move tectech and delete some gross reflection in gt++

* remove more reflection inside gt5u

* delete more reflection in gt++

* fix imports

* move bartworks and bwcrossmod

* fix proxies

* move galactigreg and ggfab

* move gtneioreplugin

* try to fix gt++ bee loader

* apply the rename rules to BW

* apply rename rules to bwcrossmod

* apply rename rules to detrav scanner mod

* apply rename rules to galacticgreg

* apply rename rules to ggfab

* apply rename rules to goodgenerator

* apply rename rules to gtnh-lanthanides

* apply rename rules to gt++

* apply rename rules to kekztech

* apply rename rules to kubatech

* apply rename rules to tectech

* apply rename rules to gt

apply the rename rules to gt

* fix tt import

* fix mui hopefully

* fix coremod except intergalactic

* rename assline recipe class

* fix a class name i stumbled on

* rename StructureUtility to GTStructureUtility to prevent conflict with structurelib

* temporary rename of GTTooltipDataCache to old name

* fix gt client/server proxy names

10 files changed, 946 insertions, 967 deletions

diff --git a/src/main/java/gregtech/loaders/misc/CoverLoader.java b/src/main/java/gregtech/loaders/misc/CoverLoader.java
new file mode 100644
index 0000000000..f2feaa3a29
--- /dev/null
+++ b/src/main/java/gregtech/loaders/misc/CoverLoader.java
@@ -0,0 +1,42 @@
+package gregtech.loaders.misc;
+
+import static gregtech.api.enums.Textures.BlockIcons.VENT_ADVANCED;
+import static gregtech.api.enums.Textures.BlockIcons.VENT_NORMAL;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+
+import gregtech.api.GregTechAPI;
+import gregtech.api.render.TextureFactory;
+import gregtech.api.util.GTModHandler;
+import gregtech.common.covers.CoverVent;
+
+public class CoverLoader implements Runnable {
+
+    @Override
+    public void run() {
+        for (byte i = 0; i < 16; i = (byte) (i + 1)) {
+            GregTechAPI.registerCover(new ItemStack(Blocks.carpet, 1, i), TextureFactory.of(Blocks.wool, i), null);
+        }
+        GregTechAPI.registerCover(
+            GTModHandler.getIC2Item("reactorVent", 1L, 1),
+            TextureFactory.of(VENT_NORMAL),
+            new CoverVent(1));
+        GregTechAPI.registerCover(
+            GTModHandler.getIC2Item("reactorVentCore", 1L, 1),
+            TextureFactory.of(VENT_NORMAL),
+            new CoverVent(1));
+        GregTechAPI.registerCover(
+            GTModHandler.getIC2Item("reactorVentGold", 1L, 1),
+            TextureFactory.of(VENT_ADVANCED),
+            new CoverVent(2));
+        GregTechAPI.registerCover(
+            GTModHandler.getIC2Item("reactorVentSpread", 1L),
+            TextureFactory.of(VENT_NORMAL),
+            new CoverVent(2));
+        GregTechAPI.registerCover(
+            GTModHandler.getIC2Item("reactorVentDiamond", 1L, 1),
+            TextureFactory.of(VENT_ADVANCED),
+            new CoverVent(3));
+    }
+}
diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GTAchievements.java
index 1245a1dbaf..aed2ff6d28 100644
--- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java
+++ b/src/main/java/gregtech/loaders/misc/GTAchievements.java
@@ -19,23 +19,23 @@ import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent;
 import cpw.mods.fml.common.gameevent.PlayerEvent.ItemSmeltedEvent;
-import gregtech.GT_Mod;
-import gregtech.api.enums.GT_Values;
+import gregtech.GTMod;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.objects.ItemData;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import gregtech.common.items.ID_MetaTool_01;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipe;
+import gregtech.common.items.IDMetaTool01;
+import gregtech.common.items.MetaGeneratedTool01;
 import ic2.core.Ic2Items;
 import thaumcraft.api.ThaumcraftApiHelper;
 
-public class GT_Achievements {
+public class GTAchievements {
 
     public static int oreReg = -1;
     public static int assReg = -1;
@@ -44,11 +44,11 @@ public class GT_Achievements {
     public int adjX = 5;
     public int adjY = 9;
 
-    public GT_Achievements() {
+    public GTAchievements() {
         this.achievementList = new ConcurrentHashMap<>();
         this.issuedAchievements = new ConcurrentHashMap<>();
 
-        for (GT_Recipe recipe : RecipeMaps.assemblylineVisualRecipes.getAllRecipes()) {
+        for (GTRecipe recipe : RecipeMaps.assemblylineVisualRecipes.getAllRecipes()) {
             registerAssAchievement(recipe);
         }
 
@@ -56,10 +56,10 @@ public class GT_Achievements {
             "flintpick",
             0,
             0,
-            GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(2, 1, Materials.Flint, Materials.Wood, null),
+            MetaGeneratedTool01.INSTANCE.getToolWithStats(2, 1, Materials.Flint, Materials.Wood, null),
             "",
             false);
-        registerAchievement("crops", -4, 0, GT_ModHandler.getIC2Item("crop", 1L), "flintpick", false);
+        registerAchievement("crops", -4, 0, GTModHandler.getIC2Item("crop", 1L), "flintpick", false);
         registerAchievement("havestlead", -4, 2, ItemList.Crop_Drop_Plumbilia.get(1), "crops", false);
         registerAchievement("havestcopper", -2, 1, ItemList.Crop_Drop_Coppon.get(1), "crops", false);
         registerAchievement("havesttin", -2, -1, ItemList.Crop_Drop_Tine.get(1), "crops", false);
@@ -73,48 +73,40 @@ public class GT_Achievements {
             "tools",
             0,
             4,
-            GT_MetaGenerated_Tool_01.INSTANCE
-                .getToolWithStats(ID_MetaTool_01.HARDHAMMER.ID, 1, Materials.Iron, Materials.Wood, null),
+            MetaGeneratedTool01.INSTANCE
+                .getToolWithStats(IDMetaTool01.HARDHAMMER.ID, 1, Materials.Iron, Materials.Wood, null),
             "flintpick",
             false);
         registerAchievement(
             "driltime",
             2,
             4,
-            GT_MetaGenerated_Tool_01.INSTANCE
-                .getToolWithStats(ID_MetaTool_01.DRILL_LV.ID, 1, Materials.BlueSteel, Materials.StainlessSteel, null),
+            MetaGeneratedTool01.INSTANCE
+                .getToolWithStats(IDMetaTool01.DRILL_LV.ID, 1, Materials.BlueSteel, Materials.StainlessSteel, null),
             "tools",
             false);
         registerAchievement(
             "brrrr",
             2,
             6,
-            GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                ID_MetaTool_01.CHAINSAW_LV.ID,
-                1,
-                Materials.BlueSteel,
-                Materials.StainlessSteel,
-                null),
+            MetaGeneratedTool01.INSTANCE
+                .getToolWithStats(IDMetaTool01.CHAINSAW_LV.ID, 1, Materials.BlueSteel, Materials.StainlessSteel, null),
             "driltime",
             false);
         registerAchievement(
             "highpowerdrill",
             3,
             5,
-            GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                ID_MetaTool_01.DRILL_HV.ID,
-                1,
-                Materials.TungstenSteel,
-                Materials.TungstenSteel,
-                null),
+            MetaGeneratedTool01.INSTANCE
+                .getToolWithStats(IDMetaTool01.DRILL_HV.ID, 1, Materials.TungstenSteel, Materials.TungstenSteel, null),
             "driltime",
             false);
         registerAchievement(
             "hammertime",
             3,
             7,
-            GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
-                ID_MetaTool_01.JACKHAMMER.ID,
+            MetaGeneratedTool01.INSTANCE.getToolWithStats(
+                IDMetaTool01.JACKHAMMER.ID,
                 1,
                 Materials.TungstenSteel,
                 Materials.TungstenSteel,
@@ -126,8 +118,8 @@ public class GT_Achievements {
             "unitool",
             -2,
             4,
-            GT_MetaGenerated_Tool_01.INSTANCE
-                .getToolWithStats(ID_MetaTool_01.UNIVERSALSPADE.ID, 1, Materials.Steel, Materials.Iron, null),
+            MetaGeneratedTool01.INSTANCE
+                .getToolWithStats(IDMetaTool01.UNIVERSALSPADE.ID, 1, Materials.Steel, Materials.Iron, null),
             "tools",
             false);
         registerAchievement("recycling", -4, 4, ItemList.Machine_LV_ArcFurnace.get(1), "unitool", false);
@@ -136,28 +128,28 @@ public class GT_Achievements {
             "crushed",
             0,
             6,
-            GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Tin, 1L),
+            GTOreDictUnificator.get(OrePrefixes.crushed, Materials.Tin, 1L),
             "tools",
             false);
         registerAchievement(
             "cleandust",
             0,
             10,
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L),
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L),
             "crushed",
             false);
         registerAchievement(
             "washing",
             -2,
             6,
-            GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Iron, 1L),
+            GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Iron, 1L),
             "crushed",
             false);
         registerAchievement(
             "spinit",
             -4,
             6,
-            GT_OreDictUnificator.get(OrePrefixes.crushedCentrifuged, Materials.Redstone, 1L),
+            GTOreDictUnificator.get(OrePrefixes.crushedCentrifuged, Materials.Redstone, 1L),
             "crushed",
             false);
 
@@ -166,7 +158,7 @@ public class GT_Achievements {
             "newmetal",
             -4,
             10,
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 1L),
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 1L),
             "newfuel",
             false);
         registerAchievement("reflect", -2, 9, ItemList.Neutron_Reflector.get(1), "newfuel", false);
@@ -175,7 +167,7 @@ public class GT_Achievements {
             "bronze",
             2,
             0,
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 1L),
+            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 1L),
             "flintpick",
             false);
         registerAchievement(
@@ -228,7 +220,7 @@ public class GT_Achievements {
             "steel",
             4,
             0,
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L),
             "bronze",
             false);
         registerAchievement("highpressure", 4, 2, ItemList.Machine_Steel_Boiler.get(1), "steel", false);
@@ -244,7 +236,7 @@ public class GT_Achievements {
             "complexalloys",
             6,
             3,
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.BlueSteel, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.BlueSteel, 1L),
             "cheapermac",
             false);
 
@@ -252,7 +244,7 @@ public class GT_Achievements {
             "magneticiron",
             4,
             -2,
-            GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1L),
+            GTOreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1L),
             "steel",
             false);
         registerAchievement("lvmotor", 4, -6, ItemList.Electric_Motor_LV.get(1), "magneticiron", false);
@@ -277,7 +269,7 @@ public class GT_Achievements {
             "gtaluminium",
             8,
             0,
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Aluminium, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Aluminium, 1L),
             "steel",
             false);
         registerAchievement("highpowersmelt", 8, 2, ItemList.Machine_Multi_Furnace.get(1), "gtaluminium", false);
@@ -291,7 +283,7 @@ public class GT_Achievements {
             "titan",
             14,
             0,
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 1L),
             "upgrade",
             false);
         registerAchievement("magic", 14, 3, ItemList.MagicEnergyConverter_LV.get(1), "titan", false);
@@ -305,14 +297,14 @@ public class GT_Achievements {
             "tungsten",
             16,
             2,
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tungsten, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Tungsten, 1L),
             "upgrade2",
             false);
         registerAchievement(
             "osmium",
             16,
             -2,
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 1L),
             "upgrade2",
             false);
         registerAchievement("hightech", 15, -3, ItemList.Field_Generator_LV.get(1), "osmium", false);
@@ -326,7 +318,7 @@ public class GT_Achievements {
             "tungstensteel",
             16,
             4,
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L),
             "tungsten",
             false);
         registerAchievement("upgrade3", 15, 5, ItemList.Casing_Coil_TungstenSteel.get(1), "tungstensteel", false);
@@ -334,7 +326,7 @@ public class GT_Achievements {
             "hssg",
             13,
             5,
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 1L),
             "upgrade3",
             false);
         registerAchievement("upgrade4", 11, 5, ItemList.Casing_Coil_HSSG.get(1), "hssg", false);
@@ -342,7 +334,7 @@ public class GT_Achievements {
             "stargatematerial",
             11,
             7,
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1L),
             "upgrade4",
             false);
         registerAchievement("conducting", 14, 6, ItemList.Casing_Coil_Superconductor.get(1), "upgrade3", false);
@@ -358,7 +350,7 @@ public class GT_Achievements {
             "alienmetallurgy",
             9,
             7,
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahAlloy, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahAlloy, 1L),
             "upgrade5",
             false);
         registerAchievement("over9000", 7, 7, ItemList.Casing_Coil_NaquadahAlloy.get(1), "alienmetallurgy", false);
@@ -366,7 +358,7 @@ public class GT_Achievements {
             "finalpreparations",
             7,
             9,
-            GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadria, 1L),
+            GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadria, 1L),
             "over9000",
             false);
         registerAchievement("denseaspossible", 6, 10, ItemList.FusionComputer_UV.get(1), "finalpreparations", false);
@@ -375,7 +367,7 @@ public class GT_Achievements {
         registerAchievement("uvage", 10, 10, ItemList.Energy_Cluster.get(1), "zpmage", false);
         registerAchievement("whatnow", 12, 10, ItemList.ZPM2.get(1), "uvage", false);
 
-        if (GT_Mod.gregtechproxy.mAchievements) {
+        if (GTMod.gregtechproxy.mAchievements) {
             AchievementPage.registerAchievementPage(
                 new AchievementPage(
                     "GregTech 5",
@@ -393,7 +385,7 @@ public class GT_Achievements {
 
     public Achievement registerAchievement(String textId, int x, int y, ItemStack icon, Achievement requirement,
         boolean special) {
-        if (!GT_Mod.gregtechproxy.mAchievements) {
+        if (!GTMod.gregtechproxy.mAchievements) {
             return null;
         }
         Achievement achievement = new Achievement(textId, textId, this.adjX + x, this.adjY + y, icon, requirement);
@@ -401,9 +393,9 @@ public class GT_Achievements {
             achievement.setSpecial();
         }
         ((StatBase) achievement).registerStat();
-        if (GT_Values.D2) {
-            GT_Log.out.println("achievement." + textId + "=");
-            GT_Log.out.println("achievement." + textId + ".desc=");
+        if (GTValues.D2) {
+            GTLog.out.println("achievement." + textId + "=");
+            GTLog.out.println("achievement." + textId + ".desc=");
         }
         this.achievementList.put(textId, achievement);
         return achievement;
@@ -411,7 +403,7 @@ public class GT_Achievements {
 
     public Achievement registerAchievement(String textId, int x, int y, ItemStack icon, String requirement,
         boolean special) {
-        if (!GT_Mod.gregtechproxy.mAchievements) {
+        if (!GTMod.gregtechproxy.mAchievements) {
             return null;
         }
         Achievement achievement = new Achievement(
@@ -425,9 +417,9 @@ public class GT_Achievements {
             achievement.setSpecial();
         }
         ((StatBase) achievement).registerStat();
-        if (GT_Values.D2) {
-            GT_Log.out.println("achievement." + textId + "=");
-            GT_Log.out.println("achievement." + textId + ".desc=");
+        if (GTValues.D2) {
+            GTLog.out.println("achievement." + textId + "=");
+            GTLog.out.println("achievement." + textId + ".desc=");
         }
         this.achievementList.put(textId, achievement);
         return achievement;
@@ -437,13 +429,13 @@ public class GT_Achievements {
         return null;
     }
 
-    public Achievement registerAssAchievement(GT_Recipe recipe) {
+    public Achievement registerAssAchievement(GTRecipe recipe) {
         if (recipe == null) {
-            GT_Mod.GT_FML_LOGGER.error("Invalid achievement registration attempt for null recipe", new Exception());
+            GTMod.GT_FML_LOGGER.error("Invalid achievement registration attempt for null recipe", new Exception());
             return null;
         }
         if (recipe.getOutput(0) == null) {
-            GT_Mod.GT_FML_LOGGER
+            GTMod.GT_FML_LOGGER
                 .error("Invalid achievement registration attempt for recipe with null output", new Exception());
             return null;
         }
@@ -465,7 +457,7 @@ public class GT_Achievements {
     }
 
     public void issueAchievement(EntityPlayer entityplayer, String textId) {
-        if (entityplayer == null || !GT_Mod.gregtechproxy.mAchievements) {
+        if (entityplayer == null || !GTMod.gregtechproxy.mAchievements) {
             return;
         }
         entityplayer.triggerAchievement(this.achievementList.get(textId));
@@ -482,7 +474,7 @@ public class GT_Achievements {
         if (player == null || stack == null) {
             return;
         }
-        ItemData data = GT_OreDictUnificator.getItemData(stack);
+        ItemData data = GTOreDictUnificator.getItemData(stack);
 
         if ((data != null) && (data.mPrefix == OrePrefixes.ingot)) {
             if (data.mMaterial.mMaterial == Materials.Aluminium) {
@@ -536,7 +528,7 @@ public class GT_Achievements {
         if (player == null || stack == null) {
             return;
         }
-        ItemData data = GT_OreDictUnificator.getItemData(stack);
+        ItemData data = GTOreDictUnificator.getItemData(stack);
         if (data != null) {
             if (data.mPrefix == OrePrefixes.dust && data.mMaterial.mMaterial == Materials.Bronze) {
                 issueAchievement(player, "bronze");
@@ -705,7 +697,7 @@ public class GT_Achievements {
         if (player == null || stack == null) {
             return;
         }
-        ItemData data = GT_OreDictUnificator.getItemData(stack);
+        ItemData data = GTOreDictUnificator.getItemData(stack);
         if (data != null && data.mPrefix != null) {
             if (data.mPrefix == OrePrefixes.dust) {
                 if (data.mMaterial.mMaterial == Materials.Lutetium) {
@@ -789,7 +781,7 @@ public class GT_Achievements {
             case "gt.blockcasings.15" -> issueAchievement(player, "conducting");
             case "gt.metaitem.01.32761" -> { // Debug Scanner pickup shows all assline recipes.
                 if (player.capabilities.isCreativeMode) {
-                    for (GT_Recipe recipe : RecipeMaps.assemblylineVisualRecipes.getAllRecipes()) {
+                    for (GTRecipe recipe : RecipeMaps.assemblylineVisualRecipes.getAllRecipes()) {
                         issueAchievement(
                             player,
                             recipe.getOutput(0)
@@ -807,7 +799,7 @@ public class GT_Achievements {
             issueAchievement(player, "buildQArmor");
         }
 
-        for (GT_Recipe recipe : RecipeMaps.assemblylineVisualRecipes.getAllRecipes()) {
+        for (GTRecipe recipe : RecipeMaps.assemblylineVisualRecipes.getAllRecipes()) {
             if (recipe.getOutput(0)
                 .getUnlocalizedName()
                 .equals(stack.getUnlocalizedName())) {
diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GTBeeDefinition.java
index 87292ced62..c8fcf5839e 100644
--- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
+++ b/src/main/java/gregtech/loaders/misc/GTBeeDefinition.java
@@ -51,11 +51,11 @@ import static gregtech.api.enums.Mods.TaintedMagic;
 import static gregtech.api.enums.Mods.Thaumcraft;
 import static gregtech.api.enums.Mods.ThaumicBases;
 import static gregtech.api.enums.Mods.TinkerConstruct;
-import static gregtech.loaders.misc.GT_BeeDefinitionReference.EXTRABEES;
-import static gregtech.loaders.misc.GT_BeeDefinitionReference.FORESTRY;
-import static gregtech.loaders.misc.GT_BeeDefinitionReference.GENDUSTRY;
-import static gregtech.loaders.misc.GT_BeeDefinitionReference.GREGTECH;
-import static gregtech.loaders.misc.GT_BeeDefinitionReference.MAGICBEES;
+import static gregtech.loaders.misc.GTBeeDefinitionReference.EXTRABEES;
+import static gregtech.loaders.misc.GTBeeDefinitionReference.FORESTRY;
+import static gregtech.loaders.misc.GTBeeDefinitionReference.GENDUSTRY;
+import static gregtech.loaders.misc.GTBeeDefinitionReference.GREGTECH;
+import static gregtech.loaders.misc.GTBeeDefinitionReference.MAGICBEES;
 
 import java.awt.Color;
 import java.util.Arrays;
@@ -69,8 +69,6 @@ import net.minecraft.item.ItemStack;
 
 import org.apache.commons.lang3.text.WordUtils;
 
-import com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool;
-
 import cpw.mods.fml.common.registry.GameRegistry;
 import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.EnumBeeType;
@@ -89,26 +87,27 @@ import forestry.apiculture.genetics.Bee;
 import forestry.apiculture.genetics.IBeeDefinition;
 import forestry.apiculture.genetics.alleles.AlleleEffect;
 import forestry.core.genetics.alleles.AlleleHelper;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.MaterialsKevlar;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_JubilanceMegaApiary;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.common.bees.GT_AlleleBeeSpecies;
-import gregtech.common.bees.GT_Bee_Mutation;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.JubilanceMegaApiary;
+import gregtech.common.bees.GTAlleleBeeSpecies;
+import gregtech.common.bees.GTBeeMutation;
 import gregtech.common.items.CombType;
 import gregtech.common.items.DropType;
 import gregtech.common.items.PropolisType;
-import gregtech.loaders.misc.bees.GT_Flowers;
+import gregtech.loaders.misc.bees.GTFlowers;
+import gtnhlanth.common.register.WerkstoffMaterialPool;
 
 /**
  * Bride Class for Lambdas
  */
-class GT_BeeDefinitionReference {
+class GTBeeDefinitionReference {
 
     protected static final byte FORESTRY = 0;
     protected static final byte EXTRABEES = 1;
@@ -116,16 +115,16 @@ class GT_BeeDefinitionReference {
     protected static final byte MAGICBEES = 3;
     protected static final byte GREGTECH = 4;
 
-    private GT_BeeDefinitionReference() {}
+    private GTBeeDefinitionReference() {}
 }
 
-public enum GT_BeeDefinition implements IBeeDefinition {
+public enum GTBeeDefinition implements IBeeDefinition {
 
     // organic
-    CLAY(GT_BranchDefinition.ORGANIC, "Clay", true, new Color(0xC8C8DA), new Color(0x0000FF), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 0), 0.30f);
+    CLAY(GTBranchDefinition.ORGANIC, "Clay", true, new Color(0xC8C8DA), new Color(0x0000FF), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 0), 0.30f);
         beeSpecies.addProduct(new ItemStack(Items.clay_ball, 1), 0.15f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(BiomesOPlenty.ID, "mudball", 1, 0), 0.05f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(BiomesOPlenty.ID, "mudball", 1, 0), 0.05f);
         beeSpecies.setHumidity(DAMP);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
     }, template -> {
@@ -137,15 +136,15 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             .registerMutation(getSpecies(FORESTRY, "Industrious"), getSpecies(FORESTRY, "Diligent"), 10);
         tMutation.requireResource(Blocks.clay, 0); // blockStainedHardenedClay
     }),
-    SLIMEBALL(GT_BranchDefinition.ORGANIC, "SlimeBall", true, new Color(0x4E9E55), new Color(0x00FF15), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 15), 0.30f);
+    SLIMEBALL(GTBranchDefinition.ORGANIC, "SlimeBall", true, new Color(0x4E9E55), new Color(0x00FF15), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 15), 0.30f);
         beeSpecies.addProduct(new ItemStack(Items.slime_ball, 1), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.STICKY), 0.05f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.STICKY), 0.05f);
         beeSpecies.setHumidity(DAMP);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
         if (TinkerConstruct.isModLoaded()) {
-            beeSpecies.addProduct(GT_ModHandler.getModItem(TinkerConstruct.ID, "strangeFood", 1, 0), 0.10f);
-            beeSpecies.addSpecialty(GT_ModHandler.getModItem(TinkerConstruct.ID, "slime.gel", 1, 2), 0.02f);
+            beeSpecies.addProduct(GTModHandler.getModItem(TinkerConstruct.ID, "strangeFood", 1, 0), 0.10f);
+            beeSpecies.addSpecialty(GTModHandler.getModItem(TinkerConstruct.ID, "slime.gel", 1, 2), 0.02f);
         }
     }, template -> {
         AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.MUSHROOMS);
@@ -158,11 +157,11 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         if (TinkerConstruct.isModLoaded())
             tMutation.requireResource(GameRegistry.findBlock(TinkerConstruct.ID, "slime.gel"), 1);
     }),
-    PEAT(GT_BranchDefinition.ORGANIC, "Peat", true, new Color(0x906237), new Color(0x58300B), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.LIGNIE), 0.30f);
-        beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 0), 0.15f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(Forestry.ID, "peat", 1, 0), 0.15f);
-        beeSpecies.addSpecialty(GT_ModHandler.getModItem(Forestry.ID, "mulch", 1, 0), 0.05f);
+    PEAT(GTBranchDefinition.ORGANIC, "Peat", true, new Color(0x906237), new Color(0x58300B), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.LIGNIE), 0.30f);
+        beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 0), 0.15f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(Forestry.ID, "peat", 1, 0), 0.15f);
+        beeSpecies.addSpecialty(GTModHandler.getModItem(Forestry.ID, "mulch", 1, 0), 0.05f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
     }, template -> {
@@ -172,10 +171,10 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         AlleleHelper.instance.set(template, FLOWERING, Flowering.FASTER);
         AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.NONE);
     }, dis -> dis.registerMutation(getSpecies(FORESTRY, "Rural"), CLAY, 10)),
-    STICKYRESIN(GT_BranchDefinition.ORGANIC, "StickyResin", true, new Color(0x2E8F5B), new Color(0xDCC289),
+    STICKYRESIN(GTBranchDefinition.ORGANIC, "StickyResin", true, new Color(0x2E8F5B), new Color(0xDCC289),
         beeSpecies -> {
-            beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 0), 0.30f);
-            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.STICKY), 0.15f);
+            beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 0), 0.30f);
+            beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.STICKY), 0.15f);
             beeSpecies.addSpecialty(ItemList.IC2_Resin.get(1), 0.15f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
@@ -186,9 +185,9 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             IBeeMutationCustom tMutation = dis.registerMutation(SLIMEBALL, PEAT, 15);
             tMutation.requireResource("logRubber");
         }),
-    COAL(GT_BranchDefinition.ORGANIC, "Coal", true, new Color(0x666666), new Color(0x525252), beeSpecies -> {
-        beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.LIGNIE), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.COAL), 0.15f);
+    COAL(GTBranchDefinition.ORGANIC, "Coal", true, new Color(0x666666), new Color(0x525252), beeSpecies -> {
+        beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.LIGNIE), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.COAL), 0.15f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
     }, template -> {
@@ -203,9 +202,9 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Industrious"), PEAT, 9);
         tMutation.requireResource("blockCoal");
     }),
-    OIL(GT_BranchDefinition.ORGANIC, "Oil", true, new Color(0x4C4C4C), new Color(0x333333), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 0), 0.30f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.OIL), 0.75f);
+    OIL(GTBranchDefinition.ORGANIC, "Oil", true, new Color(0x4C4C4C), new Color(0x333333), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 0), 0.30f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.OIL), 0.75f);
         beeSpecies.setHumidity(DAMP);
         beeSpecies.setTemperature(EnumTemperature.NORMAL);
         beeSpecies.setHasEffect();
@@ -218,8 +217,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.NONE);
         AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.NONE);
     }, dis -> dis.registerMutation(COAL, STICKYRESIN, 4)),
-    SANDWICH(GT_BranchDefinition.ORGANIC, "Sandwich", true, new Color(0x32CD32), new Color(0xDAA520), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 9), 0.15f);
+    SANDWICH(GTBranchDefinition.ORGANIC, "Sandwich", true, new Color(0x32CD32), new Color(0xDAA520), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 9), 0.15f);
         beeSpecies.addSpecialty(ItemList.Food_Sliced_Cucumber.get(1), 0.05f);
         beeSpecies.addSpecialty(ItemList.Food_Sliced_Onion.get(1), 0.05f);
         beeSpecies.addSpecialty(ItemList.Food_Sliced_Tomato.get(1), 0.05f);
@@ -237,9 +236,9 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.WHEAT);
         AlleleHelper.instance.set(template, FLOWERING, Flowering.FASTER);
     }, dis -> dis.registerMutation(getSpecies(FORESTRY, "Agrarian"), getSpecies(MAGICBEES, "TCBatty"), 10)),
-    ASH(GT_BranchDefinition.ORGANIC, "Ash", true, new Color(0x1e1a18), new Color(0xc6c6c6), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 9), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ASH), 0.15f);
+    ASH(GTBranchDefinition.ORGANIC, "Ash", true, new Color(0x1e1a18), new Color(0xc6c6c6), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 9), 0.15f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.ASH), 0.15f);
         beeSpecies.setHumidity(ARID);
         beeSpecies.setTemperature(HOT);
     }, template -> {
@@ -252,9 +251,9 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(COAL, CLAY, 10);
         tMutation.restrictTemperature(HELLISH);
     }),
-    APATITE(GT_BranchDefinition.ORGANIC, "Apatite", true, new Color(0xc1c1f6), new Color(0x676784), beeSpecies -> {
-        beeSpecies.addProduct(GT_ModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 9), 0.15f);
-        beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.APATITE), 0.15f);
+    APATITE(GTBranchDefinition.ORGANIC, "Apatite", true, new Color(0xc1c1f6), new Color(0x676784), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 9), 0.15f);
+        beeSpecies.addSpecialty(GTBees.combs.getStackForType(CombType.APATITE), 0.15f);
         beeSpecies.setHumidity(EnumHumidity.NORMAL);
         beeSpecies.setTemperature(WARM);
     }, template -> {
@@ -267,25 +266,24 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         IBeeMutationCustom tMutation = dis.registerMutation(ASH, COAL, 10);
         tMutation.requireResource("blockApatite");
     }),
-    FERTILIZER(GT_BranchDefinition.ORGANIC, "Fertilizer", true, new Color(0x7fcef5), new Color(0x654525),
-        beeSpecies -> {
-            beeSpecies.addProduct(GT_ModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 9), 0.15f);
-            beeSpecies.addSpecialty(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1), 0.2f);
-            beeSpecies.addSpecialty(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1), 0.2f);
-            beeSpecies.addSpecialty(ItemList.FR_Fertilizer.get(1), 0.3f);
-            beeSpecies.addSpecialty(ItemList.IC2_Fertilizer.get(1), 0.3f);
-            beeSpecies.setHumidity(DAMP);
-            beeSpecies.setTemperature(WARM);
-        }, template -> {
-            AlleleHelper.instance.set(template, SPEED, Speed.FASTEST);
-            AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGER);
-            AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.WHEAT);
-            AlleleHelper.instance.set(template, FLOWERING, Flowering.FASTER);
-        }, dis -> dis.registerMutation(ASH, APATITE, 8)),
+    FERTILIZER(GTBranchDefinition.ORGANIC, "Fertilizer", true, new Color(0x7fcef5), new Color(0x654525), beeSpecies -> {
+        beeSpecies.addProduct(GTModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 9), 0.15f);
+        beeSp