From f1b03a167c257ab407bb826c4bae4758ed684379 Mon Sep 17 00:00:00 2001 From: Rseifert Date: Tue, 15 Jan 2013 03:09:34 -0500 Subject: [PATCH] miror corrections Nothing major but every little bug needs fixed too. --- .../client/render/RenderPump.java | 6 +++--- .../client/render/RenderTank.java | 3 +++ .../liquidmechanics/common/LiquidMechanics.java | 2 +- .../common/block/BlockGenerator.java | 2 +- .../common/tileentity/TileEntityPump.java | 9 +++------ .../tileentity/TileEntityReleaseValve.java | 2 +- .../resource/lang/en_US.properties | 2 +- .../resource/tanks/CornerMilk.png | Bin 0 -> 4101 bytes .../liquidmechanics/resource/tanks/Tank.png | Bin 960 -> 942 bytes 9 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 minecraft/liquidmechanics/resource/tanks/CornerMilk.png 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 0000000000000000000000000000000000000000..c8482e8341822126bf13c05d90dcd9917d338700 GIT binary patch literal 4101 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