chore: fix not importing annotation in CosmeticBackpackType

feat: add itemmodel & itemname placeholders, bump api to 1.21.4 with …

.gitignore

@@ -115,3 +115,4 @@ run/
 
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.jar
+/qodana.yaml

build.gradle.kts

@@ -2,13 +2,13 @@ import net.minecrell.pluginyml.bukkit.BukkitPluginDescription
 
 plugins {
     id("java")
-    id("com.github.johnrengelman.shadow") version "7.1.2"
-    id("xyz.jpenilla.run-paper") version "2.0.0"
-    id("net.minecrell.plugin-yml.bukkit") version "0.5.2"
+    id("com.gradleup.shadow") version "8.3.2"
+    id("xyz.jpenilla.run-paper") version "2.3.1"
+    id("net.minecrell.plugin-yml.bukkit") version "0.6.0"
 }
 
 group = "com.hibiscusmc"
-version = "2.4.7"
+version = "2.8.3${getGitCommitHash()}"
 
 allprojects {
     apply(plugin = "java")
@@ -16,25 +16,22 @@ allprojects {
 
     repositories {
         mavenCentral()
+        mavenLocal()
 
         // Paper Repo
-        maven("https://papermc.io/repo/repository/maven-public/")
+        maven("https://repo.papermc.io/repository/maven-public/")
         maven("https://oss.sonatype.org/content/repositories/snapshots")
 
         // Jitpack
         maven("https://jitpack.io")
 
-        // ProtocolLib repo
-        maven("https://repo.dmulloy2.net/repository/public/") //ProtocolLib Repo, constantly down
+        // Geary
         maven("https://repo.mineinabyss.com/releases/")
         maven("https://repo.mineinabyss.com/snapshots/")
 
         // PlaceholderAPI
         maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
 
-        //Hikari
-        maven("https://mvnrepository.com/artifact/com.zaxxer/HikariCP")
-
         // Citizens & Denizen
         maven("https://maven.citizensnpcs.co/repo")
 
@@ -52,9 +49,6 @@ allprojects {
             }
         }
 
-        // UpdateChecker
-        maven("https://hub.jeff-media.com/nexus/repository/jeff-media-public/")
-
         // ParticleHelper
         maven("https://repo.bytecode.space/repository/maven-public/")
 
@@ -63,52 +57,78 @@ allprojects {
 
         // md-5 Repo
         maven("https://repo.md-5.net/content/groups/public/")
+
+        // MMOItems
+        maven("https://nexus.phoenixdevt.fr/repository/maven-public/")
+
+        // Eco-Suite/Auxilor Repo
+        maven("https://repo.auxilor.io/repository/maven-public/")
+
+        // Triumph GUI
+        maven("https://repo.triumphteam.dev/snapshots")
+
+        // Hibiscus Commons
+        maven("https://repo.hibiscusmc.com/releases")
     }
 
     dependencies {
         compileOnly(fileTree("${project.rootDir}/lib") { include("*.jar") })
         compileOnly("com.mojang:authlib:1.5.25")
-        compileOnly("org.spigotmc:spigot-api:1.18.2-R0.1-SNAPSHOT")
-        compileOnly("org.jetbrains:annotations:23.0.0")
-        compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0")
-        compileOnly("me.clip:placeholderapi:2.11.1")
-        compileOnly("com.ticxo:modelengine:R3.0.1")
-        compileOnly("com.github.oraxen:oraxen:-SNAPSHOT")
-        compileOnly("com.github.LoneDev6:API-ItemsAdder:3.2.5")
-        compileOnly("com.mineinabyss:geary-papermc:0.24-SNAPSHOT")
-        compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.1.0-SNAPSHOT")
-        compileOnly("it.unimi.dsi:fastutil:8.5.11")
-        compileOnly("com.github.LeonMangler:SuperVanish:6.2.6-4")
+        //compileOnly("org.spigotmc:spigot-api:1.18.2-R0.1-SNAPSHOT")
+        compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
+        compileOnly("org.jetbrains:annotations:24.1.0")
+        compileOnly("me.clip:placeholderapi:2.11.6")
+        compileOnly("com.ticxo.modelengine:ModelEngine:R4.0.6")
+        compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.0.12") {
+            exclude(group = "org.bukkit")
+            exclude(group = "com.google.guava")
+            exclude(group = "com.google.code.gson")
+            exclude(group = "it.unimi.dsi")
+            exclude(group = "com.sk89q.jnbt")
+            exclude(group = "org.enginehub.lin-bus.format")
+        }
+        compileOnly("io.github.toxicity188:BetterHud-standard-api:1.12") //Standard api
+        compileOnly("io.github.toxicity188:BetterHud-bukkit-api:1.12") //Platform api
+        compileOnly("io.github.toxicity188:BetterCommand:1.3") //BetterCommand library
+        //compileOnly("it.unimi.dsi:fastutil:8.5.14")
+        compileOnly("org.projectlombok:lombok:1.18.34")
+        compileOnly("me.lojosho:HibiscusCommons:0.8.1-d9fbae1d")
+
+        // Handled by Spigot Library Loader ~ Deprecated as of Dec 16, 2025
+        /*
+        compileOnly("net.kyori:adventure-api:4.24.0")
+        compileOnly("net.kyori:adventure-text-minimessage:4.24.0")
+        compileOnly("net.kyori:adventure-platform-bukkit:4.4.1")
+         */
+
+        annotationProcessor("org.projectlombok:lombok:1.18.36")
+        testCompileOnly("org.projectlombok:lombok:1.18.36")
+        testAnnotationProcessor("org.projectlombok:lombok:1.18.36")
+
+        implementation("dev.triumphteam:triumph-gui:3.2.0-SNAPSHOT") {
+            exclude("net.kyori") // Already have adventure API
+        }
+        implementation("com.owen1212055:particlehelper:1.0.0-SNAPSHOT")
+    }
+
+    tasks {
+        javadoc {
+            // javadoc spec has these added.
+            (options as StandardJavadocDocletOptions)
+                .tags("apiNote:a:API:", "implSpec:a:Implementation Requirements", "implNote:a:Implementation Note:")
+        }
     }
 }
 
 dependencies {
     implementation(project(path = ":common"))
-    implementation(project(path = ":v1_18_R2", configuration = "reobf"))
-    implementation(project(path = ":v1_19_R1", configuration = "reobf"))
-    implementation(project(path = ":v1_19_R2", configuration = "reobf"))
-    implementation(project(path = ":v1_19_R3", configuration = "reobf"))
-    implementation(project(path = ":v1_20_R1", configuration = "reobf"))
-
-    //compileOnly("com.github.Fisher2911:FisherLib:master-SNAPSHOT")
-    implementation("net.kyori:adventure-api:4.11.0")
-    implementation("net.kyori:adventure-text-minimessage:4.11.0")
-    implementation("net.kyori:adventure-platform-bukkit:4.1.2")
-    implementation("dev.triumphteam:triumph-gui:3.1.3")
-    implementation("org.spongepowered:configurate-yaml:4.1.2")
-    implementation("org.bstats:bstats-bukkit:3.0.0")
-    implementation("com.jeff_media:SpigotUpdateChecker:3.0.0")
-    implementation("com.owen1212055:particlehelper:1.0.0-SNAPSHOT")
-    implementation("com.ticxo.playeranimator:PlayerAnimator:R1.2.7")
-    implementation("com.github.BG-Software-LLC:CommentedConfiguration:-SNAPSHOT")
-    //implementation("com.ticxo.playeranimator:PlayerAnimator:R1.2.5")
 }
 
 tasks {
 
     compileJava {
         options.encoding = Charsets.UTF_8.name()
-        options.release.set(17)
+        options.release.set(21)
     }
 
     javadoc {
@@ -121,28 +141,23 @@ tasks {
     }
 
     runServer {
-        minecraftVersion("1.19.4")
+        minecraftVersion("1.21.8")
+
+        downloadPlugins {
+            hangar("PlaceholderAPI", "2.11.6")
+            hangar("Multiverse-Core", "5.3.4")
+            url("https://download.luckperms.net/1604/bukkit/loader/LuckPerms-Bukkit-5.5.15.jar")
+            github("Test-Account666", "PlugManX", "2.4.1", "PlugManX-2.4.1.jar")
+            //github("gecolay", "GSit", "2.4.3", "GSit-2.4.3.jar")
+        }
     }
 
     shadowJar {
-        dependsOn(":v1_18_R2:reobfJar")
-        dependsOn(":v1_19_R1:reobfJar")
-        dependsOn(":v1_19_R2:reobfJar")
-        dependsOn(":v1_19_R3:reobfJar")
-        dependsOn(":v1_20_R1:reobfJar")
         mergeServiceFiles()
 
-        relocate("dev.triumphteam.gui", "com.hisbiscusmc.hmccosmetics.gui")
-        relocate("me.mattstudios.mf", "com.hisbiscusmc.hmccosmetics.mf")
-        relocate("net.kyori.adventure", "com.hisbiscusmc.hmccosmetics.adventure")
-        relocate("org.spongepowered.configurate", "com.hisbiscusmc.hmccosmetics.configurate")
-        relocate("org.bstats", "com.hisbiscusmc.hmccosmetics.bstats")
-        relocate("com.zaxxer.hikaricp", "com.hisbiscusmc.hmccosmetics.hikaricp")
-        relocate("com.j256.ormlite", "com.hisbiscusmc.hmccosmetics.ormlite")
-        relocate("com.jeff_media.updatechecker", "com.hisbiscusmc.hmccosmetics.updatechecker")
-        relocate("com.owen1212055.particlehelper", "com.hisbiscusmc.hmccosmetics.particlehelper")
-        relocate("com.ticxo.playeranimator", "com.hisbiscusmc.hmccosmetics.playeranimator")
-        relocate("com.bgsoftware", "com.hisbiscusmc.hmccosmetics.configupdater")
+        relocate("dev.triumphteam.gui", "com.hibiscusmc.hmccosmetics.shaded.gui")
+        relocate("com.owen1212055.particlehelper", "com.hibiscusmc.hmccosmetics.shaded.particlehelper")
+        relocate("com.ticxo.playeranimator", "com.hibiscusmc.hmccosmetics.shaded.playeranimator")
         archiveFileName.set("HMCCosmeticsRemapped-${project.version}.jar")
 
         dependencies {
@@ -167,15 +182,19 @@ tasks {
 bukkit {
     load = BukkitPluginDescription.PluginLoadOrder.POSTWORLD
     main = "com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin"
-    apiVersion = "1.18"
+    apiVersion = "1.20"
     authors = listOf("LoJoSho")
-    depend = listOf("ProtocolLib")
-    softDepend = listOf("ModelEngine", "Oraxen", "ItemsAdder", "Geary", "HMCColor", "WorldGuard", "MythicMobs", "PlaceholderAPI", "SuperVanish", "PremiumVanish", "LibsDisguises", "Denizen")
+    depend = listOf("HibiscusCommons")
+    softDepend = listOf("Nexo", "BetterHud", "ModelEngine", "Oraxen", "ItemsAdder", "Geary", "HMCColor", "WorldGuard", "MythicMobs", "PlaceholderAPI", "SuperVanish", "PremiumVanish", "LibsDisguises", "Denizen", "MMOItems", "Eco")
     version = "${project.version}"
+    loadBefore = listOf(
+        "Cosmin" // Fixes an issue with Cosmin loading before and taking /cosmetic, when messing with what we do.
+    )
 
     commands {
         register("cosmetic") {
             description = "Base Cosmetic Command"
+            aliases = listOf("hmccosmetics", "cosmetics")
         }
     }
     permissions {
@@ -251,10 +270,41 @@ bukkit {
         register("hmccosmetics.unapplydeath.bypass") {
             default = BukkitPluginDescription.Permission.Default.OP
         }
+        register("hmccosmetics.cmd.disableall") {
+            default = BukkitPluginDescription.Permission.Default.OP
+        }
+        register("hmccosmetics.cmd.hiddenreasons") {
+            default = BukkitPluginDescription.Permission.Default.OP
+        }
+        register("hmccosmetics.cmd.clearhiddenreasons") {
+            default = BukkitPluginDescription.Permission.Default.OP
+        }
     }
 }
 
 java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(17
-    ))
+    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
+
+    withJavadocJar()
+    withSourcesJar()
+}
+
+fun getGitCommitHash(): String {
+    var includeHash = true
+    val includeHashVariable = System.getenv("HMCC_INCLUDE_HASH")
+
+    if (!includeHashVariable.isNullOrEmpty()) includeHash = includeHashVariable.toBoolean()
+
+    if (includeHash) {
+        return try {
+            val process = ProcessBuilder("git", "rev-parse", "--short", "HEAD")
+                .redirectErrorStream(true)
+                .start()
+
+            process.inputStream.bufferedReader().use { "-" + it.readLine().trim() }
+        } catch (e: Exception) {
+            "-unknown" // Fallback if Git is not available or an error occurs
+        }
+    }
+    return ""
 }

common/build.gradle.kts

@@ -3,43 +3,11 @@ plugins {
     id("maven-publish")
 }
 
-dependencies {
-    compileOnly("com.mojang:authlib:1.5.25")
-    compileOnly("org.spigotmc:spigot-api:1.18.2-R0.1-SNAPSHOT")
-    compileOnly("org.jetbrains:annotations:23.0.0")
-    compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0")
-    compileOnly("me.clip:placeholderapi:2.11.1")
-    compileOnly("com.ticxo:modelengine:R3.0.1")
-    compileOnly("com.github.oraxen:oraxen:-SNAPSHOT")
-    compileOnly("com.github.LoneDev6:API-ItemsAdder:3.2.5")
-    compileOnly("com.mineinabyss:geary-papermc:0.24-SNAPSHOT")
-    compileOnly("com.hibiscus:hmccolor:0.3-SNAPSHOT")
-    compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.1.0-SNAPSHOT")
-    compileOnly("it.unimi.dsi:fastutil:8.5.11")
-    compileOnly("io.lumine:Mythic-Dist:5.2.1")
-    compileOnly("com.denizenscript:denizen:1.2.7-SNAPSHOT")
-    compileOnly("com.github.LeonMangler:SuperVanish:6.2.6-4")
-    compileOnlyApi("LibsDisguises:LibsDisguises:10.0.21") {
-        exclude("org.spigotmc", "spigot")
-    }
-
-    //compileOnly("com.github.Fisher2911:FisherLib:master-SNAPSHOT")
-    implementation("net.kyori:adventure-api:4.12.0")
-    implementation("net.kyori:adventure-text-minimessage:4.12.0")
-    implementation("net.kyori:adventure-platform-bukkit:4.2.0")
-    implementation("dev.triumphteam:triumph-gui:3.1.3")
-    implementation("org.spongepowered:configurate-yaml:4.1.2")
-    implementation("org.bstats:bstats-bukkit:3.0.0")
-    implementation("com.jeff_media:SpigotUpdateChecker:3.0.0")
-    implementation("com.owen1212055:particlehelper:1.0.0-SNAPSHOT")
-    implementation("com.ticxo.playeranimator:PlayerAnimator:R1.2.7")
-    implementation("com.github.BG-Software-LLC:CommentedConfiguration:-SNAPSHOT")
-    //implementation("com.ticxo.playeranimator:PlayerAnimator:R1.2.5")
-}
-
 java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(17
-    ))
+    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
+
+    withJavadocJar()
+    withSourcesJar()
 }
 
 publishing {

common/settings.gradle.kts

@@ -1,8 +0,0 @@
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-        maven("https://repo.papermc.io/repository/maven-public/")
-    }
-}
-
-rootProject.name = "HMCCosmetics"

common/src/main/java/com/hibiscusmc/hmccosmetics/HMCCosmeticsPlugin.java

@@ -1,105 +1,83 @@
 package com.hibiscusmc.hmccosmetics;
 
-import com.bgsoftware.common.config.CommentedConfiguration;
 import com.hibiscusmc.hmccosmetics.api.events.HMCCosmeticSetupEvent;
 import com.hibiscusmc.hmccosmetics.command.CosmeticCommand;
 import com.hibiscusmc.hmccosmetics.command.CosmeticCommandTabComplete;
 import com.hibiscusmc.hmccosmetics.config.DatabaseSettings;
 import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.config.WardrobeSettings;
-import com.hibiscusmc.hmccosmetics.config.serializer.ItemSerializer;
-import com.hibiscusmc.hmccosmetics.config.serializer.LocationSerializer;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
 import com.hibiscusmc.hmccosmetics.database.Database;
-import com.hibiscusmc.hmccosmetics.emotes.EmoteManager;
 import com.hibiscusmc.hmccosmetics.gui.Menu;
 import com.hibiscusmc.hmccosmetics.gui.Menus;
-import com.hibiscusmc.hmccosmetics.hooks.Hooks;
+import com.hibiscusmc.hmccosmetics.gui.special.DyeMenuProvider;
+import com.hibiscusmc.hmccosmetics.gui.special.impl.HMCColorDyeMenu;
+import com.hibiscusmc.hmccosmetics.hooks.items.HookHMCCosmetics;
+import com.hibiscusmc.hmccosmetics.hooks.misc.HookBetterHud;
+import com.hibiscusmc.hmccosmetics.hooks.placeholders.HMCPlaceholderExpansion;
 import com.hibiscusmc.hmccosmetics.hooks.worldguard.WGHook;
 import com.hibiscusmc.hmccosmetics.hooks.worldguard.WGListener;
-import com.hibiscusmc.hmccosmetics.listener.PlayerConnectionListener;
-import com.hibiscusmc.hmccosmetics.listener.PlayerGameListener;
-import com.hibiscusmc.hmccosmetics.nms.NMSHandlers;
+import com.hibiscusmc.hmccosmetics.listener.*;
+import com.hibiscusmc.hmccosmetics.packets.CosmeticPacketInterface;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
+import com.hibiscusmc.hmccosmetics.util.PlayerSearchManager;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.hibiscusmc.hmccosmetics.util.TranslationUtil;
-import com.jeff_media.updatechecker.UpdateCheckSource;
-import com.jeff_media.updatechecker.UpdateChecker;
-import com.ticxo.playeranimator.PlayerAnimatorImpl;
-import org.bstats.bukkit.Metrics;
+import lombok.Getter;
+import me.lojosho.hibiscuscommons.HibiscusCommonsPlugin;
+import me.lojosho.hibiscuscommons.HibiscusPlugin;
+import me.lojosho.hibiscuscommons.config.serializer.ItemSerializer;
+import me.lojosho.hibiscuscommons.config.serializer.LocationSerializer;
+import me.lojosho.hibiscuscommons.hooks.Hooks;
+import me.lojosho.shaded.configupdater.common.config.CommentedConfiguration;
+import me.lojosho.shaded.configurate.ConfigurateException;
+import me.lojosho.shaded.configurate.ConfigurationOptions;
+import me.lojosho.shaded.configurate.yaml.NodeStyle;
+import me.lojosho.shaded.configurate.yaml.YamlConfigurationLoader;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.permissions.Permission;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.spongepowered.configurate.ConfigurateException;
-import org.spongepowered.configurate.ConfigurationNode;
-import org.spongepowered.configurate.ConfigurationOptions;
-import org.spongepowered.configurate.yaml.NodeStyle;
-import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
 
 import java.io.File;
 import java.nio.file.Path;
 
-public final class HMCCosmeticsPlugin extends JavaPlugin {
+public final class HMCCosmeticsPlugin extends HibiscusPlugin {
 
     private static HMCCosmeticsPlugin instance;
-    private static boolean disable = false;
     private static YamlConfigurationLoader configLoader;
-    private static final int pluginId = 13873;
-    private static boolean hasModelEngine = false;
-    private static boolean onLatestVersion = true;
-    private static String latestVersion = "";
+
+    @Getter
+    private PlayerSearchManager playerSearchManager;
+
+    public HMCCosmeticsPlugin() {
+        super(13873, 1879);
+        new HookHMCCosmetics();
+        new HookBetterHud();
+    }
 
     @Override
-    public void onEnable() {
+    public void onStart() {
         // Plugin startup logic
         instance = this;
-        // bstats https://bstats.org/plugin/bukkit/HMCCosmetics/13873
-        Metrics metrics = new Metrics(this, pluginId);
 
-        // NMS version check
-        if (!NMSHandlers.getHandler().getSupported()) {
-            getLogger().severe("This version is not supported! Consider switching versions?");
-            getServer().getPluginManager().disablePlugin(this);
-            return;
-        }
+        // Search Service
+        this.playerSearchManager = new PlayerSearchManager(this);
 
-        // Update Checker
-        UpdateChecker checker = new UpdateChecker(this, UpdateCheckSource.POLYMART, "1879")
-                .onSuccess((commandSenders, latestVersion) -> {
-                    this.latestVersion = (String) latestVersion;
-                    if (!this.latestVersion.equalsIgnoreCase(getDescription().getVersion())) {
-                        getLogger().info("+++++++++++++++++++++++++++++++++++");
-                        getLogger().info("There is a new update for HMCCosmetics!");
-                        getLogger().info("Please download it as soon as possible for possible fixes and new features.");
-                        getLogger().info("Current Version " + getDescription().getVersion() + " | Latest Version " + latestVersion);
-                        getLogger().info("Spigot: https://www.spigotmc.org/resources/100107/");
-                        getLogger().info("Polymart: https://polymart.org/resource/1879");
-                        getLogger().info("+++++++++++++++++++++++++++++++++++");
-                    }
-                })
-                .setNotifyRequesters(false)
-                .setNotifyOpsOnJoin(false)
-                .checkEveryXHours(24)
-                .checkNow();
-        onLatestVersion = checker.isUsingLatestVersion();
         // File setup
         saveDefaultConfig();
         if (!Path.of(getDataFolder().getPath(), "messages.yml").toFile().exists()) saveResource("messages.yml", false);
         if (!Path.of(getDataFolder().getPath(), "translations.yml").toFile().exists()) saveResource("translations.yml", false);
         if (!Path.of(getDataFolder().getPath() + "/cosmetics/").toFile().exists()) saveResource("cosmetics/defaultcosmetics.yml", false);
-        if (!Path.of(getDataFolder().getPath() + "/menus/").toFile().exists()) saveResource("menus/defaultmenu.yml", false);
-
-        // Emote folder setup
-        File emoteFile = new File(getDataFolder().getPath() + "/emotes");
-        if (!emoteFile.exists()) emoteFile.mkdir();
-
-        // Player Animator
-        PlayerAnimatorImpl.initialize(this);
+        if (!Path.of(getDataFolder().getPath() + "/menus/").toFile().exists()) {
+            saveResource("menus/defaultmenu_hats.yml", false);
+            saveResource("menus/defaultmenu_balloons.yml", false);
+            saveResource("menus/defaultmenu_hands.yml", false);
+            saveResource("menus/defaultmenu_backpacks.yml", false);
+        }
 
         // Configuration Sync
         final File configFile = Path.of(getInstance().getDataFolder().getPath(), "config.yml").toFile();
@@ -107,15 +85,19 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
         final File translationFile = Path.of(getInstance().getDataFolder().getPath(), "translations.yml").toFile();
         try {
             CommentedConfiguration.loadConfiguration(configFile).syncWithConfig(configFile, getInstance().getResource("config.yml"),
-                    "database-settings", "debug-mode", "wardrobe.viewer-location", "wardrobe.npc-location", "wardrobe.wardrobe-location", "wardrobe.leave-location");
+                    "database-settings", "wardrobe.wardrobes", "debug-mode", "wardrobe.viewer-location", "wardrobe.npc-location", "wardrobe.wardrobe-location", "wardrobe.leave-location");
             CommentedConfiguration.loadConfiguration(messageFile).syncWithConfig(messageFile, getInstance().getResource("messages.yml"));
             CommentedConfiguration.loadConfiguration(translationFile).syncWithConfig(translationFile, getInstance().getResource("translations.yml"));
         } catch (Exception e) {
             e.printStackTrace();
         }
 
+        // Move this over to Hibiscus Commons later
+        if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) new HMCPlaceholderExpansion().register();
+
         // Setup
         setup();
+        setPacketInterface(new CosmeticPacketInterface());
 
         // Commands
         getServer().getPluginCommand("cosmetic").setExecutor(new CosmeticCommand());
@@ -124,18 +106,28 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
         // Listener
         getServer().getPluginManager().registerEvents(new PlayerConnectionListener(), this);
         getServer().getPluginManager().registerEvents(new PlayerGameListener(), this);
+        getServer().getPluginManager().registerEvents(new ServerListener(), this);
+        getServer().getPluginManager().registerEvents(new PlayerMovementListener(), this);
+        getServer().getPluginManager().registerEvents(playerSearchManager, this);
 
+        if (HibiscusCommonsPlugin.isOnPaper()) {
+            getServer().getPluginManager().registerEvents(new PaperPlayerGameListener(), this);
+        }
         // Database
         new Database();
 
-        // ModelEngine
-        if (Bukkit.getPluginManager().getPlugin("ModelEngine") != null) {
-            hasModelEngine = true;
+        // WorldGuard
+        if (Bukkit.getPluginManager().getPlugin("WorldGuard") != null && Settings.isWorldGuardMoveCheck()) {
+            getServer().getPluginManager().registerEvents(new WGListener(), this);
         }
 
-        // WorldGuard
-        if (Bukkit.getPluginManager().getPlugin("WorldGuard") != null && Settings.isWorldGuardMoveCheckEnabled()) {
-            getServer().getPluginManager().registerEvents(new WGListener(), this);
+        // HMCColor
+        if (Hooks.isActiveHook("HMCColor")) {
+            try {
+                DyeMenuProvider.setDyeMenuProvider(new HMCColorDyeMenu());
+            } catch (IllegalStateException e) {
+                getLogger().warning("Unable to set HMCColor as the dye menu. There is likely another plugin registering another dye menu.");
+            }
         }
     }
 
@@ -148,14 +140,13 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
     }
 
     @Override
-    public void onDisable() {
+    public void onEnd() {
         // Plugin shutdown logic
-        disable = true;
         for (Player player : Bukkit.getOnlinePlayers()) {
             CosmeticUser user = CosmeticUsers.getUser(player);
             if (user == null) continue;
-            if (user.getUserEmoteManager().isPlayingEmote()) {
-                player.setInvisible(false);
+            if (user.isInWardrobe()) {
+                user.leaveWardrobe(true);
             }
             Database.save(user);
         }
@@ -220,9 +211,6 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
             throw new RuntimeException(e);
         }
 
-        // Misc Hooks setup (like items)
-        Hooks.setup();
-
         // Cosmetics setup
         Cosmetics.setup();
 
@@ -258,8 +246,6 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
             }
         }
 
-        EmoteManager.loadEmotes();
-
         getInstance().getLogger().info("Successfully Enabled HMCCosmetics");
         getInstance().getLogger().info(Cosmetics.values().size() + " Cosmetics Successfully Setup");
         getInstance().getLogger().info(Menus.getMenuNames().size() + " Menus Successfully Setup");
@@ -268,31 +254,4 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
 
         Bukkit.getPluginManager().callEvent(new HMCCosmeticSetupEvent());
     }
-
-    public static boolean isDisable() {
-        return disable;
-    }
-
-    public static YamlConfigurationLoader getConfigLoader() {
-        return configLoader;
-    }
-
-    public static void saveConfig(ConfigurationNode node) {
-        try {
-            HMCCosmeticsPlugin.getConfigLoader().save(node);
-            HMCCosmeticsPlugin.getInstance().getLogger().info("Set new location " + node.path());
-        } catch (ConfigurateException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public static boolean hasModelEngine() {
-        return hasModelEngine;
-    }
-    public static boolean isOnLatestVersion() {
-        return onLatestVersion;
-    }
-    public static String getLatestVersion() {
-        return latestVersion;
-    }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/api/HMCCosmeticsAPI.java

@@ -1,49 +1,215 @@
 package com.hibiscusmc.hmccosmetics.api;
 
+import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticProvider;
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
 import com.hibiscusmc.hmccosmetics.gui.Menu;
 import com.hibiscusmc.hmccosmetics.gui.Menus;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import com.hibiscusmc.hmccosmetics.user.CosmeticUserProvider;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
+import me.lojosho.hibiscuscommons.nms.MinecraftVersion;
+import me.lojosho.hibiscuscommons.nms.NMSHandlers;
+import org.bukkit.Color;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
-public class HMCCosmeticsAPI {
-
-    /**
-     * Attempts to get a cosmetic from HMCCosmetics
-     *
-     * @param cosmetic Cosmetic Id
-     * @return A {@link Cosmetic} if exists or null if it does not
-     */
-    @Nullable
-    public static Cosmetic getCosmetic(String cosmetic) {
-        return Cosmetics.getCosmetic(cosmetic);
+/**
+ * The main API class for HMCCosmetics. This class provides methods to interact with the plugin.
+ */
+public final class HMCCosmeticsAPI {
+    private HMCCosmeticsAPI() {
+        throw new UnsupportedOperationException("This class cannot be instantiated.");
     }
 
     /**
-     * Attempts to get the CosmeticUser from an online user. If a player is offline it will return null.
-     * A player maybe online but not have a CosmeticUser attached to them, either from delay specified in the config
-     * or from a /reload. Always check if it's null!
-     *
-     * @param uuid Player Unique ID
-     * @return A {@link CosmeticUser} if exists or null if it does not
+     * Retrieves a {@link Cosmetic} associated with the specified id.
+     * <p>
+     * This method attempts to fetch a {@link Cosmetic} using the given id. If no {@link Cosmetic} exists
+     * with the specified id, it will return {@code null}.
+     * </p>
+     * @param id the id of the {@link Cosmetic} to retrieve
+     * @return the {@link Cosmetic} if it exists, or {@code null} if no cosmetic is associated with the given id
      */
-    @Nullable
-    public static CosmeticUser getUser(UUID uuid) {
+    public static @Nullable Cosmetic getCosmetic(@NotNull String id) {
+        return Cosmetics.getCosmetic(id);
+    }
+
+    /**
+     * Retrieves the {@link CosmeticUser} associated with the specified player's {@link UUID}.
+     * <p>
+     * This method attempts to fetch a {@link CosmeticUser} for an online player. If the player is offline,
+     * or if no {@link CosmeticUser} is currently associated with them, it will return {@code null}.
+     * </p>
+     * Note that a player may be online but not have a {@link CosmeticUser} attached due to:
+     * <ul>
+     *   <li>A delay specified in the configuration</li>
+     *   <li>A recent server reload (e.g., via the {@code /reload} command)</li>
+     * </ul>
+     * Always perform a {@code null} check before using the returned object to ensure safe operation.
+     *
+     * @param uuid the {@link UUID} of the player whose {@link CosmeticUser} is being retrieved
+     * @return the {@link CosmeticUser} if it exists, or {@code null} if the player is offline or unassociated
+     */
+    public static @Nullable CosmeticUser getUser(@NotNull UUID uuid) {
         return CosmeticUsers.getUser(uuid);
     }
 
     /**
-     * Attempts to get a HMCCosmetics Menu. Returns null if no menu exists under that id.
+     * Retrieves a {@link Menu} associated with the specified id, or {@code null} if no menu exists with the given id.
      *
-     * @param id Menu ID
-     * @return A {@link Menu} if exists or null if it does not
+     * @param id the id of the menu to retrieve
+     * @return the {@link Menu} if it exists, or {@code null} if no menu is associated with the given id
      */
-    @Nullable
-    public static Menu getMenu(String id) {
+    public static @Nullable Menu getMenu(@NotNull String id) {
         return Menus.getMenu(id);
     }
+
+    /**
+     * Equips a {@link Cosmetic} to a player. To retrieve the necessary {@code CosmeticUser} and {@code Cosmetic}, use the {@link #getUser}
+     * and {@link #getCosmetic} methods respectively.
+     *
+     * @param user the {@link CosmeticUser} to equip the cosmetic to
+     * @param cosmetic the {@link Cosmetic} to equip
+     */
+    public static void equipCosmetic(@NotNull CosmeticUser user, @NotNull Cosmetic cosmetic) {
+        equipCosmetic(user, cosmetic, null);
+    }
+
+    /**
+     * Equips a {@link Cosmetic} to a player with an optional color customization. To retrieve the necessary
+     * {@code CosmeticUser} and {@code Cosmetic}, use the {@link #getUser} and {@link #getCosmetic} methods
+     * respectively.
+     *
+     * @param user the {@link CosmeticUser} to equip the cosmetic to
+     * @param cosmetic the {@link Cosmetic} to equip
+     * @param color the color to apply to the cosmetic, or {@code null} if the cosmetic does not support color
+     *              customization
+     */
+    public static void equipCosmetic(@NotNull CosmeticUser user, @NotNull Cosmetic cosmetic, @Nullable Color color) {
+        user.addCosmetic(cosmetic, color);
+    }
+
+    /**
+     * Removes a cosmetic from a specified slot for the given user.
+     *
+     * @param user the {@link CosmeticUser} from whom the cosmetic will be removed
+     * @param slot the {@link CosmeticSlot} from which the cosmetic will be removed
+     */
+    public static void unequipCosmetic(@NotNull CosmeticUser user, @NotNull CosmeticSlot slot) {
+        user.removeCosmeticSlot(slot);
+    }
+
+    /**
+     * Retrieves a list of all cosmetics currently registered with HMCC.
+     *
+     * @return an {@code immutable} list containing all registered {@link Cosmetic} object
+     */
+    public static @NotNull List<Cosmetic> getAllCosmetics() {
+        return List.copyOf(Cosmetics.values());
+    }
+
+    /**
+     * Retrieves a list of all cosmetic users currently registered with HMCC.
+     *
+     * @return an immutable list containing all registered {@link CosmeticUser} objects
+     */
+    public static @NotNull List<CosmeticUser> getAllCosmeticUsers() {
+        return List.copyOf(CosmeticUsers.values());
+    }
+
+    /**
+     * Retrieves a map of all cosmetic slots currently registered with HMCC.
+     *
+     * @return an immutable {@link Map} containing all registered cosmetic slots
+     */
+    public static @NotNull Map<String, CosmeticSlot> getAllCosmeticSlots() {
+        return Map.copyOf(CosmeticSlot.values());
+    }
+
+    /**
+     * Registers a new cosmetic slot with the specified id. If a slot with the same id already exists,
+     * the existing slot will be returned.
+     *
+     * <p>
+     *     The provided id will automatically be converted to uppercase when registering the slot.
+     * </p>
+     *
+     * @param id the id for the cosmetic slot
+     * @return the {@link CosmeticSlot} associated with the given id
+     * @apiNote this should be done in your {@link JavaPlugin#onLoad()} or it may error.
+     */
+    public static @NotNull CosmeticSlot registerCosmeticSlot(@NotNull String id) {
+        return CosmeticSlot.register(id);
+    }
+
+    /**
+     * Registers a new cosmetic user provider to use for constructing {@link CosmeticUser} instances.
+     *
+     * @param provider the provider to register
+     * @throws IllegalArgumentException if another plugin has already registered a provider
+     * @apiNote this should be done in your {@link JavaPlugin#onLoad()} or it may error.
+     */
+    public static void registerCosmeticUserProvider(@NotNull CosmeticUserProvider provider) {
+        CosmeticUsers.registerProvider(provider);
+    }
+
+    /**
+     * Retrieves the current {@link CosmeticUserProvider} that is in use.
+     *
+     * @return the current {@link CosmeticUserProvider}
+     */
+    public static @NotNull CosmeticUserProvider getCosmeticUserProvider() {
+        return CosmeticUsers.getProvider();
+    }
+
+    /**
+     * Registers a new cosmetic user provider to use for constructing {@link Cosmetic} instances.
+     *
+     * @param provider the provider to register
+     * @throws IllegalArgumentException if another plugin has already registered a provider
+     * @apiNote this should be done in your {@link JavaPlugin#onLoad()} or it may error.
+     */
+    public static void registerCosmeticProvider(@NotNull CosmeticProvider provider) {
+        Cosmetics.registerProvider(provider);
+    }
+
+    /**
+     * Retrieves the current {@link CosmeticProvider} that is in use.
+     *
+     * @return the current {@link CosmeticProvider}
+     */
+    public static @NotNull CosmeticProvider getCosmeticProvider() {
+        return Cosmetics.getProvider();
+    }
+
+    /**
+     * Retrieves the NMS version of the server as recognized by HMCCosmetics.
+     *
+     * <p>This value will be {@code null} until the HMCC setup has been completed. Ensure setup is finished
+     * before attempting to access this version.</p>
+     *
+     * @return the NMS version of the server in string format, or {@code null} if setup is not complete.
+     */
+    public static @Nullable String getNMSVersion() {
+        MinecraftVersion version = NMSHandlers.getVersion();
+        if (version == null) return null;
+        return version.toString();
+    }
+
+    /**
+     * Retrieves the version of HMCCosmetics currently in use.
+     *
+     * @return the HMCCosmetics version in string format
+     */
+    public static @NotNull String getHMCCVersion() {
+        return HMCCosmeticsPlugin.getInstance().getDescription().getVersion();
+    }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/CosmeticTypeRegisterEvent.java

@@ -0,0 +1,55 @@
+package com.hibiscusmc.hmccosmetics.api.events;
+
+import me.lojosho.shaded.configurate.ConfigurationNode;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Called when an attempt is made to register a cosmetic type that is not part of the default HMCC cosmetics.
+ * <p>
+ * For example, if a user specifies "test" in the config slot, and it is not a default cosmetic, this event will be
+ * triggered.
+ * </p>
+ */
+public class CosmeticTypeRegisterEvent extends Event {
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+
+    private final String id;
+    private final ConfigurationNode config;
+
+    public CosmeticTypeRegisterEvent(@NotNull String id, @NotNull ConfigurationNode config) {
+        this.id = id;
+        this.config = config;
+    }
+
+    /**
+     * Returns the id of the cosmetic attempting to be registered.
+     *
+     * @return the id of the cosmetic. This is the key in the cosmetic configuration.
+     */
+    public @NotNull String getId() {
+        return id;
+    }
+
+    /**
+     * Retrieves the {@link ConfigurationNode} for the cosmetic that was attempted to be registered.
+     * <p>
+     * This node is nested below the id in the configuration.
+     * </p>
+     *
+     * @return the configuration node for the cosmetic in the cosmetic configuration
+     */
+    public @NotNull ConfigurationNode getConfig() {
+        return config;
+    }
+
+    @Override
+    public @NotNull HandlerList getHandlers() {
+        return HANDLER_LIST;
+    }
+
+    public static @NotNull HandlerList getHandlerList() {
+        return HANDLER_LIST;
+    }
+}

common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/HMCCosmeticSetupEvent.java

@@ -5,19 +5,17 @@ import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Called when the plugin is set up and/or reloaded
+ * Called when the plugin is set up and/or reloaded.
  */
 public class HMCCosmeticSetupEvent extends Event {
-    private static final HandlerList handlers = new HandlerList();
+    private static final HandlerList HANDLER_LIST = new HandlerList();
 
     @Override
-    @NotNull
-    public HandlerList getHandlers() {
-        return handlers;
+    public @NotNull HandlerList getHandlers() {
+        return HANDLER_LIST;
     }
 
-    @NotNull
-    public static HandlerList getHandlerList() {
-        return handlers;
+    public static @NotNull HandlerList getHandlerList() {
+        return HANDLER_LIST;
     }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticEquipEvent.java

@@ -7,22 +7,24 @@ import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Called when a player equips a cosmetic
+ * Called when a player equips a {@link Cosmetic}.
  */
 public class PlayerCosmeticEquipEvent extends PlayerCosmeticEvent implements Cancellable {
-    private static final HandlerList handlers = new HandlerList();
-    private boolean cancel = false;
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+
     private Cosmetic cosmetic;
 
+    private boolean cancel = false;
+
     public PlayerCosmeticEquipEvent(@NotNull CosmeticUser who, @NotNull Cosmetic cosmetic) {
         super(who);
         this.cosmetic = cosmetic;
     }
 
     /**
-     * Gets the {@link Cosmetic} being equipped in this event
+     * Gets the {@link Cosmetic} being equipped in this event.
      *
-     * @return The {@link Cosmetic} which is being equipped in this event
+     * @return the cosmetic which is being equipped in this event
      */
     @NotNull
     public Cosmetic getCosmetic() {
@@ -30,9 +32,9 @@ public class PlayerCosmeticEquipEvent extends PlayerCosmeticEvent implements Can
     }
 
     /**
-     * Sets the {@link Cosmetic} that the player will equip
+     * Sets the {@link Cosmetic} that the player will equip.
      *
-     * @param cosmetic The {@link Cosmetic} that the player will equip
+     * @param cosmetic the cosmetic that the player will equip
      */
     public void setCosmetic(@NotNull Cosmetic cosmetic) {
         this.cosmetic = cosmetic;
@@ -43,28 +45,17 @@ public class PlayerCosmeticEquipEvent extends PlayerCosmeticEvent implements Can
         return cancel;
     }
 
-    /**
-     * Sets the cancellation state of this event
-     *
-     * <p>
-     * Canceling this event will prevent the player from equipping the cosmetic
-     * </p>
-     *
-     * @param cancel true if you wish to cancel this event
-     */
     @Override
     public void setCancelled(boolean cancel) {
         this.cancel = cancel;
     }
 
     @Override
-    @NotNull
-    public HandlerList getHandlers() {
-        return handlers;
+    public @NotNull HandlerList getHandlers() {
+        return HANDLER_LIST;
     }
 
-    @NotNull
-    public static HandlerList getHandlerList() {
-        return handlers;
+    public static @NotNull HandlerList getHandlerList() {
+        return HANDLER_LIST;
     }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticEvent.java

@@ -1,26 +1,25 @@
 package com.hibiscusmc.hmccosmetics.api.events;
 
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
-import org.bukkit.event.Event;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Represents a cosmetic user related event
+ * Represents an event related to a {@link CosmeticUser}.
  */
-public abstract class PlayerCosmeticEvent extends Event {
-    protected CosmeticUser user;
+public abstract class PlayerCosmeticEvent extends PlayerEvent {
+    protected final CosmeticUser user;
 
-    public PlayerCosmeticEvent(@NotNull final CosmeticUser who) {
+    public PlayerCosmeticEvent(@NotNull CosmeticUser who) {
+        super(who.getUniqueId());
         user = who;
     }
 
     /**
-     * Returns the user involved in this event
+     * Returns the {@link CosmeticUser} involved in this event.
      *
-     * @return User who is involved in this event
+     * @return the user who is involved in this event
      */
-    @NotNull
-    public final CosmeticUser getUser() {
+    public final @NotNull CosmeticUser getUser() {
         return user;
     }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticHideEvent.java

@@ -6,25 +6,26 @@ import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Called when cosmetics are hidden from a player
+ * Called when cosmetics are hidden from a player.
  */
 public class PlayerCosmeticHideEvent extends PlayerCosmeticEvent implements Cancellable {
-    private static final HandlerList handlers = new HandlerList();
-    private boolean cancel = false;
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+
     private final CosmeticUser.HiddenReason reason;
 
+    private boolean cancel = false;
+
     public PlayerCosmeticHideEvent(@NotNull CosmeticUser who, @NotNull CosmeticUser.HiddenReason reason) {
         super(who);
         this.reason = reason;
     }
 
     /**
-     * Gets the {@link CosmeticUser.HiddenReason} as to why cosmetics are being hidden for the player
+     * Gets the {@link CosmeticUser.HiddenReason} as to why cosmetics are being hidden for the player.
      *
-     * @return The {@link CosmeticUser.HiddenReason} why cosmetics are being hidden for the player
+     * @return the reason why cosmetics are being hidden for the player
      */
-    @NotNull
-    public CosmeticUser.HiddenReason getReason() {
+    public @NotNull CosmeticUser.HiddenReason getReason() {
         return reason;
     }
 
@@ -33,28 +34,17 @@ public class PlayerCosmeticHideEvent extends PlayerCosmeticEvent implements Canc
         return cancel;
     }
 
-    /**
-     * Sets the cancellation state of this event
-     *
-     * <p>
-     * Canceling this event will prevent the player from hiding cosmetics
-     * </p>
-     *
-     * @param cancel true if you wish to cancel this event
-     */
     @Override
     public void setCancelled(boolean cancel) {
         this.cancel = cancel;
     }
 
     @Override
-    @NotNull
-    public HandlerList getHandlers() {
-        return handlers;
+    public @NotNull HandlerList getHandlers() {
+        return HANDLER_LIST;
     }
 
-    @NotNull
-    public static HandlerList getHandlerList() {
-        return handlers;
+    public static @NotNull HandlerList getHandlerList() {
+        return HANDLER_LIST;
     }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticPostEquipEvent.java

@@ -5,8 +5,12 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 
+/**
+ * Called when a player has equipped a {@link Cosmetic}.
+ */
 public class PlayerCosmeticPostEquipEvent extends PlayerCosmeticEvent {
-    private static final HandlerList handlers = new HandlerList();
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+
     private Cosmetic cosmetic;
 
     public PlayerCosmeticPostEquipEvent(@NotNull CosmeticUser who, @NotNull Cosmetic cosmetic) {
@@ -15,32 +19,29 @@ public class PlayerCosmeticPostEquipEvent extends PlayerCosmeticEvent {
     }
 
     /**
-     * Gets the {@link Cosmetic} being equipped in this event
+     * Gets the {@link Cosmetic} being equipped in this event.
      *
-     * @return The {@link Cosmetic} which is being equipped in this event
+     * @return the cosmetic which is being equipped in this event
      */
-    @NotNull
-    public Cosmetic getCosmetic() {
+    public @NotNull Cosmetic getCosmetic() {
         return cosmetic;
     }
 
     /**
-     * Sets the {@link Cosmetic} that the player will equip
+     * Sets the {@link Cosmetic} that the player will equip.
      *
-     * @param cosmetic The {@link Cosmetic} that the player will equip
+     * @param cosmetic the cosmetic that the player will equip
      */
     public void setCosmetic(@NotNull Cosmetic cosmetic) {
         this.cosmetic = cosmetic;
     }
 
     @Override
-    @NotNull
-    public HandlerList getHandlers() {
-        return handlers;
+    public @NotNull HandlerList getHandlers() {
+        return HANDLER_LIST;
     }
 
-    @NotNull
-    public static HandlerList getHandlerList() {
-        return handlers;
+    public static @NotNull HandlerList getHandlerList() {
+        return HANDLER_LIST;
     }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticRemoveEvent.java

@@ -7,22 +7,24 @@ import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Called when a player removes a cosmetic
+ * Called when a player removes a {@link Cosmetic}.
  */
 public class PlayerCosmeticRemoveEvent extends PlayerCosmeticEvent implements Cancellable {
-    private static final HandlerList handlers = new HandlerList();
-    private boolean cancel = false;
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+
     private final Cosmetic cosmetic;
 
+    private boolean cancel = false;
+
     public PlayerCosmeticRemoveEvent(@NotNull CosmeticUser who, @NotNull Cosmetic cosmetic) {
         super(who);
         this.cosmetic = cosmetic;
     }
 
     /**
-     * Gets the {@link Cosmetic} being removed in this event
+     * Gets the {@link Cosmetic} being removed in this event.
      *
-     * @return The {@link Cosmetic} which is being removed in this event
+     * @return the cosmetic which is being removed in this event
      */
     public Cosmetic getCosmetic() {
         return cosmetic;
@@ -33,27 +35,17 @@ public class PlayerCosmeticRemoveEvent extends PlayerCosmeticEvent implements Ca
         return cancel;
     }
 
-    /**
-     * Sets the cancellation state of this event
-     *
-     * <p>
-     * Canceling this event will prevent the player from removing the cosmetic
-     * </p>
-     *
-     * @param cancel true if you wish to cancel this event
-     */
     @Override
     public void setCancelled(boolean cancel) {
         this.cancel = cancel;
     }
 
     @Override
-    @NotNull
-    public HandlerList getHandlers() {
-        return handlers;
+    public @NotNull HandlerList getHandlers() {
+        return HANDLER_LIST;
     }
 
-    public static HandlerList getHandlerList() {
-        return handlers;
+    public static @NotNull HandlerList getHandlerList() {
+        return HANDLER_LIST;
     }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticShowEvent.java

@@ -6,10 +6,11 @@ import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Called when cosmetics are shown from a player
+ * Called when cosmetics are shown from a player.
  */
 public class PlayerCosmeticShowEvent extends PlayerCosmeticEvent implements Cancellable {
-    private static final HandlerList handlers = new HandlerList();
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+
     private boolean cancel = false;
 
     public PlayerCosmeticShowEvent(@NotNull CosmeticUser who) {
@@ -21,28 +22,17 @@ public class PlayerCosmeticShowEvent extends PlayerCosmeticEvent implements Canc
         return cancel;
     }
 
-    /**
-     * Sets the cancellation state of this event
-     *
-     * <p>
-     * Canceling this event will prevent the player from showing cosmetics
-     * </p>
-     *
-     * @param cancel true if you wish to cancel this event
-     */
     @Override
     public void setCancelled(boolean cancel) {
         this.cancel = cancel;
     }
 
     @Override
-    @NotNull
-    public HandlerList getHandlers() {
-        return handlers;
+    public @NotNull HandlerList getHandlers() {
+        return HANDLER_LIST;
     }
 
-    @NotNull
-    public static HandlerList getHandlerList() {
-        return handlers;
+    public static @NotNull HandlerList getHandlerList() {
+        return HANDLER_LIST;
     }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerEmoteStartEvent.java

@@ -1,61 +0,0 @@
-package com.hibiscusmc.hmccosmetics.api.events;
-
-import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.HandlerList;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Called when a player starts playing an emote
- */
-public class PlayerEmoteStartEvent extends PlayerCosmeticEvent implements Cancellable {
-    private static final HandlerList handlers = new HandlerList();
-    private boolean cancel = false;
-    private final String animationId;
-
-    public PlayerEmoteStartEvent(@NotNull CosmeticUser who, @NotNull String animationId) {
-        super(who);
-        this.animationId = animationId;
-    }
-
-    /**
-     * Gets the animation id of the emote the player started playing
-     * @implNote The returned string of this method may be an invalid animation id. Make sure to validate it before use
-     *
-     * @return The animation id of the emote which the player started playing
-     */
-    @NotNull
-    public String getAnimationId() {
-        return animationId;
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return cancel;
-    }
-
-    /**
-     * Sets the cancellation state of this event
-     *
-     * <p>
-     * Canceling this event will prevent the player from playing the emote
-     * </p>
-     *
-     * @param cancel true if you wish to cancel this event
-     */
-    @Override
-    public void setCancelled(boolean cancel) {
-        this.cancel = cancel;
-    }
-
-    @Override
-    @NotNull
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    @NotNull
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-}

common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerEmoteStopEvent.java

@@ -1,74 +0,0 @@
-package com.hibiscusmc.hmccosmetics.api.events;
-
-import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
-import com.hibiscusmc.hmccosmetics.user.manager.UserEmoteManager;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.HandlerList;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Called when a player stops playing an emote
- */
-public class PlayerEmoteStopEvent extends PlayerCosmeticEvent implements Cancellable {
-    private static final HandlerList handlers = new HandlerList();
-    private boolean cancel = false;
-    private final UserEmoteManager.StopEmoteReason reason;
-
-    public PlayerEmoteStopEvent(@NotNull CosmeticUser who, @NotNull UserEmoteManager.StopEmoteReason reason) {
-        super(who);
-        this.reason = reason;
-    }
-
-    /**
-     * Gets the {@link UserEmoteManager.StopEmoteReason} as to why the emote has stopped playing
-     *
-     * @return The {@link UserEmoteManager.StopEmoteReason} why the emote has stopped playing
-     * @deprecated As of release 2.2.5+, replaced by {@link #getReason()}
-     */
-    @Deprecated
-    @NotNull
-    public UserEmoteManager.StopEmoteReason getStopEmoteReason() {
-        return reason;
-    }
-
-    /**
-     * Gets the {@link UserEmoteManager.StopEmoteReason} as to why the emote has stopped playing
-     *
-     * @return The {@link UserEmoteManager.StopEmoteReason} why the emote has stopped playing
-     * @since 2.2.5
-     */
-    @NotNull
-    public UserEmoteManager.StopEmoteReason getReason() {
-        return reason;
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return cancel;
-    }
-
-    /**
-     * Sets the cancellation state of this event
-     *
-     * <p>
-     * Canceling this event will prevent the player from stopping the emote
-     * </p>
-     *
-     * @param cancel true if you wish to cancel this event
-     */
-    @Override
-    public void setCancelled(boolean cancel) {
-        this.cancel = cancel;
-    }
-
-    @Override
-    @NotNull
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    @NotNull
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-}

common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerEvent.java

@@ -0,0 +1,26 @@
+package com.hibiscusmc.hmccosmetics.api.events;
+
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+/**
+ * Represents an event related to a {@link org.bukkit.entity.Player}.
+ */
+public abstract class PlayerEvent extends Event {
+    protected final UUID player;
+
+    public PlayerEvent(@NotNull UUID uuid) {
+        this.player = uuid;
+    }
+
+    /**
+     * Returns the {@link UUID} of the player involved in this event.
+     *
+     * @return the UUID of the player who is involved in this event
+     */
+    public final @NotNull UUID getUniqueId() {
+        return player;
+    }
+}

common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerLoadEvent.java

@@ -0,0 +1,25 @@
+package com.hibiscusmc.hmccosmetics.api.events;
+
+import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Called when a player's cosmetic data is loaded.
+ */
+public class PlayerLoadEvent extends PlayerCosmeticEvent {
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+
+    public PlayerLoadEvent(@NotNull CosmeticUser who) {
+        super(who);
+    }
+
+    @Override
+    public @NotNull HandlerList getHandlers() {
+        return HANDLER_LIST;
+    }
+
+    public static @NotNull HandlerList getHandlerList() {
+        return HANDLER_LIST;
+    }
+}

common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerMenuCloseEvent.java

@@ -3,26 +3,35 @@ package com.hibiscusmc.hmccosmetics.api.events;
 import com.hibiscusmc.hmccosmetics.gui.Menu;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import org.bukkit.event.HandlerList;
+import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Called when a menu is closed by a player
+ * Called when a {@link Menu} is closed by a player.
  */
 public class PlayerMenuCloseEvent extends PlayerMenuEvent {
-    private static final HandlerList handlers = new HandlerList();
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+    private final InventoryCloseEvent.Reason reason;
 
-    public PlayerMenuCloseEvent(@NotNull CosmeticUser who, @NotNull Menu menu) {
+    public PlayerMenuCloseEvent(@NotNull CosmeticUser who, @NotNull Menu menu, @NotNull InventoryCloseEvent.Reason reason) {
         super(who, menu);
+        this.reason = reason;
+    }
+
+    /**
+     * Gets the {@link InventoryCloseEvent.Reason} why the menu was closed.
+     * @return The reason why the menu was closed.
+     */
+    public InventoryCloseEvent.Reason getReason() {
+        return reason;
     }
 
     @Override
-    @NotNull
-    public HandlerList getHandlers() {
-        return handlers;
+    public @NotNull HandlerList getHandlers() {
+        return HANDLER_LIST;
     }
 
-    @NotNull
-    public static HandlerList getHandlerList() {
-        return handlers;
+    public static @NotNull HandlerList getHandlerList() {
+        return HANDLER_LIST;
     }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerMenuEvent.java

@@ -5,10 +5,10 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Represents a menu related event
+ * Represents an event related to a player's interaction with a {@link Menu}.
  */
 public abstract class PlayerMenuEvent extends PlayerCosmeticEvent {
-    protected Menu menu;
+    protected final Menu menu;
 
     public PlayerMenuEvent(@NotNull CosmeticUser who, @NotNull Menu menu) {
         super(who);
@@ -16,12 +16,11 @@ public abstract class PlayerMenuEvent extends PlayerCosmeticEvent {
     }
 
     /**
-     * Gets the {@link Menu} involved with this event
+     * Gets the {@link Menu} involved with this event.
      *
-     * @return The {@link Menu} which is involved with the event
+     * @return the menu involved in this event
      */
-    @NotNull
-    public final Menu getMenu() {
+    public @NotNull final Menu getMenu() {
         return menu;
     }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerMenuOpenEvent.java

@@ -7,10 +7,11 @@ import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Called when a menu is opened by a player
+ * Called when a {@link Menu} is opened by a player.
  */
 public class PlayerMenuOpenEvent extends PlayerMenuEvent implements Cancellable {
-    private static final HandlerList handlers = new HandlerList();
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+
     private boolean cancel = false;
 
     public PlayerMenuOpenEvent(@NotNull CosmeticUser who, @NotNull Menu menu) {
@@ -22,28 +23,17 @@ public class PlayerMenuOpenEvent extends PlayerMenuEvent implements Cancellable
         return cancel;
     }
 
-    /**
-     * Sets the cancellation state of this event
-     *
-     * <p>
-     * Canceling this event will prevent the player from opening a {@link Menu}
-     * </p>
-     *
-     * @param cancel true if you wish to cancel this event
-     */
     @Override
     public void setCancelled(boolean cancel) {
         this.cancel = cancel;
     }
 
     @Override
-    @NotNull
-    public HandlerList getHandlers() {
-        return handlers;
+    public @NotNull HandlerList getHandlers() {
+        return HANDLER_LIST;
     }
 
-    @NotNull
-    public static HandlerList getHandlerList() {
-        return handlers;
+    public static @NotNull HandlerList getHandlerList() {
+        return HANDLER_LIST;
     }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerPreLoadEvent.java

@@ -0,0 +1,44 @@
+package com.hibiscusmc.hmccosmetics.api.events;
+
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+/**
+ * Called before a player's data is loaded into the plugin.
+ *
+ * <p>
+ *     If this event is cancelled, the player's data will not be loaded,
+ *     and the player will not be able to interact with the plugin.
+ * </p>
+ */
+public class PlayerPreLoadEvent extends PlayerEvent implements Cancellable {
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+
+    private boolean cancelled = false;
+
+    public PlayerPreLoadEvent(@NotNull UUID id) {
+        super(id);
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancel) {
+        this.cancelled = cancel;
+    }
+
+    @Override
+    public @NotNull HandlerList getHandlers() {
+        return HANDLER_LIST;
+    }
+
+    public static @NotNull HandlerList getHandlerList() {
+        return HANDLER_LIST;
+    }
+}

common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerPreUnloadEvent.java

@@ -0,0 +1,43 @@
+package com.hibiscusmc.hmccosmetics.api.events;
+
+import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Called before a player's data is un-loaded from the plugin.
+ *
+ * <p>
+ *     If this event is cancelled, the player's data will not be un-loaded,
+ *     and will be kept in memory.
+ * </p>
+ */
+public class PlayerPreUnloadEvent extends PlayerCosmeticEvent implements Cancellable {
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+
+    private boolean cancelled = false;
+
+    public PlayerPreUnloadEvent(@NotNull CosmeticUser who) {
+        super(who);
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancel) {
+        this.cancelled = cancel;
+    }
+
+    @Override
+    public @NotNull HandlerList getHandlers() {
+        return HANDLER_LIST;
+    }
+
+    public static @NotNull HandlerList getHandlerList() {
+        return HANDLER_LIST;
+    }
+}

common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerUnloadEvent.java

@@ -0,0 +1,25 @@
+package com.hibiscusmc.hmccosmetics.api.events;
+
+import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Called when a players data is unloaded from the plugin. This is called when a player leaves the server.
+ */
+public class PlayerUnloadEvent extends PlayerCosmeticEvent {
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+
+    public PlayerUnloadEvent(@NotNull CosmeticUser who) {
+        super(who);
+    }
+
+    @Override
+    public @NotNull HandlerList getHandlers() {
+        return HANDLER_LIST;
+    }
+
+    public static @NotNull HandlerList getHandlerList() {
+        return HANDLER_LIST;
+    }
+}

common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerWardrobeEnterEvent.java

@@ -7,11 +7,13 @@ import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Called when a player enters their wardrobe
+ * Called when a player enters their {@link Wardrobe}.
  */
 public class PlayerWardrobeEnterEvent extends PlayerCosmeticEvent implements Cancellable {
-    private static final HandlerList handlers = new HandlerList();
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+
     private boolean cancel = false;
+
     private Wardrobe wardrobe;
 
     public PlayerWardrobeEnterEvent(@NotNull CosmeticUser who, @NotNull Wardrobe wardrobe) {
@@ -19,41 +21,38 @@ public class PlayerWardrobeEnterEvent extends PlayerCosmeticEvent implements Can
         this.wardrobe = wardrobe;
     }
 
+    /**
+     * Get the {@link Wardrobe} the player is entering.
+     * @return The wardrobe being entered
+     */
+    public Wardrobe getWardrobe() {
+        return wardrobe;
+    }
+
+    /**
+     * Set the {@link Wardrobe} the player is entering.
+     * @param wardrobe the wardrobe being entered
+     */
+    public void setWardrobe(Wardrobe wardrobe) {
+        this.wardrobe = wardrobe;
+    }
+
     @Override
     public boolean isCancelled() {
         return cancel;
     }
 
-    /**
-     * Sets the cancellation state of this event
-     *
-     * <p>
-     * Canceling this event will prevent the player from entering their wardrobe
-     * </p>
-     *
-     * @param cancel true if you wish to cancel this event
-     */
     @Override
     public void setCancelled(boolean cancel) {
         this.cancel = cancel;
     }
 
     @Override
-    @NotNull
-    public HandlerList getHandlers() {
-        return handlers;
+    public @NotNull HandlerList getHandlers() {
+        return HANDLER_LIST;
     }
 
-    @NotNull
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-    public void setWardrobe(Wardrobe wardrobe) {
-        this.wardrobe = wardrobe;
-    }
-
-    public Wardrobe getWardrobe() {
-        return wardrobe;
+    public static @NotNull HandlerList getHandlerList() {
+        return HANDLER_LIST;
     }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerWardrobeLeaveEvent.java

@@ -6,10 +6,11 @@ import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Called when a player leaves their wardrobe
+ * Called when a player leaves their {@link com.hibiscusmc.hmccosmetics.config.Wardrobe}.
  */
 public class PlayerWardrobeLeaveEvent extends PlayerCosmeticEvent implements Cancellable {
-    private static final HandlerList handlers = new HandlerList();
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+
     private boolean cancel = false;
 
     public PlayerWardrobeLeaveEvent(@NotNull CosmeticUser who) {
@@ -21,28 +22,17 @@ public class PlayerWardrobeLeaveEvent extends PlayerCosmeticEvent implements Can
         return cancel;
     }
 
-    /**
-     * Sets the cancellation state of this event
-     *
-     * <p>
-     * Canceling this event will prevent the player from leaving their wardrobe
-     * </p>
-     *
-     * @param cancel true if you wish to cancel this event
-     */
     @Override
     public void setCancelled(boolean cancel) {
         this.cancel = cancel;
     }
 
     @Override
-    @NotNull
-    public HandlerList getHandlers() {
-        return handlers;
+    public @NotNull HandlerList getHandlers() {
+        return HANDLER_LIST;
     }
 
-    @NotNull
-    public static HandlerList getHandlerList() {
-        return handlers;
+    public static @NotNull HandlerList getHandlerList() {
+        return HANDLER_LIST;
     }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java

@@ -1,5 +1,7 @@
 package com.hibiscusmc.hmccosmetics.command;
 
+import com.hibiscusmc.hmccolor.HMCColorConfig;
+import com.hibiscusmc.hmccolor.HMCColorContextKt;
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.config.Wardrobe;
@@ -8,19 +10,18 @@ import com.hibiscusmc.hmccosmetics.config.WardrobeSettings;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
-import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticEmoteType;
 import com.hibiscusmc.hmccosmetics.database.Database;
-import com.hibiscusmc.hmccosmetics.emotes.EmoteManager;
 import com.hibiscusmc.hmccosmetics.gui.Menu;
 import com.hibiscusmc.hmccosmetics.gui.Menus;
 import com.hibiscusmc.hmccosmetics.gui.special.DyeMenu;
+import com.hibiscusmc.hmccosmetics.gui.special.DyeMenuProvider;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
-import com.hibiscusmc.hmccosmetics.util.ServerUtils;
+import com.hibiscusmc.hmccosmetics.util.HMCCServerUtils;
+import me.lojosho.hibiscuscommons.hooks.Hooks;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import org.apache.commons.lang3.EnumUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Color;
 import org.bukkit.OfflinePlayer;
@@ -40,10 +41,14 @@ public class CosmeticCommand implements CommandExecutor {
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String @NotNull [] args) {
         boolean silent = false;
+        boolean console = false;
+
+        if (!(sender instanceof Player)) {
+            console = true;
+        }
 
         if (args.length == 0) {
-            if (!(sender instanceof Player)) {
-                // Console
+            if (console) {
                 return true;
             }
             if (!sender.hasPermission("hmccosmetics.cmd.default")) {
@@ -104,7 +109,18 @@ public class CosmeticCommand implements CommandExecutor {
                 }
 
                 if (sender.hasPermission("hmccosmetics.cmd.apply.color")) {
-                    if (args.length >= 4) color = ServerUtils.hex2Rgb(args[3]);
+                    if (args.length >= 4) {
+                        // TODO: Add sub-color support somehow... (and make this neater)
+                        String textColor = args[3];
+                        if (!textColor.contains("#") && Hooks.isActiveHook("HMCColor")) {
+                            HMCColorConfig.Colors colors = HMCColorContextKt.getHmcColor().getConfig().getColors().get(textColor);
+                            if (colors != null) {
+                                color = colors.getBaseColor().getColor();
+                            }
+                        } else {
+                            color = HMCCServerUtils.hex2Rgb(textColor);
+                        }
+                    }
                 }
 
                 if (args.length == 1) {
@@ -126,7 +142,12 @@ public class CosmeticCommand implements CommandExecutor {
 
                 CosmeticUser user = CosmeticUsers.getUser(player);
 
-                if (!user.canEquipCosmetic(cosmetic)) {
+                if (user == null) {
+                    if (!silent) MessagesUtil.sendMessage(sender, "invalid-player");
+                    return true;
+                }
+
+                if (!user.canEquipCosmetic(cosmetic) && !console) {
                     if (!silent) MessagesUtil.sendMessage(player, "no-cosmetic-permission");
                     return true;
                 }
@@ -134,11 +155,11 @@ public class CosmeticCommand implements CommandExecutor {
                 TagResolver placeholders =
                         TagResolver.resolver(Placeholder.parsed("cosmetic", cosmetic.getId()),
                                 TagResolver.resolver(Placeholder.parsed("player", player.getName())),
-                                TagResolver.resolver(Placeholder.parsed("cosmeticslot", cosmetic.getSlot().name())));
+                                TagResolver.resolver(Placeholder.parsed("cosmeticslot", cosmetic.getSlot().toString())));
 
                 if (!silent) MessagesUtil.sendMessage(player, "equip-cosmetic", placeholders);
 
-                user.addPlayerCosmetic(cosmetic, color);
+                user.addCosmetic(cosmetic, color);
                 user.updateCosmetic(cosmetic.getSlot());
                 return true;
             }
@@ -169,11 +190,12 @@ public class CosmeticCommand implements CommandExecutor {
                 if (args[1].equalsIgnoreCase("all")) {
                     cosmeticSlots = user.getSlotsWithCosmetics();
                 } else {
-                    if (!EnumUtils.isValidEnum(CosmeticSlot.class, args[1].toUpperCase())) {
+                    String rawSlot = args[1].toUpperCase();
+                    if (!CosmeticSlot.contains(rawSlot)) {
                         if (!silent) MessagesUtil.sendMessage(sender, "invalid-slot");
                         return true;
                     }
-                    cosmeticSlots = Set.of(CosmeticSlot.valueOf(args[1].toUpperCase()));
+                    cosmeticSlots = Set.of(CosmeticSlot.valueOf(rawSlot));
                 }
 
                 for (CosmeticSlot cosmeticSlot : cosmeticSlots) {
@@ -185,7 +207,7 @@ public class CosmeticCommand implements CommandExecutor {
                     TagResolver placeholders =
                             TagResolver.resolver(Placeholder.parsed("cosmetic", user.getCosmetic(cosmeticSlot).getId()),
                                     TagResolver.resolver(Placeholder.parsed("player", player.getName())),
-                                    TagResolver.resolver(Placeholder.parsed("cosmeticslot", cosmeticSlot.name())));
+                                    TagResolver.resolver(Placeholder.parsed("cosmeticslot", cosmeticSlot.toString())));
 
                     if (!silent) MessagesUtil.sendMessage(player, "unequip-cosmetic", placeholders);
 
@@ -225,20 +247,24 @@ public class CosmeticCommand implements CommandExecutor {
                 CosmeticUser user = CosmeticUsers.getUser(player);
 
                 if (user.isInWardrobe()) {
-                    user.leaveWardrobe();
+                    user.leaveWardrobe(false);
                 } else {
-                    user.enterWardrobe(false, wardrobe);
+                    user.enterWardrobe(wardrobe, false);
                 }
                 return true;
             }
             // cosmetic menu exampleMenu playerName
             case ("menu") -> {
-                if (args.length == 1) return true;
                 if (!sender.hasPermission("hmccosmetics.cmd.menu")) {
                     if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
                     return true;
                 }
-                Menu menu = Menus.getMenu(args[1]);
+                Menu menu;
+                if (args.length == 1) {
+                    menu = Menus.getDefaultMenu();
+                } else {
+                    menu = Menus.getMenu(args[1]);
+                }
 
                 if (sender instanceof Player) player = ((Player) sender).getPlayer();
                 if (sender.hasPermission("hmccosmetics.cmd.menu.other")) {
@@ -262,7 +288,6 @@ public class CosmeticCommand implements CommandExecutor {
             case ("dataclear") -> {
                 if (args.length == 1) return true;
                 OfflinePlayer selectedPlayer = Bukkit.getOfflinePlayer(args[1]);
-                if (selectedPlayer == null) return true;
                 if (!sender.hasPermission("hmccosmetics.cmd.dataclear") && !sender.isOp()) {
                     if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
                     return true;
@@ -285,26 +310,35 @@ public class CosmeticCommand implements CommandExecutor {
                     return true;
                 }
 
-                if (!EnumUtils.isValidEnum(CosmeticSlot.class, args[1])) {
+                final String rawSlot = args[1];
+                if (!CosmeticSlot.contains(rawSlot)) {
+                    if (!silent) MessagesUtil.sendMessage(player, "invalid-slot");
+                    return true;
+                }
+                final CosmeticSlot slot = CosmeticSlot.valueOf(rawSlot); // This is checked above. While IDEs may say the slot might be null, it will not be.
+                final Cosmetic cosmetic = user.getCosmetic(slot);
+                if (cosmetic == null) {
                     if (!silent) MessagesUtil.sendMessage(player, "invalid-slot");
                     return true;
                 }
-                CosmeticSlot slot = CosmeticSlot.valueOf(args[1]);
-                Cosmetic cosmetic = user.getCosmetic(slot);
 
                 if (args.length >= 3) {
                     if (args[2].isEmpty()) {
                         if (!silent) MessagesUtil.sendMessage(player, "invalid-color");
                         return true;
                     }
-                    Color color = ServerUtils.hex2Rgb(args[2]);
+                    Color color = HMCCServerUtils.hex2Rgb(args[2]);
                     if (color == null) {
                         if (!silent) MessagesUtil.sendMessage(player, "invalid-color");
                         return true;
                     }
-                    user.addPlayerCosmetic(cosmetic, color); // #FFFFFF
+                    user.addCosmetic(cosmetic, color); // #FFFFFF
                 } else {
-                    DyeMenu.openMenu(user, cosmetic);
+                    if (DyeMenuProvider.hasMenuProvider()) {
+                        DyeMenuProvider.openMenu(player, user, cosmetic);
+                    } else {
+                        if (!silent) MessagesUtil.sendMessage(player, "invalid-color");
+                    }
                 }
             }
             case ("setwardrobesetting") -> {
@@ -321,7 +355,7 @@ public class CosmeticCommand implements CommandExecutor {
                 }
                 Wardrobe wardrobe = WardrobeSettings.getWardrobe(args[1]);
                 if (wardrobe == null) {
-                    wardrobe = new Wardrobe(args[1], new WardrobeLocation(null, null, null), null, -1);
+                    wardrobe = new Wardrobe(args[1], new WardrobeLocation(null, null, null), null, -1, null);
                     WardrobeSettings.addWardrobe(wardrobe);
                     //MessagesUtil.sendMessage(player, "no-wardrobes");
                     //return true;
@@ -334,7 +368,7 @@ public class CosmeticCommand implements CommandExecutor {
                 }
 
                 if (args[2].equalsIgnoreCase("viewerlocation")) {
-                    WardrobeSettings.setViewerLocation(wardrobe, player.getLocation());
+                    WardrobeSettings.setViewerLocation(wardrobe, player.getEyeLocation());
                     if (!silent) MessagesUtil.sendMessage(player, "set-wardrobe-viewing");
                     return true;
                 }
@@ -352,10 +386,15 @@ public class CosmeticCommand implements CommandExecutor {
                         return true;
                     }
                     if (args[2].equalsIgnoreCase("distance")) {
-                        WardrobeSettings.setWardrobeDistance(wardrobe, Integer.valueOf(args[3]));
+                        WardrobeSettings.setWardrobeDistance(wardrobe, Integer.parseInt(args[3]));
                         if (!silent) MessagesUtil.sendMessage(player, "set-wardrobe-distance");
                         return true;
                     }
+                    if (args[2].equalsIgnoreCase("defaultmenu")) {
+                        WardrobeSettings.setWardrobeDefaultMenu(wardrobe, args[3]);
+                        if (!silent) MessagesUtil.sendMessage(player, "set-wardrobe-menu");
+                        return true;
+                    }
                 }
             }
             case ("dump") -> {
@@ -368,8 +407,9 @@ public class CosmeticCommand implements CommandExecutor {
                 }
                 player.sendMessage("Passengers -> " + player.getPassengers());
                 if (user.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
-                    player.sendMessage("Backpack Location -> " + user.getUserBackpackManager().getArmorStand().getLocation());
+                    player.sendMessage("Backpack Location -> " + user.getUserBackpackManager().getEntityManager().getLocation());
                 }
+                player.sendMessage("Cosmetic Passengers -> " + user.getUserBackpackManager().getAreaEffectEntityId());
                 player.sendMessage("Cosmetics -> " + user.getCosmetics());
                 player.sendMessage("EntityId -> " + player.getEntityId());
                 return true;
@@ -414,7 +454,7 @@ public class CosmeticCommand implements CommandExecutor {
                 CosmeticUser user = CosmeticUsers.getUser(player);
 
                 if (!silent) MessagesUtil.sendMessage(sender, "show-cosmetic");
-                user.showCosmetics();
+                user.showCosmetics(CosmeticUser.HiddenReason.COMMAND);
                 return true;
             }
             case ("debug") -> {
@@ -423,7 +463,7 @@ public class CosmeticCommand implements CommandExecutor {
                     return true;
                 }
 
-                if (Settings.getDebugMode()) {
+                if (Settings.isDebugMode()) {
                     Settings.setDebugMode(false);
                     if (!silent) MessagesUtil.sendMessage(sender, "debug-disabled");
                 } else {
@@ -431,56 +471,60 @@ public class CosmeticCommand implements CommandExecutor {
                     if (!silent) MessagesUtil.sendMessage(sender, "debug-enabled");
                 }
             }
-            case ("emote") -> {
-                if (!sender.hasPermission("hmccosmetics.cmd.emote")) {
+            case "disableall" -> {
+                if (!sender.hasPermission("hmccosmetics.cmd.disableall")) {
                     if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
                     return true;
                 }
-                if (sender.hasPermission("hmccosmetics.cmd.emote.other")) {
-                    if (args.length >= 2) player = Bukkit.getPlayer(args[1]);
-                }
-                if (player == null) {
-                    if (!silent) MessagesUtil.sendMessage(sender, "invalid-player");
-                    return true;
-                }
-                CosmeticUser user = CosmeticUsers.getUser(player);
-                if (!user.hasCosmeticInSlot(CosmeticSlot.EMOTE)) {
-                    if (!silent) MessagesUtil.sendMessage(sender, "emote-none");
-                    return true;
-                }
-
-                CosmeticEmoteType cosmeticEmoteType = (CosmeticEmoteType) user.getCosmetic(CosmeticSlot.EMOTE);
-                cosmeticEmoteType.run(user);
-                return true;
-            }
-
-            case ("playemote") -> {
-                // /cosmetic playEmote <emoteId> [playerName]
-                if (!sender.hasPermission("hmccosmetics.cmd.playemote")) {
-                    if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
-                    return true;
-                }
-
-                if (args.length < 2) {
+                if (args.length == 1) {
                     if (!silent) MessagesUtil.sendMessage(player, "not-enough-args");
                     return true;
                 }
+                if (args[1].equalsIgnoreCase("true")) {
+                    Settings.setAllPlayersHidden(true);
+                    for (CosmeticUser user : CosmeticUsers.values()) user.hideCosmetics(CosmeticUser.HiddenReason.DISABLED);
+                    if (!silent) MessagesUtil.sendMessage(sender, "disabled-all");
+                } else if (args[1].equalsIgnoreCase("false")) {
+                    Settings.setAllPlayersHidden(false);
+                    for (CosmeticUser user : CosmeticUsers.values()) user.showCosmetics(CosmeticUser.HiddenReason.DISABLED);
+                    if (!silent) MessagesUtil.sendMessage(sender, "enabled-all");
+                } else {
+                    if (!silent) MessagesUtil.sendMessage(sender, "invalid-args");
+                }
+                return true;
+            }
 
-                if (!EmoteManager.has(args[1])) {
-                    MessagesUtil.sendDebugMessages("Did not contain " + args[1]);
-                    if (!silent) MessagesUtil.sendMessage(sender, "emote-invalid");
+            case "hiddenreasons" -> {
+                if (!sender.hasPermission("hmccosmetics.cmd.hiddenreasons")) {
+                    if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
                     return true;
                 }
-
-                if (sender.hasPermission("hmccosmetics.cmd.playemote.other")) {
-                    if (args.length >= 3) player = Bukkit.getPlayer(args[2]);
+                if (args.length >= 2) {
+                    player = Bukkit.getPlayer(args[1]);
                 }
                 if (player == null) {
                     if (!silent) MessagesUtil.sendMessage(sender, "invalid-player");
                     return true;
                 }
                 CosmeticUser user = CosmeticUsers.getUser(player);
-                user.getUserEmoteManager().playEmote(args[1]);
+                sender.sendMessage(user.getHiddenReasons().toString());
+                return true;
+            }
+
+            case "clearhiddenreasons" -> {
+                if (!sender.hasPermission("hmccosmetics.cmd.clearhiddenreasons")) {
+                    if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
+                    return true;
+                }
+                if (args.length >= 2) {
+                    player = Bukkit.getPlayer(args[1]);
+                }
+                if (player == null) {
+                    if (!silent) MessagesUtil.sendMessage(sender, "invalid-player");
+                    return true;
+                }
+                CosmeticUser user = CosmeticUsers.getUser(player);
+                user.clearHiddenReasons();
                 return true;
             }
         }

common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommandTabComplete.java

@@ -1,15 +1,16 @@
 package com.hibiscusmc.hmccosmetics.command;
 
+import com.hibiscusmc.hmccolor.HMCColorContextKt;
 import com.hibiscusmc.hmccosmetics.config.Wardrobe;
 import com.hibiscusmc.hmccosmetics.config.WardrobeSettings;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
-import com.hibiscusmc.hmccosmetics.emotes.EmoteManager;
 import com.hibiscusmc.hmccosmetics.gui.Menu;
 import com.hibiscusmc.hmccosmetics.gui.Menus;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
+import me.lojosho.hibiscuscommons.hooks.Hooks;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -42,14 +43,16 @@ public class CosmeticCommandTabComplete implements TabCompleter {
             if (hasPermission(sender, "hmccosmetics.cmd.hide")) completions.add("hide");
             if (hasPermission(sender, "hmccosmetics.cmd.show")) completions.add("show");
             if (hasPermission(sender, "hmccosmetics.cmd.debug")) completions.add("debug");
-            if (hasPermission(sender, "hmccosmetics.cmd.emote")) completions.add("emote");
-            if (hasPermission(sender, "hmccosmetics.cmd.playemote")) completions.add("playemote");
+            if (hasPermission(sender, "hmccosmetics.cmd.disableall")) completions.add("disableall");
+            if (hasPermission(sender, "hmccosmetics.cmd.hiddenreasons")) completions.add("hiddenreasons");
+            if (hasPermission(sender, "hmccosmetics.cmd.clearhiddenreasons")) completions.add("clearhiddenreasons");
 
             StringUtil.copyPartialMatches(args[0], completions, finalCompletions);
         }
 
         if (!(sender instanceof Player)) return completions;
         CosmeticUser user = CosmeticUsers.getUser(((Player) sender).getUniqueId());
+        if (user == null) return completions; // User hasn't loaded in yet, can't do proper checks
 
         if (args.length == 2) {
             String subcommand = args[0].toLowerCase();
@@ -68,11 +71,15 @@ public class CosmeticCommandTabComplete implements TabCompleter {
                         if (menu.canOpen(user.getPlayer())) completions.add(menu.getId());
                     }
                 }
-                case "dataclear", "hide", "show", "emote" -> {
+                case "dataclear", "hide", "show", "hiddenreasons", "clearhiddenreasons" -> {
                     for (Player player : Bukkit.getOnlinePlayers()) {
                         completions.add(player.getName());
                     }
                 }
+                case "disableall" -> {
+                    completions.add("true");
+                    completions.add("false");
+                }
                 case "wardrobe" -> {
                     for (Wardrobe wardrobe : WardrobeSettings.getWardrobes()) {
                         if (wardrobe.hasPermission()) {
@@ -84,7 +91,7 @@ public class CosmeticCommandTabComplete implements TabCompleter {
                 }
                 case "dye" -> {
                     for (CosmeticSlot slot : user.getDyeableSlots()) {
-                        completions.add(slot.name());
+                        completions.add(slot.toString());
                     }
                 }
                 case "setwardrobesetting" -> {
@@ -92,7 +99,6 @@ public class CosmeticCommandTabComplete implements TabCompleter {
                         completions.add(wardrobe.getId());
                     }
                 }
-                case "playemote" -> completions.addAll(EmoteManager.getAllNames());
             }
             StringUtil.copyPartialMatches(args[1], completions, finalCompletions);
         }
@@ -102,7 +108,7 @@ public class CosmeticCommandTabComplete implements TabCompleter {
                 case "dye" -> {
                     completions.add("#FFFFFF");
                 }
-                case "menu", "wardrobe", "apply", "unapply", "playemote" -> {
+                case "menu", "wardrobe", "apply", "unapply" -> {
                     for (Player player : Bukkit.getOnlinePlayers()) {
                         completions.add(player.getName());
                     }
@@ -113,6 +119,7 @@ public class CosmeticCommandTabComplete implements TabCompleter {
                     completions.add("leavelocation");
                     completions.add("permission");
                     completions.add("distance");
+                    completions.add("defaultmenu");
                 }
             }
             StringUtil.copyPartialMatches(args[2], completions, finalCompletions);
@@ -122,8 +129,14 @@ public class CosmeticCommandTabComplete implements TabCompleter {
             String subcommand = args[0].toLowerCase();
             switch (subcommand) {
                 case "apply" -> {
+                    if (Hooks.isActiveHook("HMCColor")) completions.addAll(HMCColorContextKt.getHmcColor().getConfig().getColors().keySet());
                     completions.add("#FFFFFF");
                 }
+                case "setwardrobesetting" -> {
+                    if (args[2].equalsIgnoreCase("defaultmenu")) {
+                        completions.addAll(Menus.getMenuNames());
+                    }
+                }
             }
             StringUtil.copyPartialMatches(args[3], completions, finalCompletions);
         }

common/src/main/java/com/hibiscusmc/hmccosmetics/config/DatabaseSettings.java

@@ -1,10 +1,10 @@
 package com.hibiscusmc.hmccosmetics.config;
 
-import org.spongepowered.configurate.ConfigurationNode;
+import lombok.Getter;
+import me.lojosho.shaded.configurate.ConfigurationNode;
 
 public class DatabaseSettings {
 
-    //private static final String DATABASE_SETTINGS_PATH = "cosmetic-settings";
     private static final String DATABASE_TYPE_PATH = "type";
     private static final String MYSQL_DATABASE_SETTINGS = "mysql";
 
@@ -17,18 +17,24 @@ public class DatabaseSettings {
     private static final String ENABLE_DELAY = "enabled";
     private static final String DELAY_LENGTH = "delay";
 
+    @Getter
     private static String databaseType;
+    @Getter
     private static String database;
+    @Getter
     private static String password;
+    @Getter
     private static String host;
+    @Getter
     private static String username;
+    @Getter
     private static int port;
+    @Getter
     private static boolean enabledDelay;
+    @Getter
     private static int delayLength;
 
     public static void load(ConfigurationNode source) {
-        //ConfigurationNode databaseSettings = source.node(DATABASE_SETTINGS_PATH);
-
         databaseType = source.node(DATABASE_TYPE_PATH).getString();
 
         ConfigurationNode mySql = source.node(MYSQL_DATABASE_SETTINGS);
@@ -44,36 +50,4 @@ public class DatabaseSettings {
         enabledDelay = delay.node(ENABLE_DELAY).getBoolean(false);
         delayLength = delay.node(DELAY_LENGTH).getInt(2);
     }
-
-    public static String getDatabaseType() {
-        return databaseType;
-    }
-
-    public static String getDatabase() {
-        return database;
-    }
-
-    public static String getPassword() {
-        return password;
-    }
-
-    public static String getHost() {
-        return host;
-    }
-
-    public static String getUsername() {
-        return username;
-    }
-
-    public static int getPort() {
-        return port;
-    }
-
-    public static boolean isEnabledDelay() {
-        return enabledDelay;
-    }
-
-    public static int getDelayLength() {
-        return delayLength;
-    }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/config/Settings.java

@@ -1,12 +1,16 @@
 package com.hibiscusmc.hmccosmetics.config;
 
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
-import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
+import lombok.Getter;
+import lombok.Setter;
+import me.lojosho.shaded.configurate.ConfigurationNode;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.util.Vector;
-import org.spongepowered.configurate.ConfigurationNode;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 import java.util.logging.Level;
 
 public class Settings {
@@ -15,17 +19,8 @@ public class Settings {
     private static final String DEFAULT_MENU = "default-menu";
     private static final String CONFIG_VERSION = "config-version";
     private static final String COSMETIC_SETTINGS_PATH = "cosmetic-settings";
-    private static final String REQUIRE_EMPTY_HELMET_PATH = "require-empty-helmet";
-    private static final String REQUIRE_EMPTY_OFF_HAND_PATH = "require-empty-off-hand";
-    private static final String REQUIRE_EMPTY_CHEST_PLATE_PATH = "require-empty-chest-plate";
-    private static final String REQUIRE_EMPTY_PANTS_PATH = "require-empty-pants";
-    private static final String REQUIRE_EMPTY_BOOTS_PATH = "require-empty-boots";
     private static final String BALLOON_OFFSET = "balloon-offset";
-    private static final String FIRST_PERSON_BACKPACK_MODE = "first-person-backpack-mode";
-
-    private static final transient String LOOK_DOWN_PITCH_PATH = "look-down-backpack-remove";
     private static final String VIEW_DISTANCE_PATH = "view-distance";
-    private static final String PARTICLE_COUNT = "particle-count";
     private static final String DYE_MENU_PATH = "dye-menu";
     private static final String DYE_MENU_NAME = "title";
     private static final String DYE_MENU_INPUT_SLOT = "input-slot";
@@ -34,52 +29,130 @@ public class Settings {
     private static final String TICK_PERIOD_PATH = "tick-period";
     private static final String UNAPPLY_DEATH_PATH = "unapply-on-death";
     private static final String FORCE_PERMISSION_JOIN_PATH = "force-permission-join";
-    private static final String EMOTE_DISTANCE_PATH = "emote-distance";
+    private static final String FORCE_SHOW_COSMETICS_PATH = "force-show-join";
+    private static final String ITEM_PROCESSING_PATH = "item-processing";
+    private static final String ITEM_PROCESS_DISPLAY_NAME_PATH = "display-name";
+    private static final String ITEM_PROCESS_LORE_PATH = "lore";
+    private static final String DISABLED_GAMEMODE_PATH = "disabled-gamemode";
+    private static final String DISABLED_GAMEMODE_GAMEMODES_PATH = "gamemodes";
     private static final String HOOK_SETTING_PATH = "hook-settings";
     private static final String HOOK_ITEMADDER_PATH = "itemsadder";
+    private static final String HOOK_NEXO_PATH = "nexo";
     private static final String HOOK_RELOAD_CHANGE_PATH = "reload-on-change";
     private static final String HOOK_WORLDGUARD_PATH = "worldguard";
     private static final String HOOK_WG_MOVE_CHECK_PATH = "player-move-check";
     private static final String HOOK_WG_MOVE_CHECK_PATH_LEGACY = "player_move_check";
-    private static final String COSMETIC_EMOTE_CHECK_PATH = "emote-block-check";
-    private static final String COSMETIC_EMOTE_AIR_CHECK_PATH = "emote-air-check";
-    private static final String COSMETIC_EMOTE_DAMAGE_PATH = "emote-damage-leave";
-    private static final String COSMETIC_EMOTE_INVINCIBLE_PATH = "emote-invincible";
-    private static final String COSMETIC_ADD_ENCHANTS_HELMET_PATH = "helmet-add-enchantments";
-    private static final String COSMETIC_ADD_ENCHANTS_CHESTPLATE_PATH = "chest-add-enchantments";
-    private static final String COSMETIC_ADD_ENCHANTS_LEGGINGS_PATH = "leggings-add-enchantments";
-    private static final String COSMETIC_ADD_ENCHANTS_BOOTS_PATH = "boots-add-enchantments";
+    private static final String COSMETIC_DISABLED_WORLDS_PATH = "disabled-worlds";
+    private static final String COSMETIC_BACKPACK_FORCE_RIDING_PACKET_PATH = "backpack-force-riding-packet";
     private static final String COSMETIC_DESTROY_LOOSE_COSMETIC_PATH = "destroy-loose-cosmetics";
+    private static final String COSMETIC_BALLOON_HEAD_FORWARD_PATH = "balloon-head-forward";
+    private static final String COSMETIC_OFFHAND_PREVENT_SWAPPING = "offhand-prevent-swapping";
+    private static final String MENU_SETTINGS_PATH = "menu-settings";
+    private static final String MENU_CLICK_COOLDOWN_PATH = "click-cooldown";
+    private static final String MENU_CLICK_COOLDOWN_TIME_PATH = "time";
+    private static final String COSMETIC_TYPE_SETTINGS_PATH = "cosmetic-type";
+    private static final String EQUIP_CLICK_TYPE = "equip-click";
+    private static final String UNEQUIP_CLICK_TYPE = "unequip-click";
+    private static final String DYE_CLICK_TYPE = "dye-click";
+    private static final String SHADING_PATH = "shading";
+    private static final String FIRST_ROW_SHIFT_PATH = "first-row-shift";
+    private static final String SEQUENT_ROW_SHIFT_PATH = "sequent-row-shift";
+    private static final String INDIVIDUAL_COLUMN_SHIFT_PATH = "individual-column-shift";
+    private static final String BACKGROUND_PATH = "background";
+    private static final String CLEAR_BACKGROUND_PATH = "clear-background";
+    private static final String EQUIPPED_COSMETIC_COLOR_PATH = "equipped-cosmetic-color";
+    private static final String EQUIPABLE_COSMETIC_COLOR_PATH = "equipable-cosmetic-color";
+    private static final String LOCKED_COSMETIC_COLOR_PATH = "locked-cosmetic-color";
+    private static final String ENABLED_PATH = "enabled";
+    private static final String SLOT_OPTIONS_PATH = "slot-options";
+    private static final String BACKPACK_PREVENT_DARKNESS_PATH = "backpack-prevent-darkness";
+    private static final String BETTER_HUD_PATH = "betterhud";
+    private static final String BETTER_HUD_HIDE_IN_WARDROBE_PATH = "wardrobe-hide";
 
+    @Getter
     private static String defaultMenu;
+    @Getter
     private static String dyeMenuName;
+    @Getter
     private static int dyeMenuInputSlot;
+    @Getter
     private static int dyeMenuOutputSlot;
+    @Getter
     private static int configVersion;
-    private static boolean requireEmptyHelmet;
-    private static boolean requireEmptyOffHand;
-    private static boolean requireEmptyChestPlate;
-    private static boolean requireEmptyPants;
-    private static boolean requireEmptyBoots;
+    @Getter
     private static boolean debugMode;
+    @Getter
     private static boolean unapplyOnDeath;
+    @Getter
     private static boolean forcePermissionJoin;
+    @Getter
+    private static boolean forceShowOnJoin;
+    @Getter
+    private static boolean itemProcessingDisplayName;
+    @Getter
+    private static boolean itemProcessingLore;
+    @Getter
     private static boolean itemsAdderChangeReload;
+    @Getter
+    private static boolean nexoChangeReload;
+    @Getter
     private static boolean worldGuardMoveCheck;
-    private static boolean cosmeticEmoteBlockCheck;
-    private static boolean addHelmetEnchants;
-    private static boolean addChestplateEnchants;
-    private static boolean addLeggingEnchants;
-    private static boolean addBootsEnchants;
-    private static boolean emoteAirCheck;
-    private static boolean emoteDamageLeave;
-    private static boolean emoteInvincible;
+    private static final HashMap<EquipmentSlot, SlotOptionConfig> slotOptions = new HashMap<>();
+    @Getter
     private static boolean destroyLooseCosmetics;
-    private static int lookDownPitch;
+    @Getter
+    private static boolean preventOffhandSwapping;
+    @Getter
+    private static boolean backpackForceRidingEnabled;
+    @Getter
+    private static boolean disabledGamemodesEnabled;
+    @Getter
+    private static boolean balloonHeadForward;
+    @Getter
+    private static boolean backpackPreventDarkness;
+    @Getter
+    private static List<String> disabledGamemodes;
+    @Getter
+    private static List<String> disabledWorlds;
+    @Getter
     private static int viewDistance;
+    @Getter
     private static int tickPeriod;
-    private static double emoteDistance;
+    @Getter
+    private static Long defaultMenuCooldown;
+    @Getter
+    private static boolean menuClickCooldown;
+    @Getter
     private static Vector balloonOffset;
+    @Getter
+    private static String cosmeticEquipClickType;
+    @Getter
+    private static String cosmeticUnEquipClickType;
+    @Getter
+    private static String cosmeticDyeClickType;
+    @Getter
+    private static boolean defaultShading;
+    @Getter
+    private static String firstRowShift;
+    @Getter
+    private static String sequentRowShift;
+    @Getter
+    private static String individualColumnShift;
+    @Getter
+    private static String background;
+    @Getter
+    private static String clearBackground;
+    @Getter
+    private static String equippedCosmeticColor;
+    @Getter
+    private static String equipableCosmeticColor;
+    @Getter
+    private static String lockedCosmeticColor;
+    @Getter @Setter
+    private static boolean allPlayersHidden;
+    @Getter
+    private static boolean wardrobeHideHud;
+
 
     public static void load(ConfigurationNode source) {
 
@@ -98,30 +171,66 @@ public class Settings {
 
         ConfigurationNode cosmeticSettings = source.node(COSMETIC_SETTINGS_PATH);
 
-        requireEmptyHelmet = cosmeticSettings.node(REQUIRE_EMPTY_HELMET_PATH).getBoolean();
-        requireEmptyOffHand = cosmeticSettings.node(REQUIRE_EMPTY_OFF_HAND_PATH).getBoolean();
-        requireEmptyChestPlate = cosmeticSettings.node(REQUIRE_EMPTY_CHEST_PLATE_PATH).getBoolean();
-        requireEmptyPants = cosmeticSettings.node(REQUIRE_EMPTY_PANTS_PATH).getBoolean();
-        requireEmptyBoots = cosmeticSettings.node(REQUIRE_EMPTY_BOOTS_PATH).getBoolean();
+        ConfigurationNode disabledGamemodeSettings = cosmeticSettings.node(DISABLED_GAMEMODE_PATH);
+        disabledGamemodesEnabled = disabledGamemodeSettings.node(ENABLED_PATH).getBoolean(true);
+        try {
+            disabledGamemodes = disabledGamemodeSettings.node(DISABLED_GAMEMODE_GAMEMODES_PATH).getList(String.class);
+            disabledWorlds = cosmeticSettings.node(COSMETIC_DISABLED_WORLDS_PATH).getList(String.class);
+        } catch (Exception e) {
+            disabledGamemodes = new ArrayList<>();
+            disabledWorlds = new ArrayList<>();
+        }
+
+        ConfigurationNode itemProcessingSettings = cosmeticSettings.node(ITEM_PROCESSING_PATH);
+        itemProcessingDisplayName = itemProcessingSettings.node(ITEM_PROCESS_DISPLAY_NAME_PATH).getBoolean(true);
+        itemProcessingLore = itemProcessingSettings.node(ITEM_PROCESS_LORE_PATH).getBoolean(true);
+
         unapplyOnDeath = cosmeticSettings.node(UNAPPLY_DEATH_PATH).getBoolean(false);
         forcePermissionJoin = cosmeticSettings.node(FORCE_PERMISSION_JOIN_PATH).getBoolean(false);
-        emoteDistance = cosmeticSettings.node(EMOTE_DISTANCE_PATH).getDouble(-3);
-        cosmeticEmoteBlockCheck = cosmeticSettings.node(COSMETIC_EMOTE_CHECK_PATH).getBoolean(true);
-        emoteAirCheck = cosmeticSettings.node(COSMETIC_EMOTE_AIR_CHECK_PATH).getBoolean(true);
-        emoteDamageLeave = cosmeticSettings.node(COSMETIC_EMOTE_DAMAGE_PATH).getBoolean(false);
-        emoteInvincible = cosmeticSettings.node(COSMETIC_EMOTE_INVINCIBLE_PATH).getBoolean(false);
+        forceShowOnJoin = cosmeticSettings.node(FORCE_SHOW_COSMETICS_PATH).getBoolean(false);
         destroyLooseCosmetics = cosmeticSettings.node(COSMETIC_DESTROY_LOOSE_COSMETIC_PATH).getBoolean(false);
-        addHelmetEnchants = cosmeticSettings.node(COSMETIC_ADD_ENCHANTS_HELMET_PATH).getBoolean(false);
-        addChestplateEnchants = cosmeticSettings.node(COSMETIC_ADD_ENCHANTS_CHESTPLATE_PATH).getBoolean(false);
-        addLeggingEnchants = cosmeticSettings.node(COSMETIC_ADD_ENCHANTS_LEGGINGS_PATH).getBoolean(false);
-        addBootsEnchants = cosmeticSettings.node(COSMETIC_ADD_ENCHANTS_BOOTS_PATH).getBoolean(false);
+        backpackForceRidingEnabled = cosmeticSettings.node(COSMETIC_BACKPACK_FORCE_RIDING_PACKET_PATH).getBoolean(false);
+        preventOffhandSwapping = cosmeticSettings.node(COSMETIC_OFFHAND_PREVENT_SWAPPING).getBoolean(false);
+
+        cosmeticSettings.node(SLOT_OPTIONS_PATH).childrenMap().forEach((key, value) -> {
+            EquipmentSlot slot = convertConfigToEquipment(key.toString().toLowerCase());
+            if (slot == null) {
+                MessagesUtil.sendDebugMessages("Invalid slot option: " + key, Level.WARNING);
+                return;
+            }
+            boolean addEnchantments = value.node("add-enchantments").getBoolean(false);
+            boolean requireEmpty = value.node("require-empty").getBoolean(false);
+            slotOptions.put(slot, new SlotOptionConfig(slot, addEnchantments, requireEmpty));
+        });
 
         tickPeriod = cosmeticSettings.node(TICK_PERIOD_PATH).getInt(-1);
-        lookDownPitch = cosmeticSettings.node(LOOK_DOWN_PITCH_PATH).getInt();
-        viewDistance = cosmeticSettings.node(VIEW_DISTANCE_PATH).getInt();
+        viewDistance = cosmeticSettings.node(VIEW_DISTANCE_PATH).getInt(-3);
+        balloonHeadForward = cosmeticSettings.node(COSMETIC_BALLOON_HEAD_FORWARD_PATH).getBoolean(false);
+        backpackPreventDarkness = cosmeticSettings.node(BACKPACK_PREVENT_DARKNESS_PATH).getBoolean(true);
+
+        ConfigurationNode menuSettings = source.node(MENU_SETTINGS_PATH);
+
+        ConfigurationNode clickCooldownSettings = menuSettings.node(MENU_CLICK_COOLDOWN_PATH);
+        menuClickCooldown = clickCooldownSettings.node(ENABLED_PATH).getBoolean(true);
+        defaultMenuCooldown = clickCooldownSettings.node(MENU_CLICK_COOLDOWN_TIME_PATH).getLong(1000L);
+
+        ConfigurationNode shadingSettings = menuSettings.node(SHADING_PATH);
+        defaultShading = shadingSettings.node(ENABLED_PATH).getBoolean();
+        firstRowShift = shadingSettings.node(FIRST_ROW_SHIFT_PATH).getString();
+        sequentRowShift = shadingSettings.node(SEQUENT_ROW_SHIFT_PATH).getString();
+        individualColumnShift = shadingSettings.node(INDIVIDUAL_COLUMN_SHIFT_PATH).getString();
+        background = shadingSettings.node(BACKGROUND_PATH).getString();
+        clearBackground = shadingSettings.node(CLEAR_BACKGROUND_PATH).getString();
+        equippedCosmeticColor = shadingSettings.node(EQUIPPED_COSMETIC_COLOR_PATH).getString();
+        equipableCosmeticColor = shadingSettings.node(EQUIPABLE_COSMETIC_COLOR_PATH).getString();
+        lockedCosmeticColor = shadingSettings.node(LOCKED_COSMETIC_COLOR_PATH).getString();
+
+        ConfigurationNode cosmeticTypeSettings = menuSettings.node(COSMETIC_TYPE_SETTINGS_PATH);
+        cosmeticEquipClickType = cosmeticTypeSettings.node(EQUIP_CLICK_TYPE).getString("ANY");
+        cosmeticUnEquipClickType = cosmeticTypeSettings.node(UNEQUIP_CLICK_TYPE).getString("ANY");
+        cosmeticDyeClickType = cosmeticTypeSettings.node(DYE_CLICK_TYPE).getString("ANY");
 
         final var balloonSection = cosmeticSettings.node(BALLOON_OFFSET);
-
         balloonOffset = loadVector(balloonSection);
 
         ConfigurationNode dyeMenuSettings = source.node(DYE_MENU_PATH);
@@ -131,9 +240,16 @@ public class Settings {
         dyeMenuOutputSlot = dyeMenuSettings.node(DYE_MENU_OUTPUT_SLOT).getInt(25);
 
         ConfigurationNode hookSettings = source.node(HOOK_SETTING_PATH);
+
         ConfigurationNode itemsAdderSettings = hookSettings.node(HOOK_ITEMADDER_PATH);
         itemsAdderChangeReload = itemsAdderSettings.node(HOOK_RELOAD_CHANGE_PATH).getBoolean(false);
 
+        ConfigurationNode nexoSettings = hookSettings.node(HOOK_NEXO_PATH);
+        nexoChangeReload = nexoSettings.node(HOOK_RELOAD_CHANGE_PATH).getBoolean(true);
+
+        ConfigurationNode betterHudSettings = hookSettings.node(BETTER_HUD_PATH);
+        wardrobeHideHud = betterHudSettings.node(BETTER_HUD_HIDE_IN_WARDROBE_PATH).getBoolean(true);
+
         ConfigurationNode worldGuardSettings = hookSettings.node(HOOK_WORLDGUARD_PATH);
         worldGuardMoveCheck = worldGuardSettings.node(HOOK_WG_MOVE_CHECK_PATH).getBoolean(true);
         // I messed up in release 2.2.6 and forgot to change player_move_check to player-move-check.
@@ -143,167 +259,13 @@ public class Settings {
         }
     }
 
-    private static Vector loadVector(final ConfigurationNode config) {
+    public static Vector loadVector(final ConfigurationNode config) {
         return new Vector(config.node("x").getDouble(), config.node("y").getDouble(), config.node("z").getDouble());
     }
 
-    public static boolean isRequireEmptyHelmet() {
-        return requireEmptyHelmet;
-    }
-
-    public static boolean isRequireEmptyOffHand() {
-        return requireEmptyOffHand;
-    }
-
-
-    public static boolean isRequireEmptyChestPlate() {
-        return requireEmptyChestPlate;
-    }
-
-    public static boolean isRequireEmptyPants() {
-        return requireEmptyPants;
-    }
-
-    public static boolean isRequireEmptyBoots() {
-        return requireEmptyBoots;
-    }
-
-    public static boolean getRequireEmpty(CosmeticSlot slot) {
-        switch (slot) {
-            case HELMET -> {
-                return requireEmptyHelmet;
-            }
-            case CHESTPLATE -> {
-                return requireEmptyChestPlate;
-            }
-            case LEGGINGS -> {
-                return requireEmptyPants;
-            }
-            case BOOTS -> {
-                return requireEmptyBoots;
-            }
-            case OFFHAND -> {
-                return requireEmptyOffHand;
-            }
-        }
-        return false;
-    }
-
-    public static boolean getRequireEmpty(EquipmentSlot slot) {
-        switch (slot) {
-            case HEAD -> {
-                return requireEmptyHelmet;
-            }
-            case CHEST -> {
-                return requireEmptyChestPlate;
-            }
-            case LEGS -> {
-                return requireEmptyPants;
-            }
-            case FEET -> {
-                return requireEmptyBoots;
-            }
-            case OFF_HAND -> {
-                return requireEmptyOffHand;
-            }
-        }
-        return false;
-    }
-
-    public static Vector getBalloonOffset() {
-        if (balloonOffset == null) HMCCosmeticsPlugin.getInstance().getLogger().info("Shits null");
-        return balloonOffset;
-    }
-
-    public static int getLookDownPitch() {
-        return lookDownPitch;
-    }
-
-    public static int getViewDistance() {
-        return viewDistance;
-    }
-
-    public static String getDefaultMenu() {
-        return defaultMenu;
-    }
-
-    public static int getConfigVersion() {
-        return configVersion;
-    }
-
-    public static String getDyeMenuName() {
-        return dyeMenuName;
-    }
-    public static int getDyeMenuInputSlot() { return dyeMenuInputSlot; }
-    public static int getDyeMenuOutputSlot() { return dyeMenuOutputSlot; }
-
-    public static boolean isDebugEnabled() {
-        return debugMode;
-    }
-    public static boolean getItemsAdderReloadChange() {
-        return itemsAdderChangeReload;
-    }
-
-    public static int getTickPeriod() {
-        return tickPeriod;
-    }
-    public static boolean getUnapplyOnDeath() {
-        return unapplyOnDeath;
-    }
-    public static boolean getForcePermissionJoin() {
-        return forcePermissionJoin;
-    }
-
-    public static boolean getDebugMode() {
-        return debugMode;
-    }
-
-    public static double getEmoteDistance() {
-        return emoteDistance;
-    }
-
-    public static boolean getCosmeticEmoteBlockCheck() {
-        return cosmeticEmoteBlockCheck;
-    }
-
-    public static boolean getEmoteAirCheck() {
-        return emoteAirCheck;
-    }
-
-    public static boolean isEmoteDamageLeave() {
-        return emoteDamageLeave;
-    }
-
-    public static boolean isEmoteInvincible() {
-        return emoteInvincible;
-    }
-
-    public static boolean isWorldGuardMoveCheckEnabled() {
-        return worldGuardMoveCheck;
-    }
-
-    public static boolean isDestroyLooseCosmetics() {
-        return destroyLooseCosmetics;
-    }
-
-    public static boolean getShouldAddEnchants(EquipmentSlot slot) {
-        switch (slot) {
-            case HEAD -> {
-                return addHelmetEnchants;
-            }
-            case CHEST -> {
-                return addChestplateEnchants;
-            }
-            case LEGS -> {
-                return addLeggingEnchants;
-            }
-            case FEET -> {
-                return addBootsEnchants;
-            }
-            default -> {
-                return false;
-            }
-        }
+    public static SlotOptionConfig getSlotOption(EquipmentSlot slot) {
+        if (!slotOptions.containsKey(slot)) slotOptions.put(slot, new SlotOptionConfig(slot, false, false));
+        return slotOptions.get(slot);
     }
 
     public static void setDebugMode(boolean newSetting) {
@@ -315,4 +277,16 @@ public class Settings {
 
         plugin.saveConfig();
     }
+
+    private static EquipmentSlot convertConfigToEquipment(String slot) {
+        return switch (slot) {
+            case "helmet" -> EquipmentSlot.HEAD;
+            case "chestplate" -> EquipmentSlot.CHEST;
+            case "leggings" -> EquipmentSlot.LEGS;
+            case "boots" -> EquipmentSlot.FEET;
+            case "offhand" -> EquipmentSlot.OFF_HAND;
+            case "mainhand" -> EquipmentSlot.HAND;
+            default -> null;
+        };
+    }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/config/SlotOptionConfig.java

@@ -0,0 +1,20 @@
+package com.hibiscusmc.hmccosmetics.config;
+
+import lombok.Getter;
+import org.bukkit.inventory.EquipmentSlot;
+
+public class SlotOptionConfig {
+
+    @Getter
+    private final EquipmentSlot slot;
+    @Getter
+    private final boolean addEnchantments;
+    @Getter
+    private final boolean requireEmpty;
+
+    public SlotOptionConfig(EquipmentSlot slot, boolean addEnchantments, boolean requireEmpty) {
+        this.slot = slot;
+        this.addEnchantments = addEnchantments;
+        this.requireEmpty = requireEmpty;
+    }
+}

common/src/main/java/com/hibiscusmc/hmccosmetics/config/Wardrobe.java

@@ -1,60 +1,60 @@
 package com.hibiscusmc.hmccosmetics.config;
 
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import lombok.Getter;
+import lombok.Setter;
 import org.bukkit.Location;
+import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nullable;
 
 public class Wardrobe {
 
-    private String id;
-    private int distance = WardrobeSettings.getDefaultDistance();
+    @Getter
+    private final String id;
+    @Getter @Setter
+    private int distance;
+    @Getter @Setter @Nullable
     private String permission;
+    @Getter @Setter
     private WardrobeLocation location;
+    @Getter @Setter @Nullable
+    private String defaultMenu;
 
-    public Wardrobe(String id, WardrobeLocation location, @Nullable String permission, int distance) {
+    /**
+     * This creates a Wardrobe object with all the information that a user will need when entering.
+     * @param id The id of the wardrobe
+     * @param location The 3 locations of the Wardrobe, if any of these 3 locations are null, the wardrobe will not work
+     * @param permission The permission required to enter the wardrobe, if null, no permission is required
+     * @param distance The distance from the wardrobe that the player can be to enter, if -1, the player can enter from any distance
+     * @param defaultMenu The default menu that the player will open when entering the wardrobe.
+     */
+    public Wardrobe(@NotNull String id, @NotNull WardrobeLocation location, @Nullable String permission, int distance, @Nullable String defaultMenu) {
         this.id = id;
         this.location = location;
-        if (permission != null) this.permission = permission;
-        if (distance != -1) this.distance = distance;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public WardrobeLocation getLocation() {
-        return location;
-    }
-
-    public void setDistance(int distance) {
         this.distance = distance;
+        if (permission != null) this.permission = permission;
+        if (defaultMenu != null) this.defaultMenu = defaultMenu;
     }
 
-    public void setPermission(String permission) {
-        this.permission = permission;
-    }
-
+    /**
+     * This checks if the wardrobe has a permission. If it's null, no permission is required and will return false. If it's not null, it will return true.
+     * @return if the wardrobe has a permission
+     */
     public boolean hasPermission() {
         return permission != null;
     }
-    public int getDistance() {
-        return distance;
-    }
 
-    public String getPermission() {
-        return permission;
-    }
-
-    public void setLocation(WardrobeLocation location) {
-        this.location = location;
-    }
-
-    public boolean canEnter(CosmeticUser user) {
+    /**
+     * Calculates if a player can enter a wardrobe. Will return true if the player can enter, else false.
+     * @param user The user that is trying to enter the wardrobe
+     * @return if the player can enter the wardrobe
+     */
+    public boolean canEnter(@NotNull CosmeticUser user) {
         Location wardrobeLocation = location.getNpcLocation();
         Location location = user.getEntity().getLocation();
         if (wardrobeLocation == null) return false;
-        if (distance == -1) return true;
+        if (distance <= 0) return true;
         if (!wardrobeLocation.getWorld().equals(location.getWorld())) return false;
         return wardrobeLocation.distanceSquared(location) <= distance * distance;
     }

common/src/main/java/com/hibiscusmc/hmccosmetics/config/WardrobeLocation.java

@@ -1,45 +1,36 @@
 package com.hibiscusmc.hmccosmetics.config;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.bukkit.Location;
+import org.jetbrains.annotations.Nullable;
 
 public class WardrobeLocation {
 
+    @Getter @Setter
     private Location npcLocation;
+    @Getter @Setter
     private Location viewerLocation;
+    @Getter @Setter
     private Location leaveLocation;
 
-    public WardrobeLocation(Location npcLocation, Location viewerLocation, Location leaveLocation) {
+    /**
+     * This creates a WardrobeLocation object with the 3 locations that are required for a wardrobe to work
+     * @param npcLocation The location of the NPC
+     * @param viewerLocation The location of the viewer
+     * @param leaveLocation The location that the player will be teleported to when they leave the wardrobe if return-last-location in the config is false
+     */
+    public WardrobeLocation(@Nullable Location npcLocation, @Nullable Location viewerLocation, @Nullable Location leaveLocation) {
         this.npcLocation = npcLocation;
         this.viewerLocation = viewerLocation;
         this.leaveLocation = leaveLocation;
     }
 
-    public Location getNpcLocation() {
-        return npcLocation.clone();
-    }
-
-    public Location getViewerLocation() {
-        return viewerLocation.clone();
-    }
-
-    public Location getLeaveLocation() {
-        return leaveLocation.clone();
-    }
-
+    /**
+     * Checks if any of the locations are null
+     * @return true if all locations are not null, else false
+     */
     public boolean hasAllLocations() {
-        if (npcLocation == null || viewerLocation == null || leaveLocation == null) return false;
-        return true;
-    }
-
-    public void setNPCLocation(Location wardrobeLocation) {
-        this.npcLocation = wardrobeLocation;
-    }
-
-    public void setViewerLocation(Location viewerLocation) {
-        this.viewerLocation = viewerLocation;
-    }
-
-    public void setLeaveLocation(Location leaveLocation) {
-        this.leaveLocation = leaveLocation;
+        return npcLocation != null && viewerLocation != null && leaveLocation != null;
     }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/config/WardrobeSettings.java

@@ -1,26 +1,25 @@
 package com.hibiscusmc.hmccosmetics.config;
 
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
-import com.hibiscusmc.hmccosmetics.config.serializer.LocationSerializer;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
-import com.hibiscusmc.hmccosmetics.util.misc.Utils;
+import lombok.Getter;
+import me.lojosho.hibiscuscommons.config.serializer.LocationSerializer;
+import me.lojosho.shaded.configurate.ConfigurationNode;
 import net.kyori.adventure.bossbar.BossBar;
 import org.apache.commons.lang3.EnumUtils;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
-import org.spongepowered.configurate.ConfigurationNode;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Set;
 import java.util.logging.Level;
 
 public class WardrobeSettings {
 
-    private static final String WARDROBE_PATH = "wardrobe";
     private static final String DISABLE_ON_DAMAGE_PATH = "disable-on-damage";
-    private static final String DISPLAY_RADIUS_PATH = "display-radius";
     private static final String PORTABLE_PATH = "portable";
     private static final String ALWAYS_DISPLAY_PATH = "always-display";
-    private static final String STATIC_RADIUS_PATH = "static-radius";
     private static final String ROTATION_SPEED_PATH = "rotation-speed";
     private static final String SPAWN_DELAY_PATH = "spawn-delay";
     private static final String DESPAWN_DELAY_PATH = "despawn-delay";
@@ -33,12 +32,19 @@ public class WardrobeSettings {
     private static final String EQUIP_PUMPKIN_WARDROBE = "equip-pumpkin";
     private static final String TRY_COSMETICS_WARDROBE = "unchecked-wardrobe-cosmetics";
     private static final String RETURN_LAST_LOCATION = "return-last-location";
+    private static final String DAMAGE_KICK_PATH = "damage-kicked";
+    private static final String PREVENT_DAMAGE_PATH = "prevent-damage";
+
+    private static final String WARDROBE_MENU_OPTIONS = "menu-options";
+    private static final String WARDROBE_ENTER_OPEN_MENU_PATH = "enter-open-menu";
+
     private static final String GAMEMODE_OPTIONS_PATH = "gamemode-options";
     private static final String FORCE_EXIT_GAMEMODE_PATH = "exit-gamemode-enabled";
     private static final String EXIT_GAMEMODE_PATH = "exit-gamemode";
     private static final String WARDROBES_PATH = "wardrobes";
     private static final String PERMISSION_PATH = "permission";
     private static final String DISTANCE_PATH = "distance";
+    private static final String WARDROBE_DEFAULT_MENU = "default-menu";
     private static final String BOSSBAR_PATH = "bossbar";
     private static final String BOSSBAR_ENABLE_PATH = "enabled";
     private static final String BOSSBAR_TEXT_PATH = "text";
@@ -54,40 +60,65 @@ public class WardrobeSettings {
     private static final String TRANSITION_FADE_OUT_PATH = "title-fade-out";
 
     private static ConfigurationNode configRoot;
+    @Getter
     private static boolean disableOnDamage;
-    private static int displayRadius;
+    @Getter
     private static boolean portable;
+    @Getter
     private static boolean alwaysDisplay;
-    private static int staticRadius;
+    @Getter
     private static int rotationSpeed;
+    @Getter
     private static int spawnDelay;
+    @Getter
     private static int despawnDelay;
+    @Getter
     private static float bossbarProgress;
+    @Getter
     private static boolean applyCosmeticsOnClose;
+    @Getter
     private static boolean tryCosmeticsInWardrobe;
+    @Getter
     private static boolean equipPumpkin;
+    @Getter
     private static boolean returnLastLocation;
+    @Getter
     private static boolean enabledBossbar;
+    @Getter
+    private static boolean enterOpenMenu;
+    @Getter
     private static boolean forceExitGamemode;
+    @Getter
+    private static boolean damagedKicked;
+    @Getter
+    private static boolean preventDamage;
+    @Getter
     private static GameMode exitGamemode;
     private static HashMap<String, Wardrobe> wardrobes;
+    @Getter
     private static String bossbarMessage;
+    @Getter
     private static BossBar.Overlay bossbarOverlay;
+    @Getter
     private static BossBar.Color bossbarColor;
+    @Getter
     private static boolean enabledTransition;
+    @Getter
     private static String transitionText;
+    @Getter
     private static int transitionDelay;
+    @Getter
     private static int transitionFadeIn;
+    @Getter
     private static int transitionStay;
+    @Getter
     private static int transitionFadeOut;
 
     public static void load(ConfigurationNode source) {
         configRoot = source;
 
         disableOnDamage = source.node(DISABLE_ON_DAMAGE_PATH).getBoolean();
-        displayRadius = source.node(DISPLAY_RADIUS_PATH).getInt();
         portable = source.node(PORTABLE_PATH).getBoolean();
-        staticRadius = source.node(STATIC_RADIUS_PATH).getInt();
         alwaysDisplay = source.node(ALWAYS_DISPLAY_PATH).getBoolean();
         rotationSpeed = source.node(ROTATION_SPEED_PATH).getInt();
         spawnDelay = source.node(SPAWN_DELAY_PATH).getInt();
@@ -96,6 +127,11 @@ public class WardrobeSettings {
         equipPumpkin = source.node(EQUIP_PUMPKIN_WARDROBE).getBoolean();
         returnLastLocation = source.node(RETURN_LAST_LOCATION).getBoolean(false);
         tryCosmeticsInWardrobe = source.node(TRY_COSMETICS_WARDROBE).getBoolean(false);
+        damagedKicked = source.node(DAMAGE_KICK_PATH).getBoolean(false);
+        preventDamage = source.node(PREVENT_DAMAGE_PATH).getBoolean(true);
+
+        ConfigurationNode menuOptionsNode = source.node(WARDROBE_MENU_OPTIONS);
+        enterOpenMenu = menuOptionsNode.node(WARDROBE_ENTER_OPEN_MENU_PATH).getBoolean(false);
 
         ConfigurationNode gamemodeNode = source.node(GAMEMODE_OPTIONS_PATH);
         forceExitGamemode = gamemodeNode.node(FORCE_EXIT_GAMEMODE_PATH).getBoolean(false);
@@ -133,69 +169,21 @@ public class WardrobeSettings {
                 MessagesUtil.sendDebugMessages("Wardrobe Location: " + npcLocation);
                 Location viewerLocation = LocationSerializer.INSTANCE.deserialize(Location.class, wardrobesNode.node(VIEWER_LOCATION_PATH));
                 MessagesUtil.sendDebugMessages("Viewer Location: " + viewerLocation);
-                Location leaveLocation = Utils.replaceIfNull(LocationSerializer.INSTANCE.deserialize(Location.class, wardrobesNode.node(LEAVE_LOCATION_PATH)), viewerLocation);
+                Location leaveLocation = LocationSerializer.INSTANCE.deserialize(Location.class, wardrobesNode.node(LEAVE_LOCATION_PATH));
+                if (leaveLocation == null) leaveLocation = viewerLocation;
                 MessagesUtil.sendDebugMessages("Leave Location: " + leaveLocation);
                 WardrobeLocation wardrobeLocation = new WardrobeLocation(npcLocation, viewerLocation, leaveLocation);
 
-                String permission = null;
-                int distance = -1;
-                if (!wardrobesNode.node(PERMISSION_PATH).virtual()) permission = wardrobesNode.node(PERMISSION_PATH).getString();
-                if (!wardrobesNode.node(DISTANCE_PATH).virtual()) distance = wardrobesNode.node(DISTANCE_PATH).getInt();
+                String permission = wardrobesNode.node(PERMISSION_PATH).getString();
+                String defaultMenu = wardrobesNode.node(WARDROBE_DEFAULT_MENU).getString();
+                int distance = wardrobesNode.node(DISTANCE_PATH).getInt(-1);
 
-                Wardrobe wardrobe = new Wardrobe(id, wardrobeLocation, permission, distance);
+                Wardrobe wardrobe = new Wardrobe(id, wardrobeLocation, permission, distance, defaultMenu);
                 addWardrobe(wardrobe);
             } catch (Exception e) {
                 MessagesUtil.sendDebugMessages("Unable to create wardrobe " + id, Level.SEVERE);
             }
         }
-
-        //throw new RuntimeException(e);
-    }
-
-    public static int getDefaultDistance() {
-        return staticRadius;
-    }
-
-    public static boolean getDisableOnDamage() {
-        return disableOnDamage;
-    }
-
-    public static int getDisplayRadius() {
-        return displayRadius;
-    }
-
-    public static boolean isPortable() {
-        return portable;
-    }
-
-    public static boolean isAlwaysDisplay() {
-        return alwaysDisplay;
-    }
-
-    public static int getStaticRadius() {
-        return staticRadius;
-    }
-
-    public static int getRotationSpeed() {
-        return rotationSpeed;
-    }
-
-    public static int getSpawnDelay() {
-        return spawnDelay;
-    }
-
-    public static int getDespawnDelay() {
-        return despawnDelay;
-    }
-
-    public static boolean isApplyCosmeticsOnClose() {
-        return applyCosmeticsOnClose;
-    }
-    public static boolean isEquipPumpkin() {
-        return equipPumpkin;
-    }
-    public static boolean isReturnLastLocation() {
-        return returnLastLocation;
     }
 
     public static Wardrobe getWardrobe(String key) {
@@ -218,80 +206,12 @@ public class WardrobeSettings {
         wardrobes.remove(id);
     }
 
-    @Deprecated
-    public static boolean inDistanceOfWardrobe(final Location wardrobeLocation, final Location playerLocation) {
-        if (displayRadius == -1) return true;
-        if (!wardrobeLocation.getWorld().equals(playerLocation.getWorld())) return false;
-        return playerLocation.distanceSquared(wardrobeLocation) <= displayRadius * displayRadius;
-    }
-
-    @Deprecated
-    public static boolean inDistanceOfStatic(Wardrobe wardrobe, final Location location) {
-        Location wardrobeLocation = wardrobe.getLocation().getNpcLocation();
-        if (wardrobeLocation == null) return false;
-        if (staticRadius == -1) return true;
-        if (!wardrobeLocation.getWorld().equals(location.getWorld())) return false;
-        return wardrobeLocation.distanceSquared(location) <= staticRadius * staticRadius;
-    }
-
-    public static boolean getEnabledBossbar() {
-        return enabledBossbar;
-    }
-
-    public static float getBossbarProgress() {
-        return bossbarProgress;
-    }
-
-    public static String getBossbarText() {
-        return bossbarMessage;
-    }
-
-    public static BossBar.Overlay getBossbarOverlay() {
-        return bossbarOverlay;
-    }
-
-    public static BossBar.Color getBossbarColor() {
-        return bossbarColor;
-    }
-    public static boolean isEnabledTransition() {
-        return enabledTransition;
-    }
-
-    public static String getTransitionText() {
-        return transitionText;
-    }
-
-    public static int getTransitionDelay() {
-        return transitionDelay;
-    }
-    public static int getTransitionFadeIn() {
-        return transitionFadeIn;
-    }
-    public static int getTransitionStay() {
-        return transitionStay;
-    }
-    public static int getTransitionFadeOut() {
-        return transitionFadeOut;
-    }
-
-    public static boolean isForceExitGamemode() {
-        return forceExitGamemode;
-    }
-
-    public static GameMode getExitGamemode() {
-        return exitGamemode;
-    }
-
-    public static boolean isTryCosmeticsInWardrobe() {
-        return tryCosmeticsInWardrobe;
-    }
-
     /**
      * Sets where the NPC/Mannequin will spawn in the wardrobe
      * @param newLocation
      */
     public static void setNPCLocation(Wardrobe wardrobe, Location newLocation) {
-        wardrobe.getLocation().setNPCLocation(newLocation);
+        wardrobe.getLocation().setNpcLocation(newLocation);
 
         HMCCosmeticsPlugin plugin = HMCCosmeticsPlugin.getInstance();
 
@@ -362,4 +282,14 @@ public class WardrobeSettings {
 
         plugin.saveConfig();
     }
+
+    public static void setWardrobeDefaultMenu(Wardrobe wardrobe, String defaultMenu) {
+        wardrobe.setDefaultMenu(defaultMenu);
+
+        HMCCosmeticsPlugin plugin = HMCCosmeticsPlugin.getInstance();
+
+        plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".default-menu", defaultMenu);
+
+        plugin.saveConfig();
+    }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/config/serializer/ItemSerializer.java

@@ -1,165 +0,0 @@
-package com.hibiscusmc.hmccosmetics.config.serializer;
-
-import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
-import com.hibiscusmc.hmccosmetics.hooks.Hooks;
-import com.hibiscusmc.hmccosmetics.util.InventoryUtils;
-import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
-import com.hibiscusmc.hmccosmetics.util.ServerUtils;
-import com.hibiscusmc.hmccosmetics.util.builder.ColorBuilder;
-import com.hibiscusmc.hmccosmetics.util.misc.StringUtils;
-import com.hibiscusmc.hmccosmetics.util.misc.Utils;
-import org.apache.commons.lang3.EnumUtils;
-import org.bukkit.*;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.inventory.ItemFlag;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.inventory.meta.SkullMeta;
-import org.bukkit.persistence.PersistentDataType;
-import org.checkerframework.checker.nullness.qual.Nullable;
-import org.spongepowered.configurate.ConfigurationNode;
-import org.spongepowered.configurate.serialize.SerializationException;
-import org.spongepowered.configurate.serialize.TypeSerializer;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.stream.Collectors;
-
-public class ItemSerializer implements TypeSerializer<ItemStack> {
-
-    public static final ItemSerializer INSTANCE = new ItemSerializer();
-    private static final String MATERIAL = "material";
-    private static final String AMOUNT = "amount";
-    private static final String NAME = "name";
-    private static final String UNBREAKABLE = "unbreakable";
-    private static final String GLOWING = "glowing";
-    private static final String LORE = "lore";
-    private static final String MODEL_DATA = "model-data";
-    private static final String NBT_TAGS = "nbt-tag";
-    private static final String ENCHANTS = "enchants";
-    private static final String ITEM_FLAGS = "item-flags";
-    private static final String TEXTURE = "texture";
-    private static final String OWNER = "owner";
-    private static final String COLOR = "color";
-    private static final String RED = "red";
-    private static final String GREEN = "green";
-    private static final String BLUE = "blue";
-
-    private ItemSerializer() {
-    }
-
-    @Override
-    public ItemStack deserialize(final Type type, final ConfigurationNode source)
-            throws SerializationException {
-        final ConfigurationNode materialNode = source.node(MATERIAL);
-        final ConfigurationNode amountNode = source.node(AMOUNT);
-        final ConfigurationNode nameNode = source.node(NAME);
-        final ConfigurationNode unbreakableNode = source.node(UNBREAKABLE);
-        final ConfigurationNode glowingNode = source.node(GLOWING);
-        final ConfigurationNode loreNode = source.node(LORE);
-        final ConfigurationNode modelDataNode = source.node(MODEL_DATA);
-        final ConfigurationNode nbtNode = source.node(NBT_TAGS);
-        final ConfigurationNode enchantsNode = source.node(ENCHANTS);
-        final ConfigurationNode itemFlagsNode = source.node(ITEM_FLAGS);
-        final ConfigurationNode textureNode = source.node(TEXTURE);
-        final ConfigurationNode ownerNode = source.node(OWNER);
-        final ConfigurationNode colorNode = source.node(COLOR);
-        final ConfigurationNode redNode = colorNode.node(RED);
-        final ConfigurationNode greenNode = colorNode.node(GREEN);
-        final ConfigurationNode blueNode = colorNode.node(BLUE);
-
-        if (materialNode.virtual()) return null;
-
-        String material = materialNode.getString();
-
-        ItemStack item = Hooks.getItem(material);
-        if (item == null) {
-            HMCCosmeticsPlugin.getInstance().getLogger().severe("Invalid Material -> " + material);
-            return new ItemStack(Material.AIR);
-        }
-        item.setAmount(amountNode.getInt(1));
-
-        ItemMeta itemMeta = item.getItemMeta();
-        if (itemMeta == null) return item;
-        if (!nameNode.virtual())
-            itemMeta.setDisplayName(StringUtils.parseStringToString(Utils.replaceIfNull(nameNode.getString(), "")));
-        if (!unbreakableNode.virtual()) itemMeta.setUnbreakable(unbreakableNode.getBoolean());
-        if (!glowingNode.virtual()) {
-            itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
-            itemMeta.addEnchant(Enchantment.LUCK, 1, true);
-        }
-        if (!loreNode.virtual()) itemMeta.setLore(Utils.replaceIfNull(loreNode.getList(String.class),
-                        new ArrayList<String>()).
-                stream().map(StringUtils::parseStringToString).collect(Collectors.toList()));
-        if (!modelDataNode.virtual()) itemMeta.setCustomModelData(modelDataNode.getInt());
-
-        if (!nbtNode.virtual()) {
-            for (ConfigurationNode nbtNodes : nbtNode.childrenMap().values()) {
-                itemMeta.getPersistentDataContainer().set(NamespacedKey.minecraft(nbtNodes.key().toString()), PersistentDataType.STRING, nbtNodes.getString());
-            }
-        }
-
-        if (!enchantsNode.virtual()) {
-            for (ConfigurationNode enchantNode : enchantsNode.childrenMap().values()) {
-                if (Enchantment.getByKey(NamespacedKey.minecraft(enchantNode.key().toString())) == null) continue;
-                itemMeta.addEnchant(Enchantment.getByKey(NamespacedKey.minecraft(enchantNode.key().toString())), enchantNode.getInt(1), true);
-            }
-        }
-
-        try {
-            if (!itemFlagsNode.virtual()) {
-                for (String itemFlag : itemFlagsNode.getList(String.class)) {
-                    if (!EnumUtils.isValidEnum(ItemFlag.class, itemFlag)) continue;
-                    MessagesUtil.sendDebugMessages("Added " + itemFlag + " to the item!");
-                    itemMeta.addItemFlags(ItemFlag.valueOf(itemFlag));
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        if (item.getType() == Material.PLAYER_HEAD) {
-            SkullMeta skullMeta = (SkullMeta) itemMeta;
-            if (!ownerNode.virtual()) {
-                String ownerString = ownerNode.getString();
-                if (ownerString.contains("%")) {
-                    // This means it has PAPI placeholders in it
-                    skullMeta.getPersistentDataContainer().set(InventoryUtils.getSkullOwner(), PersistentDataType.STRING, ownerString);
-                }
-                OfflinePlayer player = Bukkit.getOfflinePlayer(ownerString);
-                skullMeta.setOwningPlayer(player);
-            }
-
-            if (!textureNode.virtual()) {
-                String textureString = textureNode.getString();
-                if (textureString.contains("%")) {
-                    // This means it has PAPI placeholders in it
-                    skullMeta.getPersistentDataContainer().set(InventoryUtils.getSkullTexture(), PersistentDataType.STRING, textureString);
-                }
-                Bukkit.getUnsafe().modifyItemStack(item, "{SkullOwner:{Id:[I;0,0,0,0],Properties:{textures:[{Value:\""
-                        + textureString + "\"}]}}}");
-
-
-                itemMeta = skullMeta;
-            }
-        }
-
-        if (!colorNode.virtual()) {
-            if (ColorBuilder.canBeColored(item.getType())) {
-                if (!redNode.virtual()) {
-                    itemMeta = ColorBuilder.color(itemMeta, Color.fromRGB(redNode.getInt(0), greenNode.getInt(0), blueNode.getInt(0)));
-                } else {
-                    itemMeta = ColorBuilder.color(itemMeta, ServerUtils.hex2Rgb(colorNode.getString("#FFFFFF")));
-                }
-            }
-        }
-
-        item.setItemMeta(itemMeta);
-        return item;
-    }
-    @Override
-    public void serialize(final Type type, @Nullable final ItemStack obj, final ConfigurationNode node) throws SerializationException {
-
-    }
-
-}

common/src/main/java/com/hibiscusmc/hmccosmetics/config/serializer/LocationSerializer.java

@@ -1,46 +0,0 @@
-package com.hibiscusmc.hmccosmetics.config.serializer;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.checkerframework.checker.nullness.qual.Nullable;
-import org.spongepowered.configurate.ConfigurationNode;
-import org.spongepowered.configurate.serialize.SerializationException;
-import org.spongepowered.configurate.serialize.TypeSerializer;
-
-import java.lang.reflect.Type;
-
-public class LocationSerializer implements TypeSerializer<Location> {
-
-    public static final LocationSerializer INSTANCE = new LocationSerializer();
-
-    private static final String WORLD = "world";
-    private static final String X = "x";
-    private static final String Y = "y";
-    private static final String Z = "z";
-    private static final String PITCH = "pitch";
-    private static final String YAW = "yaw";
-
-
-    private LocationSerializer() {}
-
-    @Override
-    @Nullable
-    public Location deserialize(final Type type, final ConfigurationNode source) throws SerializationException {
-        final World world = Bukkit.getWorld(source.node(WORLD).getString());
-        if (world == null) return null;
-        return new Location(
-                world,
-                source.node(X).getDouble(),
-                source.node(Y).getDouble(),
-                source.node(Z).getDouble(),
-                source.node(YAW).getFloat(),
-                source.node(PITCH).getFloat()
-        );
-    }
-
-    @Override
-    public void serialize(final Type type, @Nullable final Location loc, final ConfigurationNode source) throws SerializationException {
-        // Empty
-    }
-}

common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/Cosmetic.java

@@ -1,28 +1,69 @@
 package com.hibiscusmc.hmccosmetics.cosmetic;
 
-import com.hibiscusmc.hmccosmetics.config.serializer.ItemSerializer;
+import com.hibiscusmc.hmccosmetics.cosmetic.behavior.CosmeticUpdateBehavior;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.Setter;
+import me.lojosho.hibiscuscommons.config.serializer.ItemSerializer;
+import me.lojosho.shaded.configurate.ConfigurationNode;
+import me.lojosho.shaded.configurate.serialize.SerializationException;
+import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.spongepowered.configurate.ConfigurationNode;
-import org.spongepowered.configurate.serialize.SerializationException;
 
+import java.util.List;
 import java.util.logging.Level;
 
+@Getter
+@Setter
 public abstract class Cosmetic {
+    protected static ItemStack UNDEFINED_DISPLAY_ITEM_STACK;
 
+    static {
+        UNDEFINED_DISPLAY_ITEM_STACK = new ItemStack(Material.BARRIER);
+
+        ItemMeta meta = UNDEFINED_DISPLAY_ITEM_STACK.getItemMeta();
+        if (meta != null) {
+            // Legacy methods for Spigot >:(
+            meta.setDisplayName(ChatColor.translateAlternateColorCodes('&', "&cUndefined Item Display"));
+            meta.setLore(List.of(
+                    ChatColor.translateAlternateColorCodes('&', "&cPlease check your configurations & console to"),
+                    ChatColor.translateAlternateColorCodes('&', "&censure there are no errors.")));
+        }
+        UNDEFINED_DISPLAY_ITEM_STACK.setItemMeta(meta);
+    }
+
+    /** Identifier of the cosmetic. */
     private String id;
-    private String permission;
-    private ItemStack item;
-    private String material;
-    private CosmeticSlot slot;
-    private boolean dyable;
 
-    protected Cosmetic(String id, @NotNull ConfigurationNode config) {
+    /** Permission to use the cosmetic. */
+    private String permission;
+
+    /** The display {@link ItemStack} of the cosmetic. */
+    @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE)
+    private ItemStack item;
+
+    /** The material string of the cosmetic. */
+    private String material;
+
+    /** The {@link CosmeticSlot} this cosmetic occupies. */
+    private CosmeticSlot slot;
+
+    /** Whether the cosmetic is dyeable or not. */
+    private boolean dyeable;
+
+    /** The config for the cosmetic */
+    private ConfigurationNode config;
+
+    protected Cosmetic(@NotNull String id, @NotNull ConfigurationNode config) {
         this.id = id;
+        this.config = config;
 
         if (!config.node("permission").virtual()) {
             this.permission = config.node("permission").getString();
@@ -32,66 +73,66 @@ public abstract class Cosmetic {
 
         if (!config.node("item").virtual()) {
             this.material = config.node("item", "material").getString();
-            this.item = generateItemStack(config.node("item"));
+            try {
+                this.item = generateItemStack(config.node("item"));
+            } catch(Exception ex) {
+                MessagesUtil.sendDebugMessages("Forcing %s to use undefined display".formatted(getId()));
+                this.item = UNDEFINED_DISPLAY_ITEM_STACK;
+            }
         }
 
         MessagesUtil.sendDebugMessages("Slot: " + config.node("slot").getString());
+        this.slot = CosmeticSlot.valueOf(config.node("slot").getString());
 
-        setSlot(CosmeticSlot.valueOf(config.node("slot").getString()));
-        setDyable(config.node("dyeable").getBoolean(false));
-
-        MessagesUtil.sendDebugMessages("Dyeable " + dyable);
-        Cosmetics.addCosmetic(this);
+        this.dyeable = config.node("dyeable").getBoolean(false);
+        MessagesUtil.sendDebugMessages("Dyeable " + dyeable);
     }
 
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String id) {
+    protected Cosmetic(String id, String permission, ItemStack item, String material, CosmeticSlot slot, boolean dyeable) {
         this.id = id;
-    }
-
-    public CosmeticSlot getSlot() {
-        return this.slot;
-    }
-
-    public void setSlot(CosmeticSlot slot) {
-        this.slot = slot;
-    }
-
-    public String getPermission() {
-        return this.permission;
-    }
-
-    public void setPermission(String permission) {
         this.permission = permission;
+        this.item = item;
+        this.material = material;
+        this.slot = slot;
+        this.dyeable = dyeable;
     }
 
     public boolean requiresPermission() {
         return permission != null;
     }
 
-    public void setDyable(boolean dyable) {
-        this.dyable = dyable;
+    /**
+     * Dispatched when an update is requested upon the cosmetic. Instead, you should use {@link CosmeticUser#updateCosmetic(CosmeticSlot)})}
+     * @param user the user to preform the update against
+     */
+    @Deprecated(since = "2.8.2")
+    public void update(CosmeticUser user) {
+        if(this instanceof CosmeticUpdateBehavior behavior) {
+            behavior.dispatchUpdate(user);
+        }
     }
 
-    public boolean isDyable() {
-        return this.dyable;
+    /**
+     * Action preformed on the update. Instead, you should use {@link CosmeticUser#updateCosmetic(CosmeticSlot)})}
+     * @param user the user to preform the update against
+     */
+    @Deprecated(since = "2.8.2")
+    protected void doUpdate(final CosmeticUser user) {
+        // #update should be the preferred way of interacting with this api now.
+        this.update(user);
     }
 
-    public String getMaterial() {
-        return material;
-    }
-
-    public abstract void update(CosmeticUser user);
-
     @Nullable
     public ItemStack getItem() {
         if (item == null) return null;
         return item.clone();
     }
 
+    /**
+     * Generate an {@link ItemStack} from a {@link ConfigurationNode}.
+     * @param config the configuration node
+     * @return the {@link ItemStack}
+     */
     protected ItemStack generateItemStack(ConfigurationNode config) {
         try {
             ItemStack item = ItemSerializer.INSTANCE.deserialize(ItemStack.class, config);
@@ -105,4 +146,14 @@ public abstract class Cosmetic {
             throw new RuntimeException(e);
         }
     }
+
+    /**
+     * While cosmetics registered in HMCC are made through a configuration, cosmetics registered from other plugins
+     * may not and instead opt for {@link Cosmetic#Cosmetic(String, String, ItemStack, String, CosmeticSlot, boolean)}, which doesn't use a config.
+     * This should be used only for reference.
+     */
+    @ApiStatus.Experimental
+    public @Nullable ConfigurationNode getConfig() {
+        return config;
+    }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/CosmeticHolder.java

@@ -0,0 +1,78 @@
+package com.hibiscusmc.hmccosmetics.cosmetic;
+
+import com.google.common.collect.ImmutableCollection;
+import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import org.bukkit.Color;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+
+/**
+ * Represents any object that can wear/hold cosmetics,
+ * users, for example.
+ */
+public interface CosmeticHolder {
+    @Nullable Cosmetic getCosmetic(@NotNull CosmeticSlot slot);
+
+    @NotNull ImmutableCollection<Cosmetic> getCosmetics();
+
+    void addCosmetic(@NotNull Cosmetic cosmetic, @Nullable Color color);
+
+    default void addCosmetic(@NotNull Cosmetic cosmetic) {
+        addCosmetic(cosmetic, null);
+    }
+
+    default void removeCosmetics() {
+        // Small optimization could be made, but Concurrent modification prevents us from both getting and removing
+        for (CosmeticSlot slot : CosmeticSlot.values().values()) {
+            removeCosmeticSlot(slot);
+        }
+    }
+
+    void removeCosmeticSlot(@NotNull CosmeticSlot slot);
+
+    default void removeCosmeticSlot(@NotNull Cosmetic cosmetic) {
+        removeCosmeticSlot(cosmetic.getSlot());
+    }
+
+    default boolean hasCosmeticInSlot(@NotNull CosmeticSlot slot) {
+        return getCosmetic(slot) != null;
+    }
+
+    default boolean hasCosmeticInSlot(@NotNull Cosmetic cosmetic) {
+        final var existingCosmetic = getCosmetic(cosmetic.getSlot());
+        if (existingCosmetic == null) return false;
+        return Objects.equals(cosmetic.getId(), existingCosmetic.getId());
+    }
+
+    default boolean canEquipCosmetic(@NotNull Cosmetic cosmetic) {
+        return canEquipCosmetic(cosmetic, false);
+    }
+
+    boolean canEquipCosmetic(@NotNull Cosmetic cosmetic, boolean ignoreWardrobe);
+
+    boolean updateCosmetic(@NotNull CosmeticSlot slot);
+
+    boolean updateMovementCosmetic(@NotNull CosmeticSlot slot, final Location from, final Location to);
+
+    /**
+     * Just for backwards compatibility, ensures that the given viewer and the given cosmetic holder
+     * represent the same user.
+     *
+     * @param viewer the viewer
+     * @param cosmeticHolder the cosmetic holder
+     */
+    @ApiStatus.Internal
+    static @NotNull CosmeticUser ensureSingleCosmeticUser(@NotNull Player viewer, @NotNull CosmeticHolder cosmeticHolder) {
+        if (!(cosmeticHolder instanceof CosmeticUser user) || !user.getUniqueId().equals(viewer.getUniqueId())) {
+            throw new IllegalStateException("This method does not support having a different viewer than" +
+                    " the same cosmetic holder. Needs to be updated to support the overload that takes a viewer and" +
+                    " a cosmetic holder instead of a single CosmeticUser.");
+        }
+        return user;
+    }
+}

common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/CosmeticProvider.java

@@ -0,0 +1,68 @@
+package com.hibiscusmc.hmccosmetics.cosmetic;
+
+import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
+import com.hibiscusmc.hmccosmetics.cosmetic.types.*;
+import lombok.extern.slf4j.Slf4j;
+import me.lojosho.shaded.configurate.ConfigurationNode;
+import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Map;
+import java.util.function.BiFunction;
+
+/**
+ * Allow custom implementations of a {@link Cosmetic}.
+ */
+@Slf4j
+public abstract class CosmeticProvider {
+    protected static final Map<CosmeticSlot, BiFunction<String, ConfigurationNode, Cosmetic>> MAPPINGS = Map.ofEntries(
+        Map.entry(CosmeticSlot.HELMET, CosmeticArmorType::new),
+        Map.entry(CosmeticSlot.CHESTPLATE, CosmeticArmorType::new),
+        Map.entry(CosmeticSlot.LEGGINGS, CosmeticArmorType::new),
+        Map.entry(CosmeticSlot.BOOTS, CosmeticArmorType::new),
+        Map.entry(CosmeticSlot.OFFHAND, CosmeticArmorType::new),
+
+        Map.entry(CosmeticSlot.BACKPACK, CosmeticBackpackType::new),
+
+        Map.entry(CosmeticSlot.BALLOON, CosmeticBalloonType::new)
+    );
+
+    private static final String EXCEPTION_MESSAGE = "Unknown slot %s provided for mapping, if you registered your own CosmeticSlot please ensure that you've also registered a custom CosmeticProvider! Or if you have already registered a custom CosmeticProvider ensure it is registered in your plugins `onLoad` method instead of `onEnable`!";
+
+    /**
+     * Construct the {@link Cosmetic}.
+     * @param id the cosmetic id
+     * @param config the configuration node of the cosmetic
+     * @param slot the occupying slot of the cosmetic
+     * @return the {@link Cosmetic}
+     * @throws IllegalArgumentException if the provided cosmetic could not be mapped
+     */
+    public @NotNull Cosmetic createCosmetic(String id, ConfigurationNode config, CosmeticSlot slot) throws IllegalArgumentException {
+        final var mapper = MAPPINGS.get(slot);
+        if(mapper == null) {
+            throw new IllegalArgumentException(
+                EXCEPTION_MESSAGE.formatted(slot)
+            );
+        }
+
+        return mapper.apply(id, config);
+    }
+
+    /**
+     * Represents the plugin that is providing this {@link CosmeticProvider}
+     * @return the plugin
+     */
+    public abstract Plugin getProviderPlugin();
+
+    /**
+     * Default Implementation.
+     */
+    static class Default extends CosmeticProvider {
+        public static final CosmeticProvider INSTANCE = new Default();
+
+        @Override
+        public Plugin getProviderPlugin() {
+            return HMCCosmeticsPlugin.getInstance();
+        }
+    }
+}

common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/CosmeticSlot.java

@@ -1,13 +1,81 @@
 package com.hibiscusmc.hmccosmetics.cosmetic;
 
-public enum CosmeticSlot {
-    HELMET,
-    CHESTPLATE,
-    LEGGINGS,
-    BOOTS,
-    MAINHAND,
-    OFFHAND,
-    BACKPACK,
-    BALLOON,
-    EMOTE
+import lombok.Getter;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Getter
+public class CosmeticSlot {
+    private static final ConcurrentHashMap<String, CosmeticSlot> REGISTRY = new ConcurrentHashMap<>();
+
+    public static final CosmeticSlot HELMET = register("HELMET");
+    public static final CosmeticSlot CHESTPLATE = register("CHESTPLATE");
+    public static final CosmeticSlot LEGGINGS = register("LEGGINGS");
+    public static final CosmeticSlot BOOTS = register("BOOTS");
+    public static final CosmeticSlot MAINHAND = register("MAINHAND");
+    public static final CosmeticSlot OFFHAND = register("OFFHAND");
+    public static final CosmeticSlot BACKPACK = register("BACKPACK");
+    public static final CosmeticSlot BALLOON = register("BALLOON");
+
+    private final String name;
+
+    private CosmeticSlot(@NotNull String name) {
+        this.name = name;
+    }
+
+    /**
+     * Registers a new slot with the given name. If a slot with the given name already exists, it will be returned.
+     * @param name The name of the slot (This will automatically be converted into all UPPERCASE)
+     * @return The slot that was registered or already exists.
+     * @throws IllegalArgumentException if a cosmetic slot by that name has already been registered
+     */
+    @NotNull
+    public static CosmeticSlot register(@NotNull String name) {
+        final String upperName = name.toUpperCase();
+        if(REGISTRY.containsKey(upperName)) {
+            throw new IllegalArgumentException("A cosmetic slot with name '" + name + "' is already registered.");
+        }
+
+        final CosmeticSlot slot = new CosmeticSlot(upperName);
+        REGISTRY.put(upperName, slot);
+        return slot;
+    }
+
+    /**
+     * @return An unmodifiable map of all the slots that have been registered.
+     */
+    @NotNull
+    public static Map<String, CosmeticSlot> values() {
+        return Collections.unmodifiableMap(REGISTRY);
+    }
+
+    /**
+     * Gets the slot with the given name.
+     * @param name The name of the slot to get. This is automatically converted to all UPPERCASE.
+     * @return The slot with the given name, or null if it does not exist.
+     */
+    @Nullable
+    public static CosmeticSlot valueOf(@NotNull String name) {
+        final String upperName = name.toUpperCase();
+        return REGISTRY.get(upperName);
+    }
+
+    /**
+     * Checks if the registry contains a slot with the given name.
+     * @param name The name of the slot to check for. This is automatically converted to all UPPERCASE.
+     * @return True if the slot exists, false otherwise.
+     */
+    public static boolean contains(@NotNull String name) {
+        final String upperName = name.toUpperCase();
+        return REGISTRY.containsKey(upperName);
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/Cosmetics.java

@@ -2,26 +2,29 @@ package com.hibiscusmc.hmccosmetics.cosmetic;
 
 import com.google.common.collect.HashBiMap;
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
-import com.hibiscusmc.hmccosmetics.config.Settings;
-import com.hibiscusmc.hmccosmetics.cosmetic.types.*;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
-import org.apache.commons.lang3.EnumUtils;
+import lombok.extern.slf4j.Slf4j;
+import me.lojosho.shaded.configurate.CommentedConfigurationNode;
+import me.lojosho.shaded.configurate.ConfigurateException;
+import me.lojosho.shaded.configurate.ConfigurationNode;
+import me.lojosho.shaded.configurate.yaml.YamlConfigurationLoader;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.spongepowered.configurate.CommentedConfigurationNode;
-import org.spongepowered.configurate.ConfigurateException;
-import org.spongepowered.configurate.ConfigurationNode;
-import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
 
 import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Set;
 import java.util.logging.Level;
+import java.util.stream.Stream;
 
+@Slf4j
 public class Cosmetics {
-
     private static final HashBiMap<String, Cosmetic> COSMETICS = HashBiMap.create();
 
+    private static CosmeticProvider PROVIDER = CosmeticProvider.Default.INSTANCE;
+
     public static void addCosmetic(Cosmetic cosmetic) {
         COSMETICS.put(cosmetic.getId(), cosmetic);
     }
@@ -31,7 +34,7 @@ public class Cosmetics {
     }
 
     public static void removeCosmetic(Cosmetic cosmetic) {
-        COSMETICS.remove(cosmetic);
+        COSMETICS.remove(cosmetic.getId());
     }
 
     @Nullable
@@ -68,45 +71,71 @@ public class Cosmetics {
         File[] directoryListing = cosmeticFolder.listFiles();
         if (directoryListing == null) return;
 
-        for (File child : directoryListing) {
-            if (child.toString().contains(".yml") || child.toString().contains(".yaml")) {
-                MessagesUtil.sendDebugMessages("Scanning " + child);
-                // Loads file
-                YamlConfigurationLoader loader = YamlConfigurationLoader.builder().path(child.toPath()).build();
-                CommentedConfigurationNode root;
-                try {
-                    root = loader.load();
-                } catch (ConfigurateException e) {
-                    throw new RuntimeException(e);
+        try (Stream<Path> walkStream = Files.walk(cosmeticFolder.toPath())) {
+            walkStream.filter(p -> p.toFile().isFile()).forEach(child -> {
+                if (child.toString().contains(".yml") || child.toString().contains(".yaml")) {
+                    MessagesUtil.sendDebugMessages("Scanning " + child);
+                    // Loads file
+                    YamlConfigurationLoader loader = YamlConfigurationLoader.builder().path(child).build();
+                    CommentedConfigurationNode root;
+                    try {
+                        root = loader.load();
+                    } catch (ConfigurateException e) {
+                        throw new RuntimeException(e);
+                    }
+                    setupCosmetics(root);
                 }
-                setupCosmetics(root);
-            }
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 
+    /**
+     * Register a custom {@link CosmeticProvider} to provide your own user implementation to
+     * be used and queried.
+     * @param provider the provider to register
+     * @throws IllegalArgumentException if the provider is already registered by another plugin
+     */
+    public static void registerProvider(final CosmeticProvider provider) {
+        if(PROVIDER != CosmeticProvider.Default.INSTANCE) {
+            throw new IllegalArgumentException("CosmeticProvider already registered by %s, this conflicts with %s attempting to register their own.".formatted(
+                PROVIDER.getProviderPlugin().getName(),
+                provider.getProviderPlugin().getName()
+            ));
+        }
+
+        PROVIDER = provider;
+    }
+
+    /**
+     * Fetch the current {@link CosmeticProvider} being used.
+     * @return the current {@link CosmeticProvider} being used
+     */
+    public static CosmeticProvider getProvider() {
+        return PROVIDER;
+    }
+
     private static void setupCosmetics(@NotNull CommentedConfigurationNode config) {
         for (ConfigurationNode cosmeticConfig : config.childrenMap().values()) {
+            String id = cosmeticConfig.key().toString();
+            MessagesUtil.sendDebugMessages("Attempting to add " + id);
+            ConfigurationNode slotNode = cosmeticConfig.node("slot");
+            if (slotNode.virtual()) {
+                MessagesUtil.sendDebugMessages("Unable to create " + id + " because there is no slot defined!", Level.WARNING);
+                continue;
+            }
+            String slot = slotNode.getString("");
+            CosmeticSlot cosmeticSlot = CosmeticSlot.valueOf(slot);
+            if (cosmeticSlot == null) {
+                MessagesUtil.sendDebugMessages("Unable to create " + id + " because " + slotNode.getString() + " is not a valid slot!", Level.WARNING);
+                continue;
+            }
+
             try {
-                String id = cosmeticConfig.key().toString();
-                MessagesUtil.sendDebugMessages("Attempting to add " + id);
-                ConfigurationNode slotNode = cosmeticConfig.node("slot");
-                if (slotNode.virtual()) {
-                    MessagesUtil.sendDebugMessages("Unable to create " + id + " because there is no slot defined!", Level.WARNING);
-                    continue;
-                }
-                if (!EnumUtils.isValidEnum(CosmeticSlot.class, slotNode.getString())) {
-                    MessagesUtil.sendDebugMessages("Unable to create " + id + " because " + slotNode.getString() + " is not a valid slot!", Level.WARNING);
-                    continue;
-                }
-                switch (CosmeticSlot.valueOf(cosmeticConfig.node("slot").getString())) {
-                    case BALLOON -> new CosmeticBalloonType(id, cosmeticConfig);
-                    case BACKPACK -> new CosmeticBackpackType(id, cosmeticConfig);
-                    case MAINHAND -> new CosmeticMainhandType(id, cosmeticConfig);
-                    case EMOTE -> new CosmeticEmoteType(id, cosmeticConfig);
-                    default -> new CosmeticArmorType(id, cosmeticConfig);
-                }
-            } catch (Exception e) {
-                if (Settings.isDebugEnabled()) e.printStackTrace();
+                addCosmetic(PROVIDER.createCosmetic(id, cosmeticConfig, cosmeticSlot));
+            } catch(Exception ex) {
+                log.error("Unable to construct cosmetic for {}, skipping processing it.", id, ex);
             }
         }
     }

common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/behavior/CosmeticMovementBehavior.java

@@ -0,0 +1,16 @@
+package com.hibiscusmc.hmccosmetics.cosmetic.behavior;
+
+import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import org.bukkit.Location;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Updates cosmetics whenever a player moves.
+ */
+public interface CosmeticMovementBehavior {
+    void dispatchMove(
+        @NotNull final CosmeticUser user,
+        @NotNull final Location from,
+        @NotNull final Location to
+    );
+}

common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/behavior/CosmeticUpdateBehavior.java

@@ -0,0 +1,13 @@
+package com.hibiscusmc.hmccosmetics.cosmetic.behavior;
+
+import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Generic updates that happen every tick or when manually requested to be dispatched.
+ */
+public interface CosmeticUpdateBehavior {
+    void dispatchUpdate(
+            @NotNull final CosmeticUser user
+    );
+}

common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticArmorType.java

@@ -2,11 +2,12 @@ package com.hibiscusmc.hmccosmetics.cosmetic.types;
 
 import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
-import com.hibiscusmc.hmccosmetics.nms.NMSHandlers;
+import com.hibiscusmc.hmccosmetics.cosmetic.behavior.CosmeticUpdateBehavior;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
-import com.hibiscusmc.hmccosmetics.util.InventoryUtils;
-import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
-import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
+import com.hibiscusmc.hmccosmetics.util.HMCCInventoryUtils;
+import com.hibiscusmc.hmccosmetics.util.packets.HMCCPacketManager;
+import me.lojosho.hibiscuscommons.util.packets.PacketManager;
+import me.lojosho.shaded.configurate.ConfigurationNode;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.HumanEntity;
@@ -14,37 +15,51 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
-import org.spongepowered.configurate.ConfigurationNode;
-
-public class CosmeticArmorType extends Cosmetic {
 
+public class CosmeticArmorType extends Cosmetic implements CosmeticUpdateBehavior {
     private final EquipmentSlot equipSlot;
 
     public CosmeticArmorType(String id, ConfigurationNode config) {
         super(id, config);
 
-        this.equipSlot = InventoryUtils.getEquipmentSlot(getSlot());
+        EquipmentSlot slot = HMCCInventoryUtils.getEquipmentSlot(getSlot());
+        if (slot == null) {
+            // Hypothetically it shouldn't be null, but it was happening on some random servers? Adding this just in case
+            throw new IllegalArgumentException("Invalid slot for cosmetic armor type: " + getSlot() + " in " + id + " cosmetic config.");
+        }
+        this.equipSlot = slot;
     }
 
     @Override
-    public void update(@NotNull CosmeticUser user) {
+    public void dispatchUpdate(@NotNull CosmeticUser user) {
+        if (user.isInWardrobe()) return;
         Entity entity = Bukkit.getEntity(user.getUniqueId());
         if (entity == null) return;
-        if (user.getUserEmoteManager().isPlayingEmote()) return; // There has to be a better way of doing this...
-        ItemStack cosmeticItem = user.getUserCosmeticItem(this);
-        if (!(entity instanceof HumanEntity humanEntity)) return;
-        if (equipSlot.equals(EquipmentSlot.OFF_HAND)) {
-            if (!humanEntity.getInventory().getItemInOffHand().getType().isAir()) return;
+        if (Settings.getSlotOption(equipSlot).isRequireEmpty() && entity instanceof HumanEntity humanEntity) {
+            if (!humanEntity.getInventory().getItem(equipSlot).getType().isAir()) return;
         }
-        ItemStack equippedItem = humanEntity.getInventory().getItem(equipSlot);
-        if (Settings.getShouldAddEnchants(equipSlot)) {
-            cosmeticItem.addUnsafeEnchantments(equippedItem.getEnchantments());
-        }
-
-        NMSHandlers.getHandler().equipmentSlotUpdate(entity.getEntityId(), equipSlot, cosmeticItem, PacketManager.getViewers(entity.getLocation()));
-        //PacketManager.equipmentSlotUpdate(player, getSlot(), PacketManager.getViewers(player.getLocation())); Old method
+        ItemStack item = getItem(user);
+        if (item == null) return;
+        PacketManager.equipmentSlotUpdate(entity.getEntityId(), equipSlot, item, HMCCPacketManager.getViewers(entity.getLocation()));
     }
 
+    public ItemStack getItem(@NotNull CosmeticUser user) {
+        return getItem(user, user.getUserCosmeticItem(this));
+    }
+
+    public ItemStack getItem(@NotNull CosmeticUser user, ItemStack cosmeticItem) {
+        Player player = user.getPlayer();
+        if (player == null) return null;
+
+        if (Settings.getSlotOption(equipSlot).isAddEnchantments()) {
+            ItemStack equippedItem = player.getInventory().getItem(equipSlot);
+            cosmeticItem.addUnsafeEnchantments(equippedItem.getEnchantments());
+        }
+        // Basically, if force offhand is off AND there is no item in an offhand slot, then the equipment packet to add the cosmetic
+        return cosmeticItem;
+    }
+
+    @NotNull
     public EquipmentSlot getEquipSlot() {
         return this.equipSlot;
     }

common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBackpackType.java

@@ -1,67 +1,125 @@
 package com.hibiscusmc.hmccosmetics.cosmetic.types;
 
+import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
+import com.hibiscusmc.hmccosmetics.cosmetic.behavior.CosmeticMovementBehavior;
+import com.hibiscusmc.hmccosmetics.cosmetic.behavior.CosmeticUpdateBehavior;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.user.manager.UserBackpackManager;
-import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
-import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
-import org.bukkit.Bukkit;
+import com.hibiscusmc.hmccosmetics.user.manager.UserEntity;
+import com.hibiscusmc.hmccosmetics.util.packets.HMCCPacketManager;
+import lombok.Getter;
+import me.lojosho.hibiscuscommons.util.packets.PacketManager;
+import me.lojosho.shaded.configurate.ConfigurationNode;
 import org.bukkit.Location;
+import org.bukkit.attribute.Attribute;
+import org.bukkit.attribute.AttributeInstance;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.EquipmentSlot;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
-import org.spongepowered.configurate.ConfigurationNode;
 
-import java.util.logging.Level;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
 
-public class CosmeticBackpackType extends Cosmetic {
-
-    private final String modelName;
-    private UserBackpackManager.BackpackType backpackType;
+@Getter
+public class CosmeticBackpackType extends Cosmetic implements CosmeticUpdateBehavior, CosmeticMovementBehavior {
+    private int height = -1;
+    private ItemStack firstPersonBackpack;
 
     public CosmeticBackpackType(String id, ConfigurationNode config) {
         super(id, config);
 
-        modelName = config.node("model").getString();
-        backpackType = UserBackpackManager.BackpackType.valueOf(config.node("type").getString("NORMAL").toUpperCase());
+        if (!config.node("firstperson-item").virtual()) {
+            this.firstPersonBackpack = generateItemStack(config.node("firstperson-item"));
+            this.height = config.node("height").getInt(5);
+        }
     }
 
     @Override
-    public void update(@NotNull CosmeticUser user) {
-        Entity entity = Bukkit.getEntity(user.getUniqueId());
-        if (entity == null) return;
-
-        Location loc = entity.getLocation().clone().add(0, 2, 0);
-
-        if (user.isInWardrobe() || !user.isBackpackSpawned()) return;
-        if (!user.getUserBackpackManager().IsValidBackpackEntity()) {
-            MessagesUtil.sendDebugMessages("Invalid Backpack Entity[owner=" + user.getUniqueId() + ",player_location=" + loc + "]!", Level.WARNING);
-            user.respawnBackpack();
+    public void dispatchUpdate(@NotNull CosmeticUser user) {
+        Entity entity = user.getEntity();
+        if(entity == null) {
             return;
         }
-        if (loc.getWorld() != user.getUserBackpackManager().getArmorStand().getWorld()) {
-            user.getUserBackpackManager().getArmorStand().teleport(loc);
+
+        Location entityLocation = entity.getLocation();
+        Location loc = entityLocation.clone().add(0, 2, 0);
+
+        UserBackpackManager backpackManager = user.getUserBackpackManager();
+        if(backpackManager == null) return;
+
+        UserEntity entityManager = backpackManager.getEntityManager();
+        if(entityManager == null) return;
+
+        entityManager.teleport(loc);
+        entityManager.setRotation((int) loc.getYaw(), isFirstPersonCompadible());
+
+        int firstArmorStandId = backpackManager.getFirstArmorStandId();
+
+        List<Player> newViewers = entityManager.refreshViewers(loc);
+
+        if(!newViewers.isEmpty()) {
+            HMCCPacketManager.spawnInvisibleArmorstand(firstArmorStandId, entityLocation, UUID.randomUUID(), newViewers);
+            PacketManager.equipmentSlotUpdate(firstArmorStandId, EquipmentSlot.HEAD, user.getUserCosmeticItem(this, getItem()), newViewers);
+
+            if (user.getPlayer() != null) {
+                AttributeInstance scaleAttribute = user.getPlayer().getAttribute(Attribute.SCALE);
+                if (scaleAttribute != null) {
+                    HMCCPacketManager.sendEntityScalePacket(user.getUserBackpackManager().getFirstArmorStandId(), scaleAttribute.getValue(), newViewers);
+                }
+            }
         }
 
-        user.getUserBackpackManager().getArmorStand().teleport(loc);
+        // If true, it will send the riding packet to all players. If false, it will send the riding packet only to new players
+        if (Settings.isBackpackForceRidingEnabled()) HMCCPacketManager.sendRidingPacket(entity.getEntityId(), firstArmorStandId, entityManager.getViewers());
+        else HMCCPacketManager.sendRidingPacket(entity.getEntityId(), firstArmorStandId, newViewers);
 
-        if (user.getUserBackpackManager().getBackpackType().equals(UserBackpackManager.BackpackType.FIRST_PERSON)) {
-            user.getUserBackpackManager().teleportEffectEntity(loc);
-            PacketManager.sendRidingPacket(entity.getEntityId(), user.getUserBackpackManager().getAreaEffectEntityId(), loc);
-            PacketManager.sendRidingPacket(user.getUserBackpackManager().getAreaEffectEntityId(), user.getUserBackpackManager().getFirstArmorStandId(), loc);
-        } else {
-            PacketManager.sendRidingPacket(entity.getEntityId(), user.getUserBackpackManager().getFirstArmorStandId(), loc);
+        if (isFirstPersonCompadible() && !user.isInWardrobe() && user.getPlayer() != null) {
+            List<Player> owner = List.of(user.getPlayer());
+
+            ArrayList<Integer> particleCloud = backpackManager.getAreaEffectEntityId();
+            for (int i = 0; i < particleCloud.size(); i++) {
+                if (i == 0) {
+                    HMCCPacketManager.sendRidingPacket(entity.getEntityId(), particleCloud.get(i), owner);
+                } else {
+                    HMCCPacketManager.sendRidingPacket(particleCloud.get(i - 1), particleCloud.get(i) , owner);
+                }
+            }
+            HMCCPacketManager.sendRidingPacket(particleCloud.get(particleCloud.size() - 1), firstArmorStandId, owner);
+            if (!user.isHidden()) {
+                PacketManager.equipmentSlotUpdate(firstArmorStandId, EquipmentSlot.HEAD, user.getUserCosmeticItem(this, firstPersonBackpack), owner);
+            }
         }
 
-        user.getUserBackpackManager().getArmorStand().setRotation(loc.getYaw(), loc.getPitch());
-        user.getUserBackpackManager().showBackpack();
+        backpackManager.showBackpack();
     }
 
-    public String getModelName() {
-        return modelName;
+    @Override
+    public void dispatchMove(@NotNull CosmeticUser user, @NotNull Location from, @NotNull Location to) {
+        @SuppressWarnings("DuplicatedCode") // thanks.
+        Entity entity = user.getEntity();
+        if(entity == null) {
+            return;
+        }
+
+        Location entityLocation = entity.getLocation();
+        Location loc = entityLocation.clone().add(0, 2, 0);
+
+        UserBackpackManager backpackManager = user.getUserBackpackManager();
+        if(backpackManager == null) return;
+
+        UserEntity entityManager = backpackManager.getEntityManager();
+        if(entityManager == null) return;
+
+        entityManager.teleport(loc);
+        entityManager.setRotation((int) loc.getYaw(), isFirstPersonCompadible());
     }
 
-    public UserBackpackManager.BackpackType getBackpackType() {
-        return backpackType;
+    public boolean isFirstPersonCompadible() {
+        return firstPersonBackpack != null;
     }
+
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBalloonType.java

@@ -2,48 +2,61 @@ package com.hibiscusmc.hmccosmetics.cosmetic.types;
 
 import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
-import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager;
+import com.hibiscusmc.hmccosmetics.cosmetic.behavior.CosmeticMovementBehavior;
+import com.hibiscusmc.hmccosmetics.cosmetic.behavior.CosmeticUpdateBehavior;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
-import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
+import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager;
+import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
+import com.hibiscusmc.hmccosmetics.util.packets.HMCCPacketManager;
+import lombok.Getter;
+import me.lojosho.shaded.configurate.ConfigurationNode;
+import me.lojosho.shaded.configurate.serialize.SerializationException;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
-import org.spongepowered.configurate.ConfigurationNode;
-import org.spongepowered.configurate.serialize.SerializationException;
 
 import java.util.List;
 
-public class CosmeticBalloonType extends Cosmetic {
+public class CosmeticBalloonType extends Cosmetic implements CosmeticUpdateBehavior, CosmeticMovementBehavior {
 
+    @Getter
     private final String modelName;
-    private List<String> dyableParts;
-    private boolean showLead;
+    @Getter
+    private List<String> dyeableParts;
+    @Getter
+    private final boolean showLead;
+    @Getter
+    private Vector balloonOffset;
 
     public CosmeticBalloonType(String id, ConfigurationNode config) {
         super(id, config);
 
         String modelId = config.node("model").getString();
-
         showLead = config.node("show-lead").getBoolean(true);
 
+        ConfigurationNode balloonOffsetNode = config.node("balloon-offset");
+        if (balloonOffsetNode.virtual())
+            balloonOffset = Settings.getBalloonOffset();
+        else
+            balloonOffset = Settings.loadVector(balloonOffsetNode);
+
         try {
-            if (!config.node("dyable-parts").virtual()) {
-                dyableParts = config.node("dyable-parts").getList(String.class);
+            if (!config.node("dyeable-parts").virtual()) {
+                dyeableParts = config.node("dyeable-parts").getList(String.class);
             }
         } catch (SerializationException e) {
             // Seriously?
             throw new RuntimeException(e);
         }
-
+        if (modelId != null) modelId = modelId.toLowerCase(); // ME only accepts lowercase
         this.modelName = modelId;
     }
 
     @Override
-    public void update(@NotNull CosmeticUser user) {
+    public void dispatchUpdate(@NotNull CosmeticUser user) {
         Entity entity = Bukkit.getEntity(user.getUniqueId());
         UserBalloonManager userBalloonManager = user.getBalloonManager();
 
@@ -56,47 +69,58 @@ public class CosmeticBalloonType extends Cosmetic {
         }
 
         Location newLocation = entity.getLocation();
-        Location currentLocation = user.getBalloonManager().getLocation();
-        newLocation = newLocation.clone().add(Settings.getBalloonOffset());
+        newLocation = newLocation.clone().add(getBalloonOffset());
+        if (Settings.isBalloonHeadForward()) newLocation.setPitch(0);
 
-        List<Player> viewer = PacketManager.getViewers(entity.getLocation());
+        if (!user.isHidden() && showLead) {
+            List<Player> sendTo = userBalloonManager.getPufferfish().refreshViewers(newLocation);
+            if (sendTo.isEmpty()) return;
+            user.getBalloonManager().getPufferfish().spawnPufferfish(newLocation, sendTo);
+        }
+    }
+
+    @Override
+    public void dispatchMove(@NotNull CosmeticUser user, @NotNull Location from, @NotNull Location to) {
+        Entity entity = Bukkit.getEntity(user.getUniqueId());
+        UserBalloonManager userBalloonManager = user.getBalloonManager();
+
+        if (entity == null || userBalloonManager == null) return;
+        if (user.isInWardrobe()) return;
+
+        if (!userBalloonManager.getModelEntity().isValid()) {
+            return;
+        }
+
+        Location newLocation = entity.getLocation();
+        Location currentLocation = user.getBalloonManager().getLocation();
+        newLocation = newLocation.clone().add(getBalloonOffset());
+        if (Settings.isBalloonHeadForward()) newLocation.setPitch(0);
+
+        List<Player> viewer = HMCCPacketManager.getViewers(entity.getLocation());
 
         if (entity.getLocation().getWorld() != userBalloonManager.getLocation().getWorld()) {
             userBalloonManager.getModelEntity().teleport(newLocation);
-            PacketManager.sendTeleportPacket(userBalloonManager.getPufferfishBalloonId(), newLocation, false, viewer);
+            HMCCPacketManager.sendTeleportPacket(userBalloonManager.getPufferfishBalloonId(), newLocation, false, viewer);
             return;
         }
 
         Vector velocity = newLocation.toVector().subtract(currentLocation.toVector());
-        userBalloonManager.setVelocity(velocity.multiply(1.1));
         userBalloonManager.setLocation(newLocation);
+        userBalloonManager.setVelocity(velocity.multiply(1.1));
 
-        PacketManager.sendTeleportPacket(userBalloonManager.getPufferfishBalloonId(), newLocation, false, viewer);
-        PacketManager.sendLeashPacket(userBalloonManager.getPufferfishBalloonId(), entity.getEntityId(), viewer);
-        if (!user.getHidden() && showLead) {
-            List<Player> sendTo = userBalloonManager.getPufferfish().refreshViewers(newLocation);
-            if (sendTo.isEmpty()) return;
-            PacketManager.sendEntitySpawnPacket(newLocation, userBalloonManager.getPufferfishBalloonId(), EntityType.PUFFERFISH, userBalloonManager.getPufferfishBalloonUniqueId(), sendTo);
-            PacketManager.sendInvisibilityPacket(userBalloonManager.getPufferfishBalloonId(), sendTo);
-        }
+        MessagesUtil.sendDebugMessages("Balloon Cosmetic Update for " + user.getEntity().getName());
+        MessagesUtil.sendDebugMessages("Ballon previous location is " + currentLocation);
+        MessagesUtil.sendDebugMessages("Balloon location set to " + newLocation);
+        MessagesUtil.sendDebugMessages("Balloon velocity set to " + velocity);
+
+        HMCCPacketManager.sendTeleportPacket(userBalloonManager.getPufferfishBalloonId(), newLocation, false, viewer);
+        HMCCPacketManager.sendLeashPacket(userBalloonManager.getPufferfishBalloonId(), entity.getEntityId(), viewer);
     }
 
-    public String getModelName() {
-        return this.modelName;
-    }
-
-    public List<String> getDyableParts() {
-        return dyableParts;
-    }
-
-    public boolean isDyablePart(String name) {
+    public boolean isDyeablePart(String name) {
         // If player does not define parts, dye whole model
-        if (dyableParts == null) return true;
-        if (dyableParts.isEmpty()) return true;
-        return dyableParts.contains(name);
-    }
-
-    public boolean isShowLead() {
-        return showLead;
+        if (dyeableParts == null) return true;
+        if (dyeableParts.isEmpty()) return true;
+        return dyeableParts.contains(name);
     }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticEmoteType.java

@@ -1,38 +0,0 @@
-package com.hibiscusmc.hmccosmetics.cosmetic.types;
-
-import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
-import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
-import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
-import org.jetbrains.annotations.NotNull;
-import org.spongepowered.configurate.ConfigurationNode;
-
-public class CosmeticEmoteType extends Cosmetic {
-
-    private final String animationId;
-    private final String text;
-
-    public CosmeticEmoteType(String id, ConfigurationNode config) {
-        super(id, config);
-
-        animationId = config.node("animation").getString();
-        text = config.node("text").getString();
-        MessagesUtil.sendDebugMessages("CosmeticEmoteType Animation id " + animationId);
-    }
-
-    @Override
-    public void update(CosmeticUser user) {
-        // Nothing
-    }
-
-    public void run(@NotNull CosmeticUser user) {
-        user.getUserEmoteManager().playEmote(this);
-    }
-
-    public String getAnimationId() {
-        return animationId;
-    }
-
-    public String getText() {
-        return text;
-    }
-}

common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticMainhandType.java

@@ -1,23 +0,0 @@
-package com.hibiscusmc.hmccosmetics.cosmetic.types;
-
-import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
-import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
-import com.hibiscusmc.hmccosmetics.util.PlayerUtils;
-import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.spongepowered.configurate.ConfigurationNode;
-
-public class CosmeticMainhandType extends Cosmetic {
-
-    public CosmeticMainhandType(String id, ConfigurationNode config) {
-        super(id, config);
-    }
-
-    @Override
-    public void update(@NotNull CosmeticUser user) {
-        Player player = user.getPlayer();
-
-        PacketManager.equipmentSlotUpdate(player.getEntityId(), user, getSlot(), PlayerUtils.getNearbyPlayers(player));
-    }
-}

common/src/main/java/com/hibiscusmc/hmccosmetics/database/Database.java

@@ -2,37 +2,44 @@ package com.hibiscusmc.hmccosmetics.database;
 
 import com.hibiscusmc.hmccosmetics.config.DatabaseSettings;
 import com.hibiscusmc.hmccosmetics.database.types.Data;
-import com.hibiscusmc.hmccosmetics.database.types.InternalData;
 import com.hibiscusmc.hmccosmetics.database.types.MySQLData;
+import com.hibiscusmc.hmccosmetics.database.types.NoneData;
 import com.hibiscusmc.hmccosmetics.database.types.SQLiteData;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
+import lombok.Getter;
 import org.bukkit.entity.Player;
 
 import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.logging.Level;
 
 public class Database {
 
+    @Getter
     private static Data data;
-
-    @Deprecated
-    private static InternalData INTERNAL_DATA  = new InternalData();
-
     private static final MySQLData MYSQL_DATA = new MySQLData();
     private static final SQLiteData SQLITE_DATA = new SQLiteData();
+    private static final NoneData NONE_DATA = new NoneData();
 
     public Database() {
         String databaseType = DatabaseSettings.getDatabaseType();
-        data = SQLITE_DATA; // default
-        if (databaseType.equalsIgnoreCase("MySQL")) {
-            data = MYSQL_DATA;
+        data = SQLITE_DATA; // default to SQLite, then check if it's anything different
+        switch (databaseType.toLowerCase()) {
+            case "mysql":
+                data = MYSQL_DATA;
+                break;
+            case "sqlite":
+                // already the default
+                break;
+            case "none":
+                data = NONE_DATA;
+                MessagesUtil.sendDebugMessages("Database is set to none. Data will not be saved.", Level.WARNING);
+                break;
+            default:
+                MessagesUtil.sendDebugMessages("Invalid database type. Defaulting to SQLite.", Level.WARNING);
         }
-        /* SQLite is the default database. Might change in the future, so keep code here in case.
-        if (databaseType.equalsIgnoreCase("sqlite")) {
-            data = SQLITE_DATA;
-        }
-         */
         MessagesUtil.sendDebugMessages("Database is " + data);
 
         setup();
@@ -50,14 +57,10 @@ public class Database {
         data.save(CosmeticUsers.getUser(player));
     }
 
-    public static CosmeticUser get(UUID uniqueId) {
+    public static CompletableFuture<UserData> get(UUID uniqueId) {
         return data.get(uniqueId);
     }
 
-    public static Data getData() {
-        return data;
-    }
-
     public static void clearData(UUID uniqueId) {
         data.clear(uniqueId);
     }

common/src/main/java/com/hibiscusmc/hmccosmetics/database/UserData.java

@@ -0,0 +1,37 @@
+package com.hibiscusmc.hmccosmetics.database;
+
+import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
+import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+public class UserData {
+
+    @Getter
+    private UUID owner;
+    @Setter
+    @Getter
+    private HashMap<CosmeticSlot, Map.Entry<Cosmetic, Integer>> cosmetics;
+    @Getter
+    private ArrayList<CosmeticUser.HiddenReason> hiddenReasons;
+
+    public UserData(UUID owner) {
+        this.owner = owner;
+        this.cosmetics = new HashMap<>();
+        this.hiddenReasons = new ArrayList<>();
+    }
+
+    public void addCosmetic(CosmeticSlot slot, Cosmetic cosmetic, Integer color) {
+        cosmetics.put(slot, Map.entry(cosmetic, color));
+    }
+
+    public void addHiddenReason(CosmeticUser.HiddenReason reason) {
+        hiddenReasons.add(reason);
+    }
+}

common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/Data.java

@@ -1,21 +1,19 @@
 package com.hibiscusmc.hmccosmetics.database.types;
 
-import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
+import com.hibiscusmc.hmccosmetics.database.UserData;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import org.apache.commons.lang3.EnumUtils;
-import org.bukkit.Bukkit;
 import org.bukkit.Color;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
 
 public abstract class Data {
 
@@ -24,41 +22,38 @@ public abstract class Data {
     public abstract void save(CosmeticUser user);
 
     @Nullable
-    public abstract CosmeticUser get(UUID uniqueId);
+    public abstract CompletableFuture<UserData> get(UUID uniqueId);
 
     public abstract void clear(UUID uniqueId);
 
     // BACKPACK=colorfulbackpack&RRGGBB,HELMET=niftyhat,BALLOON=colorfulballoon,CHESTPLATE=niftychestplate
     @NotNull
     public final String serializeData(@NotNull CosmeticUser user) {
-        String data = "";
-        if (user.getHidden()) {
-            if (shouldHiddenSave(user.getHiddenReason())) {
-                data = "HIDDEN=" + user.getHiddenReason();
+        StringBuilder data = new StringBuilder();
+        if (user.isHidden()) {
+            for (CosmeticUser.HiddenReason reason :  user.getHiddenReasons()) {
+                if (shouldHiddenSave(reason)) data.append("HIDDEN=").append(reason);
             }
         }
         for (Cosmetic cosmetic : user.getCosmetics()) {
             Color color = user.getCosmeticColor(cosmetic.getSlot());
             String input = cosmetic.getSlot() + "=" + cosmetic.getId();
             if (color != null) input = input + "&" + color.asRGB();
-            if (data.length() == 0) {
-                data = input;
+            if (data.isEmpty()) {
+                data.append(input);
                 continue;
             }
-            data = data + "," + input;
+            data.append(",").append(input);
         }
-        return data;
-    }
-
-    public final Map<CosmeticSlot, Map<Cosmetic, Color>> deserializeData(CosmeticUser user, @NotNull String raw) {
-        return deserializeData(user, raw, Settings.getForcePermissionJoin());
+        return data.toString();
     }
 
     @NotNull
-    public final Map<CosmeticSlot, Map<Cosmetic, Color>> deserializeData(CosmeticUser user, @NotNull String raw, boolean checkpermissions) {
-        Map<CosmeticSlot, Map<Cosmetic, Color>> cosmetics = new HashMap<>();
+    public final HashMap<CosmeticSlot, Map.Entry<Cosmetic, Integer>> deserializeData(@NotNull String raw) {
+        HashMap<CosmeticSlot, Map.Entry<Cosmetic, Integer>> cosmetics = new HashMap<>();
 
         String[] rawData = raw.split(",");
+        ArrayList<CosmeticUser.HiddenReason> hiddenReason = new ArrayList<>();
         for (String a : rawData) {
             if (a == null || a.isEmpty()) continue;
             String[] splitData = a.split("=");
@@ -67,9 +62,8 @@ public abstract class Data {
             MessagesUtil.sendDebugMessages("First split (suppose slot) " + splitData[0]);
             if (splitData[0].equalsIgnoreCase("HIDDEN")) {
                 if (EnumUtils.isValidEnum(CosmeticUser.HiddenReason.class, splitData[1])) {
-                    Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
-                        user.hideCosmetics(CosmeticUser.HiddenReason.valueOf(splitData[1]));
-                    });
+                    if (Settings.isForceShowOnJoin()) continue;
+                    hiddenReason.add(CosmeticUser.HiddenReason.valueOf(splitData[1]));
                 }
                 continue;
             }
@@ -78,31 +72,20 @@ public abstract class Data {
                 String[] colorSplitData = splitData[1].split("&");
                 if (Cosmetics.hasCosmetic(colorSplitData[0])) cosmetic = Cosmetics.getCosmetic(colorSplitData[0]);
                 if (slot == null || cosmetic == null) continue;
-                if (checkpermissions && cosmetic.requiresPermission()) {
-                    if (user.getPlayer() != null && !user.getPlayer().hasPermission(cosmetic.getPermission())) {
-                        continue;
-                    }
-                }
-                cosmetics.put(slot, Map.of(cosmetic, Color.fromRGB(Integer.parseInt(colorSplitData[1]))));
+                cosmetics.put(slot, Map.entry(cosmetic, Integer.parseInt(colorSplitData[1])));
             } else {
                 if (Cosmetics.hasCosmetic(splitData[1])) cosmetic = Cosmetics.getCosmetic(splitData[1]);
                 if (slot == null || cosmetic == null) continue;
-                if (checkpermissions && cosmetic.requiresPermission()) {
-                    if (user.getPlayer() != null && !user.getPlayer().hasPermission(cosmetic.getPermission())) {
-                        continue;
-                    }
-                }
-                HashMap<Cosmetic, Color> cosmeticColorHashMap = new HashMap<>();
-                cosmeticColorHashMap.put(cosmetic, null);
-                cosmetics.put(slot, cosmeticColorHashMap);
+                cosmetics.put(slot, Map.entry(cosmetic, -1));
             }
         }
+
         return cosmetics;
     }
 
-    private boolean shouldHiddenSave(CosmeticUser.@NotNull HiddenReason reason) {
+    private boolean shouldHiddenSave(CosmeticUser.HiddenReason reason) {
         switch (reason) {
-            case EMOTE, NONE -> {
+            case EMOTE, NONE, GAMEMODE, WORLD, DISABLED, POTION -> {
                 return false;
             }
             default -> {

common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/InternalData.java

@@ -1,66 +0,0 @@
-package com.hibiscusmc.hmccosmetics.database.types;
-
-import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
-import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
-import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
-import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
-import org.bukkit.Bukkit;
-import org.bukkit.Color;
-import org.bukkit.NamespacedKey;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.persistence.PersistentDataType;
-
-import java.util.Map;
-import java.util.UUID;
-
-@Deprecated
-public class InternalData extends Data {
-
-    NamespacedKey key = new NamespacedKey(HMCCosmeticsPlugin.getInstance(), "cosmetics");
-
-    @Override
-    public void setup() {
-        // Nothing
-    }
-
-    @Override
-    public void save(CosmeticUser user) {
-        Player player = Bukkit.getPlayer(user.getUniqueId());
-
-        player.getPersistentDataContainer().set(key, PersistentDataType.STRING, serializeData(user));
-    }
-
-    @Override
-    public CosmeticUser get(UUID uniqueId) {
-        Player player = Bukkit.getPlayer(uniqueId);
-        CosmeticUser user = new CosmeticUser(uniqueId);
-
-        if (!player.getPersistentDataContainer().has(key, PersistentDataType.STRING)) return user;
-        String rawData = player.getPersistentDataContainer().get(key, PersistentDataType.STRING);
-
-        Map<CosmeticSlot, Map<Cosmetic, Color>> a = deserializeData(user, rawData);
-        for (Map<Cosmetic, Color> cosmeticColors : a.values()) {
-            for (Cosmetic cosmetic : cosmeticColors.keySet()) {
-                Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
-                    // This can not be async.
-                    user.addPlayerCosmetic(cosmetic, cosmeticColors.get(cosmetic));
-                });
-            }
-        }
-        return user;
-    }
-
-    @Override
-    public void clear(UUID uniqueId) {
-        OfflinePlayer player = Bukkit.getOfflinePlayer(uniqueId);
-
-        if (player.isOnline()) {
-            Player onlinePlayer = player.getPlayer();
-            if (onlinePlayer.getPersistentDataContainer().has(key, PersistentDataType.STRING)) {
-                onlinePlayer.getPersistentDataContainer().remove(key);
-            }
-            return;
-        }
-    }
-}

common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/MySQLData.java

@@ -2,13 +2,18 @@ package com.hibiscusmc.hmccosmetics.database.types;
 
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.config.DatabaseSettings;
+import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import org.bukkit.Bukkit;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.util.Properties;
 import java.util.UUID;
+import java.util.logging.Level;
 
 public class MySQLData extends SQLData {
 
@@ -33,12 +38,14 @@ public class MySQLData extends SQLData {
         HMCCosmeticsPlugin plugin = HMCCosmeticsPlugin.getInstance();
         try {
             openConnection();
-            if (connection == null) throw new NullPointerException("Connection is null");
-            connection.prepareStatement("CREATE TABLE IF NOT EXISTS `COSMETICDATABASE` " +
+            if (connection == null) throw new IllegalStateException("Connection is null");
+            try (PreparedStatement preparedStatement =  connection.prepareStatement("CREATE TABLE IF NOT EXISTS `COSMETICDATABASE` " +
                     "(UUID varchar(36) PRIMARY KEY, " +
                     "COSMETICS MEDIUMTEXT " +
-                    ");").execute();
-        } catch (SQLException | NullPointerException e) {
+                    ");")) {
+                preparedStatement.execute();
+            }
+        } catch (SQLException | IllegalStateException e) {
             plugin.getLogger().severe("");
             plugin.getLogger().severe("");
             plugin.getLogger().severe("MySQL DATABASE CAN NOT BE REACHED.");
@@ -55,8 +62,7 @@ public class MySQLData extends SQLData {
     @Override
     public void clear(UUID uniqueId) {
         Bukkit.getScheduler().runTaskAsynchronously(HMCCosmeticsPlugin.getInstance(), () -> {
-            try {
-                PreparedStatement preparedSt = preparedStatement("DELETE FROM COSMETICDATABASE WHERE UUID=?;");
+            try (PreparedStatement preparedSt = preparedStatement("DELETE FROM COSMETICDATABASE WHERE UUID=?;")) {
                 preparedSt.setString(1, uniqueId.toString());
                 preparedSt.executeUpdate();
             } catch (SQLException e) {
@@ -66,16 +72,10 @@ public class MySQLData extends SQLData {
     }
 
     private void openConnection() throws SQLException {
-        // Bukkit.getScheduler().runTaskAsynchronously(HMCCosmeticsPlugin.getInstance(), () -> {
-        // ...
-        // });
-        // connection = DriverManager.getConnection("jdbc:mysql://" + DatabaseSettings.getHost() + ":" + DatabaseSettings.getPort() + "/" + DatabaseSettings.getDatabase(), setupProperties());
-
         // Connection isn't null AND Connection isn't closed :: return
         try {
-            if (isConnectionOpen()) {
-                return;
-            } else if (connection != null) close(); // Close connection if still active
+            if (isConnectionOpen()) return;
+            if (connection != null) close(); // Close connection if still active
         } catch (RuntimeException e) {
             e.printStackTrace(); // If isConnectionOpen() throws error
         }
@@ -84,17 +84,15 @@ public class MySQLData extends SQLData {
         try {
             Class.forName("com.mysql.jdbc.Driver");
             connection = DriverManager.getConnection("jdbc:mysql://" + host + ":" + port + "/" + database, setupProperties());
-        } catch (SQLException e) {
+        } catch (SQLException | ClassNotFoundException e) {
             System.out.println(e.getMessage());
-        } catch (ClassNotFoundException e) {
-            throw new RuntimeException(e);
         }
     }
 
     public void close() {
         Bukkit.getScheduler().runTaskAsynchronously(HMCCosmeticsPlugin.getInstance(), () -> {
             try {
-                if (connection == null) throw new NullPointerException("Connection is null");
+                if (connection == null) throw new IllegalStateException("Connection is null");
                 connection.close();
             } catch (SQLException | NullPointerException e) {
                 System.out.println(e.getMessage());
@@ -105,13 +103,12 @@ public class MySQLData extends SQLData {
     @NotNull
     private Properties setupProperties() {
         Properties props = new Properties();
-        props.put("user", user);
-        props.put("password", password);
-        props.put("autoReconnect", "true");
+        props.setProperty("user", user);
+        props.setProperty("password", password);
         return props;
     }
 
-    private boolean isConnectionOpen() throws RuntimeException {
+    private boolean isConnectionOpen() {
         try {
             return connection != null && !connection.isClosed();
         } catch (SQLException e) {
@@ -124,16 +121,21 @@ public class MySQLData extends SQLData {
         PreparedStatement ps = null;
 
         if (!isConnectionOpen()) {
-            HMCCosmeticsPlugin.getInstance().getLogger().info("Connection is not open");
+            MessagesUtil.sendDebugMessages("The MySQL database connection is not open (Could the database been idle for to long?). Reconnecting...", Level.WARNING);
+            try {
+                openConnection();
+            } catch (SQLException e) {
+                e.printStackTrace();
+            }
         }
 
         try {
-            if (connection == null) throw new NullPointerException("Connection is null");
+            if (connection == null) throw new IllegalStateException("Connection is null");
             ps = connection.prepareStatement(query);
-        } catch (SQLException | NullPointerException e) {
+        } catch (SQLException | IllegalStateException e) {
             e.printStackTrace();
         }
 
         return ps;
     }
-}
+}

common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/NoneData.java

@@ -0,0 +1,30 @@
+package com.hibiscusmc.hmccosmetics.database.types;
+
+import com.hibiscusmc.hmccosmetics.database.UserData;
+import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+
+public class NoneData extends Data {
+    @Override
+    public void setup() {
+        // Nothing
+    }
+
+    @Override
+    public void save(CosmeticUser user) {
+        // Nothing
+    }
+
+    @Override
+    public @Nullable CompletableFuture<UserData> get(UUID uniqueId) {
+        return CompletableFuture.completedFuture(new UserData(uniqueId));
+    }
+
+    @Override
+    public void clear(UUID uniqueId) {
+        // Nothing
+    }
+}

common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/SQLData.java

@@ -3,53 +3,46 @@ package com.hibiscusmc.hmccosmetics.database.types;
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
+import com.hibiscusmc.hmccosmetics.database.UserData;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import org.bukkit.Bukkit;
-import org.bukkit.Color;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
 
 public abstract class SQLData extends Data {
     @Override
-    @SuppressWarnings({"Duplicates", "resource"}) // Duplicate is from deprecated InternalData
-    public CosmeticUser get(UUID uniqueId) {
-        CosmeticUser user = new CosmeticUser(uniqueId);
+    @SuppressWarnings({"resource"}) // Duplicate is from deprecated InternalData
+    public CompletableFuture<UserData> get(UUID uniqueId) {
+        return CompletableFuture.supplyAsync(() -> {
+            UserData data = new UserData(uniqueId);
 
-        Bukkit.getScheduler().runTaskAsynchronously(HMCCosmeticsPlugin.getInstance(), () -> {
-            try {
-                PreparedStatement preparedStatement = preparedStatement("SELECT * FROM COSMETICDATABASE WHERE UUID = ?;");
+            try (PreparedStatement preparedStatement = preparedStatement("SELECT * FROM COSMETICDATABASE WHERE UUID = ?;")){
                 preparedStatement.setString(1, uniqueId.toString());
-                ResultSet rs = preparedStatement.executeQuery();
-                if (rs.next()) {
-                    String rawData = rs.getString("COSMETICS");
-                    Map<CosmeticSlot, Map<Cosmetic, Color>> cosmetics = deserializeData(user, rawData);
-                    for (Map<Cosmetic, Color> cosmeticColors : cosmetics.values()) {
-                        for (Cosmetic cosmetic : cosmeticColors.keySet()) {
-                            Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
-                                // This can not be async.
-                                user.addPlayerCosmetic(cosmetic, cosmeticColors.get(cosmetic));
-                            });
-                        }
+                try (ResultSet rs = preparedStatement.executeQuery()) {
+                    if (rs.next()) {
+                        String rawData = rs.getString("COSMETICS");
+                        HashMap<CosmeticSlot, Map.Entry<Cosmetic, Integer>> cosmetics = deserializeData(rawData);
+                        data.setCosmetics(cosmetics);
                     }
                 }
             } catch (SQLException e) {
                 e.printStackTrace();
             }
+            return data;
         });
-
-        return user;
     }
 
     @Override
     @SuppressWarnings("resource")
     public void save(CosmeticUser user) {
         Runnable run = () -> {
-            try {
-                PreparedStatement preparedSt = preparedStatement("REPLACE INTO COSMETICDATABASE(UUID,COSMETICS) VALUES(?,?);");
+            try (PreparedStatement preparedSt = preparedStatement("REPLACE INTO COSMETICDATABASE(UUID,COSMETICS) VALUES(?,?);")) {
                 preparedSt.setString(1, user.getUniqueId().toString());
                 preparedSt.setString(2, serializeData(user));
                 preparedSt.executeUpdate();
@@ -57,7 +50,7 @@ public abstract class SQLData extends Data {
                 throw new RuntimeException(e);
             }
         };
-        if (!HMCCosmeticsPlugin.isDisable()) {
+        if (!HMCCosmeticsPlugin.getInstance().isDisabled()) {
             Bukkit.getScheduler().runTaskAsynchronously(HMCCosmeticsPlugin.getInstance(), run);
         } else {
             run.run();

common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/SQLiteData.java

@@ -6,7 +6,10 @@ import org.bukkit.Bukkit;
 
 import java.io.File;
 import java.io.IOException;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.util.UUID;
 import java.util.logging.Level;
 
@@ -32,10 +35,12 @@ public class SQLiteData extends SQLData {
             connection = DriverManager.getConnection("jdbc:sqlite:" + dataFolder);
 
             openConnection();
-            connection.prepareStatement("CREATE TABLE IF NOT EXISTS `COSMETICDATABASE` " +
+            try (PreparedStatement preparedStatement = connection.prepareStatement("CREATE TABLE IF NOT EXISTS `COSMETICDATABASE` " +
                     "(UUID varchar(36) PRIMARY KEY, " +
                     "COSMETICS MEDIUMTEXT " +
-                    ");").execute();
+                    ");")) {
+                preparedStatement.execute();
+            }
         } catch (SQLException e) {
             throw new RuntimeException(e);
         }
@@ -45,8 +50,7 @@ public class SQLiteData extends SQLData {
     @SuppressWarnings("resource")
     public void clear(UUID uniqueId) {
         Bukkit.getScheduler().runTaskAsynchronously(HMCCosmeticsPlugin.getInstance(), () -> {
-            try {
-                PreparedStatement preparedSt = preparedStatement("DELETE FROM COSMETICDATABASE WHERE UUID=?;");
+            try (PreparedStatement preparedSt = preparedStatement("DELETE FROM COSMETICDATABASE WHERE UUID=?;")){
                 preparedSt.setString(1, uniqueId.toString());
                 preparedSt.executeUpdate();
             } catch (SQLException e) {
@@ -56,11 +60,6 @@ public class SQLiteData extends SQLData {
     }
 
     private void openConnection() throws SQLException {
-        // Bukkit.getScheduler().runTaskAsynchronously(HMCCosmeticsPlugin.getInstance(), () -> {
-        // ...
-        // });
-        // connection = DriverManager.getConnection("jdbc:mysql://" + DatabaseSettings.getHost() + ":" + DatabaseSettings.getPort() + "/" + DatabaseSettings.getDatabase(), setupProperties());
-
         if (connection != null && !connection.isClosed()) return;
 
         // Close Connection if still active
@@ -71,7 +70,7 @@ public class SQLiteData extends SQLData {
             Class.forName("org.sqlite.JDBC");
             connection = DriverManager.getConnection("jdbc:sqlite:" + dataFolder);
         } catch (SQLException e) {
-            System.out.println(e.getMessage());
+            e.printStackTrace();
         } catch (ClassNotFoundException e) {
             throw new RuntimeException(e);
         }
@@ -80,11 +79,12 @@ public class SQLiteData extends SQLData {
     @Override
     public PreparedStatement preparedStatement(String query) {
         PreparedStatement ps = null;
-        if (!isConnectionOpen()) {
-            HMCCosmeticsPlugin.getInstance().getLogger().info("Connection is not open");
-        }
 
         try {
+            if (!isConnectionOpen()) {
+                MessagesUtil.sendDebugMessages("Connection is not open");
+                openConnection();
+            }
             ps = connection.prepareStatement(query);
         } catch (SQLException e) {
             e.printStackTrace();

common/src/main/java/com/hibiscusmc/hmccosmetics/emotes/EmoteManager.java

@@ -1,85 +0,0 @@
-package com.hibiscusmc.hmccosmetics.emotes;
-
-import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
-import com.ticxo.playeranimator.api.PlayerAnimator;
-import com.ticxo.playeranimator.api.animation.pack.AnimationPack;
-import org.apache.commons.io.FilenameUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Manages Emotes
- */
-@SuppressWarnings("SpellCheckingInspection")
-public class EmoteManager {
-    private static final @NotNull Map<@NotNull String, @NotNull String> emotes = new HashMap<>();
-
-    /**
-     * Loads all BlockBench animations from the emotes folder and puts it into the animation manager registry and local registry
-     */
-    public static void loadEmotes() {
-        // Clear the PlayerAnimator and local registries
-        PlayerAnimator.api.getAnimationManager().clearRegistry();
-        emotes.clear();
-
-        // Get the emote directory and check if it exists
-        File emoteDir = new File(HMCCosmeticsPlugin.getInstance().getDataFolder().getPath() + "/emotes/");
-        if (!emoteDir.exists()) return;
-
-        // Get all the files inside the directory and check if it isn't 0
-        File[] emoteFiles = emoteDir.listFiles();
-        if (emoteFiles == null || emoteFiles.length == 0) return;
-
-        // Remove any files that don't have the file extension ".bbmodel" and check if there are still resulting files
-        emoteFiles = Arrays.stream(emoteFiles).filter(file -> file.getPath().endsWith(".bbmodel")).distinct().toArray(File[]::new);
-        if (emoteFiles.length == 0) return;
-
-        // Loop through all files, importing all block bench animations into the registry
-        for (File animationFile : emoteFiles) {
-            String animationKey = FilenameUtils.removeExtension(animationFile.getName());
-            PlayerAnimator.api.getAnimationManager().importAnimations(animationKey, animationFile);
-        }
-
-        // Loops through all the entries in the registries and unpacks any animation packs to ensure if there were multiple animations
-        // inside a singular file, that they are added to the local registry individually for tab completion
-        for (Map.Entry<String, AnimationPack> packEntry : PlayerAnimator.api.getAnimationManager().getRegistry().entrySet()) {
-            packEntry.getValue().getAnimations().keySet().forEach(animationName -> {
-                // API key is the format "animationKey.animationFileName.animationName"
-                String apiKey = packEntry.getKey().replace(":", ".") + "." + animationName;
-                emotes.put(animationName, apiKey);
-            });
-        }
-    }
-
-    /**
-     * Returns true if there is an animation with the specified name
-     * @param animationName Name whose presence is to be tested
-     * @return True if this registry contains a mapping for the specified name
-     */
-    public static boolean has(@NotNull String animationName) {
-        return emotes.containsKey(animationName);
-    }
-
-    /**
-     * Returns the {@code API key} to which the specified name is mapped, or {@code null} if this map contains no mapping for the name.
-     * @param animationName Name whose {@code API key} is to be fetched
-     * @return The {@code API key} of the specified name or {@code null} if there was no animation name found
-     */
-    public static @Nullable String get(@NotNull String animationName) {
-        return emotes.get(animationName);
-    }
-
-    /**
-     * Gets a set of all the laoded animation names
-     * @return A set of all loaded animation names
-     */
-    public static @NotNull Set<String> getAllNames() {
-        return emotes.keySet();
-    }
-}

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java

@@ -1,17 +1,27 @@
 package com.hibiscusmc.hmccosmetics.gui;
 
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
+import com.hibiscusmc.hmccosmetics.api.events.PlayerMenuCloseEvent;
 import com.hibiscusmc.hmccosmetics.api.events.PlayerMenuOpenEvent;
-import com.hibiscusmc.hmccosmetics.config.serializer.ItemSerializer;
+import com.hibiscusmc.hmccosmetics.config.Settings;
+import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticHolder;
+import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
 import com.hibiscusmc.hmccosmetics.gui.type.Type;
 import com.hibiscusmc.hmccosmetics.gui.type.Types;
+import com.hibiscusmc.hmccosmetics.gui.type.types.TypeCosmetic;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
-import com.hibiscusmc.hmccosmetics.util.misc.Adventure;
-import com.hibiscusmc.hmccosmetics.util.misc.Placeholder;
 import dev.triumphteam.gui.builder.item.ItemBuilder;
+import dev.triumphteam.gui.components.GuiType;
 import dev.triumphteam.gui.guis.Gui;
 import dev.triumphteam.gui.guis.GuiItem;
+import lombok.Getter;
+import me.lojosho.hibiscuscommons.config.serializer.ItemSerializer;
+import me.lojosho.hibiscuscommons.hooks.Hooks;
+import me.lojosho.hibiscuscommons.util.AdventureUtils;
+import me.lojosho.shaded.configurate.ConfigurationNode;
+import me.lojosho.shaded.configurate.serialize.SerializationException;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -19,85 +29,48 @@ import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
-import org.spongepowered.configurate.ConfigurationNode;
-import org.spongepowered.configurate.serialize.SerializationException;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public class Menu {
 
+    @Getter
     private final String id;
+    @Getter
     private final String title;
+    @Getter
     private final int rows;
+    @Getter
+    private final Long cooldown;
+    @Getter
     private final ConfigurationNode config;
+    @Getter
     private final String permissionNode;
+    private final HashMap<Integer, List<MenuItem>> items;
+    @Getter
+    private final int refreshRate;
+    @Getter
+    private final boolean shading;
 
     public Menu(String id, @NotNull ConfigurationNode config) {
-        this.id = id;
+        this.id = config.node("id").getString(id);
         this.config = config;
 
         title = config.node("title").getString("chest");
         rows = config.node("rows").getInt(1);
+        cooldown = config.node("click-cooldown").getLong(Settings.getDefaultMenuCooldown());
         permissionNode = config.node("permission").getString("");
+        refreshRate = config.node("refresh-rate").getInt(-1);
+        shading = config.node("shading").getBoolean(Settings.isDefaultShading());
+
+        items = new HashMap<>();
+        setupItems();
 
         Menus.addMenu(this);
     }
 
-    public String getId() {
-        return id;
-    }
-
-    public String getTitle() {
-        return this.title;
-    }
-
-    public int getRows() {
-        return this.getRows();
-    }
-
-    public void openMenu(CosmeticUser user) {
-        openMenu(user, false);
-    }
-
-    public void openMenu(@NotNull CosmeticUser user, boolean ignorePermission) {
-        Player player = user.getPlayer();
-        if (player == null) return;
-        if (!ignorePermission && !permissionNode.isEmpty()) {
-            if (!player.hasPermission(permissionNode) && !player.isOp()) {
-                MessagesUtil.sendMessage(player, "no-permission");
-                return;
-            }
-        }
-        final Component component = Adventure.MINI_MESSAGE.deserialize(Placeholder.applyPapiPlaceholders(player, this.title));
-        Gui gui = Gui.gui().
-                title(component).
-                rows(this.rows).
-                create();
-
-        gui.setDefaultClickAction(event -> event.setCancelled(true));
-
-        // TODO: Redo this whole gui creation process to allow for all items, possibly implement caching
-        gui = getItems(user, gui);
-        final Gui finalGui = gui; // Need to make it final for the runtask
-
-        // API
-        PlayerMenuOpenEvent event = new PlayerMenuOpenEvent(user, this);
-        Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
-            Bukkit.getPluginManager().callEvent(event);
-        });
-        if (event.isCancelled()) return;
-        // Internal
-
-        Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
-            finalGui.open(player);
-        });
-    }
-
-    @Contract("_, _ -> param2")
-    private Gui getItems(@NotNull CosmeticUser user, Gui gui) {
-        Player player = user.getPlayer();
-
+    private void setupItems() {
         for (ConfigurationNode config : config.node("items").childrenMap().values()) {
 
             List<String> slotString;
@@ -113,8 +86,8 @@ public class Menu {
 
             List<Integer> slots = getSlots(slotString);
 
-            if (slots == null) {
-                MessagesUtil.sendDebugMessages("Slot is null for " + config.key().toString());
+            if (slots.isEmpty()) {
+                MessagesUtil.sendDebugMessages("Slot is empty for " + config.key().toString());
                 continue;
             }
 
@@ -122,42 +95,204 @@ public class Menu {
             try {
                 item = ItemSerializer.INSTANCE.deserialize(ItemStack.class, config.node("item"));
             } catch (SerializationException e) {
-                throw new RuntimeException(e);
-            }
-
-            if (item == null) {
-                MessagesUtil.sendDebugMessages("something went wrong! " + item);
+                MessagesUtil.sendDebugMessages("Unable to get valid item for " + config.key().toString() + " " + e.getMessage());
                 continue;
             }
 
-            Type type = null;
+            if (item == null) {
+                MessagesUtil.sendDebugMessages("Something went wrong with the item creation for " + config.key().toString());
+                continue;
+            }
 
+            int priority = config.node("priority").getInt(1);
+
+            Type type = Types.getDefaultType();
             if (!config.node("type").virtual()) {
-                String typeId = config.node("type").getString();
+                String typeId = config.node("type").getString("");
                 if (Types.isType(typeId)) type = Types.getType(typeId);
             }
 
-            for (int slot : slots) {
-                ItemStack modifiedItem = getMenuItem(user, type, config, item.clone(), slot).clone();
-                GuiItem guiItem = ItemBuilder.from(modifiedItem).asGuiItem();
-
-                Type finalType = type;
-                guiItem.setAction(event -> {
-                    MessagesUtil.sendDebugMessages("Selected slot " + slot);
-                    final ClickType clickType = event.getClick();
-                    if (finalType != null) finalType.run(user, config, clickType);
-                    // Need to delay the update by a tick so it will actually update with new values
-                    for (int guiSlot : slots) {
-                        gui.updateItem(guiSlot, getMenuItem(user, finalType, config, item.clone(), guiSlot));
-                    }
-                    MessagesUtil.sendDebugMessages("Updated slot " + slot);
-                });
-
-                MessagesUtil.sendDebugMessages("Added " + slots + " as " + guiItem + " in the menu");
-                gui.setItem(slot, guiItem);
+            for (Integer slot : slots) {
+                MenuItem menuItem = new MenuItem(slots, item, type, priority, config);
+                if (items.containsKey(slot)) {
+                    List<MenuItem> menuItems = items.get(slot);
+                    menuItems.add(menuItem);
+                    menuItems.sort(priorityCompare);
+                    items.put(slot, menuItems);
+                } else {
+                    items.put(slot, new ArrayList<>(List.of(menuItem)));
+                }
             }
         }
-        return gui;
+    }
+
+    public void openMenu(CosmeticUser user) {
+        openMenu(user, false);
+    }
+
+    public void openMenu(@NotNull CosmeticUser user, boolean ignorePermission) {
+        Player player = user.getPlayer();
+        if (player == null) return;
+        openMenu(player, user, ignorePermission);
+    }
+
+    public void openMenu(@NotNull Player viewer, @NotNull CosmeticHolder cosmeticHolder) {
+        openMenu(viewer, cosmeticHolder, false);
+    }
+
+    public void openMenu(@NotNull Player viewer, @NotNull CosmeticHolder cosmeticHolder, boolean ignorePermission) {
+        if (!ignorePermission && !permissionNode.isEmpty()) {
+            if (!viewer.hasPermission(permissionNode) && !viewer.isOp()) {
+                MessagesUtil.sendMessage(viewer, "no-permission");
+                return;
+            }
+        }
+        final Component component = AdventureUtils.MINI_MESSAGE.deserialize(Hooks.processPlaceholders(viewer, this.title));
+        Gui gui = Gui.gui()
+                .title(component)
+                .type(GuiType.CHEST)
+                .inventory((title, owner, type) -> Bukkit.createInventory(owner, rows * 9, title))
+                .create();
+
+        gui.setDefaultClickAction(event -> event.setCancelled(true));
+
+        AtomicInteger taskid = new AtomicInteger(-1);
+        gui.setOpenGuiAction(event -> {
+            Runnable run = () -> {
+                if (gui.getInventory().getViewers().isEmpty() && taskid.get() != -1) {
+                    Bukkit.getScheduler().cancelTask(taskid.get());
+                }
+
+                updateMenu(viewer, cosmeticHolder, gui);
+            };
+
+            if (refreshRate != -1) {
+                taskid.set(Bukkit.getScheduler().scheduleSyncRepeatingTask(HMCCosmeticsPlugin.getInstance(), run, 0, refreshRate));
+            } else {
+                run.run();
+            }
+        });
+
+        gui.setCloseGuiAction(event -> {
+            if (cosmeticHolder instanceof CosmeticUser user) {
+                PlayerMenuCloseEvent closeEvent = new PlayerMenuCloseEvent(user, this, event.getReason());
+                Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> Bukkit.getPluginManager().callEvent(closeEvent));
+            }
+
+            if (taskid.get() != -1) Bukkit.getScheduler().cancelTask(taskid.get());
+        });
+
+        Runnable openGuiTask = () -> {
+            gui.open(viewer);
+            updateMenu(viewer, cosmeticHolder, gui); // fixes shading? I know I do this twice but it's easier than writing a whole new class to deal with this shit
+        };
+
+        // API
+        if (cosmeticHolder instanceof CosmeticUser user) {
+            PlayerMenuOpenEvent event = new PlayerMenuOpenEvent(user, this);
+            Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
+                Bukkit.getPluginManager().callEvent(event);
+                if (!event.isCancelled()) {
+                    openGuiTask.run();
+                }
+            });
+        }
+        // Internal
+        else {
+            Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), openGuiTask);
+        }
+    }
+
+    private void updateMenu(Player viewer, CosmeticHolder cosmeticHolder, Gui gui) {
+        StringBuilder title = new StringBuilder(this.title);
+
+        int row = 0;
+        if (shading) {
+            for (int i = 0; i < gui.getInventory().getSize(); i++) {
+                // Handles the title
+                if (i % 9 == 0) {
+                    if (row == 0) {
+                        title.append(Settings.getFirstRowShift()); // Goes back to the start of the gui
+                    } else {
+                        title.append(Settings.getSequentRowShift());
+                    }
+                    row += 1;
+                } else {
+                    title.append(Settings.getIndividualColumnShift()); // Goes to the next slot
+                }
+
+                boolean occupied = false;
+
+                if (items.containsKey(i)) {
+                    // Handles the items
+                    List<MenuItem> menuItems = items.get(i);
+                    MenuItem item = menuItems.get(0);
+                    updateItem(viewer, cosmeticHolder, gui, i);
+
+                    if (item.type() instanceof TypeCosmetic) {
+                        Cosmetic cosmetic = Cosmetics.getCosmetic(item.itemConfig().node("cosmetic").getString(""));
+                        if (cosmetic == null) continue;
+                        if (cosmeticHolder.hasCosmeticInSlot(cosmetic)) {
+                            title.append(Settings.getEquippedCosmeticColor());
+                        } else {
+                            if (cosmeticHolder.canEquipCosmetic(cosmetic, true)) {
+                                title.append(Settings.getEquipableCosmeticColor());
+                            } else {
+                                title.append(Settings.getLockedCosmeticColor());
+                            }
+                        }
+                        occupied = true;
+                    }
+                }
+                if (occupied) {
+                    title.append(Settings.getBackground().replaceAll("<row>", String.valueOf(row)));
+                } else {
+                    title.append(Settings.getClearBackground().replaceAll("<row>", String.valueOf(row)));
+                }
+            }
+            MessagesUtil.sendDebugMessages("Updated menu with title " + title);
+            gui.updateTitle(AdventureUtils.MINI_MESSAGE.deserialize(Hooks.processPlaceholders(viewer, title.toString())));
+        } else {
+            for (int i = 0; i < gui.getInventory().getSize(); i++) {
+                if (items.containsKey(i)) {
+                    updateItem(viewer, cosmeticHolder, gui, i);
+                }
+            }
+        }
+    }
+
+    private void updateItem(Player viewer, CosmeticHolder cosmeticHolder, Gui gui, int slot) {
+        if (!items.containsKey(slot)) return;
+        List<MenuItem> menuItems = items.get(slot);
+        if (menuItems.isEmpty()) return;
+
+        for (MenuItem item : menuItems) {
+            Type type = item.type();
+            ItemStack modifiedItem = getMenuItem(viewer, cosmeticHolder, type, item.itemConfig(), item.item().clone(), slot);
+            if (modifiedItem.getType().isAir()) continue;
+            GuiItem guiItem = ItemBuilder.from(modifiedItem).asGuiItem();
+            guiItem.setAction(event -> {
+                UUID uuid = viewer.getUniqueId();
+                if (Settings.isMenuClickCooldown()) {
+                    Long userCooldown = Menus.getCooldown(uuid);
+                    if (userCooldown != 0 && (System.currentTimeMillis() - Menus.getCooldown(uuid) <= getCooldown())) {
+                        MessagesUtil.sendDebugMessages("Cooldown for " + viewer.getUniqueId() + " System time: " + System.currentTimeMillis() + " Cooldown: " + Menus.getCooldown(viewer.getUniqueId()) + " Difference: " + (System.currentTimeMillis() - Menus.getCooldown(viewer.getUniqueId())));
+                        MessagesUtil.sendMessage(viewer, "on-click-cooldown");
+                        return;
+                    } else {
+                        Menus.addCooldown(uuid, System.currentTimeMillis());
+                    }
+                }
+                MessagesUtil.sendDebugMessages("Updated Menu Item in slot number " + slot);
+                final ClickType clickType = event.getClick();
+                if (type != null) type.run(viewer, cosmeticHolder, item.itemConfig(), clickType);
+                updateMenu(viewer, cosmeticHolder, gui);
+            });
+
+            MessagesUtil.sendDebugMessages("Set an item in slot " + slot + " in the menu of " + getId());
+            gui.updateItem(slot, guiItem);
+            break;
+        }
     }
 
     @NotNull
@@ -167,8 +302,8 @@ public class Menu {
         for (String a : slotString) {
             if (a.contains("-")) {
                 String[] split = a.split("-");
-                int min = Integer.valueOf(split[0]);
-                int max = Integer.valueOf(split[1]);
+                int min = Integer.parseInt(split[0]);
+                int max = Integer.parseInt(split[1]);
                 slots.addAll(getSlots(min, max));
             } else {
                 slots.add(Integer.valueOf(a));
@@ -186,19 +321,17 @@ public class Menu {
         return slots;
     }
 
-    @Contract("_, _, _, _ -> param2")
+    @Contract("_, _, _, _, _, _ -> param4")
     @NotNull
-    private ItemStack getMenuItem(CosmeticUser user, Type type, ConfigurationNode config, ItemStack itemStack, int slot) {
+    private ItemStack getMenuItem(Player viewer, CosmeticHolder cosmeticHolder, Type type, ConfigurationNode config, ItemStack itemStack, int slot) {
         if (!itemStack.hasItemMeta()) return itemStack;
-        return type.setItem(user, config, itemStack, slot);
-    }
-
-    public String getPermissionNode() {
-        return permissionNode;
+        return type.setItem(viewer, cosmeticHolder, config, itemStack, slot);
     }
 
     public boolean canOpen(Player player) {
         if (permissionNode.isEmpty()) return true;
         return player.isOp() || player.hasPermission(permissionNode);
     }
+
+    public static Comparator<MenuItem> priorityCompare = Comparator.comparing(MenuItem::priority).reversed();
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/MenuItem.java

@@ -0,0 +1,12 @@
+package com.hibiscusmc.hmccosmetics.gui;
+
+import com.hibiscusmc.hmccosmetics.gui.type.Type;
+import me.lojosho.shaded.configurate.ConfigurationNode;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public record MenuItem(@NotNull List<Integer> slots, @NotNull ItemStack item,  Type type, int priority, ConfigurationNode itemConfig) {
+
+}

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menus.java

@@ -3,28 +3,31 @@ package com.hibiscusmc.hmccosmetics.gui;
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
+import me.lojosho.shaded.configurate.CommentedConfigurationNode;
+import me.lojosho.shaded.configurate.ConfigurateException;
+import me.lojosho.shaded.configurate.yaml.YamlConfigurationLoader;
 import org.apache.commons.io.FilenameUtils;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
-import org.spongepowered.configurate.CommentedConfigurationNode;
-import org.spongepowered.configurate.ConfigurateException;
-import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.*;
 import java.util.logging.Level;
+import java.util.stream.Stream;
 
 public class Menus {
 
     private static final HashMap<String, Menu> MENUS = new HashMap<>();
+    private static final HashMap<UUID, Long> COOLDOWNS = new HashMap<>();
 
-    public static void addMenu(Menu menu) {
+    public static void addMenu(@NotNull Menu menu) {
         MENUS.put(menu.getId().toUpperCase(), menu);
     }
 
+    @Nullable
     public static Menu getMenu(@NotNull String id) {
         return MENUS.get(id.toUpperCase());
     }
@@ -39,11 +42,18 @@ public class Menus {
         return MENUS.containsKey(id.toUpperCase());
     }
 
-    public static boolean hasMenu(Menu menu) {
+    public static boolean hasMenu(@NotNull Menu menu) {
         return MENUS.containsValue(menu);
     }
 
-    public static Menu getDefaultMenu() { return Menus.getMenu(Settings.getDefaultMenu()); }
+    public static boolean hasDefaultMenu() {
+        return MENUS.containsKey(Settings.getDefaultMenu());
+    }
+
+    @Nullable
+    public static Menu getDefaultMenu() {
+        return Menus.getMenu(Settings.getDefaultMenu());
+    }
 
     @NotNull
     public static List<String> getMenuNames() {
@@ -60,33 +70,48 @@ public class Menus {
         return MENUS.values();
     }
 
+    public static void addCooldown(UUID uuid, long time) {
+        COOLDOWNS.put(uuid, time);
+    }
+
+    public static Long getCooldown(UUID uuid) {
+        return COOLDOWNS.getOrDefault(uuid, 0L);
+    }
+
+    public static void removeCooldown(UUID uuid) {
+        COOLDOWNS.remove(uuid);
+    }
+
     public static void setup() {
         MENUS.clear();
+        COOLDOWNS.clear();
 
         File cosmeticFolder = new File(HMCCosmeticsPlugin.getInstance().getDataFolder() + "/menus");
         if (!cosmeticFolder.exists()) cosmeticFolder.mkdir();
 
-        File[] directoryListing = cosmeticFolder.listFiles();
-        if (directoryListing == null) return;
-
-        for (File child : directoryListing) {
-            if (child.toString().contains(".yml") || child.toString().contains(".yaml")) {
-                MessagesUtil.sendDebugMessages("Scanning " + child);
-                // Loads file
-                YamlConfigurationLoader loader = YamlConfigurationLoader.builder().path(child.toPath()).build();
-                CommentedConfigurationNode root;
-                try {
-                    root = loader.load();
-                } catch (ConfigurateException e) {
-                    throw new RuntimeException(e);
+        // Recursive file lookup
+        try (Stream<Path> walkStream = Files.walk(cosmeticFolder.toPath())) {
+            walkStream.filter(p -> p.toFile().isFile()).forEach(child -> {
+                if (child.toString().endsWith("yml") || child.toString().endsWith("yaml")) {
+                    MessagesUtil.sendDebugMessages("Scanning " + child);
+                    // Loads file
+                    YamlConfigurationLoader loader = YamlConfigurationLoader.builder().path(child).build();
+                    CommentedConfigurationNode root;
+                    try {
+                        root = loader.load();
+                    } catch (ConfigurateException e) {
+                        throw new RuntimeException(e);
+                    }
+                    try {
+                        new Menu(FilenameUtils.removeExtension(child.getFileName().toString()), root);
+                    } catch (Exception e) {
+                        MessagesUtil.sendDebugMessages("Unable to create menu in " + child.getFileName().toString(), Level.WARNING);
+                        if (Settings.isDebugMode()) e.printStackTrace();
+                    }
                 }
-                try {
-                    new Menu(FilenameUtils.removeExtension(child.getName()), root);
-                } catch (Exception e) {
-                    MessagesUtil.sendDebugMessages("Unable to create menu in " + child, Level.WARNING);
-                    if (Settings.isDebugEnabled()) e.printStackTrace();
-                }
-            }
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/Action.java

@@ -1,6 +1,8 @@
 package com.hibiscusmc.hmccosmetics.gui.action;
 
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticHolder;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 public abstract class Action {
@@ -16,5 +18,13 @@ public abstract class Action {
         return this.id;
     }
 
+    public void run(Player viewer, CosmeticHolder cosmeticHolder, String raw) {
+        run(CosmeticHolder.ensureSingleCosmeticUser(viewer, cosmeticHolder), raw);
+    }
+
+    /**
+     * @deprecated Override {@link #run(Player, CosmeticHolder, String)} instead.
+     */
+    @Deprecated
     public abstract void run(CosmeticUser user, String raw);
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/Actions.java

@@ -1,13 +1,16 @@
 package com.hibiscusmc.hmccosmetics.gui.action;
 
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticHolder;
 import com.hibiscusmc.hmccosmetics.gui.action.actions.*;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.logging.Level;
 
 @SuppressWarnings("unused")
 public class Actions {
@@ -28,7 +31,6 @@ public class Actions {
     private static final ActionCosmeticHide ACTION_HIDE = new ActionCosmeticHide();
     private static final ActionCosmeticToggle ACTION_TOGGLE = new ActionCosmeticToggle();
 
-
     public static Action getAction(@NotNull String id) {
         return actions.get(id.toUpperCase());
     }
@@ -41,16 +43,20 @@ public class Actions {
         actions.put(action.getId().toUpperCase(), action);
     }
 
-    public static void runActions(CosmeticUser user, @NotNull List<String> raw) {
+    public static void runActions(Player viewer, CosmeticHolder cosmeticHolder, @NotNull List<String> raw) {
         for (String a : raw) {
-            String id = StringUtils.substringBetween(a, "[", "]").toUpperCase();
+            String id = StringUtils.substringBetween(a, "[", "]");
             String message = StringUtils.substringAfter(a, "] ");
             MessagesUtil.sendDebugMessages("ID is " + id + " // Raw Data is " + message);
-            if (isAction(id)) {
-                getAction(id).run(user, message);
+            if (id != null && isAction(id.toUpperCase())) {
+                getAction(id).run(viewer, cosmeticHolder, message);
             } else {
-                MessagesUtil.sendDebugMessages("Possible ids: " + actions.keySet());
+                MessagesUtil.sendDebugMessages("Invalid Action ID (" + id + ") used in menus (Full raw: '" + a + "'). Make sure all actions are properly typed out. Here are all possible actions: " + actions.keySet(), Level.WARNING);
             }
         }
     }
+
+    public static void runActions(CosmeticUser user, @NotNull List<String> raw) {
+        runActions(user.getPlayer(), user, raw);
+    }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCloseMenu.java

@@ -1,7 +1,9 @@
 package com.hibiscusmc.hmccosmetics.gui.action.actions;
 
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticHolder;
 import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 public class ActionCloseMenu extends Action {
@@ -10,8 +12,13 @@ public class ActionCloseMenu extends Action {
         super("close");
     }
 
+    @Override
+    public void run(Player viewer, CosmeticHolder cosmeticHolder, String raw) {
+        viewer.closeInventory();
+    }
+
     @Override
     public void run(@NotNull CosmeticUser user, String raw) {
-        user.getPlayer().closeInventory();
+        run(user.getPlayer(), user, raw);
     }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionConsoleCommand.java

@@ -1,8 +1,12 @@
 package com.hibiscusmc.hmccosmetics.gui.action.actions;
 
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticHolder;
 import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import me.lojosho.hibiscuscommons.hooks.Hooks;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 public class ActionConsoleCommand extends Action {
@@ -11,8 +15,15 @@ public class ActionConsoleCommand extends Action {
         super("console-command");
     }
 
+    @Override
+    public void run(Player viewer, CosmeticHolder cosmeticHolder, String raw) {
+        // todo: some of these generalizations may require more specific implementations, for example,
+        // todo: what if we wanted to execute console commands only for the cosmetic holder?
+        HMCCosmeticsPlugin.getInstance().getServer().dispatchCommand(Bukkit.getConsoleSender(), Hooks.processPlaceholders(viewer, raw));
+    }
+
     @Override
     public void run(@NotNull CosmeticUser user, String raw) {
-        HMCCosmeticsPlugin.getInstance().getServer().dispatchCommand(user.getPlayer(), raw);
+        run(user.getPlayer(), user, raw);
     }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCosmeticHide.java

@@ -1,7 +1,9 @@
 package com.hibiscusmc.hmccosmetics.gui.action.actions;
 
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticHolder;
 import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 public class ActionCosmeticHide extends Action {
@@ -11,8 +13,14 @@ public class ActionCosmeticHide extends Action {
     }
 
     @Override
-    public void run(@NotNull CosmeticUser user, String raw) {
-        if (user.getHidden()) return;
+    public void run(Player viewer, CosmeticHolder cosmeticHolder, String raw) {
+        if (!(cosmeticHolder instanceof CosmeticUser user)) return;
+        if (user.isHidden()) return;
         user.hideCosmetics(CosmeticUser.HiddenReason.ACTION);
     }
+
+    @Override
+    public void run(@NotNull CosmeticUser user, String raw) {
+        run(user.getPlayer(), user, raw);
+    }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCosmeticShow.java

@@ -1,7 +1,9 @@
 package com.hibiscusmc.hmccosmetics.gui.action.actions;
 
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticHolder;
 import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 public class ActionCosmeticShow extends Action {
@@ -11,11 +13,17 @@ public class ActionCosmeticShow extends Action {
     }
 
     @Override
-    public void run(@NotNull CosmeticUser user, String raw) {
-        if (!user.getHidden()) return;
+    public void run(Player viewer, CosmeticHolder cosmeticHolder, String raw) {
+        if (!(cosmeticHolder instanceof CosmeticUser user)) return;
+        if (!user.isHidden()) return;
 
         // Do not hide if it's already off for WG
-        if (user.getHiddenReason() != CosmeticUser.HiddenReason.ACTION && user.getHiddenReason() != CosmeticUser.HiddenReason.COMMAND) return;
-        user.showCosmetics();
+        if (!user.isHidden(CosmeticUser.HiddenReason.ACTION) && !user.isHidden(CosmeticUser.HiddenReason.COMMAND)) return;
+        user.showCosmetics(CosmeticUser.HiddenReason.ACTION);
+    }
+
+    @Override
+    public void run(@NotNull CosmeticUser user, String raw) {
+        run(user.getPlayer(), user, raw);
     }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCosmeticToggle.java

@@ -1,7 +1,9 @@
 package com.hibiscusmc.hmccosmetics.gui.action.actions;
 
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticHolder;
 import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 public class ActionCosmeticToggle extends Action {
@@ -11,13 +13,19 @@ public class ActionCosmeticToggle extends Action {
     }
 
     @Override
-    public void run(@NotNull CosmeticUser user, String raw) {
-        if (user.getHidden()) {
-            if (user.getHiddenReason() != CosmeticUser.HiddenReason.ACTION && user.getHiddenReason() != CosmeticUser.HiddenReason.COMMAND) return;
-            user.showCosmetics();
+    public void run(Player viewer, CosmeticHolder cosmeticHolder, String raw) {
+        if (!(cosmeticHolder instanceof CosmeticUser user)) return;
+        if (user.isHidden()) {
+            if (!user.isHidden(CosmeticUser.HiddenReason.ACTION) && !user.isHidden(CosmeticUser.HiddenReason.COMMAND)) return;
+            user.showCosmetics(CosmeticUser.HiddenReason.ACTION);
             return;
         }
 
         user.hideCosmetics(CosmeticUser.HiddenReason.ACTION);
     }
+
+    @Override
+    public void run(@NotNull CosmeticUser user, String raw) {
+        run(user.getPlayer(), user, raw);
+    }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionEquip.java

@@ -1,9 +1,11 @@
 package com.hibiscusmc.hmccosmetics.gui.action.actions;
 
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticHolder;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
 import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import org.bukkit.entity.Player;
 
 public class ActionEquip extends Action {
 
@@ -12,10 +14,15 @@ public class ActionEquip extends Action {
     }
 
     @Override
-    public void run(CosmeticUser user, String raw) {
+    public void run(Player viewer, CosmeticHolder cosmeticHolder, String raw) {
         Cosmetic cosmetic = Cosmetics.getCosmetic(raw);
         if (cosmetic == null) return;
 
-        user.addPlayerCosmetic(cosmetic);
+        cosmeticHolder.addCosmetic(cosmetic);
+    }
+
+    @Override
+    public void run(CosmeticUser user, String raw) {
+        run(user.getPlayer(), user, raw);
     }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionMenu.java

@@ -1,11 +1,12 @@
 package com.hibiscusmc.hmccosmetics.gui.action.actions;
 
-import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticHolder;
 import com.hibiscusmc.hmccosmetics.gui.Menu;
 import com.hibiscusmc.hmccosmetics.gui.Menus;
 import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
+import org.bukkit.entity.Player;
 
 import java.util.logging.Level;
 
@@ -16,7 +17,7 @@ public class ActionMenu extends Action {
     }
 
     @Override
-    public void run(CosmeticUser user, String raw) {
+    public void run(Player viewer, CosmeticHolder cosmeticHolder, String raw) {
         boolean ignorePermission = false;
 
         raw = raw.replaceAll(" ", ""); // Removes all spaces
@@ -33,6 +34,11 @@ public class ActionMenu extends Action {
 
         Menu menu = Menus.getMenu(raw);
         MessagesUtil.sendDebugMessages(raw + " | " + ignorePermission);
-        menu.openMenu(user, ignorePermission);
+        menu.openMenu(viewer, cosmeticHolder, ignorePermission);
+    }
+
+    @Override
+    public void run(CosmeticUser user, String raw) {
+        run(user.getPlayer(), user, raw);
     }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionMessage.java

@@ -1,8 +1,10 @@
 package com.hibiscusmc.hmccosmetics.gui.action.actions;
 
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticHolder;
 import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 public class ActionMessage extends Action {
@@ -11,8 +13,13 @@ public class ActionMessage extends Action {
         super("message");
     }
 
+    @Override
+    public void run(Player viewer, CosmeticHolder cosmeticHolder, String raw) {
+        MessagesUtil.sendMessageNoKey(viewer, raw);
+    }
+
     @Override
     public void run(@NotNull CosmeticUser user, String raw) {
-        MessagesUtil.sendMessageNoKey(user.getPlayer(), raw);
+        run(user.getPlayer(), user, raw);
     }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionParticle.java

@@ -1,10 +1,11 @@
 package com.hibiscusmc.hmccosmetics.gui.action.actions;
 
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticHolder;
 import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
-import com.hibiscusmc.hmccosmetics.util.ServerUtils;
-import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
+import com.hibiscusmc.hmccosmetics.util.HMCCServerUtils;
+import com.hibiscusmc.hmccosmetics.util.packets.HMCCPacketManager;
 import com.owen1212055.particlehelper.api.particle.types.BlockDataParticle;
 import com.owen1212055.particlehelper.api.particle.types.DestinationParticle;
 import com.owen1212055.particlehelper.api.particle.types.velocity.VelocityParticle;
@@ -24,7 +25,7 @@ public class ActionParticle extends Action {
 
     @Override
     @SuppressWarnings("ConstantConditions")
-    public void run(CosmeticUser user, @NotNull String raw) {
+    public void run(Player viewer, CosmeticHolder cosmeticHolder, String raw) {
         String[] rawString = raw.split(" ");
         ParticleType<?, ?> particleType = Particles.fromKey(NamespacedKey.minecraft(rawString[0].toLowerCase()));
         if (particleType == null) {
@@ -42,10 +43,15 @@ public class ActionParticle extends Action {
             return;
         }
 
-        particle = ServerUtils.addParticleValues(particle, rawString);
-        Location location = user.getPlayer().getLocation();
-        for (Player player : PacketManager.getViewers(location)) {
+        particle = HMCCServerUtils.addParticleValues(particle, rawString);
+        Location location = viewer.getLocation();
+        for (Player player : HMCCPacketManager.getViewers(location)) {
             particle.compile().send(player, location);
         }
     }
+
+    @Override
+    public void run(CosmeticUser user, @NotNull String raw) {
+        run(user.getPlayer(), user, raw);
+    }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionPlayerCommand.java

@@ -1,8 +1,11 @@
 package com.hibiscusmc.hmccosmetics.gui.action.actions;
 
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticHolder;
 import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
+import me.lojosho.hibiscuscommons.hooks.Hooks;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 public class ActionPlayerCommand extends Action {
@@ -11,8 +14,14 @@ public class ActionPlayerCommand extends Action {
         super("player-command");
     }
 
+    @Override
+    public void run(Player viewer, CosmeticHolder cosmeticHolder, String raw) {
+        // todo: what if we wanted the cosmetic holder to execute the command instead
+        viewer.performCommand(MessagesUtil.processStringNoKeyString(viewer, Hooks.processPlaceholders(viewer, raw)));
+    }
+
     @Override
     public void run(@NotNull CosmeticUser user, String raw) {
-        user.getPlayer().performCommand(MessagesUtil.processStringNoKeyString(user.getPlayer(), raw));
+        run(user.getPlayer(), user, raw);
     }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionSound.java

@@ -1,5 +1,6 @@
 package com.hibiscusmc.hmccosmetics.gui.action.actions;
 
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticHolder;
 import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
@@ -16,8 +17,7 @@ public class ActionSound extends Action {
     }
 
     @Override
-    public void run(@NotNull CosmeticUser user, @NotNull String raw) {
-        Player player = user.getPlayer();
+    public void run(Player viewer, CosmeticHolder cosmeticHolder, String raw) {
         String[] processedString = raw.split(" ");
 
         String soundName = processedString[0];
@@ -31,6 +31,11 @@ public class ActionSound extends Action {
 
         MessagesUtil.sendDebugMessages("Attempting to play " + soundName, Level.INFO);
 
-        player.playSound(player.getLocation(), soundName, volume, pitch);
+        viewer.playSound(viewer.getLocation(), soundName, volume, pitch);
+    }
+
+    @Override
+    public void run(@NotNull CosmeticUser user, @NotNull String raw) {
+        run(user.getPlayer(), user, raw);
     }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionUnequip.java

@@ -1,9 +1,10 @@
 package com.hibiscusmc.hmccosmetics.gui.action.actions;
 
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticHolder;
 import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
 import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
-import org.apache.commons.lang3.EnumUtils;
+import org.bukkit.entity.Player;
 
 public class ActionUnequip extends Action {
 
@@ -12,10 +13,15 @@ public class ActionUnequip extends Action {
     }
 
     @Override
-    public void run(CosmeticUser user, String raw) {
-        if (!EnumUtils.isValidEnum(CosmeticSlot.class, raw)) return;
+    public void run(Player viewer, CosmeticHolder cosmeticHolder, String raw) {
+        if (!CosmeticSlot.contains(raw)) return;
 
         CosmeticSlot slot = CosmeticSlot.valueOf(raw);
-        user.removeCosmeticSlot(slot);
+        cosmeticHolder.removeCosmeticSlot(slot);
+    }
+
+    @Override
+    public void run(CosmeticUser user, String raw) {
+        run(user.getPlayer(), user, raw);
     }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/special/DyeMenu.java

@@ -1,69 +1,20 @@
 package com.hibiscusmc.hmccosmetics.gui.special;
 
-import com.hibiscusmc.hmccolor.HMCColorApi;
-import com.hibiscusmc.hmccolor.gui.guis.Gui;
-import com.hibiscusmc.hmccolor.gui.guis.GuiItem;
-import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
-import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
-import com.hibiscusmc.hmccosmetics.hooks.Hooks;
-import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
-import com.hibiscusmc.hmccosmetics.util.misc.Placeholder;
-import org.bukkit.Bukkit;
-import org.bukkit.Color;
-import org.bukkit.Material;
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticHolder;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.inventory.meta.LeatherArmorMeta;
-import org.bukkit.inventory.meta.MapMeta;
-import org.bukkit.inventory.meta.PotionMeta;
 import org.jetbrains.annotations.NotNull;
 
-public class DyeMenu {
+public interface DyeMenu {
 
-    public static void openMenu(@NotNull CosmeticUser user, Cosmetic cosmetic) {
-        Player player = user.getPlayer();
-        if (player == null) return;
-        if (!Hooks.isActiveHook("HMCColor")) {
-            addCosmetic(user, cosmetic, null);
-            return;
-        }
-        ItemStack originalItem = user.getUserCosmeticItem(cosmetic);
-        if (originalItem == null || !cosmetic.isDyable()) return;
+    /**
+     * Overrideable method that is called when a player wishing to dye a menu.
+     * After the method is called, the menu plugin itself is supposed to handle everything else, including adding the cosmetic to the CosmeticHolder
+     *
+     * @param viewer The player that is viewing the menu
+     * @param cosmeticHolder The CosmeticHolder that is being dyed (Can be different from the viewer)
+     * @param cosmetic (The cosmetic that is wished to be dyed)
+     */
+    void openMenu(@NotNull Player viewer, @NotNull CosmeticHolder cosmeticHolder, @NotNull Cosmetic cosmetic);
 
-        Gui gui = HMCColorApi.INSTANCE.colorMenu();
-        gui.updateTitle(Placeholder.applyPapiPlaceholders(player, Settings.getDyeMenuName()));
-        gui.setItem(Settings.getDyeMenuInputSlot(), new GuiItem(originalItem));
-        gui.setDefaultTopClickAction(event -> {
-            if (event.getSlot() == Settings.getDyeMenuOutputSlot()) {
-                ItemStack item = event.getInventory().getItem(Settings.getDyeMenuOutputSlot());
-                if (item == null) return;
-                ItemMeta meta = item.getItemMeta();
-                if (meta == null) return;
-
-                Color color = meta instanceof LeatherArmorMeta leatherMeta ? leatherMeta.getColor() :
-                        meta instanceof PotionMeta potionMeta ? potionMeta.getColor() :
-                                meta instanceof MapMeta mapMeta ? mapMeta.getColor() : null;
-                if (color == null) return;
-
-                addCosmetic(user, cosmetic, color);
-                event.setCancelled(true);
-            } else event.setCancelled(true);
-        });
-
-        gui.setPlayerInventoryAction(event -> event.setCancelled(true));
-        gui.setCloseGuiAction(event -> {});
-        gui.open(player);
-    }
-
-    private static void addCosmetic(@NotNull CosmeticUser user, Cosmetic cosmetic, Color color) {
-        Player player = user.getPlayer();
-        user.addPlayerCosmetic(cosmetic, color);
-        player.setItemOnCursor(new ItemStack(Material.AIR));
-        Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
-            player.closeInventory();
-            user.updateCosmetic(cosmetic.getSlot());
-        }, 2);
-    }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/special/DyeMenuProvider.java

@@ -0,0 +1,46 @@
+package com.hibiscusmc.hmccosmetics.gui.special;
+
+import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticHolder;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+public class DyeMenuProvider {
+
+    private static DyeMenu instance = null;
+
+    /**
+     * Sets the provider of the DyeMenu. Check {@link DyeMenuProvider#hasMenuProvider()} before attempting to set this,
+     * it is locked once a dye menu has been set!
+     * @param dyeMenu The dye menu implementation that wishes to be the provider.
+     * @throws IllegalStateException IllegalStateException will be thrown if a dye menu provider already is set by another plugin.
+     */
+    public static void setDyeMenuProvider(@NotNull DyeMenu dyeMenu) throws IllegalStateException {
+        if (instance != null) {
+            throw new IllegalStateException("DyeMenu Implementation has already been set by another plugin.");
+        }
+        instance = dyeMenu;
+    }
+
+    /**
+     * Called when wishing to dye a cosmetic to hand it off to the dye menu implementation
+     * @param viewer The viewer of the menu
+     * @param cosmeticHolder The cosmetic holder that the player viewer wishing to modify (could be themselves or another CosmeticHolder)
+     * @param cosmetic The cosmetic the user wishes to dye
+     * @throws IllegalStateException IllegalStateException will be thrown if the dye menu instance is null (Check {@link DyeMenuProvider#hasMenuProvider()} before calling)
+     */
+    public static void openMenu(@NotNull Player viewer, @NotNull CosmeticHolder cosmeticHolder, @NotNull Cosmetic cosmetic) throws IllegalStateException {
+        if (instance == null) {
+            throw new IllegalStateException("Unable to open a dye menu without instance of it.");
+        }
+        instance.openMenu(viewer, cosmeticHolder, cosmetic);
+    }
+
+    /**
+     * Does HMCC have a dye menu provider already set?
+     * @return True if it is already set and locked; false if none have been set.
+     */
+    public static boolean hasMenuProvider() {
+        return instance != null;
+    }
+}

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/special/impl/HMCColorDyeMenu.java

@@ -0,0 +1,58 @@
+package com.hibiscusmc.hmccosmetics.gui.special.impl;
+
+import com.hibiscusmc.hmccolor.HMCColorApi;
+import com.hibiscusmc.hmccolor.shaded.gui.guis.Gui;
+import com.hibiscusmc.hmccolor.shaded.gui.guis.GuiItem;
+import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
+import com.hibiscusmc.hmccosmetics.config.Settings;
+import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticHolder;
+import com.hibiscusmc.hmccosmetics.gui.special.DyeMenu;
+import me.lojosho.hibiscuscommons.hooks.Hooks;
+import me.lojosho.hibiscuscommons.nms.NMSHandlers;
+import me.lojosho.hibiscuscommons.util.AdventureUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.Color;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class HMCColorDyeMenu implements DyeMenu {
+
+    @Override
+    public void openMenu(@NotNull Player viewer, @NotNull CosmeticHolder cosmeticHolder, @NotNull Cosmetic cosmetic) {
+        ItemStack originalItem = cosmetic.getItem();
+        if (originalItem == null || !cosmetic.isDyeable()) return;
+
+        Gui gui = HMCColorApi.createColorMenu(viewer);
+        gui.updateTitle(AdventureUtils.MINI_MESSAGE.deserialize(Hooks.processPlaceholders(viewer, Settings.getDyeMenuName())));
+        gui.setItem(Settings.getDyeMenuInputSlot(), new GuiItem(originalItem));
+        gui.setDefaultTopClickAction(event -> {
+            if (event.getSlot() == Settings.getDyeMenuOutputSlot()) {
+                ItemStack item = event.getInventory().getItem(Settings.getDyeMenuOutputSlot());
+                if (item == null) return;
+
+                Color color = NMSHandlers.getHandler().getUtilHandler().getColor(item);
+                if (color == null) return;
+
+                addCosmetic(viewer, cosmeticHolder, cosmetic, color);
+                event.setCancelled(true);
+            } else event.setCancelled(true);
+        });
+
+        gui.setPlayerInventoryAction(event -> event.setCancelled(true));
+        gui.setCloseGuiAction(event -> {});
+        gui.open(viewer);
+    }
+
+    private void addCosmetic(@NotNull Player viewer, @NotNull CosmeticHolder cosmeticHolder, @NotNull Cosmetic cosmetic, @Nullable Color color) {
+        cosmeticHolder.addCosmetic(cosmetic, color);
+        viewer.setItemOnCursor(new ItemStack(Material.AIR));
+        Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
+            viewer.closeInventory();
+            cosmeticHolder.updateCosmetic(cosmetic.getSlot());
+        }, 2);
+    }
+}

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/Type.java

@@ -1,10 +1,23 @@
 package com.hibiscusmc.hmccosmetics.gui.type;
 
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticHolder;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import me.lojosho.hibiscuscommons.HibiscusCommonsPlugin;
+import me.lojosho.hibiscuscommons.hooks.Hooks;
+import me.lojosho.shaded.configurate.ConfigurationNode;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.TextDecoration;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
-import org.spongepowered.configurate.ConfigurationNode;
+import org.bukkit.inventory.meta.SkullMeta;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public abstract class Type {
 
@@ -19,11 +32,87 @@ public abstract class Type {
         return this.id;
     }
 
-    public void run(CosmeticUser user, ConfigurationNode config) {
-        run(user, config, null);
+    public void run(Player viewer, CosmeticHolder cosmeticHolder, ConfigurationNode config) {
+        run(viewer, cosmeticHolder, config, null);
     }
 
+    public void run(Player viewer, CosmeticHolder cosmeticHolder, ConfigurationNode config, ClickType clickType) {
+        run(CosmeticHolder.ensureSingleCosmeticUser(viewer, cosmeticHolder), config, clickType);
+    }
+
+    public void run(CosmeticUser user, ConfigurationNode config) {
+        final var player = user.getPlayer();
+        if (player == null) return;
+        run(player, user, config, null);
+    }
+
+    /**
+     * @deprecated Override {@link #run(Player, CosmeticHolder, ConfigurationNode, ClickType)} instead.
+     */
+    @Deprecated
     public abstract void run(CosmeticUser user, ConfigurationNode config, ClickType clickType);
 
+    public ItemStack setItem(Player viewer, CosmeticHolder cosmeticHolder, ConfigurationNode config, ItemStack itemStack, int slot) {
+        return setItem(CosmeticHolder.ensureSingleCosmeticUser(viewer, cosmeticHolder), config, itemStack, slot);
+    }
+
+    /**
+     * @deprecated Override {@link #setItem(Player, CosmeticHolder, ConfigurationNode, ItemStack, int)} instead.
+     */
     public abstract ItemStack setItem(CosmeticUser user, ConfigurationNode config, ItemStack itemStack, int slot);
+
+    @Contract("_, _ -> param2")
+    @NotNull
+    @SuppressWarnings("Duplicates")
+    protected ItemMeta processItemMeta(Player viewer, @NotNull ItemMeta itemMeta) {
+        // New implementation - Paper and forks
+        // I know this is a kinda batshit way to do it (with serializing and deserializing MiniMessage)
+        // But currently I can't think of another good way of doing it without a big refactor. I'll come back to this
+        // At a later date.
+        if (HibiscusCommonsPlugin.isOnPaper()) {
+            List<Component> processedLore = new ArrayList<>();
+            if (itemMeta.hasDisplayName()) {
+                String displayName = MiniMessage.miniMessage().serialize(itemMeta.displayName());
+                displayName = Hooks.processPlaceholders(viewer, displayName);
+                itemMeta.displayName(MiniMessage.miniMessage().deserialize(displayName).decorationIfAbsent(TextDecoration.ITALIC, TextDecoration.State.FALSE));
+            }
+
+            if (itemMeta.hasLore()) {
+                for (Component loreLine : itemMeta.lore()) {
+                    String loreStringLine = MiniMessage.miniMessage().serialize(loreLine);
+                    loreStringLine = Hooks.processPlaceholders(viewer, loreStringLine);
+                    processedLore.add(MiniMessage.miniMessage().deserialize(loreStringLine).decorationIfAbsent(TextDecoration.ITALIC, TextDecoration.State.FALSE));
+                }
+            }
+
+            if (itemMeta instanceof SkullMeta skullMeta) {
+                if (skullMeta.hasOwner() && skullMeta.getOwner() != null) {
+                    skullMeta.setOwner(Hooks.processPlaceholders(viewer, skullMeta.getOwner()));
+                }
+            }
+
+            itemMeta.lore(processedLore);
+        } else {
+            // Legacy implementation - Spigot
+            List<String> processedLore = new ArrayList<>();
+            if (itemMeta.hasDisplayName()) {
+                itemMeta.setDisplayName(Hooks.processPlaceholders(viewer, itemMeta.getDisplayName()));
+            }
+
+            if (itemMeta.hasLore()) {
+                for (String loreLine : itemMeta.getLore()) {
+                    processedLore.add(Hooks.processPlaceholders(viewer, loreLine));
+                }
+            }
+
+            if (itemMeta instanceof SkullMeta skullMeta) {
+                if (skullMeta.hasOwner() && skullMeta.getOwner() != null) {
+                    skullMeta.setOwner(Hooks.processPlaceholders(viewer, skullMeta.getOwner()));
+                }
+            }
+            itemMeta.setLore(processedLore);
+        }
+
+        return itemMeta;
+    }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/Types.java

@@ -10,18 +10,43 @@ public class Types {
 
     private static final HashMap<String, Type> types = new HashMap<>();
 
-    private static TypeCosmetic TYPE_COSMETIC = new TypeCosmetic();
-    private static TypeEmpty TYPE_EMPTY = new TypeEmpty();
+    private static final TypeCosmetic TYPE_COSMETIC = new TypeCosmetic();
+    private static final TypeEmpty TYPE_EMPTY = new TypeEmpty();
 
+    /**
+     * Get's a Menu Item type. Add custom menu item types with {@link #addType(Type)}
+     * @param id A non-case sensitive ID
+     * @return The type of Menu Item
+     */
     public static Type getType(@NotNull String id) {
         return types.get(id.toUpperCase());
     }
 
+    /**
+     * Checks if a type is valid. Add custom menu item types with {@link #addType(Type)}
+     * @param id A non-case sensitive ID
+     * @return True if exists, False if not.
+     */
     public static boolean isType(@NotNull String id) {
         return types.containsKey(id.toUpperCase());
     }
 
-    public static void addType(Type type) {
-        types.put(type.getId().toUpperCase(), type);
+    /**
+     * Adds a Menu Item Type to the types HashMap for reference. Menu Types will automatically be added using this method.
+     * @param type A non-null {@link Type} that'll be added. ID should be unique; can't be duplicated
+     */
+    public static boolean addType(@NotNull Type type) {
+        String id = type.getId().toUpperCase();
+        if (types.containsKey(id)) return false;
+        types.put(id, type);
+        return true;
+    }
+
+    /**
+     * Gets the default menu item; {@link TypeEmpty}
+     * @return The empty menu type.
+     */
+    public static TypeEmpty getDefaultType() {
+        return TYPE_EMPTY;
     }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java

@@ -1,60 +1,83 @@
 package com.hibiscusmc.hmccosmetics.gui.type.types;
 
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
-import com.hibiscusmc.hmccosmetics.config.serializer.ItemSerializer;
+import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticHolder;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
 import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticArmorType;
 import com.hibiscusmc.hmccosmetics.gui.action.Actions;
 import com.hibiscusmc.hmccosmetics.gui.special.DyeMenu;
+import com.hibiscusmc.hmccosmetics.gui.special.DyeMenuProvider;
 import com.hibiscusmc.hmccosmetics.gui.type.Type;
-import com.hibiscusmc.hmccosmetics.hooks.Hooks;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
-import com.hibiscusmc.hmccosmetics.util.misc.StringUtils;
-import com.hibiscusmc.hmccosmetics.util.misc.Utils;
-import me.clip.placeholderapi.PlaceholderAPI;
+import me.lojosho.hibiscuscommons.config.serializer.ItemSerializer;
+import me.lojosho.hibiscuscommons.hooks.Hooks;
+import me.lojosho.shaded.configurate.ConfigurationNode;
+import me.lojosho.shaded.configurate.serialize.SerializationException;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
-import org.spongepowered.configurate.ConfigurationNode;
-import org.spongepowered.configurate.serialize.SerializationException;
 
-import java.lang.invoke.TypeDescriptor;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public class TypeCosmetic extends Type {
 
+    public TypeCosmetic(String id) {
+        super(id);
+    }
+
     public TypeCosmetic() {
         super("cosmetic");
     }
 
     @Override
-    public void run(CosmeticUser user, @NotNull ConfigurationNode config, ClickType clickType) {
-        if (config.node("cosmetic").virtual()) return;
+    public void run(Player viewer, CosmeticHolder cosmeticHolder, ConfigurationNode config, ClickType clickType) {
+        MessagesUtil.sendDebugMessages("Running Cosmetic Click Type");
+        if (config.node("cosmetic").virtual()) {
+            MessagesUtil.sendDebugMessages("Cosmetic Config Field Virtual");
+            return;
+        }
         String cosmeticName = config.node("cosmetic").getString();
         Cosmetic cosmetic = Cosmetics.getCosmetic(cosmeticName);
-        Player player = user.getPlayer();
         if (cosmetic == null) {
-            MessagesUtil.sendMessage(player, "invalid-cosmetic");
+            MessagesUtil.sendDebugMessages("No Cosmetic Found");
+            MessagesUtil.sendMessage(viewer, "invalid-cosmetic");
             return;
         }
 
-        if (!user.canEquipCosmetic(cosmetic)) {
-            MessagesUtil.sendMessage(player, "no-cosmetic-permission");
+        if (!cosmeticHolder.canEquipCosmetic(cosmetic)) {
+            MessagesUtil.sendDebugMessages("No Cosmetic Permission");
+            MessagesUtil.sendMessage(viewer, "no-cosmetic-permission");
             return;
         }
 
+        boolean isUnEquippingCosmetic = false;
+        if (cosmeticHolder.getCosmetic(cosmetic.getSlot()) == cosmetic) isUnEquippingCosmetic = true;
+
+        String dyeClick = Settings.getCosmeticDyeClickType();
+        String requiredClick;
+        if (isUnEquippingCosmetic) requiredClick = Settings.getCosmeticUnEquipClickType();
+        else requiredClick = Settings.getCosmeticEquipClickType();
+
+        MessagesUtil.sendDebugMessages("Required click type: " + requiredClick);
+        MessagesUtil.sendDebugMessages("Click type: " + clickType.name());
+
+        final boolean isRequiredClick = requiredClick.equalsIgnoreCase("ANY") || requiredClick.equalsIgnoreCase(clickType.name());
+        final boolean isDyeClick = dyeClick.equalsIgnoreCase("ANY") || dyeClick.equalsIgnoreCase(clickType.name());
+
+        if (!isRequiredClick) isUnEquippingCosmetic = false;
+
         List<String> actionStrings = new ArrayList<>();
         ConfigurationNode actionConfig = config.node("actions");
 
+        MessagesUtil.sendDebugMessages("Running Actions");
+
         try {
             if (!actionConfig.node("any").virtual()) actionStrings.addAll(actionConfig.node("any").getList(String.class));
 
@@ -65,41 +88,61 @@ public class TypeCosmetic extends Type {
                 if (clickType.isRightClick()) {
                     if (!actionConfig.node("right-click").virtual()) actionStrings.addAll(actionConfig.node("right-click").getList(String.class));
                 }
-            }
-
-            if (user.getCosmetic(cosmetic.getSlot()) == cosmetic) {
-                if (!actionConfig.node("on-unequip").virtual()) actionStrings.addAll(actionConfig.node("on-unequip").getList(String.class));
-                MessagesUtil.sendDebugMessages("on-unequip");
-                user.removeCosmeticSlot(cosmetic);
-            } else {
-                if (!actionConfig.node("on-equip").virtual()) actionStrings.addAll(actionConfig.node("on-equip").getList(String.class));
-                MessagesUtil.sendDebugMessages("on-equip");
-                // TODO: Redo this
-                if (cosmetic.isDyable() && Hooks.isActiveHook("HMCColor")) {
-                    DyeMenu.openMenu(user, cosmetic);
-                } else {
-                    user.addPlayerCosmetic(cosmetic);
+                if (clickType.equals(ClickType.SHIFT_LEFT)) {
+                    if (!actionConfig.node("shift-left-click").virtual()) actionStrings.addAll(actionConfig.node("shift-left-click").getList(String.class));
+                }
+                if (clickType.equals(ClickType.SHIFT_RIGHT)) {
+                    if (!actionConfig.node("shift-right-click").virtual()) actionStrings.addAll(actionConfig.node("shift-right-click").getList(String.class));
                 }
             }
 
-            Actions.runActions(user, actionStrings);
+            if (isUnEquippingCosmetic) {
+                if (!actionConfig.node("on-unequip").virtual()) actionStrings.addAll(actionConfig.node("on-unequip").getList(String.class));
+                MessagesUtil.sendDebugMessages("on-unequip");
+                cosmeticHolder.removeCosmeticSlot(cosmetic);
+            } else {
+                if (!actionConfig.node("on-equip").virtual()) actionStrings.addAll(actionConfig.node("on-equip").getList(String.class));
+                MessagesUtil.sendDebugMessages("on-equip");
+                MessagesUtil.sendDebugMessages("Preparing for on-equip with the following checks:");
+                MessagesUtil.sendDebugMessages("CosmeticDyeable? " + cosmetic.isDyeable() + " / isDyeClick? " + isDyeClick + " / isHMCColorActive? " + Hooks.isActiveHook("HMCColor"));
+                // TODO: Redo this
+                if (cosmetic.isDyeable() && isDyeClick && DyeMenuProvider.hasMenuProvider()) {
+                    DyeMenuProvider.openMenu(viewer, cosmeticHolder, cosmetic);
+                } else if (isRequiredClick) {
+                    cosmeticHolder.addCosmetic(cosmetic);
+                }
+            }
+
+            Actions.runActions(viewer, cosmeticHolder, actionStrings);
 
         } catch (SerializationException e) {
-            throw new RuntimeException(e);
+            e.printStackTrace();
         }
         // Fixes issue with offhand cosmetics not appearing. Yes, I know this is dumb
-        Runnable run = () -> user.updateCosmetic(cosmetic.getSlot());
+        Runnable run = () -> cosmeticHolder.updateCosmetic(cosmetic.getSlot());
         if (cosmetic instanceof CosmeticArmorType) {
             if (((CosmeticArmorType) cosmetic).getEquipSlot().equals(EquipmentSlot.OFF_HAND)) {
                 Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), run, 1);
             }
         }
         run.run();
+        MessagesUtil.sendDebugMessages("Finished Type Click Run");
     }
 
     @Override
-    public ItemStack setItem(CosmeticUser user, @NotNull ConfigurationNode config, ItemStack itemStack, int slot) {
-        itemStack.setItemMeta(processLoreLines(user, itemStack.getItemMeta()));
+    public void run(CosmeticUser user, @NotNull ConfigurationNode config, ClickType clickType) {
+        run(user.getPlayer(), user, config, clickType);
+    }
+
+    @Override
+    public ItemStack setItem(CosmeticUser user, ConfigurationNode config, ItemStack itemStack, int slot) {
+        return setItem(user.getPlayer(), user, config, itemStack, slot);
+    }
+
+    @Override
+    public ItemStack setItem(@NotNull Player viewer, @NotNull CosmeticHolder cosmeticHolder, @NotNull ConfigurationNode config, @NotNull ItemStack itemStack, int slot) {
+        if (itemStack.hasItemMeta()) itemStack.setItemMeta(processItemMeta(viewer, itemStack.getItemMeta()));
+        else MessagesUtil.sendDebugMessages("ItemStack has no ItemMeta?");
 
         if (config.node("cosmetic").virtual()) {
             return itemStack;
@@ -110,9 +153,9 @@ public class TypeCosmetic extends Type {
             return itemStack;
         }
 
-        if (user.hasCosmeticInSlot(cosmetic) && !config.node("equipped-item").virtual()) {
+        if (cosmeticHolder.hasCosmeticInSlot(cosmetic) && (!config.node("equipped-item").virtual() || !config.node("locked-equipped-item").virtual())) {
             MessagesUtil.sendDebugMessages("GUI Equipped Item");
-            ConfigurationNode equippedItem = config.node("equipped-item");
+            ConfigurationNode equippedItem = config.node(cosmeticHolder.canEquipCosmetic(cosmetic, true) && !config.node("equipped-item").virtual() ? "equipped-item" : "locked-equipped-item");
             try {
                 if (equippedItem.node("material").virtual()) equippedItem.node("material").set(config.node("item", "material").getString());
             } catch (SerializationException e) {
@@ -123,11 +166,12 @@ public class TypeCosmetic extends Type {
             } catch (SerializationException e) {
                 throw new RuntimeException(e);
             }
-            itemStack.setItemMeta(processLoreLines(user, itemStack.getItemMeta()));
+            if (itemStack.hasItemMeta()) itemStack.setItemMeta(processItemMeta(viewer, itemStack.getItemMeta()));
+            else MessagesUtil.sendDebugMessages("ItemStack has no ItemMeta in equipped item?");
             return itemStack;
         }
 
-        if (!user.canEquipCosmetic(cosmetic) && !config.node("locked-item").virtual()) {
+        if (!cosmeticHolder.canEquipCosmetic(cosmetic, true) && !config.node("locked-item").virtual()) {
             MessagesUtil.sendDebugMessages("GUI Locked Item");
             ConfigurationNode lockedItem = config.node("locked-item");
             try {
@@ -140,25 +184,10 @@ public class TypeCosmetic extends Type {
             } catch (SerializationException e) {
                 throw new RuntimeException(e);
             }
-            itemStack.setItemMeta(processLoreLines(user, itemStack.getItemMeta()));
+            if (itemStack.hasItemMeta()) itemStack.setItemMeta(processItemMeta(viewer, itemStack.getItemMeta()));
+            else MessagesUtil.sendDebugMessages("ItemStack has no ItemMeta in locked item?");
             return itemStack;
         }
         return itemStack;
     }
-
-    @Contract("_, _ -> param2")
-    @NotNull
-    @SuppressWarnings("Duplicates")
-    private ItemMeta processLoreLines(CosmeticUser user, @NotNull ItemMeta itemMeta) {
-        List<String> processedLore = new ArrayList<>();
-
-        if (itemMeta.hasLore()) {
-            for (String loreLine : itemMeta.getLore()) {
-                if (Hooks.isActiveHook("PlaceholderAPI")) loreLine = PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine);
-                processedLore.add(loreLine);
-            }
-        }
-        itemMeta.setLore(processedLore);
-        return itemMeta;
-    }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeEmpty.java

@@ -1,16 +1,16 @@
 package com.hibiscusmc.hmccosmetics.gui.type.types;
 
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticHolder;
 import com.hibiscusmc.hmccosmetics.gui.action.Actions;
 import com.hibiscusmc.hmccosmetics.gui.type.Type;
-import com.hibiscusmc.hmccosmetics.hooks.Hooks;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
-import me.clip.placeholderapi.PlaceholderAPI;
+import me.lojosho.shaded.configurate.ConfigurationNode;
+import me.lojosho.shaded.configurate.serialize.SerializationException;
+import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
-import org.spongepowered.configurate.ConfigurationNode;
-import org.spongepowered.configurate.serialize.SerializationException;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,9 +23,10 @@ public class TypeEmpty extends Type {
         // This is an empty type, meaning, when a menu item has a type of "empty" it will run the code in the method run.
     }
 
-    // This is the code that's run when the item is clicked.
+    // This is the code that's run when the item is clicked. The item is clicked by the "viewer" player in a menu for the
+    // given "cosmeticHolder". They're the same player by default, but it's not guaranteed.
     @Override
-    public void run(CosmeticUser user, @NotNull ConfigurationNode config, ClickType clickType) {
+    public void run(Player viewer, CosmeticHolder cosmeticHolder, @NotNull ConfigurationNode config, ClickType clickType) {
         List<String> actionStrings = new ArrayList<>(); // List where we keep the actions the server will execute.
         ConfigurationNode actionConfig = config.node("actions"); // Configuration node that actions are under.
 
@@ -43,29 +44,41 @@ public class TypeEmpty extends Type {
                 if (clickType.isRightClick()) {
                     if (!actionConfig.node("right-click").virtual()) actionStrings.addAll(actionConfig.node("right-click").getList(String.class));
                 }
+                if (clickType.equals(ClickType.SHIFT_LEFT)) {
+                    if (!actionConfig.node("shift-left-click").virtual()) actionStrings.addAll(actionConfig.node("shift-left-click").getList(String.class));
+                }
+                if (clickType.equals(ClickType.SHIFT_RIGHT)) {
+                    if (!actionConfig.node("shift-right-click").virtual()) actionStrings.addAll(actionConfig.node("shift-right-click").getList(String.class));
+                }
             }
 
             // We run the actions once we got the raw strings from the config.
-            Actions.runActions(user, actionStrings);
+            Actions.runActions(viewer, cosmeticHolder, actionStrings);
         } catch (SerializationException e) {
             throw new RuntimeException(e);
         }
     }
 
+    // backward-compatibility method, will not be required in the future
+    @Override
+    public void run(CosmeticUser user, ConfigurationNode config, ClickType clickType) {
+        final var player = user.getPlayer();
+        if (player == null) return;
+        run(player, user, config, clickType);
+    }
+
+    // backward-compatibility method, will not be required in the future
+    @Override
+    public ItemStack setItem(CosmeticUser user, ConfigurationNode config, ItemStack itemStack, int slot) {
+        return setItem(user.getPlayer(), user, config, itemStack, slot);
+    }
+
     @Override
     @SuppressWarnings("Duplicates")
-    public ItemStack setItem(CosmeticUser user, ConfigurationNode config, @NotNull ItemStack itemStack, int slot) {
-        List<String> processedLore = new ArrayList<>();
+    public ItemStack setItem(Player viewer, CosmeticHolder cosmeticHolder, ConfigurationNode config, @NotNull ItemStack itemStack, int slot) {
         ItemMeta itemMeta = itemStack.getItemMeta();
 
-        if (itemMeta.hasLore()) {
-            for (String loreLine : itemMeta.getLore()) {
-                if (Hooks.isActiveHook("PlaceholderAPI"))
-                    loreLine = PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine);
-                processedLore.add(loreLine);
-            }
-        }
-        itemStack.setItemMeta(itemMeta);
+        itemStack.setItemMeta(processItemMeta(viewer, itemMeta));
         return itemStack;
     }
 

common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/Hook.java

@@ -1,93 +0,0 @@
-package com.hibiscusmc.hmccosmetics.hooks;
-
-import org.bukkit.event.Listener;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Represents a hook into other minecraft plugins
- */
-public abstract class Hook implements Listener {
-    private final String id;
-    private boolean active = false;
-    private boolean itemHook = false;
-
-    public Hook(@NotNull String id) {
-        this.id = id;
-        Hooks.addHook(this);
-    }
-
-    /**
-     * Loads this hook
-     *
-     * @implNote By default, this method does nothing. It should be overridden by child classes to implement any necessary loading logic
-     */
-    public void load() { }
-
-    /**
-     * Gets an {@link ItemStack} that is associated with the provided id from the hooked plugin
-     * @param itemId The id of the {@link ItemStack}
-     * @return The {@link ItemStack} with the id provided. If an invalid id was provided or if the hook doesn't have any related {@link ItemStack}s then this will return null
-     * @implNote By default, this method returns null. It should be overridden by child classes if you will to have your hook return a related {@link ItemStack}
-     */
-    @Nullable
-    public ItemStack getItem(@NotNull String itemId) {
-        return null;
-    }
-
-    /**
-     * Gets the id of this hook
-     *
-     * @return The unique id for this hook
-     */
-    @NotNull
-    public final String getId() {
-        return id;
-    }
-
-    /**
-     * Gets whether this hook has been activated
-     * @return true if this hook is active, false otherwise
-     * @deprecated As of release 2.2.5+, replaced by {@link #isActive()}
-     */
-    @Deprecated
-    public boolean getActive() {
-        return this.active;
-    }
-
-    /**
-     * Gets whether this hook has been activated
-     * @return true if this hook is active, false otherwise
-     * @since 2.2.5
-     */
-    public final boolean isActive() {
-        return this.active;
-    }
-
-    /**
-     * Sets whether this hook is active
-     * @param active true to activate the hook, false otherwise
-     */
-    public final void setActive(boolean active) {
-        this.active = active;
-    }
-
-    /**
-     * Whether the method {@link #getItem(String)} should return a non-null value
-     * @return true if {@link #getItem(String)} should return a non-null value, false otherwise
-     *
-     * @apiNote Even though this method returns true does not mean that {@link #getItem(String)} won't return null, rather if this returns false then {@link #getItem(String)} should return false everytime
-     */
-    public final boolean hasEnabledItemHook() {
-        return itemHook;
-    }
-
-    /**
-     * Sets whether the method {@link #getItem(String)} should return a non-null value
-     * @param enabled true if {@link #getItem(String)} should return a non-null value, false otherwise
-     */
-    public final void setEnabledItemHook(boolean enabled) {
-        itemHook = enabled;
-    }
-}

common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/Hooks.java

@@ -1,78 +0,0 @@
-package com.hibiscusmc.hmccosmetics.hooks;
-
-import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
-import com.hibiscusmc.hmccosmetics.hooks.items.*;
-import com.hibiscusmc.hmccosmetics.hooks.misc.*;
-import com.hibiscusmc.hmccosmetics.hooks.placeholders.HookPlaceholderAPI;
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.HashMap;
-
-public class Hooks {
-
-    private static final HashMap<String, Hook> hooks = new HashMap<>();
-    private static HookOraxen ORAXEN_HOOK = new HookOraxen();
-    private static HookItemAdder ITEMADDER_HOOK = new HookItemAdder();
-    private static HookGeary GEARY_HOOK = new HookGeary();
-    private static HookMythic MYTHIC_HOOK = new HookMythic();
-    private static HookDenizen DENIZEN_HOOK = new HookDenizen();
-    private static HookHMCCosmetics HMCCOSMETIC_HOOK = new HookHMCCosmetics();
-    private static HookPlaceholderAPI PAPI_HOOK = new HookPlaceholderAPI();
-    private static HookPremiumVanish PREMIUM_VANISH_HOOK = new HookPremiumVanish();
-    private static HookSuperVanish SUPER_VANISH_HOOK = new HookSuperVanish();
-    private static HookHMCColor HMC_COLOR_HOOK = new HookHMCColor();
-    private static HookCMI CMI_HOOK = new HookCMI();
-    private static HookLibsDisguises LIBS_DISGUISES_HOOK = new HookLibsDisguises();
-
-    public static Hook getHook(@NotNull String id) {
-        return hooks.get(id.toLowerCase());
-    }
-
-    public static boolean isItemHook(@NotNull String id) {
-        return hooks.containsKey(id.toLowerCase());
-    }
-
-    public static void addHook(Hook hook) {
-        hooks.put(hook.getId().toLowerCase(), hook);
-    }
-
-    public static void setup() {
-        for (Hook hook : hooks.values()) {
-            if (Bukkit.getPluginManager().getPlugin(hook.getId()) != null) {
-                HMCCosmeticsPlugin.getInstance().getServer().getPluginManager().registerEvents(hook, HMCCosmeticsPlugin.getInstance());
-                hook.setActive(true);
-                hook.load();
-                HMCCosmeticsPlugin.getInstance().getLogger().info("Successfully hooked into " + hook.getId());
-            }
-        }
-    }
-
-    @Nullable
-    public static ItemStack getItem(@NotNull String raw) {
-        if (!raw.contains(":")) {
-            Material mat = Material.getMaterial(raw.toUpperCase());
-            if (mat == null) return null;
-            return new ItemStack(mat);
-        }
-        // Ex. Oraxen:BigSword
-        // split[0] is the plugin name
-        // split[1] is the item name
-        String[] split = raw.split(":", 2);
-
-        if (!isItemHook(split[0])) return null;
-        Hook hook = getHook(split[0]);
-        if (!hook.hasEnabledItemHook()) return null;
-        if (!hook.isActive()) return null;
-        return hook.getItem(split[1]);
-    }
-
-    public static boolean isActiveHook(String id) {
-        Hook hook = getHook(id);
-        if (hook == null) return false;
-        return hook.isActive();
-    }
-}

common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookDenizen.java

@@ -1,27 +0,0 @@
-package com.hibiscusmc.hmccosmetics.hooks.items;
-
-import com.denizenscript.denizen.objects.ItemTag;
-import com.denizenscript.denizencore.utilities.CoreUtilities;
-import com.hibiscusmc.hmccosmetics.hooks.Hook;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * A hook that integrates the plugin {@link com.denizenscript.denizen.Denizen Denizen} to provide custom items
- */
-@SuppressWarnings("SpellCheckingInspection")
-public class HookDenizen extends Hook {
-    public HookDenizen() {
-        super("denizen");
-        setEnabledItemHook(true);
-    }
-
-    /**
-     * Gets a cosmetic {@link ItemStack} that is associated with the provided id from the plugin {@link com.denizenscript.denizen.Denizen Denizen}
-     */
-    @Override
-    public ItemStack getItem(@NotNull String itemId) {
-        ItemTag item = ItemTag.valueOf(itemId, CoreUtilities.noDebugContext);
-        return item == null ? null : item.getItemStack();
-    }
-}

common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookGeary.java

@@ -1,45 +0,0 @@
-package com.hibiscusmc.hmccosmetics.hooks.items;
-
-import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
-import com.hibiscusmc.hmccosmetics.hooks.Hook;
-import com.mineinabyss.geary.addons.GearyPhase;
-import com.mineinabyss.geary.modules.GearyModuleKt;
-import com.mineinabyss.geary.papermc.tracking.items.ItemTrackingKt;
-import com.mineinabyss.geary.prefabs.PrefabKey;
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * A hook that integrates the plugin {@link com.mineinabyss.geary.papermc.GearyPlugin Geary} to provide custom items
- */
-@SuppressWarnings("SpellCheckingInspection")
-public class HookGeary extends Hook {
-    private boolean enabled = false;
-
-    public HookGeary() {
-        super("geary");
-        setEnabledItemHook(true);
-    }
-
-    @Override
-    public void load() {
-        GearyModuleKt.getGeary().getPipeline().intercept(GearyPhase.ENABLE, () -> {
-            enabled = true;
-            HMCCosmeticsPlugin.setup();
-            return null;
-        });
-    }
-
-    /**
-     * Gets a cosmetic {@link ItemStack} that is associated with the provided id from the plugin {@link com.mineinabyss.geary.papermc.GearyPlugin Geary}
-     */
-    @Override
-    public ItemStack getItem(@NotNull String itemId) {
-        if (enabled) {
-            PrefabKey prefabKey = PrefabKey.Companion.ofOrNull(itemId);
-            if (prefabKey == null) return null;
-            return ItemTrackingKt.getGearyItems().createItem(prefabKey, null);
-        } else return new ItemStack(Material.AIR);
-    }
-}

common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookHMCCosmetics.java

@@ -2,7 +2,8 @@ package com.hibiscusmc.hmccosmetics.hooks.items;
 
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
-import com.hibiscusmc.hmccosmetics.hooks.Hook;
+import me.lojosho.hibiscuscommons.hooks.Hook;
+import me.lojosho.hibiscuscommons.hooks.HookFlag;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
@@ -11,8 +12,8 @@ import org.jetbrains.annotations.NotNull;
  */
 public class HookHMCCosmetics extends Hook {
     public HookHMCCosmetics() {
-        super("HMCCosmetics");
-        setEnabledItemHook(true);
+        super("HMCCosmetics", HookFlag.ITEM_SUPPORT);
+        setActive(true);
     }
 
     /**
@@ -24,5 +25,4 @@ public class HookHMCCosmetics extends Hook {
         if (cosmetic == null) return null;
         return cosmetic.getItem();
     }
-}
-
+}

common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookItemAdder.java

@@ -1,46 +0,0 @@
-package com.hibiscusmc.hmccosmetics.hooks.items;
-
-import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
-import com.hibiscusmc.hmccosmetics.config.Settings;
-import com.hibiscusmc.hmccosmetics.hooks.Hook;
-import dev.lone.itemsadder.api.CustomStack;
-import dev.lone.itemsadder.api.Events.ItemsAdderLoadDataEvent;
-import org.bukkit.Material;
-import org.bukkit.event.EventHandler;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * A hook that integrates the plugin {@link dev.lone.itemsadder.api.ItemsAdder ItemsAdder} to provide custom items
- */
-@SuppressWarnings("SpellCheckingInspection")
-public class HookItemAdder extends Hook {
-    private boolean enabled = false;
-
-    public HookItemAdder() {
-        super("itemsadder");
-        setEnabledItemHook(true);
-    }
-
-    /**
-     * Gets a cosmetic {@link ItemStack} that is associated with the provided id from the plugin {@link dev.lone.itemsadder.api.ItemsAdder ItemsAdder}
-     */
-    @Override
-    public ItemStack getItem(@NotNull String itemId) {
-        if (enabled) {
-            CustomStack stack = CustomStack.getInstance(itemId);
-            if (stack == null) return null;
-            return stack.getItemStack();
-        } else {
-            return new ItemStack(Material.AIR);
-        }
-    }
-
-    @EventHandler
-    public void onItemAdderDataLoad(ItemsAdderLoadDataEvent event) {
-        // By default, it will only run once at startup, if hook setting is enabled
-        if (enabled && !Settings.getItemsAdderReloadChange()) return;
-        this.enabled = true;
-        HMCCosmeticsPlugin.setup();
-    }
-}

common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookMythic.java

@@ -1,25 +0,0 @@
-package com.hibiscusmc.hmccosmetics.hooks.items;
-
-import com.hibiscusmc.hmccosmetics.hooks.Hook;
-import io.lumine.mythic.bukkit.MythicBukkit;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * A hook that integrates the plugin {@link io.lumine.mythic.bukkit.MythicBukkit MythicBukkit} to provide custom items
- */
-@SuppressWarnings("SpellCheckingInspection")
-public class HookMythic extends Hook {
-    public HookMythic() {
-        super("mythicmobs");
-        setEnabledItemHook(true);
-    }
-
-    /**
-     * Gets a cosmetic {@link ItemStack} that is associated with the provided id from the plugin {@link io.lumine.mythic.bukkit.MythicBukkit MythicBukkit}
-     */
-    @Override
-    public ItemStack getItem(@NotNull String itemId) {
-        return MythicBukkit.inst().getItemManager().getItemStack(itemId);
-    }
-}

common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookOraxen.java

@@ -1,28 +0,0 @@
-package com.hibiscusmc.hmccosmetics.hooks.items;
-
-import com.hibiscusmc.hmccosmetics.hooks.Hook;
-import io.th0rgal.oraxen.api.OraxenItems;
-import io.th0rgal.oraxen.items.ItemBuilder;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * A hook that integrates the plugin {@link io.th0rgal.oraxen.OraxenPlugin OraxenPlugin} to provide custom items
- */
-@SuppressWarnings("SpellCheckingInspection")
-public class HookOraxen extends Hook {
-    public HookOraxen() {
-        super("oraxen");
-        setEnabledItemHook(true);
-    }
-
-    /**
-     * Gets a cosmetic {@link ItemStack} that is associated with the provided id from the plugin {@link io.th0rgal.oraxen.OraxenPlugin OraxenPlugin}
-     */
-    @Override
-    public ItemStack getItem(@NotNull String itemId) {
-        ItemBuilder builder = OraxenItems.getItemById(itemId);
-        if (builder == null) return null;
-        return builder.build();
-    }
-}

common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookBetterHud.java

@@ -0,0 +1,39 @@
+package com.hibiscusmc.hmccosmetics.hooks.misc;
+
+import com.hibiscusmc.hmccosmetics.api.events.PlayerWardrobeEnterEvent;
+import com.hibiscusmc.hmccosmetics.api.events.PlayerWardrobeLeaveEvent;
+import com.hibiscusmc.hmccosmetics.config.Settings;
+import kr.toxicity.hud.api.BetterHud;
+import kr.toxicity.hud.api.player.HudPlayer;
+import me.lojosho.hibiscuscommons.hooks.Hook;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+public class HookBetterHud extends Hook {
+
+    public HookBetterHud() {
+        super("BetterHUD");
+        setActive(true);
+    }
+
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
+    public void onPlayerEnterWardrobe(@NotNull PlayerWardrobeEnterEvent event) {
+        if (!Settings.isWardrobeHideHud()) return;
+        UUID uuid = event.getUniqueId();
+        HudPlayer hudPlayer = BetterHud.getInstance().getPlayerManager().getHudPlayer(uuid);
+        if (hudPlayer == null) return;
+        hudPlayer.setHudEnabled(false);
+    }
+
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
+    public void onPlayerLeaveWardrobe(@NotNull PlayerWardrobeLeaveEvent event) {
+        if (!Settings.isWardrobeHideHud()) return;
+        UUID uuid = event.getUniqueId();
+        HudPlayer hudPlayer = BetterHud.getInstance().getPlayerManager().getHudPlayer(uuid);
+        if (hudPlayer == null) return;
+        hudPlayer.setHudEnabled(true);
+    }
+}

common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookCMI.java

@@ -1,35 +0,0 @@
-package com.hibiscusmc.hmccosmetics.hooks.misc;
-
-import com.Zrips.CMI.events.CMIPlayerUnVanishEvent;
-import com.Zrips.CMI.events.CMIPlayerVanishEvent;
-import com.hibiscusmc.hmccosmetics.hooks.Hook;
-import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
-import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * A hook that integrates the plugin {@link com.Zrips.CMI.CMI CMI}
- */
-public class HookCMI extends Hook {
-    public HookCMI() {
-        super("CMI");
-    }
-
-    @EventHandler
-    public void onPlayerVanish(@NotNull CMIPlayerVanishEvent event) {
-        Player player = event.getPlayer();
-        CosmeticUser user = CosmeticUsers.getUser(player);
-        if (user == null) return;
-        user.hideCosmetics(CosmeticUser.HiddenReason.PLUGIN);
-    }
-
-    @EventHandler
-    public void onPlayerShow(@NotNull CMIPlayerUnVanishEvent event) {
-        Player player = event.getPlayer();
-        CosmeticUser user = CosmeticUsers.getUser(player);
-        if (user == null) return;
-        user.showCosmetics();
-    }
-}

common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookHMCColor.java

@@ -1,12 +0,0 @@
-package com.hibiscusmc.hmccosmetics.hooks.misc;
-
-import com.hibiscusmc.hmccosmetics.hooks.Hook;
-
-/**
- * A hook that integrates the plugin {@link com.hibiscusmc.hmccolor.HMCColor HMCColor}
- */
-public class HookHMCColor extends Hook {
-    public HookHMCColor() {
-        super("HMCColor");
-    }
-}

common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookLibsDisguises.java

@@ -1,32 +0,0 @@
-package com.hibiscusmc.hmccosmetics.hooks.misc;
-
-import com.hibiscusmc.hmccosmetics.hooks.Hook;
-import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
-import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
-import me.libraryaddict.disguise.events.DisguiseEvent;
-import me.libraryaddict.disguise.events.UndisguiseEvent;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.jetbrains.annotations.NotNull;
-
-public class HookLibsDisguises extends Hook {
-    public HookLibsDisguises() {
-        super("LibsDisguises");
-    }
-
-    @EventHandler
-    public void onPlayerVanish(@NotNull DisguiseEvent event) {
-        if (!(event.getEntity() instanceof Player player)) return;
-        CosmeticUser user = CosmeticUsers.getUser(player);
-        if (user == null) return;
-        user.hideCosmetics(CosmeticUser.HiddenReason.PLUGIN);
-    }
-
-    @EventHandler
-    public void onPlayerShow(@NotNull UndisguiseEvent event) {
-        if (!(event.getEntity() instanceof Player player)) return;
-        CosmeticUser user = CosmeticUsers.getUser(player);
-        if (user == null) return;
-        user.showCosmetics();
-    }
-}

common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookPremiumVanish.java

@@ -1,37 +0,0 @@
-package com.hibiscusmc.hmccosmetics.hooks.misc;
-
-import com.hibiscusmc.hmccosmetics.hooks.Hook;
-import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
-import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
-import de.myzelyam.api.vanish.PlayerHideEvent;
-import de.myzelyam.api.vanish.PlayerShowEvent;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * A hook that integrates the plugin {@link de.myzelyam.api.vanish.VanishAPI Supervanish}
- *
- * @implSpec Supervanish and Premium Vanish both use the same api
- */
-public class HookPremiumVanish extends Hook {
-    public HookPremiumVanish() {
-        super("PremiumVanish");
-    }
-
-    @EventHandler
-    public void onPlayerVanish(@NotNull PlayerHideEvent event) {
-        Player player = event.getPlayer();
-        CosmeticUser user = CosmeticUsers.getUser(player);
-        if (user == null) return;
-        user.hideCosmetics(CosmeticUser.HiddenReason.PLUGIN);
-    }
-
-    @EventHandler
-    public void onPlayerShow(@NotNull PlayerShowEvent event) {
-        Player player = event.getPlayer();
-        CosmeticUser user = CosmeticUsers.getUser(player);
-        if (user == null) return;
-        user.showCosmetics();
-    }
-}

common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookSuperVanish.java

@@ -1,37 +0,0 @@
-package com.hibiscusmc.hmccosmetics.hooks.misc;
-
-import com.hibiscusmc.hmccosmetics.hooks.Hook;
-import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
-import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
-import de.myzelyam.api.vanish.PlayerHideEvent;
-import de.myzelyam.api.vanish.PlayerShowEvent;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * A hook that integrates the plugin {@link de.myzelyam.api.vanish.VanishAPI Supervanish}
- *
- * @implSpec Supervanish and Premium Vanish both use the same api
- */
-public class HookSuperVanish extends Hook {
-    public HookSuperVanish() {
-        super("SuperVanish");
-    }
-
-    @EventHandler
-    public void onPlayerVanish(@NotNull PlayerHideEvent event) {
-        Player player = event.getPlayer();
-        CosmeticUser user = CosmeticUsers.getUser(player);
-        if (user == null) return;
-        user.hideCosmetics(CosmeticUser.HiddenReason.PLUGIN);
-    }
-
-    @EventHandler
-    public void onPlayerShow(@NotNull PlayerShowEvent event) {
-        Player player = event.getPlayer();
-        CosmeticUser user = CosmeticUsers.getUser(player);
-        if (user == null) return;
-        user.showCosmetics();
-    }
-}

common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/placeholders/HMCPlaceholderExpansion.java

@@ -9,7 +9,6 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.hibiscusmc.hmccosmetics.util.TranslationUtil;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import org.apache.commons.lang3.EnumUtils;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
@@ -54,18 +53,15 @@ public class HMCPlaceholderExpansion extends PlaceholderExpansion {
 
     @Override
     public String onRequest(@NotNull OfflinePlayer player, @NotNull String params) {
-        if (!player.isOnline()) return null;
+        if (!player.isOnline()) return TranslationUtil.getTranslation("user-cosmetic", "offline");
         CosmeticUser user = CosmeticUsers.getUser(player.getPlayer());
-        if (user == null) return null;
+        if (user == null) return TranslationUtil.getTranslation("user-cosmetic", "invalid-user");
 
         List<String> placeholderArgs = Arrays.asList(params.split("_", 3));
 
         switch (placeholderArgs.get(0).toLowerCase()) {
             case "using":
-                if (placeholderArgs == null) {
-                    return null;
-                }
-                if (placeholderArgs.get(1) != null) {
+                if (placeholderArgs.size() >= 2) {
                     Cosmetic cosmetic = Cosmetics.getCosmetic(placeholderArgs.get(1));
                     if (cosmetic == null) return "INVALID_COSMETIC";
                     Cosmetic currentCosmetic = user.getCosmetic(cosmetic.getSlot());
@@ -74,43 +70,29 @@ public class HMCPlaceholderExpansion extends PlaceholderExpansion {
                     return TranslationUtil.getTranslation("using-cosmetic", String.valueOf(false));
                 }
             case "current":
-                if (placeholderArgs == null) {
-                    return null;
-                }
-                if (placeholderArgs.get(1) != null) {
+                if (placeholderArgs.size() >= 2) {
                     CosmeticSlot slot = CosmeticSlot.valueOf(placeholderArgs.get(1).toUpperCase());
                     if (slot == null) return null;
-                    if (user.getCosmetic(slot) == null) return null;
+                    Cosmetic cosmetic = user.getCosmetic(slot);
+                    if (cosmetic == null) return TranslationUtil.getTranslation("current-cosmetic", "no-cosmetic");
                     if (placeholderArgs.size() == 2) return user.getCosmetic(slot).getId();
 
                     String output;
                     switch (placeholderArgs.get(2).toLowerCase()) {
-                        case "material" -> {
-                            output = getMaterialName(user.getCosmetic(slot));
-                        }
-                        case "custommodeldata" -> {
-                            output = getModelData(user.getCosmetic(slot));
-                        }
-                        case "name" -> {
-                            output = getItemName(user.getCosmetic(slot));
-                        }
-                        case "lore" -> {
-                            output = getItemLore(user.getCosmetic(slot));
-                        }
-                        case "permission" -> {
-                            output = user.getCosmetic(slot).getPermission();
-                        }
-                        default -> {
-                            output = user.getCosmetic(slot).getId();
-                        }
+                        case "material" -> output = getMaterialName(cosmetic);
+                        case "custommodeldata" -> output = getModelData(cosmetic);
+                        case "itemmodel" -> output = getItemModel(cosmetic);
+                        case "itemname" -> output = getItemName(cosmetic);
+                        case "name" -> output = getDisplayName(cosmetic);
+                        case "lore" -> output = getItemLore(cosmetic);
+                        case "permission" -> output = user.getCosmetic(slot).getPermission();
+                        default -> output = user.getCosmetic(slot).getId();
                     }
-                    return TranslationUtil.getTranslation("current-cosmetic", String.valueOf(output));
+                    if (output == null) output = "none";
+                    return TranslationUtil.getTranslation("current-cosmetic", output);
                 }
             case "unlocked":
-                if (placeholderArgs == null) {
-                    return null;
-                }
-                if (placeholderArgs.get(1) != null) {
+                if (placeholderArgs.size() >= 2) {
                     Cosmetic cosmetic = Cosmetics.getCosmetic(placeholderArgs.get(1));
                     if (cosmetic == null) {
                         if (placeholderArgs.size() >= 3) {
@@ -124,16 +106,14 @@ public class HMCPlaceholderExpansion extends PlaceholderExpansion {
                             return "INVALID_COSMETIC";
                         }
                     }
-                    return TranslationUtil.getTranslation("unlocked-cosmetic", String.valueOf(user.canEquipCosmetic(cosmetic)));
+                    return TranslationUtil.getTranslation("unlocked-cosmetic", String.valueOf(user.canEquipCosmetic(cosmetic, true)));
                 }
             case "equipped":
-                if (placeholderArgs == null) {
-                    return null;
-                }
-                if (placeholderArgs.get(1) != null) {
+                if (placeholderArgs.size() >= 2) {
                     String args1 = placeholderArgs.get(1);
 
-                    if (EnumUtils.isValidEnum(CosmeticSlot.class, args1.toUpperCase())) {
+                    String rawSlot = args1.toUpperCase();
+                    if (CosmeticSlot.contains(rawSlot)) {
                         return TranslationUtil.getTranslation("equipped-cosmetic", String.valueOf(user.getCosmetic(CosmeticSlot.valueOf(args1.toUpperCase())) != null));
                     }
 
@@ -152,9 +132,34 @@ public class HMCPlaceholderExpansion extends PlaceholderExpansion {
                             return "INVALID_COSMETIC";
                         }
                     }
-                    if (user.getCosmetic(cosmetic.getSlot()) == null) return "false";
-                    return TranslationUtil.getTranslation("equipped-cosmetic", String.valueOf(cosmetic.getId() == user.getCosmetic(cosmetic.getSlot()).getId()));
+                    Cosmetic equippedCosmetic = user.getCosmetic(cosmetic.getSlot());
+                    if (equippedCosmetic == null) return TranslationUtil.getTranslation("equipped-cosmetic", "false");
+                    return TranslationUtil.getTranslation("equipped-cosmetic", String.valueOf(cosmetic.getId().equals(equippedCosmetic.getId())));
                 }
+            // %hmccosmetics_amount_balloon_unlocked%
+            case "amount":
+                if (placeholderArgs.size() >= 2) {
+                    String args1 = placeholderArgs.get(1).toUpperCase(); // changes offhand to OFFHAND
+
+                    if (!CosmeticSlot.contains(args1)) return null;
+
+                    CosmeticSlot slot = CosmeticSlot.valueOf(args1);
+                    int amount = 0;
+                    boolean checkUnlocked = false;
+                    if (placeholderArgs.size() >= 3) if (placeholderArgs.get(2).equalsIgnoreCase("unlocked")) checkUnlocked = true;
+
+                    for (Cosmetic cosmetic : Cosmetics.values()) {
+                        if (cosmetic.getSlot() != slot) continue;
+                        if (checkUnlocked && !user.canEquipCosmetic(cosmetic)) continue;
+                        amount += 1;
+                    }
+                    return TranslationUtil.getTranslation("amount-cosmetic", String.valueOf(amount));
+
+                } else {
+                    return TranslationUtil.getTranslation("amount-cosmetic", String.valueOf(Cosmetics.values().size()));
+                }
+            case "hidden":
+                return TranslationUtil.getTranslation("hidden", String.valueOf(user.isHidden()));
             case "wardrobe-enabled":
                 return TranslationUtil.getTranslation("in-wardrobe", String.valueOf(user.isInWardrobe()));
         }
@@ -203,18 +208,61 @@ public class HMCPlaceholderExpansion extends PlaceholderExpansion {
         return String.valueOf(itemMeta.getCustomModelData());
     }
 
+
+
+    /**
+     * Gets the cosmetic items item model
+     * @param cosmetic The cosmetic to get its item model
+     * @return The cosmetic items item model
+     */
+    @Nullable
+    public String getItemModel(@NotNull Cosmetic cosmetic) {
+        try {
+            ItemStack item = cosmetic.getItem();
+            if (item == null) return null;
+            if (!item.hasItemMeta()) return null;
+            ItemMeta itemMeta = item.getItemMeta();
+            if (itemMeta == null && itemMeta.hasItemModel() ) return null;
+            return itemMeta.getItemModel().asString();
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+
+
+    /**
+     * Gets the cosmetic items item name
+     * @param cosmetic The cosmetic to get its items item name
+     * @return The cosmetic items item name
+     */
+    @Nullable
+    public String getItemName(@NotNull Cosmetic cosmetic) {
+        try {
+            ItemStack item = cosmetic.getItem();
+            if (item == null) return null;
+            if (!item.hasItemMeta()) return null;
+            ItemMeta itemMeta = item.getItemMeta();
+            if (itemMeta == null || !itemMeta.hasItemName()) return null;
+            return itemMeta.getDisplayName();
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
     /**
      * Gets the cosmetic items display name
      * @param cosmetic The cosmetic to get its items display name
      * @return The cosmetic items display name
      */
     @Nullable
-    public String getItemName(@NotNull Cosmetic cosmetic) {
+    public String getDisplayName(@NotNull Cosmetic cosmetic) {
         ItemStack item = cosmetic.getItem();
         if (item == null) return null;
         if (!item.hasItemMeta()) return null;
         ItemMeta itemMeta = item.getItemMeta();
         if (itemMeta == null) return null;
+        if (!itemMeta.hasDisplayName()) return null;
         return itemMeta.getDisplayName();
     }
 

common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/placeholders/HookPlaceholderAPI.java

@@ -1,20 +0,0 @@
-package com.hibiscusmc.hmccosmetics.hooks.placeholders;
-
-import com.hibiscusmc.hmccosmetics.hooks.Hook;
-
-/**
- * A hook that integrates the plugin {@link me.clip.placeholderapi.PlaceholderAPI PlaceholderAPI}
- */
-public class HookPlaceholderAPI extends Hook {
-    public HookPlaceholderAPI() {
-        super("PlaceholderAPI");
-    }
-
-    /**
-     * Registers HMCCosmetics Placeholder Expansion
-     */
-    @Override
-    public void load() {
-        new HMCPlaceholderExpansion().register();
-    }
-}

common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGHook.java

@@ -17,21 +17,26 @@ public class WGHook {
     /**
      * @implNote Please use {@link #getCosmeticEnableFlag()} instead
      */
-    public static StateFlag COSMETIC_ENABLE_FLAG;
+    private static StateFlag COSMETIC_ENABLE_FLAG;
+
+    private static StateFlag EMOTES_ENABLE_FLAG;
 
     /**
      * @implNote Please use {@link #getCosmeticWardrobeFlag()} instead
      */
-    public static StringFlag COSMETIC_WARDROBE_FLAG;
+    private static StringFlag COSMETIC_WARDROBE_FLAG;
 
     public WGHook() {
         FlagRegistry registry = WorldGuard.getInstance().getFlagRegistry();
         try {
             StateFlag cosmeticFlag = new StateFlag("cosmetic-enable", false);
+            StateFlag emoteFlag = new StateFlag("emotes-enable", false);
             StringFlag wardrobeFlag = new StringFlag("cosmetic-wardrobe");
             registry.register(cosmeticFlag);
+            registry.register(emoteFlag);
             registry.register(wardrobeFlag);
             COSMETIC_ENABLE_FLAG = cosmeticFlag;
+            EMOTES_ENABLE_FLAG = emoteFlag;
             COSMETIC_WARDROBE_FLAG = wardrobeFlag;
         } catch (FlagConflictException e) {
             Flag<?> existing = registry.get("cosmetic-enable");
@@ -53,6 +58,14 @@ public class WGHook {
         return COSMETIC_ENABLE_FLAG;
     }
 
+    /**
+     * Gets the emotes enable {@link StateFlag}
+     * @return The emotes enable {@link StateFlag}
+     */
+    public static StateFlag getEmotesEnableFlag() {
+        return EMOTES_ENABLE_FLAG;
+    }
+
     /**
      * Gets the cosmetic wardrobe {@link StateFlag}
      * @return The cosmetic wardrobe {@link StateFlag}

common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGListener.java

@@ -4,73 +4,79 @@ import com.hibiscusmc.hmccosmetics.config.Wardrobe;
 import com.hibiscusmc.hmccosmetics.config.WardrobeSettings;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
-import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldguard.WorldGuard;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
+import com.sk89q.worldguard.protection.flags.Flag;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import com.sk89q.worldguard.protection.regions.RegionContainer;
 import com.sk89q.worldguard.protection.regions.RegionQuery;
 import org.bukkit.Location;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Map;
+import java.util.Set;
+
 /**
  * Contains {@link com.sk89q.worldguard.WorldGuard WorldGuard} related event listeners
  */
 public class WGListener implements Listener {
-    @EventHandler
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onPlayerMove(@NotNull PlayerMoveEvent event) {
-        CosmeticUser user = CosmeticUsers.getUser(event.getPlayer());
+        Player player = event.getPlayer();
+        Location from = event.getFrom();
+        Location to = event.getTo();
+        if (from.getBlockX() == to.getBlockX() && from.getBlockY() == to.getBlockY() && from.getBlockZ() == to.getBlockZ()) return;
+
+        CosmeticUser user = CosmeticUsers.getUser(player);
         if (user == null) return;
-        Location location = event.getPlayer().getLocation();
-        com.sk89q.worldedit.util.Location loc = BukkitAdapter.adapt(location);
-        RegionContainer region = WorldGuard.getInstance().getPlatform().getRegionContainer();
-        RegionQuery query = region.createQuery();
-        ApplicableRegionSet set = query.getApplicableRegions(loc);
-        if (user.getHidden()) {
-            if (user.getHiddenReason() == CosmeticUser.HiddenReason.WORLDGUARD && set.getRegions().size() == 0) {
-                user.showCosmetics();
-            }
+        Location location = player.getLocation();
+        ApplicableRegionSet set = getRegions(location);
+        if (user.isHidden() && set.getRegions().isEmpty()) {
+            user.showCosmetics(CosmeticUser.HiddenReason.WORLDGUARD);
         }
+
+        Set<String> wardrobeNames = WardrobeSettings.getWardrobeNames();
         for (ProtectedRegion protectedRegion : set.getRegions()) {
-            if (protectedRegion.getFlags().containsKey(WGHook.getCosmeticEnableFlag())) {
-                if (protectedRegion.getFlags().get(WGHook.getCosmeticEnableFlag()).toString().equalsIgnoreCase("ALLOW")) {
-                    if (user.getHiddenReason() == CosmeticUser.HiddenReason.WORLDGUARD) user.showCosmetics();
-                    return;
+            Map<Flag<?>, Object> flags = protectedRegion.getFlags();
+            if (flags.containsKey(WGHook.getCosmeticEnableFlag())) {
+                if (flags.get(WGHook.getCosmeticEnableFlag()).toString().equalsIgnoreCase("ALLOW")) {
+                    user.showCosmetics(CosmeticUser.HiddenReason.WORLDGUARD);
+                } else {
+                    user.hideCosmetics(CosmeticUser.HiddenReason.WORLDGUARD);
                 }
-                user.hideCosmetics(CosmeticUser.HiddenReason.WORLDGUARD);
-                return;
             }
-            if (protectedRegion.getFlags().containsKey(WGHook.getCosmeticWardrobeFlag())) {
-                if (!WardrobeSettings.getWardrobeNames().contains(protectedRegion.getFlags().get(WGHook.getCosmeticWardrobeFlag()).toString())) return;
-                Wardrobe wardrobe = WardrobeSettings.getWardrobe(protectedRegion.getFlags().get(WGHook.getCosmeticWardrobeFlag()).toString());
-                user.enterWardrobe(true, wardrobe);
+            if (flags.containsKey(WGHook.getCosmeticWardrobeFlag())) {
+                String wardrobeName = flags.getOrDefault(WGHook.getCosmeticWardrobeFlag(), "").toString();
+                if (wardrobeName.isEmpty() || !wardrobeNames.contains(wardrobeName)) return;
+                Wardrobe wardrobe = WardrobeSettings.getWardrobe(wardrobeName);
+                if (wardrobe == null) return;
+                user.enterWardrobe(wardrobe, true);
             }
         }
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerTeleport(PlayerTeleportEvent event) {
         CosmeticUser user = CosmeticUsers.getUser(event.getPlayer());
         if (user == null) return;
         Location location = event.getTo();
-        com.sk89q.worldedit.util.Location loc = BukkitAdapter.adapt(location);
-        RegionContainer region = WorldGuard.getInstance().getPlatform().getRegionContainer();
-        RegionQuery query = region.createQuery();
-        ApplicableRegionSet set = query.getApplicableRegions(loc);
-        if (user.getHidden()) {
-            if (user.getHiddenReason() == CosmeticUser.HiddenReason.WORLDGUARD && set.getRegions().size() == 0) {
-                user.showCosmetics();
+        ApplicableRegionSet set = getRegions(location);
+        if (user.isHidden()) {
+            if (set.getRegions().isEmpty()) {
+                user.showCosmetics(CosmeticUser.HiddenReason.WORLDGUARD);
             }
         }
         for (ProtectedRegion protectedRegion : set.getRegions()) {
             if (protectedRegion.getFlags().containsKey(WGHook.getCosmeticEnableFlag())) {
                 if (protectedRegion.getFlags().get(WGHook.getCosmeticEnableFlag()).toString().equalsIgnoreCase("ALLOW")) {
-                    if (user.getHiddenReason() == CosmeticUser.HiddenReason.WORLDGUARD) user.showCosmetics();
+                    user.showCosmetics(CosmeticUser.HiddenReason.WORLDGUARD);
                     return;
                 }
                 user.hideCosmetics(CosmeticUser.HiddenReason.WORLDGUARD);
@@ -79,8 +85,15 @@ public class WGListener implements Listener {
             if (protectedRegion.getFlags().containsKey(WGHook.getCosmeticWardrobeFlag())) {
                 if (!WardrobeSettings.getWardrobeNames().contains(protectedRegion.getFlags().get(WGHook.getCosmeticWardrobeFlag()).toString())) return;
                 Wardrobe wardrobe = WardrobeSettings.getWardrobe(protectedRegion.getFlags().get(WGHook.getCosmeticWardrobeFlag()).toString());
-                user.enterWardrobe(true, wardrobe);
+                user.enterWardrobe(wardrobe, true);
             }
         }
     }
+
+    private ApplicableRegionSet getRegions(Location location) {
+        com.sk89q.worldedit.util.Location loc = BukkitAdapter.adapt(location);
+        RegionContainer region = WorldGuard.getInstance().getPlatform().getRegionContainer();
+        RegionQuery query = region.createQuery();
+        return query.getApplicableRegions(loc);
+    }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PaperPlayerGameListener.java

@@ -0,0 +1,40 @@
+package com.hibiscusmc.hmccosmetics.listener;
+
+import com.destroystokyo.paper.event.player.PlayerArmorChangeEvent;
+import com.destroystokyo.paper.event.player.PlayerPostRespawnEvent;
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
+import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+public class PaperPlayerGameListener implements Listener {
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPlayerArmorEquip(PlayerArmorChangeEvent event) {
+        CosmeticUser user = CosmeticUsers.getUser(event.getPlayer());
+        if (user == null) return;
+        if (user.isInWardrobe()) return;
+        user.updateCosmetic(slotTypeToCosmeticType(event.getSlotType()));
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPlayerRespawn(PlayerPostRespawnEvent event) {
+        CosmeticUser user = CosmeticUsers.getUser(event.getPlayer());
+        if (user == null) return;
+        if (user.isInWardrobe()) return;
+        if (user.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) user.respawnBackpack();
+    }
+
+    private CosmeticSlot slotTypeToCosmeticType(PlayerArmorChangeEvent.SlotType slotType) {
+        return switch (slotType) {
+            case HEAD -> CosmeticSlot.HELMET;
+            case FEET -> CosmeticSlot.BOOTS;
+            case LEGS -> CosmeticSlot.LEGGINGS;
+            case CHEST -> CosmeticSlot.CHESTPLATE;
+            default -> null;
+        };
+    }
+
+}