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, 191 insertions, 193 deletions

diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java
index f5cf261be1..f1f4b8591a 100644
--- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java
+++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java
@@ -1,11 +1,11 @@
 package gregtech.api.multitileentity;
 
-import static gregtech.api.enums.GT_Values.OFFX;
-import static gregtech.api.enums.GT_Values.OFFY;
-import static gregtech.api.enums.GT_Values.OFFZ;
-import static gregtech.api.util.GT_Util.LAST_BROKEN_TILEENTITY;
-import static gregtech.api.util.GT_Util.getTileEntity;
-import static gregtech.api.util.GT_Util.setTileEntity;
+import static gregtech.api.enums.GTValues.OFFX;
+import static gregtech.api.enums.GTValues.OFFY;
+import static gregtech.api.enums.GTValues.OFFZ;
+import static gregtech.api.util.GTUtil.LAST_BROKEN_TILEENTITY;
+import static gregtech.api.util.GTUtil.getTileEntity;
+import static gregtech.api.util.GTUtil.setTileEntity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -44,7 +44,7 @@ import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IDebugableBlock;
@@ -53,10 +53,10 @@ import gregtech.api.metatileentity.BaseTileEntity;
 import gregtech.api.metatileentity.CoverableTileEntity;
 import gregtech.api.multitileentity.interfaces.IMultiTileEntity;
 import gregtech.api.objects.XSTR;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Util;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTUtil;
 import gregtech.common.covers.CoverInfo;
