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 fe6fab3..0000000 Binary files a/art/gui_calculator.xcf and /dev/null differ diff --git a/art/gui_editor.xcf b/art/gui_editor.xcf deleted file mode 100644 index b7e9bd4..0000000 Binary files a/art/gui_editor.xcf and /dev/null differ diff --git a/art/item_label_universal.xcf b/art/item_label_universal.xcf deleted file mode 100644 index d2f0b14..0000000 Binary files a/art/item_label_universal.xcf and /dev/null differ diff --git a/art/resources.xcf b/art/resources.xcf deleted file mode 100644 index 4628893..0000000 Binary files a/art/resources.xcf and /dev/null differ diff --git a/src/main/java/me/towdium/jecalculation/gui/JecaGui.java b/src/main/java/me/towdium/jecalculation/gui/JecaGui.java index ed5c3ab..7529271 100644 --- a/src/main/java/me/towdium/jecalculation/gui/JecaGui.java +++ b/src/main/java/me/towdium/jecalculation/gui/JecaGui.java @@ -93,9 +93,9 @@ public class JecaGui extends GuiContainer { if (button == -1) { int diff = Mouse.getEventDWheel() / 120; if (diff != 0) - gui.root.onScroll(gui, mouseX, mouseY, diff); + gui.root.onMouseScroll(gui, mouseX, mouseY, diff); } else if (Mouse.getEventButtonState()) { - if (gui.root.onClicked(gui, mouseX, mouseY, button)) { + if (gui.root.onMouseClicked(gui, mouseX, mouseY, button)) { return true; } else if (gui.hand != ILabel.EMPTY) { gui.hand = button == 0 ? NEIPlugin.getLabelUnderMouse() : ILabel.EMPTY; @@ -459,7 +459,7 @@ public class JecaGui extends GuiContainer { protected void keyTyped(char typedChar, int keyCode) { if (keyCode == Keyboard.KEY_ESCAPE && hand != ILabel.EMPTY) hand = ILabel.EMPTY; - else if (!root.onKey(this, typedChar, keyCode)) { + else if (!root.onKeyPressed(this, typedChar, keyCode)) { if (keyCode == Keyboard.KEY_ESCAPE && parent != null) displayParent(); else diff --git a/src/main/java/me/towdium/jecalculation/gui/guis/GuiRecipe.java b/src/main/java/me/towdium/jecalculation/gui/guis/GuiRecipe.java index 34f5b00..3d5a447 100644 --- a/src/main/java/me/towdium/jecalculation/gui/guis/GuiRecipe.java +++ b/src/main/java/me/towdium/jecalculation/gui/guis/GuiRecipe.java @@ -1,6 +1,5 @@ package me.towdium.jecalculation.gui.guis; -import codechicken.nei.PositionedStack; import codechicken.nei.recipe.IRecipeHandler; import me.towdium.jecalculation.nei.Adapter; import me.towdium.jecalculation.data.Controller; @@ -113,12 +112,12 @@ public class GuiRecipe extends WContainer implements IGui { } @Override - public boolean onKey(JecaGui gui, char ch, int code) { + public boolean onKeyPressed(JecaGui gui, char ch, int code) { if (code == Keyboard.KEY_ESCAPE && contains(text)) { setNewGroup(false); return true; } - return super.onKey(gui, ch, code); + return super.onKeyPressed(gui, ch, code); } public void setNewGroup(boolean b) { diff --git a/src/main/java/me/towdium/jecalculation/gui/guis/GuiSearch.java b/src/main/java/me/towdium/jecalculation/gui/guis/GuiSearch.java index 40539aa..1ec28ae 100644 --- a/src/main/java/me/towdium/jecalculation/gui/guis/GuiSearch.java +++ b/src/main/java/me/towdium/jecalculation/gui/guis/GuiSearch.java @@ -85,12 +85,12 @@ public class GuiSearch extends WContainer implements IGui { } @Override - public boolean onKey(JecaGui gui, char ch, int code) { + public boolean onKeyPressed(JecaGui gui, char ch, int code) { if (code == Keyboard.KEY_ESCAPE && contains(text)) { setRename(false); return true; } - return super.onKey(gui, ch, code); + return super.onKeyPressed(gui, ch, code); } public void refreshDisplay() { diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/IWidget.java b/src/main/java/me/towdium/jecalculation/gui/widgets/IWidget.java index aae70e9..3855d27 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/IWidget.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/IWidget.java @@ -15,15 +15,15 @@ public interface IWidget { return false; } - default boolean onClicked(JecaGui gui, int xMouse, int yMouse, int button) { + default boolean onMouseClicked(JecaGui gui, int xMouse, int yMouse, int button) { return false; } - default boolean onKey(JecaGui gui, char ch, int code) { + default boolean onKeyPressed(JecaGui gui, char ch, int code) { return false; } - default boolean onScroll(JecaGui gui, int xMouse, int yMouse, int diff) { + default boolean onMouseScroll(JecaGui gui, int xMouse, int yMouse, int diff) { return false; } diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WButton.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WButton.java index 459e97f..ab71a1a 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/WButton.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WButton.java @@ -51,7 +51,7 @@ public abstract class WButton 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) { if (JecaGui.mouseIn(xPos + 1, yPos + 1, xSize - 2, ySize - 2, xMouse, yMouse) && !disabled && button == 0 && listener != null) { trigger(); @@ -65,7 +65,7 @@ public abstract class WButton extends WTooltip { } @Override - public boolean onKey(JecaGui gui, char ch, int code) { + public boolean onKeyPressed(JecaGui gui, char ch, int code) { // JustEnoughCalculation.logger.info(code); if (keys != null) for (int i : keys) { if (i == code) { diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WContainer.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WContainer.java index 5329360..612a498 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/WContainer.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WContainer.java @@ -50,21 +50,21 @@ public class WContainer implements IContainer { } @Override - public boolean onClicked(JecaGui gui, int xMouse, int yMouse, int button) { + public boolean onMouseClicked(JecaGui gui, int xMouse, int yMouse, int button) { return new Utilities.ReversedIterator<>(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;