1.21.5

Co-authored-by: Bjarne Koll <git@lynxplay.dev>
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Co-authored-by: MiniDigger | Martin <admin@minidigger.dev>
Co-authored-by: Nassim Jahnke <nassim@njahnke.dev>
Co-authored-by: Noah van der Aa <ndvdaa@gmail.com>
Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
Co-authored-by: Shane Freeder <theboyetronic@gmail.com>
Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
Co-authored-by: Tamion <70228790+notTamion@users.noreply.github.com>
Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com>

paper-server/patches/sources/net/minecraft/commands/CommandSourceStack.java.patch

@@ -18,11 +18,10 @@
  
      public CommandSourceStack(
          CommandSource source,
-@@ -187,6 +_,30 @@
-                 this.chatMessageChainer
+@@ -188,6 +_,30 @@
              );
      }
-+    
+ 
 +    // Paper start - Expose 'with' functions from the CommandSourceStack
 +    @Override
 +    public CommandSourceStack withLocation(org.bukkit.Location location) {
@@ -46,9 +45,10 @@
 +        );
 +    }
 +    // Paper end - Expose 'with' functions from the CommandSourceStack
- 
++
      public CommandSourceStack withRotation(Vec2 rotation) {
          return this.rotation.equals(rotation)
+             ? this
 @@ -391,9 +_,44 @@
  
      @Override
@@ -94,7 +94,7 @@
      public Vec3 getPosition() {
          return this.worldPosition;
      }
-@@ -499,20 +_,25 @@
+@@ -498,20 +_,25 @@
          Component component = Component.translatable("chat.type.admin", this.getDisplayName(), message).withStyle(ChatFormatting.GRAY, ChatFormatting.ITALIC);
          if (this.server.getGameRules().getBoolean(GameRules.RULE_SENDCOMMANDFEEDBACK)) {
              for (ServerPlayer serverPlayer : this.server.getPlayerList().getPlayers()) {
@@ -123,7 +123,7 @@
          }
      }
  
-@@ -523,7 +_,7 @@
+@@ -522,7 +_,7 @@
  
      @Override
      public Collection<String> getOnlinePlayerNames() {
@@ -132,7 +132,7 @@
      }
  
      @Override
-@@ -598,4 +_,16 @@
+@@ -597,4 +_,16 @@
      public boolean isSilent() {
          return this.silent;
      }

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

@@ -127,7 +127,7 @@
                  StackTraceElement[] stackTrace = var12.getStackTrace();
  
                  for (int i = 0; i < Math.min(stackTrace.length, 3); i++) {
-@@ -309,18 +_,22 @@
+@@ -308,18 +_,22 @@
      }
  
      @Nullable
@@ -148,12 +148,12 @@
                  int min = Math.min(var7.getInput().length(), var7.getCursor());
                  MutableComponent mutableComponent = Component.empty()
                      .withStyle(ChatFormatting.GRAY)
--                    .withStyle(style -> style.withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/" + command)));
-+                    .withStyle(style -> style.withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/" + label))); // CraftBukkit // Paper
+-                    .withStyle(style -> style.withClickEvent(new ClickEvent.SuggestCommand("/" + command)));
++                    .withStyle(style -> style.withClickEvent(new ClickEvent.SuggestCommand("/" + label))); // CraftBukkit // Paper
                  if (min > 10) {
                      mutableComponent.append(CommonComponents.ELLIPSIS);
                  }
-@@ -332,7 +_,17 @@
+@@ -331,7 +_,17 @@
                  }
  
                  mutableComponent.append(Component.translatable("command.context.here").withStyle(ChatFormatting.RED, ChatFormatting.ITALIC));
@@ -172,7 +172,7 @@
              }
  
              return null;
-@@ -360,26 +_,120 @@
+@@ -359,26 +_,120 @@
      }
  
      public void sendCommands(ServerPlayer player) {
@@ -297,9 +297,9 @@
 +                // we want the exact command instance to be used for equality checks
 +                // when assigning serialization ids to each command node
  
-                 if (argumentBuilder instanceof RequiredArgumentBuilder) {
-                     RequiredArgumentBuilder<SharedSuggestionProvider, ?> requiredArgumentBuilder = (RequiredArgumentBuilder<SharedSuggestionProvider, ?>)argumentBuilder;
-@@ -396,7 +_,7 @@
+                 if (argumentBuilder instanceof RequiredArgumentBuilder requiredArgumentBuilder
+                     && requiredArgumentBuilder.getSuggestionsProvider() != null) {
+@@ -393,7 +_,7 @@
                  commandNodeToSuggestionNode.put(commandNode, commandNode1);
                  rootSuggestion.addChild(commandNode1);
                  if (!commandNode.getChildren().isEmpty()) {