-import gregtech.common.render.GT_MultiTile_Renderer;
+import gregtech.common.render.MultiTileRenderer;
 
 /*
  * MultiTileEntityBlock ported from GT6
@@ -85,7 +85,7 @@ public class MultiTileEntityBlock extends BlockContainer implements IDebugableBl
 
     public MultiTileEntityBlock(Material material) {
         super(material);
-        if (GregTech_API.sPreloadFinished)
+        if (GregTechAPI.sPreloadFinished)
             throw new IllegalStateException("Blocks can only be initialized within preInit!");
     }
 
@@ -121,7 +121,7 @@ public class MultiTileEntityBlock extends BlockContainer implements IDebugableBl
 
     public MultiTileEntityBlock register() {
         if (registered) throw new IllegalStateException("Block already registered " + internalName);
-        if (GregTech_API.sPreloadFinished)
+        if (GregTechAPI.sPreloadFinished)
             throw new IllegalStateException("Blocks can only be initialized within preInit!");
 
         registered = true;
@@ -141,7 +141,7 @@ public class MultiTileEntityBlock extends BlockContainer implements IDebugableBl
         // spotless:off
         // if (aTileEntity instanceof IMTE_HasMultiBlockMachineRelevantData
         //     && ((IMTE_HasMultiBlockMachineRelevantData) aTileEntity).hasMultiBlockMachineRelevantData())
-        //     GregTech_API.causeMachineUpdate(world, x, y, z);
+        //     GregTechAPI.causeMachineUpdate(world, x, y, z);
         // spotless:on
 
         world.removeTileEntity(x, y, z);
@@ -160,8 +160,7 @@ public class MultiTileEntityBlock extends BlockContainer implements IDebugableBl
 
     @Override
     public int getRenderType() {
-        return GT_MultiTile_Renderer.INSTANCE == null ? super.getRenderType()
-            : GT_MultiTile_Renderer.INSTANCE.getRenderId();
+        return MultiTileRenderer.INSTANCE == null ? super.getRenderType() : MultiTileRenderer.INSTANCE.getRenderId();
     }
 
     @Override
@@ -455,7 +454,7 @@ public class MultiTileEntityBlock extends BlockContainer implements IDebugableBl
 
     @Override
     public boolean removedByPlayer(World world, EntityPlayer aPlayer, int x, int y, int z, boolean aWillHarvest) {
-        final TileEntity tileEntity = GT_Util.getTileEntity(world, x, y, z, true);
+        final TileEntity tileEntity = GTUtil.getTileEntity(world, x, y, z, true);
         if (tileEntity != null) LAST_BROKEN_TILEENTITY.set(tileEntity);
         return super.removedByPlayer(world, aPlayer, x, y, z, aWillHarvest);
     }
@@ -467,7 +466,7 @@ public class MultiTileEntityBlock extends BlockContainer implements IDebugableBl
 
     @Override
     public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) {
-        return GregTech_API.sMachineFlammable && (world.getBlockMetadata(x, y, z) == 0) ? 100 : 0;
+        return GregTechAPI.sMachineFlammable && (world.getBlockMetadata(x, y, z) == 0) ? 100 : 0;
     }
 
     @Override
@@ -502,7 +501,7 @@ public class MultiTileEntityBlock extends BlockContainer implements IDebugableBl
         final TileEntity tileEntity = getTileEntity(world, x, y, z, true);
         if (tileEntity != null) LAST_BROKEN_TILEENTITY.set(tileEntity);
         if (tileEntity instanceof IMultiTileEntity mute) {
-            GT_Log.exp.printf(
+            GTLog.exp.printf(
                 "Explosion at : %d | %d | %d DIMID: %s due to near explosion!%n",
                 x,
                 y,
diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityClassContainer.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityClassContainer.java
index 325f583149..ca265e529e 100644
--- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityClassContainer.java
+++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityClassContainer.java
@@ -1,6 +1,6 @@
 package gregtech.api.multitileentity;
 
-import static gregtech.api.enums.GT_Values.NBT;
+import static gregtech.api.enums.GTValues.NBT;
 
 import java.lang.ref.WeakReference;
 
@@ -11,7 +11,7 @@ import gregtech.api.enums.Materials;
 import gregtech.api.multitileentity.base.MultiTileEntity;
 import gregtech.api.multitileentity.multiblock.casing.FunctionalCasing;
 import gregtech.api.multitileentity.multiblock.casing.UpgradeCasing;
-import gregtech.api.util.GT_Util;
+import gregtech.api.util.GTUtil;
 import gregtech.common.tileentities.casings.upgrade.Inventory;
 import gregtech.common.tileentities.casings.upgrade.Tank;
 
@@ -43,7 +43,7 @@ public class MultiTileEntityClassContainer {
 
         if (parameters.hasKey(NBT.MATERIAL) && !parameters.hasKey(NBT.COLOR)) parameters.setInteger(
             NBT.COLOR,
-            GT_Util.getRGBInt(
+            GTUtil.getRGBInt(
                 Materials.get(parameters.getString(NBT.MATERIAL))
                     .getRGBA()));
 
@@ -80,7 +80,7 @@ public class MultiTileEntityClassContainer {
     public MultiTileEntityClassContainer material(Materials material) {
         // Sets the material, and the color from the material, if not already set
         parameters.setString(NBT.MATERIAL, material.toString());
-        if (!parameters.hasKey(NBT.COLOR)) parameters.setInteger(NBT.COLOR, GT_Util.getRGBInt(material.getRGBA()));
+        if (!parameters.hasKey(NBT.COLOR)) parameters.setInteger(NBT.COLOR, GTUtil.getRGBInt(material.getRGBA()));
         return this;
     }
 
@@ -90,7 +90,7 @@ public class MultiTileEntityClassContainer {
     }
 
     public MultiTileEntityClassContainer color(short[] rgba) {
-        parameters.setInteger(NBT.COLOR, GT_Util.getRGBInt(rgba));
+        parameters.setInteger(NBT.COLOR, GTUtil.getRGBInt(rgba));
         return this;
     }
 
@@ -154,7 +154,7 @@ public class MultiTileEntityClassContainer {
          * Merge in arbitrary NBT tuples of (key, value). Useful for anything for which a custom method has not yet been
          * exposed
          */
-        parameters = GT_Util.fuseNBT(parameters, GT_Util.makeNBT(aTags));
+        parameters = GTUtil.fuseNBT(parameters, GTUtil.makeNBT(aTags));
         return this;
     }
 
diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityItem.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityItem.java
index e67ab61e96..bf7259626f 100644
--- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityItem.java
+++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityItem.java
@@ -1,7 +1,7 @@
 package gregtech.api.multitileentity;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
