clean up GT++ code (#589)

* yeet big reactor support

* yeet IC2 classic support

* yeet pneumaticraft support

* yeet More Planets support

* yeet Immersive Engineering support

* yeet Psychedilicraft support

* yeet Beyond Reality Core support

* sort mods to see what must be purged

* yeet simply jetpacks

* yeet RFTools

* yeet xReliquary

* yeet RedTech

* yeet Mekanism

* yeet GrowthCraft

* yeet ihl

* leftover cleaning

* yeet thermal fondation support

* yeet compact windmills support

* spotless

* remove constants from LoadedMods (part 1 / 2)

* spotless

* remove constants from LoadedMods (part 2 / 2)

* use mod id enum instead of strings + optimize imports

* Loaded.isModLoaded -> enum

* restore RA init

* missing !

* start organizing recipes stuff

* fix crash on world load in dev

* remove unused class

* remove HazmatUtils.java

* move all the removals

* remove enableHarderRecipesForHighTierCasings and usages(disabled in the pack)

* move some pyrolyse oven recipes to its own file

* sa

* bump GT version

* bump GT5U version

* spotless apply

* use Everglades entry from the mod enum

---------

Co-authored-by: miozune <miozune@gmail.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>

37 files changed, 214 insertions, 165 deletions

diff --git a/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java b/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java
index b1f4eab4be..932fe7b48d 100644
--- a/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java
+++ b/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.base;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
@@ -8,8 +10,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import gtPlusPlus.core.lib.CORE;
-
 public class AdvancedBlock extends Block {
 
     protected AdvancedBlock(final String unlocalizedName, final Material material, final CreativeTabs x,
@@ -17,7 +17,7 @@ public class AdvancedBlock extends Block {
             final String blockHarvestTool, final int blockHarvestLevel, final SoundType BlockSound) {
         super(material);
         this.setBlockName(unlocalizedName);
-        this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName);
+        this.setBlockTextureName(GTPlusPlus.ID + ":" + unlocalizedName);
         this.setCreativeTab(x);
         this.setHardness(blockHardness); // block Hardness
         this.setResistance(blockResistance);
diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java
index 54614d0288..72e3b24124 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.base;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.EnumCreatureType;
@@ -8,7 +10,6 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 
 public class BasicBlock extends BlockContainer {
@@ -26,7 +27,7 @@ public class BasicBlock extends BlockContainer {
         this.setBlockName(Utils.sanitizeString(unlocalizedName));
 
         if (type != BlockTypes.ORE && !unlocalizedName.toLowerCase().contains("ore")) {
-            this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName);
+            this.setBlockTextureName(GTPlusPlus.ID + ":" + unlocalizedName);
         }
 
         this.setCreativeTab(AddToCreativeTab.tabBlock);
diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
index f332573620..d370940b41 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.base;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
@@ -183,7 +185,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
         // DOWN, UP, NORTH, SOUTH, WEST, EAST
 
         // Default Path Name, this will make us look inside 'miscutils\textures\blocks'
-        final String aPrefixTexPath = CORE.MODID + ":";
+        final String aPrefixTexPath = GTPlusPlus.ID + ":";
         // Default Path Name, this will make us look in the sub-directory for this Tile Entity.
         final String aTexPathMid = "TileEntities" + CORE.SEPERATOR
                 + getTileEntityNameForTexturePathing()
@@ -276,7 +278,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
     @Override
     @SideOnly(Side.CLIENT)
     public final void registerBlockIcons(final IIconRegister aRegisterer) {
-        this.blockIcon = aRegisterer.registerIcon(CORE.MODID + ":" + "net");
+        this.blockIcon = aRegisterer.registerIcon(GTPlusPlus.ID + ":" + "net");
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java
index edb1ba4dcf..a0cdd88193 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.base;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import java.util.Random;
 
 import net.minecraft.block.material.Material;
@@ -17,10 +19,10 @@ 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.enums.Mods;
 import gtPlusPlus.core.client.renderer.particle.EntityDropParticleFX;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 
 public class BlockBaseFluid extends BlockFluidClassic {
@@ -71,14 +73,14 @@ public class BlockBaseFluid extends BlockFluidClassic {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(IIconRegister iicon) {
-        this.textureArray[0] = iicon.registerIcon(CORE.MODID + ":" + "fluid/" + "Fluid_" + this.name + "_Still");
-        this.textureArray[1] = iicon.registerIcon(CORE.MODID + ":" + "fluid/" + "Fluid_" + this.name + "_Flow");
+        this.textureArray[0] = iicon.registerIcon(GTPlusPlus.ID + ":" + "fluid/" + "Fluid_" + this.name + "_Still");
+        this.textureArray[1] = iicon.registerIcon(GTPlusPlus.ID + ":" + "fluid/" + "Fluid_" + this.name + "_Flow");
         // IconRegistry.addIcon("Fluid" + this.name, this.modName + ":fluid/Fluid_" + this.name + "_Still", arg0);
         // IconRegistry.addIcon("Fluid" + this.name + "1", this.modName + ":fluid/Fluid_" + this.name + "_Flow", arg0);
     }
 
     @Override
-    @Optional.Method(modid = "CoFHCore")
+    @Optional.Method(modid = Mods.Names.C_O_F_H_CORE)
     @SideOnly(Side.CLIENT)
     public void randomDisplayTick(World arg0, int arg1, int arg2, int arg3, Random arg4) {
         super.randomDisplayTick(arg0, arg1, arg2, arg3, arg4);
diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java
index a034dada97..f0ecd6def9 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java
@@ -1,5 +1,8 @@
 package gtPlusPlus.core.block.base;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+import static gregtech.api.enums.Mods.GregTech;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -65,7 +68,7 @@ public class BlockBaseModular extends BasicBlock {
             final int miningLevel) {
         super(blockType, unlocalizedName, vanillaMaterial, miningLevel);
         this.setHarvestLevel(blockType.getHarvestTool(), miningLevel);
-        this.setBlockTextureName(CORE.MODID + ":" + blockType.getTexture());
+        this.setBlockTextureName(GTPlusPlus.ID + ":" + blockType.getTexture());
         this.blockColour = colour;
         this.thisBlock = blockType;
         this.thisBlockMaterial = blockMaterialString;
@@ -187,7 +190,7 @@ public class BlockBaseModular extends BasicBlock {
     public void registerBlockIcons(final IIconRegister iIcon) {
         if (!CORE.ConfigSwitches.useGregtechTextures || this.blockMaterial == null
                 || this.thisBlock == BlockTypes.ORE) {
-            this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + this.thisBlock.getTexture());
+            this.blockIcon = iIcon.registerIcon(GTPlusPlus.ID + ":" + this.thisBlock.getTexture());
         }
         String metType = "9j4852jyo3rjmh3owlhw9oe";
         if (this.blockMaterial != null) {
@@ -199,7 +202,7 @@ public class BlockBaseModular extends BasicBlock {
         metType = (metType.equals("9j4852jyo3rjmh3owlhw9oe") ? "METALLIC" : metType);
         int tier = blockMaterial != null ? this.blockMaterial.vTier : 0;
         String aType = (this.thisBlock == BlockTypes.FRAME) ? "frameGt" : (tier <= 4 ? "block1" : "block5");
-        this.blockIcon = iIcon.registerIcon("gregtech" + ":" + "materialicons/" + metType + "/" + aType);
+        this.blockIcon = iIcon.registerIcon(GregTech.ID + ":" + "materialicons/" + metType + "/" + aType);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
index 140773f4ea..88ee9a8986 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
@@ -143,9 +143,9 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
         /*
          * @Override
          * @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister iIcon) { this.blockIcon =
-         * iIcon.registerIcon(CORE.MODID + ":" + this.thisBlock.getTexture()); //this.base =
-         * iIcon.registerIcon(CORE.MODID + ":" + "blockStone"); //this.overlay = iIcon.registerIcon(CORE.MODID + ":" +
-         * "blockOre_Overlay"); }
+         * iIcon.registerIcon(GTPlusPlus.ID + ":" + this.thisBlock.getTexture()); //this.base =
+         * iIcon.registerIcon(GTPlusPlus.ID + ":" + "blockStone"); //this.overlay = iIcon.registerIcon(GTPlusPlus.ID +
+         * ":" + "blockOre_Overlay"); }
          * @Override public int colorMultiplier(final IBlockAccess par1IBlockAccess, final int par2, final int par3,
          * final int par4){ if (this.blockColour == 0){ return MathUtils.generateSingularRandomHexValue(); } return
          * this.blockColour; }
diff --git a/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java b/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java
index 575c5ca33b..bb6aee18d5 100644
--- a/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java
+++ b/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java
@@ -1,12 +1,13 @@
 package gtPlusPlus.core.block.base;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.util.IIcon;
 
 import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
 
 public class MultiTextureBlock extends Block {
 
@@ -15,7 +16,7 @@ public class MultiTextureBlock extends Block {
     protected MultiTextureBlock(final String unlocalizedName, final Material material, final SoundType blockSound) {
         super(material);
         this.setBlockName(unlocalizedName);
-        this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName);
+        this.setBlockTextureName(GTPlusPlus.ID + ":" + unlocalizedName);
         this.setCreativeTab(AddToCreativeTab.tabBlock);
         this.setHardness(2.0F);
         this.setResistance(6.0F);
diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java b/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java
index a3209d0907..2966404a67 100644
--- a/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.general;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
@@ -18,7 +20,6 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta;
-import gtPlusPlus.core.lib.CORE;
 
 public class BlockCompressedObsidian extends BlockObsidian {
 
@@ -48,17 +49,17 @@ public class BlockCompressedObsidian extends BlockObsidian {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister iicon) {
-        this.textureArray[0] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "obsidian1");
-        this.textureArray[1] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "obsidian2");
-        this.textureArray[2] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "obsidian3");
-        this.textureArray[3] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "obsidian4");
-        this.textureArray[4] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "obsidian5");
-        this.textureArray[5] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "obsidian_invert");
-        this.textureArray[6] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "glowstone1");
-        this.textureArray[7] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "glowstone2");
-        this.textureArray[8] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "glowstone3");
-        this.textureArray[9] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "glowstone4");
-        this.textureArray[10] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "glowstone5");
+        this.textureArray[0] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "obsidian1");
+        this.textureArray[1] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "obsidian2");
+        this.textureArray[2] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "obsidian3");
+        this.textureArray[3] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "obsidian4");
+        this.textureArray[4] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "obsidian5");
+        this.textureArray[5] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "obsidian_invert");
+        this.textureArray[6] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "glowstone1");
+        this.textureArray[7] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "glowstone2");
+        this.textureArray[8] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "glowstone3");
+        this.textureArray[9] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "glowstone4");
+        this.textureArray[10] = iicon.registerIcon(GTPlusPlus.ID + ":" + "compressed/" + "glowstone5");
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockNet.java b/src/main/java/gtPlusPlus/core/block/general/BlockNet.java
index 6064190fba..c462021374 100644
--- a/src/main/java/gtPlusPlus/core/block/general/BlockNet.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockNet.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.general;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import java.util.Random;
 
 import net.minecraft.block.BlockWeb;
@@ -11,7 +13,6 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.lib.CORE;
 
 public class BlockNet extends BlockWeb {
 
@@ -26,7 +27,7 @@ public class BlockNet extends BlockWeb {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister iIcon) {
-        this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + "net");
+        this.blockIcon = iIcon.registerIcon(GTPlusPlus.ID + ":" + "net");
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java
index 975ddd3d0f..fee8176262 100644
--- a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.general;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockAir;
 import net.minecraft.block.BlockContainer;
@@ -19,7 +21,6 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
 
 public class BlockSuperLight extends BlockContainer {
 
@@ -47,7 +48,7 @@ public class BlockSuperLight extends BlockContainer {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister p_149651_1_) {
-        this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlBigBlue");
+        this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "SwirlBigBlue");
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
index 6a92c92453..61e6b71b57 100644
--- a/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.general;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import java.util.Random;
 
 import net.minecraft.block.BlockContainer;
@@ -17,7 +19,6 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.base.itemblock.ItemBlockEntityBase;
-import gtPlusPlus.core.lib.CORE;
 
 public class BlockTankXpConverter extends BlockContainer {
 
@@ -56,10 +57,10 @@ public class BlockTankXpConverter extends BlockContainer {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister p_149651_1_) {
-        this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlGray");
-        this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlGray");
-        this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlGray");
-        this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlGray");
+        this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "SwirlGray");
+        this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "SwirlGray");
+        this.textureBottom = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "SwirlGray");
+        this.textureFront = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "SwirlGray");
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/block/general/FirePit.java b/src/main/java/gtPlusPlus/core/block/general/FirePit.java
index 6c93fdf2cf..25210df133 100644
--- a/src/main/java/gtPlusPlus/core/block/general/FirePit.java
+++ b/src/main/java/gtPlusPlus/core/block/general/FirePit.java
@@ -1,6 +1,11 @@
 package gtPlusPlus.core.block.general;
 
-import static net.minecraftforge.common.util.ForgeDirection.*;
+import static net.minecraftforge.common.util.ForgeDirection.DOWN;
+import static net.minecraftforge.common.util.ForgeDirection.EAST;
+import static net.minecraftforge.common.util.ForgeDirection.NORTH;
+import static net.minecraftforge.common.util.ForgeDirection.SOUTH;
+import static net.minecraftforge.common.util.ForgeDirection.UP;
+import static net.minecraftforge.common.util.ForgeDirection.WEST;
 
 import java.util.List;
 import java.util.Random;
diff --git a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java b/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java
index 6a01dd623b..6f4b033b4b 100644
--- a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java
+++ b/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.general;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -19,7 +21,6 @@ import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.general.TileEntityInfiniteFluid;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 
@@ -57,10 +58,12 @@ public class FluidTankInfinite extends BlockContainer {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister p_149651_1_) {
-        this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "Generic_Creative_Texture");
-        this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "Generic_Creative_Texture");
-        this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "Generic_Creative_Texture");
-        this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "Generic_Creative_Texture");
+        this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "Generic_Creative_Texture");
+        this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "Generic_Creative_Texture");
+        this.textureBottom = p_149651_1_
+                .registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "Generic_Creative_Texture");
+        this.textureFront = p_149651_1_
+                .registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "Generic_Creative_Texture");
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/block/general/HellFire.java b/src/main/java/gtPlusPlus/core/block/general/HellFire.java
index 235b7db07a..4ebd9c832b 100644
--- a/src/main/java/gtPlusPlus/core/block/general/HellFire.java
+++ b/src/main/java/gtPlusPlus/core/block/general/HellFire.java
@@ -1,6 +1,12 @@
 package gtPlusPlus.core.block.general;
 
-import static net.minecraftforge.common.util.ForgeDirection.*;
+import static gregtech.api.enums.Mods.GTPlusPlus;
+import static net.minecraftforge.common.util.ForgeDirection.DOWN;
+import static net.minecraftforge.common.util.ForgeDirection.EAST;
+import static net.minecraftforge.common.util.ForgeDirection.NORTH;
+import static net.minecraftforge.common.util.ForgeDirection.SOUTH;
+import static net.minecraftforge.common.util.ForgeDirection.UP;
+import static net.minecraftforge.common.util.ForgeDirection.WEST;
 
 import java.util.IdentityHashMap;
 import java.util.Map.Entry;
@@ -25,7 +31,6 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.api.objects.random.XSTR;
 import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.math.MathUtils;
 
 public class HellFire extends BlockFire {
@@ -43,7 +48,7 @@ public class HellFire extends BlockFire {
         this.setTickRandomly(true);
         this.setLightLevel(1F);
         this.setLightOpacity(0);
-        // this.setBlockTextureName(CORE.MODID + "hellfire/blockHellFire");
+        // this.setBlockTextureName(GTPlusPlus.ID + "hellfire/blockHellFire");
         this.setBlockName("blockHellFire");
         this.setCreativeTab(AddToCreativeTab.tabBlock);
         GameRegistry.registerBlock(this, "blockHellFire");
@@ -406,8 +411,8 @@ public class HellFire extends BlockFire {
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister IIconRegister) {
         this.IIconArray = new IIcon[] {
-                IIconRegister.registerIcon(CORE.MODID + ":" + "hellfire/" + "blockHellFire" + "_layer_0"),
-                IIconRegister.registerIcon(CORE.MODID + ":" + "hellfire/" + "blockHellFire" + "_layer_1") };
+                IIconRegister.registerIcon(GTPlusPlus.ID + ":" + "hellfire/" + "blockHellFire" + "_layer_0"),
+                IIconRegister.registerIcon(GTPlusPlus.ID + ":" + "hellfire/" + "blockHellFire" + "_layer_1") };
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/block/general/LightGlass.java b/src/main/java/gtPlusPlus/core/block/general/LightGlass.java
index 4219666e2f..4bc120678f 100644
--- a/src/main/java/gtPlusPlus/core/block/general/LightGlass.java
+++ b/src/main/java/gtPlusPlus/core/block/general/LightGlass.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.general;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import java.util.Random;
 
 import net.minecraft.block.Block;
@@ -12,7 +14,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
 
 /*
  * public class LightGlass extends BlockBreakable {
@@ -33,7 +34,7 @@ public class LightGlass extends BlockAir {
         this.setBlockName("blockMFEffect");
         this.setLightLevel(12F);
         setHardness(0.1F);
-        setBlockTextureName(CORE.MODID + ":" + "blockMFEffect");
+        setBlockTextureName(GTPlusPlus.ID + ":" + "blockMFEffect");
         setStepSound(Block.soundTypeGlass);
         GameRegistry.registerBlock(this, "blockMFEffect");
 
@@ -78,7 +79,7 @@ public class LightGlass extends BlockAir {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister iIcon) {
-        this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + "blockMFEffect");
+        this.blockIcon = iIcon.registerIcon(GTPlusPlus.ID + ":" + "blockMFEffect");
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java b/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java
index 8dfe5eb367..c7a0967042 100644
--- a/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java
+++ b/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.general;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import java.util.Random;
 
 import net.minecraft.block.Block;
@@ -19,7 +21,6 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.entity.EntityPrimedMiningExplosive;
-import gtPlusPlus.core.lib.CORE;
 
 public class MiningExplosives extends BlockTNT {
 
@@ -185,14 +186,8 @@ public class MiningExplosives extends BlockTNT {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister iconRegister) {
-        //
-        /*
-         * this.blockIcon = iconRegister.registerIcon(this.getTextureName() + "_side"); this.textureTop =
-         * iconRegister.registerIcon(this.getTextureName() + "_top"); this.textureBottom =
-         * iconRegister.registerIcon(this.getTextureName() + "_bottom");
-         */
-        this.blockIcon = iconRegister.registerIcon(CORE.MODID + ":" + "chrono/" + "MetalSheet2");
-        this.textureTop = iconRegister.registerIcon(CORE.MODID + ":" + "chrono/" + "MetalFunnel");
-        this.textureBottom = iconRegister.registerIcon(CORE.MODID + ":" + "chrono/" + "MetalPanel");
+        this.blockIcon = iconRegister.registerIcon(GTPlusPlus.ID + ":" + "chrono/" + "MetalSheet2");
+        this.textureTop = iconRegister.registerIcon(GTPlusPlus.ID + ":" + "chrono/" + "MetalFunnel");
+        this.textureBottom = iconRegister.registerIcon(GTPlusPlus.ID + ":" + "chrono/" + "MetalPanel");
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/block/general/PlayerDoors.java b/src/main/java/gtPlusPlus/core/block/general/PlayerDoors.java
index 051a158515..a5ffcf6763 100644
--- a/src/main/java/gtPlusPlus/core/block/general/PlayerDoors.java
+++ b/src/main/java/gtPlusPlus/core/block/general/PlayerDoors.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.general;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import java.util.HashMap;
 import java.util.Random;
 
@@ -23,7 +25,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.core.item.base.itemblock.ItemBlockDoor;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.general.TileEntityPlayerDoorBase;
 import gtPlusPlus.core.util.Utils;
 
@@ -82,7 +83,7 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
             setBlockName("playerDoor" + aBlockExtensionName);
             this.setHarvestLevel("axe", 1);
         }
-        this.setBlockTextureName(vanillaType ? aTextureName : CORE.MODID + ":" + aTextureName);
+        this.setBlockTextureName(vanillaType ? aTextureName : GTPlusPlus.ID + ":" + aTextureName);
         GameRegistry.registerBlock(this, ItemBlockDoor.class, Utils.sanitizeString(this.getUnlocalizedName()));
     }
 
diff --git a/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java b/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java
index 7e5600715a..1956d98a39 100644
--- a/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java
+++ b/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.general.antigrief;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -18,7 +20,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 
 public class BlockWitherProof extends Block {
@@ -26,7 +27,7 @@ public class BlockWitherProof extends Block {
     public BlockWitherProof() {
         super(Material.redstoneLight);
         this.setBlockName(Utils.sanitizeString("blockBlackGate"));
-        this.setBlockTextureName(CORE.MODID + ":" + "blockFrameGt");
+        this.setBlockTextureName(GTPlusPlus.ID + ":" + "blockFrameGt");
         this.setCreativeTab(AddToCreativeTab.tabBlock);
         this.setHardness(-1F);
         this.setResistance(5000.0F);
@@ -54,7 +55,7 @@ public class BlockWitherProof extends Block {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister iIcon) {
-        this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + "blockFrameGt");
+        this.blockIcon = iIcon.registerIcon(GTPlusPlus.ID + ":" + "blockFrameGt");
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java b/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java
index c72da4cf4a..679d82677e 100644
--- a/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java
+++ b/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java
@@ -1,5 +1,6 @@
 package gtPlusPlus.core.block.general.antigrief;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
 import static gtPlusPlus.core.block.ModBlocks.blockGriefSaver;
 
 import java.util.List;
@@ -24,7 +25,6 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.general.TileEntityReverter;
 
 public class TowerDevice extends Block {
@@ -61,7 +61,7 @@ public class TowerDevice extends Block {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister par1IconRegister) {
-        TEX_ANTIBUILDER = par1IconRegister.registerIcon(CORE.MODID + ":" + "blockAntiGrief");
+        TEX_ANTIBUILDER = par1IconRegister.registerIcon(GTPlusPlus.ID + ":" + "blockAntiGrief");
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java b/src/main/java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java
index 3200e497b8..00d542143c 100644
--- a/src/main/java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java
+++ b/src/main/java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.general.fluids;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.EnumCreatureType;
@@ -12,7 +14,6 @@ import net.minecraftforge.fluids.Fluid;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
 
 public class BlockFluidSludge extends BlockFluidClassic {
 
@@ -35,8 +36,8 @@ public class BlockFluidSludge extends BlockFluidClassic {
     @SideOnly(Side.CLIENT)
     @Override
     public void registerBlockIcons(final IIconRegister register) {
-        this.stillIcon = register.registerIcon(CORE.MODID + ":fluids/fluid.jackdaniels");
-        this.flowingIcon = register.registerIcon(CORE.MODID + ":fluids/fluid.jackdaniels");
+        this.stillIcon = register.registerIcon(GTPlusPlus.ID + ":fluids/fluid.jackdaniels");
+        this.flowingIcon = register.registerIcon(GTPlusPlus.ID + ":fluids/fluid.jackdaniels");
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneDetector.java b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneDetector.java
index 21286ba993..f09872790b 100644
--- a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneDetector.java
+++ b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneDetector.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.general.redstone;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -14,7 +16,6 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.general.redstone.TileEntityRedstoneHandler;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
@@ -81,22 +82,24 @@ public class BlockGenericRedstoneDetector extends BlockGenericRedstone {
         int aMeta = 0;
         {
             HashMap<ForgeDirection, IIcon> aTempMap = new HashMap<ForgeDirection, IIcon>();
-            aTempMap.put(ForgeDirection.UP, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+            aTempMap.put(
+                    ForgeDirection.UP,
+                    iicon.registerIcon(GTPlusPlus.ID + ":" + "redstone/redstone_meter/" + "top"));
             aTempMap.put(
                     ForgeDirection.DOWN,
-                    iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+                    iicon.registerIcon(GTPlusPlus.ID + ":" + "redstone/redstone_meter/" + "top"));
             aTempMap.put(
                     ForgeDirection.NORTH,
-                    iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+                    iicon.registerIcon(GTPlusPlus.ID + ":" + "redstone/redstone_meter/" + "top"));
             aTempMap.put(
                     ForgeDirection.SOUTH,
-                    iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+                    iicon.registerIcon(GTPlusPlus.ID + ":" + "redstone/redstone_meter/" + "top"));
             aTempMap.put(
                     ForgeDirection.EAST,
-                    iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+                    iicon.registerIcon(GTPlusPlus.ID + ":" + "redstone/redstone_meter/" + "top"));
             aTempMap.put(
                     ForgeDirection.WEST,
-                    iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+                    iicon.registerIcon(GTPlusPlus.ID + ":" + "redstone/redstone_meter/" + "top"));
             aTextures.put(aMeta++, aTempMap);
         }
     }
diff --git a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneTest.java b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneTest.java
index 0d8f66c326..d1be91d31f 100644
--- a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneTest.java
+++ b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneTest.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.general.redstone;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -16,7 +18,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.general.redstone.TileEntityRedstoneHandler;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -150,22 +151,24 @@ public class BlockGenericRedstoneTest extends BlockGenericRedstone {
         int aMeta = 0;
         {
             HashMap<ForgeDirection, IIcon> aTempMap = new HashMap<ForgeDirection, IIcon>();
-            aTempMap.put(ForgeDirection.UP, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+            aTempMap.put(
+                    ForgeDirection.UP,
+                    iicon.registerIcon(GTPlusPlus.ID + ":" + "redstone/redstone_meter/" + "top"));
             aTempMap.put(
                     ForgeDirection.DOWN,
-                    iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+                    iicon.registerIcon(GTPlusPlus.ID + ":" + "redstone/redstone_meter/" + "top"));
             aTempMap.put(
                     ForgeDirection.NORTH,
-                    iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+                    iicon.registerIcon(GTPlusPlus.ID + ":" + "redstone/redstone_meter/" + "top"));
             aTempMap.put(
                     ForgeDirection.SOUTH,
-                    iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+                    iicon.registerIcon(GTPlusPlus.ID + ":" + "redstone/redstone_meter/" + "top"));
             aTempMap.put(
                     ForgeDirection.EAST,
-                    iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+                    iicon.registerIcon(GTPlusPlus.ID + ":" + "redstone/redstone_meter/" + "top"));
             aTempMap.put(
                     ForgeDirection.WEST,
-                    iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+                    iicon.registerIcon(GTPlusPlus.ID + ":" + "redstone/redstone_meter/" + "top"));
             aTextures.put(aMeta++, aTempMap);
         }
     }
diff --git a/src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java b/src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java
index 83e3edac59..fa28ef38f9 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java
@@ -1,12 +1,13 @@
 package gtPlusPlus.core.block.machine;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.EnumCreatureType;
 import net.minecraft.world.IBlockAccess;
 
 import gtPlusPlus.core.block.base.BasicBlock.BlockTypes;
 import gtPlusPlus.core.block.base.MetaBlock;
-import gtPlusPlus.core.lib.CORE;
 
 public class BlockGtFrameBox extends MetaBlock {
 
@@ -16,7 +17,7 @@ public class BlockGtFrameBox extends MetaBlock {
     public BlockGtFrameBox(final String unlocalizedName, final Material material, final BlockTypes blockTypeENUM,
             final boolean recolour, final int... colour) {
         super(unlocalizedName, material, blockTypeENUM.getBlockSoundType());
-        this.setBlockTextureName(CORE.MODID + ":" + "blockGtFrame");
+        this.setBlockTextureName(GTPlusPlus.ID + ":" + "blockGtFrame");
         this.setHarvestLevel(blockTypeENUM.getHarvestTool(), 2);
         if (recolour && ((colour != null) && (colour.length > 0))) {
             this.colours = colour;
diff --git a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java
index 5f353f2590..bf4fa41296 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.machine;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.EntityLivingBase;
@@ -17,7 +19,6 @@ import gtPlusPlus.api.objects.minecraft.CubicObject;
 import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.handler.GuiHandler;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 
@@ -141,12 +142,12 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip {
 
     @Override
     public CubicObject<String>[] getCustomTextureDirectoryObject() {
-        String[] aTexData = new String[] { CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_G",
-                CORE.MODID + ":" + "metro/" + "TEXTURE_TECH_PANEL_B",
-                CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I",
-                CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I",
-                CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I",
-                CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I" };
+        String[] aTexData = new String[] { GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_G",
+                GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_TECH_PANEL_B",
+                GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I",
+                GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I",
+                GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I",
+                GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I" };
         CubicObject<String>[] aTextureData = new CubicObject[] { new CubicObject<String>(aTexData) };
         return aTextureData;
     }
diff --git a/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java b/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java
index 28690e7972..4296f60b09 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.machine;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -22,7 +24,6 @@ import gtPlusPlus.core.client.renderer.RenderDecayChest;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.handler.GuiHandler;
 import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest;
 import gtPlusPlus.core.util.minecraft.InventoryUtils;
 
@@ -120,10 +121,10 @@ public class DecayablesChest extends BlockContainer implements ITileTooltip {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister p_149651_1_) {
-        this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "DecayablesChest_top");
-        this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "DecayablesChest_top");
-        this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "DecayablesChest_side");
-        this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "DecayablesChest_bottom");
+        this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "DecayablesChest_top");
+        this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "DecayablesChest_top");
+        this.textureBottom = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "DecayablesChest_side");
+        this.textureFront = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "DecayablesChest_bottom");
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/block/machine/EggBox.java b/src/main/java/gtPlusPlus/core/block/machine/EggBox.java
index 7cc444e7d0..9f301dadcd 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/EggBox.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/EggBox.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.machine;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -21,7 +23,6 @@ import gtPlusPlus.api.interfaces.ITileTooltip;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.handler.GuiHandler;
 import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.general.TileEntityEggBox;
 import gtPlusPlus.core.util.minecraft.InventoryUtils;
 
@@ -85,10 +86,10 @@ public class EggBox extends BlockContainer implements ITileTooltip {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister p_149651_1_) {
-        this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "EggBox_top");
-        this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "EggBox_top");
-        this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "EggBox_side");
-        this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "EggBox_side");
+        this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "EggBox_top");
+        this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "EggBox_top");
+        this.textureBottom = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "EggBox_side");
+        this.textureFront = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "EggBox_side");
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java b/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java
index f016681b77..90f0ed19e6 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.machine;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -20,7 +22,6 @@ import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.interfaces.ITileTooltip;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.general.TileEntityFishTrap;
 import gtPlusPlus.core.util.minecraft.InventoryUtils;
 
@@ -69,10 +70,10 @@ public class FishTrap extends BlockContainer implements ITileTooltip {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister p_149651_1_) {
-        this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "fishtrap");
-        this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "fishtrap");
-        this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "fishtrap");
-        this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "fishtrap");
+        this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "fishtrap");
+        this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "fishtrap");
+        this.textureBottom = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "fishtrap");
+        this.textureFront = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "fishtrap");
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java b/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java
index 610c7307f6..9cd17b8b82 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.machine;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -13,7 +15,6 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.general.TileEntityHeliumGenerator;
 
 public class HeliumGenerator extends BlockContainer {
@@ -49,10 +50,10 @@ public class HeliumGenerator extends BlockContainer {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister p_149651_1_) {
-        this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "Chrono/" + "CyberPanel");
-        this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "Chrono/" + "CyberPanel");
-        this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "Chrono/" + "CyberPanel");
-        this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "Chrono/" + "CyberPanel");
+        this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "Chrono/" + "CyberPanel");
+        this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "Chrono/" + "CyberPanel");
+        this.textureBottom = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "Chrono/" + "CyberPanel");
+        this.textureFront = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "Chrono/" + "CyberPanel");
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java
index 0d6ed29e78..f57a5e8275 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.machine;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -18,7 +20,6 @@ import gtPlusPlus.api.interfaces.ITileTooltip;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable;
 
 public class Machine_ModularityTable extends BlockContainer implements ITileTooltip {
@@ -64,10 +65,10 @@ public class Machine_ModularityTable extends BlockContainer implements ITileTool
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister p_149651_1_) {
-        this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "ModularTable_side");
-        this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "ModularTable_top");
-        this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "ModularTable_output");
-        this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "ModularTable_side");
+        this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "ModularTable_side");
+        this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "ModularTable_top");
+        this.textureBottom = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "ModularTable_output");
+        this.textureFront = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "ModularTable_side");
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java
index 4058196e21..030882d9d6 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.machine;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -21,7 +23,6 @@ import gtPlusPlus.api.interfaces.ITileTooltip;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.handler.GuiHandler;
 import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.machines.TileEntityPestKiller;
 import gtPlusPlus.core.util.minecraft.InventoryUtils;
 
