Redstoner/Modules
Archived
0
Fork 0
Code Activity

Fixed saylol bugs + cleaned up code & messages

Browse Source
This commit is contained in:
David Panić
2019-04-17 23:39:05 +02:00
parent f626609115
commit ab137092ca
1 changed files with 247 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

409
src/main/java/com/redstoner/modules/saylol/Saylol.java
View File

@@ -1,13 +1,19 @@
package com.redstoner.modules.saylol; package com.redstoner.modules.saylol;
import java.io.File; import com.nemez.cmdmgr.Command;
import java.util.ArrayList; import com.redstoner.annotations.AutoRegisterListener;
import java.util.Arrays; import com.redstoner.annotations.Commands;
import java.util.HashMap; import com.redstoner.annotations.Version;
import java.util.List; import com.redstoner.coremods.moduleLoader.ModuleLoader;
import java.util.Map; import com.redstoner.misc.CommandHolderType;
import java.util.Random; import com.redstoner.misc.JsonManager;
import com.redstoner.misc.Main;
import com.redstoner.misc.Utils;
import com.redstoner.modules.Module;
import com.redstoner.modules.ignore.Ignore;
import net.nemez.chatapi.ChatAPI;
import net.nemez.chatapi.click.ClickCallback;
import net.nemez.chatapi.click.Message;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@@ -15,251 +21,188 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;
import org.json.simple.JSONArray; import org.json.simple.JSONArray;
import com.nemez.cmdmgr.Command; import java.io.File;
import com.redstoner.annotations.AutoRegisterListener; import java.util.*;
import com.redstoner.annotations.Commands;
import com.redstoner.annotations.Version;
import com.redstoner.coremods.moduleLoader.ModuleLoader;
import com.redstoner.misc.BroadcastFilter;
import com.redstoner.misc.CommandHolderType;
import com.redstoner.misc.JsonManager;
import com.redstoner.misc.Main;
import com.redstoner.misc.Utils;
import com.redstoner.modules.Module;
import com.redstoner.modules.ignore.Ignore;
import net.nemez.chatapi.ChatAPI;
import net.nemez.chatapi.click.ClickCallback;
import net.nemez.chatapi.click.Message;
@AutoRegisterListener @AutoRegisterListener
@Commands (CommandHolderType.File) @Commands (CommandHolderType.File)
@Version(major = 5, minor = 1, revision = 0, compatible = 4) @Version (major = 5, minor = 2, revision = 0, compatible = 4)
public class Saylol implements Module public class Saylol implements Module {
{
private long lastLol = 0;
private File lolLocation = new File(Main.plugin.getDataFolder(), "lol.json"); private File lolLocation = new File(Main.plugin.getDataFolder(), "lol.json");
private JSONArray lols, handlers; private JSONArray lols, handlers;
private final String LOL_PREFIX = "§8[§blol§8] ";
private Map<CommandSender, List<Integer>> searchCache = new HashMap<>(); private Map<CommandSender, List<Integer>> searchCache = new HashMap<>();
private final String LOL_PREFIX = "§8[§blol§8] ";
private final int PAGE_SIZE = 10; private final int PAGE_SIZE = 10;
private long lastLol = 0;
@SuppressWarnings ("unchecked") @SuppressWarnings ("unchecked")
@Override @Override
public boolean onEnable() public boolean onEnable() {
{
lols = JsonManager.getArray(lolLocation); lols = JsonManager.getArray(lolLocation);
if (lols == null) if (lols == null) lols = new JSONArray();
lols = new JSONArray();
handlers = new JSONArray(); handlers = new JSONArray();
for (int i = 0; i < lols.size(); i++) for (int i = 0; i < lols.size(); i++) {
handlers.add(new ClickCallback(true, true, "") handlers.add(new ClickCallback(true, true, "") {
{
@Override @Override
public void run(CommandSender sender) public void run(CommandSender sender) {
{
if (handlers.contains(this)) if (handlers.contains(this))
clickAction((Player) sender, handlers.indexOf(this)); clickAction((Player) sender, handlers.indexOf(this));
else else
getLogger().message(sender, true, "That lol no longer exists!"); getLogger().message(sender, true, "That lol no longer exists!");
} }
}); });
}
return true; return true;
} }
@Override @Override
public void onDisable() public void onDisable() {
{
saveLolsSync(); saveLolsSync();
} }
@SuppressWarnings ("unchecked") @SuppressWarnings ("unchecked")
@Command (hook = "addlol") @Command (hook = "addlol")
public boolean addLol(CommandSender sender, String text) public boolean addLol(CommandSender sender, String text) {
{ if (lols.contains(text)) {
if (lols.contains(text))
getLogger().message(sender, true, "This lol already exists!"); getLogger().message(sender, true, "This lol already exists!");
else } else {
{
getLogger().message(sender, "Successfully added a new lol!");
lols.add("&e" + text); lols.add("&e" + text);
handlers.add(new ClickCallback(true, true, "")
{ handlers.add(new ClickCallback(true, true, "") {
@Override @Override
public void run(CommandSender sender) public void run(CommandSender sender) {
{
if (handlers.contains(this)) if (handlers.contains(this))
clickAction((Player) sender, handlers.indexOf(this)); clickAction((Player) sender, handlers.indexOf(this));
else else
getLogger().message(sender, true, "That lol no longer exists!"); getLogger().message(sender, true, "That lol no longer exists!");
} }
}); });
saveLols(); saveLols();
searchCache.clear(); searchCache.clear();
getLogger().message(sender, "Successfully added a new lol!");
} }
return true; return true;
} }
@Command (hook = "dellol") @Command (hook = "dellol")
public boolean delLol(CommandSender sender, int id) public boolean delLol(CommandSender sender, int id) {
{ if (warnNoLols(sender)) return true;
if (lols.size() == 0) if (warnLolOutOfBounds(sender, id)) return true;
{
getLogger().message(sender, true, "There are no lols yet!");
return true;
}
if (id < 0 || id >= lols.size())
{
getLogger().message(sender, true, "The ID must be at least 0 and at most " + (lols.size() - 1));
return true;
}
getLogger().message(sender, "Successfully deleted the lol: " + lols.remove(id));
handlers.remove(id); handlers.remove(id);
saveLols(); saveLols();
searchCache.clear(); searchCache.clear();
getLogger().message(sender, "Successfully deleted the lol: " + lols.remove(id));
return true; return true;
} }
@SuppressWarnings ("unchecked") @SuppressWarnings ("unchecked")
@Command (hook = "setlol") @Command (hook = "setlol")
public boolean setLol(CommandSender sender, int id, String text) public boolean setLol(CommandSender sender, int id, String text) {
{ if (warnNoLols(sender)) return true;
if (lols.size() == 0) if (warnLolOutOfBounds(sender, id)) return true;
{
getLogger().message(sender, true, "There are no lols yet!");
return true;
}
if (id < 0 || id >= lols.size())
{
getLogger().message(sender, true, "The ID must be at least 0 and at most " + (lols.size() - 1));
return true;
}
getLogger().message(sender, "Successfully changed the lol: &e" + lols.get(id) + " &7to: &e" + text);
lols.set(id, text); lols.set(id, text);
saveLols(); saveLols();
searchCache.clear(); searchCache.clear();
getLogger().message(sender, "Successfully changed the lol: &e" + lols.get(id) + " &7to: &e" + text);
return true; return true;
} }
@Command (hook = "lolid") @Command (hook = "lolid")
public boolean lolId(CommandSender sender, int id) public boolean lolId(CommandSender sender, int id) {
{ if (warnNoLols(sender)) return true;
if (lols.size() == 0) if (warnLolOutOfBounds(sender, id)) return true;
{
getLogger().message(sender, true, "There are no lols yet!");
return true;
}
long time = System.currentTimeMillis(); long time = System.currentTimeMillis();
if (time - lastLol < 15000) if (warnTime(sender, time)) return true;
{
getLogger().message(sender, true, String name = getSenderName(sender);
"You can't use saylol for another " + (14 - (int) Math.ceil((time - lastLol) / 1000)) + "s.");
return true; Utils.broadcast(
} LOL_PREFIX,
if (id < 0 || id >= lols.size()) ChatAPI.colorify(
{ null,
getLogger().message(sender, true, "The ID must be at least 0 and at most " + (lols.size() - 1)); name + "&8: &e" + lols.get(id)
return true; ),
} recipient -> recipient.hasPermission("utils.lol.see")
String name; );
if (sender instanceof Player)
name = ((Player) sender).getDisplayName();
else
name = "&9" + sender.getName();
Utils.broadcast(LOL_PREFIX, ChatAPI.colorify(null, name + "&8: &e" + lols.get(id)), new BroadcastFilter()
{
@Override
public boolean sendTo(CommandSender recipient)
{
return recipient.hasPermission("utils.lol.see");
}
});
lastLol = time; lastLol = time;
return true; return true;
} }
@Command (hook = "saylol") @Command (hook = "saylol")
public boolean saylol(CommandSender sender) public boolean saylol(CommandSender sender) {
{ if (warnNoLols(sender)) return true;
if (lols.size() == 0)
{
getLogger().message(sender, true, "There are no lols yet!");
return true;
}
long time = System.currentTimeMillis(); long time = System.currentTimeMillis();
if (time - lastLol < 15000) if (warnTime(sender, time)) return true;
{
getLogger().message(sender, true, String name = getSenderName(sender);
"You can't use saylol for another " + (14 - (int) Math.ceil((time - lastLol) / 1000)) + "s.");
return true;
}
String name;
if (sender instanceof Player)
name = ((Player) sender).getDisplayName();
else
name = "&9" + sender.getName();
Random random = new Random(); Random random = new Random();
int id = random.nextInt(lols.size()); int id = random.nextInt(lols.size());
Utils.broadcast(LOL_PREFIX, ChatAPI.colorify(null, name + "&8: &e" + lols.get(id)),
ModuleLoader.exists("Ignore")? Ignore.getIgnoredBy(sender) : null); Utils.broadcast(
LOL_PREFIX,
ChatAPI.colorify(
null,
name + "&8: &e" + lols.get(id)
),
ModuleLoader.exists("Ignore") ? Ignore.getIgnoredBy(sender) : null
);
lastLol = time; lastLol = time;
return true; return true;
} }
@Command (hook = "listlols") @Command (hook = "listlols")
public boolean listLols(CommandSender sender, int page) public boolean listLols(CommandSender sender, int page) {
{
searchCache.put(sender, Arrays.asList(-1)); searchCache.put(sender, Arrays.asList(-1));
if (lols.size() == 0) if (warnNoLols(sender)) return true;
{
getLogger().message(sender, true, "There are no lols yet!"); List<Integer> ids = new ArrayList<>();
return true;
for (int i = 0; i < lols.size(); i++) {
ids.add(i);
} }
page = page - 1;
int start = page * PAGE_SIZE; printPaged(sender, ids, page);
int end = start + PAGE_SIZE;
int pages = getMaxPage(lols.size());
if (start < 0)
{
getLogger().message(sender, true, "Page number too small, must be at least 1!");
return true;
}
if (start > lols.size())
{
getLogger().message(sender, true, "Page number too big, must be at most " + pages + "!");
return true;
}
Message m = new Message(sender, null);
m.appendText(getLogger().getHeader().replace("\n", ""));
m.appendText(" &ePage " + (page + 1) + "/" + pages + ":");
for (int i = start; i < end && i < lols.size(); i++)
m.appendCallback("\n&a" + i + "&8: &e" + lols.get(i), getCallback(i));
m.send();
return true; return true;
} }
@Command (hook = "listlolsdef") @Command (hook = "listlolsdef")
public boolean listLolsDefault(CommandSender sender) public boolean listLolsDefault(CommandSender sender) {
{
return listLols(sender, 1); return listLols(sender, 1);
} }
@Command (hook = "searchlol") @Command (hook = "searchlol")
public boolean search(CommandSender sender, boolean sensitive, String text) public boolean search(CommandSender sender, boolean sensitive, String text) {
{
searchCache.remove(sender); searchCache.remove(sender);
List<Integer> results = new ArrayList<>(); List<Integer> results = new ArrayList<>();
if (!sensitive) if (!sensitive)
text = text.toLowerCase(); text = text.toLowerCase();
for (int i = 0; i < lols.size(); i++) for (int i = 0; i < lols.size(); i++) {
{
String lol = (String) lols.get(i); String lol = (String) lols.get(i);
if ((sensitive ? lol : lol.toLowerCase()).contains(text))
results.add(i); if ((sensitive ? lol : lol.toLowerCase()).contains(text)) results.add(i);
} }
if (results.isEmpty()) { if (results.isEmpty()) {
getLogger().message(sender, "&cCouldn't find any matching lols."); getLogger().message(sender, "&cCouldn't find any matching lols.");
return true; return true;
@@ -270,34 +213,24 @@ public class Saylol implements Module
Message m = new Message(sender, null); Message m = new Message(sender, null);
m.appendText(getLogger().getHeader().replace("\n", "")); m.appendText(getLogger().getHeader().replace("\n", ""));
int size = results.size(); appendResults(m, results);
if (size > PAGE_SIZE)
m.appendText(" &ePage 1/" + getMaxPage(size) + ":");
for (int i = 0; i < size && i < PAGE_SIZE; i++)
m.appendCallback("\n&a" + i + "&8: &e" + lols.get(results.get(i)), getCallback(i));
m.appendText("\n&7Use /lol page <number> to look at other pages.");
m.send(); m.send();
return true; return true;
} }
@Command (hook = "matchlol") @Command (hook = "matchlol")
public boolean match(CommandSender sender, boolean sensitive, String regex) public boolean match(CommandSender sender, boolean sensitive, String regex) {
{
searchCache.remove(sender); searchCache.remove(sender);
List<Integer> results = new ArrayList<>(); List<Integer> results = new ArrayList<>();
if (!sensitive) if (!sensitive) regex = regex.toLowerCase();
regex = regex.toLowerCase();
for (int i = 0; i < lols.size(); i++) for (int i = 0; i < lols.size(); i++) {
{
String lol = (String) lols.get(i); String lol = (String) lols.get(i);
if ((sensitive ? lol : lol.toLowerCase()).matches(regex)) if ((sensitive ? lol : lol.toLowerCase()).matches(regex)) results.add(i);
results.add(i);
} }
if (results.isEmpty()) { if (results.isEmpty()) {
getLogger().message(sender, "&cCouldn't find any matching lols."); getLogger().message(sender, "&cCouldn't find any matching lols.");
return true; return true;
@@ -308,16 +241,8 @@ public class Saylol implements Module
Message m = new Message(sender, null); Message m = new Message(sender, null);
m.appendText(getLogger().getHeader().replace("\n", "")); m.appendText(getLogger().getHeader().replace("\n", ""));
int size = results.size(); appendResults(m, results);
if (size > PAGE_SIZE)
m.appendText(" &ePage 1/" + getMaxPage(size) + ":");
for (int i = 0; i < size && i < PAGE_SIZE; i++)
m.appendCallback("\n&a" + i + "&8: &e" + lols.get(i), getCallback(i));
m.appendText("\n&7Use /lol page <number> to look at other pages.");
m.send(); m.send();
return true; return true;
} }
@@ -326,26 +251,18 @@ public class Saylol implements Module
List<Integer> results = searchCache.get(sender); List<Integer> results = searchCache.get(sender);
if (results == null || results.size() == 0) { if (results == null || results.size() == 0) {
getLogger().message(sender, true, "There's nothing to page through. Either you haven't" getLogger().message(sender, true, "There's nothing to page through. This command pages through the last lol command's output.");
+ " done a relivent command, or the lols have changed since you have.");
return true; return true;
} }
int pages = getMaxPage(results.size()); int pages = getMaxPage(results.size());
if (results.get(0) == -1) if (results.get(0) == -1) {
listLols(sender, page); listLols(sender, page);
else if (page < 1 || page > pages) } else {
getLogger().message(sender, true, "Page number not on range. Must be between &e1&7 and &e" + pages + "&7."); printPaged(sender, results, page);
else {
Message m = new Message(sender, null);
m.appendText(getLogger().getHeader().replace("\n", " &ePage " + page + "/" + pages + ":"));
for (int i = page*PAGE_SIZE-PAGE_SIZE; i < page*PAGE_SIZE; i++)
m.appendCallback("\n&a" + i + "&8: &e" + lols.get(i), getCallback(i));
m.send();
} }
return true; return true;
} }
@@ -354,28 +271,102 @@ public class Saylol implements Module
searchCache.remove(e.getPlayer()); searchCache.remove(e.getPlayer());
} }
public int getMaxPage(int size) { private int getMaxPage(int size) {
return (int) Math.ceil(size / (double) PAGE_SIZE); return (int) Math.ceil(size / (double) PAGE_SIZE);
} }
public void saveLols() private void saveLols() {
{
JsonManager.save(lols, lolLocation); JsonManager.save(lols, lolLocation);
} }
public void saveLolsSync() private void saveLolsSync() {
{
JsonManager.saveSync(lols, lolLocation); JsonManager.saveSync(lols, lolLocation);
} }
public ClickCallback getCallback(int index) private ClickCallback getCallback(int index) {
{
return (ClickCallback) handlers.get(index); return (ClickCallback) handlers.get(index);
} }
public void clickAction(Player player, int index) private void clickAction(Player player, int index) {
{
if (player.hasPermission("utils.lol.id")) if (player.hasPermission("utils.lol.id"))
Bukkit.getScheduler().callSyncMethod(ModuleLoader.getPlugin(), () -> Bukkit.dispatchCommand(player, "lol id " + index)); Bukkit.getScheduler().callSyncMethod(ModuleLoader.getPlugin(), () -> Bukkit.dispatchCommand(player, "lol id " + index));
} }
private String getSenderName(CommandSender sender) {
return sender instanceof Player ? ((Player) sender).getDisplayName() : "&9" + sender.getName();
}
private boolean warnNoLols(CommandSender sender) {
if (lols.size() == 0) {
getLogger().message(sender, true, "There are no lols yet!");
return true;
}
return false;
}
private boolean warnTime(CommandSender sender, long time) {
if (time - lastLol < 15000) {
int secs = (14 - (int) Math.ceil((time - lastLol) / 1000));
getLogger().message(sender, true, "You can't use saylol for another " + secs + "s.");
return true;
}
return false;
}
private boolean warnLolOutOfBounds(CommandSender sender, int id) {
if (id < 0 || id >= lols.size()) {
getLogger().message(sender, true, "The ID must be at least 0 and at most " + (lols.size() - 1));
return true;
}
return false;
}
private boolean warnPageOutOfBounds(CommandSender sender, int start, int pages) {
if (start < 0) {
getLogger().message(sender, true, "Page number too small, must be at least 1!");
return true;
}
if (start > lols.size()) {
getLogger().message(sender, true, "Page number too big, must be at most " + pages + "!");
return true;
}
return false;
}
private void appendResults(Message m, List<Integer> results) {
int size = results.size();
if (size > PAGE_SIZE) m.appendText(" &ePage 1/" + getMaxPage(size) + ":");
for (int i = 0; i < size && i < PAGE_SIZE; i++) {
int id = results.get(i);
m.appendCallback("\n&a" + id + "&8: &e" + lols.get(id), getCallback(id));
}
m.appendText("\n&7Use /lol page <number> to look at other pages.");
}
private void printPaged(CommandSender sender, List<Integer> results, int page) {
page = page - 1;
int start = page * PAGE_SIZE;
int end = start + PAGE_SIZE;
int pages = getMaxPage(results.size());
if (warnPageOutOfBounds(sender, start, pages)) return;
Message m = new Message(sender, null);
m.appendText(getLogger().getHeader().replace("\n", ""));
m.appendText(" &ePage " + (page + 1) + "/" + pages + ":");
for (int i = start; i < end && i < results.size(); i++) {
int id = results.get(i);
m.appendCallback("\n&a" + id + "&8: &e" + lols.get(id), getCallback(id));
}
m.send();
}
} }