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

6 files changed, 118 insertions, 123 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneBase.java
index ee6ccff4b1..6da66be563 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneBase.java
@@ -9,25 +9,25 @@ import org.apache.commons.lang3.ArrayUtils;
 
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
-import gregtech.api.objects.GT_ItemStack;
-import gtPlusPlus.core.lib.CORE;
+import gregtech.api.metatileentity.implementations.MTETieredMachineBlock;
+import gregtech.api.objects.GTItemStack;
+import gtPlusPlus.core.lib.GTPPCore;
 
-public abstract class GT_MetaTileEntity_RedstoneBase extends GT_MetaTileEntity_TieredMachineBlock {
+public abstract class MTERedstoneBase extends MTETieredMachineBlock {
 
     protected int mOpenerCount;
 
-    public GT_MetaTileEntity_RedstoneBase(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+    public MTERedstoneBase(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
         String aDescription, ITexture... aTextures) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_RedstoneBase(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+    public MTERedstoneBase(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
         String[] aDescription, ITexture... aTextures) {
         super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
     }
 
-    public GT_MetaTileEntity_RedstoneBase(String aName, int aTier, int aInvSlotCount, String[] aDescription,
+    public MTERedstoneBase(String aName, int aTier, int aInvSlotCount, String[] aDescription,
         ITexture[][][] aTextures) {
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);
     }
@@ -38,7 +38,7 @@ public abstract class GT_MetaTileEntity_RedstoneBase extends GT_MetaTileEntity_T
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) {
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aStack) {
         return side != getBaseMetaTileEntity().getFrontFacing();
     }
 
@@ -106,6 +106,6 @@ public abstract class GT_MetaTileEntity_RedstoneBase extends GT_MetaTileEntity_T
 
     @Override
     public String[] getDescription() {
-        return ArrayUtils.add(this.mDescriptionArray, CORE.GT_Tooltip.get());
+        return ArrayUtils.add(this.mDescriptionArray, GTPPCore.GT_Tooltip.get());
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneButtonPanel.java
index 174a13d3c8..a83d05f928 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneButtonPanel.java
@@ -8,11 +8,11 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.objects.GTRenderedTexture;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
 
-public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_RedstoneBase {
+public class MTERedstoneButtonPanel extends MTERedstoneBase {
 
     public byte mRedstoneStrength = 0, mType = 0, mUpdate = 0;
 
@@ -24,7 +24,7 @@ public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_Red
         }
     }
 
-    public GT_MetaTileEntity_RedstoneButtonPanel(int aID) {
+    public MTERedstoneButtonPanel(int aID) {
         super(
             aID,
             "redstone.button.panel",
@@ -34,14 +34,13 @@ public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_Red
             "Right-click with Screwdriver to change Button Design");
     }
 
-    public GT_MetaTileEntity_RedstoneButtonPanel(final String aName, String[] aDescription,
-        final ITexture[][][] aTextures) {
+    public MTERedstoneButtonPanel(final String aName, String[] aDescription, final ITexture[][][] aTextures) {
         super(aName, 5, 0, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_RedstoneButtonPanel(this.mName, mDescriptionArray, this.mTextures);
+        return new MTERedstoneButtonPanel(this.mName, mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -162,7 +161,7 @@ public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_Red
         final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) {
         if (side == facing) {
             return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1],
-                new GT_RenderedTexture(sIconList[mType * 16 + mRedstoneStrength]) };
+                new GTRenderedTexture(sIconList[mType * 16 + mRedstoneStrength]) };
         }
         return this.mTextures[(aActive || hasRedstoneSignal() ? 5 : 0) + (side == facing ? 0
             : side == facing.getOpposite() ? 1
@@ -175,31 +174,31 @@ public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_Red
 
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Main_Off) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Main_Off) };
     }
 
     public ITexture[] getTopActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Main_On) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Main_On) };
     }
 
     public ITexture[] getBottom(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Main_Off) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Main_Off) };
     }
 
     public ITexture[] getBottomActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Main_On) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Main_On) };
     }
 
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Main_Off) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Main_Off) };
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Main_On) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Main_On) };
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneCircuitBlock.java
index 3b9b9af9a0..20cd569e24 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneCircuitBlock.java
@@ -24,44 +24,42 @@ import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.gui.modularui.GT_UIInfos;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
+import gregtech.api.gui.modularui.GTUIInfos;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.IRedstoneCircuitBlock;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_CircuitryBehavior;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.objects.GTRenderedTexture;
+import gregtech.api.util.CircuitryBehavior;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
-import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures;
+import gtPlusPlus.xmod.gregtech.api.gui.GTPPUITextures;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
-public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_RedstoneBase
-    implements IRedstoneCircuitBlock, IAddUIWidgets {
+public class MTERedstoneCircuitBlock extends MTERedstoneBase implements IRedstoneCircuitBlock, IAddUIWidgets {
 
     public int mGate = 0, mGateData[] = new int[] { 0, 0, 0, 0, 0, 0, 0, 0 };
     public boolean bOutput = true;
 
-    public GT_MetaTileEntity_RedstoneCircuitBlock(int aID) {
+    public MTERedstoneCircuitBlock(int aID) {
         super(aID, "redstone.circuit", "Redstone Circuit Block", 1, 5, "Computes Redstone");
     }
 
-    public GT_MetaTileEntity_RedstoneCircuitBlock(final String aName, String[] aDescription,
-        final ITexture[][][] aTextures) {
+    public MTERedstoneCircuitBlock(final String aName, String[] aDescription, final ITexture[][][] aTextures) {
         super(aName, 1, 5, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_RedstoneCircuitBlock(this.mName, mDescriptionArray, this.mTextures);
+        return new MTERedstoneCircuitBlock(this.mName, mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -111,12 +109,12 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
 
     @Override
     public long maxEUInput() {
-        return GT_Values.V[1];
+        return GTValues.V[1];
     }
 
     @Override
     public long maxEUOutput() {
-        return bOutput ? GT_Values.V[1] : 0;
+        return bOutput ? GTValues.V[1] : 0;
     }
 
     @Override
@@ -136,12 +134,12 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
 
     @Override
     public long maxEUStore() {
-        return GT_Values.V[3] * 1024;
+        return GTValues.V[3] * 1024;
     }
 
     @Override
     public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) {
-        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
+        GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -160,37 +158,37 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
 
     public void switchGateForward(boolean aShift) {
         try {
-            Set<Integer> tKeys = GregTech_API.sCircuitryBehaviors.keySet();
+            Set<Integer> tKeys = GregTechAPI.sCircuitryBehaviors.keySet();
             ArrayList<Integer> tList = new ArrayList<>();
             tList.addAll(tKeys);
             if (tList.size() <= 0) return;
             Collections.sort(tList);
-            if (!GregTech_API.sCircuitryBehaviors.containsKey(mGate)) mGate = tList.get(0);
+            if (!GregTechAPI.sCircuitryBehaviors.containsKey(mGate)) mGate = tList.get(0);
             int tIndex = Collections.binarySearch(tList, mGate);
             tIndex += aShift ? 16 : 1;
             while (tIndex >= tList.size()) tIndex -= tList.size();
             mGate = tList.get(tIndex);
             switchGate();
         } catch (Throwable e) {
-            GT_Log.err.print(e);
+            GTLog.err.print(e);
         }
     }
 
     public void switchGateBackward(boolean aShift) {
         try {
-            Set<Integer> tKeys = GregTech_API.sCircuitryBehaviors.keySet();
+            Set<Integer> tKeys = GregTechAPI.sCircuitryBehaviors.keySet();
             ArrayList<Integer> tList = new ArrayList<>();
             tList.addAll(tKeys);
             if (tList.size() <= 0) return;
             Collections.sort(tList);
-            if (!GregTech_API.sCircuitryBehaviors.containsKey(mGate)) mGate = tList.get(0);
+            if (!GregTechAPI.sCircuitryBehaviors.containsKey(mGate)) mGate = tList.get(0);
             int tIndex = Collections.binarySearch(tList, mGate);
             tIndex -= aShift ? 16 : 1;
             while (tIndex < 0) tIndex += tList.size();
             mGate = tList.get(tIndex);
             switchGate();
         } catch (Throwable e) {
-            GT_Log.err.print(e);
+            GTLog.err.print(e);
         }
     }
 
@@ -214,28 +212,28 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
     }
 
     public void stackGateData(int aIndex, ItemStack aStack) {
-        mGateData[aIndex] = GT_Utility.stackToInt(aStack);
+        mGateData[aIndex] = GTUtility.stackToInt(aStack);
         validateGateData();
     }
 
     private void switchGate() {
         resetRedstone();
         Arrays.fill(mGateData, 0);
-        GT_CircuitryBehavior tBehaviour = GregTech_API.sCircuitryBehaviors.get(mGate);
+        CircuitryBehavior tBehaviour = GregTechAPI.sCircuitryBehaviors.get(mGate);
         if (tBehaviour != null) try {
             tBehaviour.initParameters(mGateData, this);
         } catch (Throwable e) {
-            GT_Log.err.print(e);
+            GTLog.err.print(e);
         }
         validateGateData();
     }
 
     private void validateGateData() {
-        GT_CircuitryBehavior tBehaviour = GregTech_API.sCircuitryBehaviors.get(mGate);
+        CircuitryBehavior tBehaviour = GregTechAPI.sCircuitryBehaviors.get(mGate);
         if (tBehaviour != null) try {
             tBehaviour.validateParameters(mGateData, this);
         } catch (Throwable e) {
-            GT_Log.err.print(e);
+            GTLog.err.print(e);
         }
     }
 
@@ -254,7 +252,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
             mInventory[0] = mInventory[1] = mInventory[2] = mInventory[3] = mInventory[4] = null;
             if (getBaseMetaTileEntity().getUniversalEnergyStored() >= getMinimumStoredEU()) {
                 if (getBaseMetaTileEntity().isActive()) {
-                    GT_CircuitryBehavior tBehaviour = GregTech_API.sCircuitryBehaviors.get(mGate);
+                    CircuitryBehavior tBehaviour = GregTechAPI.sCircuitryBehaviors.get(mGate);
                     if (tBehaviour != null) {
                         try {
                             tBehaviour.onTick(mGateData, this);
@@ -267,7 +265,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
                             if (tBehaviour.displayItemStack(mGateData, this, 3))
                                 mInventory[4] = getCoverByID(mGateData[3]);
                         } catch (Throwable e) {
-                            GT_Log.err.print(e);
+                            GTLog.err.print(e);
                         }
                     }
                 }
@@ -313,11 +311,11 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
     public static final Map<Integer, ItemStack> sCoversItems = new HashMap<>();
 
     private static void initCovers() {
-        for (GT_ItemStack aKey : GregTech_API.sCovers.keySet()) {
+        for (GTItemStack aKey : GregTechAPI.sCovers.keySet()) {
             ItemStack aStack = aKey.toStack()
                 .copy();
             if (aStack != null) {
-                sCoversItems.put(GT_Utility.stackToInt(aStack), aStack);
+                sCoversItems.put(GTUtility.stackToInt(aStack), aStack);
             }
         }
     }
@@ -398,8 +396,8 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
     }
 
     @Override
-    public GT_CoverBehavior getCover(ForgeDirection side) {
-        return (GT_CoverBehavior) getBaseMetaTileEntity().getCoverBehaviorAtSideNew(side);
+    public CoverBehavior getCover(ForgeDirection side) {
+        return (CoverBehavior) getBaseMetaTileEntity().getCoverBehaviorAtSideNew(side);
     }
 
     @Override
@@ -443,48 +441,48 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
                 : side == ForgeDirection.DOWN ? 2 : side == ForgeDirection.UP ? 3 : 4)][aColorIndex + 1];
     }
 
-    private GT_RenderedTexture getBase() {
-        return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
+    private GTRenderedTexture getBase() {
+        return new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
     }
 
     public ITexture[] getTop(final byte aColor) {
-        return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Off) };
+        return new ITexture[] { getBase(), new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Off) };
     }
 
     public ITexture[] getTopActive(final byte aColor) {
-        return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_On) };
+        return new ITexture[] { getBase(), new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Top_On) };
     }
 
     public ITexture[] getBack(final byte aColor) {
-        return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off),
-            new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red) };
+        return new ITexture[] { getBase(), new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off),
+            new GTRenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red) };
     }
 
     public ITexture[] getBackActive(final byte aColor) {
-        return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On),
-            new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red_Redstone) };
+        return new ITexture[] { getBase(), new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On),
+            new GTRenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red_Redstone) };
     }
 
     public ITexture[] getBottom(final byte aColor) {
-        return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Off) };
+        return new ITexture[] { getBase(), new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Off) };
     }
 
     public ITexture[] getBottomActive(final byte aColor) {
-        return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_On) };
+        return new ITexture[] { getBase(), new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_On) };
     }
 
     public ITexture[] getSides(final byte aColor) {
-        return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off) };
+        return new ITexture[] { getBase(), new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off) };
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
-        return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On) };
+        return new ITexture[] { getBase(), new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On) };
     }
 
     @Override
     public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
         builder.widget(
-            new DrawableWidget().setDrawable(GTPP_UITextures.PICTURE_REDSTONE_CIRCUIT_SCREEN)
+            new DrawableWidget().setDrawable(GTPPUITextures.PICTURE_REDSTONE_CIRCUIT_SCREEN)
                 .setPos(43, 5)
                 .setSize(108, 72));
         for (int i = 0; i < 4; i++) {
@@ -497,12 +495,12 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
                         index,
                         clickData.mouseButton == 0 ? clickData.shift ? +128 : +1 : clickData.shift ? -128 : -1);
                 } else {
-                    tStack = GT_Utility.copy(tStack);
+                    tStack = GTUtility.copy(tStack);
                     if (clickData.mouseButton != 0) tStack.setItemDamage(OreDictionary.WILDCARD_VALUE);
                     stackGateData(index, tStack);
                 }
             })
