From 1b152d8b4e0cb464f332ceca30d681e152d543a7 Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Sat, 12 Jan 2019 00:27:55 +0100
Subject: [PATCH] Put channels in a component

Using the per-component AddCommand method
CommandComponent got removed, no need for that
Made channel properties configurable (DisplayName, Color)
Made configs testable, it will only use the cached value in that case
This was needed so channel registering continue to work during testing
Made channels possible to disable (WIP)
#48
---
 .idea/inspectionProfiles/Project_Default.xml  |   2 +-
 .../chat => component/channel}/Channel.java   | 387 ++++++++++--------
 .../component/channel/ChannelComponent.java   |  26 ++
 .../channel}/ChatChannelRegisterEvent.java    |   2 +-
 .../chat => component/channel}/ChatRoom.java  |   4 +-
 .../component/commands/CommandComponent.java  |  15 -
 .../component/restart/RestartComponent.java   |   4 +-
 .../updater/PluginUpdaterComponent.java       |   4 +-
 .../java/buttondevteam/core/MainPlugin.java   |   9 +-
 .../buttondevteam/core/PlayerListener.java    |   2 +-
 .../java/buttondevteam/core/TestPrepare.java  |   5 +-
 .../java/buttondevteam/lib/TBMCChatEvent.java |   2 +-
 .../buttondevteam/lib/TBMCChatEventBase.java  |   2 +-
 .../lib/TBMCChatPreprocessEvent.java          |   2 +-
 .../lib/TBMCSystemChatEvent.java              |   2 +-
 .../lib/architecture/Component.java           |  29 +-
 .../lib/architecture/ConfigData.java          |  12 +-
 .../lib/architecture/IHaveConfig.java         |   5 +
 .../buttondevteam/lib/chat/TBMCChatAPI.java   |  13 +-
 .../lib/player/ChannelPlayerData.java         |   2 +-
 .../lib/player/ChromaGamerBase.java           |   2 +-
 21 files changed, 298 insertions(+), 233 deletions(-)
 rename ButtonCore/src/main/java/buttondevteam/{lib/chat => component/channel}/Channel.java (77%)
 create mode 100644 ButtonCore/src/main/java/buttondevteam/component/channel/ChannelComponent.java
 rename ButtonCore/src/main/java/buttondevteam/{lib/chat => component/channel}/ChatChannelRegisterEvent.java (92%)
 rename ButtonCore/src/main/java/buttondevteam/{lib/chat => component/channel}/ChatRoom.java (87%)
 delete mode 100644 ButtonCore/src/main/java/buttondevteam/component/commands/CommandComponent.java

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 4f1aeda..14d4bba 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,7 +1,7 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
-    <inspection_tool class="WeakerAccess" enabled="true" level="WARNING" enabled_by_default="true">
+    <inspection_tool class="WeakerAccess" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="SUGGEST_PACKAGE_LOCAL_FOR_MEMBERS" value="false" />
       <option name="SUGGEST_PACKAGE_LOCAL_FOR_TOP_CLASSES" value="false" />
       <option name="SUGGEST_PRIVATE_FOR_INNERS" value="false" />
