Fixed most texture issues

src/minecraft/dark/core/network/fluid/NetworkPipes.java

@@ -9,7 +9,6 @@ import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
-import net.minecraftforge.fluids.IFluidTank;
 import dark.core.api.ColorCode;
 import dark.core.api.INetworkPart;
 import dark.core.hydraulic.helpers.FluidHelper;

src/minecraft/dark/fluid/client/ClientProxy.java

@@ -20,8 +20,6 @@ import dark.fluid.common.pipes.TileEntityGenericPipe;
 import dark.fluid.common.pipes.TileEntityPipe;
 import dark.fluid.common.pump.TileEntityConstructionPump;
 import dark.fluid.common.pump.TileEntityStarterPump;
-import dark.mech.client.render.RenderGearRod;
-import dark.mech.client.render.RenderGenerator;
 
 public class ClientProxy extends CommonProxy
 {

src/minecraft/dark/fluid/client/render/BlockRenderHelper.java

@@ -2,7 +2,7 @@ package dark.fluid.client.render;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.client.resources.ResourceLocation;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.IBlockAccess;
 
 import org.lwjgl.opengl.GL11;
@@ -41,7 +41,7 @@ public class BlockRenderHelper implements ISimpleBlockRenderingHandler
 			GL11.glTranslatef((float) 0.0F, (float) 1.1F, (float) 0.0F);
 			GL11.glRotatef(180f, 0f, 0f, 1f);
 			
-			FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(FluidMech.MODEL_TEXTURE_DIRECTORY + "pumps/WaterPump.png"));
+			FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(FluidMech.DOMAIN, FluidMech.MODEL_DIRECTORY + "pumps/WaterPump.png"));
 			modelPump.render(0.0725F);
 			modelPump.renderMotion(0.0725F, 0);
 		}
@@ -49,7 +49,7 @@ public class BlockRenderHelper implements ISimpleBlockRenderingHandler
 		{
 			GL11.glTranslatef((float) 0.0F, (float) .8F, (float) 0.0F);
 			GL11.glRotatef(180f, 0f, 0f, 1f);
-			FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(FluidMech.MODEL_TEXTURE_DIRECTORY + "Sink.png"));
+			FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(FluidMech.DOMAIN, FluidMech.MODEL_DIRECTORY + "Sink.png"));
 			sink.render(0.0565F);
 		}
 		else if (block.blockID == FluidMech.blockTank.blockID)
@@ -68,21 +68,21 @@ public class BlockRenderHelper implements ISimpleBlockRenderingHandler
 		{
 			GL11.glTranslatef((float) 0.0F, (float) 1.5F, (float) 0.0F);
 			GL11.glRotatef(180f, 0f, 0f, 1f);
-			FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(FluidMech.MODEL_TEXTURE_DIRECTORY + "mechanical/GearRod.png"));
+			FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(FluidMech.DOMAIN, FluidMech.MODEL_DIRECTORY + "mechanical/GearRod.png"));
 			modelRod.render(0.0825F, 0);
 		}
 		else if (block.blockID == FluidMech.blockGenerator.blockID)
 		{
 			GL11.glTranslatef((float) 0.0F, (float) 1.0F, (float) 0.0F);
 			GL11.glRotatef(180f, 0f, 0f, 1f);
-			FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(FluidMech.MODEL_TEXTURE_DIRECTORY + "mechanical/Generator.png"));
+			FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(FluidMech.DOMAIN, FluidMech.MODEL_DIRECTORY + "mechanical/Generator.png"));
 			modelGen.render(null);
 		}
 		else if (block.blockID == FluidMech.blockConPump.blockID && metadata < 4)
 		{
 			GL11.glTranslatef((float) 0.0F, (float) 1.2F, (float) 0.0F);
 			GL11.glRotatef(180f, 0f, 0f, 1f);
-			FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(FluidMech.MODEL_TEXTURE_DIRECTORY + "ConstructionPump.png"));
+			FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(FluidMech.DOMAIN, FluidMech.MODEL_DIRECTORY + "ConstructionPump.png"));
 			conPump.render(0.0725F);
 			conPump.renderMotor(0.0725F);
 

