etc etc

src/minecraft/fluidmech/client/ClientProxy.java

@@ -14,13 +14,13 @@ import fluidmech.client.render.RenderSink;
 import fluidmech.client.render.RenderTank;
 import fluidmech.common.CommonProxy;
 import fluidmech.common.FluidMech;
-import fluidmech.common.tileentity.TileEntityGenerator;
+import fluidmech.common.machines.TileEntityPump;
-import fluidmech.common.tileentity.TileEntityPipe;
+import fluidmech.common.machines.TileEntityReleaseValve;
-import fluidmech.common.tileentity.TileEntityPump;
+import fluidmech.common.machines.TileEntitySink;
-import fluidmech.common.tileentity.TileEntityReleaseValve;
+import fluidmech.common.machines.TileEntityTank;
-import fluidmech.common.tileentity.TileEntityRod;
+import fluidmech.common.machines.mech.TileEntityGenerator;
-import fluidmech.common.tileentity.TileEntitySink;
+import fluidmech.common.machines.mech.TileEntityRod;
-import fluidmech.common.tileentity.TileEntityTank;
+import fluidmech.common.machines.pipes.TileEntityPipe;
 
 public class ClientProxy extends CommonProxy
 {

src/minecraft/fluidmech/client/model/ModelGenerator.java

@@ -6,7 +6,7 @@
 
 package fluidmech.client.model;
 
-import fluidmech.common.tileentity.TileEntityGenerator;
+import fluidmech.common.machines.mech.TileEntityGenerator;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.tileentity.TileEntity;

src/minecraft/fluidmech/client/model/ModelLiquidTank.java

@@ -6,8 +6,8 @@
 
 package fluidmech.client.model;
 
-import fluidmech.common.tileentity.TileEntityPipe;
+import fluidmech.common.machines.TileEntityTank;
-import fluidmech.common.tileentity.TileEntityTank;
+import fluidmech.common.machines.pipes.TileEntityPipe;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.tileentity.TileEntity;

src/minecraft/fluidmech/client/render/RenderGearRod.java

@@ -7,7 +7,7 @@ import org.lwjgl.opengl.GL11;
 
 import fluidmech.client.model.ModelGearRod;
 import fluidmech.common.FluidMech;
-import fluidmech.common.tileentity.TileEntityRod;
+import fluidmech.common.machines.mech.TileEntityRod;
 
 
 public class RenderGearRod extends TileEntitySpecialRenderer

src/minecraft/fluidmech/client/render/RenderPipe.java

@@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL11;
 
 import fluidmech.client.model.ModelLargePipe;
 import fluidmech.common.FluidMech;
-import fluidmech.common.tileentity.TileEntityPipe;
+import fluidmech.common.machines.pipes.TileEntityPipe;
 
 public class RenderPipe extends TileEntitySpecialRenderer
 {

src/minecraft/fluidmech/client/render/RenderPump.java

@@ -7,7 +7,7 @@ import org.lwjgl.opengl.GL11;
 
 import fluidmech.client.model.ModelPump;
 import fluidmech.common.FluidMech;
-import fluidmech.common.tileentity.TileEntityPump;
+import fluidmech.common.machines.TileEntityPump;
 
 public class RenderPump extends TileEntitySpecialRenderer
 {

src/minecraft/fluidmech/client/render/RenderReleaseValve.java

@@ -10,7 +10,7 @@ import org.lwjgl.opengl.GL11;
 import fluidmech.client.model.ModelLargePipe;
 import fluidmech.client.model.ModelReleaseValve;
 import fluidmech.common.FluidMech;
-import fluidmech.common.tileentity.TileEntityReleaseValve;
+import fluidmech.common.machines.TileEntityReleaseValve;
 
 public class RenderReleaseValve extends TileEntitySpecialRenderer
 {

src/minecraft/fluidmech/client/render/RenderSink.java

@@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL11;
 
 import fluidmech.client.model.ModelSink;
 import fluidmech.common.FluidMech;
-import fluidmech.common.tileentity.TileEntitySink;
+import fluidmech.common.machines.TileEntitySink;
 
 public class RenderSink extends TileEntitySpecialRenderer
 {

src/minecraft/fluidmech/client/render/RenderTank.java

@@ -12,7 +12,7 @@ import org.lwjgl.opengl.GL11;
 import fluidmech.client.model.ModelLiquidTank;
 import fluidmech.client.model.ModelLiquidTankCorner;
 import fluidmech.common.FluidMech;
-import fluidmech.common.tileentity.TileEntityTank;
+import fluidmech.common.machines.TileEntityTank;
 
 public class RenderTank extends TileEntitySpecialRenderer
 {

src/minecraft/fluidmech/common/FluidMech.java

@@ -32,14 +32,11 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.network.NetworkMod;
 import cpw.mods.fml.common.registry.GameRegistry;
-import fluidmech.common.block.BlockGenerator;
-import fluidmech.common.block.BlockPipe;
 import fluidmech.common.block.BlockPumpMachine;
 import fluidmech.common.block.BlockReleaseValve;
-import fluidmech.common.block.BlockRod;
 import fluidmech.common.block.BlockSink;
 import fluidmech.common.block.BlockTank;
-import fluidmech.common.block.BlockWasteLiquid;
+import fluidmech.common.block.liquids.BlockWasteLiquid;
 import fluidmech.common.item.ItemGuage;
 import fluidmech.common.item.ItemLiquidMachine;
 import fluidmech.common.item.ItemParts;
@@ -47,13 +44,16 @@ import fluidmech.common.item.ItemPipe;
 import fluidmech.common.item.ItemReleaseValve;
 import fluidmech.common.item.ItemTank;
 import fluidmech.common.item.ItemParts.Parts;
-import fluidmech.common.tileentity.TileEntityGenerator;
+import fluidmech.common.machines.TileEntityPump;
-import fluidmech.common.tileentity.TileEntityPipe;
+import fluidmech.common.machines.TileEntityReleaseValve;
-import fluidmech.common.tileentity.TileEntityPump;
+import fluidmech.common.machines.TileEntitySink;
-import fluidmech.common.tileentity.TileEntityReleaseValve;
+import fluidmech.common.machines.TileEntityTank;
-import fluidmech.common.tileentity.TileEntityRod;
+import fluidmech.common.machines.mech.BlockGenerator;
-import fluidmech.common.tileentity.TileEntitySink;
+import fluidmech.common.machines.mech.BlockRod;
-import fluidmech.common.tileentity.TileEntityTank;
+import fluidmech.common.machines.mech.TileEntityGenerator;
+import fluidmech.common.machines.mech.TileEntityRod;
+import fluidmech.common.machines.pipes.BlockPipe;
+import fluidmech.common.machines.pipes.TileEntityPipe;
 
 /**
  * Used in the creation of a new mod class

src/minecraft/fluidmech/common/block/BlockPumpMachine.java

@@ -7,7 +7,7 @@ import java.util.List;
 import fluidmech.client.render.BlockRenderHelper;
 import fluidmech.common.FluidMech;
 import fluidmech.common.TabFluidMech;
-import fluidmech.common.tileentity.TileEntityPump;
+import fluidmech.common.machines.TileEntityPump;
 
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;

src/minecraft/fluidmech/common/block/BlockReleaseValve.java

@@ -4,7 +4,7 @@ import java.util.Random;
 
 import fluidmech.common.FluidMech;
 import fluidmech.common.TabFluidMech;
-import fluidmech.common.tileentity.TileEntityReleaseValve;
+import fluidmech.common.machines.TileEntityReleaseValve;
 
 import net.minecraft.block.material.Material;
 import net.minecraft.item.ItemStack;

src/minecraft/fluidmech/common/block/BlockSink.java

@@ -4,7 +4,7 @@ import hydraulic.core.helpers.MetaGroup;
 import hydraulic.core.liquids.LiquidHandler;
 import fluidmech.client.render.BlockRenderHelper;
 import fluidmech.common.TabFluidMech;
-import fluidmech.common.tileentity.TileEntitySink;
+import fluidmech.common.machines.TileEntitySink;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.player.EntityPlayer;

src/minecraft/fluidmech/common/block/BlockTank.java

@@ -6,7 +6,7 @@ import java.util.List;
 
 import fluidmech.client.render.BlockRenderHelper;
 import fluidmech.common.TabFluidMech;
-import fluidmech.common.tileentity.TileEntityTank;
+import fluidmech.common.machines.TileEntityTank;
 
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;

src/minecraft/fluidmech/common/block/liquids/BlockWasteLiquid.java

@@ -1,4 +1,4 @@
-package fluidmech.common.block;
+package fluidmech.common.block.liquids;
 
 import net.minecraft.block.BlockFluid;
 import net.minecraft.block.material.Material;

src/minecraft/fluidmech/common/handlers/UpdateConverter.java

@@ -1,44 +0,0 @@
-package fluidmech.common.handlers;
-
-import hydraulic.core.implement.ColorCode;
-import hydraulic.core.liquids.LiquidHandler;
-import fluidmech.common.tileentity.TileEntityPipe;
-import fluidmech.common.tileentity.TileEntityTank;
-import net.minecraft.nbt.NBTTagCompound;
-
-/**
- * used to help convert older system to newer systems.
- */
-public class UpdateConverter
-{
-    public static void convert(TileEntityPipe pipe, NBTTagCompound nbt)
-    {
-        Boolean converted24 = nbt.getBoolean("converted");
-        Boolean converted25 = nbt.getBoolean("converted025");
-        if (!converted24)
-        {
-            pipe.setColor(ColorCode.get(LiquidHandler.getFromMeta(nbt.getInteger("type"))));
-        }
-        else if (converted24 && !converted25)
-        {
-            pipe.setColor(ColorCode.get(LiquidHandler.get(nbt.getString("name"))));
-        }
-        nbt.setBoolean("converted", true);
-        nbt.setBoolean("converted025", true);
-    }
-    public static void convert(TileEntityTank pipe, NBTTagCompound nbt)
-    {
-        Boolean converted24 = nbt.getBoolean("converted");
-        Boolean converted25 = nbt.getBoolean("converted025");
-        if (!converted24)
-        {
-            pipe.setColor(ColorCode.get(LiquidHandler.getFromMeta(nbt.getInteger("type"))));
-        }
-        else if (converted24 && !converted25)
-        {
-            pipe.setColor(ColorCode.get(LiquidHandler.get(nbt.getString("name"))));
-        }
-        nbt.setBoolean("converted", true);
-        nbt.setBoolean("converted025", true);
-    }
-}

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

@@ -1,4 +1,4 @@
-package fluidmech.common.tileentity;
+package fluidmech.common.machines;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;

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

@@ -1,4 +1,4 @@
-package fluidmech.common.tileentity;
+package fluidmech.common.machines;
 
 import hydraulic.core.helpers.MetaGroup;
 import hydraulic.core.implement.ColorCode;

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

@@ -1,4 +1,4 @@
-package fluidmech.common.tileentity;
+package fluidmech.common.machines;
 
 import hydraulic.core.helpers.connectionHelper;
 import hydraulic.core.implement.ColorCode;
@@ -12,6 +12,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import fluidmech.common.block.BlockReleaseValve;
+import fluidmech.common.machines.pipes.TileEntityPipe;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;

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

@@ -1,4 +1,4 @@
-package fluidmech.common.tileentity;
+package fluidmech.common.machines;
 
 import hydraulic.core.implement.ColorCode;
 import hydraulic.core.implement.IColorCoded;

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

@@ -1,5 +1,7 @@
-package fluidmech.common.tileentity;
+package fluidmech.common.machines;
 
+import fluidmech.common.FluidMech;
+import fluidmech.common.machines.pipes.TileEntityPipe;
 import hydraulic.core.helpers.connectionHelper;
 import hydraulic.core.implement.ColorCode;
 import hydraulic.core.implement.IColorCoded;
@@ -25,9 +27,6 @@ import universalelectricity.prefab.network.PacketManager;
 
 import com.google.common.io.ByteArrayDataInput;
 
-import fluidmech.common.FluidMech;
-import fluidmech.common.handlers.UpdateConverter;
-
 public class TileEntityTank extends TileEntity implements IPacketReceiver, IReadOut, IPsiCreator, ITankContainer, IColorCoded
 {
     public TileEntity[] cc = { null, null, null, null, null, null };
@@ -84,7 +83,6 @@ public class TileEntityTank extends TileEntity implements IPacketReceiver, IRead
     public void readFromNBT(NBTTagCompound nbt)
     {
         super.readFromNBT(nbt);
-        UpdateConverter.convert(this, nbt);
 
         LiquidStack liquid = new LiquidStack(0, 0, 0);
         liquid.readFromNBT(nbt.getCompoundTag("stored"));

src/minecraft/fluidmech/common/machines/mech/BlockGenerator.java

@@ -1,11 +1,10 @@
-package fluidmech.common.block;
+package fluidmech.common.machines.mech;
 
 import java.util.ArrayList;
 
 import fluidmech.client.render.BlockRenderHelper;
 import fluidmech.common.FluidMech;
 import fluidmech.common.TabFluidMech;
-import fluidmech.common.tileentity.TileEntityGenerator;
 
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.EntityLiving;

src/minecraft/fluidmech/common/machines/mech/BlockRod.java

@@ -1,9 +1,8 @@
-package fluidmech.common.block;
+package fluidmech.common.machines.mech;
 
 import fluidmech.client.render.BlockRenderHelper;
 import fluidmech.common.FluidMech;
 import fluidmech.common.TabFluidMech;
-import fluidmech.common.tileentity.TileEntityRod;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.player.EntityPlayer;

src/minecraft/fluidmech/common/machines/mech/TileEntityGenerator.java

@@ -1,4 +1,4 @@
-package fluidmech.common.tileentity;
+package fluidmech.common.machines.mech;
 
 import hydraulic.core.helpers.MetaGroup;
 import hydraulic.core.helpers.connectionHelper;
@@ -23,7 +23,6 @@ import com.google.common.io.ByteArrayDataInput;
 
 import fluidmech.api.mech.IForce;
 import fluidmech.common.FluidMech;
-import fluidmech.common.block.BlockGenerator;
 
 
 public class TileEntityGenerator extends TileEntityElectricityProducer implements IPacketReceiver, IForce, IReadOut, IRedstoneReceptor

src/minecraft/fluidmech/common/machines/mech/TileEntityRod.java

@@ -1,4 +1,4 @@
-package fluidmech.common.tileentity;
+package fluidmech.common.machines.mech;
 
 import hydraulic.core.implement.IReadOut;
 import net.minecraft.entity.player.EntityPlayer;

src/minecraft/fluidmech/common/machines/pipes/BlockPipe.java

@@ -1,10 +1,9 @@
-package fluidmech.common.block;
+package fluidmech.common.machines.pipes;
 
 import java.util.List;
 
 import fluidmech.common.FluidMech;
 import fluidmech.common.TabFluidMech;
-import fluidmech.common.tileentity.TileEntityPipe;
 
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;

src/minecraft/fluidmech/common/machines/pipes/TileEntityPipe.java

@@ -1,6 +1,6 @@
-package fluidmech.common.tileentity;
+package fluidmech.common.machines.pipes;
 
-import fluidmech.common.handlers.UpdateConverter;
+import fluidmech.common.machines.TileEntityTank;
 import hydraulic.core.helpers.connectionHelper;
 import hydraulic.core.implement.ColorCode;
 import hydraulic.core.implement.IColorCoded;
@@ -157,7 +157,6 @@ public class TileEntityPipe extends TileEntity implements ITankContainer, IReadO
     public void readFromNBT(NBTTagCompound nbt)
     {
         super.readFromNBT(nbt);
-        UpdateConverter.convert(this, nbt);
 
         LiquidStack liquid = new LiquidStack(0, 0, 0);
         liquid.readFromNBT(nbt.getCompoundTag("stored"));

src/minecraft/fluidmech/common/tileentity/ContainerReleaseValve.java

@@ -1,51 +0,0 @@
-package fluidmech.common.tileentity;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-public class ContainerReleaseValve extends Container
-{
-    private TileEntityReleaseValve valve;
-    private int lastCookTime = 0;
-    private int lastBurnTime = 0;
-    private int lastItemBurnTime = 0;
-
-    public ContainerReleaseValve(InventoryPlayer par1InventoryPlayer, TileEntityReleaseValve par2TileEntityFurnace)
-    {
-        this.valve = par2TileEntityFurnace;
-        int var3;
-
-        for (var3 = 0; var3 < 3; ++var3)
-        {
-            for (int var4 = 0; var4 < 9; ++var4)
-            {
-                this.addSlotToContainer(new Slot(par1InventoryPlayer, var4 + var3 * 9 + 9, 8 + var4 * 18, 84 + var3 * 18));
-            }
-        }
-
-        for (var3 = 0; var3 < 9; ++var3)
-        {
-            this.addSlotToContainer(new Slot(par1InventoryPlayer, var3, 8 + var3 * 18, 142));
-        }
-    }
-
-    
-
-    public boolean canInteractWith(EntityPlayer par1EntityPlayer)
-    {
-        return this.valve.isUseableByPlayer(par1EntityPlayer);
-    }
-
-    /**
-     * Called when a player shift-clicks on a slot. You must override this or you will crash when someone does that.
-     */
-    public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2)
-    {
-        ItemStack var3 = null;
-        Slot var4 = (Slot)this.inventorySlots.get(par2);        
-        return var3;
-    }
-}