Implement chat changes

demo/src/main/java/net/minestom/demo/Main.java

@@ -1,20 +1,28 @@
 package net.minestom.demo;
 
+import net.kyori.adventure.key.Key;
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.format.TextDecoration;
 import net.minestom.demo.commands.*;
+import net.minestom.server.ConfigurationManager;
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.command.CommandManager;
+import net.minestom.server.event.player.PlayerChatEvent;
 import net.minestom.server.event.server.ServerListPingEvent;
 import net.minestom.server.extras.lan.OpenToLAN;
 import net.minestom.server.extras.lan.OpenToLANConfig;
 import net.minestom.server.extras.optifine.OptifineSupport;
 import net.minestom.server.instance.block.BlockManager;
 import net.minestom.server.instance.block.rule.vanilla.RedstonePlacementRule;
+import net.minestom.server.message.MessageSender;
 import net.minestom.server.ping.ResponseData;
+import net.minestom.server.registry.dynamic.chat.ChatDecoration;
+import net.minestom.server.registry.dynamic.chat.ChatType;
+import net.minestom.server.registry.dynamic.chat.ChatTypeBuilder;
 import net.minestom.server.utils.identity.NamedAndIdentified;
 import net.minestom.server.utils.time.TimeUnit;
 
@@ -52,6 +60,8 @@ public static void main(String[] args) {
         commandManager.register(new AutoViewCommand());
         commandManager.register(new SaveCommand());
         commandManager.register(new GamemodeCommand());
+        commandManager.register(new CommandSignTest());
+        commandManager.register(new ChatPreviewCommand());
 
 
         commandManager.setUnknownCommandCallback((sender, command) -> sender.sendMessage(Component.text("Unknown command", NamedTextColor.RED)));
@@ -92,8 +102,21 @@ public static void main(String[] args) {
             // on legacy versions, colors will be converted to the section format so it'll work there too
             responseData.setDescription(Component.text("This is a Minestom Server", TextColor.color(0x66b3ff)));
             //responseData.setPlayersHidden(true);
+        }).addListener(PlayerChatEvent.class, e -> {
+            final MessageSender s = e.getSender();
+            e.setSender(new MessageSender(
+                    s.displayName().clickEvent(ClickEvent.suggestCommand("/msg "+e.getPlayer().getUsername())).color(NamedTextColor.DARK_GREEN),
+                    Component.text("Team Name").color(NamedTextColor.GOLD)
+            ));
         });
 
+        final ConfigurationManager conf = MinecraftServer.getConfigurationManager();
+//        conf.PLAYER_CHAT_TYPE.set(ChatTypeBuilder.builder(ChatType.CHAT.key())
+//                .chat(ChatDecoration.full("%s | %s> %s", Style.style(NamedTextColor.DARK_RED))));
+        conf.SYSTEM_CHAT_TYPE.set(ChatTypeBuilder.builder(ChatType.SYSTEM.key())
+                .chat(ChatDecoration.content("SYSTEM: %s", Style.style(NamedTextColor.AQUA)
+                        .font(Key.key("minecraft:uniform")))));
+
         PlayerInit.init();
 
         OptifineSupport.enable();

demo/src/main/java/net/minestom/demo/commands/ChatPreviewCommand.java

@@ -0,0 +1,64 @@
+package net.minestom.demo.commands;
+
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.format.TextColor;
+import net.minestom.server.MinecraftServer;
+import net.minestom.server.command.builder.Command;
+import net.minestom.server.command.builder.arguments.ArgumentBoolean;
+import net.minestom.server.command.builder.arguments.ArgumentEnum;
+import net.minestom.server.command.builder.arguments.ArgumentType;
+import net.minestom.server.entity.Player;
+import net.minestom.server.event.player.PlayerChatPreviewEvent;
+
+import java.util.function.Consumer;
+
+public class ChatPreviewCommand extends Command {
+    private static final ArgumentBoolean on = ArgumentType.Boolean("on");
+    private static final ArgumentEnum<PreviewHandler> handlerArg = ArgumentType.Enum("handler", PreviewHandler.class);
+    private static PreviewHandler handler = PreviewHandler.NULL;
+
+    private enum PreviewHandler {
+        BLACK(e -> e.setResult(Component.text(e.getQuery(), NamedTextColor.BLACK))),
+        //TODO Better name?
+        ENCLOSE(e -> e.setResult(Component.empty()
+                .append(Component.text("PREPEND>", TextColor.color(255,0,255)))
+                .append(Component.text(e.getQuery()))
+                .append(Component.text("<APPEND", TextColor.color(255,0,255))))),
+        NULL(e -> e.setResult(null));
+
+        private final Consumer<PlayerChatPreviewEvent> eventConsumer;
+
+        PreviewHandler(Consumer<PlayerChatPreviewEvent> eventConsumer) {
+            this.eventConsumer = eventConsumer;
+        }
+    }
+
+    public ChatPreviewCommand() {
+        super("preview");
+
+        MinecraftServer.getGlobalEventHandler().addListener(PlayerChatPreviewEvent.class, e -> handler.eventConsumer.accept(e));
+
+        addSyntax(((sender, context) -> {
+            if (sender instanceof Player player) {
+                final Boolean enable = context.get(on);
+                player.enableChatPreview(enable);
+                player.sendMessage("Chat preview: " + (enable ? "enabled" : "disabled"));
+            }
+        }), ArgumentType.Literal("enable"), on);
+
+        addSyntax(((sender, context) -> {
+            handler = context.getOrDefault(handlerArg, PreviewHandler.NULL);
+            sender.sendMessage("Preview handler set to: " + handler.name());
+        }), ArgumentType.Literal("handler"), handlerArg);
+
+
+        addSyntax(((sender, context) -> {
+            if (sender instanceof Player player) {
+                final Boolean enable = context.get(on);
+                player.toggleChatPreview(enable);
+                player.sendMessage("Chat preview: " + (enable ? "on" : "off"));
+            }
+        }), ArgumentType.Literal("toggle"), on);
+    }
+}

