From 2ec160b9f01011941c96d1bde21967786ff15273 Mon Sep 17 00:00:00 2001 From: Discreater Date: Wed, 28 Apr 2021 23:39:49 +0800 Subject: [PATCH] feat: Gui Disambiguation --- .../jecalculation/client/gui/IDrawable.java | 12 +-- .../jecalculation/client/gui/JecGui.java | 9 ++- .../jecalculation/client/gui/Resource.java | 33 +++++--- .../client/gui/drawables/DButtonText.java | 4 +- .../client/gui/drawables/DContainer.java | 17 ++-- .../client/gui/drawables/DIcon.java | 2 +- .../client/gui/drawables/DLabel.java | 51 ++++++------ .../client/gui/drawables/DLabelGroup.java | 18 +++-- .../client/gui/drawables/DLabelScroll.java | 73 ++++++++++++++++++ .../client/gui/drawables/DPage.java | 3 +- .../client/gui/drawables/DScroll.java | 63 ++++++++------- .../client/gui/drawables/DSwitcher.java | 63 +++++++++++++++ .../client/gui/drawables/DTextField.java | 18 ++++- .../client/gui/drawables/DTooltip.java | 3 +- .../client/gui/guis/GuiCalculator.java | 2 +- .../client/gui/guis/GuiDisambiguation.java | 35 +++++++++ .../client/gui/guis/GuiRecipe.java | 2 +- .../command/commands/CommandState.java | 4 +- .../jecalculation/core/labels/ILabel.java | 6 +- .../core/labels/labels/LabelItemStack.java | 11 ++- .../core/labels/labels/LabelOreDict.java | 11 ++- .../jecalculation/utils/Utilities.java | 21 +++++ .../utils/helpers/LocalizationHelper.java | 29 ------- .../assets/jecalculation/lang/en_US.lang | 5 +- .../jecalculation/textures/gui/resources.png | Bin 10659 -> 11171 bytes 25 files changed, 362 insertions(+), 133 deletions(-) create mode 100644 src/main/java/me/towdium/jecalculation/client/gui/drawables/DLabelScroll.java create mode 100644 src/main/java/me/towdium/jecalculation/client/gui/drawables/DSwitcher.java create mode 100644 src/main/java/me/towdium/jecalculation/client/gui/guis/GuiDisambiguation.java delete mode 100644 src/main/java/me/towdium/jecalculation/utils/helpers/LocalizationHelper.java diff --git a/src/main/java/me/towdium/jecalculation/client/gui/IDrawable.java b/src/main/java/me/towdium/jecalculation/client/gui/IDrawable.java index f7e51f4..a29046a 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/IDrawable.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/IDrawable.java @@ -3,14 +3,6 @@ package me.towdium.jecalculation.client.gui; import me.towdium.jecalculation.client.gui.JecGui; public interface IDrawable { - static int gl(JecGui gui) { - return gui.getGuiLeft(); - } - - static int gt(JecGui gui) { - return gui.getGuiTop(); - } - void onDraw(JecGui gui, int xMouse, int yMouse); default boolean onClicked(JecGui gui, int xMouse, int yMouse, int button) { @@ -20,4 +12,8 @@ public interface IDrawable { default boolean onKey(JecGui gui, char ch, int code) { return false; } + + default boolean onScroll(JecGui gui, int xMouse, int yMouse, int diff) { + return false; + } } diff --git a/src/main/java/me/towdium/jecalculation/client/gui/JecGui.java b/src/main/java/me/towdium/jecalculation/client/gui/JecGui.java index 74bae97..fa81a94 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/JecGui.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/JecGui.java @@ -7,7 +7,6 @@ import me.towdium.jecalculation.core.labels.ILabel; import me.towdium.jecalculation.nei.NEIPlugin; import me.towdium.jecalculation.polyfill.mc.client.renderer.GlStateManager; import me.towdium.jecalculation.utils.IllegalPositionException; -import me.towdium.jecalculation.utils.helpers.LocalizationHelper; import me.towdium.jecalculation.utils.wrappers.Single; import me.towdium.jecalculation.utils.wrappers.Triple; import net.minecraft.client.Minecraft; @@ -38,7 +37,9 @@ import java.util.function.Function; */ @ParametersAreNonnullByDefault public class JecGui extends GuiContainer { - public static final int COLOR_GREY = 0xFFA1A1A1; + public static final int COLOR_GUI_GREY = 0xFFA1A1A1; + public static final int COLOR_TEXT_RED = 0xFF0000; + public static final int COLOR_TEXT_WHITE = 0xFFFFFF; protected static JecGui last; public static final boolean ALWAYS_TOOLTIP = false; @@ -302,11 +303,11 @@ public class JecGui extends GuiContainer { } public void drawTooltip(int xPos, int yPos, String... text) { - drawTooltip(xPos + guiLeft, yPos + guiTop, Arrays.asList(text)); + drawTooltip(xPos, yPos, Arrays.asList(text)); } public void drawTooltip(int xPos, int yPos, List text) { - tooltipBuffer.add(new Triple<>(xPos, yPos, text)); + tooltipBuffer.add(new Triple<>(xPos + guiLeft, yPos + guiTop, text)); } protected void drawBufferedTooltip() { diff --git a/src/main/java/me/towdium/jecalculation/client/gui/Resource.java b/src/main/java/me/towdium/jecalculation/client/gui/Resource.java index 7406d9d..fdc74ce 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/Resource.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/Resource.java @@ -26,19 +26,22 @@ public class Resource { public static final Resource BTN_YES_F = new Resource(84, 0, 14, 14); public static final Resource BTN_NO_N = new Resource(98, 14, 14, 14); public static final Resource BTN_NO_F = new Resource(98, 0, 14, 14); - public static final Resource WGT_BUTTON_N = new Resource(60, 232, 20, 20); - public static final Resource WGT_BUTTON_F = new Resource(80, 232, 20, 20); - public static final Resource WGT_BUTTON_D = new Resource(100, 232, 20, 20); - public static final Resource WGT_SLOT = new Resource(40, 232, 20, 20); + public static final Resource WGT_BUTTON_N = new Resource(40, 232, 20, 20); + public static final Resource WGT_BUTTON_F = new Resource(60, 232, 20, 20); + public static final Resource WGT_BUTTON_D = new Resource(80, 232, 20, 20); + public static final Resource WGT_SLOT = new Resource(20, 232, 20, 20); public static final Resource WGT_LINE = new Resource(0, 252, 163, 4); - public static final Resource WGT_PANEL = new Resource(20, 232, 20, 20); - public static final Resource WGT_ARR_L_F = new Resource(0, 232, 9, 9); - public static final Resource WGT_ARR_L_N = new Resource(0, 242, 9, 9); - public static final Resource WGT_ARR_R_F = new Resource(10, 232, 9, 9); - public static final Resource WGT_ARR_R_N = new Resource(10, 242, 9, 9); - public static final Resource WGT_PAGER_FN = new Resource(120, 232, 20, 20); - public static final Resource WGT_PAGER_F0 = new Resource(140, 232, 20, 20); - public static final Resource WGT_PAGER_N = new Resource(160, 232, 20, 20); + public static final Resource WGT_PANEL = new Resource(0, 232, 20, 20); + public static final Resource WGT_PAGER_FN = new Resource(100, 232, 20, 20); + public static final Resource WGT_PAGER_F0 = new Resource(120, 232, 20, 20); + public static final Resource WGT_PAGER_N = new Resource(140, 232, 20, 20); + public static final Resource WGT_ARR_L_F = new Resource(160, 232, 7, 9); + public static final Resource WGT_ARR_L_N = new Resource(167, 232, 7, 9); + public static final Resource WGT_ARR_L_D = new Resource(174, 232, 7, 9); + public static final Resource WGT_ARR_R_F = new Resource(160, 242, 7, 9); + public static final Resource WGT_ARR_R_N = new Resource(167, 242, 7, 9); + public static final Resource WGT_ARR_R_D = new Resource(174, 242, 7, 9); + public static final Resource WGT_SCROLL = new Resource(181, 232, 12, 15); public static final Resource ICN_RECENT_N = new Resource(0, 42, 14, 14); public static final Resource ICN_RECENT_F = new Resource(0, 28, 14, 14); public static final Resource ICN_INPUT_N = new Resource(14, 42, 14, 14); @@ -47,6 +50,12 @@ public class Resource { public static final Resource ICN_OUTPUT_F = new Resource(28, 28, 14, 14); public static final Resource ICN_CATALYST_N = new Resource(42, 42, 14, 14); public static final Resource ICN_CATALYST_F = new Resource(42, 28, 14, 14); + public static final Resource ICN_LIST_N = new Resource(56, 42, 14, 14); + public static final Resource ICN_LIST_F = new Resource(56, 28, 14, 14); + public static final Resource ICN_LABEL_N = new Resource(70, 42, 14, 14); + public static final Resource ICN_LABEL_F = new Resource(70, 28, 14, 14); + public static final Resource ICN_HELP_N = new Resource(84, 42, 14, 14); + public static final Resource ICN_HELP_F = new Resource(84, 28, 14, 14); public static final Resource LBL_ORE_DICT = new Resource(0, 56, 16, 16); protected int xPos, yPos, xSize, ySize; diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DButtonText.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/DButtonText.java index c7b6e7e..284f19e 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DButtonText.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/DButtonText.java @@ -1,7 +1,7 @@ package me.towdium.jecalculation.client.gui.drawables; import me.towdium.jecalculation.client.gui.JecGui; -import me.towdium.jecalculation.utils.helpers.LocalizationHelper; +import me.towdium.jecalculation.utils.Utilities; import javax.annotation.ParametersAreNonnullByDefault; @@ -19,7 +19,7 @@ public class DButtonText extends DButton { public void onDraw(JecGui gui, int xMouse, int yMouse) { super.onDraw(gui, xMouse, yMouse); int textColor = mouseIn(xMouse, yMouse) ? 16777120 : 0; - String text = LocalizationHelper.format(String.join(".", "gui", name, "text")); + String text = Utilities.L18n.format(String.join(".", "gui", name, "text")); int strWidth = gui.getFontRenderer().getStringWidth(text); int ellipsisWidth = gui.getFontRenderer().getStringWidth("..."); String str = text; diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DContainer.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/DContainer.java index 0ead4e1..83a047b 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DContainer.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/DContainer.java @@ -38,21 +38,26 @@ public class DContainer implements IDrawable { widgets.clear(); } + @Override public void onDraw(JecGui gui, int mouseX, int mouseY) { widgets.forEach(widget -> widget.onDraw(gui, mouseX, mouseY)); } + @Override public boolean onClicked(JecGui gui, int xMouse, int yMouse, int button) { - for (IDrawable w : widgets) { - if (w.onClicked(gui, xMouse, yMouse, button)) return true; - } + for (IDrawable w : widgets) if (w.onClicked(gui, xMouse, yMouse, button)) return true; return false; } + @Override public boolean onKey(JecGui gui, char ch, int code) { - for (IDrawable w : widgets) { - if (w.onKey(gui, ch, code)) return true; - } + for (IDrawable w : widgets) if (w.onKey(gui, ch, code)) return true; + return false; + } + + @Override + public boolean onScroll(JecGui gui, int xMouse, int yMouse, int diff) { + for (IDrawable w : widgets) if (w.onScroll(gui, xMouse, yMouse, diff)) return true; return false; } diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DIcon.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/DIcon.java index 113c436..cc176be 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DIcon.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/DIcon.java @@ -36,7 +36,7 @@ public class DIcon extends DTooltip { @Override public void onDraw(JecGui gui, int xMouse, int yMouse) { super.onDraw(gui, xMouse, yMouse); - gui.drawRectangle(xPos, yPos, xSize, ySize, JecGui.COLOR_GREY); + gui.drawRectangle(xPos, yPos, xSize, ySize, JecGui.COLOR_GUI_GREY); Resource r = mouseIn(xMouse, yMouse) ? focused : normal; gui.drawResource(r, (xSize - r.getXSize()) / 2 + xPos, (ySize - r.getYSize()) / 2 + yPos); } diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DLabel.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/DLabel.java index d9e2c16..184dc6b 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DLabel.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/DLabel.java @@ -7,6 +7,7 @@ import me.towdium.jecalculation.core.labels.ILabel; import me.towdium.jecalculation.utils.IllegalPositionException; import javax.annotation.ParametersAreNonnullByDefault; +import java.util.ArrayList; /** * Author: towdium @@ -22,7 +23,7 @@ public class DLabel implements IDrawable { } public int xPos, yPos, xSize, ySize; - public ILabel ILabel; + public ILabel label; public enumMode mode; public DLabel(int xPos, int yPos, int xSize, int ySize, enumMode mode) { @@ -30,51 +31,55 @@ public class DLabel implements IDrawable { this.yPos = yPos; this.xSize = xSize; this.ySize = ySize; - this.ILabel = ILabel.EMPTY; + this.label = label.EMPTY; this.mode = mode; } - public ILabel getILabel() { - return ILabel; + public ILabel getLabel() { + return label; } - public void setILabel(ILabel ILabel) { - this.ILabel = ILabel; + public void setLabel(ILabel label) { + this.label = label; } @Override public void onDraw(JecGui gui, int xMouse, int yMouse) { gui.drawResourceContinuous(Resource.WGT_SLOT, xPos, yPos, xSize, ySize, 3, 3, 3, 3); - ILabel.drawEntry(gui, xPos + xSize / 2, yPos + ySize / 2, true); + label.drawEntry(gui, xPos + xSize / 2, yPos + ySize / 2, true); if (mode == enumMode.RESULT || mode == enumMode.EDITOR) gui.drawText(xPos + xSize / 2 + 7.5f, yPos + ySize / 2 + 7 - (int) (font.size * gui.getFontRenderer().FONT_HEIGHT), font, - ILabel.getAmountString()); - if (mouseIn(gui, xMouse, yMouse)) + label.getAmountString()); + if (mouseIn(xMouse, yMouse)) { gui.drawRectangle(xPos + 1, yPos + 1, xSize - 2, ySize - 2, 0x80FFFFFF); + ArrayList buf = new ArrayList<>(); + buf.add(label.getDisplayName()); + gui.drawTooltip(xMouse, yMouse, label.getToolTip(buf)); + } } @Override public boolean onClicked(JecGui gui, int xMouse, int yMouse, int button) { - if (mouseIn(gui, xMouse, yMouse)) { + if (mouseIn(xMouse, yMouse)) { switch (mode) { case EDITOR: - if (gui.hand != ILabel.EMPTY) { - ILabel = gui.hand; - gui.hand = ILabel.EMPTY; + if (gui.hand != label.EMPTY) { + label = gui.hand; + gui.hand = label.EMPTY; return true; - } else if (ILabel != ILabel.EMPTY) { + } else if (label != label.EMPTY) { if (button == 0) { if (JecGui.isShiftDown()) - ILabel = ILabel.increaseAmountLarge(); + label = label.increaseAmountLarge(); else - ILabel = ILabel.increaseAmount(); + label = label.increaseAmount(); return true; } else if (button == 1) { if (JecGui.isShiftDown()) - ILabel = ILabel.decreaseAmountLarge(); + label = label.decreaseAmountLarge(); else - ILabel = ILabel.decreaseAmount(); + label = label.decreaseAmount(); return true; } } else @@ -82,14 +87,14 @@ public class DLabel implements IDrawable { case RESULT: return false; case PICKER: - if (ILabel != ILabel.EMPTY) { - gui.hand = ILabel.copy(); + if (label != label.EMPTY) { + gui.hand = label.copy(); return true; } else return false; case SELECTOR: - ILabel = gui.hand; - gui.hand = ILabel.EMPTY; + label = gui.hand; + gui.hand = label.EMPTY; return true; default: throw new IllegalPositionException(); @@ -98,7 +103,7 @@ public class DLabel implements IDrawable { return false; } - public boolean mouseIn(JecGui gui, int x, int y) { + public boolean mouseIn(int x, int y) { int xx = x - xPos; int yy = y - yPos; return xx >= 0 && xx < xSize && yy >= 0 && yy < ySize; diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DLabelGroup.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/DLabelGroup.java index 78202ba..8f8ca26 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DLabelGroup.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/DLabelGroup.java @@ -1,10 +1,13 @@ package me.towdium.jecalculation.client.gui.drawables; -import me.towdium.jecalculation.client.gui.JecGui; import me.towdium.jecalculation.client.gui.IDrawable; +import me.towdium.jecalculation.client.gui.JecGui; +import me.towdium.jecalculation.core.labels.ILabel; +import me.towdium.jecalculation.utils.wrappers.Single; import javax.annotation.ParametersAreNonnullByDefault; import java.util.ArrayList; +import java.util.List; import java.util.Optional; import java.util.stream.IntStream; @@ -21,8 +24,8 @@ public class DLabelGroup implements IDrawable { } public DLabelGroup(int xPos, int yPos, int column, int row, int xSize, int ySize, DLabel.enumMode mode) { - IntStream.range(0, column).forEach(c -> IntStream.range(0, row).forEach(r -> - widgets.add(new DLabel(xPos + c * xSize, yPos + r * ySize, xSize, ySize, mode)))); + IntStream.range(0, row).forEach(r -> IntStream.range(0, column).forEach( + c -> widgets.add(new DLabel(xPos + c * xSize, yPos + r * ySize, xSize, ySize, mode)))); } @Override @@ -35,7 +38,12 @@ public class DLabelGroup implements IDrawable { return widgets.stream().anyMatch(w -> w.onClicked(gui, xMouse, yMouse, button)); } - public Optional getEntryAt(JecGui gui, int xMouse, int yMouse) { - return widgets.stream().filter(w -> w.mouseIn(gui, xMouse, yMouse)).findFirst(); + public Optional getEntryAt(int xMouse, int yMouse) { + return widgets.stream().filter(w -> w.mouseIn(xMouse, yMouse)).findFirst(); + } + + public void setLabel(List labels, int start) { + Single i = new Single<>(start); + widgets.forEach(l -> l.setLabel(i.value < labels.size() ? labels.get(i.value++) : ILabel.EMPTY)); } } diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DLabelScroll.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/DLabelScroll.java new file mode 100644 index 0000000..a84dfca --- /dev/null +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/DLabelScroll.java @@ -0,0 +1,73 @@ +package me.towdium.jecalculation.client.gui.drawables; + +import me.towdium.jecalculation.client.gui.JecGui; +import me.towdium.jecalculation.core.labels.ILabel; +import me.towdium.jecalculation.utils.Utilities; + +import javax.annotation.ParametersAreNonnullByDefault; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * Author: towdium + * Date: 17-9-17. + */ +@ParametersAreNonnullByDefault +public class DLabelScroll extends DContainer { + protected List labels = new ArrayList<>(); + protected List filtered = new ArrayList<>(); + protected DLabelGroup labelGroup; + protected DScroll scroll; + protected int xPos, yPos, column, row, current; + protected String filter = ""; + + public DLabelScroll(int xPos, int yPos, int column, int row, DLabel.enumMode mode, boolean drawConnection) { + this.xPos = xPos; + this.yPos = yPos; + this.column = column; + this.row = row; + labelGroup = new DLabelGroup(xPos, yPos, column, row, mode); + scroll = new DScroll(xPos + column * 18 + 4, yPos, row * 18).setLsnrScroll(this::update); + add(labelGroup); + add(scroll); + if (drawConnection) add(new DRectangle(xPos + column * 18, yPos, 4, row * 18, JecGui.COLOR_GUI_GREY)); + } + + public void update(float f) { + int step = getStepAmount(); + current = (int) (step * f); + if (current == step) current--; + labelGroup.setLabel(filtered, current * column); + } + + @Override + public boolean onScroll(JecGui gui, int xMouse, int yMouse, int diff) { + boolean in = JecGui.mouseIn(xPos, yPos, column * 18, row * 18, xMouse, yMouse); + if (in) scroll.setCurrent(getPos(current - diff)); + return in; + } + + private float getPos(int step) { + return 1f / (getStepAmount() - 1) * step; + } + + public DLabelScroll setLabels(List labels) { + this.labels = labels; + setFilter(filter); + return this; + } + + public boolean setFilter(String str) { + filter = str; + filtered = labels.stream().filter(l -> Utilities.contains(l.getDisplayName(), str)) + .collect(Collectors.toList()); + scroll.setCurrent(0); + return filtered.size() != 0; + } + + private int getStepAmount() { + int line = (labels.size() + column - 1) / column; + return line - row + 1; + } +} diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DPage.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/DPage.java index 3556468..8569980 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DPage.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/DPage.java @@ -5,7 +5,6 @@ import me.towdium.jecalculation.client.gui.JecGui; import me.towdium.jecalculation.client.gui.Resource; import me.towdium.jecalculation.core.labels.ILabel; import me.towdium.jecalculation.utils.Utilities; -import me.towdium.jecalculation.utils.helpers.LocalizationHelper; import javax.annotation.ParametersAreNonnullByDefault; @@ -37,7 +36,7 @@ public class DPage implements IDrawable { record.representation.drawEntry(gui, index * 24 + 4, -17, false); timer.setState(JecGui.mouseIn(index * 24, -21, 24, 21, xMouse, yMouse)); if (timer.getTime() > 1000) - gui.drawTooltip(xMouse, yMouse, LocalizationHelper.format("gui." + record.localizeKey)); + gui.drawTooltip(xMouse, yMouse, Utilities.L18n.format("gui." + record.localizeKey)); } @Override diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DScroll.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/DScroll.java index 1083b74..9503a37 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DScroll.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/DScroll.java @@ -4,9 +4,11 @@ import me.towdium.jecalculation.client.gui.IDrawable; import me.towdium.jecalculation.client.gui.JecGui; import me.towdium.jecalculation.client.gui.Resource; import me.towdium.jecalculation.utils.Utilities.Circulator; +import org.lwjgl.input.Mouse; import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; +import java.util.function.Consumer; import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.Stream; @@ -17,48 +19,49 @@ import java.util.stream.Stream; */ @ParametersAreNonnullByDefault public class DScroll implements IDrawable { - public static final int SIZE = 13; + public int xPos, yPos, ySize, current; + public Consumer lsnrScroll; + protected boolean drag; - protected int xPos, xSize, yPos; - protected DButton left, right; - protected DRectangle wRect; - protected DText dText; - protected List keys; - protected Circulator index; - - public DScroll(int xPos, int yPos, int xSize, int total) { - this(xPos, yPos, xSize, IntStream.rangeClosed(1, total) - .mapToObj(i -> i + "/" + total).collect(Collectors.toList())); - } - - public DScroll(int xPos, int yPos, int xSize, List keys) { + public DScroll(int xPos, int yPos, int ySize) { this.xPos = xPos; - this.xSize = xSize; this.yPos = yPos; - this.keys = keys; - left = new DButtonIcon(xPos, yPos, SIZE, SIZE, Resource.WGT_ARR_L_N, Resource.WGT_ARR_L_F) - .setListenerLeft(() -> index.prev()); - right = new DButtonIcon(xPos + xSize - SIZE, yPos, SIZE, SIZE, - Resource.WGT_ARR_R_N, Resource.WGT_ARR_R_F) - .setListenerLeft(() -> index.next()); - wRect = new DRectangle(xPos + SIZE, yPos, xSize - 2 * SIZE, SIZE, JecGui.COLOR_GREY); - dText = new DText(xPos + SIZE, yPos, xSize - 2 * SIZE, SIZE, JecGui.Font.DEFAULT_SHADOW, - () -> keys.get(index.index())); - index = new Circulator(keys.size()); + this.ySize = ySize; } @Override public void onDraw(JecGui gui, int xMouse, int yMouse) { - Stream.of(left, right, wRect, dText).forEach(w -> w.onDraw(gui, xMouse, yMouse)); + if (Mouse.isButtonDown(0) && drag) setCurrent(yMouse); + else drag = false; + + gui.drawResourceContinuous(Resource.WGT_SLOT, xPos, yPos, 14, ySize, 3, 3, 3, 3); + gui.drawResource(Resource.WGT_SCROLL, xPos + 1, yPos + 1 + current); } @Override public boolean onClicked(JecGui gui, int xMouse, int yMouse, int button) { - return Stream.of(left, right).anyMatch(w -> w.onClicked(gui, xMouse, yMouse, button)); + drag = mouseIn(xMouse, yMouse); + if (drag) setCurrent(yMouse - yPos - 9); + return drag; } - @Override - public boolean onKey(JecGui gui, char ch, int code) { - return Stream.of(left, right).anyMatch(w -> w.onKey(gui, ch, code)); + private void setCurrent(int pos) { + current = pos; + if (current < 0) current = 0; + if (current > ySize - 17) current = ySize - 17; + if (lsnrScroll != null) lsnrScroll.accept(current / (ySize - 17f)); + } + + public void setCurrent(float ratio) { + setCurrent((int) ((ySize - 17) * ratio)); + } + + public boolean mouseIn(int xMouse, int yMouse) { + return JecGui.mouseIn(xPos + 1, yPos + 1, 12, ySize - 2, xMouse, yMouse); + } + + public DScroll setLsnrScroll(Consumer lsnrScroll) { + this.lsnrScroll = lsnrScroll; + return this; } } diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DSwitcher.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/DSwitcher.java new file mode 100644 index 0000000..711f16b --- /dev/null +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/DSwitcher.java @@ -0,0 +1,63 @@ +package me.towdium.jecalculation.client.gui.drawables; + +import me.towdium.jecalculation.client.gui.IDrawable; +import me.towdium.jecalculation.client.gui.JecGui; +import me.towdium.jecalculation.client.gui.Resource; +import me.towdium.jecalculation.utils.Utilities.Circulator; + +import javax.annotation.ParametersAreNonnullByDefault; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import java.util.stream.Stream; + +/** + * Author: towdium + * Date: 17-8-19. + */ +@ParametersAreNonnullByDefault +public class DSwitcher implements IDrawable { + public static final int SIZE = 13; + + protected int xPos, xSize, yPos; + protected DButton left, right; + protected DRectangle wRect; + protected DText dText; + protected List keys; + protected Circulator index; + + public DSwitcher(int xPos, int yPos, int xSize, int total) { + this(xPos, yPos, xSize, IntStream.rangeClosed(1, total) + .mapToObj(i -> i + "/" + total).collect(Collectors.toList())); + } + + public DSwitcher(int xPos, int yPos, int xSize, List keys) { + this.xPos = xPos; + this.xSize = xSize; + this.yPos = yPos; + this.keys = keys; + left = new DButtonIcon(xPos, yPos, SIZE, SIZE, Resource.WGT_ARR_L_N, Resource.WGT_ARR_L_F) + .setListenerLeft(() -> index.prev()); + right = new DButtonIcon(xPos + xSize - SIZE, yPos, SIZE, SIZE, Resource.WGT_ARR_R_N, Resource.WGT_ARR_R_F) + .setListenerLeft(() -> index.next()); + wRect = new DRectangle(xPos + SIZE, yPos, xSize - 2 * SIZE, SIZE, JecGui.COLOR_GUI_GREY); + dText = new DText(xPos + SIZE, yPos, xSize - 2 * SIZE, SIZE, JecGui.Font.DEFAULT_SHADOW, + () -> keys.get(index.index())); + index = new Circulator(keys.size()); + } + + @Override + public void onDraw(JecGui gui, int xMouse, int yMouse) { + Stream.of(left, right, wRect, dText).forEach(w -> w.onDraw(gui, xMouse, yMouse)); + } + + @Override + public boolean onClicked(JecGui gui, int xMouse, int yMouse, int button) { + return Stream.of(left, right).anyMatch(w -> w.onClicked(gui, xMouse, yMouse, button)); + } + + @Override + public boolean onKey(JecGui gui, char ch, int code) { + return Stream.of(left, right).anyMatch(w -> w.onKey(gui, ch, code)); + } +} diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DTextField.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/DTextField.java index 7bfca28..7b97d46 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DTextField.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/DTextField.java @@ -6,6 +6,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiTextField; import javax.annotation.ParametersAreNonnullByDefault; +import java.util.function.Consumer; /** * Author: towdium @@ -15,6 +16,8 @@ import javax.annotation.ParametersAreNonnullByDefault; public class DTextField implements IDrawable { protected int xPos, yPos, xSize; GuiTextField textField; + public Consumer lsnrText; + public DTextField(int xPos, int yPos, int xSize) { this.xPos = xPos; this.yPos = yPos; @@ -37,6 +40,19 @@ public class DTextField implements IDrawable { @Override public boolean onKey(JecGui gui, char ch, int code) { - return textField.textboxKeyTyped(ch, code); + boolean ret = textField.textboxKeyTyped(ch, code); + if (ret) lsnrText.accept(textField.getText()); + return ret; + } + + @SuppressWarnings("UnusedReturnValue") + public DTextField setLsnrText(Consumer lsnrText) { + this.lsnrText = lsnrText; + return this; + } + + public DTextField setColor(int color) { + textField.setTextColor(color); + return this; } } diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DTooltip.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/DTooltip.java index 6ffda5f..0d6f7c2 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DTooltip.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/DTooltip.java @@ -3,7 +3,6 @@ package me.towdium.jecalculation.client.gui.drawables; import me.towdium.jecalculation.client.gui.IDrawable; import me.towdium.jecalculation.client.gui.JecGui; import me.towdium.jecalculation.utils.Utilities; -import me.towdium.jecalculation.utils.helpers.LocalizationHelper; import me.towdium.jecalculation.utils.wrappers.Pair; import javax.annotation.Nullable; @@ -28,7 +27,7 @@ public abstract class DTooltip implements IDrawable { if (name != null) { timer.setState(mouseIn(xMouse, yMouse)); if (timer.getTime() > 500) { - Pair str = LocalizationHelper.search(String.join(".", "gui", name, "tooltip")); + Pair str = Utilities.L18n.search(String.join(".", "gui", name, "tooltip")); if (str.two || JecGui.ALWAYS_TOOLTIP) gui.drawTooltip(xMouse, yMouse, str.one); } } diff --git a/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiCalculator.java b/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiCalculator.java index d90ec7a..8953353 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiCalculator.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiCalculator.java @@ -30,6 +30,6 @@ public class GuiCalculator extends DContainer { add(new DLabel(31, 7, 20, 20, SELECTOR)); add(new DLine(52)); add(new DIcon(151, 31, 18, 18, Resource.ICN_RECENT_N, Resource.ICN_RECENT_F, "calculator.history")); - add(new DScroll(7, 56, 162, 5)); + add(new DSwitcher(7, 56, 162, 5)); } } diff --git a/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiDisambiguation.java b/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiDisambiguation.java new file mode 100644 index 0000000..0b48f4a --- /dev/null +++ b/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiDisambiguation.java @@ -0,0 +1,35 @@ +package me.towdium.jecalculation.client.gui.guis; + +import me.towdium.jecalculation.client.gui.JecGui; +import me.towdium.jecalculation.client.gui.Resource; +import me.towdium.jecalculation.client.gui.drawables.*; +import me.towdium.jecalculation.core.labels.ILabel; +import me.towdium.jecalculation.core.labels.labels.LabelOreDict; +import net.minecraft.item.ItemStack; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.IntStream; + +/** + * Author: towdium + * Date: 17-9-16. + */ +public class GuiDisambiguation extends DContainer { + public GuiDisambiguation(List> iss) { + ArrayList labels = new ArrayList<>(); + IntStream.range(0, 50).forEach(i -> labels.add(new LabelOreDict(i % 2 == 0 ? "plankWood" : "ingotIron", i))); + DLabelScroll lsUp = new DLabelScroll(25, 48, 7, 3, DLabel.enumMode.RESULT, true).setLabels(labels); + DLabelScroll lsDown = new DLabelScroll(25, 105, 7, 3, DLabel.enumMode.RESULT, true).setLabels(labels); + DTextField tf = new DTextField(25, 24, 90); + tf.setLsnrText(s -> tf.setColor(lsUp.setFilter(s) | lsDown.setFilter(s) ? + JecGui.COLOR_TEXT_WHITE : JecGui.COLOR_TEXT_RED)); + + add(new DPanel()); + add(new DSwitcher(7, 7, 162, 5)); + add(new DIcon(149, 24, 20, 20, Resource.ICN_HELP_N, Resource.ICN_HELP_F, "disambiguation.help")); + add(new DIcon(7, 48, 18, 54, Resource.ICN_LIST_N, Resource.ICN_LIST_F, "disambiguation.list")); + add(new DIcon(7, 105, 18, 54, Resource.ICN_LABEL_N, Resource.ICN_LABEL_F, "disambiguation.label")); + addAll(tf, lsUp, lsDown); + } +} diff --git a/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiRecipe.java b/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiRecipe.java index 0c1c8d1..7294d6e 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiRecipe.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiRecipe.java @@ -25,7 +25,7 @@ public class GuiRecipe extends DContainer { public GuiRecipe() { add(new DPanel()); - add(new DScroll(7, 7, 162, 2)); + add(new DSwitcher(7, 7, 162, 2)); add(new DIcon(7, 63, 21, 20, Resource.ICN_OUTPUT_N, Resource.ICN_OUTPUT_F, "recipe.output")); add(new DIcon(7, 87, 21, 20, Resource.ICN_CATALYST_N, Resource.ICN_CATALYST_F, "recipe.catalyst")); add(new DIcon(7, 111, 21, 40, Resource.ICN_INPUT_N, Resource.ICN_INPUT_F, "recipe.input")); diff --git a/src/main/java/me/towdium/jecalculation/command/commands/CommandState.java b/src/main/java/me/towdium/jecalculation/command/commands/CommandState.java index 0931534..4ca92d7 100644 --- a/src/main/java/me/towdium/jecalculation/command/commands/CommandState.java +++ b/src/main/java/me/towdium/jecalculation/command/commands/CommandState.java @@ -2,7 +2,7 @@ package me.towdium.jecalculation.command.commands; import me.towdium.jecalculation.JustEnoughCalculation; import me.towdium.jecalculation.command.SubCommand; -import me.towdium.jecalculation.utils.helpers.LocalizationHelper; +import me.towdium.jecalculation.utils.Utilities; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; import net.minecraft.util.ChatComponentTranslation; @@ -28,6 +28,6 @@ public class CommandState implements SubCommand { @Override public void execute(ICommandSender sender, String[] args) throws CommandException { sender.addChatMessage(new ChatComponentTranslation("command.state.desc", - LocalizationHelper.format(JustEnoughCalculation.side.toString()))); + Utilities.L18n.format(JustEnoughCalculation.side.toString()))); } } diff --git a/src/main/java/me/towdium/jecalculation/core/labels/ILabel.java b/src/main/java/me/towdium/jecalculation/core/labels/ILabel.java index 8c1678e..0ffda85 100644 --- a/src/main/java/me/towdium/jecalculation/core/labels/ILabel.java +++ b/src/main/java/me/towdium/jecalculation/core/labels/ILabel.java @@ -45,6 +45,10 @@ public interface ILabel { String getDisplayName(); + default List getToolTip(List existing) { + return existing; + } + default String getIdentifier() { String s = this.getClass().getSimpleName(); if (s.startsWith("Label")) s = s.substring(5); @@ -159,7 +163,7 @@ public interface ILabel { String s = nbt.getString(KEY_IDENTIFIER); ILabel e = idToData.get(s).apply(nbt.getCompoundTag(KEY_CONTENT)); if (e != ILabel.EMPTY) return e; - else throw new RuntimeException("Fail to deserialize ILabel type: " + s); + else throw new RuntimeException("Fail to deserialize label type: " + s); } } diff --git a/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelItemStack.java b/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelItemStack.java index b135180..83fd6fe 100644 --- a/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelItemStack.java +++ b/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelItemStack.java @@ -2,10 +2,13 @@ package me.towdium.jecalculation.core.labels.labels; import me.towdium.jecalculation.client.gui.JecGui; import me.towdium.jecalculation.core.labels.ILabel; +import me.towdium.jecalculation.utils.Utilities; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import java.util.List; + /** * Author: towdium * Date: 8/11/17. @@ -37,9 +40,15 @@ public class LabelItemStack extends LabelSimpleAmount { itemStack = eis.itemStack; } + @Override + public List getToolTip(List existing) { + existing.add("&9" + Utilities.getModName(itemStack)); + return existing; + } + @Override public String getDisplayName() { - return itemStack.getDisplayName(); + return itemStack.getItem() == null ? "" : itemStack.getDisplayName(); } @Override diff --git a/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelOreDict.java b/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelOreDict.java index ac3210f..67eba62 100644 --- a/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelOreDict.java +++ b/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelOreDict.java @@ -1,5 +1,6 @@ package me.towdium.jecalculation.core.labels.labels; +import me.towdium.jecalculation.JustEnoughCalculation; import me.towdium.jecalculation.client.gui.JecGui; import me.towdium.jecalculation.client.gui.Resource; import me.towdium.jecalculation.client.gui.drawables.DContainer; @@ -7,12 +8,14 @@ import me.towdium.jecalculation.client.gui.drawables.DText; import me.towdium.jecalculation.core.labels.ILabel; import me.towdium.jecalculation.polyfill.mc.client.renderer.GlStateManager; import me.towdium.jecalculation.polyfill.mc.util.NonNullList; +import me.towdium.jecalculation.utils.Utilities; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.oredict.OreDictionary; import javax.annotation.ParametersAreNonnullByDefault; +import java.util.List; import java.util.function.Consumer; /** @@ -48,7 +51,13 @@ public class LabelOreDict extends LabelSimpleAmount { @Override public String getDisplayName() { - return "Ore: " + name; // localization + return Utilities.L18n.format("label.ore_dict.name", name); + } + + @Override + public List getToolTip(List existing) { + existing.add("\u00A79\u00A7o" + JustEnoughCalculation.Reference.MODNAME); + return existing; } public static RegistryEditor.IEditor getEditor() { diff --git a/src/main/java/me/towdium/jecalculation/utils/Utilities.java b/src/main/java/me/towdium/jecalculation/utils/Utilities.java index 4b83813..a5b832b 100644 --- a/src/main/java/me/towdium/jecalculation/utils/Utilities.java +++ b/src/main/java/me/towdium/jecalculation/utils/Utilities.java @@ -6,8 +6,10 @@ import cpw.mods.fml.common.registry.GameData; import me.towdium.jecalculation.JustEnoughCalculation; import me.towdium.jecalculation.utils.wrappers.Pair; import me.towdium.jecalculation.utils.wrappers.Single; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import org.apache.commons.lang3.StringEscapeUtils; import java.util.*; import java.util.function.BiFunction; @@ -93,6 +95,10 @@ public class Utilities { return name; } + public static boolean contains(String s1, String s2) { + return s1.contains(s2); + } + public static class Timer { long time = System.currentTimeMillis(); boolean running = false; @@ -184,4 +190,19 @@ public class Utilities { return Optional.ofNullable(ret.value); } } + + public static class L18n { + public static Pair search(String translateKey, Object... parameters) { + Pair ret = new Pair<>(null, null); + String buffer = I18n.format(translateKey, parameters); + ret.two = !buffer.equals(translateKey); + buffer = StringEscapeUtils.unescapeJava(buffer); + ret.one = buffer.replace("\t", " "); + return ret; + } + + public static String format(String translateKey, Object... parameters) { + return search(translateKey, parameters).one; + } + } } diff --git a/src/main/java/me/towdium/jecalculation/utils/helpers/LocalizationHelper.java b/src/main/java/me/towdium/jecalculation/utils/helpers/LocalizationHelper.java deleted file mode 100644 index d8b37b0..0000000 --- a/src/main/java/me/towdium/jecalculation/utils/helpers/LocalizationHelper.java +++ /dev/null @@ -1,29 +0,0 @@ -package me.towdium.jecalculation.utils.helpers; - -import com.google.common.base.CaseFormat; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import me.towdium.jecalculation.utils.wrappers.Pair; -import net.minecraft.client.resources.I18n; -import org.apache.commons.lang3.StringEscapeUtils; - -/** - * Author: Towdium - * Created: 2016/6/22. - */ -@SideOnly(Side.CLIENT) -public class LocalizationHelper { - - public static Pair search(String translateKey, Object... parameters) { - Pair ret = new Pair<>(null, null); - String buffer = I18n.format(translateKey, parameters); - ret.two = !buffer.equals(translateKey); - buffer = StringEscapeUtils.unescapeJava(buffer); - ret.one = buffer.replace("\t", " "); - return ret; - } - - public static String format(String translateKey, Object... parameters) { - return search(translateKey, parameters).one; - } -} diff --git a/src/main/resources/assets/jecalculation/lang/en_US.lang b/src/main/resources/assets/jecalculation/lang/en_US.lang index a3da9ad..4491d2b 100644 --- a/src/main/resources/assets/jecalculation/lang/en_US.lang +++ b/src/main/resources/assets/jecalculation/lang/en_US.lang @@ -10,6 +10,9 @@ command.state.s_client=client only command.state.s_both=client with server command.state.s_undefined=error state -gui.gui_calculator.name.new_recipe=New recipe +gui.gui_calculator.new_recipe.name=New recipe +gui.common.label.ore_dict=OreDict config.force_client=Force Client + +label.ore_dict.name=Ore: %s diff --git a/src/main/resources/assets/jecalculation/textures/gui/resources.png b/src/main/resources/assets/jecalculation/textures/gui/resources.png index 86315cb2ede35a88ac860a47b819660514866e61..8428511e3eeaf8fc2874702e2f49948d40ccaf8a 100644 GIT binary patch literal 11171 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 literal 10659 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

DwH`b2ZZGOUuw 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 sb02f2gThnxBe|L)RVfZ@{$3N|Z@a-+cX~L0