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

8 files changed, 95 insertions, 95 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FRItemRegistry.java
index b61a91710e..ab2353cc37 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FRItemRegistry.java
@@ -19,28 +19,28 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import forestry.core.utils.StringUtil;
 import gregtech.api.enums.Mods;
 
-public class FR_ItemRegistry {
+public class FRItemRegistry {
 
     // ----- Apiary Frames ----------------------
 
     // Magic Bee Frame Items
-    public static MB_ItemFrame hiveFrameAccelerated;
-    public static MB_ItemFrame hiveFrameVoid;
-    public static MB_ItemFrame hiveFrameMutagenic;
-    public static MB_ItemFrame hiveFrameBusy;
+    public static MBItemFrame hiveFrameAccelerated;
+    public static MBItemFrame hiveFrameVoid;
+    public static MBItemFrame hiveFrameMutagenic;
+    public static MBItemFrame hiveFrameBusy;
 
     // Extra Bee Frame Items
-    public static MB_ItemFrame hiveFrameCocoa;
-    public static MB_ItemFrame hiveFrameCaged;
-    public static MB_ItemFrame hiveFrameSoul;
-    public static MB_ItemFrame hiveFrameClay;
-    public static MB_ItemFrame hiveFrameNova;
+    public static MBItemFrame hiveFrameCocoa;
+    public static MBItemFrame hiveFrameCaged;
+    public static MBItemFrame hiveFrameSoul;
+    public static MBItemFrame hiveFrameClay;
+    public static MBItemFrame hiveFrameNova;
 
     // Frame Items added by bartimaeusnek
-    public static MB_ItemFrame hiveFrameDecay;
-    public static MB_ItemFrame hiveFrameSlow;
-    public static MB_ItemFrame hiveFrameStalilize;
-    public static MB_ItemFrame hiveFrameArborist;
+    public static MBItemFrame hiveFrameDecay;
+    public static MBItemFrame hiveFrameSlow;
+    public static MBItemFrame hiveFrameStalilize;
+    public static MBItemFrame hiveFrameArborist;
 
     @Optional.Method(modid = Mods.Names.FORESTRY)
     public static void Register() {
@@ -52,19 +52,19 @@ public class FR_ItemRegistry {
 
         // Magic Bee like Frames
 
-        hiveFrameVoid = new MB_ItemFrame(
-            MB_FrameType.USELESS,
+        hiveFrameVoid = new MBItemFrame(
+            MBFrameType.USELESS,
             EnumRarity.common,
             "No more cheaty frames for GTNH players.");
 
-        hiveFrameAccelerated = new MB_ItemFrame(
-            MB_FrameType.ACCELERATED,
+        hiveFrameAccelerated = new MBItemFrame(
+            MBFrameType.ACCELERATED,
             "Longevity for bees isn't very common, especially if they're working harder.");
-        hiveFrameMutagenic = new MB_ItemFrame(
-            MB_FrameType.MUTAGENIC,
+        hiveFrameMutagenic = new MBItemFrame(
+            MBFrameType.MUTAGENIC,
             EnumRarity.epic,
             "Evolution of the fittest, finest and fastest.");
-        hiveFrameBusy = new MB_ItemFrame(MB_FrameType.BUSY, "Your bee will work harder and longer than you expected.");
+        hiveFrameBusy = new MBItemFrame(MBFrameType.BUSY, "Your bee will work harder and longer than you expected.");
         ChestGenHooks.addItem(
             ChestGenHooks.STRONGHOLD_CORRIDOR,
             new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 1, 14));
@@ -91,17 +91,17 @@ public class FR_ItemRegistry {
             new WeightedRandomChestContent(new ItemStack(hiveFrameMutagenic), 1, 3, 12));
 
         // Frame Items added by bartimaeusnek
-        hiveFrameDecay = new MB_ItemFrame(
-            MB_FrameType.DECAYING,
+        hiveFrameDecay = new MBItemFrame(
+            MBFrameType.DECAYING,
             EnumRarity.uncommon,
             "Who really needs stable genetics?");
-        hiveFrameSlow = new MB_ItemFrame(MB_FrameType.SLOWING, EnumRarity.common, "The journey is its own reward.");
-        hiveFrameStalilize = new MB_ItemFrame(
-            MB_FrameType.STABILIZING,
+        hiveFrameSlow = new MBItemFrame(MBFrameType.SLOWING, EnumRarity.common, "The journey is its own reward.");
+        hiveFrameStalilize = new MBItemFrame(
+            MBFrameType.STABILIZING,
             EnumRarity.rare,
             "If you wish your bees to keep their form.");
-        hiveFrameArborist = new MB_ItemFrame(
-            MB_FrameType.ARBORISTS,
+        hiveFrameArborist = new MBItemFrame(
+            MBFrameType.ARBORISTS,
             EnumRarity.common,
             "Who need Bees when you can have Trees?");
         ChestGenHooks.addItem(
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FRStringUtil.java
index c63401aecf..80b44268c5 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FRStringUtil.java
@@ -2,7 +2,7 @@ package gtPlusPlus.xmod.forestry.bees.items;
 
 import net.minecraft.util.StatCollector;
 
-public class FR_StringUtil {
+public class FRStringUtil {
 
     public static String getLocalizedString(final String key) {
         if (StatCollector.canTranslate(key)) {
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MBFrameType.java
index 418c05587f..aaee356868 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MBFrameType.java
@@ -3,7 +3,7 @@ package gtPlusPlus.xmod.forestry.bees.items;
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeModifier;
 
-public enum MB_FrameType implements IBeeModifier {
+public enum MBFrameType implements IBeeModifier {
 
     // ExtraBees Clone Frames
     // Name, FrameHP, territory (1f), Mutation rate, lifespan rate, production rate, genetic decay (1f)
@@ -43,12 +43,12 @@ public enum MB_FrameType implements IBeeModifier {
     private final boolean isSunlit;
     private final boolean isHellish;
 
-    MB_FrameType(final String name, final int damage, final float territory, final float mutation, final float lifespan,
+    MBFrameType(final String name, final int damage, final float territory, final float mutation, final float lifespan,
         final float production, final float geneticDecay) {
         this(name, damage, territory, mutation, lifespan, production, 1f, geneticDecay, false, false, false, false);
     }
 
-    MB_FrameType(final String name, final int damage, final float territory, final float mutation, final float lifespan,
+    MBFrameType(final String name, final int damage, final float territory, final float mutation, final float lifespan,
         final float production, final float flowering, final float geneticDecay, final boolean sealed,
         final boolean lit, final boolean sunlit, final boolean hellish) {
         this.frameName = name;
@@ -71,7 +71,7 @@ public enum MB_FrameType implements IBeeModifier {
     }
 
     public String getLocalizedName() {
-        return FR_StringUtil.getLocalizedString("frame." + this.frameName);
+        return FRStringUtil.getLocalizedString("frame." + this.frameName);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MBItemFrame.java
index e5d36d15e8..b196598f43 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MBItemFrame.java
@@ -21,17 +21,17 @@ import forestry.api.apiculture.IBeeModifier;
 import forestry.api.apiculture.IHiveFrame;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 
-public class MB_ItemFrame extends Item implements IHiveFrame {
+public class MBItemFrame extends Item implements IHiveFrame {
 
-    private final MB_FrameType type;
+    private final MBFrameType type;
     private EnumRarity rarity_value = EnumRarity.uncommon;
     private final String toolTip;
 
-    public MB_ItemFrame(final MB_FrameType frameType, final String description) {
+    public MBItemFrame(final MBFrameType frameType, final String description) {
         this(frameType, EnumRarity.uncommon, description);
     }
 
-    public MB_ItemFrame(final MB_FrameType frameType, final EnumRarity rarity, final String description) {
+    public MBItemFrame(final MBFrameType frameType, final EnumRarity rarity, final String description) {
         super();
         this.type = frameType;
         this.setMaxDamage(this.type.maxDamage);
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/GTPPComb.java
index 16f364f595..c77c7fcb8a 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPPComb.java
@@ -2,7 +2,7 @@ package gtPlusPlus.xmod.forestry.bees.items.output;
 
 import static gregtech.api.enums.Mods.Forestry;
 import static gregtech.api.enums.Mods.GTPlusPlus;
-import static gregtech.api.util.GT_RecipeConstants.CHEMPLANT_CASING_TIER;
+import static gregtech.api.util.GTRecipeConstants.CHEMPLANT_CASING_TIER;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalPlantRecipes;
 
 import java.util.List;
@@ -17,20 +17,20 @@ 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.util.GT_ModHandler;
+import gregtech.api.enums.GTValues;
+import gregtech.api.util.GTModHandler;
 import gtPlusPlus.core.material.Material;
-import gtPlusPlus.xmod.forestry.bees.handler.GTPP_CombType;
-import gtPlusPlus.xmod.forestry.bees.handler.GTPP_DropType;
-import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PropolisType;
+import gtPlusPlus.xmod.forestry.bees.handler.GTPPCombType;
+import gtPlusPlus.xmod.forestry.bees.handler.GTPPDropType;
+import gtPlusPlus.xmod.forestry.bees.handler.GTPPPropolisType;
 import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
 
-public class GTPP_Comb extends Item {
+public class GTPPComb extends Item {
 
     @SideOnly(Side.CLIENT)
     private IIcon secondIcon;
 
-    public GTPP_Comb() {
+    public GTPPComb() {
         super();
         this.setCreativeTab(Tabs.tabApiculture);
         this.setHasSubtypes(true);
@@ -38,18 +38,18 @@ public class GTPP_Comb extends Item {
         GameRegistry.registerItem(this, "gtpp.comb", GTPlusPlus.ID);
     }
 
-    public ItemStack getStackForType(GTPP_CombType type) {
+    public ItemStack getStackForType(GTPPCombType type) {
         return new ItemStack(this, 1, type.mID);
     }
 
-    public ItemStack getStackForType(GTPP_CombType type, int count) {
+    public ItemStack getStackForType(GTPPCombType type, int count) {
         return new ItemStack(this, count, type.mID);
     }
 
     @Override
     @SideOnly(Side.CLIENT)
     public void getSubItems(Item item, CreativeTabs tabs, List list) {
-        for (GTPP_CombType type : GTPP_CombType.values()) {
+        for (GTPPCombType type : GTPPCombType.values()) {
             if (type.mShowInList) {
                 list.add(this.getStackForType(type));
             }
@@ -82,11 +82,11 @@ public class GTPP_Comb extends Item {
     @Override
     @SideOnly(Side.CLIENT)
     public int getColorFromItemStack(ItemStack stack, int pass) {
-        int colour = GTPP_CombType.get(stack.getItemDamage())
+        int colour = GTPPCombType.get(stack.getItemDamage())
             .getColours()[0];
 
         if (pass >= 1) {
-            colour = GTPP_CombType.get(stack.getItemDamage())
+            colour = GTPPCombType.get(stack.getItemDamage())
                 .getColours()[1];
         }
 
@@ -95,31 +95,31 @@ public class GTPP_Comb extends Item {
 
     @Override
     public String getItemStackDisplayName(ItemStack stack) {
-        return GTPP_CombType.get(stack.getItemDamage())
+        return GTPPCombType.get(stack.getItemDamage())
             .getName();
     }
 
     public static void initCombsRecipes() {
 
         addChemicalRecipe(
-            GTPP_CombType.DRAGONBLOOD,
-            new ItemStack[] { GT_ModHandler.getModItem(Forestry.ID, "refractoryWax", 1L, 0),
-                GTPP_Bees.propolis.getStackForType(GTPP_PropolisType.DRAGONBLOOD),
-                GTPP_Bees.drop.getStackForType(GTPP_DropType.DRAGONBLOOD) },
+            GTPPCombType.DRAGONBLOOD,
+            new ItemStack[] { GTModHandler.getModItem(Forestry.ID, "refractoryWax", 1L, 0),
+                GTPP_Bees.propolis.getStackForType(GTPPPropolisType.DRAGONBLOOD),
+                GTPP_Bees.drop.getStackForType(GTPPDropType.DRAGONBLOOD) },
             new int[] { 3000, 1500, 500 });
         addChemicalRecipe(
-            GTPP_CombType.FORCE,
-            new ItemStack[] { GT_ModHandler.getModItem(Forestry.ID, "beeswax", 1L, 0),
-                GTPP_Bees.propolis.getStackForType(GTPP_PropolisType.FORCE),
-                GTPP_Bees.drop.getStackForType(GTPP_DropType.FORCE) },
+            GTPPCombType.FORCE,
+            new ItemStack[] { GTModHandler.getModItem(Forestry.ID, "beeswax", 1L, 0),
+                GTPP_Bees.propolis.getStackForType(GTPPPropolisType.FORCE),
+                GTPP_Bees.drop.getStackForType(GTPPDropType.FORCE) },
             new int[] { 5000, 3000, 1000 });
     }
 
-    public static void addChemicalRecipe(GTPP_CombType aInputStack, ItemStack[] aOutputs, int[] aChances) {
+    public static void addChemicalRecipe(GTPPCombType aInputStack, ItemStack[] aOutputs, int[] aChances) {
         Material aMat = aInputStack.mMaterial;
         long aEU = aMat.vVoltageMultiplier;
         int aTier = Math.max(aMat.vTier / 2, 1);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(aInputStack.getStackForType(aTier))
             .itemOutputs(aOutputs)
             .duration(aTier * 20 * 60)
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/GTPPDrop.java
index a84d11e74c..dd85ed6b2d 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPPDrop.java
@@ -2,7 +2,7 @@ package gtPlusPlus.xmod.forestry.bees.items.output;
 
 import static gregtech.api.enums.Mods.GTPlusPlus;
 import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 
 import java.util.List;
 
@@ -17,17 +17,17 @@ 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 gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.xmod.forestry.bees.handler.GTPP_DropType;
+import gtPlusPlus.xmod.forestry.bees.handler.GTPPDropType;
 import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
 
-public class GTPP_Drop extends Item {
+public class GTPPDrop extends Item {
 
     @SideOnly(Side.CLIENT)
     private IIcon secondIcon;
 
-    public GTPP_Drop() {
+    public GTPPDrop() {
         super();
         this.setCreativeTab(Tabs.tabApiculture);
         this.setHasSubtypes(true);
@@ -35,18 +35,18 @@ public class GTPP_Drop extends Item {
         GameRegistry.registerItem(this, "gtpp.drop", GTPlusPlus.ID);
     }
 
-    public ItemStack getStackForType(GTPP_DropType type) {
+    public ItemStack getStackForType(GTPPDropType type) {
         return new ItemStack(this, 1, type.mID);
     }
 
-    public ItemStack getStackForType(GTPP_DropType type, int count) {
+    public ItemStack getStackForType(GTPPDropType type, int count) {
         return new ItemStack(this, count, type.mID);
     }
 
     @Override
     @SideOnly(Side.CLIENT)
     public void getSubItems(Item item, CreativeTabs tabs, List list) {
-        for (GTPP_DropType type : GTPP_DropType.values()) {
+        for (GTPPDropType type : GTPPDropType.values()) {
             if (type.mShowInList) {
                 list.add(this.getStackForType(type));
             }
@@ -79,11 +79,11 @@ public class GTPP_Drop extends Item {
     @Override
     @SideOnly(Side.CLIENT)
     public int getColorFromItemStack(ItemStack stack, int pass) {
-        int colour = GTPP_DropType.get(stack.getItemDamage())
+        int colour = GTPPDropType.get(stack.getItemDamage())
             .getColours()[0];
 
         if (pass >= 1) {
-            colour = GTPP_DropType.get(stack.getItemDamage())
+            colour = GTPPDropType.get(stack.getItemDamage())
                 .getColours()[1];
         }
 
@@ -92,7 +92,7 @@ public class GTPP_Drop extends Item {
 
     @Override
     public String getItemStackDisplayName(ItemStack stack) {
-        return GTPP_DropType.get(stack.getItemDamage())
+        return GTPPDropType.get(stack.getItemDamage())
             .getName();
     }
 
@@ -102,7 +102,7 @@ public class GTPP_Drop extends Item {
     public static void initDropsRecipes() {
         ItemStack tDrop;
         Logger.BEES("Processing recipes for " + GTPP_Bees.sDropMappings.size() + " Drops.");
-        for (GTPP_DropType aDrop : GTPP_Bees.sDropMappings.values()) {
+        for (GTPPDropType aDrop : GTPP_Bees.sDropMappings.values()) {
             tDrop = aDrop.getStackForType(1);
             if (addProcess(
                 tDrop,
@@ -120,7 +120,7 @@ public class GTPP_Drop extends Item {
         if (aOutput == null) {
             return false;
         }
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(tDrop)
             .fluidOutputs(aOutput)
             .duration(aDuration * TICKS)
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/GTPPPollen.java
index 7e959151a0..9c07f294c5 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPPPollen.java
@@ -14,14 +14,14 @@ 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.xmod.forestry.bees.handler.GTPP_PollenType;
+import gtPlusPlus.xmod.forestry.bees.handler.GTPPPollenType;
 
-public class GTPP_Pollen extends Item {
+public class GTPPPollen extends Item {
 
     @SideOnly(Side.CLIENT)
     private IIcon secondIcon;
 
-    public GTPP_Pollen() {
+    public GTPPPollen() {
         super();
         this.setCreativeTab(Tabs.tabApiculture);
         this.setHasSubtypes(true);
@@ -29,18 +29,18 @@ public class GTPP_Pollen extends Item {
         GameRegistry.registerItem(this, "gtpp.pollen", GTPlusPlus.ID);
     }
 
-    public ItemStack getStackForType(GTPP_PollenType type) {
+    public ItemStack getStackForType(GTPPPollenType type) {
         return new ItemStack(this, 1, type.mID);
     }
 
-    public ItemStack getStackForType(GTPP_PollenType type, int count) {
+    public ItemStack getStackForType(GTPPPollenType type, int count) {
         return new ItemStack(this, count, type.mID);
     }
 
     @Override
     @SideOnly(Side.CLIENT)
     public void getSubItems(Item item, CreativeTabs tabs, List list) {
-        for (GTPP_PollenType type : GTPP_PollenType.values()) {
+        for (GTPPPollenType type : GTPPPollenType.values()) {
             if (type.mShowInList) {
                 list.add(this.getStackForType(type));
             }
@@ -73,11 +73,11 @@ public class GTPP_Pollen extends Item {
     @Override
     @SideOnly(Side.CLIENT)
     public int getColorFromItemStack(ItemStack stack, int pass) {
-        int colour = GTPP_PollenType.get(stack.getItemDamage())
+        int colour = GTPPPollenType.get(stack.getItemDamage())
             .getColours()[0];
 
         if (pass >= 1) {
-            colour = GTPP_PollenType.get(stack.getItemDamage())
+            colour = GTPPPollenType.get(stack.getItemDamage())
                 .getColours()[1];
         }
 
@@ -86,7 +86,7 @@ public class GTPP_Pollen extends Item {
 
     @Override
     public String getItemStackDisplayName(ItemStack stack) {
-        return GTPP_PollenType.get(stack.getItemDamage())
+        return GTPPPollenType.get(stack.getItemDamage())
             .getName();
     }
 }
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/GTPPPropolis.java
index 1c1bd95d09..22d429a2e6 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPPPropolis.java
@@ -2,7 +2,7 @@ package gtPlusPlus.xmod.forestry.bees.items.output;
 
 import static gregtech.api.enums.Mods.GTPlusPlus;
 import static gregtech.api.recipe.RecipeMaps.extractorRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
 
 import java.util.List;
 
@@ -16,17 +16,17 @@ 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 gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PropolisType;
+import gtPlusPlus.xmod.forestry.bees.handler.GTPPPropolisType;
 import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
 
-public class GTPP_Propolis extends Item {
+public class GTPPPropolis extends Item {
 
     @SideOnly(Side.CLIENT)
     private IIcon secondIcon;
 
-    public GTPP_Propolis() {
+    public GTPPPropolis() {
         super();
         this.setCreativeTab(Tabs.tabApiculture);
         this.setHasSubtypes(true);
@@ -34,18 +34,18 @@ public class GTPP_Propolis extends Item {
         GameRegistry.registerItem(this, "gtpp.propolis", GTPlusPlus.ID);
     }
 
-    public ItemStack getStackForType(GTPP_PropolisType type) {
+    public ItemStack getStackForType(GTPPPropolisType type) {
         return new ItemStack(this, 1, type.mID);
     }
 
-    public ItemStack getStackForType(GTPP_PropolisType type, int count) {
+    public ItemStack getStackForType(GTPPPropolisType type, int count) {
         return new ItemStack(this, count, type.mID);
     }
 
     @Override
     @SideOnly(Side.CLIENT)
     public void getSubItems(Item item, CreativeTabs tabs, List list) {
-        for (GTPP_PropolisType type : GTPP_PropolisType.values()) {
+        for (GTPPPropolisType type : GTPPPropolisType.values()) {
             if (type.mShowInList) {
                 list.add(this.getStackForType(type));
             }
@@ -66,20 +66,20 @@ public class GTPP_Propolis extends Item {
     @Override
     @SideOnly(Side.CLIENT)
     public int getColorFromItemStack(ItemStack stack, int pass) {
-        return GTPP_PropolisType.get(stack.getItemDamage())
+        return GTPPPropolisType.get(stack.getItemDamage())
             .getColours();
     }
 
     @Override
     public String getItemStackDisplayName(ItemStack stack) {
-        return GTPP_PropolisType.get(stack.getItemDamage())
+        return GTPPPropolisType.get(stack.getItemDamage())
             .getName();
     }
 
     public static void initPropolisRecipes() {
         ItemStack tDrop;
         Logger.BEES("Processing recipes for " + GTPP_Bees.sPropolisMappings.size() + " Propolis.");
-        for (GTPP_PropolisType aProp : GTPP_Bees.sPropolisMappings.values()) {
+        for (GTPPPropolisType aProp : GTPP_Bees.sPropolisMappings.values()) {
             tDrop = aProp.getStackForType(1);
             if (addProcess(
                 tDrop,
@@ -98,7 +98,7 @@ public class GTPP_Propolis extends Item {
         if (aOutput == null) {
             return false;
         }
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(tDrop)
             .itemOutputs(aOutput)
             .outputChances(aChance)