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

30 files changed, 220 insertions, 220 deletions

diff --git a/src/main/java/gregtech/common/render/GT_RenderDrone.java b/src/main/java/gregtech/common/render/DroneRender.java
index af1336a219..02445b6dc6 100644
--- a/src/main/java/gregtech/common/render/GT_RenderDrone.java
+++ b/src/main/java/gregtech/common/render/DroneRender.java
@@ -14,22 +14,22 @@ import org.lwjgl.opengl.GL11;
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.common.tileentities.render.TileDrone;
+import gregtech.common.tileentities.render.TileEntityDrone;
 
 @SideOnly(Side.CLIENT)
-public class GT_RenderDrone extends TileEntitySpecialRenderer {
+public class DroneRender extends TileEntitySpecialRenderer {
 
     private static final ResourceLocation DroneTexture = new ResourceLocation(GregTech.ID, "textures/model/drone.png");
     private static final IModelCustom Drone = AdvancedModelLoader
         .loadModel(new ResourceLocation(GregTech.ID, "textures/model/drone.obj"));
 
-    public GT_RenderDrone() {
-        ClientRegistry.bindTileEntitySpecialRenderer(TileDrone.class, this);
+    public DroneRender() {
+        ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDrone.class, this);
     }
 
     @Override
     public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float timeSinceLastTick) {
-        if (!(tile instanceof TileDrone drone)) return;
+        if (!(tile instanceof TileEntityDrone drone)) return;
         final float size = 1.0f;
         GL11.glPushMatrix();
         GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5);
@@ -53,7 +53,7 @@ public class GT_RenderDrone extends TileEntitySpecialRenderer {
         GL11.glEnable(GL11.GL_LIGHTING);
     }
 
-    private void renderBlade(TileDrone drone, double size) {
+    private void renderBlade(TileEntityDrone drone, double size) {
         GL11.glDisable(GL11.GL_LIGHTING);
         GL11.glDisable(GL11.GL_CULL_FACE);
         GL11.glEnable(GL11.GL_BLEND);
diff --git a/src/main/java/gregtech/common/render/GT_FlaskRenderer.java b/src/main/java/gregtech/common/render/FlaskRenderer.java
index addcb1cf70..f7d2e96ca1 100644
--- a/src/main/java/gregtech/common/render/GT_FlaskRenderer.java
+++ b/src/main/java/gregtech/common/render/FlaskRenderer.java
@@ -14,12 +14,12 @@ import org.lwjgl.opengl.GL11;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.ItemList;
-import gregtech.common.items.GT_VolumetricFlask;
+import gregtech.common.items.ItemVolumetricFlask;
 
 @SideOnly(Side.CLIENT)
-public final class GT_FlaskRenderer implements IItemRenderer {
+public final class FlaskRenderer implements IItemRenderer {
 
-    public GT_FlaskRenderer() {
+    public FlaskRenderer() {
         MinecraftForgeClient.registerItemRenderer(ItemList.VOLUMETRIC_FLASK.getItem(), this);
     }
 
@@ -36,11 +36,11 @@ public final class GT_FlaskRenderer implements IItemRenderer {
 
     @Override
     public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
-        GT_VolumetricFlask cell = (GT_VolumetricFlask) item.getItem();
+        ItemVolumetricFlask cell = (ItemVolumetricFlask) item.getItem();
         IIcon icon = item.getIconIndex();
         GL11.glEnable(GL11.GL_BLEND);
         GL11.glEnable(GL11.GL_ALPHA_TEST);
-        GT_RenderUtil.applyStandardItemTransform(type);
+        GTRenderUtil.applyStandardItemTransform(type);
 
         FluidStack fs = cell != null ? cell.getFluid(item) : null;
         if (fs != null) {
@@ -51,20 +51,20 @@ public final class GT_FlaskRenderer implements IItemRenderer {
 
             Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture);
             GL11.glBlendFunc(GL11.GL_ZERO, GL11.GL_ONE);
-            GT_RenderUtil.renderItem(type, iconWindow);
+            GTRenderUtil.renderItem(type, iconWindow);
 
             Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
             GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
             GL11.glDepthFunc(GL11.GL_EQUAL);
             GL11.glColor3ub((byte) (fluidColor >> 16), (byte) (fluidColor >> 8), (byte) fluidColor);
-            GT_RenderUtil.renderItem(type, fluidIcon);
+            GTRenderUtil.renderItem(type, fluidIcon);
             GL11.glColor3ub((byte) -1, (byte) -1, (byte) -1);
             GL11.glDepthFunc(GL11.GL_LEQUAL);
         }
 
         Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture);
         GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-        GT_RenderUtil.renderItem(type, icon);
+        GTRenderUtil.renderItem(type, icon);
         GL11.glDisable(GL11.GL_ALPHA_TEST);
         GL11.glDisable(GL11.GL_BLEND);
     }
diff --git a/src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java b/src/main/java/gregtech/common/render/FluidDisplayStackRenderer.java
index 9a35f6bc57..80e2cbe6a6 100644
--- a/src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java
+++ b/src/main/java/gregtech/common/render/FluidDisplayStackRenderer.java
@@ -16,12 +16,12 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
-import gregtech.common.items.GT_FluidDisplayItem;
+import gregtech.common.items.ItemFluidDisplay;
 
 @SideOnly(Side.CLIENT)
-public class GT_FluidDisplayStackRenderer implements IItemRenderer {
+public class FluidDisplayStackRenderer implements IItemRenderer {
 
-    public GT_FluidDisplayStackRenderer() {
+    public FluidDisplayStackRenderer() {
         MinecraftForgeClient.registerItemRenderer(ItemList.Display_Fluid.getItem(), this);
     }
 
@@ -39,7 +39,7 @@ public class GT_FluidDisplayStackRenderer implements IItemRenderer {
 
     @Override
     public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
-        if (item == null || item.getItem() == null || !(item.getItem() instanceof GT_FluidDisplayItem)) return;
+        if (item == null || item.getItem() == null || !(item.getItem() instanceof ItemFluidDisplay)) return;
 
         OpenGlHelper.glBlendFunc(770, 771, 1, 0);
         GL11.glEnable(GL11.GL_BLEND);
diff --git a/src/main/java/gregtech/common/render/GT_CapeRenderer.java b/src/main/java/gregtech/common/render/GTCapeRenderer.java
index ec9ef2880c..ea8e0a37cd 100644
--- a/src/main/java/gregtech/common/render/GT_CapeRenderer.java
+++ b/src/main/java/gregtech/common/render/GTCapeRenderer.java
@@ -13,11 +13,11 @@ import net.minecraftforge.client.event.RenderPlayerEvent;
 
 import org.lwjgl.opengl.GL11;
 
-import gregtech.api.enums.GT_Values;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.enums.GTValues;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTUtility;
 
-public class GT_CapeRenderer extends RenderPlayer {
+public class GTCapeRenderer extends RenderPlayer {
 
     private final ResourceLocation[] mCapes = { new ResourceLocation("gregtech:textures/BrainTechCape.png"),
         new ResourceLocation("gregtech:textures/GregTechCape.png"),
@@ -29,14 +29,14 @@ public class GT_CapeRenderer extends RenderPlayer {
         new ResourceLocation("gregtech:textures/Stargate.png") };
     private final Collection<String> mCapeList;
 
-    public GT_CapeRenderer(Collection<String> aCapeList) {
+    public GTCapeRenderer(Collection<String> aCapeList) {
         this.mCapeList = aCapeList;
         setRenderManager(RenderManager.instance);
     }
 
     public void receiveRenderSpecialsEvent(RenderPlayerEvent.Specials.Pre aEvent) {
         AbstractClientPlayer aPlayer = (AbstractClientPlayer) aEvent.entityPlayer;
-        if (GT_Utility.getFullInvisibility(aPlayer)) {
+        if (GTUtility.getFullInvisibility(aPlayer)) {
             aEvent.setCanceled(true);
             return;
         }
@@ -44,7 +44,7 @@ public class GT_CapeRenderer extends RenderPlayer {
         if (aPlayer.isInvisible()) {
             return;
         }
-        if (GT_Utility.getPotion(aPlayer, Potion.invisibility.id)) {
+        if (GTUtility.getPotion(aPlayer, Potion.invisibility.id)) {
             return;
         }
         try {
@@ -140,8 +140,8 @@ public class GT_CapeRenderer extends RenderPlayer {
                 GL11.glPopMatrix();
             }
         } catch (Throwable e) {
-            if (GT_Values.D1) {
-                e.printStackTrace(GT_Log.err);
+            if (GTValues.D1) {
+                e.printStackTrace(GTLog.err);
             }
         }
     }
diff --git a/src/main/java/gregtech/common/render/GT_CopiedBlockTexture.java b/src/main/java/gregtech/common/render/GTCopiedBlockTextureRender.java
index 937c1a994f..ab4282c7ba 100644
--- a/src/main/java/gregtech/common/render/GT_CopiedBlockTexture.java
+++ b/src/main/java/gregtech/common/render/GTCopiedBlockTextureRender.java
@@ -9,12 +9,12 @@ import gregtech.api.interfaces.IBlockContainer;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.util.LightingHelper;
 
-public class GT_CopiedBlockTexture extends GT_TextureBase implements ITexture, IBlockContainer {
+public class GTCopiedBlockTextureRender extends GTTextureBase implements ITexture, IBlockContainer {
 
     private final Block mBlock;
     private final byte mSide, mMeta;
 
-    protected GT_CopiedBlockTexture(Block aBlock, int ordinalSide, int aMeta, short[] aRGBa, boolean allowAlpha) {
+    protected GTCopiedBlockTextureRender(Block aBlock, int ordinalSide, int aMeta, short[] aRGBa, boolean allowAlpha) {
         if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_CopiedBlockTexture");
         mBlock = aBlock;
         mSide = (byte) ordinalSide;
diff --git a/src/main/java/gregtech/common/render/GT_CopiedCTMBlockTexture.java b/src/main/java/gregtech/common/render/GTCopiedCTMBlockTexture.java
index 17fa9ac8ff..d3f6292435 100644
--- a/src/main/java/gregtech/common/render/GT_CopiedCTMBlockTexture.java
+++ b/src/main/java/gregtech/common/render/GTCopiedCTMBlockTexture.java
@@ -7,15 +7,15 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.interfaces.IBlockContainer;
 import gregtech.api.interfaces.ITexture;
-import gregtech.api.util.GT_RenderingWorld;
+import gregtech.api.util.GTRenderingWorld;
 import gregtech.api.util.LightingHelper;
 
-class GT_CopiedCTMBlockTexture extends GT_TextureBase implements ITexture, IBlockContainer {
+class GTCopiedCTMBlockTexture extends GTTextureBase implements ITexture, IBlockContainer {
 
     private final Block mBlock;
     private final byte mSide, mMeta;
 
-    GT_CopiedCTMBlockTexture(Block aBlock, int ordinalSide, int aMeta, short[] aRGBa, boolean allowAlpha) {
+    GTCopiedCTMBlockTexture(Block aBlock, int ordinalSide, int aMeta, short[] aRGBa, boolean allowAlpha) {
         if (aRGBa.length != 4)
             throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_CopiedCTMBlockTexture");
         mBlock = aBlock;
@@ -33,8 +33,8 @@ class GT_CopiedCTMBlockTexture extends GT_TextureBase implements ITexture, IBloc
         return mBlock.getIcon(getBlockAccess(aRenderer), aX, aY, aZ, tSide);
     }
 
-    private GT_RenderingWorld getBlockAccess(RenderBlocks aRenderer) {
-        return GT_RenderingWorld.getInstance(aRenderer.blockAccess);
+    private GTRenderingWorld getBlockAccess(RenderBlocks aRenderer) {
+        return GTRenderingWorld.getInstance(aRenderer.blockAccess);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/render/GT_IconFlipped.java b/src/main/java/gregtech/common/render/GTIconFlipped.java
index 8258e74ffa..261e5e63b2 100644
--- a/src/main/java/gregtech/common/render/GT_IconFlipped.java
+++ b/src/main/java/gregtech/common/render/GTIconFlipped.java
@@ -6,13 +6,13 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
 @SideOnly(Side.CLIENT)
-public class GT_IconFlipped implements IIcon {
+public class GTIconFlipped implements IIcon {
 
     private final IIcon baseIcon;
     private final boolean flipU;
     private final boolean flipV;
 
-    public GT_IconFlipped(IIcon baseIcon, boolean flipU, boolean flipV) {
+    public GTIconFlipped(IIcon baseIcon, boolean flipU, boolean flipV) {
         this.baseIcon = baseIcon;
         this.flipU = flipU;
         this.flipV = flipV;
diff --git a/src/main/java/gregtech/common/render/GT_MultiTexture.java b/src/main/java/gregtech/common/render/GTMultiTextureRender.java
index d3cff271cb..1eaf4c69e3 100644
--- a/src/main/java/gregtech/common/render/GT_MultiTexture.java
+++ b/src/main/java/gregtech/common/render/GTMultiTextureRender.java
@@ -3,7 +3,7 @@ package gregtech.common.render;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.interfaces.ITexture;
 
 /**
@@ -14,15 +14,15 @@ import gregtech.api.interfaces.ITexture;
  * I should have done this much earlier...
  * </p>
  */
-public class GT_MultiTexture extends GT_TextureBase implements ITexture {
+public class GTMultiTextureRender extends GTTextureBase implements ITexture {
 
     protected final ITexture[] mTextures;
 
-    public static GT_MultiTexture get(ITexture... aTextures) {
-        return GT_Mod.instance.isClientSide() ? new GT_MultiTexture(aTextures) : null;
+    public static GTMultiTextureRender get(ITexture... aTextures) {
+        return GTMod.instance.isClientSide() ? new GTMultiTextureRender(aTextures) : null;
     }
 
-    protected GT_MultiTexture(ITexture... aTextures) {
+    protected GTMultiTextureRender(ITexture... aTextures) {
         mTextures = aTextures;
     }
 
diff --git a/src/main/java/gregtech/common/render/GT_RenderUtil.java b/src/main/java/gregtech/common/render/GTRenderUtil.java
index 68195513fe..650d827cff 100644
--- a/src/main/java/gregtech/common/render/GT_RenderUtil.java
+++ b/src/main/java/gregtech/common/render/GTRenderUtil.java
@@ -16,7 +16,7 @@ import org.lwjgl.opengl.GL11;
 
 import gregtech.api.interfaces.IGT_ItemWithMaterialRenderer;
 
-public class GT_RenderUtil {
+public class GTRenderUtil {
 
     public static void colorGTItem(ItemStack aStack) {
         if (aStack.getItem() instanceof IGT_ItemWithMaterialRenderer aItem) {
diff --git a/src/main/java/gregtech/common/render/GT_RenderedTexture.java b/src/main/java/gregtech/common/render/GTRenderedTexture.java
index afaf3b290c..3bd4e6d864 100644
--- a/src/main/java/gregtech/common/render/GT_RenderedTexture.java
+++ b/src/main/java/gregtech/common/render/GTRenderedTexture.java
@@ -18,7 +18,7 @@ import com.gtnewhorizon.structurelib.alignment.enumerable.ExtendedFacing;
 import com.gtnewhorizon.structurelib.alignment.enumerable.Flip;
 import com.gtnewhorizon.structurelib.alignment.enumerable.Rotation;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.interfaces.IColorModulationContainer;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
@@ -26,7 +26,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.util.LightingHelper;
 
-public class GT_RenderedTexture extends GT_TextureBase implements ITexture, IColorModulationContainer {
+public class GTRenderedTexture extends GTTextureBase implements ITexture, IColorModulationContainer {
 
     protected final IIconContainer mIconContainer;
     private final short[] mRGBa;
@@ -34,7 +34,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
     private final boolean stdOrient;
     private final boolean useExtFacing;
 
-    protected GT_RenderedTexture(IIconContainer aIcon, short[] aRGBa, boolean allowAlpha, boolean glow,
+    protected GTRenderedTexture(IIconContainer aIcon, short[] aRGBa, boolean allowAlpha, boolean glow,
         boolean stdOrient, boolean extFacing) {
         if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_RenderedTexture");
         mIconContainer = aIcon;
@@ -55,7 +55,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
         final boolean enableAO = aRenderer.enableAO;
         final LightingHelper lighting = new LightingHelper(aRenderer);
         if (glow) {
-            if (!GT_Mod.gregtechproxy.mRenderGlowTextures) {
+            if (!GTMod.gregtechproxy.mRenderGlowTextures) {
                 draw(aRenderer);
                 return;
             }
@@ -81,7 +81,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
         final boolean enableAO = aRenderer.enableAO;
         final LightingHelper lighting = new LightingHelper(aRenderer);
         if (glow) {
-            if (!GT_Mod.gregtechproxy.mRenderGlowTextures) {
+            if (!GTMod.gregtechproxy.mRenderGlowTextures) {
                 draw(aRenderer);
                 return;
             }
@@ -107,7 +107,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
         final boolean enableAO = aRenderer.enableAO;
         final LightingHelper lighting = new LightingHelper(aRenderer);
         if (glow) {
-            if (!GT_Mod.gregtechproxy.mRenderGlowTextures) {
+            if (!GTMod.gregtechproxy.mRenderGlowTextures) {
                 draw(aRenderer);
                 return;
             }
@@ -133,7 +133,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
         final boolean enableAO = aRenderer.enableAO;
         final LightingHelper lighting = new LightingHelper(aRenderer);
         if (glow) {
-            if (!GT_Mod.gregtechproxy.mRenderGlowTextures) {
+            if (!GTMod.gregtechproxy.mRenderGlowTextures) {
                 draw(aRenderer);
                 return;
             }
@@ -159,7 +159,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
         final boolean enableAO = aRenderer.enableAO;
         final LightingHelper lighting = new LightingHelper(aRenderer);
         if (glow) {
-            if (!GT_Mod.gregtechproxy.mRenderGlowTextures) {
+            if (!GTMod.gregtechproxy.mRenderGlowTextures) {
                 draw(aRenderer);
                 return;
             }
@@ -185,7 +185,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
         final boolean enableAO = aRenderer.enableAO;
         final LightingHelper lighting = new LightingHelper(aRenderer);
         if (glow) {
-            if (!GT_Mod.gregtechproxy.mRenderGlowTextures) {
+            if (!GTMod.gregtechproxy.mRenderGlowTextures) {
                 draw(aRenderer);
                 return;
             }
@@ -234,9 +234,9 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
             x,
             y,
             z,
-            useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped
-                ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped() ^ !stdOrient, aFlip.isVerticallyFliped())
-                : new GT_IconFlipped(icon, !stdOrient, false));
+            useExtFacing && GTMod.gregtechproxy.mRenderFlippedMachinesFlipped
+                ? new GTIconFlipped(icon, aFlip.isHorizontallyFlipped() ^ !stdOrient, aFlip.isVerticallyFliped())
+                : new GTIconFlipped(icon, !stdOrient, false));
         aRenderer.uvRotateBottom = 0;
     }
 
@@ -259,8 +259,8 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
             x,
             y,
             z,
-            useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped
-                ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped())
+            useExtFacing && GTMod.gregtechproxy.mRenderFlippedMachinesFlipped
+                ? new GTIconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped())
                 : icon);
         aRenderer.uvRotateTop = 0;
     }
@@ -285,8 +285,8 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
             x,
             y,
             z,
-            useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped
-                ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped())
+            useExtFacing && GTMod.gregtechproxy.mRenderFlippedMachinesFlipped
+                ? new GTIconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped())
                 : icon);
         aRenderer.uvRotateEast = 0;
         aRenderer.field_152631_f = false;
@@ -311,8 +311,8 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
             x,
             y,
             z,
-            useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped
-                ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped())
+            useExtFacing && GTMod.gregtechproxy.mRenderFlippedMachinesFlipped
+                ? new GTIconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped())
                 : icon);
         aRenderer.uvRotateWest = 0;
     }
@@ -336,8 +336,8 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
             x,
             y,
             z,
-            useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped
-                ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped())
+            useExtFacing && GTMod.gregtechproxy.mRenderFlippedMachinesFlipped
+                ? new GTIconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped())
                 : icon);
         aRenderer.uvRotateNorth = 0;
     }
@@ -362,8 +362,8 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
             x,
             y,
             z,
-            useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped
-                ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped())
+            useExtFacing && GTMod.gregtechproxy.mRenderFlippedMachinesFlipped
+                ? new GTIconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped())
                 : icon);
         aRenderer.uvRotateSouth = 0;
         aRenderer.field_152631_f = false;
@@ -371,7 +371,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
 
     private ExtendedFacing getExtendedFacing(int x, int y, int z) {
         if (stdOrient) return ExtendedFacing.DEFAULT;
-        final EntityPlayer player = GT_Mod.gregtechproxy.getThePlayer();
+        final EntityPlayer player = GTMod.gregtechproxy.getThePlayer();
         if (player == null) return ExtendedFacing.DEFAULT;
         final World w = player.getEntityWorld();
         if (w == null) return ExtendedFacing.DEFAULT;
diff --git a/src/main/java/gregtech/common/render/GT_Renderer_Block.java b/src/main/java/gregtech/common/render/GTRendererBlock.java
index aa61cc125e..1c8e2da29d 100644
--- a/src/main/java/gregtech/common/render/GT_Renderer_Block.java
+++ b/src/main/java/gregtech/common/render/GTRendererBlock.java
@@ -1,11 +1,11 @@
 package gregtech.common.render;
 
-import static gregtech.api.enums.GT_Values.SIDE_DOWN;
-import static gregtech.api.enums.GT_Values.SIDE_EAST;
-import static gregtech.api.enums.GT_Values.SIDE_NORTH;
-import static gregtech.api.enums.GT_Values.SIDE_SOUTH;
-import static gregtech.api.enums.GT_Values.SIDE_UP;
-import static gregtech.api.enums.GT_Values.SIDE_WEST;
+import static gregtech.api.enums.GTValues.SIDE_DOWN;
+import static gregtech.api.enums.GTValues.SIDE_EAST;
+import static gregtech.api.enums.GTValues.SIDE_NORTH;
+import static gregtech.api.enums.GTValues.SIDE_SOUTH;
+import static gregtech.api.enums.GTValues.SIDE_UP;
+import static gregtech.api.enums.GTValues.SIDE_WEST;
 import static gregtech.api.interfaces.metatileentity.IConnectable.CONNECTED_DOWN;
 import static gregtech.api.interfaces.metatileentity.IConnectable.CONNECTED_EAST;
 import static gregtech.api.interfaces.metatileentity.IConnectable.CONNECTED_NORTH;
@@ -42,8 +42,8 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IAllSidedTexturedTileEntity;
@@ -52,13 +52,13 @@ import gregtech.api.interfaces.tileentity.IPipeRenderedTileEntity;
 import gregtech.api.interfaces.tileentity.ITexturedTileEntity;
 import gregtech.api.metatileentity.MetaPipeEntity;
 import gregtech.api.objects.XSTR;
-import gregtech.common.blocks.GT_Block_FrameBox;
-import gregtech.common.blocks.GT_Block_Machines;
-import gregtech.common.blocks.GT_Block_Ores_Abstract;
-import gregtech.common.blocks.GT_TileEntity_Ores;
+import gregtech.common.blocks.BlockFrameBox;
+import gregtech.common.blocks.BlockMachines;
+import gregtech.common.blocks.BlockOresAbstract;
+import gregtech.common.blocks.TileEntityOres;
 
 @ThreadSafeISBRH(perThread = true)
-public class GT_Renderer_Block implements ISimpleBlockRenderingHandler {
+public class GTRendererBlock implements ISimpleBlockRenderingHandler {
 
     public static final float bloc