version bump (2.6.6)

build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "com.hibiscusmc"
-version = "2.6.4"
+version = "2.6.6"
 
 allprojects {
     apply(plugin = "java")
@@ -32,9 +32,6 @@ allprojects {
         // PlaceholderAPI
         maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
 
-        //Hikari
-        maven("https://mvnrepository.com/artifact/com.zaxxer/HikariCP")
-
         // Citizens & Denizen
         maven("https://maven.citizensnpcs.co/repo")
 
@@ -73,12 +70,12 @@ allprojects {
         compileOnly("com.mojang:authlib:1.5.25")
         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("com.comphenix.protocol:ProtocolLib:5.1.0")
         compileOnly("me.clip:placeholderapi:2.11.3")
-        compileOnly("com.ticxo:modelengine:R3.0.1")
+        compileOnly("com.ticxo.modelengine:ModelEngine:R4.0.2")
         compileOnly("com.github.oraxen:oraxen:1.160.0")
         compileOnly("com.github.LoneDev6:API-ItemsAdder:3.2.5")
-        compileOnly("com.mineinabyss:geary-papermc:0.24.1")
+        compileOnly("com.mineinabyss:geary-papermc:0.27.0")
         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.17")
@@ -97,18 +94,20 @@ dependencies {
     implementation(project(path = ":v1_19_R2", configuration = "reobf"))
     implementation(project(path = ":v1_19_R3", configuration = "reobf"))
     implementation(project(path = ":v1_20_R1", configuration = "reobf"))
+    implementation(project(path = ":v1_20_R2", configuration = "reobf"))
+    implementation(project(path = ":v1_20_R3", configuration = "reobf"))
 
     //compileOnly("com.github.Fisher2911:FisherLib:master-SNAPSHOT")
     implementation("net.kyori:adventure-api:4.11.0")
     implementation("net.kyori:adventure-text-minimessage:4.11.0")
     implementation("net.kyori:adventure-platform-bukkit:4.1.2")
     implementation("dev.triumphteam:triumph-gui:3.1.3")
-    implementation("org.spongepowered:configurate-yaml:4.1.2")
+    implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT")
     implementation("org.bstats:bstats-bukkit:3.0.0")
     implementation("com.jeff_media:SpigotUpdateChecker:3.0.0")
     implementation("com.owen1212055:particlehelper:1.0.0-SNAPSHOT")
     implementation("com.ticxo.playeranimator:PlayerAnimator:R1.2.7")
-    implementation("com.github.BG-Software-LLC:CommentedConfiguration:-SNAPSHOT")
+    implementation("com.github.BG-Software-LLC:CommentedConfiguration:bed3c46369")
     //implementation("com.ticxo.playeranimator:PlayerAnimator:R1.2.5")
 }
 
@@ -129,7 +128,7 @@ tasks {
     }
 
     runServer {
-        minecraftVersion("1.20.1")
+        minecraftVersion("1.20.4")
     }
 
     shadowJar {
@@ -138,6 +137,8 @@ tasks {
         dependsOn(":v1_19_R2:reobfJar")
         dependsOn(":v1_19_R3:reobfJar")
         dependsOn(":v1_20_R1:reobfJar")
+        dependsOn(":v1_20_R2:reobfJar")
+        dependsOn(":v1_20_R3:reobfJar")
         mergeServiceFiles()
 
         relocate("dev.triumphteam.gui", "com.hisbiscusmc.hmccosmetics.gui")

common/build.gradle.kts

@@ -7,9 +7,9 @@ dependencies {
     compileOnly("com.mojang:authlib:1.5.25")
     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("com.comphenix.protocol:ProtocolLib:5.1.0")
     compileOnly("me.clip:placeholderapi:2.11.3")
-    compileOnly("com.ticxo:modelengine:R3.0.1")
+    compileOnly("com.ticxo.modelengine:ModelEngine:R4.0.2")
     compileOnly("com.github.oraxen:oraxen:1.160.0")
     compileOnly("com.github.LoneDev6:API-ItemsAdder:3.2.5")
     compileOnly("com.mineinabyss:geary-papermc:0.24-SNAPSHOT")
@@ -34,7 +34,7 @@ dependencies {
     implementation("com.jeff_media:SpigotUpdateChecker:3.0.0")
     implementation("com.owen1212055:particlehelper:1.0.0-SNAPSHOT")
     implementation("com.ticxo.playeranimator:PlayerAnimator:R1.2.7")
-    implementation("com.github.BG-Software-LLC:CommentedConfiguration:-SNAPSHOT")
+    implementation("com.github.BG-Software-LLC:CommentedConfiguration:bed3c46369")
     //implementation("com.ticxo.playeranimator:PlayerAnimator:R1.2.5")
 }
 

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

@@ -61,7 +61,7 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
         Metrics metrics = new Metrics(this, pluginId);
 
         // NMS version check
-        if (!NMSHandlers.getHandler().getSupported()) {
+        if (!NMSHandlers.isVersionSupported()) {
             getLogger().severe("This version is not supported! Consider switching versions?");
             getServer().getPluginManager().disablePlugin(this);
             return;
@@ -70,8 +70,8 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
         // Update Checker
         UpdateChecker checker = new UpdateChecker(this, UpdateCheckSource.POLYMART, "1879")
                 .onSuccess((commandSenders, latestVersion) -> {
-                    this.latestVersion = (String) latestVersion;
+                    HMCCosmeticsPlugin.latestVersion = (String) latestVersion;
-                    if (!this.latestVersion.equalsIgnoreCase(getDescription().getVersion())) {
+                    if (!HMCCosmeticsPlugin.latestVersion.equalsIgnoreCase(getDescription().getVersion())) {
                         getLogger().info("+++++++++++++++++++++++++++++++++++");
                         getLogger().info("There is a new update for HMCCosmetics!");
                         getLogger().info("Please download it as soon as possible for possible fixes and new features.");
@@ -98,7 +98,7 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
         if (!emoteFile.exists()) emoteFile.mkdir();
 
         // Player Animator
-        PlayerAnimatorImpl.initialize(this);
+        if (!NMSHandlers.getVersion().contains("v1_20_R2") && !NMSHandlers.getVersion().contains("v1_20_R3")) PlayerAnimatorImpl.initialize(this); // PlayerAnimator does not support 1.20.2 yet
 
         // Configuration Sync
         final File configFile = Path.of(getInstance().getDataFolder().getPath(), "config.yml").toFile();
@@ -252,7 +252,7 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
             }
         }
 
-        EmoteManager.loadEmotes();
+        if (Settings.isEmotesEnabled() && !NMSHandlers.getVersion().contains("v1_20_R2") && !NMSHandlers.getVersion().contains("v1_20_R3")) EmoteManager.loadEmotes(); // PlayerAnimator does not support 1.20.2 yet
 
         getInstance().getLogger().info("Successfully Enabled HMCCosmetics");
         getInstance().getLogger().info(Cosmetics.values().size() + " Cosmetics Successfully Setup");

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

@@ -1,5 +1,7 @@
 package com.hibiscusmc.hmccosmetics.command;
 
+import com.hibiscusmc.hmccolor.HMCColorConfig;
+import com.hibiscusmc.hmccolor.HMCColorContextKt;
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.config.Wardrobe;
@@ -14,6 +16,7 @@ import com.hibiscusmc.hmccosmetics.emotes.EmoteManager;
 import com.hibiscusmc.hmccosmetics.gui.Menu;
 import com.hibiscusmc.hmccosmetics.gui.Menus;
 import com.hibiscusmc.hmccosmetics.gui.special.DyeMenu;
+import com.hibiscusmc.hmccosmetics.hooks.Hooks;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
@@ -104,7 +107,20 @@ public class CosmeticCommand implements CommandExecutor {
                 }
 
                 if (sender.hasPermission("hmccosmetics.cmd.apply.color")) {
-                    if (args.length >= 4) color = ServerUtils.hex2Rgb(args[3]);
+                    if (args.length >= 4) {
+                        // TODO: Add sub-color support somehow... (and make this neater)
+                        String textColor = args[3];
+                        if (!textColor.contains("#") && Hooks.isActiveHook("HMCColor")) {
+                            HMCColorConfig.Colors colors = HMCColorContextKt.getHmcColor().getConfig().getColors().get(textColor);
+                            if (colors != null) {
+                                String hmccolor = colors.getBaseColor().getColor();
+                                if (hmccolor.contains("#")) color = ServerUtils.hex2Rgb(hmccolor);
+                                else color = ServerUtils.rgbToRgb(hmccolor);
+                            }
+                        } else {
+                            color = ServerUtils.hex2Rgb(textColor);
+                        }
+                    }
                 }
 
                 if (args.length == 1) {

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

@@ -1,5 +1,6 @@
 package com.hibiscusmc.hmccosmetics.command;
 
+import com.hibiscusmc.hmccolor.HMCColorContextKt;
 import com.hibiscusmc.hmccosmetics.config.Wardrobe;
 import com.hibiscusmc.hmccosmetics.config.WardrobeSettings;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
@@ -8,6 +9,7 @@ import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
 import com.hibiscusmc.hmccosmetics.emotes.EmoteManager;
 import com.hibiscusmc.hmccosmetics.gui.Menu;
 import com.hibiscusmc.hmccosmetics.gui.Menus;
+import com.hibiscusmc.hmccosmetics.hooks.Hooks;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
 import org.bukkit.Bukkit;
@@ -122,6 +124,7 @@ public class CosmeticCommandTabComplete implements TabCompleter {
             String subcommand = args[0].toLowerCase();
             switch (subcommand) {
                 case "apply" -> {
+                    if (Hooks.isActiveHook("HMCColor")) completions.addAll(HMCColorContextKt.getHmcColor().getConfig().getColors().keySet());
                     completions.add("#FFFFFF");
                 }
             }

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

@@ -7,6 +7,8 @@ import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.util.Vector;
 import org.spongepowered.configurate.ConfigurationNode;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.logging.Level;
 
 public class Settings {
@@ -26,6 +28,8 @@ public class Settings {
     private static final String UNAPPLY_DEATH_PATH = "unapply-on-death";
     private static final String FORCE_PERMISSION_JOIN_PATH = "force-permission-join";
     private static final String FORCE_SHOW_COSMETICS_PATH = "force-show-join";
+    private static final String DISABLED_GAMEMODE_PATH = "disabled-gamemode";
+    private static final String DISABLED_GAMEMODE_GAMEMODES_PATH = "gamemodes";
     private static final String EMOTE_DISTANCE_PATH = "emote-distance";
     private static final String HOOK_SETTING_PATH = "hook-settings";
     private static final String HOOK_ITEMADDER_PATH = "itemsadder";
@@ -33,6 +37,7 @@ public class Settings {
     private static final String HOOK_WORLDGUARD_PATH = "worldguard";
     private static final String HOOK_WG_MOVE_CHECK_PATH = "player-move-check";
     private static final String HOOK_WG_MOVE_CHECK_PATH_LEGACY = "player_move_check";
+    private static final String COSMETIC_EMOTE_ENABLE = "emote-enable";
     private static final String COSMETIC_EMOTE_CHECK_PATH = "emote-block-check";
     private static final String COSMETIC_EMOTE_AIR_CHECK_PATH = "emote-air-check";
     private static final String COSMETIC_EMOTE_DAMAGE_PATH = "emote-damage-leave";
@@ -107,6 +112,12 @@ public class Settings {
     @Getter
     private static boolean cosmeticForceOffhandCosmeticShow;
     @Getter
+    private static boolean emotesEnabled;
+    @Getter
+    private static boolean disabledGamemodesEnabled;
+    @Getter
+    private static List<String> disabledGamemodes;
+    @Getter
     private static int viewDistance;
     @Getter
     private static int tickPeriod;
@@ -161,9 +172,18 @@ public class Settings {
 
         ConfigurationNode cosmeticSettings = source.node(COSMETIC_SETTINGS_PATH);
 
+        ConfigurationNode disabledGamemodeSettings = cosmeticSettings.node(DISABLED_GAMEMODE_PATH);
+        disabledGamemodesEnabled = disabledGamemodeSettings.node(ENABLED_PATH).getBoolean(true);
+        try {
+            disabledGamemodes = disabledGamemodeSettings.node(DISABLED_GAMEMODE_GAMEMODES_PATH).getList(String.class);
+        } catch (Exception e) {
+            disabledGamemodes = new ArrayList<>();
+        }
+
         unapplyOnDeath = cosmeticSettings.node(UNAPPLY_DEATH_PATH).getBoolean(false);
         forcePermissionJoin = cosmeticSettings.node(FORCE_PERMISSION_JOIN_PATH).getBoolean(false);
         forceShowOnJoin = cosmeticSettings.node(FORCE_SHOW_COSMETICS_PATH).getBoolean(false);
+        emotesEnabled = cosmeticSettings.node(COSMETIC_EMOTE_ENABLE).getBoolean(true);
         emoteDistance = cosmeticSettings.node(EMOTE_DISTANCE_PATH).getDouble(-3);
         cosmeticEmoteBlockCheck = cosmeticSettings.node(COSMETIC_EMOTE_CHECK_PATH).getBoolean(true);
         emoteAirCheck = cosmeticSettings.node(COSMETIC_EMOTE_AIR_CHECK_PATH).getBoolean(true);

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

@@ -9,6 +9,7 @@ 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;
@@ -35,7 +36,10 @@ public class CosmeticArmorType extends Cosmetic {
         if (Settings.getShouldAddEnchants(equipSlot)) {
             cosmeticItem.addUnsafeEnchantments(equippedItem.getEnchantments());
         }
-
+        // Basically, if force offhand is off AND there is no item in an offhand slot, then the equipment packet to add the cosmetic
+        if (!Settings.isCosmeticForceOffhandCosmeticShow()
+                && equipSlot.equals(EquipmentSlot.OFF_HAND)
+                && ((entity instanceof Player) && !user.getPlayer().getInventory().getItemInOffHand().getType().isAir())) return;
         NMSHandlers.getHandler().equipmentSlotUpdate(entity.getEntityId(), equipSlot, cosmeticItem, PacketManager.getViewers(entity.getLocation()));
     }
 

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

@@ -9,7 +9,6 @@ import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 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;
@@ -91,8 +90,7 @@ public class CosmeticBalloonType extends Cosmetic {
         if (!user.getHidden() && showLead) {
             List<Player> sendTo = userBalloonManager.getPufferfish().refreshViewers(newLocation);
             if (sendTo.isEmpty()) return;
-            PacketManager.sendEntitySpawnPacket(newLocation, userBalloonManager.getPufferfishBalloonId(), EntityType.PUFFERFISH, userBalloonManager.getPufferfishBalloonUniqueId(), sendTo);
+            user.getBalloonManager().getPufferfish().spawnPufferfish(newLocation, sendTo);
-            PacketManager.sendInvisibilityPacket(userBalloonManager.getPufferfishBalloonId(), sendTo);
         }
     }
 

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

@@ -18,6 +18,7 @@ import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.inventory.meta.SkullMeta;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.spongepowered.configurate.ConfigurationNode;
@@ -186,6 +187,12 @@ public class TypeCosmetic extends Type {
                 processedLore.add(Hooks.processPlaceholders(user.getPlayer(), loreLine));
             }
         }
+
+        if (itemMeta instanceof SkullMeta skullMeta) {
+            if (skullMeta.hasOwner()) {
+                skullMeta.setOwner(Hooks.processPlaceholders(user.getPlayer(), skullMeta.getOwner()));
+            }
+        }
         itemMeta.setLore(processedLore);
         return itemMeta;
     }

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

@@ -7,6 +7,7 @@ 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.bukkit.inventory.meta.SkullMeta;
 import org.jetbrains.annotations.NotNull;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
@@ -72,6 +73,14 @@ public class TypeEmpty extends Type {
                 processedLore.add(Hooks.processPlaceholders(user.getPlayer(), loreLine));
             }
         }
+
+        if (itemMeta instanceof SkullMeta skullMeta) {
+            if (skullMeta.hasOwner()) {
+                skullMeta.setOwner(Hooks.processPlaceholders(user.getPlayer(), skullMeta.getOwner()));
+            }
+        }
+
+        itemMeta.setLore(processedLore);
         itemStack.setItemMeta(itemMeta);
         return itemStack;
     }

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

@@ -1,12 +1,8 @@
 package com.hibiscusmc.hmccosmetics.hooks.items;
 
-import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.hooks.Hook;
-import com.mineinabyss.geary.addons.GearyPhase;
-import com.mineinabyss.geary.modules.GearyModuleKt;
 import com.mineinabyss.geary.papermc.tracking.items.ItemTrackingKt;
 import com.mineinabyss.geary.prefabs.PrefabKey;
-import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
@@ -14,31 +10,19 @@ import org.jetbrains.annotations.NotNull;
  * A hook that integrates the plugin {@link com.mineinabyss.geary.papermc.GearyPlugin Geary} to provide custom items
  */
 public class HookGeary extends Hook {
-    private boolean enabled = false;
 
     public HookGeary() {
         super("geary");
         setEnabledItemHook(true);
     }
 
-    @Override
-    public void load() {
-        if (!enabled) GearyModuleKt.getGeary().getPipeline().intercept(GearyPhase.INIT_ENTITIES, () -> {
-            enabled = true;
-            HMCCosmeticsPlugin.setup();
-            return null;
-        });
-    }
-
     /**
      * Gets a cosmetic {@link ItemStack} that is associated with the provided id from the plugin {@link com.mineinabyss.geary.papermc.GearyPlugin Geary}
      */
     @Override
     public ItemStack getItem(@NotNull String itemId) {
-        if (enabled) {
+        PrefabKey prefabKey = PrefabKey.Companion.ofOrNull(itemId);
-            PrefabKey prefabKey = PrefabKey.Companion.ofOrNull(itemId);
+        if (prefabKey == null) return null;
-            if (prefabKey == null) return null;
+        return ItemTrackingKt.getGearyItems().createItem(prefabKey, null);
-            return ItemTrackingKt.getGearyItems().createItem(prefabKey, null);
-        } else return new ItemStack(Material.AIR);
     }
 }

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

@@ -54,18 +54,15 @@ public class HMCPlaceholderExpansion extends PlaceholderExpansion {
 
     @Override
     public String onRequest(@NotNull OfflinePlayer player, @NotNull String params) {
-        if (!player.isOnline()) return null;
+        if (!player.isOnline()) return TranslationUtil.getTranslation("user-cosmetic", "offline");
         CosmeticUser user = CosmeticUsers.getUser(player.getPlayer());
-        if (user == null) return null;
+        if (user == null) return TranslationUtil.getTranslation("user-cosmetic", "invalid-user");
 
         List<String> placeholderArgs = Arrays.asList(params.split("_", 3));
 
         switch (placeholderArgs.get(0).toLowerCase()) {
             case "using":
-                if (placeholderArgs == null) {
+                if (placeholderArgs.size() >= 2) {
-                    return null;
-                }
-                if (placeholderArgs.get(1) != null) {
                     Cosmetic cosmetic = Cosmetics.getCosmetic(placeholderArgs.get(1));
                     if (cosmetic == null) return "INVALID_COSMETIC";
                     Cosmetic currentCosmetic = user.getCosmetic(cosmetic.getSlot());
@@ -74,13 +71,10 @@ public class HMCPlaceholderExpansion extends PlaceholderExpansion {
                     return TranslationUtil.getTranslation("using-cosmetic", String.valueOf(false));
                 }
             case "current":
-                if (placeholderArgs == null) {
+                if (placeholderArgs.size() >= 2) {
-                    return null;
-                }
-                if (placeholderArgs.get(1) != null) {
                     CosmeticSlot slot = CosmeticSlot.valueOf(placeholderArgs.get(1).toUpperCase());
                     if (slot == null) return null;
-                    if (user.getCosmetic(slot) == null) return null;
+                    if (user.getCosmetic(slot) == null) return TranslationUtil.getTranslation("current-cosmetic", "no-cosmetic");
                     if (placeholderArgs.size() == 2) return user.getCosmetic(slot).getId();
 
                     String output;
@@ -104,13 +98,11 @@ public class HMCPlaceholderExpansion extends PlaceholderExpansion {
                             output = user.getCosmetic(slot).getId();
                         }
                     }
-                    return TranslationUtil.getTranslation("current-cosmetic", String.valueOf(output));
+                    if (output == null) output = "none";
+                    return TranslationUtil.getTranslation("current-cosmetic", output);
                 }
             case "unlocked":
-                if (placeholderArgs == null) {
+                if (placeholderArgs.size() >= 2) {
-                    return null;
-                }
-                if (placeholderArgs.get(1) != null) {
                     Cosmetic cosmetic = Cosmetics.getCosmetic(placeholderArgs.get(1));
                     if (cosmetic == null) {
                         if (placeholderArgs.size() >= 3) {
@@ -127,10 +119,7 @@ public class HMCPlaceholderExpansion extends PlaceholderExpansion {
                     return TranslationUtil.getTranslation("unlocked-cosmetic", String.valueOf(user.canEquipCosmetic(cosmetic, true)));
                 }
             case "equipped":
-                if (placeholderArgs == null) {
+                if (placeholderArgs.size() >= 2) {
-                    return null;
-                }
-                if (placeholderArgs.get(1) != null) {
                     String args1 = placeholderArgs.get(1);
 
                     if (EnumUtils.isValidEnum(CosmeticSlot.class, args1.toUpperCase())) {
@@ -156,6 +145,28 @@ public class HMCPlaceholderExpansion extends PlaceholderExpansion {
                     if (equippedCosmetic == null) return TranslationUtil.getTranslation("equipped-cosmetic", "false");
                     return TranslationUtil.getTranslation("equipped-cosmetic", String.valueOf(cosmetic.getId().equals(equippedCosmetic.getId())));
                 }
+            // %hmccosmetics_amount_balloon_unlocked%
+            case "amount":
+                if (placeholderArgs.size() >= 2) {
+                    String args1 = placeholderArgs.get(1).toUpperCase(); // changes offhand to OFFHAND
+
+                    if (!EnumUtils.isValidEnum(CosmeticSlot.class, args1)) return null;
+
+                    CosmeticSlot slot = CosmeticSlot.valueOf(args1);
+                    int amount = 0;
+                    boolean checkUnlocked = false;
+                    if (placeholderArgs.size() >= 3) if (placeholderArgs.get(2).equalsIgnoreCase("unlocked")) checkUnlocked = true;
+
+                    for (Cosmetic cosmetic : Cosmetics.values()) {
+                        if (cosmetic.getSlot() != slot) continue;
+                        if (checkUnlocked && !user.canEquipCosmetic(cosmetic)) continue;
+                        amount += 1;
+                    }
+                    return TranslationUtil.getTranslation("amount-cosmetic", String.valueOf(amount));
+
+                } else {
+                    return TranslationUtil.getTranslation("amount-cosmetic", String.valueOf(Cosmetics.values().size()));
+                }
             case "wardrobe-enabled":
                 return TranslationUtil.getTranslation("in-wardrobe", String.valueOf(user.isInWardrobe()));
         }
@@ -216,6 +227,7 @@ public class HMCPlaceholderExpansion extends PlaceholderExpansion {
         if (!item.hasItemMeta()) return null;
         ItemMeta itemMeta = item.getItemMeta();
         if (itemMeta == null) return null;
+        if (!itemMeta.hasDisplayName()) return null;
         return itemMeta.getDisplayName();
     }
 

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

@@ -163,7 +163,6 @@ public class PlayerGameListener implements Listener {
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     public void onPlayerHit(EntityDamageByEntityEvent event) {
         Entity entity = event.getEntity();
-        if (event.getEntity().getEntityId() == event.getDamager().getEntityId()) event.setCancelled(true);
         if (!entity.getPersistentDataContainer().has(new NamespacedKey(HMCCosmeticsPlugin.getInstance(), "cosmeticMob"), PersistentDataType.SHORT))
             return;
         event.setCancelled(true);
@@ -336,6 +335,16 @@ public class PlayerGameListener implements Listener {
         CosmeticUser user = CosmeticUsers.getUser(event.getPlayer());
         if (user == null) return;
 
+        if (Settings.isDisabledGamemodesEnabled()) {
+            if (Settings.getDisabledGamemodes().contains(event.getNewGameMode().toString())) {
+                user.hideCosmetics(CosmeticUser.HiddenReason.GAMEMODE);
+            } else {
+                if (user.getHiddenReason() != null && user.getHiddenReason().equals(CosmeticUser.HiddenReason.GAMEMODE)) {
+                    user.showCosmetics();
+                }
+            }
+        }
+
         if (Settings.isDestroyLooseCosmetics()) {
             ItemStack[] equippedArmor = event.getPlayer().getInventory().getArmorContents();
             if (equippedArmor.length == 0) return;
@@ -349,11 +358,14 @@ public class PlayerGameListener implements Listener {
     public void onPlayerCosmeticEquip(PlayerCosmeticPostEquipEvent event) {
         CosmeticUser user = event.getUser();
         if (user.isInWardrobe() && event.getCosmetic().getSlot().equals(CosmeticSlot.BALLOON)) {
-            Location NPCLocation = user.getWardrobeManager().getNpcLocation();
             CosmeticBalloonType cosmetic = (CosmeticBalloonType) event.getCosmetic();
+            Location npclocation = user.getWardrobeManager().getNpcLocation().clone().add(cosmetic.getBalloonOffset());
             // We know that no other entity besides a regular player will be in the wardrobe
-            PacketManager.sendTeleportPacket(user.getBalloonManager().getPufferfishBalloonId(), NPCLocation.add(cosmetic.getBalloonOffset()), false, List.of(user.getPlayer()));
+            List<Player> viewer = List.of(user.getPlayer());
-            user.getBalloonManager().getModelEntity().teleport(NPCLocation.add(cosmetic.getBalloonOffset()));
+            user.getBalloonManager().getPufferfish().spawnPufferfish(npclocation.clone().add(cosmetic.getBalloonOffset()), viewer);
+            PacketManager.sendLeashPacket(user.getBalloonManager().getPufferfishBalloonId(), user.getWardrobeManager().getNPC_ID(), viewer);
+            PacketManager.sendTeleportPacket(user.getBalloonManager().getPufferfishBalloonId(), npclocation, false, viewer);
+            user.getBalloonManager().getModelEntity().teleport(npclocation);
         }
     }
 

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

@@ -1,6 +1,5 @@
 package com.hibiscusmc.hmccosmetics.nms;
 
-import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType;
 import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager;

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

@@ -3,17 +3,19 @@ package com.hibiscusmc.hmccosmetics.nms;
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import lombok.Getter;
+import org.jetbrains.annotations.Nullable;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.logging.Level;
 
 public class NMSHandlers {
 
-    private static final String[] SUPPORTED_VERSION = new String[]{"v1_18_R2", "v1_19_R1", "v1_19_R2", "v1_19_R3", "v1_20_R1"};
+    private static final String[] SUPPORTED_VERSION = new String[]{"v1_18_R2", "v1_19_R1", "v1_19_R2", "v1_19_R3", "v1_20_R1", "v1_20_R2", "v1_20_R3"};
     private static NMSHandler handler;
     @Getter
     private static String version;
 
+    @Nullable
     public static NMSHandler getHandler() {
         if (handler != null) {
             return handler;
@@ -23,6 +25,11 @@ public class NMSHandlers {
         return handler;
     }
 
+    public static boolean isVersionSupported() {
+        if (getHandler() == null) return false;
+        return getHandler().getSupported();
+    }
+
     public static void setup() {
         if (handler != null) return;
         final String packageName = HMCCosmeticsPlugin.getInstance().getServer().getClass().getPackage().getName();

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

@@ -527,6 +527,7 @@ public class CosmeticUser {
         POTION,
         ACTION,
         COMMAND,
-        EMOTE
+        EMOTE,
+        GAMEMODE
     }
 }

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

@@ -91,7 +91,7 @@ public class UserBackpackManager {
 
         // 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")) {
-            if (ModelEngineAPI.api.getModelRegistry().getBlueprint(cosmeticBackpackType.getModelName()) == null) {
+            if (ModelEngineAPI.getBlueprint(cosmeticBackpackType.getModelName()) == null) {
                 MessagesUtil.sendDebugMessages("Invalid Model Engine Blueprint " + cosmeticBackpackType.getModelName(), Level.SEVERE);
                 return;
             }

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

@@ -5,9 +5,11 @@ 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.user.CosmeticUsers;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
 import com.ticxo.modelengine.api.ModelEngineAPI;
+import com.ticxo.modelengine.api.entity.data.BukkitEntityData;
 import com.ticxo.modelengine.api.model.ActiveModel;
 import com.ticxo.modelengine.api.model.ModeledEntity;
 import lombok.Getter;
@@ -25,13 +27,15 @@ import java.util.logging.Level;
 
 public class UserBalloonManager {
 
+    private CosmeticUser user;
+    @Getter
     private BalloonType balloonType;
     private CosmeticBalloonType cosmeticBalloonType;
     @Getter
     private UserBalloonPufferfish pufferfish;
     private final ArmorStand modelEntity;
-
     public UserBalloonManager(CosmeticUser user, @NotNull Location location) {
+        this.user = user;
         this.pufferfish = new UserBalloonPufferfish(user.getUniqueId(), NMSHandlers.getHandler().getNextEntityId(), UUID.randomUUID());
         this.modelEntity = NMSHandlers.getHandler().getMEGEntity(location.add(Settings.getBalloonOffset()));
     }
@@ -53,7 +57,7 @@ public class UserBalloonManager {
         if (balloonType == BalloonType.MODELENGINE) {
             String id = cosmeticBalloonType.getModelName();
             MessagesUtil.sendDebugMessages("Attempting Spawning for " + id);
-            if (ModelEngineAPI.api.getModelRegistry().getBlueprint(id) == null) {
+            if (ModelEngineAPI.getBlueprint(id) == null) {
                 MessagesUtil.sendDebugMessages("Invalid Model Engine Blueprint " + id, Level.SEVERE);
                 return;
             }
@@ -61,14 +65,19 @@ public class UserBalloonManager {
             ActiveModel model = ModelEngineAPI.createActiveModel(ModelEngineAPI.getBlueprint(id));
             model.setCanHurt(false);
             modeledEntity.addModel(model, false);
+
             if (color != null) {
                 modeledEntity.getModels().forEach((d, singleModel) -> {
                     if (cosmeticBalloonType.isDyablePart(d)) {
-                        singleModel.getRendererHandler().setColor(color);
+                        singleModel.setDefaultTint(color);
-                        singleModel.getRendererHandler().update();
+                        singleModel.getModelRenderer().sendToClient();
                     }
                 });
             }
+
+            BukkitEntityData data = (BukkitEntityData) modeledEntity.getBase().getData();
+            data.setBlockedCullIgnoreRadius((double) Settings.getViewDistance());
+            data.getTracked().setPlayerPredicate(this::playerCheck);
             return;
         }
         if (balloonType == BalloonType.ITEM) {
@@ -78,18 +87,19 @@ public class UserBalloonManager {
 
     public void remove() {
         if (balloonType == BalloonType.MODELENGINE) {
-            final ModeledEntity entity = ModelEngineAPI.api.getModeledEntity(modelEntity.getUniqueId());
+            final ModeledEntity entity = ModelEngineAPI.getModeledEntity(modelEntity);
-
+            if (entity == null) {
-            if (entity == null) return;
+                MessagesUtil.sendDebugMessages("Balloon Removal Failed - Model Entity is Null");
-
+                return;
-            for (final Player player : entity.getRangeManager().getPlayerInRange()) {
-                entity.hideFromPlayer(player);
             }
+
             entity.destroy();
+            MessagesUtil.sendDebugMessages("Balloon Model Engine Removal");
         }
 
         modelEntity.remove();
         cosmeticBalloonType = null;
+        MessagesUtil.sendDebugMessages("Balloon Entity Removed");
     }
 
     public void addPlayerToModel(final CosmeticUser user, final CosmeticBalloonType cosmeticBalloonType) {
@@ -98,14 +108,13 @@ public class UserBalloonManager {
 
     public void addPlayerToModel(final CosmeticUser user, final CosmeticBalloonType cosmeticBalloonType, Color color) {
         if (balloonType == BalloonType.MODELENGINE) {
-            final ModeledEntity model = ModelEngineAPI.api.getModeledEntity(modelEntity.getUniqueId());
+            final ModeledEntity model = ModelEngineAPI.getModeledEntity(modelEntity);
             if (model == null) {
                 spawnModel(cosmeticBalloonType, color);
                 MessagesUtil.sendDebugMessages("model is null");
                 return;
             }
-            //if (model.getRangeManager().getPlayerInRange().contains(player)) return;
+
-            model.showToPlayer(user.getPlayer());
             MessagesUtil.sendDebugMessages("Show to player");
             return;
         }
@@ -113,13 +122,11 @@ public class UserBalloonManager {
             modelEntity.getEquipment().setHelmet(user.getUserCosmeticItem(cosmeticBalloonType));
         }
     }
-    public void removePlayerFromModel(final Player player) {
+    public void removePlayerFromModel(final Player viewer) {
         if (balloonType == BalloonType.MODELENGINE) {
-            final ModeledEntity model = ModelEngineAPI.api.getModeledEntity(modelEntity.getUniqueId());
+            final ModeledEntity model = ModelEngineAPI.getModeledEntity(modelEntity);
-
             if (model == null) return;
 
-            model.hideFromPlayer(player);
             MessagesUtil.sendDebugMessages("Hidden from player");
             return;
         }
@@ -170,7 +177,6 @@ public class UserBalloonManager {
     }
 
     public void sendLeashPacket(int entityId) {
-        if (cosmeticBalloonType == null) return;
         if (cosmeticBalloonType.isShowLead()) {
             PacketManager.sendLeashPacket(getPufferfishBalloonId(), entityId, getLocation());
         }
@@ -181,4 +187,21 @@ public class UserBalloonManager {
         ITEM,
         NONE
     }
+
+    private boolean playerCheck(final Player player) {
+        MessagesUtil.sendDebugMessages("playerCheck");
+        CosmeticUser viewer = CosmeticUsers.getUser(player.getUniqueId());
+
+        if (user.getPlayer() == player) {
+            return (!user.getHidden());
+        } else {
+            if (user.isInWardrobe()) return false;
+            MessagesUtil.sendDebugMessages("playerCheck - Not Same Player");
+            if (viewer != null && viewer.isInWardrobe()) {
+                MessagesUtil.sendDebugMessages("playerCheck - Viewer in Wardrobe");
+                return false;
+            }
+        }
+        return (!user.getHidden());
+    }
 }

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

@@ -5,6 +5,7 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
 import com.hibiscusmc.hmccosmetics.util.PlayerUtils;
 import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
 import org.bukkit.Location;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
@@ -35,6 +36,11 @@ public class UserBalloonPufferfish extends UserEntity {
         getViewers().clear();
     }
 
+    public void spawnPufferfish(Location location, List<Player> sendTo) {
+        PacketManager.sendEntitySpawnPacket(location, pufferFishEntityId, EntityType.PUFFERFISH, uuid, sendTo);
+        PacketManager.sendInvisibilityPacket(pufferFishEntityId, sendTo);
+    }
+
     @Override
     public List<Player> refreshViewers(Location location) {
         if (System.currentTimeMillis() - getViewerLastUpdate() <= 1000) return List.of(); //Prevents mass refreshes

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

@@ -145,6 +145,7 @@ public class UserWardrobeManager {
                 Location balloonLocation = npcLocation.clone().add(cosmetic.getBalloonOffset());
                 PacketManager.sendTeleportPacket(user.getBalloonManager().getPufferfishBalloonId(), balloonLocation , false, viewer);
                 user.getBalloonManager().getModelEntity().teleport(balloonLocation);
+                user.getBalloonManager().setLocation(balloonLocation);
             }
 
             if (WardrobeSettings.isEnabledBossbar()) {
@@ -234,7 +235,7 @@ public class UserWardrobeManager {
             }
 
             if (user.hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
-                user.respawnBalloon();
+                //user.respawnBalloon();
                 //PacketManager.sendLeashPacket(VIEWER.getBalloonEntity().getPufferfishBalloonId(), player.getEntityId(), viewer);
             }
 
@@ -300,7 +301,9 @@ public class UserWardrobeManager {
                     //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);
+                    if (user.getBalloonManager().getBalloonType() != UserBalloonManager.BalloonType.MODELENGINE) {
+                        PacketManager.sendEntityDestroyPacket(user.getBalloonManager().getModelId(), outsideViewers);
+                    }
                     user.getBalloonManager().sendLeashPacket(NPC_ID);
                 }
 

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

@@ -36,6 +36,11 @@ public class ServerUtils {
         return NMSHandlers.getHandler().getEntity(entityId);
     }
 
+    /**
+     * This takes in a string like #FFFFFF to convert it into a Bukkit color
+     * @param colorStr
+     * @return
+     */
     public static Color hex2Rgb(String colorStr) {
         if (colorStr.startsWith("#")) return Color.fromRGB(Integer.valueOf(colorStr.substring(1), 16));
         if (colorStr.startsWith("0x")) return Color.fromRGB(Integer.valueOf(colorStr.substring(2), 16));
@@ -48,6 +53,22 @@ public class ServerUtils {
         return Color.WHITE;
     }
 
+    /**
+     * This takes in a string like 55,49,181 to convert it into a Bukkit Color
+     * @param colorStr
+     * @return
+     */
+    public static Color rgbToRgb(String colorStr) {
+        if (colorStr.contains(",")) {
+            String[] colors = colorStr.split(",", 3);
+            if (colors.length == 3) {
+                return Color.fromRGB(Integer.parseInt(colors[0]), Integer.parseInt(colors[1]), Integer.parseInt(colors[2]));
+            }
+        }
+
+        return Color.WHITE;
+    }
+
     // particle amount offsetxyz
     // Ex. HEART 10 0.1 0.1 0.1
     public static Particle addParticleValues(Particle particle, String[] split) {

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

@@ -18,19 +18,4 @@ public class StringUtils {
     public static String parseStringToString(final String parsed) {
         return Adventure.SERIALIZER.serialize(Adventure.MINI_MESSAGE.deserialize(parsed));
     }
-
-    @NotNull
-    public static String formatArmorItemType(String type) {
-        type = type.toLowerCase();
-        final String[] parts = type.split(" ");
-
-        final String firstPart = parts[0].substring(0, 1).toUpperCase() + parts[0].substring(1);
-
-        if (parts.length == 1) {
-            return firstPart;
-        }
-
-        return firstPart + parts[1].substring(0, 1).toUpperCase() + parts[1].substring(1);
-    }
-
 }

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

@@ -337,13 +337,17 @@ public class PacketManager {
             final int entityId,
             final @NotNull List<Player> sendTo
     ) {
-        WrapperPlayServerNamedEntitySpawn wrapper = new WrapperPlayServerNamedEntitySpawn();
+        if (NMSHandlers.getVersion().contains("v1_18_R2") || NMSHandlers.getVersion().contains("v1_19_R1") || NMSHandlers.getVersion().contains("v1_19_R2") || NMSHandlers.getVersion().contains("v1_19_R3") || NMSHandlers.getVersion().contains("v1_20_R1")) {
-        wrapper.setEntityID(entityId);
+            WrapperPlayServerNamedEntitySpawn wrapper = new WrapperPlayServerNamedEntitySpawn();
-        wrapper.setPlayerUUID(uuid);
+            wrapper.setEntityID(entityId);
-        wrapper.setPosition(location.toVector());
+            wrapper.setPlayerUUID(uuid);
-        wrapper.setPitch(location.getPitch());
+            wrapper.setPosition(location.toVector());
-        wrapper.setYaw(location.getYaw());
+            wrapper.setPitch(location.getPitch());
-        for (final Player p : sendTo) sendPacket(p, wrapper.getHandle());
+            wrapper.setYaw(location.getYaw());
+            for (final Player p : sendTo) sendPacket(p, wrapper.getHandle());
+            return;
+        }
+        sendEntitySpawnPacket(location, entityId, EntityType.PLAYER, uuid);
     }
 
     /**

common/src/main/resources/config.yml

@@ -24,6 +24,14 @@ cosmetic-settings:
   force-permission-join: true # Checks a player permission if they can have a cosmetic when they join the server.
   force-show-join: false # If the plugin should force show a player's cosmetics when they join the server.
 
+  disabled-gamemode:
+    enabled: true
+    # Which gamemodes should cosmetics be disabled for. This is useful for servers that have a creative world. All options are here, https://hub.spigotmc.org/javadocs/spigot/org/bukkit/GameMode.html
+    gamemodes:
+      - "SPECTATOR"
+
+  # This disables the entire internal emote system within the plugin. This option requires a restart.
+  emote-enable: true
   emote-distance: -3 # This shows how far away the camera should be while a player is doing an emote. Negative is behind player.
   emote-block-check: true # If the server should check if the block is open where the camera is placed (prevents players viewing through blocks)
   emote-air-check: true # Check if there is air under a player, if there is, don't play emote

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

@@ -67,7 +67,7 @@ jetpack:
     amount: 1
   firstperson-item:
     material: PAPER
-    model-data: 14
+    model-data: 15
     name: "<white>Jetpack"
     amount: 1
 hammer:
@@ -155,6 +155,6 @@ hibiscus_flower:
   permission: "hmccosmetics.hibiscus_flower"
   item:
     material: PAPER
-    model-data: 15
+    model-data: 16
     name: "<#d24c9f>Hibiscus Flower"
     amount: 1

common/src/main/resources/translations.yml

@@ -1,3 +1,6 @@
+user-cosmetic:
+  offline: "Offline"
+  invalid-user: "Invalid User"
 unlocked-cosmetic:
   true: "true"
   false: "false"
@@ -11,5 +14,8 @@ using-cosmetic:
   true: "true"
   false: "false"
 current-cosmetic:
-  true: "true"
+  no-cosmetic: "No Cosmetic"
-  false: "false"
+  none: "none"
+amount-cosmetic:
+  1: "1"
+  10: "10"

settings.gradle.kts

@@ -13,4 +13,6 @@ include(
     "v1_19_R2",
     "v1_19_R3",
     "v1_20_R1",
+    "v1_20_R2",
+    "v1_20_R3"
 )

v1_20_R2/build.gradle.kts

@@ -0,0 +1,27 @@
+plugins {
+    id("java")
+    id("io.papermc.paperweight.userdev") version "1.5.1"
+}
+
+dependencies {
+    paperDevBundle("1.20.2-R0.1-SNAPSHOT")
+    implementation(project(":common"))
+}
+
+tasks {
+
+    build {
+        dependsOn(reobfJar)
+    }
+
+    compileJava {
+        options.encoding = Charsets.UTF_8.name()
+        options.release.set(17)
+    }
+    javadoc {
+        options.encoding = Charsets.UTF_8.name()
+    }
+    processResources {
+        filteringCharset = Charsets.UTF_8.name()
+    }
+}

v1_20_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R2/MEGEntity.java

@@ -0,0 +1,30 @@
+package com.hibiscusmc.hmccosmetics.nms.v1_20_R2;
+
+import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
+import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.decoration.ArmorStand;
+import org.bukkit.Location;
+import org.bukkit.NamespacedKey;
+import org.bukkit.craftbukkit.v1_20_R2.CraftWorld;
+import org.bukkit.persistence.PersistentDataType;
+
+public class MEGEntity extends ArmorStand {
+        public MEGEntity(Location loc) {
+                super(EntityType.ARMOR_STAND, ((CraftWorld) loc.getWorld()).getHandle());
+                this.setPos(loc.getX(), loc.getY(), loc.getZ());
+
+                MessagesUtil.sendDebugMessages("Spawned MEGEntity at " + loc);
+                setInvisible(true);
+                setNoGravity(true);
+                setSilent(true);
+                setInvulnerable(true);
+                setSmall(true);
+                setMarker(true);
+
+                persist = false;
+                getBukkitEntity().getPersistentDataContainer().set(new NamespacedKey(HMCCosmeticsPlugin.getInstance(), "cosmeticMob"), PersistentDataType.SHORT, Short.valueOf("1"));
+
+                ((CraftWorld) loc.getWorld()).getHandle().addFreshEntity(this);
+        }
+}

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

@@ -0,0 +1,170 @@
+package com.hibiscusmc.hmccosmetics.nms.v1_20_R2;
+
+import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
+import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager;
+import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
+import com.mojang.datafixers.util.Pair;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;
+import net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket;
+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.Display;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.scores.PlayerTeam;
+import net.minecraft.world.scores.Team;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.v1_20_R2.CraftEquipmentSlot;
+import org.bukkit.craftbukkit.v1_20_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_20_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_20_R2.scoreboard.CraftScoreboard;
+import org.bukkit.entity.ArmorStand;
+import org.bukkit.entity.Player;
+import org.bukkit.event.entity.CreatureSpawnEvent;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
+    @Override
+    public int getNextEntityId() {
+        return net.minecraft.world.entity.Entity.nextEntityId();
+    }
+
+    @Override
+    public org.bukkit.entity.Entity getEntity(int entityId) {
+        net.minecraft.world.entity.Entity entity = getNMSEntity(entityId);
+        if (entity == null) return null;
+        return entity.getBukkitEntity();
+    }
+
+    private net.minecraft.world.entity.Entity getNMSEntity(int entityId) {
+        for (ServerLevel world : ((CraftServer) Bukkit.getServer()).getHandle().getServer().getAllLevels()) {
+            net.minecraft.world.entity.Entity entity = world.getEntity(entityId);
+            if (entity == null) continue;
+            return entity;
+        }
+        return null;
+    }
+
+    @Override
+    public ArmorStand getMEGEntity(Location loc) {
+        return (ArmorStand) new MEGEntity(loc).getBukkitEntity();
+    }
+
+    @Override
+    public org.bukkit.entity.Entity spawnDisplayEntity(Location location, String text) {
+        Display.TextDisplay entity = new Display.TextDisplay(net.minecraft.world.entity.EntityType.TEXT_DISPLAY, ((CraftWorld) location.getWorld()).getHandle());
+        entity.setPos(location.getX(), location.getY(), location.getZ());
+        entity.persist = false;
+        //entity.setText(net.minecraft.network.chat.Component.literal("TEST!"));
+        entity.setCustomNameVisible(true);
+        entity.setCustomName(Component.literal(text));
+        MessagesUtil.sendDebugMessages("spawnDisplayEntity - " + entity);
+        ((CraftWorld) location.getWorld()).getHandle().addFreshEntity(entity, CreatureSpawnEvent.SpawnReason.CUSTOM);
+        return entity.getBukkitEntity();
+    }
+
+    @Override
+    public UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType) {
+        org.bukkit.entity.Entity entity = user.getEntity();
+
+        UserBalloonManager userBalloonManager1 = new UserBalloonManager(user, entity.getLocation());
+        userBalloonManager1.getModelEntity().teleport(entity.getLocation().add(cosmeticBalloonType.getBalloonOffset()));
+
+        userBalloonManager1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
+        userBalloonManager1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
+
+        return userBalloonManager1;
+    }
+
+
+    @Override
+    public void equipmentSlotUpdate(
+            int entityId,
+            org.bukkit.inventory.EquipmentSlot slot,
+            ItemStack item,
+            List<Player> sendTo
+    ) {
+
+        EquipmentSlot nmsSlot = null;
+        net.minecraft.world.item.ItemStack nmsItem = null;
+
+        // Converting EquipmentSlot and ItemStack to NMS ones.
+        nmsSlot = CraftEquipmentSlot.getNMS(slot);
+        nmsItem = CraftItemStack.asNMSCopy(item);
+
+        if (nmsSlot == null) return;
+
+        Pair<EquipmentSlot, net.minecraft.world.item.ItemStack> pair = new Pair<>(nmsSlot, nmsItem);
+
+        List<Pair<EquipmentSlot, net.minecraft.world.item.ItemStack>> pairs = Collections.singletonList(pair);
+
+        ClientboundSetEquipmentPacket packet = new ClientboundSetEquipmentPacket(entityId, pairs);
+        for (Player p : sendTo) sendPacket(p, packet);
+    }
+
+
+    @Override
+    public void slotUpdate(
+            Player player,
+            int slot
+    ) {
+        int index = 0;
+
+        ServerPlayer player1 = ((CraftPlayer) player).getHandle();
+
+        if (index < Inventory.getSelectionSize()) {
+            index += 36;
+        } else if (index > 39) {
+            index += 5; // Off hand
+        } else if (index > 35) {
+            index = 8 - (index - 36);
+        }
+        ItemStack item = player.getInventory().getItem(slot);
+
+        Packet packet = new ClientboundContainerSetSlotPacket(player1.inventoryMenu.containerId, player1.inventoryMenu.incrementStateId(), index, CraftItemStack.asNMSCopy(item));
+        sendPacket(player, packet);
+    }
+
+    public void hideNPCName(Player player, String NPCName) {
+        //Creating the team
+        PlayerTeam team = new PlayerTeam(((CraftScoreboard) Bukkit.getScoreboardManager().getMainScoreboard()).getHandle(), NPCName);
+
+        //Setting name visibility
+        team.setNameTagVisibility(Team.Visibility.NEVER);
+
+        //Remove the Team (i assume so if it exists)
+        ClientboundSetPlayerTeamPacket removeTeamPacket = ClientboundSetPlayerTeamPacket.createRemovePacket(team);
+        sendPacket(player, removeTeamPacket);
+        //Creating the Team
+        ClientboundSetPlayerTeamPacket createTeamPacket = ClientboundSetPlayerTeamPacket.createAddOrModifyPacket(team, true);
+        sendPacket(player, createTeamPacket);
+        //Adding players to the team (You have to use the NPC's name, and add it to a list)
+        ClientboundSetPlayerTeamPacket createPlayerTeamPacket = ClientboundSetPlayerTeamPacket.createMultiplePlayerPacket(team, new ArrayList<String>() {{
+            add(NPCName);
+        }}, ClientboundSetPlayerTeamPacket.Action.ADD);
+        sendPacket(player, createPlayerTeamPacket);
+    }
+
+    public void sendPacket(Player player, Packet packet) {
+        ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle();
+        ServerPlayerConnection connection = serverPlayer.connection;
+        connection.send(packet);
+    }
+
+    @Override
+    public boolean getSupported() {
+        return true;
+    }
+}

v1_20_R3/build.gradle.kts

@@ -0,0 +1,27 @@
+plugins {
+    id("java")
+    id("io.papermc.paperweight.userdev") version "1.5.1"
+}
+
+dependencies {
+    paperDevBundle("1.20.4-R0.1-SNAPSHOT")
+    implementation(project(":common"))
+}
+
+tasks {
+
+    build {
+        dependsOn(reobfJar)
+    }
+
+    compileJava {
+        options.encoding = Charsets.UTF_8.name()
+        options.release.set(17)
+    }
+    javadoc {
+        options.encoding = Charsets.UTF_8.name()
+    }
+    processResources {
+        filteringCharset = Charsets.UTF_8.name()
+    }
+}

v1_20_R3/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R3/MEGEntity.java

@@ -0,0 +1,30 @@
+package com.hibiscusmc.hmccosmetics.nms.v1_20_R3;
+
+import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
+import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.decoration.ArmorStand;
+import org.bukkit.Location;
+import org.bukkit.NamespacedKey;
+import org.bukkit.craftbukkit.v1_20_R3.CraftWorld;
+import org.bukkit.persistence.PersistentDataType;
+
+public class MEGEntity extends ArmorStand {
+        public MEGEntity(Location loc) {
+                super(EntityType.ARMOR_STAND, ((CraftWorld) loc.getWorld()).getHandle());
+                this.setPos(loc.getX(), loc.getY(), loc.getZ());
+
+                MessagesUtil.sendDebugMessages("Spawned MEGEntity at " + loc);
+                setInvisible(true);
+                setNoGravity(true);
+                setSilent(true);
+                setInvulnerable(true);
+                setSmall(true);
+                setMarker(true);
+
+                persist = false;
+                getBukkitEntity().getPersistentDataContainer().set(new NamespacedKey(HMCCosmeticsPlugin.getInstance(), "cosmeticMob"), PersistentDataType.SHORT, Short.valueOf("1"));
+
+                ((CraftWorld) loc.getWorld()).getHandle().addFreshEntity(this);
+        }
+}

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

@@ -0,0 +1,170 @@
+package com.hibiscusmc.hmccosmetics.nms.v1_20_R3;
+
+import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
+import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager;
+import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
+import com.mojang.datafixers.util.Pair;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;
+import net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket;
+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.Display;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.scores.PlayerTeam;
+import net.minecraft.world.scores.Team;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.v1_20_R3.CraftEquipmentSlot;
+import org.bukkit.craftbukkit.v1_20_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_20_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_20_R3.scoreboard.CraftScoreboard;
+import org.bukkit.entity.ArmorStand;
+import org.bukkit.entity.Player;
+import org.bukkit.event.entity.CreatureSpawnEvent;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
+    @Override
+    public int getNextEntityId() {
+        return net.minecraft.world.entity.Entity.nextEntityId();
+    }
+
+    @Override
+    public org.bukkit.entity.Entity getEntity(int entityId) {
+        net.minecraft.world.entity.Entity entity = getNMSEntity(entityId);
+        if (entity == null) return null;
+        return entity.getBukkitEntity();
+    }
+
+    private net.minecraft.world.entity.Entity getNMSEntity(int entityId) {
+        for (ServerLevel world : ((CraftServer) Bukkit.getServer()).getHandle().getServer().getAllLevels()) {
+            net.minecraft.world.entity.Entity entity = world.getEntity(entityId);
+            if (entity == null) continue;
+            return entity;
+        }
+        return null;
+    }
+
+    @Override
+    public ArmorStand getMEGEntity(Location loc) {
+        return (ArmorStand) new MEGEntity(loc).getBukkitEntity();
+    }
+
+    @Override
+    public org.bukkit.entity.Entity spawnDisplayEntity(Location location, String text) {
+        Display.TextDisplay entity = new Display.TextDisplay(net.minecraft.world.entity.EntityType.TEXT_DISPLAY, ((CraftWorld) location.getWorld()).getHandle());
+        entity.setPos(location.getX(), location.getY(), location.getZ());
+        entity.persist = false;
+        //entity.setText(net.minecraft.network.chat.Component.literal("TEST!"));
+        entity.setCustomNameVisible(true);
+        entity.setCustomName(Component.literal(text));
+        MessagesUtil.sendDebugMessages("spawnDisplayEntity - " + entity);
+        ((CraftWorld) location.getWorld()).getHandle().addFreshEntity(entity, CreatureSpawnEvent.SpawnReason.CUSTOM);
+        return entity.getBukkitEntity();
+    }
+
+    @Override
+    public UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType) {
+        org.bukkit.entity.Entity entity = user.getEntity();
+
+        UserBalloonManager userBalloonManager1 = new UserBalloonManager(user, entity.getLocation());
+        userBalloonManager1.getModelEntity().teleport(entity.getLocation().add(cosmeticBalloonType.getBalloonOffset()));
+
+        userBalloonManager1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
+        userBalloonManager1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
+
+        return userBalloonManager1;
+    }
+
+
+    @Override
+    public void equipmentSlotUpdate(
+            int entityId,
+            org.bukkit.inventory.EquipmentSlot slot,
+            ItemStack item,
+            List<Player> sendTo
+    ) {
+
+        EquipmentSlot nmsSlot = null;
+        net.minecraft.world.item.ItemStack nmsItem = null;
+
+        // Converting EquipmentSlot and ItemStack to NMS ones.
+        nmsSlot = CraftEquipmentSlot.getNMS(slot);
+        nmsItem = CraftItemStack.asNMSCopy(item);
+
+        if (nmsSlot == null) return;
+
+        Pair<EquipmentSlot, net.minecraft.world.item.ItemStack> pair = new Pair<>(nmsSlot, nmsItem);
+
+        List<Pair<EquipmentSlot, net.minecraft.world.item.ItemStack>> pairs = Collections.singletonList(pair);
+
+        ClientboundSetEquipmentPacket packet = new ClientboundSetEquipmentPacket(entityId, pairs);
+        for (Player p : sendTo) sendPacket(p, packet);
+    }
+
+
+    @Override
+    public void slotUpdate(
+            Player player,
+            int slot
+    ) {
+        int index = 0;
+
+        ServerPlayer player1 = ((CraftPlayer) player).getHandle();
+
+        if (index < Inventory.getSelectionSize()) {
+            index += 36;
+        } else if (index > 39) {
+            index += 5; // Off hand
+        } else if (index > 35) {
+            index = 8 - (index - 36);
+        }
+        ItemStack item = player.getInventory().getItem(slot);
+
+        Packet packet = new ClientboundContainerSetSlotPacket(player1.inventoryMenu.containerId, player1.inventoryMenu.incrementStateId(), index, CraftItemStack.asNMSCopy(item));
+        sendPacket(player, packet);
+    }
+
+    public void hideNPCName(Player player, String NPCName) {
+        //Creating the team
+        PlayerTeam team = new PlayerTeam(((CraftScoreboard) Bukkit.getScoreboardManager().getMainScoreboard()).getHandle(), NPCName);
+
+        //Setting name visibility
+        team.setNameTagVisibility(Team.Visibility.NEVER);
+
+        //Remove the Team (i assume so if it exists)
+        ClientboundSetPlayerTeamPacket removeTeamPacket = ClientboundSetPlayerTeamPacket.createRemovePacket(team);
+        sendPacket(player, removeTeamPacket);
+        //Creating the Team
+        ClientboundSetPlayerTeamPacket createTeamPacket = ClientboundSetPlayerTeamPacket.createAddOrModifyPacket(team, true);
+        sendPacket(player, createTeamPacket);
+        //Adding players to the team (You have to use the NPC's name, and add it to a list)
+        ClientboundSetPlayerTeamPacket createPlayerTeamPacket = ClientboundSetPlayerTeamPacket.createMultiplePlayerPacket(team, new ArrayList<String>() {{
+            add(NPCName);
+        }}, ClientboundSetPlayerTeamPacket.Action.ADD);
+        sendPacket(player, createPlayerTeamPacket);
+    }
+
+    public void sendPacket(Player player, Packet packet) {
+        ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle();
+        ServerPlayerConnection connection = serverPlayer.connection;
+        connection.send(packet);
+    }
+
+    @Override
+    public boolean getSupported() {
+        return true;
+    }
+}