From 2518c32c54a48299e915678106fd1dcb8201afcf Mon Sep 17 00:00:00 2001 From: drcrazy Date: Wed, 28 Aug 2019 15:40:42 +0300 Subject: [PATCH] UpDown button refactoring --- src/main/java/techreborn/client/gui/GuiAESU.java | 10 +++++----- .../techreborn/client/gui/GuiChunkLoader.java | 13 ++++++++----- .../techreborn/client/gui/GuiFusionReactor.java | 15 +++++++++------ 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/main/java/techreborn/client/gui/GuiAESU.java b/src/main/java/techreborn/client/gui/GuiAESU.java index 15896c11d..3c1549d31 100644 --- a/src/main/java/techreborn/client/gui/GuiAESU.java +++ b/src/main/java/techreborn/client/gui/GuiAESU.java @@ -30,6 +30,7 @@ import net.minecraft.entity.player.PlayerEntity; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonUpDown; +import reborncore.client.gui.builder.widget.GuiButtonUpDown.UpDownButtonType; import reborncore.common.network.NetworkManager; import reborncore.common.powerSystem.PowerSystem; import techreborn.packets.ServerboundPackets; @@ -46,10 +47,10 @@ public class GuiAESU extends GuiBase { @Override public void init() { - addButton(new GuiButtonUpDown(left + 121, top + 79, this, b -> onClick(256))); - addButton(new GuiButtonUpDown(left + 121 + 12, top + 79, this, b -> onClick(64))); - addButton(new GuiButtonUpDown(left + 121 + 24, top + 79, this, b -> onClick(-64))); - addButton(new GuiButtonUpDown(left + 121 + 36, top + 79, this, b -> onClick(-256))); + addButton(new GuiButtonUpDown(left + 121, top + 79, this, b -> onClick(256), UpDownButtonType.FASTFORWARD)); + addButton(new GuiButtonUpDown(left + 121 + 12, top + 79, this, b -> onClick(64), UpDownButtonType.FORWARD)); + addButton(new GuiButtonUpDown(left + 121 + 24, top + 79, this, b -> onClick(-64), UpDownButtonType.REWIND)); + addButton(new GuiButtonUpDown(left + 121 + 36, top + 79, this, b -> onClick(-256), UpDownButtonType.FASTREWIND)); } @Override @@ -61,7 +62,6 @@ public class GuiAESU extends GuiBase { this.drawSlot(98, 45, layer); this.drawArmourSlots(8, 18, layer); this.builder.drawEnergyOutput(this, 155, 61, this.blockEntity.getCurrentOutput(), layer); - this.builder.drawUpDownButtons(this, 121, 79, layer); } @Override diff --git a/src/main/java/techreborn/client/gui/GuiChunkLoader.java b/src/main/java/techreborn/client/gui/GuiChunkLoader.java index 8c968dffd..41c0328b2 100644 --- a/src/main/java/techreborn/client/gui/GuiChunkLoader.java +++ b/src/main/java/techreborn/client/gui/GuiChunkLoader.java @@ -28,6 +28,7 @@ import net.minecraft.entity.player.PlayerEntity; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonUpDown; +import reborncore.client.gui.builder.widget.GuiButtonUpDown.UpDownButtonType; import reborncore.common.network.NetworkManager; import techreborn.blockentity.machine.tier3.ChunkLoaderBlockEntity; import techreborn.packets.ServerboundPackets; @@ -41,6 +42,13 @@ public class GuiChunkLoader extends GuiBase { this.blockEntity = blockEntity; } + public void init() { + addButton(new GuiButtonUpDown(left + 64, top + 40, this, b -> onClick(5), UpDownButtonType.FASTFORWARD)); + addButton(new GuiButtonUpDown(left + 64 + 12, top + 40, this, b -> onClick(1), UpDownButtonType.FORWARD)); + addButton(new GuiButtonUpDown(left + 64 + 24, top + 40, this, b -> onClick(-1), UpDownButtonType.REWIND)); + addButton(new GuiButtonUpDown(left + 64 + 36, top + 40, this, b -> onClick(-5), UpDownButtonType.FASTREWIND)); + } + @Override protected void drawBackground(float partialTicks, int mouseX, int mouseY) { super.drawBackground(partialTicks, mouseX, mouseY); @@ -48,7 +56,6 @@ public class GuiChunkLoader extends GuiBase { // Battery slot drawSlot(8, 72, layer); - builder.drawUpDownButtons(this, 64, 40, layer); if (GuiBase.slotConfigType != GuiBase.SlotConfigType.NONE) { return; } @@ -62,10 +69,6 @@ public class GuiChunkLoader extends GuiBase { final GuiBase.Layer layer = GuiBase.Layer.FOREGROUND; builder.drawMultiEnergyBar(this, 9, 19, (int) blockEntity.getEnergy(), (int) blockEntity.getMaxPower(), mouseX, mouseY, 0, layer); - addButton(new GuiButtonUpDown(left + 64, top + 40, this, b -> onClick(5))); - addButton(new GuiButtonUpDown(left + 64 + 12, top + 40, this, b -> onClick(1))); - addButton(new GuiButtonUpDown(left + 64 + 24, top + 40, this, b -> onClick(-1))); - addButton(new GuiButtonUpDown(left + 64 + 36, top + 40, this, b -> onClick(-5))); } public void onClick(int amount){ diff --git a/src/main/java/techreborn/client/gui/GuiFusionReactor.java b/src/main/java/techreborn/client/gui/GuiFusionReactor.java index 7dc6e8ceb..ab0597522 100644 --- a/src/main/java/techreborn/client/gui/GuiFusionReactor.java +++ b/src/main/java/techreborn/client/gui/GuiFusionReactor.java @@ -34,6 +34,7 @@ import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.gui.builder.widget.GuiButtonUpDown; +import reborncore.client.gui.builder.widget.GuiButtonUpDown.UpDownButtonType; import reborncore.client.gui.guibuilder.GuiBuilder; import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; @@ -56,6 +57,14 @@ public class GuiFusionReactor extends GuiBase { super(player, blockEntity, blockEntity.createContainer(syncID, player)); this.blockEntity = blockEntity; } + + @Override + public void init() { + addButton(new GuiButtonUpDown(left + 121, top + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(5), UpDownButtonType.FASTFORWARD)); + addButton(new GuiButtonUpDown(left + 121 + 12, top + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(1), UpDownButtonType.FORWARD)); + addButton(new GuiButtonUpDown(left + 121 + 24, top + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(-5), UpDownButtonType.REWIND)); + addButton(new GuiButtonUpDown(left + 121 + 36, top + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(-1), UpDownButtonType.FASTREWIND)); + } @Override protected void drawBackground(final float partialTicks, final int mouseX, final int mouseY) { @@ -101,15 +110,9 @@ public class GuiFusionReactor extends GuiBase { } } - builder.drawUpDownButtons(this, 121, 79, layer); drawString("Size: " + blockEntity.size, 83, 81, 0xFFFFFF, layer); drawString("" + blockEntity.getPowerMultiplier() + "x", 10, 81, 0xFFFFFF, layer); - addButton(new GuiButtonUpDown(left + 121, top + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(5))); - addButton(new GuiButtonUpDown(left + 121 + 12, top + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(1))); - addButton(new GuiButtonUpDown(left + 121 + 24, top + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(-5))); - addButton(new GuiButtonUpDown(left + 121 + 36, top + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(-1))); - builder.drawMultiEnergyBar(this, 9, 19, (int) this.blockEntity.getEnergy(), (int) this.blockEntity.getMaxPower(), mouseX, mouseY, 0, layer); }