From e71a240fb6323f561c72eba0305ace0392f452ca Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 21 Jun 2015 12:29:54 -0400 Subject: [PATCH] Add fixes from latest EnderIO merge --- .../java/com/enderio/core/api/client/gui/IGuiScreen.java | 2 +- .../java/com/enderio/core/client/gui/GuiContainerBase.java | 4 ++-- src/main/java/com/enderio/core/client/gui/GuiScreenBase.java | 4 ++-- .../java/com/enderio/core/client/gui/ToolTipManager.java | 4 ++-- .../java/com/enderio/core/client/gui/button/IconButton.java | 5 +++-- src/main/java/com/enderio/core/common/util/FluidUtil.java | 3 ++- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/enderio/core/api/client/gui/IGuiScreen.java b/src/main/java/com/enderio/core/api/client/gui/IGuiScreen.java index 998a18c..c0e9458 100644 --- a/src/main/java/com/enderio/core/api/client/gui/IGuiScreen.java +++ b/src/main/java/com/enderio/core/api/client/gui/IGuiScreen.java @@ -11,7 +11,7 @@ public interface IGuiScreen { void addToolTip(GuiToolTip toolTip); - void removeToolTip(GuiToolTip toolTip); + boolean removeToolTip(GuiToolTip toolTip); int getGuiLeft(); diff --git a/src/main/java/com/enderio/core/client/gui/GuiContainerBase.java b/src/main/java/com/enderio/core/client/gui/GuiContainerBase.java index a623362..d58f0ca 100644 --- a/src/main/java/com/enderio/core/client/gui/GuiContainerBase.java +++ b/src/main/java/com/enderio/core/client/gui/GuiContainerBase.java @@ -461,8 +461,8 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe } @Override - public void removeToolTip(GuiToolTip toolTip) { - ttMan.removeToolTip(toolTip); + public boolean removeToolTip(GuiToolTip toolTip) { + return ttMan.removeToolTip(toolTip); } protected void drawForegroundImpl(int mouseX, int mouseY) { diff --git a/src/main/java/com/enderio/core/client/gui/GuiScreenBase.java b/src/main/java/com/enderio/core/client/gui/GuiScreenBase.java index 8ae3b1d..181e9a0 100644 --- a/src/main/java/com/enderio/core/client/gui/GuiScreenBase.java +++ b/src/main/java/com/enderio/core/client/gui/GuiScreenBase.java @@ -49,8 +49,8 @@ public abstract class GuiScreenBase extends GuiScreen implements ToolTipRenderer } @Override - public void removeToolTip(GuiToolTip toolTip) { - ttMan.removeToolTip(toolTip); + public boolean removeToolTip(GuiToolTip toolTip) { + return ttMan.removeToolTip(toolTip); } @Override diff --git a/src/main/java/com/enderio/core/client/gui/ToolTipManager.java b/src/main/java/com/enderio/core/client/gui/ToolTipManager.java index 64f942b..e12901d 100644 --- a/src/main/java/com/enderio/core/client/gui/ToolTipManager.java +++ b/src/main/java/com/enderio/core/client/gui/ToolTipManager.java @@ -30,8 +30,8 @@ public class ToolTipManager { } } - public void removeToolTip(GuiToolTip toolTip) { - toolTips.remove(toolTip); + public boolean removeToolTip(GuiToolTip toolTip) { + return toolTips.remove(toolTip); } protected final void drawTooltips(ToolTipRenderer renderer, int mouseX, int mouseY) { diff --git a/src/main/java/com/enderio/core/client/gui/button/IconButton.java b/src/main/java/com/enderio/core/client/gui/button/IconButton.java index d9b4d62..3357873 100644 --- a/src/main/java/com/enderio/core/client/gui/button/IconButton.java +++ b/src/main/java/com/enderio/core/client/gui/button/IconButton.java @@ -48,11 +48,12 @@ public class IconButton extends GuiButton { } protected void setToolTip(GuiToolTip newToolTip) { + boolean addTooltip = false; if (toolTip != null) { - gui.removeToolTip(toolTip); + addTooltip = gui.removeToolTip(toolTip); } toolTip = newToolTip; - if (toolTip != null) { + if (addTooltip && toolTip != null) { gui.addToolTip(toolTip); } } diff --git a/src/main/java/com/enderio/core/common/util/FluidUtil.java b/src/main/java/com/enderio/core/common/util/FluidUtil.java index 7548640..252e0d8 100644 --- a/src/main/java/com/enderio/core/common/util/FluidUtil.java +++ b/src/main/java/com/enderio/core/common/util/FluidUtil.java @@ -246,7 +246,8 @@ public class FluidUtil { if (source != null && source.getItem() != null) { if (source.getItem() instanceof IFluidContainerItem) { - IFluidTank targetTank = tank.getInputTank(((IFluidContainerItem) source.getItem()).getFluid(source)); + FluidStack fluid = ((IFluidContainerItem) source.getItem()).getFluid(source); + IFluidTank targetTank = fluid != null ? tank.getInputTank(fluid) : null; if (targetTank != null) { FluidStack target = targetTank.getFluid(); int maxDrain = targetTank.getCapacity() - (target != null ? target.amount : 0);