diff --git a/out/artifacts/EaglerPluginInstaller_jar/EaglerPluginInstaller.jar b/out/artifacts/EaglerPluginInstaller_jar/EaglerPluginInstaller.jar index ffb02ce..13cee69 100644 Binary files a/out/artifacts/EaglerPluginInstaller_jar/EaglerPluginInstaller.jar and b/out/artifacts/EaglerPluginInstaller_jar/EaglerPluginInstaller.jar differ diff --git a/src/main/java/tech/nully/PluginInstaller/PluginList.java b/src/main/java/tech/nully/PluginInstaller/PluginList.java index 01d1e2a..243f682 100644 --- a/src/main/java/tech/nully/PluginInstaller/PluginList.java +++ b/src/main/java/tech/nully/PluginInstaller/PluginList.java @@ -3,6 +3,9 @@ package tech.nully.PluginInstaller; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; +import java.util.ArrayList; +import java.util.List; + public class PluginList { private static String[] AlphaPluginList = new String[]{"AntiSwear", "AyunCord", "BitchFilter", "CoreProtect", "CrackShot", "CraftBook", "DupePatch", "DynMap", "Essentials", "EssenttialsAntiBuild", "EssentialsChat", "EssentialsProtect", "EssentialsSpawn", "Factions", "MCore", "Multiverse", "MyWarp", "PermissionSex", "ProtocolLib", @@ -10,8 +13,14 @@ public class PluginList { public static void SendPG1ToSender(CommandSender sender) { sender.sendMessage(ChatColor.GREEN + "Here is a list of available plugins in the database:"); int SecondCollumn = 8; + for (int i = 1; i < 8; i++) { - sender.sendMessage(i+". "+ AlphaPluginList[i-1] + "" +SecondCollumn + ". " + AlphaPluginList[SecondCollumn-1]); + int Spaces = 21-AlphaPluginList[i-1].length(); + List spaces = new ArrayList<>(); + for (int forInt = 0; i < Spaces; i++) { + spaces.add(" "); + } + sender.sendMessage(i+". "+ AlphaPluginList[i-1] + "" + Utils.ListToString(spaces) + "" +SecondCollumn + ". " + AlphaPluginList[SecondCollumn-1]); SecondCollumn++; } sender.sendMessage(" Page 1 of 12"); @@ -29,19 +38,25 @@ public class PluginList { String Col2 = ""; // Null checkers for elements in the Array - if (AlphaPluginList[i-1] != null) { + try { Col1 = AlphaPluginList[i-1]; - } else { + } catch (ArrayIndexOutOfBoundsException y) { Col1 = "N/A"; } - if (AlphaPluginList[SecondCollumn-1] != null) { + try { Col2 = AlphaPluginList[SecondCollumn-1]; - } else { + } catch (ArrayIndexOutOfBoundsException a) { Col2 = "N/A"; } // _________________________________________ - sender.sendMessage(i+". "+ Col1 + "" + SecondCollumn + ". " + Col2); + int Spaces = 21-AlphaPluginList[i-1].length(); + List spaces = new ArrayList<>(); + for (int forInt = 0; i < Spaces; i++) { + spaces.add(" "); + } + + sender.sendMessage(i+". "+ Col1 + "" + Utils.ListToString(spaces) + "" + SecondCollumn + ". " + Col2); SecondCollumn++; } @@ -60,19 +75,25 @@ public class PluginList { String Col32; // Null checkers for elements in the Array - if (AlphaPluginList[i-1] != null) { + try { Col31 = AlphaPluginList[i-1]; - } else { + } catch (ArrayIndexOutOfBoundsException e) { Col31 = "N/A"; } - if (AlphaPluginList[SecondCollumn-1] != null) { + try { Col32 = AlphaPluginList[SecondCollumn-1]; - } else { + } catch (ArrayIndexOutOfBoundsException e) { Col32 = "N/A"; } // _________________________________________ - sender.sendMessage(i+". "+ Col31 + "" + SecondCollumn + ". " + Col32); + int Spaces = 21-AlphaPluginList[i-1].length(); + List spaces = new ArrayList<>(); + for (int forInt = 0; i < Spaces; i++) { + spaces.add(" "); + } + + sender.sendMessage(i+". "+ Col31 + "" + Utils.ListToString(spaces) + "" + SecondCollumn + ". " + Col32); SecondCollumn++; } diff --git a/src/main/java/tech/nully/PluginInstaller/Utils.java b/src/main/java/tech/nully/PluginInstaller/Utils.java new file mode 100644 index 0000000..16a932e --- /dev/null +++ b/src/main/java/tech/nully/PluginInstaller/Utils.java @@ -0,0 +1,21 @@ +package tech.nully.PluginInstaller; + +import java.util.List; + +public class Utils { + public static String ArrayToString(String[] str) { + StringBuilder sb = new StringBuilder(); + for (String s : str) { + sb.append(s); + } + return sb.toString(); + } + + public static String ListToString(List list) { + StringBuilder sb = new StringBuilder(); + for (String s : list) { + sb.append(s); + } + return sb.toString(); + } +} diff --git a/src/main/java/tech/nully/PluginInstaller/plistCommand.java b/src/main/java/tech/nully/PluginInstaller/plistCommand.java index e0126cd..855627f 100644 --- a/src/main/java/tech/nully/PluginInstaller/plistCommand.java +++ b/src/main/java/tech/nully/PluginInstaller/plistCommand.java @@ -11,9 +11,10 @@ public class plistCommand implements CommandExecutor { public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { if (cmd.getName().equalsIgnoreCase("plist") && sender.isOp() || sender instanceof ConsoleCommandSender) { if (args.length >= 1) { - if (args[0] == null) { - PluginList.SendPG1ToSender(sender); - return true; + try { + System.out.println(args[0]); + } catch (ArrayIndexOutOfBoundsException e) { + System.out.println("error"); } int listPage = 0; boolean PageArgIsInt = false; @@ -30,13 +31,13 @@ public class plistCommand implements CommandExecutor { switch (PageArg) { case 1: PluginList.SendPG1ToSender(sender); - break; + return true; case 2: PluginList.SendPG2ToSender(sender); - break; + return true; case 3: PluginList.SendPG3ToSender(sender); - break; + return true; } } } diff --git a/target/classes/tech/nully/PluginInstaller/PluginList.class b/target/classes/tech/nully/PluginInstaller/PluginList.class index e7d426a..248c2a6 100644 Binary files a/target/classes/tech/nully/PluginInstaller/PluginList.class and b/target/classes/tech/nully/PluginInstaller/PluginList.class differ diff --git a/target/classes/tech/nully/PluginInstaller/plistCommand.class b/target/classes/tech/nully/PluginInstaller/plistCommand.class index 0905055..a7e1355 100644 Binary files a/target/classes/tech/nully/PluginInstaller/plistCommand.class and b/target/classes/tech/nully/PluginInstaller/plistCommand.class differ