tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

A few fixes, new textures

Browse source
This commit is contained in:
Aidan Brady 2014-01-16 16:31:05 -05:00
parent 3e6a017979
commit 4d29a57a27
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/mekanism/common/tile/TileEntitySalinationController.java
View file

@ -26,7 +26,7 @@ import com.google.common.io.ByteArrayDataInput;
public class TileEntitySalinationController extends TileEntitySalinationTank implements IConfigurable public class TileEntitySalinationController extends TileEntitySalinationTank implements IConfigurable
{ {
public static final int MAX_BRINE = 1000; public static final int MAX_BRINE = 10000;
public static final int MAX_SOLARS = 4; public static final int MAX_SOLARS = 4;
public static final int WARMUP = 10000; public static final int WARMUP = 10000;
@ -583,12 +583,12 @@ public class TileEntitySalinationController extends TileEntitySalinationTank imp
public int getScaledWaterLevel(int i) public int getScaledWaterLevel(int i)
{ {
return waterTank.getFluid() != null ? waterTank.getFluid().amount*i / 10000 : 0; return waterTank.getFluid() != null ? waterTank.getFluid().amount*i / getMaxWater() : 0;
} }
public int getScaledBrineLevel(int i) public int getScaledBrineLevel(int i)
{ {
return brineTank.getFluid() != null ? brineTank.getFluid().amount*i / 10000 : 0; return brineTank.getFluid() != null ? brineTank.getFluid().amount*i / MAX_BRINE : 0;
} }
public int getScaledTempLevel(int i) public int getScaledTempLevel(int i)

BIN
resources/assets/mekanism/textures/blocks/Chlorine.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
resources/assets/mekanism/textures/blocks/LiquidBrine.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 13 KiB