From 9fabcc0a20070c92b0b923cfabb4784f89b3ca43 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Fri, 12 Sep 2014 15:34:25 +0200 Subject: [PATCH] Fix clicking fluids in the smeltery --- .../tconstruct/smeltery/gui/SmelteryGui.java | 31 +++++-------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java b/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java index 100478ab..b87cc7da 100644 --- a/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java +++ b/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java @@ -505,39 +505,24 @@ public class SmelteryGui extends NewContainerGui { super.mouseClicked(mouseX, mouseY, mouseButton); - int base = 0; int cornerX = (width - xSize) / 2 + 36; int cornerY = (height - ySize) / 2; int fluidToBeBroughtUp = -1; - for (FluidStack liquid : logic.moltenMetal) + int[] fluidHeights = calcLiquidHeights(); + int base = 0; + for(int i = 0; i < fluidHeights.length; i++) { - int basePos = 54; - int initialLiquidSize = 0; - int liquidSize = 0;// liquid.amount * 52 / liquidLayers; - if (logic.getCapacity() > 0) - { - int total = logic.getTotalLiquid(); - int liquidLayers = (total / 20000 + 1) * 20000; - if (liquidLayers > 0) - { - liquidSize = liquid.amount * 52 / liquidLayers; - if (liquidSize == 0) - liquidSize = 1; - base += liquidSize; - } - } + int leftX = cornerX + 54; + int topY = (cornerY + 68) - fluidHeights[i] - base; - int leftX = cornerX + basePos; - int topY = (cornerY + 68) - base; - int sizeX = 52; - int sizeY = liquidSize; - if (mouseX >= leftX && mouseX <= leftX + sizeX && mouseY >= topY && mouseY < topY + sizeY) + if (mouseX >= leftX && mouseX <= leftX + 52 && mouseY >= topY && mouseY < topY + fluidHeights[i]) { - fluidToBeBroughtUp = liquid.fluidID; + fluidToBeBroughtUp = logic.moltenMetal.get(i).fluidID; TConstruct.packetPipeline.sendToServer(new SmelteryPacket(logic.getWorldObj().provider.dimensionId, logic.xCoord, logic.yCoord, logic.zCoord, this.isShiftKeyDown(), fluidToBeBroughtUp)); } + base += fluidHeights[i]; } } }