From 0f3b06a596f5cb774d4a90dd8375f13ec5fe9def Mon Sep 17 00:00:00 2001
From: JeremyStarTM <jeremystartm@staropensource.de>
Date: Tue, 30 Apr 2024 21:47:28 +0200
Subject: [PATCH] Move base classes into de.pickshadow.plugin.base

---
 src/main/java/de/pickshadow/plugin/{ => base}/Main.java       | 3 ++-
 src/main/java/de/pickshadow/plugin/{ => base}/ObjHolder.java  | 2 +-
 .../de/pickshadow/plugin/{ => base}/PluginInitializer.java    | 2 +-
 src/main/java/de/pickshadow/plugin/{ => base}/Scheduler.java  | 3 ++-
 .../de/pickshadow/plugin/{classes => base}/Translation.java   | 3 +--
 src/main/java/de/pickshadow/plugin/classes/CommandBase.java   | 2 +-
 src/main/java/de/pickshadow/plugin/classes/PlayerData.java    | 2 +-
 .../java/de/pickshadow/plugin/classes/logger/LoggerImpl.java  | 2 +-
 .../classes/logger/implementations/ExtendedBukkitLogger.java  | 2 +-
 .../java/de/pickshadow/plugin/commands/BroadcastCommand.java  | 2 +-
 .../java/de/pickshadow/plugin/commands/DiscordCommand.java    | 4 ++--
 src/main/java/de/pickshadow/plugin/commands/HomeCommand.java  | 2 +-
 src/main/java/de/pickshadow/plugin/commands/MsgCommand.java   | 4 ++--
 .../java/de/pickshadow/plugin/commands/PluginCommand.java     | 4 ++--
 .../pickshadow/plugin/commands/SystemInformationCommand.java  | 2 +-
 src/main/java/de/pickshadow/plugin/commands/TrollCommand.java | 4 ++--
 .../plugin/listeners/JoinLeaveMessagesListener.java           | 4 ++--
 src/main/java/de/pickshadow/plugin/loaders/ConfigLoader.java  | 2 +-
 .../java/de/pickshadow/plugin/loaders/PlayerDataLoader.java   | 4 ++--
 src/main/java/de/pickshadow/plugin/utils/Miscellaneous.java   | 4 ++--
 src/main/java/de/pickshadow/plugin/utils/SpellingHelper.java  | 2 +-
 src/main/resources/plugin.yml                                 | 2 +-
 22 files changed, 31 insertions(+), 30 deletions(-)
 rename src/main/java/de/pickshadow/plugin/{ => base}/Main.java (98%)
 rename src/main/java/de/pickshadow/plugin/{ => base}/ObjHolder.java (98%)
 rename src/main/java/de/pickshadow/plugin/{ => base}/PluginInitializer.java (99%)
 rename src/main/java/de/pickshadow/plugin/{ => base}/Scheduler.java (97%)
 rename src/main/java/de/pickshadow/plugin/{classes => base}/Translation.java (99%)

diff --git a/src/main/java/de/pickshadow/plugin/Main.java b/src/main/java/de/pickshadow/plugin/base/Main.java
similarity index 98%
rename from src/main/java/de/pickshadow/plugin/Main.java
rename to src/main/java/de/pickshadow/plugin/base/Main.java
index 1bbf953..ef76bd7 100644
--- a/src/main/java/de/pickshadow/plugin/Main.java
+++ b/src/main/java/de/pickshadow/plugin/base/Main.java
@@ -16,8 +16,9 @@
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package de.pickshadow.plugin;
+package de.pickshadow.plugin.base;
 
+import de.pickshadow.plugin.BuildConfiguration;
 import de.pickshadow.plugin.classes.logger.LoggerInstanceImpl;
 import de.pickshadow.plugin.classes.logger.implementations.ExtendedBukkitLogger;
 import de.pickshadow.plugin.loaders.ConfigLoader;
