So it begins...

1 files changed, 0 insertions, 208 deletions

diff --git a/patches/server/0295-Implement-Brigadier-Mojang-API.patch b/patches/server/0295-Implement-Brigadier-Mojang-API.patch
deleted file mode 100644
index b704b089cf..0000000000
--- a/patches/server/0295-Implement-Brigadier-Mojang-API.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <[email protected]>
-Date: Sun, 19 Apr 2020 18:15:29 -0400
-Subject: [PATCH] Implement Brigadier Mojang API
-
-Adds AsyncPlayerSendCommandsEvent
-  - Allows modifying on a per command basis what command data they see.
-
-Adds CommandRegisteredEvent
-  - Allows manipulating the CommandNode to add more children/metadata for the client
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index e6d66db4b5fe4385c34329897c8277e4bc814129..6807a91d4d55dc90e2820caa855a44844c87b7e2 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -14,6 +14,7 @@ val alsoShade: Configuration by configurations.creating
- 
- dependencies {
-     implementation(project(":paper-api"))
-+    implementation(project(":paper-mojangapi"))
-     // Paper start
-     implementation("org.jline:jline-terminal-jansi:3.21.0")
-     implementation("net.minecrell:terminalconsoleappender:1.3.0")
-diff --git a/src/main/java/com/mojang/brigadier/exceptions/CommandSyntaxException.java b/src/main/java/com/mojang/brigadier/exceptions/CommandSyntaxException.java
-index 3370731ee064d2693b972a0765c13dd4fd69f66a..614eba6cc55d1eb7755cac35c671cb6f6cacca13 100644
---- a/src/main/java/com/mojang/brigadier/exceptions/CommandSyntaxException.java
-+++ b/src/main/java/com/mojang/brigadier/exceptions/CommandSyntaxException.java
-@@ -5,7 +5,7 @@ package com.mojang.brigadier.exceptions;
- 
- import com.mojang.brigadier.Message;
- 
--public class CommandSyntaxException extends Exception {
-+public class CommandSyntaxException extends Exception implements net.kyori.adventure.util.ComponentMessageThrowable { // Paper
-     public static final int CONTEXT_AMOUNT = 10;
-     public static boolean ENABLE_COMMAND_STACK_TRACES = true;
-     public static BuiltInExceptionProvider BUILT_IN_EXCEPTIONS = new BuiltInExceptions();
-@@ -73,4 +73,11 @@ public class CommandSyntaxException extends Exception {
-     public int getCursor() {
-         return cursor;
-     }
-+
-+    // Paper start
-+    @Override
-+    public @org.jetbrains.annotations.Nullable net.kyori.adventure.text.Component componentMessage() {
-+        return io.papermc.paper.brigadier.PaperBrigadier.componentFromMessage(this.message);
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/com/mojang/brigadier/tree/CommandNode.java b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
-index da6250df1c5f3385b683cffde47754bca4606f5e..3384501f83d445f45aa8233e98c7597daa67b8ef 100644
---- a/src/main/java/com/mojang/brigadier/tree/CommandNode.java
-+++ b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
-@@ -34,6 +34,7 @@ public abstract class CommandNode<S> implements Comparable<CommandNode<S>> {
-     private final RedirectModifier<S> modifier;
-     private final boolean forks;
-     private Command<S> command;
-+    public LiteralCommandNode<CommandSourceStack> clientNode = null; // Paper
-     // CraftBukkit start
-     public void removeCommand(String name) {
-         this.children.remove(name);
-diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
-index 34fdef41d1eb3fe78bf688d69aae437d89a337bb..66bd75ee66840f17cc7d00ff89adcb88d83e4dc9 100644
---- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
-+++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
-@@ -43,7 +43,7 @@ import net.minecraft.world.phys.Vec2;
- import net.minecraft.world.phys.Vec3;
- import com.mojang.brigadier.tree.CommandNode; // CraftBukkit
- 
--public class CommandSourceStack implements SharedSuggestionProvider {
-+public class CommandSourceStack implements SharedSuggestionProvider, com.destroystokyo.paper.brigadier.BukkitBrigadierCommandSource { // Paper
- 
-     public static final SimpleCommandExceptionType ERROR_NOT_PLAYER = new SimpleCommandExceptionType(Component.translatable("permissions.requires.player"));
-     public static final SimpleCommandExceptionType ERROR_NOT_ENTITY = new SimpleCommandExceptionType(Component.translatable("permissions.requires.entity"));
-@@ -180,6 +180,26 @@ public class CommandSourceStack implements SharedSuggestionProvider {
-         return this.textName;
-     }
- 
-+    // Paper start
-+    @Override
-+    public org.bukkit.entity.Entity getBukkitEntity() {
-+        return getEntity() != null ? getEntity().getBukkitEntity() : null;
-+    }
-+
-+    @Override
-+    public org.bukkit.World getBukkitWorld() {
-+        return getLevel() != null ? getLevel().getWorld() : null;
-+    }
-+
-+    @Override
-+    public org.bukkit.Location getBukkitLocation() {
-+        Vec3 pos = getPosition();
-+        org.bukkit.World world = getBukkitWorld();
-+        Vec2 rot = getRotation();
-+        return world != null && pos != null ? new org.bukkit.Location(world, pos.x, pos.y, pos.z, rot != null ? rot.y : 0, rot != null ? rot.x : 0) : null;
-+    }
-+    // Paper end
-+
-     @Override
-     public boolean hasPermission(int level) {
-         // CraftBukkit start
-diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index b7f1569c662df13f278fc704cabec0400ba7c382..87ce129e1d592bcf68169feb559f44d5cda7c486 100644
---- a/src/main/java/net/minecraft/commands/Commands.java
-+++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -434,6 +434,7 @@ public class Commands {
-             bukkit.add(node.getName());
-         }
-         // Paper start - Async command map building
-+        new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent<CommandSourceStack>(player.getBukkitEntity(), (RootCommandNode) rootcommandnode, false).callEvent(); // Paper
-         net.minecraft.server.MinecraftServer.getServer().execute(() -> {
-            runSync(player, bukkit, rootcommandnode);
-         });
-@@ -441,6 +442,7 @@ public class Commands {
- 
-     private void runSync(ServerPlayer player, Collection<String> bukkit, RootCommandNode<SharedSuggestionProvider> rootcommandnode) {
-         // Paper end - Async command map building
-+        new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent<CommandSourceStack>(player.getBukkitEntity(), (RootCommandNode) rootcommandnode, false).callEvent(); // Paper
-         PlayerCommandSendEvent event = new PlayerCommandSendEvent(player.getBukkitEntity(), new LinkedHashSet<>(bukkit));
-         event.getPlayer().getServer().getPluginManager().callEvent(event);
- 
-@@ -459,6 +461,11 @@ public class Commands {
- 
-         while (iterator.hasNext()) {
-             CommandNode<CommandSourceStack> commandnode2 = (CommandNode) iterator.next();
-+            // Paper start
-+            if (commandnode2.clientNode != null) {
-+                commandnode2 = commandnode2.clientNode;
-+            }
-+            // Paper end
-             if ( !org.spigotmc.SpigotConfig.sendNamespaced && commandnode2.getName().contains( ":" ) ) continue; // Spigot
- 
-             if (commandnode2.canUse(source)) {
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1c2985463fbfe9c4c8357519019bab4fa82d5194..f286a4f65aba9706a1c7a6100b4045e6b47dc059 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -842,8 +842,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-                         ParseResults<CommandSourceStack> parseresults = this.server.getCommands().getDispatcher().parse(stringreader, this.player.createCommandSourceStack());
- 
-                         this.server.getCommands().getDispatcher().getCompletionSuggestions(parseresults).thenAccept((suggestions) -> {
--                            if (suggestions.isEmpty()) return; // CraftBukkit - don't send through empty suggestions - prevents [<args>] from showing for plugins with nothing more to offer
--                            this.connection.send(new ClientboundCommandSuggestionsPacket(packet.getId(), suggestions));
-+                            // Paper start - Brigadier API
-+                            com.destroystokyo.paper.event.brigadier.AsyncPlayerSendSuggestionsEvent suggestEvent = new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendSuggestionsEvent(this.getCraftPlayer(), suggestions, command);
-+                            suggestEvent.setCancelled(suggestions.isEmpty());
-+                            if (!suggestEvent.callEvent()) return;
-+                            this.connection.send(new ClientboundCommandSuggestionsPacket(packet.getId(), suggestEvent.getSuggestions()));
-+                            // Paper end - Brigadier API
-                         });
-                     });
-                 }
-@@ -858,7 +862,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-                         builder.suggest(completion.suggestion(), PaperAdventure.asVanilla(completion.tooltip()));
-                     }
-                 });
--                player.connection.send(new ClientboundCommandSuggestionsPacket(packet.getId(), builder.buildFuture().join()));
-+                // Paper start - Brigadier API
-+                com.mojang.brigadier.suggestion.Suggestions suggestions = builder.buildFuture().join();
-+                com.destroystokyo.paper.event.brigadier.AsyncPlayerSendSuggestionsEvent suggestEvent = new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendSuggestionsEvent(this.getCraftPlayer(), suggestions, command);
-+                suggestEvent.setCancelled(suggestions.isEmpty());
-+                if (!suggestEvent.callEvent()) return;
-+                this.connection.send(new ClientboundCommandSuggestionsPacket(packet.getId(), suggestEvent.getSuggestions()));
-+                // Paper end - Brigadier API
-             }
-         });
-         // Paper end - async tab completion
-diff --git a/src/main/java/org/bukkit/craftbukkit/command/BukkitCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/BukkitCommandWrapper.java
-index 83d81b9371902b0302d13e53b31c15fac4e67966..d113e54a30db16e2ad955170df6030d15de530d6 100644
---- a/src/main/java/org/bukkit/craftbukkit/command/BukkitCommandWrapper.java
-+++ b/src/main/java/org/bukkit/craftbukkit/command/BukkitCommandWrapper.java
-@@ -20,7 +20,7 @@ import org.bukkit.command.CommandException;
- import org.bukkit.command.CommandSender;
- import org.bukkit.craftbukkit.CraftServer;
- 
--public class BukkitCommandWrapper implements com.mojang.brigadier.Command<CommandSourceStack>, Predicate<CommandSourceStack>, SuggestionProvider<CommandSourceStack> {
-+public class BukkitCommandWrapper implements com.mojang.brigadier.Command<CommandSourceStack>, Predicate<CommandSourceStack>, SuggestionProvider<CommandSourceStack>, com.destroystokyo.paper.brigadier.BukkitBrigadierCommand<CommandSourceStack> { // Paper
- 
-     private final CraftServer server;
-     private final Command command;
-@@ -31,10 +31,24 @@ public class BukkitCommandWrapper implements com.mojang.brigadier.Command<Comman
-     }
- 
-     public LiteralCommandNode<CommandSourceStack> register(CommandDispatcher<CommandSourceStack> dispatcher, String label) {
--        return dispatcher.register(
--                LiteralArgumentBuilder.<CommandSourceStack>literal(label).requires(this).executes(this)
--                .then(RequiredArgumentBuilder.<CommandSourceStack, String>argument("args", StringArgumentType.greedyString()).suggests(this).executes(this))
--        );
-+        // Paper start - Expose Brigadier to Paper-MojangAPI
-+        com.mojang.brigadier.tree.RootCommandNode<CommandSourceStack> root = dispatcher.getRoot();
-+        LiteralCommandNode<CommandSourceStack> literal = LiteralArgumentBuilder.<CommandSourceStack>literal(label).requires(this).executes(this).build();
-+        LiteralCommandNode<CommandSourceStack> defaultNode = literal;
-+        com.mojang.brigadier.tree.ArgumentCommandNode<CommandSourceStack, String> defaultArgs = RequiredArgumentBuilder.<CommandSourceStack, String>argument("args", StringArgumentType.greedyString()).suggests(this).executes(this).build();
-+        literal.addChild(defaultArgs);
-+        com.destroystokyo.paper.event.brigadier.CommandRegisteredEvent<CommandSourceStack> event = new com.destroystokyo.paper.event.brigadier.CommandRegisteredEvent<>(label, this, this.command, root, literal, defaultArgs);
-+        if (!event.callEvent()) {
-+            return null;
-+        }
-+        literal = event.getLiteral();
-+        if (event.isRawCommand()) {
-+            defaultNode.clientNode = literal;
-+            literal = defaultNode;
-+        }
-+        root.addChild(literal);
-+        return literal;
-+        // Paper end
-     }
- 
-     @Override