From 2cf6a57bca962f793b5f2a10da7b2f46e2c56627 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Tue, 21 Dec 2021 21:34:20 -0800 Subject: [PATCH] Fix entity type tags suggestions in selectors (#6468) --- ...y-type-tags-suggestions-in-selectors.patch | 126 ++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100644 patches/server/0836-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/0836-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0836-Fix-entity-type-tags-suggestions-in-selectors.patch new file mode 100644 index 0000000000..c86a4323be --- /dev/null +++ b/patches/server/0836-Fix-entity-type-tags-suggestions-in-selectors.patch @@ -0,0 +1,126 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic +Date: Sun, 22 Aug 2021 15:21:57 -0700 +Subject: [PATCH] Fix entity type tags suggestions in selectors + +This would really be better as a client fix because just to fix it +all EntityArguments have been told to ask the server for completions +when if this was fixed on the client, that wouldn't be needed. + +Mojira Issue: https://bugs.mojang.com/browse/MC-235045 + +diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java +index cd918cec00d8202252af0d20b1a8891371c538e3..6d02910a903f2c6352202c49149172e3eee3ed86 100644 +--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java ++++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java +@@ -524,6 +524,11 @@ public class PaperConfig { + itemValidationBookPageLength = getInt("settings.item-validation.book.page", itemValidationBookPageLength); + } + ++ public static boolean fixTargetSelectorTagCompletion = true; ++ private static void fixTargetSelectorTagCompletion() { ++ fixTargetSelectorTagCompletion = getBoolean("settings.fix-target-selector-tag-completion", fixTargetSelectorTagCompletion); ++ } ++ + public static final class PacketLimit { + public final double packetLimitInterval; + public final double maxPacketRate; +diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java +index f6b73f8c6638ddf79e45042f5c8902ea1f271f5c..78603232b62549427401f9d5217d083405cb2659 100644 +--- a/src/main/java/net/minecraft/commands/Commands.java ++++ b/src/main/java/net/minecraft/commands/Commands.java +@@ -452,6 +452,11 @@ public class Commands { + } + + public static RequiredArgumentBuilder argument(String name, ArgumentType type) { ++ // Paper start ++ if (com.destroystokyo.paper.PaperConfig.fixTargetSelectorTagCompletion && type.getClass() == net.minecraft.commands.arguments.EntityArgument.class) { ++ return RequiredArgumentBuilder.argument(name, type).suggests(type::listSuggestions); ++ } ++ // Paper end + return RequiredArgumentBuilder.argument(name, type); + } + +diff --git a/src/main/java/net/minecraft/commands/arguments/EntityArgument.java b/src/main/java/net/minecraft/commands/arguments/EntityArgument.java +index 1f3076e59bac23d428c747ae12619e4b4e5fdd5a..1d23d05d7028c5f820f172cc54153f56848e1d05 100644 +--- a/src/main/java/net/minecraft/commands/arguments/EntityArgument.java ++++ b/src/main/java/net/minecraft/commands/arguments/EntityArgument.java +@@ -127,7 +127,7 @@ public class EntityArgument implements ArgumentType { + + stringreader.setCursor(suggestionsbuilder.getStart()); + SharedSuggestionProvider icompletionprovider = (SharedSuggestionProvider) commandcontext.getSource(); +- EntitySelectorParser argumentparserselector = new EntitySelectorParser(stringreader, icompletionprovider.hasPermission(2)); ++ EntitySelectorParser argumentparserselector = new EntitySelectorParser(stringreader, icompletionprovider.hasPermission(2), true); // Paper + + try { + argumentparserselector.parse(); +diff --git a/src/main/java/net/minecraft/commands/arguments/selector/EntitySelectorParser.java b/src/main/java/net/minecraft/commands/arguments/selector/EntitySelectorParser.java +index 466d1d8d80df028ff842ce21be198be6a1c77b42..015d01242a9e8e7c6ef5b6bbf1b6d6ad0c8f36ca 100644 +--- a/src/main/java/net/minecraft/commands/arguments/selector/EntitySelectorParser.java ++++ b/src/main/java/net/minecraft/commands/arguments/selector/EntitySelectorParser.java +@@ -115,12 +115,19 @@ public class EntitySelectorParser { + private boolean hasScores; + private boolean hasAdvancements; + private boolean usesSelectors; ++ public boolean parsingEntityArgumentSuggestions; // Paper - track when parsing EntityArgument suggestions + + public EntitySelectorParser(StringReader reader) { + this(reader, true); + } + + public EntitySelectorParser(StringReader reader, boolean atAllowed) { ++ // Paper start ++ this(reader, atAllowed, false); ++ } ++ public EntitySelectorParser(StringReader reader, boolean atAllowed, boolean parsingEntityArgumentSuggestions) { ++ this.parsingEntityArgumentSuggestions = parsingEntityArgumentSuggestions; ++ // Paper end + this.distance = MinMaxBounds.Doubles.ANY; + this.level = MinMaxBounds.Ints.ANY; + this.rotX = WrappedMinMaxBounds.ANY; +diff --git a/src/main/java/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.java b/src/main/java/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.java +index 061181381e4eabad5fa0122f049c4ce05996ffd2..90e023be5c38a038f1c03141ef4325abb25fd615 100644 +--- a/src/main/java/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.java ++++ b/src/main/java/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.java +@@ -69,6 +69,19 @@ public class EntitySelectorOptions { + public static final DynamicCommandExceptionType ERROR_ENTITY_TYPE_INVALID = new DynamicCommandExceptionType((entity) -> { + return new TranslatableComponent("argument.entity.options.type.invalid", entity); + }); ++ // Paper start ++ public static final DynamicCommandExceptionType ERROR_ENTITY_TAG_INVALID = new DynamicCommandExceptionType((object) -> { ++ return io.papermc.paper.adventure.PaperAdventure ++ .asVanilla(net.kyori.adventure.text.Component ++ .text("Invalid or unknown entity type tag '" + object + "'") ++ .hoverEvent(net.kyori.adventure.text.event.HoverEvent ++ .showText(net.kyori.adventure.text.Component ++ .text("You can disable this error in 'paper.yml'") ++ ) ++ ) ++ ); ++ }); ++ // Paper end + + private static void register(String id, EntitySelectorOptions.Modifier handler, Predicate condition, Component description) { + OPTIONS.put(id, new EntitySelectorOptions.Option(handler, condition, description)); +@@ -316,8 +329,20 @@ public class EntitySelectorOptions { + + if (reader.isTag()) { + ResourceLocation resourceLocation = ResourceLocation.read(reader.getReader()); ++ // Paper start - throw error if invalid entity tag (only on suggestions to keep cmd success behavior) ++ final net.minecraft.tags.Tag> tag; ++ if (com.destroystokyo.paper.PaperConfig.fixTargetSelectorTagCompletion && reader.parsingEntityArgumentSuggestions) { ++ tag = EntityTypeTags.getAllTags().getTag(resourceLocation); ++ } else { ++ tag = EntityTypeTags.getAllTags().getTagOrEmpty(resourceLocation); ++ } ++ if (tag == null) { ++ reader.getReader().setCursor(i); ++ throw ERROR_ENTITY_TAG_INVALID.createWithContext(reader.getReader(), resourceLocation.toString()); ++ } ++ // Paper end + reader.addPredicate((entity) -> { +- return entity.getType().is(entity.getServer().getTags().getOrEmpty(Registry.ENTITY_TYPE_REGISTRY).getTagOrEmpty(resourceLocation)) != bl; ++ return entity.getType().is(tag) != bl; // Paper + }); + } else { + ResourceLocation resourceLocation2 = ResourceLocation.read(reader.getReader());