fix(init): try to properly disable the plugin

.gitignore

@@ -24,6 +24,9 @@
 hs_err_pid*
 replay_pid*
 
+# Nicko first pass build files
+core/target
+
 # Idea Folder
 .idea
 

core/src/main/java/net/artelnatif/nicko/NickoBukkit.java

@@ -27,52 +27,55 @@ public class NickoBukkit extends JavaPlugin {
     @Override
     public void onEnable() {
         plugin = this;
+        mojangAPI = new MojangAPI();
+        nickoConfiguration = new NickoConfiguration(this);
+        dataStore = new PlayerDataStore(this);
 
         getLogger().info("Loading internals...");
         if (getInternals() == null) {
             getLogger().log(Level.SEVERE, "Nicko could not find a valid implementation for this server version. Is your server supported?");
+            dataStore.getStorage().setError(true);
             getServer().getPluginManager().disablePlugin(this);
         }
 
-        final PluginCommand command = getCommand("nicko");
+        if (getServer().getPluginManager().isPluginEnabled(this)) {
-        if (command != null) {
+            final PluginCommand command = getCommand("nicko");
-            command.setExecutor(new NickoCommand());
+            if (command != null) {
-            command.setTabCompleter(new NickoTabCompleter());
+                command.setExecutor(new NickoCommand());
-        }
+                command.setTabCompleter(new NickoTabCompleter());
-
-        getServer().getPluginManager().registerEvents(new PlayerJoinListener(), this);
-        getServer().getPluginManager().registerEvents(new PlayerQuitListener(), this);
-
-        mojangAPI = new MojangAPI();
-        nickoConfiguration = new NickoConfiguration(this);
-
-        getLogger().info("Loading configuration...");
-        saveDefaultConfig();
-
-        getLogger().info("Loading persistence...");
-        dataStore = new PlayerDataStore(this);
-        if (!dataStore.getStorage().getProvider().init()) {
-            dataStore.getStorage().setError(true);
-            getLogger().warning("Failed to open persistence, data will NOT be saved!");
-        }
-
-        if (nickoConfiguration.isBungeecordEnabled()) {
-            getLogger().info("Enabling Bungeecord support...");
-            if (ServerUtils.checkBungeeCordHook()) {
-                getServer().getMessenger().registerIncomingPluginChannel(this, NickoBungee.NICKO_PLUGIN_CHANNEL_UPDATE, new UpdateMessageHandler());
             }
-        }
 
-        getLogger().info("Nicko (Bukkit) has been enabled.");
+            getServer().getPluginManager().registerEvents(new PlayerJoinListener(), this);
+            getServer().getPluginManager().registerEvents(new PlayerQuitListener(), this);
+
+            getLogger().info("Loading configuration...");
+            saveDefaultConfig();
+
+            getLogger().info("Loading persistence...");
+
+            if (!dataStore.getStorage().getProvider().init()) {
+                dataStore.getStorage().setError(true);
+                getLogger().warning("Failed to open persistence, data will NOT be saved!");
+            }
+
+            if (nickoConfiguration.isBungeecordEnabled()) {
+                getLogger().info("Enabling Bungeecord support...");
+                if (ServerUtils.checkBungeeCordHook()) {
+                    getServer().getMessenger().registerIncomingPluginChannel(this, NickoBungee.NICKO_PLUGIN_CHANNEL_UPDATE, new UpdateMessageHandler());
+                }
+            }
+
+            getLogger().info("Nicko (Bukkit) has been enabled.");
+        }
     }
 
     @Override
     public void onDisable() {
-        getLogger().info("Closing persistence...");
+        if (!dataStore.getStorage().isError()) {
-        if (!dataStore.getStorage().getProvider().close()) {
+            getLogger().info("Closing persistence...");
-            getLogger().warning("Failed to close persistence!");
+            if (!dataStore.getStorage().getProvider().close()) {
-        }
+                getLogger().warning("Failed to close persistence!");
-        if (dataStore.getStorage().isError()) {
+            }
             dataStore.getStorage().setError(false);
         }
 

core/target/classes/bungee.yml

@@ -1,4 +0,0 @@
-name: Nicko
-main: net.artelnatif.nicko.bungee.NickoBungee
-version: 1.0-SNAPSHOT
-author: Aro

core/target/classes/config.yml

@@ -1,26 +0,0 @@
-# Nicko 1.0-SNAPSHOT - Config:
-
-prefix: "§8[§6Nicko§8] "
-
-bungeecord:
-  redis:
-    username: ""
-    password: ""
-    # Time To Live, the time the data will be stored on a player-by-player basis.
-    ttl: -1
-
-
-disguisekit:
-  # The rainbow header text in the book.
-  header: "Nicko's Disguise Kit"
-
-storage:
-  # Indicates wherever the data will be stored
-  # locally through a .json file or a (My)SQL database.
-  local: true
-  # SQL database's address
-  address: "localhost"
-  # SQL database's username.
-  username: ""
-  # SQL database's password.
-  password: ""

core/target/classes/plugin.yml

@@ -1,7 +0,0 @@
-name: Nicko
-main: net.artelnatif.nicko.NickoBukkit
-version: 1.0-SNAPSHOT
-author: Aro
-api-version: 1.18
-commands:
-  nicko:

core/target/maven-archiver/pom.properties

@@ -1,5 +0,0 @@
-#Generated by Maven
-#Thu Oct 13 10:30:55 CEST 2022
-groupId=net.artelnatif
-artifactId=nicko-core
-version=1.0-SNAPSHOT

core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,38 +0,0 @@
-net/artelnatif/nicko/disguise/AppearanceManager.class
-net/artelnatif/nicko/mojang/MojangSkin.class
-net/artelnatif/nicko/command/NickoPermissions$Player.class
-net/artelnatif/nicko/impl/Internals.class
-net/artelnatif/nicko/anvil/AnvilManager.class
-net/artelnatif/nicko/bungee/event/ServerSwitchListener.class
-com/yoshiplex/rainbow/RainbowText.class
-net/artelnatif/nicko/storage/PlayerDataStore.class
-net/artelnatif/nicko/command/sub/NickoDisguiseSubCmd.class
-net/artelnatif/nicko/mojang/MojangAPI$1.class
-net/artelnatif/nicko/i18n/I18N$Message$Command.class
-net/artelnatif/nicko/mojang/MojangAPI.class
-net/artelnatif/nicko/command/NickoTabCompleter.class
-net/artelnatif/nicko/i18n/I18N$Message.class
-net/artelnatif/nicko/event/PlayerJoinListener.class
-net/artelnatif/nicko/command/NickoCommand.class
-net/artelnatif/nicko/disguise/NickoProfile.class
-net/artelnatif/nicko/event/PlayerQuitListener.class
-net/artelnatif/nicko/impl/InternalsProvider.class
-net/artelnatif/nicko/config/NickoConfiguration.class
-net/artelnatif/nicko/storage/json/JSONStorage.class
-net/artelnatif/nicko/bungee/pluginchannel/PluginChannelHelper.class
-net/artelnatif/nicko/storage/sql/SQLStorage.class
-net/artelnatif/nicko/mojang/MojangUtils.class
-net/artelnatif/nicko/command/NickoPermissions$Player$Command.class
-net/artelnatif/nicko/utils/PlayerUtils.class
-net/artelnatif/nicko/i18n/I18N.class
-net/artelnatif/nicko/storage/sql/SQLStorageProvider.class
-net/artelnatif/nicko/storage/StorageProvider.class
-net/artelnatif/nicko/command/sub/NickoGUISubCmd.class
-net/artelnatif/nicko/command/sub/NickoCheckSubCmd.class
-net/artelnatif/nicko/bungee/NickoBungee.class
-net/artelnatif/nicko/command/sub/NickoSubCmd.class
-net/artelnatif/nicko/command/NickoPermissions.class
-net/artelnatif/nicko/command/sub/NickoDebugSubCmd.class
-net/artelnatif/nicko/storage/Storage.class
-net/artelnatif/nicko/NickoBukkit.class
-net/artelnatif/nicko/storage/json/JSONStorageProvider.class

core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,33 +0,0 @@
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/command/NickoPermissions.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/storage/json/JSONStorage.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/event/PlayerQuitListener.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/disguise/NickoProfile.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/command/NickoTabCompleter.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/storage/json/JSONStorageProvider.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/com/yoshiplex/rainbow/RainbowText.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/impl/InternalsProvider.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/anvil/AnvilManager.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/bungee/event/ServerSwitchListener.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/command/sub/NickoCheckSubCmd.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/disguise/AppearanceManager.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/storage/StorageProvider.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/NickoBukkit.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/storage/Storage.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/bungee/NickoBungee.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/bungee/pluginchannel/PluginChannelHelper.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/storage/PlayerDataStore.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/utils/PlayerUtils.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/storage/sql/SQLStorageProvider.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/event/PlayerJoinListener.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/config/NickoConfiguration.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/mojang/MojangAPI.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/command/sub/NickoDebugSubCmd.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/command/NickoCommand.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/command/sub/NickoSubCmd.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/i18n/I18N.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/impl/Internals.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/command/sub/NickoDisguiseSubCmd.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/storage/sql/SQLStorage.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/mojang/MojangSkin.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/command/sub/NickoGUISubCmd.java
-/home/aro/IdeaProjects/Nicko/core/src/main/java/net/artelnatif/nicko/mojang/MojangUtils.java

core/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

@@ -1 +0,0 @@
-net/artelnatif/nicko/test/MojangAPITest.class

core/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -1 +0,0 @@
-/home/aro/IdeaProjects/Nicko/core/src/test/java/net/artelnatif/nicko/test/MojangAPITest.java

v1_18_R1/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Oct 13 10:30:56 CEST 2022
+#Thu Oct 20 22:29:49 CEST 2022
 groupId=net.artelnatif
 artifactId=nicko-v1_18_R1
 version=1.0-SNAPSHOT

v1_18_R2/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Oct 13 10:30:56 CEST 2022
+#Thu Oct 20 22:29:49 CEST 2022
 groupId=net.artelnatif
 artifactId=nicko-v1_18_R2
 version=1.0-SNAPSHOT