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

14 files changed, 219 insertions, 220 deletions

diff --git a/src/main/java/kubatech/loaders/BlockLoader.java b/src/main/java/kubatech/loaders/BlockLoader.java
index fcb077ff15..e2c94a0e4b 100644
--- a/src/main/java/kubatech/loaders/BlockLoader.java
+++ b/src/main/java/kubatech/loaders/BlockLoader.java
@@ -25,11 +25,11 @@ import net.minecraft.item.ItemBlock;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import kubatech.api.enums.ItemList;
-import kubatech.loaders.block.defc.DEFCCasingBlock;
+import kubatech.loaders.block.defc.BlockDEFCCasing;
 import kubatech.loaders.block.kubablock.KubaBlock;
 import kubatech.loaders.block.kubablock.KubaItemBlock;
-import kubatech.loaders.block.kubablock.blocks.TeaAcceptor;
-import kubatech.loaders.block.kubablock.blocks.TeaStorage;
+import kubatech.loaders.block.kubablock.blocks.BlockTeaAcceptor;
+import kubatech.loaders.block.kubablock.blocks.BlockTeaStorage;
 import kubatech.tileentity.TeaAcceptorTile;
 import kubatech.tileentity.TeaStorageTile;
 
@@ -37,7 +37,7 @@ public class BlockLoader {
 
     public static final KubaBlock kubaBlock = new KubaBlock(Material.anvil);
     public static final ItemBlock kubaItemBlock = new KubaItemBlock(kubaBlock);
-    public static final DEFCCasingBlock defcCasingBlock = new DEFCCasingBlock();
+    public static final BlockDEFCCasing defcCasingBlock = new BlockDEFCCasing();
 
     public static void registerBlocks() {
         GameRegistry.registerTileEntity(TeaAcceptorTile.class, "KT_TeaAcceptor");
@@ -45,7 +45,7 @@ public class BlockLoader {
         GameRegistry.registerBlock(kubaBlock, null, "kubablocks");
         GameRegistry.registerItem(kubaItemBlock, "kubablocks");
 
-        ItemList.TeaAcceptor.set(kubaBlock.registerProxyBlock(new TeaAcceptor()));
-        ItemList.TeaStorage.set(kubaBlock.registerProxyBlock(new TeaStorage()));
+        ItemList.TeaAcceptor.set(kubaBlock.registerProxyBlock(new BlockTeaAcceptor()));
+        ItemList.TeaStorage.set(kubaBlock.registerProxyBlock(new BlockTeaStorage()));
     }
 }
diff --git a/src/main/java/kubatech/loaders/DEFCRecipes.java b/src/main/java/kubatech/loaders/DEFCRecipes.java
index ebea8d751f..37f13c1298 100644
--- a/src/main/java/kubatech/loaders/DEFCRecipes.java
+++ b/src/main/java/kubatech/loaders/DEFCRecipes.java
@@ -8,7 +8,7 @@ import static gregtech.api.enums.Mods.SuperSolarPanels;
 import static gregtech.api.enums.Mods.Witchery;
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
 import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
-import static gregtech.api.util.GT_RecipeConstants.DEFC_CASING_TIER;
+import static gregtech.api.util.GTRecipeConstants.DEFC_CASING_TIER;
 
 import java.util.Arrays;
 
@@ -22,7 +22,7 @@ import com.gtnewhorizons.modularui.api.drawable.UITexture;
 
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.registry.GameRegistry;
-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.MaterialsUEVplus;
@@ -31,12 +31,12 @@ import gregtech.api.enums.TierEU;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMapBackend;
 import gregtech.api.recipe.RecipeMapBuilder;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
 import gregtech.nei.formatter.SimpleSpecialValueFormatter;
-import gtPlusPlus.xmod.forestry.bees.handler.GTPP_CombType;
+import gtPlusPlus.xmod.forestry.bees.handler.GTPPCombType;
 import kubatech.Tags;
 
 public class DEFCRecipes {
@@ -54,13 +54,13 @@ public class DEFCRecipes {
     public static void addRecipes() {
 
         // Dragonblood recipe for magics haters
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(Blocks.dragon_egg, 1),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L))
             .fluidInputs(Materials.Radon.getPlasma(144))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 8L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 8L))
             .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 288))
             .eut(TierEU.RECIPE_UHV)
             .duration(14_000)
