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

8 files changed, 64 insertions, 64 deletions

diff --git a/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java b/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java
index 56cf2fdbab..cfc152d832 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java
@@ -3,7 +3,7 @@ package gtPlusPlus.core.tileentities;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.general.BlockSuperLight.TileEntitySuperLight;
-import gtPlusPlus.core.block.machine.Machine_SuperJukebox.TileEntitySuperJukebox;
+import gtPlusPlus.core.block.machine.BlockSuperJukebox.TileEntitySuperJukebox;
 import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer;
 import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest;
 import gtPlusPlus.core.tileentities.general.TileEntityFishTrap;
diff --git a/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java b/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java
index 98f1d67439..d5d348e0d8 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java
@@ -15,16 +15,16 @@ import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.IFluidHandler;
 
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.interfaces.IDescribable;
 import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.net.GT_Packet_Block_Event;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.net.GTPacketBlockEvent;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.covers.CoverInfo;
 import gtPlusPlus.api.interfaces.ILazyCoverable;
@@ -297,9 +297,9 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
         return this.canAccessData() ? this.mInventory.isValidSlot(aIndex) : false;
     }
 
-    private final GT_CoverBehavior[] mCoverBehaviors = new GT_CoverBehavior[] { GregTech_API.sNoBehavior,
-        GregTech_API.sNoBehavior, GregTech_API.sNoBehavior, GregTech_API.sNoBehavior, GregTech_API.sNoBehavior,
-        GregTech_API.sNoBehavior };
+    private final CoverBehavior[] mCoverBehaviors = new CoverBehavior[] { GregTechAPI.sNoBehavior,
+        GregTechAPI.sNoBehavior, GregTechAPI.sNoBehavior, GregTechAPI.sNoBehavior, GregTechAPI.sNoBehavior,
+        GregTechAPI.sNoBehavior };
     protected TileEntityBase mMetaTileEntity;
     protected long mStoredEnergy = 0;
     protected int mAverageEUInputIndex = 0, mAverageEUOutputIndex = 0;
@@ -309,7 +309,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
         mActiveEUOutputs = new boolean[] { false, false, false, false, false, false };
     private byte[] mSidedRedstone = new byte[] { 15, 15, 15, 15, 15, 15 };
     private int[] mCoverSides = new int[] { 0, 0, 0, 0, 0, 0 }, mCoverData = new int[] { 0, 0, 0, 0, 0, 0 },
-        mTimeStatistics = new int[GregTech_API.TICKS_FOR_LAG_AVERAGING];
+        mTimeStatistics = new int[GregTechAPI.TICKS_FOR_LAG_AVERAGING];
     private boolean mHasEnoughEnergy = true;
     protected boolean mRunningThroughTick = false;
     protected boolean mInputDisabled = false;
@@ -763,14 +763,14 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
     public final boolean getOpacity(int aX, int aY, int aZ) {
         return this.ignoreUnloadedChunks && this.crossedChunkBorder(aX, aZ) && !this.worldObj.blockExists(aX, aY, aZ)
             ? false
-            : GT_Utility.isOpaqueBlock(this.worldObj, aX, aY, aZ);
+            : GTUtility.isOpaqueBlock(this.worldObj, aX, aY, aZ);
     }
 
     @Override
     public final boolean getAir(int aX, int aY, int aZ) {
         return this.ignoreUnloadedChunks && this.crossedChunkBorder(aX, aZ) && !this.worldObj.blockExists(aX, aY, aZ)
             ? true
-            : GT_Utility.isBlockAir(this.worldObj, aX, aY, aZ);
+            : GTUtility.isBlockAir(this.worldObj, aX, aY, aZ);
     }
 
     @Override
@@ -846,9 +846,9 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
 
     @Override
     public final void sendBlockEvent(byte aID, byte aValue) {
-        GT_Values.NW.sendPacketToAllPlayersInRange(
+        GTValues.NW.sendPacketToAllPlayersInRange(
             this.worldObj,
-            new GT_Packet_Block_Event(this.xCoord, (short) this.yCoord, this.zCoord, aID, aValue),
+            new GTPacketBlockEvent(this.xCoord, (short) this.yCoord, this.zCoord, aID, aValue),
             this.xCoord,
             this.zCoord);
     }
@@ -858,7 +858,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
     }
 
     public final void setOnFire() {
-        GT_Utility.setCoordsOnFire(this.worldObj, this.xCoord, this.yCoord, this.zCoord, false);
+        GTUtility.setCoordsOnFire(this.worldObj, this.xCoord, this.yCoord, this.zCoord, false);
     }
 
     public final void setToFire() {
@@ -926,8 +926,8 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
     }
 
     @Override
