Update Configurable unknown command message patch to follow the vanilla

* Add <message> to be more configurable
* Fix for custom brigadier exception message #319

leaf-server/minecraft-patches/features/0055-Configurable-unknown-command-message.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable unknown command message
 
 
 diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
-index fb18f69cb26132fc8c53b185454c6aadb8a5f7e5..eff6d524c8acfc62d1fcf6b5552754e794a22735 100644
+index 8b9374ee6df71228bb8ea22661622a15cf3bc350..59e5f93df54abc56329b38340882dade7d7104a3 100644
 --- a/net/minecraft/commands/Commands.java
 +++ b/net/minecraft/commands/Commands.java
 @@ -404,31 +404,9 @@ public class Commands {
@@ -13,7 +13,7 @@ index fb18f69cb26132fc8c53b185454c6aadb8a5f7e5..eff6d524c8acfc62d1fcf6b5552754e7
              final net.kyori.adventure.text.TextComponent.Builder builder = net.kyori.adventure.text.Component.text();
              // source.sendFailure(ComponentUtils.fromMessage(var7.getRawMessage()));
 -            builder.color(net.kyori.adventure.text.format.NamedTextColor.RED).append(io.papermc.paper.command.brigadier.MessageComponentSerializer.message().deserialize(var7.getRawMessage()));
-+            final net.kyori.adventure.text.TextComponent message = getUnknownCommandMessage(builder, var7, label); // Leaf - Configurable unknown command message
++            final net.kyori.adventure.text.Component message = getUnknownCommandMessage(builder, var7, label); // Leaf - Configurable unknown command message
              // Paper end - Add UnknownCommandEvent
 -            if (var7.getInput() != null && var7.getCursor() >= 0) {
 -                int min = Math.min(var7.getInput().length(), var7.getCursor());
@@ -42,59 +42,65 @@ index fb18f69cb26132fc8c53b185454c6aadb8a5f7e5..eff6d524c8acfc62d1fcf6b5552754e7
              org.bukkit.Bukkit.getServer().getPluginManager().callEvent(event);
              if (event.message() != null) {
                  source.sendFailure(io.papermc.paper.adventure.PaperAdventure.asVanilla(event.message()), false);
-@@ -680,6 +658,86 @@ public class Commands {
+@@ -680,6 +658,92 @@ public class Commands {
          };
      }
  
 +    // Leaf start - Configurable unknown command message
-+    private static net.kyori.adventure.text.TextComponent getUnknownCommandMessage(
++    private static net.kyori.adventure.text.Component getUnknownCommandMessage(
 +        net.kyori.adventure.text.TextComponent.Builder builder, CommandSyntaxException commandSyntaxException, String label
 +    ) {
 +        String rawMessage = org.dreeam.leaf.config.modules.misc.UnknownCommandMessage.unknownCommandMessage;
 +
-+        if (!"default".equals(rawMessage)) {
-+            final String input = commandSyntaxException.getInput();
-+            final int cursor = commandSyntaxException.getCursor();
-+
-+            if (rawMessage.contains("<detail>") && input != null && cursor >= 0) {
-+                final int min = Math.min(input.length(), cursor);
-+                final net.kyori.adventure.text.TextComponent.Builder detail = net.kyori.adventure.text.Component.text();
-+                final net.kyori.adventure.text.Component context = net.kyori.adventure.text.Component.translatable("command.context.here")
-+                    .color(net.kyori.adventure.text.format.NamedTextColor.RED)
-+                    .decorate(net.kyori.adventure.text.format.TextDecoration.ITALIC);
-+                final net.kyori.adventure.text.event.ClickEvent event = net.kyori.adventure.text.event.ClickEvent.suggestCommand("/" + label);
-+
-+                detail.color(net.kyori.adventure.text.format.NamedTextColor.GRAY);
-+
-+                if (min > 10) {
-+                    detail.append(net.kyori.adventure.text.Component.text("..."));
-+                }
-+
-+                detail.append(net.kyori.adventure.text.Component.text(input.substring(Math.max(0, min - 10), min)));
-+                if (min < input.length()) {
-+                    net.kyori.adventure.text.Component commandInput = net.kyori.adventure.text.Component.text(input.substring(min))
-+                        .color(net.kyori.adventure.text.format.NamedTextColor.RED)
-+                        .decorate(net.kyori.adventure.text.format.TextDecoration.UNDERLINED);
-+
-+                    detail.append(commandInput);
-+                }
-+
-+                detail.append(context);
-+                detail.clickEvent(event);
-+
-+                builder.append(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(rawMessage, net.kyori.adventure.text.minimessage.tag.resolver.Placeholder.component("detail", detail.build())));
-+            } else {
-+                rawMessage = rawMessage.replace("<detail>", "");
-+                builder.append(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(rawMessage));
-+            }
-+
-+            return builder.build();
++        if ("default".equals(rawMessage)) {
++            return getVanillaUnknownCommandMessage(builder, commandSyntaxException, label);
 +        }
 +
-+        return getVanillaUnknownCommandMessage(builder, commandSyntaxException, label);
++        net.kyori.adventure.text.Component messageComponent = null;
++        net.kyori.adventure.text.Component detailComponent = null;
++
++        if (rawMessage.contains("<message>")) {
++            messageComponent = io.papermc.paper.command.brigadier.MessageComponentSerializer.message().deserialize(commandSyntaxException.getRawMessage());
++        }
++
++        final String input = commandSyntaxException.getInput();
++        final int cursor = commandSyntaxException.getCursor();
++
++        if (rawMessage.contains("<detail>") && input != null && cursor >= 0) {
++            final int min = Math.min(input.length(), cursor);
++            final net.kyori.adventure.text.TextComponent.Builder detail = net.kyori.adventure.text.Component.text();
++            final net.kyori.adventure.text.Component context = net.kyori.adventure.text.Component.translatable("command.context.here")
++                .color(net.kyori.adventure.text.format.NamedTextColor.RED)
++                .decorate(net.kyori.adventure.text.format.TextDecoration.ITALIC);
++            final net.kyori.adventure.text.event.ClickEvent event = net.kyori.adventure.text.event.ClickEvent.suggestCommand("/" + label);
++
++            detail.color(net.kyori.adventure.text.format.NamedTextColor.GRAY);
++
++            if (min > 10) {
++                detail.append(net.kyori.adventure.text.Component.text("..."));
++            }
++
++            detail.append(net.kyori.adventure.text.Component.text(input.substring(Math.max(0, min - 10), min)));
++            if (min < input.length()) {
++                net.kyori.adventure.text.Component commandInput = net.kyori.adventure.text.Component.text(input.substring(min))
++                    .color(net.kyori.adventure.text.format.NamedTextColor.RED)
++                    .decorate(net.kyori.adventure.text.format.TextDecoration.UNDERLINED);
++
++                detail.append(commandInput);
++            }
++
++            detail.append(context);
++            detail.clickEvent(event);
++
++            detailComponent = detail.build();
++        }
++
++        return builder.append(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(rawMessage)).build()
++            .replaceText(net.kyori.adventure.text.TextReplacementConfig.builder().matchLiteral("<message>").replacement(messageComponent).build())
++            .replaceText(net.kyori.adventure.text.TextReplacementConfig.builder().matchLiteral("<detail>").replacement(detailComponent).build());
 +    }
 +
-+    private static net.kyori.adventure.text.TextComponent getVanillaUnknownCommandMessage(
++    private static net.kyori.adventure.text.Component getVanillaUnknownCommandMessage(
 +        net.kyori.adventure.text.TextComponent.Builder builder, CommandSyntaxException var7, String label
 +    ) {
 +        builder.color(net.kyori.adventure.text.format.NamedTextColor.RED).append(io.papermc.paper.command.brigadier.MessageComponentSerializer.message().deserialize(var7.getRawMessage()));

leaf-server/minecraft-patches/features/0163-Sakura-Optimise-check-inside-blocks-and-traverse-blo.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Sakura: Optimise-check-inside-blocks-and-traverse-blocks
 
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 4221e5322fa3a3ff6ab53946aa71d54144d2c4b2..4474639b0411236e208c542973084864365c544c 100644
+index 2c15f8f0be8ba03f2c9481bed0d46aad738848a0..ad674cf202c61b50f568a36777cee196627b402c 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -1670,6 +1670,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1711,6 +1711,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      private void checkInsideBlocks(List<Entity.Movement> movements, Set<BlockState> blocksInside) {
          if (this.isAffectedByBlocks()) {
              LongSet set = this.visitedBlocks;
@@ -20,7 +20,7 @@ index 4221e5322fa3a3ff6ab53946aa71d54144d2c4b2..4474639b0411236e208c542973084864
  
              for (Entity.Movement movement : movements) {
                  Vec3 vec3 = movement.from();
-@@ -1681,7 +1686,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1722,7 +1727,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                          return;
                      }
  

leaf-server/minecraft-patches/features/0166-async-switch-connection-state.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] async switch connection state
 
 
 diff --git a/net/minecraft/network/Connection.java b/net/minecraft/network/Connection.java
-index f998cf8d70302a21289de4d84b46d322d0b8a8fe..32f26640664135c9f7f45f8b204b7ff412fe343e 100644
+index f3e9de8716f5e1a72ec465ee897c8f0413f7b1c3..3a82e1e510029576485427af9fd705b37c5f6e20 100644
 --- a/net/minecraft/network/Connection.java
 +++ b/net/minecraft/network/Connection.java
 @@ -342,6 +342,11 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {

leaf-server/minecraft-patches/features/0172-Optimise-player-movement-checks.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Optimise player movement checks
 
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 2786fbc43f238be058b153ba551f0a616c4a18f4..376d8cb183145955b887597ef7ae25ce761a795a 100644
+index ad674cf202c61b50f568a36777cee196627b402c..5a31ac325af5727a042e4056f67f53013cd33c39 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -1176,7 +1176,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1210,7 +1210,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              }
              // Paper end
  

leaf-server/minecraft-patches/features/0175-paw-optimization.patch

@@ -10,10 +10,10 @@ Some random optimizations
 - Secret patches (WIP)
 
 diff --git a/net/minecraft/network/Connection.java b/net/minecraft/network/Connection.java
-index f3e9de8716f5e1a72ec465ee897c8f0413f7b1c3..f998cf8d70302a21289de4d84b46d322d0b8a8fe 100644
+index 3a82e1e510029576485427af9fd705b37c5f6e20..32f26640664135c9f7f45f8b204b7ff412fe343e 100644
 --- a/net/minecraft/network/Connection.java
 +++ b/net/minecraft/network/Connection.java
-@@ -617,13 +617,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -661,13 +661,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
              if (!(this.packetListener instanceof net.minecraft.server.network.ServerLoginPacketListenerImpl loginPacketListener)
                  || loginPacketListener.state != net.minecraft.server.network.ServerLoginPacketListenerImpl.State.VERIFYING
                  || Connection.joinAttemptsThisTick++ < MAX_PER_TICK) {
@@ -94,7 +94,7 @@ index 0860a700106e8c1afe58c77150a0f3aee8393fdd..8e5414becccc921db39e4e6eebeb054d
                      this.tickChunks(l, list); // Gale - Purpur - remove vanilla profiler
                  } finally {
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index fbfb35dad8b07c31f967d33fb04cfcfc94557d72..ba1dd51e7187a80e8438e46383257c22f5382130 100644
+index 539206d55e87ec9968664305caaf475c991fe4d5..6cb0c14cb7aa243bbee6ca9ba57da4cc6eafdfd8 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -1387,13 +1387,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -126,7 +126,7 @@ index fbfb35dad8b07c31f967d33fb04cfcfc94557d72..ba1dd51e7187a80e8438e46383257c22
  
      private void tickPassenger(Entity ridingEntity, Entity passengerEntity, final boolean isActive) { // Paper - EAR 2
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 2c15f8f0be8ba03f2c9481bed0d46aad738848a0..124624d9c8cc292fcedb5652542b7d9da4e5d228 100644
+index 5a31ac325af5727a042e4056f67f53013cd33c39..376d8cb183145955b887597ef7ae25ce761a795a 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -1143,31 +1143,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -192,7 +192,7 @@ index 2c15f8f0be8ba03f2c9481bed0d46aad738848a0..124624d9c8cc292fcedb5652542b7d9d
      }
  
      private void applyMovementEmissionAndPlaySound(Entity.MovementEmission movementEmission, Vec3 movement, BlockPos pos, BlockState state) {
-@@ -4832,9 +4791,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4849,9 +4808,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public void setDeltaMovement(Vec3 deltaMovement) {
@@ -202,7 +202,7 @@ index 2c15f8f0be8ba03f2c9481bed0d46aad738848a0..124624d9c8cc292fcedb5652542b7d9d
      }
  
      public void addDeltaMovement(Vec3 addend) {
-@@ -4940,9 +4897,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4957,9 +4914,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          }
          // Paper end - Fix MC-4
          if (this.position.x != x || this.position.y != y || this.position.z != z) {

leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/UnknownCommandMessage.java

@@ -9,15 +9,19 @@ public class UnknownCommandMessage extends ConfigModules {
         return EnumConfigCategory.MISC.getBaseKeyName() + ".message";
     }
 
-    public static String unknownCommandMessage = "<red><lang:command.unknown.command><newline><detail>";
+    public static String unknownCommandMessage = "default";
 
     @Override
     public void onLoaded() {
         unknownCommandMessage = config.getString(getBasePath() + ".unknown-command", unknownCommandMessage, config.pickStringRegionBased("""
                 Unknown command message, using MiniMessage format, set to "default" to use vanilla message,
-                placeholder: <detail>, shows detail of the unknown command information.""",
+                placeholder:
+                <message>, show message of the command exception.
+                <detail>, shows detail of the command exception.""",
             """
                 发送未知命令时的消息, 使用 MiniMessage 格式, 设置为 "default" 使用原版消息.
-                变量: <detail>, 显示未知命令详细信息."""));
+                变量:
+                <message>, 显示命令错误所附提示消息.
+                <detail>, 显示命令错误详细信息."""));
     }
 }