diff options
| -rw-r--r-- | src/main/java/com/redstoner/modules/abot/Abot.java | 57 |
1 files changed, 35 insertions, 22 deletions
diff --git a/src/main/java/com/redstoner/modules/abot/Abot.java b/src/main/java/com/redstoner/modules/abot/Abot.java index 1fb3610..d773309 100644 --- a/src/main/java/com/redstoner/modules/abot/Abot.java +++ b/src/main/java/com/redstoner/modules/abot/Abot.java @@ -84,16 +84,14 @@ public class Abot implements Module, Listener { String name = (String) entry.get("name"); String message = (String) entry.get("message"); + String permission = (String) entry.get("hide-perm"); String hover = "&6Name: &e" + name + "\n&6Message:&f " + (message.isEmpty()? "&cNone" : message) - + "\n&6Regexes: " + (regexes.isEmpty()? "&cNone" : "\n"); + + "\n&6Permission: &b" + (permission == null || permission.isEmpty()? "&cNone" : permission) + + "\n&6Regexes: " + (regexes.isEmpty()? "&cNone" : ""); - if (regexes.isEmpty()) { - msg.appendTextHover("&e" + name, hover); - continue; - } - - for (Object regex : regexes) - hover += "&6 - &e" + (String) regex; + if (!regexes.isEmpty()) + for (Object regex : regexes) + hover += "\n&f - &e" + (String) regex; if (i > 0) msg.appendText("&7, "); @@ -113,14 +111,14 @@ public class Abot implements Module, Listener { msg.appendText("\n&6Name: &e" + (String) entry.get("name")); String message = (String) entry.get("message"); + String permission = (String) entry.get("hide-perm"); msg.appendText("\n&f - &6Message:&f " + (message.isEmpty()? "&cNone" : message) + + "\n&f - &6Permission: &b" + (permission == null || permission.isEmpty()? "&cNone" : permission) + "\n&f - &6Regexes: " + (regexes.isEmpty()? "&cNone" : "\n")); - if (regexes.isEmpty()) - continue; - - for (Object regex : regexes) - msg.appendText("&f - &e" + (String) regex); + if (!regexes.isEmpty()) + for (Object regex : regexes) + msg.appendText("&f - &e" + (String) regex); } msg.send(); } @@ -138,16 +136,18 @@ public class Abot implements Module, Listener { JSONArray regexes = (JSONArray) entry.get("regex"); - msg.appendText("\n&a" + (String) entry.get("name")); + msg.appendText("&6Name: &e" + (String) entry.get("name")); String message = (String) entry.get("message"); - msg.appendText("\n &6Message:&f " + (message.isEmpty()? "&cNone" : message) - + "\n &6Regexes: " + (regexes.isEmpty()? "&cNone" : "\n")); + String permission = (String) entry.get("hide-perm"); + msg.appendText("\n&f - &6Message:&f " + (message.isEmpty()? "&cNone" : message) + + "\n&f - &6Permission: &b" + (permission == null || permission.isEmpty()? "&cNone" : permission) + + "\n&f - &6Regexes: " + (regexes.isEmpty()? "&cNone" : "\n")); - if (!regexes.isEmpty()) + if (!regexes.isEmpty()) for (Object regex : regexes) - msg.appendText("&6 - &e" + (String) regex); - + msg.appendText("&f - &e" + (String) regex); + msg.send(); } @Command(hook = "abot_add") @@ -298,7 +298,7 @@ public class Abot implements Module, Listener { public JSONObject getAnswer(String name) { for (Object rawEntry : answers) { JSONObject entry = (JSONObject) rawEntry; - if (((String)entry.get("name")).equals(name)) + if (((String)entry.get("name")).equalsIgnoreCase(name)) return entry; } return null; @@ -307,7 +307,8 @@ public class Abot implements Module, Listener { public boolean exists(String name) { for (Object rawEntry : answers) { JSONObject entry = (JSONObject) rawEntry; - if (((String)entry.get("name")).equals(name)) + Object ename = entry.get("name"); + if (ename != null && ((String) ename).equalsIgnoreCase(name)) return true; } return false; @@ -331,8 +332,20 @@ public class Abot implements Module, Listener { answers = (JSONArray) json.get("data"); } - catch (ClassCastException e) { + catch (ClassCastException e) { //catches if abot.json is using the old format. answers = JsonManager.getArray(answerFile); + + // Names unnamed answers + for (Object rawEntry : answers) { + JSONObject entry = (JSONObject) rawEntry; + if (entry.get("name") == null) { + String name = "Unknown"; + for (int i = 0; exists(name) ; i++) + name = "Unknown" + i; + entry.put("name", name); + } + } + getLogger().message(sender, "Converting abot.json from version 1 to 2."); saveAnswers(); } |