Redstoner/Modules
Archived
0
Fork 0
Code Activity

Fixed bugs

Browse Source
This commit is contained in:
minenash
2019-06-03 13:26:14 -04:00
parent e2fc7126a5
commit 6644184abe
1 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/main/java/com/redstoner/modules/abot/Abot.java
View File

@@ -84,16 +84,14 @@ public class Abot implements Module, Listener {
String name = (String) entry.get("name"); String name = (String) entry.get("name");
String message = (String) entry.get("message"); 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) 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()) { if (!regexes.isEmpty())
msg.appendTextHover("&e" + name, hover); for (Object regex : regexes)
continue; hover += "\n&f - &e" + (String) regex;
}
for (Object regex : regexes)
hover += "&6 - &e" + (String) regex;
if (i > 0) if (i > 0)
msg.appendText("&7, "); msg.appendText("&7, ");
@@ -113,14 +111,14 @@ public class Abot implements Module, Listener {
msg.appendText("\n&6Name: &e" + (String) entry.get("name")); msg.appendText("\n&6Name: &e" + (String) entry.get("name"));
String message = (String) entry.get("message"); String message = (String) entry.get("message");
String permission = (String) entry.get("hide-perm");
msg.appendText("\n&f - &6Message:&f " + (message.isEmpty()? "&cNone" : message) 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")); + "\n&f - &6Regexes: " + (regexes.isEmpty()? "&cNone" : "\n"));
if (regexes.isEmpty()) if (!regexes.isEmpty())
continue; for (Object regex : regexes)
msg.appendText("&f - &e" + (String) regex);
for (Object regex : regexes)
msg.appendText("&f - &e" + (String) regex);
} }
msg.send(); msg.send();
} }
@@ -138,16 +136,18 @@ public class Abot implements Module, Listener {
JSONArray regexes = (JSONArray) entry.get("regex"); 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"); String message = (String) entry.get("message");
msg.appendText("\n &6Message:&f " + (message.isEmpty()? "&cNone" : message) String permission = (String) entry.get("hide-perm");
+ "\n &6Regexes: " + (regexes.isEmpty()? "&cNone" : "\n")); 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) for (Object regex : regexes)
msg.appendText("&6 - &e" + (String) regex); msg.appendText("&f - &e" + (String) regex);
msg.send();
} }
@Command(hook = "abot_add") @Command(hook = "abot_add")
@@ -298,7 +298,7 @@ public class Abot implements Module, Listener {
public JSONObject getAnswer(String name) { public JSONObject getAnswer(String name) {
for (Object rawEntry : answers) { for (Object rawEntry : answers) {
JSONObject entry = (JSONObject) rawEntry; JSONObject entry = (JSONObject) rawEntry;
if (((String)entry.get("name")).equals(name)) if (((String)entry.get("name")).equalsIgnoreCase(name))
return entry; return entry;
} }
return null; return null;
@@ -307,7 +307,8 @@ public class Abot implements Module, Listener {
public boolean exists(String name) { public boolean exists(String name) {
for (Object rawEntry : answers) { for (Object rawEntry : answers) {
JSONObject entry = (JSONObject) rawEntry; 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 true;
} }
return false; return false;
@@ -331,8 +332,20 @@ public class Abot implements Module, Listener {
answers = (JSONArray) json.get("data"); answers = (JSONArray) json.get("data");
} }
catch (ClassCastException e) { catch (ClassCastException e) { //catches if abot.json is using the old format.
answers = JsonManager.getArray(answerFile); 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."); getLogger().message(sender, "Converting abot.json from version 1 to 2.");
saveAnswers(); saveAnswers();
} }