From 25866b39f9eed12cbf1dcf87d710d317f3eb3aa2 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 26 Mar 2016 13:28:48 -0400 Subject: [PATCH] Fixed fluid scaling issue --- src/main/java/mekanism/client/gui/GuiDynamicTank.java | 2 +- .../java/mekanism/common/multiblock/UpdateProtocol.java | 4 ++-- .../mekanism/common/tile/TileEntityBoilerCasing.java | 6 +++--- .../java/mekanism/common/tile/TileEntityDynamicTank.java | 9 ++++----- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiDynamicTank.java b/src/main/java/mekanism/client/gui/GuiDynamicTank.java index df836864a..46c5b07b8 100644 --- a/src/main/java/mekanism/client/gui/GuiDynamicTank.java +++ b/src/main/java/mekanism/client/gui/GuiDynamicTank.java @@ -62,7 +62,7 @@ public class GuiDynamicTank extends GuiMekanism int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); - + if(tileEntity.getScaledFluidLevel(58) > 0) { displayGauge(7, 14, tileEntity.getScaledFluidLevel(58), tileEntity.structure.fluidStored, 0); diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index f33d6fb9f..4c95d0e5c 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -182,7 +182,7 @@ public abstract class UpdateProtocol> volume += locations.size(); - if(volume >= 27 && volume <= 5832 && locations.size() >= 26) + if(Math.abs(xmax-xmin)+1 <= 18 && Math.abs(xmax-xmin)+1 <= 18 && Math.abs(zmax-zmin)+1 <= 18) { if(rightBlocks && rightFrame && isHollow && isCorner) { @@ -191,7 +191,7 @@ public abstract class UpdateProtocol> structure.volLength = Math.abs(xmax-xmin)+1; structure.volHeight = Math.abs(ymax-ymin)+1; structure.volWidth = Math.abs(zmax-zmin)+1; - structure.volume = volume; + structure.volume = structure.volLength*structure.volHeight*structure.volWidth; structure.renderLocation = Coord4D.get(tile).translate(0, 1, 0); structure.minLocation = Coord4D.get(tile).translate(xmin, ymin, zmin); structure.maxLocation = Coord4D.get(tile).translate(xmax, ymax, zmax); diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index a6b73f751..232b16796 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -156,14 +156,14 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock 0.01) { prevScale = (9*prevScale + targetScale)/10; @@ -116,7 +115,7 @@ public class TileEntityDynamicTank extends TileEntityMultiblock