@@ -69,11 +70,11 @@ public class Machine_PestKiller extends BlockContainer implements ITileTooltip {
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister p_149651_1_) {
         this.blockIcon = p_149651_1_
-                .registerIcon(CORE.MODID + ":" + "TileEntities/" + "MACHINE_CASING_FARM_MANAGER_STRUCTURAL");
-        this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "MACHINE_PESTKILLER_TOP");
+                .registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "MACHINE_CASING_FARM_MANAGER_STRUCTURAL");
+        this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "MACHINE_PESTKILLER_TOP");
         this.textureBottom = p_149651_1_.registerIcon("planks_acacia");
         this.textureFront = p_149651_1_
-                .registerIcon(CORE.MODID + ":" + "TileEntities/" + "MACHINE_CASING_FARM_MANAGER_STRUCTURAL");
+                .registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "MACHINE_CASING_FARM_MANAGER_STRUCTURAL");
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_PooCollector.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_PooCollector.java
index c7198f7a64..4566523315 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_PooCollector.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_PooCollector.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.machine;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import java.util.List;
 import java.util.Random;
 
@@ -19,7 +21,6 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.machines.TileEntityAdvPooCollector;
 import gtPlusPlus.core.tileentities.machines.TileEntityBaseFluidCollector;
 import gtPlusPlus.core.tileentities.machines.TileEntityPooCollector;
