From 6df6e9034ae9345f04d3ed2db065f1cc250d2841 Mon Sep 17 00:00:00 2001 From: Fangoboyo <77935781+Fangoboyo@users.noreply.github.com> Date: Tue, 7 Jun 2022 20:36:59 -0700 Subject: [PATCH] reverted 90d9fda --- {Installer/.idea => .idea}/.gitignore | 0 .../artifacts/PluginInstaller_jar.xml | 0 {Updater/.idea => .idea}/compiler.xml | 7 +- {Installer/.idea => .idea}/discord.xml | 0 {Installer/.idea => .idea}/encodings.xml | 0 .../inspectionProfiles/Project_Default.xml | 0 .../.idea => .idea}/jarRepositories.xml | 0 {Installer/.idea => .idea}/misc.xml | 0 {Installer/.idea => .idea}/vcs.xml | 0 .idea/workspace.xml | 96 ------------------ Installer/.idea/compiler.xml | 13 --- Installer/.idea/workspace.xml | 73 +++++++++++++ .../nully/PluginInstaller/UpdateCommand.java | 24 ----- ...PluginInstaller.iml => PluginInstaller.iml | 0 Installer/README.md => README.md | 0 Updater/.idea/.gitignore | 8 -- Updater/.idea/discord.xml | 7 -- Updater/.idea/jarRepositories.xml | 20 ---- Updater/.idea/misc.xml | 14 --- Updater/.idea/vcs.xml | 6 -- Updater/.idea/workspace.xml | 67 ++++++++++++ Updater/pom.xml | 39 ------- .../PluginInstaller_jar/PluginInstaller.jar | Bin Installer/pom.xml => pom.xml | 0 .../nully/PluginInstaller/InstallCommand.java | 0 .../tech/nully/PluginInstaller/Installer.java | 0 .../java/tech/nully/PluginInstaller/Main.java | 1 - .../nully/PluginInstaller/plistCommand.java | 0 .../classes => src/main/resources}/plugin.yml | 0 .../resources => target/classes}/plugin.yml | 3 - .../PluginInstaller/InstallCommand.class | Bin .../nully/PluginInstaller/Installer.class | Bin .../tech/nully/PluginInstaller/Main.class | Bin .../nully/PluginInstaller/plistCommand.class | Bin 34 files changed, 146 insertions(+), 232 deletions(-) rename {Installer/.idea => .idea}/.gitignore (100%) rename {Installer/.idea => .idea}/artifacts/PluginInstaller_jar.xml (100%) rename {Updater/.idea => .idea}/compiler.xml (68%) rename {Installer/.idea => .idea}/discord.xml (100%) rename {Installer/.idea => .idea}/encodings.xml (100%) rename {Installer/.idea => .idea}/inspectionProfiles/Project_Default.xml (100%) rename {Installer/.idea => .idea}/jarRepositories.xml (100%) rename {Installer/.idea => .idea}/misc.xml (100%) rename {Installer/.idea => .idea}/vcs.xml (100%) delete mode 100644 .idea/workspace.xml delete mode 100644 Installer/.idea/compiler.xml create mode 100644 Installer/.idea/workspace.xml delete mode 100644 Installer/src/main/java/tech/nully/PluginInstaller/UpdateCommand.java rename Installer/PluginInstaller.iml => PluginInstaller.iml (100%) rename Installer/README.md => README.md (100%) delete mode 100644 Updater/.idea/.gitignore delete mode 100644 Updater/.idea/discord.xml delete mode 100644 Updater/.idea/jarRepositories.xml delete mode 100644 Updater/.idea/misc.xml delete mode 100644 Updater/.idea/vcs.xml create mode 100644 Updater/.idea/workspace.xml delete mode 100644 Updater/pom.xml rename {Installer/out => out}/artifacts/PluginInstaller_jar/PluginInstaller.jar (100%) rename Installer/pom.xml => pom.xml (100%) rename {Installer/src => src}/main/java/tech/nully/PluginInstaller/InstallCommand.java (100%) rename {Installer/src => src}/main/java/tech/nully/PluginInstaller/Installer.java (100%) rename {Installer/src => src}/main/java/tech/nully/PluginInstaller/Main.java (97%) rename {Installer/src => src}/main/java/tech/nully/PluginInstaller/plistCommand.java (100%) rename {Installer/target/classes => src/main/resources}/plugin.yml (100%) rename {Installer/src/main/resources => target/classes}/plugin.yml (84%) rename {Installer/target => target}/classes/tech/nully/PluginInstaller/InstallCommand.class (100%) rename {Installer/target => target}/classes/tech/nully/PluginInstaller/Installer.class (100%) rename {Installer/target => target}/classes/tech/nully/PluginInstaller/Main.class (100%) rename {Installer/target => target}/classes/tech/nully/PluginInstaller/plistCommand.class (100%) diff --git a/Installer/.idea/.gitignore b/.idea/.gitignore similarity index 100% rename from Installer/.idea/.gitignore rename to .idea/.gitignore diff --git a/Installer/.idea/artifacts/PluginInstaller_jar.xml b/.idea/artifacts/PluginInstaller_jar.xml similarity index 100% rename from Installer/.idea/artifacts/PluginInstaller_jar.xml rename to .idea/artifacts/PluginInstaller_jar.xml diff --git a/Updater/.idea/compiler.xml b/.idea/compiler.xml similarity index 68% rename from Updater/.idea/compiler.xml rename to .idea/compiler.xml index 46a9cb4..4715904 100644 --- a/Updater/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -6,8 +6,13 @@ - + + + + + + \ No newline at end of file diff --git a/Installer/.idea/discord.xml b/.idea/discord.xml similarity index 100% rename from Installer/.idea/discord.xml rename to .idea/discord.xml diff --git a/Installer/.idea/encodings.xml b/.idea/encodings.xml similarity index 100% rename from Installer/.idea/encodings.xml rename to .idea/encodings.xml diff --git a/Installer/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml similarity index 100% rename from Installer/.idea/inspectionProfiles/Project_Default.xml rename to .idea/inspectionProfiles/Project_Default.xml diff --git a/Installer/.idea/jarRepositories.xml b/.idea/jarRepositories.xml similarity index 100% rename from Installer/.idea/jarRepositories.xml rename to .idea/jarRepositories.xml diff --git a/Installer/.idea/misc.xml b/.idea/misc.xml similarity index 100% rename from Installer/.idea/misc.xml rename to .idea/misc.xml diff --git a/Installer/.idea/vcs.xml b/.idea/vcs.xml similarity index 100% rename from Installer/.idea/vcs.xml rename to .idea/vcs.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index b8f1143..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { - "keyToString": { - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "SHARE_PROJECT_CONFIGURATION_FILES": "true", - "WebServerToolWindowFactoryState": "false", - "settings.editor.selected.configurable": "preferences.pluginManager" - } -} - - - - - 1654654153315 - - - - - - - \ No newline at end of file diff --git a/Installer/.idea/compiler.xml b/Installer/.idea/compiler.xml deleted file mode 100644 index ee785cf..0000000 --- a/Installer/.idea/compiler.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Installer/.idea/workspace.xml b/Installer/.idea/workspace.xml new file mode 100644 index 0000000..1bdddae --- /dev/null +++ b/Installer/.idea/workspace.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1654654153315 + + + + + + + \ No newline at end of file diff --git a/Installer/src/main/java/tech/nully/PluginInstaller/UpdateCommand.java b/Installer/src/main/java/tech/nully/PluginInstaller/UpdateCommand.java deleted file mode 100644 index 26c3eed..0000000 --- a/Installer/src/main/java/tech/nully/PluginInstaller/UpdateCommand.java +++ /dev/null @@ -1,24 +0,0 @@ -package tech.nully.PluginInstaller; - -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.command.ConsoleCommandSender; - -import java.io.IOException; - -public class UpdateCommand implements CommandExecutor { - @Override - public boolean onCommand(CommandSender Sender, Command cmd, String label, String[] args) { - if (cmd.getName().equalsIgnoreCase("update")) { - if (Sender.isOp() || Sender instanceof ConsoleCommandSender) { - try { - Installer.UpdatePlugin(); - } catch (IOException e) {} - Sender.sendMessage("The latest download of the plugin has been installed, please reload the server or reload the plugin to have the changes take effect"); - return true; - } - } - return false; - } -} diff --git a/Installer/PluginInstaller.iml b/PluginInstaller.iml similarity index 100% rename from Installer/PluginInstaller.iml rename to PluginInstaller.iml diff --git a/Installer/README.md b/README.md similarity index 100% rename from Installer/README.md rename to README.md diff --git a/Updater/.idea/.gitignore b/Updater/.idea/.gitignore deleted file mode 100644 index 13566b8..0000000 --- a/Updater/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/Updater/.idea/discord.xml b/Updater/.idea/discord.xml deleted file mode 100644 index 30bab2a..0000000 --- a/Updater/.idea/discord.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Updater/.idea/jarRepositories.xml b/Updater/.idea/jarRepositories.xml deleted file mode 100644 index 712ab9d..0000000 --- a/Updater/.idea/jarRepositories.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/Updater/.idea/misc.xml b/Updater/.idea/misc.xml deleted file mode 100644 index 132404b..0000000 --- a/Updater/.idea/misc.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/Updater/.idea/vcs.xml b/Updater/.idea/vcs.xml deleted file mode 100644 index 6c0b863..0000000 --- a/Updater/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Updater/.idea/workspace.xml b/Updater/.idea/workspace.xml new file mode 100644 index 0000000..907d6d9 --- /dev/null +++ b/Updater/.idea/workspace.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1654658970090 + + + + \ No newline at end of file diff --git a/Updater/pom.xml b/Updater/pom.xml deleted file mode 100644 index 4cd0078..0000000 --- a/Updater/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - 4.0.0 - - tech.nully - PrimCore - 1.0.0 - jar - - PrimCore - - A custom coded plugin for primcraft written in Kotlin - nully.tech - - 1.8 - UTF-8 - 1.8 - 1.8 - - - - - PrimCoreRepos-repos - https://github.com/darverdevs/EaglerMavenRepo/raw/main - - - - - - com.github.EaglerMaven - craftbukkit - 1.5.2-R1.0 - - - - - \ No newline at end of file diff --git a/Installer/out/artifacts/PluginInstaller_jar/PluginInstaller.jar b/out/artifacts/PluginInstaller_jar/PluginInstaller.jar similarity index 100% rename from Installer/out/artifacts/PluginInstaller_jar/PluginInstaller.jar rename to out/artifacts/PluginInstaller_jar/PluginInstaller.jar diff --git a/Installer/pom.xml b/pom.xml similarity index 100% rename from Installer/pom.xml rename to pom.xml diff --git a/Installer/src/main/java/tech/nully/PluginInstaller/InstallCommand.java b/src/main/java/tech/nully/PluginInstaller/InstallCommand.java similarity index 100% rename from Installer/src/main/java/tech/nully/PluginInstaller/InstallCommand.java rename to src/main/java/tech/nully/PluginInstaller/InstallCommand.java diff --git a/Installer/src/main/java/tech/nully/PluginInstaller/Installer.java b/src/main/java/tech/nully/PluginInstaller/Installer.java similarity index 100% rename from Installer/src/main/java/tech/nully/PluginInstaller/Installer.java rename to src/main/java/tech/nully/PluginInstaller/Installer.java diff --git a/Installer/src/main/java/tech/nully/PluginInstaller/Main.java b/src/main/java/tech/nully/PluginInstaller/Main.java similarity index 97% rename from Installer/src/main/java/tech/nully/PluginInstaller/Main.java rename to src/main/java/tech/nully/PluginInstaller/Main.java index b37f7e1..96ab452 100644 --- a/Installer/src/main/java/tech/nully/PluginInstaller/Main.java +++ b/src/main/java/tech/nully/PluginInstaller/Main.java @@ -21,7 +21,6 @@ public class Main extends JavaPlugin { } catch (IOException e) {} getCommand("install").setExecutor(new InstallCommand()); getCommand("plist").setExecutor(new plistCommand()); - getCommand("update").setExecutor(new UpdateCommand()); getServer().getConsoleSender().sendMessage("--------------------------------------------"); getServer().getConsoleSender().sendMessage("--------------------------------------------"); getServer().getConsoleSender().sendMessage( diff --git a/Installer/src/main/java/tech/nully/PluginInstaller/plistCommand.java b/src/main/java/tech/nully/PluginInstaller/plistCommand.java similarity index 100% rename from Installer/src/main/java/tech/nully/PluginInstaller/plistCommand.java rename to src/main/java/tech/nully/PluginInstaller/plistCommand.java diff --git a/Installer/target/classes/plugin.yml b/src/main/resources/plugin.yml similarity index 100% rename from Installer/target/classes/plugin.yml rename to src/main/resources/plugin.yml diff --git a/Installer/src/main/resources/plugin.yml b/target/classes/plugin.yml similarity index 84% rename from Installer/src/main/resources/plugin.yml rename to target/classes/plugin.yml index feea49c..542274e 100644 --- a/Installer/src/main/resources/plugin.yml +++ b/target/classes/plugin.yml @@ -12,6 +12,3 @@ commands: plist: usage: / description: Gives you a list of available plugins with PluginInstaller - update: - usage: / - description: Updates the plugin to the latest version diff --git a/Installer/target/classes/tech/nully/PluginInstaller/InstallCommand.class b/target/classes/tech/nully/PluginInstaller/InstallCommand.class similarity index 100% rename from Installer/target/classes/tech/nully/PluginInstaller/InstallCommand.class rename to target/classes/tech/nully/PluginInstaller/InstallCommand.class diff --git a/Installer/target/classes/tech/nully/PluginInstaller/Installer.class b/target/classes/tech/nully/PluginInstaller/Installer.class similarity index 100% rename from Installer/target/classes/tech/nully/PluginInstaller/Installer.class rename to target/classes/tech/nully/PluginInstaller/Installer.class diff --git a/Installer/target/classes/tech/nully/PluginInstaller/Main.class b/target/classes/tech/nully/PluginInstaller/Main.class similarity index 100% rename from Installer/target/classes/tech/nully/PluginInstaller/Main.class rename to target/classes/tech/nully/PluginInstaller/Main.class diff --git a/Installer/target/classes/tech/nully/PluginInstaller/plistCommand.class b/target/classes/tech/nully/PluginInstaller/plistCommand.class similarity index 100% rename from Installer/target/classes/tech/nully/PluginInstaller/plistCommand.class rename to target/classes/tech/nully/PluginInstaller/plistCommand.class