diff --git a/ButtonCore/src/main/java/buttondevteam/lib/chat/Channel.java b/ButtonCore/src/main/java/buttondevteam/component/channel/Channel.java
similarity index 77%
rename from ButtonCore/src/main/java/buttondevteam/lib/chat/Channel.java
rename to ButtonCore/src/main/java/buttondevteam/component/channel/Channel.java
index bddc0f3..71a1d05 100755
--- a/ButtonCore/src/main/java/buttondevteam/lib/chat/Channel.java
+++ b/ButtonCore/src/main/java/buttondevteam/component/channel/Channel.java
@@ -1,175 +1,212 @@
-package buttondevteam.lib.chat;
-
-import buttondevteam.core.MainPlugin;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.BiFunction;
-import java.util.function.BiPredicate;
-import java.util.function.Function;
-import java.util.function.Predicate;
-
-public class Channel {
-    /**
-     * Specifies a score that means it's OK to send - but it does not define any groups, only send or not send. See {@link #GROUP_EVERYONE}
-     */
-    public static final int SCORE_SEND_OK = 0;
-    /**
-     * Specifies a score that means the user doesn't have permission to see or send the message. Any negative value has the same effect.
-     */
-    public static final int SCORE_SEND_NOPE = -1;
-    /**
-     * Send the message to everyone <i>who has access to the channel</i> - this does not necessarily mean all players
-     */
-    public static final String GROUP_EVERYONE = "everyone";
-    public final String DisplayName;
-    public final Color color;
-    public final String ID;
-    @Nullable
-    public String[] IDs;
-    /**
-     * Filters both the sender and the targets
-     */
-    private final Function<CommandSender, RecipientTestResult> filteranderrormsg;
-
-    private static final List<Channel> channels = new ArrayList<>();
-
-    /**
-     * Creates a channel.
-     *
-     * @param displayname       The name that should appear at the start of the message. <b>A chat color is expected at the beginning (§9).</b>
-     * @param color             The default color of the messages sent in the channel
-     * @param command           The command to be used for the channel <i>without /</i>. For example "mod". It's also used for scoreboard objective names.
-     * @param filteranderrormsg Checks all senders against the criteria provided here and sends the message if the index matches the sender's - if no score at all, displays the error.<br>
-     *                          May be null to send to everyone.
-     */
-    public Channel(String displayname, Color color, String command,
-                   Function<CommandSender, RecipientTestResult> filteranderrormsg) {
-        DisplayName = displayname;
-        this.color = color;
-        ID = command;
-        this.filteranderrormsg = filteranderrormsg;
-    }
-
-    /**
-     * Must be only called from a subclass - otherwise it'll throw an exception.
-     *
-     * @see Channel#Channel(String, Color, String, Function)
-     */
-    @SuppressWarnings("unchecked")
-    protected <T extends Channel> Channel(String displayname, Color color, String command,
-                                          BiFunction<T, CommandSender, RecipientTestResult> filteranderrormsg) {
-        DisplayName = displayname;
-        this.color = color;
-        ID = command;
-        this.filteranderrormsg = s -> filteranderrormsg.apply((T) this, s);
-    }
-
-    public boolean isGlobal() {
-        return filteranderrormsg == null;
-    }
-
-    /**
-     * Note: Errors are sent to the sender automatically
-     *
-     * @param sender The user we're sending to
-     * @param score  The (source) score to compare with the user's
-     */
-    public boolean shouldSendTo(CommandSender sender, int score) {
-        return score == getMCScore(sender); //If there's any error, the score won't be equal
-    }
-
-    /**
-     * Note: Errors are sent to the sender automatically
-     */
-    public int getMCScore(CommandSender sender) {
-        return getRTR(sender).score; //No need to check if there was an error
-    }
-
-    /**
-     * Note: Errors are sent to the sender automatically<br>
-     * <p>
-     * Null means don't send
-     */
-    @Nullable
-    public String getGroupID(CommandSender sender) {
-        return getRTR(sender).groupID; //No need to check if there was an error
-    }
-
-    public RecipientTestResult getRTR(CommandSender sender) {
-        if (filteranderrormsg == null)
-            return new RecipientTestResult(SCORE_SEND_OK, GROUP_EVERYONE);
-        return filteranderrormsg.apply(sender);
-    }
-
-    public static List<Channel> getChannels() {
-        return channels;
-    }
-
-    /**
-     * Convenience method for the function parameter of {@link #Channel(String, Color, String, Function)}. It checks if the sender is OP or optionally has the specified group. The error message is
-     * generated automatically.
-     *
-     * @param permgroup The group that can access the channel or <b>null</b> to only allow OPs.
-     * @return If has access
-     */
-    public static Function<CommandSender, RecipientTestResult> inGroupFilter(String permgroup) {
-        return noScoreResult(
-                s -> s.isOp() || (permgroup != null && (s instanceof Player && MainPlugin.permission != null && MainPlugin.permission.playerInGroup((Player) s, permgroup))),
-                "You need to be a(n) " + (permgroup != null ? permgroup : "OP") + " to use this channel.");
-    }
-
-    public static Function<CommandSender, RecipientTestResult> noScoreResult(Predicate<CommandSender> filter,
-                                                                             String errormsg) {
-        return s -> filter.test(s) ? new RecipientTestResult(SCORE_SEND_OK, GROUP_EVERYONE) : new RecipientTestResult(errormsg);
-    }
-
-    public static <T extends Channel> BiFunction<T, CommandSender, RecipientTestResult> noScoreResult(
-            BiPredicate<T, CommandSender> filter, String errormsg) {
-        return (this_, s) -> filter.test(this_, s) ? new RecipientTestResult(SCORE_SEND_OK, GROUP_EVERYONE) : new RecipientTestResult(errormsg);
-    }
-
-    public static Channel GlobalChat;
-    public static Channel AdminChat;
-    public static Channel ModChat;
-
-    static void RegisterChannel(Channel channel) {
-        channels.add(channel);
-        Bukkit.getScheduler().runTask(MainPlugin.Instance, () -> Bukkit.getPluginManager().callEvent(new ChatChannelRegisterEvent(channel))); // Wait for server start
-    }
-
-    public static class RecipientTestResult {
-        public final String errormessage;
-        public final int score; // Anything below 0 is "never send"
-        public final String groupID;
-        public static final RecipientTestResult ALL = new RecipientTestResult(SCORE_SEND_OK, GROUP_EVERYONE);
-
-        /**
-         * Creates a result that indicates an <b>error</b>
-         *
-         * @param errormessage The error message to show the sender if they don't meet the criteria.
-         */
-        public RecipientTestResult(String errormessage) {
-            this.errormessage = errormessage;
-            this.score = SCORE_SEND_NOPE;
-            this.groupID = null;
-        }
-
-        /**
-         * Creates a result that indicates a <b>success</b>
-         *
-         * @param score The score that identifies the target group. <b>Must be non-negative.</b> For example, the index of the town or nation to send to.
-         * @param groupID The ID of the target group.
-         */
-        public RecipientTestResult(int score, String groupID) {
-            if (score < 0) throw new IllegalArgumentException("Score must be non-negative!");
-            this.score = score;
-            this.groupID = groupID;
-            this.errormessage = null;
-        }
-    }
-}
+package buttondevteam.component.channel;
+
+import buttondevteam.core.ComponentManager;
+import buttondevteam.core.MainPlugin;
+import buttondevteam.lib.architecture.Component;
+import buttondevteam.lib.architecture.ConfigData;
+import buttondevteam.lib.chat.Color;
+import com.google.common.collect.Lists;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.BiFunction;
+import java.util.function.BiPredicate;
+import java.util.function.Function;
+import java.util.function.Predicate;
+
+public class Channel {
+    /**
+     * Specifies a score that means it's OK to send - but it does not define any groups, only send or not send. See {@link #GROUP_EVERYONE}
+     */
+    public static final int SCORE_SEND_OK = 0;
+    /**
+     * Specifies a score that means the user doesn't have permission to see or send the message. Any negative value has the same effect.
+     */
+    public static final int SCORE_SEND_NOPE = -1;
+    /**
+     * Send the message to everyone <i>who has access to the channel</i> - this does not necessarily mean all players
+     */
+    public static final String GROUP_EVERYONE = "everyone";
+
+	private static ChannelComponent component;
+
+	private String defDisplayName;
+	private Color defColor;
+
+	private void throwGame() {
+		if (component == null) throw new RuntimeException("Cannot access channel properties until registered!");
+	}
+
+	public final ConfigData<Boolean> Enabled() { //TODO: Implement in all plugins
+		throwGame();
+		return component.getConfig().getData(ID + ".enabled", true);
+	}
+
+	public final ConfigData<String> DisplayName() {
+		throwGame();
+		return component.getConfig().getData(ID + ".displayName", defDisplayName);
+	}
+
+	public final ConfigData<Color> Color() {
+		throwGame();
+		return component.getConfig().getData(ID + ".color", defColor, c -> Color.valueOf((String) c), Enum::toString);
+	}
+    public final String ID;
+
+	@SuppressWarnings("unchecked")
+	public ConfigData<String[]> IDs() {
+		throwGame();
+		return component.getConfig().getData(ID + ".IDs", new String[0], l -> ((List<String>) l).toArray(new String[0]), Lists::newArrayList);
+	}
+    /**
+     * Filters both the sender and the targets
+     */
+    private final Function<CommandSender, RecipientTestResult> filteranderrormsg;
+
+    private static final List<Channel> channels = new ArrayList<>();
+
+    /**
+     * Creates a channel.
+     *
+     * @param displayname       The name that should appear at the start of the message. <b>A chat color is expected at the beginning (§9).</b>
+     * @param color             The default color of the messages sent in the channel
+     * @param command           The command to be used for the channel <i>without /</i>. For example "mod". It's also used for scoreboard objective names.
+     * @param filteranderrormsg Checks all senders against the criteria provided here and sends the message if the index matches the sender's - if no score at all, displays the error.<br>
+     *                          May be null to send to everyone.
+     */
+    public Channel(String displayname, Color color, String command,
+                   Function<CommandSender, RecipientTestResult> filteranderrormsg) {
+	    defDisplayName = displayname;
+	    defColor = color;
+        ID = command;
+        this.filteranderrormsg = filteranderrormsg;
+    }
+
+    /**
+     * Must be only called from a subclass - otherwise it'll throw an exception.
+     *
+     * @see Channel#Channel(String, Color, String, Function)
+     */
+    @SuppressWarnings("unchecked")
+    protected <T extends Channel> Channel(String displayname, Color color, String command,
+                                          BiFunction<T, CommandSender, RecipientTestResult> filteranderrormsg) {
+	    defDisplayName = displayname;
+	    defColor = color;
+        ID = command;
+        this.filteranderrormsg = s -> filteranderrormsg.apply((T) this, s);
+    }
+
+    public boolean isGlobal() {
+        return filteranderrormsg == null;
+    }
+
+    /**
+     * Note: Errors are sent to the sender automatically
+     *
+     * @param sender The user we're sending to
+     * @param score  The (source) score to compare with the user's
+     */
+    public boolean shouldSendTo(CommandSender sender, int score) {
+        return score == getMCScore(sender); //If there's any error, the score won't be equal
+    }
+
+    /**
+     * Note: Errors are sent to the sender automatically
+     */
+    public int getMCScore(CommandSender sender) {
+        return getRTR(sender).score; //No need to check if there was an error
+    }
+
+    /**
+     * Note: Errors are sent to the sender automatically<br>
+     * <p>
+     * Null means don't send
+     */
+    @Nullable
+    public String getGroupID(CommandSender sender) {
+        return getRTR(sender).groupID; //No need to check if there was an error
+    }
+
+    public RecipientTestResult getRTR(CommandSender sender) {
+        if (filteranderrormsg == null)
+            return new RecipientTestResult(SCORE_SEND_OK, GROUP_EVERYONE);
+        return filteranderrormsg.apply(sender);
+    }
+
+    public static List<Channel> getChannels() {
+        return channels;
+    }
+
+    /**
+     * Convenience method for the function parameter of {@link #Channel(String, Color, String, Function)}. It checks if the sender is OP or optionally has the specified group. The error message is
+     * generated automatically.
+     *
+     * @param permgroup The group that can access the channel or <b>null</b> to only allow OPs.
+     * @return If has access
+     */
+    public static Function<CommandSender, RecipientTestResult> inGroupFilter(String permgroup) {
+        return noScoreResult(
+                s -> s.isOp() || (permgroup != null && (s instanceof Player && MainPlugin.permission != null && MainPlugin.permission.playerInGroup((Player) s, permgroup))),
+                "You need to be a(n) " + (permgroup != null ? permgroup : "OP") + " to use this channel.");
+    }
+
+    public static Function<CommandSender, RecipientTestResult> noScoreResult(Predicate<CommandSender> filter,
+                                                                             String errormsg) {
+        return s -> filter.test(s) ? new RecipientTestResult(SCORE_SEND_OK, GROUP_EVERYONE) : new RecipientTestResult(errormsg);
+    }
+
+    public static <T extends Channel> BiFunction<T, CommandSender, RecipientTestResult> noScoreResult(
+            BiPredicate<T, CommandSender> filter, String errormsg) {
+        return (this_, s) -> filter.test(this_, s) ? new RecipientTestResult(SCORE_SEND_OK, GROUP_EVERYONE) : new RecipientTestResult(errormsg);
+    }
+
+    public static Channel GlobalChat;
+    public static Channel AdminChat;
+    public static Channel ModChat;
+
+	public static void RegisterChannel(Channel channel) {
+		if (!channel.isGlobal() && !ComponentManager.isEnabled(ChannelComponent.class))
+			return; //Allow registering the global chat (and I guess other chats like the RP chat)
+		if (component == null)
+			component = (ChannelComponent) Component.getComponents().get(ChannelComponent.class);
+		if (component == null)
+			throw new RuntimeException("Attempting to register a channel before the component is registered!");
+		channels.add(channel);
+		Bukkit.getScheduler().runTask(MainPlugin.Instance, () -> Bukkit.getPluginManager().callEvent(new ChatChannelRegisterEvent(channel))); // Wait for server start
+    }
+
+    public static class RecipientTestResult {
+        public final String errormessage;
+        public final int score; // Anything below 0 is "never send"
+        public final String groupID;
+        public static final RecipientTestResult ALL = new RecipientTestResult(SCORE_SEND_OK, GROUP_EVERYONE);
+
+        /**
+         * Creates a result that indicates an <b>error</b>
+         *
+         * @param errormessage The error message to show the sender if they don't meet the criteria.
+         */
+        public RecipientTestResult(String errormessage) {
+            this.errormessage = errormessage;
+            this.score = SCORE_SEND_NOPE;
+            this.groupID = null;
+        }
+
+        /**
+         * Creates a result that indicates a <b>success</b>
+         *
+         * @param score The score that identifies the target group. <b>Must be non-negative.</b> For example, the index of the town or nation to send to.
+         * @param groupID The ID of the target group.
+         */
+        public RecipientTestResult(int score, String groupID) {
+            if (score < 0) throw new IllegalArgumentException("Score must be non-negative!");
+            this.score = score;
+            this.groupID = groupID;
+            this.errormessage = null;
+        }
+    }
+}
diff --git a/ButtonCore/src/main/java/buttondevteam/component/channel/ChannelComponent.java b/ButtonCore/src/main/java/buttondevteam/component/channel/ChannelComponent.java
new file mode 100644
index 0000000..a49ea1e
--- /dev/null
+++ b/ButtonCore/src/main/java/buttondevteam/component/channel/ChannelComponent.java
@@ -0,0 +1,26 @@
+package buttondevteam.component.channel;
+
+import buttondevteam.lib.architecture.Component;
+import org.bukkit.plugin.java.JavaPlugin;
+
+public class ChannelComponent extends Component {
+	@Override
+	protected void register(JavaPlugin plugin) {
+		super.register(plugin);
+	}
+
+	@Override
+	protected void unregister(JavaPlugin plugin) {
+		super.unregister(plugin);
+	}
+
+	@Override
+	protected void enable() {
+
+	}
+
+	@Override
+	protected void disable() {
+
+	}
+}
diff --git a/ButtonCore/src/main/java/buttondevteam/lib/chat/ChatChannelRegisterEvent.java b/ButtonCore/src/main/java/buttondevteam/component/channel/ChatChannelRegisterEvent.java
similarity index 92%
rename from ButtonCore/src/main/java/buttondevteam/lib/chat/ChatChannelRegisterEvent.java
rename to ButtonCore/src/main/java/buttondevteam/component/channel/ChatChannelRegisterEvent.java
index ad592a6..896a64d 100755
--- a/ButtonCore/src/main/java/buttondevteam/lib/chat/ChatChannelRegisterEvent.java
+++ b/ButtonCore/src/main/java/buttondevteam/component/channel/ChatChannelRegisterEvent.java
@@ -1,4 +1,4 @@
-package buttondevteam.lib.chat;
+package buttondevteam.component.channel;
 
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
diff --git a/ButtonCore/src/main/java/buttondevteam/lib/chat/ChatRoom.java b/ButtonCore/src/main/java/buttondevteam/component/channel/ChatRoom.java
similarity index 87%
rename from ButtonCore/src/main/java/buttondevteam/lib/chat/ChatRoom.java
rename to ButtonCore/src/main/java/buttondevteam/component/channel/ChatRoom.java
index 9819d7c..ea01ed6 100755
--- a/ButtonCore/src/main/java/buttondevteam/lib/chat/ChatRoom.java
+++ b/ButtonCore/src/main/java/buttondevteam/component/channel/ChatRoom.java
@@ -1,5 +1,7 @@
-package buttondevteam.lib.chat;
+package buttondevteam.component.channel;
 