@@ -67,10 +68,10 @@ public class Machine_PooCollector extends BlockContainer {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister p_149651_1_) {
-        this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "sewer_top");
-        this.textureTop2 = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "sewer_adv_top");
-        this.textureSide = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "sewer_sides");
-        this.textureSide2 = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "sewer_adv_sides");
+        this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "sewer_top");
+        this.textureTop2 = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "sewer_adv_top");
+        this.textureSide = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "sewer_sides");
+        this.textureSide2 = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "sewer_adv_sides");
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java
index c334802f21..df111bfa9d 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java
@@ -1,5 +1,9 @@
 package gtPlusPlus.core.block.machine;
 
+import static gregtech.api.enums.Mods.BuildCraftCore;
+import static gregtech.api.enums.Mods.EnderIO;
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -15,19 +19,18 @@ 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.enums.Mods;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.interfaces.ITileTooltip;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import ic2.core.item.tool.ItemToolWrench;
 
-@Optional.Interface(iface = "crazypants.enderio.api.tool.ITool", modid = "EnderIO")
+@Optional.Interface(iface = "crazypants.enderio.api.tool.ITool", modid = Mods.Names.ENDER_I_O)
 public class Machine_ProjectTable extends BlockContainer implements ITileTooltip {
 
     @SideOnly(Side.CLIENT)
@@ -71,10 +74,10 @@ public class Machine_ProjectTable extends BlockContainer implements ITileTooltip
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister p_149651_1_) {
-        this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "machine_top");
-        this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "cover_crafting");
-        this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "machine_top");
-        this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "machine_top");
+        this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "machine_top");
+        this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "cover_crafting");
+        this.textureBottom = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "machine_top");
+        this.textureFront = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "TileEntities/" + "machine_top");
     }
 
     /**
@@ -119,16 +122,16 @@ public class Machine_ProjectTable extends BlockContainer implements ITileTooltip
         if (item.getItem() instanceof ItemToolWrench) {
             return true;
         }
-        if (LoadedMods.BuildCraft) {
+        if (BuildCraftCore.isModLoaded()) {
             return checkBuildcraftWrench(item);
         }
-        if (LoadedMods.EnderIO) {
+        if (EnderIO.isModLoaded()) {
             return checkEnderIOWrench(item);
         }
         return false;
     }
 
-    @Optional.Method(modid = "EnderIO")
+    @Optional.Method(modid = Mods.Names.ENDER_I_O)
     private static boolean checkEnderIOWrench(final ItemStack item) {
         if (ReflectionUtils.doesClassExist("crazypants.enderio.api.tool.ITool")) {
             Class<?> wrenchClass;
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java
index ef55f1ece1..1ae14b4e34 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.machine;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
@@ -13,7 +15,6 @@ import gtPlusPlus.api.objects.minecraft.CubicObject;
 import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.base.itemblock.ItemBlockRoundRobinator;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
@@ -107,12 +108,12 @@ public class Machine_RoundRobinator extends BasicTileBlockWithTooltip {
     public CubicObject<String>[] getCustomTextureDirectoryObject() {
         AutoMap<String[]> aTemp = new AutoMap<String[]>();
         for (int i = 0; i < 5; i++) {
-            String[] aTexData = new String[] { CORE.MODID + ":" + "TileEntities/RoundRobinator/Top_" + i,
-                    CORE.MODID + ":" + "TileEntities/RoundRobinator/Top_" + i,
-                    CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_" + i,
-                    CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_" + i,
-                    CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_" + i,
-                    CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_" + i, };
+            String[] aTexData = new String[] { GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Top_" + i,
+                    GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Top_" + i,
+                    GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Side_" + i,
+                    GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Side_" + i,
+                    GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Side_" + i,
+                    GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Side_" + i, };
             aTemp.put(aTexData);
         }
         AutoMap<CubicObject<String>> aTemp2 = new AutoMap<CubicObject<String>>();
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_TradeTable.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_TradeTable.java
index 3897c005f9..c299cff6cb 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_TradeTable.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_TradeTable.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.machine;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.EnumCreatureType;
@@ -15,7 +17,6 @@ import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.interfaces.ITileTooltip;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.base.BlockBaseNBT;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable;
 
 public class Machine_TradeTable extends BlockBaseNBT implements ITileTooltip {
@@ -46,10 +47,10 @@ public class Machine_TradeTable extends BlockBaseNBT implements ITileTooltip {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister p_149651_1_) {
-        this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlYellow");
-        this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "workbench_top");
-        this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlYellow");
-        this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "SwirlYellow");
+        this.blockIcon = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "SwirlYellow");
+        this.textureTop = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "workbench_top");
+        this.textureBottom = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "SwirlYellow");
+        this.textureFront = p_149651_1_.registerIcon(GTPlusPlus.ID + ":" + "SwirlYellow");
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java
index 5619e55739..e3f09dc25c 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.machine;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.EntityLivingBase;
@@ -19,7 +21,6 @@ import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.handler.GuiHandler;
 import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 
@@ -146,12 +147,12 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip {
 
     @Override
     public CubicObject<String>[] getCustomTextureDirectoryObject() {
-        String[] aTexData = new String[] { CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_A",
-                CORE.MODID + ":" + "metro/" + "TEXTURE_TECH_PANEL_C",
-                CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H",
-                CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H",
-                CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H",
-                CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H" };
+        String[] aTexData = new String[] { GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_A",
+                GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_TECH_PANEL_C",
+                GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H",
+                GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H",
+                GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H",
+                GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H" };
         CubicObject<String>[] aTextureData = new CubicObject[] { new CubicObject<String>(aTexData) };
         return aTextureData;
     }
diff --git a/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Head_Fake.java b/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Head_Fake.java
index 6bd84b13f7..61465a59c1 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Head_Fake.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Head_Fake.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.machine.bedrock;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import java.util.Random;
 
 import net.minecraft.block.Block;
@@ -28,7 +30,7 @@ public class Mining_Head_Fake extends Block {
     public Mining_Head_Fake() {
         super(Material.lava);
         this.setBlockName(Utils.sanitizeString("blockMiningHeadFake"));
-        this.setBlockTextureName(CORE.MODID + ":" + "blockFrameGt");
+        this.setBlockTextureName(GTPlusPlus.ID + ":" + "blockFrameGt");
         this.setCreativeTab(AddToCreativeTab.tabBlock);
         this.setHardness(-1F);
         this.setResistance(50000.0F);
@@ -56,7 +58,7 @@ public class Mining_Head_Fake extends Block {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister iIcon) {
-        this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + "blockFrameGt");
+        this.blockIcon = iIcon.registerIcon(GTPlusPlus.ID + ":" + "blockFrameGt");
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Pipe_Fake.java b/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Pipe_Fake.java
index a0ca4978c0..29067dd2c1 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Pipe_Fake.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Pipe_Fake.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.block.machine.bedrock;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import java.util.Random;
 
 import net.minecraft.block.Block;
@@ -18,7 +20,6 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
@@ -28,7 +29,7 @@ public class Mining_Pipe_Fake extends Block {
     public Mining_Pipe_Fake() {
         super(Material.cactus);
         this.setBlockName(Utils.sanitizeString("blockMiningPipeFake"));
-        this.setBlockTextureName(CORE.MODID + ":" + "blockFrameGt");
+        this.setBlockTextureName(GTPlusPlus.ID + ":" + "blockFrameGt");
         this.setCreativeTab(AddToCreativeTab.tabBlock);
         this.setHardness(-1F);
         this.setResistance(50000.0F);
@@ -56,7 +57,7 @@ public class Mining_Pipe_Fake extends Block {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(final IIconRegister iIcon) {
-        this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + "blockFrameGt");
+        this.blockIcon = iIcon.registerIcon(GTPlusPlus.ID + ":" + "blockFrameGt");
     }
 
     @Override