killed all the errors

This doesn't mean done as i'm sure there are bugs to smash plus i still
need to implement the new network system as well fix the pump.

src/minecraft/fluidmech/client/gui/GuiReleaseValve.java

@@ -1,99 +0,0 @@
-package fluidmech.client.gui;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.ContainerRepair;
-import net.minecraft.world.World;
-
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.opengl.GL11;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class GuiReleaseValve extends GuiContainer
-{
-    private ContainerRepair field_82327_o;
-    private InventoryPlayer field_82325_q;
-
-    public GuiReleaseValve(InventoryPlayer par1, World par2World, int par3, int par4, int par5)
-    {
-        super(new ContainerRepair(par1, par2World, par3, par4, par5, Minecraft.getMinecraft().thePlayer));
-        this.field_82325_q = par1;
-        this.field_82327_o = (ContainerRepair)this.inventorySlots;
-    }
-
-    /**
-     * Adds the buttons (and other controls) to the screen in question.
-     */
-    public void initGui()
-    {
-        super.initGui();
-        Keyboard.enableRepeatEvents(true);
-        int width = (this.width - this.xSize) / 2;
-        int height = (this.height - this.ySize) / 2;
-    }
-
-    /**
-     * Called when the screen is unloaded. Used to disable keyboard repeat events
-     */
-    public void onGuiClosed()
-    {
-        super.onGuiClosed();
-        Keyboard.enableRepeatEvents(false);
-    }
-
-    /**
-     * Draw the foreground layer for the GuiContainer (everything in front of the items)
-     */
-    protected void drawGuiContainerForegroundLayer(int par1, int par2)
-    {
-        GL11.glDisable(GL11.GL_LIGHTING);
-        this.fontRenderer.drawString("Release Valve", 60, 6, 4210752);
-
-        
-
-        GL11.glEnable(GL11.GL_LIGHTING);
-    }
-
-    /**
-     * Fired when a key is typed. This is the equivalent of KeyListener.keyTyped(KeyEvent e).
-     */
-    protected void keyTyped(char par1, int par2)
-    {
-            super.keyTyped(par1, par2);
-    }
-
-    /**
-     * Called when the mouse is clicked.
-     */
-    protected void mouseClicked(int par1, int par2, int par3)
-    {
-        super.mouseClicked(par1, par2, par3);
-    }
-
-    /**
-     * Draws the screen and all the components in it.
-     */
-    public void drawScreen(int par1, int par2, float par3)
-    {
-        super.drawScreen(par1, par2, par3);
-        GL11.glDisable(GL11.GL_LIGHTING);
-    }
-
-    /**
-     * Draw the background layer for the GuiContainer (everything behind the items)
-     */
-    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
-    {
-        int tID = this.mc.renderEngine.getTexture("/gui/repair.png");
-        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-        this.mc.renderEngine.bindTexture(tID);
-        int width = (this.width - this.xSize) / 2;
-        int height = (this.height - this.ySize) / 2;
-        this.drawTexturedModalRect(width, height, 0, 0, this.xSize, this.ySize);
-    }
-  
-}

src/minecraft/fluidmech/common/FluidMech.java

@@ -77,6 +77,8 @@ public class FluidMech extends DummyModContainer
     public static final String ITEM_TEXTURE_FILE = RESOURCE_PATH + "items.png";
     public static final String LANGUAGE_PATH = RESOURCE_PATH + "lang/";
     
+    public static final String TEXTURE_NAME_PREFIX = "fluidmechanics:";
+
     private static final String[] LANGUAGES_SUPPORTED = new String[] { "en_US" };
 
     public static final Configuration CONFIGURATION = new Configuration(new File(Loader.instance().getConfigDir() + "/UniversalElectricity/", NAME + ".cfg"));

src/minecraft/fluidmech/common/item/ItemBasic.java

