From 3722ebb46afc28984382d65d6d756e3bda7cb956 Mon Sep 17 00:00:00 2001
From: Christian Koop <contact@sprax2013.de>
Date: Sat, 6 May 2023 22:16:11 +0200
Subject: [PATCH] Fix a couple compile errors after a lot of reverts and merges

---
 .../java/com/songoda/core/SongodaPlugin.java     |  4 ++--
 .../com/songoda/core/configuration/Config.java   |  2 +-
 .../com/songoda/core/gui/CustomizableGui.java    | 16 +++++++++++++---
 .../java/com/songoda/core/utils/BlockUtils.java  |  4 ++++
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Core/src/main/java/com/songoda/core/SongodaPlugin.java b/Core/src/main/java/com/songoda/core/SongodaPlugin.java
index 5363d9fb..41937b30 100644
--- a/Core/src/main/java/com/songoda/core/SongodaPlugin.java
+++ b/Core/src/main/java/com/songoda/core/SongodaPlugin.java
@@ -8,7 +8,7 @@ import com.songoda.core.utils.SongodaAuth;
 import de.tr7zw.changeme.nbtapi.utils.MinecraftVersion;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
-import org.bukkit.command.ConsoleCommandSender;
+import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -44,7 +44,7 @@ public abstract class SongodaPlugin extends JavaPlugin {
     /**
      * Called after reloadConfig() is called
      */
-    public abstract @NotNull List<SongodaYamlConfig> getConfigs();
+    public abstract void onConfigReload();
 
     /**
      * Any other plugin configuration files used by the plugin.
diff --git a/Core/src/main/java/com/songoda/core/configuration/Config.java b/Core/src/main/java/com/songoda/core/configuration/Config.java
index 6445382d..6efabd97 100644
--- a/Core/src/main/java/com/songoda/core/configuration/Config.java
+++ b/Core/src/main/java/com/songoda/core/configuration/Config.java
@@ -1,7 +1,7 @@
 package com.songoda.core.configuration;
 
 import com.songoda.core.utils.TextUtils;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConstructor;
diff --git a/Core/src/main/java/com/songoda/core/gui/CustomizableGui.java b/Core/src/main/java/com/songoda/core/gui/CustomizableGui.java
index 52463f2f..f41c4d5b 100644
--- a/Core/src/main/java/com/songoda/core/gui/CustomizableGui.java
+++ b/Core/src/main/java/com/songoda/core/gui/CustomizableGui.java
@@ -48,9 +48,19 @@ public class CustomizableGui extends Gui {
             Config config = new Config(plugin, "gui/" + guiKey + ".yml");
             config.load();
 
-            config.setNodeComment("overrides", "For information on how to apply overrides please visit\n" +
-                    "https://wiki.craftaro.com/index.php/Gui");
-            config.setNodeComment("overrides.example", "This is just an example and does not override to any items in this GUI.");
+            if (!config.isConfigurationSection("overrides")) {
+                config.setDefault("overrides.example.item", CompatibleMaterial.STONE.name(),
+                                "This is the icon material you would like to replace",
+                                "the current material with.")
+                        .setDefault("overrides.example.position", 5,
+                                "This is the current position of the icon you would like to move.",
+                                "The number represents the cell the icon currently resides in.")
+                        .setDefaultComment("overrides.example",
+                                "This is just an example and does not override to any items",
+                                "in this GUI.")
+                        .setDefaultComment("overrides",
+                                "For information on how to apply overrides please visit",
+                                "https://wiki.craftaro.com/index.php/Gui");
 
                 config.saveChanges();
             }
diff --git a/Core/src/main/java/com/songoda/core/utils/BlockUtils.java b/Core/src/main/java/com/songoda/core/utils/BlockUtils.java
index 5f4cb023..170a12df 100644
--- a/Core/src/main/java/com/songoda/core/utils/BlockUtils.java
+++ b/Core/src/main/java/com/songoda/core/utils/BlockUtils.java
@@ -19,6 +19,10 @@ import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+/**
+ * @deprecated This class will be removed in the future and replaced with a more maintainable system.
+ */
+@Deprecated
 public class BlockUtils {
     protected static final Set<Material> DOORS;
     protected static final Set<Material> PRESSURE_PLATES;