src/minecraft/dark/fluid/client/render/ItemRenderHelper.java

@@ -1,8 +1,8 @@
 package dark.fluid.client.render;
 
 import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.IItemRenderer;
 
 import org.lwjgl.opengl.GL11;
@@ -10,7 +10,6 @@ import org.lwjgl.opengl.GL11;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.fluid.client.model.ModelLargePipe;
 import dark.fluid.client.model.ModelReleaseValve;
 import dark.fluid.client.render.pipe.RenderPipe;
 import dark.fluid.common.FluidMech;
@@ -89,7 +88,7 @@ public class ItemRenderHelper implements IItemRenderer
 			pipe.SixPipe.renderBack();
 			pipe.SixPipe.renderMiddle();
 		}
-		FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(FluidMech.MODEL_TEXTURE_DIRECTORY + "ReleaseValve.png"));
+		FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(FluidMech.DOMAIN, FluidMech.MODEL_DIRECTORY + "ReleaseValve.png"));
 		GL11.glRotatef(180f, 0f, 0f, 1f);
 		if (!equ)
 		{

src/minecraft/dark/fluid/client/render/RenderConstructionPump.java

@@ -1,13 +1,13 @@
 package dark.fluid.client.render;
 
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
+import dark.core.render.RenderMachine;
 import dark.fluid.client.model.ModelConstructionPump;
 import dark.fluid.common.FluidMech;
 import dark.fluid.common.pump.TileEntityConstructionPump;
@@ -58,7 +58,7 @@ public class RenderConstructionPump extends RenderMachine
 	@Override
 	public ResourceLocation getTexture(int block, int meta)
 	{
-		return new ResourceLocation(FluidMech.MODEL_TEXTURE_DIRECTORY + "ConstructionPump.png");
+		return new ResourceLocation(FluidMech.DOMAIN, FluidMech.MODEL_DIRECTORY + "ConstructionPump.png");
 	}
 
 }

src/minecraft/dark/fluid/client/render/RenderMachine.java

@@ -1,39 +0,0 @@
-package dark.fluid.client.render;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.client.resources.ResourceLocation;
-import net.minecraft.tileentity.TileEntity;
-
-@SideOnly(Side.CLIENT)
-public abstract class RenderMachine extends TileEntitySpecialRenderer
-{
-
-	public RenderMachine()
-	{
-		
-	}
-
-	@Override
-	public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f)
-	{
-		// TODO Auto-generated method stub
-
-	}
-
-	/** Sudo method for setting the texture for current render */
-	public void bindTextureByName(String name)
-	{
-		func_110628_a(new ResourceLocation(name));
-	}
-
-	public void bindTextureByName(ResourceLocation name)
-	{
-		func_110628_a(name);
-	}
-
-	/** Gets the texture based on block and metadata mainly used by item/block inv render */
-	public abstract ResourceLocation getTexture(int block, int meta);
-
-}

src/minecraft/dark/fluid/client/render/RenderPump.java

@@ -1,13 +1,13 @@
 package dark.fluid.client.render;
 
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
+import dark.core.render.RenderMachine;
 import dark.fluid.client.model.ModelPump;
 import dark.fluid.common.FluidMech;
 import dark.fluid.common.pump.TileEntityStarterPump;
@@ -64,7 +64,7 @@ public class RenderPump extends RenderMachine
 	@Override
 	public ResourceLocation getTexture(int block, int meta)
 	{
-		return new ResourceLocation(FluidMech.MODEL_TEXTURE_DIRECTORY + "pumps/WaterPump.png");
+		return new ResourceLocation(FluidMech.DOMAIN, FluidMech.MODEL_DIRECTORY + "pumps/WaterPump.png");
 	}
 
 }

src/minecraft/dark/fluid/client/render/RenderReleaseValve.java