@@ -68,59 +68,59 @@ public class DEFCRecipes {
 
         // Casings
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 6L),
-                GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.NaquadahAlloy, 6L))
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 6L),
+                GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.NaquadahAlloy, 6L))
             .fluidInputs(Materials.Void.getMolten(1152L))
             .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingBase.get(1))
             .eut(TierEU.RECIPE_UV)
             .duration(24000)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "tile.BloodyIchorium", 1, 0),
-                GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 6L))
+                GTModHandler.getModItem(NewHorizonsCoreMod.ID, "tile.BloodyIchorium", 1, 0),
+                GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 6L))
             .fluidInputs(Materials.Void.getMolten(1152L))
             .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT1.get(1))
             .eut(TierEU.RECIPE_UV)
             .duration(24000)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 kubatech.api.enums.ItemList.DEFCCasingT1.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Draconium, 6L),
-                GT_ModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 1, 0))
+                GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Draconium, 6L),
+                GTModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 1, 0))
             .fluidInputs(Materials.Void.getMolten(2304L))
             .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT2.get(1))
             .eut(TierEU.RECIPE_UV)
             .duration(24000)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 kubatech.api.enums.ItemList.DEFCCasingT2.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.CosmicNeutronium, 6L),
-                GT_ModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 2, 0))
+                GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.CosmicNeutronium, 6L),
+                GTModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 2, 0))
             .fluidInputs(Materials.Void.getMolten(4608L))
             .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT3.get(1))
             .eut(TierEU.RECIPE_UHV)
             .duration(12000)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 kubatech.api.enums.ItemList.DEFCCasingT3.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 6L),
-                GT_ModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 3, 0))
+                GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 6L),
+                GTModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 3, 0))
             .fluidInputs(Materials.Void.getMolten(9216L))
             .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT4.get(1))
             .eut(TierEU.RECIPE_UEV)
             .duration(12000)
             .addTo(assemblerRecipes);
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 kubatech.api.enums.ItemList.DEFCCasingT4.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 6L),
-                GT_ModHandler.getModItem(DraconicEvolution.ID, "chaoticCore", 4, 0))
+                GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 6L),
+                GTModHandler.getModItem(DraconicEvolution.ID, "chaoticCore", 4, 0))
             .fluidInputs(Materials.Void.getMolten(18432L))
             .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT5.get(1))
             .eut(TierEU.RECIPE_UIV)
@@ -133,7 +133,7 @@ public class DEFCRecipes {
 
     private static final Item EMTItems = GameRegistry.findItem("EMT", "EMTItems");
 
-    private static void addOldHiddenRecipe(GT_Recipe recipe) {
+    private static void addOldHiddenRecipe(GTRecipe recipe) {
         if (!ElectroMagicTools.isModLoaded()) return;
         recipe = recipe.copy();
         recipe.mInputs = Arrays.stream(recipe.mInputs)
@@ -169,29 +169,29 @@ public class DEFCRecipes {
     private static void fusionRecipes() {
         // CORES
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 4),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Ichorium, 1),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 4),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Ichorium, 1),
                 ItemList.QuantumEye.get(1L),
                 kubatech.api.enums.ItemList.DEFCDraconicSchematic.get(0L))
             .fluidInputs(Materials.Sunnarium.getMolten(1440))
-            .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 1, 0))
+            .itemOutputs(GTModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 1, 0))
             .eut(TierEU.RECIPE_UV)
             .duration(400)
             .metadata(DEFC_CASING_TIER, 1)
             .addTo(fusionCraftingRecipes)
             .forEach(DEFCRecipes::addOldHiddenRecipe);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 8),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4),
