From 915d570b17f6309bff72745fb5843bb973c31791 Mon Sep 17 00:00:00 2001 From: sciwhiz12 Date: Thu, 16 Jun 2022 05:15:32 +0800 Subject: [PATCH] Fix EnumArgument to use enum names for suggestions (#8728) Previously, the suggestions used the string representation of the enum through Enum#toString, which can differ from the name of the enum as required by Enum#valueOf, causing invalid suggestions (both in gui and through the error message). --- .../net/minecraftforge/server/command/EnumArgument.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraftforge/server/command/EnumArgument.java b/src/main/java/net/minecraftforge/server/command/EnumArgument.java index 1a4c282c7b..28855c30bb 100644 --- a/src/main/java/net/minecraftforge/server/command/EnumArgument.java +++ b/src/main/java/net/minecraftforge/server/command/EnumArgument.java @@ -43,18 +43,18 @@ public class EnumArgument> implements ArgumentType { try { return Enum.valueOf(enumClass, name); } catch (IllegalArgumentException e) { - throw INVALID_ENUM.createWithContext(reader, name, Arrays.toString(enumClass.getEnumConstants())); + throw INVALID_ENUM.createWithContext(reader, name, Arrays.toString(Arrays.stream(enumClass.getEnumConstants()).map(Enum::name).toArray())); } } @Override public CompletableFuture listSuggestions(final CommandContext context, final SuggestionsBuilder builder) { - return SharedSuggestionProvider.suggest(Stream.of(enumClass.getEnumConstants()).map(Object::toString), builder); + return SharedSuggestionProvider.suggest(Stream.of(enumClass.getEnumConstants()).map(Enum::name), builder); } @Override public Collection getExamples() { - return Stream.of(enumClass.getEnumConstants()).map(Object::toString).collect(Collectors.toList()); + return Stream.of(enumClass.getEnumConstants()).map(Enum::name).collect(Collectors.toList()); } public static class Info> implements ArgumentTypeInfo, Info.Template>