version bump (2.4.3)

build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "com.hibiscusmc"
-version = "2.4.2"
+version = "2.4.3"
 
 allprojects {
     apply(plugin = "java")

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

@@ -0,0 +1,46 @@
+package com.hibiscusmc.hmccosmetics.api;
+
+import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
+import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+
+public class PlayerCosmeticPostEquipEvent extends PlayerCosmeticEvent {
+    private static final HandlerList handlers = new HandlerList();
+    private Cosmetic cosmetic;
+
+    public PlayerCosmeticPostEquipEvent(@NotNull CosmeticUser who, @NotNull Cosmetic cosmetic) {
+        super(who);
+        this.cosmetic = cosmetic;
+    }
+
+    /**
+     * Gets the {@link Cosmetic} being equipped in this event
+     *
+     * @return The {@link Cosmetic} which is being equipped in this event
+     */
+    @NotNull
+    public Cosmetic getCosmetic() {
+        return cosmetic;
+    }
+
+    /**
+     * Sets the {@link Cosmetic} that the player will equip
+     *
+     * @param cosmetic The {@link Cosmetic} that the player will equip
+     */
+    public void setCosmetic(@NotNull Cosmetic cosmetic) {
+        this.cosmetic = cosmetic;
+    }
+
+    @Override
+    @NotNull
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    @NotNull
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+}

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

@@ -77,26 +77,21 @@ public class Menu {
 
         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
 
-        Gui finalGui = gui;
+        // API
-
         PlayerMenuOpenEvent event = new PlayerMenuOpenEvent(user, this);
-
         Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
             Bukkit.getPluginManager().callEvent(event);
         });
-
+        if (event.isCancelled()) return;
-        if (event.isCancelled()) {
+        // Internal
-            return;
-        }
 
         Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
             finalGui.open(player);
         });
-
-        //gui.open(player);
-
     }
 
     @Contract("_, _ -> param2")

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

@@ -9,6 +9,8 @@ import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.wrappers.EnumWrappers;
 import com.comphenix.protocol.wrappers.Pair;
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
+import com.hibiscusmc.hmccosmetics.api.PlayerCosmeticEquipEvent;
+import com.hibiscusmc.hmccosmetics.api.PlayerCosmeticPostEquipEvent;
 import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
@@ -23,7 +25,9 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
 import com.hibiscusmc.hmccosmetics.user.manager.UserEmoteManager;
 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.Location;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.enchantments.Enchantment;
@@ -346,6 +350,16 @@ public class PlayerGameListener implements Listener {
         }
     }
 
+    @EventHandler
+    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()));
+            user.getBalloonManager().getModelEntity().teleport(NPCLocation.add(Settings.getBalloonOffset()));
+        }
+    }
+
     private void registerInventoryClickListener() {
         ProtocolLibrary.getProtocolManager().addPacketListener(new PacketAdapter(HMCCosmeticsPlugin.getInstance(), ListenerPriority.NORMAL, PacketType.Play.Client.WINDOW_CLICK) {
             @Override

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

@@ -116,6 +116,9 @@ public class CosmeticUser {
             CosmeticBalloonType balloonType = (CosmeticBalloonType) cosmetic;
             spawnBalloon(balloonType);
         }
+        // API
+        PlayerCosmeticPostEquipEvent postEquipEvent = new PlayerCosmeticPostEquipEvent(this, cosmetic);
+        Bukkit.getPluginManager().callEvent(postEquipEvent);
     }
 
     public void removeCosmetics() {
@@ -141,7 +144,7 @@ public class CosmeticUser {
             despawnBalloon();
         }
         if (slot == CosmeticSlot.EMOTE) {
-
+            if (getUserEmoteManager().isPlayingEmote()) getUserEmoteManager().stopEmote(UserEmoteManager.StopEmoteReason.UNEQUIP);
         }
         colors.remove(slot);
         playerCosmetics.remove(slot);

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

@@ -88,6 +88,7 @@ public class UserEmoteManager {
         SNEAK,
         DAMAGE,
         CONNECTION,
-        TELEPORT
+        TELEPORT,
+        UNEQUIP
     }
 }

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

@@ -120,8 +120,9 @@ public class UserWardrobeManager {
                 user.getBalloonManager().sendLeashPacket(NPC_ID);
                 //PacketManager.sendLeashPacket(VIEWER.getBalloonEntity().getModelId(), NPC_ID, viewer);
 
-                PacketManager.sendTeleportPacket(user.getBalloonManager().getPufferfishBalloonId(), npcLocation.clone().add(Settings.getBalloonOffset()), false, viewer);
+                Location balloonLocation = npcLocation.clone().add(Settings.getBalloonOffset());
-                user.getBalloonManager().getModelEntity().teleport(npcLocation.clone().add(Settings.getBalloonOffset()));
+                PacketManager.sendTeleportPacket(user.getBalloonManager().getPufferfishBalloonId(), balloonLocation , false, viewer);
+                user.getBalloonManager().getModelEntity().teleport(balloonLocation);
             }
 
             if (WardrobeSettings.getEnabledBossbar()) {
@@ -268,8 +269,9 @@ public class UserWardrobeManager {
                 }
 
                 if (user.hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
-                    PacketManager.sendTeleportPacket(user.getBalloonManager().getPufferfishBalloonId(), npcLocation.add(Settings.getBalloonOffset()), false, viewer);
+                    // The two lines below broke, solved by listening to PlayerCosmeticPostEquipEvent
-                    user.getBalloonManager().getModelEntity().teleport(npcLocation.add(Settings.getBalloonOffset()));
+                    //PacketManager.sendTeleportPacket(user.getBalloonManager().getPufferfishBalloonId(), npcLocation.add(Settings.getBalloonOffset()), false, viewer);
+                    //user.getBalloonManager().getModelEntity().teleport(npcLocation.add(Settings.getBalloonOffset()));
                     user.getBalloonManager().sendRemoveLeashPacket(outsideViewers);
                     PacketManager.sendEntityDestroyPacket(user.getBalloonManager().getModelId(), outsideViewers);
                     user.getBalloonManager().sendLeashPacket(NPC_ID);
@@ -302,4 +304,8 @@ public class UserWardrobeManager {
         RUNNING,
         STOPPING,
     }
+
+    public Location getNpcLocation() {
+        return npcLocation;
+    }
 }