From d264674a851ed10425eba6a7ba2e1129aafd0c8c Mon Sep 17 00:00:00 2001 From: sciwhiz12 Date: Sun, 17 Jul 2022 22:32:10 +0800 Subject: [PATCH] [1.18] Fix EnumArgument to use enum names for suggestions (#8746) 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). Using Enum#name fixes this discrepancy, so now the suggestions are always valid inputs regardless of the return of Enum#toString. Fixes #8618 --- .../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 eb2a03b793..6cd444987c 100644 --- a/src/main/java/net/minecraftforge/server/command/EnumArgument.java +++ b/src/main/java/net/minecraftforge/server/command/EnumArgument.java @@ -42,18 +42,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 Serializer implements ArgumentSerializer>