Resolve todo in EnchantmentLevelArgumentType

Author: Wide-Cat

src/main/java/meteordevelopment/meteorclient/commands/arguments/EnchantmentLevelArgumentType.java

@@ -9,7 +9,7 @@
 import com.mojang.brigadier.arguments.ArgumentType;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
+import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
 import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 import net.minecraft.enchantment.Enchantment;
@@ -21,9 +21,9 @@
 import java.util.concurrent.CompletableFuture;
 
 public class EnchantmentLevelArgumentType implements ArgumentType<Integer> {
+    private static final SimpleCommandExceptionType INVALID_LEVEL = new SimpleCommandExceptionType(Text.literal("Level must be at least 1"));
     private final String enchantmentArgName;
 
-
     public EnchantmentLevelArgumentType(String enchantmentArgName) {
         this.enchantmentArgName = enchantmentArgName;
     }
@@ -32,18 +32,14 @@ public static EnchantmentLevelArgumentType enchantmentLevel(String enchantmentAr
         return new EnchantmentLevelArgumentType(enchantmentArgName);
     }
 
-
     @Override
     public Integer parse(StringReader reader) throws CommandSyntaxException {
         int start = reader.getCursor();
         int level = reader.readInt();
 
         if (level < 1) {
             reader.setCursor(start);
-            throw new CommandSyntaxException(
-                new DynamicCommandExceptionType(obj -> Text.literal("Level must be at least 1")),
-                Text.literal("Level must be at least 1")
-            );
+            throw INVALID_LEVEL.createWithContext(reader);
         }
 
         return level;
@@ -59,27 +55,28 @@ public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> cont
             int maxLevel = enchantment.value().getMaxLevel();
             String enchantName = enchantment.value().description().getString();
 
-            // Build suggestions based on max level
-            // Suggest 1 through maxLevel
-            for (int i = 1; i <= Math.min(maxLevel, 10); i++) {
-                builder.suggest(i);
-            }
-
-            // TODO: this isn't working, only the above suggestions show up; overengineering?
             // Add a tooltip showing the valid range
             String remaining = builder.getRemaining();
             if (!remaining.isEmpty()) {
                 try {
                     int typedLevel = Integer.parseInt(remaining);
                     if (typedLevel > maxLevel) {
                         // Show error in suggestions
-                        builder.suggest(maxLevel, Text.literal("§c" + enchantName + " max: " + maxLevel));
+                        builder.suggest(maxLevel, Text.literal("§c" + enchantName + " max level: " + maxLevel));
                     }
+
+                    return builder.buildFuture();
                 } catch (NumberFormatException ignored) {
                     // Command handler highlights invalid input
                 }
             }
 
+            // Build suggestions based on max level
+            // Suggest 1 through maxLevel
+            for (int i = 1; i <= Math.min(maxLevel, 10); i++) {
+                builder.suggest(i);
+            }
+
             return builder.buildFuture();
         } catch (Exception e) {
             return Suggestions.empty();