-                GT_ModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 4, 0),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 8),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4),
+                GTModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 4, 0),
                 ItemList.QuantumStar.get(1L),
                 kubatech.api.enums.ItemList.DEFCWyvernSchematic.get(0L))
             .fluidInputs(Materials.Neutronium.getMolten(1440))
-            .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 1, 0))
+            .itemOutputs(GTModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 1, 0))
             .eut(TierEU.RECIPE_UHV)
             .duration(800)
             .metadata(DEFC_CASING_TIER, 2)
@@ -199,30 +199,30 @@ public class DEFCRecipes {
             .forEach(DEFCRecipes::addOldHiddenRecipe);
 
         if (Loader.isModLoaded("supersolarpanel")) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 12),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 4),
-                    GT_ModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 4, 0),
-                    GT_ModHandler.getModItem(SuperSolarPanels.ID, "enderquantumcomponent", 1, 0),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 12),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 4),
+                    GTModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 4, 0),
+                    GTModHandler.getModItem(SuperSolarPanels.ID, "enderquantumcomponent", 1, 0),
                     kubatech.api.enums.ItemList.DEFCAwakenedSchematic.get(0L))
                 .fluidInputs(Materials.Infinity.getMolten(1440))
-                .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 1, 0))
+                .itemOutputs(GTModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 1, 0))
                 .eut(TierEU.RECIPE_UEV)
                 .duration(1600)
                 .metadata(DEFC_CASING_TIER, 3)
                 .addTo(fusionCraftingRecipes)
                 .forEach(DEFCRecipes::addOldHiddenRecipe);
         } else {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 12),
-                    GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 4),
-                    GT_ModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 4, 0),
-                    GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ManyullynCrystal", 1, 0),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 12),
+                    GTOreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 4),
+                    GTModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 4, 0),
+                    GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ManyullynCrystal", 1, 0),
                     kubatech.api.enums.ItemList.DEFCAwakenedSchematic.get(0L))
                 .fluidInputs(Materials.Infinity.getMolten(1440))
-                .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 1, 0))
+                .itemOutputs(GTModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 1, 0))
                 .eut(TierEU.RECIPE_UEV)
                 .duration(1600)
                 .metadata(DEFC_CASING_TIER, 3)
@@ -230,15 +230,15 @@ public class DEFCRecipes {
                 .forEach(DEFCRecipes::addOldHiddenRecipe);
         }
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 16),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlackPlutonium, 4),
-                GT_ModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 4, 0),
-                GT_ModHandler.getModItem(DraconicEvolution.ID, "chaosFragment", 2, 2),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 16),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.BlackPlutonium, 4),
+                GTModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 4, 0),
+                GTModHandler.getModItem(DraconicEvolution.ID, "chaosFragment", 2, 2),
                 kubatech.api.enums.ItemList.DEFCChaoticSchematic.get(0L))
             .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(1440))
-            .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "chaoticCore", 1, 0))
+            .itemOutputs(GTModHandler.getModItem(DraconicEvolution.ID, "chaoticCore", 1, 0))
             .eut(24_000_000)
             .duration(3200)
             .metadata(DEFC_CASING_TIER, 4)
@@ -247,28 +247,28 @@ public class DEFCRecipes {
 
         // ENERGY CORES
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 8),
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StellarAlloy, 4),
-                GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 4, 1),
-                GT_ModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 1, 0),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 8),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.StellarAlloy, 4),
+                GTModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 4, 1),
+                GTModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 1, 0),
                 kubatech.api.enums.ItemList.DEFCWyvernSchematic.get(0L))
