diff --git a/src/minecraft/fluidmech/client/ClientProxy.java b/src/minecraft/fluidmech/client/ClientProxy.java index 48613b461..542938dbc 100644 --- a/src/minecraft/fluidmech/client/ClientProxy.java +++ b/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.tileentity.TileEntityPipe; -import fluidmech.common.tileentity.TileEntityPump; -import fluidmech.common.tileentity.TileEntityReleaseValve; -import fluidmech.common.tileentity.TileEntityRod; -import fluidmech.common.tileentity.TileEntitySink; -import fluidmech.common.tileentity.TileEntityTank; +import fluidmech.common.machines.TileEntityPump; +import fluidmech.common.machines.TileEntityReleaseValve; +import fluidmech.common.machines.TileEntitySink; +import fluidmech.common.machines.TileEntityTank; +import fluidmech.common.machines.mech.TileEntityGenerator; +import fluidmech.common.machines.mech.TileEntityRod; +import fluidmech.common.machines.pipes.TileEntityPipe; public class ClientProxy extends CommonProxy { diff --git a/src/minecraft/fluidmech/client/model/ModelGenerator.java b/src/minecraft/fluidmech/client/model/ModelGenerator.java index cbc1f0b62..2c6fd3040 100644 --- a/src/minecraft/fluidmech/client/model/ModelGenerator.java +++ b/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; diff --git a/src/minecraft/fluidmech/client/model/ModelLiquidTank.java b/src/minecraft/fluidmech/client/model/ModelLiquidTank.java index fa5aefc48..31635ddde 100644 --- a/src/minecraft/fluidmech/client/model/ModelLiquidTank.java +++ b/src/minecraft/fluidmech/client/model/ModelLiquidTank.java @@ -6,8 +6,8 @@ package fluidmech.client.model; -import fluidmech.common.tileentity.TileEntityPipe; -import fluidmech.common.tileentity.TileEntityTank; +import fluidmech.common.machines.TileEntityTank; +import fluidmech.common.machines.pipes.TileEntityPipe; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/src/minecraft/fluidmech/client/render/RenderGearRod.java b/src/minecraft/fluidmech/client/render/RenderGearRod.java index f91afaa06..6affc4ecf 100644 --- a/src/minecraft/fluidmech/client/render/RenderGearRod.java +++ b/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 diff --git a/src/minecraft/fluidmech/client/render/RenderPipe.java b/src/minecraft/fluidmech/client/render/RenderPipe.java index 7fc2890ff..a8a76e794 100644 --- a/src/minecraft/fluidmech/client/render/RenderPipe.java +++ b/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 { diff --git a/src/minecraft/fluidmech/client/render/RenderPump.java b/src/minecraft/fluidmech/client/render/RenderPump.java index c298939bc..8c4e7ad24 100644 --- a/src/minecraft/fluidmech/client/render/RenderPump.java +++ b/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 { diff --git a/src/minecraft/fluidmech/client/render/RenderReleaseValve.java b/src/minecraft/fluidmech/client/render/RenderReleaseValve.java index ce9ce6eb8..dcb6bf478 100644 --- a/src/minecraft/fluidmech/client/render/RenderReleaseValve.java +++ b/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 { diff --git a/src/minecraft/fluidmech/client/render/RenderSink.java b/src/minecraft/fluidmech/client/render/RenderSink.java index 6547e5c65..a2c753b27 100644 --- a/src/minecraft/fluidmech/client/render/RenderSink.java +++ b/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 { diff --git a/src/minecraft/fluidmech/client/render/RenderTank.java b/src/minecraft/fluidmech/client/render/RenderTank.java index 191cb5dcb..4c36069d5 100644 --- a/src/minecraft/fluidmech/client/render/RenderTank.java +++ b/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 { diff --git a/src/minecraft/fluidmech/common/FluidMech.java b/src/minecraft/fluidmech/common/FluidMech.java index 28bdff7ef..8b7d2a098 100644 --- a/src/minecraft/fluidmech/common/FluidMech.java +++ b/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.tileentity.TileEntityPipe; -import fluidmech.common.tileentity.TileEntityPump; -import fluidmech.common.tileentity.TileEntityReleaseValve; -import fluidmech.common.tileentity.TileEntityRod; -import fluidmech.common.tileentity.TileEntitySink; -import fluidmech.common.tileentity.TileEntityTank; +import fluidmech.common.machines.TileEntityPump; +import fluidmech.common.machines.TileEntityReleaseValve; +import fluidmech.common.machines.TileEntitySink; +import fluidmech.common.machines.TileEntityTank; +import fluidmech.common.machines.mech.BlockGenerator; +import fluidmech.common.machines.mech.BlockRod; +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 diff --git a/src/minecraft/fluidmech/common/block/BlockPumpMachine.java b/src/minecraft/fluidmech/common/block/BlockPumpMachine.java index 7540abaf0..32dca4ac2 100644 --- a/src/minecraft/fluidmech/common/block/BlockPumpMachine.java +++ b/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; diff --git a/src/minecraft/fluidmech/common/block/BlockReleaseValve.java b/src/minecraft/fluidmech/common/block/BlockReleaseValve.java index 89a1a0e25..1d9995b7b 100644 --- a/src/minecraft/fluidmech/common/block/BlockReleaseValve.java +++ b/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; diff --git a/src/minecraft/fluidmech/common/block/BlockSink.java b/src/minecraft/fluidmech/common/block/BlockSink.java index c8505a8c1..e92f9dc40 100644 --- a/src/minecraft/fluidmech/common/block/BlockSink.java +++ b/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; diff --git a/src/minecraft/fluidmech/common/block/BlockTank.java b/src/minecraft/fluidmech/common/block/BlockTank.java index 05cbe6453..b56fd017e 100644 --- a/src/minecraft/fluidmech/common/block/BlockTank.java +++ b/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; diff --git a/src/minecraft/fluidmech/common/block/BlockWasteLiquid.java b/src/minecraft/fluidmech/common/block/liquids/BlockWasteLiquid.java similarity index 94% rename from src/minecraft/fluidmech/common/block/BlockWasteLiquid.java rename to src/minecraft/fluidmech/common/block/liquids/BlockWasteLiquid.java index db52ed60f..806d2652e 100644 --- a/src/minecraft/fluidmech/common/block/BlockWasteLiquid.java +++ b/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; diff --git a/src/minecraft/fluidmech/common/handlers/UpdateConverter.java b/src/minecraft/fluidmech/common/handlers/UpdateConverter.java deleted file mode 100644 index e5b98f42a..000000000 --- a/src/minecraft/fluidmech/common/handlers/UpdateConverter.java +++ /dev/null @@ -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); - } -} diff --git a/src/minecraft/fluidmech/common/tileentity/TileEntityMachine.java b/src/minecraft/fluidmech/common/machines/TileEntityMachine.java similarity index 99% rename from src/minecraft/fluidmech/common/tileentity/TileEntityMachine.java rename to src/minecraft/fluidmech/common/machines/TileEntityMachine.java index 6c91600fd..6807cac6a 100644 --- a/src/minecraft/fluidmech/common/tileentity/TileEntityMachine.java +++ b/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; diff --git a/src/minecraft/fluidmech/common/tileentity/TileEntityPump.java b/src/minecraft/fluidmech/common/machines/TileEntityPump.java similarity index 99% rename from src/minecraft/fluidmech/common/tileentity/TileEntityPump.java rename to src/minecraft/fluidmech/common/machines/TileEntityPump.java index 3f0694262..a25cff2cd 100644 --- a/src/minecraft/fluidmech/common/tileentity/TileEntityPump.java +++ b/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; diff --git a/src/minecraft/fluidmech/common/tileentity/TileEntityReleaseValve.java b/src/minecraft/fluidmech/common/machines/TileEntityReleaseValve.java similarity index 99% rename from src/minecraft/fluidmech/common/tileentity/TileEntityReleaseValve.java rename to src/minecraft/fluidmech/common/machines/TileEntityReleaseValve.java index ee7d2e0df..dc00fe8d8 100644 --- a/src/minecraft/fluidmech/common/tileentity/TileEntityReleaseValve.java +++ b/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; diff --git a/src/minecraft/fluidmech/common/tileentity/TileEntitySink.java b/src/minecraft/fluidmech/common/machines/TileEntitySink.java similarity index 99% rename from src/minecraft/fluidmech/common/tileentity/TileEntitySink.java rename to src/minecraft/fluidmech/common/machines/TileEntitySink.java index 65866b210..58b0402af 100644 --- a/src/minecraft/fluidmech/common/tileentity/TileEntitySink.java +++ b/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; diff --git a/src/minecraft/fluidmech/common/tileentity/TileEntityTank.java b/src/minecraft/fluidmech/common/machines/TileEntityTank.java similarity index 98% rename from src/minecraft/fluidmech/common/tileentity/TileEntityTank.java rename to src/minecraft/fluidmech/common/machines/TileEntityTank.java index 5ff331d32..451cda6ca 100644 --- a/src/minecraft/fluidmech/common/tileentity/TileEntityTank.java +++ b/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")); diff --git a/src/minecraft/fluidmech/common/block/BlockGenerator.java b/src/minecraft/fluidmech/common/machines/mech/BlockGenerator.java similarity index 97% rename from src/minecraft/fluidmech/common/block/BlockGenerator.java rename to src/minecraft/fluidmech/common/machines/mech/BlockGenerator.java index 66c76def2..ac2328760 100644 --- a/src/minecraft/fluidmech/common/block/BlockGenerator.java +++ b/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; diff --git a/src/minecraft/fluidmech/common/block/BlockRod.java b/src/minecraft/fluidmech/common/machines/mech/BlockRod.java similarity index 97% rename from src/minecraft/fluidmech/common/block/BlockRod.java rename to src/minecraft/fluidmech/common/machines/mech/BlockRod.java index c30c5328d..6ed433176 100644 --- a/src/minecraft/fluidmech/common/block/BlockRod.java +++ b/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; diff --git a/src/minecraft/fluidmech/common/tileentity/TileEntityGenerator.java b/src/minecraft/fluidmech/common/machines/mech/TileEntityGenerator.java similarity index 98% rename from src/minecraft/fluidmech/common/tileentity/TileEntityGenerator.java rename to src/minecraft/fluidmech/common/machines/mech/TileEntityGenerator.java index 6b5430360..49623f40a 100644 --- a/src/minecraft/fluidmech/common/tileentity/TileEntityGenerator.java +++ b/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 diff --git a/src/minecraft/fluidmech/common/tileentity/TileEntityRod.java b/src/minecraft/fluidmech/common/machines/mech/TileEntityRod.java similarity index 98% rename from src/minecraft/fluidmech/common/tileentity/TileEntityRod.java rename to src/minecraft/fluidmech/common/machines/mech/TileEntityRod.java index 511f06c4a..41beb1920 100644 --- a/src/minecraft/fluidmech/common/tileentity/TileEntityRod.java +++ b/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; diff --git a/src/minecraft/fluidmech/common/block/BlockPipe.java b/src/minecraft/fluidmech/common/machines/pipes/BlockPipe.java similarity index 96% rename from src/minecraft/fluidmech/common/block/BlockPipe.java rename to src/minecraft/fluidmech/common/machines/pipes/BlockPipe.java index d11ed94be..7e12ab22b 100644 --- a/src/minecraft/fluidmech/common/block/BlockPipe.java +++ b/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; diff --git a/src/minecraft/fluidmech/common/tileentity/TileEntityPipe.java b/src/minecraft/fluidmech/common/machines/pipes/TileEntityPipe.java similarity index 98% rename from src/minecraft/fluidmech/common/tileentity/TileEntityPipe.java rename to src/minecraft/fluidmech/common/machines/pipes/TileEntityPipe.java index f306079cb..f866d43c4 100644 --- a/src/minecraft/fluidmech/common/tileentity/TileEntityPipe.java +++ b/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")); diff --git a/src/minecraft/fluidmech/common/tileentity/ContainerReleaseValve.java b/src/minecraft/fluidmech/common/tileentity/ContainerReleaseValve.java deleted file mode 100644 index 29fb3f2fa..000000000 --- a/src/minecraft/fluidmech/common/tileentity/ContainerReleaseValve.java +++ /dev/null @@ -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; - } -}