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

18 files changed, 193 insertions, 197 deletions

diff --git a/src/main/java/gregtech/api/net/GT_Packet.java b/src/main/java/gregtech/api/net/GTPacket.java
index d06ea7d0d3..1d2de3303b 100644
--- a/src/main/java/gregtech/api/net/GT_Packet.java
+++ b/src/main/java/gregtech/api/net/GTPacket.java
@@ -8,12 +8,12 @@ import com.google.common.io.ByteArrayDataInput;
 import io.netty.buffer.ByteBuf;
 
 /**
- * @deprecated Use {@link GT_Packet_New} instead
+ * @deprecated Use {@link GTPacketNew} instead
  */
 @Deprecated
-public abstract class GT_Packet {
+public abstract class GTPacket {
 
-    public GT_Packet(boolean aIsReference) {
+    public GTPacket(boolean aIsReference) {
         //
     }
 
@@ -42,7 +42,7 @@ public abstract class GT_Packet {
     /**
      * @return encoded byte Stream
      */
-    public abstract GT_Packet decode(ByteArrayDataInput aData);
+    public abstract GTPacket decode(ByteArrayDataInput aData);
 
     /**
      * Process the packet
diff --git a/src/main/java/gregtech/api/net/GT_Packet_Block_Event.java b/src/main/java/gregtech/api/net/GTPacketBlockEvent.java
index 9adf583698..a2164f4f07 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_Block_Event.java
+++ b/src/main/java/gregtech/api/net/GTPacketBlockEvent.java
@@ -10,17 +10,17 @@ import io.netty.buffer.ByteBuf;
 /**
  * Used to transfer Block Events in a much better fashion
  */
-public class GT_Packet_Block_Event extends GT_Packet_New {
+public class GTPacketBlockEvent extends GTPacketNew {
 
     private int mX, mZ;
     private short mY;
     private byte mID, mValue;
 
-    public GT_Packet_Block_Event() {
+    public GTPacketBlockEvent() {
         super(true);
     }
 
-    public GT_Packet_Block_Event(int aX, short aY, int aZ, byte aID, byte aValue) {
+    public GTPacketBlockEvent(int aX, short aY, int aZ, byte aID, byte aValue) {
         super(false);
         mX = aX;
         mY = aY;
@@ -39,8 +39,8 @@ public class GT_Packet_Block_Event extends GT_Packet_New {
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput aData) {
-        return new GT_Packet_Block_Event(
+    public GTPacketNew decode(ByteArrayDataInput aData) {
+        return new GTPacketBlockEvent(
             aData.readInt(),
             aData.readShort(),
             aData.readInt(),
@@ -58,6 +58,6 @@ public class GT_Packet_Block_Event extends GT_Packet_New {
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.BLOCK_EVENT.id;
+        return GTPacketTypes.BLOCK_EVENT.id;
     }
 }
diff --git a/src/main/java/gregtech/api/net/GT_Packet_ClientPreference.java b/src/main/java/gregtech/api/net/GTPacketClientPreference.java
index a5fd8a2e08..ea5d9ec476 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_ClientPreference.java
+++ b/src/main/java/gregtech/api/net/GTPacketClientPreference.java
@@ -7,27 +7,27 @@ import net.minecraft.world.IBlockAccess;
 
 import com.google.common.io.ByteArrayDataInput;
 
-import gregtech.GT_Mod;
-import gregtech.api.util.GT_ClientPreference;
+import gregtech.GTMod;
+import gregtech.api.util.GTClientPreference;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Packet_ClientPreference extends GT_Packet_New {
+public class GTPacketClientPreference extends GTPacketNew {
 
-    private GT_ClientPreference mPreference;
+    private GTClientPreference mPreference;
     private EntityPlayerMP mPlayer;
 
-    public GT_Packet_ClientPreference() {
+    public GTPacketClientPreference() {
         super(true);
     }
 
-    public GT_Packet_ClientPreference(GT_ClientPreference mPreference) {
+    public GTPacketClientPreference(GTClientPreference mPreference) {
         super(false);
         this.mPreference = mPreference;
     }
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.CLIENT_PREFERENCE.id;
+        return GTPacketTypes.CLIENT_PREFERENCE.id;
     }
 
     @Override
@@ -39,7 +39,7 @@ public class GT_Packet_ClientPreference extends GT_Packet_New {
 
     @Override
     public void process(IBlockAccess aWorld) {
-        if (mPlayer != null) GT_Mod.gregtechproxy.setClientPreference(mPlayer.getUniqueID(), mPreference);
+        if (mPlayer != null) GTMod.gregtechproxy.setClientPreference(mPlayer.getUniqueID(), mPreference);
     }
 
     @Override
@@ -51,12 +51,8 @@ public class GT_Packet_ClientPreference extends GT_Packet_New {
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput aData) {
-        return new GT_Packet_ClientPreference(
-            new GT_ClientPreference(
-                aData.readBoolean(),
-                aData.readBoolean(),
-                aData.readBoolean(),
-                aData.readBoolean()));
+    public GTPacketNew decode(ByteArrayDataInput aData) {
+        return new GTPacketClientPreference(
+            new GTClientPreference(aData.readBoolean(), aData.readBoolean(), aData.readBoolean(), aData.readBoolean()));
     }
 }
diff --git a/src/main/java/gregtech/api/net/GT_Packet_MultiTileEntity.java b/src/main/java/gregtech/api/net/GTPacketMultiTileEntity.java
index 33cb4f2dcf..b151f8eb5f 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_MultiTileEntity.java
+++ b/src/main/java/gregtech/api/net/GTPacketMultiTileEntity.java
@@ -1,6 +1,6 @@
 package gregtech.api.net;
 
-import static gregtech.api.enums.GT_Values.B;
+import static gregtech.api.enums.GTValues.B;
 
 import java.util.HashSet;
 import java.util.Objects;
@@ -18,13 +18,13 @@ import gregtech.api.net.data.MultiTileEntityProcess;
 import gregtech.api.net.data.PacketData;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Packet_MultiTileEntity extends GT_Packet_New {
+public class GTPacketMultiTileEntity extends GTPacketNew {
 
     private final Set<PacketData<MultiTileEntityProcess>> data = new HashSet<>();
     public static final int COVERS = B[0], REDSTONE = B[1], MODES = B[2], CONTROLLER = B[3], INVENTORY_INDEX = B[4],
         INVENTORY_NAME_ID = B[5], BOOLEANS = B[6], SOUND = B[7];
 
-    public GT_Packet_MultiTileEntity(boolean reference) {
+    public GTPacketMultiTileEntity(boolean reference) {
         super(reference);
     }
 
@@ -97,11 +97,11 @@ public class GT_Packet_MultiTileEntity extends GT_Packet_New {
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput in) {
+    public GTPacketNew decode(ByteArrayDataInput in) {
         Objects.requireNonNull(in);
         final int packetFeatures = in.readInt();
 
-        final GT_Packet_MultiTileEntity packet = new GT_Packet_MultiTileEntity(false);
+        final GTPacketMultiTileEntity packet = new GTPacketMultiTileEntity(false);
 
         if (containsBit(packetFeatures, CoordinateData.COORDINATE_DATA_ID)) {
             packet.addData(new CoordinateData());
@@ -225,7 +225,7 @@ public class GT_Packet_MultiTileEntity extends GT_Packet_New {
          * }
          * } catch (Exception e) {
          * e.printStackTrace();
-         * GT_Mod.GT_FML_LOGGER.error(
+         * GTMod.GT_FML_LOGGER.error(
          * "Exception setting tile entity data for tile entity {} at ({}, {}, {})",
          * tTileEntity,
          * mX,
@@ -237,7 +237,7 @@ public class GT_Packet_MultiTileEntity extends GT_Packet_New {
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.MULTI_TILE_ENTITY.id;
+        return GTPacketTypes.MULTI_TILE_ENTITY.id;
     }
 
     public void clearData() {
diff --git a/src/main/java/gregtech/api/net/GT_Packet_MusicSystemData.java b/src/main/java/gregtech/api/net/GTPacketMusicSystemData.java
index 13ebf49205..c650188594 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_MusicSystemData.java
+++ b/src/main/java/gregtech/api/net/GTPacketMusicSystemData.java
@@ -4,26 +4,26 @@ import net.minecraft.world.IBlockAccess;
 
 import com.google.common.io.ByteArrayDataInput;
 
-import gregtech.api.util.GT_MusicSystem;
+import gregtech.api.util.GTMusicSystem;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
-public class GT_Packet_MusicSystemData extends GT_Packet_New {
+public class GTPacketMusicSystemData extends GTPacketNew {
 
     ByteBuf storedData;
 
-    public GT_Packet_MusicSystemData() {
+    public GTPacketMusicSystemData() {
         super(true);
     }
 
-    public GT_Packet_MusicSystemData(ByteBuf data) {
+    public GTPacketMusicSystemData(ByteBuf data) {
         super(false);
         this.storedData = data;
     }
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.MUSIC_SYSTEM_DATA.id;
+        return GTPacketTypes.MUSIC_SYSTEM_DATA.id;
     }
 
     @Override
@@ -39,11 +39,11 @@ public class GT_Packet_MusicSystemData extends GT_Packet_New {
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput aData) {
+    public GTPacketNew decode(ByteArrayDataInput aData) {
         final int len = aData.readInt();
         final byte[] fullData = new byte[len];
         aData.readFully(fullData);
-        return new GT_Packet_MusicSystemData(Unpooled.wrappedBuffer(fullData));
+        return new GTPacketMusicSystemData(Unpooled.wrappedBuffer(fullData));
     }
 
     @Override
@@ -52,7 +52,7 @@ public class GT_Packet_MusicSystemData extends GT_Packet_New {
             return;
         }
         storedData.markReaderIndex();
-        GT_MusicSystem.ClientSystem.loadUpdatedSources(storedData);
+        GTMusicSystem.ClientSystem.loadUpdatedSources(storedData);
         storedData.resetReaderIndex();
     }
 }
diff --git a/src/main/java/gregtech/api/net/GT_Packet_New.java b/src/main/java/gregtech/api/net/GTPacketNew.java
index 41eb1740b3..d3fee800c6 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_New.java
+++ b/src/main/java/gregtech/api/net/GTPacketNew.java
@@ -6,9 +6,9 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
 @SuppressWarnings("deprecation")
-public abstract class GT_Packet_New extends GT_Packet {
+public abstract class GTPacketNew extends GTPacket {
 
-    public GT_Packet_New(boolean aIsReference) {
+    public GTPacketNew(boolean aIsReference) {
         super(aIsReference);
     }
 
@@ -26,5 +26,5 @@ public abstract class GT_Packet_New extends GT_Packet {
     public abstract void encode(ByteBuf aOut);
 
     @Override
-    public abstract GT_Packet_New decode(ByteArrayDataInput aData);
+    public abstract GTPacketNew decode(ByteArrayDataInput aData);
 }
diff --git a/src/main/java/gregtech/api/net/GT_Packet_Pollution.java b/src/main/java/gregtech/api/net/GTPacketPollution.java
index 9b4a367dc4..2f4805aad8 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_Pollution.java
+++ b/src/main/java/gregtech/api/net/GTPacketPollution.java
@@ -5,19 +5,19 @@ import net.minecraft.world.IBlockAccess;
 
 import com.google.common.io.ByteArrayDataInput;
 
-import gregtech.common.GT_Client;
+import gregtech.common.GTClient;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Packet_Pollution extends GT_Packet_New {
+public class GTPacketPollution extends GTPacketNew {
 
     private ChunkCoordIntPair chunk;
     private int pollution;
 
-    public GT_Packet_Pollution() {
+    public GTPacketPollution() {
         super(true);
     }
 
-    public GT_Packet_Pollution(ChunkCoordIntPair chunk, int pollution) {
+    public GTPacketPollution(ChunkCoordIntPair chunk, int pollution) {
         super(false);
         this.chunk = chunk;
         this.pollution = pollution;
@@ -31,17 +31,17 @@ public class GT_Packet_Pollution extends GT_Packet_New {
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput aData) {
-        return new GT_Packet_Pollution(new ChunkCoordIntPair(aData.readInt(), aData.readInt()), aData.readInt());
+    public GTPacketNew decode(ByteArrayDataInput aData) {
+        return new GTPacketPollution(new ChunkCoordIntPair(aData.readInt(), aData.readInt()), aData.readInt());
     }
 
     @Override
     public void process(IBlockAccess aWorld) {
-        GT_Client.recieveChunkPollutionPacket(chunk, pollution);
+        GTClient.recieveChunkPollutionPacket(chunk, pollution);
     }
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.POLLUTION.id;
+        return GTPacketTypes.POLLUTION.id;
     }
 }
diff --git a/src/main/java/gregtech/api/net/GT_Packet_RequestCoverData.java b/src/main/java/gregtech/api/net/GTPacketRequestCoverData.java
index bca97b69a5..4679643624 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_RequestCoverData.java
+++ b/src/main/java/gregtech/api/net/GTPacketRequestCoverData.java
@@ -19,7 +19,7 @@ import io.netty.buffer.ByteBuf;
 /**
  * Client -> Server : ask for cover data
  */
-public class GT_Packet_RequestCoverData extends GT_Packet_New {
+public class GTPacketRequestCoverData extends GTPacketNew {
 
     protected int mX;
     protected short mY;
@@ -30,11 +30,11 @@ public class GT_Packet_RequestCoverData extends GT_Packet_New {
 
     protected EntityPlayerMP mPlayer;
 
-    public GT_Packet_RequestCoverData() {
+    public GTPacketRequestCoverData() {
         super(true);
     }
 
-    public GT_Packet_RequestCoverData(CoverInfo info, ICoverable tile) {
+    public GTPacketRequestCoverData(CoverInfo info, ICoverable tile) {
         super(false);
         this.mX = tile.getXCoord();
         this.mY = tile.getYCoord();
@@ -44,7 +44,7 @@ public class GT_Packet_RequestCoverData extends GT_Packet_New {
         this.coverID = info.getCoverID();
     }
 
-    public GT_Packet_RequestCoverData(int mX, short mY, int mZ, ForgeDirection coverSide, int coverID) {
+    public GTPacketRequestCoverData(int mX, short mY, int mZ, ForgeDirection coverSide, int coverID) {
         super(false);
         this.mX = mX;
         this.mY = mY;
@@ -54,7 +54,7 @@ public class GT_Packet_RequestCoverData extends GT_Packet_New {
         this.coverID = coverID;
     }
 
-    public GT_Packet_RequestCoverData(ForgeDirection coverSide, int coverID, ICoverable tile) {
+    public GTPacketRequestCoverData(ForgeDirection coverSide, int coverID, ICoverable tile) {
         super(false);
         this.mX = tile.getXCoord();
         this.mY = tile.getYCoord();
@@ -66,7 +66,7 @@ public class GT_Packet_RequestCoverData extends GT_Packet_New {
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.REQUEST_COVER_DATA.id;
+        return GTPacketTypes.REQUEST_COVER_DATA.id;
     }
 
     @Override
@@ -80,8 +80,8 @@ public class GT_Packet_RequestCoverData extends GT_Packet_New {
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput aData) {
-        return new GT_Packet_RequestCoverData(
+    public GTPacketNew decode(ByteArrayDataInput aData) {
+        return new GTPacketRequestCoverData(
             aData.readInt(),
             aData.readShort(),
             aData.readInt(),
diff --git a/src/main/java/gregtech/api/net/GT_Packet_SendCoverData.java b/src/main/java/gregtech/api/net/GTPacketSendCoverData.java
index 268aaab803..76adb75d31 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_SendCoverData.java
+++ b/src/main/java/gregtech/api/net/GTPacketSendCoverData.java
@@ -6,7 +6,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import com.google.common.io.ByteArrayDataInput;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.metatileentity.CoverableTileEntity;
 import gregtech.api.util.ISerializableObject;
@@ -16,7 +16,7 @@ import io.netty.buffer.ByteBuf;
 /**
  * Server -> Client : Update cover data
  */
-public class GT_Packet_SendCoverData extends GT_Packet_New {
+public class GTPacketSendCoverData extends GTPacketNew {
 
     protected int mX;
     protected short mY;
@@ -26,11 +26,11 @@ public class GT_Packet_SendCoverData extends GT_Packet_New {
     protected int coverID;
     protected ISerializableObject coverData;
 
-    public GT_Packet_SendCoverData() {
+    public GTPacketSendCoverData() {
         super(true);
     }
 
-    public GT_Packet_SendCoverData(int mX, short mY, int mZ, ForgeDirection coverSide, int coverID,
+    public GTPacketSendCoverData(int mX, short mY, int mZ, ForgeDirection coverSide, int coverID,
         ISerializableObject coverData) {
         super(false);
         this.mX = mX;
@@ -42,7 +42,7 @@ public class GT_Packet_SendCoverData extends GT_Packet_New {
         this.coverData = coverData;
     }
 
-    public GT_Packet_SendCoverData(CoverInfo info, ICoverable tile) {
+    public GTPacketSendCoverData(CoverInfo info, ICoverable tile) {
         super(false);
         this.mX = tile.getXCoord();
         this.mY = tile.getYCoord();
@@ -53,7 +53,7 @@ public class GT_Packet_SendCoverData extends GT_Packet_New {
         this.coverData = info.getCoverData();
     }
 
-    public GT_Packet_SendCoverData(ForgeDirection coverSide, int coverID, ISerializableObject coverData,
+    public GTPacketSendCoverData(ForgeDirection coverSide, int coverID, ISerializableObject coverData,
         ICoverable tile) {
         super(false);
         this.mX = tile.getXCoord();
@@ -67,7 +67,7 @@ public class GT_Packet_SendCoverData extends GT_Packet_New {
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.SEND_COVER_DATA.id;
+        return GTPacketTypes.SEND_COVER_DATA.id;
     }
 
     @Override
@@ -82,15 +82,15 @@ public class GT_Packet_SendCoverData extends GT_Packet_New {
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput aData) {
+    public GTPacketNew decode(ByteArrayDataInput aData) {
         final int coverId;
-        return new GT_Packet_SendCoverData(
+        return new GTPacketSendCoverData(
             aData.readInt(),
             aData.readShort(),
             aData.readInt(),
             ForgeDirection.getOrientation(aData.readByte()),
             coverId = aData.readInt(),
-            GregTech_API.getCoverBehaviorNew(coverId)
+            GregTechAPI.getCoverBehaviorNew(coverId)
                 .createDataObject()
                 .readFromPacket(aData, null));
     }
diff --git a/src/main/java/gregtech/api/net/GT_Packet_SendOregenPattern.java b/src/main/java/gregtech/api/net/GTPacketSendOregenPattern.java
index 8213ee9c71..9db0e9a471 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_SendOregenPattern.java
+++ b/src/main/java/gregtech/api/net/GTPacketSendOregenPattern.java
@@ -4,20 +4,20 @@ import net.minecraft.world.IBlockAccess;
 
 import com.google.common.io.ByteArrayDataInput;
 
-import gregtech.api.util.GT_Log;
-import gregtech.common.GT_Worldgenerator;
-import gregtech.common.GT_Worldgenerator.OregenPattern;
+import gregtech.api.util.GTLog;
+import gregtech.common.GTWorldgenerator;
+import gregtech.common.GTWorldgenerator.OregenPattern;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Packet_SendOregenPattern extends GT_Packet_New {
+public class GTPacketSendOregenPattern extends GTPacketNew {
 
     protected OregenPattern pattern = OregenPattern.AXISSYMMETRICAL;
 
-    public GT_Packet_SendOregenPattern() {
+    public GTPacketSendOregenPattern() {
         super(true);
     }
 
-    public GT_Packet_SendOregenPattern(OregenPattern pattern) {
+    public GTPacketSendOregenPattern(OregenPattern pattern) {
         super(false);
         this.pattern = pattern;
     }
@@ -28,29 +28,29 @@ public class GT_Packet_SendOregenPattern extends GT_Packet_New {
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput aData) {
+    public GTPacketNew decode(ByteArrayDataInput aData) {
         int ordinal = aData.readInt();
         // make sure we get valid data:
         if (ordinal >= 0 && ordinal < OregenPattern.values().length) {
-            return new GT_Packet_SendOregenPattern(OregenPattern.values()[ordinal]);
+            return new GTPacketSendOregenPattern(OregenPattern.values()[ordinal]);
         }
         // invalid data, default to AXISSYMMETRICAL:
-        GT_Log.err.println(
+        GTLog.err.println(
             String.format(
                 "Received invalid data! Received %d but value must be between 0 and %d! Default (0) will be used.",
                 ordinal,
                 OregenPattern.values().length - 1));
-        return new GT_Packet_SendOregenPattern();
+        return new GTPacketSendOregenPattern();
     }
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.SEND_OREGEN_PATTERN.id;
+        return GTPacketTypes.SEND_OREGEN_PATTERN.id;
     }
 
     @Override
     public void process(IBlockAccess aWorld) {
-        GT_Worldgenerator.oregenPattern = this.pattern;
+        GTWorldgenerator.oregenPattern = this.pattern;
     }
 
 }
diff --git a/src/main/java/gregtech/api/net/GT_Packet_SetConfigurationCircuit.java b/src/main/java/gregtech/api/net/GTPacketSetConfigurationCircuit.java
index 2bfdbca9d2..8984cea509 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_SetConfigurationCircuit.java
+++ b/src/main/java/gregtech/api/net/GTPacketSetConfigurationCircuit.java
@@ -15,14 +15,14 @@ import gregtech.api.interfaces.IConfigurationCircuitSupport;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.IHasInventory;
 import gregtech.api.metatileentity.BaseTileEntity;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import io.netty.buffer.ByteBuf;
 
 /**
  * Client -> Server: Update machine configuration data
  */
-public class GT_Packet_SetConfigurationCircuit extends GT_Packet_New {
+public class GTPacketSetConfigurationCircuit extends GTPacketNew {
 
     protected int mX;
     protected short mY;
@@ -31,19 +31,19 @@ public class GT_Packet_SetConfigurationCircuit extends GT_Packet_New {
 
     protected ItemStack circuit;
 
-    public GT_Packet_SetConfigurationCircuit() {
+    public GTPacketSetConfigurationCircuit() {
         super(true);
     }
 
-    public GT_Packet_SetConfigurationCircuit(IGregTechTileEntity tile, ItemStack circuit) {
+    public GTPacketSetConfigurationCircuit(IGregTechTileEntity tile, ItemStack circuit) {
         this(tile.getXCoord(), tile.getYCoord(), tile.getZCoord(), circuit);
     }
 
-    public GT_Packet_SetConfigurationCircuit(BaseTileEntity tile, ItemStack circuit) {
+    public GTPacketSetConfigurationCircuit(BaseTileEntity tile, ItemStack circuit) {
         this(tile.getXCoord(), tile.getYCoord(), tile.getZCoord(), circuit);
     }
 
-    public GT_Packet_SetConfigurationCircuit(int x, short y, int z, ItemStack circuit) {
+    public GTPacketSetConfigurationCircuit(int x, short y, int z, ItemStack circuit) {
         super(false);
 
         this.mX = x;
@@ -55,7 +55,7 @@ public class GT_Packet_SetConfigurationCircuit extends GT_Packet_New {
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.SET_CONFIGURATION_CIRCUIT.id;
+        return GTPacketTypes.SET_CONFIGURATION_CIRCUIT.id;
     }
 
     @Override
@@ -82,8 +82,8 @@ public class GT_Packet_SetConfigurationCircuit extends GT_Packet_New {
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput aData) {
-        return new GT_Packet_SetConfigurationCircuit(
+    public GTPacketNew decode(ByteArrayDataInput aData) {
+        return new GTPacketSetConfigurationCircuit(
             aData.readInt(),
             aData.readShort(),
             aData.readInt(),
@@ -103,7 +103,7 @@ public class GT_Packet_SetConfigurationCircuit extends GT_Packet_New {
         if (!machine.allowSelectCircuit()) return;
         machine.getConfigurationCircuits()
             .stream()
-            .filter(stack -> GT_Utility.areStacksEqual(stack, circuit))
+            .filter(stack -> GTUtility.areStacksEqual(stack, circuit))
             .findFirst()
             .ifPresent(stack -> ((IHasInventory) tile).setInventorySlotContents(machine.getCircuitSlot(), stack));
     }
diff --git a/src/main/java/gregtech/api/net/GT_Packet_Sound.java b/src/main/java/gregtech/api/net/GTPacketSound.java
index 93bfdfd3aa..95f95e641d 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_Sound.java
+++ b/src/main/java/gregtech/api/net/GTPacketSound.java
@@ -7,23 +7,23 @@ import net.minecraft.world.IBlockAccess;
 
 import com.google.common.io.ByteArrayDataInput;
 
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTUtility;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufOutputStream;
 
-public class GT_Packet_Sound extends GT_Packet_New {
+public class GTPacketSound extends GTPacketNew {
 
     private int mX, mZ;
     private short mY;
     private String mSoundName;
     private float mSoundStrength, mSoundPitch;
 
-    public GT_Packet_Sound() {
+    public GTPacketSound() {
         super(true);
     }
 
-    public GT_Packet_Sound(String aSoundName, float aSoundStrength, float aSoundPitch, int aX, short aY, int aZ) {
+    public GTPacketSound(String aSoundName, float aSoundStrength, float aSoundPitch, int aX, short aY, int aZ) {
         super(false);
         mX = aX;
         mY = aY;
@@ -44,13 +44,13 @@ public class GT_Packet_Sound extends GT_Packet_New {
             byteOutputStream.writeInt(mZ);
         } catch (IOException e) {
             // this really shouldn't happen, but whatever
-            e.printStackTrace(GT_Log.err);
+            e.printStackTrace(GTLog.err);
         }
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput aData) {
-        return new GT_Packet_Sound(
+    public GTPacketNew decode(ByteArrayDataInput aData) {
+        return new GTPacketSound(
             aData.readUTF(),
             aData.readFloat(),
             aData.readFloat(),
@@ -62,12 +62,12 @@ public class GT_Packet_Sound extends GT_Packet_New {
     @Override
     public void process(IBlockAccess aWorld) {
         if (mSoundName != null) {
-            GT_Utility.doSoundAtClient(new ResourceLocation(mSoundName), 1, mSoundStrength, mSoundPitch, mX, mY, mZ);
+            GTUtility.doSoundAtClient(new ResourceLocation(mSoundName), 1, mSoundStrength, mSoundPitch, mX, mY, mZ);
         }
     }
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.SOUND.id;
+        return GTPacketTypes.SOUND.id;
     }
 }
diff --git a/src/main/java/gregtech/api/net/GT_Packet_TileEntity.java b/src/main/java/gregtech/api/net/GTPacketTileEntity.java
index b07277dc00..eecb16d6da 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_TileEntity.java
+++ b/src/main/java/gregtech/api/net/GTPacketTileEntity.java
@@ -6,23 +6,23 @@ import net.minecraft.world.IBlockAccess;
 
 import com.google.common.io.ByteArrayDataInput;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Packet_TileEntity extends GT_Packet_New {
+public class GTPacketTileEntity extends GTPacketNew {
 
     private int mX, mZ, mC0, mC1, mC2, mC3, mC4, mC5;
     private short mY, mID, mRID;
     private byte mTexture, mTexturePage, mUpdate, mRedstone, mColor;
 
-    public GT_Packet_TileEntity() {
+    public GTPacketTileEntity() {
         super(true);
     }
 
     // For multi tiles
-    public GT_Packet_TileEntity(int aX, short aY, int aZ, short aRID, short aID, int aC0, int aC1, int aC2, int aC3,
+    public GTPacketTileEntity(int aX, short aY, int aZ, short aRID, short aID, int aC0, int aC1, int aC2, int aC3,
         int aC4, int aC5, byte aTexture, byte aTexturePage, byte aUpdate, byte aRedstone, byte aColor) {
         super(false);
         mX = aX;
@@ -44,8 +44,8 @@ public class GT_Packet_TileEntity extends GT_Packet_New {
     }
 
     // For meta tiles
-    public GT_Packet_TileEntity(int aX, short aY, int aZ, short aID, int aC0, int aC1, int aC2, int aC3, int aC4,
-        int aC5, byte aTexture, byte aTexturePage, byte aUpdate, byte aRedstone, byte aColor) {
+    public GTPacketTileEntity(int aX, short aY, int aZ, short aID, int aC0, int aC1, int aC2, int aC3, int aC4, int aC5,
+        byte aTexture, byte aTexturePage, byte aUpdate, byte aRedstone, byte aColor) {
         this(
             aX,
             aY,
@@ -66,8 +66,8 @@ public class GT_Packet_TileEntity extends GT_Packet_New {
     }
 
     // For pipes
-    public GT_Packet_TileEntity(int aX, short aY, int aZ, short aID, int aC0, int aC1, int aC2, int aC3, int aC4,
-        int aC5, byte aTexture, byte aUpdate, byte aRedstone, byte aColor) {
+    public GTPacketTileEntity(int aX, short aY, int aZ, short aID, int aC0, int aC1, int aC2, int aC3, int aC4, int aC5,
+        byte aTexture, byte aUpdate, byte aRedstone, byte aColor) {
         this(aX, aY, aZ, (short) 0, aID, aC0, aC1, aC2, aC3, aC4, aC5, aTexture, (byte) 0, aUpdate, aRedstone, aColor);
     }
 
@@ -95,8 +95,8 @@ public class GT_Packet_TileEntity extends GT_Packet_New {
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput aData) {
-        return new GT_Packet_TileEntity(
+    public GTPacketNew decode(ByteArrayDataInput aData) {
+        return new GTPacketTileEntity(
             // Coords
             aData.readInt(),
             aData.readShort(),
@@ -141,7 +141,7 @@ public class GT_Packet_TileEntity extends GT_Packet_New {
             else if (tTileEntity instanceof BaseMetaPipeEntity) ((BaseMetaPipeEntity) tTileEntity)
                 .receiveMetaTileEntityData(mID, mC0, mC1, mC2, mC3, mC4, mC5, mTexture, mUpdate, mRedstone, mColor);
         } catch (Exception e) {
-            GT_Mod.GT_FML_LOGGER.error(
+            GTMod.GT_FML_LOGGER.error(
                 "Exception setting tile entity data for tile entity {} at ({}, {}, {})",
                 tTileEntity,
                 mX,
@@ -152,6 +152,6 @@ public class GT_Packet_TileEntity extends GT_Packet_New {
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.TILE_ENTITY.id;
+        return GTPacketTypes.TILE_ENTITY.id;
     }
 }
diff --git a/src/main/java/gregtech/api/net/GT_Packet_ToolSwitchMode.java b/src/main/java/gregtech/api/net/GTPacketToolSwitchMode.java
index c7984d7434..57cabcf2bf 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_ToolSwitchMode.java
+++ b/src/main/java/gregtech/api/net/GTPacketToolSwitchMode.java
@@ -8,20 +8,20 @@ import net.minecraft.world.IBlockAccess;
 
 import com.google.common.io.ByteArrayDataInput;
 
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Packet_ToolSwitchMode extends GT_Packet_New {
+public class GTPacketToolSwitchMode extends GTPacketNew {
 
     private EntityPlayerMP player;
 
-    public GT_Packet_ToolSwitchMode() {
+    public GTPacketToolSwitchMode() {
         super(true);
     }
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.TOOL_SWITCH_MODE.id;
+        return GTPacketTypes.TOOL_SWITCH_MODE.id;
     }
 
     @Override
@@ -30,8 +30,8 @@ public class GT_Packet_ToolSwitchMode extends GT_Packet_New {
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput aData) {
-        return new GT_Packet_ToolSwitchMode();
+    public GTPacketNew decode(ByteArrayDataInput aData) {
+        return new GTPacketToolSwitchMode();
     }
 
     @Override
@@ -42,11 +42,11 @@ public class GT_Packet_ToolSwitchMode extends GT_Packet_New {
     @Override
     public void process(IBlockAccess aWorld) {
         ItemStack currentItem = player.inventory.getCurrentItem();
-        if (currentItem == null || (!(currentItem.getItem() instanceof GT_MetaGenerated_Tool item))) return;
+        if (currentItem == null || (!(currentItem.getItem() instanceof MetaGeneratedTool item))) return;
         byte maxMode = item.getToolMaxMode(currentItem);
         if (maxMode <= 1) return;
-        byte newMode = (byte) ((GT_MetaGenerated_Tool.getToolMode(currentItem) + 1) % maxMode);
-        GT_MetaGenerated_Tool.setToolMode(currentItem, newMode);
+        byte newMode = (byte) ((MetaGeneratedTool.getToolMode(currentItem) + 1) % maxMode);
+        MetaGeneratedTool.setToolMode(currentItem, newMode);
         player.sendSlotContents(player.inventoryContainer, player.inventory.currentItem, currentItem);
     }
 }
diff --git a/src/main/java/gregtech/api/net/GTPacketTypes.java b/src/main/java/gregtech/api/net/GTPacketTypes.java
new file mode 100644
index 0000000000..d635706e68
--- /dev/null
+++ b/src/main/java/gregtech/api/net/GTPacketTypes.java
@@ -0,0 +1,64 @@
+package gregtech.api.net;
+
+import java.util.Arrays;
+
+import gregtech.common.blocks.PacketOres;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+
+/**
+ * Centralized place to keep all the GT packet ID constants
+ */
+public enum GTPacketTypes {
+
+    TILE_ENTITY(0, new GTPacketTileEntity()),
+    SOUND(1, new GTPacketSound()),
+    BLOCK_EVENT(2, new GTPacketBlockEvent()),
+    ORES(3, new PacketOres()),
+    POLLUTION(4, new GTPacketPollution()),
+    CLIENT_PREFERENCE(9, new GTPacketClientPreference()),
+    SET_CONFIGURATION_CIRCUIT(12, new GTPacketSetConfigurationCircuit()),
+    UPDATE_ITEM(13, new GTPacketUpdateItem()),
+    SEND_COVER_DATA(16, new GTPacketSendCoverData()),
+    REQUEST_COVER_DATA(17, new GTPacketRequestCoverData()),
+    MULTI_TILE_ENTITY(18, new GTPacketMultiTileEntity(true)),
+    SEND_OREGEN_PATTERN(19, new GTPacketSendOregenPattern()),
+    TOOL_SWITCH_MODE(20, new GTPacketToolSwitchMode()),
+    MUSIC_SYSTEM_DATA(21, new GTPacketMusicSystemData()),
+    // merge conflict prevention comment, keep a trailing comma above
+    ;
+
+    static {
+        // Validate no duplicate IDs
+        final GTPacketTypes[] types = values();
+        final Int2ObjectOpenHashMap<GTPacketNew> foundIds = new Int2ObjectOpenHashMap<>(types.length);
+        for (GTPacketTypes type : types) {
+            final GTPacketNew previous = foundIds.get(type.id);
+            if (previous != null) {
+                throw new IllegalStateException(
+                    "Duplicate packet IDs defined: " + type.id
+                        + " for "
+                        + type.getClass()
+                        + " and "
+                        + previous.getClass());
+            }
+            foundIds.put(type.id, type.referencePacket);
+        }
+    }
+
+    public final byte id;
+    public final GTPacketNew referencePacket;
+
+    GTPacketTypes(int id, GTPacketNew referencePacket) {
+        if (((int) (byte) id) != id) {
+            throw new IllegalArgumentException("Value outside of byte normal range: " + id);
+        }
+        this.id = (byte) id;
+        this.referencePacket = referencePacket;
+    }
+
+    public static GTPacketNew[] referencePackets() {
+        return Arrays.stream(values())
+            .map(p -> p.referencePacket)
+            .toArray(GTPacketNew[]::new);
+    }
+}
diff --git a/src/main/java/gregtech/api/net/GT_Packet_UpdateItem.java b/src/main/java/gregtech/api/net/GTPacketUpdateItem.java
index 1b8a453234..54846cdcc9 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_UpdateItem.java
+++ b/src/main/java/gregtech/api/net/GTPacketUpdateItem.java
@@ -17,23 +17,23 @@ import io.netty.buffer.ByteBuf;
 /**
  * Client -> Server: send arbitrary data to server and update the currently held item.
  */
-public class GT_Packet_UpdateItem extends GT_Packet_New {
+public class GTPacketUpdateItem extends GTPacketNew {
 
     private NBTTagCompound tag;
     private EntityPlayerMP mPlayer;
 
-    public GT_Packet_UpdateItem() {
+    public GTPacketUpdateItem() {
         super(true);
     }
 
-    public GT_Packet_UpdateItem(NBTTagCompound tag) {
+    public GTPacketUpdateItem(NBTTagCompound tag) {
         super(false);
         this.tag = tag;
     }
 
     @Override
     public byte getPacketID() {
-        return GT_PacketTypes.UPDATE_ITEM.id;
+        return GTPacketTypes.UPDATE_ITEM.id;
     }
 
     @Override
@@ -49,8 +49,8 @@ public class GT_Packet_UpdateItem extends GT_Packet_New {
     }
 
     @Override
-    public GT_Packet_New decode(ByteArrayDataInput aData) {
-        return new GT_Packet_UpdateItem(ISerializableObject.readCompoundTagFromGreggyByteBuf(aData));
+    public GTPacketNew decode(ByteArrayDataInput aData) {
+        return new GTPacketUpdateItem(ISerializableObject.readCompoundTagFromGreggyByteBuf(aData));
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/net/GT_PacketTypes.java b/src/main/java/gregtech/api/net/GT_PacketTypes.java
deleted file mode 100644
index 5907b2176b..0000000000
--- a/src/main/java/gregtech/api/net/GT_PacketTypes.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package gregtech.api.net;
-
-import java.util.Arrays;
-
-import gregtech.common.blocks.GT_Packet_Ores;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-
-/**
- * Centralized place to keep all the GT packet ID constants
- */
-public enum GT_PacketTypes {
-
-    TILE_ENTITY(0, new GT_Packet_TileEntity()),
-    SOUND(1, new GT_Packet_Sound()),
-    BLOCK_EVENT(2, new GT_Packet_Block_Event()),
-    ORES(3, new GT_Packet_Ores()),
-    POLLUTION(4, new GT_Packet_Pollution()),
-    CLIENT_PREFERENCE(9, new GT_Packet_ClientPreference()),
-    SET_CONFIGURATION_CIRCUIT(12, new GT_Packet_SetConfigurationCircuit()),
-    UPDATE_ITEM(13, new GT_Packet_UpdateItem()),
-    SEND_COVER_DATA(16, new GT_Packet_SendCoverData()),
-    REQUEST_COVER_DATA(17, new GT_Packet_RequestCoverData()),
-    MULTI_TILE_ENTITY(18, new GT_Packet_MultiTileEntity(true)),
-    SEND_OREGEN_PATTERN(19, new GT_Packet_SendOregenPattern()),
-    TOOL_SWITCH_MODE(20, new GT_Packet_ToolSwitchMode()),
-    MUSIC_SYSTEM_DATA(21, new GT_Packet_MusicSystemData()),
-    // merge conflict prevention comment, keep a trailing comma above
-    ;
-
-    static {
-        // Validate no duplicate IDs
-        final GT_PacketTypes[] types = values();
-        final Int2ObjectOpenHashMap<GT_Packet_New> foundIds = new Int2ObjectOpenHashMap<>(types.length);
-        for (GT_PacketTypes type : types) {
-            final GT_Packet_New previous = foundIds.get(type.id);
-            if (previous != null) {
-                throw new IllegalStateException(
-                    "Duplicate packet IDs defined: " + type.id
-                        + " for "
-                        + type.getClass()
-                        + " and "
-                        + previous.getClass());
-            }
-            foundIds.put(type.id, type.referencePacket);
-        }
-    }
-
-    public final byte id;
-    public final GT_Packet_New referencePacket;
-
-    GT_PacketTypes(int id, GT_Packet_New referencePacket) {
-        if (((int) (byte) id) != id) {
-            throw new IllegalArgumentException("Value outside of byte normal range: " + id);
-        }
-        this.id = (byte) id;
-        this.referencePacket = referencePacket;
-    }
-
-    public static GT_Packet_New[] referencePackets() {
-        return Arrays.stream(values())
-            .map(p -> p.referencePacket)
-            .toArray(GT_Packet_New[]::new);
-    }
-}
diff --git a/src/main/java/gregtech/api/net/IGT_NetworkHandler.java b/src/main/java/gregtech/api/net/IGT_NetworkHandler.java
index 8436a89e9b..3569317b01 100644
--- a/src/main/java/gregtech/api/net/IGT_NetworkHandler.java
+++ b/src/main/java/gregtech/api/net/IGT_NetworkHandler.java
@@ -8,15 +8,15 @@ import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 @SuppressWarnings("deprecation")
 public interface IGT_NetworkHandler {
 
-    void sendToPlayer(GT_Packet aPacket, EntityPlayerMP aPlayer);
+    void sendToPlayer(GTPacket aPacket, EntityPlayerMP aPlayer);
 
-    void sendToAllAround(GT_Packet aPacket, TargetPoint aPosition);
+    void sendToAllAround(GTPacket aPacket, TargetPoint aPosition);
 
-    default void sendToAll(GT_Packet aPacket) {
+    default void sendToAll(GTPacket aPacket) {
         throw new UnsupportedOperationException("sendToAll not implemented");
     }
 
-    void sendToServer(GT_Packet aPacket);
+    void sendToServer(GTPacket aPacket);
 
-    void sendPacketToAllPlayersInRange(World aWorld, GT_Packet aPacket, int aX, int aZ);
+    void sendPacketToAllPlayersInRange(World aWorld, GTPacket aPacket, int aX, int aZ);
 }