Refactoring and Misc changes in UserWardrobeManager

clean: use preferred method

build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "com.hibiscusmc"
-version = "2.1.2"
+version = "2.2.3"
 
 allprojects {
     apply(plugin = "java")
@@ -56,20 +56,27 @@ allprojects {
 
         // ParticleHelper
         maven("https://repo.bytecode.space/repository/maven-public/")
+
+        // PlayerAnimator
+        maven("https://mvn.lumine.io/repository/maven/")
     }
 
     dependencies {
 
         compileOnly("com.mojang:authlib:1.5.25")
-        compileOnly("org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT")
+        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("me.clip:placeholderapi:2.11.1")
         compileOnly("com.ticxo.modelengine:api: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-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")
 
     }
 }
@@ -83,13 +90,14 @@ dependencies {
 
     //compileOnly("com.github.Fisher2911:FisherLib:master-SNAPSHOT")
     implementation("net.kyori:adventure-api:4.11.0")
-    implementation ("net.kyori:adventure-text-minimessage:4.11.0")
+    implementation("net.kyori:adventure-text-minimessage:4.11.0")
     implementation("net.kyori:adventure-platform-bukkit:4.1.2")
     implementation("dev.triumphteam:triumph-gui:3.1.3")
     implementation("org.spongepowered:configurate-yaml:4.1.2")
     implementation("org.bstats:bstats-bukkit:3.0.0")
     implementation("com.jeff_media:SpigotUpdateChecker:3.0.0")
     implementation("com.owen1212055:particlehelper:1.0.0-SNAPSHOT")
+    implementation("com.ticxo.playeranimator:PlayerAnimator:R1.2.5")
 }
 
 tasks {
@@ -127,7 +135,8 @@ tasks {
         relocate("com.zaxxer.hikaricp", "com.hisbiscusmc.hmccosmetics.hikaricp")
         relocate("com.j256.ormlite", "com.hisbiscusmc.hmccosmetics.ormlite")
         relocate("com.jeff_media.updatechecker", "com.hisbiscusmc.hmccosmetics.updatechecker")
-        relocate("com.woen1212055.particlehelper", "com.hisbiscusmc.hmccosmetics.particlehelper")
+        relocate("com.owen1212055.particlehelper", "com.hisbiscusmc.hmccosmetics.particlehelper")
+        relocate("com.ticxo.playeranimator", "com.hisbiscusmc.hmccosmetics.playeranimator")
         archiveFileName.set("HMCCosmeticsRemapped-${project.version}.jar")
 
         dependencies {
@@ -152,10 +161,10 @@ tasks {
 bukkit {
     load = BukkitPluginDescription.PluginLoadOrder.POSTWORLD
     main = "com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin"
-    apiVersion = "1.16"
+    apiVersion = "1.17"
     authors = listOf("LoJoSho")
-    depend = listOf("ProtocolLib", "PlaceholderAPI")
+    depend = listOf("ProtocolLib")
-    softDepend = listOf("ModelEngine", "Oraxen", "ItemsAdder", "HMCColor", "WorldGuard", "MythicMobs")
+    softDepend = listOf("ModelEngine", "Oraxen", "ItemsAdder", "Looty", "HMCColor", "WorldGuard", "MythicMobs", "PlaceholderAPI", "SuperVanish", "PremiumVanish")
     version = "${project.version}"
 
     commands {
@@ -182,6 +191,21 @@ bukkit {
         register("hmccosmetics.cmd.menu") {
             default = BukkitPluginDescription.Permission.Default.TRUE
         }
+        register("hmccosmetics.emote.shiftrun") {
+            default = BukkitPluginDescription.Permission.Default.TRUE
+        }
+        register("hmccosmetics.cmd.emote") {
+            default = BukkitPluginDescription.Permission.Default.TRUE
+        }
+        register("hmccosmetics.cmd.playemote") {
+            default = BukkitPluginDescription.Permission.Default.OP
+        }
+        register("hmccosmetics.cmd.playemote.other") {
+            default = BukkitPluginDescription.Permission.Default.OP
+        }
+        register("hmccosmetics.cmd.emote.other") {
+            default = BukkitPluginDescription.Permission.Default.OP
+        }
         register("hmccosmetics.cmd.setlocation") {
             default = BukkitPluginDescription.Permission.Default.OP
         }

common/build.gradle.kts

@@ -5,27 +5,31 @@ plugins {
 
 dependencies {
     compileOnly("com.mojang:authlib:1.5.25")
-    compileOnly("org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT")
+    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("me.clip:placeholderapi:2.11.1")
     compileOnly("com.ticxo.modelengine:api: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: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.github.LeonMangler:SuperVanish:6.2.6-4")
 
     //compileOnly("com.github.Fisher2911:FisherLib:master-SNAPSHOT")
     implementation("net.kyori:adventure-api:4.12.0")
-    implementation ("net.kyori:adventure-text-minimessage:4.12.0")
+    implementation("net.kyori:adventure-text-minimessage:4.12.0")
     implementation("net.kyori:adventure-platform-bukkit:4.2.0")
     implementation("dev.triumphteam:triumph-gui:3.1.3")
     implementation("org.spongepowered:configurate-yaml:4.1.2")
     implementation("org.bstats:bstats-bukkit:3.0.0")
     implementation("com.jeff_media:SpigotUpdateChecker:3.0.0")
     implementation("com.owen1212055:particlehelper:1.0.0-SNAPSHOT")
+    implementation("com.ticxo.playeranimator:PlayerAnimator:R1.2.5")
 }
 
 java {

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

@@ -12,8 +12,7 @@ import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
 import com.hibiscusmc.hmccosmetics.database.Database;
 import com.hibiscusmc.hmccosmetics.gui.Menus;
-import com.hibiscusmc.hmccosmetics.hooks.PAPIHook;
+import com.hibiscusmc.hmccosmetics.hooks.Hooks;
-import com.hibiscusmc.hmccosmetics.hooks.items.ItemHooks;
 import com.hibiscusmc.hmccosmetics.hooks.worldguard.WGHook;
 import com.hibiscusmc.hmccosmetics.hooks.worldguard.WGListener;
 import com.hibiscusmc.hmccosmetics.listener.PlayerConnectionListener;
@@ -23,10 +22,13 @@ 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;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.permissions.Permission;
@@ -39,6 +41,7 @@ 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 {
 
@@ -91,6 +94,12 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
             saveResource("cosmetics/defaultcosmetics.yml", false);
             saveResource("menus/defaultmenu.yml", false);
         }
+        // Emote folder setup
+        File emoteFile = new File(getDataFolder().getPath() + "/emotes");
+        if (!emoteFile.exists()) emoteFile.mkdir();
+
+        // Player Animator
+        PlayerAnimatorImpl.initialize(this);
 
         setup();
 
@@ -105,11 +114,6 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
         // Database
         new Database();
 
-        // PAPI
-        if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) {
-            new PAPIHook().register();
-        }
-
         // ModelEngine
         if (Bukkit.getPluginManager().getPlugin("ModelEngine") != null) {
             hasModelEngine = true;
@@ -197,8 +201,8 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
             throw new RuntimeException(e);
         }
 
-        // ItemHooks
+        // Misc Hooks setup (like items)
-        ItemHooks.setup();
+        Hooks.setup();
 
         // Cosmetics setup
         Cosmetics.setup();
@@ -229,6 +233,22 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
             }
         }
 
+        File emoteFolder = new File(getInstance().getDataFolder().getPath() + "/emotes/");
+        if (emoteFolder.exists()) {
+            PlayerAnimator.api.getAnimationManager().clearRegistry();
+            File[] emotesFiles = emoteFolder.listFiles();
+            for (File emoteFile : emotesFiles) {
+                if (!emoteFile.getName().contains("bbmodel")) continue;
+                String animationName = emoteFile.getName().replaceAll(".bbmodel", "");
+                PlayerAnimator.api.getAnimationManager().importAnimations(FilenameUtils.removeExtension(emoteFile.getName()), emoteFile);
+                MessagesUtil.sendDebugMessages("Added '" + animationName + "' to Player Animator ");
+            }
+
+            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");

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

@@ -2,6 +2,7 @@ package com.hibiscusmc.hmccosmetics.api;
 
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
 
 public class HMCCosmeticSetupEvent extends Event {
 
@@ -12,6 +13,7 @@ public class HMCCosmeticSetupEvent extends Event {
     private static final HandlerList handlers = new HandlerList();
 
     @Override
+    @NotNull
     public HandlerList getHandlers() {
         return handlers;
     }

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

@@ -5,10 +5,11 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
 
 public class PlayerCosmeticEquipEvent extends Event implements Cancellable {
 
-    private CosmeticUser user;
+    private final CosmeticUser user;
     private Cosmetic cosmetic;
     private boolean isCancelled;
 
@@ -31,6 +32,7 @@ public class PlayerCosmeticEquipEvent extends Event implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
     @Override
+    @NotNull
     public HandlerList getHandlers() {
         return handlers;
     }
@@ -47,7 +49,7 @@ public class PlayerCosmeticEquipEvent extends Event implements Cancellable {
         return cosmetic;
     }
 
-    public void setCosmetic() {
+    public void setCosmetic(Cosmetic cosmetic) {
         this.cosmetic = cosmetic;
     }
 }

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

@@ -4,11 +4,12 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
 
 public class PlayerCosmeticHideEvent extends Event implements Cancellable {
 
-    private CosmeticUser user;
+    private final CosmeticUser user;
-    private CosmeticUser.HiddenReason reason;
+    private final CosmeticUser.HiddenReason reason;
     private boolean isCancelled;
 
     public PlayerCosmeticHideEvent(CosmeticUser user, CosmeticUser.HiddenReason reason) {
@@ -30,6 +31,7 @@ public class PlayerCosmeticHideEvent extends Event implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
     @Override
+    @NotNull
     public HandlerList getHandlers() {
         return handlers;
     }

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

@@ -5,11 +5,12 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
 
 public class PlayerCosmeticRemoveEvent extends Event implements Cancellable {
 
-    private CosmeticUser user;
+    private final CosmeticUser user;
-    private Cosmetic cosmetic;
+    private final Cosmetic cosmetic;
     private boolean isCancelled;
 
     public PlayerCosmeticRemoveEvent(CosmeticUser user, Cosmetic cosmetic) {
@@ -31,6 +32,7 @@ public class PlayerCosmeticRemoveEvent extends Event implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
     @Override
+    @NotNull
     public HandlerList getHandlers() {
         return handlers;
     }

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

@@ -4,10 +4,11 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
 
 public class PlayerCosmeticShowEvent extends Event implements Cancellable {
 
-    private CosmeticUser user;
+    private final CosmeticUser user;
     private boolean isCancelled;
 
     public PlayerCosmeticShowEvent(CosmeticUser user) {
@@ -28,6 +29,7 @@ public class PlayerCosmeticShowEvent extends Event implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
     @Override
+    @NotNull
     public HandlerList getHandlers() {
         return handlers;
     }

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

@@ -5,11 +5,12 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
 
 public class PlayerMenuOpenEvent extends Event implements Cancellable {
 
-    private CosmeticUser user;
+    private final CosmeticUser user;
-    private Menu menu;
+    private final Menu menu;
     private boolean isCancelled;
 
     public PlayerMenuOpenEvent(CosmeticUser user, Menu menu) {
@@ -31,6 +32,7 @@ public class PlayerMenuOpenEvent extends Event implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
     @Override
+    @NotNull
     public HandlerList getHandlers() {
         return handlers;
     }

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

@@ -4,10 +4,11 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
 
 public class PlayerWardrobeEnterEvent extends Event implements Cancellable {
 
-    private CosmeticUser user;
+    private final CosmeticUser user;
     private boolean isCancelled;
 
     public PlayerWardrobeEnterEvent(CosmeticUser user) {
@@ -28,6 +29,7 @@ public class PlayerWardrobeEnterEvent extends Event implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
     @Override
+    @NotNull
     public HandlerList getHandlers() {
         return handlers;
     }

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

@@ -4,10 +4,11 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
 
 public class PlayerWardrobeLeaveEvent extends Event implements Cancellable {
 
-    private CosmeticUser user;
+    private final CosmeticUser user;
     private boolean isCancelled;
 
     public PlayerWardrobeLeaveEvent(CosmeticUser user) {
@@ -28,6 +29,7 @@ public class PlayerWardrobeLeaveEvent extends Event implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
     @Override
+    @NotNull
     public HandlerList getHandlers() {
         return handlers;
     }

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

@@ -6,6 +6,7 @@ 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.gui.Menu;
 import com.hibiscusmc.hmccosmetics.gui.Menus;
@@ -14,6 +15,7 @@ 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;
@@ -32,7 +34,7 @@ public class CosmeticCommand implements CommandExecutor {
     //             0      1        2
 
     @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String @NotNull [] args) {
         boolean silent = false;
 
         if (args.length == 0) {
@@ -46,7 +48,7 @@ public class CosmeticCommand implements CommandExecutor {
             }
 
             CosmeticUser user = CosmeticUsers.getUser(((Player) sender).getUniqueId());
-            Menu menu = Menus.getMenu(Settings.getDefaultMenu());
+            Menu menu = Menus.getDefaultMenu();
 
             if (user == null) {
                 MessagesUtil.sendMessage(sender, "invalid-player");
@@ -67,13 +69,16 @@ public class CosmeticCommand implements CommandExecutor {
 
         if (sender.hasPermission("HMCCosmetics.cmd.silent") || sender.isOp()) {
             for (String singleArg : args) {
-                if (singleArg.equalsIgnoreCase("-s")) silent = true;
+                if (singleArg.equalsIgnoreCase("-s")) {
+                    silent = true;
+                    break;
+                }
             }
         }
 
         switch (firstArgs) {
             case ("reload") -> {
-                if (!sender.hasPermission("HMCCosmetics.cmd.reload") || !sender.isOp()) {
+                if (!sender.hasPermission("HMCCosmetics.cmd.reload") && !sender.isOp()) {
                     if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
                     return true;
                 }
@@ -143,7 +148,7 @@ public class CosmeticCommand implements CommandExecutor {
                     return true;
                 }
 
-                CosmeticSlot cosmeticSlot = null;
+                CosmeticSlot cosmeticSlot;
 
                 if (sender instanceof Player) player = ((Player) sender).getPlayer();
                 if (sender.hasPermission("hmccosmetics.cmd.unapply.other")) {
@@ -317,7 +322,7 @@ public class CosmeticCommand implements CommandExecutor {
                 }
                 player.sendMessage("Passengers -> " + player.getPassengers());
                 if (user.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
-                    player.sendMessage("Backpack Location -> " + user.getBackpackEntity().getLocation());
+                    player.sendMessage("Backpack Location -> " + user.getUserBackpackManager().getArmorStand().getLocation());
                 }
                 player.sendMessage("Cosmetics -> " + user.getCosmetic());
                 player.sendMessage("EntityId -> " + player.getEntityId());
@@ -380,7 +385,60 @@ public class CosmeticCommand implements CommandExecutor {
                     if (!silent) MessagesUtil.sendMessage(sender, "debug-enabled");
                 }
             }
+            case ("emote") -> {
+                if (!sender.hasPermission("hmccosmetics.cmd.emote")) {
+                    if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
+                    return true;
+                }
+                if (sender.hasPermission("hmccosmetics.cmd.emote.other")) {
+                    if (args.length >= 2) player = Bukkit.getPlayer(args[1]);
+                }
+                if (player == null) {
+                    if (!silent) MessagesUtil.sendMessage(sender, "invalid-player");
+                    return true;
+                }
+                CosmeticUser user = CosmeticUsers.getUser(player);
+                if (!user.hasCosmeticInSlot(CosmeticSlot.EMOTE)) {
+                    if (!silent) MessagesUtil.sendMessage(sender, "emote-none");
+                    return true;
+                }
 
+                CosmeticEmoteType cosmeticEmoteType = (CosmeticEmoteType) user.getCosmetic(CosmeticSlot.EMOTE);
+                cosmeticEmoteType.run(user);
+                return true;
+            }
+
+            case ("playemote") -> {
+                // /cosmetic playEmote <emoteId> [playerName]
+                if (!sender.hasPermission("hmccosmetics.cmd.playemote")) {
+                    if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
+                    return true;
+                }
+
+                if (args.length < 2) {
+                    if (!silent) MessagesUtil.sendMessage(player, "not-enough-args");
+                    return true;
+                }
+
+                if (args.length >= 2) {
+                    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]);
+                }
+                if (player == null) {
+                    if (!silent) MessagesUtil.sendMessage(sender, "invalid-player");
+                    return true;
+                }
+                CosmeticUser user = CosmeticUsers.getUser(player);
+                user.getUserEmoteManager().playEmote(args[1]);
+                return true;
+            }
         }
         return true;
     }

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

@@ -7,6 +7,7 @@ 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;
@@ -23,9 +24,9 @@ import java.util.List;
 public class CosmeticCommandTabComplete implements TabCompleter {
     @Nullable
     @Override
-    public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
+    public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String @NotNull [] args) {
         List<String> completions = new ArrayList<>();
-        List<String> finalCompletitons = new ArrayList<>();
+        List<String> finalCompletions = new ArrayList<>();
 
         if (args.length == 1) {
             if (hasPermission(sender, "hmccosmetics.cmd.apply")) completions.add("apply");
@@ -39,8 +40,10 @@ public class CosmeticCommandTabComplete implements TabCompleter {
             if (hasPermission(sender, "hmccosmetics.cmd.hide")) completions.add("hide");
             if (hasPermission(sender, "hmccosmetics.cmd.show")) completions.add("show");
             if (hasPermission(sender, "hmccosmetics.cmd.debug")) completions.add("debug");
+            if (hasPermission(sender, "hmccosmetics.cmd.emote")) completions.add("emote");
+            if (hasPermission(sender, "hmccosmetics.cmd.playemote")) completions.add("playemote");
 
-            StringUtil.copyPartialMatches(args[0], completions, finalCompletitons);
+            StringUtil.copyPartialMatches(args[0], completions, finalCompletions);
         }
 
         if (!(sender instanceof Player)) return completions;
@@ -62,7 +65,7 @@ public class CosmeticCommandTabComplete implements TabCompleter {
                         if (menu.canOpen(user.getPlayer())) completions.add(menu.getId());
                     }
                 }
-                case "dataclear", "wardrobe", "hide", "show" -> {
+                case "dataclear", "wardrobe", "hide", "show", "emote" -> {
                     for (Player player : Bukkit.getOnlinePlayers()) {
                         completions.add(player.getName());
                     }
@@ -77,8 +80,11 @@ public class CosmeticCommandTabComplete implements TabCompleter {
                     completions.add("viewerlocation");
                     completions.add("leavelocation");
                 }
+                case "playemote" -> {
+                    completions.addAll(PlayerAnimator.api.getAnimationManager().getRegistry().keySet());
+                }
             }
-            StringUtil.copyPartialMatches(args[1], completions, finalCompletitons);
+            StringUtil.copyPartialMatches(args[1], completions, finalCompletions);
         }
         if (args.length == 3) {
             String subcommand = args[0].toLowerCase();
@@ -86,13 +92,13 @@ public class CosmeticCommandTabComplete implements TabCompleter {
                 case "dye" -> {
                     completions.add("#FFFFFF");
                 }
-                case "menu", "apply", "unapply" -> {
+                case "menu", "apply", "unapply", "playemote" -> {
                     for (Player player : Bukkit.getOnlinePlayers()) {
                         completions.add(player.getName());
                     }
                 }
             }
-            StringUtil.copyPartialMatches(args[2], completions, finalCompletitons);
+            StringUtil.copyPartialMatches(args[2], completions, finalCompletions);
         }
 
         if (args.length == 4) {
@@ -102,14 +108,15 @@ public class CosmeticCommandTabComplete implements TabCompleter {
                     completions.add("#FFFFFF");
                 }
             }
-            StringUtil.copyPartialMatches(args[3], completions, finalCompletitons);
+            StringUtil.copyPartialMatches(args[3], completions, finalCompletions);
         }
 
-        Collections.sort(finalCompletitons);
+        Collections.sort(finalCompletions);
-        return finalCompletitons;
+        return finalCompletions;
     }
 
-    private static List<String> applyCommandComplete(CosmeticUser user, String[] args) {
+    @NotNull
+    private static List<String> applyCommandComplete(CosmeticUser user, String @NotNull [] args) {
         List<String> completitions = new ArrayList<>();
 
         if (args.length == 2) {
@@ -128,7 +135,7 @@ public class CosmeticCommandTabComplete implements TabCompleter {
         return completitions;
     }
 
-    private boolean hasPermission(CommandSender sender, String permission) {
+    private boolean hasPermission(@NotNull CommandSender sender, String permission) {
         if (sender.isOp()) return true;
         if (sender.hasPermission(permission)) return true;
         return false;

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

@@ -25,12 +25,18 @@ public class Settings {
     private static final String PARTICLE_COUNT = "particle-count";
     private static final String DYE_MENU_PATH = "dye-menu";
     private static final String DYE_MENU_NAME = "title";
+    private static final String DYE_MENU_INPUT_SLOT = "input-slot";
+    private static final String DYE_MENU_OUTPUT_SLOT = "output-slot";
     private static final String DEBUG_ENABLE_PETH = "debug-mode";
     private static final String TICK_PERIOD_PATH = "tick-period";
     private static final String UNAPPLY_DEATH_PATH = "unapply-on-death";
+    private static final String FORCE_PERMISSION_JOIN_PATH = "force-permission-join";
+    private static final String EMOTE_DISTANCE_PATH = "emote-distance";
 
     private static String defaultMenu;
     private static String dyeMenuName;
+    private static int dyeMenuInputSlot;
+    private static int dyeMenuOutputSlot;
     private static int configVersion;
     private static boolean requireEmptyHelmet;
     private static boolean requireEmptyOffHand;
@@ -39,9 +45,11 @@ public class Settings {
     private static boolean requireEmptyBoots;
     private static boolean debugMode;
     private static boolean unapplyOnDeath;
+    private static boolean forcePermissionJoin;
     private static int lookDownPitch;
     private static int viewDistance;
     private static int tickPeriod;
+    private static double emoteDistance;
     private static Vector balloonOffset;
 
     public static void load(ConfigurationNode source) {
@@ -67,6 +75,8 @@ public class Settings {
         requireEmptyPants = cosmeticSettings.node(REQUIRE_EMPTY_PANTS_PATH).getBoolean();
         requireEmptyBoots = cosmeticSettings.node(REQUIRE_EMPTY_BOOTS_PATH).getBoolean();
         unapplyOnDeath = cosmeticSettings.node(UNAPPLY_DEATH_PATH).getBoolean(false);
+        forcePermissionJoin = cosmeticSettings.node(FORCE_PERMISSION_JOIN_PATH).getBoolean(false);
+        emoteDistance = cosmeticSettings.node(EMOTE_DISTANCE_PATH).getDouble(-3);
 
         tickPeriod = cosmeticSettings.node(TICK_PERIOD_PATH).getInt(-1);
         lookDownPitch = cosmeticSettings.node(LOOK_DOWN_PITCH_PATH).getInt();
@@ -79,6 +89,8 @@ public class Settings {
         ConfigurationNode dyeMenuSettings = source.node(DYE_MENU_PATH);
 
         dyeMenuName = dyeMenuSettings.node(DYE_MENU_NAME).getString("Dye Menu");
+        dyeMenuInputSlot = dyeMenuSettings.node(DYE_MENU_INPUT_SLOT).getInt(19);
+        dyeMenuOutputSlot = dyeMenuSettings.node(DYE_MENU_OUTPUT_SLOT).getInt(25);
     }
 
     private static Vector loadVector(final ConfigurationNode config) {
@@ -172,6 +184,8 @@ public class Settings {
     public static String getDyeMenuName() {
         return dyeMenuName;
     }
+    public static int getDyeMenuInputSlot() { return dyeMenuInputSlot; }
+    public static int getDyeMenuOutputSlot() { return dyeMenuOutputSlot; }
 
     public static boolean isDebugEnabled() {
         return debugMode;
@@ -183,10 +197,17 @@ public class Settings {
     public static boolean getUnapplyOnDeath() {
         return unapplyOnDeath;
     }
+    public static boolean getForcePermissionJoin() {
+        return forcePermissionJoin;
+    }
 
     public static boolean getDebugMode() {
         return debugMode;
     }
+
+    public static double getEmoteDistance() {
+        return emoteDistance;
+    }
     public static void setDebugMode(boolean newSetting) {
         debugMode = newSetting;
 

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

@@ -1,11 +1,13 @@
 package com.hibiscusmc.hmccosmetics.config.serializer;
 
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
-import com.hibiscusmc.hmccosmetics.hooks.items.ItemHooks;
+import com.hibiscusmc.hmccosmetics.hooks.Hooks;
+import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.hibiscusmc.hmccosmetics.util.ServerUtils;
 import com.hibiscusmc.hmccosmetics.util.builder.ColorBuilder;
 import com.hibiscusmc.hmccosmetics.util.misc.StringUtils;
 import com.hibiscusmc.hmccosmetics.util.misc.Utils;
+import org.apache.commons.lang3.EnumUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Color;
 import org.bukkit.Material;
@@ -72,7 +74,7 @@ public class ItemSerializer implements TypeSerializer<ItemStack> {
 
         String material = materialNode.getString();
 
-        ItemStack item = ItemHooks.getItem(material);
+        ItemStack item = Hooks.getItem(material);
         if (item == null) {
             HMCCosmeticsPlugin.getInstance().getLogger().severe("Invalid Material -> " + material);
             return new ItemStack(Material.AIR);
@@ -81,15 +83,16 @@ public class ItemSerializer implements TypeSerializer<ItemStack> {
 
         ItemMeta itemMeta = item.getItemMeta();
         if (itemMeta == null) return item;
-        if (!nameNode.virtual()) itemMeta.setDisplayName(StringUtils.parseStringToString(Utils.replaceIfNull(nameNode.getString(), "")));
+        if (!nameNode.virtual())
+            itemMeta.setDisplayName(StringUtils.parseStringToString(Utils.replaceIfNull(nameNode.getString(), "")));
         if (!unbreakableNode.virtual()) itemMeta.setUnbreakable(unbreakableNode.getBoolean());
         if (!glowingNode.virtual()) {
             itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
             itemMeta.addEnchant(Enchantment.LUCK, 1, true);
         }
         if (!loreNode.virtual()) itemMeta.setLore(Utils.replaceIfNull(loreNode.getList(String.class),
-                            new ArrayList<String>()).
+                        new ArrayList<String>()).
-                    stream().map(StringUtils::parseStringToString).collect(Collectors.toList()));
+                stream().map(StringUtils::parseStringToString).collect(Collectors.toList()));
         if (!modelDataNode.virtual()) itemMeta.setCustomModelData(modelDataNode.getInt());
 
         if (!nbtNode.virtual()) {
@@ -105,11 +108,16 @@ public class ItemSerializer implements TypeSerializer<ItemStack> {
             }
         }
 
-        if (!itemFlagsNode.virtual()) {
+        try {
-            for (ConfigurationNode flagNode : itemFlagsNode.childrenMap().values()) {
+            if (!itemFlagsNode.virtual()) {
-                if (ItemFlag.valueOf(flagNode.key().toString()) == null) continue;
+                for (String itemFlag : itemFlagsNode.getList(String.class)) {
-                itemMeta.addItemFlags(ItemFlag.valueOf(flagNode.key().toString()));
+                    if (!EnumUtils.isValidEnum(ItemFlag.class, itemFlag)) continue;
+                    MessagesUtil.sendDebugMessages("Added " + itemFlag + " to the item!");
+                    itemMeta.addItemFlags(ItemFlag.valueOf(itemFlag));
+                }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
 
         if (item.getType() == Material.PLAYER_HEAD) {
@@ -141,7 +149,6 @@ public class ItemSerializer implements TypeSerializer<ItemStack> {
         item.setItemMeta(itemMeta);
         return item;
     }
-
     @Override
     public void serialize(final Type type, @Nullable final ItemStack obj, final ConfigurationNode node) throws SerializationException {
 

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

@@ -5,6 +5,7 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
@@ -19,7 +20,7 @@ public class Cosmetic {
     private CosmeticSlot slot;
     private boolean dyable;
 
-    protected Cosmetic(String id, ConfigurationNode config) {
+    protected Cosmetic(String id, @NotNull ConfigurationNode config) {
         this.id = id;
         if (!config.node("permission").virtual()) {
             this.permission = config.node("permission").getString();
@@ -58,8 +59,7 @@ public class Cosmetic {
     }
 
     public boolean requiresPermission() {
-        if (permission == null) return false;
+        return permission != null;
-        return true;
     }
 
     public void setId(String id) {

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

@@ -8,5 +8,6 @@ public enum CosmeticSlot {
     MAINHAND,
     OFFHAND,
     BACKPACK,
-    BALLOON
+    BALLOON,
+    EMOTE
 }

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

@@ -3,12 +3,11 @@ package com.hibiscusmc.hmccosmetics.cosmetic;
 import com.google.common.collect.HashBiMap;
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.config.Settings;
-import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticArmorType;
+import com.hibiscusmc.hmccosmetics.cosmetic.types.*;
-import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType;
-import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
-import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticMainhandType;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import org.apache.commons.lang3.EnumUtils;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
 import org.spongepowered.configurate.CommentedConfigurationNode;
 import org.spongepowered.configurate.ConfigurateException;
 import org.spongepowered.configurate.ConfigurationNode;
@@ -20,7 +19,7 @@ import java.util.logging.Level;
 
 public class Cosmetics {
 
-    private static HashBiMap<String, Cosmetic> COSMETICS = HashBiMap.create();
+    private static final HashBiMap<String, Cosmetic> COSMETICS = HashBiMap.create();
 
     public static void addCosmetic(Cosmetic cosmetic) {
         COSMETICS.put(cosmetic.getId(), cosmetic);
@@ -38,10 +37,14 @@ public class Cosmetics {
         return COSMETICS.get(id);
     }
 
+    @Contract(pure = true)
+    @NotNull
     public static Set<Cosmetic> values() {
         return COSMETICS.values();
     }
 
+    @Contract(pure = true)
+    @NotNull
     public static Set<String> keys() {
         return COSMETICS.keySet();
     }
@@ -79,7 +82,7 @@ public class Cosmetics {
         }
     }
 
-    private static void setupCosmetics(CommentedConfigurationNode config) {
+    private static void setupCosmetics(@NotNull CommentedConfigurationNode config) {
         for (ConfigurationNode cosmeticConfig : config.childrenMap().values()) {
             try {
                 String id = cosmeticConfig.key().toString();
@@ -97,6 +100,7 @@ public class Cosmetics {
                     case BALLOON -> new CosmeticBalloonType(id, cosmeticConfig);
                     case BACKPACK -> new CosmeticBackpackType(id, cosmeticConfig);
                     case MAINHAND -> new CosmeticMainhandType(id, cosmeticConfig);
+                    case EMOTE -> new CosmeticEmoteType(id, cosmeticConfig);
                     default -> new CosmeticArmorType(id, cosmeticConfig);
                 }
             } catch (Exception e) {

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

@@ -7,11 +7,12 @@ import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.EquipmentSlot;
+import org.jetbrains.annotations.NotNull;
 import org.spongepowered.configurate.ConfigurationNode;
 
 public class CosmeticArmorType extends Cosmetic {
 
-    private EquipmentSlot equipSlot;
+    private final EquipmentSlot equipSlot;
 
     public CosmeticArmorType(String id, ConfigurationNode config) {
         super(id, config);
@@ -20,7 +21,7 @@ public class CosmeticArmorType extends Cosmetic {
     }
 
     @Override
-    public void update(CosmeticUser user) {
+    public void update(@NotNull CosmeticUser user) {
         Player player = Bukkit.getPlayer(user.getUniqueId());
         if (player == null) return;
         if (equipSlot.equals(EquipmentSlot.OFF_HAND)) {

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

@@ -6,34 +6,42 @@ import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 import org.spongepowered.configurate.ConfigurationNode;
 
 public class CosmeticBackpackType extends Cosmetic {
 
-    ConfigurationNode config;
+    private final String modelName;
+    private ConfigurationNode config;
 
     public CosmeticBackpackType(String id, ConfigurationNode config) {
         super(id, config);
 
         this.config = config;
+        modelName = config.node("model").getString();
     }
 
     @Override
-    public void update(CosmeticUser user) {
+    public void update(@NotNull CosmeticUser user) {
         Player player = Bukkit.getPlayer(user.getUniqueId());
-        Location loc = player.getLocation().clone();
+        if (player == null) return;
 
-        if (user.isInWardrobe()) return;
+        Location loc = player.getLocation().clone().add(0, 2, 0);
 
-        if (loc.getWorld() != user.getBackpackEntity().getWorld()) {
+        if (user.isInWardrobe() || !user.isBackupSpawned()) return;
-            user.getBackpackEntity().teleport(loc);
+        if (loc.getWorld() != user.getUserBackpackManager().getArmorStand().getWorld()) {
+            user.getUserBackpackManager().getArmorStand().teleport(loc);
         }
 
-        user.getBackpackEntity().teleport(loc);
+        user.getUserBackpackManager().getArmorStand().teleport(loc);
 
-        PacketManager.sendRidingPacket(player.getEntityId(), user.getBackpackEntity().getEntityId(), loc);
+        PacketManager.sendRidingPacket(player.getEntityId(), user.getUserBackpackManager().getFirstArmorStandId(), loc);
 
-        user.getBackpackEntity().setRotation(loc.getYaw(), loc.getPitch());
+        user.getUserBackpackManager().getArmorStand().setRotation(loc.getYaw(), loc.getPitch());
-        user.showBackpack();
+        user.getUserBackpackManager().showBackpack();
+    }
+
+    public String getModelName() {
+        return modelName;
     }
 }

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

@@ -2,23 +2,22 @@ package com.hibiscusmc.hmccosmetics.cosmetic.types;
 
 import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
-import com.hibiscusmc.hmccosmetics.entities.BalloonEntity;
+import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
-import org.apache.commons.lang3.EnumUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
+import org.jetbrains.annotations.NotNull;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 
-import java.util.HashMap;
 import java.util.List;
 
 public class CosmeticBalloonType extends Cosmetic {
 
-    private String modelName;
+    private final String modelName;
     private List<String> dyableParts;
     //private HashMap<Animations, String> animationBalloons;
 
@@ -48,30 +47,32 @@ public class CosmeticBalloonType extends Cosmetic {
     }
 
     @Override
-    public void update(CosmeticUser user) {
+    public void update(@NotNull CosmeticUser user) {
         Player player = Bukkit.getPlayer(user.getUniqueId());
-        Location currentLocation = user.getBalloonEntity().getLocation().clone();
+        UserBalloonManager userBalloonManager = user.getBalloonManager();
-        Location newLocation = player.getLocation().clone().add(Settings.getBalloonOffset()).clone();
+
-        if (player == null) return;
+        if (player == null || userBalloonManager == null) return;
         if (user.isInWardrobe()) return;
 
+        Location newLocation = player.getLocation();
+        Location currentLocation = user.getBalloonManager().getLocation();
+        newLocation = newLocation.clone().add(Settings.getBalloonOffset());
+
         List<Player> viewer = PacketManager.getViewers(player.getLocation());
         viewer.add(player);
 
-        BalloonEntity balloonEntity = user.getBalloonEntity();
+        if (player.getLocation().getWorld() != userBalloonManager.getLocation().getWorld()) {
-
+            userBalloonManager.getModelEntity().teleport(newLocation);
-        if (player.getLocation().getWorld() != balloonEntity.getLocation().getWorld()) {
+            PacketManager.sendTeleportPacket(userBalloonManager.getPufferfishBalloonId(), newLocation, false, viewer);
-            balloonEntity.getModelEntity().teleport(newLocation);
-            PacketManager.sendTeleportPacket(balloonEntity.getPufferfishBalloonId(), newLocation, false, viewer);
             return;
         }
 
         Vector velocity = newLocation.toVector().subtract(currentLocation.toVector());
-        balloonEntity.setVelocity(velocity.multiply(1.1));
+        userBalloonManager.setVelocity(velocity.multiply(1.1));
-        balloonEntity.setLocation(newLocation);
+        userBalloonManager.setLocation(newLocation);
 
-        PacketManager.sendTeleportPacket(balloonEntity.getPufferfishBalloonId(), newLocation, false, viewer);
+        PacketManager.sendTeleportPacket(userBalloonManager.getPufferfishBalloonId(), newLocation, false, viewer);
-        if (!user.getHidden()) PacketManager.sendLeashPacket(balloonEntity.getPufferfishBalloonId(), player.getEntityId(), viewer);
+        if (!user.getHidden()) PacketManager.sendLeashPacket(userBalloonManager.getPufferfishBalloonId(), player.getEntityId(), viewer);
     }
 
     public String getModelName() {

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

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

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

@@ -5,6 +5,7 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.PlayerUtils;
 import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 import org.spongepowered.configurate.ConfigurationNode;
 
 public class CosmeticMainhandType extends Cosmetic {
@@ -14,10 +15,9 @@ public class CosmeticMainhandType extends Cosmetic {
     }
 
     @Override
-    public void update(CosmeticUser user) {
+    public void update(@NotNull CosmeticUser user) {
         Player player = user.getPlayer();
 
         PacketManager.equipmentSlotUpdate(player.getEntityId(), user, getSlot(), PlayerUtils.getNearbyPlayers(player));
-
     }
 }

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

@@ -16,23 +16,23 @@ public class Database {
 
     private static Data data;
 
+    @Deprecated
     private static InternalData INTERNAL_DATA  = new InternalData();
-    private static MySQLData MYSQL_DATA = new MySQLData();
+
-    private static SQLiteData SQLITE_DATA = new SQLiteData();
+    private static final MySQLData MYSQL_DATA = new MySQLData();
+    private static final SQLiteData SQLITE_DATA = new SQLiteData();
 
     public Database() {
         String databaseType = DatabaseSettings.getDatabaseType();
-        data = INTERNAL_DATA; // default
+        data = SQLITE_DATA; // default
-        if (databaseType.equalsIgnoreCase("INTERNAL")) {
-            data = INTERNAL_DATA;
-        }
         if (databaseType.equalsIgnoreCase("MySQL")) {
             data = MYSQL_DATA;
         }
+        /* SQLite is the default database. Might change in the future, so keep code here in case.
         if (databaseType.equalsIgnoreCase("sqlite")) {
             data = SQLITE_DATA;
-
         }
+         */
         MessagesUtil.sendDebugMessages("Database is " + data);
 
         setup();

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

@@ -1,6 +1,7 @@
 package com.hibiscusmc.hmccosmetics.database.types;
 
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
+import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
@@ -9,6 +10,7 @@ import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import org.apache.commons.lang3.EnumUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Color;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
@@ -35,10 +37,12 @@ public class Data {
         // Override
     }
     // BACKPACK=colorfulbackpack&RRGGBB,HELMET=niftyhat,BALLOON=colorfulballoon,CHESTPLATE=niftychestplate
-    public String steralizeData(CosmeticUser user) {
+    public String serializeData(@NotNull CosmeticUser user) {
         String data = "";
         if (user.getHidden()) {
-            data = "HIDDEN=" + user.getHiddenReason();
+            if (shouldHiddenSave(user.getHiddenReason())) {
+                data = "HIDDEN=" + user.getHiddenReason();
+            }
         }
         for (Cosmetic cosmetic : user.getCosmetic()) {
             Color color = user.getCosmeticColor(cosmetic.getSlot());
@@ -53,8 +57,9 @@ public class Data {
         return data;
     }
 
-    public Map<CosmeticSlot, Map<Cosmetic, Color>> desteralizedata(CosmeticUser user, String raw) {
+    public Map<CosmeticSlot, Map<Cosmetic, Color>> deserializeData(CosmeticUser user, @NotNull String raw) {
         Map<CosmeticSlot, Map<Cosmetic, Color>> cosmetics = new HashMap<>();
+        boolean checkPermission = Settings.getForcePermissionJoin();
 
         String[] rawData = raw.split(",");
         for (String a : rawData) {
@@ -76,10 +81,20 @@ public class Data {
                 String[] colorSplitData = splitData[1].split("&");
                 if (Cosmetics.hasCosmetic(colorSplitData[0])) cosmetic = Cosmetics.getCosmetic(colorSplitData[0]);
                 if (slot == null || cosmetic == null) continue;
+                if (cosmetic.requiresPermission() && checkPermission) {
+                    if (!user.getPlayer().hasPermission(cosmetic.getPermission())) {
+                        continue;
+                    }
+                }
                 cosmetics.put(slot, Map.of(cosmetic, Color.fromRGB(Integer.parseInt(colorSplitData[1]))));
             } else {
                 if (Cosmetics.hasCosmetic(splitData[1])) cosmetic = Cosmetics.getCosmetic(splitData[1]);
                 if (slot == null || cosmetic == null) continue;
+                if (cosmetic.requiresPermission() && checkPermission) {
+                    if (!user.getPlayer().hasPermission(cosmetic.getPermission())) {
+                        continue;
+                    }
+                }
                 HashMap<Cosmetic, Color> cosmeticColorHashMap = new HashMap<>();
                 cosmeticColorHashMap.put(cosmetic, null);
                 cosmetics.put(slot, cosmeticColorHashMap);
@@ -87,4 +102,15 @@ public class Data {
         }
         return cosmetics;
     }
+
+    private boolean shouldHiddenSave(CosmeticUser.@NotNull HiddenReason reason) {
+        switch (reason) {
+            case EMOTE, NONE -> {
+                return false;
+            }
+            default -> {
+                return true;
+            }
+        }
+    }
 }

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

@@ -14,6 +14,7 @@ import org.bukkit.persistence.PersistentDataType;
 import java.util.Map;
 import java.util.UUID;
 
+@Deprecated
 public class InternalData extends Data {
 
     NamespacedKey key = new NamespacedKey(HMCCosmeticsPlugin.getInstance(), "cosmetics");
@@ -27,7 +28,7 @@ public class InternalData extends Data {
     public void save(CosmeticUser user) {
         Player player = Bukkit.getPlayer(user.getUniqueId());
 
-        player.getPersistentDataContainer().set(key, PersistentDataType.STRING, steralizeData(user));
+        player.getPersistentDataContainer().set(key, PersistentDataType.STRING, serializeData(user));
     }
 
     @Override
@@ -38,7 +39,7 @@ public class InternalData extends Data {
         if (!player.getPersistentDataContainer().has(key, PersistentDataType.STRING)) return user;
         String rawData = player.getPersistentDataContainer().get(key, PersistentDataType.STRING);
 
-        Map<CosmeticSlot, Map<Cosmetic, Color>> a = desteralizedata(user, rawData);
+        Map<CosmeticSlot, Map<Cosmetic, Color>> a = deserializeData(user, rawData);
         for (Map<Cosmetic, Color> cosmeticColors : a.values()) {
             for (Cosmetic cosmetic : cosmeticColors.keySet()) {
                 Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {

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

@@ -58,7 +58,7 @@ public class MySQLData extends Data {
             try {
                 PreparedStatement preparedSt = preparedStatement("REPLACE INTO COSMETICDATABASE(UUID,COSMETICS) VALUES(?,?);");
                 preparedSt.setString(1, user.getUniqueId().toString());
-                preparedSt.setString(2, steralizeData(user));
+                preparedSt.setString(2, serializeData(user));
                 preparedSt.executeUpdate();
             } catch (SQLException e) {
                 throw new RuntimeException(e);
@@ -82,7 +82,7 @@ public class MySQLData extends Data {
                 ResultSet rs = preparedStatement.executeQuery();
                 if (rs.next()) {
                     String rawData = rs.getString("COSMETICS");
-                    Map<CosmeticSlot, Map<Cosmetic, Color>> cosmetics = desteralizedata(user, rawData);
+                    Map<CosmeticSlot, Map<Cosmetic, Color>> cosmetics = deserializeData(user, rawData);
                     for (Map<Cosmetic, Color> cosmeticColors : cosmetics.values()) {
                         for (Cosmetic cosmetic : cosmeticColors.keySet()) {
                             Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
@@ -160,11 +160,7 @@ public class MySQLData extends Data {
 
     private boolean isConnectionOpen() {
         try {
-            if (connection == null || connection.isClosed()) {
+            return connection != null && !connection.isClosed();
-                return false;
-            } else {
-                return true;
-            }
         } catch (SQLException e) {
             throw new RuntimeException(e);
         }

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

@@ -52,7 +52,7 @@ public class SQLiteData extends Data {
             try {
                 PreparedStatement preparedSt = preparedStatement("REPLACE INTO COSMETICDATABASE(UUID,COSMETICS) VALUES(?,?);");
                 preparedSt.setString(1, user.getUniqueId().toString());
-                preparedSt.setString(2, steralizeData(user));
+                preparedSt.setString(2, serializeData(user));
                 preparedSt.executeUpdate();
             } catch (SQLException e) {
                 throw new RuntimeException(e);
@@ -76,7 +76,7 @@ public class SQLiteData extends Data {
                 ResultSet rs = preparedStatement.executeQuery();
                 if (rs.next()) {
                     String rawData = rs.getString("COSMETICS");
-                    Map<CosmeticSlot, Map<Cosmetic, Color>> cosmetics = desteralizedata(user, rawData);
+                    Map<CosmeticSlot, Map<Cosmetic, Color>> cosmetics = deserializeData(user, rawData);
                     for (Map<Cosmetic, Color> cosmeticColors : cosmetics.values()) {
                         for (Cosmetic cosmetic : cosmeticColors.keySet()) {
                             Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
@@ -114,9 +114,6 @@ public class SQLiteData extends Data {
         //Bukkit.getScheduler().runTaskAsynchronously(HMCCosmeticsPlugin.getInstance(), () -> {
 
         //close Connection if still active
-        if (connection != null) {
-            //close();
-        }
 
         File dataFolder = new File(HMCCosmeticsPlugin.getInstance().getDataFolder(), "database.db");
 
@@ -151,11 +148,7 @@ public class SQLiteData extends Data {
 
     private boolean isConnectionOpen() {
         try {
-            if (connection == null || connection.isClosed()) {
+            return connection != null && !connection.isClosed();
-                return false;
-            } else {
-                return true;
-            }
         } catch (SQLException e) {
             throw new RuntimeException(e);
         }

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

@@ -5,22 +5,20 @@ import com.hibiscusmc.hmccosmetics.api.PlayerMenuOpenEvent;
 import com.hibiscusmc.hmccosmetics.config.serializer.ItemSerializer;
 import com.hibiscusmc.hmccosmetics.gui.type.Type;
 import com.hibiscusmc.hmccosmetics.gui.type.Types;
-import com.hibiscusmc.hmccosmetics.hooks.PAPIHook;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
-import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.hibiscusmc.hmccosmetics.util.misc.Adventure;
 import com.hibiscusmc.hmccosmetics.util.misc.Placeholder;
 import dev.triumphteam.gui.builder.item.ItemBuilder;
 import dev.triumphteam.gui.guis.Gui;
 import dev.triumphteam.gui.guis.GuiItem;
-import me.clip.placeholderapi.PlaceholderAPI;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 
@@ -29,13 +27,13 @@ import java.util.List;
 
 public class Menu {
 
-    private String id;
+    private final String id;
-    private String title;
+    private final String title;
-    private int rows;
+    private final int rows;
-    private ConfigurationNode config;
+    private final ConfigurationNode config;
-    private String permissionNode;
+    private final String permissionNode;
 
-    public Menu(String id, ConfigurationNode config) {
+    public Menu(String id, @NotNull ConfigurationNode config) {
         this.id = id;
         this.config = config;
 
@@ -62,7 +60,7 @@ public class Menu {
         openMenu(user, false);
     }
 
-    public void openMenu(CosmeticUser user, boolean ignorePermission) {
+    public void openMenu(@NotNull CosmeticUser user, boolean ignorePermission) {
         Player player = user.getPlayer();
         if (player == null) return;
         if (!ignorePermission && !permissionNode.isEmpty()) {
@@ -101,7 +99,8 @@ public class Menu {
 
     }
 
-    private Gui getItems(CosmeticUser user, Gui gui) {
+    @Contract("_, _ -> param2")
+    private Gui getItems(@NotNull CosmeticUser user, Gui gui) {
         Player player = user.getPlayer();
 
         for (ConfigurationNode config : config.node("items").childrenMap().values()) {
@@ -168,7 +167,8 @@ public class Menu {
         return gui;
     }
 
-    private List<Integer> getSlots(List<String> slotString) {
+    @NotNull
+    private List<Integer> getSlots(@NotNull List<String> slotString) {
         List<Integer> slots = new ArrayList<>();
 
         for (String a : slotString) {
@@ -185,6 +185,7 @@ public class Menu {
         return slots;
     }
 
+    @NotNull
     private List<Integer> getSlots(int small, int max) {
         List<Integer> slots = new ArrayList<>();
 
@@ -192,7 +193,9 @@ public class Menu {
         return slots;
     }
 
-    private ItemStack updateLore(CosmeticUser user, ItemStack itemStack, Type type, ConfigurationNode config) {
+    @Contract("_, _, _, _ -> param2")
+    @NotNull
+    private ItemStack updateLore(CosmeticUser user, @NotNull ItemStack itemStack, Type type, ConfigurationNode config) {
         if (itemStack.hasItemMeta()) {
             itemStack.setItemMeta(type.setLore(user, config, itemStack.getItemMeta()));
         }
@@ -205,7 +208,6 @@ public class Menu {
 
     public boolean canOpen(Player player) {
         if (permissionNode.isEmpty()) return true;
-        if (player.isOp() || player.hasPermission(permissionNode)) return true;
+        return player.isOp() || player.hasPermission(permissionNode);
-        return false;
     }
 }

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

@@ -4,6 +4,8 @@ import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import org.apache.commons.io.FilenameUtils;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
 import org.spongepowered.configurate.CommentedConfigurationNode;
 import org.spongepowered.configurate.ConfigurateException;
 import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
@@ -17,21 +19,23 @@ import java.util.logging.Level;
 
 public class Menus {
 
-    private static HashMap<String, Menu> MENUS = new HashMap<>();
+    private static final HashMap<String, Menu> MENUS = new HashMap<>();
 
     public static void addMenu(Menu menu) {
         MENUS.put(menu.getId().toUpperCase(), menu);
     }
 
-    public static Menu getMenu(String id) {
+    public static Menu getMenu(@NotNull String id) {
         return MENUS.get(id.toUpperCase());
     }
 
+    @Contract(pure = true)
+    @NotNull
     public static Collection<Menu> getMenu() {
         return MENUS.values();
     }
 
-    public static boolean hasMenu(String id) {
+    public static boolean hasMenu(@NotNull String id) {
         return MENUS.containsKey(id.toUpperCase());
     }
 
@@ -39,6 +43,9 @@ public class Menus {
         return MENUS.containsValue(menu);
     }
 
+    public static Menu getDefaultMenu() { return Menus.getMenu(Settings.getDefaultMenu()); }
+
+    @NotNull
     public static List<String> getMenuNames() {
         List<String> names = new ArrayList<>();
 

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

@@ -1,12 +1,13 @@
 package com.hibiscusmc.hmccosmetics.gui.action;
 
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import org.jetbrains.annotations.NotNull;
 
 public class Action {
 
-    private String id;
+    private final String id;
 
-    public Action(String id) {
+    public Action(@NotNull String id) {
         this.id = id.toUpperCase();
         Actions.addAction(this);
     }

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

@@ -4,13 +4,14 @@ import com.hibiscusmc.hmccosmetics.gui.action.actions.*;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import org.apache.commons.lang.StringUtils;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
 import java.util.List;
 
 public class Actions {
 
-    private static HashMap<String, Action> actions = new HashMap<>();
+    private static final HashMap<String, Action> actions = new HashMap<>();
 
     // [ID]
     private static ActionMessage ACTION_MESSAGE = new ActionMessage();
@@ -27,11 +28,11 @@ public class Actions {
     private static ActionCosmeticToggle ACTION_TOGGLE = new ActionCosmeticToggle();
 
 
-    public static Action getAction(String id) {
+    public static Action getAction(@NotNull String id) {
         return actions.get(id.toUpperCase());
     }
 
-    public static boolean isAction(String id) {
+    public static boolean isAction(@NotNull String id) {
         return actions.containsKey(id.toUpperCase());
     }
 
@@ -39,7 +40,7 @@ public class Actions {
         actions.put(action.getId().toUpperCase(), action);
     }
 
-    public static void runActions(CosmeticUser user, List<String> raw) {
+    public static void runActions(CosmeticUser user, @NotNull List<String> raw) {
         for (String a : raw) {
             String id = StringUtils.substringBetween(a, "[", "]").toUpperCase();
             String message = StringUtils.substringAfter(a, "] ");

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

@@ -2,6 +2,7 @@ package com.hibiscusmc.hmccosmetics.gui.action.actions;
 
 import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import org.jetbrains.annotations.NotNull;
 
 public class ActionCloseMenu extends Action {
 
@@ -10,7 +11,7 @@ public class ActionCloseMenu extends Action {
     }
 
     @Override
-    public void run(CosmeticUser user, String raw) {
+    public void run(@NotNull CosmeticUser user, String raw) {
         user.getPlayer().closeInventory();
     }
 }

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

@@ -3,6 +3,7 @@ package com.hibiscusmc.hmccosmetics.gui.action.actions;
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import org.jetbrains.annotations.NotNull;
 
 public class ActionConsoleCommand extends Action {
 
@@ -11,7 +12,7 @@ public class ActionConsoleCommand extends Action {
     }
 
     @Override
-    public void run(CosmeticUser user, String raw) {
+    public void run(@NotNull CosmeticUser user, String raw) {
         HMCCosmeticsPlugin.getInstance().getServer().dispatchCommand(user.getPlayer(), raw);
     }
 

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

@@ -2,6 +2,7 @@ package com.hibiscusmc.hmccosmetics.gui.action.actions;
 
 import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import org.jetbrains.annotations.NotNull;
 
 public class ActionCosmeticHide extends Action {
 
@@ -10,10 +11,9 @@ public class ActionCosmeticHide extends Action {
     }
 
     @Override
-    public void run(CosmeticUser user, String raw) {
+    public void run(@NotNull CosmeticUser user, String raw) {
         if (!user.getHidden()) {
             user.hideCosmetics(CosmeticUser.HiddenReason.ACTION);
-            return;
         }
     }
 }

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

@@ -2,6 +2,7 @@ package com.hibiscusmc.hmccosmetics.gui.action.actions;
 
 import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import org.jetbrains.annotations.NotNull;
 
 public class ActionCosmeticShow extends Action {
 
@@ -10,7 +11,7 @@ public class ActionCosmeticShow extends Action {
     }
 
     @Override
-    public void run(CosmeticUser user, String raw) {
+    public void run(@NotNull CosmeticUser user, String raw) {
         if (user.getHidden()) {
             if (user.getHiddenReason() != CosmeticUser.HiddenReason.ACTION && user.getHiddenReason() != CosmeticUser.HiddenReason.COMMAND) return; // Do not hide if its already off for WG
             user.showCosmetics();

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

@@ -2,6 +2,7 @@ package com.hibiscusmc.hmccosmetics.gui.action.actions;
 
 import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import org.jetbrains.annotations.NotNull;
 
 public class ActionCosmeticToggle extends Action {
 
@@ -10,13 +11,12 @@ public class ActionCosmeticToggle extends Action {
     }
 
     @Override
-    public void run(CosmeticUser user, String raw) {
+    public void run(@NotNull CosmeticUser user, String raw) {
         if (user.getHidden()) {
             if (user.getHiddenReason() != CosmeticUser.HiddenReason.ACTION && user.getHiddenReason() != CosmeticUser.HiddenReason.COMMAND) return;
             user.showCosmetics();
             return;
         }
         user.hideCosmetics(CosmeticUser.HiddenReason.ACTION);
-        return;
     }
 }

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

@@ -3,6 +3,7 @@ package com.hibiscusmc.hmccosmetics.gui.action.actions;
 import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
+import org.jetbrains.annotations.NotNull;
 
 public class ActionMessage extends Action {
 
@@ -11,7 +12,7 @@ public class ActionMessage extends Action {
     }
 
     @Override
-    public void run(CosmeticUser user, String raw) {
+    public void run(@NotNull CosmeticUser user, String raw) {
         MessagesUtil.sendMessageNoKey(user.getPlayer(), raw);
     }
 }

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

@@ -5,7 +5,6 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.hibiscusmc.hmccosmetics.util.ServerUtils;
 import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
-import com.owen1212055.particlehelper.api.particle.Particle;
 import com.owen1212055.particlehelper.api.particle.types.BlockDataParticle;
 import com.owen1212055.particlehelper.api.particle.types.DestinationParticle;
 import com.owen1212055.particlehelper.api.particle.types.velocity.VelocityParticle;
@@ -14,6 +13,7 @@ import com.owen1212055.particlehelper.api.type.Particles;
 import org.bukkit.Location;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
 public class ActionParticle extends Action {
 
@@ -22,7 +22,7 @@ public class ActionParticle extends Action {
     }
 
     @Override
-    public void run(CosmeticUser user, String raw) {
+    public void run(CosmeticUser user, @NotNull String raw) {
         String[] rawString = raw.split(" ");
         var particleType = Particles.fromKey(NamespacedKey.minecraft(rawString[0].toLowerCase()));
         if (particleType == null) {

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

@@ -3,6 +3,7 @@ package com.hibiscusmc.hmccosmetics.gui.action.actions;
 import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
+import org.jetbrains.annotations.NotNull;
 
 public class ActionPlayerCommand extends Action {
 
@@ -11,7 +12,7 @@ public class ActionPlayerCommand extends Action {
     }
 
     @Override
-    public void run(CosmeticUser user, String raw) {
+    public void run(@NotNull CosmeticUser user, String raw) {
         user.getPlayer().performCommand(MessagesUtil.processStringNoKeyString(user.getPlayer(), raw));
     }
 }

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

@@ -4,6 +4,7 @@ import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.logging.Level;
 
@@ -15,7 +16,7 @@ public class ActionSound extends Action {
     }
 
     @Override
-    public void run(CosmeticUser user, String raw) {
+    public void run(@NotNull CosmeticUser user, @NotNull String raw) {
         Player player = user.getPlayer();
         String[] processedString = raw.split(" ");
 

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

@@ -6,7 +6,9 @@ import com.hibiscusmc.hmccolor.gui.guis.GuiItem;
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
+import com.hibiscusmc.hmccosmetics.hooks.Hooks;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.hibiscusmc.hmccosmetics.util.misc.Placeholder;
 import org.bukkit.Bukkit;
 import org.bukkit.Color;
@@ -17,23 +19,26 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.LeatherArmorMeta;
 import org.bukkit.inventory.meta.MapMeta;
 import org.bukkit.inventory.meta.PotionMeta;
+import org.jetbrains.annotations.NotNull;
 
 public class DyeMenu {
 
-    // Yes, I do know how tacted on this feels.
+    public static void openMenu(@NotNull CosmeticUser user, Cosmetic cosmetic) {
-
+        Player player = user.getPlayer();
-
+        if (player == null) return;
-    public static void openMenu(CosmeticUser user, Cosmetic cosmetic) {
+        if (!Hooks.isActiveHook("HMCColor")) {
+            addCosmetic(user, cosmetic, null);
+            return;
+        }
         ItemStack originalItem = user.getUserCosmeticItem(cosmetic);
         if (originalItem == null || !cosmetic.isDyable()) return;
 
-        Player player = user.getPlayer();
         Gui gui = HMCColorApi.INSTANCE.colorMenu();
         gui.updateTitle(Placeholder.applyPapiPlaceholders(player, Settings.getDyeMenuName()));
-        gui.setItem(19, new GuiItem(originalItem));
+        gui.setItem(Settings.getDyeMenuInputSlot(), new GuiItem(originalItem));
         gui.setDefaultTopClickAction(event -> {
-            if (event.getSlot() == 25) {
+            if (event.getSlot() == Settings.getDyeMenuOutputSlot()) {
-                ItemStack item = event.getInventory().getItem(25);
+                ItemStack item = event.getInventory().getItem(Settings.getDyeMenuOutputSlot());
                 if (item == null) return;
                 ItemMeta meta = item.getItemMeta();
                 if (meta == null) return;
@@ -43,13 +48,7 @@ public class DyeMenu {
                                 meta instanceof MapMeta mapMeta ? mapMeta.getColor() : null;
                 if (color == null) return;
 
-                //user.removeCosmeticSlot(cosmetic);
+                addCosmetic(user, cosmetic, color);
-                user.addPlayerCosmetic(cosmetic, color);
-                player.setItemOnCursor(new ItemStack(Material.AIR));
-                Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
-                    player.closeInventory();
-                    user.updateCosmetic(cosmetic.getSlot());
-                }, 2);
             } else event.setCancelled(true);
         });
 
@@ -57,4 +56,14 @@ public class DyeMenu {
         gui.setCloseGuiAction(event -> {});
         gui.open(player);
     }
+
+    private static void addCosmetic(CosmeticUser user, Cosmetic cosmetic, Color color) {
+        Player player = user.getPlayer();
+        user.addPlayerCosmetic(cosmetic, color);
+        player.setItemOnCursor(new ItemStack(Material.AIR));
+        Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
+            player.closeInventory();
+            user.updateCosmetic(cosmetic.getSlot());
+        }, 2);
+    }
 }

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

@@ -7,7 +7,7 @@ import org.spongepowered.configurate.ConfigurationNode;
 
 public class Type {
 
-    private String id;
+    private final String id;
 
     public Type(String id) {
         this.id = id;

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

@@ -2,21 +2,22 @@ package com.hibiscusmc.hmccosmetics.gui.type;
 
 import com.hibiscusmc.hmccosmetics.gui.type.types.TypeCosmetic;
 import com.hibiscusmc.hmccosmetics.gui.type.types.TypeEmpty;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
 
 public class Types {
 
-    private static HashMap<String, Type> types = new HashMap<>();
+    private static final HashMap<String, Type> types = new HashMap<>();
 
     private static TypeCosmetic TYPE_COSMETIC = new TypeCosmetic();
     private static TypeEmpty TYPE_EMPTY = new TypeEmpty();
 
-    public static Type getType(String id) {
+    public static Type getType(@NotNull String id) {
         return types.get(id.toUpperCase());
     }
 
-    public static boolean isType(String id) {
+    public static boolean isType(@NotNull String id) {
         return types.containsKey(id.toUpperCase());
     }
 

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

@@ -7,16 +7,19 @@ import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticArmorType;
 import com.hibiscusmc.hmccosmetics.gui.action.Actions;
 import com.hibiscusmc.hmccosmetics.gui.special.DyeMenu;
 import com.hibiscusmc.hmccosmetics.gui.type.Type;
-import com.hibiscusmc.hmccosmetics.hooks.PAPIHook;
+import com.hibiscusmc.hmccosmetics.hooks.Hooks;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.hibiscusmc.hmccosmetics.util.misc.StringUtils;
 import com.hibiscusmc.hmccosmetics.util.misc.Utils;
 import me.clip.placeholderapi.PlaceholderAPI;
 import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.EquipmentSlot;
 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;
 
@@ -31,17 +34,18 @@ public class TypeCosmetic extends Type {
     }
 
     @Override
-    public void run(CosmeticUser user, ConfigurationNode config, ClickType clickType) {
+    public void run(CosmeticUser user, @NotNull ConfigurationNode config, ClickType clickType) {
         if (config.node("cosmetic").virtual()) return;
         String cosmeticName = config.node("cosmetic").getString();
         Cosmetic cosmetic = Cosmetics.getCosmetic(cosmeticName);
+        Player player = user.getPlayer();
         if (cosmetic == null) {
-            MessagesUtil.sendMessage(user.getPlayer(), "invalid-cosmetic");
+            MessagesUtil.sendMessage(player, "invalid-cosmetic");
             return;
         }
 
         if (!user.canEquipCosmetic(cosmetic)) {
-            MessagesUtil.sendMessage(user.getPlayer(), "no-cosmetic-permission");
+            MessagesUtil.sendMessage(player, "no-cosmetic-permission");
             return;
         }
 
@@ -92,7 +96,7 @@ public class TypeCosmetic extends Type {
     }
 
     @Override
-    public ItemMeta setLore(CosmeticUser user, ConfigurationNode config, ItemMeta itemMeta) {
+    public ItemMeta setLore(CosmeticUser user, @NotNull ConfigurationNode config, ItemMeta itemMeta) {
         List<String> processedLore = new ArrayList<>();
 
         if (config.node("cosmetic").virtual()) return processLoreLines(user, itemMeta);;
@@ -107,23 +111,31 @@ public class TypeCosmetic extends Type {
         } else {
             ConfigurationNode itemConfig = config.node("item");
             if (itemConfig.virtual()) return itemMeta;
-            if (itemConfig.node("locked-name").virtual() && itemConfig.node("locked-name").virtual()) {
+            if (itemConfig.node("locked-name").virtual() && itemConfig.node("locked-lore").virtual()) {
                 return processLoreLines(user, itemMeta);
             }
             try {
-                itemMeta.getLore().clear();
+                List<String> lockedLore = itemMeta.getLore();
+                String lockedName = itemMeta.getDisplayName();
 
-                List<String> lockedLore = Utils.replaceIfNull(itemConfig.node("locked-lore").getList(String.class),
+                if (!itemConfig.node("locked-lore").virtual()) {
-                                new ArrayList<String>()).
+                    lockedLore = Utils.replaceIfNull(itemConfig.node("locked-lore").getList(String.class),
-                        stream().map(StringUtils::parseStringToString).collect(Collectors.toList());
+                                    new ArrayList<String>()).
+                            stream().map(StringUtils::parseStringToString).collect(Collectors.toList());
+                }
+                if (!itemConfig.node("locked-name").virtual()) {
+                    lockedName = StringUtils.parseStringToString(Utils.replaceIfNull(itemConfig.node("locked-name").getString(), ""));
+                }
 
-                if (PAPIHook.isPAPIEnabled()) {
+                if (Hooks.isActiveHook("PlaceHolderAPI")) {
-                    String lockedName = StringUtils.parseStringToString(Utils.replaceIfNull(itemConfig.node("locked-name").getString(), ""));
+                    lockedName = PlaceholderAPI.setPlaceholders(user.getPlayer(), lockedName);
-                    itemMeta.setDisplayName(PlaceholderAPI.setPlaceholders(user.getPlayer(), lockedName));
+                }
-                    if (itemMeta.hasLore()) {
+                itemMeta.setDisplayName(lockedName);
-                        for (String loreLine : lockedLore) {
+                if (itemMeta.hasLore()) {
-                            processedLore.add(PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine));
+                    itemMeta.getLore().clear();
-                        }
+                    for (String loreLine : lockedLore) {
+                        if (Hooks.isActiveHook("PlaceHolderAPI")) loreLine = PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine);
+                        processedLore.add(loreLine);
                     }
                 }
             } catch (Exception e) {
@@ -135,14 +147,16 @@ public class TypeCosmetic extends Type {
         return itemMeta;
     }
 
-    private ItemMeta processLoreLines(CosmeticUser user, ItemMeta itemMeta) {
+    @Contract("_, _ -> param2")
+    @NotNull
+    private ItemMeta processLoreLines(CosmeticUser user, @NotNull ItemMeta itemMeta) {
         List<String> processedLore = new ArrayList<>();
 
-        if (PAPIHook.isPAPIEnabled()) {
+        if (itemMeta.hasLore()) {
-            if (itemMeta.hasLore()) {
+            for (String loreLine : itemMeta.getLore()) {
-                for (String loreLine : itemMeta.getLore()) {
+                if (Hooks.isActiveHook("PlaceholderAPI"))
-                    processedLore.add(PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine));
+                    loreLine = PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine);
-                }
+                processedLore.add(loreLine);
             }
         }
 

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

@@ -2,11 +2,13 @@ package com.hibiscusmc.hmccosmetics.gui.type.types;
 
 import com.hibiscusmc.hmccosmetics.gui.action.Actions;
 import com.hibiscusmc.hmccosmetics.gui.type.Type;
-import com.hibiscusmc.hmccosmetics.hooks.PAPIHook;
+import com.hibiscusmc.hmccosmetics.hooks.Hooks;
+import com.hibiscusmc.hmccosmetics.hooks.placeholders.HMCPlaceholderExpansion;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import me.clip.placeholderapi.PlaceholderAPI;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.meta.ItemMeta;
+import org.jetbrains.annotations.NotNull;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 
@@ -24,7 +26,7 @@ public class TypeEmpty extends Type {
 
     // This is the code that's run when the item is clicked.
     @Override
-    public void run(CosmeticUser user, ConfigurationNode config, ClickType clickType) {
+    public void run(CosmeticUser user, @NotNull ConfigurationNode config, ClickType clickType) {
         List<String> actionStrings = new ArrayList<>(); // List where we keep the actions the server will execute.
         ConfigurationNode actionConfig = config.node("actions"); // Configuration node that actions are under.
 
@@ -52,14 +54,14 @@ public class TypeEmpty extends Type {
     }
 
     @Override
-    public ItemMeta setLore(CosmeticUser user, ConfigurationNode config, ItemMeta itemMeta) {
+    public ItemMeta setLore(CosmeticUser user, ConfigurationNode config, @NotNull ItemMeta itemMeta) {
         List<String> processedLore = new ArrayList<>();
 
-        if (PAPIHook.isPAPIEnabled()) {
+        if (itemMeta.hasLore()) {
-            if (itemMeta.hasLore()) {
+            for (String loreLine : itemMeta.getLore()) {
-                for (String loreLine : itemMeta.getLore()) {
+                if (Hooks.isActiveHook("PlaceholderAPI"))
-                    processedLore.add(PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine));
+                    loreLine = PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine);
-                }
+                processedLore.add(loreLine);
             }
         }
 

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

@@ -0,0 +1,46 @@
+package com.hibiscusmc.hmccosmetics.hooks;
+
+import org.bukkit.event.Listener;
+import org.bukkit.inventory.ItemStack;
+
+public class Hook implements Listener {
+
+    private final String id;
+    private boolean active;
+    private boolean itemHook;
+
+    public Hook(String id) {
+        this.id = id;
+        active = false;
+        Hooks.addHook(this);
+    }
+
+    public void load() {
+        // Override
+    }
+
+    public ItemStack getItem(String itemId) {
+        return null;
+        // Override
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public boolean getActive() {
+        return this.active;
+    }
+
+    public void setEnabledItemHook(boolean enabled) {
+        itemHook = enabled;
+    }
+
+    public boolean hasEnabledItemHook() {
+        return itemHook;
+    }
+}

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

@@ -0,0 +1,77 @@
+package com.hibiscusmc.hmccosmetics.hooks;
+
+import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
+import com.hibiscusmc.hmccosmetics.hooks.items.*;
+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;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.HashMap;
+
+public class Hooks {
+
+    private static final HashMap<String, Hook> hooks = new HashMap<>();
+    private static HookOraxen ORAXEN_HOOK = new HookOraxen();
+    private static HookItemAdder ITEMADDER_HOOK = new HookItemAdder();
+    private static HookLooty LOOTY_HOOK = new HookLooty();
+    private static HookMythic MYTHIC_HOOK = new HookMythic();
+    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();
+
+    public static Hook getHook(@NotNull String id) {
+        return hooks.get(id.toLowerCase());
+    }
+
+    public static boolean isItemHook(@NotNull String id) {
+        return hooks.containsKey(id.toLowerCase());
+    }
+
+    public static void addHook(Hook hook) {
+        hooks.put(hook.getId().toLowerCase(), hook);
+    }
+
+    public static void setup() {
+        for (Hook hook : hooks.values()) {
+            if (Bukkit.getPluginManager().getPlugin(hook.getId()) != null) {
+                HMCCosmeticsPlugin.getInstance().getServer().getPluginManager().registerEvents(hook, HMCCosmeticsPlugin.getInstance());
+                hook.setActive(true);
+                hook.load();
+                HMCCosmeticsPlugin.getInstance().getLogger().info("Successfully hooked into " + hook.getId());
+            }
+        }
+    }
+
+    @Nullable
+    public static ItemStack getItem(@NotNull String raw) {
+        if (!raw.contains(":")) {
+            Material mat = Material.getMaterial(raw.toUpperCase());
+            if (mat == null) return null;
+            return new ItemStack(mat);
+        }
+        // Ex. Oraxen:BigSword
+        // split[0] is the plugin name
+        // split[1] is the item name
+        String[] split = raw.split(":", 2);
+
+        if (!isItemHook(split[0])) return null;
+        Hook hook = getHook(split[0]);
+        if (!hook.hasEnabledItemHook()) return null;
+        if (!hook.getActive()) return null;
+        return hook.getItem(split[1]);
+    }
+
+    public static boolean isActiveHook(String id) {
+        Hook hook = getHook(id);
+        if (hook == null) return false;
+        return hook.getActive();
+    }
+}

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

@@ -2,18 +2,20 @@ package com.hibiscusmc.hmccosmetics.hooks.items;
 
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
+import com.hibiscusmc.hmccosmetics.hooks.Hook;
 import org.bukkit.event.Listener;
 import org.bukkit.inventory.ItemStack;
 
-public class HMCCosmeticsHook extends ItemHook implements Listener {
+public class HookHMCCosmetics extends Hook implements Listener {
 
-    public HMCCosmeticsHook() {
+    public HookHMCCosmetics() {
         super("HMCCosmetics");
+        setEnabledItemHook(true);
     }
 
     @Override
-    public ItemStack get(String itemid) {
+    public ItemStack getItem(String itemId) {
-        Cosmetic cosmetic = Cosmetics.getCosmetic(itemid);
+        Cosmetic cosmetic = Cosmetics.getCosmetic(itemId);
         if (cosmetic == null) return null;
         return cosmetic.getItem();
     }

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

@@ -1,6 +1,7 @@
 package com.hibiscusmc.hmccosmetics.hooks.items;
 
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
+import com.hibiscusmc.hmccosmetics.hooks.Hook;
 import dev.lone.itemsadder.api.CustomStack;
 import dev.lone.itemsadder.api.Events.ItemsAdderLoadDataEvent;
 import org.bukkit.Material;
@@ -8,20 +9,21 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.inventory.ItemStack;
 
-public class ItemAdderHook extends ItemHook implements Listener {
+public class HookItemAdder extends Hook implements Listener {
 
     // I hate IA, this overcomplicate stuff is so unneeded if it just did its stuff when its needed.
 
     private boolean enabled = false;
 
-    public ItemAdderHook() {
+    public HookItemAdder() {
         super("itemsadder");
+        setEnabledItemHook(true);
     }
 
     @Override
-    public ItemStack get(String itemid) {
+    public ItemStack getItem(String itemId) {
         if (enabled) {
-            CustomStack stack = CustomStack.getInstance(itemid);
+            CustomStack stack = CustomStack.getInstance(itemId);
             if (stack == null) return null;
             return stack.getItemStack();
         } else {

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

@@ -0,0 +1,22 @@
+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.event.Listener;
+import org.bukkit.inventory.ItemStack;
+
+public class HookLooty extends Hook implements Listener {
+
+    public HookLooty() {
+        super("looty");
+        setEnabledItemHook(true);
+    }
+
+    @Override
+    public ItemStack getItem(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/items/HookMythic.java

@@ -1,16 +1,18 @@
 package com.hibiscusmc.hmccosmetics.hooks.items;
 
+import com.hibiscusmc.hmccosmetics.hooks.Hook;
 import io.lumine.mythic.bukkit.MythicBukkit;
 import org.bukkit.event.Listener;
 import org.bukkit.inventory.ItemStack;
 
-public class MythicHook extends ItemHook implements Listener {
+public class HookMythic extends Hook implements Listener {
-    public MythicHook() {
+    public HookMythic() {
         super("mythicmobs");
+        setEnabledItemHook(true);
     }
 
     @Override
-    public ItemStack get(String itemid) {
+    public ItemStack getItem(String itemId) {
-        return MythicBukkit.inst().getItemManager().getItemStack(itemid);
+        return MythicBukkit.inst().getItemManager().getItemStack(itemId);
     }
 }

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

@@ -0,0 +1,22 @@
+package com.hibiscusmc.hmccosmetics.hooks.items;
+
+import com.hibiscusmc.hmccosmetics.hooks.Hook;
+import io.th0rgal.oraxen.api.OraxenItems;
+import io.th0rgal.oraxen.items.ItemBuilder;
+import org.bukkit.event.Listener;
+import org.bukkit.inventory.ItemStack;
+
+public class HookOraxen extends Hook implements Listener {
+
+    public HookOraxen() {
+        super("oraxen");
+        setEnabledItemHook(true);
+    }
+
+    @Override
+    public ItemStack getItem(String itemId) {
+        ItemBuilder builder = OraxenItems.getItemById(itemId);
+        if (builder == null) return null;
+        return builder.build();
+    }
+}

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

@@ -1,33 +0,0 @@
-package com.hibiscusmc.hmccosmetics.hooks.items;
-
-import org.bukkit.event.Listener;
-import org.bukkit.inventory.ItemStack;
-
-public class ItemHook implements Listener {
-
-    private String id;
-    private boolean active;
-
-    public ItemHook(String id) {
-        this.id = id;
-        active = false;
-        ItemHooks.addItemHook(this);
-    }
-
-    public ItemStack get(String itemid) {
-        return null;
-        // Override
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setActive(boolean active) {
-        this.active = active;
-    }
-
-    public boolean getActive() {
-        return this.active;
-    }
-}

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

@@ -1,57 +0,0 @@
-package com.hibiscusmc.hmccosmetics.hooks.items;
-
-import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
-
-import java.util.HashMap;
-
-public class ItemHooks {
-
-    private static HashMap<String, ItemHook> itemHooks = new HashMap<>();
-    private static OraxenHook ORAXEN_HOOK = new OraxenHook();
-    private static ItemAdderHook ITEMADDER_HOOK = new ItemAdderHook();
-    private static MythicHook MYTHIC_HOOK = new MythicHook();
-    private static HMCCosmeticsHook HMCCOSMETIC_HOOK = new HMCCosmeticsHook();
-
-    public static ItemHook getItemHook(String id) {
-        return itemHooks.get(id.toLowerCase());
-    }
-
-    public static boolean isItemHook(String id) {
-        return itemHooks.containsKey(id.toLowerCase());
-    }
-
-    public static void addItemHook(ItemHook hook) {
-        itemHooks.put(hook.getId().toLowerCase(), hook);
-    }
-
-    public static void setup() {
-        for (ItemHook itemHook : itemHooks.values()) {
-            if (Bukkit.getPluginManager().getPlugin(itemHook.getId()) != null) {
-                HMCCosmeticsPlugin.getInstance().getServer().getPluginManager().registerEvents(itemHook, HMCCosmeticsPlugin.getInstance());
-                itemHook.setActive(true);
-                HMCCosmeticsPlugin.getInstance().getLogger().info("Successfully hooked into " + itemHook.getId());
-            }
-        }
-    }
-
-    public static ItemStack getItem(String raw) {
-        if (!raw.contains(":")) {
-            Material mat = Material.getMaterial(raw.toUpperCase());
-            if (mat == null) return null;
-            return new ItemStack(mat);
-        }
-        // Ex. Oraxen:BigSword
-        // split[0] is the plugin name
-        // split[1] is the item name
-        String[] split = raw.split(":", 2);
-
-        if (!isItemHook(split[0])) return null;
-        ItemHook itemHook = getItemHook(split[0]);
-        if (!itemHook.getActive()) return null;
-        ItemStack item = itemHook.get(split[1]);
-        return item;
-    }
-}

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

@@ -1,17 +0,0 @@
-package com.hibiscusmc.hmccosmetics.hooks.items;
-
-import io.th0rgal.oraxen.api.OraxenItems;
-import org.bukkit.event.Listener;
-import org.bukkit.inventory.ItemStack;
-
-public class OraxenHook extends ItemHook implements Listener {
-
-    public OraxenHook() {
-        super("oraxen");
-    }
-
-    @Override
-    public ItemStack get(String itemid) {
-        return OraxenItems.getItemById(itemid).build();
-    }
-}

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

@@ -0,0 +1,11 @@
+package com.hibiscusmc.hmccosmetics.hooks.misc;
+
+import com.hibiscusmc.hmccosmetics.hooks.Hook;
+import org.bukkit.event.Listener;
+
+public class HookHMCColor extends Hook implements Listener {
+
+    public HookHMCColor() {
+        super("HMCColor");
+    }
+}

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.hibiscusmc.hmccosmetics.hooks;
+package com.hibiscusmc.hmccosmetics.hooks.placeholders;
 
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
@@ -16,31 +16,34 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Arrays;
 import java.util.List;
 
-public class PAPIHook extends PlaceholderExpansion {
+public class HMCPlaceholderExpansion extends PlaceholderExpansion {
 
     private static boolean papiEnabled = false;
 
-    public PAPIHook() {
+    public HMCPlaceholderExpansion() {
         papiEnabled = true;
     }
 
     @Override
-    public @NotNull String getIdentifier() {
+    @NotNull
+    public String getIdentifier() {
         return "HMCCosmetics";
     }
 
     @Override
-    public @NotNull String getAuthor() {
+    @NotNull
+    public String getAuthor() {
         return "HibiscusMC";
     }
 
     @Override
-    public @NotNull String getVersion() {
+    @NotNull
+    public String getVersion() {
         return HMCCosmeticsPlugin.getInstance().getDescription().getVersion();
     }
 
     @Override
-    public String onRequest(OfflinePlayer player, String params) {
+    public String onRequest(@NotNull OfflinePlayer player, @NotNull String params) {
         if (!player.isOnline()) return null;
         CosmeticUser user = CosmeticUsers.getUser(player.getPlayer());
         if (user == null) return null;
@@ -54,7 +57,9 @@ public class PAPIHook extends PlaceholderExpansion {
                 }
                 if (placeholderArgs.get(1) != null) {
                     Cosmetic cosmetic = Cosmetics.getCosmetic(placeholderArgs.get(1));
-                    if (user.getCosmetic(cosmetic.getSlot()).getId() == cosmetic.getId()) return "true";
+                    Cosmetic currentCosmetic = user.getCosmetic(cosmetic.getSlot());
+                    if (cosmetic == null || currentCosmetic == null) return "false";
+                    if (currentCosmetic.getId() == cosmetic.getId()) return "true";
                     return "false";
                 }
             case "current":
@@ -64,6 +69,7 @@ public class PAPIHook extends PlaceholderExpansion {
                 if (placeholderArgs.get(1) != null) {
                     CosmeticSlot slot = CosmeticSlot.valueOf(placeholderArgs.get(1).toUpperCase());
                     if (slot == null) return null;
+                    if (user.getCosmetic(slot) == null) return null;
                     if (placeholderArgs.size() == 2) return user.getCosmetic(slot).getId();
                     switch (placeholderArgs.get(2).toLowerCase()) {
                         case "material" -> {
@@ -129,13 +135,13 @@ public class PAPIHook extends PlaceholderExpansion {
         return null;
     }
 
-    public String getMaterial(Cosmetic cosmetic) {
+    public String getMaterial(@NotNull Cosmetic cosmetic) {
         ItemStack item = cosmetic.getItem();
         if (item == null) return null;
         return cosmetic.getItem().getType().toString();
     }
 
-    public String getModelData(Cosmetic cosmetic) {
+    public String getModelData(@NotNull Cosmetic cosmetic) {
         ItemStack item = cosmetic.getItem();
         if (item == null) return null;
         if (!item.hasItemMeta()) return null;
@@ -143,7 +149,7 @@ public class PAPIHook extends PlaceholderExpansion {
         return String.valueOf(itemMeta.getCustomModelData());
     }
 
-    public String getItemName(Cosmetic cosmetic) {
+    public String getItemName(@NotNull Cosmetic cosmetic) {
         ItemStack item = cosmetic.getItem();
         if (item == null) return null;
         if (!item.hasItemMeta()) return null;
@@ -151,7 +157,7 @@ public class PAPIHook extends PlaceholderExpansion {
         return itemMeta.getDisplayName();
     }
 
-    public String getItemLore(Cosmetic cosmetic) {
+    public String getItemLore(@NotNull Cosmetic cosmetic) {
         ItemStack item = cosmetic.getItem();
         if (item == null) return null;
         if (item.hasItemMeta()) {
@@ -159,8 +165,4 @@ public class PAPIHook extends PlaceholderExpansion {
         }
         return null;
     }
-
-    public static boolean isPAPIEnabled() {
-        return papiEnabled;
-    }
 }

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

@@ -0,0 +1,15 @@
+package com.hibiscusmc.hmccosmetics.hooks.placeholders;
+
+import com.hibiscusmc.hmccosmetics.hooks.Hook;
+
+public class HookPlaceholderAPI extends Hook {
+
+    public HookPlaceholderAPI() {
+        super("PlaceholderAPI");
+    }
+
+    @Override
+    public void load() {
+        new HMCPlaceholderExpansion().register();
+    }
+}

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

@@ -12,11 +12,12 @@ import org.bukkit.Location;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerMoveEvent;
+import org.jetbrains.annotations.NotNull;
 
 public class WGListener implements Listener {
 
     @EventHandler
-    public void onPlayerMove(PlayerMoveEvent event) {
+    public void onPlayerMove(@NotNull PlayerMoveEvent event) {
         CosmeticUser user = CosmeticUsers.getUser(event.getPlayer());
         if (user == null) return;
         Location location = event.getPlayer().getLocation();

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

@@ -13,11 +13,12 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
+import org.jetbrains.annotations.NotNull;
 
 public class PlayerConnectionListener implements Listener {
 
     @EventHandler
-    public void onPlayerJoin(PlayerJoinEvent event) {
+    public void onPlayerJoin(@NotNull PlayerJoinEvent event) {
         if (event.getPlayer().isOp() || event.getPlayer().hasPermission("hmccosmetics.notifyupdate")) {
             if (!HMCCosmeticsPlugin.getLatestVersion().equalsIgnoreCase(HMCCosmeticsPlugin.getInstance().getDescription().getVersion()) && HMCCosmeticsPlugin.getLatestVersion() != null)
                 MessagesUtil.sendMessageNoKey(
@@ -46,7 +47,7 @@ public class PlayerConnectionListener implements Listener {
     }
 
     @EventHandler
-    public void onPlayerQuit(PlayerQuitEvent event) {
+    public void onPlayerQuit(@NotNull PlayerQuitEvent event) {
         CosmeticUser user = CosmeticUsers.getUser(event.getPlayer());
         if (user == null) { // Remove any passengers if a user failed to initialize. Bugs can cause this to happen
             if (!event.getPlayer().getPassengers().isEmpty()) {
@@ -58,6 +59,10 @@ public class PlayerConnectionListener implements Listener {
             }
         }
         if (user.isInWardrobe()) user.leaveWardrobe();
+        if (user.getUserEmoteManager().isPlayingEmote()) {
+            user.getUserEmoteManager().stopEmote();
+            event.getPlayer().setInvisible(false);
+        }
         Database.save(user);
         user.destroy();
         CosmeticUsers.removeUser(user.getUniqueId());

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

@@ -15,6 +15,7 @@ import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
 import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticArmorType;
 import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType;
 import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
+import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticEmoteType;
 import com.hibiscusmc.hmccosmetics.gui.Menu;
 import com.hibiscusmc.hmccosmetics.gui.Menus;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
@@ -22,17 +23,15 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
 import com.hibiscusmc.hmccosmetics.util.InventoryUtils;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import org.bukkit.Bukkit;
-import org.bukkit.Color;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Pose;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.*;
-import org.bukkit.event.entity.EntityPotionEffectEvent;
-import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.player.*;
@@ -81,8 +80,12 @@ public class PlayerGameListener implements Listener {
     public void onPlayerShift(PlayerToggleSneakEvent event) {
         CosmeticUser user = CosmeticUsers.getUser(event.getPlayer().getUniqueId());
 
-        if (!event.isSneaking()) return;
         if (user == null) return;
+        if (event.isSneaking()) {
+            user.getUserEmoteManager().stopEmote();
+        }
+
+        if (!event.isSneaking()) return;
         if (!user.isInWardrobe()) return;
 
         user.leaveWardrobe();
@@ -99,9 +102,9 @@ public class PlayerGameListener implements Listener {
         }
 
         if (user.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
-            user.hideBackpack();
+            user.getUserBackpackManager().hideBackpack();
 
-            user.getBackpackEntity().teleport(event.getTo());
+            user.getUserBackpackManager().getArmorStand().teleport(event.getTo());
 
             Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
                 user.updateCosmetic();
@@ -129,14 +132,14 @@ public class PlayerGameListener implements Listener {
             return;
         }
 
-        final Cosmetic cosmetic = user.getCosmetic(CosmeticSlot.BALLOON);
+        if (user.hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
-        final Color color = user.getCosmeticColor(CosmeticSlot.BALLOON);
+            user.despawnBalloon();
-        user.removeCosmeticSlot(CosmeticSlot.BALLOON);
 
-        Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
+            Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
-            user.addPlayerCosmetic(cosmetic, color);
+                user.spawnBalloon((CosmeticBalloonType) user.getCosmetic(CosmeticSlot.BALLOON));
-            user.updateCosmetic();
+                user.updateCosmetic();
-        }, 4);
+            }, 4);
+        }
     }
 
     @EventHandler
@@ -151,14 +154,35 @@ public class PlayerGameListener implements Listener {
 
     @EventHandler
     public void onPlayerLook(PlayerMoveEvent event) {
+        if (event.isCancelled()) return;
+        Player player = event.getPlayer();
         // TODO: Move to packets
-        CosmeticUser user = CosmeticUsers.getUser(event.getPlayer().getUniqueId());
+        CosmeticUser user = CosmeticUsers.getUser(player);
         if (user == null) return;
         // Really need to look into optimization of this
         user.updateCosmetic(CosmeticSlot.BACKPACK);
         user.updateCosmetic(CosmeticSlot.BALLOON);
     }
 
+    @EventHandler
+    public void onPlayerPoseChange(EntityPoseChangeEvent event) {
+        if (!(event.getEntity() instanceof Player)) return;
+        Player player = ((Player) event.getEntity()).getPlayer();
+        CosmeticUser user = CosmeticUsers.getUser(player);
+        if (user == null) return;
+        if (!user.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) return;
+        Pose pose = event.getPose();
+        if (pose.equals(Pose.STANDING)) {
+            if (!user.isBackupSpawned()) {
+                user.spawnBackpack((CosmeticBackpackType) user.getCosmetic(CosmeticSlot.BACKPACK));
+            }
+            return;
+        }
+        if (pose.equals(Pose.SLEEPING) || pose.equals(Pose.SWIMMING) || pose.equals(Pose.FALL_FLYING)) {
+            user.despawnBackpack();
+        }
+    }
+
     @EventHandler
     public void onPlayerArmorDamage(PlayerItemDamageEvent event) {
         // Possibly look into cancelling the event, then handling the damage on our own.
@@ -198,11 +222,25 @@ public class PlayerGameListener implements Listener {
         CosmeticUser user = CosmeticUsers.getUser(event.getPlayer().getUniqueId());
         if (user == null) return;
         // Really need to look into optimization of this
+        if (user.hasCosmeticInSlot(CosmeticSlot.EMOTE) && event.getPlayer().isSneaking() && event.getPlayer().hasPermission("hmccosmetics.emote.shiftrun")) {
+            CosmeticEmoteType cosmeticEmoteType = (CosmeticEmoteType) user.getCosmetic(CosmeticSlot.EMOTE);
+            cosmeticEmoteType.run(user);
+            event.setCancelled(true);
+            return;
+        }
         Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
             user.updateCosmetic(CosmeticSlot.OFFHAND);
         }, 2);
     }
 
+    @EventHandler
+    public void onPlayerPickupItem(EntityPickupItemEvent event) {
+        if (!(event.getEntity() instanceof Player)) return;
+        CosmeticUser user = CosmeticUsers.getUser(event.getEntity().getUniqueId());
+        if (user == null) return;
+        if (user.isInWardrobe()) event.setCancelled(true);
+    }
+
     @EventHandler
     public void playerInvisibility(EntityPotionEffectEvent event) {
         if (event.isCancelled()) return;
@@ -355,8 +393,12 @@ public class PlayerGameListener implements Listener {
                 Player player = event.getPlayer();
                 CosmeticUser user = CosmeticUsers.getUser(player);
                 if (user == null) return;
+                if (user.getUserEmoteManager().isPlayingEmote()) {
+                    event.setCancelled(true);
+                    return;
+                }
                 if (!user.isInWardrobe()) return;
-                Menu menu = Menus.getMenu(Settings.getDefaultMenu());
+                Menu menu = Menus.getDefaultMenu();
                 if (menu == null) return;
                 menu.openMenu(user);
                 event.setCancelled(true);

common/src/main/java/com/hibiscusmc/hmccosmetics/nms/NMSHandler.java

@@ -3,7 +3,7 @@ package com.hibiscusmc.hmccosmetics.nms;
 import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
 import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType;
 import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
-import com.hibiscusmc.hmccosmetics.entities.BalloonEntity;
+import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import org.bukkit.Location;
 import org.bukkit.entity.ArmorStand;
@@ -19,13 +19,15 @@ public interface NMSHandler {
 
     Entity getEntity(int entityId);
 
-    Entity getInvisibleArmorstand(Location loc);
+    Entity getHMCArmorStand(Location loc);
 
     ArmorStand getMEGEntity(Location loc);
 
     Entity spawnBackpack(CosmeticUser user, CosmeticBackpackType cosmeticBackpackType);
 
-    BalloonEntity spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType);
+    Entity spawnHMCParticleCloud(Location location);
+
+    UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType);
 
     void equipmentSlotUpdate(
             int entityId,

common/src/main/java/com/hibiscusmc/hmccosmetics/nms/NMSHandlers.java

@@ -37,7 +37,6 @@ public class NMSHandlers {
             MessagesUtil.sendDebugMessages(packageVersion + " has been detected.", Level.INFO);
             version = packageVersion;
             try {
-                //Class.forName("org.bukkit.craftbukkit." + version + ".block.CraftBlock").getName();
                 handler = (NMSHandler) Class.forName("com.hibiscusmc.hmccosmetics.nms." + packageVersion + ".NMSHandler").getConstructor().newInstance();
                 return;
             } catch (ClassNotFoundException | InvocationTargetException | InstantiationException |

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

@@ -6,21 +6,20 @@ import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.config.WardrobeSettings;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
-import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticArmorType;
+import com.hibiscusmc.hmccosmetics.cosmetic.types.*;
-import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType;
+import com.hibiscusmc.hmccosmetics.user.manager.UserBackpackManager;
-import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
+import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager;
-import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticMainhandType;
-import com.hibiscusmc.hmccosmetics.entities.BalloonEntity;
 import com.hibiscusmc.hmccosmetics.nms.NMSHandlers;
+import com.hibiscusmc.hmccosmetics.user.manager.UserEmoteManager;
+import com.hibiscusmc.hmccosmetics.user.manager.UserWardrobeManager;
 import com.hibiscusmc.hmccosmetics.util.InventoryUtils;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.hibiscusmc.hmccosmetics.util.PlayerUtils;
 import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Color;
+import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.entity.ArmorStand;
-import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.*;
@@ -34,22 +33,19 @@ public class CosmeticUser {
     private UUID uniqueId;
     private int taskId;
     private HashMap<CosmeticSlot, Cosmetic> playerCosmetics = new HashMap<>();
-    private Wardrobe wardrobe;
+    private UserWardrobeManager userWardrobeManager;
-    private ArmorStand invisibleArmorstand;
+    private UserBalloonManager userBalloonManager;
-    private BalloonEntity balloonEntity;
+    private UserBackpackManager userBackpackManager;
+    private UserEmoteManager userEmoteManager;
 
     // Cosmetic Settings/Toggles
-    private boolean hideBackpack;
     private boolean hideCosmetics;
     private HiddenReason hiddenReason;
     private HashMap<CosmeticSlot, Color> colors = new HashMap<>();
 
-    public CosmeticUser() {
-        // Empty
-    }
-
     public CosmeticUser(UUID uuid) {
         this.uniqueId = uuid;
+        userEmoteManager = new UserEmoteManager(this);
         tick();
     }
 
@@ -85,17 +81,6 @@ public class CosmeticUser {
         return playerCosmetics.values();
     }
 
-    public int getArmorstandId() {
-        return invisibleArmorstand.getEntityId();
-    }
-
-    public Entity getBackpackEntity() {
-        return this.invisibleArmorstand;
-    }
-    public BalloonEntity getBalloonEntity() {
-        return this.balloonEntity;
-    }
-
     public void addPlayerCosmetic(Cosmetic cosmetic) {
         addPlayerCosmetic(cosmetic, null);
     }
@@ -126,13 +111,6 @@ public class CosmeticUser {
             spawnBalloon(balloonType);
         }
     }
-    public void toggleCosmetic(Cosmetic cosmetic) {
-        if (hasCosmeticInSlot(cosmetic.getSlot())) {
-            removeCosmeticSlot(cosmetic.getSlot());
-            return;
-        }
-        addPlayerCosmetic(cosmetic);
-    }
 
     public void removeCosmetics() {
         // Small optimization could be made, but Concurrent modification prevents us from both getting and removing
@@ -155,6 +133,9 @@ public class CosmeticUser {
         }
         if (slot == CosmeticSlot.BALLOON) {
             despawnBalloon();
+        }
+        if (slot == CosmeticSlot.EMOTE) {
+
         }
         colors.remove(slot);
         playerCosmetics.remove(slot);
@@ -225,8 +206,32 @@ public class CosmeticUser {
         return item;
     }
 
+    public UserBackpackManager getUserBackpackManager() {
+        return userBackpackManager;
+    }
+
+    public UserBalloonManager getBalloonManager() {
+        return this.userBalloonManager;
+    }
+
+    public UserWardrobeManager getWardrobeManager() {
+        return userWardrobeManager;
+    }
+
+    public UserEmoteManager getUserEmoteManager() {
+        return userEmoteManager;
+    }
+
     public void enterWardrobe() {
-        if (!WardrobeSettings.inDistanceOfStatic(getPlayer().getLocation())) {
+        enterWardrobe(false);
+    }
+
+    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;
         }
@@ -236,25 +241,21 @@ public class CosmeticUser {
             return;
         }
 
-        if (wardrobe == null) {
+        if (userWardrobeManager == null) {
-            wardrobe = new Wardrobe(this);
+            userWardrobeManager = new UserWardrobeManager(this, exitLocation, viewingLocation, npcLocation);
-            wardrobe.start();
+            userWardrobeManager.start();
         }
     }
 
-    public Wardrobe getWardrobe() {
-        return wardrobe;
-    }
-
     public void leaveWardrobe() {
         PlayerWardrobeLeaveEvent event = new PlayerWardrobeLeaveEvent(this);
         Bukkit.getPluginManager().callEvent(event);
         if (event.isCancelled()) {
             return;
         }
-        if (!getWardrobe().getWardrobeStatus().equals(Wardrobe.WardrobeStatus.RUNNING)) return;
+        if (!getWardrobeManager().getWardrobeStatus().equals(UserWardrobeManager.WardrobeStatus.RUNNING)) return;
 
-        getWardrobe().setWardrobeStatus(Wardrobe.WardrobeStatus.STOPPING);
+        getWardrobeManager().setWardrobeStatus(UserWardrobeManager.WardrobeStatus.STOPPING);
 
         if (WardrobeSettings.isEnabledTransition()) {
             MessagesUtil.sendTitle(
@@ -265,16 +266,14 @@ public class CosmeticUser {
                     WardrobeSettings.getTransitionFadeOut()
             );
             Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
-                wardrobe.end();
+                userWardrobeManager.end();
-                wardrobe = null;
+                userWardrobeManager = null;
             }, WardrobeSettings.getTransitionDelay());
-        } else {
-
         }
     }
 
     public boolean isInWardrobe() {
-        if (wardrobe == null) return false;
+        if (userWardrobeManager == null) return false;
         return true;
     }
 
@@ -287,45 +286,43 @@ public class CosmeticUser {
     }
 
     public void spawnBackpack(CosmeticBackpackType cosmeticBackpackType) {
-        MessagesUtil.sendDebugMessages("spawnBackpack Bukkit - Start");
+        if (this.userBackpackManager != null) return;
-        Player player = Bukkit.getPlayer(getUniqueId());
+        this.userBackpackManager = new UserBackpackManager(this);
+        userBackpackManager.spawnBackpack(cosmeticBackpackType);
+    }
 
-        if (this.invisibleArmorstand != null) return;
+    public void despawnBackpack() {
+        if (userBackpackManager == null) return;
+        userBackpackManager.despawnBackpack();
+        userBackpackManager = null;
+    }
 
-        this.invisibleArmorstand = (ArmorStand) NMSHandlers.getHandler().spawnBackpack(this, cosmeticBackpackType);
+    public boolean isBackupSpawned() {
-
+        if (this.userBackpackManager == null) return false;
-        MessagesUtil.sendDebugMessages("spawnBackpack Bukkit - Finish");
+        return true;
     }
 
     public void spawnBalloon(CosmeticBalloonType cosmeticBalloonType) {
         Player player = Bukkit.getPlayer(getUniqueId());
 
-        if (this.balloonEntity != null) return;
+        if (this.userBalloonManager != null) return;
 
-        this.balloonEntity = NMSHandlers.getHandler().spawnBalloon(this, cosmeticBalloonType);
+        this.userBalloonManager = NMSHandlers.getHandler().spawnBalloon(this, cosmeticBalloonType);
 
         List<Player> viewer = PlayerUtils.getNearbyPlayers(player);
         viewer.add(player);
 
-        PacketManager.sendLeashPacket(getBalloonEntity().getPufferfishBalloonId(), player.getEntityId(), viewer);
+        PacketManager.sendLeashPacket(getBalloonManager().getPufferfishBalloonId(), player.getEntityId(), viewer);
     }
 
     public void despawnBalloon() {
-        if (this.balloonEntity == null) return;
+        if (this.userBalloonManager == null) return;
         List<Player> sentTo = PlayerUtils.getNearbyPlayers(getPlayer().getLocation());
 
-        PacketManager.sendEntityDestroyPacket(balloonEntity.getPufferfishBalloonId(), sentTo);
+        PacketManager.sendEntityDestroyPacket(userBalloonManager.getPufferfishBalloonId(), sentTo);
 
-        this.balloonEntity.remove();
+        this.userBalloonManager.remove();
-        this.balloonEntity = null;
+        this.userBalloonManager = null;
-    }
-
-    public void despawnBackpack() {
-        Player player = Bukkit.getPlayer(getUniqueId());
-        if (invisibleArmorstand == null) return;
-        invisibleArmorstand.setHealth(0);
-        invisibleArmorstand.remove();
-        this.invisibleArmorstand = null;
     }
 
     public void respawnBackpack() {
@@ -388,24 +385,6 @@ public class CosmeticUser {
         }
     }
 
-    public void hideBackpack() {
-        if (hideBackpack == true) return;
-        if (hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
-            invisibleArmorstand.getEquipment().clear();
-            hideBackpack = true;
-        }
-    }
-
-    public void showBackpack() {
-        if (hideBackpack == false) return;
-        if (hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
-            CosmeticBackpackType cosmeticBackpackType = (CosmeticBackpackType) getCosmetic(CosmeticSlot.BACKPACK);
-            ItemStack item = getUserCosmeticItem(cosmeticBackpackType);
-            invisibleArmorstand.getEquipment().setHelmet(item);
-            hideBackpack = false;
-        }
-    }
-
     public void hideCosmetics(HiddenReason reason) {
         if (hideCosmetics == true) return;
         PlayerCosmeticHideEvent event = new PlayerCosmeticHideEvent(this, reason);
@@ -417,12 +396,12 @@ public class CosmeticUser {
         hideCosmetics = true;
         hiddenReason = reason;
         if (hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
-            getBalloonEntity().removePlayerFromModel(getPlayer());
+            getBalloonManager().removePlayerFromModel(getPlayer());
             List<Player> viewer = PlayerUtils.getNearbyPlayers(getPlayer());
-            PacketManager.sendLeashPacket(getBalloonEntity().getPufferfishBalloonId(), -1, viewer);
+            PacketManager.sendLeashPacket(getBalloonManager().getPufferfishBalloonId(), -1, viewer);
         }
         if (hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
-            invisibleArmorstand.getEquipment().clear();
+            userBackpackManager.getArmorStand().getEquipment().clear();
         }
         updateCosmetic();
         MessagesUtil.sendDebugMessages("HideCosmetics");
@@ -441,14 +420,14 @@ public class CosmeticUser {
         hiddenReason = HiddenReason.NONE;
         if (hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
             CosmeticBalloonType balloonType = (CosmeticBalloonType) getCosmetic(CosmeticSlot.BALLOON);
-            getBalloonEntity().addPlayerToModel(this, balloonType);
+            getBalloonManager().addPlayerToModel(this, balloonType);
             List<Player> viewer = PlayerUtils.getNearbyPlayers(getPlayer());
-            PacketManager.sendLeashPacket(getBalloonEntity().getPufferfishBalloonId(), getPlayer().getEntityId(), viewer);
+            PacketManager.sendLeashPacket(getBalloonManager().getPufferfishBalloonId(), getPlayer().getEntityId(), viewer);
         }
         if (hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
             CosmeticBackpackType cosmeticBackpackType = (CosmeticBackpackType) getCosmetic(CosmeticSlot.BACKPACK);
             ItemStack item = getUserCosmeticItem(cosmeticBackpackType);
-            invisibleArmorstand.getEquipment().setHelmet(item);
+            userBackpackManager.getArmorStand().getEquipment().setHelmet(item);
         }
         updateCosmetic();
         MessagesUtil.sendDebugMessages("ShowCosmetics");
@@ -468,6 +447,7 @@ public class CosmeticUser {
         PLUGIN,
         POTION,
         ACTION,
-        COMMAND
+        COMMAND,
+        EMOTE
     }
 }

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

@@ -0,0 +1,88 @@
+package com.hibiscusmc.hmccosmetics.user.manager;
+
+import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
+import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType;
+import com.hibiscusmc.hmccosmetics.nms.NMSHandlers;
+import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
+import com.ticxo.modelengine.api.ModelEngineAPI;
+import com.ticxo.modelengine.api.model.ActiveModel;
+import com.ticxo.modelengine.api.model.ModeledEntity;
+import org.bukkit.entity.ArmorStand;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.logging.Level;
+
+public class UserBackpackManager {
+
+    private boolean hideBackpack;
+    private ArmorStand invisibleArmorStand;
+    private final CosmeticUser user;
+    private BackpackType backpackType;
+
+    public UserBackpackManager(CosmeticUser user) {
+        this.user = user;
+        hideBackpack = false;
+        backpackType = BackpackType.NORMAL;
+    }
+
+    public int getFirstArmorStandId() {
+        return invisibleArmorStand.getEntityId();
+    }
+
+    public ArmorStand getArmorStand() {
+        return invisibleArmorStand;
+    }
+
+    public void spawnBackpack(CosmeticBackpackType cosmeticBackpackType) {
+        MessagesUtil.sendDebugMessages("spawnBackpack Bukkit - Start");
+
+        if (this.invisibleArmorStand != null) return;
+
+        this.invisibleArmorStand = (ArmorStand) NMSHandlers.getHandler().spawnBackpack(user, cosmeticBackpackType);
+
+        if (cosmeticBackpackType.getModelName() != null && HMCCosmeticsPlugin.hasModelEngine()) {
+            if (ModelEngineAPI.api.getModelRegistry().getBlueprint(cosmeticBackpackType.getModelName()) == null) {
+                MessagesUtil.sendDebugMessages("Invalid Model Engine Blueprint " + cosmeticBackpackType.getModelName(), Level.SEVERE);
+                return;
+            }
+            ModeledEntity modeledEntity = ModelEngineAPI.getOrCreateModeledEntity(invisibleArmorStand);
+            ActiveModel model = ModelEngineAPI.createActiveModel(ModelEngineAPI.getBlueprint(cosmeticBackpackType.getModelName()));
+            model.setCanHurt(false);
+            modeledEntity.addModel(model, false);
+        }
+
+        MessagesUtil.sendDebugMessages("spawnBackpack Bukkit - Finish");
+    }
+
+    public void despawnBackpack() {
+        if (invisibleArmorStand == null) return;
+        invisibleArmorStand.setHealth(0);
+        invisibleArmorStand.remove();
+        this.invisibleArmorStand = null;
+    }
+
+    public void hideBackpack() {
+        if (user.getHidden()) return;
+        getArmorStand().getEquipment().clear();
+        hideBackpack = true;
+    }
+
+    public void showBackpack() {
+        if (!hideBackpack) return;
+        CosmeticBackpackType cosmeticBackpackType = (CosmeticBackpackType) user.getCosmetic(CosmeticSlot.BACKPACK);
+        ItemStack item = user.getUserCosmeticItem(cosmeticBackpackType);
+        getArmorStand().getEquipment().setHelmet(item);
+        hideBackpack = false;
+    }
+
+    public void setVisibility(boolean shown) {
+        hideBackpack = shown;
+    }
+
+    public enum BackpackType {
+        NORMAL,
+        FIRST_PERSON // First person not yet implemented
+    }
+}

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

@@ -1,4 +1,4 @@
-package com.hibiscusmc.hmccosmetics.entities;
+package com.hibiscusmc.hmccosmetics.user.manager;
 
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.config.Settings;
@@ -15,24 +15,25 @@ import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.UUID;
 import java.util.logging.Level;
 
-public class BalloonEntity {
+public class UserBalloonManager {
 
     private BalloonType balloonType;
     private final int balloonID;
     private final UUID uniqueID;
     private final ArmorStand modelEntity;
 
-    public BalloonEntity(Location location) {
+    public UserBalloonManager(@NotNull Location location) {
         this.uniqueID = UUID.randomUUID();
         this.balloonID = NMSHandlers.getHandler().getNextEntityId();
         this.modelEntity = NMSHandlers.getHandler().getMEGEntity(location.add(Settings.getBalloonOffset()));
     }
 
-    public void spawnModel(CosmeticBalloonType cosmeticBalloonType, Color color) {
+    public void spawnModel(@NotNull CosmeticBalloonType cosmeticBalloonType, Color color) {
         // redo this
         if (cosmeticBalloonType.getModelName() != null && HMCCosmeticsPlugin.hasModelEngine()) {
             balloonType = BalloonType.MODELENGINE;

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

@@ -0,0 +1,42 @@
+package com.hibiscusmc.hmccosmetics.user.manager;
+
+import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticEmoteType;
+import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
+import org.jetbrains.annotations.NotNull;
+
+public class UserEmoteManager {
+
+    CosmeticUser user;
+    private UserEmoteModel model;
+
+    public UserEmoteManager(CosmeticUser user) {
+        this.user = user;
+    }
+
+    public void playEmote(@NotNull CosmeticEmoteType cosmeticEmoteType) {
+        MessagesUtil.sendDebugMessages("playEmote " + cosmeticEmoteType.getAnimationId());
+        playEmote(cosmeticEmoteType.getAnimationId());
+    }
+
+    public void playEmote(String animationId) {
+        if (isPlayingEmote()) return;
+        if (user.isInWardrobe()) return;
+        try {
+            model = new UserEmoteModel(user);
+            model.playAnimation(animationId);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public boolean isPlayingEmote() {
+        if (model == null) return false;
+        return model.isPlayingAnimation();
+    }
+
+    public void stopEmote() {
+        if (!isPlayingEmote()) return;
+        model.stopAnimation();
+    }
+}

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

@@ -0,0 +1,123 @@
+package com.hibiscusmc.hmccosmetics.user.manager;
+
+import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
+import com.hibiscusmc.hmccosmetics.config.Settings;
+import com.hibiscusmc.hmccosmetics.nms.NMSHandlers;
+import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
+import com.hibiscusmc.hmccosmetics.util.ServerUtils;
+import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
+import com.ticxo.playeranimator.api.model.player.PlayerModel;
+import org.bukkit.Bukkit;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+
+public class UserEmoteModel extends PlayerModel {
+
+    private final CosmeticUser user;
+    private String emotePlaying;
+    private final int armorStandId;
+    private GameMode originalGamemode;
+
+    public UserEmoteModel(@NotNull CosmeticUser user) {
+        super(user.getPlayer());
+        this.user = user;
+        armorStandId = NMSHandlers.getHandler().getNextEntityId();
+        getRangeManager().setRenderDistance(Settings.getViewDistance());
+    }
+
+    @Override
+    public void playAnimation(@NotNull String id) {
+        if (id.contains(":")) id = id.split(":", 2)[1]; // A:B -> B -> B.B.B
+        if (!id.contains(".")) id = id + "." + id + "." + id; // Make into a format that playerAnimator works with. Requires 3 splits.
+
+        super.playAnimation(id);
+
+        emotePlaying = id;
+
+        // Add config option that either allows player to move or forces them into a spot.
+        Player player = user.getPlayer();
+        List<Player> viewer = Collections.singletonList(user.getPlayer());
+        List<Player> outsideViewers = PacketManager.getViewers(player.getLocation());
+        outsideViewers.remove(player);
+
+        PacketManager.equipmentSlotUpdate(player, true, outsideViewers);
+
+        Location newLocation = player.getLocation().clone();
+        newLocation.setPitch(0);
+
+        double DISTANCE = Settings.getEmoteDistance();
+
+        Location thirdPersonLocation = newLocation.add(newLocation.getDirection().normalize().multiply(DISTANCE));
+        if (thirdPersonLocation.getBlock().getType() != Material.AIR) {
+            stopAnimation();
+            MessagesUtil.sendMessage(player, "emote-blocked");
+            return;
+        }
+
+        user.getPlayer().setInvisible(true);
+        user.hideCosmetics(CosmeticUser.HiddenReason.EMOTE);
+
+        originalGamemode = player.getGameMode();
+
+        PacketManager.sendEntitySpawnPacket(thirdPersonLocation, armorStandId, EntityType.ARMOR_STAND, UUID.randomUUID(), viewer);
+        PacketManager.sendInvisibilityPacket(armorStandId, viewer);
+        PacketManager.sendLookPacket(armorStandId, player.getLocation(), viewer);
+
+        PacketManager.gamemodeChangePacket(player, 3);
+        PacketManager.sendCameraPacket(armorStandId, viewer);
+
+        MessagesUtil.sendDebugMessages("playAnimation run");
+    }
+
+    @Override
+    public boolean update() {
+        if (super.getAnimationProperty() == null) {
+            stopAnimation();
+            return false;
+        }
+        boolean update = (super.update() && isPlayingAnimation());
+        if (!update) {
+            stopAnimation();
+        }
+        return update;
+    }
+
+    public void stopAnimation() {
+        emotePlaying = null;
+        despawn();
+        Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
+            Player player = user.getPlayer();
+            if (player == null) return;
+
+            List<Player> viewer = Collections.singletonList(player);
+            List<Player> outsideViewers = PacketManager.getViewers(player.getLocation());
+            outsideViewers.remove(player);
+
+            int entityId = player.getEntityId();
+            PacketManager.sendCameraPacket(entityId, viewer);
+            PacketManager.sendEntityDestroyPacket(armorStandId, viewer);
+            if (this.originalGamemode != null) {
+                PacketManager.gamemodeChangePacket(player, ServerUtils.convertGamemode(this.originalGamemode));
+                player.setGameMode(this.originalGamemode);
+            }
+
+            if (user.getPlayer() != null) player.setInvisible(false);
+            PacketManager.equipmentSlotUpdate(player, false, outsideViewers);
+            user.showPlayer();
+            user.showCosmetics();
+        });
+    }
+
+    public boolean isPlayingAnimation() {
+        return emotePlaying != null;
+    }
+}

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

@@ -1,10 +1,12 @@
-package com.hibiscusmc.hmccosmetics.user;
+package com.hibiscusmc.hmccosmetics.user.manager;
 
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.config.WardrobeSettings;
+import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
 import com.hibiscusmc.hmccosmetics.nms.NMSHandlers;
+import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.hibiscusmc.hmccosmetics.util.ServerUtils;
 import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
@@ -22,49 +24,51 @@ import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.scheduler.BukkitRunnable;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 
-public class Wardrobe {
+public class UserWardrobeManager {
 
-    private int NPC_ID;
+    private final int NPC_ID;
+    private final int ARMORSTAND_ID;
+    private final UUID WARDROBE_UUID;
     private String npcName;
-    private UUID WARDROBE_UUID;
-    private int ARMORSTAND_ID;
     private GameMode originalGamemode;
-    private CosmeticUser VIEWER;
+    private final CosmeticUser user;
-    private Location viewingLocation;
+    private final Location viewingLocation;
-    private Location npcLocation;
+    private final Location npcLocation;
     private Location exitLocation;
     private BossBar bossBar;
     private boolean active;
     private WardrobeStatus wardrobeStatus;
 
-    public Wardrobe(CosmeticUser user) {
+    public UserWardrobeManager(CosmeticUser user, Location exitLocation, Location viewingLocation, Location npcLocation) {
         NPC_ID = NMSHandlers.getHandler().getNextEntityId();
         ARMORSTAND_ID = NMSHandlers.getHandler().getNextEntityId();
         WARDROBE_UUID = UUID.randomUUID();
-        VIEWER = user;
+        this.user = user;
+
+        this.exitLocation = exitLocation;
+        this.viewingLocation = viewingLocation;
+        this.npcLocation = npcLocation;
+
         wardrobeStatus = WardrobeStatus.SETUP;
     }
 
     public void start() {
         setWardrobeStatus(WardrobeStatus.STARTING);
-        Player player = VIEWER.getPlayer();
+        Player player = user.getPlayer();
 
         this.originalGamemode = player.getGameMode();
         if (WardrobeSettings.isReturnLastLocation()) {
             this.exitLocation = player.getLocation().clone();
-        } else {
-            this.exitLocation = WardrobeSettings.getLeaveLocation();
         }
 
-        viewingLocation = WardrobeSettings.getViewerLocation();
+        user.hidePlayer();
-        npcLocation = WardrobeSettings.getWardrobeLocation();
+        List<Player> viewer = Collections.singletonList(player);
-
-        VIEWER.hidePlayer();
-        List<Player> viewer = List.of(player);
         List<Player> outsideViewers = PacketManager.getViewers(viewingLocation);
         outsideViewers.remove(player);
 
@@ -99,17 +103,18 @@ public class Wardrobe {
             PacketManager.sendRotationPacket(NPC_ID, npcLocation, true, viewer);
 
             // Misc
-            if (VIEWER.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
+            if (user.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
-                PacketManager.ridingMountPacket(NPC_ID, VIEWER.getBackpackEntity().getEntityId(), viewer);
+                user.getUserBackpackManager().getArmorStand().teleport(npcLocation.clone().add(0, 2, 0));
+                PacketManager.ridingMountPacket(NPC_ID, user.getUserBackpackManager().getFirstArmorStandId(), viewer);
             }
 
-            if (VIEWER.hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
+            if (user.hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
-                PacketManager.sendLeashPacket(VIEWER.getBalloonEntity().getPufferfishBalloonId(), -1, viewer);
+                PacketManager.sendLeashPacket(user.getBalloonManager().getPufferfishBalloonId(), -1, viewer);
-                PacketManager.sendLeashPacket(VIEWER.getBalloonEntity().getPufferfishBalloonId(), NPC_ID, viewer); // This needs a possible fix
+                PacketManager.sendLeashPacket(user.getBalloonManager().getPufferfishBalloonId(), NPC_ID, viewer); // This needs a possible fix
                 //PacketManager.sendLeashPacket(VIEWER.getBalloonEntity().getModelId(), NPC_ID, viewer);
 
-                PacketManager.sendTeleportPacket(VIEWER.getBalloonEntity().getPufferfishBalloonId(), npcLocation.clone().add(Settings.getBalloonOffset()), false, viewer);
+                PacketManager.sendTeleportPacket(user.getBalloonManager().getPufferfishBalloonId(), npcLocation.clone().add(Settings.getBalloonOffset()), false, viewer);
-                PacketManager.sendTeleportPacket(VIEWER.getBalloonEntity().getModelId(), npcLocation.clone().add(Settings.getBalloonOffset()), false, viewer);
+                user.getBalloonManager().getModelEntity().teleport(npcLocation.clone().add(Settings.getBalloonOffset()));
             }
 
             if (WardrobeSettings.getEnabledBossbar()) {
@@ -130,7 +135,7 @@ public class Wardrobe {
 
         if (WardrobeSettings.isEnabledTransition()) {
             MessagesUtil.sendTitle(
-                    VIEWER.getPlayer(),
+                    user.getPlayer(),
                     WardrobeSettings.getTransitionText(),
                     WardrobeSettings.getTransitionFadeIn(),
                     WardrobeSettings.getTransitionStay(),
@@ -145,9 +150,9 @@ public class Wardrobe {
 
     public void end() {
         setWardrobeStatus(WardrobeStatus.STOPPING);
-        Player player = VIEWER.getPlayer();
+        Player player = user.getPlayer();
 
-        List<Player> viewer = List.of(player);
+        List<Player> viewer = Collections.singletonList(player);
         List<Player> outsideViewers = PacketManager.getViewers(viewingLocation);
         outsideViewers.remove(player);
 
@@ -157,7 +162,7 @@ public class Wardrobe {
             this.active = false;
 
             // NPC
-            if (VIEWER.hasCosmeticInSlot(CosmeticSlot.BALLOON)) PacketManager.sendLeashPacket(VIEWER.getBalloonEntity().getModelId(), -1, viewer);
+            if (user.hasCosmeticInSlot(CosmeticSlot.BALLOON)) PacketManager.sendLeashPacket(user.getBalloonManager().getModelId(), -1, viewer);
             PacketManager.sendEntityDestroyPacket(NPC_ID, viewer); // Success
             PacketManager.sendRemovePlayerPacket(player, WARDROBE_UUID, viewer); // Success
 
@@ -170,26 +175,22 @@ public class Wardrobe {
 
             //PacketManager.sendEntityDestroyPacket(player.getEntityId(), viewer); // Success
             player.setGameMode(this.originalGamemode);
-            VIEWER.showPlayer();
+            user.showPlayer();
 
-            if (VIEWER.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
+            if (user.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
-                VIEWER.respawnBackpack();
+                user.respawnBackpack();
                 //PacketManager.ridingMountPacket(player.getEntityId(), VIEWER.getBackpackEntity().getEntityId(), viewer);
             }
 
-            if (VIEWER.hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
+            if (user.hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
-                VIEWER.respawnBalloon();
+                user.respawnBalloon();
                 //PacketManager.sendLeashPacket(VIEWER.getBalloonEntity().getPufferfishBalloonId(), player.getEntityId(), viewer);
             }
 
-            if (exitLocation == null) {
+            player.teleport(Objects.requireNonNullElseGet(exitLocation, () -> player.getWorld().getSpawnLocation()));
-                player.teleport(player.getWorld().getSpawnLocation());
-            } else {
-                player.teleport(exitLocation);
-            }
 
             if (WardrobeSettings.isEquipPumpkin()) {
-                NMSHandlers.getHandler().equipmentSlotUpdate(VIEWER.getPlayer().getEntityId(), EquipmentSlot.HEAD, player.getInventory().getHelmet(), viewer);
+                NMSHandlers.getHandler().equipmentSlotUpdate(user.getPlayer().getEntityId(), EquipmentSlot.HEAD, player.getInventory().getHelmet(), viewer);
             }
 
             if (WardrobeSettings.getEnabledBossbar()) {
@@ -198,7 +199,14 @@ public class Wardrobe {
                 target.hideBossBar(bossBar);
             }
 
-            VIEWER.updateCosmetic();
+            // For Wardrobe Temp Cosmetics
+            for (Cosmetic cosmetic : user.getCosmetic()) {
+                if (cosmetic.requiresPermission()) {
+                    if (!player.hasPermission(cosmetic.getPermission())) user.removeCosmeticSlot(cosmetic.getSlot());
+                }
+            }
+
+            user.updateCosmetic();
         };
         run.run();
     }
@@ -209,49 +217,50 @@ public class Wardrobe {
         BukkitRunnable runnable = new BukkitRunnable() {
             @Override
             public void run() {
-                if (active == false) {
+                Player player = user.getPlayer();
+                if (!active || player == null) {
                     MessagesUtil.sendDebugMessages("Active is false");
                     this.cancel();
                     return;
                 }
                 MessagesUtil.sendDebugMessages("Update ");
-                List<Player> viewer = List.of(VIEWER.getPlayer());
+                List<Player> viewer = Collections.singletonList(player);
                 List<Player> outsideViewers = PacketManager.getViewers(viewingLocation);
-                outsideViewers.remove(VIEWER.getPlayer());
+                outsideViewers.remove(player);
 
                 Location location = WardrobeSettings.getWardrobeLocation().clone();
                 int yaw = data.get();
                 location.setYaw(yaw);
 
                 PacketManager.sendLookPacket(NPC_ID, location, viewer);
-                VIEWER.hidePlayer();
+                user.hidePlayer();
                 int rotationSpeed = WardrobeSettings.getRotationSpeed();
-                location.setYaw(getNextYaw(yaw - 30, rotationSpeed));
+                location.setYaw(ServerUtils.getNextYaw(yaw - 30, rotationSpeed));
                 PacketManager.sendRotationPacket(NPC_ID, location, true, viewer);
-                int nextyaw = getNextYaw(yaw, rotationSpeed);
+                int nextyaw = ServerUtils.getNextYaw(yaw, rotationSpeed);
                 data.set(nextyaw);
 
                 for (CosmeticSlot slot : CosmeticSlot.values()) {
-                    PacketManager.equipmentSlotUpdate(NPC_ID, VIEWER, slot, viewer);
+                    PacketManager.equipmentSlotUpdate(NPC_ID, user, slot, viewer);
                 }
 
-                if (VIEWER.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
+                if (user.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
-                    PacketManager.sendTeleportPacket(VIEWER.getArmorstandId(), location, false, viewer);
+                    PacketManager.sendTeleportPacket(user.getUserBackpackManager().getFirstArmorStandId(), location, false, viewer);
-                    PacketManager.ridingMountPacket(NPC_ID, VIEWER.getBackpackEntity().getEntityId(), viewer);
+                    PacketManager.ridingMountPacket(NPC_ID, user.getUserBackpackManager().getFirstArmorStandId(), viewer);
-                    VIEWER.getBackpackEntity().setRotation(nextyaw, 0);
+                    user.getUserBackpackManager().getArmorStand().setRotation(nextyaw, 0);
-                    PacketManager.sendEntityDestroyPacket(VIEWER.getArmorstandId(), outsideViewers);
+                    PacketManager.sendEntityDestroyPacket(user.getUserBackpackManager().getFirstArmorStandId(), outsideViewers);
                 }
 
-                if (VIEWER.hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
+                if (user.hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
-                    PacketManager.sendTeleportPacket(VIEWER.getBalloonEntity().getPufferfishBalloonId(), WardrobeSettings.getWardrobeLocation().add(Settings.getBalloonOffset()), false, viewer);
+                    PacketManager.sendTeleportPacket(user.getBalloonManager().getPufferfishBalloonId(), WardrobeSettings.getWardrobeLocation().add(Settings.getBalloonOffset()), false, viewer);
-                    VIEWER.getBalloonEntity().getModelEntity().teleport(WardrobeSettings.getWardrobeLocation().add(Settings.getBalloonOffset()));
+                    user.getBalloonManager().getModelEntity().teleport(WardrobeSettings.getWardrobeLocation().add(Settings.getBalloonOffset()));
-                    PacketManager.sendLeashPacket(VIEWER.getBalloonEntity().getPufferfishBalloonId(), -1, outsideViewers);
+                    PacketManager.sendLeashPacket(user.getBalloonManager().getPufferfishBalloonId(), -1, outsideViewers);
-                    PacketManager.sendEntityDestroyPacket(VIEWER.getBalloonEntity().getModelId(), outsideViewers);
+                    PacketManager.sendEntityDestroyPacket(user.getBalloonManager().getModelId(), outsideViewers);
-                    //PacketManager.sendLeashPacket(VIEWER.getBalloonEntity().getModelId(), NPC_ID, viewer); // Pufferfish goes away for some reason?
+                    PacketManager.sendLeashPacket(user.getBalloonManager().getPufferfishBalloonId(), NPC_ID, viewer); // Pufferfish goes away for some reason?
                 }
 
                 if (WardrobeSettings.isEquipPumpkin()) {
-                    NMSHandlers.getHandler().equipmentSlotUpdate(VIEWER.getPlayer().getEntityId(), EquipmentSlot.HEAD, new ItemStack(Material.CARVED_PUMPKIN), viewer);
+                    NMSHandlers.getHandler().equipmentSlotUpdate(user.getPlayer().getEntityId(), EquipmentSlot.HEAD, new ItemStack(Material.CARVED_PUMPKIN), viewer);
                 }
             }
         };
@@ -259,16 +268,7 @@ public class Wardrobe {
         runnable.runTaskTimer(HMCCosmeticsPlugin.getInstance(), 0, 2);
     }
 
-    private static int getNextYaw(final int current, final int rotationSpeed) {
+    public int getCameraId() {
-        int nextYaw = current + rotationSpeed;
-        if (nextYaw > 179) {
-            nextYaw = (current + rotationSpeed) - 358;
-            return nextYaw;
-        }
-        return nextYaw;
-    }
-
-    public int getArmorstandId() {
         return ARMORSTAND_ID;
     }
 

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

@@ -3,6 +3,8 @@ package com.hibiscusmc.hmccosmetics.util;
 import com.comphenix.protocol.wrappers.EnumWrappers;
 import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
 import org.bukkit.inventory.EquipmentSlot;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class InventoryUtils {
@@ -58,6 +60,8 @@ public class InventoryUtils {
         };
     }
 
+    @Contract(pure = true)
+    @Nullable
     public static CosmeticSlot BukkitCosmeticSlot(int slot) {
         switch (slot) {
             case 36 -> {
@@ -81,6 +85,8 @@ public class InventoryUtils {
         }
     }
 
+    @Contract(pure = true)
+    @Nullable
     public static CosmeticSlot NMSCosmeticSlot(int slot) {
         switch (slot) {
             case 5 -> {
@@ -104,7 +110,9 @@ public class InventoryUtils {
         }
     }
 
-    public static EquipmentSlot getEquipmentSlot(CosmeticSlot slot) {
+    @Contract(pure = true)
+    @Nullable
+    public static EquipmentSlot getEquipmentSlot(@NotNull CosmeticSlot slot) {
         switch (slot) {
             case HELMET -> {
                 return EquipmentSlot.HEAD;

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

@@ -3,7 +3,8 @@ package com.hibiscusmc.hmccosmetics.util;
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.config.WardrobeSettings;
-import com.hibiscusmc.hmccosmetics.hooks.PAPIHook;
+import com.hibiscusmc.hmccosmetics.hooks.Hooks;
+import com.hibiscusmc.hmccosmetics.hooks.placeholders.HMCPlaceholderExpansion;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.misc.Adventure;
 import me.clip.placeholderapi.PlaceholderAPI;
@@ -14,6 +15,8 @@ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import net.kyori.adventure.title.Title;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.configurate.ConfigurationNode;
 
 import java.time.Duration;
@@ -23,9 +26,9 @@ import java.util.logging.Level;
 public class MessagesUtil {
 
     private static String prefix;
-    private static HashMap<String, String> messages = new HashMap<>();
+    private static final HashMap<String, String> messages = new HashMap<>();
 
-    public static void setup(ConfigurationNode config) {
+    public static void setup(@NotNull ConfigurationNode config) {
         prefix = config.node("prefix").getString("");
         for (ConfigurationNode node : config.childrenMap().values()) {
             if (node.virtual()) continue;
@@ -34,7 +37,7 @@ public class MessagesUtil {
         }
      }
 
-    public static void sendMessage(CosmeticUser user, String key) {
+    public static void sendMessage(@NotNull CosmeticUser user, String key) {
         sendMessage(user.getPlayer(), key);
     }
 
@@ -91,11 +94,12 @@ public class MessagesUtil {
         return processString(player, key, null);
     }
 
+    @Nullable
     public static Component processString(Player player, String key, TagResolver placeholders) {
         if (!messages.containsKey(key)) return null;
         if (messages.get(key) == null) return null;
         String message = messages.get(key);
-        if (PAPIHook.isPAPIEnabled() && player != null) message = PlaceholderAPI.setPlaceholders(player, message);
+        if (Hooks.isActiveHook("PlaceholderAPI") && player != null) message = PlaceholderAPI.setPlaceholders(player, message);
         message = message.replaceAll("%prefix%", prefix);
         if (placeholders != null ) {
             return Adventure.MINI_MESSAGE.deserialize(message, placeholders);
@@ -103,17 +107,20 @@ public class MessagesUtil {
         return Adventure.MINI_MESSAGE.deserialize(message);
     }
 
+    @NotNull
     public static Component processStringNoKey(String message) {
         return processStringNoKey(null, message, null);
     }
 
+    @NotNull
     public static Component processStringNoKey(Player player, String message) {
         return processStringNoKey(player, message, null);
     }
 
+    @NotNull
     public static Component processStringNoKey(Player player, String message, TagResolver placeholders) {
         message = message.replaceAll("%prefix%", prefix);
-        if (PAPIHook.isPAPIEnabled() && player != null) message = PlaceholderAPI.setPlaceholders(player, message);
+        if (Hooks.isActiveHook("PlaceholderAPI") && player != null) message = PlaceholderAPI.setPlaceholders(player, message);
         if (placeholders != null ) {
             return Adventure.MINI_MESSAGE.deserialize(message, placeholders);
         }
@@ -122,7 +129,7 @@ public class MessagesUtil {
 
     public static String processStringNoKeyString(Player player, String message) {
         message = message.replaceAll("%prefix%", prefix);
-        if (PAPIHook.isPAPIEnabled() && player != null) message = PlaceholderAPI.setPlaceholders(player, message);
+        if (Hooks.isActiveHook("PlaceholderAPI") && player != null) message = PlaceholderAPI.setPlaceholders(player, message);
         return message;
     }
 

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

@@ -6,12 +6,15 @@ import com.hibiscusmc.hmccosmetics.config.Settings;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class PlayerUtils {
 
+    @Nullable
     public static WrappedSignedProperty getSkin(Player player) {
         WrappedSignedProperty skinData = WrappedGameProfile.fromPlayer(player).getProperties()
                 .get("textures").stream().findAny().orElse(null);
@@ -22,11 +25,13 @@ public class PlayerUtils {
         return new WrappedSignedProperty("textures", skinData.getValue(), skinData.getSignature());
     }
 
-    public static List<Player> getNearbyPlayers(Player player) {
+    @NotNull
+    public static List<Player> getNearbyPlayers(@NotNull Player player) {
         return getNearbyPlayers(player.getLocation());
     }
 
-    public static List<Player> getNearbyPlayers(Location location) {
+    @NotNull
+    public static List<Player> getNearbyPlayers(@NotNull Location location) {
         List<Player> players = new ArrayList<>();
         int viewDistance = Settings.getViewDistance();
         for (Entity entity : location.getWorld().getNearbyEntities(location, viewDistance, viewDistance, viewDistance)) {

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

@@ -137,4 +137,13 @@ public class ServerUtils {
             }
         }
     }
+
+    public static int getNextYaw(final int current, final int rotationSpeed) {
+        int nextYaw = current + rotationSpeed;
+        if (nextYaw > 179) {
+            nextYaw = (current + rotationSpeed) - 358;
+            return nextYaw;
+        }
+        return nextYaw;
+    }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/util/builder/ColorBuilder.java

@@ -6,6 +6,7 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.LeatherArmorMeta;
 import org.bukkit.inventory.meta.PotionMeta;
+import org.jetbrains.annotations.NotNull;
 
 public class ColorBuilder {
 
@@ -13,7 +14,7 @@ public class ColorBuilder {
         return canBeColored(new ItemStack(material));
     }
 
-    public static boolean canBeColored(final ItemStack itemStack) {
+    public static boolean canBeColored(final @NotNull ItemStack itemStack) {
         final ItemMeta itemMeta = itemStack.getItemMeta();
 
         return (itemMeta instanceof LeatherArmorMeta ||

common/src/main/java/com/hibiscusmc/hmccosmetics/util/builder/ItemBuilder.java

@@ -8,6 +8,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,7 +35,7 @@ public class ItemBuilder {
      * @param itemStack builder ItemStack
      */
 
-    ItemBuilder(final ItemStack itemStack) {
+    ItemBuilder(final @NotNull ItemStack itemStack) {
         this.material = itemStack.getType();
         this.itemMeta = itemStack.hasItemMeta() ? itemStack.getItemMeta()
                 : Bukkit.getItemFactory().getItemMeta(this.material);
@@ -44,6 +46,8 @@ public class ItemBuilder {
      * @return
      */
 
+    @Contract("_ -> new")
+    @NotNull
     public static ItemBuilder from(final Material material) {
         return new ItemBuilder(material);
     }
@@ -52,7 +56,8 @@ public class ItemBuilder {
      * @param itemStack builder ItemStack
      * @return
      */
-
+    @Contract("_ -> new")
+    @NotNull
     public static ItemBuilder from(final ItemStack itemStack) {
         return new ItemBuilder(itemStack);
     }

common/src/main/java/com/hibiscusmc/hmccosmetics/util/misc/Keys.java

@@ -6,6 +6,7 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataType;
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jetbrains.annotations.NotNull;
 
 public class Keys {
 
@@ -13,7 +14,7 @@ public class Keys {
     public static final NamespacedKey ITEM_KEY = new NamespacedKey(plugin, "cosmetic");
     public static final NamespacedKey TOKEN_KEY = new NamespacedKey(plugin, "token-key");
 
-    public static void setKey(final ItemStack itemStack) {
+    public static void setKey(final @NotNull ItemStack itemStack) {
         final ItemMeta itemMeta = itemStack.getItemMeta();
 
         if (itemMeta == null) {
@@ -26,7 +27,7 @@ public class Keys {
     }
 
     public static <T, Z> void setKey(
-            final ItemStack itemStack,
+            final @NotNull ItemStack itemStack,
             final NamespacedKey key,
             final PersistentDataType<T, Z> type,
             final Z value) {
@@ -41,7 +42,7 @@ public class Keys {
         itemStack.setItemMeta(itemMeta);
     }
 
-    public static boolean hasKey(final ItemStack itemStack) {
+    public static boolean hasKey(final @NotNull ItemStack itemStack) {
         final ItemMeta itemMeta = itemStack.getItemMeta();
 
         if (itemMeta == null) {
@@ -51,7 +52,7 @@ public class Keys {
         return itemMeta.getPersistentDataContainer().has(ITEM_KEY, PersistentDataType.BYTE);
     }
 
-    public static <T, Z> boolean hasKey(final ItemStack itemStack, final NamespacedKey key, final PersistentDataType<T, Z> type) {
+    public static <T, Z> boolean hasKey(final @NotNull ItemStack itemStack, final NamespacedKey key, final PersistentDataType<T, Z> type) {
         final ItemMeta itemMeta = itemStack.getItemMeta();
 
         if (itemMeta == null) {
@@ -62,7 +63,7 @@ public class Keys {
     }
 
     @Nullable
-    public static <T, Z> Z getValue(final ItemStack itemStack, final NamespacedKey key, final PersistentDataType<T, Z> type) {
+    public static <T, Z> Z getValue(final @NotNull ItemStack itemStack, final NamespacedKey key, final PersistentDataType<T, Z> type) {
         final ItemMeta itemMeta = itemStack.getItemMeta();
 
         if (itemMeta == null) {

common/src/main/java/com/hibiscusmc/hmccosmetics/util/misc/StringUtils.java

@@ -1,6 +1,7 @@
 package com.hibiscusmc.hmccosmetics.util.misc;
 
 import net.kyori.adventure.text.Component;
+import org.jetbrains.annotations.NotNull;
 
 public class StringUtils {
 
@@ -8,15 +9,17 @@ public class StringUtils {
      * @param parsed message to be parsed
      * @return MiniMessage parsed string
      */
-
+    @NotNull
     public static Component parse(final String parsed) {
         return Adventure.MINI_MESSAGE.deserialize(parsed);
     }
 
+    @NotNull
     public static String parseStringToString(final String parsed) {
         return Adventure.SERIALIZER.serialize(Adventure.MINI_MESSAGE.deserialize(parsed));
     }
 
+    @NotNull
     public static String formatArmorItemType(String type) {
         type = type.toLowerCase();
         final String[] parts = type.split(" ");

common/src/main/java/com/hibiscusmc/hmccosmetics/util/misc/Utils.java

@@ -29,7 +29,7 @@ public class Utils {
         return original;
     }
 
-    public static <T> T replaceIf(final @Nullable T original, final T replacement, final Predicate<T> predicate) {
+    public static <T> T replaceIf(final @Nullable T original, final T replacement, final @NotNull Predicate<T> predicate) {
         if (predicate.test(original)) return replacement;
         return original;
     }

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

@@ -16,9 +16,13 @@ import com.hibiscusmc.hmccosmetics.util.packets.wrappers.WrapperPlayServerPlayer
 import com.hibiscusmc.hmccosmetics.util.packets.wrappers.WrapperPlayServerRelEntityMove;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.EquipmentSlot;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -28,11 +32,11 @@ import java.util.UUID;
 public class PacketManager extends BasePacket {
 
     public static void sendEntitySpawnPacket(
-            final Location location,
+            final @NotNull Location location,
             final int entityId,
             final EntityType entityType,
             final UUID uuid,
-            final List<Player> sendTo
+            final @NotNull List<Player> sendTo
     ) {
         PacketContainer packet = new PacketContainer(PacketType.Play.Server.SPAWN_ENTITY);
         packet.getModifier().writeDefaults();
@@ -61,7 +65,7 @@ public class PacketManager extends BasePacket {
     public static void ridingMountPacket(
             int mountId,
             int passengerId,
-            List<Player> sendTo
+            @NotNull List<Player> sendTo
     ) {
         PacketContainer packet = new PacketContainer(PacketType.Play.Server.MOUNT);
         packet.getIntegers().write(0, mountId);
@@ -71,6 +75,17 @@ public class PacketManager extends BasePacket {
 
     public static void equipmentSlotUpdate(
             Player player,
+            boolean empty,
+            List<Player> sendTo
+    ) {
+        for (EquipmentSlot slot : EquipmentSlot.values()) {
+            ItemStack item = player.getInventory().getItem(slot);
+            if (empty) item = new ItemStack(Material.AIR);
+            NMSHandlers.getHandler().equipmentSlotUpdate(player.getEntityId(), slot, item, sendTo);
+        }
+    }
+    public static void equipmentSlotUpdate(
+            @NotNull Player player,
             CosmeticSlot cosmetic,
             List<Player> sendTo
     ) {
@@ -91,13 +106,13 @@ public class PacketManager extends BasePacket {
             CosmeticSlot cosmeticSlot,
             List<Player> sendTo
     ) {
-        if (cosmeticSlot == CosmeticSlot.BACKPACK || cosmeticSlot == CosmeticSlot.BALLOON) return;
+        if (cosmeticSlot == CosmeticSlot.BACKPACK || cosmeticSlot == CosmeticSlot.BALLOON || cosmeticSlot == CosmeticSlot.EMOTE) return;
 
         NMSHandlers.getHandler().equipmentSlotUpdate(entityId, user, cosmeticSlot, sendTo);
     }
 
     public static void armorStandMetaPacket(
-            Entity entity,
+            @NotNull Entity entity,
             List<Player> sendTo
     ) {
         PacketContainer packet = new PacketContainer(PacketType.Play.Server.ENTITY_METADATA);
@@ -133,9 +148,9 @@ public class PacketManager extends BasePacket {
     }
 
     public static void sendLookPacket(
-             int entityId,
+            int entityId,
-             Location location,
+            @NotNull Location location,
-             List<Player> sendTo
+            @NotNull List<Player> sendTo
     ) {
         PacketContainer packet = new PacketContainer(PacketType.Play.Server.ENTITY_HEAD_ROTATION);
         packet.getIntegers().write(0, entityId);
@@ -152,10 +167,10 @@ public class PacketManager extends BasePacket {
     }
 
     public static void sendRotationPacket(
-             int entityId,
+            int entityId,
-             Location location,
+            @NotNull Location location,
-             boolean onGround,
+            boolean onGround,
-             List<Player> sendTo
+            @NotNull List<Player> sendTo
     ) {
         float ROTATION_FACTOR = 256.0F / 360.0F;
         float yaw = location.getYaw() * ROTATION_FACTOR;
@@ -174,7 +189,7 @@ public class PacketManager extends BasePacket {
             int entityId,
             int yaw,
             boolean onGround,
-            List<Player> sendTo
+            @NotNull List<Player> sendTo
     ) {
         float ROTATION_FACTOR = 256.0F / 360.0F;
         float yaw2 = yaw * ROTATION_FACTOR;
@@ -211,7 +226,7 @@ public class PacketManager extends BasePacket {
     public static void sendRidingPacket(
             final int mountId,
             final int passengerId,
-            final List<Player> sendTo
+            final @NotNull List<Player> sendTo
     ) {
         PacketContainer packet = new PacketContainer(PacketType.Play.Server.MOUNT);
         packet.getIntegers().write(0, mountId);
@@ -226,7 +241,7 @@ public class PacketManager extends BasePacket {
      * @param entityId The entity to delete for a player
      * @param sendTo The players the packet should be sent to
      */
-    public static void sendEntityDestroyPacket(final int entityId, List<Player> sendTo) {
+    public static void sendEntityDestroyPacket(final int entityId, @NotNull List<Player> sendTo) {
         PacketContainer packet = new PacketContainer(PacketType.Play.Server.ENTITY_DESTROY);
         packet.getModifier().write(0, new IntArrayList(new int[]{entityId}));
         for (final Player p : sendTo) sendPacket(p, packet);
@@ -237,7 +252,7 @@ public class PacketManager extends BasePacket {
      * @param entityId The Entity ID that camera will go towards
      * @param sendTo The players that will be sent this packet
      */
-    public static void sendCameraPacket(final int entityId, List<Player> sendTo) {
+    public static void sendCameraPacket(final int entityId, @NotNull List<Player> sendTo) {
         PacketContainer packet = new PacketContainer(PacketType.Play.Server.CAMERA);
         packet.getIntegers().write(0, entityId);
         for (final Player p : sendTo) sendPacket(p, packet);
@@ -252,10 +267,10 @@ public class PacketManager extends BasePacket {
      * @param sendTo Who should it send the packet to?
      */
     public static void sendFakePlayerSpawnPacket(
-            final Location location,
+            final @NotNull Location location,
             final UUID uuid,
             final int entityId,
-            final List<Player> sendTo
+            final @NotNull List<Player> sendTo
     ) {
         WrapperPlayServerNamedEntitySpawn wrapper = new WrapperPlayServerNamedEntitySpawn();
         wrapper.setEntityID(entityId);
@@ -312,7 +327,7 @@ public class PacketManager extends BasePacket {
      */
     public static void sendPlayerOverlayPacket(
             final int playerId,
-            final List<Player> sendTo
+            final @NotNull List<Player> sendTo
     ) {
         /*
         0x01 = Is on fire
@@ -384,7 +399,7 @@ public class PacketManager extends BasePacket {
     public static void sendLeashPacket(
             final int leashedEntity,
             final int entityId,
-            final List<Player> sendTo
+            final @NotNull List<Player> sendTo
     ) {
         PacketContainer packet = new PacketContainer(PacketType.Play.Server.ATTACH_ENTITY);
         packet.getIntegers().write(0, leashedEntity);
@@ -403,9 +418,9 @@ public class PacketManager extends BasePacket {
      */
     public static void sendTeleportPacket(
             final int entityId,
-            final Location location,
+            final @NotNull Location location,
             boolean onGround,
-            final List<Player> sendTo
+            final @NotNull List<Player> sendTo
     ) {
         PacketContainer packet = new PacketContainer(PacketType.Play.Server.ENTITY_TELEPORT);
         packet.getIntegers().write(0, entityId);
@@ -430,10 +445,10 @@ public class PacketManager extends BasePacket {
      */
     public static void sendMovePacket(
             final int entityId,
-            final Location from,
+            final @NotNull Location from,
-            final Location to,
+            final @NotNull Location to,
             final boolean onGround,
-            List<Player> sendTo
+            @NotNull List<Player> sendTo
     ) {
         PacketContainer packet = new PacketContainer(PacketType.Play.Server.REL_ENTITY_MOVE);
         WrapperPlayServerRelEntityMove wrapper = new WrapperPlayServerRelEntityMove(packet);
@@ -456,6 +471,7 @@ public class PacketManager extends BasePacket {
         sendMovePacket(entityId, from, to, onGround, getViewers(to));
     }
 
+    @NotNull
     public static List<Player> getViewers(Location location) {
         ArrayList<Player> viewers = new ArrayList();
         if (Settings.getViewDistance() <= 0) {

common/src/main/java/com/hibiscusmc/hmccosmetics/util/packets/wrappers/WrapperPlayServerNamedEntitySpawn.java

@@ -6,6 +6,7 @@ import com.comphenix.protocol.events.PacketEvent;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
 import org.bukkit.util.Vector;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.UUID;
 
@@ -58,7 +59,7 @@ public class WrapperPlayServerNamedEntitySpawn extends AbstractPacket {
      * @param event - the packet event.
      * @return The spawned entity.
      */
-    public Entity getEntity(PacketEvent event) {
+    public Entity getEntity(@NotNull PacketEvent event) {
         return getEntity(event.getPlayer().getWorld());
     }
 
@@ -96,7 +97,7 @@ public class WrapperPlayServerNamedEntitySpawn extends AbstractPacket {
      *
      * @param position - the new position.
      */
-    public void setPosition(Vector position) {
+    public void setPosition(@NotNull Vector position) {
         setX(position.getX());
         setY(position.getY());
         setZ(position.getZ());

common/src/main/java/com/hibiscusmc/hmccosmetics/util/packets/wrappers/WrapperPlayServerRelEntityMove.java

@@ -5,6 +5,7 @@ import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
+import org.jetbrains.annotations.NotNull;
 
 public class WrapperPlayServerRelEntityMove extends AbstractPacket {
     public static final PacketType TYPE =
@@ -55,7 +56,7 @@ public class WrapperPlayServerRelEntityMove extends AbstractPacket {
      * @param event - the packet event.
      * @return The spawned entity.
      */
-    public Entity getEntity(PacketEvent event) {
+    public Entity getEntity(@NotNull PacketEvent event) {
         return getEntity(event.getPlayer().getWorld());
     }
 

common/src/main/resources/config.yml

@@ -21,6 +21,9 @@ cosmetic-settings:
   # Ticking periods is something that ensures new players near a player get the packets to actually apply to the user.
 
   unapply-on-death: false # If when a player dies, their cosmetics should be unapplied. If this is true, use hmccosmetics.unapplydeath.bypass to bypass
+  force-permission-join: true # Checks a player permission if they can have a cosmetic when they join the server.
+
+  emote-distance: -3 # This shows how far away the camera should be while a player is doing an emote. Negative is behind player.
 
   # view distance in blocks that other players will see the backpack cosmetic
   # setting this to lower than the server player view distance should fix the
@@ -32,9 +35,11 @@ cosmetic-settings:
     y: 3
     z: 0.5
 dye-menu:
-  # If you use ItemsAdder, set this to "§f:offset_-8::cosmetics_gui:"
+  # If you use ItemsAdder, set this to "§f:offset_-8::dye_menu:"
   # If you use Oraxen, set this to "<glyph:neg_shift_8><glyph:dye_menu>"
   title: "§f"
+  input-slot: 19
+  output-slot: 25
 wardrobe:
   # spawn static wardrobe if in this radius of wardrobe-location
   static-radius: 10
@@ -78,4 +83,4 @@ wardrobe:
     y: 5
     z: 5
     yaw: 0
-    pitch: 0
+    pitch: 0

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

@@ -92,4 +92,22 @@ kite:
     material: PAPER
     model-data: 7
     name: "<blue>Kite"
+    amount: 1
+handstand:
+  slot: EMOTE
+  animation: handstand
+meditate:
+  slot: EMOTE
+  animation: meditate
+thinking:
+  slot: EMOTE
+  animation: thinking
+explorer_backpack:
+  slot: BACKPACK
+  permission: "hmccosmetics.explorer_backpack"
+  dyeable: true
+  item:
+    material: LEATHER_HORSE_ARMOR
+    model-data: 3
+    name: "<white>Explorer's Backpack"
     amount: 1

common/src/main/resources/menus/defaultmenu.yml

@@ -132,4 +132,39 @@ items:
         - "<gray>Enabled: <#6D9DC5>%HMCCosmetics_equipped_kite%"
         - "<gray>Allowed: <#6D9DC5>%HMCCosmetics_unlocked_kite%" 
     type: cosmetic
-    cosmetic: kite
+    cosmetic: kite
+  handstand:
+    slots:
+      - 12
+    item:
+      material: PAPER
+      name: "<blue>Handstand Emote"
+    type: cosmetic
+    cosmetic: handstand
+  meditate:
+    slots:
+      - 13
+    item:
+      material: PAPER
+      name: "<blue>Meditate Emote"
+    type: cosmetic
+    cosmetic: meditate
+  thinking:
+    slots:
+      - 14
+    item:
+      material: PAPER
+      name: "<blue>Thinking Emote"
+    type: cosmetic
+    cosmetic: thinking
+  explorer_backpack:
+    slots:
+      - 15
+    item:
+      material: hmccosmetics:explorer_backpack
+      lore:
+        - ""
+        - "<gray>Enabled: <#6D9DC5>%HMCCosmetics_equipped_explorer_backpack%"
+        - "<gray>Allowed: <#6D9DC5>%HMCCosmetics_unlocked_explorer_backpack%" 
+    type: cosmetic
+    cosmetic: explorer_backpack

common/src/main/resources/messages.yml

@@ -17,6 +17,9 @@ unequip-cosmetic: "%prefix% <gradient:#6D9DC5:#45CDE9>You have unequipped <cosme
 hide-cosmetic: "%prefix% <gradient:#6D9DC5:#45CDE9>Hidden cosmetics"
 show-cosmetic: "%prefix% <gradient:#6D9DC5:#45CDE9>Revealed cosmetics!"
 
+emote-blocked: "%prefix% <red>You can not use your emote here!"
+emote-none: "%prefix% <red>You have no emote equipped!"
+
 invalid-slot: "%prefix% <red>Invalid cosmetic slot!"
 invalid-player: "%prefix% <red>Invalid Player!"
 invalid-menu: "%prefix% <red>Invalid Menu!"

settings.gradle.kts

@@ -4,6 +4,7 @@ pluginManagement {
         maven("https://repo.papermc.io/repository/maven-public/")
     }
 }
+
 rootProject.name = "HMCCosmetics"
 include(
     "common",

v1_17_R1/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "1.3.8"
+    id("io.papermc.paperweight.userdev") version "1.5.1"
 }
 
 dependencies {

v1_17_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_17_R1/HMCArmorStand.java

@@ -5,13 +5,13 @@ import net.minecraft.world.level.Level;
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.v1_17_R1.CraftWorld;
 
-public class InvisibleArmorstand extends ArmorStand {
+public class HMCArmorStand extends ArmorStand {
 
-    public InvisibleArmorstand(Level world, double x, double y, double z) {
+    public HMCArmorStand(Level world, double x, double y, double z) {
         super(world, x, y, z);
     }
 
-    public InvisibleArmorstand(Location loc) {
+    public HMCArmorStand(Location loc) {
         super(((CraftWorld) loc.getWorld()).getHandle(), loc.getX(), loc.getY(), loc.getZ());
         this.setPos(loc.getX(), loc.getY(), loc.getZ());
         setInvisible(true);

v1_17_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_17_R1/HMCParticleCloud.java

@@ -0,0 +1,24 @@
+package com.hibiscusmc.hmccosmetics.nms.v1_17_R1;
+
+
+import net.minecraft.world.entity.AreaEffectCloud;
+import net.minecraft.world.level.Level;
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.v1_17_R1.CraftWorld;
+
+public class HMCParticleCloud extends AreaEffectCloud {
+
+    public HMCParticleCloud(Level world, double x, double y, double z) {
+        super(world, x, y, z);
+    }
+
+    public HMCParticleCloud(Location loc) {
+        super(((CraftWorld) loc.getWorld()).getHandle(), loc.getX(), loc.getY(), loc.getZ());
+        this.setPos(loc.getX(), loc.getY(), loc.getZ());
+        setInvisible(true);
+        setInvulnerable(true);
+        setSilent(true);
+        setNoGravity(true);
+        persist = false;
+    }
+}

v1_17_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_17_R1/NMSHandler.java

@@ -6,7 +6,7 @@ import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticArmorType;
 import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType;
 import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
 import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticMainhandType;
-import com.hibiscusmc.hmccosmetics.entities.BalloonEntity;
+import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.InventoryUtils;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
@@ -64,9 +64,15 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
     }
 
     @Override
-    public org.bukkit.entity.Entity getInvisibleArmorstand(Location loc) {
+    public org.bukkit.entity.Entity getHMCArmorStand(Location loc) {
-        InvisibleArmorstand invisibleArmorstand = new InvisibleArmorstand(loc);
+        HMCArmorStand hmcArmorStand = new HMCArmorStand(loc);
-        return invisibleArmorstand.getBukkitEntity();
+        return hmcArmorStand.getBukkitEntity();
+    }
+
+    @Override
+    public org.bukkit.entity.Entity spawnHMCParticleCloud(Location location) {
+        HMCParticleCloud hmcParticleCloud = new HMCParticleCloud(location);
+        return hmcParticleCloud.getBukkitEntity();
     }
 
     @Override
@@ -76,7 +82,7 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
 
     @Override
     public org.bukkit.entity.Entity spawnBackpack(CosmeticUser user, CosmeticBackpackType cosmeticBackpackType) {
-        InvisibleArmorstand invisibleArmorstand = new InvisibleArmorstand(user.getPlayer().getLocation());
+        HMCArmorStand invisibleArmorstand = new HMCArmorStand(user.getPlayer().getLocation());
 
         ItemStack item = user.getUserCosmeticItem(cosmeticBackpackType);
 
@@ -94,22 +100,22 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
 
 
     @Override
-    public BalloonEntity spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType) {
+    public UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType) {
         Player player = user.getPlayer();
         Location newLoc = player.getLocation().clone().add(Settings.getBalloonOffset());
 
-        BalloonEntity balloonEntity1 = new BalloonEntity(user.getPlayer().getLocation());
+        UserBalloonManager userBalloonManager1 = new UserBalloonManager(user.getPlayer().getLocation());
         List<Player> sentTo = PlayerUtils.getNearbyPlayers(player.getLocation());
-        balloonEntity1.getModelEntity().teleport(user.getPlayer().getLocation().add(Settings.getBalloonOffset()));
+        userBalloonManager1.getModelEntity().teleport(user.getPlayer().getLocation().add(Settings.getBalloonOffset()));
 
-        balloonEntity1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
+        userBalloonManager1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
-        balloonEntity1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
+        userBalloonManager1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
 
-        PacketManager.sendEntitySpawnPacket(newLoc, balloonEntity1.getPufferfishBalloonId(), EntityType.PUFFERFISH, balloonEntity1.getPufferfishBalloonUniqueId(), sentTo);
+        PacketManager.sendEntitySpawnPacket(newLoc, userBalloonManager1.getPufferfishBalloonId(), EntityType.PUFFERFISH, userBalloonManager1.getPufferfishBalloonUniqueId(), sentTo);
-        PacketManager.sendInvisibilityPacket(balloonEntity1.getPufferfishBalloonId(), sentTo);
+        PacketManager.sendInvisibilityPacket(userBalloonManager1.getPufferfishBalloonId(), sentTo);
-        PacketManager.sendLeashPacket(balloonEntity1.getPufferfishBalloonId(), player.getEntityId(), sentTo);
+        PacketManager.sendLeashPacket(userBalloonManager1.getPufferfishBalloonId(), player.getEntityId(), sentTo);
 
-        return balloonEntity1;
+        return userBalloonManager1;
     }
 
     @Override

v1_18_R2/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "1.3.8"
+    id("io.papermc.paperweight.userdev") version "1.5.1"
 }
 
 dependencies {

v1_18_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_18_R2/HMCArmorStand.java

@@ -5,13 +5,13 @@ import net.minecraft.world.level.Level;
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
 
-public class InvisibleArmorstand extends ArmorStand {
+public class HMCArmorStand extends ArmorStand {
 
-    public InvisibleArmorstand(Level world, double x, double y, double z) {
+    public HMCArmorStand(Level world, double x, double y, double z) {
         super(world, x, y, z);
     }
 
-    public InvisibleArmorstand(Location loc) {
+    public HMCArmorStand(Location loc) {
         super(((CraftWorld) loc.getWorld()).getHandle(), loc.getX(), loc.getY(), loc.getZ());
         this.setPos(loc.getX(), loc.getY(), loc.getZ());
         setInvisible(true);

v1_18_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_18_R2/HMCParticleCloud.java

@@ -0,0 +1,24 @@
+package com.hibiscusmc.hmccosmetics.nms.v1_18_R2;
+
+
+import net.minecraft.world.entity.AreaEffectCloud;
+import net.minecraft.world.level.Level;
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
+
+public class HMCParticleCloud extends AreaEffectCloud {
+
+    public HMCParticleCloud(Level world, double x, double y, double z) {
+        super(world, x, y, z);
+    }
+
+    public HMCParticleCloud(Location loc) {
+        super(((CraftWorld) loc.getWorld()).getHandle(), loc.getX(), loc.getY(), loc.getZ());
+        this.setPos(loc.getX(), loc.getY(), loc.getZ());
+        setInvisible(true);
+        setInvulnerable(true);
+        setSilent(true);
+        setNoGravity(true);
+        persist = false;
+    }
+}

v1_18_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_18_R2/NMSHandler.java

@@ -6,7 +6,7 @@ import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticArmorType;
 import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType;
 import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
 import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticMainhandType;
-import com.hibiscusmc.hmccosmetics.entities.BalloonEntity;
+import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.InventoryUtils;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
@@ -66,9 +66,15 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
     }
 
     @Override
-    public org.bukkit.entity.Entity getInvisibleArmorstand(Location loc) {
+    public org.bukkit.entity.Entity getHMCArmorStand(Location loc) {
-        InvisibleArmorstand invisibleArmorstand = new InvisibleArmorstand(loc);
+        HMCArmorStand hmcArmorStand = new HMCArmorStand(loc);
-        return invisibleArmorstand.getBukkitEntity();
+        return hmcArmorStand.getBukkitEntity();
+    }
+
+    @Override
+    public org.bukkit.entity.Entity spawnHMCParticleCloud(Location location) {
+        HMCParticleCloud hmcParticleCloud = new HMCParticleCloud(location);
+        return hmcParticleCloud.getBukkitEntity();
     }
 
     @Override
@@ -78,7 +84,7 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
 
     @Override
     public org.bukkit.entity.Entity spawnBackpack(CosmeticUser user, CosmeticBackpackType cosmeticBackpackType) {
-        InvisibleArmorstand invisibleArmorstand = new InvisibleArmorstand(user.getPlayer().getLocation());
+        HMCArmorStand invisibleArmorstand = new HMCArmorStand(user.getPlayer().getLocation());
 
         ItemStack item = user.getUserCosmeticItem(cosmeticBackpackType);
 
@@ -96,22 +102,22 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
 
 
     @Override
-    public BalloonEntity spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType) {
+    public UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType) {
         Player player = user.getPlayer();
         Location newLoc = player.getLocation().clone().add(Settings.getBalloonOffset());
 
-        BalloonEntity balloonEntity1 = new BalloonEntity(user.getPlayer().getLocation());
+        UserBalloonManager userBalloonManager1 = new UserBalloonManager(user.getPlayer().getLocation());
         List<Player> sentTo = PlayerUtils.getNearbyPlayers(player.getLocation());
-        balloonEntity1.getModelEntity().teleport(user.getPlayer().getLocation().add(Settings.getBalloonOffset()));
+        userBalloonManager1.getModelEntity().teleport(user.getPlayer().getLocation().add(Settings.getBalloonOffset()));
 
-        balloonEntity1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
+        userBalloonManager1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
-        balloonEntity1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
+        userBalloonManager1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
 
-        PacketManager.sendEntitySpawnPacket(newLoc, balloonEntity1.getPufferfishBalloonId(), EntityType.PUFFERFISH, balloonEntity1.getPufferfishBalloonUniqueId(), sentTo);
+        PacketManager.sendEntitySpawnPacket(newLoc, userBalloonManager1.getPufferfishBalloonId(), EntityType.PUFFERFISH, userBalloonManager1.getPufferfishBalloonUniqueId(), sentTo);
-        PacketManager.sendInvisibilityPacket(balloonEntity1.getPufferfishBalloonId(), sentTo);
+        PacketManager.sendInvisibilityPacket(userBalloonManager1.getPufferfishBalloonId(), sentTo);
-        PacketManager.sendLeashPacket(balloonEntity1.getPufferfishBalloonId(), player.getEntityId(), sentTo);
+        PacketManager.sendLeashPacket(userBalloonManager1.getPufferfishBalloonId(), player.getEntityId(), sentTo);
 
-        return balloonEntity1;
+        return userBalloonManager1;
     }
 
     @Override

v1_19_R1/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "1.3.8"
+    id("io.papermc.paperweight.userdev") version "1.5.1"
 }
 
 dependencies {

v1_19_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R1/HMCArmorStand.java

@@ -5,13 +5,13 @@ import net.minecraft.world.level.Level;
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.v1_19_R1.CraftWorld;
 
-public class InvisibleArmorstand extends ArmorStand {
+public class HMCArmorStand extends ArmorStand {
 
-    public InvisibleArmorstand(Level world, double x, double y, double z) {
+    public HMCArmorStand(Level world, double x, double y, double z) {
         super(world, x, y, z);
     }
 
-    public InvisibleArmorstand(Location loc) {
+    public HMCArmorStand(Location loc) {
         super(((CraftWorld) loc.getWorld()).getHandle(), loc.getX(), loc.getY(), loc.getZ());
         this.setPos(loc.getX(), loc.getY(), loc.getZ());
         setInvisible(true);

v1_19_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R1/HMCParticleCloud.java

@@ -0,0 +1,24 @@
+package com.hibiscusmc.hmccosmetics.nms.v1_19_R1;
+
+
+import net.minecraft.world.entity.AreaEffectCloud;
+import net.minecraft.world.level.Level;
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.v1_19_R1.CraftWorld;
+
+public class HMCParticleCloud extends AreaEffectCloud {
+
+    public HMCParticleCloud(Level world, double x, double y, double z) {
+        super(world, x, y, z);
+    }
+
+    public HMCParticleCloud(Location loc) {
+        super(((CraftWorld) loc.getWorld()).getHandle(), loc.getX(), loc.getY(), loc.getZ());
+        this.setPos(loc.getX(), loc.getY(), loc.getZ());
+        setInvisible(true);
+        setInvulnerable(true);
+        setSilent(true);
+        setNoGravity(true);
+        persist = false;
+    }
+}