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

24 files changed, 281 insertions, 282 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java b/src/main/java/gtPlusPlus/xmod/forestry/ForestryHandler.java
index dc2d277283..963c793cee 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/ForestryHandler.java
@@ -2,21 +2,21 @@ package gtPlusPlus.xmod.forestry;
 
 import static gregtech.api.enums.Mods.Forestry;
 
-import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry;
-import gtPlusPlus.xmod.forestry.bees.recipe.FR_Gregtech_Recipes;
+import gtPlusPlus.xmod.forestry.bees.items.FRItemRegistry;
+import gtPlusPlus.xmod.forestry.bees.recipe.FRGregTechRecipes;
 import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
 
-public class HANDLER_FR {
+public class ForestryHandler {
 
     public static void preInit() {
         if (Forestry.isModLoaded()) {
-            FR_ItemRegistry.Register();
+            FRItemRegistry.Register();
         }
     }
 
     public static void postInit() {
         if (Forestry.isModLoaded()) {
-            FR_Gregtech_Recipes.registerItems();
+            FRGregTechRecipes.registerItems();
             new GTPP_Bees();
         }
     }
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/ForestryTreeHandler.java b/src/main/java/gtPlusPlus/xmod/forestry/ForestryTreeHandler.java
index 1f64eacb5c..49b048977e 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/ForestryTreeHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/ForestryTreeHandler.java
@@ -11,7 +11,7 @@ import forestry.api.arboriculture.TreeManager;
 import forestry.arboriculture.genetics.TreeDefinition;
 import forestry.plugins.PluginArboriculture;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntityTreeFarm;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTETreeFarm;
 
 public class ForestryTreeHandler {
 
@@ -45,7 +45,7 @@ public class ForestryTreeHandler {
                 }
             }
 
-            GregtechMetaTileEntityTreeFarm.registerForestryTree(
+            MTETreeFarm.registerForestryTree(
                 speciesUID,
                 sapling == null ? null : sapling.copy(),
                 log == null ? null : log.copy(),
@@ -83,7 +83,7 @@ public class ForestryTreeHandler {
                 }
             }
 
-            GregtechMetaTileEntityTreeFarm.registerForestryTree(
+            MTETreeFarm.registerForestryTree(
                 speciesUID,
                 sapling == null ? null : sapling.copy(),
                 log == null ? null : log.copy(),
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java
index d908850658..05ab3c8711 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java
@@ -1,7 +1,7 @@
 package gtPlusPlus.xmod.forestry.bees.custom;
 
 import gregtech.api.enums.Materials;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 import gtPlusPlus.core.util.Utils;
 
 public enum CustomCombs {
@@ -11,8 +11,8 @@ public enum CustomCombs {
     SILICON("silicon", true, Materials.Silicon, 100),
     RUBBER("rubber", true, Materials.Rubber, 100),
     PLASTIC("polyethylene", true, Materials.Plastic, 75),
-    PTFE("polytetrafluoroethylene", true, GTPP_Bees.PTFE, 50),
-    PBS("styrene-butadiene", true, GTPP_Bees.PBS, 25),
+    PTFE("polytetrafluoroethylene", true, GTPPBees.PTFE, 50),
+    PBS("styrene-butadiene", true, GTPPBees.PBS, 25),
 
     // Fuels
     BIOMASS("biomass", true, Materials.Biomass, 100),
@@ -82,7 +82,7 @@ public enum CustomCombs {
 
     public String getName() {
         // return "gt.comb."+this.name;
-        return GT_LanguageManager.addStringLocalization(
+        return GTLanguageManager.addStringLocalization(
             "comb." + this.name,
             this.name.substring(0, 1)
                 .toUpperCase() + this.name.substring(1) + " Comb");
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBeeDefinition.java
index 0cdb49a9b5..7f7553bf1d 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBeeDefinition.java
@@ -27,21 +27,21 @@ 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 gregtech.loaders.misc.GTBeeDefinition;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 
-public enum GTPP_Bee_Definition implements IBeeDefinition {
+public enum GTPPBeeDefinition implements IBeeDefinition {
 
-    SILICON(GTPP_Branch_Definition.ORGANIC, "Silicon", true, Utils.rgbtoHexValue(75, 75, 75),
+    SILICON(GTPPBranchDefinition.ORGANIC, "Silicon", true, Utils.rgbtoHexValue(75, 75, 75),
         Utils.rgbtoHexValue(125, 125, 125)) {
 
         @Override
         protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
             beeSpecies.addProduct(getSlagComb(), 0.10f);
-            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SILICON), 0.20f);
+            beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.SILICON), 0.20f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
         }
@@ -60,13 +60,13 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
         }
     },
 
-    RUBBER(GTPP_Branch_Definition.ORGANIC, "Rubber", true, Utils.rgbtoHexValue(55, 55, 55),
+    RUBBER(GTPPBranchDefinition.ORGANIC, "Rubber", true, Utils.rgbtoHexValue(55, 55, 55),
         Utils.rgbtoHexValue(75, 75, 75)) {
 
         @Override
         protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
             beeSpecies.addProduct(getSlagComb(), 0.10f);
-            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.RUBBER), 0.30f);
+            beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.RUBBER), 0.30f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
         }
@@ -85,13 +85,13 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
         }
     },
 
-    PLASTIC(GTPP_Branch_Definition.ORGANIC, "Plastic", true, Utils.rgbtoHexValue(245, 245, 245),
+    PLASTIC(GTPPBranchDefinition.ORGANIC, "Plastic", true, Utils.rgbtoHexValue(245, 245, 245),
         Utils.rgbtoHexValue(175, 175, 175)) {
 
         @Override
         protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
             beeSpecies.addProduct(getStoneComb(), 0.30f);
-            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.PLASTIC), 0.15f);
+            beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.PLASTIC), 0.15f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
         }
@@ -107,13 +107,13 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
         }
     },
 
