From 9fae6dc2f180e7ebf5e62b7e225fff5c284436ae Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Tue, 16 Sep 2014 14:05:31 +0800 Subject: [PATCH] Fixed right click on color / redstone buttons. --- src/main/java/crazypants/enderio/fluid/BlockFluidEio.java | 3 +-- src/main/java/crazypants/enderio/gui/ColorButton.java | 3 ++- src/main/java/crazypants/enderio/gui/RedstoneModeButton.java | 1 + src/main/java/crazypants/gui/GuiContainerBase.java | 5 ++++- src/main/java/crazypants/gui/GuiScreenBase.java | 5 +++++ src/main/java/crazypants/gui/IGuiScreen.java | 2 ++ 6 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java b/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java index d4ffa5f2..20d373b7 100644 --- a/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java +++ b/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java @@ -88,8 +88,7 @@ public class BlockFluidEio extends BlockFluidClassic { } else if(this == EnderIO.blockNutrientDistillation && entity instanceof EntityPlayerMP) { long time = entity.worldObj.getTotalWorldTime(); EntityPlayerMP player = (EntityPlayerMP) entity; - if(time % Config.nutrientFoodBoostDelay == 0 && player.getEntityData().getLong("eioLastFoodBoost") != time) - { + if(time % Config.nutrientFoodBoostDelay == 0 && player.getEntityData().getLong("eioLastFoodBoost") != time) { int food = player.getFoodStats().getFoodLevel(); float sat = player.getFoodStats().getSaturationLevel(); player.getFoodStats().setFoodLevel(food + 1); diff --git a/src/main/java/crazypants/enderio/gui/ColorButton.java b/src/main/java/crazypants/enderio/gui/ColorButton.java index cf62007b..33ae755b 100644 --- a/src/main/java/crazypants/enderio/gui/ColorButton.java +++ b/src/main/java/crazypants/enderio/gui/ColorButton.java @@ -59,7 +59,7 @@ public class ColorButton extends IconButtonEIO { if(colorIndex < 0) { colorIndex = ItemDye.field_150923_a.length - 1; } - setColorIndex(colorIndex); + setColorIndex(colorIndex); } public int getColorIndex() { @@ -85,6 +85,7 @@ public class ColorButton extends IconButtonEIO { if(r.contains(mouseX, mouseY)) { if(rightMouseDown && Mouse.getEventButton() == 1 && !Mouse.getEventButtonState()) { prevColor(); + gui.doActionPerformed(this); } rightMouseDown = Mouse.getEventButton() == 1 && Mouse.getEventButtonState(); } else { diff --git a/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java b/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java index b36f3d76..b5646da4 100644 --- a/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java +++ b/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java @@ -93,6 +93,7 @@ public class RedstoneModeButton extends IconButtonEIO { if(r.contains(mouseX, mouseY)) { if(rightMouseDown && Mouse.getEventButton() == 1 && !Mouse.getEventButtonState()) { prevMode(); + gui.doActionPerformed(this); } rightMouseDown = Mouse.getEventButton() == 1 && Mouse.getEventButtonState(); } else { diff --git a/src/main/java/crazypants/gui/GuiContainerBase.java b/src/main/java/crazypants/gui/GuiContainerBase.java index 96114953..31ec3281 100644 --- a/src/main/java/crazypants/gui/GuiContainerBase.java +++ b/src/main/java/crazypants/gui/GuiContainerBase.java @@ -271,6 +271,9 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe return 0; } - + @Override + public void doActionPerformed(GuiButton guiButton) { + actionPerformed(guiButton); + } } diff --git a/src/main/java/crazypants/gui/GuiScreenBase.java b/src/main/java/crazypants/gui/GuiScreenBase.java index 64908aef..941fa352 100644 --- a/src/main/java/crazypants/gui/GuiScreenBase.java +++ b/src/main/java/crazypants/gui/GuiScreenBase.java @@ -221,5 +221,10 @@ public abstract class GuiScreenBase extends GuiScreen implements ToolTipRenderer public void removeButton(GuiButton button) { buttonList.remove(button); } + + @Override + public void doActionPerformed(GuiButton guiButton) { + actionPerformed(guiButton); + } } diff --git a/src/main/java/crazypants/gui/IGuiScreen.java b/src/main/java/crazypants/gui/IGuiScreen.java index f5fc830e..ad7f01fa 100644 --- a/src/main/java/crazypants/gui/IGuiScreen.java +++ b/src/main/java/crazypants/gui/IGuiScreen.java @@ -21,6 +21,8 @@ public interface IGuiScreen { void removeButton(GuiButton button); int getOverlayOffsetX(); + + void doActionPerformed(GuiButton but); }