version bump (2.5.2)

Fixed interaction between backpack cosmetics and other passengers

build.gradle.kts

@@ -2,13 +2,13 @@ import net.minecrell.pluginyml.bukkit.BukkitPluginDescription
 
 plugins {
     id("java")
-    id("com.github.johnrengelman.shadow") version "7.1.2"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
     id("xyz.jpenilla.run-paper") version "2.0.0"
-    id("net.minecrell.plugin-yml.bukkit") version "0.5.2"
+    id("net.minecrell.plugin-yml.bukkit") version "0.6.0"
 }
 
 group = "com.hibiscusmc"
-version = "2.4.8"
+version = "2.5.2"
 
 allprojects {
     apply(plugin = "java")
@@ -71,14 +71,14 @@ allprojects {
         compileOnly("org.spigotmc:spigot-api:1.18.2-R0.1-SNAPSHOT")
         compileOnly("org.jetbrains:annotations:23.0.0")
         compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0")
-        compileOnly("me.clip:placeholderapi:2.11.1")
+        compileOnly("me.clip:placeholderapi:2.11.3")
         compileOnly("com.ticxo:modelengine:R3.0.1")
         compileOnly("com.github.oraxen:oraxen:-SNAPSHOT")
         compileOnly("com.github.LoneDev6:API-ItemsAdder:3.2.5")
         compileOnly("com.mineinabyss:geary-papermc:0.24-SNAPSHOT")
         compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.1.0-SNAPSHOT")
         compileOnly("it.unimi.dsi:fastutil:8.5.11")
-        compileOnly("com.github.LeonMangler:SuperVanish:6.2.6-4")
+        compileOnly("com.github.LeonMangler:SuperVanish:6.2.17")
     }
 }
 