@@ -0,0 +1,55 @@
+package fluidmech.common.item;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.client.renderer.texture.IconRegister;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.Icon;
+import universalelectricity.components.common.BasicComponents;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import fluidmech.common.FluidMech;
+
+public class ItemBasic extends Item
+{
+	protected List<Icon> icons = new ArrayList<Icon>();
+
+	public ItemBasic(String name, int id)
+	{
+		super(id);
+		this.setUnlocalizedName(name);
+		this.setCreativeTab(BasicComponents.TAB);
+	}
+
+	@SideOnly(Side.CLIENT)
+	public void func_94581_a(IconRegister iconRegister)
+	{
+		List<ItemStack> list = new ArrayList<ItemStack>();
+		this.getSubItems(this.itemID, this.getCreativeTab(), list);
+
+		if (list.size() > 0)
+		{
+			for (ItemStack itemStack : list)
+			{
+				this.icons.add(iconRegister.func_94245_a(this.getUnlocalizedName(itemStack).replace("item.", FluidMech.TEXTURE_NAME_PREFIX)));
+			}
+		}
+		else
+		{
+			this.iconIndex = iconRegister.func_94245_a(this.getUnlocalizedName().replace("item.", FluidMech.TEXTURE_NAME_PREFIX));
+		}
+	}
+
+	@Override
+	public Icon getIconFromDamage(int damage)
+	{
+		if (this.icons.size() > damage)
+		{
+			return icons.get(damage);
+		}
+
+		return super.getIconFromDamage(damage);
+	}
+}

src/minecraft/fluidmech/common/item/ItemLiquidMachine.java

@@ -7,28 +7,22 @@ import net.minecraft.item.ItemStack;
 public class ItemLiquidMachine extends ItemBlock
 {
 
-    public ItemLiquidMachine(int id)
+	public ItemLiquidMachine(int id)
-    {
+	{
-        super(id);
+		super(id);
-        this.setMaxDamage(0);
+		this.setMaxDamage(0);
-        this.setHasSubtypes(true);
+		this.setHasSubtypes(true);
-    }
+	}
 
-    @Override
+	@Override
-    public int getMetadata(int damage)
+	public int getMetadata(int damage)
-    {
+	{
-        return damage;
+		return damage;
-    }
+	}
 
-    @Override
+	@Override
-    public String getItemNameIS(ItemStack par1ItemStack)
+	public String getUnlocalizedName(ItemStack itemStack)
-    {
+	{
-        return Block.blocksList[this.getBlockID()].getBlockName() + "." + (par1ItemStack.getItemDamage());
+		return "tile." + Block.blocksList[this.getBlockID()].getUnlocalizedName() + "." + itemStack.getItemDamage();
-    }
+	}
-
-    @Override
-    public String getItemName()
-    {
-        return Block.blocksList[this.getBlockID()].getBlockName() + ".0";
-    }
 }

src/minecraft/fluidmech/common/item/ItemParts.java

@@ -2,80 +2,59 @@ package fluidmech.common.item;
 
 import java.util.List;
 
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import fluidmech.common.FluidMech;
 import fluidmech.common.TabFluidMech;
 
-/** A metadata item containing parts of various machines in Liquid Mechanics Mod.
+/**
+ * A metadata item containing parts of various machines in Liquid Mechanics Mod.
  * 
- * @author Rs */
+ * @author Rs
-public class ItemParts extends Item
+ */
+public class ItemParts extends ItemBasic
 {
-    public enum Parts
+	public enum Parts
-    {
+	{
-        Bronze("Bronze", 0),
+		Bronze("BronzeTube"), Iron("IronTube"), Obby("ObbyTube"), Nether("NetherTube"), Seal("LeatherSeal"), SlimeSeal("SlimeSeal"), Tank("UnfinishedTank"), Valve("ValvePart");
-        Iron("Iron", 1),
-        Obby("Obby", 2),
-        Nether("Nether", 3),
-        Seal("Seal", 16),
-        SlimeSeal("Slime", 17),
-        Tank("Tank", 18),
-        Valve("Valve", 19);
 
-        public String name;
+		public String name;
-        public int itemIndex;
 
-        private Parts(String name, int itemIndex)
+		private Parts(String name)
-        {
+		{
-            this.name = name;
+			this.name = name;
-            this.itemIndex = itemIndex;
+		}
-        }
+	}
-    }
 
-    public ItemParts(int par1)
+	public ItemParts(int par1)
-    {
+	{
-        super(par1);
+		super("lmPart", par1);
-        this.setHasSubtypes(true);
+		this.setHasSubtypes(true);
-        this.setMaxDamage(0);
+		this.setMaxDamage(0);
-        this.setMaxStackSize(64);
+		this.setMaxStackSize(64);
-        this.setItemName("lmPart");
+		this.setCreativeTab(TabFluidMech.INSTANCE);
-        this.setCreativeTab(TabFluidMech.INSTANCE);
+	}
-    }
 
-    @Override
+	@Override
-    public int getIconFromDamage(int par1)
+	public String getUnlocalizedName(ItemStack itemStack)
-    {
+	{
-        if (par1 < Parts.values().length) { return Parts.values()[par1].itemIndex; }
+		return "item." + Parts.values()[itemStack.getItemDamage()].name;
-        return par1;
+	}
-    }
 
-    @Override
+	@Override
-    public String getTextureFile()
+	public int getMetadata(int meta)
-    {
+	{
-        return FluidMech.ITEM_TEXTURE_FILE;
+		return meta;
-    }
+	}
 
-    @Override
+	@Override
-    public String getItemNameIS(ItemStack i)
+	public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List)
-    {
+	{
-        int j = i.getItemDamage();
+		for (int i = 0; i < Parts.values().length; i++)
-        return i.getItem().getItemName() + "." + j;
+		{
-    }
+			par3List.add(new ItemStack(this, 1, i));
-
+		}
-    @Override
+	}
-    public int getMetadata(int meta)
-    {
-        return meta;
-    }
-
-    @Override
-    public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List)
-    {
-        for (int i = 0; i < Parts.values().length; i++)
-        {
-            par3List.add(new ItemStack(this, 1, i));
-        }
-    }
 }

