chan: store & manipulate channels themselves rather than strings

foyer-mc · Sep 1, 2019 · 40f2d5e · 40f2d5e
1 parent 3074d88
commit 40f2d5e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/src/main/java/cool/foyer/chat/Chat.java b/src/main/java/cool/foyer/chat/Chat.java
@@ -15,7 +15,7 @@
 public class Chat {
 
     private final ProxiedPlayer player;
-    private String focus;
+    private Channel focus;
     private final Set<Channel> channels = new HashSet<>();
 
 }
diff --git a/src/main/java/cool/foyer/chat/ChatHandler.java b/src/main/java/cool/foyer/chat/ChatHandler.java
@@ -26,8 +26,7 @@ public void onLogin(PostLoginEvent event) {
         chat.focus(plugin.defaultFocus());
 
         var defaults = plugin.defaultChannels();
-        for (var chanName : defaults) {
-            var chan = this.plugin.channels().get(chanName);
+        for (var chan : defaults) {
             chan.recipients().add(player);
             chat.channels().add(chan);
         }
@@ -60,7 +59,7 @@ public void onChat(ChatEvent event) {
         var player = (ProxiedPlayer) sender;
         var msg = ChatColor.stripColor(event.getMessage());
         var chat = this.plugin.chats().get(player);
-        var chan = this.plugin.channels().get(chat.focus());
+        var chan = chat.focus();
 
         if (chan == null) {
             player.sendMessage("§cAucun canal sélectionné.§r");

diff --git a/src/main/java/cool/foyer/chat/Commands.java b/src/main/java/cool/foyer/chat/Commands.java
@@ -25,7 +25,7 @@ public Commands(Plugin plugin) {
     @Subcommand("switch")
     @CommandCompletion("@channels")
     public void cmdSwitch(Chat chat, Channel chan) {
-        chat.focus(chan.toString());
+        chat.focus(chan);
     }
 
     @Subcommand("list")

diff --git a/src/main/java/cool/foyer/chat/Plugin.java b/src/main/java/cool/foyer/chat/Plugin.java
@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -33,8 +34,8 @@ public class Plugin extends net.md_5.bungee.api.plugin.Plugin {
     private Configuration config;
 
     private String defaultTemplate;
-    private List<String> defaultChannels;
-    private String defaultFocus;
+    private List<Channel> defaultChannels = new ArrayList<>();
+    private Channel defaultFocus;
 
     private void loadConfig() {
         var datadir = getDataFolder();
@@ -57,8 +58,6 @@ private void loadConfig() {
         }
 
         defaultTemplate = config.getString("template");
-        defaultChannels = config.getStringList("default_channels");
-        defaultFocus    = config.getString("default_focus");
     }
 
     @Override
@@ -74,6 +73,10 @@ public void onEnable() {
                 .template(template);
             channels.put(name, chan);
         }
+        for (var name : config.getStringList("default_channels")) {
+            defaultChannels.add(channels.get(name));
+        }
+        defaultFocus = channels.get(config.getString("default_focus"));
 
         var pm = getProxy().getPluginManager();
         pm.registerListener(this, new ChatHandler(this));