From bbea8c7192717f08876c2083f99d6be8edcb2e3d Mon Sep 17 00:00:00 2001
From: Juuz <6596629+Juuxel@users.noreply.github.com>
Date: Sun, 27 Feb 2022 13:05:06 +0200
Subject: Fix IOOBE when WTextField.scrollOffset was outside the string

Fixes #154. Also documented some WTextField methods.
---
 .../cottonmc/test/client/LibGuiTestClient.java     | 46 +++++++++-------------
 .../cottonmc/test/client/TextFieldTestGui.java     | 20 ++++++++++
 2 files changed, 38 insertions(+), 28 deletions(-)
 create mode 100644 GuiTest/src/main/java/io/github/cottonmc/test/client/TextFieldTestGui.java

(limited to 'GuiTest/src/main/java/io')

diff --git a/GuiTest/src/main/java/io/github/cottonmc/test/client/LibGuiTestClient.java b/GuiTest/src/main/java/io/github/cottonmc/test/client/LibGuiTestClient.java
index efdcd3f..38545fa 100644
--- a/GuiTest/src/main/java/io/github/cottonmc/test/client/LibGuiTestClient.java
+++ b/GuiTest/src/main/java/io/github/cottonmc/test/client/LibGuiTestClient.java
@@ -1,19 +1,25 @@
 package io.github.cottonmc.test.client;
 
+import com.mojang.brigadier.Command;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.command.v1.ClientCommandManager;
+import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource;
 import net.fabricmc.fabric.api.client.screenhandler.v1.ScreenRegistry;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.text.LiteralText;
 
 import io.github.cottonmc.cotton.gui.client.CottonClientScreen;
 import io.github.cottonmc.cotton.gui.client.CottonHud;
 import io.github.cottonmc.cotton.gui.client.CottonInventoryScreen;
+import io.github.cottonmc.cotton.gui.client.LightweightGuiDescription;
 import io.github.cottonmc.cotton.gui.impl.modmenu.ConfigGui;
 import io.github.cottonmc.cotton.gui.widget.WLabel;
 import io.github.cottonmc.test.LibGuiTest;
 import io.github.cottonmc.test.ReallySimpleDescription;
 import io.github.cottonmc.test.TestDescription;
 
+import java.util.function.Function;
+
 import static net.fabricmc.fabric.api.client.command.v1.ClientCommandManager.literal;
 
 public class LibGuiTestClient implements ClientModInitializer {
@@ -35,35 +41,19 @@ public class LibGuiTestClient implements ClientModInitializer {
 
 		ClientCommandManager.DISPATCHER.register(
 				literal("libgui")
-						.then(literal("config").executes(context -> {
-							var client = context.getSource().getClient();
-							client.send(() -> {
-								client.setScreen(new CottonClientScreen(new ConfigGui(client.currentScreen)));
-							});
-							return 0;
-						}))
-						.then(literal("tab").executes(context -> {
-							var client = context.getSource().getClient();
-							client.send(() -> {
-								client.setScreen(new CottonClientScreen(new TabTestGui()));
-							});
-							return 0;
-						}))
-						.then(literal("scrolling").executes(context -> {
-							var client = context.getSource().getClient();
-							client.send(() -> {
-								client.setScreen(new CottonClientScreen(new ScrollingTestGui()));
-							});
-							return 0;
-						}))
-						.then(literal("insets").executes(context -> {
-							var client = context.getSource().getClient();
-							client.send(() -> {
-								client.setScreen(new CottonClientScreen(new InsetsTestGui()));
-							});
-							return 0;
-						}))
+						.then(literal("config").executes(openScreen(client -> new ConfigGui(client.currentScreen))))
+						.then(literal("tab").executes(openScreen(client -> new TabTestGui())))
+						.then(literal("scrolling").executes(openScreen(client -> new ScrollingTestGui())))
+						.then(literal("insets").executes(openScreen(client -> new InsetsTestGui())))
+						.then(literal("textfield").executes(openScreen(client -> new TextFieldTestGui())))
 		);
 	}
 
+	private static Command<FabricClientCommandSource> openScreen(Function<MinecraftClient, LightweightGuiDescription> screenFactory) {
+		return context -> {
+			var client = context.getSource().getClient();
+			client.send(() -> client.setScreen(new CottonClientScreen(screenFactory.apply(client))));
+			return Command.SINGLE_SUCCESS;
+		};
+	}
 }
diff --git a/GuiTest/src/main/java/io/github/cottonmc/test/client/TextFieldTestGui.java b/GuiTest/src/main/java/io/github/cottonmc/test/client/TextFieldTestGui.java
new file mode 100644
index 0000000..dc2b68c
--- /dev/null
+++ b/GuiTest/src/main/java/io/github/cottonmc/test/client/TextFieldTestGui.java
@@ -0,0 +1,20 @@
+package io.github.cottonmc.test.client;
+
+import net.minecraft.item.Items;
+import net.minecraft.text.LiteralText;
+
+import io.github.cottonmc.cotton.gui.client.LightweightGuiDescription;
+import io.github.cottonmc.cotton.gui.widget.WButton;
+import io.github.cottonmc.cotton.gui.widget.WGridPanel;
+import io.github.cottonmc.cotton.gui.widget.WTextField;
+import io.github.cottonmc.cotton.gui.widget.icon.ItemIcon;
+
+public class TextFieldTestGui extends LightweightGuiDescription {
+	public TextFieldTestGui() {
+		WGridPanel grid = (WGridPanel) rootPanel;
+		WTextField textField = new WTextField(new LiteralText("Type something")).setMaxLength(Integer.MAX_VALUE);
+		grid.add(textField, 0, 0, 6, 1);
+		grid.add(new WButton(new ItemIcon(Items.BARRIER), new LiteralText("Clear")).setOnClick(() -> textField.setText("")), 0, 2, 6, 1);
+		rootPanel.validate(this);
+	}
+}
-- 
cgit