diff --git a/src/main/java/de/pickshadow/plugin/ObjHolder.java b/src/main/java/de/pickshadow/plugin/base/ObjHolder.java
similarity index 98%
rename from src/main/java/de/pickshadow/plugin/ObjHolder.java
rename to src/main/java/de/pickshadow/plugin/base/ObjHolder.java
index 0f79ade..aaeb417 100644
--- a/src/main/java/de/pickshadow/plugin/ObjHolder.java
+++ b/src/main/java/de/pickshadow/plugin/base/ObjHolder.java
@@ -16,7 +16,7 @@
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package de.pickshadow.plugin;
+package de.pickshadow.plugin.base;
 
 import de.pickshadow.plugin.classes.logger.LoggerImpl;
 import de.pickshadow.plugin.loaders.ConfigLoader;
diff --git a/src/main/java/de/pickshadow/plugin/PluginInitializer.java b/src/main/java/de/pickshadow/plugin/base/PluginInitializer.java
similarity index 99%
rename from src/main/java/de/pickshadow/plugin/PluginInitializer.java
rename to src/main/java/de/pickshadow/plugin/base/PluginInitializer.java
index 80e18c5..42d2f53 100644
--- a/src/main/java/de/pickshadow/plugin/PluginInitializer.java
+++ b/src/main/java/de/pickshadow/plugin/base/PluginInitializer.java
@@ -16,7 +16,7 @@
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package de.pickshadow.plugin;
+package de.pickshadow.plugin.base;
 
 import de.pickshadow.plugin.classes.logger.LoggerInstanceImpl;
 import de.pickshadow.plugin.commands.*;
diff --git a/src/main/java/de/pickshadow/plugin/Scheduler.java b/src/main/java/de/pickshadow/plugin/base/Scheduler.java
similarity index 97%
rename from src/main/java/de/pickshadow/plugin/Scheduler.java
rename to src/main/java/de/pickshadow/plugin/base/Scheduler.java
index 154f9c2..6f4a151 100644
--- a/src/main/java/de/pickshadow/plugin/Scheduler.java
+++ b/src/main/java/de/pickshadow/plugin/base/Scheduler.java
@@ -16,8 +16,9 @@
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package de.pickshadow.plugin;
+package de.pickshadow.plugin.base;
 
+import de.pickshadow.plugin.BuildConfiguration;
 import de.pickshadow.plugin.classes.Configuration;
 import de.pickshadow.plugin.classes.logger.LoggerInstanceImpl;
 import de.pickshadow.plugin.utils.Miscellaneous;
diff --git a/src/main/java/de/pickshadow/plugin/classes/Translation.java b/src/main/java/de/pickshadow/plugin/base/Translation.java
similarity index 99%
rename from src/main/java/de/pickshadow/plugin/classes/Translation.java
rename to src/main/java/de/pickshadow/plugin/base/Translation.java
index 6831972..9f41cd3 100644
--- a/src/main/java/de/pickshadow/plugin/classes/Translation.java
+++ b/src/main/java/de/pickshadow/plugin/base/Translation.java
@@ -16,11 +16,10 @@
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package de.pickshadow.plugin.classes;
+package de.pickshadow.plugin.base;
 
 import de.pickshadow.plugin.BuildConfiguration;
 import de.pickshadow.plugin.GitHead;
-import de.pickshadow.plugin.ObjHolder;
 
 import java.util.Arrays;
 
diff --git a/src/main/java/de/pickshadow/plugin/classes/CommandBase.java b/src/main/java/de/pickshadow/plugin/classes/CommandBase.java
index f016a1a..b5d5358 100644
--- a/src/main/java/de/pickshadow/plugin/classes/CommandBase.java
+++ b/src/main/java/de/pickshadow/plugin/classes/CommandBase.java
@@ -18,7 +18,7 @@
  */
 package de.pickshadow.plugin.classes;
 
-import de.pickshadow.plugin.ObjHolder;
+import de.pickshadow.plugin.base.ObjHolder;
 import de.pickshadow.plugin.classes.logger.LoggerInstanceImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.command.*;
diff --git a/src/main/java/de/pickshadow/plugin/classes/PlayerData.java b/src/main/java/de/pickshadow/plugin/classes/PlayerData.java
index 5bad964..dcfe0c8 100644
--- a/src/main/java/de/pickshadow/plugin/classes/PlayerData.java
+++ b/src/main/java/de/pickshadow/plugin/classes/PlayerData.java
@@ -18,7 +18,7 @@
  */
 package de.pickshadow.plugin.classes;
 
