From 82cdf8fbe2e336a3534bde5d5d625e5f860b8712 Mon Sep 17 00:00:00 2001 From: Discreater Date: Thu, 29 Apr 2021 02:36:33 +0800 Subject: [PATCH] chore: rename --- .../gui/{IDrawable.java => IWidget.java} | 4 +- .../jecalculation/client/gui/JecGui.java | 17 ++++---- .../drawables/{DButton.java => WButton.java} | 9 ++--- .../{DButtonIcon.java => WButtonIcon.java} | 6 +-- .../{DButtonText.java => WButtonText.java} | 4 +- .../{DContainer.java => WContainer.java} | 24 ++++++------ .../gui/drawables/{DIcon.java => WIcon.java} | 8 ++-- .../drawables/{DLabel.java => WLabel.java} | 8 ++-- .../{DLabelGroup.java => WLabelGroup.java} | 14 +++---- .../{DLabelScroll.java => WLabelScroll.java} | 16 ++++---- .../gui/drawables/{DLine.java => WLine.java} | 6 +-- .../gui/drawables/{DPage.java => WPage.java} | 10 ++--- .../drawables/{DPanel.java => WPanel.java} | 4 +- .../{DRectangle.java => WRectangle.java} | 6 +-- .../drawables/{DScroll.java => WScroll.java} | 13 ++----- .../drawables/{DSearch.java => WSearch.java} | 10 ++--- .../{DSwitcher.java => WSwitcher.java} | 26 ++++++------- .../gui/drawables/{DText.java => WText.java} | 16 ++++---- .../{DTextField.java => WTextField.java} | 10 ++--- .../{DTooltip.java => WTooltip.java} | 6 +-- .../client/gui/guis/GuiCalculator.java | 26 ++++++------- .../client/gui/guis/GuiDisambiguation.java | 21 +++++----- .../client/gui/guis/GuiEditorFluidStack.java | 14 +++---- .../client/gui/guis/GuiLabel.java | 26 ++++++------- .../client/gui/guis/GuiRecipe.java | 39 +++++++++---------- .../jecalculation/core/labels/ILabel.java | 14 +++---- .../core/labels/labels/LabelFluidStack.java | 4 +- .../core/labels/labels/LabelItemStack.java | 2 +- .../core/labels/labels/LabelOreDict.java | 8 ++-- .../jecalculation/nei/JecaTooltipHandler.java | 2 +- .../towdium/jecalculation/nei/NEIPlugin.java | 4 +- 31 files changed, 180 insertions(+), 197 deletions(-) rename src/main/java/me/towdium/jecalculation/client/gui/{IDrawable.java => IWidget.java} (83%) rename src/main/java/me/towdium/jecalculation/client/gui/drawables/{DButton.java => WButton.java} (87%) rename src/main/java/me/towdium/jecalculation/client/gui/drawables/{DButtonIcon.java => WButtonIcon.java} (85%) rename src/main/java/me/towdium/jecalculation/client/gui/drawables/{DButtonText.java => WButtonText.java} (91%) rename src/main/java/me/towdium/jecalculation/client/gui/drawables/{DContainer.java => WContainer.java} (69%) rename src/main/java/me/towdium/jecalculation/client/gui/drawables/{DIcon.java => WIcon.java} (83%) rename src/main/java/me/towdium/jecalculation/client/gui/drawables/{DLabel.java => WLabel.java} (95%) rename src/main/java/me/towdium/jecalculation/client/gui/drawables/{DLabelGroup.java => WLabelGroup.java} (73%) rename src/main/java/me/towdium/jecalculation/client/gui/drawables/{DLabelScroll.java => WLabelScroll.java} (80%) rename src/main/java/me/towdium/jecalculation/client/gui/drawables/{DLine.java => WLine.java} (79%) rename src/main/java/me/towdium/jecalculation/client/gui/drawables/{DPage.java => WPage.java} (85%) rename src/main/java/me/towdium/jecalculation/client/gui/drawables/{DPanel.java => WPanel.java} (83%) rename src/main/java/me/towdium/jecalculation/client/gui/drawables/{DRectangle.java => WRectangle.java} (78%) rename src/main/java/me/towdium/jecalculation/client/gui/drawables/{DScroll.java => WScroll.java} (80%) rename src/main/java/me/towdium/jecalculation/client/gui/drawables/{DSearch.java => WSearch.java} (82%) rename src/main/java/me/towdium/jecalculation/client/gui/drawables/{DSwitcher.java => WSwitcher.java} (70%) rename src/main/java/me/towdium/jecalculation/client/gui/drawables/{DText.java => WText.java} (74%) rename src/main/java/me/towdium/jecalculation/client/gui/drawables/{DTextField.java => WTextField.java} (85%) rename src/main/java/me/towdium/jecalculation/client/gui/drawables/{DTooltip.java => WTooltip.java} (86%) diff --git a/src/main/java/me/towdium/jecalculation/client/gui/IDrawable.java b/src/main/java/me/towdium/jecalculation/client/gui/IWidget.java similarity index 83% rename from src/main/java/me/towdium/jecalculation/client/gui/IDrawable.java rename to src/main/java/me/towdium/jecalculation/client/gui/IWidget.java index a29046a..2d8754b 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/IDrawable.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/IWidget.java @@ -1,8 +1,6 @@ package me.towdium.jecalculation.client.gui; -import me.towdium.jecalculation.client.gui.JecGui; - -public interface IDrawable { +public interface IWidget { void onDraw(JecGui gui, int xMouse, int yMouse); default boolean onClicked(JecGui gui, int xMouse, int yMouse, int button) { 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 0d5eea4..2ca625a 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/JecGui.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/JecGui.java @@ -2,7 +2,6 @@ package me.towdium.jecalculation.client.gui; import cpw.mods.fml.client.config.GuiUtils; import me.towdium.jecalculation.JustEnoughCalculation; -import me.towdium.jecalculation.client.gui.drawables.DContainer; import me.towdium.jecalculation.core.labels.ILabel; import me.towdium.jecalculation.nei.NEIPlugin; import me.towdium.jecalculation.polyfill.mc.client.renderer.GlStateManager; @@ -46,14 +45,14 @@ public class JecGui extends GuiContainer { protected JecGui parent; public ILabel hand = ILabel.EMPTY; - public IDrawable root; + public IWidget root; protected List>> tooltipBuffer = new ArrayList<>(); - public JecGui(@Nullable JecGui parent, IDrawable root) { + public JecGui(@Nullable JecGui parent, IWidget root) { this(parent, false, root); } - public JecGui(@Nullable JecGui parent, boolean acceptsTransfer, IDrawable root) { + public JecGui(@Nullable JecGui parent, boolean acceptsTransfer, IWidget root) { super(acceptsTransfer ? new ContainerTransfer() : new ContainerNonTransfer()); this.parent = parent; this.root = root; @@ -64,11 +63,11 @@ public class JecGui extends GuiContainer { return xMouse > xPos && yMouse > yPos && xMouse <= xPos + xSize && yMouse <= yPos + ySize; } - public static void displayGui(IDrawable root) { + public static void displayGui(IWidget root) { displayGui(true, false, root); } - public static void displayGui(boolean updateParent, boolean acceptsTransfer, IDrawable root) { + public static void displayGui(boolean updateParent, boolean acceptsTransfer, IWidget root) { // isCallingFromMinecraftThread if (Minecraft.getMinecraft().func_152345_ab()) displayGuiUnsafe(updateParent, acceptsTransfer, root); @@ -86,7 +85,7 @@ public class JecGui extends GuiContainer { return ret; } - private static void displayGuiUnsafe(boolean updateParent, boolean acceptsTransfer, IDrawable root) { + private static void displayGuiUnsafe(boolean updateParent, boolean acceptsTransfer, IWidget root) { Minecraft mc = Minecraft.getMinecraft(); JecGui parent; if (mc.currentScreen == null) parent = null; @@ -125,7 +124,7 @@ public class JecGui extends GuiContainer { GlStateManager.popMatrix(); GlStateManager.pushMatrix(); GlStateManager.translate(mouseX - 8, mouseY - 8, 0); - hand.drawEntry(this); + hand.drawLabel(this); GlStateManager.popMatrix(); drawBufferedTooltip(); GlStateManager.enableLighting(); @@ -145,7 +144,7 @@ public class JecGui extends GuiContainer { if (Mouse.getEventButtonState()) { if (Mouse.getEventButton() == 0) { if (hand == ILabel.EMPTY) { - ILabel e = NEIPlugin.getEntryUnderMouse(); + ILabel e = NEIPlugin.getLabelUnderMouse(); if (e != ILabel.EMPTY) { hand = e; return true; diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DButton.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WButton.java similarity index 87% rename from src/main/java/me/towdium/jecalculation/client/gui/drawables/DButton.java rename to src/main/java/me/towdium/jecalculation/client/gui/drawables/WButton.java index 81f23fb..944403e 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DButton.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WButton.java @@ -2,7 +2,6 @@ package me.towdium.jecalculation.client.gui.drawables; import me.towdium.jecalculation.client.gui.JecGui; import me.towdium.jecalculation.client.gui.Resource; -import me.towdium.jecalculation.client.gui.IDrawable; import me.towdium.jecalculation.utils.ClientUtils; import me.towdium.jecalculation.utils.Utilities; @@ -14,12 +13,12 @@ import javax.annotation.ParametersAreNonnullByDefault; * Date: 17-8-17. */ @ParametersAreNonnullByDefault -public abstract class DButton extends DTooltip { +public abstract class WButton extends WTooltip { protected int xPos, yPos, xSize, ySize; protected Runnable lsnrLeft, lsnrRight; protected Utilities.Timer timer = new Utilities.Timer(); - public DButton(int xPos, int yPos, int xSize, int ySize, @Nullable String name) { + public WButton(int xPos, int yPos, int xSize, int ySize, @Nullable String name) { super(name); this.xPos = xPos; this.yPos = yPos; @@ -27,12 +26,12 @@ public abstract class DButton extends DTooltip { this.ySize = ySize; } - public DButton setListenerLeft(Runnable r) { + public WButton setListenerLeft(Runnable r) { lsnrLeft = r; return this; } - public DButton setListenerRight(Runnable r) { + public WButton setListenerRight(Runnable r) { lsnrRight = r; return this; } diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DButtonIcon.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WButtonIcon.java similarity index 85% rename from src/main/java/me/towdium/jecalculation/client/gui/drawables/DButtonIcon.java rename to src/main/java/me/towdium/jecalculation/client/gui/drawables/WButtonIcon.java index c5fbcd8..e8f2734 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DButtonIcon.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WButtonIcon.java @@ -11,14 +11,14 @@ import javax.annotation.ParametersAreNonnullByDefault; * Date: 17-9-16. */ @ParametersAreNonnullByDefault -public class DButtonIcon extends DButton { +public class WButtonIcon extends WButton { protected Resource normal, focused; - public DButtonIcon(int xPos, int yPos, int xSize, int ySize, Resource normal, Resource focused) { + public WButtonIcon(int xPos, int yPos, int xSize, int ySize, Resource normal, Resource focused) { this(xPos, yPos, xSize, ySize, normal, focused, null); } - public DButtonIcon(int xPos, int yPos, int xSize, int ySize, Resource normal, Resource focused, @Nullable String name) { + public WButtonIcon(int xPos, int yPos, int xSize, int ySize, Resource normal, Resource focused, @Nullable String name) { super(xPos, yPos, xSize, ySize, name); this.normal = normal; this.focused = focused; diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DButtonText.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WButtonText.java similarity index 91% rename from src/main/java/me/towdium/jecalculation/client/gui/drawables/DButtonText.java rename to src/main/java/me/towdium/jecalculation/client/gui/drawables/WButtonText.java index 284f19e..dc1c2c3 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DButtonText.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WButtonText.java @@ -10,8 +10,8 @@ import javax.annotation.ParametersAreNonnullByDefault; * Date: 17-9-16. */ @ParametersAreNonnullByDefault -public class DButtonText extends DButton { - public DButtonText(int xPos, int yPos, int xSize, int ySize, String name) { +public class WButtonText extends WButton { + public WButtonText(int xPos, int yPos, int xSize, int ySize, String name) { super(xPos, yPos, xSize, ySize, name); } diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DContainer.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WContainer.java similarity index 69% rename from src/main/java/me/towdium/jecalculation/client/gui/drawables/DContainer.java rename to src/main/java/me/towdium/jecalculation/client/gui/drawables/WContainer.java index 83a047b..8f6275c 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DContainer.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WContainer.java @@ -1,7 +1,7 @@ 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.IWidget; import javax.annotation.ParametersAreNonnullByDefault; import java.util.ArrayList; @@ -12,25 +12,25 @@ import java.util.List; * Date: 17-9-14. */ @ParametersAreNonnullByDefault -public class DContainer implements IDrawable { - protected List widgets = new ArrayList<>(); +public class WContainer implements IWidget { + protected List widgets = new ArrayList<>(); protected JecGui gui; - public void add(IDrawable w) { + public void add(IWidget w) { widgets.add(w); } - public void addAll(IDrawable... w) { - for (IDrawable aw : w) + public void addAll(IWidget... w) { + for (IWidget aw : w) add(aw); } - public void remove(IDrawable w) { + public void remove(IWidget w) { widgets.remove(w); } - public void removeAll(IDrawable... w) { - for (IDrawable aw : w) + public void removeAll(IWidget... w) { + for (IWidget aw : w) remove(aw); } @@ -45,19 +45,19 @@ public class DContainer implements IDrawable { @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 (IWidget 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 (IWidget 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; + for (IWidget 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/WIcon.java similarity index 83% rename from src/main/java/me/towdium/jecalculation/client/gui/drawables/DIcon.java rename to src/main/java/me/towdium/jecalculation/client/gui/drawables/WIcon.java index cc176be..1272254 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DIcon.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WIcon.java @@ -1,9 +1,7 @@ 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.Timer; import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; @@ -14,15 +12,15 @@ import javax.annotation.ParametersAreNonnullByDefault; * Date: 17-8-18. */ @ParametersAreNonnullByDefault -public class DIcon extends DTooltip { +public class WIcon extends WTooltip { public int xPos, yPos, xSize, ySize; public Resource normal, focused; - public DIcon(int xPos, int yPos, int xSize, int ySize, Resource normal, Resource focused) { + public WIcon(int xPos, int yPos, int xSize, int ySize, Resource normal, Resource focused) { this(xPos, yPos, xSize, ySize, normal, focused, null); } - public DIcon(int xPos, int yPos, int xSize, int ySize, + public WIcon(int xPos, int yPos, int xSize, int ySize, Resource normal, Resource focused, @Nullable String name) { super(name); this.xPos = xPos; diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DLabel.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WLabel.java similarity index 95% rename from src/main/java/me/towdium/jecalculation/client/gui/drawables/DLabel.java rename to src/main/java/me/towdium/jecalculation/client/gui/drawables/WLabel.java index 4612be8..c9d7c9b 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DLabel.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WLabel.java @@ -1,6 +1,6 @@ package me.towdium.jecalculation.client.gui.drawables; -import me.towdium.jecalculation.client.gui.IDrawable; +import me.towdium.jecalculation.client.gui.IWidget; import me.towdium.jecalculation.client.gui.JecGui; import me.towdium.jecalculation.client.gui.Resource; import me.towdium.jecalculation.core.labels.ILabel; @@ -14,7 +14,7 @@ import java.util.ArrayList; * Date: 17-8-17. */ @ParametersAreNonnullByDefault -public class DLabel implements IDrawable { +public class WLabel implements IWidget { static JecGui.Font font; static { @@ -26,7 +26,7 @@ public class DLabel implements IDrawable { public ILabel label; public enumMode mode; - public DLabel(int xPos, int yPos, int xSize, int ySize, enumMode mode) { + public WLabel(int xPos, int yPos, int xSize, int ySize, enumMode mode) { this.xPos = xPos; this.yPos = yPos; this.xSize = xSize; @@ -46,7 +46,7 @@ public class DLabel implements IDrawable { @Override public void onDraw(JecGui gui, int xMouse, int yMouse) { gui.drawResourceContinuous(Resource.WGT_SLOT, xPos, yPos, xSize, ySize, 3, 3, 3, 3); - label.drawEntry(gui, xPos + xSize / 2, yPos + ySize / 2, true); + label.drawLabel(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, label.getAmountString()); diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DLabelGroup.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WLabelGroup.java similarity index 73% rename from src/main/java/me/towdium/jecalculation/client/gui/drawables/DLabelGroup.java rename to src/main/java/me/towdium/jecalculation/client/gui/drawables/WLabelGroup.java index 8f8ca26..c855f2f 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DLabelGroup.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WLabelGroup.java @@ -1,6 +1,6 @@ package me.towdium.jecalculation.client.gui.drawables; -import me.towdium.jecalculation.client.gui.IDrawable; +import me.towdium.jecalculation.client.gui.IWidget; import me.towdium.jecalculation.client.gui.JecGui; import me.towdium.jecalculation.core.labels.ILabel; import me.towdium.jecalculation.utils.wrappers.Single; @@ -16,16 +16,16 @@ import java.util.stream.IntStream; * Date: 17-8-17. */ @ParametersAreNonnullByDefault -public class DLabelGroup implements IDrawable { - ArrayList widgets = new ArrayList<>(); +public class WLabelGroup implements IWidget { + ArrayList widgets = new ArrayList<>(); - public DLabelGroup(int xPos, int yPos, int column, int row, DLabel.enumMode mode) { + public WLabelGroup(int xPos, int yPos, int column, int row, WLabel.enumMode mode) { this(xPos, yPos, column, row, 18, 18, mode); } - public DLabelGroup(int xPos, int yPos, int column, int row, int xSize, int ySize, DLabel.enumMode mode) { + public WLabelGroup(int xPos, int yPos, int column, int row, int xSize, int ySize, WLabel.enumMode 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)))); + c -> widgets.add(new WLabel(xPos + c * xSize, yPos + r * ySize, xSize, ySize, mode)))); } @Override @@ -38,7 +38,7 @@ public class DLabelGroup implements IDrawable { return widgets.stream().anyMatch(w -> w.onClicked(gui, xMouse, yMouse, button)); } - public Optional getEntryAt(int xMouse, int yMouse) { + public Optional getLabelAt(int xMouse, int yMouse) { return widgets.stream().filter(w -> w.mouseIn(xMouse, yMouse)).findFirst(); } diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DLabelScroll.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WLabelScroll.java similarity index 80% rename from src/main/java/me/towdium/jecalculation/client/gui/drawables/DLabelScroll.java rename to src/main/java/me/towdium/jecalculation/client/gui/drawables/WLabelScroll.java index a0d4e5d..ba95e59 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DLabelScroll.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WLabelScroll.java @@ -14,24 +14,24 @@ import java.util.stream.Collectors; * Date: 17-9-17. */ @ParametersAreNonnullByDefault -public class DLabelScroll extends DContainer { +public class WLabelScroll extends WContainer { protected List labels = new ArrayList<>(); protected List filtered = new ArrayList<>(); - protected DLabelGroup labelGroup; - protected DScroll scroll; + protected WLabelGroup labelGroup; + protected WScroll 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) { + public WLabelScroll(int xPos, int yPos, int column, int row, WLabel.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); + labelGroup = new WLabelGroup(xPos, yPos, column, row, mode); + scroll = new WScroll(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)); + if (drawConnection) add(new WRectangle(xPos + column * 18, yPos, 4, row * 18, JecGui.COLOR_GUI_GREY)); } public void update(float f) { @@ -52,7 +52,7 @@ public class DLabelScroll extends DContainer { return 1f / (getStepAmount() - 1) * step; } - public DLabelScroll setLabels(List labels) { + public WLabelScroll setLabels(List labels) { this.labels = labels; setFilter(filter); return this; diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DLine.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WLine.java similarity index 79% rename from src/main/java/me/towdium/jecalculation/client/gui/drawables/DLine.java rename to src/main/java/me/towdium/jecalculation/client/gui/drawables/WLine.java index 6537783..33439b7 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DLine.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WLine.java @@ -1,6 +1,6 @@ package me.towdium.jecalculation.client.gui.drawables; -import me.towdium.jecalculation.client.gui.IDrawable; +import me.towdium.jecalculation.client.gui.IWidget; import me.towdium.jecalculation.client.gui.JecGui; import me.towdium.jecalculation.client.gui.Resource; @@ -11,10 +11,10 @@ import javax.annotation.ParametersAreNonnullByDefault; * Date: 17-8-18. */ @ParametersAreNonnullByDefault -public class DLine implements IDrawable { +public class WLine implements IWidget { public int y; - public DLine(int y) { + public WLine(int y) { this.y = y; } diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DPage.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WPage.java similarity index 85% rename from src/main/java/me/towdium/jecalculation/client/gui/drawables/DPage.java rename to src/main/java/me/towdium/jecalculation/client/gui/drawables/WPage.java index 8569980..8a48432 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DPage.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WPage.java @@ -1,6 +1,6 @@ package me.towdium.jecalculation.client.gui.drawables; -import me.towdium.jecalculation.client.gui.IDrawable; +import me.towdium.jecalculation.client.gui.IWidget; import me.towdium.jecalculation.client.gui.JecGui; import me.towdium.jecalculation.client.gui.Resource; import me.towdium.jecalculation.core.labels.ILabel; @@ -13,7 +13,7 @@ import javax.annotation.ParametersAreNonnullByDefault; * Date: 17-9-16. */ @ParametersAreNonnullByDefault -public class DPage implements IDrawable { +public class WPage implements IWidget { protected int index; @@ -22,7 +22,7 @@ public class DPage implements IDrawable { protected boolean focused; protected Runnable listener; - public DPage(int index, ILabel.RegistryEditor.Record record, boolean focused) { + public WPage(int index, ILabel.RegistryEditor.Record record, boolean focused) { this.index = index; this.record = record; this.focused = focused; @@ -33,7 +33,7 @@ public class DPage implements IDrawable { Resource resource = focused ? (index == 0 ? Resource.WGT_PAGER_F0 : Resource.WGT_PAGER_FN) : Resource.WGT_PAGER_N; gui.drawResourceContinuous(resource, index * 24, -21, 24, 25, 4, 4, 4, 4); - record.representation.drawEntry(gui, index * 24 + 4, -17, false); + record.representation.drawLabel(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, Utilities.L18n.format("gui." + record.localizeKey)); @@ -46,7 +46,7 @@ public class DPage implements IDrawable { return ret; } - public DPage setListener(Runnable r) { + public WPage setListener(Runnable r) { listener = r; return this; } diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DPanel.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WPanel.java similarity index 83% rename from src/main/java/me/towdium/jecalculation/client/gui/drawables/DPanel.java rename to src/main/java/me/towdium/jecalculation/client/gui/drawables/WPanel.java index 7a1546a..b4df862 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DPanel.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WPanel.java @@ -1,6 +1,6 @@ package me.towdium.jecalculation.client.gui.drawables; -import me.towdium.jecalculation.client.gui.IDrawable; +import me.towdium.jecalculation.client.gui.IWidget; import me.towdium.jecalculation.client.gui.JecGui; import me.towdium.jecalculation.client.gui.Resource; @@ -11,7 +11,7 @@ import javax.annotation.ParametersAreNonnullByDefault; * Date: 17-9-15. */ @ParametersAreNonnullByDefault -public class DPanel implements IDrawable { +public class WPanel implements IWidget { @Override public void onDraw(JecGui gui, int xMouse, int yMouse) { gui.drawResourceContinuous(Resource.WGT_PANEL, 0, 0, gui.getXSize(), gui.getYSize(), 5, 5, 5, 5); diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DRectangle.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WRectangle.java similarity index 78% rename from src/main/java/me/towdium/jecalculation/client/gui/drawables/DRectangle.java rename to src/main/java/me/towdium/jecalculation/client/gui/drawables/WRectangle.java index 0715df7..091c939 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DRectangle.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WRectangle.java @@ -1,6 +1,6 @@ package me.towdium.jecalculation.client.gui.drawables; -import me.towdium.jecalculation.client.gui.IDrawable; +import me.towdium.jecalculation.client.gui.IWidget; import me.towdium.jecalculation.client.gui.JecGui; import javax.annotation.ParametersAreNonnullByDefault; @@ -10,10 +10,10 @@ import javax.annotation.ParametersAreNonnullByDefault; * Date: 17-8-22. */ @ParametersAreNonnullByDefault -public class DRectangle implements IDrawable { +public class WRectangle implements IWidget { public int xPos, yPos, xSize, ySize, color; - public DRectangle(int xPos, int yPos, int xSize, int ySize, int color) { + public WRectangle(int xPos, int yPos, int xSize, int ySize, int color) { this.xPos = xPos; this.yPos = yPos; this.xSize = xSize; diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DScroll.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WScroll.java similarity index 80% rename from src/main/java/me/towdium/jecalculation/client/gui/drawables/DScroll.java rename to src/main/java/me/towdium/jecalculation/client/gui/drawables/WScroll.java index ab556f5..1e366fc 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DScroll.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WScroll.java @@ -1,29 +1,24 @@ package me.towdium.jecalculation.client.gui.drawables; -import me.towdium.jecalculation.client.gui.IDrawable; +import me.towdium.jecalculation.client.gui.IWidget; 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; /** * Author: towdium * Date: 17-8-19. */ @ParametersAreNonnullByDefault -public class DScroll implements IDrawable { +public class WScroll implements IWidget { public int xPos, yPos, ySize, current; public Consumer lsnrScroll; protected boolean drag; - public DScroll(int xPos, int yPos, int ySize) { + public WScroll(int xPos, int yPos, int ySize) { this.xPos = xPos; this.yPos = yPos; this.ySize = ySize; @@ -60,7 +55,7 @@ public class DScroll implements IDrawable { return JecGui.mouseIn(xPos + 1, yPos + 1, 12, ySize - 2, xMouse, yMouse); } - public DScroll setLsnrScroll(Consumer lsnrScroll) { + public WScroll setLsnrScroll(Consumer lsnrScroll) { this.lsnrScroll = lsnrScroll; return this; } diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DSearch.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WSearch.java similarity index 82% rename from src/main/java/me/towdium/jecalculation/client/gui/drawables/DSearch.java rename to src/main/java/me/towdium/jecalculation/client/gui/drawables/WSearch.java index 44cf9e2..4705ac6 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DSearch.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WSearch.java @@ -13,13 +13,13 @@ import java.util.function.Consumer; * Date: 17-9-28. */ @ParametersAreNonnullByDefault -public class DSearch extends DContainer { - DTextField tf; - List lss; +public class WSearch extends WContainer { + WTextField tf; + List lss; Consumer callback; - public DSearch(Consumer callback, DTextField tf, DLabelScroll... lss) { - List lst = Arrays.asList(lss); + public WSearch(Consumer callback, WTextField tf, WLabelScroll... lss) { + List lst = Arrays.asList(lss); tf.setLsnrText(s -> tf.setColor(lst.stream().anyMatch(ls -> ls.setFilter(s)) ? JecGui.COLOR_TEXT_WHITE : JecGui.COLOR_TEXT_RED)); add(tf); diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DSwitcher.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WSwitcher.java similarity index 70% rename from src/main/java/me/towdium/jecalculation/client/gui/drawables/DSwitcher.java rename to src/main/java/me/towdium/jecalculation/client/gui/drawables/WSwitcher.java index 711f16b..a822e22 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DSwitcher.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WSwitcher.java @@ -1,6 +1,6 @@ package me.towdium.jecalculation.client.gui.drawables; -import me.towdium.jecalculation.client.gui.IDrawable; +import me.towdium.jecalculation.client.gui.IWidget; import me.towdium.jecalculation.client.gui.JecGui; import me.towdium.jecalculation.client.gui.Resource; import me.towdium.jecalculation.utils.Utilities.Circulator; @@ -16,39 +16,39 @@ import java.util.stream.Stream; * Date: 17-8-19. */ @ParametersAreNonnullByDefault -public class DSwitcher implements IDrawable { +public class WSwitcher implements IWidget { public static final int SIZE = 13; protected int xPos, xSize, yPos; - protected DButton left, right; - protected DRectangle wRect; - protected DText dText; + protected WButton left, right; + protected WRectangle wRect; + protected WText wText; protected List keys; protected Circulator index; - public DSwitcher(int xPos, int yPos, int xSize, int total) { + public WSwitcher(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) { + public WSwitcher(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) + left = new WButtonIcon(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) + right = new WButtonIcon(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())); + wRect = new WRectangle(xPos + SIZE, yPos, xSize - 2 * SIZE, SIZE, JecGui.COLOR_GUI_GREY); + wText = new WText(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)); + Stream.of(left, right, wRect, wText).forEach(w -> w.onDraw(gui, xMouse, yMouse)); } @Override diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DText.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WText.java similarity index 74% rename from src/main/java/me/towdium/jecalculation/client/gui/drawables/DText.java rename to src/main/java/me/towdium/jecalculation/client/gui/drawables/WText.java index 7fa09f9..04cc299 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DText.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WText.java @@ -1,6 +1,6 @@ package me.towdium.jecalculation.client.gui.drawables; -import me.towdium.jecalculation.client.gui.IDrawable; +import me.towdium.jecalculation.client.gui.IWidget; import me.towdium.jecalculation.client.gui.JecGui; import javax.annotation.ParametersAreNonnullByDefault; @@ -11,35 +11,35 @@ import java.util.function.Supplier; * Date: 17-8-21. */ @ParametersAreNonnullByDefault -public class DText implements IDrawable { +public class WText implements IWidget { public static final int UNDEFINED = Integer.MAX_VALUE; public int xPos, yPos, xSize, ySize; public JecGui.Font font; public Supplier key; - public DText(int xPos, int yPos, JecGui.Font font, String key) { + public WText(int xPos, int yPos, JecGui.Font font, String key) { this(xPos, yPos, UNDEFINED, UNDEFINED, font, key); } - public DText(int xPos, int yPos, JecGui.Font font, Supplier key) { + public WText(int xPos, int yPos, JecGui.Font font, Supplier key) { this(xPos, yPos, UNDEFINED, UNDEFINED, font, key); } - public DText(int xPos, int yPos, int xSize, JecGui.Font font, String key) { + public WText(int xPos, int yPos, int xSize, JecGui.Font font, String key) { this(xPos, yPos, xSize, UNDEFINED, font, key); } - public DText(int xPos, int yPos, int xSize, JecGui.Font font, Supplier key) { + public WText(int xPos, int yPos, int xSize, JecGui.Font font, Supplier key) { this(xPos, yPos, xSize, UNDEFINED, font, key); } - public DText(int xPos, int yPos, int xSize, int ySize, JecGui.Font font, String key) { + public WText(int xPos, int yPos, int xSize, int ySize, JecGui.Font font, String key) { this(xPos, yPos, xSize, UNDEFINED, font, () -> key); } - public DText(int xPos, int yPos, int xSize, int ySize, JecGui.Font font, Supplier key) { + public WText(int xPos, int yPos, int xSize, int ySize, JecGui.Font font, Supplier key) { this.xPos = xPos; this.yPos = yPos; this.xSize = xSize; diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DTextField.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WTextField.java similarity index 85% rename from src/main/java/me/towdium/jecalculation/client/gui/drawables/DTextField.java rename to src/main/java/me/towdium/jecalculation/client/gui/drawables/WTextField.java index 7b97d46..aec97a1 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DTextField.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WTextField.java @@ -1,7 +1,7 @@ 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.IWidget; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiTextField; @@ -13,12 +13,12 @@ import java.util.function.Consumer; * Date: 17-8-18. */ @ParametersAreNonnullByDefault -public class DTextField implements IDrawable { +public class WTextField implements IWidget { protected int xPos, yPos, xSize; GuiTextField textField; public Consumer lsnrText; - public DTextField(int xPos, int yPos, int xSize) { + public WTextField(int xPos, int yPos, int xSize) { this.xPos = xPos; this.yPos = yPos; this.xSize = xSize; @@ -46,12 +46,12 @@ public class DTextField implements IDrawable { } @SuppressWarnings("UnusedReturnValue") - public DTextField setLsnrText(Consumer lsnrText) { + public WTextField setLsnrText(Consumer lsnrText) { this.lsnrText = lsnrText; return this; } - public DTextField setColor(int color) { + public WTextField 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/WTooltip.java similarity index 86% rename from src/main/java/me/towdium/jecalculation/client/gui/drawables/DTooltip.java rename to src/main/java/me/towdium/jecalculation/client/gui/drawables/WTooltip.java index 0d6f7c2..473d31e 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DTooltip.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WTooltip.java @@ -1,6 +1,6 @@ package me.towdium.jecalculation.client.gui.drawables; -import me.towdium.jecalculation.client.gui.IDrawable; +import me.towdium.jecalculation.client.gui.IWidget; import me.towdium.jecalculation.client.gui.JecGui; import me.towdium.jecalculation.utils.Utilities; import me.towdium.jecalculation.utils.wrappers.Pair; @@ -13,12 +13,12 @@ import javax.annotation.ParametersAreNonnullByDefault; * Date: 17-9-16. */ @ParametersAreNonnullByDefault -public abstract class DTooltip implements IDrawable { +public abstract class WTooltip implements IWidget { @Nullable public String name; Utilities.Timer timer = new Utilities.Timer(); - public DTooltip(@Nullable String name) { + public WTooltip(@Nullable String name) { this.name = name; } 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 164d8fe..4206d32 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 @@ -6,30 +6,30 @@ import me.towdium.jecalculation.client.gui.drawables.*; import javax.annotation.ParametersAreNonnullByDefault; -import static me.towdium.jecalculation.client.gui.drawables.DLabel.enumMode.*; +import static me.towdium.jecalculation.client.gui.drawables.WLabel.enumMode.*; /** * Author: towdium * Date: 8/14/17. */ @ParametersAreNonnullByDefault -public class GuiCalculator extends DContainer { +public class GuiCalculator extends WContainer { public GuiCalculator() { - add(new DPanel()); - add(new DTextField(61, 7, 64)); - add(new DButtonIcon(7, 7, 20, 20, Resource.BTN_LABEL_N, Resource.BTN_LABEL_F, "calculator.label") + add(new WPanel()); + add(new WTextField(61, 7, 64)); + add(new WButtonIcon(7, 7, 20, 20, Resource.BTN_LABEL_N, Resource.BTN_LABEL_F, "calculator.label") .setListenerLeft(() -> JecGui.displayGui(new GuiLabel(l -> { JecGui.displayParent(); JecGui.getCurrent().hand = l; })))); - add(new DButtonIcon(130, 7, 20, 20, Resource.BTN_NEW_N, Resource.BTN_NEW_F, "calculator.recipe") + add(new WButtonIcon(130, 7, 20, 20, Resource.BTN_NEW_N, Resource.BTN_NEW_F, "calculator.recipe") .setListenerLeft(() -> JecGui.displayGui(true, true, new GuiRecipe()))); - add(new DButtonIcon(149, 7, 20, 20, Resource.BTN_SEARCH_N, Resource.BTN_SEARCH_F, "calculator.search")); - add(new DLabelGroup(7, 87, 9, 4, RESULT)); - add(new DLabelGroup(7, 31, 8, 1, PICKER)); - 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 DSwitcher(7, 56, 162, 5)); + add(new WButtonIcon(149, 7, 20, 20, Resource.BTN_SEARCH_N, Resource.BTN_SEARCH_F, "calculator.search")); + add(new WLabelGroup(7, 87, 9, 4, RESULT)); + add(new WLabelGroup(7, 31, 8, 1, PICKER)); + add(new WLabel(31, 7, 20, 20, SELECTOR)); + add(new WLine(52)); + add(new WIcon(151, 31, 18, 18, Resource.ICN_RECENT_N, Resource.ICN_RECENT_F, "calculator.history")); + add(new WSwitcher(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 index 3696834..6580e21 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiDisambiguation.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiDisambiguation.java @@ -1,6 +1,5 @@ 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; @@ -15,20 +14,20 @@ import java.util.stream.IntStream; * Author: towdium * Date: 17-9-16. */ -public class GuiDisambiguation extends DContainer { +public class GuiDisambiguation extends WContainer { 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); + WLabelScroll lsUp = new WLabelScroll(25, 48, 7, 3, WLabel.enumMode.RESULT, true).setLabels(labels); + WLabelScroll lsDown = new WLabelScroll(25, 105, 7, 3, WLabel.enumMode.RESULT, true).setLabels(labels); + WTextField tf = new WTextField(25, 24, 90); - 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")); - add(new DSearch(i -> { + add(new WPanel()); + add(new WSwitcher(7, 7, 162, 5)); + add(new WIcon(149, 24, 20, 20, Resource.ICN_HELP_N, Resource.ICN_HELP_F, "disambiguation.help")); + add(new WIcon(7, 48, 18, 54, Resource.ICN_LIST_N, Resource.ICN_LIST_F, "disambiguation.list")); + add(new WIcon(7, 105, 18, 54, Resource.ICN_LABEL_N, Resource.ICN_LABEL_F, "disambiguation.label")); + add(new WSearch(i -> { }, tf, lsUp, lsDown)); } } diff --git a/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiEditorFluidStack.java b/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiEditorFluidStack.java index 1dfaadf..b987f20 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiEditorFluidStack.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiEditorFluidStack.java @@ -1,9 +1,9 @@ package me.towdium.jecalculation.client.gui.guis; -import me.towdium.jecalculation.client.gui.drawables.DLabel; -import me.towdium.jecalculation.client.gui.drawables.DLabelScroll; -import me.towdium.jecalculation.client.gui.drawables.DSearch; -import me.towdium.jecalculation.client.gui.drawables.DTextField; +import me.towdium.jecalculation.client.gui.drawables.WLabel; +import me.towdium.jecalculation.client.gui.drawables.WLabelScroll; +import me.towdium.jecalculation.client.gui.drawables.WSearch; +import me.towdium.jecalculation.client.gui.drawables.WTextField; import me.towdium.jecalculation.core.labels.ILabel; import me.towdium.jecalculation.core.labels.labels.LabelFluidStack; import net.minecraftforge.fluids.FluidRegistry; @@ -18,10 +18,10 @@ import java.util.stream.Collectors; @ParametersAreNonnullByDefault public class GuiEditorFluidStack extends ILabel.RegistryEditor.Editor { public GuiEditorFluidStack() { - DLabelScroll ls = new DLabelScroll(7, 33, 8, 7, DLabel.enumMode.PICKER, true).setLabels( + WLabelScroll ls = new WLabelScroll(7, 33, 8, 7, WLabel.enumMode.PICKER, true).setLabels( FluidRegistry.getRegisteredFluids().entrySet().stream() .map(e -> new LabelFluidStack(e.getValue(), 1000)).collect(Collectors.toList())); - DTextField tf = new DTextField(25, 7, 90); - add(new DSearch(l -> callback.value.accept(l), tf, ls)); + WTextField tf = new WTextField(25, 7, 90); + add(new WSearch(l -> callback.value.accept(l), tf, ls)); } } diff --git a/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiLabel.java b/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiLabel.java index 59923c4..cc7fd7d 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiLabel.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiLabel.java @@ -4,10 +4,10 @@ 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 me.towdium.jecalculation.client.gui.IDrawable; -import me.towdium.jecalculation.client.gui.drawables.DContainer; -import me.towdium.jecalculation.client.gui.drawables.DPage; -import me.towdium.jecalculation.client.gui.drawables.DPanel; +import me.towdium.jecalculation.client.gui.IWidget; +import me.towdium.jecalculation.client.gui.drawables.WContainer; +import me.towdium.jecalculation.client.gui.drawables.WPage; +import me.towdium.jecalculation.client.gui.drawables.WPanel; import me.towdium.jecalculation.core.labels.ILabel; import me.towdium.jecalculation.utils.wrappers.Single; @@ -19,14 +19,14 @@ import java.util.function.Consumer; * Date: 17-9-14. */ @ParametersAreNonnullByDefault -public class GuiLabel extends DContainer { - DContainer container = new DContainer(); +public class GuiLabel extends WContainer { + WContainer container = new WContainer(); Consumer callback; - LoadingCache cache = CacheBuilder.newBuilder().concurrencyLevel(1) - .maximumWeight(16).weigher((Weigher) (key, value) -> 1) - .build(new CacheLoader() { + LoadingCache cache = CacheBuilder.newBuilder().concurrencyLevel(1) + .maximumWeight(16).weigher((Weigher) (key, value) -> 1) + .build(new CacheLoader() { @Override - public IDrawable load(Integer i) { + public IWidget load(Integer i) { ILabel.RegistryEditor.Record record = ILabel.EDITOR.getRecords().get(i); return record.editor.get().setCallback(callback); } @@ -37,10 +37,10 @@ public class GuiLabel extends DContainer { Single index = new Single<>(0); ILabel.EDITOR.getRecords().forEach(r -> { int i = index.value; - add(new DPage(i, r, false).setListener(() -> refresh(i))); + add(new WPage(i, r, false).setListener(() -> refresh(i))); index.value += 1; }); - add(new DPanel()); + add(new WPanel()); add(container); refresh(0); } @@ -48,6 +48,6 @@ public class GuiLabel extends DContainer { protected void refresh(int index) { container.clear(); container.add(cache.getUnchecked(index)); - container.add(new DPage(index, ILabel.EDITOR.getRecords().get(index), true)); + container.add(new WPage(index, ILabel.EDITOR.getRecords().get(index), true)); } } 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 6e2ee89..d2dd626 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 @@ -5,39 +5,38 @@ import me.towdium.jecalculation.client.gui.Resource; import me.towdium.jecalculation.client.gui.drawables.*; import me.towdium.jecalculation.core.labels.ILabel; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import static me.towdium.jecalculation.client.gui.drawables.DLabel.enumMode.EDITOR; +import static me.towdium.jecalculation.client.gui.drawables.WLabel.enumMode.EDITOR; /** * Author: towdium * Date: 17-9-8. */ -public class GuiRecipe extends DContainer { - DButton buttonSave = new DButtonIcon(26, 33, 20, 20, Resource.BTN_SAVE_N, Resource.BTN_SAVE_F, "recipe.save"); - DButton buttonCopy = new DButtonIcon(83, 33, 20, 20, Resource.BTN_COPY_N, Resource.BTN_COPY_F, "recipe.copy"); - DButton buttonDel = new DButtonIcon(64, 33, 20, 20, Resource.BTN_DEL_N, Resource.BTN_DEL_F, "recipe.clear"); - DButton buttonLabel = new DButtonIcon(45, 33, 20, 20, Resource.BTN_LABEL_N, Resource.BTN_LABEL_F, "recipe.label"); - DButton buttonYes = new DButtonIcon(7, 33, 20, 20, Resource.BTN_YES_N, Resource.BTN_YES_F, "recipe.confirm"); - DButton buttonNo = new DButtonIcon(26, 33, 20, 20, Resource.BTN_NO_N, Resource.BTN_NO_F, "recipe.abort"); - DLabelGroup groupInput = new DLabelGroup(28, 111, 7, 2, 20, 20, EDITOR); - DLabelGroup groupCatalyst = new DLabelGroup(28, 87, 7, 1, 20, 20, EDITOR); - DLabelGroup groupOutput = new DLabelGroup(28, 63, 7, 1, 20, 20, EDITOR); - DTextField textField = new DTextField(49, 33, 119); - DButton buttonNew = new DButtonIcon(7, 33, 20, 20, Resource.BTN_NEW_N, Resource.BTN_NEW_F, "recipe.new") +public class GuiRecipe extends WContainer { + WButton buttonSave = new WButtonIcon(26, 33, 20, 20, Resource.BTN_SAVE_N, Resource.BTN_SAVE_F, "recipe.save"); + WButton buttonCopy = new WButtonIcon(83, 33, 20, 20, Resource.BTN_COPY_N, Resource.BTN_COPY_F, "recipe.copy"); + WButton buttonDel = new WButtonIcon(64, 33, 20, 20, Resource.BTN_DEL_N, Resource.BTN_DEL_F, "recipe.clear"); + WButton buttonLabel = new WButtonIcon(45, 33, 20, 20, Resource.BTN_LABEL_N, Resource.BTN_LABEL_F, "recipe.label"); + WButton buttonYes = new WButtonIcon(7, 33, 20, 20, Resource.BTN_YES_N, Resource.BTN_YES_F, "recipe.confirm"); + WButton buttonNo = new WButtonIcon(26, 33, 20, 20, Resource.BTN_NO_N, Resource.BTN_NO_F, "recipe.abort"); + WLabelGroup groupInput = new WLabelGroup(28, 111, 7, 2, 20, 20, EDITOR); + WLabelGroup groupCatalyst = new WLabelGroup(28, 87, 7, 1, 20, 20, EDITOR); + WLabelGroup groupOutput = new WLabelGroup(28, 63, 7, 1, 20, 20, EDITOR); + WTextField textField = new WTextField(49, 33, 119); + WButton buttonNew = new WButtonIcon(7, 33, 20, 20, Resource.BTN_NEW_N, Resource.BTN_NEW_F, "recipe.new") .setListenerLeft(() -> setModeNewGroup(true)); public GuiRecipe() { - add(new DPanel()); - 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")); - add(new DLine(57)); + add(new WPanel()); + add(new WSwitcher(7, 7, 162, 2)); + add(new WIcon(7, 63, 21, 20, Resource.ICN_OUTPUT_N, Resource.ICN_OUTPUT_F, "recipe.output")); + add(new WIcon(7, 87, 21, 20, Resource.ICN_CATALYST_N, Resource.ICN_CATALYST_F, "recipe.catalyst")); + add(new WIcon(7, 111, 21, 40, Resource.ICN_INPUT_N, Resource.ICN_INPUT_F, "recipe.input")); + add(new WLine(57)); addAll(groupInput, groupCatalyst, groupOutput); setModeNewGroup(false); } 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 f78a11c..97e953a 100644 --- a/src/main/java/me/towdium/jecalculation/core/labels/ILabel.java +++ b/src/main/java/me/towdium/jecalculation/core/labels/ILabel.java @@ -1,9 +1,9 @@ package me.towdium.jecalculation.core.labels; import com.google.common.base.CaseFormat; -import me.towdium.jecalculation.client.gui.IDrawable; +import me.towdium.jecalculation.client.gui.IWidget; import me.towdium.jecalculation.client.gui.JecGui; -import me.towdium.jecalculation.client.gui.drawables.DContainer; +import me.towdium.jecalculation.client.gui.drawables.WContainer; import me.towdium.jecalculation.client.gui.guis.GuiEditorFluidStack; import me.towdium.jecalculation.core.labels.labels.LabelFluidStack; import me.towdium.jecalculation.core.labels.labels.LabelItemStack; @@ -69,14 +69,14 @@ public interface ILabel { NBTTagCompound toNBTTagCompound(); - default void drawEntry(JecGui gui, int xPos, int yPos, boolean center) { + default void drawLabel(JecGui gui, int xPos, int yPos, boolean center) { GlStateManager.pushMatrix(); GlStateManager.translate(center ? xPos - 8 : xPos, center ? yPos - 8 : yPos, 0); - drawEntry(gui); + drawLabel(gui); GlStateManager.popMatrix(); } - void drawEntry(JecGui gui); + void drawLabel(JecGui gui); /** * Since {@link ILabel} merging is bidirectional, it is redundant to @@ -264,11 +264,11 @@ public interface ILabel { return records; } - public interface IEditor extends IDrawable { + public interface IEditor extends IWidget { IEditor setCallback(Consumer callback); } - public static class Editor extends DContainer implements RegistryEditor.IEditor { + public static class Editor extends WContainer implements RegistryEditor.IEditor { protected Single> callback = new Single<>(null); @Override diff --git a/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelFluidStack.java b/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelFluidStack.java index 101aae8..646b4d2 100644 --- a/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelFluidStack.java +++ b/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelFluidStack.java @@ -2,12 +2,10 @@ package me.towdium.jecalculation.core.labels.labels; import me.towdium.jecalculation.client.gui.JecGui; import me.towdium.jecalculation.client.gui.Resource; -import me.towdium.jecalculation.client.gui.drawables.DText; import me.towdium.jecalculation.core.labels.ILabel; import me.towdium.jecalculation.utils.Utilities; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import javax.annotation.ParametersAreNonnullByDefault; @@ -89,7 +87,7 @@ public class LabelFluidStack implements ILabel { } @Override - public void drawEntry(JecGui gui) { + public void drawLabel(JecGui gui) { gui.drawResource(Resource.LBL_FLUID, 0, 0); gui.drawFluid(fluid.getFluid(), 2, 2, 12, 12); } 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 e9c94ff..3905f68 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 @@ -67,7 +67,7 @@ public class LabelItemStack extends LabelSimpleAmount { } @Override - public void drawEntry(JecGui gui) { + public void drawLabel(JecGui gui) { gui.drawItemStack(0, 0, itemStack, false); } 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 eaab8e3..e62d5d7 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 @@ -3,8 +3,7 @@ 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; -import me.towdium.jecalculation.client.gui.drawables.DText; +import me.towdium.jecalculation.client.gui.drawables.WText; import me.towdium.jecalculation.core.labels.ILabel; import me.towdium.jecalculation.polyfill.mc.client.renderer.GlStateManager; import me.towdium.jecalculation.polyfill.mc.util.NonNullList; @@ -17,7 +16,6 @@ import net.minecraftforge.oredict.OreDictionary; import javax.annotation.ParametersAreNonnullByDefault; import java.util.HashSet; import java.util.List; -import java.util.function.Consumer; import java.util.stream.Collectors; /** @@ -72,7 +70,7 @@ public class LabelOreDict extends LabelSimpleAmount { } @Override - public void drawEntry(JecGui gui) { + public void drawLabel(JecGui gui) { NonNullList list = NonNullList.create(); OreDictionary.getOres(name).forEach(is -> { if (is.getItemDamage() == OreDictionary.WILDCARD_VALUE) { @@ -110,7 +108,7 @@ public class LabelOreDict extends LabelSimpleAmount { public static class Editor extends RegistryEditor.Editor { public Editor() { - add(new DText(5, 5, JecGui.Font.DEFAULT_NO_SHADOW, "hello")); + add(new WText(5, 5, JecGui.Font.DEFAULT_NO_SHADOW, "hello")); } @Override diff --git a/src/main/java/me/towdium/jecalculation/nei/JecaTooltipHandler.java b/src/main/java/me/towdium/jecalculation/nei/JecaTooltipHandler.java index 44866b4..3229d90 100644 --- a/src/main/java/me/towdium/jecalculation/nei/JecaTooltipHandler.java +++ b/src/main/java/me/towdium/jecalculation/nei/JecaTooltipHandler.java @@ -25,7 +25,7 @@ public class JecaTooltipHandler implements IContainerTooltipHandler { int mousey, List currenttip) { if (gui instanceof JecGui) { - NEIPlugin.setEntryUnderMouse(itemstack); + NEIPlugin.setLabelUnderMouse(itemstack); } return currenttip; } diff --git a/src/main/java/me/towdium/jecalculation/nei/NEIPlugin.java b/src/main/java/me/towdium/jecalculation/nei/NEIPlugin.java index 56e7d56..e998079 100644 --- a/src/main/java/me/towdium/jecalculation/nei/NEIPlugin.java +++ b/src/main/java/me/towdium/jecalculation/nei/NEIPlugin.java @@ -14,12 +14,12 @@ public class NEIPlugin { private static ItemStack currentItemStack; - public static ILabel getEntryUnderMouse() { + public static ILabel getLabelUnderMouse() { if (NEIPlugin.currentItemStack == null) return ILabel.EMPTY; else return registryItem.toLabel(NEIPlugin.currentItemStack); } - public static void setEntryUnderMouse(ItemStack itemStack) { + public static void setLabelUnderMouse(ItemStack itemStack) { NEIPlugin.currentItemStack = itemStack; } }