@@ -1,14 +1,14 @@
 package dark.fluid.client.render;
 
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
 import dark.core.api.ColorCode;
+import dark.core.render.RenderMachine;
 import dark.fluid.client.model.ModelLargePipe;
 import dark.fluid.client.model.ModelReleaseValve;
 import dark.fluid.common.FluidMech;
@@ -51,7 +51,7 @@ public class RenderReleaseValve extends RenderMachine
 		if (ents[4] != null)
 			SixPipe.renderLeft();
 		SixPipe.renderMiddle();
-		bindTextureByName(FluidMech.MODEL_TEXTURE_DIRECTORY + "ReleaseValve.png");
+		bindTextureByName(FluidMech.DOMAIN, FluidMech.MODEL_DIRECTORY + "ReleaseValve.png");
 		if (ents[1] == null)
 			valve.render();
 		GL11.glPopMatrix();
@@ -60,7 +60,7 @@ public class RenderReleaseValve extends RenderMachine
 
 	public static String getPipeTexture(int meta)
 	{
-		return FluidMech.MODEL_TEXTURE_DIRECTORY + "pipes/" + ColorCode.get(meta).getName() + "Pipe.png";
+		return FluidMech.MODEL_DIRECTORY + "pipes/" + ColorCode.get(meta).getName() + "Pipe.png";
 	}
 
 	@Override
@@ -72,6 +72,6 @@ public class RenderReleaseValve extends RenderMachine
 	@Override
 	public ResourceLocation getTexture(int block, int meta)
 	{
-		return new ResourceLocation(FluidMech.MODEL_TEXTURE_DIRECTORY + "pipes/" + ColorCode.get(15).getName() + "Pipe.png");
+		return new ResourceLocation(FluidMech.DOMAIN, FluidMech.MODEL_DIRECTORY + "pipes/" + ColorCode.get(15).getName() + "Pipe.png");
 	}
 }

src/minecraft/dark/fluid/client/render/RenderSink.java

@@ -1,15 +1,15 @@
 package dark.fluid.client.render;
 
 import net.minecraft.block.Block;
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fluids.FluidStack;
 
 import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
+import dark.core.render.RenderMachine;
 import dark.fluid.client.model.ModelSink;
 import dark.fluid.common.FluidMech;
 import dark.fluid.common.machines.TileEntitySink;
@@ -31,7 +31,7 @@ public class RenderSink extends RenderMachine
 		{
 			return;
 		}
-		bindTextureByName(Block.waterStill.getBlockTextureFromSide(0) + "blue.png");
+		//bindTextureByName(Block.waterStill.getBlockTextureFromSide(0) + "blue.png");
 		float p = 0;
 		if (stack.amount > 0)
 			p = 0.5f;
@@ -83,7 +83,7 @@ public class RenderSink extends RenderMachine
 	@Override
 	public ResourceLocation getTexture(int block, int meta)
 	{
-		return new ResourceLocation(FluidMech.MODEL_TEXTURE_DIRECTORY + "Sink.png");
+		return new ResourceLocation(FluidMech.DOMAIN, FluidMech.MODEL_DIRECTORY + "Sink.png");
 	}
 
 }

src/minecraft/dark/fluid/client/render/RenderTank.java

@@ -1,7 +1,7 @@
 package dark.fluid.client.render;
 
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -9,9 +9,9 @@ import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
 import dark.core.api.ColorCode;
 import dark.core.render.LiquidRenderer;
+import dark.core.render.RenderMachine;
 import dark.fluid.client.model.ModelTankSide;
 import dark.fluid.common.machines.TileEntityTank;
 
@@ -54,7 +54,7 @@ public class RenderTank extends RenderMachine
 				GL11.glDisable(GL11.GL_LIGHTING);
 				GL11.glEnable(GL11.GL_BLEND);
 				GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-				bindTextureByName(LiquidRenderer.getLiquidSheet(liquid.getFluid()));