-import static gregtech.api.enums.GT_Values.SIDE_TOP;
+import static gregtech.GTMod.GT_FML_LOGGER;
+import static gregtech.api.enums.GTValues.SIDE_TOP;
 
 import java.util.List;
 
@@ -132,7 +132,7 @@ public class MultiTileEntityItem extends ItemBlock {
              *    Add back if needed
              */
             // try {
-            //     GregTech_API.causeMachineUpdate(world, x, y, z);
+            //     GregTechAPI.causeMachineUpdate(world, x, y, z);
             // } catch (Throwable e) {
             //     GT_FML_LOGGER.error("causeMachineUpdate", e);
             // }
diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java
index 0b5afbb043..186110abb7 100644
--- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java
+++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java
@@ -1,6 +1,6 @@
 package gregtech.api.multitileentity;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
+import static gregtech.GTMod.GT_FML_LOGGER;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -21,12 +21,12 @@ import com.gtnewhorizon.gtnhlib.util.map.ItemStackMap;
 import appeng.core.CreativeTab;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.LoaderState;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.multitileentity.base.MultiTileEntity;
 import gregtech.api.multitileentity.interfaces.IMultiTileEntity;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Util;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtil;
+import gregtech.api.util.GTUtility;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectMap;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectOpenHashMap;
 
@@ -61,7 +61,7 @@ public class MultiTileEntityRegistry {
         this.block = block;
         GT_FML_LOGGER.info(internalName + " " + Block.getIdFromBlock(block) + " This is the answer");
         this.block.setRegistry(this);
-        REGISTRIES.put(new ItemStack(Item.getItemById(Block.getIdFromBlock(block)), 1, GT_Values.W), this);
+        REGISTRIES.put(new ItemStack(Item.getItemById(Block.getIdFromBlock(block)), 1, GTValues.W), this);
         NAMED_REGISTRIES.put(internalName, this);
     }
 
@@ -84,7 +84,7 @@ public class MultiTileEntityRegistry {
     }
 
     public static MultiTileEntityRegistry getRegistry(int aRegistryID) {
-        return REGISTRIES.get(new ItemStack(Item.getItemById(aRegistryID), 1, GT_Values.W));
+        return REGISTRIES.get(new ItemStack(Item.getItemById(aRegistryID), 1, GTValues.W));
     }
 
     public static MultiTileEntityRegistry getRegistry(String aRegistryName) {
@@ -101,7 +101,7 @@ public class MultiTileEntityRegistry {
      */
     public ItemStack add(String aLocalised, MultiTileEntityClassContainer aClassContainer) {
         boolean tFailed = false;
-        if (GT_Utility.isStringInvalid(aLocalised)) {
+        if (GTUtility.isStringInvalid(aLocalised)) {
             GT_FML_LOGGER.error("MULTI-TILE REGISTRY ERROR: Localisation Missing!");
             tFailed = true;
         }
@@ -113,7 +113,7 @@ public class MultiTileEntityRegistry {
                 GT_FML_LOGGER.error("MULTI-TILE REGISTRY ERROR: Class inside Class Container is null!");
                 tFailed = true;
             }
-            if (aClassContainer.getMuteID() == GT_Values.W) {
+            if (aClassContainer.getMuteID() == GTValues.W) {
                 GT_FML_LOGGER.error("MULTI-TILE REGISTRY ERROR: Class Container uses Wildcard MetaData!");
                 tFailed = true;
             }
@@ -138,8 +138,7 @@ public class MultiTileEntityRegistry {
             return null;
         }
 
-        GT_LanguageManager
-            .addStringLocalization(internalName + "." + aClassContainer.getMuteID() + ".name", aLocalised);
+        GTLanguageManager.addStringLocalization(internalName + "." + aClassContainer.getMuteID() + ".name", aLocalised);
         registry.put(aClassContainer.getMuteID(), aClassContainer);
         mLastRegisteredID = aClassContainer.getMuteID();
         registrations.add(aClassContainer);
@@ -154,7 +153,7 @@ public class MultiTileEntityRegistry {
         return getItem(aClassContainer.getMuteID());
     }
 
-    public short mLastRegisteredID = GT_Values.W;
+    public short mLastRegisteredID = GTValues.W;
 
     public ItemStack getItem() {
         return getItem(mLastRegisteredID, 1, null);
@@ -206,14 +205,14 @@ public class MultiTileEntityRegistry {
     public TileEntity getNewTileEntity(World aWorld, int x, int y, int z, int metaID, NBTTagCompound nbt) {
         final MultiTileEntityClassContainer container = registry.get((short) metaID);
         if (container == null) return null;
-        final MultiTileEntity te = (MultiTileEntity) GT_Utility
+        final MultiTileEntity te = (MultiTileEntity) GTUtility
             .callConstructor(container.getMuteClass(), -1, null, true);
         te.setWorldObj(aWorld);
         te.xCoord = x;
         te.yCoord = y;
         te.zCoord = z;
         nbt = (nbt == null || nbt.hasNoTags()) ? container.getParameters()
-            : GT_Util.fuseNBT(nbt, container.getParameters());
+            : GTUtil.fuseNBT(nbt, container.getParameters());
         te.initFromNBT(nbt, (short) metaID, (short) Block.getIdFromBlock(block));
         return te;
     }
diff --git a/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java b/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java
index eeadfe7602..24163f9c20 100644
--- a/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java
+++ b/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java
@@ -1,7 +1,7 @@
 package gregtech.api.multitileentity.base;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
-import static gregtech.api.enums.GT_Values.VALID_SIDES;
+import static gregtech.GTMod.GT_FML_LOGGER;
+import static gregtech.api.enums.GTValues.VALID_SIDES;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -35,15 +35,15 @@ import net.minecraftforge.fluids.Fluid;
 import com.gtnewhorizons.modularui.common.internal.network.NetworkUtils;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.GT_Values.NBT;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
+import gregtech.api.enums.GTValues.NBT;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Mods;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.enums.Textures.BlockIcons.CustomIcon;
-import gregtech.api.gui.modularui.GT_UIInfos;
+import gregtech.api.gui.modularui.GTUIInfos;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.metatileentity.CoverableTileEntity;
 import gregtech.api.metatileentity.GregTechTileClientEvents;
@@ -52,18 +52,18 @@ import gregtech.api.multitileentity.MultiTileEntityClassContainer;
 import gregtech.api.multitileentity.MultiTileEntityRegistry;
 import gregtech.api.multitileentity.interfaces.IMultiTileEntity;
 import gregtech.api.multitileentity.interfaces.SyncedMultiTileEntity;
-import gregtech.api.net.GT_Packet_MultiTileEntity;
-import gregtech.api.net.GT_Packet_New;
+import gregtech.api.net.GTPacketMultiTileEntity;
+import gregtech.api.net.GTPacketNew;
 import gregtech.api.net.data.CommonData;
 import gregtech.api.net.data.CoordinateData;
 import gregtech.api.net.data.MultiTileEntityData;
-import gregtech.api.objects.GT_ItemStack;
+import gregtech.api.objects.GTItemStack;
 import gregtech.api.objects.XSTR;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Util;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTLog;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtil;
+import gregtech.api.util.GTUtility;
 import gregtech.common.render.MultiTileBasicRender;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
@@ -98,16 +98,16 @@ public abstract class MultiTileEntity extends CoverableTileEntity
     protected ForgeDirection facing = ForgeDirection.WEST; // Default to WEST, so it renders facing Left in the
                                                            // inventory
     protected byte color;
-    protected int rgba = GT_Values.UNCOLORED;
-    private short mteID = GT_Values.W, mteRegistry = GT_Values.W;
+    protected int rgba = GTValues.UNCOLORED;
+    private short mteID = GTValues.W, mteRegistry = GTValues.W;
     private String customName = null;
     private String ownerName = "";
-    private UUID ownerUUID = GT_Utility.defaultUuid;
+    private UUID ownerUUID = GTUtility.defaultUuid;
     private boolean lockUpgrade = false;
 
-    private final GT_Packet_MultiTileEntity fullPacket = new GT_Packet_MultiTileEntity(false);
-    private final GT_Packet_MultiTileEntity timedPacket = new GT_Packet_MultiTileEntity(false);
-    private final GT_Packet_MultiTileEntity graphicPacket = new GT_Packet_MultiTileEntity(false);
+    private final GTPacketMultiTileEntity fullPacket = new GTPacketMultiTileEntity(false);
+    private final GTPacketMultiTileEntity timedPacket = new GTPacketMultiTileEntity(false);
+    private final GTPacketMultiTileEntity graphicPacket = new GTPacketMultiTileEntity(false);
 
     public MultiTileEntity(boolean isTicking) {
         this.isTicking = isTicking;
@@ -213,7 +213,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
     @Override
     public void readFromNBT(NBTTagCompound nbt) {
         // Check if it is a World/Chunk-Loading Process calling readFromNBT
-        if (mteID == GT_Values.W || mteRegistry == GT_Values.W) {
+        if (mteID == GTValues.W || mteRegistry == GTValues.W) {
             // Read the ID Tags first
             mteID = nbt.getShort(NBT.MTE_ID);
             mteRegistry = nbt.getShort(NBT.MTE_REG);
@@ -224,7 +224,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
                 if (tClass != null) {
                     // Add the Default Parameters. Useful for things that differ between different tiers/types of the
                     // same machine
-                    nbt = GT_Util.fuseNBT(nbt, tClass.getParameters());
+                    nbt = GTUtil.fuseNBT(nbt, tClass.getParameters());
                 }
             }
         }
@@ -255,7 +255,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
             readMultiTileNBT(nbt);
 
             if (NetworkUtils.isDedicatedClient()) {
-                if (GregTech_API.sBlockIcons == null && nbt.hasKey(NBT.TEXTURE_FOLDER)) {
+                if (GregTechAPI.sBlockIcons == null && nbt.hasKey(NBT.TEXTURE_FOLDER)) {
                     loadTextures(nbt.getString(NBT.TEXTURE_FOLDER));
                 } else {
                     copyTextures();
@@ -284,7 +284,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
         nbt.setShort(NBT.MTE_ID, mteID);
         nbt.setShort(NBT.MTE_REG, mteRegistry);
         // write the Custom Name
-        if (GT_Utility.isStringValid(customName)) {
+        if (GTUtility.isStringValid(customName)) {
             final NBTTagCompound displayNBT;
             if (nbt.hasKey(NBT.DISPLAY)) {
                 displayNBT = nbt.getCompoundTag(NBT.DISPLAY);
@@ -349,7 +349,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
     public TileEntity getTileEntity(int aX, int aY, int aZ) {
         if (worldObj == null
             || (ignoreUnloadedChunks && crossedChunkBorder(aX, aZ) && !worldObj.blockExists(aX, aY, aZ))) return null;
-        return GT_Util.getTileEntity(worldObj, aX, aY, aZ, true);
+        return GTUtil.getTileEntity(worldObj, aX, aY, aZ, true);
     }
 
     @Override
@@ -410,7 +410,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
 
     @Override
     public String getCustomName() {
-        return GT_Utility.isStringValid(customName) ? customName : null;
+        return GTUtility.isStringValid(customName) ? customName : null;
     }
 
     @Override
@@ -468,7 +468,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
 
         if (shouldTriggerBlockUpdate()) {
             // If we're triggering a block update this will call onMachineBlockUpdate()
-            GregTech_API.causeMachineUpdate(worldObj, xCoord, yCoord, zCoord);
+            GregTechAPI.causeMachineUpdate(worldObj, xCoord, yCoord, zCoord);
         } else {
             // If we're not trigger a cascading one, call the update here.
             onMachineBlockUpdate();
@@ -653,7 +653,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
     }
 
     @Override
-    public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCoverID) {
+    public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aCoverID) {
         return true;
     }
 
@@ -696,13 +696,13 @@ public abstract class MultiTileEntity extends CoverableTileEntity
 
     @Override
     public String getOwnerName() {
-        if (GT_Utility.isStringInvalid(ownerName)) return "Player";
+        if (GTUtility.isStringInvalid(ownerName)) return "Player";
         return ownerName;
     }
 
     @Override
     public String setOwnerName(String aName) {
-        if (GT_Utility.isStringInvalid(aName)) return ownerName = "Player";
+        if (GTUtility.isStringInvalid(aName)) return ownerName = "Player";
         return ownerName = aName;
     }
 
@@ -741,7 +741,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
             return allowRightclick(aPlayer) && onRightClick(aPlayer, side, aX, aY, aZ);
         } catch (Throwable e) {
             GT_FML_LOGGER.error("onBlockActivated Failed", e);
-            e.printStackTrace(GT_Log.err);
+            e.printStackTrace(GTLog.err);
             return true;
         }
     }
@@ -752,7 +752,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
             // Configure Cover, sneak can also be: screwdriver, wrench, side cutter, soldering iron
             if (aPlayer.isSneaking()) {
                 final ForgeDirection tSide = (getCoverIDAtSide(side) == 0)
-                    ? GT_Utility.determineWrenchingSide(side, aX, aY, aZ)
+                    ? GTUtility.determineWrenchingSide(side, aX, aY, aZ)
                     : side;
                 return (getCoverBehaviorAtSideNew(tSide).hasCoverGUI());
             } else if (getCoverBehaviorAtSideNew(side).onCoverRightclickClient(side, this, aPlayer, aX, aY, aZ)) {
@@ -764,37 +764,37 @@ public abstract class MultiTileEntity extends CoverableTileEntity
             if (!privateAccess() || aPlayer.getDisplayName()
                 .equalsIgnoreCase(getOwnerName())) {
                 final ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem();
-                final ForgeDirection wrenchSide = GT_Utility.determineWrenchingSide(side, aX, aY, aZ);
+                final ForgeDirection wrenchSide = GTUtility.determineWrenchingSide(side, aX, aY, aZ);
 
                 if (tCurrentItem != null) {
                     if (getColorization() >= 0
-                        && GT_Utility.areStacksEqual(new ItemStack(Items.water_bucket, 1), tCurrentItem)) {
+                        && GTUtility.areStacksEqual(new ItemStack(Items.water_bucket, 1), tCurrentItem)) {
                         // TODO (Colorization)
                     }
 
-                    if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWrenchList))
+                    if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sWrenchList))
                         return onWrenchRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ, tCurrentItem);
-                    if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sScrewdriverList))
+                    if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sScrewdriverList))
                         return onScrewdriverRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ, tCurrentItem);
-                    if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sHardHammerList))
+                    if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sHardHammerList))
                         return onHammerRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ, tCurrentItem);
-                    if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSoftHammerList))
+                    if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sSoftHammerList))
                         return onMalletRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ, tCurrentItem);
