Use waitShowModalForm

jasonlaubb · Mar 9, 2025 · eb00a41 · eb00a41
1 parent 2cc353e
commit eb00a41
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 25 deletions.
diff --git a/Matrix_BP/functions/matrix/help.mcfunction b/Matrix_BP/functions/matrix/help.mcfunction
@@ -1,4 +1,4 @@
-tellraw @s {"rawtext":[{"translate":"function.help","with":["CqZGXeRKPJ", "V6.0.34"]},{"text":"\n§7>> §c(Not translated) If you cannot see any messages, install the RESOURCE PACK correctly, Matrix anticheat required RP to show you the translated message.\n"},{"translate":"function.help.typeA","with":[]},{"text":"\n"},{"translate":"function.help.typeB","with":[]}]}
+tellraw @s {"rawtext":[{"translate":"function.help","with":["CqZGXeRKPJ", "V6.0.35"]},{"text":"\n§7>> §c(Not translated) If you cannot see any messages, install the RESOURCE PACK correctly, Matrix anticheat required RP to show you the translated message.\n"},{"translate":"function.help.typeA","with":[]},{"text":"\n"},{"translate":"function.help.typeB","with":[]}]}
 scoreboard objectives add matrix:zero_mark dummy
 scoreboard players set is_enabled matrix:zero_mark -1
 execute if score is_enabled matrix:script-online = is_enabled matrix:zero_mark run tellraw @s {"rawtext":[{"translate":"function.script.online"}]}

diff --git a/Matrix_BP/manifest.json b/Matrix_BP/manifest.json
@@ -1,10 +1,10 @@
 {
     "format_version": 2,
     "header": {
-        "name": "§bMatrix§a+ §gAnti-Cheat §7(BP§7) V6.0.34§r",
+        "name": "§bMatrix§a+ §gAnti-Cheat §7(BP§7) V6.0.35§r",
         "description": "pack.description",
         "uuid": "22cc8811-023a-42dc-9f1b-45065f9d33b2",
-        "version": [6, 0, 34],
+        "version": [6, 0, 35],
         "min_engine_version": [1, 21, 60]
     },
     "metadata": {
@@ -29,7 +29,7 @@
     "dependencies": [
         {
             "uuid": "44408a4d-808d-4c6a-bd46-77dd6c3f5fbb",
-            "version": [6, 0, 34]
+            "version": [6, 0, 35]
         },
         {
             "module_name": "@minecraft/server",

diff --git a/Matrix_BP/src/matrixAPI.ts b/Matrix_BP/src/matrixAPI.ts
@@ -64,7 +64,7 @@ export class IntegratedSystemEvent {
  * @warn You are not allowed to copy or modify this system unless you have declared yours as a fork from us.
  */
 class Module {
-    public static readonly version: [number, number, number] = [6, 0, 34];
+    public static readonly version: [number, number, number] = [6, 0, 35];
     public static readonly discordInviteLink = "CqZGXeRKPJ";
     // Map that store almost everything. (Temporary)
     public static readonly tickData = new Map<string, TickData>();

diff --git a/Matrix_BP/src/program/command/mset.ts b/Matrix_BP/src/program/command/mset.ts
@@ -2,6 +2,7 @@ import { system } from "@minecraft/server";
 import { Command, Config } from "../../matrixAPI";
 import { fastText, rawtextTranslate } from "../../util/rawtext";
 import { ModalFormData } from "@minecraft/server-ui";
+import { waitShowModalForm } from "../../util/util";
 const MATCH_REG = /#[(a-zA-Z)|/]+\,[^#,]+#/g
 const TEST_REG = /^(#[(a-zA-Z)|/]+\,[^#,]+#)+$/
 new Command()
@@ -10,26 +11,22 @@ new Command()
 	.setMinPermissionLevel(3)
 	.setAliases("multiset", "fastset", "fset", "import")
 	.onExecute(async (player) => {
-		new ModalFormData()
+		const data = await waitShowModalForm(new ModalFormData()
 			.title(rawtextTranslate("command.mset.title"))
 			.textField(rawtextTranslate("command.mset.input"), "<key here>")
-			.submitButton("Press to input")
-			//@ts-expect-error
-			.show(player)
-			.then((data) => {
-				if (data.canceled) return;
-				const key = data.formValues![0] as string;
-				const match = key.match(MATCH_REG);
-				if (match === null || TEST_REG.test(key) === false) {
-					player.sendMessage(fastText().addText("§bMatrix§a+ §7> §c").addTran("command.mset.error").build());
-					return;
-				}
-				match.forEach((value) => {
-					const [key, ...nv] = value.slice(1, -1).split(",");
-					player.runChatCommand(`set ${key} "${nv.join(",")}"`)
-				});
-				player.sendMessage(rawtextTranslate("command.mset.success", match.length.toString()));
-			})
+			.submitButton("Press to input"), player);
+		if (data === null ||data.canceled) return;
+		const key = data.formValues![0] as string;
+		const match = key.match(MATCH_REG);
+		if (match === null || TEST_REG.test(key) === false) {
+			player.sendMessage(fastText().addText("§bMatrix§a+ §7> §c").addTran("command.mset.error").build());
+			return;
+		}
+		match.forEach((value) => {
+			const [key, ...nv] = value.slice(1, -1).split(",");
+			player.runChatCommand(`set ${key} "${nv.join(",")}"`)
+		});
+		player.sendMessage(rawtextTranslate("command.mset.success", match.length.toString()));
 	})
 	.register();
 new Command()

diff --git a/Matrix_RP/manifest.json b/Matrix_RP/manifest.json
@@ -1,10 +1,10 @@
 {
     "format_version": 2,
     "header": {
-        "name": "§bMatrix§a+ §gAnti-Cheat §7(RP§7) V6.0.34§r",
+        "name": "§bMatrix§a+ §gAnti-Cheat §7(RP§7) V6.0.35§r",
         "description": "pack.description",
         "uuid": "44408a4d-808d-4c6a-bd46-77dd6c3f5fbb",
-        "version": [6, 0, 34],
+        "version": [6, 0, 35],
         "min_engine_version": [1, 21, 60]
     },
     "modules": [