-            .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "draconiumEnergyCore", 1, 0))
+            .itemOutputs(GTModHandler.getModItem(DraconicEvolution.ID, "draconiumEnergyCore", 1, 0))
             .eut(TierEU.RECIPE_UV)
             .duration(1000)
             .metadata(DEFC_CASING_TIER, 2)
             .addTo(fusionCraftingRecipes)
             .forEach(DEFCRecipes::addOldHiddenRecipe);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 8),
-                GT_ModHandler.getModItem(DraconicEvolution.ID, "draconiumEnergyCore", 4, 0),
-                GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 4, 4),
-                GT_ModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 1, 0),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 8),
+                GTModHandler.getModItem(DraconicEvolution.ID, "draconiumEnergyCore", 4, 0),
+                GTModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 4, 4),
+                GTModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 1, 0),
                 kubatech.api.enums.ItemList.DEFCAwakenedSchematic.get(0L))
-            .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "draconiumEnergyCore", 1, 1))
+            .itemOutputs(GTModHandler.getModItem(DraconicEvolution.ID, "draconiumEnergyCore", 1, 1))
             .eut(TierEU.RECIPE_UHV)
             .duration(2000)
             .metadata(DEFC_CASING_TIER, 3)
@@ -276,11 +276,11 @@ public class DEFCRecipes {
             .forEach(DEFCRecipes::addOldHiddenRecipe);
 
         // Dragon Blood
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(Blocks.dragon_egg, 0),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64),
-                GT_Utility.getIntegratedCircuit(1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64),
+                GTUtility.getIntegratedCircuit(1))
             .fluidInputs(Materials.Radon.getPlasma(144))
             .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 288))
             .eut(TierEU.RECIPE_UHV)
@@ -289,11 +289,11 @@ public class DEFCRecipes {
             .noOptimize()
             .addTo(fusionCraftingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_ModHandler.getModItem(Witchery.ID, "infinityegg", 0),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64),
-                GT_Utility.getIntegratedCircuit(1))
+                GTModHandler.getModItem(Witchery.ID, "infinityegg", 0),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64),
+                GTUtility.getIntegratedCircuit(1))
             .fluidInputs(Materials.Radon.getPlasma(72))
             .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 432))
             .eut(TierEU.RECIPE_UHV)
@@ -302,11 +302,11 @@ public class DEFCRecipes {
             .noOptimize()
             .addTo(fusionCraftingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(Blocks.dragon_egg, 0),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64),
-                GTPP_CombType.DRAGONBLOOD.getStackForType(1))
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64),
+                GTPPCombType.DRAGONBLOOD.getStackForType(1))
             .fluidInputs(Materials.Radon.getPlasma(216))
             .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 432))
             .eut(TierEU.RECIPE_UHV)
@@ -315,11 +315,11 @@ public class DEFCRecipes {
             .noOptimize()
             .addTo(fusionCraftingRecipes);
 
-        GT_Values.RA.stdBuilder()
+        GTValues.RA.stdBuilder()
             .itemInputs(
-                GT_ModHandler.getModItem(Witchery.ID, "infinityegg", 0),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64),
-                GTPP_CombType.DRAGONBLOOD.getStackForType(1))
+                GTModHandler.getModItem(Witchery.ID, "infinityegg", 0),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64),
+                GTPPCombType.DRAGONBLOOD.getStackForType(1))
             .fluidInputs(Materials.Radon.getPlasma(108))
             .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 648))
             .eut(TierEU.RECIPE_UHV)
diff --git a/src/main/java/kubatech/loaders/ItemLoader.java b/src/main/java/kubatech/loaders/ItemLoader.java
index d8218ea873..a7d37da63a 100644
--- a/src/main/java/kubatech/loaders/ItemLoader.java
+++ b/src/main/java/kubatech/loaders/ItemLoader.java
@@ -73,10 +73,10 @@ import net.minecraft.util.StatCollector;
 import cpw.mods.fml.common.registry.GameRegistry;
 import kubatech.loaders.item.ItemProxy;
 import kubatech.loaders.item.KubaItems;
