[Refactor] Move Shouting code to MSocial.

Q0rDev · Sep 25, 2013 · 693422d · 693422d
1 parent bca9ddb
commit 693422d
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 87 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <!-- Project information -->
     <groupId>ca.q0r</groupId>
     <artifactId>MChat</artifactId>
-    <version>1.6.4-R0.2</version>
+    <version>1.6.4-R0.3</version>
     <name>MChat</name>
     <url>http://mdev.in/</url>
     <description>Chat Formatting for Bukkit</description>

diff --git a/src/main/java/ca/q0r/mchat/api/API.java b/src/main/java/ca/q0r/mchat/api/API.java
@@ -55,12 +55,8 @@ public class API {
     private static TreeMap<String, Object> varMapQueue;
 
     // Maps
-    private static HashMap<String, Boolean> shouting;
     private static HashMap<String, Boolean> spying;
 
-    // Shout Format Type
-    private static String shoutFormat;
-
     /**
      * Class Initializer
      */
@@ -70,9 +66,7 @@ public static void initialize() {
         varMap = new TreeMap<String, Object>();
         varMapQueue = new TreeMap<String, Object>();
 
-        shouting = new HashMap<String, Boolean>();
         spying = new HashMap<String, Boolean>();
-        shoutFormat = "";
     }
 
     /**
@@ -288,29 +282,6 @@ public static HashMap<String, Boolean> isSpying() {
         return spying;
     }
 
-    /**
-     * Shouting HashMap.
-     * @return Map of Player's Shouting status.
-     */
-    public static HashMap<String, Boolean> isShouting() {
-        return shouting;
-    }
-
-    /**
-     * Shout Format.
-     * @return Shout Format.
-     */
-    public static String getShoutFormat() {
-        return shoutFormat;
-    }
-
-    /**
-     * Sets Shout Format.
-     */
-    public static void setShoutFormat(String format) {
-        shoutFormat = format;
-    }
-
     private static void setupPlugins() {
         PluginManager pm = Bukkit.getServer().getPluginManager();
         Plugin pluginTest;

diff --git a/src/main/java/ca/q0r/mchat/variables/VariableManager.java b/src/main/java/ca/q0r/mchat/variables/VariableManager.java
@@ -33,9 +33,6 @@ public class VariableManager {
     // Towny
     private static Boolean townyB;
 
-    // MSocial
-    private static Boolean mSocialB;
-
     public static void initialize() {
         varSet = new HashSet<Var>();
 
@@ -49,9 +46,6 @@ public static void initialize() {
         // Initialize Player Vars
         PlayerVars.addVars();
 
-        // Initialize MSocial Vars
-        MSocialVars.addVars(mSocialB);
-
         // Initialize Heroes Vars
         if (heroesB) {
             HeroesVars.addVars(heroes.getCharacterManager());
@@ -238,9 +232,6 @@ private static void setupPlugins() {
             heroes = (Heroes) pm.getPlugin("Heroes");
         }
 
-        // Setup MSocial
-        mSocialB = setupPlugin("MSocial");
-
         townyB = setupPlugin("Towny");
     }
 

diff --git a/src/main/java/ca/q0r/mchat/variables/vars/MSocialVars.java b/src/main/java/ca/q0r/mchat/variables/vars/MSocialVars.java
diff --git a/src/main/java/ca/q0r/mchat/variables/vars/PlayerVars.java b/src/main/java/ca/q0r/mchat/variables/vars/PlayerVars.java
@@ -2,6 +2,7 @@
 
 import ca.q0r.mchat.api.API;
 import ca.q0r.mchat.api.Reader;
+import ca.q0r.mchat.configs.config.ConfigType;
 import ca.q0r.mchat.configs.locale.LocaleType;
 import ca.q0r.mchat.types.IndicatorType;
 import ca.q0r.mchat.types.InfoType;
@@ -15,10 +16,10 @@
 
 public class PlayerVars {
     public static void addVars() {
-        VariableManager.addVars(new Var[] { new GroupVar(), new PrefixVar(), new SuffixVar(), new MNameVar(),
-                new PNameVar(), new DNameVar(), new ExpVar(), new ExpBarVar(), new GameModeVar(), new HealthVar(),
-                new HealthBarVar(), new HungerVar(), new HungerBarVar(), new LevelVar(), new LocVar(), new TotalExpVar(),
-                new WorldVar(), new WorldNameVar(), new GroupNameVar(), new MNameFormat(), new TimeFormat(), new SpyFormat()});
+        VariableManager.addVars(new Var[] { new GroupVar(), new PrefixVar(), new SuffixVar(), new MNameVar(), new PNameVar(),
+                new DNameVar(), new ExpVar(), new ExpBarVar(), new GameModeVar(), new HealthVar(), new HealthBarVar(),
+                new HungerVar(), new HungerBarVar(), new LevelVar(), new LocVar(), new TotalExpVar(), new WorldVar(),
+                new WorldNameVar(), new GroupNameVar(), new MNameFormat(), new TimeFormat(), new SpyFormat(), new DistanceType()});
     }
 
     private static class GroupVar extends Var {
@@ -284,4 +285,17 @@ public Object getValue(Object obj) {
             return sType;
         }
     }
+
+    private static class DistanceType extends Var {
+        @Keys( keys = {"distancetype","dtype"} )
+        public Object getValue(Object obj) {
+            String dType = "";
+
+            if (ConfigType.MCHAT_CHAT_DISTANCE.getDouble() > 0) {
+                dType = LocaleType.FORMAT_LOCAL.getVal();
+            }
+
+            return dType;
+        }
+    }
 }