diff --git a/minecraft/liquidmechanics/client/render/RenderPump.java b/minecraft/liquidmechanics/client/render/RenderPump.java index 84bd0504..088d76c7 100644 --- a/minecraft/liquidmechanics/client/render/RenderPump.java +++ b/minecraft/liquidmechanics/client/render/RenderPump.java @@ -25,13 +25,13 @@ public class RenderPump extends TileEntitySpecialRenderer int meta = te.worldObj.getBlockMetadata(te.xCoord, te.yCoord, te.zCoord); switch (te.color.ordinal()) { - case 1: + case 4: bindTextureByName(LiquidMechanics.RESOURCE_PATH + "pumps/WaterPump.png"); break;// water - case 2: + case 1: bindTextureByName(LiquidMechanics.RESOURCE_PATH + "pumps/LavaPump.png"); break;// lava - case 3: + case 0: bindTextureByName(LiquidMechanics.RESOURCE_PATH + "pumps/OilPump.png"); break; default: diff --git a/minecraft/liquidmechanics/client/render/RenderTank.java b/minecraft/liquidmechanics/client/render/RenderTank.java index cd03b659..97785553 100644 --- a/minecraft/liquidmechanics/client/render/RenderTank.java +++ b/minecraft/liquidmechanics/client/render/RenderTank.java @@ -133,6 +133,9 @@ public class RenderTank extends TileEntitySpecialRenderer case 4: type = "Water"; break; + case 13: + type = "Milk"; + break; default: type = ""; break; diff --git a/minecraft/liquidmechanics/common/LiquidMechanics.java b/minecraft/liquidmechanics/common/LiquidMechanics.java index 3121d33f..a0a4d98c 100644 --- a/minecraft/liquidmechanics/common/LiquidMechanics.java +++ b/minecraft/liquidmechanics/common/LiquidMechanics.java @@ -60,7 +60,7 @@ import cpw.mods.fml.common.registry.GameRegistry; public class LiquidMechanics extends DummyModContainer { // TODO Change in Version Release - public static final String VERSION = "0.2.6"; + public static final String VERSION = "0.2.5"; // Constants public static final String NAME = "Liquid Mechanics"; diff --git a/minecraft/liquidmechanics/common/block/BlockGenerator.java b/minecraft/liquidmechanics/common/block/BlockGenerator.java index 371ac7cf..20486628 100644 --- a/minecraft/liquidmechanics/common/block/BlockGenerator.java +++ b/minecraft/liquidmechanics/common/block/BlockGenerator.java @@ -22,7 +22,7 @@ public class BlockGenerator extends universalelectricity.prefab.BlockMachine public BlockGenerator(int id) { - super("Generator", id, Material.iron); + super("lmGen", id, Material.iron); this.setCreativeTab(TabLiquidMechanics.INSTANCE); this.setHardness(1f); this.setResistance(5f); diff --git a/minecraft/liquidmechanics/common/tileentity/TileEntityPump.java b/minecraft/liquidmechanics/common/tileentity/TileEntityPump.java index 404a2218..96fa0a12 100644 --- a/minecraft/liquidmechanics/common/tileentity/TileEntityPump.java +++ b/minecraft/liquidmechanics/common/tileentity/TileEntityPump.java @@ -223,12 +223,9 @@ public class TileEntityPump extends TileEntityElectricityReceiver implements IPa public boolean canPump(int x, int y, int z) { // if (this.tank.getLiquid() == null) return false; - if (this.tank.getLiquid() != null && this.tank.getLiquid().amount >= this.wMax) - return false; - if (this.isDisabled()) - return false; - if ((LiquidHandler.getFromBlockID(worldObj.getBlockId(x, y, z)) == null || LiquidHandler.getFromBlockID(worldObj.getBlockId(x, y, z)) == LiquidHandler.unkown)) - return false; + if (this.tank.getLiquid() != null && this.tank.getLiquid().amount >= this.wMax) { return false; } + if (this.isDisabled()) { return false; } + if ((LiquidHandler.getFromBlockID(worldObj.getBlockId(x, y, z)) == null || LiquidHandler.getFromBlockID(worldObj.getBlockId(x, y, z)) == LiquidHandler.unkown)) { return false; } return true; } diff --git a/minecraft/liquidmechanics/common/tileentity/TileEntityReleaseValve.java b/minecraft/liquidmechanics/common/tileentity/TileEntityReleaseValve.java index 3b70795f..c1ce7d80 100644 --- a/minecraft/liquidmechanics/common/tileentity/TileEntityReleaseValve.java +++ b/minecraft/liquidmechanics/common/tileentity/TileEntityReleaseValve.java @@ -62,7 +62,7 @@ public class TileEntityReleaseValve extends TileEntity implements IPressure, IRe connected[i] = null; } } - if (!this.worldObj.isRemote && ticks++ >= 40) + if (!this.worldObj.isRemote && ticks++ >= 20) { ticks = 0; BlockReleaseValve.checkForPower(worldObj, xCoord, yCoord, zCoord); diff --git a/minecraft/liquidmechanics/resource/lang/en_US.properties b/minecraft/liquidmechanics/resource/lang/en_US.properties index 4a87cc2e..aa4bc6ec 100644 --- a/minecraft/liquidmechanics/resource/lang/en_US.properties +++ b/minecraft/liquidmechanics/resource/lang/en_US.properties @@ -2,7 +2,7 @@ # @author DarkGuardsman # Blocks -tile.Generator.name=Generator +tile.lmGen.name=Generator tile.lmMachines.0.name=Pump tile.MechanicRod.name=Geared Rod tile.eValve.0.name=Release Valve diff --git a/minecraft/liquidmechanics/resource/tanks/CornerMilk.png b/minecraft/liquidmechanics/resource/tanks/CornerMilk.png new file mode 100644 index 00000000..c8482e83 Binary files /dev/null and b/minecraft/liquidmechanics/resource/tanks/CornerMilk.png differ diff --git a/minecraft/liquidmechanics/resource/tanks/Tank.png b/minecraft/liquidmechanics/resource/tanks/Tank.png index 7a3b611b..c1e14696 100644 Binary files a/minecraft/liquidmechanics/resource/tanks/Tank.png and b/minecraft/liquidmechanics/resource/tanks/Tank.png differ