+				bindTextureByName("",LiquidRenderer.getLiquidSheet(liquid.getFluid()));
 
 				GL11.glTranslatef((float) x, (float) y, (float) z);
 				GL11.glScalef(1.01F, 1.01F, 1.01F);

src/minecraft/dark/fluid/client/render/pipe/IPipeExtentionRender.java

@@ -1,9 +1,9 @@
 package dark.fluid.client.render.pipe;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraftforge.common.ForgeDirection;
 import universalelectricity.core.vector.Vector3;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import dark.fluid.common.pipes.TileEntityPipe;
 
 /** Class for TileEntity Renders that extend the pipe class to use instead of extending

src/minecraft/dark/fluid/client/render/pipe/RenderPipe.java

@@ -1,22 +1,20 @@
 package dark.fluid.client.render.pipe;
 
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
 
 import org.lwjgl.opengl.GL11;
 
+import universalelectricity.core.vector.Vector3;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
-import universalelectricity.core.vector.Vector3;
 import dark.core.api.ColorCode;
 import dark.core.hydraulic.helpers.FluidRestrictionHandler;
+import dark.core.render.RenderMachine;
 import dark.fluid.client.model.ModelLargePipe;
-import dark.fluid.client.render.RenderMachine;
 import dark.fluid.common.FluidMech;
-import dark.fluid.common.pipes.TileEntityGenericPipe;
 import dark.fluid.common.pipes.TileEntityPipe;
 import dark.fluid.common.pipes.addon.IPipeExtention;
 
@@ -96,7 +94,7 @@ public class RenderPipe extends RenderMachine
 		{
 			name = ColorCode.get(meta).getName();
 		}
-		return new ResourceLocation(FluidMech.MODEL_TEXTURE_DIRECTORY + "pipes/" + name + "Pipe.png");
+		return new ResourceLocation(FluidMech.DOMAIN, FluidMech.MODEL_DIRECTORY + "pipes/" + name + "Pipe.png");
 	}
 
 	public void render(int blockID, int meta, boolean[] side)

src/minecraft/dark/fluid/client/render/pipe/RenderPipeWindow.java

@@ -1,9 +1,9 @@
 package dark.fluid.client.render.pipe;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraftforge.common.ForgeDirection;
 import universalelectricity.core.vector.Vector3;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import dark.fluid.client.model.ModelLargePipe;
 import dark.fluid.common.pipes.TileEntityPipe;
 

src/minecraft/dark/fluid/common/FluidMech.java

@@ -13,7 +13,6 @@ import net.minecraftforge.common.Configuration;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fluids.BlockFluidFinite;
 import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.oredict.OreDictionary;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 
@@ -27,11 +26,8 @@ import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.Mod.Init;
 import cpw.mods.fml.common.Mod.Instance;
 import cpw.mods.fml.common.Mod.Metadata;
-import cpw.mods.fml.common.Mod.PostInit;
-import cpw.mods.fml.common.Mod.PreInit;
 import cpw.mods.fml.common.ModMetadata;
 import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
@@ -68,7 +64,7 @@ import dark.mech.common.machines.BlockGenerator;
 import dark.mech.common.machines.BlockRod;
 
 @ModstatInfo(prefix = "fluidmech")
-@Mod(modid = FluidMech.MOD_ID, name = FluidMech.MOD_NAME, version = FluidMech.VERSION, dependencies = "after:BasicComponents", useMetadata = true)
+@Mod(modid = FluidMech.MOD_ID, name = FluidMech.MOD_NAME, version = FluidMech.VERSION, useMetadata = true)
 @NetworkMod(channels = { FluidMech.CHANNEL }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketManager.class)
 public class FluidMech extends DummyModContainer
 {
@@ -80,10 +76,11 @@ public class FluidMech extends DummyModContainer
 	public static final String BUILD_VERSION = "@BUILD@";
 
 	// @Mod
-	public static final String MOD_ID = "Fluid_Mechanics";
-	public static final String MOD_NAME = "Fluid Mechanics";
+	public static final String MOD_ID = "FluidMech";
+	public static final String MOD_NAME = "Fluid_Mechanics";
 	public static final String VERSION = MAJOR_VERSION + "." + MINOR_VERSION + "." + REVIS_VERSION + "." + BUILD_VERSION;
-
+	public static final String DOMAIN = "fm";
+	public static final String PREFIX = DOMAIN + ":";
 	// @NetworkMod
 	public static final String CHANNEL = "FluidMech";
 
@@ -91,20 +88,22 @@ public class FluidMech extends DummyModContainer
 	public static ModMetadata meta;
 
 	/* RESOURCE FILE PATHS */