-                .setBackground(GT_UITextures.BUTTON_STANDARD, GTPP_UITextures.OVERLAY_BUTTON_PLUS_MINUS)
+                .setBackground(GTUITextures.BUTTON_STANDARD, GTPPUITextures.OVERLAY_BUTTON_PLUS_MINUS)
                 .setPos(7, 5 + i * 18)
                 .setSize(18, 18))
                 .widget(
@@ -512,16 +510,16 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
         }
         builder.widget(
             new CycleButtonWidget().setToggle(() -> bOutput, val -> bOutput = val)
-                .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
-                .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EMIT_ENERGY)
+                .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
+                .setStaticTexture(GTUITextures.OVERLAY_BUTTON_EMIT_ENERGY)
                 .addTooltip("Toggle EU Output")
                 .setPos(151, 5)
                 .setSize(18, 18))
             .widget(
                 new CycleButtonWidget()
                     .setToggle(() -> getBaseMetaTileEntity().isActive(), val -> getBaseMetaTileEntity().setActive(val))
-                    .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
-                    .setStaticTexture(GTPP_UITextures.OVERLAY_BUTTON_ACTIVE_STATE)
+                    .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
+                    .setStaticTexture(GTPPUITextures.OVERLAY_BUTTON_ACTIVE_STATE)
                     .addTooltip("Toggle Active State")
                     .setPos(151, 23)
                     .setSize(18, 18))
