Map magic item and variable name arguments to a more lenient brigadier argument type

Author: TonytheMacaroni

core/src/main/java/com/nisovin/magicspells/commands/MagicCommands.java

@@ -99,6 +99,7 @@ public static void register(@NotNull PaperCommandManager<CommandSourceStack> man
 		// Less restrictive in terms of valid non-quoted characters compared to the brigadier string type.
 		brigadierMapper.mapSimpleNMS(new TypeToken<OwnedSpellParser>() {}, "nbt_path", true);
 		brigadierMapper.mapSimpleNMS(new TypeToken<SpellParser<CommandSourceStack>>() {}, "nbt_path", true);
+		brigadierMapper.mapSimpleNMS(new TypeToken<LenientQuotedStringParser<CommandSourceStack>>() {}, "nbt_path", true);
 
 		MinecraftExceptionHandler.create(CommandSourceStack::getSender)
 			.defaultHandlers()

core/src/main/java/com/nisovin/magicspells/commands/MagicItemCommand.java

@@ -12,7 +12,6 @@
 import org.incendo.cloud.description.Description;
 import org.incendo.cloud.parser.flag.CommandFlag;
 import org.incendo.cloud.paper.PaperCommandManager;
-import org.incendo.cloud.parser.standard.StringParser;
 import org.incendo.cloud.parser.standard.IntegerParser;
 import org.incendo.cloud.suggestion.SuggestionProvider;
 import org.incendo.cloud.bukkit.data.MultiplePlayerSelector;
@@ -26,6 +25,7 @@
 import com.nisovin.magicspells.Perm;
 import com.nisovin.magicspells.util.magicitems.MagicItem;
 import com.nisovin.magicspells.util.magicitems.MagicItems;
+import com.nisovin.magicspells.commands.parsers.LenientQuotedStringParser;
 import com.nisovin.magicspells.commands.exceptions.InvalidCommandArgumentException;
 
 public class MagicItemCommand {
@@ -49,7 +49,7 @@ static void register(@NotNull PaperCommandManager<CommandSourceStack> manager) {
 			)
 			.required(
 				MAGIC_ITEM_KEY,
-				StringParser.stringParser(),
+				LenientQuotedStringParser.lenientQuotedStringParser(),
 				Description.of("The magic item to give."),
 				SuggestionProvider.suggestingStrings(MagicItems.getMagicItemKeys())
 			)

core/src/main/java/com/nisovin/magicspells/commands/VariableCommands.java

@@ -30,6 +30,7 @@
 import com.nisovin.magicspells.variables.Variable;
 import com.nisovin.magicspells.util.managers.VariableManager;
 import com.nisovin.magicspells.variables.variabletypes.GlobalVariable;
+import com.nisovin.magicspells.commands.parsers.LenientQuotedStringParser;
 import com.nisovin.magicspells.variables.variabletypes.GlobalStringVariable;
 import com.nisovin.magicspells.commands.exceptions.InvalidCommandArgumentException;
 
@@ -44,7 +45,7 @@ static void register(@NotNull PaperCommandManager<CommandSourceStack> manager) {
 
 		var variableComponent = CommandComponent.<CommandSourceStack, String>builder()
 			.key(VARIABLE_KEY)
-			.parser(StringParser.stringParser())
+			.parser(LenientQuotedStringParser.lenientQuotedStringParser())
 			.suggestionProvider(SuggestionProvider.suggestingStrings(
 				() -> MagicSpells.getVariableManager().getVariables().keySet().iterator()
 			));

core/src/main/java/com/nisovin/magicspells/commands/parsers/LenientQuotedStringParser.java

@@ -0,0 +1,25 @@
+package com.nisovin.magicspells.commands.parsers;
+
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+import org.incendo.cloud.context.CommandInput;
+import org.incendo.cloud.parser.ArgumentParser;
+import org.incendo.cloud.context.CommandContext;
+import org.incendo.cloud.parser.ParserDescriptor;
+import org.incendo.cloud.parser.ArgumentParseResult;
+import org.incendo.cloud.parser.standard.StringParser;
+
+public class LenientQuotedStringParser<C> implements ArgumentParser<C, String> {
+
+	public static <C> ParserDescriptor<C, String> lenientQuotedStringParser() {
+		return ParserDescriptor.of(new LenientQuotedStringParser<>(), String.class);
+	}
+
+	private final StringParser<C> stringParser = new StringParser<>(StringParser.StringMode.QUOTED);
+
+	@Override
+	public @NonNull ArgumentParseResult<String> parse(@NonNull CommandContext<C> commandContext, @NonNull CommandInput commandInput) {
+		return stringParser.parse(commandContext, commandInput);
+	}
+
+}