-    PTFE(GTPP_Branch_Definition.ORGANIC, "Ptfe", true, Utils.rgbtoHexValue(150, 150, 150),
+    PTFE(GTPPBranchDefinition.ORGANIC, "Ptfe", true, Utils.rgbtoHexValue(150, 150, 150),
         Utils.rgbtoHexValue(75, 75, 75)) {
 
         @Override
         protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
             beeSpecies.addProduct(getStoneComb(), 0.30f);
-            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.PTFE), 0.10f);
+            beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.PTFE), 0.10f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
         }
@@ -129,12 +129,12 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
         }
     },
 
-    PBS(GTPP_Branch_Definition.ORGANIC, "Pbs", true, Utils.rgbtoHexValue(33, 26, 24), Utils.rgbtoHexValue(23, 16, 14)) {
+    PBS(GTPPBranchDefinition.ORGANIC, "Pbs", true, Utils.rgbtoHexValue(33, 26, 24), Utils.rgbtoHexValue(23, 16, 14)) {
 
         @Override
         protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
             beeSpecies.addProduct(getStoneComb(), 0.30f);
-            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.PBS), 0.10f);
+            beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.PBS), 0.10f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
         }
@@ -153,13 +153,13 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
     /**
      * Fuels
      */
-    BIOMASS(GTPP_Branch_Definition.ORGANIC, "Biomass", true, Utils.rgbtoHexValue(33, 225, 24),
+    BIOMASS(GTPPBranchDefinition.ORGANIC, "Biomass", true, Utils.rgbtoHexValue(33, 225, 24),
         Utils.rgbtoHexValue(23, 175, 14)) {
 
         @Override
         protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
-            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SAND), 0.40f);
-            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.BIOMASS), 0.20f);
+            beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.SAND), 0.40f);
+            beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.BIOMASS), 0.20f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
         }
@@ -176,13 +176,13 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
         }
     },
 
-    ETHANOL(GTPP_Branch_Definition.ORGANIC, "Ethanol", true, Utils.rgbtoHexValue(255, 128, 0),
+    ETHANOL(GTPPBranchDefinition.ORGANIC, "Ethanol", true, Utils.rgbtoHexValue(255, 128, 0),
         Utils.rgbtoHexValue(220, 156, 32)) {
 
         @Override
         protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
-            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SAND), 0.40f);
-            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.ETHANOL), 0.20f);
+            beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.SAND), 0.40f);
+            beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.ETHANOL), 0.20f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
         }
@@ -202,13 +202,13 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
     /**
      * Materials
      */
-    FLUORINE(GTPP_Branch_Definition.ORGANIC, "Fluorine", true, Utils.rgbtoHexValue(30, 230, 230),
+    FLUORINE(GTPPBranchDefinition.ORGANIC, "Fluorine", true, Utils.rgbtoHexValue(30, 230, 230),
         Utils.rgbtoHexValue(10, 150, 150)) {
 
         @Override
         protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
             beeSpecies.addProduct(getStoneComb(), 0.40f);
-            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.FLUORINE), 0.05f);
+            beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.FLUORINE), 0.05f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(EnumTemperature.COLD);
         }
