diff --git a/.idea/artifacts/EaglerPluginInstaller_jar.xml b/.idea/artifacts/EaglerPluginInstaller_jar.xml index 70e0900..e7e98be 100644 --- a/.idea/artifacts/EaglerPluginInstaller_jar.xml +++ b/.idea/artifacts/EaglerPluginInstaller_jar.xml @@ -3,6 +3,7 @@ $PROJECT_DIR$/out/artifacts/EaglerPluginInstaller_jar + \ No newline at end of file diff --git a/out/artifacts/EaglerPluginInstaller_jar/EaglerPluginInstaller.jar b/out/artifacts/EaglerPluginInstaller_jar/EaglerPluginInstaller.jar index ab7d17e..ffb02ce 100644 Binary files a/out/artifacts/EaglerPluginInstaller_jar/EaglerPluginInstaller.jar and b/out/artifacts/EaglerPluginInstaller_jar/EaglerPluginInstaller.jar differ diff --git a/pom.xml b/pom.xml index ef33914..3b5f0a7 100644 --- a/pom.xml +++ b/pom.xml @@ -33,6 +33,11 @@ craftbukkit 1.5.2-R1.0 + + com.googlecode.json-simple + json-simple + 1.1 + diff --git a/src/main/java/tech/nully/PluginInstaller/PluginList.java b/src/main/java/tech/nully/PluginInstaller/PluginList.java index 2bb3a13..01d1e2a 100644 --- a/src/main/java/tech/nully/PluginInstaller/PluginList.java +++ b/src/main/java/tech/nully/PluginInstaller/PluginList.java @@ -4,8 +4,9 @@ import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; public class PluginList { - private static String[] AlphaPluginList = new String[]{"AntiSwear", "BitchFilter", "CoreProtect", "CrackShot", "DupePatch", "DynMap", "Essentials", - "EssenttialsAntiBuild", "EssentialsChat", "EssentialsProtect", "EssentialsSpawn", "Factions", "MCore", "MyWarp",}; + 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", + "Vault", "WorldEdit", "WorldGuard"}; public static void SendPG1ToSender(CommandSender sender) { sender.sendMessage(ChatColor.GREEN + "Here is a list of available plugins in the database:"); int SecondCollumn = 8; @@ -48,5 +49,36 @@ public class PluginList { sender.sendMessage("Note: You do not need to have proper"); sender.sendMessage("capitalization when using the install command"); } + + public static void SendPG3ToSender(CommandSender sender) { + sender.sendMessage(ChatColor.GREEN + "Here is a list of available plugins in the database:"); + + // List ------------------------------------------------------------- + int SecondCollumn = 36; + for (int i = 29; i < 36; i++) { + String Col31; + String Col32; + + // Null checkers for elements in the Array + if (AlphaPluginList[i-1] != null) { + Col31 = AlphaPluginList[i-1]; + } else { + Col31 = "N/A"; + } + if (AlphaPluginList[SecondCollumn-1] != null) { + Col32 = AlphaPluginList[SecondCollumn-1]; + } else { + Col32 = "N/A"; + } + // _________________________________________ + + sender.sendMessage(i+". "+ Col31 + "" + SecondCollumn + ". " + Col32); + SecondCollumn++; + } + + sender.sendMessage(" Page 3 of 12"); + sender.sendMessage("Note: You do not need to have proper"); + sender.sendMessage("capitalization when using the install command"); + } } diff --git a/src/main/java/tech/nully/PluginInstaller/plistCommand.java b/src/main/java/tech/nully/PluginInstaller/plistCommand.java index 843370a..e0126cd 100644 --- a/src/main/java/tech/nully/PluginInstaller/plistCommand.java +++ b/src/main/java/tech/nully/PluginInstaller/plistCommand.java @@ -12,8 +12,6 @@ public class plistCommand implements CommandExecutor { if (cmd.getName().equalsIgnoreCase("plist") && sender.isOp() || sender instanceof ConsoleCommandSender) { if (args.length >= 1) { if (args[0] == null) { - sender.sendMessage(ChatColor.GREEN + "Here is a list of available plugins in the database:"); - // TODO: Finish this list PluginList.SendPG1ToSender(sender); return true; } @@ -25,11 +23,21 @@ public class plistCommand implements CommandExecutor { } catch (NumberFormatException n) { sender.sendMessage(ChatColor.RED + "That is not a valid page number!"); PageArgIsInt = false; - return false; + return true; } - if (PageArgIsInt) { - + int PageArg = Integer.parseInt(args[0]); + switch (PageArg) { + case 1: + PluginList.SendPG1ToSender(sender); + break; + case 2: + PluginList.SendPG2ToSender(sender); + break; + case 3: + PluginList.SendPG3ToSender(sender); + break; + } } } } diff --git a/target/classes/plugin.yml b/target/classes/plugin.yml index c2c34b0..562067e 100644 --- a/target/classes/plugin.yml +++ b/target/classes/plugin.yml @@ -1,10 +1,10 @@ name: EaglerPluginInstaller -version: 1.1.0 +version: 1.1.1 main: tech.nully.PluginInstaller.Main prefix: [EaglerPluginInstaller] loadbefore: [EaglerPluginUpdater] authors: [BongoCat] -description: A plugin that is capable of installing the latest compatible version of plugins with eaglercraft from an online repository +description: A plugin that is capable of installing the latest compatible version of plugins with eaglercraft from an online repository weith the executing of a command. website: nully.tech commands: install: diff --git a/target/classes/tech/nully/PluginInstaller/InstallCommand.class b/target/classes/tech/nully/PluginInstaller/InstallCommand.class index 2d82488..9b2eab3 100644 Binary files a/target/classes/tech/nully/PluginInstaller/InstallCommand.class and b/target/classes/tech/nully/PluginInstaller/InstallCommand.class differ diff --git a/target/classes/tech/nully/PluginInstaller/Main.class b/target/classes/tech/nully/PluginInstaller/Main.class index c977204..1c21f95 100644 Binary files a/target/classes/tech/nully/PluginInstaller/Main.class and b/target/classes/tech/nully/PluginInstaller/Main.class differ diff --git a/target/classes/tech/nully/PluginInstaller/PluginList.class b/target/classes/tech/nully/PluginInstaller/PluginList.class new file mode 100644 index 0000000..e7d426a Binary files /dev/null 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 9d15c34..0905055 100644 Binary files a/target/classes/tech/nully/PluginInstaller/plistCommand.class and b/target/classes/tech/nully/PluginInstaller/plistCommand.class differ