From c1a34875cf1be4c844bbddcf69cd679468db60a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenzo=20Dellac=C3=A0?= <lorenzo.dellaca@mind-overflow.net>
Date: Sun, 10 Jan 2021 00:48:42 +0100
Subject: [PATCH] Move config classes to configuration sub-package

---
 src/net/mindoverflow/network/uhccore/UhcCore.java         | 2 +-
 .../network/uhccore/commands/UhcCoreCommand.java          | 2 +-
 .../uhccore/commands/uhccommands/ReloadCommand.java       | 2 +-
 .../uhccore/commands/uhccommands/SetFireworkCommand.java  | 4 ++--
 .../uhccore/commands/uhccommands/SetSpawnCommand.java     | 4 ++--
 .../uhccore/commands/uhccommands/StartUhcCommand.java     | 3 ---
 .../mindoverflow/network/uhccore/utils/MessageUtils.java  | 2 ++
 .../uhccore/utils/{ => configuration}/ConfigEntries.java  | 2 +-
 .../uhccore/utils/{ => configuration}/FileUtils.java      | 8 +++-----
 .../utils/{ => configuration}/LocalizedMessages.java      | 2 +-
 10 files changed, 14 insertions(+), 17 deletions(-)
 rename src/net/mindoverflow/network/uhccore/utils/{ => configuration}/ConfigEntries.java (91%)
 rename src/net/mindoverflow/network/uhccore/utils/{ => configuration}/FileUtils.java (98%)
 rename src/net/mindoverflow/network/uhccore/utils/{ => configuration}/LocalizedMessages.java (83%)

diff --git a/src/net/mindoverflow/network/uhccore/UhcCore.java b/src/net/mindoverflow/network/uhccore/UhcCore.java
index 64ec3ce..9f9ed83 100644
--- a/src/net/mindoverflow/network/uhccore/UhcCore.java
+++ b/src/net/mindoverflow/network/uhccore/UhcCore.java
@@ -4,7 +4,7 @@ import net.mindoverflow.network.uhccore.commands.UhcCoreCommand;
 import net.mindoverflow.network.uhccore.completers.InfoCompleter;
 import net.mindoverflow.network.uhccore.listeners.*;
 import net.mindoverflow.network.uhccore.utils.Debugger;
-import net.mindoverflow.network.uhccore.utils.FileUtils;
+import net.mindoverflow.network.uhccore.utils.configuration.FileUtils;
 import net.mindoverflow.network.uhccore.utils.MessageUtils;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
diff --git a/src/net/mindoverflow/network/uhccore/commands/UhcCoreCommand.java b/src/net/mindoverflow/network/uhccore/commands/UhcCoreCommand.java
index 16b10d4..3de4e54 100644
--- a/src/net/mindoverflow/network/uhccore/commands/UhcCoreCommand.java
+++ b/src/net/mindoverflow/network/uhccore/commands/UhcCoreCommand.java
@@ -4,7 +4,7 @@ import net.mindoverflow.network.uhccore.UhcCore;
 import net.mindoverflow.network.uhccore.commands.uhccommands.*;
 import net.mindoverflow.network.uhccore.utils.Debugger;
 import net.mindoverflow.network.uhccore.utils.MessageUtils;
-import net.mindoverflow.network.uhccore.utils.LocalizedMessages;
+import net.mindoverflow.network.uhccore.utils.configuration.LocalizedMessages;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
diff --git a/src/net/mindoverflow/network/uhccore/commands/uhccommands/ReloadCommand.java b/src/net/mindoverflow/network/uhccore/commands/uhccommands/ReloadCommand.java
index 80d0ddd..35a3cfe 100644
--- a/src/net/mindoverflow/network/uhccore/commands/uhccommands/ReloadCommand.java
+++ b/src/net/mindoverflow/network/uhccore/commands/uhccommands/ReloadCommand.java
@@ -1,7 +1,7 @@
 package net.mindoverflow.network.uhccore.commands.uhccommands;
 
 import net.mindoverflow.network.uhccore.utils.Debugger;
-import net.mindoverflow.network.uhccore.utils.FileUtils;
+import net.mindoverflow.network.uhccore.utils.configuration.FileUtils;
 import org.bukkit.command.CommandSender;
 
 import java.util.logging.Level;
diff --git a/src/net/mindoverflow/network/uhccore/commands/uhccommands/SetFireworkCommand.java b/src/net/mindoverflow/network/uhccore/commands/uhccommands/SetFireworkCommand.java
index 2537b32..f4448e3 100644
--- a/src/net/mindoverflow/network/uhccore/commands/uhccommands/SetFireworkCommand.java
+++ b/src/net/mindoverflow/network/uhccore/commands/uhccommands/SetFireworkCommand.java
@@ -1,9 +1,9 @@
 package net.mindoverflow.network.uhccore.commands.uhccommands;
 
 import net.mindoverflow.network.uhccore.utils.CommonValues;
-import net.mindoverflow.network.uhccore.utils.ConfigEntries;
+import net.mindoverflow.network.uhccore.utils.configuration.ConfigEntries;
 import net.mindoverflow.network.uhccore.utils.Debugger;