-import de.pickshadow.plugin.ObjHolder;
+import de.pickshadow.plugin.base.ObjHolder;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.ApiStatus;
diff --git a/src/main/java/de/pickshadow/plugin/classes/logger/LoggerImpl.java b/src/main/java/de/pickshadow/plugin/classes/logger/LoggerImpl.java
index b4e74ee..bdffc4a 100644
--- a/src/main/java/de/pickshadow/plugin/classes/logger/LoggerImpl.java
+++ b/src/main/java/de/pickshadow/plugin/classes/logger/LoggerImpl.java
@@ -19,7 +19,7 @@
 package de.pickshadow.plugin.classes.logger;
 
 import de.pickshadow.plugin.BuildConfiguration;
-import de.pickshadow.plugin.ObjHolder;
+import de.pickshadow.plugin.base.ObjHolder;
 import de.pickshadow.plugin.classes.Types;
 import de.pickshadow.plugin.utils.Miscellaneous;
 import org.bukkit.Bukkit;
diff --git a/src/main/java/de/pickshadow/plugin/classes/logger/implementations/ExtendedBukkitLogger.java b/src/main/java/de/pickshadow/plugin/classes/logger/implementations/ExtendedBukkitLogger.java
index 3a4cf9e..51537f5 100644
--- a/src/main/java/de/pickshadow/plugin/classes/logger/implementations/ExtendedBukkitLogger.java
+++ b/src/main/java/de/pickshadow/plugin/classes/logger/implementations/ExtendedBukkitLogger.java
@@ -18,7 +18,7 @@
  */
 package de.pickshadow.plugin.classes.logger.implementations;
 
-import de.pickshadow.plugin.ObjHolder;
+import de.pickshadow.plugin.base.ObjHolder;
 import de.pickshadow.plugin.classes.Types;
 import de.pickshadow.plugin.classes.logger.LoggerImpl;
 import org.bukkit.Bukkit;
diff --git a/src/main/java/de/pickshadow/plugin/commands/BroadcastCommand.java b/src/main/java/de/pickshadow/plugin/commands/BroadcastCommand.java
index c887c2c..b341a07 100644
--- a/src/main/java/de/pickshadow/plugin/commands/BroadcastCommand.java
+++ b/src/main/java/de/pickshadow/plugin/commands/BroadcastCommand.java
@@ -18,7 +18,7 @@
  */
 package de.pickshadow.plugin.commands;
 
-import de.pickshadow.plugin.ObjHolder;
+import de.pickshadow.plugin.base.ObjHolder;
 import de.pickshadow.plugin.classes.CommandBase;
 import de.pickshadow.plugin.classes.Types;
 import de.pickshadow.plugin.utils.Miscellaneous;
diff --git a/src/main/java/de/pickshadow/plugin/commands/DiscordCommand.java b/src/main/java/de/pickshadow/plugin/commands/DiscordCommand.java
index af3997e..2f752b6 100644
--- a/src/main/java/de/pickshadow/plugin/commands/DiscordCommand.java
+++ b/src/main/java/de/pickshadow/plugin/commands/DiscordCommand.java
@@ -19,8 +19,8 @@
 package de.pickshadow.plugin.commands;
 
 import de.pickshadow.plugin.classes.CommandBase;
-import de.pickshadow.plugin.classes.Translation;
-import de.pickshadow.plugin.ObjHolder;
+import de.pickshadow.plugin.base.Translation;
+import de.pickshadow.plugin.base.ObjHolder;
 import de.pickshadow.plugin.classes.Types;
 import de.pickshadow.plugin.utils.Miscellaneous;
 import de.pickshadow.plugin.utils.TabCompletionHelper;
diff --git a/src/main/java/de/pickshadow/plugin/commands/HomeCommand.java b/src/main/java/de/pickshadow/plugin/commands/HomeCommand.java
index 80d2260..f7fe0c1 100644
--- a/src/main/java/de/pickshadow/plugin/commands/HomeCommand.java
+++ b/src/main/java/de/pickshadow/plugin/commands/HomeCommand.java
@@ -19,7 +19,7 @@
 package de.pickshadow.plugin.commands;
 
 import de.pickshadow.plugin.classes.CommandBase;