@@ -121,7 +121,7 @@ tasks {
     }
 
     runServer {
-        minecraftVersion("1.19.4")
+        minecraftVersion("1.20.1")
     }
 
     shadowJar {
@@ -172,6 +172,9 @@ bukkit {
     depend = listOf("ProtocolLib")
     softDepend = listOf("ModelEngine", "Oraxen", "ItemsAdder", "Geary", "HMCColor", "WorldGuard", "MythicMobs", "PlaceholderAPI", "SuperVanish", "PremiumVanish", "LibsDisguises", "Denizen")
     version = "${project.version}"
+    loadBefore = listOf(
+        "Cosmin" // Fixes an issue with Cosmin loading before and taking /cosmetic, when messing with what we do.
+    )
 
     commands {
         register("cosmetic") {

common/build.gradle.kts

@@ -8,7 +8,7 @@ dependencies {
     compileOnly("org.spigotmc:spigot-api:1.18.2-R0.1-SNAPSHOT")
     compileOnly("org.jetbrains:annotations:23.0.0")
     compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0")
-    compileOnly("me.clip:placeholderapi:2.11.1")
+    compileOnly("me.clip:placeholderapi:2.11.3")
     compileOnly("com.ticxo:modelengine:R3.0.1")
     compileOnly("com.github.oraxen:oraxen:-SNAPSHOT")
     compileOnly("com.github.LoneDev6:API-ItemsAdder:3.2.5")
@@ -18,7 +18,7 @@ dependencies {
     compileOnly("it.unimi.dsi:fastutil:8.5.11")
     compileOnly("io.lumine:Mythic-Dist:5.2.1")
     compileOnly("com.denizenscript:denizen:1.2.7-SNAPSHOT")
-    compileOnly("com.github.LeonMangler:SuperVanish:6.2.6-4")
+    compileOnly("com.github.LeonMangler:SuperVanish:6.2.17")
     compileOnlyApi("LibsDisguises:LibsDisguises:10.0.21") {
         exclude("org.spigotmc", "spigot")
     }

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

@@ -50,7 +50,6 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
     private static boolean disable = false;
     private static YamlConfigurationLoader configLoader;
     private static final int pluginId = 13873;
-    private static boolean hasModelEngine = false;
     private static boolean onLatestVersion = true;
     private static String latestVersion = "";
 
@@ -128,11 +127,6 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
         // Database
         new Database();
 
-        // ModelEngine
-        if (Bukkit.getPluginManager().getPlugin("ModelEngine") != null) {
-            hasModelEngine = true;
-        }
-
         // WorldGuard
         if (Bukkit.getPluginManager().getPlugin("WorldGuard") != null && Settings.isWorldGuardMoveCheckEnabled()) {
             getServer().getPluginManager().registerEvents(new WGListener(), this);
@@ -286,9 +280,6 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
         }
     }
 
-    public static boolean hasModelEngine() {
-        return hasModelEngine;
-    }
     public static boolean isOnLatestVersion() {
         return onLatestVersion;
     }

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

@@ -1,13 +1,17 @@
 package com.hibiscusmc.hmccosmetics.api;
 
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
+import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
 import com.hibiscusmc.hmccosmetics.gui.Menu;
 import com.hibiscusmc.hmccosmetics.gui.Menus;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
+import org.bukkit.Color;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
 import java.util.UUID;
 
 public class HMCCosmeticsAPI {
@@ -19,7 +23,7 @@ public class HMCCosmeticsAPI {
      * @return A {@link Cosmetic} if exists or null if it does not
      */
     @Nullable
-    public static Cosmetic getCosmetic(String cosmetic) {
+    public static Cosmetic getCosmetic(@NotNull String cosmetic) {
         return Cosmetics.getCosmetic(cosmetic);
     }
 
@@ -32,7 +36,7 @@ public class HMCCosmeticsAPI {
      * @return A {@link CosmeticUser} if exists or null if it does not
      */
     @Nullable
-    public static CosmeticUser getUser(UUID uuid) {
+    public static CosmeticUser getUser(@NotNull UUID uuid) {
         return CosmeticUsers.getUser(uuid);
     }
 
@@ -43,7 +47,51 @@ public class HMCCosmeticsAPI {
      * @return A {@link Menu} if exists or null if it does not
      */
     @Nullable
-    public static Menu getMenu(String id) {
+    public static Menu getMenu(@NotNull String id) {
         return Menus.getMenu(id);
     }
+
+    /**
+     * Equips a cosmetic to a player. You can use getUser and getCosmetic to get the CosmeticUser and Cosmetic to equip.
+     * @param user CosmeticUser to equip cosmetic to
+     * @param cosmetic Cosmetic to equip
+     */
+    public static void equipCosmetic(@NotNull CosmeticUser user, @NotNull Cosmetic cosmetic) {
+        equipCosmetic(user, cosmetic, null);
+    }
+
+    /**
+     * Equips a cosmetic to a player with a color. You can use getUser and getCosmetic to get the CosmeticUser and Cosmetic to equip.
+     * @param user CosmeticUser to equip cosmetic to
+     * @param cosmetic Cosmetic to equip
+     * @param color Color to apply to cosmetic
+     */
+    public static void equipCosmetic(@NotNull CosmeticUser user, @NotNull Cosmetic cosmetic, @Nullable Color color) {
+        user.addPlayerCosmetic(cosmetic, color);
+    }
+
+    /**
+     * Removes a cosmetic in cosmeticslot.
+     * @param user The user to remove the cosmetic from
+     * @param slot The slot to remove the cosmetic from
+     */
+    public static void unequipCosmetic(@NotNull CosmeticUser user, @NotNull CosmeticSlot slot) {
+        user.removeCosmeticSlot(slot);
+    }
+
+    /**
+     * Gets all Cosmetics that are currently registered with HMCC. This list is immutable!
+     * @return A list of all registered cosmetics
+     */
+    public static List<Cosmetic> getAllCosmetics() {
+        return List.copyOf(Cosmetics.values());
+    }
+
+    /**
+     * Gets all CosmeticUsers that are currently registered with HMCC. This list is immutable!
+     * @return A list of all registered CosmeticUsers
+     */
+    public static List<CosmeticUser> getAllCosmeticUsers() {
+        return List.copyOf(CosmeticUsers.values());
+    }
 }

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

@@ -21,11 +21,7 @@ public class Settings {
     private static final String REQUIRE_EMPTY_PANTS_PATH = "require-empty-pants";
     private static final String REQUIRE_EMPTY_BOOTS_PATH = "require-empty-boots";
     private static final String BALLOON_OFFSET = "balloon-offset";
-    private static final String FIRST_PERSON_BACKPACK_MODE = "first-person-backpack-mode";
-
-    private static final transient String LOOK_DOWN_PITCH_PATH = "look-down-backpack-remove";
     private static final String VIEW_DISTANCE_PATH = "view-distance";
-    private static final String PARTICLE_COUNT = "particle-count";
     private static final String DYE_MENU_PATH = "dye-menu";
     private static final String DYE_MENU_NAME = "title";
     private static final String DYE_MENU_INPUT_SLOT = "input-slot";
@@ -51,6 +47,10 @@ public class Settings {
     private static final String COSMETIC_ADD_ENCHANTS_LEGGINGS_PATH = "leggings-add-enchantments";
     private static final String COSMETIC_ADD_ENCHANTS_BOOTS_PATH = "boots-add-enchantments";
     private static final String COSMETIC_DESTROY_LOOSE_COSMETIC_PATH = "destroy-loose-cosmetics";
+    private static final String MENU_SETTINGS_PATH = "menu-settings";
+    private static final String COSMETIC_TYPE_SETTINGS_PATH = "cosmetic-type";
+    private static final String EQUIP_CLICK_TYPE = "equip-click";
+    private static final String UNEQUIP_CLICK_TYPE = "unequip-click";
 
     private static String defaultMenu;
     private static String dyeMenuName;
@@ -77,11 +77,12 @@ public class Settings {
     private static boolean emoteDamageLeave;
     private static boolean emoteInvincible;
     private static boolean destroyLooseCosmetics;
-    private static int lookDownPitch;
     private static int viewDistance;
     private static int tickPeriod;
     private static double emoteDistance;
     private static Vector balloonOffset;
+    private static String cosmeticEquipClickType;
+    private static String cosmeticUnEquipClickType;
 
     public static void load(ConfigurationNode source) {
 
@@ -118,11 +119,14 @@ public class Settings {
         addChestplateEnchants = cosmeticSettings.node(COSMETIC_ADD_ENCHANTS_CHESTPLATE_PATH).getBoolean(false);
         addLeggingEnchants = cosmeticSettings.node(COSMETIC_ADD_ENCHANTS_LEGGINGS_PATH).getBoolean(false);
         addBootsEnchants = cosmeticSettings.node(COSMETIC_ADD_ENCHANTS_BOOTS_PATH).getBoolean(false);
-
         tickPeriod = cosmeticSettings.node(TICK_PERIOD_PATH).getInt(-1);
-        lookDownPitch = cosmeticSettings.node(LOOK_DOWN_PITCH_PATH).getInt();
         viewDistance = cosmeticSettings.node(VIEW_DISTANCE_PATH).getInt();
 
+        ConfigurationNode menuSettings = source.node(MENU_SETTINGS_PATH);
+        ConfigurationNode cosmeticTypeSettings = menuSettings.node(COSMETIC_TYPE_SETTINGS_PATH);
+        cosmeticEquipClickType = cosmeticTypeSettings.node(EQUIP_CLICK_TYPE).getString("ALL");
+        cosmeticUnEquipClickType = cosmeticTypeSettings.node(UNEQUIP_CLICK_TYPE).getString("ALL");
+
         final var balloonSection = cosmeticSettings.node(BALLOON_OFFSET);
 
         balloonOffset = loadVector(balloonSection);
@@ -218,10 +222,6 @@ public class Settings {
         return balloonOffset;
     }
 
-    public static int getLookDownPitch() {
-        return lookDownPitch;
-    }
-
     public static int getViewDistance() {
         return viewDistance;
     }
@@ -322,4 +322,12 @@ public class Settings {
 
         plugin.saveConfig();
     }
+
+    public static String getCosmeticEquipClickType() {
+        return cosmeticEquipClickType;
+    }
+
+    public static String getCosmeticUnEquipClickType() {
+        return cosmeticUnEquipClickType;
+    }
 }

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

@@ -10,7 +10,9 @@ import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.spongepowered.configurate.ConfigurationNode;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Set;
 import java.util.logging.Level;
 
 public class WardrobeSettings {

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

@@ -5,12 +5,10 @@ import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 import com.hibiscusmc.hmccosmetics.nms.NMSHandlers;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.InventoryUtils;
-import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;

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

@@ -1,29 +1,39 @@
 package com.hibiscusmc.hmccosmetics.cosmetic.types;
 
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
+import com.hibiscusmc.hmccosmetics.nms.NMSHandlers;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.user.manager.UserBackpackManager;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.entity.AreaEffectCloud;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.EquipmentSlot;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.spongepowered.configurate.ConfigurationNode;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.logging.Level;
 
 public class CosmeticBackpackType extends Cosmetic {
 
     private final String modelName;
-    private UserBackpackManager.BackpackType backpackType;
+    private ItemStack firstPersonBackpack;
 
     public CosmeticBackpackType(String id, ConfigurationNode config) {
         super(id, config);
 
         modelName = config.node("model").getString();
-        backpackType = UserBackpackManager.BackpackType.valueOf(config.node("type").getString("NORMAL").toUpperCase());
+
+        if (!config.node("firstperson-item").virtual()) {
+            this.firstPersonBackpack = generateItemStack(config.node("firstperson-item"));
+        }
+        //backpackType = UserBackpackManager.BackpackType.valueOf(config.node("type").getString("NORMAL").toUpperCase());
     }
 
     @Override
@@ -34,8 +44,9 @@ public class CosmeticBackpackType extends Cosmetic {
         Location loc = entity.getLocation().clone().add(0, 2, 0);
 
         if (user.isInWardrobe() || !user.isBackpackSpawned()) return;
+        // This needs to be moved to purely packet based, there are far to many plugin doing dumb stuff that prevents spawning armorstands ignoring our spawn reason.
         if (!user.getUserBackpackManager().IsValidBackpackEntity()) {
-            MessagesUtil.sendDebugMessages("Invalid Backpack Entity[owner=" + user.getUniqueId() + ",player_location=" + loc + "]!", Level.WARNING);
+            MessagesUtil.sendDebugMessages("Invalid Backpack Entity[owner=" + user.getUniqueId() + ",player_location=" + loc + "]!");
             user.respawnBackpack();
             return;
         }
@@ -44,16 +55,26 @@ public class CosmeticBackpackType extends Cosmetic {
         }
 
         user.getUserBackpackManager().getArmorStand().teleport(loc);
-
-        if (user.getUserBackpackManager().getBackpackType().equals(UserBackpackManager.BackpackType.FIRST_PERSON)) {
-            user.getUserBackpackManager().teleportEffectEntity(loc);
-            PacketManager.sendRidingPacket(entity.getEntityId(), user.getUserBackpackManager().getAreaEffectEntityId(), loc);
-            PacketManager.sendRidingPacket(user.getUserBackpackManager().getAreaEffectEntityId(), user.getUserBackpackManager().getFirstArmorStandId(), loc);
-        } else {
-            PacketManager.sendRidingPacket(entity.getEntityId(), user.getUserBackpackManager().getFirstArmorStandId(), loc);
-        }
-
         user.getUserBackpackManager().getArmorStand().setRotation(loc.getYaw(), loc.getPitch());
+
+        List<Player> outsideViewers = user.getUserBackpackManager().getCloudManager().refreshViewers(loc);
+        if (!user.isInWardrobe() && isFirstPersonCompadible() && user.getPlayer() != null) {
+            List<Player> owner = List.of(user.getPlayer());
+
+            ArrayList<Integer> particleCloud = user.getUserBackpackManager().getAreaEffectEntityId();
+            for (int i = 0; i < particleCloud.size(); i++) {
+                if (i == 0) {
+                    PacketManager.sendRidingPacket(entity.getEntityId(), particleCloud.get(i), owner);
+                } else {
+                    PacketManager.sendRidingPacket(particleCloud.get(i - 1), particleCloud.get(i) , owner);
+                }
+            }
+            PacketManager.sendRidingPacket(particleCloud.get(particleCloud.size() - 1), user.getUserBackpackManager().getFirstArmorStandId(), owner);
+            if (!user.getHidden()) NMSHandlers.getHandler().equipmentSlotUpdate(user.getUserBackpackManager().getFirstArmorStandId(), EquipmentSlot.HEAD, firstPersonBackpack, owner);
+            MessagesUtil.sendDebugMessages("First Person Backpack Update[owner=" + user.getUniqueId() + ",player_location=" + loc + "]!", Level.INFO);
+        }
+        PacketManager.sendRidingPacket(entity.getEntityId(), user.getUserBackpackManager().getFirstArmorStandId(), outsideViewers);
+
         user.getUserBackpackManager().showBackpack();
     }
 
@@ -61,7 +82,11 @@ public class CosmeticBackpackType extends Cosmetic {
         return modelName;
     }
 
-    public UserBackpackManager.BackpackType getBackpackType() {
+    public boolean isFirstPersonCompadible() {
-        return backpackType;
+        return firstPersonBackpack != null;
+    }
+
+    public ItemStack getFirstPersonBackpack() {
+        return firstPersonBackpack;
     }
 }

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

@@ -2,8 +2,8 @@ package com.hibiscusmc.hmccosmetics.cosmetic.types;
 
 import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
-import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager;
 import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -21,7 +21,7 @@ public class CosmeticBalloonType extends Cosmetic {
 
     private final String modelName;
     private List<String> dyableParts;
-    private boolean showLead;
+    private final boolean showLead;
 
     public CosmeticBalloonType(String id, ConfigurationNode config) {
         super(id, config);
@@ -38,7 +38,7 @@ public class CosmeticBalloonType extends Cosmetic {
             // Seriously?
             throw new RuntimeException(e);
         }
-
+        if (modelId != null) modelId = modelId.toLowerCase(); // ME only accepts lowercase
         this.modelName = modelId;
     }
 
@@ -73,6 +73,10 @@ public class CosmeticBalloonType extends Cosmetic {
 
         PacketManager.sendTeleportPacket(userBalloonManager.getPufferfishBalloonId(), newLocation, false, viewer);
         PacketManager.sendLeashPacket(userBalloonManager.getPufferfishBalloonId(), entity.getEntityId(), viewer);
+        if (user.getHidden()) {
+            userBalloonManager.getPufferfish().hidePufferfish();
+            return;
+        }
         if (!user.getHidden() && showLead) {
             List<Player> sendTo = userBalloonManager.getPufferfish().refreshViewers(newLocation);
             if (sendTo.isEmpty()) return;

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

@@ -2,7 +2,6 @@ package com.hibiscusmc.hmccosmetics.database;
 
 import com.hibiscusmc.hmccosmetics.config.DatabaseSettings;
 import com.hibiscusmc.hmccosmetics.database.types.Data;
-import com.hibiscusmc.hmccosmetics.database.types.InternalData;
 import com.hibiscusmc.hmccosmetics.database.types.MySQLData;
 import com.hibiscusmc.hmccosmetics.database.types.SQLiteData;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
@@ -16,9 +15,6 @@ public class Database {
 
     private static Data data;
 
-    @Deprecated
-    private static InternalData INTERNAL_DATA  = new InternalData();
-
     private static final MySQLData MYSQL_DATA = new MySQLData();
     private static final SQLiteData SQLITE_DATA = new SQLiteData();
 

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

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

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

@@ -6,7 +6,10 @@ import org.bukkit.Bukkit;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.util.Properties;
 import java.util.UUID;
 

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

@@ -15,7 +15,7 @@ import java.util.UUID;
 
 public abstract class SQLData extends Data {
     @Override
-    @SuppressWarnings({"Duplicates", "resource"}) // Duplicate is from deprecated InternalData
+    @SuppressWarnings({"resource"}) // Duplicate is from deprecated InternalData
     public CosmeticUser get(UUID uniqueId) {
         CosmeticUser user = new CosmeticUser(uniqueId);
 

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

@@ -6,7 +6,10 @@ import org.bukkit.Bukkit;
 
 import java.io.File;
 import java.io.IOException;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.util.UUID;
 import java.util.logging.Level;
 

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

@@ -18,7 +18,7 @@ import java.util.Set;
  */
 @SuppressWarnings("SpellCheckingInspection")
 public class EmoteManager {
-    private static final @NotNull Map<@NotNull String, @NotNull String> emotes = new HashMap<>();
+    private static final @NotNull Map<String, String> emotes = new HashMap<>();
 
     /**
      * Loads all BlockBench animations from the emotes folder and puts it into the animation manager registry and local registry

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

@@ -2,18 +2,20 @@ package com.hibiscusmc.hmccosmetics.gui;
 
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.api.events.PlayerMenuOpenEvent;
+import com.hibiscusmc.hmccosmetics.config.Settings;
 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.Hooks;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.hibiscusmc.hmccosmetics.util.misc.Adventure;
-import com.hibiscusmc.hmccosmetics.util.misc.Placeholder;
 import dev.triumphteam.gui.builder.item.ItemBuilder;
 import dev.triumphteam.gui.guis.Gui;
 import dev.triumphteam.gui.guis.GuiItem;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
+import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
@@ -23,7 +25,9 @@ import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public class Menu {
 
@@ -32,6 +36,8 @@ public class Menu {
     private final int rows;
     private final ConfigurationNode config;
     private final String permissionNode;
+    private final ArrayList<MenuItem> items;
+    private final int refreshRate;
 
     public Menu(String id, @NotNull ConfigurationNode config) {
         this.id = id;
@@ -40,64 +46,15 @@ public class Menu {
         title = config.node("title").getString("chest");
         rows = config.node("rows").getInt(1);
         permissionNode = config.node("permission").getString("");
+        refreshRate = config.node("refresh-rate").getInt(-1);
+
+        items = new ArrayList<>();
+        setupItems();
 
         Menus.addMenu(this);
     }
 
-    public String getId() {
+    private void setupItems() {
-        return id;
-    }
-
-    public String getTitle() {
-        return this.title;
-    }
-
-    public int getRows() {
-        return this.getRows();
-    }
-
-    public void openMenu(CosmeticUser user) {
-        openMenu(user, false);
-    }
-
-    public void openMenu(@NotNull CosmeticUser user, boolean ignorePermission) {
-        Player player = user.getPlayer();
-        if (player == null) return;
-        if (!ignorePermission && !permissionNode.isEmpty()) {
-            if (!player.hasPermission(permissionNode) && !player.isOp()) {
-                MessagesUtil.sendMessage(player, "no-permission");
-                return;
-            }
-        }
-        final Component component = Adventure.MINI_MESSAGE.deserialize(Placeholder.applyPapiPlaceholders(player, this.title));
-        Gui gui = Gui.gui().
-                title(component).
-                rows(this.rows).
-                create();
-
-        gui.setDefaultClickAction(event -> event.setCancelled(true));
-
-        // TODO: Redo this whole gui creation process to allow for all items, possibly implement caching
-        gui = getItems(user, gui);
-        final Gui finalGui = gui; // Need to make it final for the runtask
-
-        // API
-        PlayerMenuOpenEvent event = new PlayerMenuOpenEvent(user, this);
-        Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
-            Bukkit.getPluginManager().callEvent(event);
-        });
-        if (event.isCancelled()) return;
-        // Internal
-
-        Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
-            finalGui.open(player);
-        });
-    }
-
-    @Contract("_, _ -> param2")
-    private Gui getItems(@NotNull CosmeticUser user, Gui gui) {
-        Player player = user.getPlayer();
-
         for (ConfigurationNode config : config.node("items").childrenMap().values()) {
 
             List<String> slotString;
@@ -137,27 +94,97 @@ public class Menu {
                 if (Types.isType(typeId)) type = Types.getType(typeId);
             }
 
-            for (int slot : slots) {
+            items.add(new MenuItem(slots, item, type, config));
-                ItemStack modifiedItem = getMenuItem(user, type, config, item.clone(), slot).clone();
+        }
-                GuiItem guiItem = ItemBuilder.from(modifiedItem).asGuiItem();
+    }
 
-                Type finalType = type;
+    public String getId() {
+        return id;
+    }
+
+    public String getTitle() {
+        return this.title;
+    }
+
+    public int getRows() {
+        return this.getRows();
+    }
+
+    public void openMenu(CosmeticUser user) {
+        openMenu(user, false);
+    }
+
+    public void openMenu(@NotNull CosmeticUser user, boolean ignorePermission) {
+        Player player = user.getPlayer();
+        if (player == null) return;
+        if (!ignorePermission && !permissionNode.isEmpty()) {
+            if (!player.hasPermission(permissionNode) && !player.isOp()) {
+                MessagesUtil.sendMessage(player, "no-permission");
+                return;
+            }
+        }
+        final Component component = Adventure.MINI_MESSAGE.deserialize(Hooks.processPlaceholders(player, this.title));
+        Gui gui = Gui.gui().
+                title(component).
+                rows(this.rows).
+                create();
+
+        gui.setDefaultClickAction(event -> event.setCancelled(true));
+
+        AtomicInteger taskid = new AtomicInteger(-1);
+        gui.setOpenGuiAction(event -> {
+            Runnable run = new Runnable() {
+                @Override
+                public void run() {
+                    if (gui.getInventory().getViewers().size() == 0 && taskid.get() != -1) {
+                        Bukkit.getScheduler().cancelTask(taskid.get());
+                    }
+
+                    updateMenu(user, gui);
+                }
+            };
+
+            if (refreshRate != -1) {
+                taskid.set(Bukkit.getScheduler().scheduleSyncRepeatingTask(HMCCosmeticsPlugin.getInstance(), run, 0, refreshRate));
+            } else {
+                run.run();
+            }
+        });
+
+        gui.setCloseGuiAction(event -> {
+            if (taskid.get() != -1) Bukkit.getScheduler().cancelTask(taskid.get());
+        });
+
+        // API
+        PlayerMenuOpenEvent event = new PlayerMenuOpenEvent(user, this);
+        Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
+            Bukkit.getPluginManager().callEvent(event);
+        });
+        if (event.isCancelled()) return;
+        // Internal
+
+        Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
+            gui.open(player);
+        });
+    }
+
+    private void updateMenu(CosmeticUser user, Gui gui) {
+        for (MenuItem item : items) {
+            Type type = item.getType();
+            for (int slot : item.getSlots()) {
+                ItemStack modifiedItem = getMenuItem(user, type, item.getItemConfig(), item.getItem().clone(), slot);
+                GuiItem guiItem = ItemBuilder.from(modifiedItem).asGuiItem();
                 guiItem.setAction(event -> {
                     MessagesUtil.sendDebugMessages("Selected slot " + slot);
                     final ClickType clickType = event.getClick();
-                    if (finalType != null) finalType.run(user, config, clickType);
+                    if (type != null) type.run(user, item.getItemConfig(), clickType);
-                    // Need to delay the update by a tick so it will actually update with new values
+                    updateMenu(user, gui);
-                    for (int guiSlot : slots) {
-                        gui.updateItem(guiSlot, getMenuItem(user, finalType, config, item.clone(), guiSlot));
-                    }
-                    MessagesUtil.sendDebugMessages("Updated slot " + slot);
                 });
 
-                MessagesUtil.sendDebugMessages("Added " + slots + " as " + guiItem + " in the menu");
+                MessagesUtil.sendDebugMessages("Added " + slot + " as " + guiItem + " in the menu");
-                gui.setItem(slot, guiItem);
+                gui.updateItem(slot, guiItem);
             }
         }
-        return gui;
     }
 
     @NotNull

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

@@ -0,0 +1,39 @@
+package com.hibiscusmc.hmccosmetics.gui;
+
+import com.hibiscusmc.hmccosmetics.gui.type.Type;
+import org.bukkit.inventory.ItemStack;
+import org.spongepowered.configurate.ConfigurationNode;
+
+import java.util.List;
+
+public class MenuItem {
+
+    private List<Integer> slots;
+    private ItemStack item;
+    private Type type;
+    private ConfigurationNode itemConfig;
+
+    public MenuItem(List<Integer> slots, ItemStack item, Type type, ConfigurationNode itemConfig) {
+        this.slots = slots;
+        this.item = item;
+        this.type = type;
+        this.itemConfig = itemConfig;
+    }
+
+    public List<Integer> getSlots() {
+        return slots;
+    }
+
+    public ItemStack getItem() {
+        return item;
+    }
+
+    public Type getType() {
+        return type;
+    }
+
+    public ConfigurationNode getItemConfig() {
+        return itemConfig;
+    }
+
+}

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

@@ -13,7 +13,6 @@ import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
 import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;

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

@@ -1,6 +1,5 @@
 package com.hibiscusmc.hmccosmetics.gui.action.actions;
 
-import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.gui.Menu;
 import com.hibiscusmc.hmccosmetics.gui.Menus;
 import com.hibiscusmc.hmccosmetics.gui.action.Action;

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

@@ -8,7 +8,6 @@ import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 import com.hibiscusmc.hmccosmetics.hooks.Hooks;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
-import com.hibiscusmc.hmccosmetics.util.misc.Placeholder;
 import org.bukkit.Bukkit;
 import org.bukkit.Color;
 import org.bukkit.Material;
@@ -33,7 +32,7 @@ public class DyeMenu {
         if (originalItem == null || !cosmetic.isDyable()) return;
 
         Gui gui = HMCColorApi.INSTANCE.colorMenu();
-        gui.updateTitle(Placeholder.applyPapiPlaceholders(player, Settings.getDyeMenuName()));
+        gui.updateTitle(Hooks.processPlaceholders(player, Settings.getDyeMenuName()));
         gui.setItem(Settings.getDyeMenuInputSlot(), new GuiItem(originalItem));
         gui.setDefaultTopClickAction(event -> {
             if (event.getSlot() == Settings.getDyeMenuOutputSlot()) {

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

@@ -3,7 +3,6 @@ package com.hibiscusmc.hmccosmetics.gui.type;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
 import org.spongepowered.configurate.ConfigurationNode;
 
 public abstract class Type {

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

@@ -1,6 +1,7 @@
 package com.hibiscusmc.hmccosmetics.gui.type.types;
 
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
+import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.config.serializer.ItemSerializer;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
@@ -11,9 +12,6 @@ import com.hibiscusmc.hmccosmetics.gui.type.Type;
 import com.hibiscusmc.hmccosmetics.hooks.Hooks;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
-import com.hibiscusmc.hmccosmetics.util.misc.StringUtils;
-import com.hibiscusmc.hmccosmetics.util.misc.Utils;
-import me.clip.placeholderapi.PlaceholderAPI;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
@@ -25,10 +23,8 @@ import org.jetbrains.annotations.NotNull;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 
-import java.lang.invoke.TypeDescriptor;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public class TypeCosmetic extends Type {
 
@@ -38,23 +34,45 @@ public class TypeCosmetic extends Type {
 
     @Override
     public void run(CosmeticUser user, @NotNull ConfigurationNode config, ClickType clickType) {
-        if (config.node("cosmetic").virtual()) return;
+        MessagesUtil.sendDebugMessages("Running Cosmetic Click Type");
+        if (config.node("cosmetic").virtual()) {
+            MessagesUtil.sendDebugMessages("Cosmetic Config Field Virtual");
+            return;
+        }
         String cosmeticName = config.node("cosmetic").getString();
         Cosmetic cosmetic = Cosmetics.getCosmetic(cosmeticName);
         Player player = user.getPlayer();
         if (cosmetic == null) {
+            MessagesUtil.sendDebugMessages("No Cosmetic Found");
             MessagesUtil.sendMessage(player, "invalid-cosmetic");
             return;
         }
 
         if (!user.canEquipCosmetic(cosmetic)) {
+            MessagesUtil.sendDebugMessages("No Cosmetic Permission");
             MessagesUtil.sendMessage(player, "no-cosmetic-permission");
             return;
         }
 
+        boolean isUnEquippingCosmetic = false;
+        if (user.getCosmetic(cosmetic.getSlot()) == cosmetic) isUnEquippingCosmetic = true;
+
+        String requiredClick;
+        if (isUnEquippingCosmetic) requiredClick = Settings.getCosmeticUnEquipClickType();
+        else requiredClick = Settings.getCosmeticEquipClickType();
+
+        MessagesUtil.sendDebugMessages("Required click type: " + requiredClick);
+        MessagesUtil.sendDebugMessages("Click type: " + clickType.name());
+        if (!requiredClick.equalsIgnoreCase("ANY") && !requiredClick.equalsIgnoreCase(clickType.name())) {
+            MessagesUtil.sendMessage(user.getPlayer(), "invalid-click-type");
+            return;
+        }
+
         List<String> actionStrings = new ArrayList<>();
         ConfigurationNode actionConfig = config.node("actions");
 
+        MessagesUtil.sendDebugMessages("Running Actions");
+
         try {
             if (!actionConfig.node("any").virtual()) actionStrings.addAll(actionConfig.node("any").getList(String.class));
 
@@ -67,7 +85,7 @@ public class TypeCosmetic extends Type {
                 }
             }
 
-            if (user.getCosmetic(cosmetic.getSlot()) == cosmetic) {
+            if (isUnEquippingCosmetic) {
                 if (!actionConfig.node("on-unequip").virtual()) actionStrings.addAll(actionConfig.node("on-unequip").getList(String.class));
                 MessagesUtil.sendDebugMessages("on-unequip");
                 user.removeCosmeticSlot(cosmetic);
@@ -85,7 +103,7 @@ public class TypeCosmetic extends Type {
             Actions.runActions(user, actionStrings);
 
         } catch (SerializationException e) {
-            throw new RuntimeException(e);
+            e.printStackTrace();
         }
         // Fixes issue with offhand cosmetics not appearing. Yes, I know this is dumb
         Runnable run = () -> user.updateCosmetic(cosmetic.getSlot());
@@ -95,6 +113,7 @@ public class TypeCosmetic extends Type {
             }
         }
         run.run();
+        MessagesUtil.sendDebugMessages("Finished Type Click Run");
     }
 
     @Override
@@ -152,10 +171,13 @@ public class TypeCosmetic extends Type {
     private ItemMeta processLoreLines(CosmeticUser user, @NotNull ItemMeta itemMeta) {
         List<String> processedLore = new ArrayList<>();
 
+        if (itemMeta.hasDisplayName()) {
+            itemMeta.setDisplayName(Hooks.processPlaceholders(user.getPlayer(), itemMeta.getDisplayName()));
+        }
+
         if (itemMeta.hasLore()) {
             for (String loreLine : itemMeta.getLore()) {
-                if (Hooks.isActiveHook("PlaceholderAPI")) loreLine = PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine);
+                processedLore.add(Hooks.processPlaceholders(user.getPlayer(), loreLine));
-                processedLore.add(loreLine);
             }
         }
         itemMeta.setLore(processedLore);

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

@@ -4,7 +4,6 @@ import com.hibiscusmc.hmccosmetics.gui.action.Actions;
 import com.hibiscusmc.hmccosmetics.gui.type.Type;
 import com.hibiscusmc.hmccosmetics.hooks.Hooks;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
-import me.clip.placeholderapi.PlaceholderAPI;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
@@ -58,11 +57,13 @@ public class TypeEmpty extends Type {
         List<String> processedLore = new ArrayList<>();
         ItemMeta itemMeta = itemStack.getItemMeta();
 
+        if (itemMeta.hasDisplayName()) {
+            itemMeta.setDisplayName(Hooks.processPlaceholders(user.getPlayer(), itemMeta.getDisplayName()));
+        }
+
         if (itemMeta.hasLore()) {
             for (String loreLine : itemMeta.getLore()) {
-                if (Hooks.isActiveHook("PlaceholderAPI"))
+                processedLore.add(Hooks.processPlaceholders(user.getPlayer(), loreLine));
-                    loreLine = PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine);
-                processedLore.add(loreLine);
             }
         }
         itemStack.setItemMeta(itemMeta);

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

@@ -4,8 +4,10 @@ import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.hooks.items.*;
 import com.hibiscusmc.hmccosmetics.hooks.misc.*;
 import com.hibiscusmc.hmccosmetics.hooks.placeholders.HookPlaceholderAPI;
+import me.clip.placeholderapi.PlaceholderAPI;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -27,6 +29,7 @@ public class Hooks {
     private static HookHMCColor HMC_COLOR_HOOK = new HookHMCColor();
     private static HookCMI CMI_HOOK = new HookCMI();
     private static HookLibsDisguises LIBS_DISGUISES_HOOK = new HookLibsDisguises();
+    private static HookModelEngine MODEL_ENGINE_HOOK = new HookModelEngine();
 
     public static Hook getHook(@NotNull String id) {
         return hooks.get(id.toLowerCase());
@@ -70,6 +73,12 @@ public class Hooks {
         return hook.getItem(split[1]);
     }
 
+    @NotNull
+    public static String processPlaceholders(OfflinePlayer player, String raw) {
+        if (getHook("PlaceholderAPI").isActive()) return PlaceholderAPI.setPlaceholders(player, raw);
+        return raw;
+    }
+
     public static boolean isActiveHook(String id) {
         Hook hook = getHook(id);
         if (hook == null) return false;

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

@@ -7,6 +7,7 @@ import dev.lone.itemsadder.api.CustomStack;
 import dev.lone.itemsadder.api.Events.ItemsAdderLoadDataEvent;
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
@@ -36,7 +37,7 @@ public class HookItemAdder extends Hook {
         }
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onItemAdderDataLoad(ItemsAdderLoadDataEvent event) {
         // By default, it will only run once at startup, if hook setting is enabled
         if (enabled && !Settings.getItemsAdderReloadChange()) return;

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

@@ -7,6 +7,7 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -17,7 +18,7 @@ public class HookCMI extends Hook {
         super("CMI");
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerVanish(@NotNull CMIPlayerVanishEvent event) {
         Player player = event.getPlayer();
         CosmeticUser user = CosmeticUsers.getUser(player);
@@ -25,7 +26,7 @@ public class HookCMI extends Hook {
         user.hideCosmetics(CosmeticUser.HiddenReason.PLUGIN);
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerShow(@NotNull CMIPlayerUnVanishEvent event) {
         Player player = event.getPlayer();
         CosmeticUser user = CosmeticUsers.getUser(player);

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

@@ -7,6 +7,7 @@ import me.libraryaddict.disguise.events.DisguiseEvent;
 import me.libraryaddict.disguise.events.UndisguiseEvent;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.jetbrains.annotations.NotNull;
 
 public class HookLibsDisguises extends Hook {
@@ -14,7 +15,7 @@ public class HookLibsDisguises extends Hook {
         super("LibsDisguises");
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerVanish(@NotNull DisguiseEvent event) {
         if (!(event.getEntity() instanceof Player player)) return;
         CosmeticUser user = CosmeticUsers.getUser(player);
@@ -22,7 +23,7 @@ public class HookLibsDisguises extends Hook {
         user.hideCosmetics(CosmeticUser.HiddenReason.PLUGIN);
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerShow(@NotNull UndisguiseEvent event) {
         if (!(event.getEntity() instanceof Player player)) return;
         CosmeticUser user = CosmeticUsers.getUser(player);

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

@@ -0,0 +1,10 @@
+package com.hibiscusmc.hmccosmetics.hooks.misc;
+
+import com.hibiscusmc.hmccosmetics.hooks.Hook;
+
+public class HookModelEngine extends Hook {
+
+    public HookModelEngine() {
+        super("ModelEngine");
+    }
+}

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

@@ -7,6 +7,7 @@ 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.EventPriority;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -19,7 +20,7 @@ public class HookPremiumVanish extends Hook {
         super("PremiumVanish");
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerVanish(@NotNull PlayerHideEvent event) {
         Player player = event.getPlayer();
         CosmeticUser user = CosmeticUsers.getUser(player);
@@ -27,7 +28,7 @@ public class HookPremiumVanish extends Hook {
         user.hideCosmetics(CosmeticUser.HiddenReason.PLUGIN);
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerShow(@NotNull PlayerShowEvent event) {
         Player player = event.getPlayer();
         CosmeticUser user = CosmeticUsers.getUser(player);

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

@@ -7,6 +7,7 @@ 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.EventPriority;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -19,7 +20,7 @@ public class HookSuperVanish extends Hook {
         super("SuperVanish");
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerVanish(@NotNull PlayerHideEvent event) {
         Player player = event.getPlayer();
         CosmeticUser user = CosmeticUsers.getUser(player);
@@ -27,7 +28,7 @@ public class HookSuperVanish extends Hook {
         user.hideCosmetics(CosmeticUser.HiddenReason.PLUGIN);
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerShow(@NotNull PlayerShowEvent event) {
         Player player = event.getPlayer();
         CosmeticUser user = CosmeticUsers.getUser(player);

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

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

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

@@ -1,10 +1,10 @@
 package com.hibiscusmc.hmccosmetics.hooks.worldguard;
 
+import com.hibiscusmc.hmccosmetics.api.events.PlayerEmoteStartEvent;
 import com.hibiscusmc.hmccosmetics.config.Wardrobe;
 import com.hibiscusmc.hmccosmetics.config.WardrobeSettings;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
-import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldguard.WorldGuard;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
@@ -12,7 +12,9 @@ import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import com.sk89q.worldguard.protection.regions.RegionContainer;
 import com.sk89q.worldguard.protection.regions.RegionQuery;
 import org.bukkit.Location;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
@@ -22,15 +24,12 @@ import org.jetbrains.annotations.NotNull;
  * Contains {@link com.sk89q.worldguard.WorldGuard WorldGuard} related event listeners
  */
 public class WGListener implements Listener {
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerMove(@NotNull PlayerMoveEvent event) {
         CosmeticUser user = CosmeticUsers.getUser(event.getPlayer());
         if (user == null) return;
         Location location = event.getPlayer().getLocation();
-        com.sk89q.worldedit.util.Location loc = BukkitAdapter.adapt(location);
+        ApplicableRegionSet set = getRegions(location);
-        RegionContainer region = WorldGuard.getInstance().getPlatform().getRegionContainer();
-        RegionQuery query = region.createQuery();
-        ApplicableRegionSet set = query.getApplicableRegions(loc);
         if (user.getHidden()) {
             if (user.getHiddenReason() == CosmeticUser.HiddenReason.WORLDGUARD && set.getRegions().size() == 0) {
                 user.showCosmetics();
@@ -53,15 +52,12 @@ public class WGListener implements Listener {
         }
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerTeleport(PlayerTeleportEvent event) {
         CosmeticUser user = CosmeticUsers.getUser(event.getPlayer());
         if (user == null) return;
         Location location = event.getTo();
-        com.sk89q.worldedit.util.Location loc = BukkitAdapter.adapt(location);
+        ApplicableRegionSet set = getRegions(location);
-        RegionContainer region = WorldGuard.getInstance().getPlatform().getRegionContainer();
-        RegionQuery query = region.createQuery();
-        ApplicableRegionSet set = query.getApplicableRegions(loc);
         if (user.getHidden()) {
             if (user.getHiddenReason() == CosmeticUser.HiddenReason.WORLDGUARD && set.getRegions().size() == 0) {
                 user.showCosmetics();
@@ -83,4 +79,28 @@ public class WGListener implements Listener {
             }
         }
     }
+
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onPlayerEmote(PlayerEmoteStartEvent event) {
+        Player player = event.getUser().getPlayer();
+        if (player == null) return;
+        Location location = player.getLocation();
+        ApplicableRegionSet set = getRegions(location);
+        for (ProtectedRegion protectedRegion : set.getRegions()) {
+            if (protectedRegion.getFlags().containsKey(WGHook.getEmotesEnableFlag())) {
+                if (protectedRegion.getFlags().get(WGHook.getEmotesEnableFlag()).toString().equalsIgnoreCase("DENY")) {
+                    event.setCancelled(true);
+                    return;
+                }
+                return;
+            }
+        }
+    }
+
+    private ApplicableRegionSet getRegions(Location location) {
+        com.sk89q.worldedit.util.Location loc = BukkitAdapter.adapt(location);
+        RegionContainer region = WorldGuard.getInstance().getPlatform().getRegionContainer();
+        RegionQuery query = region.createQuery();
+        return query.getApplicableRegions(loc);
+    }
 }

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

@@ -11,6 +11,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
@@ -18,10 +19,10 @@ import org.jetbrains.annotations.NotNull;
 
 public class PlayerConnectionListener implements Listener {
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerJoin(@NotNull PlayerJoinEvent event) {
         if (event.getPlayer().isOp() || event.getPlayer().hasPermission("hmccosmetics.notifyupdate")) {
-            if (!HMCCosmeticsPlugin.getLatestVersion().equalsIgnoreCase(HMCCosmeticsPlugin.getInstance().getDescription().getVersion()) && HMCCosmeticsPlugin.getLatestVersion() != null)
+            if (!HMCCosmeticsPlugin.getLatestVersion().equalsIgnoreCase(HMCCosmeticsPlugin.getInstance().getDescription().getVersion()) && HMCCosmeticsPlugin.getLatestVersion().isEmpty())
                 MessagesUtil.sendMessageNoKey(
                         event.getPlayer(),
                         "<br>" +
@@ -47,7 +48,7 @@ public class PlayerConnectionListener implements Listener {
         }
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerQuit(@NotNull PlayerQuitEvent event) {
         CosmeticUser user = CosmeticUsers.getUser(event.getPlayer());
         if (user == null) { // Remove any passengers if a user failed to initialize. Bugs can cause this to happen

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

@@ -35,6 +35,7 @@ import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Pose;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.*;
 import org.bukkit.event.inventory.InventoryClickEvent;
@@ -45,6 +46,8 @@ import org.bukkit.persistence.PersistentDataType;
 import org.bukkit.potion.PotionEffectType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.spigotmc.event.entity.EntityDismountEvent;
+import org.spigotmc.event.entity.EntityMountEvent;
 
 import java.util.*;
 
@@ -62,7 +65,7 @@ public class PlayerGameListener implements Listener {
         //registerTeleportMovement();
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.LOW)
     public void onPlayerClick(@NotNull InventoryClickEvent event) {
         // || !event.getClickedInventory().getType().equals(InventoryType.PLAYER)
         if (event.getClick().isShiftClick()) return;
@@ -89,7 +92,7 @@ public class PlayerGameListener implements Listener {
         MessagesUtil.sendDebugMessages("Event fired, updated cosmetic " + cosmeticSlot);
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.LOW)
     public void onPlayerShift(PlayerToggleSneakEvent event) {
         CosmeticUser user = CosmeticUsers.getUser(event.getPlayer().getUniqueId());
 
@@ -104,7 +107,7 @@ public class PlayerGameListener implements Listener {
         user.leaveWardrobe();
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.LOW)
     public void onPlayerTeleport(PlayerTeleportEvent event) {
         CosmeticUser user = CosmeticUsers.getUser(event.getPlayer().getUniqueId());
 
@@ -114,28 +117,27 @@ public class PlayerGameListener implements Listener {
             return;
         }
 
-        if (user.hasCosmeticInSlot(CosmeticSlot.BACKPACK) && user.getUserBackpackManager() != null) {
+        if (user.isInWardrobe()) {
-            Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
+            user.leaveWardrobe();
-                user.respawnBackpack();
-                user.updateCosmetic();
-            }, 1);
         }
 
+        Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
+            if (user.hasCosmeticInSlot(CosmeticSlot.BACKPACK) && user.getUserBackpackManager() != null) {
+                user.respawnBackpack();
+            }
+            if (user.hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
+                user.respawnBalloon();
+            }
+            user.updateCosmetic();
+        }, 1);
+
         if (event.getCause().equals(PlayerTeleportEvent.TeleportCause.NETHER_PORTAL) || event.getCause().equals(PlayerTeleportEvent.TeleportCause.END_PORTAL)) return;
-
-        if (user.hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
-            final CosmeticBalloonType cosmeticBalloonType = (CosmeticBalloonType) user.getCosmetic(CosmeticSlot.BALLOON);
-            user.despawnBalloon();
-            Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
-                user.spawnBalloon(cosmeticBalloonType);
-            }, 2);
-        }
         if (user.getUserEmoteManager().isPlayingEmote()) {
             user.getUserEmoteManager().stopEmote(UserEmoteManager.StopEmoteReason.TELEPORT);
         }
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.LOW)
     public void portalTeleport(PlayerPortalEvent event) {
         CosmeticUser user = CosmeticUsers.getUser(event.getPlayer().getUniqueId());
 
@@ -155,7 +157,7 @@ public class PlayerGameListener implements Listener {
         }
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerHit(EntityDamageByEntityEvent event) {
         if (event.isCancelled()) return;
         Entity entity = event.getEntity();
@@ -165,11 +167,10 @@ public class PlayerGameListener implements Listener {
         event.setCancelled(true);
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.LOW)
     public void onPlayerDamaged(EntityDamageEvent event) {
         if (event.isCancelled()) return;
-        if (!(event.getEntity() instanceof Player)) return;
+        if (!(event.getEntity() instanceof Player player)) return;
-        Player player = ((Player) event.getEntity()).getPlayer();
         CosmeticUser user = CosmeticUsers.getUser(player);
         if (user == null) return;
         if (user.getUserEmoteManager().isPlayingEmote()) {
@@ -185,11 +186,10 @@ public class PlayerGameListener implements Listener {
         }
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerLook(PlayerMoveEvent event) {
         if (event.isCancelled()) return;
         Player player = event.getPlayer();
-        // TODO: Move to packets
         CosmeticUser user = CosmeticUsers.getUser(player);
         if (user == null) return;
         // Really need to look into optimization of this
@@ -197,10 +197,9 @@ public class PlayerGameListener implements Listener {
         user.updateCosmetic(CosmeticSlot.BALLOON);
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerPoseChange(EntityPoseChangeEvent event) {
-        if (!(event.getEntity() instanceof Player)) return;
+        if (!(event.getEntity() instanceof Player player)) return;
-        Player player = ((Player) event.getEntity()).getPlayer();
         CosmeticUser user = CosmeticUsers.getUser(player);
         if (user == null) return;
         if (!user.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) return;
@@ -208,14 +207,7 @@ public class PlayerGameListener implements Listener {
         if (pose.equals(Pose.STANDING)) {
             // #84, Riptides mess with backpacks
             ItemStack currentItem = player.getInventory().getItemInMainHand();
-            if (currentItem != null) {
+            if (currentItem.containsEnchantment(Enchantment.RIPTIDE)) return;
-                if (currentItem.hasItemMeta()) {
-                    if (currentItem.containsEnchantment(Enchantment.RIPTIDE)) {
-                        return;
-                    }
-                }
-            }
-
             if (!user.isBackpackSpawned()) {
                 user.spawnBackpack((CosmeticBackpackType) user.getCosmetic(CosmeticSlot.BACKPACK));
             }
@@ -226,10 +218,9 @@ public class PlayerGameListener implements Listener {
         }
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.LOW)
     public void onPlayerArmorDamage(PlayerItemDamageEvent event) {
         // Possibly look into cancelling the event, then handling the damage on our own.
-
         if (event.isCancelled()) return;
         MessagesUtil.sendDebugMessages("PlayerItemDamageEvent");
 
@@ -247,6 +238,7 @@ public class PlayerGameListener implements Listener {
         if (slot == -1) return;
 
         CosmeticUser user = CosmeticUsers.getUser(event.getPlayer().getUniqueId());
+        if (user == null) return;
         CosmeticSlot cosmeticSlot = InventoryUtils.BukkitCosmeticSlot(slot);
 
         if (!user.hasCosmeticInSlot(cosmeticSlot)) {
@@ -260,7 +252,7 @@ public class PlayerGameListener implements Listener {
         }, 2);
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.LOW)
     public void playerOffhandSwap(PlayerSwapHandItemsEvent event) {
         CosmeticUser user = CosmeticUsers.getUser(event.getPlayer().getUniqueId());
         if (user == null) return;
@@ -276,7 +268,7 @@ public class PlayerGameListener implements Listener {
         }, 2);
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerPickupItem(EntityPickupItemEvent event) {
         if (!(event.getEntity() instanceof Player)) return;
         CosmeticUser user = CosmeticUsers.getUser(event.getEntity().getUniqueId());
@@ -284,7 +276,7 @@ public class PlayerGameListener implements Listener {
         if (user.isInWardrobe()) event.setCancelled(true);
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void playerInvisibility(EntityPotionEffectEvent event) {
         if (event.isCancelled()) return;
         if (!event.getModifiedType().equals(PotionEffectType.INVISIBILITY)) return;
@@ -302,7 +294,7 @@ public class PlayerGameListener implements Listener {
         }
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.LOW)
     public void onMainHandSwitch(PlayerItemHeldEvent event) {
         CosmeticUser user = CosmeticUsers.getUser(event.getPlayer());
         if (user == null) return;
@@ -323,7 +315,7 @@ public class PlayerGameListener implements Listener {
         }
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.LOW)
     public void onPlayerDeath(PlayerDeathEvent event) {
         CosmeticUser user = CosmeticUsers.getUser(event.getEntity());
         if (user == null) return;
@@ -335,7 +327,7 @@ public class PlayerGameListener implements Listener {
         }
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.LOW)
     public void onPlayerGamemodeSwitch(PlayerGameModeChangeEvent event) {
         CosmeticUser user = CosmeticUsers.getUser(event.getPlayer());
         if (user == null) return;
@@ -349,16 +341,41 @@ public class PlayerGameListener implements Listener {
         }
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.LOW)
     public void onPlayerCosemticEquip(PlayerCosmeticPostEquipEvent event) {
         CosmeticUser user = event.getUser();
         if (user.isInWardrobe() && event.getCosmetic().getSlot().equals(CosmeticSlot.BALLOON)) {
             Location NPCLocation = user.getWardrobeManager().getNpcLocation();
-            PacketManager.sendTeleportPacket(user.getBalloonManager().getPufferfishBalloonId(), NPCLocation.add(Settings.getBalloonOffset()), false, List.of(event.getUser().getPlayer()));
+            // We know that no other entity besides a regular player will be in the wardrobe
+            PacketManager.sendTeleportPacket(user.getBalloonManager().getPufferfishBalloonId(), NPCLocation.add(Settings.getBalloonOffset()), false, List.of(user.getPlayer()));
             user.getBalloonManager().getModelEntity().teleport(NPCLocation.add(Settings.getBalloonOffset()));
         }
     }
 
+    @EventHandler
+	public void onPlayerMounted(EntityMountEvent event) {
+		if (!event.isCancelled() && event.getEntity() instanceof Player player) {
+            CosmeticUser user = CosmeticUsers.getUser(player);
+            if (user == null) return;
+
+            Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(HMCCosmeticsPlugin.getInstance(), ()->{
+                user.respawnBackpack();
+            }, 1);
+		}
+	}
+
+	@EventHandler
+	public void onPlayerDismounted(EntityDismountEvent event) {
+		if (!event.isCancelled() && event.getDismounted() instanceof Player player) {
+            CosmeticUser user = CosmeticUsers.getUser(player);
+            if (user == null) return;
+
+            Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(HMCCosmeticsPlugin.getInstance(), ()->{
+                user.respawnBackpack();
+            }, 1);
+		}
+	}
+
     private void registerInventoryClickListener() {
         ProtocolLibrary.getProtocolManager().addPacketListener(new PacketAdapter(HMCCosmeticsPlugin.getInstance(), ListenerPriority.NORMAL, PacketType.Play.Client.WINDOW_CLICK) {
             @Override
@@ -371,7 +388,7 @@ public class PlayerGameListener implements Listener {
                 if (invTypeClicked != 0) return;
                 // -999 is when a player clicks outside their inventory. https://wiki.vg/Inventory#Player_Inventory
                 if (slotClicked == -999) return;
-                if (!(event.getPlayer() instanceof Player)) return;
+                if (event.getPlayer() == null) return;
 
                 CosmeticUser user = CosmeticUsers.getUser(player);
                 if (user == null) return;
@@ -391,7 +408,6 @@ public class PlayerGameListener implements Listener {
                 MessagesUtil.sendDebugMessages("Menu Initial ");
                 Player player = event.getPlayer();
                 if (event.getPlayer() == null) return;
-                if (!(event.getPlayer() instanceof Player)) return;
 
                 int windowID = event.getPacket().getIntegers().read(0);
                 List<ItemStack> slotData = event.getPacket().getItemListModifier().read(0);
@@ -466,7 +482,7 @@ public class PlayerGameListener implements Listener {
         ProtocolLibrary.getProtocolManager().addPacketListener(new PacketAdapter(HMCCosmeticsPlugin.getInstance(), ListenerPriority.NORMAL, PacketType.Play.Client.ARM_ANIMATION) {
             @Override
             public void onPacketReceiving(PacketEvent event) {
-                if (!(event.getPlayer() instanceof Player)) return;
+                if (event.getPlayer() == null) return;
                 Player player = event.getPlayer();
                 CosmeticUser user = CosmeticUsers.getUser(player);
                 if (user == null) return;
@@ -487,9 +503,8 @@ public class PlayerGameListener implements Listener {
         ProtocolLibrary.getProtocolManager().addPacketListener(new PacketAdapter(HMCCosmeticsPlugin.getInstance(), ListenerPriority.NORMAL, PacketType.Play.Client.USE_ENTITY) {
             @Override
             public void onPacketReceiving(PacketEvent event) {
-                if (!(event.getPlayer() instanceof Player)) return;
+                if (event.getPlayer() == null) return;
-                Player player = event.getPlayer();
+                CosmeticUser user = CosmeticUsers.getUser(event.getPlayer());
-                CosmeticUser user = CosmeticUsers.getUser(player);
                 if (user == null) return;
                 if (user.getUserEmoteManager().isPlayingEmote() || user.isInWardrobe()) {
                     event.setCancelled(true);

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

@@ -3,9 +3,8 @@ 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.user.manager.UserBalloonManager;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
-import net.kyori.adventure.text.Component;
+import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager;
 import org.bukkit.Location;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Entity;
@@ -26,8 +25,6 @@ public interface NMSHandler {
 
     Entity spawnBackpack(CosmeticUser user, CosmeticBackpackType cosmeticBackpackType);
 
-    Entity spawnHMCParticleCloud(Location location);
-
     Entity spawnDisplayEntity(Location location, String text);
 
     UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType);

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

@@ -9,19 +9,23 @@ import com.hibiscusmc.hmccosmetics.config.Wardrobe;
 import com.hibiscusmc.hmccosmetics.config.WardrobeSettings;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
-import com.hibiscusmc.hmccosmetics.cosmetic.types.*;
+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.hooks.Hooks;
+import com.hibiscusmc.hmccosmetics.nms.NMSHandlers;
 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 me.clip.placeholderapi.PlaceholderAPI;
+import org.bukkit.Bukkit;
-import org.bukkit.*;
+import org.bukkit.Color;
+import org.bukkit.Material;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
@@ -59,7 +63,7 @@ public class CosmeticUser {
         Runnable run = () -> {
             MessagesUtil.sendDebugMessages("Tick[uuid=" + uniqueId + "]", Level.INFO);
             updateCosmetic();
-            if (getHidden()) MessagesUtil.sendActionBar(getPlayer(), "hidden-cosmetics");
+            if (getHidden() && !getUserEmoteManager().isPlayingEmote()) MessagesUtil.sendActionBar(getPlayer(), "hidden-cosmetics");
         };
 
         int tickPeriod = Settings.getTickPeriod();
@@ -220,7 +224,7 @@ public class CosmeticUser {
                 if (skullMeta.getPersistentDataContainer().has(InventoryUtils.getSkullOwner(), PersistentDataType.STRING)) {
                     String owner = skullMeta.getPersistentDataContainer().get(InventoryUtils.getSkullOwner(), PersistentDataType.STRING);
 
-                    if (Hooks.isActiveHook("PlaceholderAPI")) owner = PlaceholderAPI.setPlaceholders(getPlayer(), owner);
+                    owner = Hooks.processPlaceholders(getPlayer(), owner);
 
                     skullMeta.setOwningPlayer(Bukkit.getOfflinePlayer(owner));
                     //skullMeta.getPersistentDataContainer().remove(InventoryUtils.getSkullOwner()); // Don't really need this?
@@ -228,7 +232,7 @@ public class CosmeticUser {
                 if (skullMeta.getPersistentDataContainer().has(InventoryUtils.getSkullTexture(), PersistentDataType.STRING)) {
                     String texture = skullMeta.getPersistentDataContainer().get(InventoryUtils.getSkullTexture(), PersistentDataType.STRING);
 
-                    if (Hooks.isActiveHook("PlaceholderAPI")) texture = PlaceholderAPI.setPlaceholders(getPlayer(), texture);
+                    texture = Hooks.processPlaceholders(getPlayer(), texture);
 
                     Bukkit.getUnsafe().modifyItemStack(item, "{SkullOwner:{Id:[I;0,0,0,0],Properties:{textures:[{Value:\""
                             + texture + "\"}]}}}");
@@ -242,14 +246,12 @@ public class CosmeticUser {
 
             if (itemMeta.hasLore()) {
                 for (String loreLine : itemMeta.getLore()) {
-                    if (Hooks.isActiveHook("PlaceholderAPI")) loreLine = PlaceholderAPI.setPlaceholders(getPlayer(), loreLine);
+                    processedLore.add(Hooks.processPlaceholders(getPlayer(), loreLine));
-                    processedLore.add(loreLine);
                 }
             }
             if (itemMeta.hasDisplayName()) {
                 String displayName = itemMeta.getDisplayName();
-                if (Hooks.isActiveHook("PlaceholderAPI")) displayName = PlaceholderAPI.setPlaceholders(getPlayer(), displayName);
+                itemMeta.setDisplayName(Hooks.processPlaceholders(getPlayer(), displayName));
-                itemMeta.setDisplayName(displayName);
             }
             itemMeta.setLore(processedLore);
 
@@ -348,7 +350,7 @@ public class CosmeticUser {
 
     public void spawnBackpack(CosmeticBackpackType cosmeticBackpackType) {
         if (this.userBackpackManager != null) return;
-        this.userBackpackManager = new UserBackpackManager(this, cosmeticBackpackType.getBackpackType());
+        this.userBackpackManager = new UserBackpackManager(this, cosmeticBackpackType.isFirstPersonCompadible());
         userBackpackManager.spawnBackpack(cosmeticBackpackType);
     }
 
@@ -365,6 +367,7 @@ public class CosmeticUser {
     public void spawnBalloon(CosmeticBalloonType cosmeticBalloonType) {
         if (this.userBalloonManager != null) return;
         this.userBalloonManager = NMSHandlers.getHandler().spawnBalloon(this, cosmeticBalloonType);
+        updateCosmetic(cosmeticBalloonType);
     }
 
     public void despawnBalloon() {
@@ -475,7 +478,7 @@ public class CosmeticUser {
     }
 
     public void showCosmetics() {
-        if (hideCosmetics == false) return;
+        if (!hideCosmetics) return;
 
         PlayerCosmeticShowEvent event = new PlayerCosmeticShowEvent(this);
         Bukkit.getPluginManager().callEvent(event);

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

@@ -7,6 +7,7 @@ import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Set;
 import java.util.UUID;
 
 public class CosmeticUsers {
@@ -43,4 +44,8 @@ public class CosmeticUsers {
         if (entity.getType().equals(EntityType.PLAYER)) return null;
         return COSMETIC_USERS.get(entity.getUniqueId());
     }
+
+    public static Set<CosmeticUser> values() {
+        return COSMETIC_USERS.values();
+    }
 }

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

@@ -0,0 +1,68 @@
+package com.hibiscusmc.hmccosmetics.user.manager;
+
+import com.hibiscusmc.hmccosmetics.util.PlayerUtils;
+import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+public class UserBackpackCloudManager {
+
+    private ArrayList<Integer> ids;
+    private UUID owner;
+    private List<Player> viewers = new ArrayList<>();
+    private Long lastUpdate;
+
+    public UserBackpackCloudManager(UUID owner) {
+        this.ids = new ArrayList<>();
+        this.owner = owner;
+        this.lastUpdate = 0L;
+    }
+
+    public ArrayList<Integer> getId() {
+        return ids;
+    }
+
+    public UUID getOwner() {
+        return owner;
+    }
+
+    public List<Player> refreshViewers(Location location) {
+        if (System.currentTimeMillis() - lastUpdate <= 1000) return List.of(); //Prevents mass refreshes
+        ArrayList<Player> newPlayers = new ArrayList<>();
+        ArrayList<Player> removePlayers = new ArrayList<>();
+        List<Player> players = PlayerUtils.getNearbyPlayers(location);
+
+        for (Player player : players) {
+            //if (player.getUniqueId().toString().equalsIgnoreCase(owner.toString())) continue;
+            if (!viewers.contains(player)) {
+                viewers.add(player);
+                newPlayers.add(player);
+                continue;
+            }
+            // bad loopdy loops
+            for (Player viewerPlayer : viewers) {
+                if (!players.contains(viewerPlayer)) {
+                    removePlayers.add(viewerPlayer);
+                    PacketManager.sendEntityDestroyPacket(ids, List.of(viewerPlayer)); // prevents random leashes
+                }
+            }
+        }
+        viewers.removeAll(removePlayers);
+        lastUpdate = System.currentTimeMillis();
+        return newPlayers;
+    }
+
+    public void hideEffects() {
+        PacketManager.sendEntityDestroyPacket(ids, viewers);
+        viewers.clear();
+    }
+
+    public List<Player> getViewers() {
+        return viewers;
+    }
+
+}

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

@@ -1,34 +1,43 @@
 package com.hibiscusmc.hmccosmetics.user.manager;
 
-import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
 import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType;
+import com.hibiscusmc.hmccosmetics.hooks.Hooks;
 import com.hibiscusmc.hmccosmetics.nms.NMSHandlers;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
+import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
 import com.ticxo.modelengine.api.ModelEngineAPI;
 import com.ticxo.modelengine.api.model.ActiveModel;
 import com.ticxo.modelengine.api.model.ModeledEntity;
-import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.entity.AreaEffectCloud;
 import org.bukkit.entity.ArmorStand;
+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;
+import java.util.List;
+import java.util.UUID;
 import java.util.logging.Level;
 
 public class UserBackpackManager {
 
     private boolean hideBackpack;
     private ArmorStand invisibleArmorStand;
-    private AreaEffectCloud particleCloud;
+    private ArrayList<Integer> particleCloud = new ArrayList<>();
     private final CosmeticUser user;
-    private BackpackType backpackType;
+    private boolean firstPerson;
+    private UserBackpackCloudManager cloudManager;
 
-    public UserBackpackManager(CosmeticUser user, BackpackType backpackType) {
+    public UserBackpackManager(CosmeticUser user, boolean firstPersonView) {
         this.user = user;
-        hideBackpack = false;
+        this.hideBackpack = false;
-        this.backpackType = backpackType;
+        this.firstPerson = firstPersonView;
+        this.cloudManager = new UserBackpackCloudManager(user.getUniqueId());
     }
 
     public int getFirstArmorStandId() {
@@ -50,42 +59,48 @@ public class UserBackpackManager {
     public void spawnBackpack(CosmeticBackpackType cosmeticBackpackType) {
         MessagesUtil.sendDebugMessages("spawnBackpack Bukkit - Start");
 
-        if (getBackpackType().equals(BackpackType.NORMAL)) {
+        spawn(cosmeticBackpackType);
-            spawnNormalBackpack(cosmeticBackpackType);
-        }
-        if (getBackpackType().equals(BackpackType.FIRST_PERSON)) {
-            spawnFirstPersonBackpack(cosmeticBackpackType);
-        }
     }
 
-    private void spawnNormalBackpack(CosmeticBackpackType cosmeticBackpackType) {
+    private void spawn(CosmeticBackpackType cosmeticBackpackType) {
-
         if (this.invisibleArmorStand != null) return;
-
         this.invisibleArmorStand = (ArmorStand) NMSHandlers.getHandler().spawnBackpack(user, cosmeticBackpackType);
 
-        if (cosmeticBackpackType.getModelName() != null && HMCCosmeticsPlugin.hasModelEngine()) {
+        Entity entity = user.getEntity();
-            if (ModelEngineAPI.api.getModelRegistry().getBlueprint(cosmeticBackpackType.getModelName()) == null) {
+
-                MessagesUtil.sendDebugMessages("Invalid Model Engine Blueprint " + cosmeticBackpackType.getModelName(), Level.SEVERE);
+        int[] passengerIDs = new int[entity.getPassengers().size() + 1];
-                return;
+
+        for (int i = 0; i < entity.getPassengers().size(); i++) {
+            passengerIDs[i] = entity.getPassengers().get(i).getEntityId();
+        }
+
+        passengerIDs[passengerIDs.length - 1] = this.getFirstArmorStandId();
+
+        List<Player> outsideViewers = user.getUserBackpackManager().getCloudManager().refreshViewers(user.getEntity().getLocation());
+        PacketManager.sendRidingPacket(user.getEntity().getEntityId(), passengerIDs, outsideViewers);
+
+        ArrayList<Player> owner = new ArrayList<>();
+        if (user.getPlayer() != null) owner.add(user.getPlayer());
+
+        if (cosmeticBackpackType.isFirstPersonCompadible()) {
+            for (int i = particleCloud.size(); i < 5; i++) {
+                int entityId = NMSHandlers.getHandler().getNextEntityId();
+                PacketManager.sendEntitySpawnPacket(user.getEntity().getLocation(), entityId, EntityType.AREA_EFFECT_CLOUD, UUID.randomUUID());
+                PacketManager.sendCloudEffect(entityId, PacketManager.getViewers(user.getEntity().getLocation()));
+                this.particleCloud.add(entityId);
             }
-            ModeledEntity modeledEntity = ModelEngineAPI.getOrCreateModeledEntity(invisibleArmorStand);
+            // Copied code from updating the backpack
-            ActiveModel model = ModelEngineAPI.createActiveModel(ModelEngineAPI.getBlueprint(cosmeticBackpackType.getModelName()));
+            for (int i = 0; i < particleCloud.size(); i++) {
-            model.setCanHurt(false);
+                if (i == 0) PacketManager.sendRidingPacket(entity.getEntityId(), particleCloud.get(i), owner);
-            modeledEntity.addModel(model, false);
+                else PacketManager.sendRidingPacket(particleCloud.get(i - 1), particleCloud.get(i) , owner);
+            }
+            PacketManager.sendRidingPacket(particleCloud.get(particleCloud.size() - 1), user.getUserBackpackManager().getFirstArmorStandId(), owner);
+            if (!user.getHidden()) NMSHandlers.getHandler().equipmentSlotUpdate(user.getUserBackpackManager().getFirstArmorStandId(), EquipmentSlot.HEAD, cosmeticBackpackType.getFirstPersonBackpack(), owner);
         }
+        PacketManager.sendRidingPacket(entity.getEntityId(), passengerIDs, outsideViewers);
 
-        MessagesUtil.sendDebugMessages("spawnBackpack Bukkit - Finish");
+        // No one should be using ME because it barely works but some still use it, so it's here
-    }
+        if (cosmeticBackpackType.getModelName() != null && Hooks.isActiveHook("ModelEngine")) {
-
-    public void spawnFirstPersonBackpack(CosmeticBackpackType cosmeticBackpackType) {
-
-        if (this.invisibleArmorStand != null) return;
-
-        this.invisibleArmorStand = (ArmorStand) NMSHandlers.getHandler().spawnBackpack(user, cosmeticBackpackType);
-        this.particleCloud = (AreaEffectCloud) NMSHandlers.getHandler().spawnHMCParticleCloud(user.getPlayer().getLocation());
-
-        if (cosmeticBackpackType.getModelName() != null && HMCCosmeticsPlugin.hasModelEngine()) {
             if (ModelEngineAPI.api.getModelRegistry().getBlueprint(cosmeticBackpackType.getModelName()) == null) {
                 MessagesUtil.sendDebugMessages("Invalid Model Engine Blueprint " + cosmeticBackpackType.getModelName(), Level.SEVERE);
                 return;
@@ -106,7 +121,9 @@ public class UserBackpackManager {
             this.invisibleArmorStand = null;
         }
         if (particleCloud != null) {
-            particleCloud.remove();
+            for (Integer entityId : particleCloud) {
+                PacketManager.sendEntityDestroyPacket(entityId, getCloudManager().getViewers());
+            }
             this.particleCloud = null;
         }
     }
@@ -129,16 +146,8 @@ public class UserBackpackManager {
         hideBackpack = shown;
     }
 
-    public BackpackType getBackpackType() {
+    public ArrayList<Integer> getAreaEffectEntityId() {
-        return backpackType;
+        return particleCloud;
-    }
-
-    public int getAreaEffectEntityId() {
-        return particleCloud.getEntityId();
-    }
-
-    public void teleportEffectEntity(Location location) {
-        particleCloud.teleport(location);
     }
 
     public void setItem(ItemStack item) {
@@ -150,8 +159,7 @@ public class UserBackpackManager {
         getArmorStand().getEquipment().setHelmet(item);
     }
 
-    public enum BackpackType {
+    public UserBackpackCloudManager getCloudManager() {
-        NORMAL,
+        return cloudManager;
-        FIRST_PERSON // First person not yet implemented
     }
 }

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

@@ -3,10 +3,10 @@ package com.hibiscusmc.hmccosmetics.user.manager;
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
+import com.hibiscusmc.hmccosmetics.hooks.Hooks;
 import com.hibiscusmc.hmccosmetics.nms.NMSHandlers;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
-import com.hibiscusmc.hmccosmetics.util.PlayerUtils;
 import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
 import com.ticxo.modelengine.api.ModelEngineAPI;
 import com.ticxo.modelengine.api.model.ActiveModel;
@@ -15,7 +15,6 @@ import org.bukkit.Color;
 import org.bukkit.Location;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
@@ -38,7 +37,7 @@ public class UserBalloonManager {
 
     public void spawnModel(@NotNull CosmeticBalloonType cosmeticBalloonType, Color color) {
         // redo this
-        if (cosmeticBalloonType.getModelName() != null && HMCCosmeticsPlugin.hasModelEngine()) {
+        if (cosmeticBalloonType.getModelName() != null && Hooks.isActiveHook("ModelEngine")) {
             balloonType = BalloonType.MODELENGINE;
         } else {
             if (cosmeticBalloonType.getItem() != null) {

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

@@ -1,6 +1,5 @@
 package com.hibiscusmc.hmccosmetics.user.manager;
 
-import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.hibiscusmc.hmccosmetics.util.PlayerUtils;
 import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
 import org.bukkit.Location;
@@ -20,7 +19,7 @@ public class UserBalloonPufferfish {
     public UserBalloonPufferfish(int id, UUID uuid) {
         this.id = id;
         this.uuid = uuid;
-        this.lastUpdate = System.currentTimeMillis();
+        this.lastUpdate = 0L;
     }
 
     public int getId() {
@@ -55,4 +54,9 @@ public class UserBalloonPufferfish {
         lastUpdate = System.currentTimeMillis();
         return newPlayers;
     }
+
+    public void hidePufferfish() {
+        PacketManager.sendEntityDestroyPacket(id, viewers);
+        viewers.clear();
+    }
 }

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

@@ -11,7 +11,6 @@ import com.ticxo.playeranimator.api.model.player.PlayerModel;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
-import org.bukkit.Material;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;

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

@@ -103,6 +103,7 @@ public class UserWardrobeManager {
             // NPC 2
             Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
                 PacketManager.sendFakePlayerSpawnPacket(npcLocation, WARDROBE_UUID, NPC_ID, viewer);
+                PacketManager.sendPlayerOverlayPacket(NPC_ID, viewer);
                 MessagesUtil.sendDebugMessages("Spawned Fake Player on " + npcLocation);
                 NMSHandlers.getHandler().hideNPCName(player, npcName);
             }, 4);
@@ -113,7 +114,10 @@ public class UserWardrobeManager {
 
             // Misc
             if (user.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
+                // Maybe null as backpack maybe despawned before entering
+                if (user.getUserBackpackManager() == null) user.respawnBackpack();
                 user.getUserBackpackManager().getArmorStand().teleport(npcLocation.clone().add(0, 2, 0));
+                NMSHandlers.getHandler().equipmentSlotUpdate(user.getUserBackpackManager().getFirstArmorStandId(), EquipmentSlot.HEAD, user.getUserCosmeticItem(user.getCosmetic(CosmeticSlot.BACKPACK)), viewer);
                 PacketManager.ridingMountPacket(NPC_ID, user.getUserBackpackManager().getFirstArmorStandId(), viewer);
             }
 

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

@@ -6,7 +6,6 @@ import com.hibiscusmc.hmccosmetics.config.WardrobeSettings;
 import com.hibiscusmc.hmccosmetics.hooks.Hooks;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.misc.Adventure;
-import me.clip.placeholderapi.PlaceholderAPI;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import net.kyori.adventure.text.Component;
@@ -89,7 +88,7 @@ public class MessagesUtil {
     public static void sendTitle(Player player, String message, int fadein, int stay, int fadeout) {
         Audience target = BukkitAudiences.create(HMCCosmeticsPlugin.getInstance()).player(player);
 
-        Title.Times times = Title.Times.times(Duration.ofMillis(WardrobeSettings.getTransitionFadeIn()), Duration.ofMillis(3000), Duration.ofMillis(1000));
+        Title.Times times = Title.Times.times(Duration.ofMillis(fadein), Duration.ofMillis(stay), Duration.ofMillis(fadeout));
         Title title = Title.title(processStringNoKey(player, message), Component.empty(), times);
 
         target.showTitle(title);
@@ -104,7 +103,7 @@ public class MessagesUtil {
         if (!MESSAGES.containsKey(key)) return null;
         if (MESSAGES.get(key) == null) return null;
         String message = MESSAGES.get(key);
-        if (Hooks.isActiveHook("PlaceholderAPI") && player != null) message = PlaceholderAPI.setPlaceholders(player, message);
+        if (player != null) message = Hooks.processPlaceholders(player, message);
         message = message.replaceAll("%prefix%", prefix);
         if (placeholders != null ) {
             return Adventure.MINI_MESSAGE.deserialize(message, placeholders);
@@ -125,7 +124,7 @@ public class MessagesUtil {
     @NotNull
     public static Component processStringNoKey(Player player, String message, TagResolver placeholders) {
         message = message.replaceAll("%prefix%", prefix);
-        if (Hooks.isActiveHook("PlaceholderAPI") && player != null) message = PlaceholderAPI.setPlaceholders(player, message);
+        if (player != null) message = Hooks.processPlaceholders(player, message);
         if (placeholders != null ) {
             return Adventure.MINI_MESSAGE.deserialize(message, placeholders);
         }
@@ -134,7 +133,7 @@ public class MessagesUtil {
 
     public static String processStringNoKeyString(Player player, String message) {
         message = message.replaceAll("%prefix%", prefix);
-        if (Hooks.isActiveHook("PlaceholderAPI") && player != null) message = PlaceholderAPI.setPlaceholders(player, message);
+        if (player != null) message = Hooks.processPlaceholders(player, message);
         return message;
     }
 

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

@@ -1,20 +1,5 @@
 package com.hibiscusmc.hmccosmetics.util;
 
-public class TranslationPair {
+public record TranslationPair(String key, String value) {
 
-    private String key;
-    private String value;
-
-    public TranslationPair(String key, String value) {
-        this.key = key;
-        this.value = value;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }

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

@@ -1,5 +1,6 @@
 package com.hibiscusmc.hmccosmetics.util;
 
+import com.hibiscusmc.hmccosmetics.util.misc.StringUtils;
 import org.spongepowered.configurate.ConfigurationNode;
 
 import java.util.ArrayList;
@@ -9,19 +10,20 @@ import java.util.List;
 public class TranslationUtil {
 
     // unlocked-cosmetic -> true -> True
-    private static HashMap<String, List<TranslationPair>> keys = new HashMap<>();
+    private static final HashMap<String, List<TranslationPair>> keys = new HashMap<>();
 
     public static void setup(ConfigurationNode config) {
+        keys.clear();
         for (ConfigurationNode node : config.childrenMap().values()) {
             ArrayList<TranslationPair> pairs = new ArrayList<>();
             for (ConfigurationNode translatableMessage : node.childrenMap().values()) {
                 String key = translatableMessage.key().toString();
-                key.replaceAll("'", ""); // Autoupdater adds ' to it? Removes it from the key
+                key = key.replaceAll("'", ""); // Autoupdater adds ' to it? Removes it from the key
                 TranslationPair pair = new TranslationPair(key, translatableMessage.getString());
                 pairs.add(pair);
                 MessagesUtil.sendDebugMessages("setupTranslation key:" + node.key().toString() + " | " + node);
                 MessagesUtil.sendDebugMessages("Overall Key " + node.key().toString());
-                MessagesUtil.sendDebugMessages("Key '" + pair.getKey() + "' Value '" + pair.getValue() + "'");
+                MessagesUtil.sendDebugMessages("Key '" + pair.key() + "' Value '" + pair.value() + "'");
             }
             keys.put(node.key().toString().toLowerCase(), pairs);
         }
@@ -30,7 +32,7 @@ public class TranslationUtil {
     public static String getTranslation(String key, String message) {
         List<TranslationPair> pairs = keys.get(key);
         for (TranslationPair pair : pairs) {
-            if (pair.getKey() == message) return pair.getValue();
+            if (pair.key().equals(message)) return StringUtils.parseStringToString(pair.value());
         }
 
         return message;

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

@@ -1,215 +0,0 @@
-package com.hibiscusmc.hmccosmetics.util.builder;
-
-import com.hibiscusmc.hmccosmetics.util.misc.Placeholder;
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemFlag;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-public class ItemBuilder {
-
-    protected Material material;
-    protected int amount;
-    protected ItemMeta itemMeta;
-
-    /**
-     * @param material builder material
-     */
-
-    ItemBuilder(final Material material) {
-        this.material = material;
-        this.itemMeta = Bukkit.getItemFactory().getItemMeta(material);
-    }
-
-    /**
-     * @param itemStack builder ItemStack
-     */
-
-    ItemBuilder(final @NotNull ItemStack itemStack) {
-        this.material = itemStack.getType();
-        this.itemMeta = itemStack.hasItemMeta() ? itemStack.getItemMeta()
-                : Bukkit.getItemFactory().getItemMeta(this.material);
-    }
-
-    /**
-     * @param material builder material
-     * @return
-     */
-
-    @Contract("_ -> new")
-    @NotNull
-    public static ItemBuilder from(final Material material) {
-        return new ItemBuilder(material);
-    }
-
-    /**
-     * @param itemStack builder ItemStack
-     * @return
-     */
-    @Contract("_ -> new")
-    @NotNull
-    public static ItemBuilder from(final ItemStack itemStack) {
-        return new ItemBuilder(itemStack);
-    }
-
-    /**
-     * @param amount ItemStack amount
-     * @return this
-     */
-
-    public ItemBuilder amount(final int amount) {
-        this.amount = Math.min(Math.max(1, amount), 64);
-        return this;
-    }
-
-    /**
-     * @param name ItemStack name
-     * @return this
-     */
-
-    public ItemBuilder name(final String name) {
-        if (this.itemMeta == null) {
-            return this;
-        }
-        this.itemMeta.setDisplayName(name);
-        return this;
-    }
-
-    /**
-     * @param lore ItemStack lore
-     * @return this
-     */
-
-    public ItemBuilder lore(final List<String> lore) {
-        if (this.itemMeta == null) {
-            return this;
-        }
-        this.itemMeta.setLore(lore);
-        return this;
-    }
-
-    public ItemBuilder papiPlaceholders(final Player player) {
-        this.lorePapiPlaceholders(player);
-        this.namePapiPlaceholders(player);
-        return this;
-    }
-
-    private void lorePapiPlaceholders(final Player player) {
-        if (this.itemMeta == null) {
-            return;
-        }
-        final List<String> newLore = new ArrayList<>();
-
-        final List<String> lore = this.itemMeta.getLore();
-
-        if (lore == null) {
-            return;
-        }
-
-        for (final String line : this.itemMeta.getLore()) {
-            newLore.add(Placeholder.applyPapiPlaceholders(player, line));
-        }
-
-        this.itemMeta.setLore(newLore);
-    }
-
-    private void namePapiPlaceholders(final Player player) {
-        if (this.itemMeta == null) {
-            return;
-        }
-
-        this.itemMeta.setDisplayName(
-                Placeholder.applyPapiPlaceholders(
-                        player,
-                        this.itemMeta.getDisplayName()
-                )
-        );
-    }
-
-    /**
-     * @param unbreakable whether the ItemStack is unbreakable
-     * @return this
-     */
-
-    public ItemBuilder unbreakable(final boolean unbreakable) {
-        if (this.itemMeta == null) {
-            return this;
-        }
-        this.itemMeta.setUnbreakable(unbreakable);
-        return this;
-    }
-
-    public ItemBuilder glow(final boolean glow) {
-        if (this.itemMeta == null) {
-            return this;
-        }
-        if (glow) {
-            this.itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
-            this.itemMeta.addEnchant(Enchantment.LUCK, 1, true);
-        }
-        return this;
-    }
-
-    /**
-     * @param enchantments enchants to be added to the ItemStack
-     * @param ignoreLeveLRestrictions whether to ignore enchantment level restrictions
-     * @return this
-     */
-
-    public ItemBuilder enchants(final Map<Enchantment, Integer> enchantments,
-                                boolean ignoreLeveLRestrictions) {
-        if (this.itemMeta == null) {
-            return this;
-        }
-        enchantments.forEach((enchantment, level) -> this.itemMeta.addEnchant(enchantment, level,
-                ignoreLeveLRestrictions));
-        return this;
-    }
-
-    /**
-     * @param itemFlags ItemStack ItemFlags
-     * @return this
-     */
-
-    public ItemBuilder itemFlags(final Set<ItemFlag> itemFlags) {
-        if (this.itemMeta == null) {
-            return this;
-        }
-        this.itemMeta.addItemFlags(itemFlags.toArray(new ItemFlag[0]));
-        return this;
-    }
-
-    /**
-     * @param modelData ItemStack modelData
-     * @return this
-     */
-
-    public ItemBuilder modelData(final int modelData) {
-        if (this.itemMeta == null) {
-            return this;
-        }
-        this.itemMeta.setCustomModelData(modelData);
-        return this;
-    }
-
-    /**
-     * @return built ItemStack
-     */
-
-    public ItemStack build() {
-        final ItemStack itemStack = new ItemStack(this.material, Math.max(this.amount, 1));
-        itemStack.setItemMeta(itemMeta);
-        return itemStack;
-    }
-
-}

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

@@ -1,75 +0,0 @@
-package com.hibiscusmc.hmccosmetics.util.misc;
-
-import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
-import org.bukkit.NamespacedKey;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.persistence.PersistentDataType;
-import org.checkerframework.checker.nullness.qual.Nullable;
-import org.jetbrains.annotations.NotNull;
-
-public class Keys {
-
-    static HMCCosmeticsPlugin plugin = HMCCosmeticsPlugin.getInstance();
-    public static final NamespacedKey ITEM_KEY = new NamespacedKey(plugin, "cosmetic");
-    public static final NamespacedKey TOKEN_KEY = new NamespacedKey(plugin, "token-key");
-
-    public static void setKey(final @NotNull ItemStack itemStack) {
-        final ItemMeta itemMeta = itemStack.getItemMeta();
-
-        if (itemMeta == null) {
-            return;
-        }
-
-        itemMeta.getPersistentDataContainer().set(ITEM_KEY, PersistentDataType.BYTE, (byte) 1);
-
-        itemStack.setItemMeta(itemMeta);
-    }
-
-    public static <T, Z> void setKey(
-            final @NotNull ItemStack itemStack,
-            final NamespacedKey key,
-            final PersistentDataType<T, Z> type,
-            final Z value) {
-        final ItemMeta itemMeta = itemStack.getItemMeta();
-
-        if (itemMeta == null) {
-            return;
-        }
-
-        itemMeta.getPersistentDataContainer().set(key, type, value);
-
-        itemStack.setItemMeta(itemMeta);
-    }
-
-    public static boolean hasKey(final @NotNull ItemStack itemStack) {
-        final ItemMeta itemMeta = itemStack.getItemMeta();
-
-        if (itemMeta == null) {
-            return false;
-        }
-
-        return itemMeta.getPersistentDataContainer().has(ITEM_KEY, PersistentDataType.BYTE);
-    }
-
-    public static <T, Z> boolean hasKey(final @NotNull ItemStack itemStack, final NamespacedKey key, final PersistentDataType<T, Z> type) {
-        final ItemMeta itemMeta = itemStack.getItemMeta();
-
-        if (itemMeta == null) {
-            return false;
-        }
-
-        return itemMeta.getPersistentDataContainer().has(key, type);
-    }
-
-    @Nullable
-    public static <T, Z> Z getValue(final @NotNull ItemStack itemStack, final NamespacedKey key, final PersistentDataType<T, Z> type) {
-        final ItemMeta itemMeta = itemStack.getItemMeta();
-
-        if (itemMeta == null) {
-            return null;
-        }
-
-        return itemMeta.getPersistentDataContainer().get(key, type);
-    }
-}

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

@@ -1,33 +0,0 @@
-package com.hibiscusmc.hmccosmetics.util.misc;
-
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.Nullable;
-
-public class Placeholder {
-
-    public static final String PREFIX = "%prefix%";
-    public static final String TYPE = "%type%";
-    public static final String ITEM = "%item%";
-    public static final String FILE = "%file%";
-
-    public static final String PLAYER = "%player%";
-    public static final String ENABLED = "%enabled%";
-    public static final String ALLOWED = "%allowed%";
-    public static final String ID = "%id%";
-
-    /**
-     * @return message with placeholders applied
-     */
-
-    public static String applyPapiPlaceholders(@Nullable final Player player,
-                                               final String message) {
-        /*
-        if (HookManager.getInstance().isEnabled(PAPIHook.class)) {
-            return HookManager.getInstance().getPapiHook().parse(player, message);
-        }
-         */
-
-        return message;
-    }
-
-}

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

@@ -17,6 +17,7 @@ import com.hibiscusmc.hmccosmetics.util.packets.wrappers.WrapperPlayServerRelEnt
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.Particle;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
@@ -31,6 +32,15 @@ import java.util.UUID;
 
 public class PacketManager extends BasePacket {
 
+    public static void sendEntitySpawnPacket(
+            final @NotNull Location location,
+            final int entityId,
+            final EntityType entityType,
+            final UUID uuid
+            ) {
+        sendEntitySpawnPacket(location, entityId, entityType, uuid, getViewers(location));
+    }
+
     public static void sendEntitySpawnPacket(
             final @NotNull Location location,
             final int entityId,
@@ -145,7 +155,29 @@ public class PacketManager extends BasePacket {
             packet.getDataValueCollectionModifier().write(0, wrappedDataValueList);
         }
         for (Player p : sendTo) sendPacket(p, packet);
+    }
 
+    public static void sendCloudEffect(
+            int entityId,
+            List<Player> sendTo
+    ) {
+        PacketContainer packet = new PacketContainer(PacketType.Play.Server.ENTITY_METADATA);
+        packet.getModifier().writeDefaults();
+        packet.getIntegers().write(0, entityId);
+        WrappedDataWatcher wrapper = new WrappedDataWatcher();
+
+        if (NMSHandlers.getVersion().contains("v1_18_R2") || NMSHandlers.getVersion().contains("v1_19_R1")) {
+            wrapper.setObject(new WrappedDataWatcher.WrappedDataWatcherObject(0, WrappedDataWatcher.Registry.get(Byte.class)), (byte) 0x20);
+            wrapper.setObject(new WrappedDataWatcher.WrappedDataWatcherObject(8, WrappedDataWatcher.Registry.get(Float.class)), 0f);
+            packet.getWatchableCollectionModifier().write(0, wrapper.getWatchableObjects());
+        } else {
+            final List<WrappedDataValue> wrappedDataValueList = Lists.newArrayList();
+            wrappedDataValueList.add(new WrappedDataValue(0, WrappedDataWatcher.Registry.get(Byte.class), (byte) 0x20));
+            wrappedDataValueList.add(new WrappedDataValue(8, WrappedDataWatcher.Registry.get(Float.class), 0f));
+            //wrappedDataValueList.add(new WrappedDataValue(11, WrappedDataWatcher.Registry.get(Integer.class), 21));
+            packet.getDataValueCollectionModifier().write(0, wrappedDataValueList);
+        }
+        for (Player p : sendTo) sendPacket(p, packet);
     }
 
     public static void sendLookPacket(
@@ -218,6 +250,25 @@ public class PacketManager extends BasePacket {
         sendRidingPacket(mountId, passengerId, getViewers(location));
     }
 
+    /**
+     * Mostly to deal with backpacks, this deals with entities riding other entities.
+     * @param mountId The entity that is the "mount", ex. a player
+     * @param passengerIds The entities that are riding the mount, ex. a armorstand for a backpack
+     * @param sendTo Whom to send the packet to
+     */
+    public static void sendRidingPacket(
+            final int mountId,
+            final int[] passengerIds,
+            final @NotNull List<Player> sendTo
+    ) {
+        PacketContainer packet = new PacketContainer(PacketType.Play.Server.MOUNT);
+        packet.getIntegers().write(0, mountId);
+        packet.getIntegerArrays().write(0, passengerIds);
+        for (final Player p : sendTo) {
+            sendPacket(p, packet);
+        }
+    }
+
     /**
      * Mostly to deal with backpacks, this deals with entities riding other entities.
      * @param mountId The entity that is the "mount", ex. a player
@@ -229,12 +280,7 @@ public class PacketManager extends BasePacket {
             final int passengerId,
             final @NotNull List<Player> sendTo
     ) {
-        PacketContainer packet = new PacketContainer(PacketType.Play.Server.MOUNT);
+        sendRidingPacket(mountId, new int[] {passengerId}, sendTo);
-        packet.getIntegers().write(0, mountId);
-        packet.getIntegerArrays().write(0, new int[]{passengerId});
-        for (final Player p : sendTo) {
-            sendPacket(p, packet);
-        }
     }
 
     /**
@@ -248,6 +294,18 @@ public class PacketManager extends BasePacket {
         for (final Player p : sendTo) sendPacket(p, packet);
     }
 
+    /**
+     * Destroys an entity from a player
+     * @param sendTo The players the packet should be sent to
+     */
+    public static void sendEntityDestroyPacket(final List<Integer> ids, @NotNull List<Player> sendTo) {
+        PacketContainer packet = new PacketContainer(PacketType.Play.Server.ENTITY_DESTROY);
+        IntArrayList entities = new IntArrayList(new int[]{});
+        for (int id : ids) entities.add(id);
+        packet.getModifier().write(0, entities);
+        for (final Player p : sendTo) sendPacket(p, packet);
+    }
+
     /**
      * Sends a camera packet
      * @param entityId The Entity ID that camera will go towards
@@ -350,9 +408,16 @@ public class PacketManager extends BasePacket {
         packet.getModifier().writeDefaults();
         packet.getIntegers().write(0, playerId);
         WrappedDataWatcher wrapper = new WrappedDataWatcher();
-        wrapper.setObject(new WrappedDataWatcher.WrappedDataWatcherObject(17, WrappedDataWatcher.Registry.get(Byte.class)), mask);
+
-        wrapper.setObject(new WrappedDataWatcher.WrappedDataWatcherObject(15, WrappedDataWatcher.Registry.get(Byte.class)), (byte) 0x10);
+        if (NMSHandlers.getVersion().contains("v1_18_R2") || NMSHandlers.getVersion().contains("v1_19_R1")) {
-        packet.getWatchableCollectionModifier().write(0, wrapper.getWatchableObjects());
+            wrapper.setObject(new WrappedDataWatcher.WrappedDataWatcherObject(17, WrappedDataWatcher.Registry.get(Byte.class)), mask);
+            packet.getWatchableCollectionModifier().write(0, wrapper.getWatchableObjects());
+        } else {
+            final List<WrappedDataValue> wrappedDataValueList = Lists.newArrayList();
+            wrappedDataValueList.add(new WrappedDataValue(17, WrappedDataWatcher.Registry.get(Byte.class), mask));
+            packet.getDataValueCollectionModifier().write(0, wrappedDataValueList);
+        }
+
         for (final Player p : sendTo) {
             sendPacket(p, packet);
         }
@@ -364,6 +429,7 @@ public class PacketManager extends BasePacket {
      * @param uuid What is the fake player UUID
      * @param sendTo Whom to send the packet to
      */
+    @SuppressWarnings("deprecation")
     public static void sendRemovePlayerPacket(
             final Player player,
             final UUID uuid,
@@ -371,6 +437,7 @@ public class PacketManager extends BasePacket {
     ) {
         if (NMSHandlers.getVersion().contains("v1_18_R2") || NMSHandlers.getVersion().contains("v1_19_R1")) {
             WrapperPlayServerPlayerInfo info = new WrapperPlayServerPlayerInfo();
+            // Remove player is deprecated on 1.19.3+, but we still need to support 1.18.2
             info.setAction(EnumWrappers.PlayerInfoAction.REMOVE_PLAYER);
 
             String name = "Mannequin-" + player.getEntityId();
@@ -468,18 +535,9 @@ public class PacketManager extends BasePacket {
         }
     }
 
-    public static void sendMovePacket(
-            final int entityId,
-            final Location from,
-            final Location to,
-            final boolean onGround
-    ) {
-        sendMovePacket(entityId, from, to, onGround, getViewers(to));
-    }
-
     @NotNull
     public static List<Player> getViewers(Location location) {
-        ArrayList<Player> viewers = new ArrayList();
+        ArrayList<Player> viewers = new ArrayList<>();
         if (Settings.getViewDistance() <= 0) {
             viewers.addAll(location.getWorld().getPlayers());
         } else {

common/src/main/resources/config.yml

@@ -6,7 +6,7 @@ config-version: 1
 default-menu: defaultmenu
 debug-mode: false
 database-settings:
-  type: sqlite #MYSQL, SQLite, INTERNAL (not recommended!)
+  type: sqlite #MYSQL, SQLite
   mysql:
     database: database
     password: cherryBomb
@@ -48,6 +48,11 @@ cosmetic-settings:
     x: 0.5
     y: 3
     z: 0.5
+menu-settings:
+  cosmetic-type:
+    # This allows you to specify if it should require a special click type for the interaction to work.
+    equip-click: "ANY" # ANY or ClickType, https://jd.papermc.io/paper/1.20/org/bukkit/event/inventory/ClickType.html
+    unequip-click: "ANY" # ANY or ClickType, https://jd.papermc.io/paper/1.20/org/bukkit/event/inventory/ClickType.html
 dye-menu:
   # If you use ItemsAdder, set this to "§f:offset_-8::dye_menu:"
   # If you use Oraxen, set this to "<glyph:neg_shift_8><glyph:dye_menu>"

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

@@ -15,6 +15,11 @@ backpack:
     model-data: 4
     name: "<blue>Backpack"
     amount: 1
+  firstperson-item:
+    material: PAPER
+    model-data: 8
+    name: "<white>Backpack"
+    amount: 1
 future_wings:
   slot: BACKPACK
   permission: "hmccosmetics.future_wings"
@@ -23,6 +28,11 @@ future_wings:
     model-data: 9
     name: "<#d24c9f>Future Wings"
     amount: 1
+  firstperson-item:
+    material: PAPER
+    model-data: 10
+    name: "<white>Future Wings"
+    amount: 1
 lantern_cosmetic:
   slot: OFFHAND
   permission: "hmccosmetics.lantern_cosmetic"
@@ -55,6 +65,11 @@ jetpack:
     model-data: 12
     name: "<blue>Jetpack"
     amount: 1
+  firstperson-item:
+    material: PAPER
+    model-data: 14
+    name: "<white>Jetpack"
+    amount: 1
 hammer:
   slot: OFFHAND
   permission: "hmccosmetics.hammer"
@@ -111,6 +126,11 @@ explorer_backpack:
     model-data: 3
     name: "<white>Explorer's Backpack"
     amount: 1
+  firstperson-item:
+    material: LEATHER_HORSE_ARMOR
+    model-data: 5
+    name: "<white>Explorer's Backpack"
+    amount: 1
 garbage_truck_balloon:
   slot: BALLOON
   permission: "hmccosmetics.garbage_truck_balloon"
@@ -128,4 +148,13 @@ earth_day_grabber:
     material: LEATHER_HORSE_ARMOR
     model-data: 4
     name: "<green>Earth Day Grabber"
-    amount: 1
+    amount: 1
+hibiscus_flower:
+  slot: HELMET
+  dyeable: true
+  permission: "hmccosmetics.hibiscus_flower"
+  item:
+    material: PAPER
+    model-data: 15
+    name: "<#d24c9f>Hibiscus Flower"
+    amount: 1

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

@@ -1,5 +1,6 @@
 title: "<white>"
 rows: 6
+refresh-rate: 20 # Set to -1 or remove to disable auto-updating, leading to it only using event-based updates.
 items:
   beanie:
     slots:
@@ -189,4 +190,15 @@ items:
         - "<gray>Enabled: <#6D9DC5>%HMCCosmetics_equipped_earth_day_grabber%"
         - "<gray>Allowed: <#6D9DC5>%HMCCosmetics_unlocked_earth_day_grabber%" 
     type: cosmetic
-    cosmetic: earth_day_grabber
+    cosmetic: earth_day_grabber
+  hibiscus_flower:
+    slots:
+      - 18
+    item:
+      material: hmccosmetics:hibiscus_flower
+      lore:
+        - ""
+        - "<gray>Enabled: <#6D9DC5>%HMCCosmetics_equipped_hibiscus_flower%"
+        - "<gray>Allowed: <#6D9DC5>%HMCCosmetics_unlocked_hibiscus_flower%" 
+    type: cosmetic
+    cosmetic: hibiscus_flower

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

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

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

@@ -6,14 +6,11 @@ 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.user.manager.UserBalloonManager;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager;
 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 com.mojang.datafixers.util.Pair;
-import net.kyori.adventure.text.Component;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;
 import net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket;
@@ -21,7 +18,6 @@ import net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.ServerPlayerConnection;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.scores.PlayerTeam;
@@ -35,7 +31,6 @@ import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack;
 import org.bukkit.craftbukkit.v1_18_R2.scoreboard.CraftScoreboard;
 import org.bukkit.entity.ArmorStand;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.inventory.ItemStack;
@@ -72,12 +67,6 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
         return hmcArmorStand.getBukkitEntity();
     }
 
-    @Override
-    public org.bukkit.entity.Entity spawnHMCParticleCloud(Location location) {
-        HMCParticleCloud hmcParticleCloud = new HMCParticleCloud(location);
-        return hmcParticleCloud.getBukkitEntity();
-    }
-
     @Override
     public ArmorStand getMEGEntity(Location loc) {
         return (ArmorStand) new MEGEntity(loc).getBukkitEntity();
@@ -106,19 +95,13 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
     @Override
     public UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType) {
         org.bukkit.entity.Entity entity = user.getEntity();
-        Location newLoc = entity.getLocation().clone().add(Settings.getBalloonOffset());
 
         UserBalloonManager userBalloonManager1 = new UserBalloonManager(entity.getLocation());
-        List<Player> sentTo = PlayerUtils.getNearbyPlayers(entity.getLocation());
         userBalloonManager1.getModelEntity().teleport(entity.getLocation().add(Settings.getBalloonOffset()));
 
         userBalloonManager1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
         userBalloonManager1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
 
-        PacketManager.sendEntitySpawnPacket(newLoc, userBalloonManager1.getPufferfishBalloonId(), EntityType.PUFFERFISH, userBalloonManager1.getPufferfishBalloonUniqueId(), sentTo);
-        PacketManager.sendInvisibilityPacket(userBalloonManager1.getPufferfishBalloonId(), sentTo);
-        userBalloonManager1.sendLeashPacket(entity.getEntityId());
-
         return userBalloonManager1;
     }
 

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

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

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

@@ -6,14 +6,11 @@ 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.user.manager.UserBalloonManager;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager;
 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 com.mojang.datafixers.util.Pair;
-import net.kyori.adventure.text.Component;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;
 import net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket;
@@ -21,7 +18,6 @@ import net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.ServerPlayerConnection;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.scores.PlayerTeam;
@@ -35,7 +31,6 @@ import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack;
 import org.bukkit.craftbukkit.v1_19_R1.scoreboard.CraftScoreboard;
 import org.bukkit.entity.ArmorStand;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.inventory.ItemStack;
@@ -72,12 +67,6 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
         return hmcArmorStand.getBukkitEntity();
     }
 
-    @Override
-    public org.bukkit.entity.Entity spawnHMCParticleCloud(Location location) {
-        HMCParticleCloud hmcParticleCloud = new HMCParticleCloud(location);
-        return hmcParticleCloud.getBukkitEntity();
-    }
-
     @Override
     public ArmorStand getMEGEntity(Location loc) {
         return (ArmorStand) new MEGEntity(loc).getBukkitEntity();
@@ -108,19 +97,13 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
     @Override
     public UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType) {
         org.bukkit.entity.Entity entity = user.getEntity();
-        Location newLoc = entity.getLocation().clone().add(Settings.getBalloonOffset());
 
         UserBalloonManager userBalloonManager1 = new UserBalloonManager(entity.getLocation());
-        List<Player> sentTo = PlayerUtils.getNearbyPlayers(entity.getLocation());
         userBalloonManager1.getModelEntity().teleport(entity.getLocation().add(Settings.getBalloonOffset()));
 
         userBalloonManager1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
         userBalloonManager1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
 
-        PacketManager.sendEntitySpawnPacket(newLoc, userBalloonManager1.getPufferfishBalloonId(), EntityType.PUFFERFISH, userBalloonManager1.getPufferfishBalloonUniqueId(), sentTo);
-        PacketManager.sendInvisibilityPacket(userBalloonManager1.getPufferfishBalloonId(), sentTo);
-        userBalloonManager1.sendLeashPacket(entity.getEntityId());
-
         return userBalloonManager1;
     }
 

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

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

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

@@ -6,14 +6,11 @@ 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.user.manager.UserBalloonManager;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager;
 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 com.mojang.datafixers.util.Pair;
-import net.kyori.adventure.text.Component;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;
 import net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket;
@@ -21,7 +18,6 @@ import net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.ServerPlayerConnection;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.scores.PlayerTeam;
@@ -35,7 +31,6 @@ import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemStack;
 import org.bukkit.craftbukkit.v1_19_R2.scoreboard.CraftScoreboard;
 import org.bukkit.entity.ArmorStand;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.inventory.ItemStack;
@@ -72,12 +67,6 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
         return hmcArmorStand.getBukkitEntity();
     }
 
-    @Override
-    public org.bukkit.entity.Entity spawnHMCParticleCloud(Location location) {
-        HMCParticleCloud hmcParticleCloud = new HMCParticleCloud(location);
-        return hmcParticleCloud.getBukkitEntity();
-    }
-
     @Override
     public ArmorStand getMEGEntity(Location loc) {
         return (ArmorStand) new MEGEntity(loc).getBukkitEntity();
@@ -107,19 +96,13 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
     @Override
     public UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType) {
         org.bukkit.entity.Entity entity = user.getEntity();
-        Location newLoc = entity.getLocation().clone().add(Settings.getBalloonOffset());
 
         UserBalloonManager userBalloonManager1 = new UserBalloonManager(entity.getLocation());
-        List<Player> sentTo = PlayerUtils.getNearbyPlayers(entity.getLocation());
         userBalloonManager1.getModelEntity().teleport(entity.getLocation().add(Settings.getBalloonOffset()));
 
         userBalloonManager1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
         userBalloonManager1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
 
-        PacketManager.sendEntitySpawnPacket(newLoc, userBalloonManager1.getPufferfishBalloonId(), EntityType.PUFFERFISH, userBalloonManager1.getPufferfishBalloonUniqueId(), sentTo);
-        PacketManager.sendInvisibilityPacket(userBalloonManager1.getPufferfishBalloonId(), sentTo);
-        userBalloonManager1.sendLeashPacket(entity.getEntityId());
-
         return userBalloonManager1;
     }
 

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

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

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

@@ -6,12 +6,10 @@ 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.user.manager.UserBalloonManager;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager;
 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 com.mojang.datafixers.util.Pair;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.Packet;
@@ -36,7 +34,6 @@ import org.bukkit.craftbukkit.v1_19_R3.inventory.CraftItemStack;
 import org.bukkit.craftbukkit.v1_19_R3.scoreboard.CraftScoreboard;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.inventory.ItemStack;
@@ -73,12 +70,6 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
         return hmcArmorStand.getBukkitEntity();
     }
 
-    @Override
-    public org.bukkit.entity.Entity spawnHMCParticleCloud(Location location) {
-        HMCParticleCloud hmcParticleCloud = new HMCParticleCloud(location);
-        return hmcParticleCloud.getBukkitEntity();
-    }
-
     @Override
     public ArmorStand getMEGEntity(Location loc) {
         return (ArmorStand) new MEGEntity(loc).getBukkitEntity();
@@ -114,19 +105,13 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
     @Override
     public UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType) {
         Entity entity = user.getEntity();
-        Location newLoc = entity.getLocation().clone().add(Settings.getBalloonOffset());
 
         UserBalloonManager userBalloonManager1 = new UserBalloonManager(entity.getLocation());
-        List<Player> sentTo = PlayerUtils.getNearbyPlayers(entity.getLocation());
         userBalloonManager1.getModelEntity().teleport(entity.getLocation().add(Settings.getBalloonOffset()));
 
         userBalloonManager1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
         userBalloonManager1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
 
-        PacketManager.sendEntitySpawnPacket(newLoc, userBalloonManager1.getPufferfishBalloonId(), EntityType.PUFFERFISH, userBalloonManager1.getPufferfishBalloonUniqueId(), sentTo);
-        PacketManager.sendInvisibilityPacket(userBalloonManager1.getPufferfishBalloonId(), sentTo);
-        userBalloonManager1.sendLeashPacket(entity.getEntityId());
-
         return userBalloonManager1;
     }
 

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

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

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

@@ -6,12 +6,10 @@ 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.user.manager.UserBalloonManager;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager;
 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 com.mojang.datafixers.util.Pair;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.Packet;
@@ -22,7 +20,6 @@ import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.ServerPlayerConnection;
 import net.minecraft.world.entity.Display;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.scores.PlayerTeam;
@@ -36,7 +33,6 @@ import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftItemStack;
 import org.bukkit.craftbukkit.v1_20_R1.scoreboard.CraftScoreboard;
 import org.bukkit.entity.ArmorStand;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.inventory.ItemStack;
@@ -73,12 +69,6 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
         return hmcArmorStand.getBukkitEntity();
     }
 
-    @Override
-    public org.bukkit.entity.Entity spawnHMCParticleCloud(Location location) {
-        HMCParticleCloud hmcParticleCloud = new HMCParticleCloud(location);
-        return hmcParticleCloud.getBukkitEntity();
-    }
-
     @Override
     public ArmorStand getMEGEntity(Location loc) {
         return (ArmorStand) new MEGEntity(loc).getBukkitEntity();
@@ -116,19 +106,13 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
     @Override
     public UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType) {
         org.bukkit.entity.Entity entity = user.getEntity();
-        Location newLoc = entity.getLocation().clone().add(Settings.getBalloonOffset());
 
         UserBalloonManager userBalloonManager1 = new UserBalloonManager(entity.getLocation());
-        List<Player> sentTo = PlayerUtils.getNearbyPlayers(entity.getLocation());
         userBalloonManager1.getModelEntity().teleport(entity.getLocation().add(Settings.getBalloonOffset()));
 
         userBalloonManager1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
         userBalloonManager1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
 
-        PacketManager.sendEntitySpawnPacket(newLoc, userBalloonManager1.getPufferfishBalloonId(), EntityType.PUFFERFISH, userBalloonManager1.getPufferfishBalloonUniqueId(), sentTo);
-        PacketManager.sendInvisibilityPacket(userBalloonManager1.getPufferfishBalloonId(), sentTo);
-        userBalloonManager1.sendLeashPacket(entity.getEntityId());
-
         return userBalloonManager1;
     }