From 26af793479081f4125c3b7391a61a9614479cef9 Mon Sep 17 00:00:00 2001 From: Rseifert Date: Fri, 29 Mar 2013 15:11:11 -0400 Subject: [PATCH] Cleanup on tank fixed model rendering north and south connector wrong fixed water gauge not rendering with a texture changed read out string for the tank to use a formatted string --- src/minecraft/fluidmech/client/model/ModelLiquidTank.java | 4 ++-- src/minecraft/fluidmech/client/render/RenderTank.java | 4 ++-- src/minecraft/fluidmech/common/machines/TileEntityTank.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/minecraft/fluidmech/client/model/ModelLiquidTank.java b/src/minecraft/fluidmech/client/model/ModelLiquidTank.java index 6f988b5a..4749a5a2 100644 --- a/src/minecraft/fluidmech/client/model/ModelLiquidTank.java +++ b/src/minecraft/fluidmech/client/model/ModelLiquidTank.java @@ -365,7 +365,7 @@ public class ModelLiquidTank extends ModelBase // Front if (conenctedTiles[2] instanceof TileEntityPipe) { - CCFront.render(f5); + CCBack.render(f5); } else { @@ -379,7 +379,7 @@ public class ModelLiquidTank extends ModelBase // back if (conenctedTiles[3] instanceof TileEntityPipe) { - CCBack.render(f5); + CCFront.render(f5); } else { diff --git a/src/minecraft/fluidmech/client/render/RenderTank.java b/src/minecraft/fluidmech/client/render/RenderTank.java index ca8c4a32..a5f86dad 100644 --- a/src/minecraft/fluidmech/client/render/RenderTank.java +++ b/src/minecraft/fluidmech/client/render/RenderTank.java @@ -110,8 +110,8 @@ public class RenderTank extends TileEntitySpecialRenderer case RED: type = "Lava"; break; - case BLUE: - type = "Water"; + case YELLOW: + type = "Fuel"; break; default: type = ""; diff --git a/src/minecraft/fluidmech/common/machines/TileEntityTank.java b/src/minecraft/fluidmech/common/machines/TileEntityTank.java index 6cb662da..ea9c7462 100644 --- a/src/minecraft/fluidmech/common/machines/TileEntityTank.java +++ b/src/minecraft/fluidmech/common/machines/TileEntityTank.java @@ -104,7 +104,7 @@ public class TileEntityTank extends TileEntityAdvanced implements IPacketReceive { return "Empty"; } - return (tank.getLiquid().amount / LiquidContainerRegistry.BUCKET_VOLUME) + "/" + (tank.getCapacity() / LiquidContainerRegistry.BUCKET_VOLUME) + " " + LiquidHandler.get(tank.getLiquid()).getName(); + return String.format("%d/%d %S Stored", tank.getLiquid().amount / LiquidContainerRegistry.BUCKET_VOLUME, tank.getCapacity() / LiquidContainerRegistry.BUCKET_VOLUME, LiquidHandler.get(tank.getLiquid()).getName()); } @Override