@@ -529,7 +527,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
                 if (clickData.mouseButton == 0) switchGateForward(clickData.shift);
                 else switchGateBackward(clickData.shift);
             })
-                .setBackground(GT_UITextures.BUTTON_STANDARD, GTPP_UITextures.OVERLAY_BUTTON_CHANGE_MODE)
+                .setBackground(GTUITextures.BUTTON_STANDARD, GTPPUITextures.OVERLAY_BUTTON_CHANGE_MODE)
                 .addTooltip("Change Redstone Circuit")
                 .setPos(151, 41)
                 .setSize(18, 18));
@@ -543,12 +541,12 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
         builder.widget(new DrawableWidget().setDrawable(() -> {
             if (getBaseMetaTileEntity().getErrorDisplayID() > 0) {
                 if ((getBaseMetaTileEntity().getTimer() / 5) % 2 == 0) {
-                    return GTPP_UITextures.PICTURE_ELECTRICITY_ERROR;
+                    return GTPPUITextures.PICTURE_ELECTRICITY_ERROR;
                 } else {
                     return null;
                 }
             } else {
-                return GTPP_UITextures.PICTURE_ELECTRICITY_FINE;
+                return GTPPUITextures.PICTURE_ELECTRICITY_FINE;
             }
         })
             .setPos(140, 9)
@@ -559,7 +557,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
                     val -> getBaseMetaTileEntity().setErrorDisplayID(val)));
 
         builder.widget(TextWidget.dynamicString(() -> {
-            GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+            CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate);
             if (tCircuit != null) return tCircuit.getName();
             return "";
         })
