Start balloon stuff

common/src/main/java/io/github/fisher2911/hmccosmetics/database/Database.java

@@ -13,6 +13,7 @@ import io.github.fisher2911.hmccosmetics.gui.ArmorItem;
 import io.github.fisher2911.hmccosmetics.hook.HookManager;
 import io.github.fisher2911.hmccosmetics.hook.item.CitizensHook;
 import io.github.fisher2911.hmccosmetics.inventory.PlayerArmor;
+import io.github.fisher2911.hmccosmetics.packet.EntityIds;
 import io.github.fisher2911.hmccosmetics.user.BaseUser;
 import io.github.fisher2911.hmccosmetics.user.NPCUser;
 import io.github.fisher2911.hmccosmetics.user.User;
@@ -83,6 +84,7 @@ public class Database {
     public void loadUser(final Entity entity, final Consumer<User> onComplete) {
         final UUID uuid = entity.getUniqueId();
         final int armorStandId = FAKE_ENTITY_ID.getAndDecrement();
+        final int balloonId = FAKE_ENTITY_ID.getAndDecrement();
         final Wardrobe wardrobe = this.createNewWardrobe(uuid);
         Threads.getInstance().execute(
                 () -> {
@@ -97,10 +99,13 @@ public class Database {
 
                         final User actualUser = user.toUser(
                                 this.plugin.getCosmeticManager(),
-                                entity.getEntityId(),
+                                new EntityIds(
+                                        entity.getEntityId(),
+                                        armorStandId,
+                                        balloonId
+                                ),
                                 armorItems,
-                                wardrobe,
+                                wardrobe
-                                armorStandId
                         );
                         Bukkit.getScheduler().runTask(this.plugin,
                                 () -> onComplete.accept(actualUser)
@@ -112,15 +117,14 @@ public class Database {
                 });
         onComplete.accept(new User(
                 uuid,
-                entity.getEntityId(),
                 PlayerArmor.empty(),
-                wardrobe,
+                new EntityIds(entity.getEntityId(), armorStandId, balloonId)
-                armorStandId
         ));
     }
 
     public void loadNPCUser(final int id, final Entity entity, final Consumer<NPCUser> onComplete) {
         final int armorStandId = FAKE_ENTITY_ID.getAndDecrement();
+        final int balloonId = FAKE_ENTITY_ID.getAndDecrement();
         Threads.getInstance().execute(
                 () -> {
                     try {
@@ -134,9 +138,12 @@ public class Database {
 
                         final NPCUser actualUser = citizen.toUser(
                                 this.plugin.getCosmeticManager(),
-                                entity.getEntityId(),
+                                new EntityIds(
-                                armorItems,
+                                        entity.getEntityId(),
-                                armorStandId
+                                        armorStandId,
+                                        balloonId
+                                ),
+                                armorItems
                         );
 
                         Bukkit.getScheduler().runTask(this.plugin,
@@ -148,7 +155,12 @@ public class Database {
                     }
                 });
 
-        onComplete.accept(new NPCUser(id, entity.getEntityId(), PlayerArmor.empty(), armorStandId));
+        onComplete.accept(new NPCUser(
+                id,
+                PlayerArmor.empty(),
+                new EntityIds(entity.getEntityId(), armorStandId, balloonId)
+                )
+        );
     }
 
     public void saveUser(final User user) {
@@ -219,11 +231,13 @@ public class Database {
         return new Wardrobe(
                 this.plugin,
                 UUID.randomUUID(),
-                FAKE_ENTITY_ID.getAndDecrement(),
                 ownerUUID,
                 PlayerArmor.empty(),
-                FAKE_ENTITY_ID.getAndDecrement(),
+                new EntityIds(
-                FAKE_ENTITY_ID.getAndDecrement(),
+                        FAKE_ENTITY_ID.getAndDecrement(),
+                        FAKE_ENTITY_ID.getAndDecrement(),
+                        FAKE_ENTITY_ID.getAndDecrement()
+                ),
                 false
         );
     }

common/src/main/java/io/github/fisher2911/hmccosmetics/database/DatabaseConverter.java

@@ -3,6 +3,7 @@ package io.github.fisher2911.hmccosmetics.database;
 import io.github.fisher2911.hmccosmetics.HMCCosmetics;
 import io.github.fisher2911.hmccosmetics.gui.ArmorItem;
 import io.github.fisher2911.hmccosmetics.inventory.PlayerArmor;
+import io.github.fisher2911.hmccosmetics.packet.EntityIds;
 import io.github.fisher2911.hmccosmetics.user.User;
 
 import java.io.File;
@@ -93,10 +94,13 @@ public class DatabaseConverter {
                     final UUID uuid = UUID.fromString(results.getString(1));
                     final User user = new User(
                             uuid,
-                            -1,
                             playerArmor,
                             this.database.createNewWardrobe(uuid),
-                            this.database.FAKE_ENTITY_ID.getAndDecrement()
+                            new EntityIds(
+                                    -1,
+                                    this.database.FAKE_ENTITY_ID.getAndDecrement(),
+                                    this.database.FAKE_ENTITY_ID.getAndDecrement()
+                            )
                     );
                     final String backpackId = results.getString(2);
                     final String hatId = results.getString(3);

common/src/main/java/io/github/fisher2911/hmccosmetics/database/dao/CitizenDAO.java

@@ -5,6 +5,7 @@ import com.j256.ormlite.table.DatabaseTable;
 import io.github.fisher2911.hmccosmetics.cosmetic.CosmeticManager;
 import io.github.fisher2911.hmccosmetics.gui.ArmorItem;
 import io.github.fisher2911.hmccosmetics.inventory.PlayerArmor;
+import io.github.fisher2911.hmccosmetics.packet.EntityIds;
 import io.github.fisher2911.hmccosmetics.user.BaseUser;
 import io.github.fisher2911.hmccosmetics.user.NPCUser;
 import io.github.fisher2911.hmccosmetics.user.User;
@@ -34,9 +35,8 @@ public class CitizenDAO {
         @Nullable
         public NPCUser toUser(
                 final CosmeticManager cosmeticManager,
-                final int entityId,
+                final EntityIds entityIds,
-                final List<ArmorItemDAO> armorItems,
+                final List<ArmorItemDAO> armorItems
-                final int armorStandId
         ) {
             final PlayerArmor playerArmor = PlayerArmor.empty();
 
@@ -48,7 +48,7 @@ public class CitizenDAO {
                 playerArmor.setItem(armorItem);
             }
 
-            return new NPCUser(this.citizensId, entityId, playerArmor, armorStandId);
+            return new NPCUser(this.citizensId, playerArmor, entityIds);
         }
 
     @Override

common/src/main/java/io/github/fisher2911/hmccosmetics/database/dao/UserDAO.java

@@ -5,6 +5,7 @@ import com.j256.ormlite.table.DatabaseTable;
 import io.github.fisher2911.hmccosmetics.cosmetic.CosmeticManager;
 import io.github.fisher2911.hmccosmetics.gui.ArmorItem;
 import io.github.fisher2911.hmccosmetics.inventory.PlayerArmor;
+import io.github.fisher2911.hmccosmetics.packet.EntityIds;
 import io.github.fisher2911.hmccosmetics.user.BaseUser;
 import io.github.fisher2911.hmccosmetics.user.NPCUser;
 import io.github.fisher2911.hmccosmetics.user.User;
@@ -35,10 +36,9 @@ public class UserDAO {
     @Nullable
     public User toUser(
             final CosmeticManager cosmeticManager,
-            final int entityId,
+            final EntityIds entityIds,
             final List<ArmorItemDAO> armorItems,
-            final Wardrobe wardrobe,
+            final Wardrobe wardrobe
-            final int armorStandId
     ) {
         final PlayerArmor playerArmor = PlayerArmor.empty();
 
@@ -50,7 +50,7 @@ public class UserDAO {
             playerArmor.setItem(armorItem);
         }
 
-        return new User(this.uuid, entityId, playerArmor, wardrobe, armorStandId);
+        return new User(this.uuid, playerArmor, wardrobe, entityIds);
     }
 
     @Override

common/src/main/java/io/github/fisher2911/hmccosmetics/hook/item/CitizensHook.java

@@ -49,7 +49,7 @@ public class CitizensHook implements Hook, Listener {
                         if (!user.isValid()) {
                             continue;
                         }
-                        user.updateArmorStand(settings);
+                        user.updateOutsideCosmetics(settings);
                     }
                 })
         );

common/src/main/java/io/github/fisher2911/hmccosmetics/packet/EntityIds.java

@@ -0,0 +1,42 @@
+package io.github.fisher2911.hmccosmetics.packet;
+
+import java.util.EnumMap;
+import java.util.Map;
+
+public class EntityIds {
+
+    private final Map<Type, Integer> ids;
+
+    public EntityIds(final Map<Type, Integer> ids) {
+        this.ids = ids;
+    }
+
+    public EntityIds(final int self, final int armorStand, final int balloon) {
+        final Map<Type, Integer> ids = new EnumMap<>(Type.class);
+        ids.put(Type.SELF, self);
+        ids.put(Type.ARMOR_STAND, armorStand);
+        ids.put(Type.BALLOON, balloon);
+        this.ids = ids;
+    }
+
+    public int self() {
+        return ids.getOrDefault(Type.SELF, -1);
+    }
+
+    public int armorStand() {
+        return ids.getOrDefault(Type.ARMOR_STAND, -1);
+    }
+
+    public int balloon() {
+        return ids.getOrDefault(Type.BALLOON, -1);
+    }
+
+    public enum Type {
+
+        SELF,
+        ARMOR_STAND,
+        BALLOON
+
+    }
+
+}

common/src/main/java/io/github/fisher2911/hmccosmetics/packet/PacketManager.java

@@ -96,6 +96,12 @@ public class PacketManager {
         return packet;
     }
 
+    public static PacketContainer getLeashPacket(final int entityId, final int balloonId) {
+        final PacketContainer packet = new PacketContainer(PacketType.Play.Server.ATTACH_ENTITY);
+        packet.getIntegers().write(0, balloonId).write(1, entityId);
+        return packet;
+    }
+
     public static PacketContainer getEquipmentPacket(
             final List<Pair<EnumWrappers.ItemSlot, ItemStack>> equipmentList,
             final int entityId

common/src/main/java/io/github/fisher2911/hmccosmetics/user/BaseUser.java

@@ -7,6 +7,7 @@ import io.github.fisher2911.hmccosmetics.config.CosmeticSettings;
 import io.github.fisher2911.hmccosmetics.config.Settings;
 import io.github.fisher2911.hmccosmetics.gui.ArmorItem;
 import io.github.fisher2911.hmccosmetics.inventory.PlayerArmor;
+import io.github.fisher2911.hmccosmetics.packet.EntityIds;
 import io.github.fisher2911.hmccosmetics.packet.PacketManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -26,22 +27,21 @@ import java.util.UUID;
 public abstract class BaseUser<T> {
 
     protected final T id;
-    protected final int entityId;
+    protected final EntityIds entityIds;
     protected final PlayerArmor playerArmor;
 
     protected ArmorItem lastSetItem = ArmorItem.empty(ArmorItem.Type.HAT);
 
     protected boolean hasArmorStand;
-    protected final int armorStandId;
+    protected boolean hasBallon;
 
     // List of players that are currently viewing the armor stand
     protected final Set<UUID> viewing = new HashSet<>();
 
-    public BaseUser(final T id, final int entityId, final PlayerArmor playerArmor,  final int armorStandId) {
+    public BaseUser(final T id, final PlayerArmor playerArmor, final EntityIds entityIds) {
         this.id = id;
-        this.entityId = entityId;
+        this.entityIds = entityIds;
         this.playerArmor = playerArmor;
-        this.armorStandId = armorStandId;
     }
 
     @Nullable
@@ -68,7 +68,11 @@ public abstract class BaseUser<T> {
     }
 
     public int getArmorStandId() {
-        return armorStandId;
+        return this.entityIds.armorStand();
+    }
+
+    public int getBalloonId() {
+        return this.entityIds.balloon();
     }
 
     protected ArmorItem setItem(final ArmorItem armorItem) {
@@ -80,47 +84,78 @@ public abstract class BaseUser<T> {
         return this.setItem(ArmorItem.empty(type));
     }
 
-    public void spawnArmorStand(final Player other, final Location location, final CosmeticSettings settings) {
+    public void spawnOutsideCosmetics(final Player other, final Location location, final Settings settings) {
-        if (!this.isInViewDistance(this.getLocation(), other.getLocation(), settings) || !shouldShow(other)) return;
+        if (this.getLocation() == null) return;
+        this.updateOutsideCosmetics(other, location, settings);
+    }
 
-        final PacketContainer packet = PacketManager.getEntitySpawnPacket(location, this.armorStandId, EntityType.ARMOR_STAND);
+    private void despawnBalloon(final Player other) {
-        this.viewing.add(other.getUniqueId());
+        final PacketContainer removePacket = PacketManager.getEntityDestroyPacket(this.getBalloonId());
+        PacketManager.sendPacket(other, removePacket);
+    }
+
+    private void spawnBalloon(final Player other, final Location location, final CosmeticSettings settings) {
+        final Location actual = location.add(0, 5, 0);
+        final PacketContainer spawnPacket = PacketManager.getEntitySpawnPacket(actual, this.getBalloonId(), EntityType.PIG);
+        final PacketContainer leashPacket = PacketManager.getLeashPacket(this.getBalloonId(), this.getEntityId());
+        PacketManager.sendPacket(other, spawnPacket, leashPacket);
+    }
+
+    private void updateBalloon(final CosmeticSettings settings) {
+        final Location location = this.getLocation();
+        for (final Player player : Bukkit.getOnlinePlayers()) {
+            if (!this.hasBallon) {
+                this.spawnBalloon(player, location, settings);
+            } else {
+                this.updateBalloon(player, location, settings);
+            }
+        }
+        this.hasBallon = true;
+    }
+
+    private void updateBalloon(final Player other, final Location location, final CosmeticSettings settings) {
+//        final PacketContainer spawnPacket = PacketManager.getEntitySpawnPacket(location, this.getBalloonId(), EntityType.PARROT);
+//        PacketManager.sendPacket(other, spawnPacket, spawnPacket);
+    }
+
+    private void spawnArmorStand(final Player other, final Location location, final CosmeticSettings settings) {
+//        if (!this.isInViewDistance(this.getLocation(), other.getLocation(), settings) || !shouldShow(other)) return;
+        final PacketContainer packet = PacketManager.getEntitySpawnPacket(location, this.getArmorStandId(), EntityType.ARMOR_STAND);
         PacketManager.sendPacket(other, packet);
     }
 
-    public void spawnArmorStand(final Settings settings) {
+//    private void spawnArmorStand(final Settings settings) {
-        if (this.hasArmorStand) {
+//        if (this.hasArmorStand) {
-            this.updateArmorStand(settings);
+//            this.updateArmorStand(settings);
-            return;
+//            return;
-        }
+//        }
+//
+//        for (final Player p : Bukkit.getOnlinePlayers()) {
+//            this.spawnArmorStand(p, this.getLocation(), settings.getCosmeticSettings());
+//        }
+//
+//        this.hasArmorStand = true;
+//    }
 
-        for (final Player p : Bukkit.getOnlinePlayers()) {
+    public void updateOutsideCosmetics(final Player player, final Settings settings) {
-            this.spawnArmorStand(p, this.getLocation(), settings.getCosmeticSettings());
+        this.updateOutsideCosmetics(player, this.getLocation(), settings);
-        }
-
-        this.hasArmorStand = true;
     }
 
-    public void updateArmorStand(final Settings settings) {
+    public void updateOutsideCosmetics(final Settings settings) {
-        if (!this.hasArmorStand) {
-            this.spawnArmorStand(settings);
-        }
         for (final Player player : Bukkit.getOnlinePlayers()) {
-            this.updateArmorStand(player, settings);
+            this.spawnOutsideCosmetics(player, this.getLocation(), settings);
         }
     }
 
-    public void updateArmorStand(final Player other, final Settings settings) {
+    public void updateOutsideCosmetics(final Player other, final Location location, final Settings settings) {
-        this.updateArmorStand(other, settings, this.getLocation());
-    }
-
-    public void updateArmorStand(final Player other, final Settings settings, final Location location) {
         final boolean inViewDistance = this.isInViewDistance(this.getLocation(), other.getLocation(), settings.getCosmeticSettings());
         if (!this.viewing.contains(other.getUniqueId())) {
             if (!inViewDistance || !shouldShow(other)) return;
             this.spawnArmorStand(other, location, settings.getCosmeticSettings());
+            this.spawnBalloon(other, location, settings.getCosmeticSettings());
         } else if (!inViewDistance || !shouldShow(other)) {
             this.despawnAttached(other);
+            this.despawnBalloon(other);
             this.viewing.remove(other.getUniqueId());
             return;
         }
@@ -136,15 +171,18 @@ public abstract class BaseUser<T> {
             ));
         }
 
-        final PacketContainer armorPacket = PacketManager.getEquipmentPacket(equipmentList, this.armorStandId);
+        final int armorStandId = this.getArmorStandId();
-        final PacketContainer rotationPacket = PacketManager.getRotationPacket(this.armorStandId, location);
+        final PacketContainer armorPacket = PacketManager.getEquipmentPacket(equipmentList, armorStandId);
-        final PacketContainer ridingPacket = PacketManager.getRidingPacket(this.getEntityId(), this.armorStandId);
+        final PacketContainer rotationPacket = PacketManager.getRotationPacket(armorStandId, location);
-        final PacketContainer armorStandMetaContainer = PacketManager.getArmorStandMetaContainer(this.armorStandId);
+        final PacketContainer ridingPacket = PacketManager.getRidingPacket(this.getEntityId(), armorStandId);
+        final PacketContainer armorStandMetaContainer = PacketManager.getArmorStandMetaContainer(armorStandId);
 
         PacketManager.sendPacket(other, armorPacket, armorStandMetaContainer, rotationPacket, ridingPacket);
 
         if (hidden) return;
 
+        this.updateBalloon(other, location, settings.getCosmeticSettings());
+
         final int lookDownPitch = settings.getCosmeticSettings().getLookDownPitch();
 
         if (lookDownPitch != -1 &&
@@ -154,7 +192,7 @@ public abstract class BaseUser<T> {
             ));
 
             if (!this.id.equals(other.getUniqueId())) return;
-            PacketManager.sendPacket(other, PacketManager.getEquipmentPacket(equipmentList, this.armorStandId));
+            PacketManager.sendPacket(other, PacketManager.getEquipmentPacket(equipmentList, armorStandId));
         }
     }
 
@@ -170,13 +208,13 @@ public abstract class BaseUser<T> {
     }
 
     public void despawnAttached(final Player other) {
-        PacketManager.sendPacket(other, PacketManager.getEntityDestroyPacket(this.armorStandId));
+        PacketManager.sendPacket(other, PacketManager.getEntityDestroyPacket(this.getArmorStandId()));
         this.viewing.remove(other.getUniqueId());
         this.hasArmorStand = false;
     }
 
     public void despawnAttached() {
-        PacketManager.sendPacketToOnline(PacketManager.getEntityDestroyPacket(this.armorStandId));
+        PacketManager.sendPacketToOnline(PacketManager.getEntityDestroyPacket(this.getArmorStandId()));
         this.hasArmorStand = false;
     }
 
@@ -189,7 +227,7 @@ public abstract class BaseUser<T> {
     }
 
     public int getEntityId() {
-        return this.entityId;
+        return this.entityIds.self();
     }
 
     public abstract Equipment getEquipment();

common/src/main/java/io/github/fisher2911/hmccosmetics/user/NPCUser.java

@@ -3,6 +3,7 @@ package io.github.fisher2911.hmccosmetics.user;
 import io.github.fisher2911.hmccosmetics.hook.HookManager;
 import io.github.fisher2911.hmccosmetics.hook.item.CitizensHook;
 import io.github.fisher2911.hmccosmetics.inventory.PlayerArmor;
+import io.github.fisher2911.hmccosmetics.packet.EntityIds;
 import net.citizensnpcs.api.npc.NPC;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
@@ -14,13 +15,13 @@ public class NPCUser extends BaseUser<Integer> {
 
     private final CitizensHook hook;
 
-    public NPCUser(final int id, final int entityId, final PlayerArmor playerArmor, final int armorStandId) {
+    public NPCUser(final int id, final PlayerArmor playerArmor, final EntityIds entityIds) {
-        super(id, entityId, playerArmor, armorStandId);
+        super(id, playerArmor, entityIds);
         this.hook = HookManager.getInstance().getCitizensHook();
     }
 
-    public NPCUser(final PlayerArmor playerArmor, final int armorStandId, final NPC npc) {
+    public NPCUser(final PlayerArmor playerArmor, final NPC npc, final EntityIds entityIds) {
-        this(npc.getId(), npc.getId(), playerArmor, armorStandId);
+        this(npc.getId(), playerArmor, entityIds);
     }
 
     @Nullable

common/src/main/java/io/github/fisher2911/hmccosmetics/user/User.java

@@ -3,6 +3,7 @@ package io.github.fisher2911.hmccosmetics.user;
 import io.github.fisher2911.hmccosmetics.gui.ArmorItem;
 import io.github.fisher2911.hmccosmetics.gui.CosmeticGui;
 import io.github.fisher2911.hmccosmetics.inventory.PlayerArmor;
+import io.github.fisher2911.hmccosmetics.packet.EntityIds;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
@@ -18,13 +19,13 @@ public class User extends BaseUser<UUID> {
     private CosmeticGui openGui;
     private boolean hidden;
 
-    public User(final UUID uuid, final int entityId, final PlayerArmor playerArmor, final Wardrobe wardrobe, final int armorStandId) {
+    public User(final UUID uuid, final PlayerArmor playerArmor, final Wardrobe wardrobe, final EntityIds entityIds) {
-        super(uuid, entityId, playerArmor, armorStandId);
+        super(uuid, playerArmor, entityIds);
         this.wardrobe = wardrobe;
     }
 
-    public User(final UUID uuid, final int entityId, final PlayerArmor playerArmor, final int armorStandId) {
+    public User(final UUID uuid, final PlayerArmor playerArmor, final EntityIds entityIds) {
-        super(uuid, entityId, playerArmor, armorStandId);
+        super(uuid, playerArmor, entityIds);
     }
 
     public @Nullable Player getPlayer() {

common/src/main/java/io/github/fisher2911/hmccosmetics/user/UserFactory.java

@@ -4,6 +4,7 @@ import io.github.fisher2911.hmccosmetics.HMCCosmetics;
 import io.github.fisher2911.hmccosmetics.hook.HookManager;
 import io.github.fisher2911.hmccosmetics.hook.item.CitizensHook;
 import io.github.fisher2911.hmccosmetics.inventory.PlayerArmor;
+import io.github.fisher2911.hmccosmetics.packet.EntityIds;
 import org.bukkit.entity.Entity;
 import org.jetbrains.annotations.Nullable;
 
@@ -24,17 +25,21 @@ public class UserFactory {
     public static <T extends BaseUser> T createUser(
             final Class<T> type,
             final Entity entity,
-            final int armorStandId
+            final int armorStandId,
+            final int balloonId
             ) {
         final UUID uuid = entity.getUniqueId();
         final int entityId = entity.getEntityId();
         if (type.equals(User.class)) {
             return (T) new User(
                     uuid,
-                    entityId,
                     PlayerArmor.empty(),
                     plugin.getDatabase().createNewWardrobe(uuid),
-                    armorStandId
+                    new EntityIds(
+                            entityId,
+                            armorStandId,
+                            balloonId
+                    )
             );
         }
 
@@ -43,9 +48,12 @@ public class UserFactory {
             final int citizensId = HookManager.getInstance().getCitizensHook().getCitizensId(entity);
             return (T) new NPCUser(
                     citizensId,
-                    entityId,
                     PlayerArmor.empty(),
-                    armorStandId
+                    new EntityIds(
+                            entityId,
+                            armorStandId,
+                            balloonId
+                    )
             );
         }
 

common/src/main/java/io/github/fisher2911/hmccosmetics/user/UserManager.java

@@ -89,7 +89,7 @@ public class UserManager {
         this.plugin.getTaskManager().submit(new InfiniteTask(
                 () -> {
                     for (final User user : this.userMap.values()) {
-                        user.updateArmorStand(this.plugin.getSettings());
+                        user.updateOutsideCosmetics(this.plugin.getSettings());
                     }
                 }
         ));
@@ -99,7 +99,7 @@ public class UserManager {
         for (final User user : this.userMap.values()) {
             final Player p = user.getPlayer();
             if (p == null) continue;
-            user.spawnArmorStand(player, p.getLocation(), this.settings.getCosmeticSettings());
+            user.updateOutsideCosmetics(player, p.getLocation(), this.settings);
             this.updateCosmetics(user, player);
         }
     }
@@ -202,7 +202,7 @@ public class UserManager {
                     this.updateCosmetics(user);
                 }
                 case BACKPACK -> {
-                    if (user instanceof Wardrobe) user.updateArmorStand(settings);
+                    if (user instanceof Wardrobe) user.updateOutsideCosmetics(settings);
                 }
             }
         });

common/src/main/java/io/github/fisher2911/hmccosmetics/user/Wardrobe.java

@@ -6,6 +6,7 @@ import io.github.fisher2911.hmccosmetics.config.Settings;
 import io.github.fisher2911.hmccosmetics.config.WardrobeSettings;
 import io.github.fisher2911.hmccosmetics.gui.ArmorItem;
 import io.github.fisher2911.hmccosmetics.inventory.PlayerArmor;
+import io.github.fisher2911.hmccosmetics.packet.EntityIds;
 import io.github.fisher2911.hmccosmetics.packet.PacketManager;
 import io.github.fisher2911.hmccosmetics.task.SupplierTask;
 import io.github.fisher2911.hmccosmetics.task.Task;
@@ -23,7 +24,6 @@ public class Wardrobe extends User {
 
     private final HMCCosmetics plugin;
     private final UUID ownerUUID;
-    private final int viewerId;
     private boolean active;
     private boolean cameraLocked;
 
@@ -34,16 +34,13 @@ public class Wardrobe extends User {
     public Wardrobe(
             final HMCCosmetics plugin,
             final UUID uuid,
-            final int entityId,
             final UUID ownerUUID,
             final PlayerArmor playerArmor,
-            final int armorStandId,
+            final EntityIds entityIds,
-            final int viewerId,
             final boolean active) {
-        super(uuid, entityId, playerArmor, armorStandId);
+        super(uuid, playerArmor, entityIds);
         this.plugin = plugin;
         this.ownerUUID = ownerUUID;
-        this.viewerId = viewerId;
         this.active = active;
         this.wardrobe = this;
     }
@@ -106,8 +103,8 @@ public class Wardrobe extends User {
                 this.plugin,
                 () -> {
                     PacketManager.sendPacket(viewer, playerInfoPacket, playerSpawnPacket);
-                    this.spawnArmorStand(viewer, this.currentLocation, this.plugin.getSettings().getCosmeticSettings());
+                    this.spawnOutsideCosmetics(viewer, this.currentLocation, this.plugin.getSettings());
-                    this.updateArmorStand(viewer, plugin.getSettings(), this.currentLocation);
+                    this.updateOutsideCosmetics(viewer, this.currentLocation, plugin.getSettings());
                     PacketManager.sendPacket(
                             viewer,
                             PacketManager.getLookPacket(this.getEntityId(), this.currentLocation),
@@ -123,8 +120,8 @@ public class Wardrobe extends User {
     }
 
     @Override
-    public void updateArmorStand(final Player player, final Settings settings) {
+    public void updateOutsideCosmetics(final Player player, final Settings settings) {
-        this.updateArmorStand(player, settings, this.currentLocation);
+        this.updateOutsideCosmetics(player, this.currentLocation, settings);
     }
 
     public void despawnFakePlayer(final Player viewer) {
@@ -168,7 +165,7 @@ public class Wardrobe extends User {
                     final int yaw = data.get();
                     location.setYaw(yaw);
                     PacketManager.sendPacket(player, PacketManager.getLookPacket(this.getEntityId(), location));
-                    this.updateArmorStand(player, this.plugin.getSettings(), location);
+                    this.updateOutsideCosmetics(player, location, this.plugin.getSettings());
                     location.setYaw(this.getNextYaw(yaw - 30, rotationSpeed));
                     PacketManager.sendPacket(player, PacketManager.getRotationPacket(this.getEntityId(), location));
                     data.set(this.getNextYaw(yaw, rotationSpeed));