-    public GT_CoverBehavior getCoverBehaviorAtSide(ForgeDirection side) {
-        return side != ForgeDirection.UNKNOWN ? mCoverBehaviors[side.ordinal()] : GregTech_API.sNoBehavior;
+    public CoverBehavior getCoverBehaviorAtSide(ForgeDirection side) {
+        return side != ForgeDirection.UNKNOWN ? mCoverBehaviors[side.ordinal()] : GregTechAPI.sNoBehavior;
     }
 
     @Override
@@ -944,7 +944,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
             final int ordinalSide = side.ordinal();
             mCoverSides[ordinalSide] = aID;
             mCoverData[ordinalSide] = 0;
-            mCoverBehaviors[ordinalSide] = (GT_CoverBehavior) GregTech_API.getCoverBehaviorNew(aID);
+            mCoverBehaviors[ordinalSide] = (CoverBehavior) GregTechAPI.getCoverBehaviorNew(aID);
             return true;
         }
         return false;
@@ -958,7 +958,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
 
     @Override
     public void setCoverItemAtSide(ForgeDirection side, ItemStack aCover) {
-        GregTech_API.getCoverBehaviorNew(aCover)
+        GregTechAPI.getCoverBehaviorNew(aCover)
             .placeCover(side, aCover, this);
     }
 
@@ -970,7 +970,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
 
     @Override
     public ItemStack getCoverItemAtSide(ForgeDirection side) {
-        return GT_Utility.intToStack(getCoverIDAtSide(side));
+        return GTUtility.intToStack(getCoverIDAtSide(side));
     }
 
     @Override
@@ -1056,12 +1056,12 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
     }
 
     public String getOwnerName() {
-        if (GT_Utility.isStringInvalid(mOwnerName)) return "Player";
+        if (GTUtility.isStringInvalid(mOwnerName)) return "Player";
         return mOwnerName;
     }
 
     public String setOwnerName(String aName) {
-        if (GT_Utility.isStringInvalid(aName)) return mOwnerName = "Player";
+        if (GTUtility.isStringInvalid(aName)) return mOwnerName = "Player";
         return mOwnerName = aName;
     }
 
@@ -1222,15 +1222,15 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
 
     @Override
     public boolean addStackToSlot(int aIndex, ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack)) return true;
+        if (GTUtility.isStackInvalid(aStack)) return true;
         if (aIndex < 0 || aIndex >= getSizeInventory()) return false;
         ItemStack tStack = getStackInSlot(aIndex);