demo/src/main/java/net/minestom/demo/commands/CommandSignTest.java

@@ -0,0 +1,55 @@
+package net.minestom.demo.commands;
+
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.minestom.server.command.ArgumentsSignature;
+import net.minestom.server.command.builder.Command;
+import net.minestom.server.command.builder.arguments.ArgumentType;
+import net.minestom.server.command.builder.arguments.minecraft.ArgumentMessage;
+import net.minestom.server.crypto.MessageSignature;
+import net.minestom.server.crypto.SignatureValidator;
+import net.minestom.server.entity.Player;
+import net.minestom.server.message.Messenger;
+
+import java.util.List;
+
+public class CommandSignTest extends Command {
+    private static final ArgumentMessage message = ArgumentType.Message("message");
+
+    public CommandSignTest() {
+        super("sign");
+
+        addSyntax(((sender, context) -> {
+            if (sender instanceof Player player) {
+                final ArgumentsSignature argumentsSignature = context.getSignature();
+                if (argumentsSignature == null) {
+                    Messenger.sendSystemMessage(List.of(player), Component.text("You didn't sign the arguments!", NamedTextColor.RED));
+                    return;
+                }
+                final MessageSignature signature = argumentsSignature.signatureOf(message, player.getUuid());
+                final SignatureValidator validator = SignatureValidator.from(player);
+                if (validator == null) {
+                    Messenger.sendSystemMessage(List.of(player), Component.text("There is no public key associated with your profile!", NamedTextColor.RED));
+                    return;
+                }
+                Messenger.sendSystemMessage(List.of(player),
+                        Component.text("Signature details: preview: ")
+                                .append(formatBoolean(argumentsSignature.signedPreview()))
+                                .append(Component.text(", argument_signature: "))
+                                .append(format(SignatureValidator.validate(validator, signature, Component.text(context.get(message)))))
+                                .append(Component.text(", preview_signature: "))
+                                .append(format(SignatureValidator.validate(validator, signature, player.getLastPreviewedMessage()))));
+            } else {
+                sender.sendMessage("Consoles luckily doesn't sign commands...");
+            }
+        }), message);
+    }
+
+    private static Component format(boolean valid) {
+        return valid ? Component.text("valid", NamedTextColor.GREEN) : Component.text("invalid", NamedTextColor.RED);
+    }
+
+    private static Component formatBoolean(boolean value) {
+        return value ? Component.text("true", NamedTextColor.GREEN) : Component.text("false", NamedTextColor.RED);
+    }
+}

gradle/libs.versions.toml

@@ -7,7 +7,7 @@ adventure = "4.10.1"
 kotlin = "1.6.20"
 hydrazine = "1.7.2"
 dependencyGetter = "v1.0.1"
-minestomData = "3e211f3953"
+minestomData = "adbb835d9c"
 hephaistos = "2.4.4"
 jetbrainsAnnotations = "23.0.0"
 

src/autogenerated/java/net/minestom/server/entity/EntityTypes.java

@@ -5,6 +5,8 @@
  */
 @SuppressWarnings("unused")
 interface EntityTypes {
+    EntityType ALLAY = EntityTypeImpl.get("minecraft:allay");
+
     EntityType AREA_EFFECT_CLOUD = EntityTypeImpl.get("minecraft:area_effect_cloud");
 
     EntityType ARMOR_STAND = EntityTypeImpl.get("minecraft:armor_stand");
@@ -21,6 +23,8 @@ interface EntityTypes {
 
     EntityType BOAT = EntityTypeImpl.get("minecraft:boat");
 
+    EntityType CHEST_BOAT = EntityTypeImpl.get("minecraft:chest_boat");
+
     EntityType CAT = EntityTypeImpl.get("minecraft:cat");
 
     EntityType CAVE_SPIDER = EntityTypeImpl.get("minecraft:cave_spider");
@@ -65,6 +69,8 @@ interface EntityTypes {
 
     EntityType FOX = EntityTypeImpl.get("minecraft:fox");
 
+    EntityType FROG = EntityTypeImpl.get("minecraft:frog");
+
     EntityType GHAST = EntityTypeImpl.get("minecraft:ghast");
 
     EntityType GIANT = EntityTypeImpl.get("minecraft:giant");
@@ -183,6 +189,8 @@ interface EntityTypes {
 
     EntityType STRIDER = EntityTypeImpl.get("minecraft:strider");
 
+    EntityType TADPOLE = EntityTypeImpl.get("minecraft:tadpole");
+
     EntityType EGG = EntityTypeImpl.get("minecraft:egg");
 
     EntityType ENDER_PEARL = EntityTypeImpl.get("minecraft:ender_pearl");
@@ -207,6 +215,8 @@ interface EntityTypes {
 
     EntityType WANDERING_TRADER = EntityTypeImpl.get("minecraft:wandering_trader");
 
+    EntityType WARDEN = EntityTypeImpl.get("minecraft:warden");
+
     EntityType WITCH = EntityTypeImpl.get("minecraft:witch");
 
     EntityType WITHER = EntityTypeImpl.get("minecraft:wither");