use DialogPayload

HSGamer · HSGamer · commit 5de7818ed428 · 2025-10-06T23:01:25.000+07:00
diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
 
     <properties>
         <core.version>4.5.7</core.version>
-        <unidialog.version>1.4.0</unidialog.version>
+        <unidialog.version>1.5.0</unidialog.version>
         <java.version>21</java.version>
         <project.mainClass>me.hsgamer.bettergui.betterdialogs.BetterDialogs</project.mainClass>
         <license.packageName>me.hsgamer.bettergui.betterdialogs.license</license.packageName>
diff --git a/src/main/java/me/hsgamer/bettergui/betterdialogs/component/input/BooleanInputComponent.java b/src/main/java/me/hsgamer/bettergui/betterdialogs/component/input/BooleanInputComponent.java
@@ -18,6 +18,7 @@
 import io.github.projectunified.unidialog.adventure.input.AdventureBooleanInput;
 import io.github.projectunified.unidialog.core.input.BooleanInput;
 import io.github.projectunified.unidialog.core.input.DialogInputBuilder;
+import io.github.projectunified.unidialog.core.payload.DialogPayload;
 import me.hsgamer.bettergui.betterdialogs.DialogManagerProvider;
 import me.hsgamer.bettergui.betterdialogs.builder.DialogComponentBuilder;
 import me.hsgamer.bettergui.betterdialogs.text.Text;
@@ -29,7 +30,7 @@
 import java.util.Optional;
 import java.util.UUID;
 