+import buttondevteam.lib.chat.Color;
+import buttondevteam.lib.chat.TBMCChatAPI;
 import org.bukkit.command.CommandSender;
 
 import java.util.ArrayList;
diff --git a/ButtonCore/src/main/java/buttondevteam/component/commands/CommandComponent.java b/ButtonCore/src/main/java/buttondevteam/component/commands/CommandComponent.java
deleted file mode 100644
index b85ad34..0000000
--- a/ButtonCore/src/main/java/buttondevteam/component/commands/CommandComponent.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package buttondevteam.component.commands;
-
-import buttondevteam.lib.architecture.Component;
-
-public class CommandComponent extends Component { //TODO: Do we just move everything here?
-	@Override
-	public void enable() {
-
-	}
-
-	@Override
-	public void disable() {
-
-	}
-}
diff --git a/ButtonCore/src/main/java/buttondevteam/component/restart/RestartComponent.java b/ButtonCore/src/main/java/buttondevteam/component/restart/RestartComponent.java
index 8184b8a..f87785e 100644
--- a/ButtonCore/src/main/java/buttondevteam/component/restart/RestartComponent.java
+++ b/ButtonCore/src/main/java/buttondevteam/component/restart/RestartComponent.java
@@ -9,8 +9,8 @@ public class RestartComponent extends Component {
 	@Override
 	public void enable() {
 		//TODO: Permissions for the commands
-		TBMCChatAPI.AddCommand(getPlugin(), ScheduledRestartCommand.class);
-		TBMCChatAPI.AddCommand(getPlugin(), PrimeRestartCommand.class);
+		TBMCChatAPI.AddCommand(this, new ScheduledRestartCommand());
+		TBMCChatAPI.AddCommand(this, new PrimeRestartCommand());
 	}
 
 	@Override
diff --git a/ButtonCore/src/main/java/buttondevteam/component/updater/PluginUpdaterComponent.java b/ButtonCore/src/main/java/buttondevteam/component/updater/PluginUpdaterComponent.java
index 2425631..bd64c05 100644
--- a/ButtonCore/src/main/java/buttondevteam/component/updater/PluginUpdaterComponent.java
+++ b/ButtonCore/src/main/java/buttondevteam/component/updater/PluginUpdaterComponent.java
@@ -6,11 +6,11 @@ import buttondevteam.lib.chat.TBMCChatAPI;
 public class PluginUpdaterComponent extends Component {
 	@Override
 	public void enable() {
-		TBMCChatAPI.AddCommand(getPlugin(), UpdatePluginCommand.class);
+		TBMCChatAPI.AddCommand(this, new UpdatePluginCommand());
 	}
 
 	@Override
-	public void disable() { //TODO: Unregister commands and such
+	public void disable() { //Commands are automatically unregistered
 
 	}
 }
diff --git a/ButtonCore/src/main/java/buttondevteam/core/MainPlugin.java b/ButtonCore/src/main/java/buttondevteam/core/MainPlugin.java
index 92a3517..1dc2149 100755
--- a/ButtonCore/src/main/java/buttondevteam/core/MainPlugin.java
+++ b/ButtonCore/src/main/java/buttondevteam/core/MainPlugin.java
@@ -1,12 +1,13 @@
 package buttondevteam.core;
 
+import buttondevteam.component.channel.Channel;
+import buttondevteam.component.channel.ChannelComponent;
+import buttondevteam.component.channel.ChatRoom;
 import buttondevteam.component.restart.RestartComponent;
 import buttondevteam.component.updater.PluginUpdater;
 import buttondevteam.component.updater.PluginUpdaterComponent;
 import buttondevteam.lib.TBMCCoreAPI;
 import buttondevteam.lib.architecture.Component;
-import buttondevteam.lib.chat.Channel;
-import buttondevteam.lib.chat.ChatRoom;
 import buttondevteam.lib.chat.Color;
 import buttondevteam.lib.chat.TBMCChatAPI;
 import buttondevteam.lib.player.ChromaGamerBase;
@@ -54,6 +55,7 @@ public class MainPlugin extends JavaPlugin {
 		saveConfig();
 		Component.registerComponent(this, new PluginUpdaterComponent());
 		Component.registerComponent(this, new RestartComponent());
+		Component.registerComponent(this, new ChannelComponent());
 		ComponentManager.enableComponents();
 		TBMCChatAPI.AddCommand(this, MemberCommand.class);
 		TBMCCoreAPI.RegisterEventsForExceptions(new PlayerListener(), this);
@@ -62,8 +64,7 @@ public class MainPlugin extends JavaPlugin {
 		ChromaGamerBase.addConverter(sender -> Optional.ofNullable(sender instanceof Player
 				? TBMCPlayer.getPlayer(((Player) sender).getUniqueId(), TBMCPlayer.class) : null)); //Players, has higher priority
 		TBMCCoreAPI.RegisterUserClass(TBMCPlayerBase.class);
-        TBMCChatAPI.RegisterChatChannel(Channel.GlobalChat = new Channel("§fOOC§f", Color.White, "ooc", null));
-        Channel.GlobalChat.IDs = new String[]{"g"}; //Support /g as well
+		TBMCChatAPI.RegisterChatChannel(Channel.GlobalChat = new Channel("§fOOC§f", Color.White, "g", null)); //The /ooc ID has moved to the config
 		TBMCChatAPI.RegisterChatChannel(
 				Channel.AdminChat = new Channel("§cADMIN§f", Color.Red, "a", Channel.inGroupFilter(null)));
 		TBMCChatAPI.RegisterChatChannel(
diff --git a/ButtonCore/src/main/java/buttondevteam/core/PlayerListener.java b/ButtonCore/src/main/java/buttondevteam/core/PlayerListener.java
index c654d29..26251a9 100755
--- a/ButtonCore/src/main/java/buttondevteam/core/PlayerListener.java
+++ b/ButtonCore/src/main/java/buttondevteam/core/PlayerListener.java
@@ -59,6 +59,6 @@ public class PlayerListener implements Listener {
 		if (Arrays.stream(event.getExceptions()).anyMatch("Minecraft"::equalsIgnoreCase))
 			return;
         Bukkit.getOnlinePlayers().stream().filter(event::shouldSendTo)
-                .forEach(p -> p.sendMessage(event.getChannel().DisplayName.substring(0, 2) + event.getMessage()));
+	        .forEach(p -> p.sendMessage(event.getChannel().DisplayName().get().substring(0, 2) + event.getMessage()));
     }
 }
\ No newline at end of file
diff --git a/ButtonCore/src/main/java/buttondevteam/core/TestPrepare.java b/ButtonCore/src/main/java/buttondevteam/core/TestPrepare.java
index 5f89ad3..179e9cf 100755
--- a/ButtonCore/src/main/java/buttondevteam/core/TestPrepare.java
+++ b/ButtonCore/src/main/java/buttondevteam/core/TestPrepare.java
@@ -1,6 +1,8 @@
 package buttondevteam.core;
 
-import buttondevteam.lib.chat.Channel;
+import buttondevteam.component.channel.Channel;
+import buttondevteam.component.channel.ChannelComponent;
+import buttondevteam.lib.architecture.Component;
 import buttondevteam.lib.chat.Color;
 import buttondevteam.lib.chat.TBMCChatAPI;
 import org.bukkit.Bukkit;
@@ -38,6 +40,7 @@ public class TestPrepare {
 				return cl.isAssignableFrom(invocation.getMethod().getReturnType());
 			}
 		}));
+		Component.registerComponent(Mockito.mock(MainPlugin.class), new ChannelComponent());
 		TBMCChatAPI.RegisterChatChannel(Channel.GlobalChat = new Channel("§fg§f", Color.White, "g", null));
 	}
 }