-import kubatech.loaders.item.items.Tea;
-import kubatech.loaders.item.items.TeaCollection;
-import kubatech.loaders.item.items.TeaIngredient;
-import kubatech.loaders.item.items.TeaUltimate;
+import kubatech.loaders.item.items.ItemTea;
+import kubatech.loaders.item.items.ItemTeaCollection;
+import kubatech.loaders.item.items.ItemTeaIngredient;
+import kubatech.loaders.item.items.ItemTeaUltimate;
 
 public class ItemLoader {
 
@@ -87,45 +87,45 @@ public class ItemLoader {
 
         // DON'T EVER CHANGE ORDER IN HERE, ADD NEW ITEMS ON BOTTOM
 
-        LegendaryBlackTea.set(kubaitems.registerProxyItem(new TeaCollection("black_tea")));
-        LegendaryButterflyTea.set(kubaitems.registerProxyItem(new TeaCollection("butterfly_tea")));
-        LegendaryEarlGrayTea.set(kubaitems.registerProxyItem(new TeaCollection("earl_gray_tea")));
-        LegendaryGreenTea.set(kubaitems.registerProxyItem(new TeaCollection("green_tea")));
-        LegendaryLemonTea.set(kubaitems.registerProxyItem(new TeaCollection("lemon_tea")));
-        LegendaryMilkTea.set(kubaitems.registerProxyItem(new TeaCollection("milk_tea")));
-        LegendaryOolongTea.set(kubaitems.registerProxyItem(new TeaCollection("oolong_tea")));
-        LegendaryPeppermintTea.set(kubaitems.registerProxyItem(new TeaCollection("peppermint_tea")));
-        LegendaryPuerhTea.set(kubaitems.registerProxyItem(new TeaCollection("pu-erh_tea")));
-        LegendaryRedTea.set(kubaitems.registerProxyItem(new TeaCollection("red_tea")));
-        LegendaryWhiteTea.set(kubaitems.registerProxyItem(new TeaCollection("white_tea")));
-        LegendaryYellowTea.set(kubaitems.registerProxyItem(new TeaCollection("yellow_tea")));
-        LegendaryUltimateTea.set(kubaitems.registerProxyItem(new TeaUltimate()));
-
-        BlackTea.set(kubaitems.registerProxyItem(new Tea("black_tea", 4, 0.3f)));
-        EarlGrayTea.set(kubaitems.registerProxyItem(new Tea("earl_gray_tea", 4, 0.3f)));
-        GreenTea.set(kubaitems.registerProxyItem(new Tea("green_tea", 4, 0.3f)));
-        LemonTea.set(kubaitems.registerProxyItem(new Tea("lemon_tea", 4, 0.3f)));
-        MilkTea.set(kubaitems.registerProxyItem(new Tea("milk_tea", 4, 0.3f)));
-        OolongTea.set(kubaitems.registerProxyItem(new Tea("oolong_tea", 4, 0.3f)));
-        PeppermintTea.set(kubaitems.registerProxyItem(new Tea("peppermint_tea", 4, 0.3f)));
-        PuerhTea.set(kubaitems.registerProxyItem(new Tea("pu-erh_tea", 4, 0.3f)));
-        WhiteTea.set(kubaitems.registerProxyItem(new Tea("white_tea", 4, 0.3f)));
-        YellowTea.set(kubaitems.registerProxyItem(new Tea("yellow_tea", 4, 0.3f)));
-
-        BlackTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("black_tea_leaf")));
-        GreenTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("green_tea_leaf")));
-        OolongTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("oolong_tea_leaf")));
-        PuerhTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("pu-erh_tea_leaf")));
-        WhiteTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("white_tea_leaf")));
-        YellowTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("yellow_tea_leaf")));
-
-        TeaLeafDehydrated.set(kubaitems.registerProxyItem(new TeaIngredient("tea_leaf_dehydrated")));
-        SteamedTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("steamed_tea_leaf")));
-        RolledTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("rolled_tea_leaf")));
-        OxidizedTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("oxidized_tea_leaf")));
-        FermentedTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("fermented_tea_leaf")));
-        BruisedTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("bruised_tea_leaf")));
-        PartiallyOxidizedTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("partially_oxidized_tea_leaf")));
+        LegendaryBlackTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("black_tea")));
+        LegendaryButterflyTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("butterfly_tea")));
+        LegendaryEarlGrayTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("earl_gray_tea")));
+        LegendaryGreenTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("green_tea")));
+        LegendaryLemonTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("lemon_tea")));
+        LegendaryMilkTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("milk_tea")));
+        LegendaryOolongTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("oolong_tea")));
+        LegendaryPeppermintTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("peppermint_tea")));
+        LegendaryPuerhTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("pu-erh_tea")));
+        LegendaryRedTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("red_tea")));
+        LegendaryWhiteTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("white_tea")));
+        LegendaryYellowTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("yellow_tea")));
+        LegendaryUltimateTea.set(kubaitems.registerProxyItem(new ItemTeaUltimate()));
+
+        BlackTea.set(kubaitems.registerProxyItem(new ItemTea("black_tea", 4, 0.3f)));
+        EarlGrayTea.set(kubaitems.registerProxyItem(new ItemTea("earl_gray_tea", 4, 0.3f)));
+        GreenTea.set(kubaitems.registerProxyItem(new ItemTea("green_tea", 4, 0.3f)));
+        LemonTea.set(kubaitems.registerProxyItem(new ItemTea("lemon_tea", 4, 0.3f)));
+        MilkTea.set(kubaitems.registerProxyItem(new ItemTea("milk_tea", 4, 0.3f)));
+        OolongTea.set(kubaitems.registerProxyItem(new ItemTea("oolong_tea", 4, 0.3f)));
+        PeppermintTea.set(kubaitems.registerProxyItem(new ItemTea("peppermint_tea", 4, 0.3f)));
+        PuerhTea.set(kubaitems.registerProxyItem(new ItemTea("pu-erh_tea", 4, 0.3f)));
+        WhiteTea.set(kubaitems.registerProxyItem(new ItemTea("white_tea", 4, 0.3f)));
+        YellowTea.set(kubaitems.registerProxyItem(new ItemTea("yellow_tea", 4, 0.3f)));
+
+        BlackTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("black_tea_leaf")));
+        GreenTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("green_tea_leaf")));
+        OolongTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("oolong_tea_leaf")));
+        PuerhTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("pu-erh_tea_leaf")));
+        WhiteTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("white_tea_leaf")));
+        YellowTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("yellow_tea_leaf")));
+
+        TeaLeafDehydrated.set(kubaitems.registerProxyItem(new ItemTeaIngredient("tea_leaf_dehydrated")));
+        SteamedTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("steamed_tea_leaf")));
+        RolledTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("rolled_tea_leaf")));
+        OxidizedTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("oxidized_tea_leaf")));
+        FermentedTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("fermented_tea_leaf")));
+        BruisedTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("bruised_tea_leaf")));
+        PartiallyOxidizedTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("partially_oxidized_tea_leaf")));
 
         TeaAcceptorResearchNote
             .set(kubaitems.registerProxyItem(new ItemProxy("tea_acceptor_research_note", "research_note")));