-	public static final String RESOURCE_PATH = "/mods/fluidmech/";
-	public static final String TEXTURE_DIRECTORY = RESOURCE_PATH + "textures/";
+	public static final String DIRECTORY_NO_SLASH = "assets/fm/";
+	public static final String DIRECTORY = "/" + DIRECTORY_NO_SLASH;
+	public static final String LANGUAGE_PATH = DIRECTORY + "languages/";
+	public static final String SOUND_PATH = DIRECTORY + "audio/";
+
+	public static final String TEXTURE_DIRECTORY = "textures/";
+	public static final String BLOCK_DIRECTORY = TEXTURE_DIRECTORY + "blocks/";
+	public static final String ITEM_DIRECTORY = TEXTURE_DIRECTORY + "items/";
+	public static final String MODEL_DIRECTORY = TEXTURE_DIRECTORY + "models/";
 	public static final String GUI_DIRECTORY = TEXTURE_DIRECTORY + "gui/";
-	public static final String BLOCK_TEXTURE_DIRECTORY = TEXTURE_DIRECTORY + "blocks/";
-	public static final String ITEM_TEXTURE_DIRECTORY = TEXTURE_DIRECTORY + "items/";
-	public static final String MODEL_TEXTURE_DIRECTORY = TEXTURE_DIRECTORY + "models/";
-	public static final String TEXTURE_NAME_PREFIX = "fluidmech:";
-	public static final String LANGUAGE_PATH = RESOURCE_PATH + "languages/";
 
 	/* SUPPORTED LANGS */
 	private static final String[] LANGUAGES_SUPPORTED = new String[] { "en_US", "de_DE" };
 
 	/* CONFIG FILE */
-	public static final Configuration CONFIGURATION = new Configuration(new File(Loader.instance().getConfigDir() + "/UniversalElectricity/", FluidMech.MOD_NAME + ".cfg"));
+	public static final Configuration CONFIGURATION = new Configuration(new File(Loader.instance().getConfigDir() + "/Dark/", FluidMech.MOD_NAME + ".cfg"));
 
 	/* START IDS */
 	public final static int BLOCK_ID_PREFIX = 3100;
@@ -136,11 +135,6 @@ public class FluidMech extends DummyModContainer
 	/* LOGGER - EXTENDS FORGE'S LOG SYSTEM */
 	public static Logger FMLog = Logger.getLogger(FluidMech.MOD_NAME);
 
-	static
-	{
-		/* EVENT BUS (done here to ensure all fluid events are caught) */
-		MinecraftForge.EVENT_BUS.register(new FluidRestrictionHandler());
-	}
 
 	@EventHandler
 	public void preInit(FMLPreInitializationEvent event)
@@ -153,7 +147,7 @@ public class FluidMech extends DummyModContainer
 
 		/* UPDATE NOTIFIER */
 		Modstats.instance().getReporter().registerMod(this);
-
+		MinecraftForge.EVENT_BUS.register(new FluidRestrictionHandler());
 		/* CONFIGS */
 		CONFIGURATION.load();
 		

src/minecraft/dark/fluid/common/item/ItemBasic.java

@@ -34,7 +34,7 @@ public class ItemBasic extends Item
 		{
 			for (ItemStack itemStack : list)
 			{
-				this.icons[list.indexOf(itemStack)] = iconRegister.registerIcon(this.getUnlocalizedName(itemStack).replace("item.", FluidMech.TEXTURE_NAME_PREFIX));
+				this.icons[list.indexOf(itemStack)] = iconRegister.registerIcon(this.getUnlocalizedName(itemStack).replace("item.", FluidMech.PREFIX));
 			}
 		}
 	}