diff --git a/ButtonCore/src/main/java/buttondevteam/lib/TBMCChatEvent.java b/ButtonCore/src/main/java/buttondevteam/lib/TBMCChatEvent.java
index f304cde..cae2c39 100755
--- a/ButtonCore/src/main/java/buttondevteam/lib/TBMCChatEvent.java
+++ b/ButtonCore/src/main/java/buttondevteam/lib/TBMCChatEvent.java
@@ -1,6 +1,6 @@
 package buttondevteam.lib;
 
-import buttondevteam.lib.chat.Channel;
+import buttondevteam.component.channel.Channel;
 import buttondevteam.lib.chat.ChatMessage;
 import lombok.Getter;
 import lombok.experimental.Delegate;
diff --git a/ButtonCore/src/main/java/buttondevteam/lib/TBMCChatEventBase.java b/ButtonCore/src/main/java/buttondevteam/lib/TBMCChatEventBase.java
index 14c7de9..bed34a6 100755
--- a/ButtonCore/src/main/java/buttondevteam/lib/TBMCChatEventBase.java
+++ b/ButtonCore/src/main/java/buttondevteam/lib/TBMCChatEventBase.java
@@ -1,6 +1,6 @@
 package buttondevteam.lib;
 
-import buttondevteam.lib.chat.Channel;
+import buttondevteam.component.channel.Channel;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
diff --git a/ButtonCore/src/main/java/buttondevteam/lib/TBMCChatPreprocessEvent.java b/ButtonCore/src/main/java/buttondevteam/lib/TBMCChatPreprocessEvent.java
index 3dd4720..28bd27e 100755
--- a/ButtonCore/src/main/java/buttondevteam/lib/TBMCChatPreprocessEvent.java
+++ b/ButtonCore/src/main/java/buttondevteam/lib/TBMCChatPreprocessEvent.java
@@ -1,6 +1,6 @@
 package buttondevteam.lib;
 