-import de.pickshadow.plugin.classes.Translation;
+import de.pickshadow.plugin.base.Translation;
 import de.pickshadow.plugin.classes.Types;
 import de.pickshadow.plugin.utils.Miscellaneous;
 import de.pickshadow.plugin.utils.TabCompletionHelper;
diff --git a/src/main/java/de/pickshadow/plugin/commands/MsgCommand.java b/src/main/java/de/pickshadow/plugin/commands/MsgCommand.java
index e006fb7..3c04b43 100644
--- a/src/main/java/de/pickshadow/plugin/commands/MsgCommand.java
+++ b/src/main/java/de/pickshadow/plugin/commands/MsgCommand.java
@@ -19,10 +19,10 @@
 package de.pickshadow.plugin.commands;
 
 import de.pickshadow.plugin.BuildConfiguration;
-import de.pickshadow.plugin.ObjHolder;
+import de.pickshadow.plugin.base.ObjHolder;
 import de.pickshadow.plugin.classes.CommandBase;
 import de.pickshadow.plugin.classes.PlayerData;
-import de.pickshadow.plugin.classes.Translation;
+import de.pickshadow.plugin.base.Translation;
 import de.pickshadow.plugin.classes.Types;
 import de.pickshadow.plugin.utils.Miscellaneous;
 import de.pickshadow.plugin.utils.TabCompletionHelper;
diff --git a/src/main/java/de/pickshadow/plugin/commands/PluginCommand.java b/src/main/java/de/pickshadow/plugin/commands/PluginCommand.java
index db6eaf9..0ff9433 100644
--- a/src/main/java/de/pickshadow/plugin/commands/PluginCommand.java
+++ b/src/main/java/de/pickshadow/plugin/commands/PluginCommand.java
@@ -19,8 +19,8 @@
 package de.pickshadow.plugin.commands;
 
 import de.pickshadow.plugin.classes.CommandBase;
-import de.pickshadow.plugin.classes.Translation;
-import de.pickshadow.plugin.ObjHolder;
+import de.pickshadow.plugin.base.Translation;
+import de.pickshadow.plugin.base.ObjHolder;
 import de.pickshadow.plugin.classes.Types;
 import de.pickshadow.plugin.classes.Configuration;
 import de.pickshadow.plugin.utils.Miscellaneous;
diff --git a/src/main/java/de/pickshadow/plugin/commands/SystemInformationCommand.java b/src/main/java/de/pickshadow/plugin/commands/SystemInformationCommand.java
index a1c9f60..95b3973 100644
--- a/src/main/java/de/pickshadow/plugin/commands/SystemInformationCommand.java
+++ b/src/main/java/de/pickshadow/plugin/commands/SystemInformationCommand.java
@@ -19,7 +19,7 @@
 package de.pickshadow.plugin.commands;
 
 import de.pickshadow.plugin.classes.CommandBase;
-import de.pickshadow.plugin.classes.Translation;
+import de.pickshadow.plugin.base.Translation;
 import de.pickshadow.plugin.utils.Miscellaneous;
 import de.pickshadow.plugin.utils.TabCompletionHelper;
 import net.kyori.adventure.text.Component;
diff --git a/src/main/java/de/pickshadow/plugin/commands/TrollCommand.java b/src/main/java/de/pickshadow/plugin/commands/TrollCommand.java
index 4c80384..9489946 100644
--- a/src/main/java/de/pickshadow/plugin/commands/TrollCommand.java
+++ b/src/main/java/de/pickshadow/plugin/commands/TrollCommand.java
@@ -18,9 +18,9 @@
  */
 package de.pickshadow.plugin.commands;
 
-import de.pickshadow.plugin.ObjHolder;
+import de.pickshadow.plugin.base.ObjHolder;
 import de.pickshadow.plugin.classes.CommandBase;
-import de.pickshadow.plugin.classes.Translation;
+import de.pickshadow.plugin.base.Translation;
 import de.pickshadow.plugin.classes.Types;
 import de.pickshadow.plugin.utils.Miscellaneous;
 import de.pickshadow.plugin.utils.TabCompletionHelper;
