From f5066d4a9e7c6d1a5d1edaac8e2181454a63d905 Mon Sep 17 00:00:00 2001
From: len <40720638+destro174@users.noreply.github.com>
Date: Sat, 15 May 2021 13:31:53 +0200
Subject: [PATCH] remove chatplayer instnaces

---
 .../com/alttd/chat/objects/ChatPlayer.java    | 36 -------------------
 .../com/alttd/chat/handlers/ChatHandler.java  | 31 +++++++---------
 .../chat/listeners/ProxyPlayerListener.java   |  7 ++--
 3 files changed, 17 insertions(+), 57 deletions(-)
 delete mode 100644 api/src/main/java/com/alttd/chat/objects/ChatPlayer.java

diff --git a/api/src/main/java/com/alttd/chat/objects/ChatPlayer.java b/api/src/main/java/com/alttd/chat/objects/ChatPlayer.java
deleted file mode 100644
index 258f6f2..0000000
--- a/api/src/main/java/com/alttd/chat/objects/ChatPlayer.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.alttd.chat.objects;
-
-import java.util.UUID;
-
-public class ChatPlayer {
-    // todo merge partyuser here, or make party user extend this?
-    // todo gctoggle?
-
-    // todo cache prefixes?
-
-    private UUID uuid;
-    private UUID replyTarget;
-    private boolean globalChatEnabled; // this vs permission?
-
-    public ChatPlayer(UUID p) {
-        uuid = p;
-        replyTarget = null;
-    }
-
-    public UUID getUuid() {
-        return uuid;
-    }
-
-    public boolean isGlobalChatEnabled() {
-        return globalChatEnabled;
-    }
-
-    public UUID getReplyTarget() {
-        return replyTarget;
-    }
-
-    public void setReplyTarget(UUID uuid) {
-        if (!replyTarget.equals(uuid))
-            replyTarget = uuid;
-    }
-}
diff --git a/velocity/src/main/java/com/alttd/chat/handlers/ChatHandler.java b/velocity/src/main/java/com/alttd/chat/handlers/ChatHandler.java
index 3259038..b95442f 100644
--- a/velocity/src/main/java/com/alttd/chat/handlers/ChatHandler.java
+++ b/velocity/src/main/java/com/alttd/chat/handlers/ChatHandler.java
@@ -1,51 +1,46 @@
 package com.alttd.chat.handlers;
 
-import com.alttd.chat.VelocityChat;
 import com.alttd.chat.api.PrivateMessageEvent;
 import com.alttd.chat.config.Config;
-import com.alttd.chat.objects.ChatPlayer;
+import com.alttd.chat.objects.ChatUser;
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.proxy.Player;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
-import net.luckperms.api.LuckPerms;
-import net.luckperms.api.model.group.Group;
-import net.luckperms.api.model.user.User;
 
 import java.util.*;
 
 public class ChatHandler {
 
-    private List<ChatPlayer> chatPlayers;
+    private List<ChatUser> chatUsers;
 
     public ChatHandler() {
-        chatPlayers = new ArrayList<>();
+        chatUsers = new ArrayList<>();
     }
 
-    public void addPlayer(ChatPlayer chatPlayer) {
-        chatPlayers.add(chatPlayer);
+    public void addPlayer(ChatUser chatuser) {
+        chatUsers.add(chatuser);
     }
 
-    public void removePlayer(ChatPlayer chatPlayer) {
-        if(chatPlayer != null)
-            chatPlayers.remove(chatPlayer);
+    public void removePlayer(ChatUser chatUser) {
+        if(chatUser != null)
+            chatUsers.remove(chatUser);
     }
 
     public void removePlayer(UUID uuid) {
-        removePlayer(getChatPlayer(uuid));
+        removePlayer(getChatUser(uuid));
     }
 
-    public ChatPlayer getChatPlayer(UUID uuid) {
-        for(ChatPlayer p: chatPlayers) {
+    public ChatUser getChatUser(UUID uuid) {
+        for(ChatUser p: chatUsers) {
             if(p.getUuid() == uuid)
                 return p;
         }
         return null;
     }
 
-    public List<ChatPlayer> getChatPlayers() {
-        return Collections.unmodifiableList(chatPlayers);
+    public List<ChatUser> getChatPlayers() {
+        return Collections.unmodifiableList(chatUsers);
     }
 
     public void privateMessage(PrivateMessageEvent event) {
diff --git a/velocity/src/main/java/com/alttd/chat/listeners/ProxyPlayerListener.java b/velocity/src/main/java/com/alttd/chat/listeners/ProxyPlayerListener.java
index 157a6c5..af22692 100644
--- a/velocity/src/main/java/com/alttd/chat/listeners/ProxyPlayerListener.java
+++ b/velocity/src/main/java/com/alttd/chat/listeners/ProxyPlayerListener.java
@@ -4,7 +4,6 @@ import com.alttd.chat.VelocityChat;
 import com.alttd.chat.config.Config;
 import com.alttd.chat.data.ServerWrapper;
 import com.alttd.chat.handlers.ServerHandler;
-import com.alttd.chat.objects.ChatPlayer;
 import com.velocitypowered.api.event.PostOrder;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.connection.DisconnectEvent;
@@ -22,12 +21,14 @@ public class ProxyPlayerListener {
 
     @Subscribe(order = PostOrder.FIRST)
     public void onPlayerLogin(LoginEvent event) {
-        VelocityChat.getPlugin().getChatHandler().addPlayer(new ChatPlayer(event.getPlayer().getUniqueId()));
+        // TODO setup ChatUser on Proxy
+        //VelocityChat.getPlugin().getChatHandler().addPlayer(new ChatPlayer(event.getPlayer().getUniqueId()));
     }
 
     @Subscribe
     public void quitEvent(DisconnectEvent event) {
-        VelocityChat.getPlugin().getChatHandler().removePlayer(event.getPlayer().getUniqueId());
+        // TODO setup ChatUser on Proxy
+        //VelocityChat.getPlugin().getChatHandler().removePlayer(event.getPlayer().getUniqueId());
     }
 
     // Server Join and Leave messages