@@ -567,7 +565,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
             .setDefaultColor(COLOR_TEXT_WHITE.get())
             .setPos(46, 8))
             .widget(TextWidget.dynamicString(() -> {
-                GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate);
                 if (tCircuit != null) return tCircuit.getDescription();
                 return "";
             })
@@ -575,7 +573,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
                 .setDefaultColor(COLOR_TEXT_WHITE.get())
                 .setPos(46, 19))
             .widget(TextWidget.dynamicString(() -> {
-                GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate);
                 if (tCircuit != null) return tCircuit.getDataDescription(mGateData, 0);
                 return "";
             })
@@ -583,7 +581,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
                 .setDefaultColor(COLOR_TEXT_WHITE.get())
                 .setPos(46, 33))
             .widget(TextWidget.dynamicString(() -> {
-                GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate);
                 if (tCircuit != null) return tCircuit.getDataDescription(mGateData, 1);
                 return "";
             })
@@ -591,7 +589,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
                 .setDefaultColor(COLOR_TEXT_WHITE.get())
                 .setPos(46, 44))
             .widget(TextWidget.dynamicString(() -> {
-                GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate);
                 if (tCircuit != null) return tCircuit.getDataDescription(mGateData, 2);
                 return "";
             })
@@ -599,7 +597,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
                 .setDefaultColor(COLOR_TEXT_WHITE.get())
                 .setPos(46, 55))
             .widget(TextWidget.dynamicString(() -> {
-                GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate);
                 if (tCircuit != null) return tCircuit.getDataDescription(mGateData, 3);
                 return "";
             })