@@ -231,15 +231,15 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
     // Coke
 
     // Force
-    FORCE(GTPP_Branch_Definition.METAL, "Force", true, Utils.rgbtoHexValue(250, 250, 20),
+    FORCE(GTPPBranchDefinition.METAL, "Force", true, Utils.rgbtoHexValue(250, 250, 20),
         Utils.rgbtoHexValue(200, 200, 5)) {
 
         @Override
         protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
             beeSpecies.addProduct(getStoneComb(), 0.30f);
-            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SAND), 0.25f);
-            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.FORCE), 0.25f);
-            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SALT), 0.05f);
+            beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.SAND), 0.25f);
+            beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.FORCE), 0.25f);
+            beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.SALT), 0.05f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(EnumTemperature.HOT);
         }
@@ -260,13 +260,13 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
     },
 
     // Nikolite
-    NIKOLITE(GTPP_Branch_Definition.METAL, "Nikolite", true, Utils.rgbtoHexValue(60, 180, 200),
+    NIKOLITE(GTPPBranchDefinition.METAL, "Nikolite", true, Utils.rgbtoHexValue(60, 180, 200),
         Utils.rgbtoHexValue(40, 150, 170)) {
 
         @Override
         protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
             beeSpecies.addProduct(getStoneComb(), 0.30f);
-            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.NIKOLITE), 0.05f);
+            beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.NIKOLITE), 0.05f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(EnumTemperature.HOT);
         }
