streamline loading of MQ channels

Author: burdo

src/main/java/com/ampznetwork/chatmod/lite/ChatModCore.java

@@ -7,6 +7,7 @@
 import com.ampznetwork.chatmod.api.model.protocol.internal.PacketType;
 import com.ampznetwork.chatmod.api.util.ChatMessageParser;
 import com.ampznetwork.chatmod.lite.lang.Words;
+import com.ampznetwork.chatmod.lite.model.JacksonPacketConverter;
 import com.ampznetwork.chatmod.lite.model.abstr.ChannelConfigProvider;
 import com.ampznetwork.chatmod.lite.model.abstr.ChatDispatcher;
 import com.ampznetwork.chatmod.lite.model.abstr.ChatModConfig;
@@ -91,7 +92,7 @@ public void execAndRespond(
         }
     }
 
-    public void outbound(Channel channel, ChatMessagePacketImpl packet) {
+    public void outbound(Channel channel, ChatMessagePacket packet) {
         if (channel.isPublish()) send(packet);
         else packetCaster.localcastPacket(packet);
     }
@@ -301,4 +302,16 @@ public boolean hasAccess(UUID id, Channel channel) {
         return channel.getPermission() == null || permissionAdapter.checkPermissionOrOp(id,
                 "chat.channel." + channel.getName());
     }
+
+    public void loadMqChannels() {
+        var exchange = config.getRabbit().exchange("minecraft", "topic");
+        for (var channel : getChannels()) {
+            if (!channel.isPublish()) continue;
+            var route = exchange.route(Util.Kyori.sanitizePlain(config.getServerName() + ".chat." + channel.getName())
+                    .toLowerCase(), "chat." + channel.getName(), new JacksonPacketConverter(getObjectMapper()));
+            route.subscribeData(packetCaster::localcastPacket);
+            getMqChannels().put(channel, route);
+        }
+        log.info("Created %d RabbitMQ bindings".formatted(getMqChannels().size()));
+    }
 }

src/main/java/com/ampznetwork/chatmod/lite/hytale/ChatModLiteHytale.java

@@ -1,6 +1,9 @@
 package com.ampznetwork.chatmod.lite.hytale;
 
+import com.ampznetwork.chatmod.api.model.protocol.ChatMessage;
 import com.ampznetwork.chatmod.api.model.protocol.ChatMessagePacket;
+import com.ampznetwork.chatmod.api.model.protocol.internal.ChatMessagePacketImpl;
+import com.ampznetwork.chatmod.api.model.protocol.internal.PacketType;
 import com.ampznetwork.chatmod.api.util.ChatMessageParser;
 import com.ampznetwork.chatmod.lite.ChatModCore;
 import com.ampznetwork.chatmod.lite.config.HytaleConfigFile;
@@ -46,6 +49,7 @@ public ChatModLiteHytale(@NotNull JavaPluginInit init) {
     @Override
     protected void setup() {
         config.syncLoad();
+        core.loadMqChannels();
 
         super.setup();
 
@@ -92,15 +96,19 @@ public void localcastPacket(ChatMessagePacket packet) {
 
     @Override
     public Player getPlayer(UUID playerId) {
-        return Player.basic(playerId, "Hytale User"); // todo
+        var ref = Universe.get().getPlayer(playerId);
+        return Player.basic(playerId, ref != null ? ref.getUsername() : "Hytale User");
     }
 
     private PlayerChatEvent handleChat(PlayerChatEvent event) {
         var player = getPlayer(event.getSender().getUuid());
         var channel = core.activeChannels(player).findAny().orElseGet(() -> core.getChannels().getFirst());
 
-        var text = new ChatMessageParser().parse(event.getContent());
-        core.localcast(channel, text);
+        var text    = new ChatMessageParser().parse(event.getContent());
+        var message = new ChatMessage(player, event.getSender().getUsername(), event.getContent(), text);
+        var packet  = new ChatMessagePacketImpl(PacketType.CHAT, config.getServerName(), channel.getName(), message);
+
+        core.outbound(channel, packet);
 
         event.setCancelled(true);
         return event;

src/main/java/com/ampznetwork/chatmod/lite/spigot/ChatModLiteSpigot.java

@@ -8,7 +8,6 @@
 import com.ampznetwork.chatmod.api.model.protocol.internal.PacketType;
 import com.ampznetwork.chatmod.api.util.ChatMessageParser;
 import com.ampznetwork.chatmod.lite.ChatModCore;
-import com.ampznetwork.chatmod.lite.model.JacksonPacketConverter;
 import com.ampznetwork.chatmod.lite.model.abstr.ChannelConfigProvider;
 import com.ampznetwork.chatmod.lite.model.abstr.ChatDispatcher;
 import com.ampznetwork.chatmod.lite.model.abstr.ChatModConfig;
@@ -248,15 +247,7 @@ public void onEnable() {
         }
         getLogger().info("Loaded %d channels".formatted(core.getChannels().size()));
 
-        var exchange = rabbit.exchange("minecraft", "topic");
-        for (var channel : core.getChannels()) {
-            if (!channel.isPublish()) continue;
-            var route = exchange.route(Util.Kyori.sanitizePlain(serverName + ".chat." + channel.getName())
-                    .toLowerCase(), "chat." + channel.getName(), new JacksonPacketConverter(core.getObjectMapper()));
-            route.subscribeData(this::localcastPacket);
-            core.getMqChannels().put(channel, route);
-        }
-        getLogger().info("Created %d RabbitMQ bindings".formatted(core.getMqChannels().size()));
+        core.loadMqChannels();
 
         formattingScheme = cfg.getString("formatting.scheme",
                 "&7[%server_name%&7] #&6%channel_name%&7 <%player_name%&7> &r%message%");

src/main/resources/hytale.config.json

@@ -11,7 +11,8 @@
     {
       "name": "global",
       "alias": "g",
-      "display": "&6global"
+      "display": "&6global",
+      "publish": true
     },
     {
       "name": "local",
@@ -23,6 +24,7 @@
       "name": "staff",
       "alias": "s",
       "display": "&4staff",
+      "publish": true,
       "permission": "chat.channel.staff"
     }
   ],

src/main/resources/manifest.json

@@ -11,7 +11,10 @@
   "Website": "https://github.com/AMPZNetwork/ChatModLite",
   "ServerVersion": "*",
   "Dependencies": {},
-  "OptionalDependencies": {},
+  "OptionalDependencies": {
+    "Hytale:Universe": "*",
+    "Hytale:PermissionsModule": "*"
+  },
   "DisabledByDefault": false,
   "Main": "com.ampznetwork.chatmod.lite.hytale.ChatModLiteHytale",
   "IncludesAssetPack": false