clean: clean HMCCInventoryUtils with new static variables

feat: migrate over to using a registry for CosmeticSlot than enums
feat: begin migrating over to the new getViewers method
2025-12-30 12:29:16 +00:00 · 2025-01-17 14:57:43 -06:00 · 2025-01-17 14:45:08 -06:00 · 2025-01-17 14:06:40 -06:00 · 2025-01-17 13:19:45 -06:00 · 2025-01-16 20:53:05 -06:00
43 changed files with 635 additions and 642 deletions
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,13 +2,13 @@ import net.minecrell.pluginyml.bukkit.BukkitPluginDescription

 plugins {
    id("java")
-    id("com.github.johnrengelman.shadow") version "8.1.1"
-    id("xyz.jpenilla.run-paper") version "2.0.0"
+    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.7.3-DEV"
+version = "2.7.5${getGitCommitHash()}"

 allprojects {
    apply(plugin = "java")
@@ -49,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/")

@@ -75,26 +72,26 @@ allprojects {
        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("io.papermc.paper:paper-api:1.19.4-R0.1-SNAPSHOT")
+        compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT")
        compileOnly("org.jetbrains:annotations:24.1.0")
-        compileOnly("com.comphenix.protocol:ProtocolLib:5.1.0")
+        compileOnly("com.comphenix.protocol:ProtocolLib:5.3.0")
        compileOnly("me.clip:placeholderapi:2.11.6")
-        compileOnly("com.ticxo.modelengine:ModelEngine:R4.0.2")
-        compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.1.0-SNAPSHOT")
-        compileOnly("it.unimi.dsi:fastutil:8.5.13")
+        compileOnly("com.ticxo.modelengine:ModelEngine:R4.0.6")
+        compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.0.12")
+        //compileOnly("it.unimi.dsi:fastutil:8.5.14")
        compileOnly("org.projectlombok:lombok:1.18.34")
-        compileOnly("me.lojosho:HibiscusCommons:0.4.1")
+        compileOnly("me.lojosho:HibiscusCommons:0.6.0-85d65299")

        // Handled by Spigot Library Loader
-        compileOnly("net.kyori:adventure-api:4.17.0")
-        compileOnly("net.kyori:adventure-text-minimessage:4.17.0")
-        compileOnly("net.kyori:adventure-platform-bukkit:4.3.3")
+        compileOnly("net.kyori:adventure-api:4.18.0")
+        compileOnly("net.kyori:adventure-text-minimessage:4.18.0")
+        compileOnly("net.kyori:adventure-platform-bukkit:4.3.4")

-        annotationProcessor("org.projectlombok:lombok:1.18.34")
-        testCompileOnly("org.projectlombok:lombok:1.18.34")
-        testAnnotationProcessor("org.projectlombok:lombok:1.18.34")
+        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.1.10") {
+        implementation("dev.triumphteam:triumph-gui:3.1.11") {
            exclude("net.kyori") // Already have adventure API
        }
        implementation("com.owen1212055:particlehelper:1.0.0-SNAPSHOT")
@@ -123,15 +120,21 @@ tasks {
    }

    runServer {
-        minecraftVersion("1.20.6")
+        minecraftVersion("1.21.4")
+
+        downloadPlugins {
+            hangar("PlaceholderAPI", "2.11.6")
+            url("https://ci.dmulloy2.net/job/ProtocolLib/lastSuccessfulBuild/artifact/build/libs/ProtocolLib.jar")
+            url("https://download.luckperms.net/1567/bukkit/loader/LuckPerms-Bukkit-5.4.150.jar")
+        }
    }

    shadowJar {
        mergeServiceFiles()

-        relocate("dev.triumphteam.gui", "com.hisbiscusmc.hmccosmetics.gui")
-        relocate("com.owen1212055.particlehelper", "com.hisbiscusmc.hmccosmetics.particlehelper")
-        relocate("com.ticxo.playeranimator", "com.hisbiscusmc.hmccosmetics.playeranimator")
+        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 {
@@ -156,7 +159,7 @@ tasks {
 bukkit {
    load = BukkitPluginDescription.PluginLoadOrder.POSTWORLD
    main = "com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin"
-    apiVersion = "1.19"
+    apiVersion = "1.20"
    authors = listOf("LoJoSho")
    depend = listOf("HibiscusCommons", "ProtocolLib")
    softDepend = listOf("ModelEngine", "Oraxen", "ItemsAdder", "Geary", "HMCColor", "WorldGuard", "MythicMobs", "PlaceholderAPI", "SuperVanish", "PremiumVanish", "LibsDisguises", "Denizen", "MMOItems", "Eco")
@@ -257,6 +260,25 @@ bukkit {
 }

 java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(21
-    ))
+    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
 }
+
+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 ""
+}
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }

 java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(17
+    toolchain.languageVersion.set(JavaLanguageVersion.of(21
    ))
 }

--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/HMCCosmeticsPlugin.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/HMCCosmeticsPlugin.java
@@ -20,6 +20,7 @@ import com.hibiscusmc.hmccosmetics.hooks.worldguard.WGListener;
 import com.hibiscusmc.hmccosmetics.listener.PaperPlayerGameListener;
 import com.hibiscusmc.hmccosmetics.listener.PlayerConnectionListener;
 import com.hibiscusmc.hmccosmetics.listener.PlayerGameListener;
+import com.hibiscusmc.hmccosmetics.listener.ServerListener;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
@@ -94,6 +95,7 @@ public final class HMCCosmeticsPlugin extends HibiscusPlugin {
        // Listener
        getServer().getPluginManager().registerEvents(new PlayerConnectionListener(), this);
        getServer().getPluginManager().registerEvents(new PlayerGameListener(), this);
+        getServer().getPluginManager().registerEvents(new ServerListener(), this);
        // Taken from PaperLib
        if (HibiscusCommonsPlugin.isOnPaper()) {
            getServer().getPluginManager().registerEvents(new PaperPlayerGameListener(), this);
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java
@@ -43,10 +43,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")) {
@@ -140,7 +144,7 @@ public class CosmeticCommand implements CommandExecutor {

                CosmeticUser user = CosmeticUsers.getUser(player);

-                if (!user.canEquipCosmetic(cosmetic)) {
+                if (!user.canEquipCosmetic(cosmetic) && !console) {
                    if (!silent) MessagesUtil.sendMessage(player, "no-cosmetic-permission");
                    return true;
                }
@@ -148,7 +152,7 @@ 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);

@@ -183,11 +187,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) {
@@ -199,7 +204,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);

@@ -239,20 +244,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")) {
@@ -298,11 +307,12 @@ public class CosmeticCommand implements CommandExecutor {
                    return true;
                }

-                if (!EnumUtils.isValidEnum(CosmeticSlot.class, args[1])) {
+                String rawSlot = args[1];
+                if (!CosmeticSlot.contains(rawSlot)) {
                    if (!silent) MessagesUtil.sendMessage(player, "invalid-slot");
                    return true;
                }
-                CosmeticSlot slot = CosmeticSlot.valueOf(args[1]);
+                CosmeticSlot slot = CosmeticSlot.valueOf(rawSlot);
                Cosmetic cosmetic = user.getCosmetic(slot);

                if (args.length >= 3) {
@@ -334,7 +344,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;
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommandTabComplete.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommandTabComplete.java
@@ -94,7 +94,7 @@ public class CosmeticCommandTabComplete implements TabCompleter {
                }
                case "dye" -> {
                    for (CosmeticSlot slot : user.getDyeableSlots()) {
-                        completions.add(slot.name());
+                        completions.add(slot.toString());
                    }
                }
                case "setwardrobesetting" -> {
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/config/Settings.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/config/Settings.java
@@ -30,11 +30,15 @@ public class Settings {
    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 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 EMOTE_DISTANCE_PATH = "emote-distance";
    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";
@@ -49,8 +53,6 @@ public class Settings {
    private static final String COSMETIC_DISABLED_WORLDS_PATH = "disabled-worlds";
    private static final String COSMETIC_PACKET_ENTITY_TELEPORT_COOLDOWN_PATH = "entity-cooldown-teleport-packet";
    private static final String COSMETIC_BACKPACK_FORCE_RIDING_PACKET_PATH = "backpack-force-riding-packet";
-    private static final String COSMETIC_BACKPACK_LIGHT_EMINATION_PATH = "backpack-light-emination";
-    private static final String COSMETIC_BACKPACK_LIGHT_BLOCK_DETECTION = "backpack-block-detection";
    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 MENU_SETTINGS_PATH = "menu-settings";
@@ -90,8 +92,14 @@ public class Settings {
    @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;
    @Getter
    private static boolean cosmeticEmoteBlockCheck;
@@ -107,10 +115,6 @@ public class Settings {
    @Getter
    private static boolean backpackForceRidingEnabled;
    @Getter
-    private static boolean backpackLightEmination;
-    @Getter
-    private static boolean backpackBlockDetection;
-    @Getter
    private static boolean emotesEnabled;
    @Getter
    private static boolean disabledGamemodesEnabled;
@@ -191,6 +195,10 @@ public class Settings {
            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);
        forceShowOnJoin = cosmeticSettings.node(FORCE_SHOW_COSMETICS_PATH).getBoolean(false);
@@ -202,8 +210,6 @@ public class Settings {
        emoteInvincible = cosmeticSettings.node(COSMETIC_EMOTE_INVINCIBLE_PATH).getBoolean(false);
        destroyLooseCosmetics = cosmeticSettings.node(COSMETIC_DESTROY_LOOSE_COSMETIC_PATH).getBoolean(false);
        backpackForceRidingEnabled = cosmeticSettings.node(COSMETIC_BACKPACK_FORCE_RIDING_PACKET_PATH).getBoolean(false);
-        backpackLightEmination = cosmeticSettings.node(COSMETIC_BACKPACK_LIGHT_EMINATION_PATH).getBoolean(true);
-        backpackBlockDetection = cosmeticSettings.node(COSMETIC_BACKPACK_LIGHT_BLOCK_DETECTION).getBoolean(true);

        cosmeticSettings.node(SLOT_OPTIONS_PATH).childrenMap().forEach((key, value) -> {
            EquipmentSlot slot = convertConfigToEquipment(key.toString().toLowerCase());
@@ -254,9 +260,13 @@ 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 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.
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/config/Wardrobe.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/config/Wardrobe.java
@@ -14,10 +14,12 @@ public class Wardrobe {
    private final String id;
    @Getter @Setter
    private int distance;
-    @Getter @Setter
+    @Getter @Setter @Nullable
    private String permission;
    @Getter @Setter
    private WardrobeLocation location;
+    @Getter @Setter @Nullable
+    private String defaultMenu;

    /**
     * This creates a Wardrobe object with all the information that a user will need when entering.
@@ -25,12 +27,14 @@ public class 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) {
+    public Wardrobe(@NotNull String id, @NotNull WardrobeLocation location, @Nullable String permission, int distance, @Nullable String defaultMenu) {
        this.id = id;
        this.location = location;
        this.distance = distance;
        if (permission != null) this.permission = permission;
+        if (defaultMenu != null) this.defaultMenu = defaultMenu;
    }

    /**
@@ -50,7 +54,7 @@ public class Wardrobe {
        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;
    }
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/config/WardrobeSettings.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/config/WardrobeSettings.java
@@ -2,7 +2,6 @@ package com.hibiscusmc.hmccosmetics.config;

 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 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;
@@ -45,6 +44,7 @@ public class WardrobeSettings {
    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";
@@ -169,14 +169,16 @@ 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 = 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);
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/CosmeticSlot.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/CosmeticSlot.java
@@ -1,14 +1,58 @@
 package com.hibiscusmc.hmccosmetics.cosmetic;

-public enum CosmeticSlot {
-    HELMET,
-    CHESTPLATE,
-    LEGGINGS,
-    BOOTS,
-    MAINHAND,
-    OFFHAND,
-    BACKPACK,
-    BALLOON,
-    EMOTE,
-    CUSTOM
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class CosmeticSlot {
+    private static final ConcurrentHashMap<String, CosmeticSlot> REGISTRY = new ConcurrentHashMap<>();
+
+    public static final CosmeticSlot HELMET = new CosmeticSlot("HELMET");
+    public static final CosmeticSlot CHESTPLATE = new CosmeticSlot("CHESTPLATE");
+    public static final CosmeticSlot LEGGINGS = new CosmeticSlot("LEGGINGS");
+    public static final CosmeticSlot BOOTS = new CosmeticSlot("BOOTS");
+    public static final CosmeticSlot MAINHAND = new CosmeticSlot("MAINHAND");
+    public static final CosmeticSlot OFFHAND = new CosmeticSlot("OFFHAND");
+    public static final CosmeticSlot BACKPACK = new CosmeticSlot("BACKPACK");
+    public static final CosmeticSlot BALLOON = new CosmeticSlot("BALLOON");
+    public static final CosmeticSlot EMOTE = new CosmeticSlot("EMOTE");
+    public static final CosmeticSlot CUSTOM = new CosmeticSlot("CUSTOM");
+
+    private final String name;
+
+    private CosmeticSlot(@NotNull String name) {
+        this.name = name;
+        REGISTRY.put(name, this);
+    }
+
+    public static CosmeticSlot register(@NotNull String name) {
+        name = name.toUpperCase();
+        return REGISTRY.computeIfAbsent(name, key -> new CosmeticSlot(key));
+    }
+
+    public static Map<String, CosmeticSlot> values() {
+        return Collections.unmodifiableMap(REGISTRY);
+    }
+
+    public static CosmeticSlot valueOf(@NotNull String name) {
+        name = name.toUpperCase();
+        return REGISTRY.get(name);
+    }
+
+    /**
+     * Checks if the registry contains a slot with the given name.
+     * @param name
+     * @return
+     */
+    public static boolean contains(@NotNull String name) {
+        name = name.toUpperCase();
+        return REGISTRY.containsKey(name);
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
 }
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/Cosmetics.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/Cosmetics.java
@@ -94,28 +94,25 @@ public class Cosmetics {

    private static void setupCosmetics(@NotNull CommentedConfigurationNode config) {
        for (ConfigurationNode cosmeticConfig : config.childrenMap().values()) {
-            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(slotNode.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);
-                    case HELMET, CHESTPLATE, LEGGINGS, BOOTS, OFFHAND -> new CosmeticArmorType(id, cosmeticConfig);
-                    default -> new CosmeticTypeRegisterEvent(id, cosmeticConfig).callEvent();
-                }
-            } catch (Exception e) {
-                if (Settings.isDebugMode()) e.printStackTrace();
+            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("");
+            if (!CosmeticSlot.contains(slot)) {
+                MessagesUtil.sendDebugMessages("Unable to create " + id + " because " + slotNode.getString() + " is not a valid slot!", Level.WARNING);
+                continue;
+            }
+            switch (slot) {
+                case "BALLOON" -> new CosmeticBalloonType(id, cosmeticConfig);
+                case "BACKPACK" -> new CosmeticBackpackType(id, cosmeticConfig);
+                case "MAINHAND" -> new CosmeticMainhandType(id, cosmeticConfig);
+                case "EMOTE" -> new CosmeticEmoteType(id, cosmeticConfig);
+                case "HELMET", "CHESTPLATE", "LEGGINGS", "BOOTS", "OFFHAND" -> new CosmeticArmorType(id, cosmeticConfig);
+                default -> new CosmeticTypeRegisterEvent(id, cosmeticConfig).callEvent();
            }
        }
    }
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticArmorType.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticArmorType.java
@@ -22,7 +22,12 @@ public class CosmeticArmorType extends Cosmetic {
    public CosmeticArmorType(String id, ConfigurationNode config) {
        super(id, config);

-        this.equipSlot = HMCCInventoryUtils.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
@@ -52,6 +57,7 @@ public class CosmeticArmorType extends Cosmetic {
        return cosmeticItem;
    }

+    @NotNull
    public EquipmentSlot getEquipSlot() {
        return this.equipSlot;
    }
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBackpackType.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBackpackType.java
@@ -3,7 +3,6 @@ package com.hibiscusmc.hmccosmetics.cosmetic.types;
 import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 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.HMCCPacketManager;
 import lombok.Getter;
@@ -11,7 +10,6 @@ import me.lojosho.hibiscuscommons.util.packets.PacketManager;
 import me.lojosho.shaded.configurate.ConfigurationNode;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
@@ -26,8 +24,6 @@ import java.util.logging.Level;

 public class CosmeticBackpackType extends Cosmetic {

-    @Getter
-    private final String modelName;
    @Getter
    private int height = -1;
    private ItemStack firstPersonBackpack;
@@ -35,8 +31,6 @@ public class CosmeticBackpackType extends Cosmetic {
    public CosmeticBackpackType(String id, ConfigurationNode config) {
        super(id, config);

-        modelName = config.node("model").getString();
-
        if (!config.node("firstperson-item").virtual()) {
            this.firstPersonBackpack = generateItemStack(config.node("firstperson-item"));
            this.height = config.node("height").getInt(5);
@@ -58,21 +52,20 @@ public class CosmeticBackpackType extends Cosmetic {
        }
        List<Player> outsideViewers = user.getUserBackpackManager().getEntityManager().refreshViewers(loc);

-        UserBackpackManager backpackManager = user.getUserBackpackManager();
-        backpackManager.getEntityManager().teleport(loc);
-        backpackManager.getEntityManager().setRotation((int) loc.getYaw(), isFirstPersonCompadible());
+        user.getUserBackpackManager().getEntityManager().teleport(loc);
+        user.getUserBackpackManager().getEntityManager().setRotation((int) loc.getYaw(), isFirstPersonCompadible());

-        HMCCPacketManager.sendEntitySpawnPacket(user.getEntity().getLocation(), backpackManager.getFirstArmorStandId(), EntityType.ARMOR_STAND, UUID.randomUUID(), outsideViewers);
-        //HMCCPacketManager.sendArmorstandMetadata(backpackManager.getFirstArmorStandId(), outsideViewers);
-        PacketManager.equipmentSlotUpdate(backpackManager.getFirstArmorStandId(), EquipmentSlot.HEAD, user.getUserCosmeticItem(this, getItem()), outsideViewers);
+        HMCCPacketManager.sendEntitySpawnPacket(user.getEntity().getLocation(), user.getUserBackpackManager().getFirstArmorStandId(), EntityType.ARMOR_STAND, UUID.randomUUID(), outsideViewers);
+        HMCCPacketManager.sendArmorstandMetadata(user.getUserBackpackManager().getFirstArmorStandId(), outsideViewers);
+        PacketManager.equipmentSlotUpdate(user.getUserBackpackManager().getFirstArmorStandId(), EquipmentSlot.HEAD, user.getUserCosmeticItem(this, getItem()), outsideViewers);
        // 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(), backpackManager.getFirstArmorStandId(), backpackManager.getEntityManager().getViewers());
+        if (Settings.isBackpackForceRidingEnabled()) HMCCPacketManager.sendRidingPacket(entity.getEntityId(), user.getUserBackpackManager().getFirstArmorStandId(), user.getUserBackpackManager().getEntityManager().getViewers());
        else HMCCPacketManager.sendRidingPacket(entity.getEntityId(), user.getUserBackpackManager().getFirstArmorStandId(), outsideViewers);

        if (!user.isInWardrobe() && isFirstPersonCompadible() && user.getPlayer() != null) {
            List<Player> owner = List.of(user.getPlayer());

-            ArrayList<Integer> particleCloud = backpackManager.getAreaEffectEntityId();
+            ArrayList<Integer> particleCloud = user.getUserBackpackManager().getAreaEffectEntityId();
            for (int i = 0; i < particleCloud.size(); i++) {
                if (i == 0) {
                    HMCCPacketManager.sendRidingPacket(entity.getEntityId(), particleCloud.get(i), owner);
@@ -80,17 +73,16 @@ public class CosmeticBackpackType extends Cosmetic {
                    HMCCPacketManager.sendRidingPacket(particleCloud.get(i - 1), particleCloud.get(i) , owner);
                }
            }
-            HMCCPacketManager.sendRidingPacket(particleCloud.get(particleCloud.size() - 1), backpackManager.getFirstArmorStandId(), owner);
+            HMCCPacketManager.sendRidingPacket(particleCloud.get(particleCloud.size() - 1), user.getUserBackpackManager().getFirstArmorStandId(), owner);
            if (!user.isHidden()) {
                //if (loc.getPitch() < -70) NMSHandlers.getHandler().equipmentSlotUpdate(user.getUserBackpackManager().getFirstArmorStandId(), EquipmentSlot.HEAD, new ItemStack(Material.AIR), owner);
                //else NMSHandlers.getHandler().equipmentSlotUpdate(user.getUserBackpackManager().getFirstArmorStandId(), EquipmentSlot.HEAD, firstPersonBackpack, owner);
-                PacketManager.equipmentSlotUpdate(backpackManager.getFirstArmorStandId(), EquipmentSlot.HEAD, user.getUserCosmeticItem(this, firstPersonBackpack), owner);
+                PacketManager.equipmentSlotUpdate(user.getUserBackpackManager().getFirstArmorStandId(), EquipmentSlot.HEAD, user.getUserCosmeticItem(this, firstPersonBackpack), owner);
            }
-            MessagesUtil.sendDebugMessages("First Person Backpack Update[owner=" + user.getUniqueId() + ",player_location=" + loc + "]!", Level.INFO);
+            //MessagesUtil.sendDebugMessages("First Person Backpack Update[owner=" + user.getUniqueId() + ",player_location=" + loc + "]!", Level.INFO);
        }

-        MessagesUtil.sendDebugMessages("TTTTTTT " + backpackManager.refreshBlock(backpackManager.getEntityManager().getViewers()));
-        backpackManager.showBackpack();
+        user.getUserBackpackManager().showBackpack();
    }

    public boolean isFirstPersonCompadible() {
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticMainhandType.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticMainhandType.java
@@ -18,6 +18,6 @@ public class CosmeticMainhandType extends Cosmetic {
    public void update(@NotNull CosmeticUser user) {
        Player player = user.getPlayer();

-        HMCCPacketManager.equipmentSlotUpdate(player.getEntityId(), user, getSlot(), HMCCPlayerUtils.getNearbyPlayers(player));
+        HMCCPacketManager.equipmentSlotUpdate(player.getEntityId(), user, getSlot(), HMCCPacketManager.getViewers(player.getLocation()));
    }
 }
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/database/Database.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/database/Database.java
@@ -12,6 +12,7 @@ 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 {
@@ -56,7 +57,7 @@ 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);
    }

--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/database/UserData.java
+++ b/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);
+    }
+}
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/Data.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/Data.java
@@ -5,6 +5,7 @@ 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;
@@ -14,6 +15,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

 import java.util.*;
+import java.util.concurrent.CompletableFuture;

 public abstract class Data {

@@ -22,7 +24,7 @@ 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);

@@ -48,13 +50,9 @@ public abstract class Data {
        return data.toString();
    }

-    public final Map<CosmeticSlot, Map<Cosmetic, Color>> deserializeData(CosmeticUser user, @NotNull String raw) {
-        return deserializeData(user, raw, Settings.isForcePermissionJoin());
-    }
-
    @NotNull
-    public final Map<CosmeticSlot, Map<Cosmetic, Color>> deserializeData(CosmeticUser user, @NotNull String raw, boolean permissionCheck) {
-        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<>();
@@ -76,59 +74,14 @@ 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 (permissionCheck && 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 (permissionCheck && 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));
            }
        }

-        MessagesUtil.sendDebugMessages("Hidden Reason: " + hiddenReason);
-        // if else this, if else that, if else I got to deal with this anymore i'll lose my mind
-        if (!hiddenReason.isEmpty()) {
-            for (CosmeticUser.HiddenReason reason : hiddenReason) user.silentlyAddHideFlag(reason);
-        } else {
-            Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
-                // Handle gamemode check
-                if (user.getPlayer() != null && Settings.isDisabledGamemodesEnabled() && Settings.getDisabledGamemodes().contains(user.getPlayer().getGameMode().toString())) {
-                    MessagesUtil.sendDebugMessages("Hiding Cosmetics due to gamemode");
-                    user.hideCosmetics(CosmeticUser.HiddenReason.GAMEMODE);
-                    return;
-                } else {
-                    if (user.isHidden(CosmeticUser.HiddenReason.GAMEMODE)) {
-                        MessagesUtil.sendDebugMessages("Join Gamemode Check: Showing Cosmetics");
-                        user.showCosmetics(CosmeticUser.HiddenReason.GAMEMODE);
-                        return;
-                    }
-                }
-                // Handle world check
-                if (user.getPlayer() != null && Settings.getDisabledWorlds().contains(user.getPlayer().getWorld().getName())) {
-                    MessagesUtil.sendDebugMessages("Hiding Cosmetics due to world");
-                    user.hideCosmetics(CosmeticUser.HiddenReason.WORLD);
-                } else {
-                    if (user.isHidden(CosmeticUser.HiddenReason.WORLD)) {
-                        MessagesUtil.sendDebugMessages("Join World Check: Showing Cosmetics");
-                        user.showCosmetics(CosmeticUser.HiddenReason.WORLD);
-                    }
-                }
-                if (Settings.isAllPlayersHidden()) {
-                    user.hideCosmetics(CosmeticUser.HiddenReason.DISABLED);
-                }
-            });
-        }
        return cosmetics;
    }

--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/NoneData.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/NoneData.java
@@ -1,9 +1,11 @@
 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
@@ -17,8 +19,8 @@ public class NoneData extends Data {
    }

    @Override
-    public @Nullable CosmeticUser get(UUID uniqueId) {
-        return new CosmeticUser(uniqueId);
+    public @Nullable CompletableFuture<UserData> get(UUID uniqueId) {
+        return CompletableFuture.completedFuture(new UserData(uniqueId));
    }

    @Override
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/SQLData.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/SQLData.java
@@ -3,6 +3,7 @@ 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;
@@ -13,14 +14,15 @@ 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({"resource"}) // Duplicate is from deprecated InternalData
-    public CosmeticUser get(UUID uniqueId) {
-        CosmeticUser user = new CosmeticUser(uniqueId);
+    public CompletableFuture<UserData> get(UUID uniqueId) {
+        return CompletableFuture.supplyAsync(() -> {
+            UserData data = new UserData(uniqueId);

-        Bukkit.getScheduler().runTaskAsynchronously(HMCCosmeticsPlugin.getInstance(), () -> {
            PreparedStatement preparedStatement = null;
            try {
                preparedStatement = preparedStatement("SELECT * FROM COSMETICDATABASE WHERE UUID = ?;");
@@ -28,21 +30,8 @@ public abstract class SQLData extends Data {
                ResultSet rs = preparedStatement.executeQuery();
                if (rs.next()) {
                    String rawData = rs.getString("COSMETICS");
-                    Map<CosmeticSlot, Map<Cosmetic, Color>> cosmetics = deserializeData(user, rawData);
-                    // Load cosmetics, put them into the addedCosmetic hashmap
-                    HashMap<Cosmetic, Color> addedCosmetics = new HashMap<>();
-                    for (Map<Cosmetic, Color> cosmeticColors : cosmetics.values()) {
-                        for (Cosmetic cosmetic : cosmeticColors.keySet()) {
-                            addedCosmetics.put(cosmetic, cosmeticColors.get(cosmetic));
-                        }
-                    }
-                    // Run a task on the main thread, adding the cosmetics to the player
-                    Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
-                        // This can not be async.
-                        for (Cosmetic cosmetic : addedCosmetics.keySet()) {
-                            user.addPlayerCosmetic(cosmetic, addedCosmetics.get(cosmetic));
-                        }
-                    });
+                    HashMap<CosmeticSlot, Map.Entry<Cosmetic, Integer>> cosmetics = deserializeData(rawData);
+                    data.setCosmetics(cosmetics);
                }
            } catch (SQLException e) {
                e.printStackTrace();
@@ -51,9 +40,8 @@ public abstract class SQLData extends Data {
                    if (preparedStatement != null) preparedStatement.close();
                } catch (SQLException e) {}
            }
+            return data;
        });
-
-        return user;
    }

    @Override
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionUnequip.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionUnequip.java
@@ -13,7 +13,7 @@ public class ActionUnequip extends Action {

    @Override
    public void run(CosmeticUser user, String raw) {
-        if (!EnumUtils.isValidEnum(CosmeticSlot.class, raw)) return;
+        if (!CosmeticSlot.contains(raw)) return;

        CosmeticSlot slot = CosmeticSlot.valueOf(raw);
        user.removeCosmeticSlot(slot);
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java
@@ -128,8 +128,9 @@ public class TypeCosmetic extends Type {
    }

    @Override
-    public ItemStack setItem(CosmeticUser user, @NotNull ConfigurationNode config, ItemStack itemStack, int slot) {
-        itemStack.setItemMeta(processLoreLines(user, itemStack.getItemMeta()));
+    public ItemStack setItem(@NotNull CosmeticUser user, @NotNull ConfigurationNode config, @NotNull ItemStack itemStack, int slot) {
+        if (itemStack.hasItemMeta()) itemStack.setItemMeta(processLoreLines(user, itemStack.getItemMeta()));
+        else MessagesUtil.sendDebugMessages("ItemStack has no ItemMeta?");

        if (config.node("cosmetic").virtual()) {
            return itemStack;
@@ -153,7 +154,8 @@ public class TypeCosmetic extends Type {
            } catch (SerializationException e) {
                throw new RuntimeException(e);
            }
-            itemStack.setItemMeta(processLoreLines(user, itemStack.getItemMeta()));
+            if (itemStack.hasItemMeta()) itemStack.setItemMeta(processLoreLines(user, itemStack.getItemMeta()));
+            else MessagesUtil.sendDebugMessages("ItemStack has no ItemMeta in equipped item?");
            return itemStack;
        }

@@ -170,7 +172,8 @@ public class TypeCosmetic extends Type {
            } catch (SerializationException e) {
                throw new RuntimeException(e);
            }
-            itemStack.setItemMeta(processLoreLines(user, itemStack.getItemMeta()));
+            if (itemStack.hasItemMeta()) itemStack.setItemMeta(processLoreLines(user, itemStack.getItemMeta()));
+            else MessagesUtil.sendDebugMessages("ItemStack has no ItemMeta in locked item?");
            return itemStack;
        }
        return itemStack;
@@ -193,7 +196,7 @@ public class TypeCosmetic extends Type {
        }

        if (itemMeta instanceof SkullMeta skullMeta) {
-            if (skullMeta.hasOwner()) {
+            if (skullMeta.hasOwner() && skullMeta.getOwner() != null) {
                skullMeta.setOwner(Hooks.processPlaceholders(user.getPlayer(), skullMeta.getOwner()));
            }
        }
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeEmpty.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeEmpty.java
@@ -75,7 +75,7 @@ public class TypeEmpty extends Type {
        }

        if (itemMeta instanceof SkullMeta skullMeta) {
-            if (skullMeta.hasOwner()) {
+            if (skullMeta.hasOwner() && skullMeta.getOwner() != null) {
                skullMeta.setOwner(Hooks.processPlaceholders(user.getPlayer(), skullMeta.getOwner()));
            }
        }
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookHMCCosmetics.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookHMCCosmetics.java
@@ -13,6 +13,7 @@ import org.jetbrains.annotations.NotNull;
 public class HookHMCCosmetics extends Hook {
    public HookHMCCosmetics() {
        super("HMCCosmetics", HookFlag.ITEM_SUPPORT);
+        setActive(true);
    }

    /**
@@ -24,5 +25,4 @@ public class HookHMCCosmetics extends Hook {
        if (cosmetic == null) return null;
        return cosmetic.getItem();
    }
-}
-
+}
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/placeholders/HMCPlaceholderExpansion.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/placeholders/HMCPlaceholderExpansion.java
@@ -122,7 +122,8 @@ public class HMCPlaceholderExpansion extends PlaceholderExpansion {
                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));
                    }

@@ -150,7 +151,7 @@ public class HMCPlaceholderExpansion extends PlaceholderExpansion {
                if (placeholderArgs.size() >= 2) {
                    String args1 = placeholderArgs.get(1).toUpperCase(); // changes offhand to OFFHAND

-                    if (!EnumUtils.isValidEnum(CosmeticSlot.class, args1)) return null;
+                    if (!CosmeticSlot.contains(args1)) return null;

                    CosmeticSlot slot = CosmeticSlot.valueOf(args1);
                    int amount = 0;
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGListener.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGListener.java
@@ -39,15 +39,14 @@ public class WGListener implements Listener {
            if (protectedRegion.getFlags().containsKey(WGHook.getCosmeticEnableFlag())) {
                if (protectedRegion.getFlags().get(WGHook.getCosmeticEnableFlag()).toString().equalsIgnoreCase("ALLOW")) {
                    user.showCosmetics(CosmeticUser.HiddenReason.WORLDGUARD);
-                    return;
+                } 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);
+                user.enterWardrobe(wardrobe, true);
            }
        }
    }
@@ -75,7 +74,7 @@ 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);
            }
        }
    }
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerConnectionListener.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerConnectionListener.java
@@ -4,6 +4,7 @@ import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.config.DatabaseSettings;
 import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.database.Database;
+import com.hibiscusmc.hmccosmetics.database.UserData;
 import com.hibiscusmc.hmccosmetics.gui.Menus;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
@@ -17,6 +18,8 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.jetbrains.annotations.NotNull;

+import java.util.UUID;
+
 public class PlayerConnectionListener implements Listener {

    @EventHandler(priority = EventPriority.MONITOR)
@@ -33,17 +36,24 @@ public class PlayerConnectionListener implements Listener {
                );
        }

+        // This literally makes me want to end it all but I can't do that so I'll just cry instead
        Runnable run = () -> {
            if (!event.getPlayer().isOnline()) return; // If a player is no longer online, don't run this.
-            CosmeticUser user = Database.get(event.getPlayer().getUniqueId());
-            CosmeticUsers.addUser(user);
-            MessagesUtil.sendDebugMessages("Run User Join");
+            UUID uuid = event.getPlayer().getUniqueId();
+            Database.get(uuid).thenAccept(data -> {
+                if (data == null) return;
+                Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
+                    CosmeticUser cosmeticUser = new CosmeticUser(uuid, data);
+                    CosmeticUsers.addUser(cosmeticUser);
+                    MessagesUtil.sendDebugMessages("Run User Join for " + uuid);

-            // And finally, launch an update for the cosmetics they have.
-            Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
-                if (user.getPlayer() == null) return;
-                user.updateCosmetic();
-            }, 4);
+                    // And finally, launch an update for the cosmetics they have.
+                    Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
+                        if (cosmeticUser.getPlayer() == null) return;
+                        cosmeticUser.updateCosmetic();
+                    }, 4);
+                });
+            });
        };

        if (DatabaseSettings.isEnabledDelay()) {
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java
@@ -19,16 +19,15 @@ import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType;
 import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
 import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticEmoteType;
 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 com.hibiscusmc.hmccosmetics.user.manager.UserEmoteManager;
 import com.hibiscusmc.hmccosmetics.user.manager.UserWardrobeManager;
 import com.hibiscusmc.hmccosmetics.util.HMCCInventoryUtils;
+import com.hibiscusmc.hmccosmetics.util.HMCCServerUtils;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.hibiscusmc.hmccosmetics.util.packets.HMCCPacketManager;
 import me.lojosho.hibiscuscommons.api.events.*;
-import me.lojosho.hibiscuscommons.hooks.items.HookItemAdder;
 import me.lojosho.hibiscuscommons.util.packets.PacketManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -51,8 +50,6 @@ import org.bukkit.persistence.PersistentDataType;
 import org.bukkit.potion.PotionEffectType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.spigotmc.event.entity.EntityDismountEvent;
-import org.spigotmc.event.entity.EntityMountEvent;

 import java.util.*;

@@ -66,10 +63,7 @@ public class PlayerGameListener implements Listener {
        registerPlayerArmListener();
        registerEntityUseListener();
        registerSlotChangeListener();
-
-        //registerLookMovement();
-        //registerMoveListener();
-        //registerTeleportMovement();
+        registerPassengerSetListener();
    }

    @EventHandler(priority = EventPriority.LOW)
@@ -111,7 +105,7 @@ public class PlayerGameListener implements Listener {
        if (!event.isSneaking()) return;
        if (!user.isInWardrobe()) return;

-        user.leaveWardrobe();
+        user.leaveWardrobe(false);
    }

    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
@@ -125,7 +119,7 @@ public class PlayerGameListener implements Listener {
        }

        if (user.isInWardrobe()) {
-            user.leaveWardrobe();
+            user.leaveWardrobe(false);
        }

        Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
@@ -202,7 +196,7 @@ public class PlayerGameListener implements Listener {
                event.setCancelled(true);
                return;
            }
-            if (WardrobeSettings.isDamagedKicked()) user.leaveWardrobe();
+            if (WardrobeSettings.isDamagedKicked()) user.leaveWardrobe(false);
        }
    }

@@ -345,7 +339,7 @@ public class PlayerGameListener implements Listener {
        CosmeticUser user = CosmeticUsers.getUser(event.getEntity());
        if (user == null) return;

-        if (user.isInWardrobe()) user.leaveWardrobe();
+        if (user.isInWardrobe()) user.leaveWardrobe(false);

        if (Settings.isUnapplyOnDeath() && !event.getEntity().hasPermission("hmccosmetics.unapplydeath.bypass")) {
            user.removeCosmetics();
@@ -379,6 +373,10 @@ public class PlayerGameListener implements Listener {
    public void onPlayerCosmeticEquip(PlayerCosmeticPostEquipEvent event) {
        CosmeticUser user = event.getUser();
        if (user.isInWardrobe() && event.getCosmetic().getSlot().equals(CosmeticSlot.BALLOON)) {
+            if (user.getBalloonManager() == null) {
+                MessagesUtil.sendDebugMessages("Balloon Manager is null? " + user.getEntity().getName());
+                return;
+            }
            CosmeticBalloonType cosmetic = (CosmeticBalloonType) event.getCosmetic();
            Location npclocation = user.getWardrobeManager().getNpcLocation().clone().add(cosmetic.getBalloonOffset());
            // We know that no other entity besides a regular player will be in the wardrobe
@@ -425,21 +423,6 @@ public class PlayerGameListener implements Listener {
        user.showCosmetics(CosmeticUser.HiddenReason.PLUGIN);
    }

-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onHookReload(HibiscusHookReload event) {
-        if (event.getHook() instanceof HookItemAdder hook) {
-            switch (event.getReloadType()) {
-                case INITIAL -> {
-                    HMCCosmeticsPlugin.setup();
-                }
-                case RELOAD -> {
-                    if (!Settings.isItemsAdderChangeReload()) return;
-                    HMCCosmeticsPlugin.setup();
-                }
-            }
-        }
-    }
-
    // These emote mostly handles emotes from other plugins, such as ItemsAdder
    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
    public void onPlayerPlayEmote(HibiscusPlayerEmotePlayEvent event) {
@@ -455,6 +438,22 @@ public class PlayerGameListener implements Listener {
        user.showCosmetics(CosmeticUser.HiddenReason.EMOTE);
    }

+    @EventHandler(priority = EventPriority.LOW)
+    public void onPlayerHibiscusPose(HibiscusPlayerPoseEvent event) {
+        if (event.isGettingUp()) return;
+        CosmeticUser user = CosmeticUsers.getUser(event.getPlayer());
+        if (user == null) return;
+        user.hideCosmetics(CosmeticUser.HiddenReason.PLUGIN);
+    }
+
+    @EventHandler(priority = EventPriority.LOW)
+    public void onPlayerHibiscusGetUpPose(HibiscusPlayerPoseEvent event) {
+        if (!event.isGettingUp()) return;
+        CosmeticUser user = CosmeticUsers.getUser(event.getPlayer());
+        if (user == null) return;
+        user.showCosmetics(CosmeticUser.HiddenReason.PLUGIN);
+    }
+
    private void registerInventoryClickListener() {
        ProtocolLibrary.getProtocolManager().addPacketListener(new PacketAdapter(HMCCosmeticsPlugin.getInstance(), ListenerPriority.NORMAL, PacketType.Play.Client.WINDOW_CLICK) {
            @Override
@@ -585,6 +584,7 @@ public class PlayerGameListener implements Listener {
                    switch (pair.getFirst()) {
                        case MAINHAND -> {
                            if (user.getPlayer() == event.getPlayer()) continue; // When a player scrolls real fast, it messes up the mainhand. This fixes it
+                            if (user.getPlayer() != null && user.getPlayer().isInvisible()) continue; // Fixes integration with GSit still showing mainhand even when hidden
                            armor.set(i, new Pair<>(pair.getFirst(), user.getPlayer().getInventory().getItemInMainHand()));
                        }
                        default -> {
@@ -630,6 +630,37 @@ public class PlayerGameListener implements Listener {
        });
    }

+    private void registerPassengerSetListener() {
+        ProtocolLibrary.getProtocolManager().addPacketListener(new PacketAdapter(HMCCosmeticsPlugin.getInstance(), ListenerPriority.NORMAL, PacketType.Play.Server.MOUNT) {
+            @Override
+            public void onPacketSending(PacketEvent event) {
+                CosmeticUser viewerUser = CosmeticUsers.getUser(event.getPlayer().getUniqueId());
+                if (viewerUser == null) return;
+                if (viewerUser.isInWardrobe()) return;
+
+                int ownerId = event.getPacket().getIntegers().read(0);
+                MessagesUtil.sendDebugMessages("Mount Packet Sent - Read - EntityID: " + ownerId);
+                Entity entity = HMCCServerUtils.getEntity(ownerId);
+                if (entity == null) return;
+
+                CosmeticUser user = CosmeticUsers.getUser(entity.getUniqueId());
+                if (user == null) return;
+                MessagesUtil.sendDebugMessages("Mount Packet Sent - " + user.getUniqueId());
+
+                if (!user.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) return;
+                if (user.getUserBackpackManager() == null) return;
+
+                // Basically, take the original passengers and "bump" them to the end of the list
+                int[] originalPassengers = event.getPacket().getIntegerArrays().read(0);
+                List<Integer> passengers = new ArrayList<>(user.getUserBackpackManager().getEntityManager().getIds());
+
+                passengers.addAll(Arrays.stream(originalPassengers).boxed().toList());
+
+                event.getPacket().getIntegerArrays().write(0, passengers.stream().mapToInt(Integer::intValue).toArray());
+            }
+        });
+    }
+
    private void registerPlayerArmListener() {
        ProtocolLibrary.getProtocolManager().addPacketListener(new PacketAdapter(HMCCosmeticsPlugin.getInstance(), ListenerPriority.NORMAL, PacketType.Play.Client.ARM_ANIMATION) {
            @Override
@@ -667,62 +698,6 @@ public class PlayerGameListener implements Listener {
        });
    }

-    private void registerLookMovement() {
-        ProtocolLibrary.getProtocolManager().addPacketListener(new PacketAdapter(HMCCosmeticsPlugin.getInstance(), ListenerPriority.NORMAL, PacketType.Play.Client.LOOK) {
-            @Override
-            public void onPacketReceiving(PacketEvent event) {
-                // TODO: Finish
-                MessagesUtil.sendDebugMessages("Look Packet ");
-                Player player = event.getPlayer();
-                if (event.getPlayer() == null) return;
-                CosmeticUser user = CosmeticUsers.getUser(player);
-                if (user == null) return;
-                if (user.isBackpackSpawned()) {
-                    user.getUserBackpackManager().getEntityManager().setRotation(Math.round(event.getPacket().getFloat().read(0)));
-                }
-            }
-        });
-    }
-
-    private void registerMoveListener() {
-        ProtocolLibrary.getProtocolManager().addPacketListener(new PacketAdapter(HMCCosmeticsPlugin.getInstance(), ListenerPriority.NORMAL, PacketType.Play.Client.POSITION) {
-            @Override
-            public void onPacketReceiving(PacketEvent event) {
-                // TODO: Finish
-                MessagesUtil.sendDebugMessages("Position Packet ");
-                Player player = event.getPlayer();
-                if (event.getPlayer() == null) return;
-                CosmeticUser user = CosmeticUsers.getUser(player);
-                if (user == null) return;
-                if (user.isBackpackSpawned()) {
-                    // The yaw follows the head, which makes it look weird and do weird things when moving around
-                    user.getUserBackpackManager().getEntityManager().teleport(new Location(player.getWorld(), event.getPacket().getDoubles().read(0), event.getPacket().getDoubles().read(1), event.getPacket().getDoubles().read(2), event.getPacket().getFloat().read(0), event.getPacket().getFloat().read(1)));
-                }
-            }
-        });
-    }
-
-    private void registerTeleportMovement() {
-        ProtocolLibrary.getProtocolManager().addPacketListener(new PacketAdapter(HMCCosmeticsPlugin.getInstance(), ListenerPriority.NORMAL, PacketType.Play.Client.POSITION_LOOK) {
-            @Override
-            public void onPacketReceiving(PacketEvent event) {
-                // TODO: Finish
-                MessagesUtil.sendDebugMessages("Teleport Packet ");
-                Player player = event.getPlayer();
-                if (event.getPlayer() == null) return;
-                CosmeticUser user = CosmeticUsers.getUser(player);
-                if (user == null) return;
-                if (user.isBackpackSpawned()) {
-                    Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> user.updateCosmetic(CosmeticSlot.BACKPACK));
-                }
-            }
-        });
-    }
-
-
-
-
-
    @Nullable
    private EquipmentSlot getArmorSlot(final Material material) {
        for (final EquipmentSlot slot : EquipmentSlot.values()) {
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/ServerListener.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/ServerListener.java
@@ -0,0 +1,38 @@
+package com.hibiscusmc.hmccosmetics.listener;
+
+import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
+import com.hibiscusmc.hmccosmetics.config.Settings;
+import me.lojosho.hibiscuscommons.api.events.HibiscusHookReload;
+import me.lojosho.hibiscuscommons.api.events.HibiscusHooksAllActiveEvent;
+import me.lojosho.hibiscuscommons.hooks.Hook;
+import me.lojosho.hibiscuscommons.hooks.items.HookItemAdder;
+import me.lojosho.hibiscuscommons.hooks.items.HookNexo;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+public class ServerListener implements Listener {
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onHookReload(HibiscusHookReload event) {
+        Hook hook = event.getHook();
+        HibiscusHookReload.ReloadType reloadType = event.getReloadType();
+        if (hook instanceof HookItemAdder) {
+            if (reloadType == HibiscusHookReload.ReloadType.RELOAD) {
+                if (!Settings.isItemsAdderChangeReload()) return;
+                HMCCosmeticsPlugin.setup();
+            }
+        }
+        if (hook instanceof HookNexo) {
+            if (reloadType == HibiscusHookReload.ReloadType.RELOAD) {
+                if (!Settings.isNexoChangeReload()) return;
+                HMCCosmeticsPlugin.setup();
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onAllHooksReady(HibiscusHooksAllActiveEvent event) {
+        HMCCosmeticsPlugin.setup();
+    }
+}
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java
@@ -13,6 +13,7 @@ import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticArmorType;
 import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType;
 import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
 import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticMainhandType;
+import com.hibiscusmc.hmccosmetics.database.UserData;
 import com.hibiscusmc.hmccosmetics.gui.Menus;
 import com.hibiscusmc.hmccosmetics.user.manager.UserBackpackManager;
 import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager;
@@ -20,11 +21,11 @@ import com.hibiscusmc.hmccosmetics.user.manager.UserEmoteManager;
 import com.hibiscusmc.hmccosmetics.user.manager.UserWardrobeManager;
 import com.hibiscusmc.hmccosmetics.util.HMCCInventoryUtils;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
-import com.hibiscusmc.hmccosmetics.util.HMCCPlayerUtils;
 import com.hibiscusmc.hmccosmetics.util.packets.HMCCPacketManager;
 import lombok.Getter;
 import me.lojosho.hibiscuscommons.hooks.Hooks;
 import me.lojosho.hibiscuscommons.util.InventoryUtils;
+import me.lojosho.hibiscuscommons.util.ServerUtils;
 import me.lojosho.hibiscuscommons.util.packets.PacketManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Color;
@@ -38,6 +39,7 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.*;
 import org.bukkit.persistence.PersistentDataType;
 import org.bukkit.scheduler.BukkitTask;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

 import java.util.*;
@@ -58,7 +60,6 @@ public class CosmeticUser {

    // Cosmetic Settings/Toggles
    private final ArrayList<HiddenReason> hiddenReason = new ArrayList<>();
-    private final HashMap<CosmeticSlot, ItemStack> cachedCosmeticItems = new HashMap<>();
    private final HashMap<CosmeticSlot, Color> colors = new HashMap<>();

    public CosmeticUser(UUID uuid) {
@@ -67,10 +68,19 @@ public class CosmeticUser {
        tick();
    }

+    public CosmeticUser(UUID uuid, UserData data) {
+        this.uniqueId = uuid;
+        userEmoteManager = new UserEmoteManager(this);
+        loadData(data);
+        tick();
+    }
+
    private void tick() {
        // Occasionally updates the entity cosmetics
        Runnable run = () -> {
            MessagesUtil.sendDebugMessages("Tick[uuid=" + uniqueId + "]", Level.INFO);
+            if (Hooks.isInvisible(uniqueId)) hideCosmetics(HiddenReason.VANISH);
+            else showCosmetics(HiddenReason.VANISH);
            updateCosmetic();
            if (isHidden() && !getUserEmoteManager().isPlayingEmote() && !getCosmetics().isEmpty()) MessagesUtil.sendActionBar(getPlayer(), "hidden-cosmetics");
        };
@@ -88,6 +98,54 @@ public class CosmeticUser {
        despawnBalloon();
    }

+    public void loadData(@NotNull UserData data) {
+        boolean permissionCheck = Settings.isForcePermissionJoin();
+
+        for (Map.Entry<CosmeticSlot, Map.Entry<Cosmetic, Integer>> entry : data.getCosmetics().entrySet()) {
+            Cosmetic cosmetic = entry.getValue().getKey();
+            Color color = entry.getValue().getValue() == -1 ? null : Color.fromRGB(entry.getValue().getValue());
+
+            if (permissionCheck && cosmetic.requiresPermission()) {
+                if (getPlayer() != null && !getPlayer().hasPermission(cosmetic.getPermission())) {
+                    continue;
+                }
+            }
+            addPlayerCosmetic(cosmetic, color);
+        }
+
+        if (!hiddenReason.isEmpty()) {
+            for (CosmeticUser.HiddenReason reason : hiddenReason) silentlyAddHideFlag(reason);
+        } else {
+            for (HiddenReason reason : data.getHiddenReasons()) {
+                if (getPlayer() != null && Settings.isDisabledGamemodesEnabled() && Settings.getDisabledGamemodes().contains(getPlayer().getGameMode().toString())) {
+                    MessagesUtil.sendDebugMessages("Hiding Cosmetics due to gamemode");
+                    hideCosmetics(CosmeticUser.HiddenReason.GAMEMODE);
+                    return;
+                } else {
+                    if (isHidden(CosmeticUser.HiddenReason.GAMEMODE)) {
+                        MessagesUtil.sendDebugMessages("Join Gamemode Check: Showing Cosmetics");
+                        showCosmetics(CosmeticUser.HiddenReason.GAMEMODE);
+                        return;
+                    }
+                }
+                // Handle world check
+                if (getPlayer() != null && Settings.getDisabledWorlds().contains(getPlayer().getWorld().getName())) {
+                    MessagesUtil.sendDebugMessages("Hiding Cosmetics due to world");
+                    hideCosmetics(CosmeticUser.HiddenReason.WORLD);
+                } else {
+                    if (isHidden(CosmeticUser.HiddenReason.WORLD)) {
+                        MessagesUtil.sendDebugMessages("Join World Check: Showing Cosmetics");
+                        showCosmetics(CosmeticUser.HiddenReason.WORLD);
+                    }
+                }
+                if (Settings.isAllPlayersHidden()) {
+                    hideCosmetics(CosmeticUser.HiddenReason.DISABLED);
+                }
+                silentlyAddHideFlag(reason);
+            }
+        }
+    }
+
    public Cosmetic getCosmetic(CosmeticSlot slot) {
        return playerCosmetics.get(slot);
    }
@@ -96,11 +154,11 @@ public class CosmeticUser {
        return ImmutableList.copyOf(playerCosmetics.values());
    }

-    public void addPlayerCosmetic(Cosmetic cosmetic) {
+    public void addPlayerCosmetic(@NotNull Cosmetic cosmetic) {
        addPlayerCosmetic(cosmetic, null);
    }

-    public void addPlayerCosmetic(Cosmetic cosmetic, Color color) {
+    public void addPlayerCosmetic(@NotNull Cosmetic cosmetic, @Nullable Color color) {
        // API
        PlayerCosmeticEquipEvent event = new PlayerCosmeticEquipEvent(this, cosmetic);
        Bukkit.getPluginManager().callEvent(event);
@@ -134,7 +192,7 @@ public class CosmeticUser {

    public void removeCosmetics() {
        // Small optimization could be made, but Concurrent modification prevents us from both getting and removing
-        for (CosmeticSlot slot : CosmeticSlot.values()) {
+        for (CosmeticSlot slot : CosmeticSlot.values().values()) {
            removeCosmeticSlot(slot);
        }
    }
@@ -157,7 +215,6 @@ public class CosmeticUser {
        if (slot == CosmeticSlot.EMOTE) {
            if (getUserEmoteManager().isPlayingEmote()) getUserEmoteManager().stopEmote(UserEmoteManager.StopEmoteReason.UNEQUIP);
        }
-        cachedCosmeticItems.remove(slot);
        colors.remove(slot);
        playerCosmetics.remove(slot);
        removeArmor(slot);
@@ -213,7 +270,7 @@ public class CosmeticUser {
            }
        }
        if (items.isEmpty() || getEntity() == null) return;
-        PacketManager.equipmentSlotUpdate(getEntity().getEntityId(), items, HMCCPlayerUtils.getNearbyPlayers(getEntity().getLocation()));
+        PacketManager.equipmentSlotUpdate(getEntity().getEntityId(), items, ServerUtils.getViewers(getEntity()));
        MessagesUtil.sendDebugMessages("updateCosmetic (All) - end - " + items.size());
    }

@@ -223,16 +280,12 @@ public class CosmeticUser {
        return getUserCosmeticItem(cosmetic);
    }

-    public ItemStack getUserCosmeticItem(Cosmetic cosmetic) {
+    public ItemStack getUserCosmeticItem(@NotNull Cosmetic cosmetic) {
        ItemStack item = null;
        if (!hiddenReason.isEmpty()) {
            if (cosmetic instanceof CosmeticBackpackType || cosmetic instanceof CosmeticBalloonType) return new ItemStack(Material.AIR);
            return getPlayer().getInventory().getItem(HMCCInventoryUtils.getEquipmentSlot(cosmetic.getSlot()));
        }
-        // Check if the item is cached. This helps with performance as we don't need to keep recreating the item
-        if (cachedCosmeticItems.containsKey(cosmetic.getSlot())) {
-            return cachedCosmeticItems.get(cosmetic.getSlot());
-        }
        if (cosmetic instanceof CosmeticArmorType armorType) {
            item = armorType.getItem(this, cosmetic.getItem());
        }
@@ -250,15 +303,11 @@ public class CosmeticUser {
    }

    @SuppressWarnings("deprecation")
-    public ItemStack getUserCosmeticItem(Cosmetic cosmetic, ItemStack item) {
+    public ItemStack getUserCosmeticItem(@NotNull Cosmetic cosmetic, @Nullable ItemStack item) {
        if (item == null) {
            //MessagesUtil.sendDebugMessages("GetUserCosemticUser Item is null");
            return new ItemStack(Material.AIR);
        }
-        // Check if the item is cached. This helps with performance as we don't need to keep recreating the item
-        if (cachedCosmeticItems.containsKey(cosmetic.getSlot())) {
-            return cachedCosmeticItems.get(cosmetic.getSlot());
-        }
        if (item.hasItemMeta()) {
            ItemMeta itemMeta = item.getItemMeta();

@@ -285,18 +334,22 @@ public class CosmeticUser {
                itemMeta = skullMeta;
            }

-            List<String> processedLore = new ArrayList<>();
-
-            if (itemMeta.hasLore()) {
-                for (String loreLine : itemMeta.getLore()) {
-                    processedLore.add(Hooks.processPlaceholders(getPlayer(), loreLine));
+            if (Settings.isItemProcessingDisplayName()) {
+                if (itemMeta.hasDisplayName()) {
+                    String displayName = itemMeta.getDisplayName();
+                    itemMeta.setDisplayName(Hooks.processPlaceholders(getPlayer(), displayName));
                }
            }
-            if (itemMeta.hasDisplayName()) {
-                String displayName = itemMeta.getDisplayName();
-                itemMeta.setDisplayName(Hooks.processPlaceholders(getPlayer(), displayName));
+            if (Settings.isItemProcessingLore()) {
+                List<String> processedLore = new ArrayList<>();
+                if (itemMeta.hasLore()) {
+                    for (String loreLine : itemMeta.getLore()) {
+                        processedLore.add(Hooks.processPlaceholders(getPlayer(), loreLine));
+                    }
+                }
+                itemMeta.setLore(processedLore);
            }
-            itemMeta.setLore(processedLore);
+

            if (colors.containsKey(cosmetic.getSlot())) {
                Color color = colors.get(cosmetic.getSlot());
@@ -322,7 +375,6 @@ public class CosmeticUser {

            item.setItemMeta(itemMeta);
        }
-        cachedCosmeticItems.put(cosmetic.getSlot(), item);
        return item;
    }

@@ -334,7 +386,22 @@ public class CosmeticUser {
        return userWardrobeManager;
    }

-    public void enterWardrobe(boolean ignoreDistance, Wardrobe wardrobe) {
+    /**
+     * Use {@link #enterWardrobe(Wardrobe, boolean)} instead.
+     * @param ignoreDistance
+     * @param wardrobe
+     */
+    @Deprecated(forRemoval = true, since = "2.7.5")
+    public void enterWardrobe(boolean ignoreDistance, @NotNull Wardrobe wardrobe) {
+        enterWardrobe(wardrobe, ignoreDistance);
+    }
+
+    /**
+     * This method is used to enter a wardrobe. You can listen to the {@link PlayerWardrobeEnterEvent} to cancel the event or modify any data.
+     * @param wardrobe The wardrobe to enter. Use {@link WardrobeSettings#getWardrobe(String)} to get pre-existing wardrobe or use your own by {@link Wardrobe}.
+     * @param ignoreDistance If true, the player can enter the wardrobe from any distance. If false, the player must be within the distance set in the wardrobe (If wardrobe has a distance of 0 or lower, the player can enter from any distance).
+     */
+    public void enterWardrobe(@NotNull Wardrobe wardrobe, boolean ignoreDistance) {
        if (wardrobe.hasPermission() && !getPlayer().hasPermission(wardrobe.getPermission())) {
            MessagesUtil.sendMessage(getPlayer(), "no-permission");
            return;
@@ -360,10 +427,18 @@ public class CosmeticUser {
        }
    }

+    /**
+     * Use {@link #leaveWardrobe(boolean)} instead.
+     */
+    @Deprecated(forRemoval = true, since = "2.7.5")
    public void leaveWardrobe() {
        leaveWardrobe(false);
    }

+    /**
+     * Causes the player to leave the wardrobe. If a player is not in the wardrobe, this will do nothing, use (@{@link #isInWardrobe()} to check if they are).
+     * @param ejected If true, the player was ejected from the wardrobe (Skips transition). If false, the player left the wardrobe normally.
+     */
    public void leaveWardrobe(boolean ejected) {
        PlayerWardrobeLeaveEvent event = new PlayerWardrobeLeaveEvent(this);
        Bukkit.getPluginManager().callEvent(event);
@@ -394,6 +469,10 @@ public class CosmeticUser {
        }
    }

+    /**
+     * This checks if the player is in a wardrobe. If they are, it will return true, else false. See {@link #getWardrobeManager()} to get the wardrobe manager.
+     * @return If the player is in a wardrobe.
+     */
    public boolean isInWardrobe() {
        return userWardrobeManager != null;
    }
@@ -435,10 +514,6 @@ public class CosmeticUser {

    public void despawnBalloon() {
        if (this.userBalloonManager == null) return;
-        List<Player> sentTo = HMCCPlayerUtils.getNearbyPlayers(getEntity().getLocation());
-
-        HMCCPacketManager.sendEntityDestroyPacket(userBalloonManager.getPufferfishBalloonId(), sentTo);
-
        this.userBalloonManager.remove();
        this.userBalloonManager = null;
    }
@@ -465,9 +540,9 @@ public class CosmeticUser {
        EquipmentSlot equipmentSlot = HMCCInventoryUtils.getEquipmentSlot(slot);
        if (equipmentSlot == null) return;
        if (getPlayer() != null) {
-            PacketManager.equipmentSlotUpdate(getEntity().getEntityId(), equipmentSlot, getPlayer().getInventory().getItem(equipmentSlot), HMCCPlayerUtils.getNearbyPlayers(getEntity().getLocation()));
+            PacketManager.equipmentSlotUpdate(getEntity().getEntityId(), equipmentSlot, getPlayer().getInventory().getItem(equipmentSlot), ServerUtils.getViewers(getEntity()));
        } else {
-            HMCCPacketManager.equipmentSlotUpdate(getEntity().getEntityId(), this, slot, HMCCPlayerUtils.getNearbyPlayers(getEntity().getLocation()));
+            HMCCPacketManager.equipmentSlotUpdate(getEntity().getEntityId(), this, slot, ServerUtils.getViewers(getEntity()));
        }
    }

@@ -576,7 +651,7 @@ public class CosmeticUser {
            if (!isBalloonSpawned()) respawnBalloon();
            CosmeticBalloonType balloonType = (CosmeticBalloonType) getCosmetic(CosmeticSlot.BALLOON);
            getBalloonManager().addPlayerToModel(this, balloonType);
-            List<Player> viewer = HMCCPlayerUtils.getNearbyPlayers(getEntity().getLocation());
+            List<Player> viewer = ServerUtils.getViewers(getEntity());
            HMCCPacketManager.sendLeashPacket(getBalloonManager().getPufferfishBalloonId(), getPlayer().getEntityId(), viewer);
        }
        if (hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
@@ -619,6 +694,7 @@ public class CosmeticUser {
        NONE,
        WORLDGUARD,
        PLUGIN,
+        VANISH,
        POTION,
        ACTION,
        COMMAND,
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBackpackManager.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBackpackManager.java
@@ -1,6 +1,5 @@
 package com.hibiscusmc.hmccosmetics.user.manager;

-import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
 import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
@@ -8,12 +7,10 @@ import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.hibiscusmc.hmccosmetics.util.packets.HMCCPacketManager;
 import com.ticxo.modelengine.api.ModelEngineAPI;
 import lombok.Getter;
-import lombok.Setter;
 import me.lojosho.hibiscuscommons.hooks.Hooks;
 import me.lojosho.hibiscuscommons.util.ServerUtils;
 import me.lojosho.hibiscuscommons.util.packets.PacketManager;
 import org.bukkit.Material;
-import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
@@ -36,13 +33,10 @@ public class UserBackpackManager {
    private final CosmeticUser user;
    @Getter
    private UserEntity entityManager;
-    @Getter @Setter
-    private boolean inBlock;

    public UserBackpackManager(CosmeticUser user) {
        this.user = user;
        this.backpackHidden = false;
-        this.inBlock = false;
        this.invisibleArmorStand = ServerUtils.getNextEntityId();
        this.entityManager = new UserEntity(user.getUniqueId());
        if (user.getEntity() != null) this.entityManager.refreshViewers(user.getEntity().getLocation()); // Fixes an issue where a player, who somehow removes their potions, but doesn't have an entity produces an NPE (it's dumb)
@@ -63,17 +57,7 @@ public class UserBackpackManager {
        getEntityManager().teleport(user.getEntity().getLocation());
        List<Player> outsideViewers = getEntityManager().getViewers();
        HMCCPacketManager.sendEntitySpawnPacket(user.getEntity().getLocation(), getFirstArmorStandId(), EntityType.ARMOR_STAND, UUID.randomUUID(), getEntityManager().getViewers());
-        if (Settings.isBackpackBlockDetection()) {
-            if (checkBlock()) {
-                setInBlock(true);
-                HMCCPacketManager.sendArmorstandMetadata(getFirstArmorStandId(), isInBlock(), outsideViewers);
-            } else {
-                HMCCPacketManager.sendArmorstandMetadata(getFirstArmorStandId(), isInBlock(), outsideViewers);
-            }
-            //refreshBlock(outsideViewers);
-        } else {
-            HMCCPacketManager.sendArmorstandMetadata(getFirstArmorStandId(), Settings.isBackpackLightEmination(), outsideViewers);
-        }
+        HMCCPacketManager.sendArmorstandMetadata(getFirstArmorStandId(), outsideViewers);

        Entity entity = user.getEntity();

@@ -106,20 +90,6 @@ public class UserBackpackManager {
        PacketManager.equipmentSlotUpdate(getFirstArmorStandId(), EquipmentSlot.HEAD, user.getUserCosmeticItem(cosmeticBackpackType), outsideViewers);
        HMCCPacketManager.sendRidingPacket(entity.getEntityId(), passengerIDs, outsideViewers);

-        // No one should be using ME because it barely works but some still use it, so it's here
-        if (cosmeticBackpackType.getModelName() != null && Hooks.isActiveHook("ModelEngine")) {
-            if (ModelEngineAPI.getBlueprint(cosmeticBackpackType.getModelName()) == null) {
-                MessagesUtil.sendDebugMessages("Invalid Model Engine Blueprint " + cosmeticBackpackType.getModelName(), Level.SEVERE);
-                return;
-            }
-            /* TODO: Readd ModelEngine support
-            ModeledEntity modeledEntity = ModelEngineAPI.createModeledEntity(new PacketBaseEntity(getFirstArmorStandId(), UUID.randomUUID(), entity.getLocation()));
-            ActiveModel model = ModelEngineAPI.createActiveModel(ModelEngineAPI.getBlueprint(cosmeticBackpackType.getModelName()));
-            model.setCanHurt(false);
-            modeledEntity.addModel(model, false);
-             */
-        }
-
        MessagesUtil.sendDebugMessages("spawnBackpack Bukkit - Finish");
    }

@@ -163,33 +133,4 @@ public class UserBackpackManager {
        ItemStack item = new ItemStack(Material.AIR);
        PacketManager.equipmentSlotUpdate(getFirstArmorStandId(), EquipmentSlot.HEAD, item, getEntityManager().getViewers());
    }
-
-    /**
-     * Refreshes the block detection for the backpack
-     * @param outsideViewers
-     * @return true if the entity was updated, false if not
-     */
-    public boolean refreshBlock(List<Player> outsideViewers) {
-        if (Settings.isBackpackBlockDetection()) {
-            if (isInBlock() && checkBlock()) {
-                HMCCPacketManager.sendArmorstandMetadata(getFirstArmorStandId(), false, outsideViewers);
-                setInBlock(false);
-                return true;
-            }
-            if (!isInBlock() && !checkBlock()) {
-                HMCCPacketManager.sendArmorstandMetadata(getFirstArmorStandId(), true, outsideViewers);
-                setInBlock(true);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public boolean checkBlock() {
-        if (Settings.isBackpackBlockDetection()) {
-            Block block = getEntityManager().getLocation().clone().add(0, 1.5, 0).getBlock();
-            return block.getType().isAir();
-        }
-        return false;
-    }
 }
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBalloonManager.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBalloonManager.java
@@ -11,6 +11,7 @@ import com.ticxo.modelengine.api.ModelEngineAPI;
 import com.ticxo.modelengine.api.entity.data.BukkitEntityData;
 import com.ticxo.modelengine.api.model.ActiveModel;
 import com.ticxo.modelengine.api.model.ModeledEntity;
+import com.ticxo.modelengine.api.nms.RenderParsers;
 import lombok.Getter;
 import me.lojosho.hibiscuscommons.hooks.Hooks;
 import me.lojosho.hibiscuscommons.nms.NMSHandlers;
@@ -30,16 +31,17 @@ import java.util.logging.Level;

 public class UserBalloonManager {

-    private CosmeticUser user;
+    private final CosmeticUser user;
    @Getter
    private BalloonType balloonType;
    private CosmeticBalloonType cosmeticBalloonType;
    @Getter
    private UserBalloonPufferfish pufferfish;
    private final ArmorStand modelEntity;
+
    public UserBalloonManager(CosmeticUser user, @NotNull Location location) {
        this.user = user;
-        this.pufferfish = new UserBalloonPufferfish(user.getUniqueId(), NMSHandlers.getHandler().getNextEntityId(), UUID.randomUUID());
+        this.pufferfish = new UserBalloonPufferfish(user.getUniqueId(), NMSHandlers.getHandler().getUtilHandler().getNextEntityId(), UUID.randomUUID());
        this.modelEntity = location.getWorld().spawn(location, ArmorStand.class, (e) -> {
            e.setInvisible(true);
            e.setGravity(false);
@@ -82,7 +84,7 @@ public class UserBalloonManager {
                modeledEntity.getModels().forEach((d, singleModel) -> {
                    if (cosmeticBalloonType.isDyablePart(d)) {
                        singleModel.setDefaultTint(color);
-                        singleModel.getModelRenderer().sendToClient();
+                        singleModel.getModelRenderer().sendToClient(ModelEngineAPI.getNMSHandler().createParsers());
                    }
                });
            }
@@ -98,6 +100,7 @@ public class UserBalloonManager {
    }

    public void remove() {
+        pufferfish.destroyPufferfish();
        if (balloonType == BalloonType.MODELENGINE) {
            final ModeledEntity entity = ModelEngineAPI.getModeledEntity(modelEntity);
            if (entity == null) {
@@ -156,6 +159,7 @@ public class UserBalloonManager {
    public int getPufferfishBalloonId() {
        return pufferfish.getPufferFishEntityId();
    }
+
    public UUID getPufferfishBalloonUniqueId() {
        return pufferfish.getUuid();
    }
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBalloonPufferfish.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBalloonPufferfish.java
@@ -3,7 +3,10 @@ package com.hibiscusmc.hmccosmetics.user.manager;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
 import com.hibiscusmc.hmccosmetics.util.HMCCPlayerUtils;
+import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.hibiscusmc.hmccosmetics.util.packets.HMCCPacketManager;
+import lombok.Getter;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
@@ -14,8 +17,11 @@ import java.util.UUID;

 public class UserBalloonPufferfish extends UserEntity {

-    private int pufferFishEntityId;
-    private UUID uuid;
+    @Getter
+    private final int pufferFishEntityId;
+    @Getter
+    private final UUID uuid;
+    private boolean destroyed = false;

    public UserBalloonPufferfish(UUID owner, int pufferFishEntityId, UUID uuid) {
        super(owner);
@@ -23,14 +29,6 @@ public class UserBalloonPufferfish extends UserEntity {
        this.uuid = uuid;
    }

-    public int getPufferFishEntityId() {
-        return pufferFishEntityId;
-    }
-
-    public UUID getUuid() {
-        return uuid;
-    }
-
    public void hidePufferfish() {
        HMCCPacketManager.sendEntityDestroyPacket(pufferFishEntityId, getViewers());
        getViewers().clear();
@@ -41,35 +39,15 @@ public class UserBalloonPufferfish extends UserEntity {
        HMCCPacketManager.sendInvisibilityPacket(pufferFishEntityId, sendTo);
    }

+    public void destroyPufferfish() {
+        HMCCPacketManager.sendEntityDestroyPacket(pufferFishEntityId, getViewers());
+        getViewers().clear();
+        destroyed = true;
+    }
+
    @Override
    public List<Player> refreshViewers(Location location) {
-        if (System.currentTimeMillis() - getViewerLastUpdate() <= 1000) return List.of(); //Prevents mass refreshes
-        ArrayList<Player> newPlayers = new ArrayList<>();
-        ArrayList<Player> removePlayers = new ArrayList<>();
-        List<Player> players = HMCCPlayerUtils.getNearbyPlayers(location);
-
-        for (Player player : players) {
-            CosmeticUser user = CosmeticUsers.getUser(player);
-            if (user != null && getOwner() != user.getUniqueId() && user.isInWardrobe()) { // Fixes issue where players in wardrobe would see other players cosmetics if they were not in wardrobe
-                removePlayers.add(player);
-                HMCCPacketManager.sendEntityDestroyPacket(getPufferFishEntityId(), List.of(player));
-                continue;
-            }
-            if (!getViewers().contains(player)) {
-                getViewers().add(player);
-                newPlayers.add(player);
-                continue;
-            }
-            // bad loopdy loops
-            for (Player viewerPlayer : getViewers()) {
-                if (!players.contains(viewerPlayer)) {
-                    removePlayers.add(viewerPlayer);
-                    HMCCPacketManager.sendEntityDestroyPacket(getPufferFishEntityId(), List.of(viewerPlayer));
-                }
-            }
-        }
-        getViewers().removeAll(removePlayers);
-        setViewerLastUpdate(System.currentTimeMillis());
-        return newPlayers;
+        if (destroyed) return List.of(); //Prevents refreshing a destroyed entity
+        return super.refreshViewers(location);
    }
 }
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserEntity.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserEntity.java
@@ -4,9 +4,12 @@ import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
 import com.hibiscusmc.hmccosmetics.util.HMCCPlayerUtils;
+import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.hibiscusmc.hmccosmetics.util.packets.HMCCPacketManager;
 import lombok.Getter;
 import lombok.Setter;
+import me.lojosho.hibiscuscommons.util.ServerUtils;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;

@@ -41,11 +44,16 @@ public class UserEntity {
        if (System.currentTimeMillis() - viewerLastUpdate <= 1000) return List.of(); //Prevents mass refreshes
        ArrayList<Player> newPlayers = new ArrayList<>();
        ArrayList<Player> removePlayers = new ArrayList<>();
-        List<Player> players = HMCCPlayerUtils.getNearbyPlayers(location);
+        Player ownerPlayer = Bukkit.getPlayer(owner);
+        if (ownerPlayer == null) {
+            MessagesUtil.sendDebugMessages("Owner is null (refreshViewers), returning empty list");
+            return List.of();
+        }
+        List<Player> players = ServerUtils.getViewers(ownerPlayer);

        for (Player player : players) {
            CosmeticUser user = CosmeticUsers.getUser(player);
-            if (user != null && owner != user.getUniqueId() && user.isInWardrobe()) { // Fixes issue where players in wardrobe would see other players cosmetics if they were not in wardrobe
+            if (user != null && owner != user.getUniqueId() && user.isInWardrobe() && !player.canSee(ownerPlayer)) { // Fixes issue where players in wardrobe would see other players cosmetics if they were not in wardrobe
                removePlayers.add(player);
                HMCCPacketManager.sendEntityDestroyPacket(ids, List.of(player));
                continue;
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserWardrobeManager.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserWardrobeManager.java
@@ -64,6 +64,7 @@ public class UserWardrobeManager {
    private BossBar bossBar;
    @Getter
    private boolean active;
+    @Setter
    @Getter
    private WardrobeStatus wardrobeStatus;
    @Getter
@@ -83,8 +84,11 @@ public class UserWardrobeManager {
        this.viewingLocation = wardrobeLocation.getViewerLocation();
        this.npcLocation = wardrobeLocation.getNpcLocation();

+        String defaultMenu = wardrobe.getDefaultMenu();
+        if (defaultMenu != null && Menus.hasMenu(defaultMenu)) this.lastOpenMenu = Menus.getMenu(defaultMenu);
+        else this.lastOpenMenu = Menus.getDefaultMenu();
+
        wardrobeStatus = WardrobeStatus.SETUP;
-        this.lastOpenMenu = Menus.getDefaultMenu();
    }

    public void start() {
@@ -129,7 +133,7 @@ public class UserWardrobeManager {
                HMCCPacketManager.sendFakePlayerSpawnPacket(npcLocation, WARDROBE_UUID, NPC_ID, viewer);
                HMCCPacketManager.sendPlayerOverlayPacket(NPC_ID, viewer);
                MessagesUtil.sendDebugMessages("Spawned Fake Player on " + npcLocation);
-                NMSHandlers.getHandler().hideNPCName(player, npcName);
+                NMSHandlers.getHandler().getPacketHandler().sendScoreboardHideNamePacket(player, npcName);
            }, 4);

            // Location
@@ -281,7 +285,7 @@ public class UserWardrobeManager {
        run.run();
    }

-    public void update() {
+    private void update() {
        final AtomicInteger data = new AtomicInteger();

        BukkitRunnable runnable = new BukkitRunnable() {
@@ -310,7 +314,7 @@ public class UserWardrobeManager {
                int nextyaw = HMCCServerUtils.getNextYaw(yaw, rotationSpeed);
                data.set(nextyaw);

-                for (CosmeticSlot slot : CosmeticSlot.values()) {
+                for (CosmeticSlot slot : CosmeticSlot.values().values()) {
                    HMCCPacketManager.equipmentSlotUpdate(NPC_ID, user, slot, viewer);
                }

@@ -343,10 +347,6 @@ public class UserWardrobeManager {
        runnable.runTaskTimer(HMCCosmeticsPlugin.getInstance(), 0, 2);
    }

-    public void setWardrobeStatus(WardrobeStatus status) {
-        this.wardrobeStatus = status;
-    }
-
    public enum WardrobeStatus {
        SETUP,
        STARTING,
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/util/HMCCInventoryUtils.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/util/HMCCInventoryUtils.java
@@ -12,10 +12,22 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;

 public class HMCCInventoryUtils {

+    private static final Map<CosmeticSlot, EquipmentSlot> SLOT_MAP = new HashMap<>();
+    static {
+        SLOT_MAP.put(CosmeticSlot.HELMET, EquipmentSlot.HEAD);
+        SLOT_MAP.put(CosmeticSlot.CHESTPLATE, EquipmentSlot.CHEST);
+        SLOT_MAP.put(CosmeticSlot.LEGGINGS, EquipmentSlot.LEGS);
+        SLOT_MAP.put(CosmeticSlot.BOOTS, EquipmentSlot.FEET);
+        SLOT_MAP.put(CosmeticSlot.OFFHAND, EquipmentSlot.OFF_HAND);
+        SLOT_MAP.put(CosmeticSlot.MAINHAND, EquipmentSlot.HAND);
+    }
+
    /**
     * Converts from the Bukkit item slots to ProtocolLib item slots. Will produce a null if an improper bukkit item slot is sent through
     * @param slot The BUKKIT item slot to convert.
@@ -63,6 +75,7 @@ public class HMCCInventoryUtils {
            case FEET -> CosmeticSlot.BOOTS;
            case OFFHAND -> CosmeticSlot.OFFHAND;
            case MAINHAND -> CosmeticSlot.MAINHAND;
+            default -> null;
        };
    }

@@ -131,29 +144,7 @@ public class HMCCInventoryUtils {
    @Contract(pure = true)
    @Nullable
    public static EquipmentSlot getEquipmentSlot(@NotNull CosmeticSlot slot) {
-        switch (slot) {
-            case HELMET -> {
-                return EquipmentSlot.HEAD;
-            }
-            case CHESTPLATE -> {
-                return EquipmentSlot.CHEST;
-            }
-            case LEGGINGS -> {
-                return EquipmentSlot.LEGS;
-            }
-            case BOOTS -> {
-                return EquipmentSlot.FEET;
-            }
-            case OFFHAND -> {
-                return EquipmentSlot.OFF_HAND;
-            }
-            case MAINHAND -> {
-                return EquipmentSlot.HAND;
-            }
-            default -> {
-                return null;
-            }
-        }
+        return SLOT_MAP.get(slot);
    }

    public static EquipmentSlot getEquipmentSlot(@NotNull EnumWrappers.ItemSlot slot) {
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/util/HMCCPlayerUtils.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/util/HMCCPlayerUtils.java
@@ -24,12 +24,24 @@ public class HMCCPlayerUtils {
        return new WrappedSignedProperty("textures", skinData.getValue(), skinData.getSignature());
    }

+    /**
+     * Get nearby players. {@link com.hibiscusmc.hmccosmetics.util.packets.HMCCPacketManager#getViewers(Location)}
+     * @param player
+     * @return
+     */
    @NotNull
+    @Deprecated(since = "2.7.5", forRemoval = true)
    public static List<Player> getNearbyPlayers(@NotNull Player player) {
        return getNearbyPlayers(player.getLocation());
    }

+    /**
+     * Get nearby players. {@link com.hibiscusmc.hmccosmetics.util.packets.HMCCPacketManager#getViewers(Location)}
+     * @param location
+     * @return
+     */
    @NotNull
+    @Deprecated(since = "2.7.5", forRemoval = true)
    public static List<Player> getNearbyPlayers(@NotNull Location location) {
        return PacketManager.getViewers(location, Settings.getViewDistance());
    }
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/util/HMCCServerUtils.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/util/HMCCServerUtils.java
@@ -33,7 +33,7 @@ public class HMCCServerUtils {
    }

    public static org.bukkit.entity.Entity getEntity(int entityId) {
-        return NMSHandlers.getHandler().getEntity(entityId);
+        return NMSHandlers.getHandler().getUtilHandler().getEntity(entityId);
    }

    /**
@@ -157,13 +157,4 @@ public class HMCCServerUtils {
        }
        return nextYaw;
    }
-
-    public static boolean hasClass(String className) {
-        try {
-            Class.forName(className);
-            return true;
-        } catch (ClassNotFoundException e) {
-            return false;
-        }
-    }
 }
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/util/misc/Utils.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/util/misc/Utils.java
@@ -1,118 +0,0 @@
-package com.hibiscusmc.hmccosmetics.util.misc;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Optional;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.Predicate;
-
-public class Utils {
-
-    /**
-     * @param original Object to be checked if null
-     * @param replacement Object returned if original is null
-     * @return original if not null, otherwise replacement
-     */
-
-    public static <T> T replaceIfNull(final @Nullable T original, final @NotNull T replacement) {
-        return replaceIfNull(original, replacement, t -> {
-        });
-    }
-
-    @SafeVarargs
-    public static <T> T replaceIf(final @Nullable T original, final T replacement, final @Nullable T... checks) {
-        for (final T check : checks) {
-            if (original == check) return replacement;
-        }
-        return original;
-    }
-
-    public static <T> T replaceIf(final @Nullable T original, final T replacement, final @NotNull Predicate<T> predicate) {
-        if (predicate.test(original)) return replacement;
-        return original;
-    }
-
-    /**
-     * @param original Object to be checked if null
-     * @param replacement Object returned if original is null
-     * @param consumer accepts the original object, can be used for logging
-     * @return original if not null, otherwise replacement
-     */
-
-    public static <T> T replaceIfNull(final @Nullable T original, final T replacement,
-                                      final @NotNull Consumer<T> consumer) {
-        if (original == null) {
-            consumer.accept(replacement);
-            return replacement;
-        }
-        consumer.accept(original);
-        return original;
-    }
-
-    /**
-     * @param t object being checked
-     * @param consumer accepted if t is not null
-     * @param <T> type
-     */
-
-    public static <T> void doIfNotNull(final @Nullable T t, final @NotNull Consumer<T> consumer) {
-        if (t == null) {
-            return;
-        }
-        consumer.accept(t);
-    }
-
-    /**
-     * @param t object being checked
-     * @param function applied if t is not null
-     * @param <T> type
-     * @return
-     */
-
-    public static <T> Optional<T> returnIfNotNull(final @Nullable T t,
-                                                  final @NotNull Function<T, T> function) {
-        if (t == null) {
-            return Optional.empty();
-        }
-        return Optional.of(function.apply(t));
-    }
-
-    /**
-     * @param enumAsString Enum value as a string to be parsed
-     * @param enumClass enum type enumAsString is to be converted to
-     * @param defaultEnum default value to be returned
-     * @return enumAsString as an enum, or default enum if it could not be parsed
-     */
-
-    public static <E extends Enum<E>> E stringToEnum(final @NotNull String enumAsString,
-                                                     final @NotNull Class<E> enumClass,
-                                                     E defaultEnum) {
-        return stringToEnum(enumAsString, enumClass, defaultEnum, e -> {
-        });
-    }
-
-    /**
-     * @param enumAsString Enum value as a string to be parsed
-     * @param enumClass enum type enumAsString is to be converted to
-     * @param defaultEnum default value to be returned
-     * @param consumer accepts the returned enum, can be used for logging
-     * @return enumAsString as an enum, or default enum if it could not be parsed
-     */
-
-    public static <E extends Enum<E>> E stringToEnum(final @NotNull String enumAsString,
-                                                     @NotNull final Class<E> enumClass,
-                                                     final E defaultEnum,
-                                                     final @NotNull Consumer<E> consumer) {
-        try {
-            final E value = Enum.valueOf(enumClass, enumAsString);
-            consumer.accept(value);
-            return value;
-        } catch (final IllegalArgumentException exception) {
-            consumer.accept(defaultEnum);
-            return defaultEnum;
-        }
-    }
-
-}
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/util/packets/HMCCPacketManager.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/util/packets/HMCCPacketManager.java
@@ -18,6 +18,7 @@ import com.hibiscusmc.hmccosmetics.util.packets.wrappers.WrapperPlayServerRelEnt
 import me.lojosho.hibiscuscommons.util.packets.PacketManager;
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.EquipmentSlot;
@@ -100,26 +101,13 @@ public class HMCCPacketManager extends PacketManager {
            int entityId,
            List<Player> sendTo
    ) {
-        sendArmorstandMetadata(entityId, false, sendTo);
-    }
-
-    public static void sendArmorstandMetadata(
-            int entityId,
-            boolean onFire,
-            List<Player> sendTo
-    ) {
-        byte mask = 0x20;
-        if (onFire) {
-            // 0x21 = Invisible + Fire (Aka, burns to make it not take the light of the block its in, avoiding turning it black)
-            mask = 0x21;
-        }
-
        PacketContainer packet = new PacketContainer(PacketType.Play.Server.ENTITY_METADATA);
        packet.getModifier().writeDefaults();
        packet.getIntegers().write(0, entityId);
        final List<WrappedDataValue> wrappedDataValueList = Lists.newArrayList();

-        wrappedDataValueList.add(new WrappedDataValue(0, WrappedDataWatcher.Registry.get(Byte.class), mask));
+        // 0x21 = Invisible + Fire (Aka, burns to make it not take the light of the block its in, avoiding turning it black)
+        wrappedDataValueList.add(new WrappedDataValue(0, WrappedDataWatcher.Registry.get(Byte.class), (byte) 0x21));
        wrappedDataValueList.add(new WrappedDataValue(15, WrappedDataWatcher.Registry.get(Byte.class), (byte) 0x10));
        packet.getDataValueCollectionModifier().write(0, wrappedDataValueList);
        for (Player p : sendTo) sendPacket(p, packet);
@@ -392,13 +380,18 @@ public class HMCCPacketManager extends PacketManager {
        }
    }

+    /**
+     * Gets the nearby players (or viewers) of a location through the view distance set in the config. If the view distance is 0, it will return all players in the world.
+     * @param location
+     * @return
+     */
    @NotNull
-    public static List<Player> getViewers(Location location) {
+    public static List<Player> getViewers(@NotNull Location location) {
        ArrayList<Player> viewers = new ArrayList<>();
        if (Settings.getViewDistance() <= 0) {
            viewers.addAll(location.getWorld().getPlayers());
        } else {
-            viewers.addAll(HMCCPlayerUtils.getNearbyPlayers(location));
+            viewers.addAll(PacketManager.getViewers(location, Settings.getViewDistance()));
        }
        return viewers;
    }
--- a/common/src/main/resources/config.yml
+++ b/common/src/main/resources/config.yml
@@ -24,6 +24,12 @@ cosmetic-settings:
  force-permission-join: true # Checks a player permission if they can have a cosmetic when they join the server.
  force-show-join: false # If the plugin should force show a player's cosmetics when they join the server.

+  # This determines what to process what areas to process placeholders when displaying the item to the user.
+  # This can be heavy on servers with a lot of players, so if experiencing lag issues relating to setting display/lores of items, disable this.
+  item-processing:
+    display-name: true
+    lore: true
+
  # This is a list of worlds that cosmetics are hidden in. When a player enters one of these worlds, their cosmetics will be hidden.
  disabled-worlds:
    - "disabledworld"
@@ -45,17 +51,8 @@ cosmetic-settings:
  emote-camera: true
  # If a player should be able to move in an emote. This option really only affects if "emote-camera" is false
  emote-move: false
-
-
  # This make it so it always sends the riding packets for the backpack. This sends more packets but is more reliable for servers which modify player passengers.
  backpack-force-riding-packet: false
-  # This makes the plugin either (true) always have the backpack eminate light to avoid the black backpack bug or (false) turns it off.
-  backpack-light-emination: true
-  # This activates the block detection for the backpack. This allows backpacks to not appear completely black when in a block.
-  # Requires backpack-light-emination to be true.
-  backpack-block-detection: true
-
-
  # This helps reduce the amount of packets sent for packet entities, but reduces accuracy of the entity. This is in milliseconds. -1 to disable.
  # This is useful for servers with a lot of backpacks, as they are passengers, which means the client will update their position automatically within an area where the entity is located.
  entity-cooldown-teleport-packet: 500
@@ -132,6 +129,9 @@ hook-settings:
    # This causes the plugin to reload itself after any ItemsAdder change. This keeps the plugin fully up to date with IA, but
    # could cause console spam as HMCCosmetics has to reload itself as well.
    reload-on-change: false
+  nexo:
+    # This causes the plugin to reload itself after any Nexo change. This keeps the plugin fully up to date with Nexo
+    reload-on-change: true
  worldguard:
    # Checks worldguard regions for HMCC flags. If set to false, flags will not work properly.
    # Requires restart to apply changes.
@@ -177,6 +177,7 @@ wardrobe:
    default:
      distance: -1 # Distance in blocks that a player can interact with the wardrobe. -1 to ignore.
      permission: "hmccosmetics.wardrobe.default" # Permission required to use the wardrobe.
+      default-menu: defaultmenu
      npc-location:
        world: "world"
        x: 0
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/51
+++ b/51
@@ -1,7 +1,7 @@
 #!/bin/sh

 #
-# Copyright <EFBFBD> 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions <EFBFBD>$var<EFBFBD>, <EFBFBD>${var}<EFBFBD>, <EFBFBD>${var:-default}<EFBFBD>, <EFBFBD>${var+SET}<EFBFBD>,
-#           <EFBFBD>${var#prefix}<EFBFBD>, <EFBFBD>${var%suffix}<EFBFBD>, and <EFBFBD>$( cmd )<EFBFBD>;
-#         * compound commands having a testable exit status, especially <EFBFBD>case<EFBFBD>;
-#         * various built-in commands including <EFBFBD>command<EFBFBD>, <EFBFBD>set<EFBFBD>, and <EFBFBD>ulimit<EFBFBD>.
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
    esac
 done

-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
    fi
 else
    JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi

 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
    case $MAX_FD in #(
      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
        MAX_FD=$( ulimit -H -n ) ||
            warn "Could not query maximum file descriptor limit"
    esac
    case $MAX_FD in  #(
      '' | soft) :;; #(
      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
        ulimit -n "$MAX_FD" ||
            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
    done
 fi

-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.

 set -- \
        "-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -205,6 +214,12 @@ set -- \
        org.gradle.wrapper.GradleWrapperMain \
        "$@"

+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal

 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute

 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

 :end
@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd

 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%

 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
Author	SHA1	Message	Date
LoJoSho	e18690496f	clean: clean HMCCInventoryUtils with new static variables	2025-01-17 14:57:43 -06:00
LoJoSho	c522581d46	feat: migrate over to using a registry for CosmeticSlot than enums	2025-01-17 14:45:08 -06:00
LoJoSho	c31d2e1aee	feat: begin migrating over to the new getViewers method	2025-01-17 14:06:40 -06:00
LoJoSho	9879c82d40	clean: minor format adjustment in build.gradle.kts	2025-01-17 13:19:45 -06:00
LoJoSho	1873f5b9b5	feat: hook into hooks to check invisibility	2025-01-16 20:53:05 -06:00
LoJoSho	68d94be743	chore: remove unused hasClass method (use HibiscusCommons method instead)	2025-01-16 13:26:59 -06:00
LoJoSho	14e38e7974	chore: remove old, unused Backpack ModelEngine 4	2025-01-16 13:19:40 -06:00
LoJoSho	5cc19ab2db	chore: move getNearbyPlayers from HMCCPlayerUtils to getViewers HMCCPacketManager	2025-01-16 13:11:30 -06:00
LoJoSho	93b1c20c40	chore: remove old Utils class	2025-01-16 12:59:20 -06:00
LoJoSho	49435436cb	chore: move from deprecated spigot event to bukkit event	2025-01-16 12:54:40 -06:00
LoJoSho	0477e801a6	chore: move away from internally deprecated methods	2025-01-16 12:45:53 -06:00
LoJoSho	5779d278a9	chore: update paper api (1.20.4) & lombok (1.18.36)	2025-01-16 12:11:36 -06:00
LoJoSho	0a8821d3e8	chore: update test server to 1.21.4	2025-01-14 00:03:10 -06:00
LoJoSho	e96e9e00bb	feat: use HibiscusHooksAllActiveEvent for reloading plugins that active their items later	2025-01-14 00:02:37 -06:00
LoJoSho	217fb5d332	fix: HookHMCC not setting itself as active	2025-01-14 00:01:49 -06:00
LoJoSho	6636cc9548	chore: add more documentation to entering and leaving wardrobes	2025-01-10 14:14:02 -06:00
LoJoSho	c3fcf760d7	clean: move setWardrobeStatus to Lombok; make wardrobe update method private	2025-01-10 14:05:08 -06:00
LoJoSho	7116767e22	clean: remove unused caching user items	2025-01-10 14:01:35 -06:00
LoJoSho	0877165f9f	clean: adjust distance check in wardrobes	2025-01-10 13:57:08 -06:00
LoJoSho	b43466a793	clean: remove old ProtocolLib code	2024-12-29 17:18:21 -06:00
LoJoSho	401e6170e6	version bump (2.7.5)	2024-12-29 15:40:22 -06:00
LoJoSho	782eb4c464	chore: update adventure dependencies	2024-12-29 15:40:09 -06:00
LoJoSho	1ef2c6b631	chore: update gradle (8.12) & run-paper (2.3.1)	2024-12-28 19:49:48 -06:00
LoJoSho	c7667b2dc2	chore: improve version handling	2024-12-28 18:20:09 -06:00
LoJoSho	e4c4933d46	chore: more debug in passenger listener	2024-12-16 13:27:13 -06:00
LoJoSho	1f94192772	chore: update LP in runServer	2024-12-16 13:26:45 -06:00
LoJoSho	8ebcea5465	feat: if player is hidden from another player, their cosmetics are no longer seen	2024-12-06 13:36:49 -06:00
LoJoSho	4c7ccc06ca	feat: version now has commit hash with it	2024-12-04 08:55:39 -06:00
LoJoSho	667f58ff4b	fix: mount packet has bad if test	2024-11-25 13:22:58 -06:00
LoJoSho	69d318c4b0	feat: add Nexo support	2024-11-23 20:35:19 -06:00
LoJoSho	0414f3be90	clean: remove first person backpack update message (it is spammy)	2024-11-23 20:27:21 -06:00
LoJoSho	402203b4c2	feat: add passenger listener to better ensure backpacks stay on	2024-11-23 20:26:57 -06:00
LoJoSho	6dcaf06ebe	feat: add defaultmenu to specific wardrobes	2024-11-19 20:43:31 -06:00
LoJoSho	1b6adca00e	fix: balloon pufferfish getting wrong viewers	2024-11-16 10:57:31 -06:00
LoJoSho	0dce5822e3	feat: overhaul of getting player data	2024-11-15 21:59:32 -06:00
LoJoSho	0f1b75f09e	feat: update to Hibiscus Commons 0.5	2024-11-15 20:21:04 -06:00
LoJoSho	19192c46a5	feat: add config options to avoid certain item processing if desired	2024-10-30 10:14:29 -05:00
LoJoSho	62a9e7d1ac	chore: define variable nullability for getUserCosmeticItem	2024-10-30 09:21:27 -05:00
LoJoSho	06077201f9	fix: not checking if a null variable is null before usage in balloon handling in the wardrobe	2024-10-30 09:15:14 -05:00
LoJoSho	b2795a705e	fix: not checking if itemstack has meta data before modification of meta data	2024-10-27 19:54:55 -05:00
LoJoSho	1e6734bf6f	feat: console can now apply any cosmetic to a player	2024-10-24 20:34:17 -05:00
LoJoSho	ad382e5d9e	chore: update ProtocolLib to newest version	2024-10-21 12:28:39 -05:00
LoJoSho	6458a1e316	chore: add downloadPlugins to runServer task	2024-10-13 17:38:11 -05:00
LoJoSho	279d6edc34	fix: mainhand showing even if invisible	2024-10-12 12:34:17 -05:00
LoJoSho	439dc85aa3	feat: add Hibiscus Commons / GSit compatibility	2024-10-10 22:50:58 -05:00
LoJoSho	60e23411dc	fix: fixed cosmetic applying owner skull npe? (Should have already been checked but is now fully checked)	2024-10-02 22:24:04 -05:00
LoJoSho	33fb680c22	fix: Possible null in getEquipSlot	2024-10-01 23:58:44 -05:00
LoJoSho	536b7ebdec	clean: remove jeff repo (moved to Hibiscus Commons)	2024-09-20 17:54:23 -05:00
LoJoSho	5da95f2f5b	fix: finish the full update to Java 21	2024-09-20 17:50:51 -05:00
LoJoSho	30f4a84241	feat: menu command not having menu id will now open default menu	2024-09-20 17:13:54 -05:00
LoJoSho	f34e126c85	chore: bring test-server to 1.21.1	2024-09-20 17:11:49 -05:00
LoJoSho	d7d0f27e49	chore: fix misspelled relocated paths	2024-08-26 13:16:33 -05:00
LoJoSho	f42937a6d0	fix: Model Engine coloring throwing class not found (version bump 2.7.4-DEV)	2024-08-26 12:57:23 -05:00
LoJoSho	c8b7430998	clean: update gradle wrapper	2024-08-16 10:11:33 -05:00
LoJoSho	42de76d84d	version bump (2.7.3)	2024-08-16 09:33:26 -05:00
LoJoSho	5102fd77b7	Merge remote-tracking branch 'origin/remapped' into remapped	2024-08-09 10:03:11 -05:00
LoJoSho	9c66d4ee81	fix: entering wardrobe not activating if allow cosmetics set to allow	2024-08-09 10:02:59 -05:00
LoJoSho	7ade2d9227	fix: ProtocolLib body part changed in newest versions	2024-08-05 21:27:13 -05:00
LoJoSho	7b43b42740	Revert "feat: customize backpack light emination" This reverts commit `3cf265f231`.	2024-08-01 18:31:05 -05:00
LoJoSho	25f050f387	Revert "feat: add user cosmetic item caching" This reverts commit `34b02574b2`.	2024-08-01 18:27:38 -05:00