EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 13:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Splot commands into pages = YAY

Browse Source
This commit is contained in:
Sauilitired 2014-11-02 21:49:26 +01:00
parent c5bd4c4935
commit 5c24fc092d
3 changed files with 75 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/C.java
View File

@ -328,7 +328,7 @@ public enum C {
HELP_INFO("&6You need to specify a help category"), HELP_INFO("&6You need to specify a help category"),
HELP_INFO_ITEM("&6/plots help %category% &c- &6%category_desc%"), HELP_INFO_ITEM("&6/plots help %category% &c- &6%category_desc%"),
HELP_PAGE("&c>> &6%usage% &c[&6%alias%&c] &c- &6%desc%"), HELP_PAGE("&c>> &6%usage% &c[&6%alias%&c] &c- &6%desc%"),
HELP_HEADER("&6Help for Plots"), HELP_HEADER("&c(Page &6%cur&c/&6%max&c) &6Help for Plots"),
/* /*
* Direction * Direction
*/ */

90
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java
View File

@ -87,7 +87,13 @@ public class MainCommand implements CommandExecutor, TabCompleter {
return true; return true;
} }
StringBuilder help = new StringBuilder(); StringBuilder help = new StringBuilder();
for (String string : helpMenu(player, cato)) { int page = 0;
try {
page = Integer.parseInt(args[2]);
--page;
if(page < 0) page = 0;
} catch(Exception e) {}
for (String string : helpMenu(player, cato, page)) {
help.append(string).append("\n"); help.append(string).append("\n");
} }
PlayerFunctions.sendMessage(player, help.toString()); PlayerFunctions.sendMessage(player, help.toString());
@ -123,23 +129,71 @@ public class MainCommand implements CommandExecutor, TabCompleter {
return false; return false;
} }
public static ArrayList<String> helpMenu(Player player, final SubCommand.CommandCategory category) {
ArrayList<String> help = new ArrayList<String>() { public static List<SubCommand> getCommands(SubCommand.CommandCategory category, Player player) {
{ List<SubCommand> cmds = new ArrayList<>();
add(t(C.HELP_HEADER.s())); for(SubCommand c : subCommands)
add(t(C.HELP_CATEGORY.s().replaceAll("%category%", category.toString()))); if(c.category == category && c.permission.hasPermission(player))
} cmds.add(c);
}; return cmds;
for (SubCommand cmd : subCommands) { }
if (cmd.permission.hasPermission(player) && (cmd.category == category)) {
String s = t(C.HELP_PAGE.s()); /*
s = s.replaceAll("%alias%", cmd.alias); // Current page
s = s.replaceAll("%usage%", cmd.usage.contains("plot") ? cmd.usage : "/plot " + cmd.usage); int page = 0;
s = s.replaceAll("%cmd%", cmd.cmd);
s = s.replaceAll("%desc%", cmd.description); //is a page specified? else use 0
help.add(s); if(args.length > 1) {
} try {
} page = Integer.parseInt(args[1]);
} catch(Exception e) {
page = 0;
}
}
//Get the total pages
int totalPages = ((int) Math.ceil(12 * (PlotMain.getPlotsSorted().size()) / 100));
if(page > totalPages)
page = totalPages;
//Only display 12!
int max = (page * 12) + 12;
if(max > PlotMain.getPlotsSorted().size())
max = PlotMain.getPlotsSorted().size();
StringBuilder string = new StringBuilder();
string.append(C.PLOT_LIST_HEADER_PAGED.s().replaceAll("%cur", page + 1 + "").replaceAll("%max", totalPages + 1 + "").replaceAll("%word%", "all") + "\n");
Plot p;
//This might work xD
for (int x = (page * 12); x < max; x++) {
*/
public static ArrayList<String> helpMenu(Player player, final SubCommand.CommandCategory category, int page) {
List<SubCommand> commands = getCommands(category, player);
final int totalPages = ((int) Math.ceil(12 * (commands.size()) / 100));
if(page > totalPages)
page = totalPages;
int max = (page * 12) + 12;
if(max > commands.size())
max = commands.size();
ArrayList<String> help = new ArrayList<>(
Arrays.asList(
t(C.HELP_HEADER.s().replaceAll("%cur", page + 1 + "").replaceAll("%max", totalPages + 1 + "")),
t(C.HELP_CATEGORY.s().replaceAll("%category%", category.toString()))
));
SubCommand cmd;
for(int x = (page * 12); x < max; x++) {
cmd = subCommands.get(x);
String s = t(C.HELP_PAGE.s());
s = s.replaceAll("%alias%", cmd.alias);
s = s.replaceAll("%usage%", cmd.usage.contains("plot") ? cmd.usage : "/plot " + cmd.usage);
s = s.replaceAll("%cmd%", cmd.cmd);
s = s.replaceAll("%desc%", cmd.description);
help.add(s);
}
if (help.size() < 2) { if (help.size() < 2) {
help.add(t(C.NO_COMMANDS.s())); help.add(t(C.NO_COMMANDS.s()));
} }

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/list.java
View File

@ -78,6 +78,8 @@ public class list extends SubCommand {
if(args.length > 1) { if(args.length > 1) {
try { try {
page = Integer.parseInt(args[1]); page = Integer.parseInt(args[1]);
--page;
if(page < 0) page = 0;
} catch(Exception e) { } catch(Exception e) {
page = 0; page = 0;
} }