miror corrections
Nothing major but every little bug needs fixed too.
This commit is contained in:
parent
2273dc425e
commit
f1b03a167c
9 changed files with 13 additions and 13 deletions
|
@ -25,13 +25,13 @@ public class RenderPump extends TileEntitySpecialRenderer
|
||||||
int meta = te.worldObj.getBlockMetadata(te.xCoord, te.yCoord, te.zCoord);
|
int meta = te.worldObj.getBlockMetadata(te.xCoord, te.yCoord, te.zCoord);
|
||||||
switch (te.color.ordinal())
|
switch (te.color.ordinal())
|
||||||
{
|
{
|
||||||
case 1:
|
case 4:
|
||||||
bindTextureByName(LiquidMechanics.RESOURCE_PATH + "pumps/WaterPump.png");
|
bindTextureByName(LiquidMechanics.RESOURCE_PATH + "pumps/WaterPump.png");
|
||||||
break;// water
|
break;// water
|
||||||
case 2:
|
case 1:
|
||||||
bindTextureByName(LiquidMechanics.RESOURCE_PATH + "pumps/LavaPump.png");
|
bindTextureByName(LiquidMechanics.RESOURCE_PATH + "pumps/LavaPump.png");
|
||||||
break;// lava
|
break;// lava
|
||||||
case 3:
|
case 0:
|
||||||
bindTextureByName(LiquidMechanics.RESOURCE_PATH + "pumps/OilPump.png");
|
bindTextureByName(LiquidMechanics.RESOURCE_PATH + "pumps/OilPump.png");
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -133,6 +133,9 @@ public class RenderTank extends TileEntitySpecialRenderer
|
||||||
case 4:
|
case 4:
|
||||||
type = "Water";
|
type = "Water";
|
||||||
break;
|
break;
|
||||||
|
case 13:
|
||||||
|
type = "Milk";
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
type = "";
|
type = "";
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -60,7 +60,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
|
||||||
public class LiquidMechanics extends DummyModContainer
|
public class LiquidMechanics extends DummyModContainer
|
||||||
{
|
{
|
||||||
// TODO Change in Version Release
|
// TODO Change in Version Release
|
||||||
public static final String VERSION = "0.2.6";
|
public static final String VERSION = "0.2.5";
|
||||||
|
|
||||||
// Constants
|
// Constants
|
||||||
public static final String NAME = "Liquid Mechanics";
|
public static final String NAME = "Liquid Mechanics";
|
||||||
|
|
|
@ -22,7 +22,7 @@ public class BlockGenerator extends universalelectricity.prefab.BlockMachine
|
||||||
|
|
||||||
public BlockGenerator(int id)
|
public BlockGenerator(int id)
|
||||||
{
|
{
|
||||||
super("Generator", id, Material.iron);
|
super("lmGen", id, Material.iron);
|
||||||
this.setCreativeTab(TabLiquidMechanics.INSTANCE);
|
this.setCreativeTab(TabLiquidMechanics.INSTANCE);
|
||||||
this.setHardness(1f);
|
this.setHardness(1f);
|
||||||
this.setResistance(5f);
|
this.setResistance(5f);
|
||||||
|
|
|
@ -223,12 +223,9 @@ public class TileEntityPump extends TileEntityElectricityReceiver implements IPa
|
||||||
public boolean canPump(int x, int y, int z)
|
public boolean canPump(int x, int y, int z)
|
||||||
{
|
{
|
||||||
// if (this.tank.getLiquid() == null) return false;
|
// if (this.tank.getLiquid() == null) return false;
|
||||||
if (this.tank.getLiquid() != null && this.tank.getLiquid().amount >= this.wMax)
|
if (this.tank.getLiquid() != null && this.tank.getLiquid().amount >= this.wMax) { return false; }
|
||||||
return false;
|
if (this.isDisabled()) { return false; }
|
||||||
if (this.isDisabled())
|
if ((LiquidHandler.getFromBlockID(worldObj.getBlockId(x, y, z)) == null || LiquidHandler.getFromBlockID(worldObj.getBlockId(x, y, z)) == LiquidHandler.unkown)) { return false; }
|
||||||
return false;
|
|
||||||
if ((LiquidHandler.getFromBlockID(worldObj.getBlockId(x, y, z)) == null || LiquidHandler.getFromBlockID(worldObj.getBlockId(x, y, z)) == LiquidHandler.unkown))
|
|
||||||
return false;
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -62,7 +62,7 @@ public class TileEntityReleaseValve extends TileEntity implements IPressure, IRe
|
||||||
connected[i] = null;
|
connected[i] = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!this.worldObj.isRemote && ticks++ >= 40)
|
if (!this.worldObj.isRemote && ticks++ >= 20)
|
||||||
{
|
{
|
||||||
ticks = 0;
|
ticks = 0;
|
||||||
BlockReleaseValve.checkForPower(worldObj, xCoord, yCoord, zCoord);
|
BlockReleaseValve.checkForPower(worldObj, xCoord, yCoord, zCoord);
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# @author DarkGuardsman
|
# @author DarkGuardsman
|
||||||
|
|
||||||
# Blocks
|
# Blocks
|
||||||
tile.Generator.name=Generator
|
tile.lmGen.name=Generator
|
||||||
tile.lmMachines.0.name=Pump
|
tile.lmMachines.0.name=Pump
|
||||||
tile.MechanicRod.name=Geared Rod
|
tile.MechanicRod.name=Geared Rod
|
||||||
tile.eValve.0.name=Release Valve
|
tile.eValve.0.name=Release Valve
|
||||||
|
|
BIN
minecraft/liquidmechanics/resource/tanks/CornerMilk.png
Normal file
BIN
minecraft/liquidmechanics/resource/tanks/CornerMilk.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 4 KiB |
Binary file not shown.
Before Width: | Height: | Size: 960 B After Width: | Height: | Size: 942 B |
Loading…
Reference in a new issue