-                    if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSolderingToolList))
+                    if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sSolderingToolList))
                         return onSolderingRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ, tCurrentItem);
-                    if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWireCutterList))
+                    if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sWireCutterList))
                         return onWireCutterRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ, tCurrentItem);
 
                     final ForgeDirection coverSide = getCoverIDAtSide(side) == 0 ? wrenchSide : side;
 
                     if (getCoverIDAtSide(coverSide) == 0) {
-                        if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sCovers.keySet())) {
-                            if (GregTech_API.getCoverBehaviorNew(tCurrentItem)
+                        if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sCovers.keySet())) {
+                            if (GregTechAPI.getCoverBehaviorNew(tCurrentItem)
                                 .isCoverPlaceable(coverSide, tCurrentItem, this)
-                                && allowCoverOnSide(coverSide, new GT_ItemStack(tCurrentItem))) {
+                                && allowCoverOnSide(coverSide, new GTItemStack(tCurrentItem))) {
                                 setCoverItemAtSide(coverSide, tCurrentItem);
                                 if (!aPlayer.capabilities.isCreativeMode) tCurrentItem.stackSize--;
-                                GT_Utility.sendSoundToPlayers(
+                                GTUtility.sendSoundToPlayers(
                                     worldObj,
                                     SoundResource.IC2_TOOLS_WRENCH,
                                     1.0F,
@@ -808,9 +808,9 @@ public abstract class MultiTileEntity extends CoverableTileEntity
                             return true;
                         }
                     } else {
-                        if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sCrowbarList)) {
-                            if (GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) {
-                                GT_Utility.sendSoundToPlayers(
+                        if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sCrowbarList)) {
+                            if (GTModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) {
+                                GTUtility.sendSoundToPlayers(
                                     worldObj,
                                     SoundResource.RANDOM_BREAK,
                                     1.0F,
@@ -825,7 +825,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
                         }
                     }
                 } else if (aPlayer.isSneaking()) { // Sneak click, no tool -> open cover config if possible.
-                    side = (getCoverIDAtSide(side) == 0) ? GT_Utility.determineWrenchingSide(side, aX, aY, aZ) : side;
+                    side = (getCoverIDAtSide(side) == 0) ? GTUtility.determineWrenchingSide(side, aX, aY, aZ) : side;
                     return getCoverIDAtSide(side) > 0 && getCoverBehaviorAtSideNew(side).onCoverShiftRightClick(
                         side,
                         getCoverIDAtSide(side),
@@ -867,7 +867,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
             return false;
         }
 
-        GT_UIInfos.openGTTileEntityUI(this, aPlayer);
+        GTUIInfos.openGTTileEntityUI(this, aPlayer);
         System.out.println("Trying to open a UI");
         return true;
     }
@@ -875,15 +875,15 @@ public abstract class MultiTileEntity extends CoverableTileEntity
     public boolean onWrenchRightClick(EntityPlayer aPlayer, ItemStack tCurrentItem, ForgeDirection wrenchSide, float aX,
         float aY, float aZ, ItemStack aTool) {
         if (setMainFacing(wrenchSide)) {
-            GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer);
-            GT_Utility.sendSoundToPlayers(worldObj, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1, xCoord, yCoord, zCoord);
+            GTModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer);
+            GTUtility.sendSoundToPlayers(worldObj, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1, xCoord, yCoord, zCoord);
         }
         return onWrenchRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ);
     }
 
     public boolean onScrewdriverRightClick(EntityPlayer aPlayer, ItemStack tCurrentItem, ForgeDirection wrenchSide,
         float aX, float aY, float aZ, ItemStack aTool) {
-        if (GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 200, aPlayer)) {
+        if (GTModHandler.damageOrDechargeItem(tCurrentItem, 1, 200, aPlayer)) {
             setCoverDataAtSide(
                 wrenchSide,
                 getCoverBehaviorAtSideNew(wrenchSide).onCoverScrewdriverClick(
@@ -896,7 +896,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
                     aY,
                     aZ));
             // TODO: Update connections!
-            GT_Utility.sendSoundToPlayers(worldObj, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1, xCoord, yCoord, zCoord);
+            GTUtility.sendSoundToPlayers(worldObj, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1, xCoord, yCoord, zCoord);
         }
         return onScrewdriverRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ);
     }
