Fixed stuff

LaBoulangerie · Sep 10, 2022 · a650ccb · a650ccb
1 parent f483015
commit a650ccb
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/src/main/java/net/laboulangerie/townychat/core/TownyChatRenderer.java b/src/main/java/net/laboulangerie/townychat/core/TownyChatRenderer.java
@@ -1,5 +1,6 @@
 package net.laboulangerie.townychat.core;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 import java.util.regex.Pattern;
@@ -14,6 +15,7 @@
 import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 import net.laboulangerie.townychat.TownyChat;
 import net.laboulangerie.townychat.player.ChatPlayer;
@@ -46,7 +48,11 @@ public TownyChatRenderer() {
             message = MiniMessage.miniMessage().deserialize(textMessage.content());
         }
 
-        return componentRenderer.parse(source, channelFormat, Placeholder.component("message", message));
+        List<TagResolver.Single> resolvers = new ArrayList<>();
+        resolvers.add(Placeholder.component("message", message));
+        resolvers.add(Placeholder.component("username", source.name()));
+
+        return componentRenderer.parse(source, channelFormat, TagResolver.resolver(resolvers));
     }
 
     // TODO : Remove redundant method, but how???
@@ -60,7 +66,11 @@ public TownyChatRenderer() {
             message = MiniMessage.miniMessage().deserialize(textMessage.content());
         }
 
-        return componentRenderer.parse(source, channelFormat, Placeholder.component("message", message));
+        List<TagResolver.Single> resolvers = new ArrayList<>();
+        resolvers.add(Placeholder.component("message", message));
+        resolvers.add(Placeholder.component("username", source.name()));
+
+        return componentRenderer.parse(source, channelFormat, TagResolver.resolver(resolvers));
     }
 
     private String censorString(String string) {

diff --git a/src/main/java/net/laboulangerie/townychat/listeners/DiscordHook.java b/src/main/java/net/laboulangerie/townychat/listeners/DiscordHook.java
@@ -56,11 +56,12 @@ public void onMessage(AsyncChatHookEvent event) {
     // From Discord to Minecraft
     @Override
     public void broadcastMessageToChannel(String channelId, Component message) {
-
+        System.out.println("aaaaa");
         // get the destination channel
         Channel destinationChannel = null;
 
         for (Channel channel : channelManager.getChannels().values()) {
+            System.out.println(channel.getId());
             if (channel.getId().equals(channelId)) {
                 destinationChannel = channel;
                 break;

diff --git a/src/main/java/net/laboulangerie/townychat/listeners/MiscListener.java b/src/main/java/net/laboulangerie/townychat/listeners/MiscListener.java
@@ -37,7 +37,8 @@ public void onPlayerJoin(PlayerJoinEvent event) {
 
             @Override
             public void run() {
-                Component joinComponent = componentRenderer.parse(event.getPlayer(), joinString);
+                Component joinComponent = componentRenderer.parse(event.getPlayer(), joinString,
+                        Placeholder.component("username", event.getPlayer().name()));
                 TownyChat.PLUGIN.getServer().broadcast(joinComponent);
             }
         }.runTaskLater(TownyChat.PLUGIN, 5);
@@ -46,7 +47,8 @@ public void run() {
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
         String joinString = miscSection.getString("quit_message");
-        Component joinComponent = componentRenderer.parse(event.getPlayer(), joinString);
+        Component joinComponent = componentRenderer.parse(event.getPlayer(), joinString,
+                Placeholder.component("username", event.getPlayer().name()));
         event.quitMessage(joinComponent);
     }
 
@@ -63,6 +65,7 @@ public void onPlayerAdvancementDone(PlayerAdvancementDoneEvent event) {
         String advancementString = miscSection.getString("advancement." + frame.name().toLowerCase());
         Component advancementComponent = componentRenderer.parse(event.getPlayer(), advancementString,
                 TagResolver.resolver(
+                        Placeholder.component("username", event.getPlayer().name()),
                         Placeholder.component("advancement_title", advancementDisplay.title()),
                         Placeholder.component("advancement_description", advancementDisplay.description())));