[Refactor] Update to reflect MChat's changes from getName() to getUni…

…queId().
Q0rDev · Apr 21, 2014 · f79a091 · f79a091
1 parent 41936e8
commit f79a091
Show file tree

Hide file tree

Showing 12 changed files with 111 additions and 95 deletions.
diff --git a/pom.xml b/pom.xml
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>ca.q0r</groupId>
             <artifactId>MChat</artifactId>
-            <version>1.7.2-R1.0.0-SNAPSHOT</version>
+            <version>1.7.2-R0.0.2-SNAPSHOT</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>

diff --git a/src/main/java/ca/q0r/msocial/MSocial.java b/src/main/java/ca/q0r/msocial/MSocial.java
@@ -16,20 +16,21 @@
 import org.bukkit.scheduler.BukkitRunnable;
 
 import java.util.HashMap;
+import java.util.UUID;
 
 public class MSocial extends JavaPlugin {
     // Default Plugin Data
     public PluginManager pm;
     public PluginDescriptionFile pdfFile;
 
     // Maps
-    public static HashMap<String, Boolean> isShouting = new HashMap<>();
-    public HashMap<String, Boolean> isMuted = new HashMap<>();
-    public HashMap<String, Boolean> isConv = new HashMap<>();
+    public static HashMap<UUID, Boolean> isShouting = new HashMap<>();
+    public HashMap<UUID, Boolean> isMuted = new HashMap<>();
+    public HashMap<UUID, Boolean> isConv = new HashMap<>();
 
-    public HashMap<String, String> lastPMd = new HashMap<>();
-    public HashMap<String, String> getInvite = new HashMap<>();
-    public HashMap<String, String> chatPartner = new HashMap<>();
+    public HashMap<UUID, UUID> lastPMd = new HashMap<>();
+    public HashMap<UUID, UUID> getInvite = new HashMap<>();
+    public HashMap<UUID, UUID> chatPartner = new HashMap<>();
 
     public void onEnable() {
         // Initialize Plugin Data

diff --git a/src/main/java/ca/q0r/msocial/commands/AcceptCommand.java b/src/main/java/ca/q0r/msocial/commands/AcceptCommand.java
@@ -10,6 +10,8 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import java.util.UUID;
+
 public class AcceptCommand implements CommandExecutor {
     private MSocial plugin;
 
@@ -28,30 +30,30 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
         }
 
         Player player = (Player) sender;
-        String pName = player.getName();
+        UUID pUUID = player.getUniqueId();
         String pWorld = player.getWorld().getName();
 
-        String rName = plugin.getInvite.get(pName);
+        UUID rUUID = plugin.getInvite.get(pUUID);
 
-        if (rName == null) {
+        if (rUUID == null) {
             MessageUtil.sendMessage(player, LocaleType.MESSAGE_CONVERSATION_NO_PENDING.getVal());
             return true;
         }
 
-        Player recipient = plugin.getServer().getPlayer(rName);
+        Player recipient = plugin.getServer().getPlayer(rUUID);
         String rWorld = recipient.getWorld().getName();
 
-        if (CommandUtil.isOnlineForCommand(sender, rName)) {
-            plugin.getInvite.remove(pName);
+        if (CommandUtil.isOnlineForCommand(sender, rUUID)) {
+            plugin.getInvite.remove(pUUID);
 
-            plugin.isConv.put(pName, true);
-            plugin.isConv.put(rName, true);
+            plugin.isConv.put(pUUID, true);
+            plugin.isConv.put(rUUID, true);
 
-            plugin.chatPartner.put(rName, pName);
-            plugin.chatPartner.put(pName, rName);
+            plugin.chatPartner.put(rUUID, pUUID);
+            plugin.chatPartner.put(pUUID, rUUID);
 
-            MessageUtil.sendMessage(player, LocaleType.MESSAGE_CONVERSATION_STARTED.getVal().replace("%player", Parser.parsePlayerName(rName, rWorld)));
-            MessageUtil.sendMessage(recipient, LocaleType.MESSAGE_CONVERSATION_ACCEPTED.getVal().replace("%player", Parser.parsePlayerName(pName, pWorld)));
+            MessageUtil.sendMessage(player, LocaleType.MESSAGE_CONVERSATION_STARTED.getVal().replace("%player", Parser.parsePlayerName(rUUID, rWorld)));
+            MessageUtil.sendMessage(recipient, LocaleType.MESSAGE_CONVERSATION_ACCEPTED.getVal().replace("%player", Parser.parsePlayerName(pUUID, pWorld)));
         }
 
         return true;

diff --git a/src/main/java/ca/q0r/msocial/commands/DenyCommand.java b/src/main/java/ca/q0r/msocial/commands/DenyCommand.java
@@ -12,6 +12,8 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import java.util.UUID;
+
 public class DenyCommand implements CommandExecutor {
     private MSocial plugin;
 
@@ -31,27 +33,27 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
         }
 
         Player player = (Player) sender;
-        String pName = player.getName();
+        UUID pUUID = player.getUniqueId();
         String pWorld = player.getWorld().getName();
 
-        String rName = plugin.getInvite.get(pName);
+        UUID rUUID = plugin.getInvite.get(pUUID);
 
-        if (rName == null) {
+        if (rUUID == null) {
             MessageUtil.sendMessage(player, LocaleType.MESSAGE_CONVERSATION_NO_PENDING.getVal());
             return true;
         }
 
-        Player recipient = plugin.getServer().getPlayer(rName);
+        Player recipient = plugin.getServer().getPlayer(rUUID);
         String rWorld = recipient.getWorld().getName();
 
         if (CommandUtil.isOnlineForCommand(sender, recipient)) {
-            plugin.getInvite.remove(pName);
+            plugin.getInvite.remove(pUUID);
 
-            plugin.isConv.put(pName, false);
-            plugin.isConv.put(rName, false);
+            plugin.isConv.put(pUUID, false);
+            plugin.isConv.put(rUUID, false);
 
-            MessageUtil.sendMessage(player, API.replace(LocaleType.MESSAGE_CONVERSATION_DENIED.getVal(), "player", Parser.parsePlayerName(rName, rWorld), IndicatorType.LOCALE_VAR));
-            MessageUtil.sendMessage(recipient, API.replace(LocaleType.MESSAGE_CONVERSATION_NOT_STARTED.getVal(), "player", Parser.parsePlayerName(pName, pWorld), IndicatorType.LOCALE_VAR));
+            MessageUtil.sendMessage(player, API.replace(LocaleType.MESSAGE_CONVERSATION_DENIED.getVal(), "player", Parser.parsePlayerName(rUUID, rWorld), IndicatorType.LOCALE_VAR));
+            MessageUtil.sendMessage(recipient, API.replace(LocaleType.MESSAGE_CONVERSATION_NOT_STARTED.getVal(), "player", Parser.parsePlayerName(pUUID, pWorld), IndicatorType.LOCALE_VAR));
         }
 
         return true;

diff --git a/src/main/java/ca/q0r/msocial/commands/InviteCommand.java b/src/main/java/ca/q0r/msocial/commands/InviteCommand.java
@@ -12,6 +12,8 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import java.util.UUID;
+
 public class InviteCommand implements CommandExecutor {
     private MSocial plugin;
 
@@ -32,28 +34,28 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
         }
 
         Player player = (Player) sender;
-        String pName = player.getName();
+        UUID pUUid = player.getUniqueId();
         String pWorld = player.getWorld().getName();
 
         if (args.length < 1) {
             return false;
         }
 
-        Player recipient = plugin.getServer().getPlayer(args[0]);
-        String rName = recipient.getName();
+        Player recipient = API.getPlayer(args[0]);
+        UUID rUUID = recipient.getUniqueId();
         String rWorld = recipient.getWorld().getName();
 
         if (!CommandUtil.isOnlineForCommand(sender, recipient)) {
             return true;
         }
 
-        if (plugin.getInvite.get(rName) == null) {
-            plugin.getInvite.put(rName, pName);
+        if (plugin.getInvite.get(rUUID) == null) {
+            plugin.getInvite.put(rUUID, pUUid);
 
-            MessageUtil.sendMessage(player, API.replace(LocaleType.MESSAGE_CONVERSATION_INVITE_SENT.getVal(), "player", Parser.parsePlayerName(rName, rWorld), IndicatorType.LOCALE_VAR));
-            MessageUtil.sendMessage(recipient, API.replace(LocaleType.MESSAGE_CONVERSATION_INVITED.getVal(), "player", Parser.parsePlayerName(pName, pWorld), IndicatorType.LOCALE_VAR));
+            MessageUtil.sendMessage(player, API.replace(LocaleType.MESSAGE_CONVERSATION_INVITE_SENT.getVal(), "player", Parser.parsePlayerName(rUUID, rWorld), IndicatorType.LOCALE_VAR));
+            MessageUtil.sendMessage(recipient, API.replace(LocaleType.MESSAGE_CONVERSATION_INVITED.getVal(), "player", Parser.parsePlayerName(pUUid, pWorld), IndicatorType.LOCALE_VAR));
         } else {
-            MessageUtil.sendMessage(player, API.replace(LocaleType.MESSAGE_CONVERSATION_HAS_REQUEST.getVal(), "player", Parser.parsePlayerName(rName, rWorld), IndicatorType.LOCALE_VAR));
+            MessageUtil.sendMessage(player, API.replace(LocaleType.MESSAGE_CONVERSATION_HAS_REQUEST.getVal(), "player", Parser.parsePlayerName(rUUID, rWorld), IndicatorType.LOCALE_VAR));
         }
 
         return true;

diff --git a/src/main/java/ca/q0r/msocial/commands/LeaveCommand.java b/src/main/java/ca/q0r/msocial/commands/LeaveCommand.java
@@ -1,6 +1,7 @@
 package ca.q0r.msocial.commands;
 
 import ca.q0r.mchat.api.API;
+import ca.q0r.mchat.api.Parser;
 import ca.q0r.mchat.types.IndicatorType;
 import ca.q0r.mchat.util.MessageUtil;
 import ca.q0r.msocial.MSocial;
@@ -10,6 +11,8 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import java.util.UUID;
+
 public class LeaveCommand implements CommandExecutor {
     private MSocial plugin;
 
@@ -29,33 +32,34 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
         }
 
         Player player = (Player) sender;
-        String pName = player.getName();
+        UUID pUUID = player.getUniqueId();
+        String pWorld = player.getWorld().getName();
 
-        String rName = plugin.chatPartner.get(pName);
+        UUID rUUID = plugin.chatPartner.get(pUUID);
 
-        Boolean isConv = plugin.isConv.get(pName);
+        Boolean isConv = plugin.isConv.get(pUUID);
 
-        if (rName == null || isConv == null) {
-            plugin.isConv.put(pName, false);
-            plugin.chatPartner.remove(pName);
+        if (rUUID == null || isConv == null) {
+            plugin.isConv.put(pUUID, false);
+            plugin.chatPartner.remove(pUUID);
 
             return true;
         }
 
         if (isConv) {
-            MessageUtil.sendMessage(player, API.replace(LocaleType.MESSAGE_CONVERSATION_LEFT.getVal(), "player", rName, IndicatorType.LOCALE_VAR));
-
-            Player recipient = plugin.getServer().getPlayer(rName);
+            Player recipient = plugin.getServer().getPlayer(rUUID);
+            String rWorld = recipient.getWorld().getName();
 
             if (recipient != null) {
-                MessageUtil.sendMessage(recipient, API.replace(LocaleType.MESSAGE_CONVERSATION_ENDED.getVal(), "player", pName, IndicatorType.LOCALE_VAR));
+                MessageUtil.sendMessage(player, API.replace(LocaleType.MESSAGE_CONVERSATION_LEFT.getVal(), "player", Parser.parsePlayerName(rUUID, rWorld), IndicatorType.LOCALE_VAR));
+                MessageUtil.sendMessage(recipient, API.replace(LocaleType.MESSAGE_CONVERSATION_ENDED.getVal(), "player", Parser.parsePlayerName(pUUID, pWorld), IndicatorType.LOCALE_VAR));
             }
 
-            plugin.isConv.put(pName, false);
-            plugin.isConv.put(rName, false);
+            plugin.isConv.put(pUUID, false);
+            plugin.isConv.put(rUUID, false);
 
-            plugin.chatPartner.remove(rName);
-            plugin.chatPartner.remove(pName);
+            plugin.chatPartner.remove(rUUID);
+            plugin.chatPartner.remove(pUUID);
         } else {
             MessageUtil.sendMessage(player, LocaleType.MESSAGE_CONVERSATION_NOT_IN.getVal());
         }

diff --git a/src/main/java/ca/q0r/msocial/commands/MuteCommand.java b/src/main/java/ca/q0r/msocial/commands/MuteCommand.java
@@ -1,6 +1,7 @@
 package ca.q0r.msocial.commands;
 
 import ca.q0r.mchat.api.API;
+import ca.q0r.mchat.api.Parser;
 import ca.q0r.mchat.types.IndicatorType;
 import ca.q0r.mchat.util.CommandUtil;
 import ca.q0r.mchat.util.MessageUtil;
@@ -12,6 +13,7 @@
 import org.bukkit.entity.Player;
 
 import java.util.TreeMap;
+import java.util.UUID;
 
 public class MuteCommand implements CommandExecutor {
     MSocial plugin;
@@ -30,26 +32,28 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
             return false;
         }
 
-        String target = args[0];
-        Player player = plugin.getServer().getPlayer(args[0]);
 
-        if (player != null) {
-            target = player.getName();
+        Player player = API.getPlayer(args[0]);
+
+        if (!CommandUtil.isOnlineForCommand(sender, player)) {
+            return true;
         }
 
+        UUID uuid = player.getUniqueId();
+
         TreeMap<String, String> rMap = new TreeMap<>();
 
-        rMap.put("player", target);
+        rMap.put("player", Parser.parsePlayerName(uuid, player.getWorld().getName()));
 
-        if (plugin.isMuted.get(target) != null && plugin.isMuted.get(target)) {
-            plugin.isMuted.put(target, false);
+        if (plugin.isMuted.get(uuid) != null && plugin.isMuted.get(uuid)) {
+            plugin.isMuted.put(uuid, false);
 
             rMap.put("muted", "unmuted");
             rMap.put("mute", "mute");
 
             MessageUtil.sendMessage(sender, API.replace(LocaleType.MESSAGE_MUTE_MISC.getVal(), rMap, IndicatorType.LOCALE_VAR));
         } else {
-            plugin.isMuted.put(target, true);
+            plugin.isMuted.put(uuid, true);
 
             rMap.put("muted", "muted");
             rMap.put("mute", "unmute");

diff --git a/src/main/java/ca/q0r/msocial/commands/PMCommand.java b/src/main/java/ca/q0r/msocial/commands/PMCommand.java
@@ -13,6 +13,7 @@
 import org.bukkit.entity.Player;
 
 import java.util.TreeMap;
+import java.util.UUID;
 
 public class PMCommand implements CommandExecutor {
     MSocial plugin;
@@ -36,7 +37,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
         }
 
         Player player = (Player) sender;
-        String pName = player.getName();
+        UUID pUUID = player.getUniqueId();
         String world = player.getWorld().getName();
 
         if (args.length < 2) {
@@ -49,23 +50,24 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
             message += " " + args[i];
         }
 
-        if (!CommandUtil.isOnlineForCommand(sender, args[0])) {
+        Player recipient = API.getPlayer(args[0]);
+
+        if (!CommandUtil.isOnlineForCommand(sender, recipient)) {
             return true;
         }
 
-        Player recipient = plugin.getServer().getPlayer(args[0]);
-        String rName = recipient.getName();
-        String senderName = Parser.parsePlayerName(pName, world);
+        UUID rUUID = recipient.getUniqueId();
+        String senderName = Parser.parsePlayerName(pUUID, world);
 
         TreeMap<String, String> rMap = new TreeMap<>();
 
-        rMap.put("recipient", Parser.parsePlayerName(rName, recipient.getWorld().getName()));
+        rMap.put("recipient", Parser.parsePlayerName(rUUID, recipient.getWorld().getName()));
         rMap.put("sender", senderName);
         rMap.put("msg", message);
 
         player.sendMessage(API.replace(LocaleType.FORMAT_PM_SENT.getVal(), rMap, IndicatorType.LOCALE_VAR));
 
-        plugin.lastPMd.put(rName, pName);
+        plugin.lastPMd.put(rUUID, pUUID);
 
         recipient.sendMessage(API.replace(LocaleType.FORMAT_PM_RECEIVED.getVal(), rMap, IndicatorType.LOCALE_VAR));
         MessageUtil.log(API.replace(LocaleType.FORMAT_PM_RECEIVED.getVal(), rMap, IndicatorType.LOCALE_VAR));