@@ -607,10 +605,10 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
                 .setDefaultColor(COLOR_TEXT_WHITE.get())
                 .setPos(46, 66))
             .widget(TextWidget.dynamicString(() -> {
-                GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate);
                 if (tCircuit != null) {
                     String tString = tCircuit.getDataDisplay(mGateData, 0);
-                    return tString == null ? GT_Utility.parseNumberToString(mGateData[0]) : tString;
+                    return tString == null ? GTUtility.parseNumberToString(mGateData[0]) : tString;
                 }
                 return "";
             })
@@ -618,10 +616,10 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
                 .setDefaultColor(COLOR_TEXT_WHITE.get())
                 .setPos(99, 33))
             .widget(TextWidget.dynamicString(() -> {
-                GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate);
                 if (tCircuit != null) {
                     String tString = tCircuit.getDataDisplay(mGateData, 1);
-                    return tString == null ? GT_Utility.parseNumberToString(mGateData[1]) : tString;
+                    return tString == null ? GTUtility.parseNumberToString(mGateData[1]) : tString;
                 }
                 return "";
             })
@@ -629,10 +627,10 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
                 .setDefaultColor(COLOR_TEXT_WHITE.get())
                 .setPos(99, 44))
             .widget(TextWidget.dynamicString(() -> {
-                GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate);
                 if (tCircuit != null) {
                     String tString = tCircuit.getDataDisplay(mGateData, 2);
-                    return tString == null ? GT_Utility.parseNumberToString(mGateData[2]) : tString;
+                    return tString == null ? GTUtility.parseNumberToString(mGateData[2]) : tString;
                 }
                 return "";
             })
