From c88415241f58a9568e243ab11aeb2582c625d1f2 Mon Sep 17 00:00:00 2001 From: Discreater Date: Tue, 20 Jul 2021 13:21:13 +0800 Subject: [PATCH] chore: cherry pick 1.16 updates --- .../jecalculation/data/label/ILabel.java | 6 +- .../me/towdium/jecalculation/gui/JecaGui.java | 9 ++- .../towdium/jecalculation/gui/guis/Gui.java | 46 +++++++++++ .../jecalculation/gui/guis/GuiCraft.java | 16 +++- .../jecalculation/gui/guis/GuiImport.java | 2 +- .../jecalculation/gui/guis/GuiLabel.java | 37 +++++---- .../jecalculation/gui/guis/GuiMath.java | 2 +- .../jecalculation/gui/guis/GuiRecipe.java | 31 ++++---- .../jecalculation/gui/guis/GuiSearch.java | 4 +- .../towdium/jecalculation/gui/guis/IGui.java | 7 ++ .../gui/guis/pickers/IPicker.java | 4 +- .../gui/guis/pickers/PickerItemStack.java | 5 ++ .../gui/guis/pickers/PickerPlaceholder.java | 2 +- .../gui/guis/pickers/PickerSimple.java | 2 +- .../jecalculation/gui/widgets/IContainer.java | 2 - .../jecalculation/gui/widgets/IWidget.java | 15 ++-- .../jecalculation/gui/widgets/WButton.java | 30 +++++--- .../gui/widgets/WButtonIcon.java | 7 +- .../jecalculation/gui/widgets/WContainer.java | 77 ++++++------------- .../jecalculation/gui/widgets/WHelp.java | 6 +- .../jecalculation/gui/widgets/WLabel.java | 38 ++++++--- .../gui/widgets/WLabelGroup.java | 6 ++ .../gui/widgets/WLabelScroll.java | 23 +++--- .../jecalculation/gui/widgets/WOverlay.java | 19 +---- .../jecalculation/gui/widgets/WPage.java | 6 +- .../jecalculation/gui/widgets/WPanel.java | 20 +++-- .../jecalculation/gui/widgets/WTextField.java | 10 ++- .../jecalculation/gui/widgets/WTick.java | 14 ++-- .../jecalculation/utils/Utilities.java | 2 +- 29 files changed, 273 insertions(+), 175 deletions(-) create mode 100644 src/main/java/me/towdium/jecalculation/gui/guis/Gui.java diff --git a/src/main/java/me/towdium/jecalculation/data/label/ILabel.java b/src/main/java/me/towdium/jecalculation/data/label/ILabel.java index ad2668a..b78bc69 100644 --- a/src/main/java/me/towdium/jecalculation/data/label/ILabel.java +++ b/src/main/java/me/towdium/jecalculation/data/label/ILabel.java @@ -457,7 +457,9 @@ public interface ILabel { @Override public ILabel increaseAmount() { - return setAmount(getAmount() + getMultiplier()); + int mul = getMultiplier(); + if (getAmount() == 1 && mul != 1) return setAmount(mul); + else return setAmount(getAmount() + mul); } @Override @@ -465,7 +467,7 @@ public interface ILabel { if (getAmount() <= 0) { return ILabel.EMPTY; } if (getAmount() <= getMultiplier()) { - return this; + return setAmount(1); } else { return setAmount(getAmount() - getMultiplier()); } diff --git a/src/main/java/me/towdium/jecalculation/gui/JecaGui.java b/src/main/java/me/towdium/jecalculation/gui/JecaGui.java index 583a27a..22f2727 100644 --- a/src/main/java/me/towdium/jecalculation/gui/JecaGui.java +++ b/src/main/java/me/towdium/jecalculation/gui/JecaGui.java @@ -12,6 +12,7 @@ import me.towdium.jecalculation.nei.NEIPlugin; import me.towdium.jecalculation.polyfill.mc.client.renderer.GlStateManager; import me.towdium.jecalculation.utils.ItemStackHelper; import me.towdium.jecalculation.utils.Utilities; +import me.towdium.jecalculation.utils.wrappers.Wrapper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; @@ -105,12 +106,13 @@ public class JecaGui extends GuiContainer { if (diff != 0) gui.root.onMouseScroll(gui, xMouse, yMouse, diff); } else if (Mouse.getEventButtonState()) { + gui.root.onMouseFocused(gui, xMouse, yMouse, button); if (gui.root.onMouseClicked(gui, xMouse, yMouse, button)) { return true; } else if (gui.hand != ILabel.EMPTY) { gui.hand = button == 0 ? NEIPlugin.getLabelUnderMouse() : ILabel.EMPTY; return true; - } else if (button == 0) { + } else if (button == 0 && gui.root.acceptsLabel()) { ILabel e = NEIPlugin.getLabelUnderMouse(); if (e != ILabel.EMPTY) { gui.hand = e; @@ -215,8 +217,9 @@ public class JecaGui extends GuiContainer { @Nullable public ILabel getLabelUnderMouse() { - WLabel w = root.getLabelUnderMouse(getMouseX(), getMouseY()); - return w == null ? null : w.getLabel(); + Wrapper l = new Wrapper<>(null); + root.getLabelUnderMouse(getMouseX(), getMouseY(), l); + return l.value; } /** diff --git a/src/main/java/me/towdium/jecalculation/gui/guis/Gui.java b/src/main/java/me/towdium/jecalculation/gui/guis/Gui.java new file mode 100644 index 0000000..e2d5964 --- /dev/null +++ b/src/main/java/me/towdium/jecalculation/gui/guis/Gui.java @@ -0,0 +1,46 @@ +package me.towdium.jecalculation.gui.guis; + +import me.towdium.jecalculation.gui.widgets.IWidget; +import me.towdium.jecalculation.gui.widgets.WContainer; +import me.towdium.jecalculation.polyfill.MethodsReturnNonnullByDefault; + +import javax.annotation.Nullable; +import javax.annotation.ParametersAreNonnullByDefault; + +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +public class Gui extends WContainer implements IGui { + protected WContainer overlay = new WContainer(); + protected WContainer widgets = new WContainer(); + + public Gui() { + super.add(widgets); + super.add(overlay); + } + + public void setOverlay(@Nullable IWidget overlay) { + this.overlay.clear(); + if (overlay != null) + this.overlay.add(overlay); + } + + @Override + public void add(IWidget... w) { + widgets.add(w); + } + + @Override + public void remove(IWidget... w) { + widgets.remove(w); + } + + @Override + public void clear() { + widgets.clear(); + } + + @Override + public boolean contains(IWidget w) { + return widgets.contains(w); + } +} diff --git a/src/main/java/me/towdium/jecalculation/gui/guis/GuiCraft.java b/src/main/java/me/towdium/jecalculation/gui/guis/GuiCraft.java index 6474555..b7c056e 100644 --- a/src/main/java/me/towdium/jecalculation/gui/guis/GuiCraft.java +++ b/src/main/java/me/towdium/jecalculation/gui/guis/GuiCraft.java @@ -33,12 +33,17 @@ import static me.towdium.jecalculation.data.structure.RecordCraft.Mode.*; @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @SideOnly(Side.CLIENT) -public class GuiCraft extends WContainer implements IGui { +public class GuiCraft extends Gui { Calculator calculator = null; RecordCraft record; WLabel label = new WLabel(31, 7, 20, 20, true).setLsnrUpdate((i, v) -> refreshLabel(v, false, true)); WLabelGroup recent = new WLabelGroup(7, 31, 8, 1, false).setLsnrLeftClick( - (i, v) -> label.setLabel(i.get(v).getLabel().copy(), true)); + (i, v) -> { + ILabel l = i.get(v).getLabel(); + if (l != ILabel.EMPTY) { + label.setLabel(i.get(v).getLabel().copy(), true); + } + }); WLabelScroll result = new WLabelScroll(7, 87, 8, 4, false).setLsnrLeftClick((i, v) -> { Object rep = i.get(v).getLabel().getRepresentation(); NEIPlugin.openRecipeGui(rep, false); @@ -107,6 +112,11 @@ public class GuiCraft extends WContainer implements IGui { return true; } + @Override + public boolean acceptsLabel() { + return true; + } + void setMode(RecordCraft.Mode mode) { record.mode = mode; Controller.setRCraft(record); @@ -208,7 +218,7 @@ public class GuiCraft extends WContainer implements IGui { public Suggest(List labels, boolean replace) { this.replace = replace; int width = labels.size() * 20; - addPanel(new WPanel(-width, 2, 56 + width, 30)); + add(new WPanel(-width, 2, 56 + width, 30)); add(new WLabel(31, 7, 20, 20, false).setLabel(label.getLabel()).setLsnrUpdate((i, v) -> refresh(v))); add(new WIcon(5 - width, 7, 18, 20, Resource.ICN_HELP, "craft.suggest")); add(new WLine(26, 7, 20, false)); diff --git a/src/main/java/me/towdium/jecalculation/gui/guis/GuiImport.java b/src/main/java/me/towdium/jecalculation/gui/guis/GuiImport.java index 46ba970..705875b 100644 --- a/src/main/java/me/towdium/jecalculation/gui/guis/GuiImport.java +++ b/src/main/java/me/towdium/jecalculation/gui/guis/GuiImport.java @@ -24,7 +24,7 @@ import static me.towdium.jecalculation.gui.Resource.ICN_TEXT; */ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault -public class GuiImport extends WContainer implements IGui, ISearchable { +public class GuiImport extends Gui implements ISearchable { List> data; // selected, file, group, recipes List> filtered; WSearch search = new WSearch(26, 25, 90, this); diff --git a/src/main/java/me/towdium/jecalculation/gui/guis/GuiLabel.java b/src/main/java/me/towdium/jecalculation/gui/guis/GuiLabel.java index 82335da..ffd4b12 100644 --- a/src/main/java/me/towdium/jecalculation/gui/guis/GuiLabel.java +++ b/src/main/java/me/towdium/jecalculation/gui/guis/GuiLabel.java @@ -3,11 +3,14 @@ package me.towdium.jecalculation.gui.guis; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; -import com.google.common.cache.Weigher; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import me.towdium.jecalculation.data.label.ILabel; -import me.towdium.jecalculation.gui.widgets.*; +import me.towdium.jecalculation.gui.guis.pickers.IPicker; +import me.towdium.jecalculation.gui.widgets.WContainer; +import me.towdium.jecalculation.gui.widgets.WHelp; +import me.towdium.jecalculation.gui.widgets.WPage; +import me.towdium.jecalculation.gui.widgets.WPanel; import me.towdium.jecalculation.polyfill.MethodsReturnNonnullByDefault; import me.towdium.jecalculation.utils.wrappers.Wrapper; @@ -22,21 +25,17 @@ import java.util.function.Consumer; @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @SideOnly(Side.CLIENT) -public class GuiLabel extends WContainer implements IGui { +public class GuiLabel extends Gui { WContainer container = new WContainer(); + IPicker current; Consumer callback; - LoadingCache cache = CacheBuilder.newBuilder() - .concurrencyLevel(1) - .maximumWeight(16) - .weigher((Weigher) (key, value) -> 1) - .build(new CacheLoader() { - @Override - public IWidget load(Integer i) { - ILabel.RegistryEditor.Record record = ILabel.EDITOR.getRecords() - .get(i); - return record.editor.get().setCallback(callback); - } - }); + LoadingCache cache = CacheBuilder.newBuilder().build(new CacheLoader() { + @Override + public IPicker load(Integer i) { + ILabel.RegistryEditor.Record record = ILabel.EDITOR.getRecords().get(i); + return record.editor.get().setCallback(callback); + } + }); public GuiLabel(Consumer callback) { this.callback = callback; @@ -51,9 +50,15 @@ public class GuiLabel extends WContainer implements IGui { refresh(0); } + @Override + public boolean acceptsLabel() { + return current.acceptsLabel(); + } + protected void refresh(int index) { container.clear(); - container.add(cache.getUnchecked(index)); + current = cache.getUnchecked(index); + container.add(current); container.add(new WPage(index, ILabel.EDITOR.getRecords().get(index), true)); } } diff --git a/src/main/java/me/towdium/jecalculation/gui/guis/GuiMath.java b/src/main/java/me/towdium/jecalculation/gui/guis/GuiMath.java index a305423..b9c2593 100644 --- a/src/main/java/me/towdium/jecalculation/gui/guis/GuiMath.java +++ b/src/main/java/me/towdium/jecalculation/gui/guis/GuiMath.java @@ -24,7 +24,7 @@ import static me.towdium.jecalculation.data.structure.RecordMath.context; */ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -public class GuiMath extends WContainer implements IGui { +public class GuiMath extends Gui { WLcd lcd = new WLcd(7); LinkedList numbers; BigDecimal last; diff --git a/src/main/java/me/towdium/jecalculation/gui/guis/GuiRecipe.java b/src/main/java/me/towdium/jecalculation/gui/guis/GuiRecipe.java index 4502513..787f823 100644 --- a/src/main/java/me/towdium/jecalculation/gui/guis/GuiRecipe.java +++ b/src/main/java/me/towdium/jecalculation/gui/guis/GuiRecipe.java @@ -31,13 +31,13 @@ import static me.towdium.jecalculation.gui.Resource.*; @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault @SideOnly(Side.CLIENT) -public class GuiRecipe extends WContainer implements IGui { +public class GuiRecipe extends Gui { Pair dest; WSwitcher group = new WSwitcher(7, 7, 162, Controller.getGroups()).setListener(i -> refresh()); WTextField text = new WTextField(49, 25, 119); - WLabelScroll catalyst = new WLabelScroll(25, 101, 7, 1, true); - WLabelScroll input = new WLabelScroll(25, 123, 7, 2, true); - WLabelScroll output = new WLabelScroll(25, 61, 7, 2, true); + WLabelScroll catalyst = new WLabelScroll(25, 101, 7, 1, true).setLsnrScroll(GuiRecipe::handleLabelScroll); + WLabelScroll input = new WLabelScroll(25, 123, 7, 2, true).setLsnrScroll(GuiRecipe::handleLabelScroll); + WLabelScroll output = new WLabelScroll(25, 61, 7, 2, true).setLsnrScroll(GuiRecipe::handleLabelScroll); WButton clear = new WButtonIcon(64, 25, 20, 20, BTN_DEL, "recipe.clear").setListener(i -> reset()); // check duplicate and valid WButton copy = new WButtonIcon(83, 25, 20, 20, BTN_COPY, "recipe.copy").setListener(i -> { @@ -134,19 +134,12 @@ public class GuiRecipe extends WContainer implements IGui { } @Override - public boolean onMouseScroll(JecaGui gui, int xMouse, int yMouse, int diff) { - WLabel w = getLabelUnderMouse(xMouse, yMouse); - if (w == null) - return super.onMouseScroll(gui, xMouse, yMouse, diff); - ILabel l = w.getLabel(); - for (int i = 0; i < Math.abs(diff); i++) - l = diff > 0 ? l.increaseAmount() : l.decreaseAmount(); - w.setLabel(l, true); + public boolean acceptsTransfer() { return true; } @Override - public boolean acceptsTransfer() { + public boolean acceptsLabel() { return true; } @@ -230,6 +223,14 @@ public class GuiRecipe extends WContainer implements IGui { entry.remove(index); } + static boolean handleLabelScroll(WLabel w, int diff) { + ILabel l = w.getLabel(); + for (int i = 0; i < Math.abs(diff); i++) + l = diff > 0 ? l.increaseAmount() : l.decreaseAmount(); + w.setLabel(l, true); + return true; + } + class WAmount extends WOverlay { WLabel temp; WButton number; @@ -255,7 +256,7 @@ public class GuiRecipe extends WContainer implements IGui { }); temp = new WLabel(x - 1, y - 1, 20, 20, true).setLsnrUpdate((i, v) -> update()); temp.setLabel(ref.getLabel().copy()); - addPanel(new WPanel(x - 7, y - 30, 111, 55)); + add(new WPanel(x - 7, y - 30, 111, 55)); add(new WText(x + 21, y + 5, PLAIN, "x")); text = new WTextField(x + 28, y + 9 - WTextField.HEIGHT / 2, 50); pick = new WButtonIcon(x + 21, y - 24, 20, 20, BTN_PICK, "recipe.pick").setListener(i -> { @@ -322,7 +323,7 @@ public class GuiRecipe extends WContainer implements IGui { ref = getWidget(type).get(idx); int x = ref.xPos; int y = ref.yPos; - addPanel(new WPanel(x - 7, y - 46, 111, 71)); + add(new WPanel(x - 7, y - 46, 111, 71)); temp = new WLabel(x - 1, y - 1, 20, 20, false); temp.setLabel(ref.getLabel().copy()); content = new WLabelScroll(x + 8, y - 40, 4, 2, false).setLabels(disamb.get(type).get(idx)) diff --git a/src/main/java/me/towdium/jecalculation/gui/guis/GuiSearch.java b/src/main/java/me/towdium/jecalculation/gui/guis/GuiSearch.java index 316a929..93e2451 100644 --- a/src/main/java/me/towdium/jecalculation/gui/guis/GuiSearch.java +++ b/src/main/java/me/towdium/jecalculation/gui/guis/GuiSearch.java @@ -21,7 +21,7 @@ import static me.towdium.jecalculation.gui.Resource.*; @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -public class GuiSearch extends WContainer implements IGui { +public class GuiSearch extends Gui { IdentityHashMap> recipes; WLabelScroll labels = new WLabelScroll(7, 51, 8, 6, false) .setLsnrLeftClick((i, v) -> { @@ -144,7 +144,7 @@ public class GuiSearch extends WContainer implements IGui { Trio recipe = recipes.get(l.getLabel()); int x = l.xPos - 1; int y = l.yPos - 1; - addPanel(new WPanel(x - 5, y - 5, 72, 30)); + add(new WPanel(x - 5, y - 5, 72, 30)); add(new WLabel(x, y, 20, 20, false).setLabel(l.getLabel())); add(new WButtonIcon(x + 23, y, 20, 20, BTN_EDIT, "search.edit").setListener(i -> { JecaGui.displayGui(true, true, new GuiRecipe(recipe.two, recipe.three)); diff --git a/src/main/java/me/towdium/jecalculation/gui/guis/IGui.java b/src/main/java/me/towdium/jecalculation/gui/guis/IGui.java index 2c60557..8cc5e05 100644 --- a/src/main/java/me/towdium/jecalculation/gui/guis/IGui.java +++ b/src/main/java/me/towdium/jecalculation/gui/guis/IGui.java @@ -4,6 +4,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import me.towdium.jecalculation.gui.JecaGui; import me.towdium.jecalculation.gui.widgets.IContainer; +import me.towdium.jecalculation.gui.widgets.IWidget; /** * Author: Towdium @@ -17,4 +18,10 @@ public interface IGui extends IContainer { default boolean acceptsTransfer() { return false; } + + default boolean acceptsLabel() { + return false; + } + + void setOverlay(IWidget w); } diff --git a/src/main/java/me/towdium/jecalculation/gui/guis/pickers/IPicker.java b/src/main/java/me/towdium/jecalculation/gui/guis/pickers/IPicker.java index da5577d..11c554b 100644 --- a/src/main/java/me/towdium/jecalculation/gui/guis/pickers/IPicker.java +++ b/src/main/java/me/towdium/jecalculation/gui/guis/pickers/IPicker.java @@ -3,8 +3,8 @@ package me.towdium.jecalculation.gui.guis.pickers; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import me.towdium.jecalculation.data.label.ILabel; +import me.towdium.jecalculation.gui.guis.Gui; import me.towdium.jecalculation.gui.guis.IGui; -import me.towdium.jecalculation.gui.widgets.WContainer; import me.towdium.jecalculation.polyfill.MethodsReturnNonnullByDefault; import javax.annotation.ParametersAreNonnullByDefault; @@ -20,7 +20,7 @@ import java.util.function.Consumer; public interface IPicker extends IGui { IPicker setCallback(Consumer callback); - class Impl extends WContainer implements IPicker { + class Impl extends Gui implements IPicker { protected Consumer callback; @Override diff --git a/src/main/java/me/towdium/jecalculation/gui/guis/pickers/PickerItemStack.java b/src/main/java/me/towdium/jecalculation/gui/guis/pickers/PickerItemStack.java index a428e3b..54e79f9 100644 --- a/src/main/java/me/towdium/jecalculation/gui/guis/pickers/PickerItemStack.java +++ b/src/main/java/me/towdium/jecalculation/gui/guis/pickers/PickerItemStack.java @@ -37,6 +37,11 @@ public class PickerItemStack extends IPicker.Impl implements IGui { update(ILabel.EMPTY); } + @Override + public boolean acceptsLabel() { + return true; + } + public void update(ILabel l) { raw = l; setFMeta(false); diff --git a/src/main/java/me/towdium/jecalculation/gui/guis/pickers/PickerPlaceholder.java b/src/main/java/me/towdium/jecalculation/gui/guis/pickers/PickerPlaceholder.java index c1d4130..d16aabb 100644 --- a/src/main/java/me/towdium/jecalculation/gui/guis/pickers/PickerPlaceholder.java +++ b/src/main/java/me/towdium/jecalculation/gui/guis/pickers/PickerPlaceholder.java @@ -27,9 +27,9 @@ public class PickerPlaceholder extends IPicker.Impl implements IGui { .setLabels(LPlaceholder.getRecent()).setLsnrLeftClick((i, v) -> notifyLsnr(i.get(v).getLabel())); WTextField create = new WTextField(26, 7, 69).setListener( i -> i.setColor(i.getText().equals("") ? COLOR_TEXT_RED : COLOR_TEXT_WHITE)); - add(new WSearch(26, 45, 90, scroll)); add(new WIcon(7, 45, 20, 20, ICN_TEXT, "common.search")); add(new WIcon(7, 7, 20, 20, ICN_TEXT, "placeholder.create")); + add(new WSearch(26, 45, 90, scroll)); add(new WLine(36)); add(new WButtonIcon(95, 7, 20, 20, BTN_YES, "common.confirm").setListener(i -> { if (!create.getText().equals("")) diff --git a/src/main/java/me/towdium/jecalculation/gui/guis/pickers/PickerSimple.java b/src/main/java/me/towdium/jecalculation/gui/guis/pickers/PickerSimple.java index ce59f1c..7d7f187 100644 --- a/src/main/java/me/towdium/jecalculation/gui/guis/pickers/PickerSimple.java +++ b/src/main/java/me/towdium/jecalculation/gui/guis/pickers/PickerSimple.java @@ -34,8 +34,8 @@ public class PickerSimple extends IPicker.Impl implements IGui { public PickerSimple(List labels) { WLabelScroll ls = new WLabelScroll(7, 33, 8, 7, false).setLabels(labels) .setLsnrLeftClick((i, v) -> notifyLsnr(i.get(v).getLabel())); - add(new WSearch(26, 7, 90, ls)); add(new WIcon(7, 7, 20, 20, ICN_TEXT, "common.search")); + add(new WSearch(26, 7, 90, ls)); add(ls); } diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/IContainer.java b/src/main/java/me/towdium/jecalculation/gui/widgets/IContainer.java index 1b3617a..3fff469 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/IContainer.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/IContainer.java @@ -10,6 +10,4 @@ public interface IContainer extends IWidget { void remove(IWidget... w); void clear(); - - void setOverlay(WOverlay w); } diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/IWidget.java b/src/main/java/me/towdium/jecalculation/gui/widgets/IWidget.java index 312ac9a..4ffb1b5 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/IWidget.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/IWidget.java @@ -1,8 +1,9 @@ package me.towdium.jecalculation.gui.widgets; +import me.towdium.jecalculation.data.label.ILabel; import me.towdium.jecalculation.gui.JecaGui; +import me.towdium.jecalculation.utils.wrappers.Wrapper; -import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; @@ -12,7 +13,9 @@ import java.util.List; */ @ParametersAreNonnullByDefault public interface IWidget { - boolean onDraw(JecaGui gui, int xMouse, int yMouse); + default boolean onDraw(JecaGui gui, int xMouse, int yMouse) { + return false; + } default boolean onTooltip(JecaGui gui, int xMouse, int yMouse, List tooltip) { return false; @@ -22,6 +25,9 @@ public interface IWidget { return false; } + default void onMouseFocused(JecaGui gui, int xMouse, int yMouse, int button) { + } + default boolean onMouseReleased(JecaGui gui, int xMouse, int yMouse, int button) { return false; } @@ -34,9 +40,8 @@ public interface IWidget { return false; } - @Nullable - default WLabel getLabelUnderMouse(int xMouse, int yMouse) { - return null; + default boolean getLabelUnderMouse(int xMouse, int yMouse, Wrapper label) { + return false; } @FunctionalInterface diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WButton.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WButton.java index 45f7e9f..ada27ef 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/WButton.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WButton.java @@ -3,6 +3,7 @@ package me.towdium.jecalculation.gui.widgets; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import me.towdium.jecalculation.gui.JecaGui; +import me.towdium.jecalculation.gui.Resource; import me.towdium.jecalculation.polyfill.MethodsReturnNonnullByDefault; import me.towdium.jecalculation.utils.ClientUtils; import org.lwjgl.input.Keyboard; @@ -43,26 +44,37 @@ public abstract class WButton extends WTooltip { @Override public boolean onDraw(JecaGui gui, int xMouse, int yMouse) { super.onDraw(gui, xMouse, yMouse); - boolean hovered = JecaGui.mouseIn(xPos + 1, yPos + 1, xSize - 2, ySize - 2, xMouse, yMouse); - if (keys != null) - for (int i : keys) - if (Keyboard.isKeyDown(i)) - hovered = true; - gui.drawResourceContinuous(disabled ? WGT_BUTTON_D : (hovered ? WGT_BUTTON_F : WGT_BUTTON_N), xPos, yPos, xSize, + boolean hovered = hovered(xMouse, yMouse); + Resource res; + if (disabled) res = WGT_BUTTON_D; + else if (hovered) res = WGT_BUTTON_F; + else res = WGT_BUTTON_N; + + gui.drawResourceContinuous(res, xPos, yPos, xSize, ySize, 5, 5, 5, 5); return hovered; } @Override public boolean onMouseClicked(JecaGui gui, int xMouse, int yMouse, int button) { - if (JecaGui.mouseIn(xPos + 1, yPos + 1, xSize - 2, ySize - 2, xMouse, yMouse) && !disabled && button == 0 && - listener != null) { + if (mouseIn(xMouse, yMouse) && !disabled && button == 0 && listener != null) { trigger(); return true; } else return false; } + protected boolean hovered(int xMouse, int yMouse) { + if (mouseIn(xMouse, yMouse)) { + return true; + } + if (keys != null) + for (int i : keys) + if (Keyboard.isKeyDown(i)) + return true; + return false; + } + private void trigger() { listener.invoke(this); ClientUtils.playClickSound(1.0F); @@ -82,7 +94,7 @@ public abstract class WButton extends WTooltip { @Override public boolean mouseIn(int xMouse, int yMouse) { - return JecaGui.mouseIn(xPos + 1, yPos + 1, xSize - 2, ySize - 2, xMouse, yMouse); + return JecaGui.mouseIn(xPos, yPos, xSize - 2, ySize - 2, xMouse, yMouse); } @SuppressWarnings("UnusedReturnValue") diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WButtonIcon.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WButtonIcon.java index 4e1f3e3..5e3c68d 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/WButtonIcon.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WButtonIcon.java @@ -43,8 +43,11 @@ public class WButtonIcon extends WButton { public boolean onDraw(JecaGui gui, int xMouse, int yMouse) { boolean ret = super.onDraw(gui, xMouse, yMouse); Resource r = disabled ? rDisabled : (mouseIn(xMouse, yMouse) ? rFocused : rNormal); - if (r != null) - gui.drawResource(r, xPos + (xSize - r.getXSize() + 1) / 2, yPos + (ySize - r.getYSize() + 1) / 2); + if (r != null) { + int x = xPos + (xSize - r.getXSize() + 1) / 2; + int y = yPos + (ySize - r.getYSize() + 1) / 2; + gui.drawResource(r, x, y); + } return ret; } } diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WContainer.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WContainer.java index f2e7ceb..a54fe84 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/WContainer.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WContainer.java @@ -2,16 +2,16 @@ package me.towdium.jecalculation.gui.widgets; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import me.towdium.jecalculation.data.label.ILabel; import me.towdium.jecalculation.gui.JecaGui; import me.towdium.jecalculation.polyfill.MethodsReturnNonnullByDefault; import me.towdium.jecalculation.utils.Utilities; +import me.towdium.jecalculation.utils.wrappers.Wrapper; -import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Objects; /** * Author: towdium @@ -22,28 +22,13 @@ import java.util.Objects; @SideOnly(Side.CLIENT) public class WContainer implements IContainer { protected List widgets = new ArrayList<>(); - protected WOverlay overlay = null; - - public void add(IWidget w) { - widgets.add(w); - } public void add(IWidget... w) { - if (w.length == 1) - widgets.add(w[0]); - else - widgets.addAll(Arrays.asList(w)); + widgets.addAll(Arrays.asList(w)); } public void remove(IWidget... w) { - if (w.length == 1) - widgets.remove(w[0]); - else - widgets.removeAll(Arrays.asList(w)); - } - - public void setOverlay(@Nullable WOverlay overlay) { - this.overlay = overlay; + widgets.removeAll(Arrays.asList(w)); } public void clear() { @@ -56,65 +41,53 @@ public class WContainer implements IContainer { @Override public boolean onDraw(JecaGui gui, int mouseX, int mouseY) { - IWidget[] w = new IWidget[1]; + Wrapper w = new Wrapper<>(null); widgets.forEach(widget -> { if (widget.onDraw(gui, mouseX, mouseY)) - w[0] = widget; + w.value = widget; }); - if (w[0] != null) - w[0].onDraw(gui, mouseX, mouseY); - if (overlay != null) - overlay.onDraw(gui, mouseX, mouseY); + if (w.value != null) + w.value.onDraw(gui, mouseX, mouseY); return false; } @Override public boolean onMouseClicked(JecaGui gui, int xMouse, int yMouse, int button) { - boolean b = overlay != null && overlay.onMouseClicked(gui, xMouse, yMouse, button); - return b || new Utilities.ReversedIterator<>(widgets).stream() - .anyMatch(i -> i.onMouseClicked(gui, xMouse, yMouse, - button)); + return new Utilities.ReversedIterator<>(widgets).stream() + .anyMatch(i -> i.onMouseClicked(gui, xMouse, yMouse, button)); + } + + @Override + public void onMouseFocused(JecaGui gui, int xMouse, int yMouse, int button) { + widgets.forEach(i -> i.onMouseFocused(gui, xMouse, yMouse, button)); } @Override public boolean onKeyPressed(JecaGui gui, char ch, int code) { - boolean b = overlay != null && overlay.onKeyPressed(gui, ch, code); - return b || new Utilities.ReversedIterator<>(widgets).stream().anyMatch(i -> i.onKeyPressed(gui, ch, code)); + return new Utilities.ReversedIterator<>(widgets).stream().anyMatch(i -> i.onKeyPressed(gui, ch, code)); } @Override public boolean onMouseReleased(JecaGui gui, int xMouse, int yMouse, int button) { - boolean b = overlay != null && overlay.onMouseReleased(gui, xMouse, yMouse, button); - return b || new Utilities.ReversedIterator<>(widgets).stream() - .anyMatch(i -> i.onMouseReleased(gui, xMouse, yMouse, - button)); + return new Utilities.ReversedIterator<>(widgets).stream() + .anyMatch(i -> i.onMouseReleased(gui, xMouse, yMouse, button)); } @Override public boolean onMouseScroll(JecaGui gui, int xMouse, int yMouse, int diff) { - boolean b = overlay != null && overlay.onMouseScroll(gui, xMouse, yMouse, diff); - return b || new Utilities.ReversedIterator<>(widgets).stream() - .anyMatch(i -> i.onMouseScroll(gui, xMouse, yMouse, diff)); + return new Utilities.ReversedIterator<>(widgets).stream() + .anyMatch(i -> i.onMouseScroll(gui, xMouse, yMouse, diff)); } @Override public boolean onTooltip(JecaGui gui, int xMouse, int yMouse, List tooltip) { - boolean b = overlay != null && overlay.onTooltip(gui, xMouse, yMouse, tooltip); - return b || new Utilities.ReversedIterator<>(widgets).stream() - .anyMatch(i -> i.onTooltip(gui, xMouse, yMouse, tooltip)); + return new Utilities.ReversedIterator<>(widgets).stream() + .anyMatch(i -> i.onTooltip(gui, xMouse, yMouse, tooltip)); } - @Nullable @Override - public WLabel getLabelUnderMouse(int xMouse, int yMouse) { - if(overlay != null && overlay.mouseIn(xMouse, yMouse)) { - return null; - } else { - return new Utilities.ReversedIterator<>(widgets).stream() - .map(i -> i.getLabelUnderMouse(xMouse, yMouse)) - .filter(Objects::nonNull) - .findFirst() - .orElse(null); - } + public boolean getLabelUnderMouse(int xMouse, int yMouse, Wrapper label) { + return new Utilities.ReversedIterator<>(widgets).stream() + .anyMatch(i -> i.getLabelUnderMouse(xMouse, yMouse, label)); } } diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WHelp.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WHelp.java index 2b4b9c2..2a72a8a 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/WHelp.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WHelp.java @@ -52,7 +52,7 @@ public class WHelp extends WContainer { public boolean onMouseClicked(JecaGui gui, int xMouse, int yMouse, int button) { boolean ret = mouseIn(xMouse, yMouse); if (ret) - gui.root.add(new Doc()); + gui.root.setOverlay(new Doc()); return ret; } } @@ -146,7 +146,7 @@ public class WHelp extends WContainer { public boolean onMouseClicked(JecaGui gui, int xMouse, int yMouse, int button) { boolean ret = mouseIn(xMouse, yMouse); if (ret) - gui.root.remove(Doc.this); + gui.root.setOverlay(null); return ret; } @@ -160,7 +160,7 @@ public class WHelp extends WContainer { if (super.onKeyPressed(gui, ch, code)) return true; if (code == Keyboard.KEY_ESCAPE) { - gui.root.remove(Doc.this); + gui.root.setOverlay(null); return true; } else return false; diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WLabel.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WLabel.java index ff2b0ae..c13cf7b 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/WLabel.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WLabel.java @@ -7,11 +7,12 @@ import me.towdium.jecalculation.data.label.ILabel; import me.towdium.jecalculation.gui.JecaGui; import me.towdium.jecalculation.polyfill.MethodsReturnNonnullByDefault; import me.towdium.jecalculation.utils.Utilities.Timer; +import me.towdium.jecalculation.utils.wrappers.Wrapper; -import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; import java.util.function.BiConsumer; +import java.util.function.BiFunction; import java.util.function.Function; import static me.towdium.jecalculation.gui.JecaGui.Font.HALF; @@ -30,6 +31,7 @@ public class WLabel implements IWidget { public boolean accept; public ListenerValue update; public ListenerAction leftClick, rightClick; + public ListenerValue scroll; Function fmtAmount = i -> ""; BiConsumer> fmtTooltip = (i, j) -> i.getToolTip(j, false); protected Timer timer = new Timer(); @@ -86,33 +88,44 @@ public class WLabel implements IWidget { return false; } - @Nullable @Override - public WLabel getLabelUnderMouse(int xMouse, int yMouse) { - return mouseIn(xMouse, yMouse) ? this : null; + public boolean getLabelUnderMouse(int xMouse, int yMouse, Wrapper label) { + if (mouseIn(xMouse, yMouse) && this.label != ILabel.EMPTY) { + label.value = this.label; + return true; + } else + return false; } @Override public boolean onMouseClicked(JecaGui gui, int xMouse, int yMouse, int button) { if (!mouseIn(xMouse, yMouse)) return false; - if(button == 1) { + if (button == 1) { notifyRightClick(); return true; } - if (accept) { - if (gui.hand == ILabel.EMPTY && leftClick != null) - notifyLeftClick(); - else { + if (accept && gui.hand != ILabel.EMPTY) { label = gui.hand; gui.hand = label.EMPTY; notifyUpdate(); - } } else notifyLeftClick(); return true; } + @Override + public boolean onMouseScroll(JecaGui gui, int xMouse, int yMouse, int diff) { + if (scroll == null) + return false; + else if (mouseIn(xMouse, yMouse)) { + scroll.invoke(this, diff); + return true; + } + else + return false; + } + public WLabel setLsnrUpdate(ListenerValue listener) { update = listener; return this; @@ -128,6 +141,11 @@ public class WLabel implements IWidget { return this; } + public WLabel setLsnrScroll(ListenerValue listener) { + scroll = listener; + return this; + } + public WLabel setFmtAmount(Function f) { fmtAmount = f; return this; diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WLabelGroup.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WLabelGroup.java index ee00114..f588046 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/WLabelGroup.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WLabelGroup.java @@ -9,6 +9,7 @@ import javax.annotation.ParametersAreNonnullByDefault; import java.util.ArrayList; import java.util.List; import java.util.function.BiConsumer; +import java.util.function.BiFunction; import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -82,6 +83,11 @@ public class WLabelGroup extends WContainer { return this; } + public WLabelGroup setLsnrScroll(ListenerValue hdlr) { + labels.forEach(i -> i.setLsnrScroll(hdlr)); + return this; + } + public WLabelGroup setFmtAmount(Function f) { labels.forEach(i -> i.setFmtAmount(f)); return this; diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WLabelScroll.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WLabelScroll.java index 40ee29a..b874923 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/WLabelScroll.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WLabelScroll.java @@ -29,7 +29,7 @@ public class WLabelScroll extends WContainer implements ISearchable { protected String filter = ""; protected int xPos, yPos, column, row, current; private ListenerValue lsnrUpdate; - private ListenerValue lsnrLeftClick, lsnrRightClick; + private ListenerValue hdlrLeftClick, hdlrRightClick; protected final boolean accept; public WLabelScroll(int xPos, int yPos, int column, int row, boolean accept) { @@ -92,13 +92,13 @@ public class WLabelScroll extends WContainer implements ISearchable { return this; } - public WLabelScroll setLsnrLeftClick(ListenerValue lsnrLeftClick) { - this.lsnrLeftClick = lsnrLeftClick; + public WLabelScroll setLsnrLeftClick(ListenerValue hdlrLeftClick) { + this.hdlrLeftClick = hdlrLeftClick; return this; } - public WLabelScroll setLsnrRightClick(ListenerValue lsnrRightClick) { - this.lsnrRightClick = lsnrRightClick; + public WLabelScroll setLsnrRightClick(ListenerValue hdlrRightClick) { + this.hdlrRightClick = hdlrRightClick; return this; } @@ -124,13 +124,18 @@ public class WLabelScroll extends WContainer implements ISearchable { } protected void onLeftClick(WLabelGroup w, int index) { - if (lsnrLeftClick != null) - lsnrLeftClick.invoke(this, column * current + index); + if (hdlrLeftClick != null) + hdlrLeftClick.invoke(this, column * current + index); } protected void onRightClick(WLabelGroup w, int index) { - if (lsnrRightClick != null) - lsnrRightClick.invoke(this, column * current + index); + if (hdlrRightClick != null) + hdlrRightClick.invoke(this, column * current + index); + } + + public WLabelScroll setLsnrScroll(ListenerValue hdlr) { + labelGroup.setLsnrScroll(hdlr); + return this; } public WLabelScroll setFmtAmount(Function f) { diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WOverlay.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WOverlay.java index 0c78d8c..5401c7c 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/WOverlay.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WOverlay.java @@ -13,12 +13,7 @@ import javax.annotation.ParametersAreNonnullByDefault; */ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault -public abstract class WOverlay extends WContainer { - /** - * For checking whether the mouse in the overlay - */ - protected WPanel panel; - +public class WOverlay extends WContainer { @Override public boolean onKeyPressed(JecaGui gui, char ch, int code) { if (super.onKeyPressed(gui, ch, code)) return true; @@ -43,19 +38,9 @@ public abstract class WOverlay extends WContainer { @Override public boolean onDraw(JecaGui gui, int mouseX, int mouseY) { GlStateManager.pushMatrix(); - GlStateManager.translate(0, 0, 100); + GlStateManager.translate(0, 0, 180); super.onDraw(gui, mouseX, mouseY); GlStateManager.popMatrix(); return false; } - - protected void addPanel(WPanel panel) { - this.panel = panel; - add(panel); - } - - protected boolean mouseIn(int x, int y) { - if(panel == null) return false; - return panel.mouseIn(x, y); - } } diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WPage.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WPage.java index b03f888..79034a2 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/WPage.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WPage.java @@ -49,10 +49,10 @@ public class WPage extends WTooltip { @Override public boolean onMouseClicked(JecaGui gui, int xMouse, int yMouse, int button) { - boolean ret = JecaGui.mouseIn(index * 24, -21, 24, 21, xMouse, yMouse) && listener != null && !focused; - if (ret) + if (mouseIn(xMouse, yMouse) && listener != null && !focused) { listener.invoke(this); - return ret; + return true; + } else return false; } @Override diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WPanel.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WPanel.java index b148c87..af41936 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/WPanel.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WPanel.java @@ -6,6 +6,7 @@ import me.towdium.jecalculation.data.label.ILabel; import me.towdium.jecalculation.gui.JecaGui; import me.towdium.jecalculation.gui.Resource; import me.towdium.jecalculation.polyfill.MethodsReturnNonnullByDefault; +import me.towdium.jecalculation.utils.wrappers.Wrapper; import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; @@ -44,13 +45,6 @@ public class WPanel implements IWidget { return mouseIn(xMouse, yMouse); } - @Override - public boolean onMouseClicked(JecaGui gui, int xMouse, int yMouse, int button) { - boolean ret = mouseIn(xMouse, yMouse); - if (ret) gui.hand = ILabel.EMPTY; - return ret; - } - /** * Assuming Panel will be the first widget in the container's widgets. * @param gui gui @@ -64,6 +58,18 @@ public class WPanel implements IWidget { return mouseIn(xMouse, yMouse); } + @Override + public boolean onMouseClicked(JecaGui gui, int xMouse, int yMouse, int button) { + boolean ret = mouseIn(xMouse, yMouse); + if (ret) gui.hand = ILabel.EMPTY; + return ret; + } + + @Override + public boolean getLabelUnderMouse(int xMouse, int yMouse, Wrapper label) { + return false; + } + public boolean mouseIn(int x, int y) { int xx = x - xPos; int yy = y - yPos; diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WTextField.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WTextField.java index 7eeb0f1..209c781 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/WTextField.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WTextField.java @@ -29,14 +29,20 @@ public class WTextField implements IWidget { textField = new GuiTextField(Minecraft.getMinecraft().fontRenderer, xPos + 1, yPos + 1, xSize - 2, 18); } + @Override + public void onMouseFocused(JecaGui gui, int xMouse, int yMouse, int button) { + textField.mouseClicked(xMouse, yMouse, button); + } + @Override public boolean onMouseClicked(JecaGui gui, int xMouse, int yMouse, int button) { textField.mouseClicked(xMouse, yMouse, button); if (textField.isFocused() && button == 1) { textField.setText(""); notifyLsnr(); - } - return false; + return true; + } else + return false; } @Override diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WTick.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WTick.java index c844ef6..f5eb979 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/WTick.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WTick.java @@ -1,6 +1,7 @@ package me.towdium.jecalculation.gui.widgets; import me.towdium.jecalculation.gui.JecaGui; +import me.towdium.jecalculation.gui.Resource; import me.towdium.jecalculation.polyfill.MethodsReturnNonnullByDefault; import javax.annotation.Nullable; @@ -93,12 +94,13 @@ public class WTick extends WContainer { @Override public boolean onDraw(JecaGui gui, int xMouse, int yMouse) { - boolean ret = super.onDraw(gui, xMouse, yMouse); - boolean hovered = JecaGui.mouseIn(xPos + 1, yPos + 1, xSize - 2, ySize - 2, xMouse, yMouse); - gui.drawResourceContinuous(disabled ? WGT_BUTTON_S_D : (hovered ? WGT_BUTTON_S_F : WGT_BUTTON_S_N), xPos, - yPos, xSize, ySize, 5, 5, 5, 5); - - return ret; + boolean hovered = hovered(xMouse, yMouse); + Resource res; + if (disabled) res = WGT_BUTTON_S_D; + else if (hovered) res = WGT_BUTTON_S_F; + else res = WGT_BUTTON_S_N; + gui.drawResourceContinuous(res, xPos, yPos, xSize, ySize, 5, 5, 5, 5); + return hovered; } } } diff --git a/src/main/java/me/towdium/jecalculation/utils/Utilities.java b/src/main/java/me/towdium/jecalculation/utils/Utilities.java index d1ca302..6d10e54 100644 --- a/src/main/java/me/towdium/jecalculation/utils/Utilities.java +++ b/src/main/java/me/towdium/jecalculation/utils/Utilities.java @@ -214,7 +214,7 @@ public class Utilities { public Circulator move(int steps) { current += steps; if (current < 0) - current += (-current) / total * total + total; + current += (total - current - 1) / total * total; else current = current % total; return this;