diff --git a/src/main/java/kubatech/loaders/MobHandlerLoader.java b/src/main/java/kubatech/loaders/MobHandlerLoader.java
index c7932dd00c..d54edfa260 100644
--- a/src/main/java/kubatech/loaders/MobHandlerLoader.java
+++ b/src/main/java/kubatech/loaders/MobHandlerLoader.java
@@ -21,8 +21,8 @@
 package kubatech.loaders;
 
 import static gregtech.api.enums.Mods.InfernalMobs;
-import static kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher.DIAMOND_SPIKES_DAMAGE;
-import static kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher.MOB_SPAWN_INTERVAL;
+import static kubatech.tileentity.gregtech.multiblock.MTEExtremeEntityCrusher.DIAMOND_SPIKES_DAMAGE;
+import static kubatech.tileentity.gregtech.multiblock.MTEExtremeEntityCrusher.MOB_SPAWN_INTERVAL;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
@@ -50,10 +50,10 @@ import com.kuba6000.mobsinfo.api.event.PreMobsRegistrationEvent;
 
 import atomicstryker.infernalmobs.common.InfernalMobsCore;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import kubatech.Tags;
 import kubatech.config.Config;
-import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher;
+import kubatech.tileentity.gregtech.multiblock.MTEExtremeEntityCrusher;
 
 public class MobHandlerLoader {
 
@@ -90,7 +90,7 @@ public class MobHandlerLoader {
             mDuration = Math.max(MOB_SPAWN_INTERVAL, (int) ((recipe.maxEntityHealth / DIAMOND_SPIKES_DAMAGE) * 10d));
         }
 
-        public ItemStack[] generateOutputs(Random rnd, GT_MetaTileEntity_ExtremeEntityCrusher MTE, double attackDamage,
+        public ItemStack[] generateOutputs(Random rnd, MTEExtremeEntityCrusher MTE, double attackDamage,
             int lootinglevel, boolean preferInfernalDrops, boolean voidAllDamagedAndEnchantedItems) {
             MTE.lEUt = mEUt;
             MTE.mMaxProgresstime = Math.max(MOB_SPAWN_INTERVAL, (int) ((recipe.maxEntityHealth / attackDamage) * 10d));
@@ -235,8 +235,8 @@ public class MobHandlerLoader {
         if (recipe != null) {
             event.additionalInformation.addAll(
                 Arrays.asList(
-                    GT_Utility.trans("153", "Usage: ") + GT_Utility.formatNumbers(recipe.mEUt) + " EU/t",
-                    GT_Utility.trans("158", "Time: ") + GT_Utility.formatNumbers(recipe.mDuration / 20d) + " secs"));
+                    GTUtility.trans("153", "Usage: ") + GTUtility.formatNumbers(recipe.mEUt) + " EU/t",
+                    GTUtility.trans("158", "Time: ") + GTUtility.formatNumbers(recipe.mDuration / 20d) + " secs"));
         }
     }
 }
diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java
index 94bb9fb8ee..139909851a 100644
--- a/src/main/java/kubatech/loaders/RecipeLoader.java
+++ b/src/main/java/kubatech/loaders/RecipeLoader.java
@@ -36,13 +36,13 @@ import static gregtech.api.enums.Mods.PamsHarvestCraft;
 import static gregtech.api.recipe.RecipeMaps.benderRecipes;
 import static gregtech.api.recipe.RecipeMaps.cutterRecipes;
 import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_RecipeConstants.AssemblyLine;
-import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM;
-import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME;
-import static gregtech.api.util.GT_RecipeConstants.UniversalChemical;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeConstants.AssemblyLine;
+import static gregtech.api.util.GTRecipeConstants.RESEARCH_ITEM;
+import static gregtech.api.util.GTRecipeConstants.RESEARCH_TIME;
+import static gregtech.api.util.GTRecipeConstants.UniversalChemical;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes;
 import static kubatech.api.enums.ItemList.BlackTea;
 import static kubatech.api.enums.ItemList.BlackTeaLeaf;
@@ -82,29 +82,29 @@ import net.minecraftforge.fluids.FluidRegistry;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import forestry.plugins.PluginCore;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TierEU;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 import ic2.core.Ic2Items;
 import kubatech.api.enums.ItemList;
-import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_DEFusionCrafter;
-import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher;
-import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeIndustrialGreenhouse;
-import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_MegaIndustrialApiary;
+import kubatech.tileentity.gregtech.multiblock.MTEDEFusionCrafter;
+import kubatech.tileentity.gregtech.multiblock.MTEExtremeEntityCrusher;
+import kubatech.ti