Add demo command

patches/server/0061-Add-demo-command.patch

@@ -1,79 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Mon, 30 Nov 2020 03:12:04 -0600
-Subject: [PATCH] Add demo command
-
-
-diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
-index d4ca48d52c32c5dfb290936fdfc7268f0485aeaf..e0b5a1d017cbafdde2c38745a045452c76614b66 100644
---- a/net/minecraft/commands/Commands.java
-+++ b/net/minecraft/commands/Commands.java
-@@ -255,6 +255,7 @@ public class Commands {
-             StopCommand.register(this.dispatcher);
-             TransferCommand.register(this.dispatcher);
-             WhitelistCommand.register(this.dispatcher);
-+            org.purpurmc.purpur.command.DemoCommand.register(this.dispatcher); // Purpur
-             org.purpurmc.purpur.command.PingCommand.register(this.dispatcher); // Purpur
-         }
- 
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 33bece7921477677370829c8d5243796bb52deb1..790dbbc02a89eeb715cdda339da01379ca704afa 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -182,6 +182,7 @@ public class PurpurConfig {
-     public static boolean afkBroadcastUseDisplayName = false;
-     public static String afkTabListPrefix = "[AFK] ";
-     public static String afkTabListSuffix = "";
-+    public static String demoCommandOutput = "<green>%s has been shown the demo screen";
-     public static String pingCommandOutput = "<green>%s's ping is %sms";
-     private static void messages() {
-         cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
-@@ -190,6 +191,7 @@ public class PurpurConfig {
-         afkBroadcastUseDisplayName = getBoolean("settings.messages.afk-broadcast-use-display-name", afkBroadcastUseDisplayName);
-         afkTabListPrefix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-prefix", afkTabListPrefix)));
-         afkTabListSuffix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix)));
-+        demoCommandOutput = getString("settings.messages.demo-command-output", demoCommandOutput);
-         pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
-     }
- 
-diff --git a/src/main/java/org/purpurmc/purpur/command/DemoCommand.java b/src/main/java/org/purpurmc/purpur/command/DemoCommand.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..235f3cd89f675b70a6152a00534608c0902f19fd
---- /dev/null
-+++ b/src/main/java/org/purpurmc/purpur/command/DemoCommand.java
-@@ -0,0 +1,35 @@
-+package org.purpurmc.purpur.command;
-+
-+import com.mojang.brigadier.CommandDispatcher;
-+import net.minecraft.commands.CommandSourceStack;
-+import net.minecraft.commands.Commands;
-+import net.minecraft.commands.arguments.EntityArgument;
-+import net.minecraft.network.protocol.game.ClientboundGameEventPacket;
-+import net.minecraft.server.level.ServerPlayer;
-+import org.purpurmc.purpur.PurpurConfig;
-+
-+import java.util.Collection;
-+import java.util.Collections;
-+
-+public class DemoCommand {
-+    public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
-+        dispatcher.register(Commands.literal("demo")
-+                .requires((listener) -> listener.hasPermission(2, "bukkit.command.demo"))
-+                .executes((context) -> execute(context.getSource(), Collections.singleton(context.getSource().getPlayerOrException())))
-+                .then(Commands.argument("targets", EntityArgument.players())
-+                        .requires(listener -> listener.hasPermission(2, "bukkit.command.demo.other"))
-+                        .executes((context) -> execute(context.getSource(), EntityArgument.getPlayers(context, "targets")))
-+                )
-+        );
-+    }
-+
-+    private static int execute(CommandSourceStack sender, Collection<ServerPlayer> targets) {
-+        for (ServerPlayer player : targets) {
-+            ClientboundGameEventPacket packet = new ClientboundGameEventPacket(ClientboundGameEventPacket.DEMO_EVENT, 0);
-+            player.connection.send(packet);
-+            String output = String.format(PurpurConfig.demoCommandOutput, player.getGameProfile().getName());
-+            sender.sendSuccess(output, false);
-+        }
-+        return targets.size();
-+    }
-+}

purpur-server/minecraft-patches/sources/net/minecraft/commands/Commands.java.patch

@@ -8,10 +8,11 @@
  import org.slf4j.Logger;
  
  public class Commands {
-@@ -245,6 +_,7 @@
+@@ -245,6 +_,8 @@
              StopCommand.register(this.dispatcher);
              TransferCommand.register(this.dispatcher);
              WhitelistCommand.register(this.dispatcher);
++            org.purpurmc.purpur.command.DemoCommand.register(this.dispatcher); // Purpur - Add demo command
 +            org.purpurmc.purpur.command.PingCommand.register(this.dispatcher); // Purpur - Add ping command
          }
  

purpur-server/src/main/java/org/purpurmc/purpur/PurpurConfig.java

@@ -163,6 +163,7 @@ public class PurpurConfig {
     public static boolean afkBroadcastUseDisplayName = false;
     public static String afkTabListPrefix = "[AFK] ";
     public static String afkTabListSuffix = "";
+    public static String demoCommandOutput = "<green>%s has been shown the demo screen";
     public static String pingCommandOutput = "<green>%s's ping is %sms";
     private static void messages() {
         cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
@@ -171,6 +172,7 @@ public class PurpurConfig {
         afkBroadcastUseDisplayName = getBoolean("settings.messages.afk-broadcast-use-display-name", afkBroadcastUseDisplayName);
         afkTabListPrefix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-prefix", afkTabListPrefix)));
         afkTabListSuffix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix)));
+        demoCommandOutput = getString("settings.messages.demo-command-output", demoCommandOutput);
         pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
     }
 

purpur-server/src/main/java/org/purpurmc/purpur/command/DemoCommand.java

@@ -0,0 +1,35 @@
+package org.purpurmc.purpur.command;
+
+import com.mojang.brigadier.CommandDispatcher;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+import net.minecraft.commands.arguments.EntityArgument;
+import net.minecraft.network.protocol.game.ClientboundGameEventPacket;
+import net.minecraft.server.level.ServerPlayer;
+import org.purpurmc.purpur.PurpurConfig;
+
+import java.util.Collection;
+import java.util.Collections;
+
+public class DemoCommand {
+    public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
+        dispatcher.register(Commands.literal("demo")
+                .requires((listener) -> listener.hasPermission(2, "bukkit.command.demo"))
+                .executes((context) -> execute(context.getSource(), Collections.singleton(context.getSource().getPlayerOrException())))
+                .then(Commands.argument("targets", EntityArgument.players())
+                        .requires(listener -> listener.hasPermission(2, "bukkit.command.demo.other"))
+                        .executes((context) -> execute(context.getSource(), EntityArgument.getPlayers(context, "targets")))
+                )
+        );
+    }
+
+    private static int execute(CommandSourceStack sender, Collection<ServerPlayer> targets) {
+        for (ServerPlayer player : targets) {
+            ClientboundGameEventPacket packet = new ClientboundGameEventPacket(ClientboundGameEventPacket.DEMO_EVENT, 0);
+            player.connection.send(packet);
+            String output = String.format(PurpurConfig.demoCommandOutput, player.getGameProfile().getName());
+            sender.sendSuccess(output, false);
+        }
+        return targets.size();
+    }
+}