From 28c919ee09ec4e6f88773df1b5043d8f649bd00e Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Fri, 6 Feb 2015 23:18:30 +0100 Subject: [PATCH] allow shift click on side config button to reset all sides to default --- resources/assets/enderio/lang/en_US.lang | 2 + .../enderio/gui/ToggleButtonEIO.java | 15 +++--- .../crazypants/enderio/gui/TooltipAddera.java | 17 +++---- .../machine/AbstractMachineEntity.java | 10 ++++ .../enderio/machine/IIoConfigurable.java | 2 + .../enderio/machine/PacketIoMode.java | 23 +++++++-- .../enderio/machine/buffer/TileBuffer.java | 8 +++ .../enderio/machine/capbank/GuiCapBank.java | 37 +++----------- .../enderio/machine/capbank/TileCapBank.java | 17 +++++++ .../machine/gui/GuiButtonIoConfig.java | 51 +++++++++++++++++++ .../enderio/machine/gui/GuiMachineBase.java | 32 +++--------- .../machine/gui/GuiOverlayIoConfig.java | 10 +++- .../machine/power/TileCapacitorBank.java | 12 +++++ 13 files changed, 160 insertions(+), 76 deletions(-) create mode 100644 src/main/java/crazypants/enderio/machine/gui/GuiButtonIoConfig.java diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 1906d381..df40096c 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -722,6 +722,8 @@ enderio.gui.machine.button.retrievelevels=Retrieve 10 enderio.gui.machine.tooltip.retrievelevels=player XP levels enderio.gui.machine.button.retrieveall=Retrieve all enderio.gui.machine.ioMode.overlay.tooltip=Configure IO +enderio.gui.machine.ioMode.overlay.tooltip.visible.line1=Shift click to reset all sides +enderio.gui.machine.ioMode.overlay.tooltip.visible.line2=to their default setting enderio.gui.machine.ioMode.none=None enderio.gui.machine.ioMode.pull=Pull enderio.gui.machine.ioMode.push=Push diff --git a/src/main/java/crazypants/enderio/gui/ToggleButtonEIO.java b/src/main/java/crazypants/enderio/gui/ToggleButtonEIO.java index 097f2fbd..9b37fca7 100644 --- a/src/main/java/crazypants/enderio/gui/ToggleButtonEIO.java +++ b/src/main/java/crazypants/enderio/gui/ToggleButtonEIO.java @@ -6,8 +6,8 @@ import crazypants.gui.IGuiScreen; public class ToggleButtonEIO extends IconButtonEIO { private boolean selected; - private IconEIO unselectedIcon; - private IconEIO selectedIcon; + private final IconEIO unselectedIcon; + private final IconEIO selectedIcon; private String[] selectedTooltip; private String[] unselectedTooltip; @@ -52,12 +52,15 @@ public class ToggleButtonEIO extends IconButtonEIO { @Override public boolean mousePressed(Minecraft par1Minecraft, int par2, int par3) { - boolean result = super.mousePressed(par1Minecraft, par2, par3); - if(result) { - setSelected(!selected); + if(super.mousePressed(par1Minecraft, par2, par3)) { + return toggleSelected(); } - return result; + return false; + } + protected boolean toggleSelected() { + setSelected(!selected); + return true; } public void setSelectedToolTip(String... tt) { diff --git a/src/main/java/crazypants/enderio/gui/TooltipAddera.java b/src/main/java/crazypants/enderio/gui/TooltipAddera.java index cc8820b2..ede5a5a7 100644 --- a/src/main/java/crazypants/enderio/gui/TooltipAddera.java +++ b/src/main/java/crazypants/enderio/gui/TooltipAddera.java @@ -44,10 +44,10 @@ import crazypants.util.Lang; public class TooltipAddera { - public static TooltipAddera instance = new TooltipAddera(); + public static final TooltipAddera instance = new TooltipAddera(); //TODO: Need to decouple this stuff with a callback - private BallTipProvider btp = new BallTipProvider(); + private final BallTipProvider btp = new BallTipProvider(); static { MinecraftForge.EVENT_BUS.register(instance); @@ -96,11 +96,11 @@ public class TooltipAddera { IGrindingMultiplier gb = CrusherRecipeManager.getInstance().getGrindballFromStack(evt.itemStack); if(gb != null) { btp.ball = gb; - TooltipAddera.instance.addInformation(btp, evt.itemStack, evt.entityPlayer, evt.toolTip, false); + addInformation(btp, evt.itemStack, evt.entityPlayer, evt.toolTip, false); } if(Config.addRegisterdNameTooltip) { - UniqueIdentifier uid = null; + UniqueIdentifier uid; Block block = Block.getBlockFromItem(evt.itemStack.getItem()); if(block != null && block != Blocks.air) { uid = GameRegistry.findUniqueIdentifierFor(block); @@ -259,19 +259,18 @@ public class TooltipAddera { } public static void addDetailedTooltipFromResources(List list, String unlocalizedName) { - addTooltipFromResources(list, unlocalizedName, ".tooltip.detailed.line"); + addTooltipFromResources(list, unlocalizedName.concat(".tooltip.detailed.line")); } public static void addBasicTooltipFromResources(List list, String unlocalizedName) { - addTooltipFromResources(list, unlocalizedName, ".tooltip.basic.line"); + addTooltipFromResources(list, unlocalizedName.concat(".tooltip.basic.line")); } public static void addCommonTooltipFromResources(List list, String unlocalizedName) { - addTooltipFromResources(list, unlocalizedName, ".tooltip.common.line"); + addTooltipFromResources(list, unlocalizedName.concat(".tooltip.common.line")); } - public static void addTooltipFromResources(List list, String unlocalizedName, String tooltipTag) { - String keyBase = unlocalizedName + tooltipTag; + public static void addTooltipFromResources(List list, String keyBase) { boolean done = false; int line = 1; while (!done) { diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index 51fa28d7..42f14752 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -108,6 +108,16 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi updateBlock(); } + @Override + public void clearAllIoModes() { + if(faceModes != null) { + faceModes = null; + forceClientUpdate = true; + notifyNeighbours = true; + updateBlock(); + } + } + @Override public IoMode getIoMode(ForgeDirection face) { if(faceModes == null) { diff --git a/src/main/java/crazypants/enderio/machine/IIoConfigurable.java b/src/main/java/crazypants/enderio/machine/IIoConfigurable.java index f520c9bf..f18e8ad9 100644 --- a/src/main/java/crazypants/enderio/machine/IIoConfigurable.java +++ b/src/main/java/crazypants/enderio/machine/IIoConfigurable.java @@ -13,6 +13,8 @@ public interface IIoConfigurable { public IoMode getIoMode(ForgeDirection face) ; + public void clearAllIoModes(); + BlockCoord getLocation(); } diff --git a/src/main/java/crazypants/enderio/machine/PacketIoMode.java b/src/main/java/crazypants/enderio/machine/PacketIoMode.java index 0744018f..57cb0c2c 100644 --- a/src/main/java/crazypants/enderio/machine/PacketIoMode.java +++ b/src/main/java/crazypants/enderio/machine/PacketIoMode.java @@ -7,6 +7,7 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.util.BlockCoord; public class PacketIoMode implements IMessage, IMessageHandler { @@ -19,10 +20,20 @@ public class PacketIoMode implements IMessage, IMessageHandler coords = new ArrayList(); if(network != null && network.getMembers().size() < 200) { for (TileCapBank cb : network.getMembers()) { @@ -160,13 +155,6 @@ public class GuiCapBank extends GuiContainerBase { configOverlay = new GuiOverlayIoConfig(coords) { - - @Override - public void setVisible(boolean visible) { - super.setVisible(visible); - configB.setIcon(visible ? IconEIO.IO_CONFIG_DOWN : IconEIO.IO_CONFIG_UP); - } - @Override protected String getLabelForMode(IoMode mode) { if(mode == IoMode.PUSH) { @@ -176,19 +164,11 @@ public class GuiCapBank extends GuiContainerBase { } return super.getLabelForMode(mode); } - }; addOverlay(configOverlay); - } - - @Override - protected void actionPerformed(GuiButton b) { - super.actionPerformed(b); - if(b.id == CONFIG_ID) { - boolean vis = !configOverlay.isVisible(); - configOverlay.setVisible(vis); - } + y += 20; + configB = new GuiButtonIoConfig(this, CONFIG_ID, x, y, te, configOverlay); } @Override @@ -197,16 +177,13 @@ public class GuiCapBank extends GuiContainerBase { configB.onGuiInit(); - int x = guiLeft + xSize - rightMargin - GuiPoweredMachineBase.BUTTON_SIZE; - int y = guiTop + inputY; - FontRenderer fontRenderer = getFontRenderer(); inputRsButton.onGuiInit(); outputRsButton.onGuiInit(); - x = guiLeft + inputX; - y = guiTop + inputY; + int x = guiLeft + inputX; + int y = guiTop + inputY; maxInputTF = new GuiTextField(fontRenderer, x, y, 68, 16); maxInputTF.setCanLoseFocus(true); maxInputTF.setMaxStringLength(10); diff --git a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java index a05c5dbd..25a19265 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java @@ -300,6 +300,23 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerHandler, } } + @Override + public void clearAllIoModes() { + if(network != null) { + for(TileCapBank cb : network.getMembers()) { + cb.doClearAllIoModes(); + } + } else { + doClearAllIoModes(); + } + } + + private void doClearAllIoModes() { + for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + setDefaultIoMode(dir); + } + } + @Override public IoMode getIoMode(ForgeDirection face) { if(faceModes == null) { diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiButtonIoConfig.java b/src/main/java/crazypants/enderio/machine/gui/GuiButtonIoConfig.java new file mode 100644 index 00000000..2c2d1242 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/gui/GuiButtonIoConfig.java @@ -0,0 +1,51 @@ +package crazypants.enderio.machine.gui; + +import crazypants.enderio.gui.IconEIO; +import crazypants.enderio.gui.ToggleButtonEIO; +import crazypants.enderio.gui.TooltipAddera; +import crazypants.enderio.machine.IIoConfigurable; +import crazypants.enderio.machine.PacketIoMode; +import crazypants.enderio.network.PacketHandler; +import crazypants.gui.IGuiScreen; +import crazypants.util.Lang; +import java.util.ArrayList; +import org.lwjgl.input.Keyboard; + +public class GuiButtonIoConfig extends ToggleButtonEIO { + + private final IIoConfigurable config; + private final GuiOverlayIoConfig configOverlay; + + @SuppressWarnings("LeakingThisInConstructor") + public GuiButtonIoConfig(IGuiScreen gui, int id, int x, int y, IIoConfigurable config, GuiOverlayIoConfig configOverlay) { + super(gui, id, x, y, IconEIO.IO_CONFIG_UP, IconEIO.IO_CONFIG_DOWN); + this.config = config; + this.configOverlay = configOverlay; + this.configOverlay.setConfigB(this); + + String configTooltip = Lang.localize("gui.machine.ioMode.overlay.tooltip"); + setUnselectedToolTip(configTooltip); + + ArrayList list = new ArrayList(); + list.add(configTooltip); + TooltipAddera.addTooltipFromResources(list, "enderio.gui.machine.ioMode.overlay.tooltip.visible.line"); + if(list.size() > 1) { + setSelectedToolTip(list.toArray(new String[list.size()])); + } + } + + @Override + protected boolean toggleSelected() { + if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { + if(!configOverlay.isVisible()) { + return false; + } + config.clearAllIoModes(); + PacketHandler.INSTANCE.sendToServer(new PacketIoMode(config)); + } else { + boolean vis = !configOverlay.isVisible(); + configOverlay.setVisible(vis); + } + return true; + } +} diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java b/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java index d957be46..0dd43b59 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java @@ -16,7 +16,6 @@ import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.IoConfigRenderer.SelectedFace; import crazypants.enderio.gui.RedstoneModeButton; -import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.SlotDefinition; @@ -42,7 +41,7 @@ public abstract class GuiMachineBase extends Gu private final GuiOverlayIoConfig configOverlay; - protected ToggleButtonEIO configB; + protected final GuiButtonIoConfig configB; protected IconButtonEIO recipeButton; @@ -59,37 +58,18 @@ public abstract class GuiMachineBase extends Gu int y = 5; redstoneButton = new RedstoneModeButton(this, -1, x, y, tileEntity, new BlockCoord(tileEntity)); - y += 19; - configB = new ToggleButtonEIO(this, CONFIG_ID, x, y, IconEIO.IO_CONFIG_UP, IconEIO.IO_CONFIG_DOWN); - configB.setToolTip(Lang.localize("gui.machine.ioMode.overlay.tooltip")); - - configOverlay = new GuiOverlayIoConfig(machine) { - - @Override - public void setVisible(boolean visible) { - super.setVisible(visible); - configB.setSelected(visible); - } - - }; + configOverlay = new GuiOverlayIoConfig(machine); addOverlay(configOverlay); - + + y += 19; + configB = new GuiButtonIoConfig(this, CONFIG_ID, x, y, machine, configOverlay); + y += 19; - recipeButton = new IconButtonEIO(this, RECIPE_ID, x, y, IconEIO.RECIPE); recipeButton.visible = false; recipeButton.setIconMargin(3, 3); } - @Override - protected void actionPerformed(GuiButton b) { - super.actionPerformed(b); - if(b.id == CONFIG_ID) { - boolean vis = !configOverlay.isVisible(); - configOverlay.setVisible(vis); - } - } - @Override public void initGui() { super.initGui(); diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java b/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java index 7d26b3c2..a53c8e2e 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java @@ -11,6 +11,7 @@ import net.minecraft.client.gui.ScaledResolution; import crazypants.enderio.gui.IGuiOverlay; import crazypants.enderio.gui.IoConfigRenderer; import crazypants.enderio.gui.IoConfigRenderer.SelectedFace; +import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.machine.IIoConfigurable; import crazypants.enderio.machine.IoMode; import crazypants.gui.IGuiScreen; @@ -21,6 +22,7 @@ import crazypants.util.BlockCoord; public class GuiOverlayIoConfig implements IGuiOverlay { private boolean visible = false; + private ToggleButtonEIO configB; private IGuiScreen screen; @@ -39,6 +41,10 @@ public class GuiOverlayIoConfig implements IGuiOverlay { coords.addAll(bc); } + public void setConfigB(ToggleButtonEIO configB) { + this.configB = configB; + } + @Override public void init(IGuiScreen screen) { this.screen = screen; @@ -98,7 +104,9 @@ public class GuiOverlayIoConfig implements IGuiOverlay { @Override public void setVisible(boolean visible) { this.visible = visible; - + if(configB != null) { + configB.setSelected(visible); + } } @Override diff --git a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java index d661d7f1..84e9fdbd 100644 --- a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java @@ -143,6 +143,18 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerHa setIoMode(faceHit, mode, true); } + @Override + public void clearAllIoModes() { + if(faceModes != null) { + faceModes = null; + receptorsDirty = true; + getController().masterReceptorsDirty = true; + notifyNeighbours = true; + render = true; + updateBlock(); + } + } + public void setIoMode(ForgeDirection faceHit, IoMode mode, boolean updateReceptors) { if(mode == IoMode.NONE && faceModes == null) { return;