From 36891bb4f9e6aedacf8f79bc1b18b0402845f3a8 Mon Sep 17 00:00:00 2001 From: xander Date: Tue, 20 Sep 2022 21:50:48 +0100 Subject: 1.4.2 --- .../java/dev/isxander/yacl/gui/controllers/ActionController.java | 7 ++++--- .../java/dev/isxander/yacl/gui/controllers/BooleanController.java | 1 - .../java/dev/isxander/yacl/gui/controllers/ControllerWidget.java | 5 ++++- .../java/dev/isxander/yacl/gui/controllers/EnumController.java | 1 - .../java/dev/isxander/yacl/gui/controllers/LabelController.java | 1 - .../java/dev/isxander/yacl/gui/controllers/TickBoxController.java | 1 - .../yacl/gui/controllers/slider/SliderControllerElement.java | 2 -- 7 files changed, 8 insertions(+), 10 deletions(-) (limited to 'src/main/java/dev/isxander/yacl/gui/controllers') diff --git a/src/main/java/dev/isxander/yacl/gui/controllers/ActionController.java b/src/main/java/dev/isxander/yacl/gui/controllers/ActionController.java index ee3f988..6207f03 100644 --- a/src/main/java/dev/isxander/yacl/gui/controllers/ActionController.java +++ b/src/main/java/dev/isxander/yacl/gui/controllers/ActionController.java @@ -6,7 +6,6 @@ import dev.isxander.yacl.api.utils.Dimension; import dev.isxander.yacl.gui.AbstractWidget; import dev.isxander.yacl.gui.YACLScreen; import net.minecraft.text.Text; -import org.jetbrains.annotations.ApiStatus; import org.lwjgl.glfw.GLFW; import java.util.function.BiConsumer; @@ -67,10 +66,12 @@ public class ActionController implements Controller { + private final String buttonString; + public ActionControllerElement(ActionController control, YACLScreen screen, Dimension dim) { super(control, screen, dim); + buttonString = control.formatValue().getString().toLowerCase(); } public void executeAction() { @@ -108,7 +109,7 @@ public class ActionController implements Controller { return new BooleanControllerElement(this, screen, widgetDimension); } - @ApiStatus.Internal public static class BooleanControllerElement extends ControllerWidget { private BooleanControllerElement(BooleanController control, YACLScreen screen, Dimension dim) { super(control, screen, dim); diff --git a/src/main/java/dev/isxander/yacl/gui/controllers/ControllerWidget.java b/src/main/java/dev/isxander/yacl/gui/controllers/ControllerWidget.java index 8385dfb..6ef7e56 100644 --- a/src/main/java/dev/isxander/yacl/gui/controllers/ControllerWidget.java +++ b/src/main/java/dev/isxander/yacl/gui/controllers/ControllerWidget.java @@ -18,12 +18,15 @@ public abstract class ControllerWidget> extends Abstract protected boolean focused = false; protected boolean hovered = false; + protected final String optionName; + public ControllerWidget(T control, YACLScreen screen, Dimension dim) { super(dim); this.control = control; this.screen = screen; control.option().addListener((opt, pending) -> updateTooltip()); updateTooltip(); + this.optionName = control.option().name().getString().toLowerCase(); } @Override @@ -145,7 +148,7 @@ public abstract class ControllerWidget> extends Abstract @Override public boolean matchesSearch(String query) { - return control.option().name().getString().toLowerCase().contains(query.toLowerCase()); + return optionName.contains(query.toLowerCase()); } @Override diff --git a/src/main/java/dev/isxander/yacl/gui/controllers/EnumController.java b/src/main/java/dev/isxander/yacl/gui/controllers/EnumController.java index 261c067..5cf680d 100644 --- a/src/main/java/dev/isxander/yacl/gui/controllers/EnumController.java +++ b/src/main/java/dev/isxander/yacl/gui/controllers/EnumController.java @@ -77,7 +77,6 @@ public class EnumController> implements Controller { return new EnumControllerElement<>(this, screen, widgetDimension, option().typeClass().getEnumConstants()); } - @ApiStatus.Internal public static class EnumControllerElement> extends ControllerWidget> { private final T[] values; diff --git a/src/main/java/dev/isxander/yacl/gui/controllers/LabelController.java b/src/main/java/dev/isxander/yacl/gui/controllers/LabelController.java index 57927f5..4e72d97 100644 --- a/src/main/java/dev/isxander/yacl/gui/controllers/LabelController.java +++ b/src/main/java/dev/isxander/yacl/gui/controllers/LabelController.java @@ -44,7 +44,6 @@ public class LabelController implements Controller { return new LabelControllerElement(widgetDimension); } - @ApiStatus.Internal public class LabelControllerElement extends AbstractWidget { private MultilineText wrappedText; diff --git a/src/main/java/dev/isxander/yacl/gui/controllers/TickBoxController.java b/src/main/java/dev/isxander/yacl/gui/controllers/TickBoxController.java index d7864e0..ece6bce 100644 --- a/src/main/java/dev/isxander/yacl/gui/controllers/TickBoxController.java +++ b/src/main/java/dev/isxander/yacl/gui/controllers/TickBoxController.java @@ -50,7 +50,6 @@ public class TickBoxController implements Controller { return new TickBoxControllerElement(this, screen, widgetDimension); } - @ApiStatus.Internal public static class TickBoxControllerElement extends ControllerWidget { private TickBoxControllerElement(TickBoxController control, YACLScreen screen, Dimension dim) { super(control, screen, dim); diff --git a/src/main/java/dev/isxander/yacl/gui/controllers/slider/SliderControllerElement.java b/src/main/java/dev/isxander/yacl/gui/controllers/slider/SliderControllerElement.java index 01ac336..dd977f7 100644 --- a/src/main/java/dev/isxander/yacl/gui/controllers/slider/SliderControllerElement.java +++ b/src/main/java/dev/isxander/yacl/gui/controllers/slider/SliderControllerElement.java @@ -7,10 +7,8 @@ import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.math.MathHelper; -import org.jetbrains.annotations.ApiStatus; import org.lwjgl.glfw.GLFW; -@ApiStatus.Internal public class SliderControllerElement extends ControllerWidget> { private final double min, max, interval; -- cgit