src/minecraft/fluidmech/common/item/ItemPipe.java

@@ -1,5 +1,6 @@
 package fluidmech.common.item;
 
+import fluidmech.common.item.ItemParts.Parts;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
@@ -7,28 +8,22 @@ import net.minecraft.item.ItemStack;
 public class ItemPipe extends ItemBlock
 {
 
-    public ItemPipe(int id)
+	public ItemPipe(int id)
-    {
+	{
-        super(id);
+		super(id);
-        this.setMaxDamage(0);
+		this.setMaxDamage(0);
-        this.setHasSubtypes(true);
+		this.setHasSubtypes(true);
-    }
+	}
 
-    @Override
+	@Override
-    public int getMetadata(int damage)
+	public int getMetadata(int damage)
-    {
+	{
-        return damage;
+		return damage;
-    }
+	}
 
-    @Override
+	@Override
-    public String getItemNameIS(ItemStack par1ItemStack)
+	public String getUnlocalizedName(ItemStack itemStack)
-    {
+	{
-        return Block.blocksList[this.getBlockID()].getBlockName() + "." + (par1ItemStack.getItemDamage());
+		return "tile." + Block.blocksList[this.getBlockID()].getUnlocalizedName() + "." + itemStack.getItemDamage();
-    }
+	}
-
-    @Override
-    public String getItemName()
-    {
-        return Block.blocksList[this.getBlockID()].getBlockName() + ".0";
-    }
 }

src/minecraft/fluidmech/common/item/ItemReleaseValve.java

@@ -21,14 +21,8 @@ public class ItemReleaseValve extends ItemBlock
     }
 
     @Override
-    public String getItemNameIS(ItemStack par1ItemStack)
+	public String getUnlocalizedName(ItemStack itemStack)
-    {
+	{
-        return Block.blocksList[this.getBlockID()].getBlockName() + "." + (par1ItemStack.getItemDamage());
+		return "tile." + Block.blocksList[this.getBlockID()].getUnlocalizedName() + "." + itemStack.getItemDamage();
-    }
+	}
-
-    @Override
-    public String getItemName()
-    {
-        return Block.blocksList[this.getBlockID()].getBlockName() + ".0";
-    }
 }

src/minecraft/fluidmech/common/item/ItemTank.java

@@ -7,28 +7,22 @@ import net.minecraft.item.ItemStack;
 public class ItemTank extends ItemBlock
 {
 
-    public ItemTank(int id)
+	public ItemTank(int id)
-    {
+	{
-        super(id);
+		super(id);
-        this.setMaxDamage(0);
+		this.setMaxDamage(0);
-        this.setHasSubtypes(true);
+		this.setHasSubtypes(true);
-    }
+	}
 
-    @Override
+	@Override
-    public int getMetadata(int damage)
+	public int getMetadata(int damage)
-    {
+	{
-        return damage;
+		return damage;
-    }
+	}
 
-    @Override
+	@Override
-    public String getItemNameIS(ItemStack par1ItemStack)
+	public String getUnlocalizedName(ItemStack itemStack)
-    {
+	{
-        return Block.blocksList[this.getBlockID()].getBlockName() + "." + (par1ItemStack.getItemDamage());
+		return "tile." + Block.blocksList[this.getBlockID()].getUnlocalizedName() + "." + itemStack.getItemDamage();
-    }
+	}
-
-    @Override
-    public String getItemName()
-    {
-        return Block.blocksList[this.getBlockID()].getBlockName() + ".0";
-    }
 }