@@ -640,10 +638,10 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
                 .setDefaultColor(COLOR_TEXT_WHITE.get())
                 .setPos(99, 55))
             .widget(TextWidget.dynamicString(() -> {
-                GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate);
                 if (tCircuit != null) {
                     String tString = tCircuit.getDataDisplay(mGateData, 3);
-                    return tString == null ? GT_Utility.parseNumberToString(mGateData[3]) : tString;
+                    return tString == null ? GTUtility.parseNumberToString(mGateData[3]) : tString;
                 }
                 return "";
             })
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneLamp.java
index 06dd76c3f4..7b963d3c7d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneLamp.java
@@ -6,11 +6,11 @@ import net.minecraftforge.common.util.ForgeDirection;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.objects.GTRenderedTexture;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
 
-public class GT_MetaTileEntity_RedstoneLamp extends GT_MetaTileEntity_RedstoneBase {
+public class MTERedstoneLamp extends MTERedstoneBase {
 
     public byte mRedstoneStrength = 0, mType = 0;
     public static TexturesGtBlock.CustomIcon[] sIconList = new TexturesGtBlock.CustomIcon[2];
@@ -20,17 +20,17 @@ public class GT_MetaTileEntity_RedstoneLamp extends GT_MetaTileEntity_RedstoneBa
         sIconList[1] = new CustomIcon("TileEntities/gt4/redstone/Lamp/on");
     }
 
-    public GT_MetaTileEntity_RedstoneLamp(int aID) {
+    public MTERedstoneLamp(int aID) {
         super(aID, "redstone.lamp", "Redstone Controlled Lamp", 0, 0, "Redstone Controlled Lamp");
     }
 
-    public GT_MetaTileEntity_RedstoneLamp(final String aName, String[] aDescription, final ITexture[][][] aTextures) {
+    public MTERedstoneLamp(final String aName, String[] aDescription, final ITexture[][][] aTextures) {
         super(aName, 0, 0, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_RedstoneLamp(this.mName, mDescriptionArray, this.mTextures);
+        return new MTERedstoneLamp(this.mName, mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -64,10 +64,10 @@ public class GT_MetaTileEntity_RedstoneLamp extends GT_MetaTileEntity_RedstoneBa
     }
 
     public ITexture[] getSides(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(sIconList[0]) };
+        return new ITexture[] { new GTRenderedTexture(sIconList[0]) };
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
-        return new ITexture[] { new GT_RenderedTexture(sIconList[1]) };
+        return new ITexture[] { new GTRenderedTexture(sIconList[1]) };
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneStrengthDisplay.java
index b3b9d0fdcb..c2591c6a41 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneStrengthDisplay.java
@@ -8,11 +8,11 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.objects.GTRenderedTexture;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
 
-public class GT_MetaTileEntity_RedstoneStrengthDisplay extends GT_MetaTileEntity_RedstoneBase {
+public class MTERedstoneStrengthDisplay extends MTERedstoneBase {
 
     public byte mRedstoneStrength = 0, mType = 0;
     public static TexturesGtBlock.CustomIcon[] sIconList = new TexturesGtBlock.CustomIcon[144];
@@ -23,18 +23,17 @@ public class GT_MetaTileEntity_RedstoneStrengthDisplay extends GT_MetaTileEntity
         }
     }
 
-    public GT_MetaTileEntity_RedstoneStrengthDisplay(int aID, String aUnlocal, String aLocal, String aDescription) {
+    public MTERedstoneStrengthDisplay(int aID, String aUnlocal, String aLocal, String aDescription) {
         super(aID, aUnlocal, aLocal, 5, 0, aDescription);
     }
 
-    public GT_MetaTileEntity_RedstoneStrengthDisplay(final String aName, String[] aDescription,
-        final ITexture[][][] aTextures) {
+    public MTERedstoneStrengthDisplay(final String aName, String[] aDescription, final ITexture[][][] aTextures) {
         super(aName, 5, 0, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_RedstoneStrengthDisplay(this.mName, mDescriptionArray, this.mTextures);
+        return new MTERedstoneStrengthDisplay(this.mName, mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -96,7 +95,7 @@ public class GT_MetaTileEntity_RedstoneStrengthDisplay extends GT_MetaTileEntity
         final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) {
         if (side == facing) {
             return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1],
-                new GT_RenderedTexture(sIconList[mType * 16 + mRedstoneStrength]) };
+                new GTRenderedTexture(sIconList[mType * 16 + mRedstoneStrength]) };
         }
         return this.mTextures[(aActive || hasRedstoneSignal() ? 5 : 0) + (side == facing ? 0
             : side == facing.getOpposite() ? 1
@@ -109,31 +108,31 @@ public class GT_MetaTileEntity_RedstoneStrengthDisplay extends GT_MetaTileEntity
 
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Off) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Off) };
     }
 
     public ITexture[] getTopActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_On) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Top_On) };
     }
 
     public ITexture[] getBottom(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Off) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Off) };
     }
 
     public ITexture[] getBottomActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_On) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_On) };
     }
 
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off) };
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
         return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On) };
