From 8c7b656a7483ca6679946e6c20b94bc1ffff2437 Mon Sep 17 00:00:00 2001 From: Fangoboyo <77935781+Fangoboyo@users.noreply.github.com> Date: Thu, 9 Jun 2022 12:29:31 -0700 Subject: [PATCH] Changed suggested plugins and changed plugin version text --- .../nully/PluginInstaller/InstallCommand.java | 10 +++++- .../java/tech/nully/PluginInstaller/Main.java | 4 +-- .../nully/PluginInstaller/PluginList.java | 32 +++++++++++++++++ .../nully/PluginInstaller/plistCommand.java | 36 +++++++++++++------ src/main/resources/plugin.yml | 2 +- 5 files changed, 69 insertions(+), 15 deletions(-) create mode 100644 src/main/java/tech/nully/PluginInstaller/PluginList.java diff --git a/src/main/java/tech/nully/PluginInstaller/InstallCommand.java b/src/main/java/tech/nully/PluginInstaller/InstallCommand.java index 1f98adb..32f9088 100644 --- a/src/main/java/tech/nully/PluginInstaller/InstallCommand.java +++ b/src/main/java/tech/nully/PluginInstaller/InstallCommand.java @@ -35,15 +35,23 @@ public class InstallCommand implements CommandExecutor { try (InputStream in = plugin.openStream()) { // Installs the plugin - ins.InstallPlugin(in, Install_Jar.toLowerCase()); + ins.InstallPlugin(in, Install_Jar.substring(0, 1).toUpperCase() + Install_Jar.substring(1)); snder.sendMessage("You have successfully installed the " + ChatColor.GREEN + Install_Jar.toUpperCase() + ChatColor.WHITE + " plugin!"); return true; } catch (IOException e) {} } else if (Install_Jar.equalsIgnoreCase("recommended")) { InputStream reco1 = URI.create("https://github.com/darverdevs/PluginInstallerRepo/raw/main/dupepatch.jar") .toURL().openStream(); + InputStream reco2 = URI.create("https://github.com/darverdevs/PluginInstallerRepo/raw/main/essentials.jar") + .toURL().openStream(); + InputStream reco3 = URI.create("https://github.com/darverdevs/PluginInstallerRepo/raw/main/essentialsspawn.jar") + .toURL().openStream(); ins.InstallPlugin(reco1, "DupePatch"); snder.sendMessage("You have successfully installed the " + ChatColor.GREEN + "DupePatch" + ChatColor.WHITE + " plugin!"); + ins.InstallPlugin(reco1, "Essentials"); + snder.sendMessage("You have successfully installed the " + ChatColor.GREEN + "Essentials" + ChatColor.WHITE + " plugin!"); + ins.InstallPlugin(reco1, "EssentialsSpawn"); + snder.sendMessage("You have successfully installed the " + ChatColor.GREEN + "EssentialsSpawn" + ChatColor.WHITE + " plugin!"); return true; } } catch (IOException e) { diff --git a/src/main/java/tech/nully/PluginInstaller/Main.java b/src/main/java/tech/nully/PluginInstaller/Main.java index 38f8360..5f11f44 100644 --- a/src/main/java/tech/nully/PluginInstaller/Main.java +++ b/src/main/java/tech/nully/PluginInstaller/Main.java @@ -25,7 +25,7 @@ public class Main extends JavaPlugin { getServer().getConsoleSender().sendMessage("--------------------------------------------"); getServer().getConsoleSender().sendMessage("--------------------------------------------"); getServer().getConsoleSender().sendMessage( - ChatColor.GREEN + "[EaglerPluginInstaller]" + ChatColor.AQUA + " EaglerPluginInstaller V1.1.0 is now Enabled! :D"); + ChatColor.GREEN + "[EaglerPluginInstaller]" + ChatColor.AQUA + " EaglerPluginInstaller V1.1.1 is now Enabled! :D"); getServer().getConsoleSender().sendMessage("To use PluginInstaller, run the command \"/install \" (\"install \" in console) to install a plugin"); getServer().getConsoleSender().sendMessage("To get a list of installable plugins, use the command \"/plist\" or \"plist\" in console"); getServer().getConsoleSender().sendMessage("You can request to add a new plugin to the database by going to https://github.com/darverdevs/PluginInstallerRepo/tree/main"); @@ -39,7 +39,7 @@ public class Main extends JavaPlugin { getServer().getConsoleSender().sendMessage("--------------------------------------------"); getServer().getConsoleSender().sendMessage("--------------------------------------------"); getServer().getConsoleSender().sendMessage( - ChatColor.GREEN + "[EaglerPluginInstaller]" + ChatColor.AQUA + " PluginInstaller V1.1.0 is now Disabled! D:"); + ChatColor.GREEN + "[EaglerPluginInstaller]" + ChatColor.AQUA + " PluginInstaller V1.1.1 is now Disabled! D:"); getServer().getConsoleSender().sendMessage("--------------------------------------------"); getServer().getConsoleSender().sendMessage("--------------------------------------------"); } diff --git a/src/main/java/tech/nully/PluginInstaller/PluginList.java b/src/main/java/tech/nully/PluginInstaller/PluginList.java new file mode 100644 index 0000000..eab6ad0 --- /dev/null +++ b/src/main/java/tech/nully/PluginInstaller/PluginList.java @@ -0,0 +1,32 @@ +package tech.nully.PluginInstaller; + +import org.bukkit.command.CommandSender; + +import java.net.*; +import java.io.*; + +public class PluginList { + public static void SendPG1ToSender(CommandSender sender) { + try { + URL files = URI.create("https://raw.githubusercontent.com/darverdevs/PluginInstallerRepo/main/names.txt").toURL(); + URLConnection file = files.openConnection(); + BufferedReader best = new BufferedReader(new InputStreamReader(file.getInputStream())); + while ((best.readLine() != null)) { + sender.sendMessage(best.readLine()); + } + best.close(); + } + catch(IOException io) { + System.out.println(io.getMessage()); + } + /*sender.sendMessage("1. AntiSwear 8. AntiSwear"); + sender.sendMessage("2. BitchFilter 9. ProtocolLib"); + sender.sendMessage("3. CoreProtect 10. MCore"); + sender.sendMessage("4. CrackShot 11. "); + sender.sendMessage("5. DupePatch 12. "); + sender.sendMessage("6. DynMap 13. "); + sender.sendMessage("7. BitchFilter 14. ");*/ + + } +} + diff --git a/src/main/java/tech/nully/PluginInstaller/plistCommand.java b/src/main/java/tech/nully/PluginInstaller/plistCommand.java index c9a893f..843370a 100644 --- a/src/main/java/tech/nully/PluginInstaller/plistCommand.java +++ b/src/main/java/tech/nully/PluginInstaller/plistCommand.java @@ -4,21 +4,35 @@ import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; +import org.bukkit.command.ConsoleCommandSender; public class plistCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - if (cmd.getName().equalsIgnoreCase("plist")) { - sender.sendMessage(ChatColor.GREEN + "Here is a list of available plugins in the database:"); - // TODO: Finish this list - sender.sendMessage("1. Factions 8. AntiSwear"); - sender.sendMessage("2. ProtocolLib 9. ProtocolLib"); - sender.sendMessage("3. PermissionSex 10. MCore"); - sender.sendMessage("4. Vault 11. "); - sender.sendMessage("5. CoreProtect 12. "); - sender.sendMessage("6. DupePatch 13. "); - sender.sendMessage("7. BitchFilter 14. "); - } + 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; + } + int listPage = 0; + boolean PageArgIsInt = false; + try { + listPage= Integer.parseInt(args[0]); + PageArgIsInt = true; + } catch (NumberFormatException n) { + sender.sendMessage(ChatColor.RED + "That is not a valid page number!"); + PageArgIsInt = false; + return false; + } + + if (PageArgIsInt) { + + } + } + } return false; } } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index c2c34b0..19a573b 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: EaglerPluginInstaller -version: 1.1.0 +version: 1.1.1 main: tech.nully.PluginInstaller.Main prefix: [EaglerPluginInstaller] loadbefore: [EaglerPluginUpdater]