Merge pull request #111 from HibiscusMC/multi_wardrobe

Wardrobe Improvements (2.4.0)

.github/ISSUE_TEMPLATE/01-bug_report.yml

@@ -0,0 +1,61 @@
+name: Bug Report
+description: Report an issue with HMCCosmetics
+labels: [bug]
+assignees: ["LoJoSho"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for filing an bug report! If you are here to ask a question, use our [Discord server](https://discord.gg/pcm8kWrdNt) instead!
+  - type: input
+    id: release_version
+    attributes:
+      label: Plugin Version
+      placeholder: vx.x.x
+      description: |
+        Insert the version of HMCCosmetics you are using (e.g. `v2.2.8`). Before continuing make sure you have the latest version of HMCCosmetics as
+        your issue may have already been resolved.
+  - type: input
+    id: server_version
+    attributes:
+      label: Server Version
+      placeholder: fork-x-x.x.x
+      description: |
+        Insert the version of your minecraft server in the format `fork-build-version` (e.g. `PAPER-521-1.19.4`, `PURPUR-1838-1.19.2`)
+  - type: textarea
+    id: description
+    attributes:
+      label: Issue description
+      description: Describe the issue in as much detail as possible (Include any error logs in a code block below)
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: Steps to reproduce
+      description: Explain how to reproduce this issue step-by-step, in as much detail as possible.
+      placeholder: |
+        Steps to reproduce:
+        1. Do thing
+        2. Observe behavior
+        3. Post any error logs below
+    validations:
+      required: true
+  - type: dropdown
+    id: priority
+    attributes:
+      label: Issue priority
+      description: Please be realistic. If you need to elaborate on your reasoning, please use the issue description field above.
+      options:
+        - Low (slightly annoying)
+        - Medium (should be fixed somewhat soon)
+        - High (immediate attention needed)
+    validations:
+      required: true
+  - type: textarea
+    id: versions
+    attributes:
+      label: Other Versions
+      placeholder: |
+        - ModelEngine R3.0.1 (`/version ModelEngine`)
+        - Any other relevant version information such as depenedencies
+      description: |
+        List any necessary or relevant versions here.

.github/ISSUE_TEMPLATE/02-feature_request.yml

@@ -0,0 +1,28 @@
+name: Feature Request
+description: Request a new feature for HMCCosmetics
+labels: [enhancement]
+assignees: ["LoJoSho"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        If you are here to ask a question, use our [Discord server](https://discord.gg/pcm8kWrdNt) instead!
+  - type: markdown
+    attributes:
+      value: |
+        Please check that the feature you are requesting does not already exist *and/or* hasn't already been requested by someone else.
+  - type: textarea
+    id: description
+    attributes:
+      label: Feature Description
+      description: A clear and concise description of what the problem is, or what feature you want to be implemented.
+      placeholder: A good addition would be...
+    validations:
+      required: true
+  - type: textarea
+    id: solution
+    attributes:
+      label: Implementation Description
+      description: A clear and concise description of what you want to happen, and any optional **configuration changes** that need to be made.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -1,62 +0,0 @@
-name: Bug Report
-description: Create a bug report to help us keep track of all bugs that have to be fixed
-title: "[BUG] <name for bug>"
-labels: [bug]
-
-body:
-  - type: checkboxes
-    id: i-have-checked
-    attributes:
-      label: I have checked...
-      options:
-        - label: "I am using the latest version of HMCCosmetics"
-          required: true
-        - label: "I am using the latest version of any dependencies"
-          required: true
-        - label: "I have checked if any similar bug reports exist"
-          required: true
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: A full description of the bug
-    validations:
-      required: true
-  - type: textarea
-    id: reproduce
-    attributes:
-      label: Steps to reproduce
-      description: Explain how to reproduce this issue step-by-step, in as much detail as possible.
-    validations:
-      required: true
-  - type: textarea
-    id: hmcc-version
-    attributes:
-      label: Plugin Version
-      description: Run `version HMCCosmetics` in your console and paste the output
-    validations:
-      required: true
-  - type: textarea
-    id: meg-version
-    attributes:
-      label: ModelEngine Version
-      description: "Run `version ModelEngine` in your console and paste the output. Optional if not using balloons."
-    validations:
-      required: false
-  - type: textarea
-    id: server-version
-    attributes:
-      label: Server Version
-      description: "Run `version` in your console and paste the output."
-    validations:
-      required: true
-  - type: "dropdown"
-    id: "type"
-    attributes:
-      label: "How breaking is the bug?"
-      options:
-        - "Breaking Bug - Plugin unusable"
-        - "Non-breaking Bug - Plugin still usable, but certain features unavailable"
-        - "Minor Bug - Plugin completely functional, but features have non-working aspects"
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +1,5 @@
 blank_issues_enabled: false
+contact_links:
+    - name: General Questions and Help
+      url: https://discord.gg/pcm8kWrdNt
+      about: This issue tracker is not for support questions. Please refer to the Hibiscus community's help and discussion discord server.

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -1,29 +0,0 @@
-name: Feature Request
-description: Create a feature request to help us keep track of all features you want to be added
-title: "[FEATURE] <title>"
-labels: [enhancement]
-
-body:
-  - type: "checkboxes"
-    id: "i-have-checked"
-    attributes:
-      label: "I have checked that..."
-      options:
-        - label: "...such a feature does not exist already"
-          required: true
-        - label: "...such a feature request has not been submitted already"
-          required: true
-  - type: "textarea"
-    id: "description"
-    attributes:
-      label: "Description"
-      description: "A full description of the feature"
-    validations:
-      required: true
-  - type: "textarea"
-    id: "config-changes"
-    attributes:
-      label: "Config Changes"
-      description: "The configuration changes your feature should have"
-    validations:
-      required: false

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,11 +1,14 @@
 #### Select the option(s) that best describes this PR:
 - [ ] Major breaking change
 - [ ] Minor change
-- [ ] Bug fix
 - [ ] Feature implementation
-- [ ] Documentation
+- [ ] Bug fix
-- [ ] Cleaning
+- [ ] Chore (Changes that don't fix or add new features *and don't* modify source files)
-- [ ] Refactoring
+- [ ] Refactoring (Changes that dont't fix or add new features *but do* modify source files)
+- [ ] Documentation (Changes to README files and/or JavaDocs)
+- [ ] Style (Changes that don't affect the meaning of the code)
+- [ ] Performance
+- [ ] Other (Please specify below)
 
 #### Please describe the changes this PR makes and why it should be merged:
 

build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "com.hibiscusmc"
-version = "2.2.7"
+version = "2.4.0"
 
 allprojects {
     apply(plugin = "java")
@@ -27,6 +27,7 @@ allprojects {
         // ProtocolLib repo
         maven("https://repo.dmulloy2.net/repository/public/") //ProtocolLib Repo, constantly down
         maven("https://repo.mineinabyss.com/releases/")
+        maven("https://repo.mineinabyss.com/snapshots/")
 
         // PlaceholderAPI
         maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
@@ -34,8 +35,8 @@ allprojects {
         //Hikari
         maven("https://mvnrepository.com/artifact/com.zaxxer/HikariCP")
 
-        // Citizens
+        // Citizens & Denizen
-        maven("https://repo.citizensnpcs.co")
+        maven("https://maven.citizensnpcs.co/repo")
 
         // Worldguard
         maven("https://maven.enginehub.org/repo/")
@@ -69,14 +70,12 @@ allprojects {
         compileOnly("com.mojang:authlib:1.5.25")
         compileOnly("org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT")
         compileOnly("org.jetbrains:annotations:23.0.0")
-        compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0-SNAPSHOT")
+        compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0")
         compileOnly("me.clip:placeholderapi:2.11.1")
-        compileOnly("com.ticxo.modelengine:api:R3.0.1")
+        compileOnly("com.ticxo:modelengine:R3.0.1")
         compileOnly("com.github.oraxen:oraxen:-SNAPSHOT")
         compileOnly("com.github.LoneDev6:API-ItemsAdder:3.2.5")
-        compileOnly("com.mineinabyss:idofront:0.12.111")
+        compileOnly("com.mineinabyss:geary-papermc:0.24-SNAPSHOT")
-        compileOnly("com.mineinabyss:geary-papermc-core:0.19.113")
-        compileOnly("com.mineinabyss:looty:0.8.67")
         compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.1.0-SNAPSHOT")
         compileOnly("it.unimi.dsi:fastutil:8.5.11")
         compileOnly("com.github.LeonMangler:SuperVanish:6.2.6-4")
@@ -100,7 +99,9 @@ dependencies {
     implementation("org.bstats:bstats-bukkit:3.0.0")
     implementation("com.jeff_media:SpigotUpdateChecker:3.0.0")
     implementation("com.owen1212055:particlehelper:1.0.0-SNAPSHOT")
-    implementation("com.ticxo.playeranimator:PlayerAnimator:R1.2.5")
+    implementation("com.ticxo:PlayerAnimator:R1.2.6")
+    implementation("com.github.BG-Software-LLC:CommentedConfiguration:-SNAPSHOT")
+    //implementation("com.ticxo.playeranimator:PlayerAnimator:R1.2.5")
 }
 
 tasks {
@@ -141,6 +142,7 @@ tasks {
         relocate("com.jeff_media.updatechecker", "com.hisbiscusmc.hmccosmetics.updatechecker")
         relocate("com.owen1212055.particlehelper", "com.hisbiscusmc.hmccosmetics.particlehelper")
         relocate("com.ticxo.playeranimator", "com.hisbiscusmc.hmccosmetics.playeranimator")
+        relocate("com.bgsoftware", "com.hisbiscusmc.hmccosmetics.configupdater")
         archiveFileName.set("HMCCosmeticsRemapped-${project.version}.jar")
 
         dependencies {
@@ -168,7 +170,7 @@ bukkit {
     apiVersion = "1.17"
     authors = listOf("LoJoSho")
     depend = listOf("ProtocolLib")
-    softDepend = listOf("ModelEngine", "Oraxen", "ItemsAdder", "Looty", "HMCColor", "WorldGuard", "MythicMobs", "PlaceholderAPI", "SuperVanish", "PremiumVanish")
+    softDepend = listOf("ModelEngine", "Oraxen", "ItemsAdder", "Geary", "HMCColor", "WorldGuard", "MythicMobs", "PlaceholderAPI", "SuperVanish", "PremiumVanish", "LibsDisguises", "Denizen")
     version = "${project.version}"
 
     commands {
@@ -210,7 +212,7 @@ bukkit {
         register("hmccosmetics.cmd.emote.other") {
             default = BukkitPluginDescription.Permission.Default.OP
         }
-        register("hmccosmetics.cmd.setlocation") {
+        register("hmccosmetics.cmd.setwardrobesetting") {
             default = BukkitPluginDescription.Permission.Default.OP
         }
         register("hmccosmetics.cmd.dataclear") {

common/build.gradle.kts

@@ -7,18 +7,21 @@ dependencies {
     compileOnly("com.mojang:authlib:1.5.25")
     compileOnly("org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT")
     compileOnly("org.jetbrains:annotations:23.0.0")
-    compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0-SNAPSHOT")
+    compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0")
     compileOnly("me.clip:placeholderapi:2.11.1")
-    compileOnly("com.ticxo.modelengine:api:R3.0.1")
+    compileOnly("com.ticxo:modelengine:R3.0.1")
     compileOnly("com.github.oraxen:oraxen:-SNAPSHOT")
     compileOnly("com.github.LoneDev6:API-ItemsAdder:3.2.5")
-    compileOnly("com.mineinabyss:geary-papermc-core:0.19.113")
+    compileOnly("com.mineinabyss:geary-papermc:0.24-SNAPSHOT")
-    compileOnly("com.mineinabyss:looty:0.8.67")
     compileOnly("com.hibiscus:hmccolor:0.3-SNAPSHOT")
     compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.1.0-SNAPSHOT")
     compileOnly("it.unimi.dsi:fastutil:8.5.11")
     compileOnly("io.lumine:Mythic-Dist:5.2.1")
+    compileOnly("com.denizenscript:denizen:1.2.7-SNAPSHOT")
     compileOnly("com.github.LeonMangler:SuperVanish:6.2.6-4")
+    compileOnlyApi("LibsDisguises:LibsDisguises:10.0.21") {
+        exclude("org.spigotmc", "spigot")
+    }
 
     //compileOnly("com.github.Fisher2911:FisherLib:master-SNAPSHOT")
     implementation("net.kyori:adventure-api:4.12.0")
@@ -29,7 +32,9 @@ dependencies {
     implementation("org.bstats:bstats-bukkit:3.0.0")
     implementation("com.jeff_media:SpigotUpdateChecker:3.0.0")
     implementation("com.owen1212055:particlehelper:1.0.0-SNAPSHOT")
-    implementation("com.ticxo.playeranimator:PlayerAnimator:R1.2.5")
+    implementation("com.ticxo:PlayerAnimator:R1.2.6")
+    implementation("com.github.BG-Software-LLC:CommentedConfiguration:-SNAPSHOT")
+    //implementation("com.ticxo.playeranimator:PlayerAnimator:R1.2.5")
 }
 
 java {

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

@@ -1,5 +1,6 @@
 package com.hibiscusmc.hmccosmetics;
 
+import com.bgsoftware.common.config.CommentedConfiguration;
 import com.hibiscusmc.hmccosmetics.api.HMCCosmeticSetupEvent;
 import com.hibiscusmc.hmccosmetics.command.CosmeticCommand;
 import com.hibiscusmc.hmccosmetics.command.CosmeticCommandTabComplete;
@@ -11,6 +12,8 @@ import com.hibiscusmc.hmccosmetics.config.serializer.LocationSerializer;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
 import com.hibiscusmc.hmccosmetics.database.Database;
+import com.hibiscusmc.hmccosmetics.emotes.EmoteManager;
+import com.hibiscusmc.hmccosmetics.gui.Menu;
 import com.hibiscusmc.hmccosmetics.gui.Menus;
 import com.hibiscusmc.hmccosmetics.hooks.Hooks;
 import com.hibiscusmc.hmccosmetics.hooks.worldguard.WGHook;
@@ -20,15 +23,11 @@ import com.hibiscusmc.hmccosmetics.listener.PlayerGameListener;
 import com.hibiscusmc.hmccosmetics.nms.NMSHandlers;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
-import com.hibiscusmc.hmccosmetics.user.manager.UserEmoteManager;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.hibiscusmc.hmccosmetics.util.TranslationUtil;
 import com.jeff_media.updatechecker.UpdateCheckSource;
 import com.jeff_media.updatechecker.UpdateChecker;
 import com.ticxo.playeranimator.PlayerAnimatorImpl;
-import com.ticxo.playeranimator.api.PlayerAnimator;
-import com.ticxo.playeranimator.api.animation.pack.AnimationPack;
-import org.apache.commons.io.FilenameUtils;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -44,7 +43,6 @@ import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
 
 import java.io.File;
 import java.nio.file.Path;
-import java.util.Map;
 
 public final class HMCCosmeticsPlugin extends JavaPlugin {
 
@@ -90,13 +88,12 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
                 .checkNow();
         onLatestVersion = checker.isUsingLatestVersion();
         // File setup
-        if (!getDataFolder().exists()) {
         saveDefaultConfig();
-            saveResource("translations.yml", false);
+        //saveResource("translations.yml", false);
-            saveResource("messages.yml", false);
+        if (!Path.of(getDataFolder().getPath(), "messages.yml").toFile().exists()) saveResource("messages.yml", false);
-            saveResource("cosmetics/defaultcosmetics.yml", false);
+        if (!Path.of(getDataFolder().getPath() + "/cosmetics/").toFile().exists()) saveResource("cosmetics/defaultcosmetics.yml", false);
-            saveResource("menus/defaultmenu.yml", false);
+        if (!Path.of(getDataFolder().getPath() + "/menus/").toFile().exists()) saveResource("menus/defaultmenu.yml", false);
-        }
+
         // Emote folder setup
         File emoteFile = new File(getDataFolder().getPath() + "/emotes");
         if (!emoteFile.exists()) emoteFile.mkdir();
@@ -104,6 +101,16 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
         // Player Animator
         PlayerAnimatorImpl.initialize(this);
 
+        // Configuration Sync
+        final File configFile = Path.of(getInstance().getDataFolder().getPath(), "config.yml").toFile();
+        final File messageFile = Path.of(getInstance().getDataFolder().getPath(), "messages.yml").toFile();
+        try {
+            CommentedConfiguration.loadConfiguration(configFile).syncWithConfig(configFile, getInstance().getResource("config.yml"),
+                    "database-settings", "debug-mode", "wardrobe.viewer-location", "wardrobe.npc-location", "wardrobe.wardrobe-location", "wardrobe.leave-location");
+            CommentedConfiguration.loadConfiguration(messageFile).syncWithConfig(messageFile, getInstance().getResource("messages.yml"));
+        } catch (Exception e) {}
+
+        // Setup
         setup();
 
         // Commands
@@ -174,7 +181,7 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
             WardrobeSettings.load(loader.load().node("wardrobe"));
             DatabaseSettings.load(loader.load().node("database-settings"));
             configLoader = loader;
-        } catch (ConfigurateException e) {
+        } catch (Exception e) {
             throw new RuntimeException(e);
         }
 
@@ -240,28 +247,19 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
                 getInstance().getServer().getPluginManager().addPermission(new Permission(cosmetic.getPermission()));
             }
         }
-
+        for (Menu menu : Menus.values()) {
-        File emoteFolder = new File(getInstance().getDataFolder().getPath() + "/emotes/");
+            if (menu.getPermissionNode() != null) {
-        if (emoteFolder.exists()) {
+                if (getInstance().getServer().getPluginManager().getPermission(menu.getPermissionNode()) != null) continue;
-            PlayerAnimator.api.getAnimationManager().clearRegistry();
+                getInstance().getServer().getPluginManager().addPermission(new Permission(menu.getPermissionNode()));
-            File[] emotesFiles = emoteFolder.listFiles();
+            }
-            for (File emoteFile : emotesFiles) {
-                if (!emoteFile.getName().contains("bbmodel")) continue;
-                String animationName = FilenameUtils.removeExtension(emoteFile.getName());
-                PlayerAnimator.api.getAnimationManager().importAnimations(animationName, emoteFile);
-                MessagesUtil.sendDebugMessages("Added '" + animationName + "' to Player Animator ");
         }
 
-            /*
+        EmoteManager.loadEmotes();
-            for (Map.Entry<String, AnimationPack> packEntry : PlayerAnimator.api.getAnimationManager().getRegistry().entrySet()) {
-                Set<String> animationNames = packEntry.getValue().getAnimations().keySet().stream().map(animation -> packEntry.getKey().replace(":", ".") + "." + animation).collect(Collectors.toSet());
-            }
-             */
-        }
 
         getInstance().getLogger().info("Successfully Enabled HMCCosmetics");
         getInstance().getLogger().info(Cosmetics.values().size() + " Cosmetics Successfully Setup");
         getInstance().getLogger().info(Menus.getMenuNames().size() + " Menus Successfully Setup");
+        getInstance().getLogger().info(WardrobeSettings.getWardrobes().size() + " Wardrobes Successfully Setup");
         getInstance().getLogger().info("Data storage is set to " + DatabaseSettings.getDatabaseType());
 
         Bukkit.getPluginManager().callEvent(new HMCCosmeticSetupEvent());

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

@@ -1,5 +1,7 @@
 package com.hibiscusmc.hmccosmetics.api;
 
+import com.hibiscusmc.hmccosmetics.config.Wardrobe;
+import com.hibiscusmc.hmccosmetics.config.WardrobeLocation;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
@@ -11,9 +13,11 @@ import org.jetbrains.annotations.NotNull;
 public class PlayerWardrobeEnterEvent extends PlayerCosmeticEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private boolean cancel = false;
+    private Wardrobe wardrobe;
 
-    public PlayerWardrobeEnterEvent(@NotNull CosmeticUser who) {
+    public PlayerWardrobeEnterEvent(@NotNull CosmeticUser who, @NotNull Wardrobe wardrobe) {
         super(who);
+        this.wardrobe = wardrobe;
     }
 
     @Override
@@ -45,4 +49,12 @@ public class PlayerWardrobeEnterEvent extends PlayerCosmeticEvent implements Can
     public static HandlerList getHandlerList() {
         return handlers;
     }
+
+    public void setWardrobe(Wardrobe wardrobe) {
+        this.wardrobe = wardrobe;
+    }
+
+    public Wardrobe getWardrobe() {
+        return wardrobe;
+    }
 }

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

@@ -2,12 +2,15 @@ package com.hibiscusmc.hmccosmetics.command;
 
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.config.Settings;
+import com.hibiscusmc.hmccosmetics.config.Wardrobe;
+import com.hibiscusmc.hmccosmetics.config.WardrobeLocation;
 import com.hibiscusmc.hmccosmetics.config.WardrobeSettings;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
 import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticEmoteType;
 import com.hibiscusmc.hmccosmetics.database.Database;
+import com.hibiscusmc.hmccosmetics.emotes.EmoteManager;
 import com.hibiscusmc.hmccosmetics.gui.Menu;
 import com.hibiscusmc.hmccosmetics.gui.Menus;
 import com.hibiscusmc.hmccosmetics.gui.special.DyeMenu;
@@ -15,7 +18,6 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.hibiscusmc.hmccosmetics.util.ServerUtils;
-import com.ticxo.playeranimator.api.PlayerAnimator;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.apache.commons.lang3.EnumUtils;
@@ -194,8 +196,14 @@ public class CosmeticCommand implements CommandExecutor {
             }
             case ("wardrobe") -> {
                 if (sender instanceof Player) player = ((Player) sender).getPlayer();
+
+                if (args.length == 1) {
+                    if (!silent) MessagesUtil.sendMessage(player, "not-enough-args");
+                    return true;
+                }
+
                 if (sender.hasPermission("hmccosmetics.cmd.wardrobe.other")) {
-                    if (args.length >= 2) player = Bukkit.getPlayer(args[1]);
+                    if (args.length >= 3) player = Bukkit.getPlayer(args[2]);
                 }
 
                 if (!sender.hasPermission("hmccosmetics.cmd.wardrobe")) {
@@ -208,9 +216,19 @@ public class CosmeticCommand implements CommandExecutor {
                     return true;
                 }
 
+                if (!WardrobeSettings.getWardrobeNames().contains(args[1])) {
+                    if (!silent) MessagesUtil.sendMessage(sender, "no-wardrobes");
+                    return true;
+                }
+                Wardrobe wardrobe = WardrobeSettings.getWardrobe(args[1]);
+
                 CosmeticUser user = CosmeticUsers.getUser(player);
 
-                user.toggleWardrobe();
+                if (user.isInWardrobe()) {
+                    user.leaveWardrobe();
+                } else {
+                    user.enterWardrobe(false, wardrobe);
+                }
                 return true;
             }
             // cosmetic menu exampleMenu playerName
@@ -289,36 +307,56 @@ public class CosmeticCommand implements CommandExecutor {
                     DyeMenu.openMenu(user, cosmetic);
                 }
             }
-            case ("setlocation") -> {
+            case ("setwardrobesetting") -> {
-                if (!sender.hasPermission("hmccosmetics.cmd.setlocation")) {
+                if (!sender.hasPermission("hmccosmetics.cmd.setwardrobesetting")) {
                     if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
                     return true;
                 }
 
                 if (player == null) return true;
 
-                if (args.length < 2) {
+                if (args.length < 3) {
                     if (!silent) MessagesUtil.sendMessage(player, "not-enough-args");
                     return true;
                 }
+                Wardrobe wardrobe = WardrobeSettings.getWardrobe(args[1]);
+                if (wardrobe == null) {
+                    wardrobe = new Wardrobe(args[1], new WardrobeLocation(null, null, null), null, -1);
+                    WardrobeSettings.addWardrobe(wardrobe);
+                    //MessagesUtil.sendMessage(player, "no-wardrobes");
+                    //return true;
+                }
 
-                if (args[1].equalsIgnoreCase("wardrobelocation")) {
+                if (args[2].equalsIgnoreCase("npclocation")) {
-                    WardrobeSettings.setWardrobeLocation(player.getLocation());
+                    WardrobeSettings.setNPCLocation(wardrobe, player.getLocation());
                     if (!silent) MessagesUtil.sendMessage(player, "set-wardrobe-location");
                     return true;
                 }
 
-                if (args[1].equalsIgnoreCase("viewerlocation")) {
+                if (args[2].equalsIgnoreCase("viewerlocation")) {
-                    WardrobeSettings.setViewerLocation(player.getLocation());
+                    WardrobeSettings.setViewerLocation(wardrobe, player.getLocation());
                     if (!silent) MessagesUtil.sendMessage(player, "set-wardrobe-viewing");
                     return true;
                 }
 
-                if (args[1].equalsIgnoreCase("leavelocation")) {
+                if (args[2].equalsIgnoreCase("leavelocation")) {
-                    WardrobeSettings.setLeaveLocation(player.getLocation());
+                    WardrobeSettings.setLeaveLocation(wardrobe, player.getLocation());
                     if (!silent) MessagesUtil.sendMessage(player, "set-wardrobe-leaving");
                     return true;
                 }
+
+                if (args.length >= 4) {
+                    if (args[2].equalsIgnoreCase("permission")) {
+                        WardrobeSettings.setWardrobePermission(wardrobe, args[3]);
+                        if (!silent) MessagesUtil.sendMessage(player, "set-wardrobe-permission");
+                        return true;
+                    }
+                    if (args[2].equalsIgnoreCase("distance")) {
+                        WardrobeSettings.setWardrobeDistance(wardrobe, Integer.valueOf(args[3]));
+                        if (!silent) MessagesUtil.sendMessage(player, "set-wardrobe-distance");
+                        return true;
+                    }
+                }
             }
             case ("dump") -> {
                 if (player == null) return true;
@@ -428,13 +466,11 @@ public class CosmeticCommand implements CommandExecutor {
                     return true;
                 }
 
-                if (args.length >= 2) {
+                if (!EmoteManager.has(args[1])) {
-                    if (!PlayerAnimator.api.getAnimationManager().getRegistry().keySet().contains(args[1])) {
                     MessagesUtil.sendDebugMessages("Did not contain " + args[1]);
                     if (!silent) MessagesUtil.sendMessage(sender, "emote-invalid");
                     return true;
                 }
-                }
 
                 if (sender.hasPermission("hmccosmetics.cmd.playemote.other")) {
                     if (args.length >= 3) player = Bukkit.getPlayer(args[2]);
@@ -444,7 +480,7 @@ public class CosmeticCommand implements CommandExecutor {
                     return true;
                 }
                 CosmeticUser user = CosmeticUsers.getUser(player);
-                user.getUserEmoteManager().playEmote(args[1]);
+                user.getUserEmoteManager().playEmote(EmoteManager.get(args[1]));
                 return true;
             }
         }

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

@@ -1,13 +1,15 @@
 package com.hibiscusmc.hmccosmetics.command;
 
+import com.hibiscusmc.hmccosmetics.config.Wardrobe;
+import com.hibiscusmc.hmccosmetics.config.WardrobeSettings;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
+import com.hibiscusmc.hmccosmetics.emotes.EmoteManager;
 import com.hibiscusmc.hmccosmetics.gui.Menu;
 import com.hibiscusmc.hmccosmetics.gui.Menus;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
-import com.ticxo.playeranimator.api.PlayerAnimator;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -36,7 +38,7 @@ public class CosmeticCommandTabComplete implements TabCompleter {
             if (hasPermission(sender, "hmccosmetics.cmd.wardrobe")) completions.add("wardrobe");
             if (hasPermission(sender, "hmccosmetics.cmd.dataclear")) completions.add("dataclear");
             if (hasPermission(sender, "hmccosmetics.cmd.dye")) completions.add("dye");
-            if (hasPermission(sender, "hmccosmetics.cmd.setlocation")) completions.add("setlocation");
+            if (hasPermission(sender, "hmccosmetics.cmd.setwardrobesetting")) completions.add("setwardrobesetting");
             if (hasPermission(sender, "hmccosmetics.cmd.hide")) completions.add("hide");
             if (hasPermission(sender, "hmccosmetics.cmd.show")) completions.add("show");
             if (hasPermission(sender, "hmccosmetics.cmd.debug")) completions.add("debug");
@@ -66,24 +68,31 @@ public class CosmeticCommandTabComplete implements TabCompleter {
                         if (menu.canOpen(user.getPlayer())) completions.add(menu.getId());
                     }
                 }
-                case "dataclear", "wardrobe", "hide", "show", "emote" -> {
+                case "dataclear", "hide", "show", "emote" -> {
                     for (Player player : Bukkit.getOnlinePlayers()) {
                         completions.add(player.getName());
                     }
                 }
+                case "wardrobe" -> {
+                    for (Wardrobe wardrobe : WardrobeSettings.getWardrobes()) {
+                        if (wardrobe.hasPermission()) {
+                            if (user.getPlayer().hasPermission(wardrobe.getPermission())) completions.add(wardrobe.getId());
+                        } else {
+                            completions.add(wardrobe.getId());
+                        }
+                    }
+                }
                 case "dye" -> {
                     for (CosmeticSlot slot : user.getDyeableSlots()) {
                         completions.add(slot.name());
                     }
                 }
-                case "setlocation" -> {
+                case "setwardrobesetting" -> {
-                    completions.add("wardrobelocation");
+                    for (Wardrobe wardrobe : WardrobeSettings.getWardrobes()) {
-                    completions.add("viewerlocation");
+                        completions.add(wardrobe.getId());
-                    completions.add("leavelocation");
                     }
-                case "playemote" -> {
-                    completions.addAll(PlayerAnimator.api.getAnimationManager().getRegistry().keySet());
                 }
+                case "playemote" -> completions.addAll(EmoteManager.getAllNames());
             }
             StringUtil.copyPartialMatches(args[1], completions, finalCompletions);
         }
@@ -93,11 +102,18 @@ public class CosmeticCommandTabComplete implements TabCompleter {
                 case "dye" -> {
                     completions.add("#FFFFFF");
                 }
-                case "menu", "apply", "unapply", "playemote" -> {
+                case "menu", "wardrobe", "apply", "unapply", "playemote" -> {
                     for (Player player : Bukkit.getOnlinePlayers()) {
                         completions.add(player.getName());
                     }
                 }
+                case "setwardrobesetting" -> {
+                    completions.add("npclocation");
+                    completions.add("viewerlocation");
+                    completions.add("leavelocation");
+                    completions.add("permission");
+                    completions.add("distance");
+                }
             }
             StringUtil.copyPartialMatches(args[2], completions, finalCompletions);
         }

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

@@ -42,6 +42,7 @@ public class Settings {
     private static final String HOOK_WG_MOVE_CHECK_PATH = "player-move-check";
     private static final String HOOK_WG_MOVE_CHECK_PATH_LEGACY = "player_move_check";
     private static final String COSMETIC_EMOTE_CHECK_PATH = "emote-block-check";
+    private static final String COSMETIC_EMOTE_AIR_CHECK_PATH = "emote-air-check";
     private static final String COSMETIC_EMOTE_DAMAGE_PATH = "emote-damage-leave";
     private static final String COSMETIC_EMOTE_INVINCIBLE_PATH = "emote-invincible";
     private static final String COSMETIC_ADD_ENCHANTS_HELMET_PATH = "helmet-add-enchantments";
@@ -70,6 +71,7 @@ public class Settings {
     private static boolean addChestplateEnchants;
     private static boolean addLeggingEnchants;
     private static boolean addBootsEnchants;
+    private static boolean emoteAirCheck;
     private static boolean emoteDamageLeave;
     private static boolean emoteInvincible;
     private static boolean destroyLooseCosmetics;
@@ -105,6 +107,7 @@ public class Settings {
         forcePermissionJoin = cosmeticSettings.node(FORCE_PERMISSION_JOIN_PATH).getBoolean(false);
         emoteDistance = cosmeticSettings.node(EMOTE_DISTANCE_PATH).getDouble(-3);
         cosmeticEmoteBlockCheck = cosmeticSettings.node(COSMETIC_EMOTE_CHECK_PATH).getBoolean(true);
+        emoteAirCheck = cosmeticSettings.node(COSMETIC_EMOTE_AIR_CHECK_PATH).getBoolean(true);
         emoteDamageLeave = cosmeticSettings.node(COSMETIC_EMOTE_DAMAGE_PATH).getBoolean(false);
         emoteInvincible = cosmeticSettings.node(COSMETIC_EMOTE_INVINCIBLE_PATH).getBoolean(false);
         destroyLooseCosmetics = cosmeticSettings.node(COSMETIC_DESTROY_LOOSE_COSMETIC_PATH).getBoolean(false);
@@ -263,6 +266,10 @@ public class Settings {
         return cosmeticEmoteBlockCheck;
     }
 
+    public static boolean getEmoteAirCheck() {
+        return emoteAirCheck;
+    }
+
     public static boolean isEmoteDamageLeave() {
         return emoteDamageLeave;
     }

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

@@ -0,0 +1,61 @@
+package com.hibiscusmc.hmccosmetics.config;
+
+import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import org.bukkit.Location;
+
+import javax.annotation.Nullable;
+
+public class Wardrobe {
+
+    private String id;
+    private int distance = WardrobeSettings.getDefaultDistance();
+    private String permission;
+    private WardrobeLocation location;
+
+    public Wardrobe(String id, WardrobeLocation location, @Nullable String permission, int distance) {
+        this.id = id;
+        this.location = location;
+        if (permission != null) this.permission = permission;
+        if (distance != -1) this.distance = distance;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public WardrobeLocation getLocation() {
+        return location;
+    }
+
+    public void setDistance(int distance) {
+        this.distance = distance;
+    }
+
+    public void setPermission(String permission) {
+        this.permission = permission;
+    }
+
+    public boolean hasPermission() {
+        return permission != null;
+    }
+    public int getDistance() {
+        return distance;
+    }
+
+    public String getPermission() {
+        return permission;
+    }
+
+    public void setLocation(WardrobeLocation location) {
+        this.location = location;
+    }
+
+    public boolean canEnter(CosmeticUser user) {
+        Location wardrobeLocation = location.getNpcLocation();
+        Location location = user.getPlayer().getLocation();
+        if (wardrobeLocation == null) return false;
+        if (distance == -1) return true;
+        if (!wardrobeLocation.getWorld().equals(location.getWorld())) return false;
+        return wardrobeLocation.distanceSquared(location) <= distance * distance;
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.hibiscusmc.hmccosmetics.config;
+
+import org.bukkit.Location;
+
+public class WardrobeLocation {
+
+    private Location npcLocation;
+    private Location viewerLocation;
+    private Location leaveLocation;
+
+    public WardrobeLocation(Location npcLocation, Location viewerLocation, Location leaveLocation) {
+        this.npcLocation = npcLocation;
+        this.viewerLocation = viewerLocation;
+        this.leaveLocation = leaveLocation;
+    }
+
+    public Location getNpcLocation() {
+        return npcLocation.clone();
+    }
+
+    public Location getViewerLocation() {
+        return viewerLocation.clone();
+    }
+
+    public Location getLeaveLocation() {
+        return leaveLocation.clone();
+    }
+
+    public boolean hasAllLocations() {
+        if (npcLocation == null || viewerLocation == null || leaveLocation == null) return false;
+        return true;
+    }
+
+    public void setNPCLocation(Location wardrobeLocation) {
+        this.npcLocation = wardrobeLocation;
+    }
+
+    public void setViewerLocation(Location viewerLocation) {
+        this.viewerLocation = viewerLocation;
+    }
+
+    public void setLeaveLocation(Location leaveLocation) {
+        this.leaveLocation = leaveLocation;
+    }
+}

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

@@ -9,7 +9,9 @@ import org.apache.commons.lang3.EnumUtils;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.spongepowered.configurate.ConfigurationNode;
-import org.spongepowered.configurate.serialize.SerializationException;
+
+import java.util.*;
+import java.util.logging.Level;
 
 public class WardrobeSettings {
 
@@ -25,14 +27,18 @@ public class WardrobeSettings {
     private static final String APPLY_COSMETICS_ON_CLOSE = "apply-cosmetics-on-close";
     private static final String OPEN_SOUND = "open-sound";
     private static final String CLOSE_SOUND = "close-sound";
-    private static final String STATIC_LOCATION_PATH = "wardrobe-location";
+    private static final String NPC_LOCATION_PATH = "npc-location";
     private static final String VIEWER_LOCATION_PATH = "viewer-location";
     private static final String LEAVE_LOCATION_PATH = "leave-location";
     private static final String EQUIP_PUMPKIN_WARDROBE = "equip-pumpkin";
+    private static final String TRY_COSMETICS_WARDROBE = "unchecked-wardrobe-cosmetics";
     private static final String RETURN_LAST_LOCATION = "return-last-location";
     private static final String GAMEMODE_OPTIONS_PATH = "gamemode-options";
     private static final String FORCE_EXIT_GAMEMODE_PATH = "exit-gamemode-enabled";
     private static final String EXIT_GAMEMODE_PATH = "exit-gamemode";
+    private static final String WARDROBES_PATH = "wardrobes";
+    private static final String PERMISSION_PATH = "permission";
+    private static final String DISTANCE_PATH = "distance";
     private static final String BOSSBAR_PATH = "bossbar";
     private static final String BOSSBAR_ENABLE_PATH = "enabled";
     private static final String BOSSBAR_TEXT_PATH = "text";
@@ -58,14 +64,13 @@ public class WardrobeSettings {
     private static int despawnDelay;
     private static float bossbarProgress;
     private static boolean applyCosmeticsOnClose;
+    private static boolean tryCosmeticsInWardrobe;
     private static boolean equipPumpkin;
     private static boolean returnLastLocation;
     private static boolean enabledBossbar;
     private static boolean forceExitGamemode;
     private static GameMode exitGamemode;
-    private static Location wardrobeLocation;
+    private static HashMap<String, Wardrobe> wardrobes;
-    private static Location viewerLocation;
-    private static Location leaveLocation;
     private static String bossbarMessage;
     private static BossBar.Overlay bossbarOverlay;
     private static BossBar.Color bossbarColor;
@@ -90,6 +95,7 @@ public class WardrobeSettings {
         applyCosmeticsOnClose = source.node(APPLY_COSMETICS_ON_CLOSE).getBoolean();
         equipPumpkin = source.node(EQUIP_PUMPKIN_WARDROBE).getBoolean();
         returnLastLocation = source.node(RETURN_LAST_LOCATION).getBoolean(false);
+        tryCosmeticsInWardrobe = source.node(TRY_COSMETICS_WARDROBE).getBoolean(false);
 
         ConfigurationNode gamemodeNode = source.node(GAMEMODE_OPTIONS_PATH);
         forceExitGamemode = gamemodeNode.node(FORCE_EXIT_GAMEMODE_PATH).getBoolean(false);
@@ -119,17 +125,37 @@ public class WardrobeSettings {
         transitionStay = transitionNode.node(TRANSITION_STAY_PATH).getInt(2000);
         transitionFadeOut = transitionNode.node(TRANSITION_FADE_OUT_PATH).getInt(2000);
 
+        wardrobes = new HashMap<>();
+        for (ConfigurationNode wardrobesNode : source.node(WARDROBES_PATH).childrenMap().values()) {
+            String id = wardrobesNode.key().toString();
             try {
-            wardrobeLocation = LocationSerializer.INSTANCE.deserialize(Location.class, source.node(STATIC_LOCATION_PATH));
+                Location npcLocation = LocationSerializer.INSTANCE.deserialize(Location.class, wardrobesNode.node(NPC_LOCATION_PATH));
-            MessagesUtil.sendDebugMessages("Wardrobe Location: " + wardrobeLocation);
+                MessagesUtil.sendDebugMessages("Wardrobe Location: " + npcLocation);
-            viewerLocation = LocationSerializer.INSTANCE.deserialize(Location.class, source.node(VIEWER_LOCATION_PATH));
+                Location viewerLocation = LocationSerializer.INSTANCE.deserialize(Location.class, wardrobesNode.node(VIEWER_LOCATION_PATH));
                 MessagesUtil.sendDebugMessages("Viewer Location: " + viewerLocation);
-            leaveLocation = Utils.replaceIfNull(LocationSerializer.INSTANCE.deserialize(Location.class, source.node(LEAVE_LOCATION_PATH)), viewerLocation);
+                Location leaveLocation = Utils.replaceIfNull(LocationSerializer.INSTANCE.deserialize(Location.class, wardrobesNode.node(LEAVE_LOCATION_PATH)), viewerLocation);
-        } catch (SerializationException e) {
+                MessagesUtil.sendDebugMessages("Leave Location: " + leaveLocation);
-            throw new RuntimeException(e);
+                WardrobeLocation wardrobeLocation = new WardrobeLocation(npcLocation, viewerLocation, leaveLocation);
+
+                String permission = null;
+                int distance = -1;
+                if (!wardrobesNode.node(PERMISSION_PATH).virtual()) permission = wardrobesNode.node(PERMISSION_PATH).getString();
+                if (!wardrobesNode.node(DISTANCE_PATH).virtual()) distance = wardrobesNode.node(DISTANCE_PATH).getInt();
+
+                Wardrobe wardrobe = new Wardrobe(id, wardrobeLocation, permission, distance);
+                addWardrobe(wardrobe);
+            } catch (Exception e) {
+                MessagesUtil.sendDebugMessages("Unable to create wardrobe " + id, Level.SEVERE);
             }
         }
 
+        //throw new RuntimeException(e);
+    }
+
+    public static int getDefaultDistance() {
+        return staticRadius;
+    }
+
     public static boolean getDisableOnDamage() {
         return disableOnDamage;
     }
@@ -172,25 +198,36 @@ public class WardrobeSettings {
         return returnLastLocation;
     }
 
-    public static Location getWardrobeLocation() {
+    public static Wardrobe getWardrobe(String key) {
-        return wardrobeLocation.clone();
+        return wardrobes.get(key);
     }
 
-    public static Location getViewerLocation() {
+    public static Set<String> getWardrobeNames() {
-        return viewerLocation;
+        return wardrobes.keySet();
     }
 
-    public static Location getLeaveLocation() {
+    public static Collection<Wardrobe> getWardrobes() {
-        return leaveLocation;
+        return wardrobes.values();
     }
 
+    public static void addWardrobe(Wardrobe wardrobe) {
+        wardrobes.put(wardrobe.getId(), wardrobe);
+    }
+
+    public static void removeWardrobe(String id) {
+        wardrobes.remove(id);
+    }
+
+    @Deprecated
     public static boolean inDistanceOfWardrobe(final Location wardrobeLocation, final Location playerLocation) {
         if (displayRadius == -1) return true;
         if (!wardrobeLocation.getWorld().equals(playerLocation.getWorld())) return false;
         return playerLocation.distanceSquared(wardrobeLocation) <= displayRadius * displayRadius;
     }
 
-    public static boolean inDistanceOfStatic(final Location location) {
+    @Deprecated
+    public static boolean inDistanceOfStatic(Wardrobe wardrobe, final Location location) {
+        Location wardrobeLocation = wardrobe.getLocation().getNpcLocation();
         if (wardrobeLocation == null) return false;
         if (staticRadius == -1) return true;
         if (!wardrobeLocation.getWorld().equals(location.getWorld())) return false;
@@ -245,57 +282,84 @@ public class WardrobeSettings {
         return exitGamemode;
     }
 
-    public static void setWardrobeLocation(Location newLocation) {
+    public static boolean isTryCosmeticsInWardrobe() {
-        wardrobeLocation = newLocation;
+        return tryCosmeticsInWardrobe;
+    }
 
-        HMCCosmeticsPlugin plugin = HMCCosmeticsPlugin.getInstance();
+    /**
-
+     * Sets where the NPC/Mannequin will spawn in the wardrobe
-        plugin.getConfig().set("wardrobe.wardrobe-location." + "world", newLocation.getWorld().getName());
+     * @param newLocation
-        plugin.getConfig().set("wardrobe.wardrobe-location." + "x", newLocation.getX());
-        plugin.getConfig().set("wardrobe.wardrobe-location." + "y", newLocation.getY());
-        plugin.getConfig().set("wardrobe.wardrobe-location." + "z", newLocation.getZ());
-        plugin.getConfig().set("wardrobe.wardrobe-location." + "yaw", newLocation.getYaw());
-        plugin.getConfig().set("wardrobe.wardrobe-location." + "pitch", newLocation.getPitch());
-
-        /* Configuration sets suck
-        source.node(WORLD).set(loc.getWorld().getName());
-        source.node(X).set(loc.getX());
-        source.node(Y).set(loc.getY());
-        source.node(Z).set(loc.getZ());
-        source.node(YAW).set(loc.getYaw());
-        source.node(PITCH).set(loc.getPitch());
      */
-
+    public static void setNPCLocation(Wardrobe wardrobe, Location newLocation) {
-        HMCCosmeticsPlugin.getInstance().saveConfig();
+        wardrobe.getLocation().setNPCLocation(newLocation);
-    }
-
-    public static void setViewerLocation(Location newLocation) {
-        viewerLocation = newLocation;
 
         HMCCosmeticsPlugin plugin = HMCCosmeticsPlugin.getInstance();
 
-        plugin.getConfig().set("wardrobe.viewer-location." + "world", newLocation.getWorld().getName());
+        plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".npc-location." + "world", newLocation.getWorld().getName());
-        plugin.getConfig().set("wardrobe.viewer-location." + "x", newLocation.getX());
+        plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".npc-location." + "x", newLocation.getX());
-        plugin.getConfig().set("wardrobe.viewer-location." + "y", newLocation.getY());
+        plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".npc-location." + "y", newLocation.getY());
-        plugin.getConfig().set("wardrobe.viewer-location." + "z", newLocation.getZ());
+        plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".npc-location." + "z", newLocation.getZ());
-        plugin.getConfig().set("wardrobe.viewer-location." + "yaw", newLocation.getYaw());
+        plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".npc-location." + "yaw", newLocation.getYaw());
-        plugin.getConfig().set("wardrobe.viewer-location." + "pitch", newLocation.getPitch());
+        plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".npc-location." + "pitch", newLocation.getPitch());
 
-        HMCCosmeticsPlugin.getInstance().saveConfig();
+        plugin.saveConfig();
     }
 
-    public static void setLeaveLocation(Location newLocation) {
+    /**
-        leaveLocation = newLocation;
+     * Sets where the player will view the wardrobe
+     * @param newLocation
+     */
+    public static void setViewerLocation(Wardrobe wardrobe, Location newLocation) {
+        wardrobe.getLocation().setViewerLocation(newLocation);
 
         HMCCosmeticsPlugin plugin = HMCCosmeticsPlugin.getInstance();
 
-        plugin.getConfig().set("wardrobe.leave-location." + "world", newLocation.getWorld().getName());
+        plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".viewer-location.world", newLocation.getWorld().getName());
-        plugin.getConfig().set("wardrobe.leave-location." + "x", newLocation.getX());
+        plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".viewer-location.x", newLocation.getX());
-        plugin.getConfig().set("wardrobe.leave-location." + "y", newLocation.getY());
+        plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".viewer-location.y", newLocation.getY());
-        plugin.getConfig().set("wardrobe.leave-location." + "z", newLocation.getZ());
+        plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".viewer-location.z", newLocation.getZ());
-        plugin.getConfig().set("wardrobe.leave-location." + "yaw", newLocation.getYaw());
+        plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".viewer-location.yaw", newLocation.getYaw());
-        plugin.getConfig().set("wardrobe.leave-location." + "pitch", newLocation.getPitch());
+        plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".viewer-location.pitch", newLocation.getPitch());
 
-        HMCCosmeticsPlugin.getInstance().saveConfig();
+        plugin.saveConfig();
+    }
+
+    /**
+     * Sets where a player will leave the wardrobe from
+     * @param newLocation
+     */
+    public static void setLeaveLocation(Wardrobe wardrobe, Location newLocation) {
+        wardrobe.getLocation().setLeaveLocation(newLocation);
+
+        HMCCosmeticsPlugin plugin = HMCCosmeticsPlugin.getInstance();
+
+        plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".leave-location.world", newLocation.getWorld().getName());
+        plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".leave-location.x", newLocation.getX());
+        plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".leave-location.y", newLocation.getY());
+        plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".leave-location.z", newLocation.getZ());
+        plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".leave-location.yaw", newLocation.getYaw());
+        plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".leave-location.pitch", newLocation.getPitch());
+
+        plugin.saveConfig();
+    }
+
+    public static void setWardrobePermission(Wardrobe wardrobe, String permission) {
+        wardrobe.setPermission(permission);
+
+        HMCCosmeticsPlugin plugin = HMCCosmeticsPlugin.getInstance();
+
+        plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".permission", permission);
+
+        plugin.saveConfig();
+    }
+
+    public static void setWardrobeDistance(Wardrobe wardrobe, int distance) {
+        wardrobe.setDistance(distance);
+
+        HMCCosmeticsPlugin plugin = HMCCosmeticsPlugin.getInstance();
+
+        plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".distance", distance);
+
+        plugin.saveConfig();
     }
 }

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

@@ -143,9 +143,6 @@ public class ItemSerializer implements TypeSerializer<ItemStack> {
             }
         }
 
-        NamespacedKey key = new NamespacedKey(HMCCosmeticsPlugin.getInstance(), source.key().toString());
-        itemMeta.getPersistentDataContainer().set(key, PersistentDataType.STRING, source.key().toString());
-
         item.setItemMeta(itemMeta);
         return item;
     }

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

@@ -17,6 +17,7 @@ public abstract class Cosmetic {
     private String id;
     private String permission;
     private ItemStack item;
+    private String material;
     private CosmeticSlot slot;
     private boolean dyable;
 
@@ -29,7 +30,10 @@ public abstract class Cosmetic {
             this.permission = null;
         }
 
-        if (!config.node("item").virtual()) this.item = generateItemStack(config.node("item"));
+        if (!config.node("item").virtual()) {
+            this.material = config.node("item", "material").getString();
+            this.item = generateItemStack(config.node("item"));
+        }
 
         MessagesUtil.sendDebugMessages("Slot: " + config.node("slot").getString());
 
@@ -76,6 +80,10 @@ public abstract class Cosmetic {
         return this.dyable;
     }
 
+    public String getMaterial() {
+        return material;
+    }
+
     public abstract void update(CosmeticUser user);
 
     @Nullable

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

@@ -28,6 +28,7 @@ public class CosmeticArmorType extends Cosmetic {
     public void update(@NotNull CosmeticUser user) {
         Player player = Bukkit.getPlayer(user.getUniqueId());
         if (player == null) return;
+        if (user.getUserEmoteManager().isPlayingEmote()) return; // There has to be a better way of doing this...
         ItemStack cosmeticItem = user.getUserCosmeticItem(this);
         if (equipSlot.equals(EquipmentSlot.OFF_HAND)) {
             if (!player.getInventory().getItemInOffHand().getType().isAir()) return;

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

@@ -34,7 +34,7 @@ public class CosmeticBackpackType extends Cosmetic {
 
         if (user.isInWardrobe() || !user.isBackpackSpawned()) return;
         if (!user.getUserBackpackManager().getArmorStand().isValid()) {
-            MessagesUtil.sendDebugMessages("Invalid Backpack detected! Respawning backpack, report this on the discord if this happens often!", Level.WARNING);
+            MessagesUtil.sendDebugMessages("Invalid Backpack Entity[owner=" + user.getUniqueId() + ",player_location=" + loc + "]!", Level.WARNING);
             user.respawnBackpack();
             return;
         }

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

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

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

@@ -105,7 +105,7 @@ public class Menu {
 
         for (ConfigurationNode config : config.node("items").childrenMap().values()) {
 
-            List<String> slotString = null;
+            List<String> slotString;
             try {
                 slotString = config.node("slots").getList(String.class);
             } catch (SerializationException e) {
@@ -118,17 +118,14 @@ public class Menu {
 
             List<Integer> slots = getSlots(slotString);
 
-
             if (slots == null) {
                 MessagesUtil.sendDebugMessages("Slot is null for " + config.key().toString());
                 continue;
             }
 
             ItemStack item;
-
             try {
                 item = ItemSerializer.INSTANCE.deserialize(ItemStack.class, config.node("item"));
-                //item = config.node("item").get(ItemStack.class);
             } catch (SerializationException e) {
                 throw new RuntimeException(e);
             }
@@ -145,24 +142,25 @@ public class Menu {
                 if (Types.isType(typeId)) type = Types.getType(typeId);
             }
 
-            ItemStack originalItem = item.clone();
+            for (int slot : slots) {
-            item = updateLore(user, item, type, config);
+                ItemStack modifiedItem = getMenuItem(user, type, config, item.clone(), slot).clone();
-
+                GuiItem guiItem = ItemBuilder.from(modifiedItem).asGuiItem();
-            GuiItem guiItem = ItemBuilder.from(item).asGuiItem();
 
                 Type finalType = type;
                 guiItem.setAction(event -> {
+                    MessagesUtil.sendDebugMessages("Selected slot " + slot);
                     final ClickType clickType = event.getClick();
                     if (finalType != null) finalType.run(user, config, clickType);
-
+                    // Need to delay the update by a tick so it will actually update with new values
-                for (int i : slots) {
+                    for (int guiSlot : slots) {
-                    gui.updateItem(i, updateLore(user, originalItem.clone(), finalType, config));
+                        gui.updateItem(guiSlot, getMenuItem(user, finalType, config, item.clone(), guiSlot));
-                    MessagesUtil.sendDebugMessages("Updated slot " + i);
                     }
+                    MessagesUtil.sendDebugMessages("Updated slot " + slot);
                 });
 
                 MessagesUtil.sendDebugMessages("Added " + slots + " as " + guiItem + " in the menu");
-            gui.setItem(slots, guiItem);
+                gui.setItem(slot, guiItem);
+            }
         }
         return gui;
     }
@@ -195,11 +193,9 @@ public class Menu {
 
     @Contract("_, _, _, _ -> param2")
     @NotNull
-    private ItemStack updateLore(CosmeticUser user, @NotNull ItemStack itemStack, Type type, ConfigurationNode config) {
+    private ItemStack getMenuItem(CosmeticUser user, Type type, ConfigurationNode config, ItemStack itemStack, int slot) {
-        if (itemStack.hasItemMeta()) {
+        if (!itemStack.hasItemMeta()) return itemStack;
-            itemStack.setItemMeta(type.setLore(user, config, itemStack.getItemMeta()));
+        return type.setItem(user, config, itemStack, slot);
-        }
-        return itemStack;
     }
 
     public String getPermissionNode() {

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

@@ -56,6 +56,10 @@ public class Menus {
         return names;
     }
 
+    public static Collection<Menu> values() {
+        return MENUS.values();
+    }
+
     public static void setup() {
         MENUS.clear();
 

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

@@ -48,6 +48,7 @@ public class DyeMenu {
                 if (color == null) return;
 
                 addCosmetic(user, cosmetic, color);
+                event.setCancelled(true);
             } else event.setCancelled(true);
         });
 

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

@@ -2,6 +2,7 @@ package com.hibiscusmc.hmccosmetics.gui.type;
 
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import org.bukkit.event.inventory.ClickType;
+import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.spongepowered.configurate.ConfigurationNode;
 
@@ -24,5 +25,5 @@ public abstract class Type {
 
     public abstract void run(CosmeticUser user, ConfigurationNode config, ClickType clickType);
 
-    public abstract ItemMeta setLore(CosmeticUser user, ConfigurationNode config, ItemMeta itemMeta);
+    public abstract ItemStack setItem(CosmeticUser user, ConfigurationNode config, ItemStack itemStack, int slot);
 }

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

@@ -1,6 +1,7 @@
 package com.hibiscusmc.hmccosmetics.gui.type.types;
 
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
+import com.hibiscusmc.hmccosmetics.config.serializer.ItemSerializer;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
 import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticArmorType;
@@ -17,12 +18,14 @@ import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.EquipmentSlot;
+import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 
+import java.lang.invoke.TypeDescriptor;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -72,7 +75,7 @@ public class TypeCosmetic extends Type {
                 if (!actionConfig.node("on-equip").virtual()) actionStrings.addAll(actionConfig.node("on-equip").getList(String.class));
                 MessagesUtil.sendDebugMessages("on-equip");
                 // TODO: Redo this
-                if (cosmetic.isDyable()) {
+                if (cosmetic.isDyable() && Hooks.isActiveHook("HMCColor")) {
                     DyeMenu.openMenu(user, cosmetic);
                 } else {
                     user.addPlayerCosmetic(cosmetic);
@@ -89,62 +92,58 @@ public class TypeCosmetic extends Type {
         if (cosmetic instanceof CosmeticArmorType) {
             if (((CosmeticArmorType) cosmetic).getEquipSlot().equals(EquipmentSlot.OFF_HAND)) {
                 Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), run, 1);
-                return;
             }
         }
         run.run();
     }
 
     @Override
-    public ItemMeta setLore(CosmeticUser user, @NotNull ConfigurationNode config, ItemMeta itemMeta) {
+    public ItemStack setItem(CosmeticUser user, @NotNull ConfigurationNode config, ItemStack itemStack, int slot) {
-        List<String> processedLore = new ArrayList<>();
+        itemStack.setItemMeta(processLoreLines(user, itemStack.getItemMeta()));
 
-        if (config.node("cosmetic").virtual()) return processLoreLines(user, itemMeta);;
+        if (config.node("cosmetic").virtual()) {
+            return itemStack;
+        }
         String cosmeticName = config.node("cosmetic").getString();
         Cosmetic cosmetic = Cosmetics.getCosmetic(cosmeticName);
         if (cosmetic == null) {
-            return processLoreLines(user, itemMeta);
+            return itemStack;
         }
 
-        if (user.canEquipCosmetic(cosmetic)) {
+        if (user.hasCosmeticInSlot(cosmetic) && !config.node("equipped-item").virtual()) {
-            return processLoreLines(user, itemMeta);
+            MessagesUtil.sendDebugMessages("GUI Equipped Item");
-        } else {
+            ConfigurationNode equippedItem = config.node("equipped-item");
-            ConfigurationNode itemConfig = config.node("item");
+            try {
-            if (itemConfig.virtual()) return itemMeta;
+                if (equippedItem.node("material").virtual()) equippedItem.node("material").set(config.node("item", "material").getString());
-            if (itemConfig.node("locked-name").virtual() && itemConfig.node("locked-lore").virtual()) {
+            } catch (SerializationException e) {
-                return processLoreLines(user, itemMeta);
+                // Nothing >:)
             }
             try {
-                List<String> lockedLore = itemMeta.getLore();
+                itemStack = ItemSerializer.INSTANCE.deserialize(ItemStack.class, equippedItem);
-                String lockedName = itemMeta.getDisplayName();
+            } catch (SerializationException e) {
-
+                throw new RuntimeException(e);
-                if (!itemConfig.node("locked-lore").virtual()) {
-                    lockedLore = Utils.replaceIfNull(itemConfig.node("locked-lore").getList(String.class),
-                                    new ArrayList<String>()).
-                            stream().map(StringUtils::parseStringToString).collect(Collectors.toList());
             }
-                if (!itemConfig.node("locked-name").virtual()) {
+            itemStack.setItemMeta(processLoreLines(user, itemStack.getItemMeta()));
-                    lockedName = StringUtils.parseStringToString(Utils.replaceIfNull(itemConfig.node("locked-name").getString(), ""));
+            return itemStack;
         }
 
-                if (Hooks.isActiveHook("PlaceHolderAPI")) {
+        if (!user.canEquipCosmetic(cosmetic) && !config.node("locked-item").virtual()) {
-                    lockedName = PlaceholderAPI.setPlaceholders(user.getPlayer(), lockedName);
+            MessagesUtil.sendDebugMessages("GUI Locked Item");
+            ConfigurationNode lockedItem = config.node("locked-item");
+            try {
+                if (lockedItem.node("material").virtual()) lockedItem.node("material").set(config.node("item", "material").getString());
+            } catch (SerializationException e) {
+                // Nothing >:)
             }
-                itemMeta.setDisplayName(lockedName);
+            try {
-                if (itemMeta.hasLore()) {
+                itemStack = ItemSerializer.INSTANCE.deserialize(ItemStack.class, lockedItem);
-                    itemMeta.getLore().clear();
+            } catch (SerializationException e) {
-                    for (String loreLine : lockedLore) {
+                throw new RuntimeException(e);
-                        if (Hooks.isActiveHook("PlaceHolderAPI")) loreLine = PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine);
-                        processedLore.add(loreLine);
             }
+            itemStack.setItemMeta(processLoreLines(user, itemStack.getItemMeta()));
+            return itemStack;
         }
-            } catch (Exception e) {
+        return itemStack;
-                e.printStackTrace();
-            }
-        }
-
-        itemMeta.setLore(processedLore);
-        return itemMeta;
     }
 
     @Contract("_, _ -> param2")
@@ -155,12 +154,10 @@ public class TypeCosmetic extends Type {
 
         if (itemMeta.hasLore()) {
             for (String loreLine : itemMeta.getLore()) {
-                if (Hooks.isActiveHook("PlaceholderAPI"))
+                if (Hooks.isActiveHook("PlaceholderAPI")) loreLine = PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine);
-                    loreLine = PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine);
                 processedLore.add(loreLine);
             }
         }
-
         itemMeta.setLore(processedLore);
         return itemMeta;
     }

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

@@ -6,6 +6,7 @@ import com.hibiscusmc.hmccosmetics.hooks.Hooks;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import me.clip.placeholderapi.PlaceholderAPI;
 import org.bukkit.event.inventory.ClickType;
+import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
 import org.spongepowered.configurate.ConfigurationNode;
@@ -53,8 +54,9 @@ public class TypeEmpty extends Type {
 
     @Override
     @SuppressWarnings("Duplicates")
-    public ItemMeta setLore(CosmeticUser user, ConfigurationNode config, @NotNull ItemMeta itemMeta) {
+    public ItemStack setItem(CosmeticUser user, ConfigurationNode config, @NotNull ItemStack itemStack, int slot) {
         List<String> processedLore = new ArrayList<>();
+        ItemMeta itemMeta = itemStack.getItemMeta();
 
         if (itemMeta.hasLore()) {
             for (String loreLine : itemMeta.getLore()) {
@@ -63,8 +65,8 @@ public class TypeEmpty extends Type {
                 processedLore.add(loreLine);
             }
         }
-
+        itemStack.setItemMeta(itemMeta);
-        return itemMeta;
+        return itemStack;
     }
 
     // That's it! Now, add it as a static in another one of your classes (such as your main class) and you are good to go.

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

@@ -2,10 +2,7 @@ package com.hibiscusmc.hmccosmetics.hooks;
 
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.hooks.items.*;
-import com.hibiscusmc.hmccosmetics.hooks.misc.HookCMI;
+import com.hibiscusmc.hmccosmetics.hooks.misc.*;
-import com.hibiscusmc.hmccosmetics.hooks.misc.HookHMCColor;
-import com.hibiscusmc.hmccosmetics.hooks.misc.HookPremiumVanish;
-import com.hibiscusmc.hmccosmetics.hooks.misc.HookSuperVanish;
 import com.hibiscusmc.hmccosmetics.hooks.placeholders.HookPlaceholderAPI;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -20,14 +17,16 @@ public class Hooks {
     private static final HashMap<String, Hook> hooks = new HashMap<>();
     private static HookOraxen ORAXEN_HOOK = new HookOraxen();
     private static HookItemAdder ITEMADDER_HOOK = new HookItemAdder();
-    private static HookLooty LOOTY_HOOK = new HookLooty();
+    private static HookGeary GEARY_HOOK = new HookGeary();
     private static HookMythic MYTHIC_HOOK = new HookMythic();
+    private static HookDenizen DENIZEN_HOOK = new HookDenizen();
     private static HookHMCCosmetics HMCCOSMETIC_HOOK = new HookHMCCosmetics();
     private static HookPlaceholderAPI PAPI_HOOK = new HookPlaceholderAPI();
     private static HookPremiumVanish PREMIUM_VANISH_HOOK = new HookPremiumVanish();
     private static HookSuperVanish SUPER_VANISH_HOOK = new HookSuperVanish();
     private static HookHMCColor HMC_COLOR_HOOK = new HookHMCColor();
     private static HookCMI CMI_HOOK = new HookCMI();
+    private static HookLibsDisguises LIBS_DISGUISES_HOOK = new HookLibsDisguises();
 
     public static Hook getHook(@NotNull String id) {
         return hooks.get(id.toLowerCase());

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

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

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

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

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

@@ -1,28 +0,0 @@
-package com.hibiscusmc.hmccosmetics.hooks.items;
-
-import com.hibiscusmc.hmccosmetics.hooks.Hook;
-import com.mineinabyss.geary.prefabs.PrefabKey;
-import com.mineinabyss.looty.LootyFactory;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * A hook that integrates the plugin {@link com.mineinabyss.looty.LootyPlugin Looty} to provide custom items
- */
-@SuppressWarnings("SpellCheckingInspection")
-public class HookLooty extends Hook {
-    public HookLooty() {
-        super("looty");
-        setEnabledItemHook(true);
-    }
-
-    /**
-     * Gets a cosmetic {@link ItemStack} that is associated with the provided id from the plugin {@link com.mineinabyss.looty.LootyPlugin Looty}
-     */
-    @Override
-    public ItemStack getItem(@NotNull String itemId) {
-        PrefabKey prefabKey = PrefabKey.Companion.ofOrNull(itemId);
-        if (prefabKey == null) return null;
-        return LootyFactory.INSTANCE.createFromPrefab(prefabKey);
-    }
-}

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

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

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

@@ -47,6 +47,11 @@ public class HMCPlaceholderExpansion extends PlaceholderExpansion {
         return HMCCosmeticsPlugin.getInstance().getDescription().getVersion();
     }
 
+    @Override
+    public boolean persist() {
+        return true;
+    }
+
     @Override
     public String onRequest(@NotNull OfflinePlayer player, @NotNull String params) {
         if (!player.isOnline()) return null;
@@ -62,8 +67,9 @@ public class HMCPlaceholderExpansion extends PlaceholderExpansion {
                 }
                 if (placeholderArgs.get(1) != null) {
                     Cosmetic cosmetic = Cosmetics.getCosmetic(placeholderArgs.get(1));
+                    if (cosmetic == null) return "INVALID_COSMETIC";
                     Cosmetic currentCosmetic = user.getCosmetic(cosmetic.getSlot());
-                    if (cosmetic == null || currentCosmetic == null) return "false";
+                    if (currentCosmetic == null) return "false";
                     if (currentCosmetic.getId() == cosmetic.getId()) return "true";
                     return "false";
                 }
@@ -104,12 +110,16 @@ public class HMCPlaceholderExpansion extends PlaceholderExpansion {
                 if (placeholderArgs.get(1) != null) {
                     Cosmetic cosmetic = Cosmetics.getCosmetic(placeholderArgs.get(1));
                     if (cosmetic == null) {
+                        if (placeholderArgs.size() >= 3) {
                             Cosmetic secondAttemptCosmetic = Cosmetics.getCosmetic(placeholderArgs.get(1) + "_" + placeholderArgs.get(2));
                             if (secondAttemptCosmetic == null) {
                                 return "INVALID_COSMETIC";
                             } else {
                                 cosmetic = secondAttemptCosmetic;
                             }
+                        } else {
+                            return "INVALID_COSMETIC";
+                        }
                     }
                     return TranslationUtil.getTranslation("unlockedCosmetic", String.valueOf(user.canEquipCosmetic(cosmetic)));
                 }

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

@@ -4,6 +4,7 @@ import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.sk89q.worldguard.WorldGuard;
 import com.sk89q.worldguard.protection.flags.Flag;
 import com.sk89q.worldguard.protection.flags.StateFlag;
+import com.sk89q.worldguard.protection.flags.StringFlag;
 import com.sk89q.worldguard.protection.flags.registry.FlagConflictException;
 import com.sk89q.worldguard.protection.flags.registry.FlagRegistry;
 
@@ -21,13 +22,13 @@ public class WGHook {
     /**
      * @implNote Please use {@link #getCosmeticWardrobeFlag()} instead
      */
-    public static StateFlag COSMETIC_WARDROBE_FLAG;
+    public static StringFlag COSMETIC_WARDROBE_FLAG;
 
     public WGHook() {
         FlagRegistry registry = WorldGuard.getInstance().getFlagRegistry();
         try {
             StateFlag cosmeticFlag = new StateFlag("cosmetic-enable", false);
-            StateFlag wardrobeFlag = new StateFlag("cosmetic-wardrobe", false);
+            StringFlag wardrobeFlag = new StringFlag("cosmetic-wardrobe");
             registry.register(cosmeticFlag);
             registry.register(wardrobeFlag);
             COSMETIC_ENABLE_FLAG = cosmeticFlag;
@@ -56,7 +57,7 @@ public class WGHook {
      * Gets the cosmetic wardrobe {@link StateFlag}
      * @return The cosmetic wardrobe {@link StateFlag}
      */
-    public static StateFlag getCosmeticWardrobeFlag() {
+    public static StringFlag getCosmeticWardrobeFlag() {
         return COSMETIC_WARDROBE_FLAG;
     }
 

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

@@ -1,7 +1,10 @@
 package com.hibiscusmc.hmccosmetics.hooks.worldguard;
 
+import com.hibiscusmc.hmccosmetics.config.Wardrobe;
+import com.hibiscusmc.hmccosmetics.config.WardrobeSettings;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
+import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldguard.WorldGuard;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
@@ -34,13 +37,17 @@ public class WGListener implements Listener {
         }
         for (ProtectedRegion protectedRegion : set.getRegions()) {
             if (protectedRegion.getFlags().containsKey(WGHook.getCosmeticEnableFlag())) {
-                if (protectedRegion.getFlags().get(WGHook.getCosmeticEnableFlag()).toString().equalsIgnoreCase("ALLOW")) return;
+                if (protectedRegion.getFlags().get(WGHook.getCosmeticEnableFlag()).toString().equalsIgnoreCase("ALLOW")) {
+                    if (user.getHiddenReason() == CosmeticUser.HiddenReason.WORLDGUARD) user.showCosmetics();
+                    return;
+                }
                 user.hideCosmetics(CosmeticUser.HiddenReason.WORLDGUARD);
                 return;
             }
             if (protectedRegion.getFlags().containsKey(WGHook.getCosmeticWardrobeFlag())) {
-                if (!protectedRegion.getFlags().get(WGHook.getCosmeticWardrobeFlag()).toString().equalsIgnoreCase("ALLOW")) return;
+                if (!WardrobeSettings.getWardrobeNames().contains(protectedRegion.getFlags().get(WGHook.getCosmeticWardrobeFlag()).toString())) return;
-                user.enterWardrobe();
+                Wardrobe wardrobe = WardrobeSettings.getWardrobe(protectedRegion.getFlags().get(WGHook.getCosmeticWardrobeFlag()).toString());
+                user.enterWardrobe(true, wardrobe);
             }
         }
     }

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

@@ -328,11 +328,27 @@ public class PlayerGameListener implements Listener {
         CosmeticUser user = CosmeticUsers.getUser(event.getEntity());
         if (user == null) return;
 
+        if (user.isInWardrobe()) user.leaveWardrobe();
+
         if (Settings.getUnapplyOnDeath() && !event.getEntity().hasPermission("hmccosmetics.unapplydeath.bypass")) {
             user.removeCosmetics();
         }
     }
 
+    @EventHandler
+    public void onPlayerGamemodeSwitch(PlayerGameModeChangeEvent event) {
+        CosmeticUser user = CosmeticUsers.getUser(event.getPlayer());
+        if (user == null) return;
+
+        if (Settings.isDestroyLooseCosmetics()) {
+            ItemStack[] equippedArmor = event.getPlayer().getInventory().getArmorContents();
+            if (equippedArmor.length == 0) return;
+            for (ItemStack armor : equippedArmor) {
+                if (InventoryUtils.isCosmeticItem(armor)) armor.setAmount(0);
+            }
+        }
+    }
+
     private void registerInventoryClickListener() {
         ProtocolLibrary.getProtocolManager().addPacketListener(new PacketAdapter(HMCCosmeticsPlugin.getInstance(), ListenerPriority.NORMAL, PacketType.Play.Client.WINDOW_CLICK) {
             @Override

common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java

@@ -5,6 +5,7 @@ import com.google.common.collect.ImmutableList;
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.api.*;
 import com.hibiscusmc.hmccosmetics.config.Settings;
+import com.hibiscusmc.hmccosmetics.config.Wardrobe;
 import com.hibiscusmc.hmccosmetics.config.WardrobeSettings;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
@@ -30,7 +31,7 @@ import java.util.logging.Level;
 
 public class CosmeticUser {
 
-    private UUID uniqueId;
+    private final UUID uniqueId;
     private int taskId;
     private HashMap<CosmeticSlot, Cosmetic> playerCosmetics = new HashMap<>();
     private UserWardrobeManager userWardrobeManager;
@@ -52,7 +53,7 @@ public class CosmeticUser {
     private void tick() {
         // Occasionally updates the entity cosmetics
         Runnable run = () -> {
-            MessagesUtil.sendDebugMessages("tick " + uniqueId, Level.INFO);
+            MessagesUtil.sendDebugMessages("Tick[uuid=" + uniqueId + "]", Level.INFO);
             updateCosmetic();
         };
 
@@ -105,11 +106,11 @@ public class CosmeticUser {
 
         playerCosmetics.put(cosmetic.getSlot(), cosmetic);
         if (color != null) colors.put(cosmetic.getSlot(), color);
-        MessagesUtil.sendDebugMessages("addPlayerCosmetic " + cosmetic.getId());
+        MessagesUtil.sendDebugMessages("addPlayerCosmetic[id=" + cosmetic.getId() + "]");
         if (cosmetic.getSlot() == CosmeticSlot.BACKPACK) {
             CosmeticBackpackType backpackType = (CosmeticBackpackType) cosmetic;
             spawnBackpack(backpackType);
-            MessagesUtil.sendDebugMessages("addPlayerCosmetic spawnBackpack " + cosmetic.getId());
+            MessagesUtil.sendDebugMessages("addPlayerCosmetic[spawnBackpack,id=" + cosmetic.getId() + "]");
         }
         if (cosmetic.getSlot() == CosmeticSlot.BALLOON) {
             CosmeticBalloonType balloonType = (CosmeticBalloonType) cosmetic;
@@ -156,6 +157,11 @@ public class CosmeticUser {
         return playerCosmetics.containsKey(slot);
     }
 
+    public boolean hasCosmeticInSlot(Cosmetic cosmetic) {
+        if (getCosmetic(cosmetic.getSlot()) == null) return false;
+        return Objects.equals(cosmetic.getId(), getCosmetic(cosmetic.getSlot()).getId());
+    }
+
     public Set<CosmeticSlot> getSlotsWithCosmetics() {
         return Set.copyOf(playerCosmetics.keySet());
     }
@@ -173,7 +179,7 @@ public class CosmeticUser {
     }
 
     public void updateCosmetic() {
-        for (Cosmetic cosmetic : playerCosmetics.values()) {
+        for (Cosmetic cosmetic : getCosmetics()) {
             updateCosmetic(cosmetic.getSlot());
         }
     }
@@ -210,7 +216,8 @@ public class CosmeticUser {
                     mapMeta.setColor(color);
                 }
             }
-            itemMeta.getPersistentDataContainer().set(InventoryUtils.getKey(), PersistentDataType.STRING, "true");
+            itemMeta.getPersistentDataContainer().set(InventoryUtils.getCosmeticKey(), PersistentDataType.STRING, cosmetic.getId());
+            itemMeta.getPersistentDataContainer().set(InventoryUtils.getOwnerKey(), PersistentDataType.STRING, getPlayer().getUniqueId().toString());
 
             item.setItemMeta(itemMeta);
         }
@@ -233,27 +240,28 @@ public class CosmeticUser {
         return userEmoteManager;
     }
 
-    public void enterWardrobe() {
+    public void enterWardrobe(boolean ignoreDistance, Wardrobe wardrobe) {
-        enterWardrobe(false);
+        if (wardrobe.hasPermission() && !getPlayer().hasPermission(wardrobe.getPermission())) {
+            MessagesUtil.sendMessage(getPlayer(), "no-permission");
+            return;
         }
-
+        if (!wardrobe.canEnter(this) && !ignoreDistance) {
-    public void enterWardrobe(boolean ignoreDistance) {
-        enterWardrobe(ignoreDistance, WardrobeSettings.getLeaveLocation(), WardrobeSettings.getViewerLocation(), WardrobeSettings.getWardrobeLocation());
-    }
-
-    public void enterWardrobe(boolean ignoreDistance, Location exitLocation, Location viewingLocation, Location npcLocation) {
-        if (!WardrobeSettings.inDistanceOfStatic(getPlayer().getLocation()) && !ignoreDistance) {
             MessagesUtil.sendMessage(getPlayer(), "not-near-wardrobe");
             return;
         }
-        PlayerWardrobeEnterEvent event = new PlayerWardrobeEnterEvent(this);
+        if (!wardrobe.getLocation().hasAllLocations()) {
+            MessagesUtil.sendMessage(getPlayer(), "wardrobe-not-setup");
+            return;
+        }
+        PlayerWardrobeEnterEvent event = new PlayerWardrobeEnterEvent(this, wardrobe);
         Bukkit.getPluginManager().callEvent(event);
         if (event.isCancelled()) {
             return;
         }
+        wardrobe = event.getWardrobe();
 
         if (userWardrobeManager == null) {
-            userWardrobeManager = new UserWardrobeManager(this, exitLocation, viewingLocation, npcLocation);
+            userWardrobeManager = new UserWardrobeManager(this, wardrobe);
             userWardrobeManager.start();
         }
     }
@@ -264,6 +272,7 @@ public class CosmeticUser {
         if (event.isCancelled()) {
             return;
         }
+        MessagesUtil.sendDebugMessages("Leaving Wardrobe");
         if (!getWardrobeManager().getWardrobeStatus().equals(UserWardrobeManager.WardrobeStatus.RUNNING)) return;
 
         getWardrobeManager().setWardrobeStatus(UserWardrobeManager.WardrobeStatus.STOPPING);
@@ -280,20 +289,14 @@ public class CosmeticUser {
                 userWardrobeManager.end();
                 userWardrobeManager = null;
             }, WardrobeSettings.getTransitionDelay());
+        } else {
+            userWardrobeManager.end();
+            userWardrobeManager = null;
         }
     }
 
     public boolean isInWardrobe() {
-        if (userWardrobeManager == null) return false;
+        return userWardrobeManager != null;
-        return true;
-    }
-
-    public void toggleWardrobe() {
-        if (isInWardrobe()) {
-            leaveWardrobe();
-        } else {
-            enterWardrobe();
-        }
     }
 
     public void spawnBackpack(CosmeticBackpackType cosmeticBackpackType) {
@@ -309,8 +312,7 @@ public class CosmeticUser {
     }
 
     public boolean isBackpackSpawned() {
-        if (this.userBackpackManager == null) return false;
+        return this.userBackpackManager != null;
-        return true;
     }
 
     public void spawnBalloon(CosmeticBalloonType cosmeticBalloonType) {
@@ -361,7 +363,7 @@ public class CosmeticUser {
     }
 
     public List<CosmeticSlot> getDyeableSlots() {
-        ArrayList<CosmeticSlot> dyableSlots = new ArrayList();
+        ArrayList<CosmeticSlot> dyableSlots = new ArrayList<>();
 
         for (Cosmetic cosmetic : getCosmetics()) {
             if (cosmetic.isDyable()) dyableSlots.add(cosmetic.getSlot());
@@ -372,8 +374,8 @@ public class CosmeticUser {
 
     public boolean canEquipCosmetic(Cosmetic cosmetic) {
         if (!cosmetic.requiresPermission()) return true;
-        if (getPlayer().hasPermission(cosmetic.getPermission())) return true;
+        if (isInWardrobe() && WardrobeSettings.isTryCosmeticsInWardrobe()) return true;
-        return false;
+        return getPlayer().hasPermission(cosmetic.getPermission());
     }
 
     public void hidePlayer() {
@@ -395,7 +397,7 @@ public class CosmeticUser {
     }
 
     public void hideCosmetics(HiddenReason reason) {
-        if (hideCosmetics == true) return;
+        if (hideCosmetics) return;
         PlayerCosmeticHideEvent event = new PlayerCosmeticHideEvent(this, reason);
         Bukkit.getPluginManager().callEvent(event);
         if (event.isCancelled()) {

common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserEmoteManager.java

@@ -3,6 +3,7 @@ package com.hibiscusmc.hmccosmetics.user.manager;
 import com.hibiscusmc.hmccosmetics.api.PlayerEmoteStartEvent;
 import com.hibiscusmc.hmccosmetics.api.PlayerEmoteStopEvent;
 import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticEmoteType;
+import com.hibiscusmc.hmccosmetics.emotes.EmoteManager;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import org.bukkit.Bukkit;
@@ -19,7 +20,7 @@ public class UserEmoteManager {
 
     public void playEmote(@NotNull CosmeticEmoteType cosmeticEmoteType) {
         MessagesUtil.sendDebugMessages("playEmote " + cosmeticEmoteType.getAnimationId());
-        playEmote(cosmeticEmoteType.getAnimationId());
+        playEmote(EmoteManager.get(cosmeticEmoteType.getAnimationId()));
     }
 
     public void playEmote(String animationId) {

common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserEmoteModel.java

@@ -57,11 +57,21 @@ public class UserEmoteModel extends PlayerModel {
         double DISTANCE = Settings.getEmoteDistance();
 
         Location thirdPersonLocation = newLocation.add(newLocation.getDirection().normalize().multiply(DISTANCE));
+        if (DISTANCE > 0) {
+            MessagesUtil.sendDebugMessages("Yaw " + (int) thirdPersonLocation.getYaw());
+            MessagesUtil.sendDebugMessages("New Yaw " + ServerUtils.getNextYaw((int) thirdPersonLocation.getYaw(), 180));
+            thirdPersonLocation.setYaw(ServerUtils.getNextYaw((int) thirdPersonLocation.getYaw(), 180));
+        }
         if (Settings.getCosmeticEmoteBlockCheck() && thirdPersonLocation.getBlock().getType().isOccluding()) {
             stopAnimation();
             MessagesUtil.sendMessage(player, "emote-blocked");
             return;
         }
+        // Check if block below player is an air block
+        if (Settings.getEmoteAirCheck() && newLocation.clone().subtract(0, 1, 0).getBlock().getType().isAir()) {
+            stopAnimation();
+            MessagesUtil.sendMessage(player, "emote-blocked");
+        }
 
         user.getPlayer().setInvisible(true);
         user.hideCosmetics(CosmeticUser.HiddenReason.EMOTE);
@@ -70,7 +80,7 @@ public class UserEmoteModel extends PlayerModel {
 
         PacketManager.sendEntitySpawnPacket(thirdPersonLocation, armorStandId, EntityType.ARMOR_STAND, UUID.randomUUID(), viewer);
         PacketManager.sendInvisibilityPacket(armorStandId, viewer);
-        PacketManager.sendLookPacket(armorStandId, player.getLocation(), viewer);
+        PacketManager.sendLookPacket(armorStandId, thirdPersonLocation, viewer);
 
         PacketManager.gamemodeChangePacket(player, 3);
         PacketManager.sendCameraPacket(armorStandId, viewer);

common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserWardrobeManager.java

@@ -2,6 +2,8 @@ package com.hibiscusmc.hmccosmetics.user.manager;
 
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.config.Settings;
+import com.hibiscusmc.hmccosmetics.config.Wardrobe;
+import com.hibiscusmc.hmccosmetics.config.WardrobeLocation;
 import com.hibiscusmc.hmccosmetics.config.WardrobeSettings;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
@@ -38,6 +40,8 @@ public class UserWardrobeManager {
     private String npcName;
     private GameMode originalGamemode;
     private final CosmeticUser user;
+    private final Wardrobe wardrobe;
+    private final WardrobeLocation wardrobeLocation;
     private final Location viewingLocation;
     private final Location npcLocation;
     private Location exitLocation;
@@ -45,15 +49,18 @@ public class UserWardrobeManager {
     private boolean active;
     private WardrobeStatus wardrobeStatus;
 
-    public UserWardrobeManager(CosmeticUser user, Location exitLocation, Location viewingLocation, Location npcLocation) {
+    public UserWardrobeManager(CosmeticUser user, Wardrobe wardrobe) {
         NPC_ID = NMSHandlers.getHandler().getNextEntityId();
         ARMORSTAND_ID = NMSHandlers.getHandler().getNextEntityId();
         WARDROBE_UUID = UUID.randomUUID();
         this.user = user;
 
-        this.exitLocation = exitLocation;
+        this.wardrobe = wardrobe;
-        this.viewingLocation = viewingLocation;
+        this.wardrobeLocation = wardrobe.getLocation();
-        this.npcLocation = npcLocation;
+
+        this.exitLocation = wardrobeLocation.getLeaveLocation();
+        this.viewingLocation = wardrobeLocation.getViewerLocation();
+        this.npcLocation = wardrobeLocation.getNpcLocation();
 
         wardrobeStatus = WardrobeStatus.SETUP;
     }
@@ -208,9 +215,7 @@ public class UserWardrobeManager {
 
             // For Wardrobe Temp Cosmetics
             for (Cosmetic cosmetic : user.getCosmetics()) {
-                if (cosmetic.requiresPermission()) {
+                if (!user.canEquipCosmetic(cosmetic)) user.removeCosmeticSlot(cosmetic.getSlot());
-                    if (!player.hasPermission(cosmetic.getPermission())) user.removeCosmeticSlot(cosmetic.getSlot());
-                }
             }
 
             user.updateCosmetic();
@@ -226,16 +231,16 @@ public class UserWardrobeManager {
             public void run() {
                 Player player = user.getPlayer();
                 if (!active || player == null) {
-                    MessagesUtil.sendDebugMessages("Active is false");
+                    MessagesUtil.sendDebugMessages("WardrobeEnd[user=" + user.getUniqueId() + ",reason=Active is false]");
                     this.cancel();
                     return;
                 }
-                MessagesUtil.sendDebugMessages("Update ");
+                MessagesUtil.sendDebugMessages("WardrobeUpdate[user=" + user.getUniqueId() + ",status=" + getWardrobeStatus() + "]");
                 List<Player> viewer = Collections.singletonList(player);
                 List<Player> outsideViewers = PacketManager.getViewers(viewingLocation);
                 outsideViewers.remove(player);
 
-                Location location = WardrobeSettings.getWardrobeLocation().clone();
+                Location location = npcLocation;
                 int yaw = data.get();
                 location.setYaw(yaw);
 
@@ -259,8 +264,8 @@ public class UserWardrobeManager {
                 }
 
                 if (user.hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
-                    PacketManager.sendTeleportPacket(user.getBalloonManager().getPufferfishBalloonId(), WardrobeSettings.getWardrobeLocation().add(Settings.getBalloonOffset()), false, viewer);
+                    PacketManager.sendTeleportPacket(user.getBalloonManager().getPufferfishBalloonId(), npcLocation.add(Settings.getBalloonOffset()), false, viewer);
-                    user.getBalloonManager().getModelEntity().teleport(WardrobeSettings.getWardrobeLocation().add(Settings.getBalloonOffset()));
+                    user.getBalloonManager().getModelEntity().teleport(npcLocation.add(Settings.getBalloonOffset()));
                     user.getBalloonManager().sendRemoveLeashPacket(outsideViewers);
                     PacketManager.sendEntityDestroyPacket(user.getBalloonManager().getModelId(), outsideViewers);
                     user.getBalloonManager().sendLeashPacket(NPC_ID);

common/src/main/java/com/hibiscusmc/hmccosmetics/util/InventoryUtils.java

@@ -143,12 +143,17 @@ public class InventoryUtils {
     }
 
     public static boolean isCosmeticItem(ItemStack itemStack) {
+        if (itemStack == null) return false;
         itemStack = itemStack.clone();
         if (!itemStack.hasItemMeta()) return false;
-        return itemStack.getItemMeta().getPersistentDataContainer().has(getKey(), PersistentDataType.STRING);
+        return itemStack.getItemMeta().getPersistentDataContainer().has(getCosmeticKey(), PersistentDataType.STRING);
     }
 
-    public static NamespacedKey getKey() {
+    public static NamespacedKey getCosmeticKey() {
         return new NamespacedKey(HMCCosmeticsPlugin.getInstance(), "cosmetic");
     }
+
+    public static NamespacedKey getOwnerKey() {
+        return new NamespacedKey(HMCCosmeticsPlugin.getInstance(), "owner");
+    }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/util/packets/PacketManager.java

@@ -306,15 +306,21 @@ public class PacketManager extends BasePacket {
         WrappedGameProfile wrappedGameProfile = new WrappedGameProfile(uuid, name);
         WrappedSignedProperty skinData = PlayerUtils.getSkin(skinnedPlayer);
         if (skinData != null) wrappedGameProfile.getProperties().put("textures", skinData);
-        if (NMSHandlers.getVersion().contains("v1_17_R1") || NMSHandlers.getVersion().contains("v1_18_R2") || NMSHandlers.getVersion().contains("v1_19_R1") || NMSHandlers.getVersion().contains("v1_19_R3")) {
+        // For sor some reason 1.19.2 handles it on the 0 field index, every other verison handles it on the 1
-            info.getHandle().getPlayerInfoDataLists().write(1, Collections.singletonList(new PlayerInfoData(
+        if (NMSHandlers.getVersion().contains("v1_19_R1")) {
+            info.getHandle().getPlayerInfoDataLists().write(0, Collections.singletonList(new PlayerInfoData(
                     wrappedGameProfile,
                     0,
                     EnumWrappers.NativeGameMode.CREATIVE,
                     WrappedChatComponent.fromText(name)
             )));
         } else {
-            info.setData(List.of(new PlayerInfoData(wrappedGameProfile, 0, EnumWrappers.NativeGameMode.CREATIVE, WrappedChatComponent.fromText(name))));
+            info.getHandle().getPlayerInfoDataLists().write(1, Collections.singletonList(new PlayerInfoData(
+                    wrappedGameProfile,
+                    0,
+                    EnumWrappers.NativeGameMode.CREATIVE,
+                    WrappedChatComponent.fromText(name)
+            )));
         }
         for (final Player p : sendTo) sendPacket(p, info.getHandle());
     }

common/src/main/resources/config.yml

@@ -25,6 +25,7 @@ cosmetic-settings:
 
   emote-distance: -3 # This shows how far away the camera should be while a player is doing an emote. Negative is behind player.
   emote-block-check: true # If the server should check if the block is open where the camera is placed (prevents players viewing through blocks)
+  emote-air-check: true # Check if there is air under a player, if there is, don't play emote
   emote-damage-leave: true # If the player should leave the emote when they take damage
   emote-invincible: false # If the player should not take damage while doing an emote
 
@@ -70,10 +71,12 @@ wardrobe:
   equip-pumpkin: false
   # Rather than having a set exit location, this will send the player back to where they entered the wardrobe. Not recommended for WG regions
   return-last-location: false
+  # If players in wardrobes should be able to equip any cosmetic, regardless of permission (Cosmetics they do not have access to will be removed when they leave the wardrobe)
+  unchecked-wardrobe-cosmetics: false
 
   gamemode-options:
     exit-gamemode-enabled: false # Setting this to false will set the gamemode the player came in as. True sets to exit-gamemode gamemode
-    exit-gamemode: "SURVIVAL" # Only activates if force-exit-gamemode is true, find gamemodes here: https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/GameMode.html
+    exit-gamemode: "SURVIVAL" # Only activates if exit-gamemode-enabled is true, find gamemodes here: https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/GameMode.html
 
   # Bossbar that shows when a player is in a wardrobe.
   bossbar:
@@ -91,22 +94,24 @@ wardrobe:
     title-fade-in: 1000 # milliseconds
     title-stay: 500 # milliseconds
     title-fade-out: 1000 # milliseconds
-  wardrobe-location:
+  wardrobes:
-    world: "World"
+    default:
+      npc-location:
+        world: "world"
         x: 0
         y: 0
         z: 0
         yaw: 0
         pitch: 0
       viewer-location:
-    world: "World"
+        world: "world"
         x: 5
         y: 0
         z: 5
         yaw: 0
         pitch: 0
       leave-location:
-    world: "World"
+        world: "world"
         x: 5
         y: 5
         z: 5

common/src/main/resources/cosmetics/defaultcosmetics.yml

@@ -124,7 +124,6 @@ earth_day_grabber:
   slot: OFFHAND
   dyeable: true
   permission: "hmccosmetics.earth_day_grabber"
-  model: earth_day_grabber
   item:
     material: LEATHER_HORSE_ARMOR
     model-data: 4

common/src/main/resources/messages.yml

@@ -11,6 +11,10 @@ not-near-wardrobe: "%prefix% <red>You are not near the wardrobe!"
 set-wardrobe-location: "%prefix% <gradient:#6D9DC5:#45CDE9>Set new wardrobe location!"
 set-wardrobe-viewing: "%prefix% <gradient:#6D9DC5:#45CDE9>Set new wardrobe viewing location!"
 set-wardrobe-leaving: "%prefix% <gradient:#6D9DC5:#45CDE9>Set new wardrobe leaving location!"
+set-wardrobe-permission: "%prefix% <gradient:#6D9DC5:#45CDE9>Set new wardrobe permission!"
+set-wardrobe-distance: "%prefix% <gradient:#6D9DC5:#45CDE9>Set new wardrobe distance!"
+no-wardrobes: "%prefix% <red>There are no wardrobes with that name!"
+wardrobe-not-setup: "%prefix% <red>This wardrobe does not have all required locations set!"
 
 equip-cosmetic: "%prefix% <gradient:#6D9DC5:#45CDE9>You have equipped <cosmetic>!"
 unequip-cosmetic: "%prefix% <gradient:#6D9DC5:#45CDE9>You have unequipped <cosmetic>!"