chore: rename IWidget

This commit is contained in:
Discreater committed 2021-05-06 23:08:06 +08:00
1 parent a89ea6b2b9
commit cd92230f07
19 files changed
+42 -43

No files matched your search

@@ -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
@@ -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) {
@@ -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() {
@@ -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;
}
@@ -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) {
@@ -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
@@ -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);
@@ -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) {
@@ -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);
@@ -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;
}
}
@@ -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;
@@ -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;
@@ -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;
@@ -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;