-import buttondevteam.lib.chat.Channel;
+import buttondevteam.component.channel.Channel;
 import lombok.Getter;
 import lombok.Setter;
 import org.bukkit.command.CommandSender;
diff --git a/ButtonCore/src/main/java/buttondevteam/lib/TBMCSystemChatEvent.java b/ButtonCore/src/main/java/buttondevteam/lib/TBMCSystemChatEvent.java
index 0432054..f4ded2a 100755
--- a/ButtonCore/src/main/java/buttondevteam/lib/TBMCSystemChatEvent.java
+++ b/ButtonCore/src/main/java/buttondevteam/lib/TBMCSystemChatEvent.java
@@ -1,6 +1,6 @@
 package buttondevteam.lib;
 
-import buttondevteam.lib.chat.Channel;
+import buttondevteam.component.channel.Channel;
 import lombok.Getter;
 import org.bukkit.command.CommandSender;
 import org.bukkit.event.HandlerList;
diff --git a/ButtonCore/src/main/java/buttondevteam/lib/architecture/Component.java b/ButtonCore/src/main/java/buttondevteam/lib/architecture/Component.java
index 9a09483..6e37710 100644
--- a/ButtonCore/src/main/java/buttondevteam/lib/architecture/Component.java
+++ b/ButtonCore/src/main/java/buttondevteam/lib/architecture/Component.java
@@ -34,7 +34,7 @@ public abstract class Component {
 	private @Getter
 	IHaveConfig config;
 
-	public ConfigData<Boolean> shouldBeEnabled() {
+	public final ConfigData<Boolean> shouldBeEnabled() {
 		return config.getData("enabled", true);
 	}
 
@@ -78,12 +78,15 @@ public abstract class Component {
 			}
 			if (register) {
 				component.plugin = plugin;
-				var compconf = plugin.getConfig().getConfigurationSection("components");
-				if (compconf == null) compconf = plugin.getConfig().createSection("components");
-				component.configSect = compconf.getConfigurationSection(component.getClassName());
-				if (component.configSect == null)
-					component.configSect = compconf.createSection(component.getClassName());
-				component.config = new IHaveConfig(component.configSect);
+				if (plugin.getConfig() != null) { //Production
+					var compconf = plugin.getConfig().getConfigurationSection("components");
+					if (compconf == null) compconf = plugin.getConfig().createSection("components");
+					component.configSect = compconf.getConfigurationSection(component.getClassName());
+					if (component.configSect == null)
+						component.configSect = compconf.createSection(component.getClassName());
+					component.config = new IHaveConfig(component.configSect);
+				} else //Testing
+					component.config = new IHaveConfig(null);
 				component.register(plugin);
 				components.put(component.getClass(), component);
 				if (ComponentManager.areComponentsEnabled() && component.shouldBeEnabled().get()) {
@@ -179,23 +182,21 @@ public abstract class Component {
 	protected abstract void disable();
 
 	/**
-	 * Registers a TBMCCommand to the plugin. Make sure to add it to plugin.yml and use {@link buttondevteam.lib.chat.CommandClass}.
+	 * Registers a TBMCCommand to the component. Make sure to add it to plugin.yml and use {@link buttondevteam.lib.chat.CommandClass}.
 	 *
-	 * @param plugin      Main plugin responsible for stuff
 	 * @param commandBase Custom coded command class
 	 */
-	protected void registerCommand(JavaPlugin plugin, TBMCCommandBase commandBase) {
-		TBMCChatAPI.AddCommand(plugin, commandBase);
+	protected final void registerCommand(TBMCCommandBase commandBase) {
+		TBMCChatAPI.AddCommand(this, commandBase);
 	}
 
 	/**
-	 * Registers a Listener to this plugin
+	 * Registers a Listener to this component
 	 *
-	 * @param plugin   Main plugin responsible for stuff
 	 * @param listener The event listener to register
 	 * @return The provided listener
 	 */
-	protected Listener registerListener(JavaPlugin plugin, Listener listener) {
+	protected final Listener registerListener(Listener listener) {
 		TBMCCoreAPI.RegisterEventsForExceptions(listener, plugin);
 		return listener;
 	}
diff --git a/ButtonCore/src/main/java/buttondevteam/lib/architecture/ConfigData.java b/ButtonCore/src/main/java/buttondevteam/lib/architecture/ConfigData.java
index 8ad3424..ff551aa 100644
--- a/ButtonCore/src/main/java/buttondevteam/lib/architecture/ConfigData.java
+++ b/ButtonCore/src/main/java/buttondevteam/lib/architecture/ConfigData.java
@@ -15,6 +15,9 @@ import java.util.function.Function;
 @RequiredArgsConstructor(access = AccessLevel.PACKAGE)
 //@AllArgsConstructor(access = AccessLevel.PACKAGE)
 public class ConfigData<T> { //TODO: Save after a while
+	/**
+	 * May be null for testing
+	 */
 	private final ConfigurationSection config;
 	private final String path;
 	private @Nullable final T def;
@@ -46,14 +49,14 @@ public class ConfigData<T> { //TODO: Save after a while
 	@SuppressWarnings("unchecked")
 	public T get() {
 		if (value != null) return value; //Speed things up
-		Object val = config.get(path);
+		Object val = config == null ? null : config.get(path); //config==null: testing
 		if (val == null) {
 			val = primitiveDef;
 		}
 		if (val == primitiveDef && !saved) {
 			if (def != null)
 				set(def); //Save default value
-			else
+			else if (config != null) //config==null: testing
 				config.set(path, primitiveDef);
 			saved = true;
 		}
@@ -70,7 +73,8 @@ public class ConfigData<T> { //TODO: Save after a while
 		if (setter != null)
 			val = setter.apply(value);
 		else val = value;
-		config.set(path, val);
-		this.value =value;
+		if (config != null)
+			config.set(path, val);
+		this.value = value;
 	}
 }
diff --git a/ButtonCore/src/main/java/buttondevteam/lib/architecture/IHaveConfig.java b/ButtonCore/src/main/java/buttondevteam/lib/architecture/IHaveConfig.java
index f993040..f2b4623 100644
--- a/ButtonCore/src/main/java/buttondevteam/lib/architecture/IHaveConfig.java
+++ b/ButtonCore/src/main/java/buttondevteam/lib/architecture/IHaveConfig.java
@@ -12,6 +12,11 @@ public final class IHaveConfig {
 	private final HashMap<String, ConfigData<?>> datamap = new HashMap<>();
 	private ConfigurationSection config;
 
+	/**
+	 * May be used in testing
+	 *
+	 * @param section May be null for testing
+	 */
 	IHaveConfig(ConfigurationSection section) {
 		config = section;
 	}
diff --git a/ButtonCore/src/main/java/buttondevteam/lib/chat/TBMCChatAPI.java b/ButtonCore/src/main/java/buttondevteam/lib/chat/TBMCChatAPI.java
index ed61f53..59b2af2 100755
--- a/ButtonCore/src/main/java/buttondevteam/lib/chat/TBMCChatAPI.java
+++ b/ButtonCore/src/main/java/buttondevteam/lib/chat/TBMCChatAPI.java
@@ -1,5 +1,7 @@
 package buttondevteam.lib.chat;
 
+import buttondevteam.component.channel.Channel;
+import buttondevteam.component.channel.Channel.RecipientTestResult;
 import buttondevteam.core.CommandCaller;
 import buttondevteam.core.MainPlugin;
 import buttondevteam.lib.TBMCChatEvent;
@@ -7,7 +9,6 @@ import buttondevteam.lib.TBMCChatPreprocessEvent;
 import buttondevteam.lib.TBMCCoreAPI;
 import buttondevteam.lib.TBMCSystemChatEvent;
 import buttondevteam.lib.architecture.Component;
-import buttondevteam.lib.chat.Channel.RecipientTestResult;
 import lombok.val;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
@@ -130,7 +131,7 @@ public class TBMCChatAPI {
 
 	/**
 	 * <p>
-	 * This method adds a plugin's command to help and sets it's executor.
+	 * This method adds a plugin's command to help and sets it's executor. They will be automatically unregistered on plugin disable.
 	 * </p>
 	 * <p>
 	 * The <u>command must be registered</u> in the caller plugin's plugin.yml. Otherwise the plugin will output a messsage to console.
@@ -163,7 +164,7 @@ public class TBMCChatAPI {
 
 	/**
 	 * <p>
-	 * This method adds a plugin's command to help and sets its executor.
+	 * This method adds a plugin's command to help and sets its executor. They will be automatically unregistered on plugin disable.
 	 * </p>
 	 * <p>
 	 * The <u>command must be registered</u> in the caller plugin's plugin.yml. Otherwise the plugin will output a message to console.
@@ -191,7 +192,7 @@ public class TBMCChatAPI {
 
 	/**
 	 * <p>
-	 * This method adds a plugin's command to help and sets its executor.
+	 * This method adds a plugin's command to help and sets its executor. They will be automatically unregistered on component disable.
 	 * </p>
 	 * <p>
 	 * The <u>command must be registered</u> in the caller plugin's plugin.yml. Otherwise the plugin will output a message to console.
@@ -277,7 +278,7 @@ public class TBMCChatAPI {
 	 */
 	public static boolean SendChatMessage(ChatMessage cm, Channel channel) {
 	    if (!Channel.getChannels().contains(channel))
-		    throw new RuntimeException("Channel " + channel.DisplayName + " not registered!");
+		    throw new RuntimeException("Channel " + channel.DisplayName().get() + " not registered!");
 		val permcheck = cm.getPermCheck();
 	    RecipientTestResult rtr = getScoreOrSendError(channel, permcheck);
 		int score = rtr.score;
@@ -308,7 +309,7 @@ public class TBMCChatAPI {
 	 */
 	public static boolean SendSystemMessage(Channel channel, RecipientTestResult rtr, String message, String... exceptions) {
 		if (!Channel.getChannels().contains(channel))
-			throw new RuntimeException("Channel " + channel.DisplayName + " not registered!");
+			throw new RuntimeException("Channel " + channel.DisplayName().get() + " not registered!");
 		TBMCSystemChatEvent event = new TBMCSystemChatEvent(channel, message, rtr.score, rtr.groupID, exceptions);
 		Bukkit.getPluginManager().callEvent(event);
 		return event.isCancelled();
diff --git a/ButtonCore/src/main/java/buttondevteam/lib/player/ChannelPlayerData.java b/ButtonCore/src/main/java/buttondevteam/lib/player/ChannelPlayerData.java
index 583a5c9..91c9c4f 100644
--- a/ButtonCore/src/main/java/buttondevteam/lib/player/ChannelPlayerData.java
+++ b/ButtonCore/src/main/java/buttondevteam/lib/player/ChannelPlayerData.java
@@ -1,6 +1,6 @@
 package buttondevteam.lib.player;
 
-import buttondevteam.lib.chat.Channel;
+import buttondevteam.component.channel.Channel;
 import org.bukkit.configuration.file.YamlConfiguration;
 
 public class ChannelPlayerData { //I just want this to work
diff --git a/ButtonCore/src/main/java/buttondevteam/lib/player/ChromaGamerBase.java b/ButtonCore/src/main/java/buttondevteam/lib/player/ChromaGamerBase.java
index 9d0a3a4..902a00a 100755
--- a/ButtonCore/src/main/java/buttondevteam/lib/player/ChromaGamerBase.java
+++ b/ButtonCore/src/main/java/buttondevteam/lib/player/ChromaGamerBase.java
@@ -1,7 +1,7 @@
 package buttondevteam.lib.player;
 
+import buttondevteam.component.channel.Channel;
 import buttondevteam.lib.TBMCCoreAPI;
-import buttondevteam.lib.chat.Channel;
 import com.google.common.collect.HashBiMap;
 import lombok.val;
 import org.bukkit.Bukkit;