4 files changed, 16 insertions, 10 deletions
diff --git a/src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java b/src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java
index 9bcc6ecf07..07388c35b6 100644
--- a/src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java
+++ b/src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.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.Entity;
@@ -13,7 +15,6 @@ import net.minecraftforge.fluids.Fluid;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 
 public class BlockFluidBase extends BlockFluidClassic {
@@ -58,10 +59,10 @@ public class BlockFluidBase extends BlockFluidClassic {
     @Override
     public void registerBlockIcons(IIconRegister register) {
         if (stillIcon == null) {
-            stillIcon = register.registerIcon(CORE.MODID + ":" + "fluids/fluid.fluid.autogenerated.still");
+            stillIcon = register.registerIcon(GTPlusPlus.ID + ":" + "fluids/fluid.fluid.autogenerated.still");
         }
         if (flowingIcon == null) {
-            flowingIcon = register.registerIcon(CORE.MODID + ":" + "fluids/fluid.fluid.autogenerated.flowing");
+            flowingIcon = register.registerIcon(GTPlusPlus.ID + ":" + "fluids/fluid.fluid.autogenerated.flowing");
         }
     }
 
diff --git a/src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java b/src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java
index 54ed1f3a9e..96936cced8 100644
--- a/src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java
+++ b/src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java
@@ -1,11 +1,12 @@
 package gtPlusPlus.core.fluids;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import net.minecraft.block.Block;
 import net.minecraft.item.EnumRarity;
 import net.minecraftforge.fluids.Fluid;
 
 import gregtech.api.GregTech_API;
-import gtPlusPlus.core.lib.CORE;
 
 public class FactoryFluid extends Fluid implements Runnable {
 
@@ -49,7 +50,7 @@ public class FactoryFluid extends Fluid implements Runnable {
         if (viscosity != Short.MIN_VALUE) this.setViscosity(viscosity);
         this.setGaseous(gas);
         this.setRarity(aRarity);
-        this.mTextureName = CORE.MODID + ":fluids/fluid.fluid.autogenerated";
+        this.mTextureName = GTPlusPlus.ID + ":fluids/fluid.fluid.autogenerated";
         GregTech_API.sGTBlockIconload.add(this);
     }
 
diff --git a/src/main/java/gtPlusPlus/core/fluids/FluidRegistryHandler.java b/src/main/java/gtPlusPlus/core/fluids/FluidRegistryHandler.java
index dd510957fc..22f9ce0799 100644
--- a/src/main/java/gtPlusPlus/core/fluids/FluidRegistryHandler.java
+++ b/src/main/java/gtPlusPlus/core/fluids/FluidRegistryHandler.java
@@ -1,13 +1,14 @@
 package gtPlusPlus.core.fluids;
 
-import static gtPlusPlus.core.block.ModBlocks.*;
+import static gregtech.api.enums.Mods.GTPlusPlus;
+import static gtPlusPlus.core.block.ModBlocks.blockFluidSludge;
+import static gtPlusPlus.core.block.ModBlocks.fluidSludge;
 
 import net.minecraft.block.material.Material;
 import net.minecraftforge.fluids.FluidRegistry;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import gtPlusPlus.core.block.general.fluids.BlockFluidSludge;
-import gtPlusPlus.core.lib.CORE;
 
 public class FluidRegistryHandler {
 
@@ -41,8 +42,9 @@ public class FluidRegistryHandler {
         fluidSludge.setUnlocalizedName("fluid.sludge");
         FluidRegistry.registerFluid(fluidSludge);
         blockFluidSludge = new BlockFluidSludge(fluidSludge, Material.cactus).setBlockName("fluidBlockSludge");
-        GameRegistry
-                .registerBlock(blockFluidSludge, CORE.MODID + "_" + blockFluidSludge.getUnlocalizedName().substring(5));
+        GameRegistry.registerBlock(
+                blockFluidSludge,
+                GTPlusPlus.ID + "_" + blockFluidSludge.getUnlocalizedName().substring(5));
         fluidSludge.setUnlocalizedName(blockFluidSludge.getUnlocalizedName());
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java b/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java
index 668076eb68..476df9036f 100644
--- a/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java
+++ b/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.fluids;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -298,7 +300,7 @@ public class ItemGenericFluidBucket extends ItemBucket {
     @Override
     public void registerIcons(final IIconRegister i) {
         mBaseBucketTexture = i.registerIcon("bucket_empty");
-        mOverlayBucketTexture = i.registerIcon(CORE.MODID + ":bucket.generic.overlay");
+        mOverlayBucketTexture = i.registerIcon(GTPlusPlus.ID + ":bucket.generic.overlay");
     }
 
     @Override