beta commit

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,8 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="AutoCloseableResource" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="METHOD_MATCHER_CONFIG" value="java.util.Formatter,format,java.io.Writer,append,com.google.common.base.Preconditions,checkNotNull,org.hibernate.Session,close,java.io.PrintWriter,printf,java.io.PrintStream,printf,java.net.URL,openStream" />
+    </inspection_tool>
+  </profile>
+</component>

src/main/java/tech/nully/PluginInstaller/InstallCommand.java

@@ -9,6 +9,7 @@ import org.bukkit.command.ConsoleCommandSender;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
+import java.net.URL;
 import java.util.Locale;
 
 public class InstallCommand implements CommandExecutor {
@@ -16,42 +17,38 @@ public class InstallCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender snder, Command cmd, String label, String[] args) {
         // Name checker
-        if (cmd.getName().equalsIgnoreCase("installpl")) {
+        if (cmd.getName().equalsIgnoreCase("install")) {
-            snder.sendMessage("Check 1 passed");
             if (snder.isOp() || snder instanceof ConsoleCommandSender) {
-                snder.sendMessage("Check 2 passed");
                 Installer ins = new Installer();
 
                 // handler for install argument
                 if (args.length == 1) {
-                    snder.sendMessage("Check 3 passed");
                     String Install_Jar = args[0].toLowerCase();
 
-                    // Checks if the list of plugin links contains what the user wants to install
+                    // Checks if the created URL is a valid one
-                    if (ins.IsValidLink("https://github.com/darverdevs/PluginInstallerRepo/raw/main/" + Install_Jar + ".jar")) {
+                    try {
-                        snder.sendMessage("Check 4 passed");
+                        if (ins.IsValidLink("https://github.com/darverdevs/PluginInstallerRepo/raw/main/" + Install_Jar + ".jar")) {
-                        // Creates an input stream based on the corresponding URL from the players first argument
+                            //plugin URL
-                        try (InputStream in = URI.create(Main.getJavaURLs().get(Install_Jar)).toURL().openStream()) {
+                            URL plugin = URI.create("https://github.com/darverdevs/PluginInstallerRepo/raw/main/" + Install_Jar + ".jar")
-                            snder.sendMessage("Check 5 passed");
+                                    .toURL();
-                            // Installs the plugin
+
-                            ins.InstallPlugin(in, Install_Jar.toLowerCase(), snder);
+                            // Creates the InputStream
-                            snder.sendMessage("You have successfully installed the " + ChatColor.GREEN + Install_Jar.toUpperCase() + ChatColor.WHITE + " plugin!");
+                            try (InputStream in = plugin.openStream()) {
-                            return true;
+
-                        } catch (IOException e) {}
+                                // Installs the plugin
+                                ins.InstallPlugin(in, Install_Jar.toLowerCase(), snder);
+                                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();
+                            ins.InstallPlugin(reco1, "DupePatch", snder);
+                        }
+                    } catch (IOException e) {
+                        snder.sendMessage("\"" + Install_Jar + "\"" + "is not a valid plugin from the database");
                     }
                 }
-
-
-                if (args[0].equalsIgnoreCase("list")) {
-                    snder.sendMessage(ChatColor.GREEN + "Here is a list of available plugins in the database:");
-                    snder.sendMessage("1. Factions       8. ");
-                    snder.sendMessage("2. ProtocolLib    9. ");
-                    snder.sendMessage("3. PermissionSex 10. ");
-                    snder.sendMessage("4. Vault         11. ");
-                    snder.sendMessage("5. BitchFilter   12. ");
-                    snder.sendMessage("6. BitchFilter   13. ");
-                    snder.sendMessage("7. BitchFilter   14. ");
-                }
             }
         }
         return false;

src/main/java/tech/nully/PluginInstaller/Installer.java

@@ -8,38 +8,31 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
 import java.util.HashMap;
 
 public class Installer {
-    private HashMap<String, String> JARURLs = new HashMap<>();
-
-    public static HashMap<String, String> SetupInstaller() {
-        Installer ins = new Installer();
-        ins.JARURLs.put("dynmap", "https://github.com/darverdevs/PluginInstallerRepo/raw/main/dynmap-1.9.1.jar");;
-        ins.JARURLs.put("factions", "https://github.com/darverdevs/PluginInstallerRepo/raw/main/Factions.jar");
-        ins.JARURLs.put("permissionsex", "https://github.com/darverdevs/PluginInstallerRepo/raw/main/PermissionSex.jar");
-        ins.JARURLs.put("protocollib", "https://github.com/darverdevs/PluginInstallerRepo/raw/main/ProtocolLib.jar");
-        ins.JARURLs.put("vault", "https://github.com/darverdevs/PluginInstallerRepo/raw/main/Vault.jar");
-        ins.JARURLs.put("mcore", "https://github.com/darverdevs/PluginInstallerRepo/raw/main/mcore.jar");
-        return ins.JARURLs;
-    }
 
     public void InstallPlugin(InputStream in, String pluginName, CommandSender s) throws IOException {
         File f = new File(Main.getInstance().getDataFolder().getParent() + "/" + pluginName + ".jar");
-        s.sendMessage("Check 1x passed");
         Files.copy(in, f.toPath(), StandardCopyOption.REPLACE_EXISTING);
-        System.out.println(f.toPath().toString());
-        s.sendMessage("Check 2x passed");
     }
 
-    public boolean IsValidLink(String url) throws MalformedURLException, IOException{
+    public boolean IsValidLink(String url) throws IOException{
         URL u = new URL(url);
         HttpURLConnection huc =  (HttpURLConnection)  u.openConnection();
         huc.setRequestMethod("GET");
         huc.connect();
         return huc.getResponseCode() == 200;
     }
+
+    public static void UpdatePlugin() throws IOException {
+        InputStream in = URI.create("https://github.com/darverdevs/PluginInstaller/raw/main/out/artifacts/PluginInstaller_jar/PluginInstaller.jar")
+                .toURL().openStream();
+        File f = new File(Main.getInstance().getDataFolder().getParent() + "/" + "PluginInstaller" + ".jar");
+        Files.copy(in, f.toPath(), StandardCopyOption.REPLACE_EXISTING);
+    }
 }

src/main/java/tech/nully/PluginInstaller/Main.java

@@ -4,6 +4,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.io.IOException;
 import java.util.HashMap;
 
 public class Main extends JavaPlugin {
@@ -11,19 +12,22 @@ public class Main extends JavaPlugin {
     public static Plugin getInstance() {
         return instance;
     }
-    private static HashMap<String, String> javaURLs = null;
-    public static HashMap<String, String> getJavaURLs() {
-        return javaURLs;
-    }
     @Override
     public void onEnable() {
         instance = this;
-        getCommand("installpl").setExecutor(new InstallCommand());
+        try {
-        javaURLs = Installer.SetupInstaller();
+            Installer.UpdatePlugin();
+        } catch (IOException e) {}
+        getCommand("install").setExecutor(new InstallCommand());
+        getCommand("plist").setExecutor(new plistCommand());
         getServer().getConsoleSender().sendMessage("--------------------------------------------");
         getServer().getConsoleSender().sendMessage("--------------------------------------------");
         getServer().getConsoleSender().sendMessage(
                 ChatColor.GREEN + "[PluginInstaller]" + ChatColor.AQUA + " PluginInstaller V1.0.0 is now Enabled! :D");
+        getServer().getConsoleSender().sendMessage("To use PluginInstaller, run the command \"/install <pluginname>\" (\"install <pluginname>\" 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");
+        getServer().getConsoleSender().sendMessage("and creating an issue or pull request of the plugin you want to add");
         getServer().getConsoleSender().sendMessage("--------------------------------------------");
         getServer().getConsoleSender().sendMessage("--------------------------------------------");
     }

src/main/java/tech/nully/PluginInstaller/plistCommand.java

@@ -0,0 +1,24 @@
+package tech.nully.PluginInstaller;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+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. ");
+            sender.sendMessage("3. PermissionSex 10. ");
+            sender.sendMessage("4. Vault         11. ");
+            sender.sendMessage("5. CoreProtect   12. ");
+            sender.sendMessage("6. DupePatch     13. ");
+            sender.sendMessage("7. BitchFilter   14. ");
+        }
+        return false;
+    }
+}

src/main/resources/plugin.yml

@@ -6,6 +6,9 @@ authors: [BongoCat]
 description: A plugin that is capable of installing the latest compatible version of plugins with eaglercraft
 website: nully.tech
 commands:
-  installpl:
+  install:
     usage: /<command> <plugin>
     description: Installs the latest compatible version of the requested plugin
+  plist:
+    usage: /<command>
+    description: Gives you a list of available plugins with PluginInstaller

target/classes/plugin.yml

@@ -6,6 +6,9 @@ authors: [BongoCat]
 description: A plugin that is capable of installing the latest compatible version of plugins with eaglercraft
 website: nully.tech
 commands:
-  installpl:
+  install:
     usage: /<command> <plugin>
     description: Installs the latest compatible version of the requested plugin
+  plist:
+    usage: /<command>
+    description: Gives you a list of available plugins with PluginInstaller