From cd92230f074912668f8f6e8e63f13f1eb8d5a594 Mon Sep 17 00:00:00 2001 From: Discreater Date: Thu, 6 May 2021 23:08:06 +0800 Subject: [PATCH] chore: rename IWidget --- README.md | 4 ++-- art/gui_calculator.xcf | Bin 33595 -> 0 bytes art/gui_editor.xcf | Bin 69762 -> 0 bytes art/item_label_universal.xcf | Bin 6908 -> 0 bytes art/resources.xcf | Bin 70628 -> 0 bytes .../me/towdium/jecalculation/gui/JecaGui.java | 6 +++--- .../jecalculation/gui/guis/GuiRecipe.java | 5 ++--- .../jecalculation/gui/guis/GuiSearch.java | 4 ++-- .../jecalculation/gui/widgets/IWidget.java | 6 +++--- .../jecalculation/gui/widgets/WButton.java | 4 ++-- .../jecalculation/gui/widgets/WContainer.java | 12 ++++++------ .../jecalculation/gui/widgets/WHelp.java | 16 ++++++++-------- .../jecalculation/gui/widgets/WLabel.java | 4 ++-- .../jecalculation/gui/widgets/WLabelScroll.java | 2 +- .../jecalculation/gui/widgets/WOverlay.java | 12 ++++++------ .../jecalculation/gui/widgets/WPage.java | 2 +- .../jecalculation/gui/widgets/WPanel.java | 2 +- .../jecalculation/gui/widgets/WScroll.java | 2 +- .../jecalculation/gui/widgets/WTextField.java | 4 ++-- 19 files changed, 42 insertions(+), 43 deletions(-) delete mode 100644 art/gui_calculator.xcf delete mode 100644 art/gui_editor.xcf delete mode 100644 art/item_label_universal.xcf delete mode 100644 art/resources.xcf diff --git a/README.md b/README.md index b2f8964..78c3f6d 100644 --- a/README.md +++ b/README.md @@ -25,13 +25,13 @@ the [release page](https://minecraft.curseforge.com/projects/just-enough-calcula - [ ] Others - [x] Item from NEI item panel - [ ] Fluid from NEI item panel (Need to get fluid from labels) -- [x] OreDictionary recognize' +- [x] OreDictionary recognize ## TODO - Backport the 1.16 feature - [ ] Disambiguation in picker - - [ ] Infinite recipe inputs, outputs and catalysts) + - [ ] Infinite recipe inputs, outputs and catalysts ## Known Issues - [ ] Client Only diff --git a/art/gui_calculator.xcf b/art/gui_calculator.xcf deleted file mode 100644 index fe6fab3d695e896924012d2033389cd3c44f0b7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33595 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 diff --git a/art/gui_editor.xcf b/art/gui_editor.xcf deleted file mode 100644 index b7e9bd49dfb788992d99d26df986636ca096850c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 69762 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 r{E(widgets).stream() - .anyMatch(i -> i.onClicked(gui, xMouse, yMouse, button)); + .anyMatch(i -> i.onMouseClicked(gui, xMouse, yMouse, button)); } @Override - public boolean onKey(JecaGui gui, char ch, int code) { + public boolean onKeyPressed(JecaGui gui, char ch, int code) { return new Utilities.ReversedIterator<>(widgets).stream() - .anyMatch(i -> i.onKey(gui, ch, code)); + .anyMatch(i -> i.onKeyPressed(gui, ch, code)); } @Override - public boolean onScroll(JecaGui gui, int xMouse, int yMouse, int diff) { + public boolean onMouseScroll(JecaGui gui, int xMouse, int yMouse, int diff) { return new Utilities.ReversedIterator<>(widgets).stream() - .anyMatch(i -> i.onScroll(gui, xMouse, yMouse, diff)); + .anyMatch(i -> i.onMouseScroll(gui, xMouse, yMouse, diff)); } @Override diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WHelp.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WHelp.java index 384cffb..0b61aae 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/WHelp.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WHelp.java @@ -46,7 +46,7 @@ public class WHelp extends WContainer { } @Override - public boolean onClicked(JecaGui gui, int xMouse, int yMouse, int button) { + public boolean onMouseClicked(JecaGui gui, int xMouse, int yMouse, int button) { boolean ret = mouseIn(xMouse, yMouse); if (ret) gui.root.add(new Doc()); @@ -65,17 +65,17 @@ public class WHelp extends WContainer { @Override - public boolean onClicked(JecaGui gui, int xMouse, int yMouse, int button) { - if (!super.onClicked(gui, xMouse, yMouse, button)) + public boolean onMouseClicked(JecaGui gui, int xMouse, int yMouse, int button) { + if (!super.onMouseClicked(gui, xMouse, yMouse, button)) gui.root.remove(this); return true; } @Override - public boolean onScroll(JecaGui gui, int xMouse, int yMouse, int diff) { + public boolean onMouseScroll(JecaGui gui, int xMouse, int yMouse, int diff) { switcher.move(-diff); text.setPage(switcher.getIndex()); - return super.onScroll(gui, xMouse, yMouse, diff); + return super.onMouseScroll(gui, xMouse, yMouse, diff); } public class Text implements IWidget { @@ -138,7 +138,7 @@ public class WHelp extends WContainer { } @Override - public boolean onClicked(JecaGui gui, int xMouse, int yMouse, int button) { + public boolean onMouseClicked(JecaGui gui, int xMouse, int yMouse, int button) { boolean ret = mouseIn(xMouse, yMouse); if (ret) gui.root.remove(Doc.this); @@ -151,8 +151,8 @@ public class WHelp extends WContainer { } @Override - public boolean onKey(JecaGui gui, char ch, int code) { - if (super.onKey(gui, ch, code)) + public boolean onKeyPressed(JecaGui gui, char ch, int code) { + if (super.onKeyPressed(gui, ch, code)) return true; if (code == Keyboard.KEY_ESCAPE) { gui.root.remove(Doc.this); diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WLabel.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WLabel.java index 63c6339..121855f 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/WLabel.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WLabel.java @@ -86,7 +86,7 @@ public class WLabel implements IWidget { } @Override - public boolean onScroll(JecaGui gui, int xMouse, int yMouse, int diff) { + public boolean onMouseScroll(JecaGui gui, int xMouse, int yMouse, int diff) { if (mouseIn(xMouse, yMouse)) { if (mode == Mode.EDITOR && label != ILabel.EMPTY) { for (int i = 0; i < Math.abs(diff); i++) @@ -105,7 +105,7 @@ public class WLabel implements IWidget { } @Override - public boolean onClicked(JecaGui gui, int xMouse, int yMouse, int button) { + public boolean onMouseClicked(JecaGui gui, int xMouse, int yMouse, int button) { if (!mouseIn(xMouse, yMouse) || (button == 1 && mode != Mode.RESULT)) return false; switch (mode) { diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WLabelScroll.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WLabelScroll.java index f853077..e19df4f 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/WLabelScroll.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WLabelScroll.java @@ -51,7 +51,7 @@ public class WLabelScroll extends WContainer implements ISearchable { } @Override - public boolean onScroll(JecaGui gui, int xMouse, int yMouse, int diff) { + public boolean onMouseScroll(JecaGui gui, int xMouse, int yMouse, int diff) { boolean in = JecaGui.mouseIn(xPos, yPos, column * 18, row * 18, xMouse, yMouse); if (in) { float pos = getPos(current - diff); diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WOverlay.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WOverlay.java index 3dbc7a6..51f19f7 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/WOverlay.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WOverlay.java @@ -12,8 +12,8 @@ import javax.annotation.ParametersAreNonnullByDefault; @ParametersAreNonnullByDefault public class WOverlay extends WContainer { @Override - public boolean onKey(JecaGui gui, char ch, int code) { - if (super.onKey(gui, ch, code)) return true; + public boolean onKeyPressed(JecaGui gui, char ch, int code) { + if (super.onKeyPressed(gui, ch, code)) return true; if (code == Keyboard.KEY_ESCAPE) { gui.root.remove(this); return true; @@ -21,14 +21,14 @@ public class WOverlay extends WContainer { } @Override - public boolean onClicked(JecaGui gui, int xMouse, int yMouse, int button) { - if (!super.onClicked(gui, xMouse, yMouse, button)) gui.root.remove(this); + public boolean onMouseClicked(JecaGui gui, int xMouse, int yMouse, int button) { + if (!super.onMouseClicked(gui, xMouse, yMouse, button)) gui.root.remove(this); return true; } @Override - public boolean onScroll(JecaGui gui, int xMouse, int yMouse, int diff) { - if (!super.onScroll(gui, xMouse, yMouse, diff)) gui.root.remove(this); + public boolean onMouseScroll(JecaGui gui, int xMouse, int yMouse, int diff) { + if (!super.onMouseScroll(gui, xMouse, yMouse, diff)) gui.root.remove(this); return true; } } diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WPage.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WPage.java index c2e8479..4b473d8 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/WPage.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WPage.java @@ -45,7 +45,7 @@ public class WPage extends WTooltip { } @Override - public boolean onClicked(JecaGui gui, int xMouse, int yMouse, int button) { + public boolean onMouseClicked(JecaGui gui, int xMouse, int yMouse, int button) { boolean ret = JecaGui.mouseIn(index * 24, -21, 24, 21, xMouse, yMouse) && listener != null && !focused; if (ret) listener.invoke(this); return ret; diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WPanel.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WPanel.java index 80155d5..5d2db8e 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/WPanel.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WPanel.java @@ -42,7 +42,7 @@ public class WPanel implements IWidget { } @Override - public boolean onClicked(JecaGui gui, int xMouse, int yMouse, int button) { + public boolean onMouseClicked(JecaGui gui, int xMouse, int yMouse, int button) { boolean ret = mouseIn(xMouse, yMouse); if (ret) gui.hand = ILabel.EMPTY; return ret; diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WScroll.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WScroll.java index 45c39a2..6380dc8 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/WScroll.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WScroll.java @@ -38,7 +38,7 @@ public class WScroll implements IWidget { } @Override - public boolean onClicked(JecaGui gui, int xMouse, int yMouse, int button) { + public boolean onMouseClicked(JecaGui gui, int xMouse, int yMouse, int button) { drag = mouseIn(xMouse, yMouse); if (drag) setCurrent(yMouse - yPos - 9, true); return drag; diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WTextField.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WTextField.java index f382571..76d7a6e 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/WTextField.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WTextField.java @@ -29,7 +29,7 @@ public class WTextField implements IWidget { } @Override - public boolean onClicked(JecaGui gui, int xMouse, int yMouse, int button) { + public boolean onMouseClicked(JecaGui gui, int xMouse, int yMouse, int button) { textField.mouseClicked(xMouse, yMouse, button); if (textField.isFocused() && button == 1) { textField.setText(""); @@ -44,7 +44,7 @@ public class WTextField implements IWidget { } @Override - public boolean onKey(JecaGui gui, char ch, int code) { + public boolean onKeyPressed(JecaGui gui, char ch, int code) { boolean ret = textField.textboxKeyTyped(ch, code); if (ret) notifyLsnr(); return ret;