@@ -1033,20 +1033,20 @@ public abstract class MultiTileEntity extends CoverableTileEntity
     /**
      * @return a Packet containing all Data which has to be synchronised to the Client - Override as needed
      */
-    public GT_Packet_MultiTileEntity getClientDataPacket() {
+    public GTPacketMultiTileEntity getClientDataPacket() {
 
-        final GT_Packet_MultiTileEntity packet = new GT_Packet_MultiTileEntity(false);
+        final GTPacketMultiTileEntity packet = new GTPacketMultiTileEntity(false);
         return packet;
     }
 
     @Override
     public void sendClientData(EntityPlayerMP aPlayer) {
         if (worldObj == null || worldObj.isRemote) return;
-        final GT_Packet_New tPacket = getClientDataPacket();
+        final GTPacketNew tPacket = getClientDataPacket();
         if (aPlayer == null) {
-            GT_Values.NW.sendPacketToAllPlayersInRange(worldObj, tPacket, getXCoord(), getZCoord());
+            GTValues.NW.sendPacketToAllPlayersInRange(worldObj, tPacket, getXCoord(), getZCoord());
         } else {
-            GT_Values.NW.sendToPlayer(tPacket, aPlayer);
+            GTValues.NW.sendToPlayer(tPacket, aPlayer);
         }
         sendCoverDataIfNeeded();
     }
@@ -1339,20 +1339,20 @@ public abstract class MultiTileEntity extends CoverableTileEntity