diff --git a/src/main/java/de/pickshadow/plugin/listeners/JoinLeaveMessagesListener.java b/src/main/java/de/pickshadow/plugin/listeners/JoinLeaveMessagesListener.java
index a0ddfc5..f10c013 100644
--- a/src/main/java/de/pickshadow/plugin/listeners/JoinLeaveMessagesListener.java
+++ b/src/main/java/de/pickshadow/plugin/listeners/JoinLeaveMessagesListener.java
@@ -18,8 +18,8 @@
  */
 package de.pickshadow.plugin.listeners;
 
-import de.pickshadow.plugin.ObjHolder;
-import de.pickshadow.plugin.classes.Translation;
+import de.pickshadow.plugin.base.ObjHolder;
+import de.pickshadow.plugin.base.Translation;
 import de.pickshadow.plugin.utils.Miscellaneous;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
diff --git a/src/main/java/de/pickshadow/plugin/loaders/ConfigLoader.java b/src/main/java/de/pickshadow/plugin/loaders/ConfigLoader.java
index 975f7c0..7fde373 100644
--- a/src/main/java/de/pickshadow/plugin/loaders/ConfigLoader.java
+++ b/src/main/java/de/pickshadow/plugin/loaders/ConfigLoader.java
@@ -18,7 +18,7 @@
  */
 package de.pickshadow.plugin.loaders;
 
-import de.pickshadow.plugin.ObjHolder;
+import de.pickshadow.plugin.base.ObjHolder;
 import de.pickshadow.plugin.classes.Configuration;
 import de.pickshadow.plugin.classes.logger.LoggerInstanceImpl;
 import de.pickshadow.plugin.utils.FileOperations;
diff --git a/src/main/java/de/pickshadow/plugin/loaders/PlayerDataLoader.java b/src/main/java/de/pickshadow/plugin/loaders/PlayerDataLoader.java
index eacc237..016c539 100644
--- a/src/main/java/de/pickshadow/plugin/loaders/PlayerDataLoader.java
+++ b/src/main/java/de/pickshadow/plugin/loaders/PlayerDataLoader.java
@@ -18,9 +18,9 @@
  */
 package de.pickshadow.plugin.loaders;
 
-import de.pickshadow.plugin.ObjHolder;
+import de.pickshadow.plugin.base.ObjHolder;
 import de.pickshadow.plugin.classes.PlayerData;
-import de.pickshadow.plugin.classes.Translation;
+import de.pickshadow.plugin.base.Translation;
 import de.pickshadow.plugin.classes.Types;
 import de.pickshadow.plugin.classes.logger.LoggerInstanceImpl;
 import de.pickshadow.plugin.utils.FileOperations;
diff --git a/src/main/java/de/pickshadow/plugin/utils/Miscellaneous.java b/src/main/java/de/pickshadow/plugin/utils/Miscellaneous.java
index 80234fa..76b5b03 100644
--- a/src/main/java/de/pickshadow/plugin/utils/Miscellaneous.java
+++ b/src/main/java/de/pickshadow/plugin/utils/Miscellaneous.java
@@ -18,8 +18,8 @@
  */
 package de.pickshadow.plugin.utils;
 
-import de.pickshadow.plugin.classes.Translation;
-import de.pickshadow.plugin.ObjHolder;
+import de.pickshadow.plugin.base.Translation;
+import de.pickshadow.plugin.base.ObjHolder;
 import de.pickshadow.plugin.classes.Types;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
diff --git a/src/main/java/de/pickshadow/plugin/utils/SpellingHelper.java b/src/main/java/de/pickshadow/plugin/utils/SpellingHelper.java
index fe6b91d..0d6095c 100644
--- a/src/main/java/de/pickshadow/plugin/utils/SpellingHelper.java
+++ b/src/main/java/de/pickshadow/plugin/utils/SpellingHelper.java
@@ -20,7 +20,7 @@ package de.pickshadow.plugin.utils;
 
 import com.nikialeksey.hunspell.Hunspell;
 import de.pickshadow.plugin.BuildConfiguration;
-import de.pickshadow.plugin.ObjHolder;
+import de.pickshadow.plugin.base.ObjHolder;
 import de.pickshadow.plugin.classes.logger.LoggerInstanceImpl;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 355f42c..bd43424 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 name: PSSP
 version: '${version}'
-main: de.pickshadow.plugin.Main
+main: de.pickshadow.plugin.base.Main
 api-version: '1.20'
 prefix: PSSP
 depend: [ FreedomChat ]