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

17 files changed, 88 insertions, 88 deletions

diff --git a/src/main/java/gtPlusPlus/core/block/ModBlocks.java b/src/main/java/gtPlusPlus/core/block/ModBlocks.java
index 417b342f7e..6169581257 100644
--- a/src/main/java/gtPlusPlus/core/block/ModBlocks.java
+++ b/src/main/java/gtPlusPlus/core/block/ModBlocks.java
@@ -5,19 +5,19 @@ import net.minecraftforge.fluids.Fluid;
 
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.general.BlockCompressedObsidian;
-import gtPlusPlus.core.block.general.FluidTankInfinite;
-import gtPlusPlus.core.block.general.HellFire;
-import gtPlusPlus.core.block.general.LightGlass;
-import gtPlusPlus.core.block.general.MiningExplosives;
+import gtPlusPlus.core.block.general.BlockFluidTankInfinite;
+import gtPlusPlus.core.block.general.BlockHellFire;
+import gtPlusPlus.core.block.general.BlockLightGlass;
+import gtPlusPlus.core.block.general.BlockMiningExplosives;
 import gtPlusPlus.core.block.general.antigrief.BlockWitherProof;
-import gtPlusPlus.core.block.machine.CircuitProgrammer;
-import gtPlusPlus.core.block.machine.DecayablesChest;
-import gtPlusPlus.core.block.machine.FishTrap;
-import gtPlusPlus.core.block.machine.Machine_PestKiller;
-import gtPlusPlus.core.block.machine.Machine_PooCollector;
-import gtPlusPlus.core.block.machine.Machine_ProjectTable;
-import gtPlusPlus.core.block.machine.Machine_SuperJukebox;
-import gtPlusPlus.core.block.machine.VolumetricFlaskSetter;
+import gtPlusPlus.core.block.machine.BlockCircuitProgrammer;
+import gtPlusPlus.core.block.machine.BlockDecayablesChest;
+import gtPlusPlus.core.block.machine.BlockFishTrap;
+import gtPlusPlus.core.block.machine.BlockFlaskSetter;
+import gtPlusPlus.core.block.machine.BlockPestKiller;
+import gtPlusPlus.core.block.machine.BlockPooCollector;
+import gtPlusPlus.core.block.machine.BlockProjectTable;
+import gtPlusPlus.core.block.machine.BlockSuperJukebox;
 import gtPlusPlus.core.fluids.FluidRegistryHandler;
 
 public final class ModBlocks {
@@ -68,31 +68,31 @@ public final class ModBlocks {
     public static void registerBlocks() {
 
         Logger.INFO("Registering Blocks.");
-        MatterFabricatorEffectBlock = new LightGlass(false);
+        MatterFabricatorEffectBlock = new BlockLightGlass(false);
 
         // Fluids
         FluidRegistryHandler.registerFluids();
 
         // Workbench
-        blockFishTrap = new FishTrap();
-        blockInfiniteFLuidTank = new FluidTankInfinite();
-        blockMiningExplosive = new MiningExplosives();
-        blockHellfire = new HellFire();
-        blockProjectTable = new Machine_ProjectTable();
+        blockFishTrap = new BlockFishTrap();
+        blockInfiniteFLuidTank = new BlockFluidTankInfinite();
+        blockMiningExplosive = new BlockMiningExplosives();
+        blockHellfire = new BlockHellFire();
+        blockProjectTable = new BlockProjectTable();
         blockWitherGuard = new BlockWitherProof();
         blockCompressedObsidian = new BlockCompressedObsidian();
 
-        blockCircuitProgrammer = new CircuitProgrammer();
+        blockCircuitProgrammer = new BlockCircuitProgrammer();
 
-        blockDecayablesChest = new DecayablesChest();
+        blockDecayablesChest = new BlockDecayablesChest();
 
-        blockCustomJukebox = new Machine_SuperJukebox();
+        blockCustomJukebox = new BlockSuperJukebox();
 
-        blockPooCollector = new Machine_PooCollector();
+        blockPooCollector = new BlockPooCollector();
 
-        blockPestKiller = new Machine_PestKiller();
+        blockPestKiller = new BlockPestKiller();
 
-        blockVolumetricFlaskSetter = new VolumetricFlaskSetter();
+        blockVolumetricFlaskSetter = new BlockFlaskSetter();
 
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
index c39565ea41..bace2937fd 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
@@ -30,7 +30,7 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.minecraft.CubicObject;
 import gtPlusPlus.api.objects.minecraft.SafeTexture;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.InventoryUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -63,7 +63,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
 
     /**
      * Does this {@link Block} require special {@link ItemBlock} handling?
-     * 
+     *
      * @return The {@link Class} that will be used for this {@link Block}.
      */
     public Class<? extends ItemBlock> getItemBlockClass() {
@@ -72,28 +72,28 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
 
     /**
      * A lazy way to declare the unlocal name for the block, makes boilerplating easy.
-     * 
+     *
      * @return The internal name for this block.
      */
     public abstract String getUnlocalBlockName();
 
     /**
      * Lazy Boilerplating.
-     * 
+     *
      * @return Block Hardness.
      */
     protected abstract float initBlockHardness();
 
     /**
      * Lazy Boilerplating.
-     * 
+     *
      * @return Block Resistance.
      */
     protected abstract float initBlockResistance();
 
     /**
      * Lazy Boilerplating.
-     * 
+     *
      * @return The {@link CreativeTab} this Block is shown on.
      */
     protected abstract CreativeTabs initCreativeTab();
@@ -128,7 +128,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
 
     /**
      * The String used for texture pathing.
-     * 
+     *
      * @return Sanitized {@link String}, containing no spaces or illegal characters.
      */
     private String getTileEntityNameForTexturePathing() {
@@ -172,9 +172,9 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
         // Default Path Name, this will make us look inside 'miscutils\textures\blocks'
         final String aPrefixTexPath = GTPlusPlus.ID + ":";
         // Default Path Name, this will make us look in the subdirectory for this Tile Entity.
-        final String aTexPathMid = "TileEntities" + CORE.SEPERATOR
+        final String aTexPathMid = "TileEntities" + GTPPCore.SEPERATOR
             + getTileEntityNameForTexturePathing()
-            + CORE.SEPERATOR;
+            + GTPPCore.SEPERATOR;
         // Construct a full path
         String aTexPathBuilt = aPrefixTexPath + aTexPathMid;
         // File Name Suffixes, without meta tags
diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java
index b07c6d1529..abd83d7171 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java
@@ -16,11 +16,11 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TextureSet;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTOreDictUnificator;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.base.itemblock.ItemBlockGtBlock;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
@@ -58,7 +58,7 @@ public class BlockBaseModular extends BasicBlock {
         registerComponent();
         sBlockCache.put(material.getUnlocalizedName() + "." + blockType.name(), this);
         thisBlockMaterialTranslatedName = material.getTranslatedName();
-        GT_LanguageManager.addStringLocalization("gtplusplus." + getUnlocalizedName() + ".name", getProperName());
+        GTLanguageManager.addStringLocalization("gtplusplus." + getUnlocalizedName() + ".name", getProperName());
     }
 
     protected BlockBaseModular(final String unlocalizedName, final String blockMaterialString,
@@ -79,13 +79,13 @@ public class BlockBaseModular extends BasicBlock {
             ItemBlockGtBlock.class,
             Utils.sanitizeString(blockType.getTexture() + unlocalizedName));
         if (fx == 0) {
-            GT_OreDictUnificator
+            GTOreDictUnificator
                 .registerOre("block" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this));
         } else if (fx == 1) {
-            GT_OreDictUnificator
+            GTOreDictUnificator
                 .registerOre("frameGt" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this));
         } else if (fx == 2) {
-            GT_OreDictUnificator
+            GTOreDictUnificator
                 .registerOre("frameGt" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this));
         }
     }
@@ -172,7 +172,7 @@ public class BlockBaseModular extends BasicBlock {
 
     @Override
     public String getLocalizedName() {
-        return GT_LanguageManager.getTranslation("gtplusplus." + getUnlocalizedName() + ".name")
+        return GTLanguageManager.getTranslation("gtplusplus." + getUnlocalizedName() + ".name")
             .replace("%s", "%temp")
             .replace("%material", this.thisBlockMaterialTranslatedName)
             .replace("%temp", "%s");
@@ -198,7 +198,7 @@ public class BlockBaseModular extends BasicBlock {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister iIcon) {
-        if (!CORE.ConfigSwitches.useGregtechTextures || this.blockMaterial == null
+        if (!GTPPCore.ConfigSwitches.useGregtechTextures || this.blockMaterial == null
             || this.thisBlock == BlockTypes.ORE) {
             this.blockIcon = iIcon.registerIcon(GTPlusPlus.ID + ":" + this.thisBlock.getTexture());
         }
diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
index 1813090810..b0ee1c0c77 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
@@ -18,12 +18,12 @@ import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTOreDictUnificator;
 import gtPlusPlus.api.interfaces.ITexturedBlock;
 import gtPlusPlus.core.client.renderer.CustomOreBlockRenderer;
 import gtPlusPlus.core.item.base.itemblock.ItemBlockOre;
@@ -31,8 +31,8 @@ import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_RenderedTexture;
+import gtPlusPlus.xmod.gregtech.api.objects.GTPPCopiedBlockTexture;
+import gtPlusPlus.xmod.gregtech.api.objects.GTPPRenderedTexture;
 
 public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
 
@@ -60,7 +60,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
                 this,
                 ItemBlockOre.class,
                 Utils.sanitizeString("ore" + Utils.sanitizeString(this.blockMaterial.getLocalizedName())));
-            GT_OreDictUnificator.registerOre(
+            GTOreDictUnificator.registerOre(
                 "ore" + Utils.sanitizeString(this.blockMaterial.getLocalizedName()),
                 ItemUtils.getSimpleStack(this));
         } catch (Throwable t) {
@@ -115,10 +115,10 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
     @Override
     public ITexture[] getTexture(Block block, ForgeDirection side) {
         if (this.blockMaterial != null) {
-            GTPP_RenderedTexture aIconSet = new GTPP_RenderedTexture(
+            GTPPRenderedTexture aIconSet = new GTPPRenderedTexture(
                 blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex],
                 this.blockMaterial.getRGBA());
-            return new ITexture[] { new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet };
+            return new ITexture[] { new GTPPCopiedBlockTexture(Blocks.stone, 0, 0), aIconSet };
         }
 
         if (hiddenTextureArray == null) {
@@ -134,7 +134,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
                 hiddenTextureArray = new IIconContainer[6];
             }
         }
-        return new ITexture[] { new GTPP_RenderedTexture(hiddenTextureArray[0], new short[] { 240, 240, 240, 0 }) };
+        return new ITexture[] { new GTPPRenderedTexture(hiddenTextureArray[0], new short[] { 240, 240, 240, 0 }) };
     }
 
     @Override
@@ -167,7 +167,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
         if (shouldSilkTouch) {
             drops.add(ItemUtils.simpleMetaStack(this, metadata, 1));
         } else {
-            switch (GT_Mod.gregtechproxy.oreDropSystem) {
+            switch (GTMod.gregtechproxy.oreDropSystem) {
                 case Item -> {
                     drops.add(
                         ItemUtils.getItemStackOfAmountFromOreDictNoBroken(
diff --git a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java b/src/main/java/gtPlusPlus/core/block/general/BlockFluidTankInfinite.java
index 41a581394b..a300b83577 100644
--- a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockFluidTankInfinite.java
@@ -23,7 +23,7 @@ import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.tileentities.general.TileEntityInfiniteFluid;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 
-public class FluidTankInfinite extends BlockContainer {
+public class BlockFluidTankInfinite extends BlockContainer {
 
     @SideOnly(Side.CLIENT)
     private IIcon textureTop;
@@ -34,7 +34,7 @@ public class FluidTankInfinite extends BlockContainer {
     @SideOnly(Side.CLIENT)
     private IIcon textureFront;
 
-    public FluidTankInfinite() {
+    public BlockFluidTankInfinite() {
         super(Material.iron);
         this.setBlockName("blockInfiniteFluidTank");
         this.setCreativeTab(AddToCreativeTab.tabMachines);
diff --git a/src/main/java/gtPlusPlus/core/block/general/HellFire.java b/src/main/java/gtPlusPlus/core/block/general/BlockHellFire.java
index 4e8d94328d..b18a2d4b86 100644
--- a/src/main/java/gtPlusPlus/core/block/general/HellFire.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockHellFire.java
@@ -33,7 +33,7 @@ import gregtech.api.objects.XSTR;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.util.math.MathUtils;
 
-public class HellFire extends BlockFire {
+public class BlockHellFire extends BlockFire {
 
     private final int[] field_149849_a = new int[Short.MAX_VALUE];
 
@@ -42,7 +42,7 @@ public class HellFire extends BlockFire {
     @SideOnly(Side.CLIENT)
     private IIcon[] IIconArray;
 
-    public HellFire() {
+    public BlockHellFire() {
         this.setTickRandomly(true);
         this.setLightLevel(1F);
         this.setLightOpacity(0);
diff --git a/src/main/java/gtPlusPlus/core/block/general/LightGlass.java b/src/main/java/gtPlusPlus/core/block/general/BlockLightGlass.java
index b6facce45f..1e4df5c399 100644
--- a/src/main/java/gtPlusPlus/core/block/general/LightGlass.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockLightGlass.java
@@ -20,7 +20,7 @@ import gtPlusPlus.core.creative.AddToCreativeTab;
 /*
  * public class LightGlass extends BlockBreakable {
  */
-public class LightGlass extends BlockAir {
+public class BlockLightGlass extends BlockAir {
 
     private int state = 0;
     private final int a = 255;
@@ -29,7 +29,7 @@ public class LightGlass extends BlockAir {
     private int b = 0;
     private int hex;
 
-    public LightGlass(final boolean bool) {
+    public BlockLightGlass(final boolean bool) {
         super();
         this.setCreativeTab(AddToCreativeTab.tabBlock);
         this.setBlockName("blockMFEffect");
diff --git a/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java b/src/main/java/gtPlusPlus/core/block/general/BlockMiningExplosives.java
index 7579907e9d..20b6fff9e6 100644
--- a/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockMiningExplosives.java
@@ -22,7 +22,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.entity.EntityPrimedMiningExplosive;
 
-public class MiningExplosives extends BlockTNT {
+public class BlockMiningExplosives extends BlockTNT {
 
     @SideOnly(Side.CLIENT)
     private IIcon textureTop;
@@ -30,7 +30,7 @@ public class MiningExplosives extends BlockTNT {
     @SideOnly(Side.CLIENT)
     private IIcon textureBottom;
 
-    public MiningExplosives() {
+    public BlockMiningExplosives() {
         this.setBlockName("blockMiningExplosives");
         GameRegistry.registerBlock(this, "blockMiningExplosives");
         this.setCreativeTab(AddToCreativeTab.tabMachines);
diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java
index dc6c92f065..4110c02fe3 100644
--- a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java
@@ -177,7 +177,7 @@ public class BlockSuperLight extends BlockContainer {
                                 // Turning Lights off
                                 else if (!enable && aLight > 0) {
                                     aBlocksToUpdate.put(new BlockPos(xOff, yOff, zOff, this.worldObj));
-                                    if (aBlockGet instanceof LightGlass) {
+                                    if (aBlockGet instanceof BlockLightGlass) {
                                         Logger.INFO("Dimmed air.");
                                         this.worldObj.setBlock(xOff, yOff, zOff, Blocks.air, 0, 3);
                                     }
diff --git a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/block/machine/BlockCircuitProgrammer.java
index f6cd34aec1..191a2a8f92 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockCircuitProgrammer.java
@@ -13,7 +13,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
+import gregtech.common.items.MetaGeneratedTool01;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.objects.minecraft.CubicObject;
 import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip;
@@ -22,7 +22,7 @@ import gtPlusPlus.core.handler.GuiHandler;
 import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 
-public class CircuitProgrammer extends BasicTileBlockWithTooltip {
+public class BlockCircuitProgrammer extends BasicTileBlockWithTooltip {
 
     /**
      * Determines which tooltip is displayed within the itemblock.
@@ -34,7 +34,7 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip {
         return this.mTooltipID;
     }
 
-    public CircuitProgrammer() {
+    public BlockCircuitProgrammer() {
         super(Material.iron);
     }
 
@@ -53,7 +53,7 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip {
             try {
                 final ItemStack mHandStack = PlayerUtils.getItemStackInPlayersHand(world, player.getDisplayName());
                 final Item mHandItem = mHandStack.getItem();
-                if (((mHandItem instanceof GT_MetaGenerated_Tool_01)
+                if (((mHandItem instanceof MetaGeneratedTool01)
                     && ((mHandItem.getDamage(mHandStack) == 22) || (mHandItem.getDamage(mHandStack) == 150)))) {
                     final TileEntityCircuitProgrammer tile = (TileEntityCircuitProgrammer) world.getTileEntity(x, y, z);
                     if (tile != null) {
diff --git a/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java b/src/main/java/gtPlusPlus/core/block/machine/BlockDecayablesChest.java
index 16d038bea9..2bcd9afb5f 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockDecayablesChest.java
@@ -27,7 +27,7 @@ import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
 import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest;
 import gtPlusPlus.core.util.minecraft.InventoryUtils;
 
-public class DecayablesChest extends BlockContainer implements ITileTooltip {
+public class BlockDecayablesChest extends BlockContainer implements ITileTooltip {
 
     @SideOnly(Side.CLIENT)
     private IIcon textureTop;
@@ -48,7 +48,7 @@ public class DecayablesChest extends BlockContainer implements ITileTooltip {
         return this.mTooltipID;
     }
 
-    public DecayablesChest() {
+    public BlockDecayablesChest() {
         super(Material.iron);
         this.setBlockName("blockDecayablesChest");
         this.setCreativeTab(AddToCreativeTab.tabMachines);
diff --git a/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java b/src/main/java/gtPlusPlus/core/block/machine/BlockFishTrap.java
index 0ec1ac629a..0a91c76d60 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockFishTrap.java
@@ -25,7 +25,7 @@ import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
 import gtPlusPlus.core.tileentities.general.TileEntityFishTrap;
 import gtPlusPlus.core.util.minecraft.InventoryUtils;
 
-public class FishTrap extends BlockContainer implements ITileTooltip {
+public class BlockFishTrap extends BlockContainer implements ITileTooltip {
 
     @SideOnly(Side.CLIENT)
     private IIcon textureTop;
@@ -46,7 +46,7 @@ public class FishTrap extends BlockContainer implements ITileTooltip {
         return this.mTooltipID;
     }
 
-    public FishTrap() {
+    public BlockFishTrap() {
         super(Material.iron);
         this.setBlockName("blockFishTrap");
         this.setHardness(5f);
diff --git a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/block/machine/BlockFlaskSetter.java
index 1bca4a5c5f..510caf3e14 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockFlaskSetter.java
@@ -14,7 +14,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
+import gregtech.common.items.MetaGeneratedTool01;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.objects.minecraft.CubicObject;
 import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip;
@@ -24,7 +24,7 @@ import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
 import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 
-public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip {
+public class BlockFlaskSetter extends BasicTileBlockWithTooltip {
 
     /**
      * Determines which tooltip is displayed within the itemblock.
@@ -41,7 +41,7 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip {
         return ItemBlockBasicTile.class;
     }
 
-    public VolumetricFlaskSetter() {
+    public BlockFlaskSetter() {
         super(Material.iron);
     }
 
@@ -60,7 +60,7 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip {
             try {
                 final ItemStack mHandStack = PlayerUtils.getItemStackInPlayersHand(world, player.getDisplayName());
                 final Item mHandItem = mHandStack.getItem();
-                if (((mHandItem instanceof GT_MetaGenerated_Tool_01)
+                if (((mHandItem instanceof MetaGeneratedTool01)
                     && ((mHandItem.getDamage(mHandStack) == 22) || (mHandItem.getDamage(mHandStack) == 150)))) {
                     final TileEntityVolumetricFlaskSetter tile = (TileEntityVolumetricFlaskSetter) world
                         .getTileEntity(x, y, z);
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java b/src/main/java/gtPlusPlus/core/block/machine/BlockPestKiller.java
index bf98a22500..95e7f3bc56 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockPestKiller.java
@@ -26,7 +26,7 @@ import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
 import gtPlusPlus.core.tileentities.machines.TileEntityPestKiller;
 import gtPlusPlus.core.util.minecraft.InventoryUtils;
 
-public class Machine_PestKiller extends BlockContainer implements ITileTooltip {
+public class BlockPestKiller extends BlockContainer implements ITileTooltip {
 
     @SideOnly(Side.CLIENT)
     private IIcon textureTop;
@@ -47,7 +47,7 @@ public class Machine_PestKiller extends BlockContainer implements ITileTooltip {
         return this.mTooltipID;
     }
 
-    public Machine_PestKiller() {
+    public BlockPestKiller() {
         super(Material.wood);
         this.setBlockName("blockPestKiller");
         this.setHardness(5f);
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_PooCollector.java b/src/main/java/gtPlusPlus/core/block/machine/BlockPooCollector.java
index 4f1b679fcf..6a371a3284 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_PooCollector.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockPooCollector.java
@@ -27,7 +27,7 @@ import gtPlusPlus.core.tileentities.machines.TileEntityPooCollector;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 
-public class Machine_PooCollector extends BlockContainer {
+public class BlockPooCollector extends BlockContainer {
 
     @SideOnly(Side.CLIENT)
     private IIcon textureTop;
@@ -41,7 +41,7 @@ public class Machine_PooCollector extends BlockContainer {
     @SideOnly(Side.CLIENT)
     private IIcon textureSide2;
 
-    public Machine_PooCollector() {
+    public BlockPooCollector() {
         super(Material.iron);
         this.setHardness(5f);
         this.setResistance(1f);
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java b/src/main/java/gtPlusPlus/core/block/machine/BlockProjectTable.java
index 4f0d0d7d60..1537aec736 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockProjectTable.java
@@ -31,7 +31,7 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import ic2.core.item.tool.ItemToolWrench;
 
 @Optional.Interface(iface = "crazypants.enderio.api.tool.ITool", modid = Mods.Names.ENDER_I_O)
-public class Machine_ProjectTable extends BlockContainer implements ITileTooltip {
+public class BlockProjectTable extends BlockContainer implements ITileTooltip {
 
     @SideOnly(Side.CLIENT)
     private IIcon textureTop;
@@ -52,7 +52,7 @@ public class Machine_ProjectTable extends BlockContainer implements ITileTooltip
         return this.mTooltipID;
     }
 
-    public Machine_ProjectTable() {
+    public BlockProjectTable() {
         super(Material.iron);
         this.setBlockName("blockProjectBench");
         this.setCreativeTab(AddToCreativeTab.tabMachines);
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java b/src/main/java/gtPlusPlus/core/block/machine/BlockSuperJukebox.java
index 6b3c87fac4..4440d2920a 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockSuperJukebox.java
@@ -22,15 +22,15 @@ import net.minecraft.world.World;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.handler.GuiHandler;
-import gtPlusPlus.core.inventories.Inventory_SuperJukebox;
+import gtPlusPlus.core.inventories.InventorySuperJukebox;
 import gtPlusPlus.core.util.math.MathUtils;
 
-public class Machine_SuperJukebox extends BlockJukebox {
+public class BlockSuperJukebox extends BlockJukebox {
 
     @SideOnly(Side.CLIENT)
     private IIcon mIcon;
@@ -47,7 +47,7 @@ public class Machine_SuperJukebox extends BlockJukebox {
         }
     }
 
-    public Machine_SuperJukebox() {
+    public BlockSuperJukebox() {
         this.setBlockName("blockSuperJukebox");
         this.setCreativeTab(CreativeTabs.tabRedstone);
         setHardness(2.0F);
@@ -184,7 +184,7 @@ public class Machine_SuperJukebox extends BlockJukebox {
         public int numPlayersUsing;
 
         private ItemStack mCurrentlyPlayingStack;
-        private final Inventory_SuperJukebox inventoryContents;
+        private final InventorySuperJukebox inventoryContents;
         private String customName;
 
         /*
@@ -202,7 +202,7 @@ public class Machine_SuperJukebox extends BlockJukebox {
         public boolean a_TEST_BOOL_VAR_4;
 
         public TileEntitySuperJukebox() {
-            this.inventoryContents = new Inventory_SuperJukebox();
+            this.inventoryContents = new InventorySuperJukebox();
         }
 
         @Override
@@ -283,7 +283,7 @@ public class Machine_SuperJukebox extends BlockJukebox {
             this.markDirty();
         }
 
-        public Inventory_SuperJukebox getInventory() {
+        public InventorySuperJukebox getInventory() {
             return this.inventoryContents;
         }
 
@@ -341,13 +341,13 @@ public class Machine_SuperJukebox extends BlockJukebox {
                 .getInventory()) {
                 if (g != null && aSlotCounter <= 17) {
                     Logger.INFO("b3 - " + g.getDisplayName());
-                    if (GT_Utility.areStacksEqual(g, aRecordToPlay, true)) {
+                    if (GTUtility.areStacksEqual(g, aRecordToPlay, true)) {
                         IInventory aThisInv = this.getInventory();
                         if (aThisInv.getStackInSlot(20) != null) {
                             openDiscDrive();
                         }
 
-                        GT_Utility.moveStackFromSlotAToSlotB(
+                        GTUtility.moveStackFromSlotAToSlotB(
                             aThisInv,
                             aThisInv,
                             aSlotCounter,
@@ -417,7 +417,7 @@ public class Machine_SuperJukebox extends BlockJukebox {
                     .getInventory()[i];
                 if (g == null && aSlotCounter >= 0) {
                     IInventory aThisInv = this.getInventory();
-                    GT_Utility
+                    GTUtility
                         .moveStackFromSlotAToSlotB(aThisInv, aThisInv, 20, i, (byte) 1, (byte) 1, (byte) 1, (byte) 1);
                     vanillaStopJukebox();
                     Logger.INFO("b++");