From 408e93681524f89361c209fe5f6848a7139aa329 Mon Sep 17 00:00:00 2001 From: Discreater Date: Mon, 26 Apr 2021 23:23:00 +0800 Subject: [PATCH] feat: GuiEditor --- art/gui_calculator.xcf | Bin 0 -> 33595 bytes art/gui_editor.xcf | Bin 0 -> 69762 bytes art/item_label_universal.xcf | Bin 0 -> 6908 bytes art/resources.xcf | Bin 0 -> 70628 bytes .../jecalculation/client/gui/JecGui.java | 182 ++++++++++++------ .../client/gui/guis/GuiCalculator.java | 13 +- .../client/gui/guis/GuiEditor.java | 48 +++++ .../client/resource/Resource.java | 51 +++-- .../client/widget/widgets/WButton.java | 13 +- .../client/widget/widgets/WButtonIcon.java | 25 ++- .../client/widget/widgets/WEntry.java | 2 +- .../client/widget/widgets/WIcon.java | 6 +- .../client/widget/widgets/WLine.java | 2 +- .../client/widget/widgets/WPager.java | 4 +- .../client/widget/widgets/WTextField.java | 6 +- .../jecalculation/core/entry/Entry.java | 4 +- .../jecalculation/textures/gui/resources.png | Bin 4976 -> 9880 bytes 17 files changed, 252 insertions(+), 104 deletions(-) create mode 100644 art/gui_calculator.xcf create mode 100644 art/gui_editor.xcf create mode 100644 art/item_label_universal.xcf create mode 100644 art/resources.xcf create mode 100644 src/main/java/me/towdium/jecalculation/client/gui/guis/GuiEditor.java diff --git a/art/gui_calculator.xcf b/art/gui_calculator.xcf new file mode 100644 index 0000000000000000000000000000000000000000..fe6fab3d695e896924012d2033389cd3c44f0b7f GIT binary patch literal 33595 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 literal 0 HcmV?d00001 diff --git a/art/gui_editor.xcf b/art/gui_editor.xcf new file mode 100644 index 0000000000000000000000000000000000000000..b7e9bd49dfb788992d99d26df986636ca096850c GIT binary patch literal 69762 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 r{E indenter, String... text) { Single y = new Single<>(0); boolean unicode = fontRendererObj.getUnicodeFlag(); - if (!f.unicode) fontRendererObj.setUnicodeFlag(false); + if (!f.unicode) + fontRendererObj.setUnicodeFlag(false); GlStateManager.pushMatrix(); GlStateManager.translate(xPos, yPos, 0); GlStateManager.scale(f.size, f.size, 1); @@ -199,9 +223,12 @@ public class JecGui extends GuiContainer { int l = fontRendererObj.getStringWidth("..."); String[] ss = !f.cut ? text : Arrays.stream(text).map(s -> { int w = fontRendererObj.getStringWidth(s); - if (w <= sizeScaled) return s; - else if (l >= w) return "..."; - else return fontRendererObj.trimStringToWidth(s, (int) sizeScaled - l) + "..."; + if (w <= sizeScaled) + return s; + else if (l >= w) + return "..."; + else + return fontRendererObj.trimStringToWidth(s, (int) sizeScaled - l) + "..."; }).toArray(String[]::new); if (f.centred) { drawText(xPos, yPos, f, (s) -> (int) ((sizeScaled - fontRendererObj.getStringWidth(s)) / 2), ss); @@ -235,6 +262,9 @@ public class JecGui extends GuiContainer { } public void drawItemStack(int xPos, int yPos, ItemStack is, boolean centred) { + if (is.getItem() == null) { + return; + } if (centred) { xPos -= 8; yPos -= 8; @@ -300,19 +330,32 @@ public class JecGui extends GuiContainer { public class WidgetManager { protected List widgets = new ArrayList<>(); + protected boolean initialized = false; public void add(Widget w) { widgets.add(w); + if (initialized && w instanceof Widget.Advanced) + ((Widget.Advanced) w).onGuiInit(JecGui.this); + } + + public void addAll(Widget... w) { + for (Widget aw : w) + add(aw); } public void remove(Widget w) { - widgets.remove(w); - if (w instanceof Widget.Advanced) ((Widget.Advanced) w).onRemoved(JecGui.this); + if (widgets.remove(w) && w instanceof Widget.Advanced) ((Widget.Advanced) w).onRemoved(JecGui.this); + } + + public void removeAll(Widget... w) { + for (Widget aw : w) + remove(aw); } public void onInit() { widgets.stream().filter(w -> w instanceof Widget.Advanced) .forEach(w -> ((Widget.Advanced) w).onGuiInit(JecGui.this)); + initialized = true; } public void onDraw(int mouseX, int mouseY) { @@ -321,8 +364,12 @@ public class JecGui extends GuiContainer { @SuppressWarnings("UnusedReturnValue") public boolean onClick(int xMouse, int yMouse, int button) { - return widgets.stream().filter(w -> w instanceof Widget.Advanced) - .anyMatch(w -> ((Widget.Advanced) w).onClicked(JecGui.this, xMouse, yMouse, button)); + for (Widget w : widgets) { + if (w instanceof Widget.Advanced && + ((Widget.Advanced) w).onClicked(JecGui.this, xMouse, yMouse, button)) + return true; + } + return false; } @SuppressWarnings("UnusedReturnValue") @@ -333,16 +380,23 @@ public class JecGui extends GuiContainer { public Optional getEntryAt(int xMouse, int yMouse) { return widgets.stream().map(w -> { - if (w instanceof WEntryGroup) return ((WEntryGroup) w).getEntryAt(JecGui.this, xMouse, yMouse); - else if (w instanceof WEntry) return Optional.ofNullable( - ((WEntry) w).mouseIn(JecGui.this, xMouse, yMouse) ? ((WEntry) w) : null); - else return Optional.empty(); + if (w instanceof WEntryGroup) + return ((WEntryGroup) w).getEntryAt(JecGui.this, xMouse, yMouse); + else if (w instanceof WEntry) + return Optional.ofNullable(((WEntry) w).mouseIn(JecGui.this, xMouse, yMouse) ? ((WEntry) w) : null); + else + return Optional.empty(); }).filter(Optional::isPresent).findFirst().orElse(Optional.empty()); } } - public int getGuiLeft() { return guiLeft; } - public int getGuiTop() { return guiTop; } + public int getGuiLeft() { + return guiLeft; + } + + public int getGuiTop() { + return guiTop; + } public void drawHoveringText(String text, int x, int y) { super.drawHoveringText(Arrays.asList(text), x, y, fontRendererObj); 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 16949eb..240382b 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 @@ -17,17 +17,16 @@ import javax.annotation.ParametersAreNonnullByDefault; public class GuiCalculator extends JecGui { public GuiCalculator(@Nullable GuiScreen parent) { super(parent, true); - wgtMgr.add(new WButtonIcon(7, 7, 20, 20, Resource.BUTTON_LABEL_N, Resource.BUTTON_LABEL_F, "new_label") - .setListenerLeft(() -> Minecraft.getMinecraft().displayGuiScreen(null)) - .setListenerRight(() -> Minecraft.getMinecraft().displayGuiScreen(null))); - wgtMgr.add(new WButtonIcon(130, 7, 20, 20, Resource.BUTTON_NEW_N, Resource.BUTTON_NEW_F, "new_recipe")); - wgtMgr.add(new WButtonIcon(149, 7, 20, 20, Resource.BUTTON_SEARCH_N, Resource.BUTTON_SEARCH_F, "search")); + wgtMgr.add(new WButtonIcon(7, 7, 20, 20, Resource.BTN_LABEL_N, Resource.BTN_LABEL_F, "label")); + wgtMgr.add(new WButtonIcon(130, 7, 20, 20, Resource.BTN_NEW_N, Resource.BTN_NEW_F, "recipe") + .setListenerLeft(() -> Minecraft.getMinecraft().displayGuiScreen(new GuiEditor(this)))); + wgtMgr.add(new WButtonIcon(149, 7, 20, 20, Resource.BTN_SEARCH_N, Resource.BTN_SEARCH_F, "search")); wgtMgr.add(new WEntryGroup(7, 87, 9, 4)); wgtMgr.add(new WEntryGroup(7, 31, 8, 1)); wgtMgr.add(new WEntry(31, 7, 20, 20)); wgtMgr.add(new WLine(52)); - wgtMgr.add(new WTextField(62, 7, 63)); - wgtMgr.add(new WIcon(151, 31, 18, 18, Resource.ICON_RECENT_N, Resource.ICON_RECENT_F)); + wgtMgr.add(new WTextField(61, 7, 64)); + wgtMgr.add(new WIcon(151, 31, 18, 18, Resource.ICN_RECENT_N, Resource.ICN_RECENT_F, "history")); wgtMgr.add(new WPager(7, 56, 162, 5)); } } diff --git a/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiEditor.java b/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiEditor.java new file mode 100644 index 0000000..47ad889 --- /dev/null +++ b/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiEditor.java @@ -0,0 +1,48 @@ +package me.towdium.jecalculation.client.gui.guis; + +import me.towdium.jecalculation.client.gui.JecGui; +import me.towdium.jecalculation.client.resource.Resource; +import me.towdium.jecalculation.client.widget.widgets.*; +import net.minecraft.client.gui.GuiScreen; + +import javax.annotation.Nullable; + +/** + * Author: towdium + * Date: 17-9-8. + */ +public class GuiEditor extends JecGui { + WButtonIcon buttonSave = new WButtonIcon(26, 33, 20, 20, Resource.BTN_SAVE_N, Resource.BTN_SAVE_F, "save"); + WButtonIcon buttonCopy = new WButtonIcon(83, 33, 20, 20, Resource.BTN_COPY_N, Resource.BTN_COPY_F, "copy"); + WButtonIcon buttonDel = new WButtonIcon(64, 33, 20, 20, Resource.BTN_DEL_N, Resource.BTN_DEL_F, "clear"); + WButtonIcon buttonLabel = new WButtonIcon(45, 33, 20, 20, Resource.BTN_LABEL_N, Resource.BTN_LABEL_F, "label"); + WButtonIcon buttonYes = new WButtonIcon(7, 33, 20, 20, Resource.BTN_YES_N, Resource.BTN_YES_F, "confirm"); + WButtonIcon buttonNo = new WButtonIcon(26, 33, 20, 20, Resource.BTN_NO_N, Resource.BTN_NO_F, "abort"); + WEntryGroup groupInput = new WEntryGroup(28, 111, 7, 2, 20, 20); + WEntryGroup groupCatalyst = new WEntryGroup(28, 87, 7, 1, 20, 20); + WEntryGroup groupOutput = new WEntryGroup(28, 63, 7, 1, 20, 20); + WTextField textField = new WTextField(49, 33, 119); + WButtonIcon buttonNew = new WButtonIcon(7, 33, 20, 20, Resource.BTN_NEW_N, Resource.BTN_NEW_F, "new") + .setListenerLeft(() -> setModeNewGroup(true)); + + public GuiEditor(@Nullable GuiScreen parent) { + super(parent); + wgtMgr.add(new WPager(7, 7, 162, 2)); + wgtMgr.add(new WIcon(7, 63, 21, 20, Resource.ICN_OUTPUT_N, Resource.ICN_OUTPUT_F, "output")); + wgtMgr.add(new WIcon(7, 87, 21, 20, Resource.ICN_CATALYST_N, Resource.ICN_CATALYST_F, "catalyst")); + wgtMgr.add(new WIcon(7, 111, 21, 40, Resource.ICN_INPUT_N, Resource.ICN_INPUT_F, "input")); + wgtMgr.add(new WLine(57)); + wgtMgr.addAll(groupInput, groupCatalyst, groupOutput); + setModeNewGroup(false); + } + + public void setModeNewGroup(boolean b) { + if (b) { + wgtMgr.removeAll(buttonNew, buttonLabel, buttonDel, buttonCopy, buttonSave); + wgtMgr.addAll(buttonYes, buttonNo, textField); + } else { + wgtMgr.addAll(buttonNew, buttonLabel, buttonDel, buttonSave); // TODO buttonCopy + wgtMgr.removeAll(buttonYes, buttonNo, textField); + } + } +} diff --git a/src/main/java/me/towdium/jecalculation/client/resource/Resource.java b/src/main/java/me/towdium/jecalculation/client/resource/Resource.java index f397b05..c59c198 100644 --- a/src/main/java/me/towdium/jecalculation/client/resource/Resource.java +++ b/src/main/java/me/towdium/jecalculation/client/resource/Resource.java @@ -10,23 +10,40 @@ import net.minecraft.util.ResourceLocation; public class Resource { public static final ResourceLocation location = new ResourceLocation( JustEnoughCalculation.Reference.MODID, "textures/gui/resources.png"); - public static final Resource BUTTON_LABEL_N = new Resource(0, 14, 14, 14); - public static final Resource BUTTON_LABEL_F = new Resource(0, 0, 14, 14); - public static final Resource BUTTON_NEW_N = new Resource(14, 14, 14, 14); - public static final Resource BUTTON_NEW_F = new Resource(14, 0, 14, 14); - public static final Resource BUTTON_SEARCH_N = new Resource(28, 14, 14, 14); - public static final Resource BUTTON_SEARCH_F = new Resource(28, 0, 14, 14); - public static final Resource WIDGET_BUTTON_N = new Resource(216, 0, 20, 20); - public static final Resource WIDGET_BUTTON_F = new Resource(236, 0, 20, 20); - public static final Resource WIDGET_SLOT = new Resource(196, 0, 20, 20); - public static final Resource WIDGET_LINE = new Resource(0, 28, 163, 4); - public static final Resource WIDGET_PANEL = new Resource(176, 0, 20, 20); - public static final Resource WIDGET_ARR_L_F = new Resource(156, 0, 9, 9); - public static final Resource WIDGET_ARR_L_N = new Resource(156, 10, 9, 9); - public static final Resource WIDGET_ARR_R_F = new Resource(166, 0, 9, 9); - public static final Resource WIDGET_ARR_R_N = new Resource(166, 10, 9, 9); - public static final Resource ICON_RECENT_N = new Resource(0, 46, 14, 14); - public static final Resource ICON_RECENT_F = new Resource(0, 32, 14, 14); + public static final Resource BTN_LABEL_N = new Resource(0, 14, 14, 14); + public static final Resource BTN_LABEL_F = new Resource(0, 0, 14, 14); + public static final Resource BTN_NEW_N = new Resource(14, 14, 14, 14); + public static final Resource BTN_NEW_F = new Resource(14, 0, 14, 14); + public static final Resource BTN_SEARCH_N = new Resource(28, 14, 14, 14); + public static final Resource BTN_SEARCH_F = new Resource(28, 0, 14, 14); + public static final Resource BTN_SAVE_N = new Resource(42, 14, 14, 14); + public static final Resource BTN_SAVE_F = new Resource(42, 0, 14, 14); + public static final Resource BTN_COPY_N = new Resource(56, 14, 14, 14); + public static final Resource BTN_COPY_F = new Resource(56, 0, 14, 14); + public static final Resource BTN_DEL_N = new Resource(70, 14, 14, 14); + public static final Resource BTN_DEL_F = new Resource(70, 0, 14, 14); + public static final Resource BTN_YES_N = new Resource(84, 14, 14, 14); + 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_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 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); + public static final Resource ICN_INPUT_F = new Resource(14, 28, 14, 14); + public static final Resource ICN_OUTPUT_N = new Resource(28, 42, 14, 14); + 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); protected int xPos, yPos, xSize, ySize; protected ResourceLocation rl; diff --git a/src/main/java/me/towdium/jecalculation/client/widget/widgets/WButton.java b/src/main/java/me/towdium/jecalculation/client/widget/widgets/WButton.java index 7c426ae..a348525 100644 --- a/src/main/java/me/towdium/jecalculation/client/widget/widgets/WButton.java +++ b/src/main/java/me/towdium/jecalculation/client/widget/widgets/WButton.java @@ -16,7 +16,7 @@ import javax.annotation.ParametersAreNonnullByDefault; */ @ParametersAreNonnullByDefault public class WButton extends Widget.Advanced { - public int xPos, yPos, xSize, ySize; + protected int xPos, yPos, xSize, ySize; public Runnable lsnrLeft, lsnrRight; public String text, tooltip; protected GuiButtonExt button; @@ -45,6 +45,15 @@ public class WButton extends Widget.Advanced { return this; } + public boolean isEnabled() { + return button.enabled; + } + + public WButton setEnabled(boolean e) { + button.enabled = e; + return this; + } + protected static boolean mouseIn(GuiButtonExt button, int x, int y) { return button.enabled && button.visible && JecGui.mouseIn(button.xPosition, button.yPosition, button.width, button.height, x, y); @@ -65,7 +74,7 @@ public class WButton extends Widget.Advanced { @Override public boolean onClicked(JecGui gui, int xMouse, int yMouse, int button) { - if (mouseIn(this.button, xMouse, yMouse)) { + if (mouseIn(this.button, xMouse, yMouse) && isEnabled()) { if (button == 0 && lsnrLeft != null) { lsnrLeft.run(); ClientUtils.playClickSound(1.0F); diff --git a/src/main/java/me/towdium/jecalculation/client/widget/widgets/WButtonIcon.java b/src/main/java/me/towdium/jecalculation/client/widget/widgets/WButtonIcon.java index fae28f5..34612ba 100644 --- a/src/main/java/me/towdium/jecalculation/client/widget/widgets/WButtonIcon.java +++ b/src/main/java/me/towdium/jecalculation/client/widget/widgets/WButtonIcon.java @@ -21,7 +21,13 @@ public class WButtonIcon extends WButton { this(xPos, yPos, xSize, ySize, normal, focused, null); } - public WButtonIcon(int xPos, int yPos, int xSize, int ySize, Resource normal, Resource focused, @Nullable String tooltip) { + public WButtonIcon(int xPos, + int yPos, + int xSize, + int ySize, + Resource normal, + Resource focused, + @Nullable String tooltip) { super(xPos, yPos, xSize, ySize, "", tooltip); this.xPos = xPos; this.yPos = yPos; @@ -38,9 +44,10 @@ public class WButtonIcon extends WButton { public void drawButton(Minecraft mc, int mouseX, int mouseY) { final int x = this.xPosition; final int y = this.yPosition; - this.field_146123_n = mouseX > x + 1 && mouseY > y + 1 && mouseX <= x + width - 1 && mouseY <= y + height - 1; - boolean hovered = this.field_146123_n; - gui.drawResourceContinuous(hovered ? Resource.WIDGET_BUTTON_F : Resource.WIDGET_BUTTON_N, x, y, width, height, 3, 3, 3, 3); + boolean hovered = mouseX > x + 1 && mouseY > y + 1 && mouseX <= x + width - 1 && mouseY <= y + height - 1; + this.field_146123_n = hovered; + gui.drawResourceContinuous(hovered ? Resource.WGT_BUTTON_F : Resource.WGT_BUTTON_N, x, y, width, height, + 3, 3, 3, 3); Resource r = hovered ? focused : normal; gui.drawResource(r, x + (width - r.getXSize()) / 2, y + (height - r.getYSize()) / 2); } @@ -60,4 +67,14 @@ public class WButtonIcon extends WButton { public WButtonIcon setListenerRight(Runnable r) { return ((WButtonIcon) super.setListenerRight(r)); } + + @Override + public boolean isEnabled() { + return true; + } + + public WButtonIcon setEnabled(boolean e) { + if (!e) throw new RuntimeException("Unsupported"); + else return this; + } } diff --git a/src/main/java/me/towdium/jecalculation/client/widget/widgets/WEntry.java b/src/main/java/me/towdium/jecalculation/client/widget/widgets/WEntry.java index f27724c..89c01ba 100644 --- a/src/main/java/me/towdium/jecalculation/client/widget/widgets/WEntry.java +++ b/src/main/java/me/towdium/jecalculation/client/widget/widgets/WEntry.java @@ -34,7 +34,7 @@ public class WEntry extends Widget.Advanced { @Override public void onDraw(JecGui gui, int xMouse, int yMouse) { - gui.drawResourceContinuous(Resource.WIDGET_SLOT, xPos + gui.getGuiLeft(), yPos + gui.getGuiTop(), xSize, ySize, + gui.drawResourceContinuous(Resource.WGT_SLOT, xPos + gui.getGuiLeft(), yPos + gui.getGuiTop(), xSize, ySize, 3, 3, 3, 3); gui.drawItemStack(gl(gui) + xPos + xSize / 2, gt(gui) + yPos + ySize / 2, entry.getRepresentation(), true); if (mouseIn(gui, xMouse, yMouse)) diff --git a/src/main/java/me/towdium/jecalculation/client/widget/widgets/WIcon.java b/src/main/java/me/towdium/jecalculation/client/widget/widgets/WIcon.java index 48f6d29..f13b3c2 100644 --- a/src/main/java/me/towdium/jecalculation/client/widget/widgets/WIcon.java +++ b/src/main/java/me/towdium/jecalculation/client/widget/widgets/WIcon.java @@ -37,9 +37,9 @@ public class WIcon extends Widget { @Override public void onDraw(JecGui gui, int xMouse, int yMouse) { - boolean hovered = JecGui.mouseIn(xPos + gl(gui), yPos + gt(gui), xSize, ySize, xMouse, yMouse); - gui.drawRectangle(xPos + gl(gui), yPos + gt(gui), xSize, ySize, - hovered ? JecGui.COLOR_BLUE : JecGui.COLOR_GREY); + boolean hovered = JecGui.mouseIn(xPos + gl(gui) + (xSize - normal.getXSize()) / 2, + yPos + gt(gui) + (ySize - normal.getYSize()) / 2, normal.getXSize(), normal.getYSize(), xMouse, yMouse); + gui.drawRectangle(xPos + gl(gui), yPos + gt(gui), xSize, ySize, JecGui.COLOR_GREY); Resource r = hovered ? focused : normal; gui.drawResource(r, (xSize - r.getXSize()) / 2 + xPos + gl(gui), (ySize - r.getYSize()) / 2 + yPos + gt(gui)); if (tooltip != null) { diff --git a/src/main/java/me/towdium/jecalculation/client/widget/widgets/WLine.java b/src/main/java/me/towdium/jecalculation/client/widget/widgets/WLine.java index 28cdae8..c8a35ab 100644 --- a/src/main/java/me/towdium/jecalculation/client/widget/widgets/WLine.java +++ b/src/main/java/me/towdium/jecalculation/client/widget/widgets/WLine.java @@ -20,6 +20,6 @@ public class WLine extends Widget { @Override public void onDraw(JecGui gui, int xMouse, int yMouse) { - gui.drawResource(Resource.WIDGET_LINE, 6 + gui.getGuiLeft(), y + gui.getGuiTop() - 1); + gui.drawResource(Resource.WGT_LINE, 6 + gui.getGuiLeft(), y + gui.getGuiTop() - 1); } } diff --git a/src/main/java/me/towdium/jecalculation/client/widget/widgets/WPager.java b/src/main/java/me/towdium/jecalculation/client/widget/widgets/WPager.java index ac083de..fa3f225 100644 --- a/src/main/java/me/towdium/jecalculation/client/widget/widgets/WPager.java +++ b/src/main/java/me/towdium/jecalculation/client/widget/widgets/WPager.java @@ -36,9 +36,9 @@ public class WPager extends Widget.Advanced { this.xSize = xSize; this.yPos = yPos; this.keys = keys; - left = new WButtonIcon(xPos, yPos, SIZE, SIZE, Resource.WIDGET_ARR_L_N, Resource.WIDGET_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 WButtonIcon(xPos + xSize - SIZE, yPos, SIZE, SIZE, Resource.WIDGET_ARR_R_N, Resource.WIDGET_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 WRectangle(xPos + SIZE, yPos, xSize - 2 * SIZE, SIZE, JecGui.COLOR_GREY); wText = new WText(xPos + SIZE, yPos, xSize - 2 * SIZE, SIZE, JecGui.Font.DEFAULT_SHADOW, diff --git a/src/main/java/me/towdium/jecalculation/client/widget/widgets/WTextField.java b/src/main/java/me/towdium/jecalculation/client/widget/widgets/WTextField.java index d46edcd..a6dae22 100644 --- a/src/main/java/me/towdium/jecalculation/client/widget/widgets/WTextField.java +++ b/src/main/java/me/towdium/jecalculation/client/widget/widgets/WTextField.java @@ -23,12 +23,14 @@ public class WTextField extends Widget.Advanced { @Override public void onGuiInit(JecGui gui) { - textField = new GuiTextField(gui.getFontRenderer(), xPos + gui.getGuiLeft(), yPos + gui.getGuiTop(), xSize, 20); + textField = new GuiTextField(gui.getFontRenderer(), xPos + gui.getGuiLeft() + 1, yPos + gui.getGuiTop() + 1, + xSize - 2, 18); } @Override public boolean onClicked(JecGui gui, int xMouse, int yMouse, int button) { - boolean flag = xMouse >= textField.xPosition && xMouse < textField.xPosition + textField.width && yMouse >= textField.yPosition && yMouse < textField.yPosition + textField.height; + boolean flag = xMouse >= textField.xPosition && xMouse < textField.xPosition + textField.width && + yMouse >= textField.yPosition && yMouse < textField.yPosition + textField.height; textField.mouseClicked(xMouse, yMouse, button); return textField.isFocused() && flag && button == 0; } diff --git a/src/main/java/me/towdium/jecalculation/core/entry/Entry.java b/src/main/java/me/towdium/jecalculation/core/entry/Entry.java index 722db9e..7cdfb83 100644 --- a/src/main/java/me/towdium/jecalculation/core/entry/Entry.java +++ b/src/main/java/me/towdium/jecalculation/core/entry/Entry.java @@ -18,9 +18,11 @@ import java.util.function.Function; * Date: 8/11/17. */ public interface Entry { + ItemStack EMPTY_ITEM_STACK = new ItemStack((Item)null); + EntryMergerRegistry MERGER = EntryMergerRegistry.INSTANCE; EntryRegistry REGISTRY = EntryRegistry.INSTANCE; - Entry EMPTY = new EntryItemStack(new ItemStack(new Item()), 0); + Entry EMPTY = new EntryItemStack(Entry.EMPTY_ITEM_STACK, 0); int getAmount(); diff --git a/src/main/resources/assets/jecalculation/textures/gui/resources.png b/src/main/resources/assets/jecalculation/textures/gui/resources.png index 0803ebb8686b2050397d16e516bffbb92a783ffe..2791f9535b491e7e6e8881ace821ca8728506140 100644 GIT binary patch literal 9880 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 JqSWjn{}(b9AT|I1 literal 4976 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 i|F{2_2jYCYj|8-D>BhEIOv?ZF0r-LCeZrp)