-import net.mindoverflow.network.uhccore.utils.FileUtils;
+import net.mindoverflow.network.uhccore.utils.configuration.FileUtils;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.YamlConfiguration;
diff --git a/src/net/mindoverflow/network/uhccore/commands/uhccommands/SetSpawnCommand.java b/src/net/mindoverflow/network/uhccore/commands/uhccommands/SetSpawnCommand.java
index 4fe9203..ff1255d 100644
--- a/src/net/mindoverflow/network/uhccore/commands/uhccommands/SetSpawnCommand.java
+++ b/src/net/mindoverflow/network/uhccore/commands/uhccommands/SetSpawnCommand.java
@@ -1,8 +1,8 @@
 package net.mindoverflow.network.uhccore.commands.uhccommands;
 
 import net.mindoverflow.network.uhccore.utils.CommonValues;
-import net.mindoverflow.network.uhccore.utils.ConfigEntries;
-import net.mindoverflow.network.uhccore.utils.FileUtils;
+import net.mindoverflow.network.uhccore.utils.configuration.ConfigEntries;
+import net.mindoverflow.network.uhccore.utils.configuration.FileUtils;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.YamlConfiguration;
diff --git a/src/net/mindoverflow/network/uhccore/commands/uhccommands/StartUhcCommand.java b/src/net/mindoverflow/network/uhccore/commands/uhccommands/StartUhcCommand.java
index f5eadfa..f0a42e4 100644
--- a/src/net/mindoverflow/network/uhccore/commands/uhccommands/StartUhcCommand.java
+++ b/src/net/mindoverflow/network/uhccore/commands/uhccommands/StartUhcCommand.java
@@ -2,16 +2,13 @@ package net.mindoverflow.network.uhccore.commands.uhccommands;
 
 import net.mindoverflow.network.uhccore.UhcCore;
 import net.mindoverflow.network.uhccore.utils.CommonValues;
-import net.mindoverflow.network.uhccore.utils.ConfigEntries;
 import net.mindoverflow.network.uhccore.utils.Debugger;
-import net.mindoverflow.network.uhccore.utils.FileUtils;
 import net.mindoverflow.network.uhccore.utils.math.NumberUtils;
 import org.bukkit.*;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import java.util.HashMap;
-import java.util.Random;
 import java.util.logging.Level;
 
 
diff --git a/src/net/mindoverflow/network/uhccore/utils/MessageUtils.java b/src/net/mindoverflow/network/uhccore/utils/MessageUtils.java
index 59161f0..3aa3ff1 100644
--- a/src/net/mindoverflow/network/uhccore/utils/MessageUtils.java
+++ b/src/net/mindoverflow/network/uhccore/utils/MessageUtils.java
@@ -2,6 +2,8 @@ package net.mindoverflow.network.uhccore.utils;
 
 
 import net.mindoverflow.network.uhccore.UhcCore;
+import net.mindoverflow.network.uhccore.utils.configuration.FileUtils;
+import net.mindoverflow.network.uhccore.utils.configuration.LocalizedMessages;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.YamlConfiguration;
diff --git a/src/net/mindoverflow/network/uhccore/utils/ConfigEntries.java b/src/net/mindoverflow/network/uhccore/utils/configuration/ConfigEntries.java
similarity index 91%
rename from src/net/mindoverflow/network/uhccore/utils/ConfigEntries.java
rename to src/net/mindoverflow/network/uhccore/utils/configuration/ConfigEntries.java
index 3d57afa..87d75a9 100644
--- a/src/net/mindoverflow/network/uhccore/utils/ConfigEntries.java
+++ b/src/net/mindoverflow/network/uhccore/utils/configuration/ConfigEntries.java
@@ -1,4 +1,4 @@
-package net.mindoverflow.network.uhccore.utils;
+package net.mindoverflow.network.uhccore.utils.configuration;
 
 public enum ConfigEntries
 {
diff --git a/src/net/mindoverflow/network/uhccore/utils/FileUtils.java b/src/net/mindoverflow/network/uhccore/utils/configuration/FileUtils.java
similarity index 98%
rename from src/net/mindoverflow/network/uhccore/utils/FileUtils.java
rename to src/net/mindoverflow/network/uhccore/utils/configuration/FileUtils.java
index 5e9d0d1..dde854e 100644
--- a/src/net/mindoverflow/network/uhccore/utils/FileUtils.java
+++ b/src/net/mindoverflow/network/uhccore/utils/configuration/FileUtils.java
@@ -1,21 +1,19 @@
-package net.mindoverflow.network.uhccore.utils;
+package net.mindoverflow.network.uhccore.utils.configuration;
 
 import net.mindoverflow.network.uhccore.UhcCore;
 import net.mindoverflow.network.uhccore.listeners.TeamsSelectorGUI;
+import net.mindoverflow.network.uhccore.utils.CommonValues;
+import net.mindoverflow.network.uhccore.utils.Debugger;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
-import sun.security.krb5.Config;
 
 import java.io.*;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
 import java.util.logging.Level;
 
 public class FileUtils
diff --git a/src/net/mindoverflow/network/uhccore/utils/LocalizedMessages.java b/src/net/mindoverflow/network/uhccore/utils/configuration/LocalizedMessages.java
similarity index 83%
rename from src/net/mindoverflow/network/uhccore/utils/LocalizedMessages.java
rename to src/net/mindoverflow/network/uhccore/utils/configuration/LocalizedMessages.java
index 0e3095b..709d984 100644
--- a/src/net/mindoverflow/network/uhccore/utils/LocalizedMessages.java
+++ b/src/net/mindoverflow/network/uhccore/utils/configuration/LocalizedMessages.java
@@ -1,4 +1,4 @@
-package net.mindoverflow.network.uhccore.utils;
+package net.mindoverflow.network.uhccore.utils.configuration;
 
 public enum LocalizedMessages {