-        if (GT_Utility.isStackInvalid(tStack)) {
+        if (GTUtility.isStackInvalid(tStack)) {
             setInventorySlotContents(aIndex, aStack);
             return true;
         }
-        aStack = GT_OreDictUnificator.get(aStack);
-        if (GT_Utility.areStacksEqual(tStack, aStack)
+        aStack = GTOreDictUnificator.get(aStack);
+        if (GTUtility.areStacksEqual(tStack, aStack)
             && tStack.stackSize + aStack.stackSize <= Math.min(aStack.getMaxStackSize(), getInventoryStackLimit())) {
             tStack.stackSize += aStack.stackSize;
             return true;
@@ -1240,7 +1240,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
 
     @Override
     public boolean addStackToSlot(int aIndex, ItemStack aStack, int aAmount) {
-        return addStackToSlot(aIndex, GT_Utility.copyAmount(aAmount, aStack));
+        return addStackToSlot(aIndex, GTUtility.copyAmount(aAmount, aStack));
     }
 
     @Override
@@ -1290,8 +1290,8 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
             this.doExplosion(
                 this.oOutput * (long) (this.getUniversalEnergyStored() >= this.getUniversalEnergyCapacity() ? 4
                     : (this.getUniversalEnergyStored() >= this.getUniversalEnergyCapacity() / 2L ? 2 : 1)));
-            GT_Mod arg9999 = GT_Mod.instance;
-            GT_Mod.achievements.issueAchievement(
+            GTMod arg9999 = GTMod.instance;
+            GTMod.achievements.issueAchievement(
                 this.getWorldObj()
                     .getPlayerEntityByName(this.mOwnerName),
                 "electricproblems");
@@ -1300,10 +1300,10 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
 
     public void doExplosion(long aAmount) {
         if (this.canAccessData()) {
-            if (GregTech_API.sMachineWireFire && this.mMetaTileEntity.isElectric()) {
+            if (GregTechAPI.sMachineWireFire && this.mMetaTileEntity.isElectric()) {
                 try {
                     this.mReleaseEnergy = true;
-                    Util.emitEnergyToNetwork(GT_Values.V[5], Math.max(1L, this.getStoredEU() / GT_Values.V[5]), this);
+                    Util.emitEnergyToNetwork(GTValues.V[5], Math.max(1L, this.getStoredEU() / GTValues.V[5]), this);
                 } catch (Exception arg4) {}
             }
             this.mReleaseEnergy = false;
diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java
index ce28dd0b3e..113440e8b5 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java
@@ -9,7 +9,7 @@ import net.minecraft.network.Packet;
 import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
 import net.minecraft.tileentity.TileEntity;
 
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.inventories.InventoryCircuitProgrammer;
 import gtPlusPlus.core.recipe.common.CI;
@@ -109,7 +109,7 @@ public class TileEntityCircuitProgrammer extends TileEntity implements ISidedInv
                     // Check Circuit Type
                     ItemStack aOutput;
                     if (aTypeInSlot == 0) {
-                        aOutput = GT_Utility.getIntegratedCircuit(e);
+                        aOutput = GTUtility.getIntegratedCircuit(e);
                     } else if (aTypeInSlot == 1) {
                         aOutput = CI.getNumberedBioCircuit(e);
                     } else if (aTypeInSlot == 2) {
diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java
index 4b3fd3f087..a6754b00b0 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java
@@ -25,13 +25,13 @@ import com.cleanroommc.modularui.widgets.TextWidget;
 import com.cleanroommc.modularui.widgets.slot.SlotGroup;
 
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.inventories.Inventory_DecayablesChest;
+import gtPlusPlus.core.inventories.InventoryDecayablesChest;
 import gtPlusPlus.core.item.materials.DustDecayable;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class TileEntityDecayablesChest extends TileEntity implements ISidedInventory, IGuiHolder {
 
-    private final Inventory_DecayablesChest inventoryContents;
+    private final InventoryDecayablesChest inventoryContents;
 
     /** Determines if the check for adjacent chests has taken place. */
     public boolean adjacentChestChecked;
@@ -57,10 +57,10 @@ public class TileEntityDecayablesChest extends TileEntity implements ISidedInven
     private int tickCount = 0;
 
     public TileEntityDecayablesChest() {
-        this.inventoryContents = new Inventory_DecayablesChest();
+        this.inventoryContents = new InventoryDecayablesChest();
     }
 
-    public Inventory_DecayablesChest getInventory() {
+    public InventoryDecayablesChest getInventory() {
         return this.inventoryContents;
     }
 
diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java
index 1a09b6b423..49d466d70d 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java
@@ -17,7 +17,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.FishingHooks;
 
 import gregtech.api.enums.Materials;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.inventories.InventoryFishTrap;
 import gtPlusPlus.core.util.math.MathUtils;
@@ -76,7 +76,7 @@ public class TileEntityFishTrap extends TileEntity implements ISidedInventory {
         }
         for (final ItemStack contents : this.getInventory()
             .getInventory()) {
-            if (GT_Utility.areStacksEqual(loot, contents)) {
+            if (GTUtility.areStacksEqual(loot, contents)) {
                 if (contents.stackSize < contents.getMaxStackSize()) {
                     contents.stackSize++;
                     this.markDirty();
diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java
index a9bc2b0049..7f1cde2476 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java
@@ -12,8 +12,8 @@ import net.minecraftforge.fluids.FluidStack;
 
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.container.Container_VolumetricFlaskSetter;
-import gtPlusPlus.core.inventories.Inventory_VolumetricFlaskSetter;
+import gtPlusPlus.core.container.ContainerVolumetricFlaskSetter;
+import gtPlusPlus.core.inventories.InventoryVolumetricFlaskSetter;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
@@ -21,7 +21,7 @@ import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
 public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISidedInventory {
 
     private int tickCount = 0;
-    private final Inventory_VolumetricFlaskSetter inventoryContents;
+    private final InventoryVolumetricFlaskSetter inventoryContents;
     private String customName;
     public int locationX;
     public int locationY;
@@ -30,7 +30,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide
     private int aCustomValue = 1000;
 
     public TileEntityVolumetricFlaskSetter() {
-        this.inventoryContents = new Inventory_VolumetricFlaskSetter();
+        this.inventoryContents = new InventoryVolumetricFlaskSetter();
         this.setTileLocation();
     }
 
@@ -62,7 +62,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide
     public final boolean hasFlask() {
         for (int i = 0; i < this.getInventory()
             .getInventory().length - 1; i++) {
-            if (i == Container_VolumetricFlaskSetter.SLOT_OUTPUT) {
+            if (i == ContainerVolumetricFlaskSetter.SLOT_OUTPUT) {
                 continue;
             }
             if (this.getInventory()
@@ -73,7 +73,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide
         return false;
     }
 
-    public Inventory_VolumetricFlaskSetter getInventory() {
+    public InventoryVolumetricFlaskSetter getInventory() {
         return this.inventoryContents;
     }
 
@@ -124,9 +124,9 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide
 
         // Check if there is output in slot.
         Boolean hasOutput = false;
-        if (aInputs[Container_VolumetricFlaskSetter.SLOT_OUTPUT] != null) {
+        if (aInputs[ContainerVolumetricFlaskSetter.SLOT_OUTPUT] != null) {
             hasOutput = true;
-            if (aInputs[Container_VolumetricFlaskSetter.SLOT_OUTPUT].stackSize >= 16) {
+            if (aInputs[ContainerVolumetricFlaskSetter.SLOT_OUTPUT].stackSize >= 16) {
                 return false;
             }
         }
@@ -145,7 +145,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide
                 log("Skipping Custom slot as value <= 0");
                 continue;
             }
-            if (e == Container_VolumetricFlaskSetter.SLOT_OUTPUT) {
+            if (e == ContainerVolumetricFlaskSetter.SLOT_OUTPUT) {
                 continue;
             }
 
@@ -163,7 +163,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide
                 }
                 // Existing Output
                 else {
-                    ItemStack f = aInputs[Container_VolumetricFlaskSetter.SLOT_OUTPUT];
+                    ItemStack f = aInputs[ContainerVolumetricFlaskSetter.SLOT_OUTPUT];
                     FluidStack aFluidInCheckedSlot = VolumetricFlaskHelper.getFlaskFluid(f);
                     int aTypeInCheckedSlot = getFlaskType(f);
                     // Check that the Circuit in the Output slot is not null and the same type as the circuit input.
@@ -214,7 +214,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide
                             VolumetricFlaskHelper.setFluid(aOutput, aOutputFluid);
                         }
                         this.setInventorySlotContents(e, aInputStack);
-                        this.setInventorySlotContents(Container_VolumetricFlaskSetter.SLOT_OUTPUT, aOutput);
+                        this.setInventorySlotContents(ContainerVolumetricFlaskSetter.SLOT_OUTPUT, aOutput);
                         return true;
                     }
                 }
@@ -359,7 +359,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide
 
     @Override
     public boolean canExtractItem(final int aSlot, final ItemStack p_102008_2_, final int p_102008_3_) {
-        return aSlot == Container_VolumetricFlaskSetter.SLOT_OUTPUT;
+        return aSlot == ContainerVolumetricFlaskSetter.SLOT_OUTPUT;
     }
 
     public String getCustomName() {
diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java
index dfdb7104b0..66378f0f7a 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java
@@ -27,11 +27,11 @@ import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 import net.minecraftforge.oredict.OreDictionary;
 
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.minecraft.BTF_FluidTank;
 import gtPlusPlus.core.inventories.InventoryPestKiller;
-import gtPlusPlus.core.material.MISC_MATERIALS;
+import gtPlusPlus.core.material.MaterialMisc;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
@@ -186,7 +186,7 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory,
             if (f != null) {
                 if (f.isFluidEqual(FluidUtils.getWildcardFluidStack("formaldehyde", 1))) {
                     return 1;
-                } else if (f.isFluidEqual(MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(1))) {
+                } else if (f.isFluidEqual(MaterialMisc.HYDROGEN_CYANIDE.getFluidStack(1))) {
                     return 2;
                 }
             }
@@ -330,7 +330,7 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory,
         if (this.getInventory()
             .getInventory()[0] == null) {
             return true;
-        } else if (GT_Utility.areStacksEqual(
+        } else if (GTUtility.areStacksEqual(
             aStack,
             this.getInventory()
                 .getInventory()[0])) {
@@ -471,7 +471,7 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory,
             ArrayList<ItemStack> t2Cells = OreDictionary.getOres("cellHydrogenCyanide");
             didFill = addFluid(t1Cells, aInput, FluidUtils.getWildcardFluidStack("formaldehyde", 1000));
             if (!didFill) {
-                didFill = addFluid(t2Cells, aInput, MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(1000));
+                didFill = addFluid(t2Cells, aInput, MaterialMisc.HYDROGEN_CYANIDE.getFluidStack(1000));
             }
         }
 
@@ -495,7 +495,7 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory,
 
     public boolean addFluid(ArrayList<ItemStack> inputs, ItemStack aInput, FluidStack aFluidForInput) {
         for (ItemStack a : inputs) {
-            if (GT_Utility.areStacksEqual(a, aInput)) {
+            if (GTUtility.areStacksEqual(a, aInput)) {
                 if (mTank.getFluid() == null || mTank.getFluid()
                     .isFluidEqual(aFluidForInput)) {
                     boolean didFill = fill(ForgeDirection.UNKNOWN, aFluidForInput, true) > 0;
diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java
index 7c90ddc1c2..02641f1e08 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java
@@ -9,9 +9,9 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 
 import gregtech.api.enums.ItemList;
-import gregtech.common.items.GT_MetaGenerated_Item_01;
+import gregtech.common.items.MetaGeneratedItem01;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.container.Container_ProjectTable;
+import gtPlusPlus.core.container.ContainerProjectTable;
 import gtPlusPlus.core.inventories.projecttable.InventoryProjectMain;
 import gtPlusPlus.core.inventories.projecttable.InventoryProjectOutput;
 import gtPlusPlus.core.util.minecraft.NBTUtils;
@@ -28,7 +28,7 @@ public class TileEntityProjectTable extends TileEntity
     public InventoryProjectMain inventoryGrid;
     public InventoryProjectOutput inventoryOutputs;
 
-    private Container_ProjectTable container;
+    private ContainerProjectTable container;
 
     public TileEntityProjectTable() {
         this.inventoryGrid = new InventoryProjectMain(); // number of slots - without product slot
@@ -36,7 +36,7 @@ public class TileEntityProjectTable extends TileEntity
         this.canUpdate();
     }
 
-    public void setContainer(Container_ProjectTable container) {
+    public void setContainer(ContainerProjectTable container) {
         this.container = container;
     }
 
@@ -122,7 +122,7 @@ public class TileEntityProjectTable extends TileEntity
             // Data stick
             ItemStack dataStick = this.inventoryOutputs.getStackInSlot(0);
             if (dataStick != null && this.container != null && container.getOutputContent() != null) {
-                if ((dataStick.getItem() instanceof GT_MetaGenerated_Item_01 && dataStick.getItemDamage() == 32708)
+                if ((dataStick.getItem() instanceof MetaGeneratedItem01 && dataStick.getItemDamage() == 32708)
                     || (dataStick == ItemList.Tool_DataStick.get(1))
                     || (dataStick == GregtechItemList.Old_Tool_DataStick.get(1))
                     || (dataStick.getItem() instanceof MetaGeneratedGregtechItems