+            new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On) };
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneStrengthScale.java
index 5821dbab1a..e59500dcc0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneStrengthScale.java
@@ -7,11 +7,11 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.objects.GTRenderedTexture;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
 
-public class GT_MetaTileEntity_RedstoneStrengthScale extends GT_MetaTileEntity_RedstoneStrengthDisplay {
+public class MTERedstoneStrengthScale extends MTERedstoneStrengthDisplay {
 
     public static TexturesGtBlock.CustomIcon[] sIconList = new TexturesGtBlock.CustomIcon[32];
 
@@ -21,18 +21,17 @@ public class GT_MetaTileEntity_RedstoneStrengthScale extends GT_MetaTileEntity_R
         }
     }
 
-    public GT_MetaTileEntity_RedstoneStrengthScale(int aID) {
+    public MTERedstoneStrengthScale(int aID) {
         super(aID, "redstone.display.scale", "Redstone Scale", "Redstone Strength on a Scale");
     }
 
-    public GT_MetaTileEntity_RedstoneStrengthScale(final String aName, String[] aDescription,
-        final ITexture[][][] aTextures) {
+    public MTERedstoneStrengthScale(final String aName, String[] aDescription, final ITexture[][][] aTextures) {
         super(aName, aDescription, aTextures);
     }
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_RedstoneStrengthScale(this.mName, mDescriptionArray, this.mTextures);
+        return new MTERedstoneStrengthScale(this.mName, mDescriptionArray, this.mTextures);
     }
 
     @Override
@@ -45,7 +44,7 @@ public class GT_MetaTileEntity_RedstoneStrengthScale extends GT_MetaTileEntity_R
         final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) {
         if (side == facing) {
             return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1],
-                new GT_RenderedTexture(sIconList[mType * 16 + mRedstoneStrength]) };
+                new GTRenderedTexture(sIconList[mType * 16 + mRedstoneStrength]) };
         }
         return this.mTextures[(aActive || hasRedstoneSignal() ? 5 : 0) + (side == facing ? 0
             : side == facing.getOpposite() ? 1