Merge pull request #58 from HibiscusMC/fix_looty

add missing hook initializer for Looty

build.gradle.kts

@@ -2,14 +2,13 @@ import net.minecrell.pluginyml.bukkit.BukkitPluginDescription
 
 plugins {
     id("java")
-    id("maven-publish")
     id("com.github.johnrengelman.shadow") version "7.1.2"
     id("xyz.jpenilla.run-paper") version "2.0.0"
     id("net.minecrell.plugin-yml.bukkit") version "0.5.2"
 }
 
 group = "com.hibiscusmc"
-version = "2.1.1"
+version = "2.2.0"
 
 allprojects {
     apply(plugin = "java")
@@ -57,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")
 
     }
 }
@@ -91,6 +97,7 @@ dependencies {
     implementation("org.bstats:bstats-bukkit:3.0.0")
     implementation("com.jeff_media:SpigotUpdateChecker:3.0.0")
     implementation("com.owen1212055:particlehelper:1.0.0-SNAPSHOT")
+    implementation("com.ticxo.playeranimator:PlayerAnimator:R1.2.5")
 }
 
 tasks {
@@ -128,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 {
@@ -153,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")
-    softDepend = listOf("ModelEngine", "Oraxen", "ItemsAdder", "HMCColor", "WorldGuard", "MythicMobs")
+    depend = listOf("ProtocolLib")
+    softDepend = listOf("ModelEngine", "Oraxen", "ItemsAdder", "Looty", "HMCColor", "WorldGuard", "MythicMobs", "PlaceholderAPI", "SuperVanish", "PremiumVanish")
     version = "${project.version}"
 
     commands {
@@ -183,6 +191,15 @@ 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.emote.other") {
+            default = BukkitPluginDescription.Permission.Default.OP
+        }
         register("hmccosmetics.cmd.setlocation") {
             default = BukkitPluginDescription.Permission.Default.OP
         }
@@ -228,17 +245,4 @@ bukkit {
 java {
     toolchain.languageVersion.set(JavaLanguageVersion.of(17
     ))
-}
-
-
-publishing {
-    publications {
-        create<MavenPublication>("maven") {
-            groupId = "${project.group}"
-            artifactId = "${project.name}"
-            version = "${project.version}"
-
-            from(components["java"])
-        }
-    }
 }

common/build.gradle.kts

@@ -1,33 +1,104 @@
 plugins {
     id("java")
+    id("maven-publish")
 }
 
 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 {
     toolchain.languageVersion.set(JavaLanguageVersion.of(17
     ))
 }
+
+publishing {
+    val publishData = PublishData(project)
+    publications {
+        create<MavenPublication>("maven") {
+            groupId = "${rootProject.group}"
+            artifactId = "${rootProject.name}"
+            version = "${rootProject.version}"
+
+            from(components["java"])
+        }
+    }
+
+    repositories {
+        maven {
+            authentication {
+                credentials(PasswordCredentials::class) {
+                    username = System.getenv("REPO_USERNAME")
+                    password = System.getenv("REPO_PASSWORD")
+                }
+            }
+
+            name = "HibiscusMCRepository"
+            url = uri(publishData.getRepository())
+        }
+    }
+}
+
+class PublishData(private val project: Project) {
+    var type: Type = getReleaseType()
+    var hashLength: Int = 7
+
+    private fun getReleaseType(): Type {
+        val branch = getCheckedOutBranch()
+        return when {
+            branch.contentEquals("master") || branch.contentEquals("local") -> Type.RELEASE
+            branch.startsWith("dev") -> Type.DEV
+            else -> Type.SNAPSHOT
+        }
+    }
+
+    private fun getCheckedOutGitCommitHash(): String =
+        System.getenv("GITHUB_SHA")?.substring(0, hashLength) ?: "local"
+
+    private fun getCheckedOutBranch(): String =
+        System.getenv("GITHUB_REF")?.replace("refs/heads/", "") ?: "local"
+
+    fun getVersion(): String = getVersion(false)
+
+    fun getVersion(appendCommit: Boolean): String =
+        type.append(getVersionString(), appendCommit, getCheckedOutGitCommitHash())
+
+    private fun getVersionString(): String =
+        (rootProject.version as String).replace("-SNAPSHOT", "").replace("-DEV", "")
+
+    fun getRepository(): String = type.repo
+
+    enum class Type(private val append: String, val repo: String, private val addCommit: Boolean) {
+        RELEASE("", "https://repo.hibiscusmc.com/releases/", false),
+        DEV("-DEV", "https://repo.hibiscusmc.com/development/", true),
+        SNAPSHOT("-SNAPSHOT", "https://repo.hibiscusmc.com/snapshots/", true);
+
+        fun append(name: String, appendCommit: Boolean, commitHash: String): String =
+            name.plus(append).plus(if (appendCommit && addCommit) "-".plus(commitHash) else "")
+    }
+}

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.items.ItemHooks;
+import com.hibiscusmc.hmccosmetics.hooks.Hooks;
 import com.hibiscusmc.hmccosmetics.hooks.worldguard.WGHook;
 import com.hibiscusmc.hmccosmetics.hooks.worldguard.WGListener;
 import com.hibiscusmc.hmccosmetics.listener.PlayerConnectionListener;
@@ -23,6 +22,10 @@ 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;
@@ -38,6 +41,9 @@ import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
 
 import java.io.File;
 import java.nio.file.Path;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 public final class HMCCosmeticsPlugin extends JavaPlugin {
 
@@ -46,6 +52,8 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
     private static YamlConfigurationLoader configLoader;
     private static final int pluginId = 13873;
     private static boolean hasModelEngine = false;
+    private static boolean onLatestVersion = true;
+    private static String latestVersion = "";
 
     @Override
     public void onEnable() {
@@ -62,11 +70,24 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
         }
 
         // Update Checker
-        new UpdateChecker(this, UpdateCheckSource.POLYMART, "1879")
-                .setDownloadLink("https://polymart.org/resource/1879")
+        UpdateChecker checker = new UpdateChecker(this, UpdateCheckSource.POLYMART, "1879")
+                .onSuccess((commandSenders, latestVersion) -> {
+                    this.latestVersion = (String) latestVersion;
+                    if (!this.latestVersion.equalsIgnoreCase(getDescription().getVersion())) {
+                        getLogger().info("+++++++++++++++++++++++++++++++++++");
+                        getLogger().info("There is a new update for HMCCosmetics!");
+                        getLogger().info("Please download it as soon as possible for possible fixes and new features.");
+                        getLogger().info("Current Version " + getDescription().getVersion() + " | Latest Version " + latestVersion);
+                        getLogger().info("Spigot: https://www.spigotmc.org/resources/100107/");
+                        getLogger().info("Polymart: https://polymart.org/resource/1879");
+                        getLogger().info("+++++++++++++++++++++++++++++++++++");
+                    }
+                })
+                .setNotifyRequesters(false)
+                .setNotifyOpsOnJoin(false)
                 .checkEveryXHours(24)
                 .checkNow();
-
+        onLatestVersion = checker.isUsingLatestVersion();
         // File setup
         if (!getDataFolder().exists()) {
             saveDefaultConfig();
@@ -75,6 +96,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();
 
@@ -89,11 +116,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;
@@ -181,8 +203,8 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
             throw new RuntimeException(e);
         }
 
-        // ItemHooks
-        ItemHooks.setup();
+        // Misc Hooks setup (like items)
+        Hooks.setup();
 
         // Cosmetics setup
         Cosmetics.setup();
@@ -213,6 +235,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");
@@ -241,4 +279,10 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
     public static boolean hasModelEngine() {
         return hasModelEngine;
     }
+    public static boolean isOnLatestVersion() {
+        return onLatestVersion;
+    }
+    public static String getLatestVersion() {
+        return latestVersion;
+    }
 }

common/src/main/java/com/hibiscusmc/hmccosmetics/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;
@@ -33,6 +34,8 @@ public class CosmeticCommand implements CommandExecutor {
 
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
+        boolean silent = false;
+
         if (args.length == 0) {
             if (!(sender instanceof Player)) {
                 // Console
@@ -44,7 +47,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");
@@ -62,49 +65,61 @@ public class CosmeticCommand implements CommandExecutor {
         Player player = sender instanceof Player ? (Player) sender : null;
 
         String firstArgs = args[0].toLowerCase();
+
+        if (sender.hasPermission("HMCCosmetics.cmd.silent") || sender.isOp()) {
+            for (String singleArg : args) {
+                if (singleArg.equalsIgnoreCase("-s")) silent = true;
+            }
+        }
+
         switch (firstArgs) {
             case ("reload") -> {
-                if (!sender.hasPermission("HMCCosmetics.cmd.reload") || !sender.isOp()) {
-                    MessagesUtil.sendMessage(sender, "no-permission");
+                if (!sender.hasPermission("HMCCosmetics.cmd.reload") && !sender.isOp()) {
+                    if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
                     return true;
                 }
                 HMCCosmeticsPlugin.setup();
-                MessagesUtil.sendMessage(sender, "reloaded");
+                if (!silent) MessagesUtil.sendMessage(sender, "reloaded");
                 return true;
             }
             case ("apply") -> {
                 if (!sender.hasPermission("hmccosmetics.cmd.apply")) {
-                    MessagesUtil.sendMessage(sender, "no-permission");
+                    if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
                     return true;
                 }
                 Cosmetic cosmetic;
+                Color color = Color.WHITE;
 
                 if (sender instanceof Player) player = ((Player) sender).getPlayer();
                 if (sender.hasPermission("hmccosmetics.cmd.apply.other")) {
                     if (args.length >= 3) player = Bukkit.getPlayer(args[2]);
                 }
 
+                if (sender.hasPermission("hmccosmetics.cmd.apply.color")) {
+                    if (args.length >= 4) color = ServerUtils.hex2Rgb(args[3]);
+                }
+
                 if (args.length == 1) {
-                    MessagesUtil.sendMessage(player, "not-enough-args");
+                    if (!silent) MessagesUtil.sendMessage(player, "not-enough-args");
                     return true;
                 }
 
                 cosmetic = Cosmetics.getCosmetic(args[1]);
 
                 if (cosmetic == null) {
-                    MessagesUtil.sendMessage(sender, "invalid-cosmetic");
+                    if (!silent) MessagesUtil.sendMessage(sender, "invalid-cosmetic");
                     return true;
                 }
 
                 if (player == null) {
-                    MessagesUtil.sendMessage(sender, "invalid-player");
+                    if (!silent) MessagesUtil.sendMessage(sender, "invalid-player");
                     return true;
                 }
 
                 CosmeticUser user = CosmeticUsers.getUser(player);
 
                 if (!user.canEquipCosmetic(cosmetic)) {
-                    MessagesUtil.sendMessage(player, "no-cosmetic-permission");
+                    if (!silent) MessagesUtil.sendMessage(player, "no-cosmetic-permission");
                     return true;
                 }
 
@@ -113,19 +128,19 @@ public class CosmeticCommand implements CommandExecutor {
                                 TagResolver.resolver(Placeholder.parsed("player", player.getName())),
                                 TagResolver.resolver(Placeholder.parsed("cosmeticslot", cosmetic.getSlot().name())));
 
-                MessagesUtil.sendMessage(player, "equip-cosmetic", placeholders);
+                if (!silent) MessagesUtil.sendMessage(player, "equip-cosmetic", placeholders);
 
-                user.addPlayerCosmetic(cosmetic);
+                user.addPlayerCosmetic(cosmetic, color);
                 user.updateCosmetic(cosmetic.getSlot());
                 return true;
             }
             case ("unapply") -> {
                 if (!sender.hasPermission("hmccosmetics.cmd.unapply")) {
-                    MessagesUtil.sendMessage(sender, "no-permission");
+                    if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
                     return true;
                 }
                 if (args.length == 1) {
-                    MessagesUtil.sendMessage(player, "not-enough-args");
+                    if (!silent) MessagesUtil.sendMessage(player, "not-enough-args");
                     return true;
                 }
 
@@ -137,20 +152,20 @@ public class CosmeticCommand implements CommandExecutor {
                 }
 
                 if (!EnumUtils.isValidEnum(CosmeticSlot.class, args[1].toUpperCase())) {
-                    MessagesUtil.sendMessage(sender, "invalid-slot");
+                    if (!silent) MessagesUtil.sendMessage(sender, "invalid-slot");
                     return true;
                 }
                 cosmeticSlot = CosmeticSlot.valueOf(args[1].toUpperCase());
 
                 if (player == null) {
-                    MessagesUtil.sendMessage(sender, "invalid-player");
+                    if (!silent) MessagesUtil.sendMessage(sender, "invalid-player");
                     return true;
                 }
 
                 CosmeticUser user = CosmeticUsers.getUser(player);
 
                 if (user.getCosmetic(cosmeticSlot) == null) {
-                    MessagesUtil.sendMessage(sender, "no-cosmetic-slot");
+                    if (!silent) MessagesUtil.sendMessage(sender, "no-cosmetic-slot");
                     return true;
                 }
 
@@ -159,7 +174,7 @@ public class CosmeticCommand implements CommandExecutor {
                                 TagResolver.resolver(Placeholder.parsed("player", player.getName())),
                                 TagResolver.resolver(Placeholder.parsed("cosmeticslot", cosmeticSlot.name())));
 
-                MessagesUtil.sendMessage(player, "unequip-cosmetic", placeholders);
+                if (!silent) MessagesUtil.sendMessage(player, "unequip-cosmetic", placeholders);
 
                 user.removeCosmeticSlot(cosmeticSlot);
                 user.updateCosmetic(cosmeticSlot);
@@ -172,12 +187,12 @@ public class CosmeticCommand implements CommandExecutor {
                 }
 
                 if (!sender.hasPermission("hmccosmetics.cmd.wardrobe")) {
-                    MessagesUtil.sendMessage(sender, "no-permission");
+                    if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
                     return true;
                 }
 
                 if (player == null) {
-                    MessagesUtil.sendMessage(sender, "invalid-player");
+                    if (!silent) MessagesUtil.sendMessage(sender, "invalid-player");
                     return true;
                 }
 
@@ -190,7 +205,7 @@ public class CosmeticCommand implements CommandExecutor {
             case ("menu") -> {
                 if (args.length == 1) return true;
                 if (!sender.hasPermission("hmccosmetics.cmd.menu")) {
-                    MessagesUtil.sendMessage(sender, "no-permission");
+                    if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
                     return true;
                 }
                 Menu menu = Menus.getMenu(args[1]);
@@ -202,12 +217,12 @@ public class CosmeticCommand implements CommandExecutor {
                 CosmeticUser user = CosmeticUsers.getUser(player);
 
                 if (user == null) {
-                    MessagesUtil.sendMessage(sender, "invalid-player");
+                    if (!silent) MessagesUtil.sendMessage(sender, "invalid-player");
                     return true;
                 }
 
                 if (menu == null) {
-                    MessagesUtil.sendMessage(sender, "invalid-menu");
+                    if (!silent) MessagesUtil.sendMessage(sender, "invalid-menu");
                     return true;
                 }
 
@@ -219,7 +234,7 @@ public class CosmeticCommand implements CommandExecutor {
                 OfflinePlayer selectedPlayer = Bukkit.getOfflinePlayer(args[1]);
                 if (selectedPlayer == null) return true;
                 if (!sender.hasPermission("hmccosmetics.cmd.dataclear") && !sender.isOp()) {
-                    MessagesUtil.sendMessage(sender, "no-permission");
+                    if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
                     return true;
                 }
                 Database.clearData(selectedPlayer.getUniqueId());
@@ -231,17 +246,17 @@ public class CosmeticCommand implements CommandExecutor {
                 CosmeticUser user = CosmeticUsers.getUser(player);
                 if (user == null) return true;
                 if (!sender.hasPermission("hmccosmetics.cmd.dye") && !sender.isOp()) {
-                    MessagesUtil.sendMessage(sender, "no-permission");
+                    if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
                     return true;
                 }
 
                 if (args.length == 1) {
-                    MessagesUtil.sendMessage(player, "not-enough-args");
+                    if (!silent) MessagesUtil.sendMessage(player, "not-enough-args");
                     return true;
                 }
 
                 if (!EnumUtils.isValidEnum(CosmeticSlot.class, args[1])) {
-                    MessagesUtil.sendMessage(player, "invalid-slot");
+                    if (!silent) MessagesUtil.sendMessage(player, "invalid-slot");
                     return true;
                 }
                 CosmeticSlot slot = CosmeticSlot.valueOf(args[1]);
@@ -249,12 +264,12 @@ public class CosmeticCommand implements CommandExecutor {
 
                 if (args.length >= 3) {
                     if (args[2].isEmpty()) {
-                        MessagesUtil.sendMessage(player, "invalid-color");
+                        if (!silent) MessagesUtil.sendMessage(player, "invalid-color");
                         return true;
                     }
                     Color color = ServerUtils.hex2Rgb(args[2]);
                     if (color == null) {
-                        MessagesUtil.sendMessage(player, "invalid-color");
+                        if (!silent) MessagesUtil.sendMessage(player, "invalid-color");
                         return true;
                     }
                     user.addPlayerCosmetic(cosmetic, color); // #FFFFFF
@@ -264,32 +279,32 @@ public class CosmeticCommand implements CommandExecutor {
             }
             case ("setlocation") -> {
                 if (!sender.hasPermission("hmccosmetics.cmd.setlocation")) {
-                    MessagesUtil.sendMessage(sender, "no-permission");
+                    if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
                     return true;
                 }
 
                 if (player == null) return true;
 
                 if (args.length < 2) {
-                    MessagesUtil.sendMessage(player, "not-enough-args");
+                    if (!silent) MessagesUtil.sendMessage(player, "not-enough-args");
                     return true;
                 }
 
                 if (args[1].equalsIgnoreCase("wardrobelocation")) {
                     WardrobeSettings.setWardrobeLocation(player.getLocation());
-                    MessagesUtil.sendMessage(player, "set-wardrobe-location");
+                    if (!silent) MessagesUtil.sendMessage(player, "set-wardrobe-location");
                     return true;
                 }
 
                 if (args[1].equalsIgnoreCase("viewerlocation")) {
                     WardrobeSettings.setViewerLocation(player.getLocation());
-                    MessagesUtil.sendMessage(player, "set-wardrobe-viewing");
+                    if (!silent) MessagesUtil.sendMessage(player, "set-wardrobe-viewing");
                     return true;
                 }
 
                 if (args[1].equalsIgnoreCase("leavelocation")) {
                     WardrobeSettings.setLeaveLocation(player.getLocation());
-                    MessagesUtil.sendMessage(player, "set-wardrobe-leaving");
+                    if (!silent) MessagesUtil.sendMessage(player, "set-wardrobe-leaving");
                     return true;
                 }
             }
@@ -298,12 +313,12 @@ public class CosmeticCommand implements CommandExecutor {
                 CosmeticUser user = CosmeticUsers.getUser(player);
                 if (user == null) return true;
                 if (!sender.hasPermission("HMCCosmetic.cmd.dump") && !sender.isOp()) {
-                    MessagesUtil.sendMessage(sender, "no-permission");
+                    if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
                     return true;
                 }
                 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());
@@ -316,17 +331,17 @@ public class CosmeticCommand implements CommandExecutor {
                 }
 
                 if (!sender.hasPermission("hmccosmetics.cmd.hide")) {
-                    MessagesUtil.sendMessage(sender, "no-permission");
+                    if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
                     return true;
                 }
 
                 if (player == null) {
-                    MessagesUtil.sendMessage(sender, "invalid-player");
+                    if (!silent) MessagesUtil.sendMessage(sender, "invalid-player");
                     return true;
                 }
 
                 CosmeticUser user = CosmeticUsers.getUser(player);
-                MessagesUtil.sendMessage(sender, "hide-cosmetic");
+                if (!silent) MessagesUtil.sendMessage(sender, "hide-cosmetic");
                 user.hideCosmetics(CosmeticUser.HiddenReason.COMMAND);
                 return true;
             }
@@ -337,36 +352,53 @@ public class CosmeticCommand implements CommandExecutor {
                 }
 
                 if (!sender.hasPermission("hmccosmetics.cmd.show")) {
-                    MessagesUtil.sendMessage(sender, "no-permission");
+                    if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
                     return true;
                 }
 
                 if (player == null) {
-                    MessagesUtil.sendMessage(sender, "invalid-player");
+                    if (!silent) MessagesUtil.sendMessage(sender, "invalid-player");
                     return true;
                 }
 
                 CosmeticUser user = CosmeticUsers.getUser(player);
 
-                MessagesUtil.sendMessage(sender, "show-cosmetic");
+                if (!silent) MessagesUtil.sendMessage(sender, "show-cosmetic");
                 user.showCosmetics();
                 return true;
             }
             case ("debug") -> {
                 if (!sender.hasPermission("hmccosmetics.cmd.debug")) {
-                    MessagesUtil.sendMessage(sender, "no-permission");
+                    if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
                     return true;
                 }
 
                 if (Settings.getDebugMode()) {
                     Settings.setDebugMode(false);
-                    MessagesUtil.sendMessage(sender, "debug-disabled");
+                    if (!silent) MessagesUtil.sendMessage(sender, "debug-disabled");
                 } else {
                     Settings.setDebugMode(true);
-                    MessagesUtil.sendMessage(sender, "debug-enabled");
+                    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]);
+                }
+                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;
+            }
         }
         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;
@@ -39,6 +40,7 @@ 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");
 
             StringUtil.copyPartialMatches(args[0], completions, finalCompletitons);
         }
@@ -62,7 +64,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());
                     }
@@ -91,11 +93,20 @@ public class CosmeticCommandTabComplete implements TabCompleter {
                         completions.add(player.getName());
                     }
                 }
-
             }
             StringUtil.copyPartialMatches(args[2], completions, finalCompletitons);
         }
 
+        if (args.length == 4) {
+            String subcommand = args[0].toLowerCase();
+            switch (subcommand) {
+                case "apply" -> {
+                    completions.add("#FFFFFF");
+                }
+            }
+            StringUtil.copyPartialMatches(args[3], completions, finalCompletitons);
+        }
+
         Collections.sort(finalCompletitons);
         return finalCompletitons;
     }

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

@@ -28,6 +28,8 @@ public class Settings {
     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;
@@ -39,9 +41,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 +71,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();
@@ -183,10 +189,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>()).
-                    stream().map(StringUtils::parseStringToString).collect(Collectors.toList()));
+                        new ArrayList<String>()).
+                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()) {
-            for (ConfigurationNode flagNode : itemFlagsNode.childrenMap().values()) {
-                if (ItemFlag.valueOf(flagNode.key().toString()) == null) continue;
-                itemMeta.addItemFlags(ItemFlag.valueOf(flagNode.key().toString()));
+        try {
+            if (!itemFlagsNode.virtual()) {
+                for (String itemFlag : itemFlagsNode.getList(String.class)) {
+                    if (!EnumUtils.isValidEnum(ItemFlag.class, itemFlag)) continue;
+                    MessagesUtil.sendDebugMessages("Added " + itemFlag + " to the item!");
+                    itemMeta.addItemFlags(ItemFlag.valueOf(itemFlag));
+                }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
 
         if (item.getType() == Material.PLAYER_HEAD) {
@@ -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/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,10 +3,7 @@ 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.CosmeticBackpackType;
-import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
-import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticMainhandType;
+import com.hibiscusmc.hmccosmetics.cosmetic.types.*;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import org.apache.commons.lang3.EnumUtils;
 import org.spongepowered.configurate.CommentedConfigurationNode;
@@ -97,6 +94,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/CosmeticBackpackType.java

@@ -25,15 +25,15 @@ public class CosmeticBackpackType extends Cosmetic {
 
         if (user.isInWardrobe()) return;
 
-        if (loc.getWorld() != user.getBackpackEntity().getWorld()) {
-            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.showBackpack();
+        user.getUserBackpackManager().getArmorstand().setRotation(loc.getYaw(), loc.getPitch());
+        user.getUserBackpackManager().showBackpack();
     }
 }

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

@@ -2,10 +2,9 @@ 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;
@@ -13,7 +12,6 @@ import org.bukkit.util.Vector;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 
-import java.util.HashMap;
 import java.util.List;
 
 public class CosmeticBalloonType extends Cosmetic {
@@ -50,28 +48,28 @@ public class CosmeticBalloonType extends Cosmetic {
     @Override
     public void update(CosmeticUser user) {
         Player player = Bukkit.getPlayer(user.getUniqueId());
-        Location currentLocation = user.getBalloonEntity().getLocation().clone();
-        Location newLocation = player.getLocation().clone().add(Settings.getBalloonOffset()).clone();
-        if (player == null) return;
+        UserBalloonManager userBalloonManager = user.getBalloonManager();
+        Location newLocation = player.getLocation();
+        if (player == null || userBalloonManager == null || newLocation == null) return;
         if (user.isInWardrobe()) return;
+        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() != balloonEntity.getLocation().getWorld()) {
-            balloonEntity.getModelEntity().teleport(newLocation);
-            PacketManager.sendTeleportPacket(balloonEntity.getPufferfishBalloonId(), newLocation, false, viewer);
+        if (player.getLocation().getWorld() != userBalloonManager.getLocation().getWorld()) {
+            userBalloonManager.getModelEntity().teleport(newLocation);
+            PacketManager.sendTeleportPacket(userBalloonManager.getPufferfishBalloonId(), newLocation, false, viewer);
             return;
         }
 
         Vector velocity = newLocation.toVector().subtract(currentLocation.toVector());
-        balloonEntity.setVelocity(velocity.multiply(1.1));
-        balloonEntity.setLocation(newLocation);
+        userBalloonManager.setVelocity(velocity.multiply(1.1));
+        userBalloonManager.setLocation(newLocation);
 
-        PacketManager.sendTeleportPacket(balloonEntity.getPufferfishBalloonId(), newLocation, false, viewer);
-        if (!user.getHidden()) PacketManager.sendLeashPacket(balloonEntity.getPufferfishBalloonId(), player.getEntityId(), viewer);
+        PacketManager.sendTeleportPacket(userBalloonManager.getPufferfishBalloonId(), newLocation, false, 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,31 @@
+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.spongepowered.configurate.ConfigurationNode;
+
+public class CosmeticEmoteType extends Cosmetic {
+
+    private 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(CosmeticUser user) {
+        user.getUserEmoteManager().playEmote(this);
+    }
+
+    public String getAnimationId() {
+        return animationId;
+    }
+}

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

@@ -1,10 +1,14 @@
 package com.hibiscusmc.hmccosmetics.database.types;
 
+import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
+import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
+import org.apache.commons.lang3.EnumUtils;
+import org.bukkit.Bukkit;
 import org.bukkit.Color;
 import org.jetbrains.annotations.Nullable;
 
@@ -34,6 +38,11 @@ public class Data {
     // BACKPACK=colorfulbackpack&RRGGBB,HELMET=niftyhat,BALLOON=colorfulballoon,CHESTPLATE=niftychestplate
     public String steralizeData(CosmeticUser user) {
         String data = "";
+        if (user.getHidden()) {
+            if (shouldHiddenSave(user.getHiddenReason())) {
+                data = "HIDDEN=" + user.getHiddenReason();
+            }
+        }
         for (Cosmetic cosmetic : user.getCosmetic()) {
             Color color = user.getCosmeticColor(cosmetic.getSlot());
             String input = cosmetic.getSlot() + "=" + cosmetic.getId();
@@ -47,8 +56,9 @@ public class Data {
         return data;
     }
 
-    public Map<CosmeticSlot, Map<Cosmetic, Color>> desteralizedata(String raw) {
+    public Map<CosmeticSlot, Map<Cosmetic, Color>> desteralizedata(CosmeticUser user, String raw) {
         Map<CosmeticSlot, Map<Cosmetic, Color>> cosmetics = new HashMap<>();
+        boolean checkPermission = Settings.getForcePermissionJoin();
 
         String[] rawData = raw.split(",");
         for (String a : rawData) {
@@ -57,16 +67,33 @@ public class Data {
             CosmeticSlot slot = null;
             Cosmetic cosmetic = null;
             MessagesUtil.sendDebugMessages("First split (suppose slot) " + splitData[0]);
+            if (splitData[0].equalsIgnoreCase("HIDDEN")) {
+                if (EnumUtils.isValidEnum(CosmeticUser.HiddenReason.class, splitData[1])) {
+                    Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
+                        user.hideCosmetics(CosmeticUser.HiddenReason.valueOf(splitData[1]));
+                    });
+                }
+                continue;
+            }
             if (CosmeticSlot.valueOf(splitData[0]) != null) slot = CosmeticSlot.valueOf(splitData[0]);
-
             if (splitData[1].contains("&")) {
                 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);
@@ -74,4 +101,15 @@ public class Data {
         }
         return cosmetics;
     }
+
+    private boolean shouldHiddenSave(CosmeticUser.HiddenReason reason) {
+        switch (reason) {
+            case EMOTE, NONE -> {
+                return false;
+            }
+            default -> {
+                return true;
+            }
+        }
+    }
 }

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

@@ -38,7 +38,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(rawData);
+        Map<CosmeticSlot, Map<Cosmetic, Color>> a = desteralizedata(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

@@ -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(rawData);
+                    Map<CosmeticSlot, Map<Cosmetic, Color>> cosmetics = desteralizedata(user, rawData);
                     for (Map<Cosmetic, Color> cosmeticColors : cosmetics.values()) {
                         for (Cosmetic cosmetic : cosmeticColors.keySet()) {
                             Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {

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

@@ -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(rawData);
+                    Map<CosmeticSlot, Map<Cosmetic, Color>> cosmetics = desteralizedata(user, rawData);
                     for (Map<Cosmetic, Color> cosmeticColors : cosmetics.values()) {
                         for (Cosmetic cosmetic : cosmeticColors.keySet()) {
                             Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {

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

@@ -5,22 +5,18 @@ 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.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 

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

@@ -39,6 +39,8 @@ public class Menus {
         return MENUS.containsValue(menu);
     }
 
+    public static Menu getDefaultMenu() { return Menus.getMenu(Settings.getDefaultMenu()); }
+
     public static List<String> getMenuNames() {
         List<String> names = new ArrayList<>();
 

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

@@ -14,11 +14,20 @@ public class ActionMenu extends Action {
 
     @Override
     public void run(CosmeticUser user, String raw) {
+        boolean ignorePermission = false;
+
+        raw = raw.replaceAll(" ", ""); // Removes all spaces
+
+        if (raw.contains("-o")) {
+            raw = raw.replaceAll("-o", "");
+            ignorePermission = true;
+        }
         if (!Menus.hasMenu(raw)) {
             HMCCosmeticsPlugin.getInstance().getLogger().info("Invalid Action Menu -> " + raw);
             return;
         }
         Menu menu = Menus.getMenu(raw);
-        menu.openMenu(user, true);
+        HMCCosmeticsPlugin.getInstance().getLogger().info(raw + " | " + ignorePermission);
+        menu.openMenu(user, ignorePermission);
     }
 }

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

@@ -7,7 +7,7 @@ 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;
@@ -107,23 +107,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),
-                                new ArrayList<String>()).
-                        stream().map(StringUtils::parseStringToString).collect(Collectors.toList());
+                if (!itemConfig.node("locked-lore").virtual()) {
+                    lockedLore = Utils.replaceIfNull(itemConfig.node("locked-lore").getList(String.class),
+                                    new ArrayList<String>()).
+                            stream().map(StringUtils::parseStringToString).collect(Collectors.toList());
+                }
+                if (!itemConfig.node("locked-name").virtual()) {
+                    lockedName = StringUtils.parseStringToString(Utils.replaceIfNull(itemConfig.node("locked-name").getString(), ""));
+                }
 
-                if (PAPIHook.isPAPIEnabled()) {
-                    String lockedName = StringUtils.parseStringToString(Utils.replaceIfNull(itemConfig.node("locked-name").getString(), ""));
-                    itemMeta.setDisplayName(PlaceholderAPI.setPlaceholders(user.getPlayer(), lockedName));
-                    if (itemMeta.hasLore()) {
-                        for (String loreLine : lockedLore) {
-                            processedLore.add(PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine));
-                        }
+                if (Hooks.isActiveHook("PlaceHolderAPI")) {
+                    lockedName = PlaceholderAPI.setPlaceholders(user.getPlayer(), lockedName);
+                }
+                itemMeta.setDisplayName(lockedName);
+                if (itemMeta.hasLore()) {
+                    itemMeta.getLore().clear();
+                    for (String loreLine : lockedLore) {
+                        if (Hooks.isActiveHook("PlaceHolderAPI")) loreLine = PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine);
+                        processedLore.add(loreLine);
                     }
                 }
             } catch (Exception e) {
@@ -138,11 +146,11 @@ public class TypeCosmetic extends Type {
     private ItemMeta processLoreLines(CosmeticUser user, ItemMeta itemMeta) {
         List<String> processedLore = new ArrayList<>();
 
-        if (PAPIHook.isPAPIEnabled()) {
-            if (itemMeta.hasLore()) {
-                for (String loreLine : itemMeta.getLore()) {
-                    processedLore.add(PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine));
-                }
+        if (itemMeta.hasLore()) {
+            for (String loreLine : itemMeta.getLore()) {
+                if (Hooks.isActiveHook("PlaceholderAPI"))
+                    loreLine = PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine);
+                processedLore.add(loreLine);
             }
         }
 

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

@@ -2,7 +2,8 @@ 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;
@@ -55,11 +56,11 @@ public class TypeEmpty extends Type {
     public ItemMeta setLore(CosmeticUser user, ConfigurationNode config, ItemMeta itemMeta) {
         List<String> processedLore = new ArrayList<>();
 
-        if (PAPIHook.isPAPIEnabled()) {
-            if (itemMeta.hasLore()) {
-                for (String loreLine : itemMeta.getLore()) {
-                    processedLore.add(PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine));
-                }
+        if (itemMeta.hasLore()) {
+            for (String loreLine : itemMeta.getLore()) {
+                if (Hooks.isActiveHook("PlaceholderAPI"))
+                    loreLine = PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine);
+                processedLore.add(loreLine);
             }
         }
 

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

@@ -1,20 +1,25 @@
-package com.hibiscusmc.hmccosmetics.hooks.items;
+package com.hibiscusmc.hmccosmetics.hooks;
 
 import org.bukkit.event.Listener;
 import org.bukkit.inventory.ItemStack;
 
-public class ItemHook implements Listener {
+public class Hook implements Listener {
 
     private String id;
     private boolean active;
+    private boolean itemHook;
 
-    public ItemHook(String id) {
+    public Hook(String id) {
         this.id = id;
         active = false;
-        ItemHooks.addItemHook(this);
+        Hooks.addHook(this);
     }
 
-    public ItemStack get(String itemid) {
+    public void load() {
+        // Override
+    }
+
+    public ItemStack getItem(String itemid) {
         return null;
         // Override
     }
@@ -30,4 +35,12 @@ public class ItemHook implements Listener {
     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,72 @@
+package com.hibiscusmc.hmccosmetics.hooks;
+
+import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
+import com.hibiscusmc.hmccosmetics.hooks.items.*;
+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 java.util.HashMap;
+
+public class Hooks {
+
+    private static 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();
+
+    public static Hook getHook(String id) {
+        return hooks.get(id.toLowerCase());
+    }
+
+    public static boolean isItemHook(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());
+            }
+        }
+    }
+
+    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;
+        Hook hook = getHook(split[0]);
+        if (!hook.hasEnabledItemHook()) return null;
+        if (!hook.getActive()) return null;
+        ItemStack item = hook.getItem(split[1]);
+        return item;
+    }
+
+    public static boolean isActiveHook(String id) {
+        if (!hooks.containsKey(getHook(id))) return false;
+        return hooks.get(getHook(id)).getActive();
+    }
+}

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

@@ -2,17 +2,19 @@ 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);
         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,18 +9,19 @@ 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);
             if (stack == null) return null;
@@ -31,7 +33,7 @@ public class ItemAdderHook extends ItemHook implements Listener {
 
     @EventHandler
     public void onItemAdderDataLoad(ItemsAdderLoadDataEvent event) {
-        if (this.enabled) return;
+        if (enabled) return; // Only run on the first event fired; ignore all rest
         this.enabled = true;
         HMCCosmeticsPlugin.setup();
     }

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 MythicHook() {
+public class HookMythic extends Hook implements Listener {
+    public HookMythic() {
         super("mythicmobs");
+        setEnabledItemHook(true);
     }
 
     @Override
-    public ItemStack get(String itemid) {
+    public ItemStack getItem(String 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/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/HookPremiumVanish.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;
+
+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(PlayerHideEvent event) {
+        Player player = event.getPlayer();
+        CosmeticUser user = CosmeticUsers.getUser(player);
+        if (user == null) return;
+        user.hideCosmetics(CosmeticUser.HiddenReason.PLUGIN);
+    }
+
+    @EventHandler
+    public void onPlayerShow(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,35 @@
+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;
+
+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(PlayerHideEvent event) {
+        Player player = event.getPlayer();
+        CosmeticUser user = CosmeticUsers.getUser(player);
+        if (user == null) return;
+        user.hideCosmetics(CosmeticUser.HiddenReason.PLUGIN);
+    }
+
+    @EventHandler
+    public void onPlayerShow(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,11 +16,11 @@ 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;
     }
 
@@ -54,7 +54,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 +66,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" -> {
@@ -159,8 +162,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/listener/PlayerConnectionListener.java

@@ -18,6 +18,18 @@ public class PlayerConnectionListener implements Listener {
 
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent event) {
+        if (event.getPlayer().isOp() || event.getPlayer().hasPermission("hmccosmetics.notifyupdate")) {
+            if (!HMCCosmeticsPlugin.getLatestVersion().equalsIgnoreCase(HMCCosmeticsPlugin.getInstance().getDescription().getVersion()) && HMCCosmeticsPlugin.getLatestVersion() != null)
+                MessagesUtil.sendMessageNoKey(
+                        event.getPlayer(),
+                        "<br>" +
+                                "<GRAY>There is a new version of <light_purple><Bold>HMCCosmetics<reset><gray> available!<br>" +
+                                "<GRAY>Current version: <red>" + HMCCosmeticsPlugin.getInstance().getDescription().getVersion() + " <GRAY>| Latest version: <light_purple>" + HMCCosmeticsPlugin.getLatestVersion() + "<br>" +
+                                "<GRAY>Download it on <gold><click:OPEN_URL:'https://www.spigotmc.org/resources/100107/'>Spigot<reset> <gray>or <gold><click:OPEN_URL:'https://polymart.org/resource/1879'>Polymart<reset><gray>!" +
+                                "<br>"
+                );
+        }
+
         Runnable run = () -> {
             CosmeticUser user = Database.get(event.getPlayer().getUniqueId());
             CosmeticUsers.addUser(user);
@@ -46,6 +58,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

@@ -13,8 +13,8 @@ import com.hibiscusmc.hmccosmetics.config.Settings;
 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.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;
@@ -31,6 +31,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityPickupItemEvent;
 import org.bukkit.event.entity.EntityPotionEffectEvent;
 import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.inventory.ClickType;
@@ -81,8 +82,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 +104,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();
@@ -151,6 +156,7 @@ public class PlayerGameListener implements Listener {
 
     @EventHandler
     public void onPlayerLook(PlayerMoveEvent event) {
+        if (event.isCancelled()) return;
         // TODO: Move to packets
         CosmeticUser user = CosmeticUsers.getUser(event.getPlayer().getUniqueId());
         if (user == null) return;
@@ -198,11 +204,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;
@@ -356,7 +376,7 @@ public class PlayerGameListener implements Listener {
                 CosmeticUser user = CosmeticUsers.getUser(player);
                 if (user == null) 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;
@@ -25,7 +25,7 @@ public interface NMSHandler {
 
     Entity spawnBackpack(CosmeticUser user, CosmeticBackpackType cosmeticBackpackType);
 
-    BalloonEntity spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType);
+    UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType);
 
     void equipmentSlotUpdate(
             int entityId,

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.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.cosmetic.types.*;
+import com.hibiscusmc.hmccosmetics.user.manager.UserBackpackManager;
+import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager;
 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 ArmorStand invisibleArmorstand;
-    private BalloonEntity balloonEntity;
+    private UserWardrobeManager userWardrobeManager;
+    private UserBalloonManager userBalloonManager;
+    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);
@@ -191,6 +172,7 @@ public class CosmeticUser {
     public ItemStack getUserCosmeticItem(Cosmetic cosmetic) {
         ItemStack item = null;
         if (hideCosmetics) {
+            if (cosmetic instanceof CosmeticBackpackType || cosmetic instanceof CosmeticBalloonType) return new ItemStack(Material.AIR);
             return getPlayer().getInventory().getItem(InventoryUtils.getEquipmentSlot(cosmetic.getSlot()));
         }
         if (cosmetic instanceof CosmeticArmorType || cosmetic instanceof CosmeticMainhandType || cosmetic instanceof CosmeticBackpackType) {
@@ -224,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;
         }
@@ -235,25 +241,21 @@ public class CosmeticUser {
             return;
         }
 
-        if (wardrobe == null) {
-            wardrobe = new Wardrobe(this);
-            wardrobe.start();
+        if (userWardrobeManager == null) {
+            userWardrobeManager = new UserWardrobeManager(this, exitLocation, viewingLocation, npcLocation);
+            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(
@@ -264,16 +266,14 @@ public class CosmeticUser {
                     WardrobeSettings.getTransitionFadeOut()
             );
             Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
-                wardrobe.end();
-                wardrobe = null;
+                userWardrobeManager.end();
+                userWardrobeManager = null;
             }, WardrobeSettings.getTransitionDelay());
-        } else {
-
         }
     }
 
     public boolean isInWardrobe() {
-        if (wardrobe == null) return false;
+        if (userWardrobeManager == null) return false;
         return true;
     }
 
@@ -286,45 +286,39 @@ public class CosmeticUser {
     }
 
     public void spawnBackpack(CosmeticBackpackType cosmeticBackpackType) {
-        MessagesUtil.sendDebugMessages("spawnBackpack Bukkit - Start");
-        Player player = Bukkit.getPlayer(getUniqueId());
-
-        if (this.invisibleArmorstand != null) return;
-
-        this.invisibleArmorstand = (ArmorStand) NMSHandlers.getHandler().spawnBackpack(this, cosmeticBackpackType);
-
-        MessagesUtil.sendDebugMessages("spawnBackpack Bukkit - Finish");
+        this.userBackpackManager = new UserBackpackManager(this);
+        userBackpackManager.spawnBackpack(cosmeticBackpackType);
     }
 
+    public void despawnBackpack() {
+        if (userBackpackManager == null) return;
+        userBackpackManager.despawnBackpack();
+        userBackpackManager = null;
+    }
+
+
+
     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.balloonEntity = null;
-    }
-
-    public void despawnBackpack() {
-        Player player = Bukkit.getPlayer(getUniqueId());
-        if (invisibleArmorstand == null) return;
-        invisibleArmorstand.setHealth(0);
-        invisibleArmorstand.remove();
-        this.invisibleArmorstand = null;
+        this.userBalloonManager.remove();
+        this.userBalloonManager = null;
     }
 
     public void respawnBackpack() {
@@ -387,24 +381,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);
@@ -416,12 +392,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");
@@ -440,14 +416,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");
@@ -467,6 +443,7 @@ public class CosmeticUser {
         PLUGIN,
         POTION,
         ACTION,
-        COMMAND
+        COMMAND,
+        EMOTE
     }
 }

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

@@ -0,0 +1,72 @@
+package com.hibiscusmc.hmccosmetics.user.manager;
+
+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 org.bukkit.entity.ArmorStand;
+import org.bukkit.inventory.ItemStack;
+
+public class UserBackpackManager {
+
+    private boolean hideBackpack;
+    private ArmorStand invisibleArmorstand;
+    private 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);
+
+
+        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() == true) return;
+        getArmorstand().getEquipment().clear();
+        hideBackpack = true;
+    }
+
+    public void showBackpack() {
+        if (hideBackpack == false) 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;
@@ -19,14 +19,14 @@ import org.bukkit.util.Vector;
 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(Location location) {
         this.uniqueID = UUID.randomUUID();
         this.balloonID = NMSHandlers.getHandler().getNextEntityId();
         this.modelEntity = NMSHandlers.getHandler().getMEGEntity(location.add(Settings.getBalloonOffset()));

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

@@ -0,0 +1,37 @@
+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;
+
+public class UserEmoteManager {
+
+    CosmeticUser user;
+    private UserEmoteModel model;
+
+    public UserEmoteManager(CosmeticUser user) {
+        this.user = user;
+    }
+
+    public void playEmote(CosmeticEmoteType cosmeticEmoteType) {
+        MessagesUtil.sendDebugMessages("playEmote " + cosmeticEmoteType.getAnimationId());
+        if (isPlayingEmote()) return;
+        if (user.isInWardrobe()) return;
+        try {
+            model = new UserEmoteModel(user);
+            model.playAnimation(cosmeticEmoteType.getAnimationId());
+        } 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,118 @@
+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.bukkit.inventory.EquipmentSlot;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.UUID;
+
+public class UserEmoteModel extends PlayerModel {
+
+    private CosmeticUser user;
+    private String emotePlaying;
+    private int armorstandId;
+    private GameMode originalGamemode;
+
+    public UserEmoteModel(CosmeticUser user) {
+        super(user.getPlayer());
+        this.user = user;
+        armorstandId = NMSHandlers.getHandler().getNextEntityId();
+        getRangeManager().setRenderDistance(Settings.getViewDistance());
+    }
+
+    @Override
+    public void playAnimation(String id) {
+        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 = List.of(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(), () -> {
+            if (user.getPlayer() == null) return;
+            Player player = user.getPlayer();
+            List<Player> viewer = List.of(user.getPlayer());
+            if (viewer == null) return;
+            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() {
+        if (emotePlaying == null) return false;
+        return true;
+    }
+}

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

@@ -1,10 +1,11 @@
-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.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;
@@ -26,7 +27,7 @@ import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 
-public class Wardrobe {
+public class UserWardrobeManager {
 
     private int NPC_ID;
     private String npcName;
@@ -41,11 +42,29 @@ public class Wardrobe {
     private boolean active;
     private WardrobeStatus wardrobeStatus;
 
-    public Wardrobe(CosmeticUser user) {
+    public UserWardrobeManager(CosmeticUser user) {
         NPC_ID = NMSHandlers.getHandler().getNextEntityId();
         ARMORSTAND_ID = NMSHandlers.getHandler().getNextEntityId();
         WARDROBE_UUID = UUID.randomUUID();
         VIEWER = user;
+
+        exitLocation = WardrobeSettings.getLeaveLocation();
+        viewingLocation = WardrobeSettings.getViewerLocation();
+        npcLocation = WardrobeSettings.getWardrobeLocation();
+
+        wardrobeStatus = WardrobeStatus.SETUP;
+    }
+
+    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.exitLocation = exitLocation;
+        this.viewingLocation = viewingLocation;
+        this.npcLocation = npcLocation;
+
         wardrobeStatus = WardrobeStatus.SETUP;
     }
 
@@ -56,13 +75,8 @@ public class Wardrobe {
         this.originalGamemode = player.getGameMode();
         if (WardrobeSettings.isReturnLastLocation()) {
             this.exitLocation = player.getLocation().clone();
-        } else {
-            this.exitLocation = WardrobeSettings.getLeaveLocation();
         }
 
-        viewingLocation = WardrobeSettings.getViewerLocation();
-        npcLocation = WardrobeSettings.getWardrobeLocation();
-
         VIEWER.hidePlayer();
         List<Player> viewer = List.of(player);
         List<Player> outsideViewers = PacketManager.getViewers(viewingLocation);
@@ -100,16 +114,16 @@ public class Wardrobe {
 
             // Misc
             if (VIEWER.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
-                PacketManager.ridingMountPacket(NPC_ID, VIEWER.getBackpackEntity().getEntityId(), viewer);
+                PacketManager.ridingMountPacket(NPC_ID, VIEWER.getUserBackpackManager().getFirstArmorstandId(), viewer);
             }
 
             if (VIEWER.hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
-                PacketManager.sendLeashPacket(VIEWER.getBalloonEntity().getPufferfishBalloonId(), -1, viewer);
-                PacketManager.sendLeashPacket(VIEWER.getBalloonEntity().getPufferfishBalloonId(), NPC_ID, viewer); // This needs a possible fix
+                PacketManager.sendLeashPacket(VIEWER.getBalloonManager().getPufferfishBalloonId(), -1, viewer);
+                PacketManager.sendLeashPacket(VIEWER.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(VIEWER.getBalloonEntity().getModelId(), npcLocation.clone().add(Settings.getBalloonOffset()), false, viewer);
+                PacketManager.sendTeleportPacket(VIEWER.getBalloonManager().getPufferfishBalloonId(), npcLocation.clone().add(Settings.getBalloonOffset()), false, viewer);
+                VIEWER.getBalloonManager().getModelEntity().teleport(npcLocation.clone().add(Settings.getBalloonOffset()));
             }
 
             if (WardrobeSettings.getEnabledBossbar()) {
@@ -157,7 +171,7 @@ public class Wardrobe {
             this.active = false;
 
             // NPC
-            if (VIEWER.hasCosmeticInSlot(CosmeticSlot.BALLOON)) PacketManager.sendLeashPacket(VIEWER.getBalloonEntity().getModelId(), -1, viewer);
+            if (VIEWER.hasCosmeticInSlot(CosmeticSlot.BALLOON)) PacketManager.sendLeashPacket(VIEWER.getBalloonManager().getModelId(), -1, viewer);
             PacketManager.sendEntityDestroyPacket(NPC_ID, viewer); // Success
             PacketManager.sendRemovePlayerPacket(player, WARDROBE_UUID, viewer); // Success
 
@@ -209,7 +223,7 @@ public class Wardrobe {
         BukkitRunnable runnable = new BukkitRunnable() {
             @Override
             public void run() {
-                if (active == false) {
+                if (active == false || VIEWER.getPlayer() == null) {
                     MessagesUtil.sendDebugMessages("Active is false");
                     this.cancel();
                     return;
@@ -226,9 +240,9 @@ public class Wardrobe {
                 PacketManager.sendLookPacket(NPC_ID, location, viewer);
                 VIEWER.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()) {
@@ -236,18 +250,18 @@ public class Wardrobe {
                 }
 
                 if (VIEWER.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
-                    PacketManager.sendTeleportPacket(VIEWER.getArmorstandId(), location, false, viewer);
-                    PacketManager.ridingMountPacket(NPC_ID, VIEWER.getBackpackEntity().getEntityId(), viewer);
-                    VIEWER.getBackpackEntity().setRotation(nextyaw, 0);
-                    PacketManager.sendEntityDestroyPacket(VIEWER.getArmorstandId(), outsideViewers);
+                    PacketManager.sendTeleportPacket(VIEWER.getUserBackpackManager().getFirstArmorstandId(), location, false, viewer);
+                    PacketManager.ridingMountPacket(NPC_ID, VIEWER.getUserBackpackManager().getFirstArmorstandId(), viewer);
+                    VIEWER.getUserBackpackManager().getArmorstand().setRotation(nextyaw, 0);
+                    PacketManager.sendEntityDestroyPacket(VIEWER.getUserBackpackManager().getFirstArmorstandId(), outsideViewers);
                 }
 
                 if (VIEWER.hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
-                    PacketManager.sendTeleportPacket(VIEWER.getBalloonEntity().getPufferfishBalloonId(), WardrobeSettings.getWardrobeLocation().add(Settings.getBalloonOffset()), false, viewer);
-                    VIEWER.getBalloonEntity().getModelEntity().teleport(WardrobeSettings.getWardrobeLocation().add(Settings.getBalloonOffset()));
-                    PacketManager.sendLeashPacket(VIEWER.getBalloonEntity().getPufferfishBalloonId(), -1, outsideViewers);
-                    PacketManager.sendEntityDestroyPacket(VIEWER.getBalloonEntity().getModelId(), outsideViewers);
-                    //PacketManager.sendLeashPacket(VIEWER.getBalloonEntity().getModelId(), NPC_ID, viewer); // Pufferfish goes away for some reason?
+                    PacketManager.sendTeleportPacket(VIEWER.getBalloonManager().getPufferfishBalloonId(), WardrobeSettings.getWardrobeLocation().add(Settings.getBalloonOffset()), false, viewer);
+                    VIEWER.getBalloonManager().getModelEntity().teleport(WardrobeSettings.getWardrobeLocation().add(Settings.getBalloonOffset()));
+                    PacketManager.sendLeashPacket(VIEWER.getBalloonManager().getPufferfishBalloonId(), -1, outsideViewers);
+                    PacketManager.sendEntityDestroyPacket(VIEWER.getBalloonManager().getModelId(), outsideViewers);
+                    PacketManager.sendLeashPacket(VIEWER.getBalloonManager().getPufferfishBalloonId(), NPC_ID, viewer); // Pufferfish goes away for some reason?
                 }
 
                 if (WardrobeSettings.isEquipPumpkin()) {
@@ -259,15 +273,6 @@ public class Wardrobe {
         runnable.runTaskTimer(HMCCosmeticsPlugin.getInstance(), 0, 2);
     }
 
-    private static int getNextYaw(final int current, final int rotationSpeed) {
-        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/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;
@@ -95,7 +96,7 @@ public class MessagesUtil {
         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);
@@ -113,7 +114,7 @@ public class MessagesUtil {
 
     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 +123,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/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/packets/PacketManager.java

@@ -16,9 +16,12 @@ 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 java.util.ArrayList;
 import java.util.Collections;
@@ -69,6 +72,17 @@ public class PacketManager extends BasePacket {
         for (Player p : sendTo) sendPacket(p, packet);
     }
 
+    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(
             Player player,
             CosmeticSlot cosmetic,
@@ -91,7 +105,7 @@ 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);
     }

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

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

@@ -92,4 +92,13 @@ kite:
     material: PAPER
     model-data: 7
     name: "<blue>Kite"
-    amount: 1
+    amount: 1
+handstand:
+  slot: EMOTE
+  animation: handstand
+meditate:
+  slot: EMOTE
+  animation: meditate
+thinking:
+  slot: EMOTE
+  animation: thinking

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

@@ -132,4 +132,28 @@ 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

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!"

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;
@@ -94,22 +94,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()));
-        balloonEntity1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
+        userBalloonManager1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
+        userBalloonManager1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
 
-        PacketManager.sendEntitySpawnPacket(newLoc, balloonEntity1.getPufferfishBalloonId(), EntityType.PUFFERFISH, balloonEntity1.getPufferfishBalloonUniqueId(), sentTo);
-        PacketManager.sendInvisibilityPacket(balloonEntity1.getPufferfishBalloonId(), sentTo);
-        PacketManager.sendLeashPacket(balloonEntity1.getPufferfishBalloonId(), player.getEntityId(), sentTo);
+        PacketManager.sendEntitySpawnPacket(newLoc, userBalloonManager1.getPufferfishBalloonId(), EntityType.PUFFERFISH, userBalloonManager1.getPufferfishBalloonUniqueId(), sentTo);
+        PacketManager.sendInvisibilityPacket(userBalloonManager1.getPufferfishBalloonId(), sentTo);
+        PacketManager.sendLeashPacket(userBalloonManager1.getPufferfishBalloonId(), player.getEntityId(), sentTo);
 
-        return balloonEntity1;
+        return userBalloonManager1;
     }
 
     @Override

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;
@@ -96,22 +96,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()));
-        balloonEntity1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
+        userBalloonManager1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
+        userBalloonManager1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
 
-        PacketManager.sendEntitySpawnPacket(newLoc, balloonEntity1.getPufferfishBalloonId(), EntityType.PUFFERFISH, balloonEntity1.getPufferfishBalloonUniqueId(), sentTo);
-        PacketManager.sendInvisibilityPacket(balloonEntity1.getPufferfishBalloonId(), sentTo);
-        PacketManager.sendLeashPacket(balloonEntity1.getPufferfishBalloonId(), player.getEntityId(), sentTo);
+        PacketManager.sendEntitySpawnPacket(newLoc, userBalloonManager1.getPufferfishBalloonId(), EntityType.PUFFERFISH, userBalloonManager1.getPufferfishBalloonUniqueId(), sentTo);
+        PacketManager.sendInvisibilityPacket(userBalloonManager1.getPufferfishBalloonId(), sentTo);
+        PacketManager.sendLeashPacket(userBalloonManager1.getPufferfishBalloonId(), player.getEntityId(), sentTo);
 
-        return balloonEntity1;
+        return userBalloonManager1;
     }
 
     @Override

v1_19_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_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;
@@ -96,22 +96,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()));
-        balloonEntity1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
+        userBalloonManager1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
+        userBalloonManager1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
 
-        PacketManager.sendEntitySpawnPacket(newLoc, balloonEntity1.getPufferfishBalloonId(), EntityType.PUFFERFISH, balloonEntity1.getPufferfishBalloonUniqueId(), sentTo);
-        PacketManager.sendInvisibilityPacket(balloonEntity1.getPufferfishBalloonId(), sentTo);
-        PacketManager.sendLeashPacket(balloonEntity1.getPufferfishBalloonId(), player.getEntityId(), sentTo);
+        PacketManager.sendEntitySpawnPacket(newLoc, userBalloonManager1.getPufferfishBalloonId(), EntityType.PUFFERFISH, userBalloonManager1.getPufferfishBalloonUniqueId(), sentTo);
+        PacketManager.sendInvisibilityPacket(userBalloonManager1.getPufferfishBalloonId(), sentTo);
+        PacketManager.sendLeashPacket(userBalloonManager1.getPufferfishBalloonId(), player.getEntityId(), sentTo);
 
-        return balloonEntity1;
+        return userBalloonManager1;
     }
 
     @Override

v1_19_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_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;
@@ -96,22 +96,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()));
-        balloonEntity1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
+        userBalloonManager1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
+        userBalloonManager1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
 
-        PacketManager.sendEntitySpawnPacket(newLoc, balloonEntity1.getPufferfishBalloonId(), EntityType.PUFFERFISH, balloonEntity1.getPufferfishBalloonUniqueId(), sentTo);
-        PacketManager.sendInvisibilityPacket(balloonEntity1.getPufferfishBalloonId(), sentTo);
-        PacketManager.sendLeashPacket(balloonEntity1.getPufferfishBalloonId(), player.getEntityId(), sentTo);
+        PacketManager.sendEntitySpawnPacket(newLoc, userBalloonManager1.getPufferfishBalloonId(), EntityType.PUFFERFISH, userBalloonManager1.getPufferfishBalloonUniqueId(), sentTo);
+        PacketManager.sendInvisibilityPacket(userBalloonManager1.getPufferfishBalloonId(), sentTo);
+        PacketManager.sendLeashPacket(userBalloonManager1.getPufferfishBalloonId(), player.getEntityId(), sentTo);
 
-        return balloonEntity1;
+        return userBalloonManager1;
     }
 
     @Override