@@ -289,7 +289,7 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
     /*
      * CLAY(GTPP_Branch_Definition.ORGANIC, "Clay", true, 0x19d0ec, 0xffdc16) {
      * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
-     * beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f);
+     * beeSpecies.addProduct(GTModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f);
      * beeSpecies.addProduct(new ItemStack(Items.clay_ball, 1), 0.15f); beeSpecies.setHumidity(EnumHumidity.DAMP);
      * beeSpecies.setTemperature(EnumTemperature.NORMAL); }
      * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.MEADOWS.getTemplate(); }
@@ -297,7 +297,7 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
      * registerMutation(getSpecies("Industrious"), getSpecies("Diligent"), 20); } },
      * SLIMEBALL(GTPP_Branch_Definition.ORGANIC, "SlimeBall", true, 0x4E9E55, 0x00FF15) {
      * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
-     * beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 15), 0.30f);
+     * beeSpecies.addProduct(GTModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 15), 0.30f);
      * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STICKY), 0.30f);
      * beeSpecies.setHumidity(EnumHumidity.DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); }
      * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.MARSHY.getTemplate(); }
@@ -306,14 +306,14 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
      * 0x906237, 0x58300B) {
      * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
      * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.LIGNIE), 0.30f);
-     * beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.15f);
+     * beeSpecies.addProduct(GTModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.15f);
      * beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }
      * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.RURAL.getTemplate(); }
      * @Override protected void registerMutations() { IBeeMutationCustom tMutation =
      * registerMutation(getSpecies("Rural"), CLAY.species, 20); } }, STICKYRESIN(GTPP_Branch_Definition.ORGANIC,
      * "StickyResin", true, 0x2E8F5B, 0xDCC289) {
      * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
-     * beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f);
+     * beeSpecies.addProduct(GTModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f);
      * beeSpecies.addProduct(ItemList.IC2_Resin.get(1, new Object[0]), 0.15f);
      * beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }
      * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.MEADOWS.getTemplate(); }
@@ -328,7 +328,7 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
      * registerMutation(getSpecies("Industrious"), PEAT.species, 18); } }, OIL(GTPP_Branch_Definition.ORGANIC, "Oil",
      * true, 0x4C4C4C, 0x333333) {
      * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
-     * beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f);
+     * beeSpecies.addProduct(GTModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f);
      * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.OIL), 0.15f);
      * beeSpecies.setHumidity(EnumHumidity.DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL);
      * beeSpecies.setNocturnal(); }
@@ -476,13 +476,13 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
 
     ;
 
-    private final GTPP_Branch_Definition branch;
+    private final GTPPBranchDefinition branch;
     private final IAlleleBeeSpeciesCustom species;
 
     private IAllele[] template;
     private IBeeGenome genome;
 
-    GTPP_Bee_Definition(GTPP_Branch_Definition branch, String binomial, boolean dominant, int primary, int secondary) {
+    GTPPBeeDefinition(GTPPBranchDefinition branch, String binomial, boolean dominant, int primary, int secondary) {
         String lowercaseName = this.toString()
             .toLowerCase(Locale.ENGLISH);
         String species = "species" + WordUtils.capitalize(lowercaseName);
@@ -505,10 +505,10 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
     }
 
     public static void initBees() {
-        for (GTPP_Bee_Definition bee : values()) {
+        for (GTPPBeeDefinition bee : values()) {
             bee.init();
         }
-        for (GTPP_Bee_Definition bee : values()) {
+        for (GTPPBeeDefinition bee : values()) {
             bee.registerMutations();
         }
     }
@@ -574,11 +574,11 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
     }
 
     private static ItemStack getSlagComb() {
-        return issStackValid(ItemUtils.getSimpleStack(GTPP_Bees.Comb_Slag, 1));
+        return issStackValid(ItemUtils.getSimpleStack(GTPPBees.Comb_Slag, 1));
     }
 
     private static ItemStack getStoneComb() {
-        return issStackValid(ItemUtils.getSimpleStack(GTPP_Bees.Comb_Stone, 1));
+        return issStackValid(ItemUtils.getSimpleStack(GTPPBees.Comb_Stone, 1));
     }
 
     private static ItemStack issStackValid(ItemStack result) {
@@ -590,8 +590,8 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
 
     public static IAlleleBeeSpecies getGregtechBeeType(String name) {
         try {
-            Enum<GT_BeeDefinition> gtBeeEnumObject = Enum.valueOf(GT_BeeDefinition.class, name);
-            Field gtBeesField = FieldUtils.getDeclaredField(GT_BeeDefinition.class, "species", true);
+            Enum<GTBeeDefinition> gtBeeEnumObject = Enum.valueOf(GTBeeDefinition.class, name);
+            Field gtBeesField = FieldUtils.getDeclaredField(GTBeeDefinition.class, "species", true);
             gtBeesField.setAccessible(true);
             ReflectionUtils.makeFieldAccessible(gtBeesField);
             Object beeType = gtBeesField.get(gtBeeEnumObject);
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBees.java
index 4d04e3ad31..f0cd284bdf 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBees.java
@@ -2,8 +2,8 @@ package gtPlusPlus.xmod.forestry.bees.custom;
 
 import static gregtech.api.enums.Mods.Forestry;
 import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -15,11 +15,11 @@ import net.minecraftforge.fluids.FluidStack;
 
 import org.apache.commons.lang3.reflect.FieldUtils;
 
-import gregtech.GT_Mod;
-import gregtech.api.enums.GT_Values;
+import gregtech.GTMod;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.item.base.ingots.BaseItemIngot_OLD;
+import gtPlusPlus.core.item.base.ingots.BaseItemIngotOld;
 import gtPlusPlus.core.item.base.misc.BaseItemMisc;
 import gtPlusPlus.core.item.base.misc.BaseItemMisc.MiscTypes;
 import gtPlusPlus.core.util.Utils;
@@ -27,7 +27,7 @@ import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 
-public class GTPP_Bees {
+public class GTPPBees {
 
     // Custom Comb Drop Base Items
     public static Item dropForceGem;
@@ -49,7 +49,7 @@ public class GTPP_Bees {
 
     // public static GTPP_Branch_Definition definition;
 
-    public GTPP_Bees() {
+    public GTPPBees() {
         if (Forestry.isModLoaded()) {
 
             // Set Materials and Comb stacks from GT via Reflection
@@ -59,7 +59,7 @@ public class GTPP_Bees {
             try {
                 combs = new ItemCustomComb();
                 combs.initCombsRecipes();
-                GTPP_Bee_Definition.initBees();
+                GTPPBeeDefinition.initBees();
             } catch (Throwable t) {
                 Logger.BEES("Failed to load bees, probably due to an ancient forestry version");
                 t.printStackTrace();
@@ -77,7 +77,7 @@ public class GTPP_Bees {
             .generateSpecialUseDusts("Nikolite", "Nikolite", Utils.rgbtoHexValue(60, 180, 200))[2];
 
         if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotNikolite", 1) == null) {
-            new BaseItemIngot_OLD("itemIngotNikolite", "Nikolite", Utils.rgbtoHexValue(60, 180, 200), 0);
+            new BaseItemIngotOld("itemIngotNikolite", "Nikolite", Utils.rgbtoHexValue(60, 180, 200), 0);
         }
 
         dropFluorineBlob = new BaseItemMisc("Fluorine", new short[] { 30, 230, 230 }, 64, MiscTypes.DROP, null);
@@ -91,7 +91,7 @@ public class GTPP_Bees {
     }
 
     private void addExtractorRecipe(ItemStack input, FluidStack output) {
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(input)
             .fluidOutputs(output)
             .duration(1 * SECONDS + 10 * TICKS)
@@ -101,9 +101,9 @@ public class GTPP_Bees {
 
     private static boolean tryGetBeesBoolean() {
         try {
-            Class<?> mProxy = Class.forName("gregtech.GT_Mod.gregtechproxy");
+            Class<?> mProxy = Class.forName("gregtech.GTMod.gregtechproxy");
             Field mNerf = FieldUtils.getDeclaredField(mProxy, "mGTBees", true);
-            boolean returnValue = (boolean) mNerf.get(GT_Mod.gregtechproxy);
+            boolean returnValue = (boolean) mNerf.get(GTMod.gregtechproxy);
             return returnValue;
         } catch (ClassNotFoundException | IllegalArgumentException | IllegalAccessException e) {
             return false;
@@ -113,7 +113,7 @@ public class GTPP_Bees {
     private void setMaterials() {
         try {
 
-            Class<?> gtBees = Class.forName("gregtech.loaders.misc.GT_Bees");
+            Class<?> gtBees = Class.forName("gregtech.loaders.misc.GTBees");
             Class<?> gtCombItemClass = Class.forName("gregtech.common.items.ItemComb");
             Class gtCombEnumClass = Class.forName("gregtech.common.items.CombType");
             Field gtCombs = FieldUtils.getDeclaredField(gtBees, "combs", true);
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Branch_Definition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBranchDefinition.java
index 94e6078c49..ca35849172 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Branch_Definition.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBranchDefinition.java
@@ -7,7 +7,7 @@ import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IClassification;
 import gtPlusPlus.api.objects.Logger;
 
-public enum GTPP_Branch_Definition {
+public enum GTPPBranchDefinition {
 
     ORGANIC("ORGANIC"),
     GEM("GEM"),
@@ -18,7 +18,7 @@ public enum GTPP_Branch_Definition {
     final String mFieldName;
     final Enum mActualValues;
 
-    GTPP_Branch_Definition(String mValue) {
+    GTPPBranchDefinition(String mValue) {
         this.mFieldName = mValue;
         this.mActualValues = setEnumVar(mValue);
     }
@@ -26,7 +26,7 @@ public enum GTPP_Branch_Definition {
     public final IAllele[] getTemplate() {
         Class gtBranchDefClass;
         try {
-            gtBranchDefClass = Class.forName("gregtech.loaders.misc.GT_BranchDefinition");
+            gtBranchDefClass = Class.forName("gregtech.loaders.misc.GTBranchDefinition");
             Enum enumA = mActualValues;
             Method methodMyMethod = gtBranchDefClass.getMethod("getTemplate");
 
@@ -47,7 +47,7 @@ public enum GTPP_Branch_Definition {
     public final IClassification getBranch() {
         Class gtBranchDefClass;
         try {
-            gtBranchDefClass = Class.forName("gregtech.loaders.misc.GT_BranchDefinition");
+            gtBranchDefClass = Class.forName("gregtech.loaders.misc.GTBranchDefinition");
             Enum enum_MY_SAMPLE_ENUM = mActualValues;
             Method methodMyMethod = gtBranchDefClass.getMethod("getBranch");
 
@@ -66,7 +66,7 @@ public enum GTPP_Branch_Definition {
 
     private Enum setEnumVar(String value) {
         try {
-            Class gtBranchDefClass = Class.forName("gregtech.loaders.misc.GT_BranchDefinition");
+            Class gtBranchDefClass = Class.forName("gregtech.loaders.misc.GTBranchDefinition");
             Enum branchDef = Enum.valueOf(gtBranchDefClass, value);
             return branchDef;
         } catch (ClassNotFoundException 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 63c0ae53ec..0ff3625a25 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java
@@ -2,8 +2,8 @@ package gtPlusPlus.xmod.forestry.bees.custom;
 
 import static gregtech.api.enums.Mods.GTPlusPlus;
 import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 
 import java.util.List;
 
@@ -17,11 +17,11 @@ 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 gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 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.GTOreDictUnificator;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class ItemCustomComb extends Item {
@@ -101,37 +101,37 @@ public class ItemCustomComb extends Item {
         ItemStack tComb;
 
         tComb = getStackForType(CustomCombs.SILICON);
-        addSpecialCent(tComb, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Mat