[Refactor/Dependency] Move 'ca.q0r.*.config' to 'ca.q0r.*.yml'./Update MChat Dependency.

Author: MiracleM4n

pom.xml

@@ -4,7 +4,7 @@
     <!-- Project information -->
     <groupId>ca.q0r</groupId>
     <artifactId>MAdvanced</artifactId>
-    <version>1.6.4-R0.3</version>
+    <version>1.6.4-R0.4</version>
     <name>MAdvanced</name>
     <url>http://mdev.in/</url>
     <description>Advanced MChat functionality</description>
@@ -97,14 +97,7 @@
         <dependency>
             <groupId>ca.q0r</groupId>
             <artifactId>MChat</artifactId>
-            <version>1.6.4-R0.2</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.getspout</groupId>
-            <artifactId>spoutpluginapi</artifactId>
-            <version>dev-SNAPSHOT</version>
+            <version>1.6.4-R0.5</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>

src/main/java/ca/q0r/madvanced/MAdvanced.java

@@ -1,11 +1,10 @@
 package ca.q0r.madvanced;
 
 import ca.q0r.madvanced.commands.*;
-import ca.q0r.madvanced.configs.ConfigUtil;
-import ca.q0r.madvanced.configs.LocaleUtil;
 import ca.q0r.madvanced.events.*;
-import ca.q0r.madvanced.types.ConfigType;
-import ca.q0r.madvanced.types.LocaleType;
+import ca.q0r.madvanced.yml.YmlManager;
+import ca.q0r.madvanced.yml.config.ConfigType;
+import ca.q0r.madvanced.yml.locale.LocaleType;
 import ca.q0r.mchat.api.API;
 import ca.q0r.mchat.api.Parser;
 import ca.q0r.mchat.util.MessageUtil;
@@ -59,7 +58,8 @@ public void run() {
 				}
 			}, 200);*/
 
-            initializeConfigs();
+            // Load Yml
+            YmlManager.initialize();
 
             // Setup Plugins
             setupPlugins();
@@ -103,7 +103,8 @@ public void onDisable() {
 
             getServer().getScheduler().cancelTasks(this);
 
-            unloadConfigs();
+            // Unload Yml
+            YmlManager.unload();
 
             // Stop the Timer
             timer.stop();
@@ -197,16 +198,6 @@ public void run() {
         }, 20L * 10, 20L * 10);
     }
 
-    private void initializeConfigs() {
-        ConfigUtil.initialize();
-        LocaleUtil.initialize();
-    }
-
-    private void unloadConfigs() {
-        ConfigUtil.dispose();
-        LocaleUtil.dispose();
-    }
-
     void setupCommands() {
         regCommands("madvanced", new AdvancedCommand());
         regCommands("mchatafk", new AFKCommand(this));

src/main/java/ca/q0r/madvanced/commands/AFKCommand.java

@@ -1,7 +1,7 @@
 package ca.q0r.madvanced.commands;
 
 import ca.q0r.madvanced.MAdvanced;
-import ca.q0r.madvanced.types.LocaleType;
+import ca.q0r.madvanced.yml.locale.LocaleType;
 import ca.q0r.mchat.util.CommandUtil;
 import ca.q0r.mchat.util.MessageUtil;
 import org.bukkit.command.Command;

src/main/java/ca/q0r/madvanced/commands/AFKOtherCommand.java

@@ -1,8 +1,8 @@
 package ca.q0r.madvanced.commands;
 
 import ca.q0r.madvanced.MAdvanced;
-import ca.q0r.madvanced.types.ConfigType;
-import ca.q0r.madvanced.types.LocaleType;
+import ca.q0r.madvanced.yml.config.ConfigType;
+import ca.q0r.madvanced.yml.locale.LocaleType;
 import ca.q0r.mchat.api.API;
 import ca.q0r.mchat.api.Parser;
 import ca.q0r.mchat.types.IndicatorType;

src/main/java/ca/q0r/madvanced/commands/AdvancedCommand.java

@@ -1,7 +1,9 @@
 package ca.q0r.madvanced.commands;
 
-import ca.q0r.madvanced.configs.ConfigUtil;
-import ca.q0r.madvanced.configs.LocaleUtil;
+import ca.q0r.madvanced.yml.YmlManager;
+import ca.q0r.madvanced.yml.YmlType;
+import ca.q0r.madvanced.yml.config.ConfigYml;
+import ca.q0r.madvanced.yml.locale.LocaleYml;
 import ca.q0r.mchat.util.CommandUtil;
 import ca.q0r.mchat.util.MessageUtil;
 import org.bukkit.command.Command;
@@ -26,8 +28,8 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
                 return true;
             }
 
-            ConfigUtil.initialize();
-            LocaleUtil.initialize();
+            YmlManager.reloadYml(YmlType.CONFIG_YML);
+            YmlManager.reloadYml(YmlType.LOCALE_YML);
 
             MessageUtil.sendMessage(sender, "Config Reloaded.");
             return true;

src/main/java/ca/q0r/madvanced/commands/ListCommand.java

@@ -1,8 +1,8 @@
 package ca.q0r.madvanced.commands;
 
 import ca.q0r.madvanced.MAdvanced;
-import ca.q0r.madvanced.types.ConfigType;
-import ca.q0r.madvanced.types.LocaleType;
+import ca.q0r.madvanced.yml.config.ConfigType;
+import ca.q0r.madvanced.yml.locale.LocaleType;
 import ca.q0r.mchat.api.API;
 import ca.q0r.mchat.api.Parser;
 import ca.q0r.mchat.api.Reader;

src/main/java/ca/q0r/madvanced/configs/ConfigUtil.java

@@ -1,7 +1,7 @@
 package ca.q0r.madvanced.events;
 
 import ca.q0r.madvanced.MAdvanced;
-import ca.q0r.madvanced.types.LocaleType;
+import ca.q0r.madvanced.yml.locale.LocaleType;
 import ca.q0r.mchat.api.Parser;
 import ca.q0r.mchat.util.MessageUtil;
 import org.bukkit.ChatColor;

src/main/java/ca/q0r/madvanced/configs/LocaleUtil.java

@@ -1,6 +1,8 @@
 package ca.q0r.madvanced.events;
 
-import ca.q0r.madvanced.configs.ConfigUtil;
+import ca.q0r.madvanced.yml.YmlManager;
+import ca.q0r.madvanced.yml.YmlType;
+import ca.q0r.madvanced.yml.config.ConfigYml;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -17,7 +19,7 @@ public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
         String msg = event.getMessage();
         String command = msg.split(" ")[0].replace("/", "");
 
-        for (Map.Entry<String, List<String>> entry : ConfigUtil.getAliasMap().entrySet()) {
+        for (Map.Entry<String, List<String>> entry : ((ConfigYml) YmlManager.getYml(YmlType.CONFIG_YML)).getAliasMap().entrySet()) {
             for (String comm : entry.getValue()) {
                 if (comm.equalsIgnoreCase(command)) {
                     event.setMessage(msg.replaceFirst("/" + command, "/" + entry.getKey()));