From 80bd5ff4ab499802893d1aa8c2989196972cbf91 Mon Sep 17 00:00:00 2001
From: aro <pantoine.rochas@gmail.com>
Date: Mon, 6 Mar 2023 20:19:42 +0100
Subject: [PATCH] fix: invalid configuration

---
 .../net/artelnatif/nicko/NickoBukkit.java     | 20 +++++++++----------
 core/src/main/resources/config.yml            |  5 -----
 .../nicko/test/NickoPluginTest.java           |  2 +-
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/core/src/main/java/net/artelnatif/nicko/NickoBukkit.java b/core/src/main/java/net/artelnatif/nicko/NickoBukkit.java
index 8ff3a2a..22d9c17 100644
--- a/core/src/main/java/net/artelnatif/nicko/NickoBukkit.java
+++ b/core/src/main/java/net/artelnatif/nicko/NickoBukkit.java
@@ -4,17 +4,17 @@ import de.studiocode.invui.gui.structure.Structure;
 import de.studiocode.invui.item.builder.ItemBuilder;
 import de.studiocode.invui.item.impl.SimpleItem;
 import net.artelnatif.nicko.command.NickoCommand;
+import net.artelnatif.nicko.config.Configuration;
 import net.artelnatif.nicko.config.ConfigurationManager;
 import net.artelnatif.nicko.event.PlayerJoinListener;
 import net.artelnatif.nicko.event.PlayerQuitListener;
 import net.artelnatif.nicko.gui.items.main.ExitGUI;
 import net.artelnatif.nicko.i18n.Locale;
 import net.artelnatif.nicko.i18n.LocaleFileManager;
-import net.artelnatif.nicko.mojang.MojangAPI;
-import net.artelnatif.nicko.placeholder.PlaceHolderHook;
-import net.artelnatif.nicko.config.Configuration;
 import net.artelnatif.nicko.impl.Internals;
 import net.artelnatif.nicko.impl.InternalsProvider;
+import net.artelnatif.nicko.mojang.MojangAPI;
+import net.artelnatif.nicko.placeholder.PlaceHolderHook;
 import net.artelnatif.nicko.storage.PlayerDataStore;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -25,13 +25,11 @@ import org.bukkit.plugin.java.JavaPluginLoader;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.logging.Logger;
 
 public class NickoBukkit extends JavaPlugin {
     private static NickoBukkit plugin;
 
-    private ConfigurationManager configManager;
-    private Logger logger;
+    private ConfigurationManager configurationManager;
     private File dataFolder;
     private MojangAPI mojangAPI;
     private Configuration configuration;
@@ -55,11 +53,11 @@ public class NickoBukkit extends JavaPlugin {
     @Override
     public void onEnable() {
         plugin = this;
-        configManager = new ConfigurationManager(getDataFolder());
-        configManager.saveDefaultConfig();
+        configurationManager = new ConfigurationManager(getDataFolder());
+        configurationManager.saveDefaultConfig();
 
         mojangAPI = new MojangAPI();
-        dataStore = new PlayerDataStore(mojangAPI, configuration);
+        dataStore = new PlayerDataStore(mojangAPI, getNickoConfig());
 
         if (!getDataStore().getStorage().isError()) {
             getLogger().info("Loading persistence...");
@@ -125,10 +123,10 @@ public class NickoBukkit extends JavaPlugin {
 
     public Configuration getNickoConfig() {
         try {
-            if (configuration == null) { return configuration = configManager.load(); }
+            if (configuration == null) { return configuration = configurationManager.load(); }
             return configuration;
         } catch (IOException e) {
-            logger.severe("Failed to load configuration file: " + e.getMessage());
+            getLogger().severe("Failed to load configuration file: " + e.getMessage());
             return null;
         }
     }
diff --git a/core/src/main/resources/config.yml b/core/src/main/resources/config.yml
index e38a56e..79a5a5b 100644
--- a/core/src/main/resources/config.yml
+++ b/core/src/main/resources/config.yml
@@ -36,11 +36,6 @@ prefix: "§8[§6Nicko§8] "
 # Accepted values: false (Disabled), true (Enabled)
 local: true
 
-# Enables Bungeecord support, switching
-# servers will transfer player's disguise.
-# Accepted values: false (Disabled), true (Enabled)
-bungeecord: false
-
 # Nicko will copy the English locale as "lang.yml"
 # and will use the translations in that file when "Server Custom"
 # is selected as the player's locale.
diff --git a/core/src/test/java/net/artelnatif/nicko/test/NickoPluginTest.java b/core/src/test/java/net/artelnatif/nicko/test/NickoPluginTest.java
index 3ae5695..ec63b63 100644
--- a/core/src/test/java/net/artelnatif/nicko/test/NickoPluginTest.java
+++ b/core/src/test/java/net/artelnatif/nicko/test/NickoPluginTest.java
@@ -25,7 +25,7 @@ public class NickoPluginTest {
     @DisplayName("Plugin Initialization")
     public void testPluginInitialization() {
         Assertions.assertNotNull(plugin.getDataStore().getStorage().getProvider());
-        Assertions.assertNotNull(plugin.getConfig());
+        Assertions.assertNotNull(plugin.getNickoConfig());
     }
 
     @AfterAll