src/minecraft/dark/fluid/common/pipes/BlockPipe.java

@@ -11,7 +11,6 @@ import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.IFluidTank;
-import universalelectricity.prefab.block.BlockAdvanced;
 import dark.core.hydraulic.helpers.FluidRestrictionHandler;
 import dark.fluid.api.INetworkPipe;
 import dark.fluid.common.FluidMech;

src/minecraft/dark/fluid/common/pipes/TileEntityGenericPipe.java

@@ -8,7 +8,6 @@ import net.minecraftforge.fluids.FluidStack;
 import universalelectricity.core.vector.Vector3;
 import universalelectricity.core.vector.VectorHelper;
 import dark.core.api.ColorCode;
-import dark.core.hydraulic.helpers.FluidHelper;
 import dark.core.network.fluid.NetworkPipes;
 
 public class TileEntityGenericPipe extends TileEntityPipe

src/minecraft/dark/fluid/common/pipes/TileEntityPipe.java

@@ -37,7 +37,6 @@ import dark.core.api.ColorCode;
 import dark.core.api.IColorCoded;
 import dark.core.api.ITileConnector;
 import dark.core.api.IToolReadOut;
-import dark.core.hydraulic.helpers.FluidHelper;
 import dark.core.hydraulic.helpers.FluidRestrictionHandler;
 import dark.core.network.fluid.NetworkPipes;
 import dark.core.tile.network.NetworkTileEntities;

src/minecraft/dark/fluid/common/pump/BlockConstructionPump.java

@@ -39,9 +39,9 @@ public class BlockConstructionPump extends BlockMachine
 	@Override
 	public void registerIcons(IconRegister par1IconRegister)
 	{
-		this.blockIcon = par1IconRegister.registerIcon(FluidMech.TEXTURE_NAME_PREFIX + "ironMachineSide");
-		this.inputIcon = par1IconRegister.registerIcon(FluidMech.TEXTURE_NAME_PREFIX + "inputMachineSide");
-		this.outputIcon = par1IconRegister.registerIcon(FluidMech.TEXTURE_NAME_PREFIX + "outputMachineSide");
+		this.blockIcon = par1IconRegister.registerIcon(FluidMech.PREFIX + "ironMachineSide");
+		this.inputIcon = par1IconRegister.registerIcon(FluidMech.PREFIX + "inputMachineSide");
+		this.outputIcon = par1IconRegister.registerIcon(FluidMech.PREFIX + "outputMachineSide");
 	}
 
 	@Override

src/minecraft/dark/fluid/common/pump/BlockDrain.java

@@ -38,9 +38,9 @@ public class BlockDrain extends BlockMachine
 	@Override
 	public void registerIcons(IconRegister par1IconRegister)
 	{
-		this.blockIcon = par1IconRegister.registerIcon(FluidMech.TEXTURE_NAME_PREFIX + "ironMachineSide");
-		this.drainIcon = par1IconRegister.registerIcon(FluidMech.TEXTURE_NAME_PREFIX + "drain");
-		this.fillIcon = par1IconRegister.registerIcon(FluidMech.TEXTURE_NAME_PREFIX + "drain2");
+		this.blockIcon = par1IconRegister.registerIcon(FluidMech.PREFIX + "ironMachineSide");
+		this.drainIcon = par1IconRegister.registerIcon(FluidMech.PREFIX + "drain");
+		this.fillIcon = par1IconRegister.registerIcon(FluidMech.PREFIX + "drain2");
 	}
 
 	@Override

src/minecraft/dark/mech/client/model/ModelGearRod.java

@@ -8,7 +8,6 @@ package dark.mech.client.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.tileentity.TileEntity;
 
 public class ModelGearRod extends ModelBase
 {