fix: avoid creating invalid tuning ID, avoid removing built-in tunings

zhenlige · Nov 28, 2024 · 3e9e22f · 3e9e22f
1 parent eeef142
commit 3e9e22f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/src/main/java/com/github/zhenlige/xennote/Xennote.java b/src/main/java/com/github/zhenlige/xennote/Xennote.java
@@ -5,6 +5,7 @@
 import com.github.zhenlige.xennote.payload.BlockTuningPayload;
 import com.google.common.collect.ImmutableSet;
 import com.mojang.brigadier.arguments.StringArgumentType;
+import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.command.v2.ArgumentTypeRegistry;
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
@@ -57,6 +58,9 @@ public class Xennote implements ModInitializer {
 		Registries.BLOCK_ENTITY_TYPE, Identifier.of(MOD_ID, "note_block_entity"),
 		new BlockEntityType<>(XenNoteBlockEntity::new, ImmutableSet.of(NOTE_BLOCK))
 	);
+	public static final DynamicCommandExceptionType INVALID_TUNING_ID = new DynamicCommandExceptionType(
+		o -> Text.translatable("argument.tuning.invalid_id",  o)
+	);
 
 	@Override
 	public void onInitialize() {
@@ -159,11 +163,15 @@ private static void registerCommand() {
 								MinecraftServer server = context.getSource().getServer();
 								WorldTunings tunings = WorldTunings.getServerState(server);
 								String id = StringArgumentType.getString(context, "id");
-								Tuning tuning = TuningArgumentType.getTuning(context, "tuning");
-								tunings.tunings.put(id, tuning);
-								for (ServerPlayerEntity player : server.getPlayerManager().getPlayerList())
-									ServerPlayNetworking.send(player, new UpdateTuningPayload(id, Optional.of(tuning)));
-								return 1;
+								if (id.matches("[A-Za-z_]\\w*")) {
+									Tuning tuning = TuningArgumentType.getTuning(context, "tuning");
+									tunings.tunings.put(id, tuning);
+									for (ServerPlayerEntity player : server.getPlayerManager().getPlayerList())
+										ServerPlayNetworking.send(player, new UpdateTuningPayload(id, Optional.of(tuning)));
+									return 1;
+								} else {
+									throw INVALID_TUNING_ID.create(id);
+								}
 							})
 						)
 					)
@@ -174,6 +182,8 @@ private static void registerCommand() {
 							WorldTunings tunings = WorldTunings.getServerState(server);
 							String id = StringArgumentType.getString(context, "id");
 							tunings.tunings.remove(id);
+							if (WorldTunings.BUILT_IN_TUNINGS.containsKey(id))
+								tunings.tunings.put(id, WorldTunings.BUILT_IN_TUNINGS.get(id));
 							for (ServerPlayerEntity player : server.getPlayerManager().getPlayerList())
 								ServerPlayNetworking.send(player, new UpdateTuningPayload(id, Optional.empty()));
 							return 1;

diff --git a/src/main/resources/assets/xennote/lang/en_us.json b/src/main/resources/assets/xennote/lang/en_us.json
@@ -13,5 +13,6 @@
 	"option.xennote.prime_map": "Prime mapping",
 	"option.xennote.prime": "Prime",
 	"option.xennote.map_to": "Mapped to interval",
-	"argument.tuning.invalid": "Invalid tuning argument: %s"
+	"argument.tuning.invalid": "Invalid tuning argument: %s",
+	"argument.tuning.invalid_id": "Invalid tuning ID: %s"
 }
diff --git a/src/main/resources/assets/xennote/lang/zh_cn.json b/src/main/resources/assets/xennote/lang/zh_cn.json
@@ -13,5 +13,6 @@
 	"option.xennote.prime_map": "质数映射",
 	"option.xennote.prime": "质数",
 	"option.xennote.map_to": "映射到音程",
-	"argument.tuning.invalid": "无效调律参数：%s"
+	"argument.tuning.invalid": "无效调律参数：%s",
+	"argument.tuning.invalid_id": "无效调律ID：%s"
 }
diff --git a/src/main/resources/assets/xennote/lang/zh_tw.json b/src/main/resources/assets/xennote/lang/zh_tw.json
@@ -13,6 +13,7 @@
 	"option.xennote.prime_map": "質數映射",
 	"option.xennote.prime": "質數",
 	"option.xennote.map_to": "映射到音程",
-	"argument.tuning.invalid": "無效調律參數：%s"
+	"argument.tuning.invalid": "無效調律參數：%s",
+	"argument.tuning.invalid_id": "無效調律ID：%s"
 
 }