Rework listener processing

Author: rettichlp

src/client/java/de/rettichlp/PKUtilsClient.java

@@ -1,6 +1,6 @@
 package de.rettichlp;
 
-import de.rettichlp.common.manager.MessageManager;
+import de.rettichlp.common.manager.WantedManager;
 import de.rettichlp.common.storage.Storage;
 import net.fabricmc.api.ClientModInitializer;
 
@@ -14,8 +14,13 @@ public class PKUtilsClient implements ClientModInitializer {
     public void onInitializeClient() {
         // This entrypoint is suitable for setting up client-specific logic, such as rendering.
 
-        MessageManager messageManager = new MessageManager();
+        WantedManager wantedManager = new WantedManager();
 
         GAME.register((message, overlay) -> messageManager.process(message));
+        GAME.register((message, overlay) -> {
+            String rawMessage = message.getString();
+
+            wantedManager.onMessage(rawMessage);
+        });
     }
 }

src/client/java/de/rettichlp/common/listener/MessageListener.java

@@ -0,0 +1,6 @@
+package de.rettichlp.common.listener;
+
+public interface MessageListener {
+
+    void onMessage(String message);
+}

…ichlp/common/manager/MessageManager.java …tichlp/common/manager/WantedManager.javasrc/client/java/de/rettichlp/common/manager/MessageManager.java renamed to src/client/java/de/rettichlp/common/manager/WantedManager.java src/client/java/de/rettichlp/common/manager/MessageManager.java renamed to src/client/java/de/rettichlp/common/manager/WantedManager.java

@@ -1,8 +1,7 @@
 package de.rettichlp.common.manager;
 
-import com.mojang.brigadier.Message;
+import de.rettichlp.common.listener.MessageListener;
 import de.rettichlp.common.storage.schema.WantedEntry;
-import lombok.NoArgsConstructor;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 
@@ -15,44 +14,38 @@
 import static java.util.Optional.ofNullable;
 import static java.util.regex.Pattern.compile;
 
-@NoArgsConstructor
-public class MessageManager {
+public class WantedManager implements MessageListener {
 
     private final static Pattern WELCOME_BACK_PATTERN = compile("Willkommen zurück!");
     private final static Pattern ONLINE_WANTED_PLAYERS_HEADER_PATTERN = compile("Online Spieler mit WantedPunkten:");
     private final static Pattern ONLINE_WANTED_PLAYERS_ENTRY_PATTERN = compile("- (?<playerName>[A-Za-z0-9_]+) \\| (?<wantedPointAmount>\\d+) \\| (?<reason>.+)(?<afk> \\| AFK|)");
 
-    private String rawMessage;
-    private ClientPlayNetworkHandler networkHandler;
+    private final ClientPlayNetworkHandler networkHandler;
+
     private long activeWantedCheck = 0;
 
-    public void process(Message message) {
-        this.rawMessage = message.getString();
+    public WantedManager() {
         this.networkHandler = ofNullable(MinecraftClient.getInstance().player)
                 .map(clientPlayerEntity -> clientPlayerEntity.networkHandler)
                 .orElseThrow();
-
-        executeJoinCommands();
-        readWantedPoints();
     }
 
-    private void executeJoinCommands() {
-        Matcher welcomeBackMatcher = WELCOME_BACK_PATTERN.matcher(this.rawMessage);
+    @Override
+    public void onMessage(String message) {
+        Matcher welcomeBackMatcher = WELCOME_BACK_PATTERN.matcher(message);
         if (welcomeBackMatcher.find()) {
-
             this.networkHandler.sendChatCommand("wanteds");
+            return;
         }
-    }
 
-    public void readWantedPoints() {
-        Matcher onlineWantedPlayersHeaderMatcher = ONLINE_WANTED_PLAYERS_HEADER_PATTERN.matcher(this.rawMessage);
+        Matcher onlineWantedPlayersHeaderMatcher = ONLINE_WANTED_PLAYERS_HEADER_PATTERN.matcher(message);
         if (onlineWantedPlayersHeaderMatcher.find()) {
             this.activeWantedCheck = currentTimeMillis();
             storage.resetWantedEntries();
             return;
         }
 
-        Matcher onlineWantedPlayersEntryMatcher = ONLINE_WANTED_PLAYERS_ENTRY_PATTERN.matcher(this.rawMessage);
+        Matcher onlineWantedPlayersEntryMatcher = ONLINE_WANTED_PLAYERS_ENTRY_PATTERN.matcher(message);
         if (onlineWantedPlayersEntryMatcher.find() && (currentTimeMillis() - this.activeWantedCheck < 2000)) {
             String playerName = onlineWantedPlayersEntryMatcher.group("playerName");
             int wantedPointAmount = parseInt(onlineWantedPlayersEntryMatcher.group("wantedPointAmount"));