From 295b616669299f36a32402274ecf45650755b397 Mon Sep 17 00:00:00 2001
From: mfnalex <mail@jeff-media.de>
Date: Wed, 19 May 2021 15:16:24 +0200
Subject: [PATCH] 10.0.0

---
 CHANGELOG.md                                  |  6 +++++
 pom.xml                                       | 14 +++++------
 .../ChestSortAPIHandler.java                  |  5 +++-
 .../ChestSortAdminCommand.java                |  2 +-
 .../ChestSortCategory.java                    |  4 +--
 .../ChestSortChestSortCommand.java            |  2 +-
 .../ChestSortConfigUpdater.java               |  4 +--
 .../ChestSortDebugger.java                    |  2 +-
 .../ChestSortInvSortCommand.java              |  2 +-
 .../ChestSortListener.java                    |  7 +++---
 .../ChestSortLogger.java                      |  2 +-
 .../ChestSortMessages.java                    |  2 +-
 .../ChestSortOrganizer.java                   | 18 ++++++-------
 .../ChestSortPermissionsHandler.java          |  2 +-
 .../ChestSortPlayerSetting.java               |  2 +-
 .../ChestSortPlugin.java                      | 25 ++++++++++++-------
 .../ChestSortSettingsGUI.java                 |  2 +-
 .../ChestSortTabCompleter.java                |  2 +-
 .../config/Config.java                        |  4 +--
 .../hooks/CrackShotHook.java                  |  4 +--
 .../hooks/CrateReloadedHook.java              |  4 +--
 .../hooks/CustomItemsHook.java                |  2 +-
 .../hooks/EnderContainersHook.java            |  4 +--
 .../hooks/GenericGUIHook.java                 |  4 +--
 .../hooks/GoldenCratesHook.java               |  4 +--
 .../hooks/HeadDatabaseHook.java               |  4 +--
 .../hooks/InventoryPagesHook.java             |  4 +--
 .../hooks/MinepacksHook.java                  |  4 +--
 .../hooks/PlayerVaultsHook.java               |  4 +--
 .../hooks/SlimeFunHook.java                   |  2 +-
 .../placeholders/ChestSortPlaceholders.java   |  4 +--
 .../test/APIDeprecation.java                  |  4 +--
 .../utils/CategoryLinePair.java               |  2 +-
 .../utils/LlamaUtils.java                     |  2 +-
 .../utils/TypeMatchPositionPair.java          |  2 +-
 .../{ChestSort => chestsort}/utils/Utils.java |  4 +--
 src/main/resources/plugin.yml                 |  2 +-
 37 files changed, 91 insertions(+), 76 deletions(-)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/ChestSortAPIHandler.java (93%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/ChestSortAdminCommand.java (98%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/ChestSortCategory.java (95%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/ChestSortChestSortCommand.java (99%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/ChestSortConfigUpdater.java (98%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/ChestSortDebugger.java (97%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/ChestSortInvSortCommand.java (98%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/ChestSortListener.java (99%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/ChestSortLogger.java (98%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/ChestSortMessages.java (99%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/ChestSortOrganizer.java (98%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/ChestSortPermissionsHandler.java (97%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/ChestSortPlayerSetting.java (98%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/ChestSortPlugin.java (98%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/ChestSortSettingsGUI.java (99%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/ChestSortTabCompleter.java (97%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/config/Config.java (80%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/hooks/CrackShotHook.java (88%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/hooks/CrateReloadedHook.java (88%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/hooks/CustomItemsHook.java (79%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/hooks/EnderContainersHook.java (87%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/hooks/GenericGUIHook.java (88%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/hooks/GoldenCratesHook.java (88%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/hooks/HeadDatabaseHook.java (85%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/hooks/InventoryPagesHook.java (97%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/hooks/MinepacksHook.java (94%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/hooks/PlayerVaultsHook.java (88%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/hooks/SlimeFunHook.java (90%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/placeholders/ChestSortPlaceholders.java (97%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/test/APIDeprecation.java (70%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/utils/CategoryLinePair.java (95%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/utils/LlamaUtils.java (94%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/utils/TypeMatchPositionPair.java (95%)
 rename src/main/java/de/jeff_media/{ChestSort => chestsort}/utils/Utils.java (94%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5402a23..5a568c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 10.0.0
+- API update - some weird Spigot update broke casting the Plugin instance to its interface.
+  - Plugins depending on ChestSort or using its API must be updated too.
+  - API is now accessed simply via de.jeff_media.chestsort.ChestSortAPI
+  - Added "isChestSortInstalled" method
+
 ## 9.7.2
 - Updated Turkish translation
 
diff --git a/pom.xml b/pom.xml
index 13032b7..3ebf635 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 	<name>ChestSort</name>
 	<url>https://www.chestsort.de</url>
 	<description>Automatically sorts your chests!</description>
-	<version>9.7.2</version>
+	<version>10.0.0</version>
 	<packaging>jar</packaging>
 
 	<properties>
@@ -45,23 +45,23 @@
 					<relocations>
 						<relocation>
 							<pattern>de.jeff_media.jefflib</pattern>
-							<shadedPattern>de.jeff_media.ChestSort.jefflib</shadedPattern>
+							<shadedPattern>de.jeff_media.chestsort.jefflib</shadedPattern>
 						</relocation>
 						<relocation>
 							<pattern>org.apache.maven.artifact</pattern>
-							<shadedPattern>de.jeff_media.ChestSort.jefflib.thirdparty.org.apache.maven.artifact</shadedPattern>
+							<shadedPattern>de.jeff_media.chestsort.jefflib.thirdparty.org.apache.maven.artifact</shadedPattern>
 						</relocation>
 						<relocation>
 							<pattern>de.jeff_media.updatechecker</pattern>
-							<shadedPattern>de.jeff_media.ChestSort.updatechecker</shadedPattern>
+							<shadedPattern>de.jeff_media.chestsort.updatechecker</shadedPattern>
 						</relocation>
 						<relocation>
 							<pattern>org.bstats</pattern>
-							<shadedPattern>de.jeff_media.ChestSort</shadedPattern>
+							<shadedPattern>de.jeff_media.chestsort</shadedPattern>
 						</relocation>
 						<relocation>
 							<pattern>io.papermc.lib</pattern>
-							<shadedPattern>de.jeff_media.ChestSort.paperlib</shadedPattern> <!-- Replace this -->
+							<shadedPattern>de.jeff_media.chestsort.paperlib</shadedPattern> <!-- Replace this -->
 						</relocation>
 					</relocations>
 					<artifactSet>
@@ -149,7 +149,7 @@
 		<dependency>
 			<groupId>de.jeff_media</groupId>
 			<artifactId>ChestSortAPI</artifactId>
-			<version>2.0.0</version>
+			<version>3.0.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/src/main/java/de/jeff_media/ChestSort/ChestSortAPIHandler.java b/src/main/java/de/jeff_media/chestsort/ChestSortAPIHandler.java
similarity index 93%
rename from src/main/java/de/jeff_media/ChestSort/ChestSortAPIHandler.java
rename to src/main/java/de/jeff_media/chestsort/ChestSortAPIHandler.java
index 113191f..1c8640d 100644
--- a/src/main/java/de/jeff_media/ChestSort/ChestSortAPIHandler.java
+++ b/src/main/java/de/jeff_media/chestsort/ChestSortAPIHandler.java
@@ -1,9 +1,12 @@
-package de.jeff_media.ChestSort;
+package de.jeff_media.chestsort;
 
 import de.jeff_media.ChestSortAPI.ChestSortAPI;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
+/**
+ * This isn't used anymore
+ */
 public class ChestSortAPIHandler implements ChestSortAPI {
 	
 	final ChestSortPlugin plugin;
diff --git a/src/main/java/de/jeff_media/ChestSort/ChestSortAdminCommand.java b/src/main/java/de/jeff_media/chestsort/ChestSortAdminCommand.java
similarity index 98%
rename from src/main/java/de/jeff_media/ChestSort/ChestSortAdminCommand.java
rename to src/main/java/de/jeff_media/chestsort/ChestSortAdminCommand.java
index dce55fe..fdb4ce2 100644
--- a/src/main/java/de/jeff_media/ChestSort/ChestSortAdminCommand.java
+++ b/src/main/java/de/jeff_media/chestsort/ChestSortAdminCommand.java
@@ -1,4 +1,4 @@
-package de.jeff_media.ChestSort;
+package de.jeff_media.chestsort;
 
 import de.jeff_media.jefflib.NBTAPI;
 import org.bukkit.Bukkit;
diff --git a/src/main/java/de/jeff_media/ChestSort/ChestSortCategory.java b/src/main/java/de/jeff_media/chestsort/ChestSortCategory.java
similarity index 95%
rename from src/main/java/de/jeff_media/ChestSort/ChestSortCategory.java
rename to src/main/java/de/jeff_media/chestsort/ChestSortCategory.java
index c19e88d..43ce2e8 100644
--- a/src/main/java/de/jeff_media/ChestSort/ChestSortCategory.java
+++ b/src/main/java/de/jeff_media/chestsort/ChestSortCategory.java
@@ -1,6 +1,6 @@
-package de.jeff_media.ChestSort;
+package de.jeff_media.chestsort;
 
-import de.jeff_media.ChestSort.utils.TypeMatchPositionPair;
+import de.jeff_media.chestsort.utils.TypeMatchPositionPair;
 
 public class ChestSortCategory implements Comparable<ChestSortCategory>{
 
diff --git a/src/main/java/de/jeff_media/ChestSort/ChestSortChestSortCommand.java b/src/main/java/de/jeff_media/chestsort/ChestSortChestSortCommand.java
similarity index 99%
rename from src/main/java/de/jeff_media/ChestSort/ChestSortChestSortCommand.java
rename to src/main/java/de/jeff_media/chestsort/ChestSortChestSortCommand.java
index 524808d..91c24ba 100644
--- a/src/main/java/de/jeff_media/ChestSort/ChestSortChestSortCommand.java
+++ b/src/main/java/de/jeff_media/chestsort/ChestSortChestSortCommand.java
@@ -1,4 +1,4 @@
-package de.jeff_media.ChestSort;
+package de.jeff_media.chestsort;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
diff --git a/src/main/java/de/jeff_media/ChestSort/ChestSortConfigUpdater.java b/src/main/java/de/jeff_media/chestsort/ChestSortConfigUpdater.java
similarity index 98%
rename from src/main/java/de/jeff_media/ChestSort/ChestSortConfigUpdater.java
rename to src/main/java/de/jeff_media/chestsort/ChestSortConfigUpdater.java
index 8339bd8..7f47f6b 100644
--- a/src/main/java/de/jeff_media/ChestSort/ChestSortConfigUpdater.java
+++ b/src/main/java/de/jeff_media/chestsort/ChestSortConfigUpdater.java
@@ -1,4 +1,4 @@
-package de.jeff_media.ChestSort;
+package de.jeff_media.chestsort;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
@@ -11,7 +11,7 @@ import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 
-import de.jeff_media.ChestSort.utils.Utils;
+import de.jeff_media.chestsort.utils.Utils;
 
 public class ChestSortConfigUpdater {
 
diff --git a/src/main/java/de/jeff_media/ChestSort/ChestSortDebugger.java b/src/main/java/de/jeff_media/chestsort/ChestSortDebugger.java
similarity index 97%
rename from src/main/java/de/jeff_media/ChestSort/ChestSortDebugger.java
rename to src/main/java/de/jeff_media/chestsort/ChestSortDebugger.java
index 4da078f..af31c03 100644
--- a/src/main/java/de/jeff_media/ChestSort/ChestSortDebugger.java
+++ b/src/main/java/de/jeff_media/chestsort/ChestSortDebugger.java
@@ -1,4 +1,4 @@
-package de.jeff_media.ChestSort;
+package de.jeff_media.chestsort;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
diff --git a/src/main/java/de/jeff_media/ChestSort/ChestSortInvSortCommand.java b/src/main/java/de/jeff_media/chestsort/ChestSortInvSortCommand.java
similarity index 98%
rename from src/main/java/de/jeff_media/ChestSort/ChestSortInvSortCommand.java
rename to src/main/java/de/jeff_media/chestsort/ChestSortInvSortCommand.java
index 5512a46..ef84078 100644
--- a/src/main/java/de/jeff_media/ChestSort/ChestSortInvSortCommand.java
+++ b/src/main/java/de/jeff_media/chestsort/ChestSortInvSortCommand.java
@@ -1,4 +1,4 @@
-package de.jeff_media.ChestSort;
+package de.jeff_media.chestsort;
 
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
diff --git a/src/main/java/de/jeff_media/ChestSort/ChestSortListener.java b/src/main/java/de/jeff_media/chestsort/ChestSortListener.java
similarity index 99%
rename from src/main/java/de/jeff_media/ChestSort/ChestSortListener.java
rename to src/main/java/de/jeff_media/chestsort/ChestSortListener.java
index 93bfe48..3b0f66e 100644
--- a/src/main/java/de/jeff_media/ChestSort/ChestSortListener.java
+++ b/src/main/java/de/jeff_media/chestsort/ChestSortListener.java
@@ -1,8 +1,7 @@
-package de.jeff_media.ChestSort;
+package de.jeff_media.chestsort;
 
-import de.jeff_media.ChestSort.hooks.*;
-import de.jeff_media.ChestSort.utils.LlamaUtils;
-import de.jeff_media.ChestSortAPI.ChestSortAPI;
+import de.jeff_media.chestsort.hooks.*;
+import de.jeff_media.chestsort.utils.LlamaUtils;
 import de.jeff_media.ChestSortAPI.ChestSortEvent;
 import de.jeff_media.ChestSortAPI.ISortable;
 import net.md_5.bungee.api.ChatMessageType;
diff --git a/src/main/java/de/jeff_media/ChestSort/ChestSortLogger.java b/src/main/java/de/jeff_media/chestsort/ChestSortLogger.java
similarity index 98%
rename from src/main/java/de/jeff_media/ChestSort/ChestSortLogger.java
rename to src/main/java/de/jeff_media/chestsort/ChestSortLogger.java
index ab0dec3..faec56a 100644
--- a/src/main/java/de/jeff_media/ChestSort/ChestSortLogger.java
+++ b/src/main/java/de/jeff_media/chestsort/ChestSortLogger.java
@@ -1,4 +1,4 @@
-package de.jeff_media.ChestSort;
+package de.jeff_media.chestsort;
 
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/de/jeff_media/ChestSort/ChestSortMessages.java b/src/main/java/de/jeff_media/chestsort/ChestSortMessages.java
similarity index 99%
rename from src/main/java/de/jeff_media/ChestSort/ChestSortMessages.java
rename to src/main/java/de/jeff_media/chestsort/ChestSortMessages.java
index e9e4fb5..01ffd54 100644
--- a/src/main/java/de/jeff_media/ChestSort/ChestSortMessages.java
+++ b/src/main/java/de/jeff_media/chestsort/ChestSortMessages.java
@@ -1,4 +1,4 @@
-package de.jeff_media.ChestSort;
+package de.jeff_media.chestsort;
 
 import org.bukkit.ChatColor;
 
diff --git a/src/main/java/de/jeff_media/ChestSort/ChestSortOrganizer.java b/src/main/java/de/jeff_media/chestsort/ChestSortOrganizer.java
similarity index 98%
rename from src/main/java/de/jeff_media/ChestSort/ChestSortOrganizer.java
rename to src/main/java/de/jeff_media/chestsort/ChestSortOrganizer.java
index 10a291f..774b15e 100644
--- a/src/main/java/de/jeff_media/ChestSort/ChestSortOrganizer.java
+++ b/src/main/java/de/jeff_media/chestsort/ChestSortOrganizer.java
@@ -1,11 +1,11 @@
-package de.jeff_media.ChestSort;
+package de.jeff_media.chestsort;
 
-import de.jeff_media.ChestSort.hooks.CrackShotHook;
-import de.jeff_media.ChestSort.hooks.InventoryPagesHook;
-import de.jeff_media.ChestSort.hooks.SlimeFunHook;
-import de.jeff_media.ChestSort.utils.CategoryLinePair;
-import de.jeff_media.ChestSort.utils.TypeMatchPositionPair;
-import de.jeff_media.ChestSort.utils.Utils;
+import de.jeff_media.chestsort.hooks.CrackShotHook;
+import de.jeff_media.chestsort.hooks.InventoryPagesHook;
+import de.jeff_media.chestsort.hooks.SlimeFunHook;
+import de.jeff_media.chestsort.utils.CategoryLinePair;
+import de.jeff_media.chestsort.utils.TypeMatchPositionPair;
+import de.jeff_media.chestsort.utils.Utils;
 import de.jeff_media.ChestSortAPI.ChestSortEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -453,12 +453,12 @@ public class ChestSortOrganizer {
     }
 
     // Sort a complete inventory
-    void sortInventory(Inventory inv) {
+    public void sortInventory(Inventory inv) {
         sortInventory(inv, 0, inv.getSize() - 1);
     }
 
     // Sort an inventory only between startSlot and endSlot
-    void sortInventory(@NotNull Inventory inv, int startSlot, int endSlot) {
+    public void sortInventory(@NotNull Inventory inv, int startSlot, int endSlot) {
         if(inv==null) return;
         plugin.debug("Attempting to sort an Inventory and calling ChestSortEvent.");
         Class<? extends Inventory> invClass = inv.getClass();
diff --git a/src/main/java/de/jeff_media/ChestSort/ChestSortPermissionsHandler.java b/src/main/java/de/jeff_media/chestsort/ChestSortPermissionsHandler.java
similarity index 97%
rename from src/main/java/de/jeff_media/ChestSort/ChestSortPermissionsHandler.java
rename to src/main/java/de/jeff_media/chestsort/ChestSortPermissionsHandler.java
index 199eff9..ef3fea3 100644
--- a/src/main/java/de/jeff_media/ChestSort/ChestSortPermissionsHandler.java
+++ b/src/main/java/de/jeff_media/chestsort/ChestSortPermissionsHandler.java
@@ -1,4 +1,4 @@
-package de.jeff_media.ChestSort;
+package de.jeff_media.chestsort;
 
 import java.util.HashMap;
 import java.util.UUID;
diff --git a/src/main/java/de/jeff_media/ChestSort/ChestSortPlayerSetting.java b/src/main/java/de/jeff_media/chestsort/ChestSortPlayerSetting.java
similarity index 98%
rename from src/main/java/de/jeff_media/ChestSort/ChestSortPlayerSetting.java
rename to src/main/java/de/jeff_media/chestsort/ChestSortPlayerSetting.java
index b99984a..a12f30c 100644
--- a/src/main/java/de/jeff_media/ChestSort/ChestSortPlayerSetting.java
+++ b/src/main/java/de/jeff_media/chestsort/ChestSortPlayerSetting.java
@@ -1,4 +1,4 @@
-package de.jeff_media.ChestSort;
+package de.jeff_media.chestsort;
 
 import org.bukkit.Bukkit;
 import org.bukkit.inventory.Inventory;
diff --git a/src/main/java/de/jeff_media/ChestSort/ChestSortPlugin.java b/src/main/java/de/jeff_media/chestsort/ChestSortPlugin.java
similarity index 98%
rename from src/main/java/de/jeff_media/ChestSort/ChestSortPlugin.java
rename to src/main/java/de/jeff_media/chestsort/ChestSortPlugin.java
index 53ed2fb..756fc7c 100644
--- a/src/main/java/de/jeff_media/ChestSort/ChestSortPlugin.java
+++ b/src/main/java/de/jeff_media/chestsort/ChestSortPlugin.java
@@ -25,15 +25,15 @@
 	
 */
 
-package de.jeff_media.ChestSort;
+package de.jeff_media.chestsort;
 
 import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksPlugin;
-import de.jeff_media.ChestSort.config.Config;
-import de.jeff_media.ChestSort.hooks.EnderContainersHook;
-import de.jeff_media.ChestSort.hooks.GenericGUIHook;
-import de.jeff_media.ChestSort.hooks.PlayerVaultsHook;
-import de.jeff_media.ChestSort.placeholders.ChestSortPlaceholders;
-import de.jeff_media.ChestSort.utils.Utils;
+import de.jeff_media.chestsort.config.Config;
+import de.jeff_media.chestsort.hooks.EnderContainersHook;
+import de.jeff_media.chestsort.hooks.GenericGUIHook;
+import de.jeff_media.chestsort.hooks.PlayerVaultsHook;
+import de.jeff_media.chestsort.placeholders.ChestSortPlaceholders;
+import de.jeff_media.chestsort.utils.Utils;
 import de.jeff_media.jefflib.JeffLib;
 import de.jeff_media.jefflib.NBTAPI;
 import de.jeff_media.jefflib.VersionUtil;
@@ -74,7 +74,7 @@ public class ChestSortPlugin extends JavaPlugin implements de.jeff_media.ChestSo
     int mcMinorVersion; // 14 for 1.14, 13 for 1.13, ...
     String mcVersion;    // 1.13.2 = 1_13_R2
     ChestSortMessages messages;
-    ChestSortOrganizer organizer;
+    public ChestSortOrganizer organizer;
     Map<String, ChestSortPlayerSetting> perPlayerSettings = new HashMap<>();
     ChestSortPermissionsHandler permissionsHandler;
     ChestSortSettingsGUI settingsGUI;
@@ -82,6 +82,11 @@ public class ChestSortPlugin extends JavaPlugin implements de.jeff_media.ChestSo
     UpdateChecker updateChecker;
     boolean usingMatchingConfig = true;
     boolean verbose = true;
+    private static ChestSortPlugin instance;
+
+    public static ChestSortPlugin getInstance() {
+        return instance;
+    }
 
     // Creates the default configuration file
     // Also checks the config-version of an already existing file. If the existing
@@ -206,7 +211,7 @@ public class ChestSortPlugin extends JavaPlugin implements de.jeff_media.ChestSo
         return difference <= cooldown;
     }
 
-    boolean isSortingEnabled(Player p) {
+    public boolean isSortingEnabled(Player p) {
         if (perPlayerSettings == null) {
             perPlayerSettings = new HashMap<>();
         }
@@ -352,6 +357,8 @@ public class ChestSortPlugin extends JavaPlugin implements de.jeff_media.ChestSo
     @Override
     public void onEnable() {
 
+        instance = this;
+
         JeffLib.init(this);
 
         String tmpVersion = getServer().getClass().getPackage().getName();
diff --git a/src/main/java/de/jeff_media/ChestSort/ChestSortSettingsGUI.java b/src/main/java/de/jeff_media/chestsort/ChestSortSettingsGUI.java
similarity index 99%
rename from src/main/java/de/jeff_media/ChestSort/ChestSortSettingsGUI.java
rename to src/main/java/de/jeff_media/chestsort/ChestSortSettingsGUI.java
index 3d22df4..57108ac 100644
--- a/src/main/java/de/jeff_media/ChestSort/ChestSortSettingsGUI.java
+++ b/src/main/java/de/jeff_media/chestsort/ChestSortSettingsGUI.java
@@ -1,4 +1,4 @@
-package de.jeff_media.ChestSort;
+package de.jeff_media.chestsort;
 
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
diff --git a/src/main/java/de/jeff_media/ChestSort/ChestSortTabCompleter.java b/src/main/java/de/jeff_media/chestsort/ChestSortTabCompleter.java
similarity index 97%
rename from src/main/java/de/jeff_media/ChestSort/ChestSortTabCompleter.java
rename to src/main/java/de/jeff_media/chestsort/ChestSortTabCompleter.java
index 4184bea..d4e7f87 100644
--- a/src/main/java/de/jeff_media/ChestSort/ChestSortTabCompleter.java
+++ b/src/main/java/de/jeff_media/chestsort/ChestSortTabCompleter.java
@@ -1,4 +1,4 @@
-package de.jeff_media.ChestSort;
+package de.jeff_media.chestsort;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/de/jeff_media/ChestSort/config/Config.java b/src/main/java/de/jeff_media/chestsort/config/Config.java
similarity index 80%
rename from src/main/java/de/jeff_media/ChestSort/config/Config.java
rename to src/main/java/de/jeff_media/chestsort/config/Config.java
index 85d9d2d..15694e4 100644
--- a/src/main/java/de/jeff_media/ChestSort/config/Config.java
+++ b/src/main/java/de/jeff_media/chestsort/config/Config.java
@@ -1,6 +1,6 @@
-package de.jeff_media.ChestSort.config;
+package de.jeff_media.chestsort.config;
 
-import de.jeff_media.ChestSort.ChestSortPlugin;
+import de.jeff_media.chestsort.ChestSortPlugin;
 
 public class Config {
     public static final String HOTKEY_COOLDOWN = "hotkey-cooldown";
diff --git a/src/main/java/de/jeff_media/ChestSort/hooks/CrackShotHook.java b/src/main/java/de/jeff_media/chestsort/hooks/CrackShotHook.java
similarity index 88%
rename from src/main/java/de/jeff_media/ChestSort/hooks/CrackShotHook.java
rename to src/main/java/de/jeff_media/chestsort/hooks/CrackShotHook.java
index aa79369..01e1b9a 100644
--- a/src/main/java/de/jeff_media/ChestSort/hooks/CrackShotHook.java
+++ b/src/main/java/de/jeff_media/chestsort/hooks/CrackShotHook.java
@@ -1,10 +1,10 @@
-package de.jeff_media.ChestSort.hooks;
+package de.jeff_media.chestsort.hooks;
 
 import org.bukkit.inventory.ItemStack;
 
 import com.shampaggon.crackshot.CSUtility;
 
-import de.jeff_media.ChestSort.ChestSortPlugin;
+import de.jeff_media.chestsort.ChestSortPlugin;
 
 public class CrackShotHook {
 	
diff --git a/src/main/java/de/jeff_media/ChestSort/hooks/CrateReloadedHook.java b/src/main/java/de/jeff_media/chestsort/hooks/CrateReloadedHook.java
similarity index 88%
rename from src/main/java/de/jeff_media/ChestSort/hooks/CrateReloadedHook.java
rename to src/main/java/de/jeff_media/chestsort/hooks/CrateReloadedHook.java
index 89c6209..7235e0e 100644
--- a/src/main/java/de/jeff_media/ChestSort/hooks/CrateReloadedHook.java
+++ b/src/main/java/de/jeff_media/chestsort/hooks/CrateReloadedHook.java
@@ -1,6 +1,6 @@
-package de.jeff_media.ChestSort.hooks;
+package de.jeff_media.chestsort.hooks;
 
-import de.jeff_media.ChestSort.ChestSortPlugin;
+import de.jeff_media.chestsort.ChestSortPlugin;
 import org.bukkit.inventory.Inventory;
 
 public class CrateReloadedHook {
diff --git a/src/main/java/de/jeff_media/ChestSort/hooks/CustomItemsHook.java b/src/main/java/de/jeff_media/chestsort/hooks/CustomItemsHook.java
similarity index 79%
rename from src/main/java/de/jeff_media/ChestSort/hooks/CustomItemsHook.java
rename to src/main/java/de/jeff_media/chestsort/hooks/CustomItemsHook.java
index b2265d5..7bcee5b 100644
--- a/src/main/java/de/jeff_media/ChestSort/hooks/CustomItemsHook.java
+++ b/src/main/java/de/jeff_media/chestsort/hooks/CustomItemsHook.java
@@ -1,4 +1,4 @@
-package de.jeff_media.ChestSort.hooks;
+package de.jeff_media.chestsort.hooks;
 
 import org.bukkit.inventory.ItemStack;
 
diff --git a/src/main/java/de/jeff_media/ChestSort/hooks/EnderContainersHook.java b/src/main/java/de/jeff_media/chestsort/hooks/EnderContainersHook.java
similarity index 87%
rename from src/main/java/de/jeff_media/ChestSort/hooks/EnderContainersHook.java
rename to src/main/java/de/jeff_media/chestsort/hooks/EnderContainersHook.java
index 0f96760..ff2598e 100644
--- a/src/main/java/de/jeff_media/ChestSort/hooks/EnderContainersHook.java
+++ b/src/main/java/de/jeff_media/chestsort/hooks/EnderContainersHook.java
@@ -1,6 +1,6 @@
-package de.jeff_media.ChestSort.hooks;
+package de.jeff_media.chestsort.hooks;
 
-import de.jeff_media.ChestSort.ChestSortPlugin;
+import de.jeff_media.chestsort.ChestSortPlugin;
 import org.bukkit.inventory.Inventory;
 
 public class EnderContainersHook {
diff --git a/src/main/java/de/jeff_media/ChestSort/hooks/GenericGUIHook.java b/src/main/java/de/jeff_media/chestsort/hooks/GenericGUIHook.java
similarity index 88%
rename from src/main/java/de/jeff_media/ChestSort/hooks/GenericGUIHook.java
rename to src/main/java/de/jeff_media/chestsort/hooks/GenericGUIHook.java
index f01aa01..fb358dd 100644
--- a/src/main/java/de/jeff_media/ChestSort/hooks/GenericGUIHook.java
+++ b/src/main/java/de/jeff_media/chestsort/hooks/GenericGUIHook.java
@@ -1,6 +1,6 @@
-package de.jeff_media.ChestSort.hooks;
+package de.jeff_media.chestsort.hooks;
 
-import de.jeff_media.ChestSort.ChestSortPlugin;
+import de.jeff_media.chestsort.ChestSortPlugin;
 import org.bukkit.inventory.Inventory;
 
 public class GenericGUIHook {
diff --git a/src/main/java/de/jeff_media/ChestSort/hooks/GoldenCratesHook.java b/src/main/java/de/jeff_media/chestsort/hooks/GoldenCratesHook.java
similarity index 88%
rename from src/main/java/de/jeff_media/ChestSort/hooks/GoldenCratesHook.java
rename to src/main/java/de/jeff_media/chestsort/hooks/GoldenCratesHook.java
index 149ee02..ada80ac 100644
--- a/src/main/java/de/jeff_media/ChestSort/hooks/GoldenCratesHook.java
+++ b/src/main/java/de/jeff_media/chestsort/hooks/GoldenCratesHook.java
@@ -1,6 +1,6 @@
-package de.jeff_media.ChestSort.hooks;
+package de.jeff_media.chestsort.hooks;
 
-import de.jeff_media.ChestSort.ChestSortPlugin;
+import de.jeff_media.chestsort.ChestSortPlugin;
 import org.bukkit.inventory.Inventory;
 
 public class GoldenCratesHook {
diff --git a/src/main/java/de/jeff_media/ChestSort/hooks/HeadDatabaseHook.java b/src/main/java/de/jeff_media/chestsort/hooks/HeadDatabaseHook.java
similarity index 85%
rename from src/main/java/de/jeff_media/ChestSort/hooks/HeadDatabaseHook.java
rename to src/main/java/de/jeff_media/chestsort/hooks/HeadDatabaseHook.java
index 5b42309..bd6fb06 100644
--- a/src/main/java/de/jeff_media/ChestSort/hooks/HeadDatabaseHook.java
+++ b/src/main/java/de/jeff_media/chestsort/hooks/HeadDatabaseHook.java
@@ -1,6 +1,6 @@
-package de.jeff_media.ChestSort.hooks;
+package de.jeff_media.chestsort.hooks;
 
-import de.jeff_media.ChestSort.ChestSortPlugin;
+import de.jeff_media.chestsort.ChestSortPlugin;
 import org.bukkit.inventory.Inventory;
 
 public class HeadDatabaseHook {
diff --git a/src/main/java/de/jeff_media/ChestSort/hooks/InventoryPagesHook.java b/src/main/java/de/jeff_media/chestsort/hooks/InventoryPagesHook.java
similarity index 97%
rename from src/main/java/de/jeff_media/ChestSort/hooks/InventoryPagesHook.java
rename to src/main/java/de/jeff_media/chestsort/hooks/InventoryPagesHook.java
index 2a32c12..942bd2a 100644
--- a/src/main/java/de/jeff_media/ChestSort/hooks/InventoryPagesHook.java
+++ b/src/main/java/de/jeff_media/chestsort/hooks/InventoryPagesHook.java
@@ -1,4 +1,4 @@
-package de.jeff_media.ChestSort.hooks;
+package de.jeff_media.chestsort.hooks;
 
 import java.io.File;
 
@@ -9,7 +9,7 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 
-import de.jeff_media.ChestSort.ChestSortPlugin;
+import de.jeff_media.chestsort.ChestSortPlugin;
 import org.jetbrains.annotations.NotNull;
 
 public class InventoryPagesHook {
diff --git a/src/main/java/de/jeff_media/ChestSort/hooks/MinepacksHook.java b/src/main/java/de/jeff_media/chestsort/hooks/MinepacksHook.java
similarity index 94%
rename from src/main/java/de/jeff_media/ChestSort/hooks/MinepacksHook.java
rename to src/main/java/de/jeff_media/chestsort/hooks/MinepacksHook.java
index 0aad537..0d21999 100644
--- a/src/main/java/de/jeff_media/ChestSort/hooks/MinepacksHook.java
+++ b/src/main/java/de/jeff_media/chestsort/hooks/MinepacksHook.java
@@ -1,4 +1,4 @@
-package de.jeff_media.ChestSort.hooks;
+package de.jeff_media.chestsort.hooks;
 
 import org.bukkit.Bukkit;
 import org.bukkit.inventory.Inventory;
@@ -7,7 +7,7 @@ import org.bukkit.plugin.Plugin;
 
 import at.pcgamingfreaks.Minepacks.Bukkit.API.Backpack;
 import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksPlugin;
-import de.jeff_media.ChestSort.ChestSortPlugin;
+import de.jeff_media.chestsort.ChestSortPlugin;
 
 public class MinepacksHook {
 	
diff --git a/src/main/java/de/jeff_media/ChestSort/hooks/PlayerVaultsHook.java b/src/main/java/de/jeff_media/chestsort/hooks/PlayerVaultsHook.java
similarity index 88%
rename from src/main/java/de/jeff_media/ChestSort/hooks/PlayerVaultsHook.java
rename to src/main/java/de/jeff_media/chestsort/hooks/PlayerVaultsHook.java
index 0d29737..688fb64 100644
--- a/src/main/java/de/jeff_media/ChestSort/hooks/PlayerVaultsHook.java
+++ b/src/main/java/de/jeff_media/chestsort/hooks/PlayerVaultsHook.java
@@ -1,6 +1,6 @@
-package de.jeff_media.ChestSort.hooks;
+package de.jeff_media.chestsort.hooks;
 
-import de.jeff_media.ChestSort.ChestSortPlugin;
+import de.jeff_media.chestsort.ChestSortPlugin;
 import org.bukkit.inventory.Inventory;
 
 public class PlayerVaultsHook {
diff --git a/src/main/java/de/jeff_media/ChestSort/hooks/SlimeFunHook.java b/src/main/java/de/jeff_media/chestsort/hooks/SlimeFunHook.java
similarity index 90%
rename from src/main/java/de/jeff_media/ChestSort/hooks/SlimeFunHook.java
rename to src/main/java/de/jeff_media/chestsort/hooks/SlimeFunHook.java
index 208ea57..4a5a18b 100644
--- a/src/main/java/de/jeff_media/ChestSort/hooks/SlimeFunHook.java
+++ b/src/main/java/de/jeff_media/chestsort/hooks/SlimeFunHook.java
@@ -1,4 +1,4 @@
-package de.jeff_media.ChestSort.hooks;
+package de.jeff_media.chestsort.hooks;
 
 import io.github.thebusybiscuit.slimefun4.implementation.items.backpacks.SlimefunBackpack;
 import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
diff --git a/src/main/java/de/jeff_media/ChestSort/placeholders/ChestSortPlaceholders.java b/src/main/java/de/jeff_media/chestsort/placeholders/ChestSortPlaceholders.java
similarity index 97%
rename from src/main/java/de/jeff_media/ChestSort/placeholders/ChestSortPlaceholders.java
rename to src/main/java/de/jeff_media/chestsort/placeholders/ChestSortPlaceholders.java
index e6a0ca1..bba2b57 100644
--- a/src/main/java/de/jeff_media/ChestSort/placeholders/ChestSortPlaceholders.java
+++ b/src/main/java/de/jeff_media/chestsort/placeholders/ChestSortPlaceholders.java
@@ -1,6 +1,6 @@
-package de.jeff_media.ChestSort.placeholders;
+package de.jeff_media.chestsort.placeholders;
 
-import de.jeff_media.ChestSort.ChestSortPlugin;
+import de.jeff_media.chestsort.ChestSortPlugin;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import org.bukkit.entity.Player;
 
diff --git a/src/main/java/de/jeff_media/ChestSort/test/APIDeprecation.java b/src/main/java/de/jeff_media/chestsort/test/APIDeprecation.java
similarity index 70%
rename from src/main/java/de/jeff_media/ChestSort/test/APIDeprecation.java
rename to src/main/java/de/jeff_media/chestsort/test/APIDeprecation.java
index 7431dab..d8f8562 100644
--- a/src/main/java/de/jeff_media/ChestSort/test/APIDeprecation.java
+++ b/src/main/java/de/jeff_media/chestsort/test/APIDeprecation.java
@@ -1,6 +1,6 @@
-package de.jeff_media.ChestSort.test;
+package de.jeff_media.chestsort.test;
 
-import de.jeff_media.ChestSort.ChestSortPlugin;
+import de.jeff_media.chestsort.ChestSortPlugin;
 import org.bukkit.entity.Player;
 
 public class APIDeprecation {
diff --git a/src/main/java/de/jeff_media/ChestSort/utils/CategoryLinePair.java b/src/main/java/de/jeff_media/chestsort/utils/CategoryLinePair.java
similarity index 95%
rename from src/main/java/de/jeff_media/ChestSort/utils/CategoryLinePair.java
rename to src/main/java/de/jeff_media/chestsort/utils/CategoryLinePair.java
index f52d8dd..cd9106d 100644
--- a/src/main/java/de/jeff_media/ChestSort/utils/CategoryLinePair.java
+++ b/src/main/java/de/jeff_media/chestsort/utils/CategoryLinePair.java
@@ -1,4 +1,4 @@
-package de.jeff_media.ChestSort.utils;
+package de.jeff_media.chestsort.utils;
 
 
 public class CategoryLinePair {
diff --git a/src/main/java/de/jeff_media/ChestSort/utils/LlamaUtils.java b/src/main/java/de/jeff_media/chestsort/utils/LlamaUtils.java
similarity index 94%
rename from src/main/java/de/jeff_media/ChestSort/utils/LlamaUtils.java
rename to src/main/java/de/jeff_media/chestsort/utils/LlamaUtils.java
index 6aa73a3..3c2979a 100644
--- a/src/main/java/de/jeff_media/ChestSort/utils/LlamaUtils.java
+++ b/src/main/java/de/jeff_media/chestsort/utils/LlamaUtils.java
@@ -1,4 +1,4 @@
-package de.jeff_media.ChestSort.utils;
+package de.jeff_media.chestsort.utils;
 
 import org.bukkit.entity.ChestedHorse;
 import org.bukkit.entity.Donkey;
diff --git a/src/main/java/de/jeff_media/ChestSort/utils/TypeMatchPositionPair.java b/src/main/java/de/jeff_media/chestsort/utils/TypeMatchPositionPair.java
similarity index 95%
rename from src/main/java/de/jeff_media/ChestSort/utils/TypeMatchPositionPair.java
rename to src/main/java/de/jeff_media/chestsort/utils/TypeMatchPositionPair.java
index 1b3fe45..165dd05 100644
--- a/src/main/java/de/jeff_media/ChestSort/utils/TypeMatchPositionPair.java
+++ b/src/main/java/de/jeff_media/chestsort/utils/TypeMatchPositionPair.java
@@ -1,4 +1,4 @@
-package de.jeff_media.ChestSort.utils;
+package de.jeff_media.chestsort.utils;
 
 public class TypeMatchPositionPair {
 	
diff --git a/src/main/java/de/jeff_media/ChestSort/utils/Utils.java b/src/main/java/de/jeff_media/chestsort/utils/Utils.java
similarity index 94%
rename from src/main/java/de/jeff_media/ChestSort/utils/Utils.java
rename to src/main/java/de/jeff_media/chestsort/utils/Utils.java
index 915e393..73f975a 100644
--- a/src/main/java/de/jeff_media/ChestSort/utils/Utils.java
+++ b/src/main/java/de/jeff_media/chestsort/utils/Utils.java
@@ -1,4 +1,4 @@
-package de.jeff_media.ChestSort.utils;
+package de.jeff_media.chestsort.utils;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -6,7 +6,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 
-import de.jeff_media.ChestSort.ChestSortPlugin;
+import de.jeff_media.chestsort.ChestSortPlugin;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 3a20a8e..a31fc56 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,4 +1,4 @@
-main: de.jeff_media.ChestSort.ChestSortPlugin
+main: de.jeff_media.chestsort.ChestSortPlugin
 name: ChestSort
 version: 9.7.1
 api-version: "1.13"