From cf1ec3c539bca65ed56187b4fd2649d499633b61 Mon Sep 17 00:00:00 2001 From: Adrian Oeyen Date: Thu, 18 Dec 2025 01:54:48 +0100 Subject: [PATCH 1/4] remove unused imports --- src/main/java/org/sk/skMinecraft/CentralResourceHandler.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/org/sk/skMinecraft/CentralResourceHandler.java b/src/main/java/org/sk/skMinecraft/CentralResourceHandler.java index f10c394..21f9100 100644 --- a/src/main/java/org/sk/skMinecraft/CentralResourceHandler.java +++ b/src/main/java/org/sk/skMinecraft/CentralResourceHandler.java @@ -2,10 +2,8 @@ import org.bukkit.entity.Entity; -import java.sql.Array; import java.util.ArrayList; import java.util.HashMap; -import java.util.List; public class CentralResourceHandler { From 28862d0002826ca34501f4c9c0df83c7dc80bde8 Mon Sep 17 00:00:00 2001 From: Adrian Oeyen Date: Thu, 18 Dec 2025 02:05:21 +0100 Subject: [PATCH 2/4] add chat message class --- .../java/org/sk/skMinecraft/data/ChatMessage.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/main/java/org/sk/skMinecraft/data/ChatMessage.java diff --git a/src/main/java/org/sk/skMinecraft/data/ChatMessage.java b/src/main/java/org/sk/skMinecraft/data/ChatMessage.java new file mode 100644 index 0000000..aad73d7 --- /dev/null +++ b/src/main/java/org/sk/skMinecraft/data/ChatMessage.java @@ -0,0 +1,14 @@ +package org.sk.skMinecraft.data; + +import org.bukkit.entity.Player; + +public class ChatMessage { + + public Player player; + public String message; + + public ChatMessage(Player player, String message) { + this.player = player; + this.message = message; + } +} \ No newline at end of file From 4afda22a53b1e4425b1875f897acd101006ad006 Mon Sep 17 00:00:00 2001 From: Adrian Oeyen Date: Thu, 18 Dec 2025 02:05:48 +0100 Subject: [PATCH 3/4] rework chat messages to use the ChatMessage class and track the player --- .../org/sk/skMinecraft/CentralResourceHandler.java | 11 ++++++----- src/main/java/org/sk/skMinecraft/SkMinecraft.java | 4 +++- .../java/org/sk/skMinecraft/commands/PollChat.java | 7 +++++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/sk/skMinecraft/CentralResourceHandler.java b/src/main/java/org/sk/skMinecraft/CentralResourceHandler.java index 21f9100..6dd9dc7 100644 --- a/src/main/java/org/sk/skMinecraft/CentralResourceHandler.java +++ b/src/main/java/org/sk/skMinecraft/CentralResourceHandler.java @@ -1,26 +1,27 @@ package org.sk.skMinecraft; import org.bukkit.entity.Entity; +import org.sk.skMinecraft.data.ChatMessage; import java.util.ArrayList; import java.util.HashMap; public class CentralResourceHandler { - private static ArrayList chatMessages; + private static ArrayList chatMessages; private static HashMap spawnedEntites; public static void init() { CentralResourceHandler.spawnedEntites = new HashMap<>(); - CentralResourceHandler.chatMessages = new ArrayList(); + CentralResourceHandler.chatMessages = new ArrayList(); } - public static synchronized void addChatMessage(String message) { + public static synchronized void addChatMessage(ChatMessage message) { chatMessages.add(message); } - public static ArrayList getChatMessages() { - ArrayList copy = CentralResourceHandler.chatMessages; + public static ArrayList getChatMessages() { + ArrayList copy = CentralResourceHandler.chatMessages; CentralResourceHandler.chatMessages = new ArrayList<>(); return copy; diff --git a/src/main/java/org/sk/skMinecraft/SkMinecraft.java b/src/main/java/org/sk/skMinecraft/SkMinecraft.java index 6911bf5..31956ac 100644 --- a/src/main/java/org/sk/skMinecraft/SkMinecraft.java +++ b/src/main/java/org/sk/skMinecraft/SkMinecraft.java @@ -5,6 +5,7 @@ import org.bukkit.event.player.AsyncPlayerChatEvent; import org.bukkit.plugin.java.JavaPlugin; import org.sk.skMinecraft.commands.Command; +import org.sk.skMinecraft.data.ChatMessage; import java.io.BufferedReader; import java.io.IOException; @@ -75,7 +76,8 @@ private void startTcpListener() { @EventHandler public void onPlayerChat(AsyncPlayerChatEvent event) { - CentralResourceHandler.addChatMessage(event.getMessage()); + ChatMessage message = new ChatMessage(event.getPlayer(), event.getMessage()); + CentralResourceHandler.addChatMessage(message); } private void stopTcpListener() { diff --git a/src/main/java/org/sk/skMinecraft/commands/PollChat.java b/src/main/java/org/sk/skMinecraft/commands/PollChat.java index 2219ee7..0019961 100644 --- a/src/main/java/org/sk/skMinecraft/commands/PollChat.java +++ b/src/main/java/org/sk/skMinecraft/commands/PollChat.java @@ -3,6 +3,7 @@ import org.bukkit.Bukkit; import org.sk.skMinecraft.CentralResourceHandler; import org.sk.skMinecraft.SkMinecraft; +import org.sk.skMinecraft.data.ChatMessage; import java.util.ArrayList; @@ -14,9 +15,11 @@ public PollChat(String s) { @Override public void apply() { Bukkit.getScheduler().runTask(plugin, () -> { - ArrayList messages = CentralResourceHandler.getChatMessages(); + ArrayList messages = CentralResourceHandler.getChatMessages(); + String output = messages.stream() + .map(message -> message.player.getName() + ":" + message.message) + .reduce("", (arg, msg) -> arg == "" ? msg : arg + SkMinecraft.seperator + msg); - String output = String.join(SkMinecraft.seperator, messages); this.writer.println(output); }); } From f3f6c83353869a913de747169f485d435fc0a2c1 Mon Sep 17 00:00:00 2001 From: Adrian Oeyen Date: Thu, 18 Dec 2025 02:10:48 +0100 Subject: [PATCH 4/4] update readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b5de452..83d5b01 100644 --- a/README.md +++ b/README.md @@ -287,13 +287,13 @@ chatCommand say Hello from plugin! #### Return -- All chat messsages since the last poll seperated by `|<-->|` +- A list of block of `:` seperated by `š¯‡‰` #### Example ```bash pollChat -Hallo|<-->|A second message|<-->|Last message +Player1:Halloš¯‡‰Player1:A second messageš¯‡‰Player2:Last message ``` ### Command: spawnEntity