-public class BooleanInputComponent extends InputComponent<String> {
+public class BooleanInputComponent extends InputComponent<Boolean> {
     private final Text label;
     private final String initial;
     private final String onTrue;
@@ -67,25 +68,16 @@ protected void apply(Player player, DialogInputBuilder builder) {
     }
 
     @Override
-    protected String getValue(String value, UUID uuid, String args) {
-        return value;
-    }
-
-    @Override
-    protected String convertValue(UUID uuid, String rawValue) {
-        try {
-            float value = Float.parseFloat(rawValue);
-            rawValue = value == 0 ? "false" : "true";
-        } catch (NumberFormatException e) {
-            // Ignore the exception, keep the raw value as is
-        }
-
-        if (rawValue.equalsIgnoreCase("true") || rawValue.equalsIgnoreCase("yes")) {
+    protected String getValue(Boolean value, UUID uuid, String args) {
+        if (value == Boolean.TRUE) {
             return StringReplacerApplier.replace(onTrue, uuid, this);
-        } else if (rawValue.equalsIgnoreCase("false") || rawValue.equalsIgnoreCase("no")) {
-            return StringReplacerApplier.replace(onFalse, uuid, this);
         } else {
-            return rawValue;
+            return StringReplacerApplier.replace(onFalse, uuid, this);
         }
     }
+
+    @Override
+    protected Boolean getValue(String key, DialogPayload payload) {
+        return payload.booleanValue(key);
+    }
 }
diff --git a/src/main/java/me/hsgamer/bettergui/betterdialogs/component/input/InputComponent.java b/src/main/java/me/hsgamer/bettergui/betterdialogs/component/input/InputComponent.java
@@ -17,6 +17,7 @@
 
 import io.github.projectunified.unidialog.core.dialog.Dialog;
 import io.github.projectunified.unidialog.core.input.DialogInputBuilder;
+import io.github.projectunified.unidialog.core.payload.DialogPayload;
 import me.hsgamer.bettergui.betterdialogs.builder.DialogComponentBuilder;
 import me.hsgamer.bettergui.betterdialogs.component.DialogComponent;
 import org.bukkit.entity.Player;
@@ -43,7 +44,7 @@ private static String normalizeName(String name) {
 
     protected abstract String getValue(T value, UUID uuid, String args);
 
-    protected abstract T convertValue(UUID uuid, String rawValue);
+    protected abstract T getValue(String key, DialogPayload payload);
 
     public String getValue(UUID uuid, String args) {
         T value = values.get(uuid);
@@ -53,16 +54,13 @@ public String getValue(UUID uuid, String args) {
         return getValue(value, uuid, args);
     }
 
-    public void applyValue(UUID uuid, Map<String, String> map) {
-        String rawValue = map.get(key);
-        if (rawValue != null) {
-            T value = convertValue(uuid, rawValue);
-            if (value != null) {
-                values.put(uuid, value);
-                return;
-            }
+    public void applyValue(DialogPayload payload) {
+        T value = getValue(key, payload);
+        if (value == null) {
+            values.remove(payload.owner());
+        } else {
+            values.put(payload.owner(), value);
         }
-        values.remove(uuid);
     }
 
     @Override
diff --git a/src/main/java/me/hsgamer/bettergui/betterdialogs/component/input/NumberInputComponent.java b/src/main/java/me/hsgamer/bettergui/betterdialogs/component/input/NumberInputComponent.java
@@ -18,6 +18,7 @@
 import io.github.projectunified.unidialog.adventure.input.AdventureNumberRangeInput;
 import io.github.projectunified.unidialog.core.input.DialogInputBuilder;
 import io.github.projectunified.unidialog.core.input.NumberRangeInput;
+import io.github.projectunified.unidialog.core.payload.DialogPayload;
 import me.hsgamer.bettergui.betterdialogs.DialogManagerProvider;
 import me.hsgamer.bettergui.betterdialogs.builder.DialogComponentBuilder;
 import me.hsgamer.bettergui.betterdialogs.text.Text;
@@ -113,7 +114,7 @@ protected String getValue(Number value, UUID uuid, String args) {
     }
 
     @Override
-    protected Number convertValue(UUID uuid, String rawValue) {
-        return Validate.getNumber(rawValue).orElse(null);
+    protected Number getValue(String key, DialogPayload payload) {
+        return payload.numberValue(key);
     }
 }
diff --git a/src/main/java/me/hsgamer/bettergui/betterdialogs/component/input/SingleOptionInputComponent.java b/src/main/java/me/hsgamer/bettergui/betterdialogs/component/input/SingleOptionInputComponent.java
@@ -18,6 +18,7 @@
 import io.github.projectunified.unidialog.adventure.input.AdventureSingleOptionInput;
 import io.github.projectunified.unidialog.core.input.DialogInputBuilder;
 import io.github.projectunified.unidialog.core.input.SingleOptionInput;
+import io.github.projectunified.unidialog.core.payload.DialogPayload;
 import me.hsgamer.bettergui.betterdialogs.DialogManagerProvider;
 import me.hsgamer.bettergui.betterdialogs.builder.DialogComponentBuilder;
 import me.hsgamer.bettergui.betterdialogs.text.Text;
@@ -92,7 +93,7 @@ protected String getValue(String value, UUID uuid, String args) {
     }
 
     @Override
-    protected String convertValue(UUID uuid, String rawValue) {
-        return rawValue;
+    protected String getValue(String key, DialogPayload payload) {
+        return payload.textValue(key);
     }
 }
diff --git a/src/main/java/me/hsgamer/bettergui/betterdialogs/component/input/TextInputComponent.java b/src/main/java/me/hsgamer/bettergui/betterdialogs/component/input/TextInputComponent.java
@@ -18,6 +18,7 @@
 import io.github.projectunified.unidialog.adventure.input.AdventureTextInput;
 import io.github.projectunified.unidialog.core.input.DialogInputBuilder;
 import io.github.projectunified.unidialog.core.input.TextInput;
+import io.github.projectunified.unidialog.core.payload.DialogPayload;
 import me.hsgamer.bettergui.betterdialogs.DialogManagerProvider;
 import me.hsgamer.bettergui.betterdialogs.builder.DialogComponentBuilder;
 import me.hsgamer.bettergui.betterdialogs.text.Text;
@@ -97,7 +98,7 @@ protected String getValue(String value, UUID uuid, String args) {
     }
 
     @Override
-    protected String convertValue(UUID uuid, String rawValue) {
-        return rawValue;
+    protected String getValue(String key, DialogPayload payload) {
+        return payload.textValue(key);
     }
 }
diff --git a/src/main/java/me/hsgamer/bettergui/betterdialogs/menu/DialogMenu.java b/src/main/java/me/hsgamer/bettergui/betterdialogs/menu/DialogMenu.java
@@ -17,6 +17,7 @@
 
 import io.github.projectunified.unidialog.adventure.dialog.AdventureDialog;
 import io.github.projectunified.unidialog.core.dialog.Dialog;
+import io.github.projectunified.unidialog.core.payload.DialogPayload;
 import me.hsgamer.bettergui.betterdialogs.DialogManagerProvider;
 import me.hsgamer.bettergui.betterdialogs.builder.DialogComponentBuilder;
 import me.hsgamer.bettergui.betterdialogs.component.DialogComponent;
@@ -122,19 +123,19 @@ public abstract class DialogMenu extends BaseMenu {
         return dialog;
     }
 
-    private void applyInputs(UUID uuid, Map<String, String> map) {
+    private void applyInputs(DialogPayload payload) {
         for (DialogComponent component : componentMap.values()) {
             if (component instanceof InputComponent<?> inputComponent) {
-                inputComponent.applyValue(uuid, map);
+                inputComponent.applyValue(payload);
             }
         }
     }
 
     public String registerAction(String actionName, Consumer<UUID> action) {
         String id = getName() + "_" + actionName;
-        DialogManagerProvider.dialogManager().registerCustomAction(id, (uuid, map) -> {
-            applyInputs(uuid, map);
-            action.accept(uuid);
+        DialogManagerProvider.dialogManager().registerCustomAction(id, payload -> {
+            applyInputs(payload);
+            action.accept(payload.owner());
         });
         return id;
     }

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`import io.github.projectunified.unidialog.adventure.input.AdventureNumberRangeInput;`
`19`	`19`	`import io.github.projectunified.unidialog.core.input.DialogInputBuilder;`
`20`	`20`	`import io.github.projectunified.unidialog.core.input.NumberRangeInput;`
	`21`	`+import io.github.projectunified.unidialog.core.payload.DialogPayload;`
`21`	`22`	`import me.hsgamer.bettergui.betterdialogs.DialogManagerProvider;`
`22`	`23`	`import me.hsgamer.bettergui.betterdialogs.builder.DialogComponentBuilder;`
`23`	`24`	`import me.hsgamer.bettergui.betterdialogs.text.Text;`
`@@ -113,7 +114,7 @@ protected String getValue(Number value, UUID uuid, String args) {`
`113`	`114`	`}`
`114`	`115`
`115`	`116`	`@Override`
`116`		`- protected Number convertValue(UUID uuid, String rawValue) {`
`117`		`- return Validate.getNumber(rawValue).orElse(null);`
	`117`	`+ protected Number getValue(String key, DialogPayload payload) {`
	`118`	`+ return payload.numberValue(key);`
`118`	`119`	`}`
`119`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`
`18`	`18`	`import io.github.projectunified.unidialog.adventure.dialog.AdventureDialog;`
`19`	`19`	`import io.github.projectunified.unidialog.core.dialog.Dialog;`
	`20`	`+import io.github.projectunified.unidialog.core.payload.DialogPayload;`
`20`	`21`	`import me.hsgamer.bettergui.betterdialogs.DialogManagerProvider;`
`21`	`22`	`import me.hsgamer.bettergui.betterdialogs.builder.DialogComponentBuilder;`
`22`	`23`	`import me.hsgamer.bettergui.betterdialogs.component.DialogComponent;`
`@@ -122,19 +123,19 @@ public abstract class DialogMenu extends BaseMenu {`
`122`	`123`	`return dialog;`
`123`	`124`	`}`
`124`	`125`
`125`		`- private void applyInputs(UUID uuid, Map<String, String> map) {`
	`126`	`+ private void applyInputs(DialogPayload payload) {`
`126`	`127`	`for (DialogComponent component : componentMap.values()) {`
`127`	`128`	`if (component instanceof InputComponent<?> inputComponent) {`
`128`		`- inputComponent.applyValue(uuid, map);`
	`129`	`+ inputComponent.applyValue(payload);`
`129`	`130`	`}`
`130`	`131`	`}`
`131`	`132`	`}`
`132`	`133`
`133`	`134`	`public String registerAction(String actionName, Consumer<UUID> action) {`
`134`	`135`	`String id = getName() + "_" + actionName;`
`135`		`- DialogManagerProvider.dialogManager().registerCustomAction(id, (uuid, map) -> {`
`136`		`- applyInputs(uuid, map);`
`137`		`- action.accept(uuid);`
	`136`	`+ DialogManagerProvider.dialogManager().registerCustomAction(id, payload -> {`
	`137`	`+ applyInputs(payload);`
	`138`	`+ action.accept(payload.owner());`
`138`	`139`	`});`
`139`	`140`	`return id;`
`140`	`141`	`}`