src/minecraft/fluidmech/common/machines/TileEntityMinorPump.java

@@ -197,7 +197,7 @@ public class TileEntityMinorPump extends TileEntityElectricityRunnable implement
 			int f = getFillTarget().fill(back, this.color.getLiquidData().getStack(), true);
 			if (f > 0)
 			{
-				worldObj.setBlockWithNotify(xCoord, yCoord - 1, zCoord, 0);
+				worldObj.setBlockAndMetadataWithNotify(xCoord, yCoord - 1, zCoord, 0, 0, 3);
 				return true;
 			}
 		}

src/minecraft/hydraulic/core/liquids/HydraulicNetworkManager.java

@@ -9,6 +9,7 @@ import java.util.List;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
 import universalelectricity.core.vector.Vector3;
+import universalelectricity.core.vector.VectorHelper;
 import cpw.mods.fml.common.FMLLog;
 
 /**
@@ -17,136 +18,131 @@ import cpw.mods.fml.common.FMLLog;
  */
 public class HydraulicNetworkManager
 {
-    public static HydraulicNetworkManager instance = new HydraulicNetworkManager();
+	public static HydraulicNetworkManager instance = new HydraulicNetworkManager();
 
-    private List<HydraulicNetwork> hydraulicNetworks = new ArrayList<HydraulicNetwork>();
+	private List<HydraulicNetwork> hydraulicNetworks = new ArrayList<HydraulicNetwork>();
 
-    /**
+	/**
-     * Registers a conductor into the UE electricity net.
+	 * Registers a conductor into the UE electricity net.
-     */
+	 */
-    public void registerConductor(IFluidPipe newConductor)
+	public void registerConductor(IFluidPipe newConductor)
-    {
+	{
-        this.cleanUpNetworks();
+		this.cleanUpNetworks();
-        HydraulicNetwork newNetwork = new HydraulicNetwork(newConductor);
+		HydraulicNetwork newNetwork = new HydraulicNetwork(newConductor);
-        this.hydraulicNetworks.add(newNetwork);
+		this.hydraulicNetworks.add(newNetwork);
-    }
+	}
 
-    public void unregister(TileEntity tileEntity)
+	public void unregister(TileEntity tileEntity)
-    {
+	{
-        for (HydraulicNetwork network : this.hydraulicNetworks)
+		for (HydraulicNetwork network : this.hydraulicNetworks)
-        {
+		{
-            network.removeEntity(tileEntity);
+			network.removeEntity(tileEntity);
-        }
+		}
-    }
+	}
 
-    /**
+	/**
-     * Merges two connection lines together into one.
+	 * Merges two connection lines together into one.
-     * 
+	 * 
-     * @param networkA
+	 * @param networkA - The network to be merged into. This network will be kept.
-     *            - The network to be merged into. This network will be kept.
+	 * @param networkB - The network to be merged. This network will be deleted.
-     * @param networkB
+	 */
-     *            - The network to be merged. This network will be deleted.
+	public void mergeConnection(HydraulicNetwork networkA, HydraulicNetwork networkB)
-     */
+	{
-    public void mergeConnection(HydraulicNetwork networkA, HydraulicNetwork networkB)
+		if (networkA != networkB)
-    {
+		{
-        if (networkA != networkB)
+			if (networkA != null && networkB != null)
-        {
+			{
-            if (networkA != null && networkB != null)
+				networkA.conductors.addAll(networkB.conductors);
-            {
+				networkA.setNetwork();
-                networkA.conductors.addAll(networkB.conductors);
+				this.hydraulicNetworks.remove(networkB);
-                networkA.setNetwork();
+				networkB = null;
-                this.hydraulicNetworks.remove(networkB);
-                networkB = null;
 
-                networkA.cleanConductors();
+				networkA.cleanConductors();
-            }
+			}
-            else
+			else
-            {
+			{
-                System.err.println("Failed to merge pipe connections!");
+				System.err.println("Failed to merge pipe connections!");
-            }
+			}
-        }
+		}
-    }
+	}
 
-    /**
+	/**
-     * Separate one connection line into two different ones between two
+	 * Separate one connection line into two different ones between two conductors. This function
-     * conductors. This function does this by resetting all wires in the
+	 * does this by resetting all wires in the connection line and making them each reconnect.
-     * connection line and making them each reconnect.
+	 * 
-     * 
+	 * @param conductorA - existing conductor
-     * @param conductorA
+	 * @param conductorB - broken/invalid conductor
-     *            - existing conductor
+	 */
-     * @param conductorB
+	public void splitConnection(IFluidPipe conductorA, IFluidPipe conductorB)
-     *            - broken/invalid conductor
+	{
-     */
+		try
-    public void splitConnection(IFluidPipe conductorA, IFluidPipe conductorB)
+		{
-    {
+			HydraulicNetwork network = conductorA.getNetwork();
-        try
-        {
-            HydraulicNetwork network = conductorA.getNetwork();
 
-            if (network != null)
+			if (network != null)
-            {
+			{
-                network.cleanConductors();
+				network.cleanConductors();
-                network.resetConductors();
+				network.resetConductors();
 
-                Iterator it = network.conductors.iterator();
+				Iterator it = network.conductors.iterator();
 
-                while (it.hasNext())
+				while (it.hasNext())
-                {
+				{
-                    IFluidPipe conductor = (IFluidPipe) it.next();
+					IFluidPipe conductor = (IFluidPipe) it.next();
 
-                    for (byte i = 0; i < 6; i++)
+					for (byte i = 0; i < 6; i++)
-                    {
+					{
-                        conductor.updateConnectionWithoutSplit(Vector3.getConnectorFromSide(((TileEntity) conductor).worldObj, new Vector3((TileEntity) conductor), ForgeDirection.getOrientation(i)), ForgeDirection.getOrientation(i));
+						conductor.updateConnectionWithoutSplit(VectorHelper.getConnectorFromSide(((TileEntity) conductor).worldObj, new Vector3((TileEntity) conductor), ForgeDirection.getOrientation(i)), ForgeDirection.getOrientation(i));
-                    }
+					}
-                }
+				}
-            }
+			}
-            else
+			else
-            {
+			{
-                FMLLog.severe("Conductor invalid network while splitting connection!");
+				FMLLog.severe("Conductor invalid network while splitting connection!");
-            }
+			}
-        }
+		}
-        catch (Exception e)
+		catch (Exception e)
-        {
+		{
-            FMLLog.severe("Failed to split wire connection!");
+			FMLLog.severe("Failed to split wire connection!");
-            e.printStackTrace();
+			e.printStackTrace();
-        }
+		}
-    }
+	}
 
-    /**
+	/**
-     * Clean up and remove all useless and invalid connections.
+	 * Clean up and remove all useless and invalid connections.
-     */
+	 */
-    public void cleanUpNetworks()
+	public void cleanUpNetworks()
-    {
+	{
-        try
+		try
-        {
+		{
-            Iterator it = hydraulicNetworks.iterator();
+			Iterator it = hydraulicNetworks.iterator();
 
-            while (it.hasNext())
+			while (it.hasNext())
-            {
+			{
-                HydraulicNetwork network = (HydraulicNetwork) it.next();
+				HydraulicNetwork network = (HydraulicNetwork) it.next();
-                network.cleanConductors();
+				network.cleanConductors();
 
-                if (network.conductors.size() == 0)
+				if (network.conductors.size() == 0)
-                {
+				{
-                    it.remove();
+					it.remove();
-                }
+				}
-            }
+			}
-        }
+		}
-        catch (Exception e)
+		catch (Exception e)
-        {
+		{
-            FMLLog.severe("Failed to clean up wire connections!");
+			FMLLog.severe("Failed to clean up wire connections!");
-            e.printStackTrace();
+			e.printStackTrace();
-        }
+		}
-    }
+	}
 
-    public void resetConductors()
+	public void resetConductors()
-    {
+	{
-        Iterator it = hydraulicNetworks.iterator();
+		Iterator it = hydraulicNetworks.iterator();
 
-        while (it.hasNext())
+		while (it.hasNext())
-        {
+		{
-            HydraulicNetwork network = ((HydraulicNetwork) it.next());
+			HydraulicNetwork network = ((HydraulicNetwork) it.next());
-            network.resetConductors();
+			network.resetConductors();
-        }
+		}
-    }
+	}
 }