Refactoring and Misc changes in UserWardrobeManager

clean: use preferred method

build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "com.hibiscusmc"
-version = "2.2.2"
+version = "2.2.3"
 
 allprojects {
     apply(plugin = "java")
@@ -90,7 +90,7 @@ dependencies {
 
     //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-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")
@@ -197,6 +197,12 @@ bukkit {
         register("hmccosmetics.cmd.emote") {
             default = BukkitPluginDescription.Permission.Default.TRUE
         }
+        register("hmccosmetics.cmd.playemote") {
+            default = BukkitPluginDescription.Permission.Default.OP
+        }
+        register("hmccosmetics.cmd.playemote.other") {
+            default = BukkitPluginDescription.Permission.Default.OP
+        }
         register("hmccosmetics.cmd.emote.other") {
             default = BukkitPluginDescription.Permission.Default.OP
         }

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

@@ -42,8 +42,6 @@ import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
 import java.io.File;
 import java.nio.file.Path;
 import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 public final class HMCCosmeticsPlugin extends JavaPlugin {
 

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

@@ -2,6 +2,7 @@ package com.hibiscusmc.hmccosmetics.api;
 
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
 
 public class HMCCosmeticSetupEvent extends Event {
 
@@ -12,6 +13,7 @@ public class HMCCosmeticSetupEvent extends Event {
     private static final HandlerList handlers = new HandlerList();
 
     @Override
+    @NotNull
     public HandlerList getHandlers() {
         return handlers;
     }

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

@@ -5,10 +5,11 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
 
 public class PlayerCosmeticEquipEvent extends Event implements Cancellable {
 
-    private CosmeticUser user;
+    private final CosmeticUser user;
     private Cosmetic cosmetic;
     private boolean isCancelled;
 
@@ -31,6 +32,7 @@ public class PlayerCosmeticEquipEvent extends Event implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
     @Override
+    @NotNull
     public HandlerList getHandlers() {
         return handlers;
     }
@@ -47,7 +49,7 @@ public class PlayerCosmeticEquipEvent extends Event implements Cancellable {
         return cosmetic;
     }
 
-    public void setCosmetic() {
+    public void setCosmetic(Cosmetic cosmetic) {
         this.cosmetic = cosmetic;
     }
 }

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

@@ -4,11 +4,12 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
 
 public class PlayerCosmeticHideEvent extends Event implements Cancellable {
 
-    private CosmeticUser user;
+    private final CosmeticUser user;
-    private CosmeticUser.HiddenReason reason;
+    private final CosmeticUser.HiddenReason reason;
     private boolean isCancelled;
 
     public PlayerCosmeticHideEvent(CosmeticUser user, CosmeticUser.HiddenReason reason) {
@@ -30,6 +31,7 @@ public class PlayerCosmeticHideEvent extends Event implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
     @Override
+    @NotNull
     public HandlerList getHandlers() {
         return handlers;
     }

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

@@ -5,11 +5,12 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
 
 public class PlayerCosmeticRemoveEvent extends Event implements Cancellable {
 
-    private CosmeticUser user;
+    private final CosmeticUser user;
-    private Cosmetic cosmetic;
+    private final Cosmetic cosmetic;
     private boolean isCancelled;
 
     public PlayerCosmeticRemoveEvent(CosmeticUser user, Cosmetic cosmetic) {
@@ -31,6 +32,7 @@ public class PlayerCosmeticRemoveEvent extends Event implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
     @Override
+    @NotNull
     public HandlerList getHandlers() {
         return handlers;
     }

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

@@ -4,10 +4,11 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
 
 public class PlayerCosmeticShowEvent extends Event implements Cancellable {
 
-    private CosmeticUser user;
+    private final CosmeticUser user;
     private boolean isCancelled;
 
     public PlayerCosmeticShowEvent(CosmeticUser user) {
@@ -28,6 +29,7 @@ public class PlayerCosmeticShowEvent extends Event implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
     @Override
+    @NotNull
     public HandlerList getHandlers() {
         return handlers;
     }

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

@@ -5,11 +5,12 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
 
 public class PlayerMenuOpenEvent extends Event implements Cancellable {
 
-    private CosmeticUser user;
+    private final CosmeticUser user;
-    private Menu menu;
+    private final Menu menu;
     private boolean isCancelled;
 
     public PlayerMenuOpenEvent(CosmeticUser user, Menu menu) {
@@ -31,6 +32,7 @@ public class PlayerMenuOpenEvent extends Event implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
     @Override
+    @NotNull
     public HandlerList getHandlers() {
         return handlers;
     }

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

@@ -4,10 +4,11 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
 
 public class PlayerWardrobeEnterEvent extends Event implements Cancellable {
 
-    private CosmeticUser user;
+    private final CosmeticUser user;
     private boolean isCancelled;
 
     public PlayerWardrobeEnterEvent(CosmeticUser user) {
@@ -28,6 +29,7 @@ public class PlayerWardrobeEnterEvent extends Event implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
     @Override
+    @NotNull
     public HandlerList getHandlers() {
         return handlers;
     }

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

@@ -4,10 +4,11 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
 
 public class PlayerWardrobeLeaveEvent extends Event implements Cancellable {
 
-    private CosmeticUser user;
+    private final CosmeticUser user;
     private boolean isCancelled;
 
     public PlayerWardrobeLeaveEvent(CosmeticUser user) {
@@ -28,6 +29,7 @@ public class PlayerWardrobeLeaveEvent extends Event implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
     @Override
+    @NotNull
     public HandlerList getHandlers() {
         return handlers;
     }

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

@@ -15,6 +15,7 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.hibiscusmc.hmccosmetics.util.ServerUtils;
+import com.ticxo.playeranimator.api.PlayerAnimator;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.apache.commons.lang3.EnumUtils;
@@ -33,7 +34,7 @@ public class CosmeticCommand implements CommandExecutor {
     //             0      1        2
 
     @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String @NotNull [] args) {
         boolean silent = false;
 
         if (args.length == 0) {
@@ -68,7 +69,10 @@ public class CosmeticCommand implements CommandExecutor {
 
         if (sender.hasPermission("HMCCosmetics.cmd.silent") || sender.isOp()) {
             for (String singleArg : args) {
-                if (singleArg.equalsIgnoreCase("-s")) silent = true;
+                if (singleArg.equalsIgnoreCase("-s")) {
+                    silent = true;
+                    break;
+                }
             }
         }
 
@@ -144,7 +148,7 @@ public class CosmeticCommand implements CommandExecutor {
                     return true;
                 }
 
-                CosmeticSlot cosmeticSlot = null;
+                CosmeticSlot cosmeticSlot;
 
                 if (sender instanceof Player) player = ((Player) sender).getPlayer();
                 if (sender.hasPermission("hmccosmetics.cmd.unapply.other")) {
@@ -318,7 +322,7 @@ public class CosmeticCommand implements CommandExecutor {
                 }
                 player.sendMessage("Passengers -> " + player.getPassengers());
                 if (user.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
-                    player.sendMessage("Backpack Location -> " + user.getUserBackpackManager().getArmorstand().getLocation());
+                    player.sendMessage("Backpack Location -> " + user.getUserBackpackManager().getArmorStand().getLocation());
                 }
                 player.sendMessage("Cosmetics -> " + user.getCosmetic());
                 player.sendMessage("EntityId -> " + player.getEntityId());
@@ -389,6 +393,10 @@ public class CosmeticCommand implements CommandExecutor {
                 if (sender.hasPermission("hmccosmetics.cmd.emote.other")) {
                     if (args.length >= 2) player = Bukkit.getPlayer(args[1]);
                 }
+                if (player == null) {
+                    if (!silent) MessagesUtil.sendMessage(sender, "invalid-player");
+                    return true;
+                }
                 CosmeticUser user = CosmeticUsers.getUser(player);
                 if (!user.hasCosmeticInSlot(CosmeticSlot.EMOTE)) {
                     if (!silent) MessagesUtil.sendMessage(sender, "emote-none");
@@ -399,6 +407,38 @@ public class CosmeticCommand implements CommandExecutor {
                 cosmeticEmoteType.run(user);
                 return true;
             }
+
+            case ("playemote") -> {
+                // /cosmetic playEmote <emoteId> [playerName]
+                if (!sender.hasPermission("hmccosmetics.cmd.playemote")) {
+                    if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
+                    return true;
+                }
+
+                if (args.length < 2) {
+                    if (!silent) MessagesUtil.sendMessage(player, "not-enough-args");
+                    return true;
+                }
+
+                if (args.length >= 2) {
+                    if (!PlayerAnimator.api.getAnimationManager().getRegistry().keySet().contains(args[1])) {
+                        MessagesUtil.sendDebugMessages("Did not contain " + args[1]);
+                        if (!silent) MessagesUtil.sendMessage(sender, "emote-invalid");
+                        return true;
+                    }
+                }
+
+                if (sender.hasPermission("hmccosmetics.cmd.playemote.other")) {
+                    if (args.length >= 3) player = Bukkit.getPlayer(args[2]);
+                }
+                if (player == null) {
+                    if (!silent) MessagesUtil.sendMessage(sender, "invalid-player");
+                    return true;
+                }
+                CosmeticUser user = CosmeticUsers.getUser(player);
+                user.getUserEmoteManager().playEmote(args[1]);
+                return true;
+            }
         }
         return true;
     }

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

@@ -24,9 +24,9 @@ import java.util.List;
 public class CosmeticCommandTabComplete implements TabCompleter {
     @Nullable
     @Override
-    public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
+    public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String @NotNull [] args) {
         List<String> completions = new ArrayList<>();
-        List<String> finalCompletitons = new ArrayList<>();
+        List<String> finalCompletions = new ArrayList<>();
 
         if (args.length == 1) {
             if (hasPermission(sender, "hmccosmetics.cmd.apply")) completions.add("apply");
@@ -41,8 +41,9 @@ public class CosmeticCommandTabComplete implements TabCompleter {
             if (hasPermission(sender, "hmccosmetics.cmd.show")) completions.add("show");
             if (hasPermission(sender, "hmccosmetics.cmd.debug")) completions.add("debug");
             if (hasPermission(sender, "hmccosmetics.cmd.emote")) completions.add("emote");
+            if (hasPermission(sender, "hmccosmetics.cmd.playemote")) completions.add("playemote");
 
-            StringUtil.copyPartialMatches(args[0], completions, finalCompletitons);
+            StringUtil.copyPartialMatches(args[0], completions, finalCompletions);
         }
 
         if (!(sender instanceof Player)) return completions;
@@ -79,8 +80,11 @@ public class CosmeticCommandTabComplete implements TabCompleter {
                     completions.add("viewerlocation");
                     completions.add("leavelocation");
                 }
+                case "playemote" -> {
+                    completions.addAll(PlayerAnimator.api.getAnimationManager().getRegistry().keySet());
+                }
             }
-            StringUtil.copyPartialMatches(args[1], completions, finalCompletitons);
+            StringUtil.copyPartialMatches(args[1], completions, finalCompletions);
         }
         if (args.length == 3) {
             String subcommand = args[0].toLowerCase();
@@ -88,13 +92,13 @@ public class CosmeticCommandTabComplete implements TabCompleter {
                 case "dye" -> {
                     completions.add("#FFFFFF");
                 }
-                case "menu", "apply", "unapply" -> {
+                case "menu", "apply", "unapply", "playemote" -> {
                     for (Player player : Bukkit.getOnlinePlayers()) {
                         completions.add(player.getName());
                     }
                 }
             }
-            StringUtil.copyPartialMatches(args[2], completions, finalCompletitons);
+            StringUtil.copyPartialMatches(args[2], completions, finalCompletions);
         }
 
         if (args.length == 4) {
@@ -104,14 +108,15 @@ public class CosmeticCommandTabComplete implements TabCompleter {
                     completions.add("#FFFFFF");
                 }
             }
-            StringUtil.copyPartialMatches(args[3], completions, finalCompletitons);
+            StringUtil.copyPartialMatches(args[3], completions, finalCompletions);
         }
 
-        Collections.sort(finalCompletitons);
+        Collections.sort(finalCompletions);
-        return finalCompletitons;
+        return finalCompletions;
     }
 
-    private static List<String> applyCommandComplete(CosmeticUser user, String[] args) {
+    @NotNull
+    private static List<String> applyCommandComplete(CosmeticUser user, String @NotNull [] args) {
         List<String> completitions = new ArrayList<>();
 
         if (args.length == 2) {
@@ -130,7 +135,7 @@ public class CosmeticCommandTabComplete implements TabCompleter {
         return completitions;
     }
 
-    private boolean hasPermission(CommandSender sender, String permission) {
+    private boolean hasPermission(@NotNull CommandSender sender, String permission) {
         if (sender.isOp()) return true;
         if (sender.hasPermission(permission)) return true;
         return false;

common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/Cosmetic.java

@@ -5,6 +5,7 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
@@ -19,7 +20,7 @@ public class Cosmetic {
     private CosmeticSlot slot;
     private boolean dyable;
 
-    protected Cosmetic(String id, ConfigurationNode config) {
+    protected Cosmetic(String id, @NotNull ConfigurationNode config) {
         this.id = id;
         if (!config.node("permission").virtual()) {
             this.permission = config.node("permission").getString();
@@ -58,8 +59,7 @@ public class Cosmetic {
     }
 
     public boolean requiresPermission() {
-        if (permission == null) return false;
+        return permission != null;
-        return true;
     }
 
     public void setId(String id) {

common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/Cosmetics.java

@@ -6,6 +6,8 @@ import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.cosmetic.types.*;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import org.apache.commons.lang3.EnumUtils;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
 import org.spongepowered.configurate.CommentedConfigurationNode;
 import org.spongepowered.configurate.ConfigurateException;
 import org.spongepowered.configurate.ConfigurationNode;
@@ -17,7 +19,7 @@ import java.util.logging.Level;
 
 public class Cosmetics {
 
-    private static HashBiMap<String, Cosmetic> COSMETICS = HashBiMap.create();
+    private static final HashBiMap<String, Cosmetic> COSMETICS = HashBiMap.create();
 
     public static void addCosmetic(Cosmetic cosmetic) {
         COSMETICS.put(cosmetic.getId(), cosmetic);
@@ -35,10 +37,14 @@ public class Cosmetics {
         return COSMETICS.get(id);
     }
 
+    @Contract(pure = true)
+    @NotNull
     public static Set<Cosmetic> values() {
         return COSMETICS.values();
     }
 
+    @Contract(pure = true)
+    @NotNull
     public static Set<String> keys() {
         return COSMETICS.keySet();
     }
@@ -76,7 +82,7 @@ public class Cosmetics {
         }
     }
 
-    private static void setupCosmetics(CommentedConfigurationNode config) {
+    private static void setupCosmetics(@NotNull CommentedConfigurationNode config) {
         for (ConfigurationNode cosmeticConfig : config.childrenMap().values()) {
             try {
                 String id = cosmeticConfig.key().toString();

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

@@ -7,11 +7,12 @@ import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.EquipmentSlot;
+import org.jetbrains.annotations.NotNull;
 import org.spongepowered.configurate.ConfigurationNode;
 
 public class CosmeticArmorType extends Cosmetic {
 
-    private EquipmentSlot equipSlot;
+    private final EquipmentSlot equipSlot;
 
     public CosmeticArmorType(String id, ConfigurationNode config) {
         super(id, config);
@@ -20,7 +21,7 @@ public class CosmeticArmorType extends Cosmetic {
     }
 
     @Override
-    public void update(CosmeticUser user) {
+    public void update(@NotNull CosmeticUser user) {
         Player player = Bukkit.getPlayer(user.getUniqueId());
         if (player == null) return;
         if (equipSlot.equals(EquipmentSlot.OFF_HAND)) {

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

@@ -6,11 +6,12 @@ import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 import org.spongepowered.configurate.ConfigurationNode;
 
 public class CosmeticBackpackType extends Cosmetic {
 
-    private String modelName;
+    private final String modelName;
     private ConfigurationNode config;
 
     public CosmeticBackpackType(String id, ConfigurationNode config) {
@@ -21,20 +22,22 @@ public class CosmeticBackpackType extends Cosmetic {
     }
 
     @Override
-    public void update(CosmeticUser user) {
+    public void update(@NotNull CosmeticUser user) {
         Player player = Bukkit.getPlayer(user.getUniqueId());
+        if (player == null) return;
+
         Location loc = player.getLocation().clone().add(0, 2, 0);
 
         if (user.isInWardrobe() || !user.isBackupSpawned()) return;
-        if (loc.getWorld() != user.getUserBackpackManager().getArmorstand().getWorld()) {
+        if (loc.getWorld() != user.getUserBackpackManager().getArmorStand().getWorld()) {
-            user.getUserBackpackManager().getArmorstand().teleport(loc);
+            user.getUserBackpackManager().getArmorStand().teleport(loc);
         }
 
-        user.getUserBackpackManager().getArmorstand().teleport(loc);
+        user.getUserBackpackManager().getArmorStand().teleport(loc);
 
-        PacketManager.sendRidingPacket(player.getEntityId(), user.getUserBackpackManager().getFirstArmorstandId(), loc);
+        PacketManager.sendRidingPacket(player.getEntityId(), user.getUserBackpackManager().getFirstArmorStandId(), loc);
 
-        user.getUserBackpackManager().getArmorstand().setRotation(loc.getYaw(), loc.getPitch());
+        user.getUserBackpackManager().getArmorStand().setRotation(loc.getYaw(), loc.getPitch());
         user.getUserBackpackManager().showBackpack();
     }
 

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

@@ -9,6 +9,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
+import org.jetbrains.annotations.NotNull;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 
@@ -16,7 +17,7 @@ import java.util.List;
 
 public class CosmeticBalloonType extends Cosmetic {
 
-    private String modelName;
+    private final String modelName;
     private List<String> dyableParts;
     //private HashMap<Animations, String> animationBalloons;
 
@@ -46,12 +47,14 @@ public class CosmeticBalloonType extends Cosmetic {
     }
 
     @Override
-    public void update(CosmeticUser user) {
+    public void update(@NotNull CosmeticUser user) {
         Player player = Bukkit.getPlayer(user.getUniqueId());
         UserBalloonManager userBalloonManager = user.getBalloonManager();
-        Location newLocation = player.getLocation();
+
-        if (player == null || userBalloonManager == null || newLocation == null) return;
+        if (player == null || userBalloonManager == null) return;
         if (user.isInWardrobe()) return;
+
+        Location newLocation = player.getLocation();
         Location currentLocation = user.getBalloonManager().getLocation();
         newLocation = newLocation.clone().add(Settings.getBalloonOffset());
 

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

@@ -3,11 +3,12 @@ package com.hibiscusmc.hmccosmetics.cosmetic.types;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
+import org.jetbrains.annotations.NotNull;
 import org.spongepowered.configurate.ConfigurationNode;
 
 public class CosmeticEmoteType extends Cosmetic {
 
-    private String animationId;
+    private final String animationId;
 
     public CosmeticEmoteType(String id, ConfigurationNode config) {
         super(id, config);
@@ -21,7 +22,7 @@ public class CosmeticEmoteType extends Cosmetic {
         // Nothing
     }
 
-    public void run(CosmeticUser user) {
+    public void run(@NotNull CosmeticUser user) {
         user.getUserEmoteManager().playEmote(this);
     }
 

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

@@ -5,6 +5,7 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.PlayerUtils;
 import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 import org.spongepowered.configurate.ConfigurationNode;
 
 public class CosmeticMainhandType extends Cosmetic {
@@ -14,10 +15,9 @@ public class CosmeticMainhandType extends Cosmetic {
     }
 
     @Override
-    public void update(CosmeticUser user) {
+    public void update(@NotNull CosmeticUser user) {
         Player player = user.getPlayer();
 
         PacketManager.equipmentSlotUpdate(player.getEntityId(), user, getSlot(), PlayerUtils.getNearbyPlayers(player));
-
     }
 }

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

@@ -16,23 +16,23 @@ public class Database {
 
     private static Data data;
 
+    @Deprecated
     private static InternalData INTERNAL_DATA  = new InternalData();
-    private static MySQLData MYSQL_DATA = new MySQLData();
+
-    private static SQLiteData SQLITE_DATA = new SQLiteData();
+    private static final MySQLData MYSQL_DATA = new MySQLData();
+    private static final SQLiteData SQLITE_DATA = new SQLiteData();
 
     public Database() {
         String databaseType = DatabaseSettings.getDatabaseType();
-        data = INTERNAL_DATA; // default
+        data = SQLITE_DATA; // default
-        if (databaseType.equalsIgnoreCase("INTERNAL")) {
-            data = INTERNAL_DATA;
-        }
         if (databaseType.equalsIgnoreCase("MySQL")) {
             data = MYSQL_DATA;
         }
+        /* SQLite is the default database. Might change in the future, so keep code here in case.
         if (databaseType.equalsIgnoreCase("sqlite")) {
             data = SQLITE_DATA;
-
         }
+         */
         MessagesUtil.sendDebugMessages("Database is " + data);
 
         setup();

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

@@ -10,6 +10,7 @@ import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import org.apache.commons.lang3.EnumUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Color;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
@@ -36,7 +37,7 @@ public class Data {
         // Override
     }
     // BACKPACK=colorfulbackpack&RRGGBB,HELMET=niftyhat,BALLOON=colorfulballoon,CHESTPLATE=niftychestplate
-    public String steralizeData(CosmeticUser user) {
+    public String serializeData(@NotNull CosmeticUser user) {
         String data = "";
         if (user.getHidden()) {
             if (shouldHiddenSave(user.getHiddenReason())) {
@@ -56,7 +57,7 @@ public class Data {
         return data;
     }
 
-    public Map<CosmeticSlot, Map<Cosmetic, Color>> desteralizedata(CosmeticUser user, String raw) {
+    public Map<CosmeticSlot, Map<Cosmetic, Color>> deserializeData(CosmeticUser user, @NotNull String raw) {
         Map<CosmeticSlot, Map<Cosmetic, Color>> cosmetics = new HashMap<>();
         boolean checkPermission = Settings.getForcePermissionJoin();
 
@@ -102,7 +103,7 @@ public class Data {
         return cosmetics;
     }
 
-    private boolean shouldHiddenSave(CosmeticUser.HiddenReason reason) {
+    private boolean shouldHiddenSave(CosmeticUser.@NotNull HiddenReason reason) {
         switch (reason) {
             case EMOTE, NONE -> {
                 return false;

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

@@ -14,6 +14,7 @@ import org.bukkit.persistence.PersistentDataType;
 import java.util.Map;
 import java.util.UUID;
 
+@Deprecated
 public class InternalData extends Data {
 
     NamespacedKey key = new NamespacedKey(HMCCosmeticsPlugin.getInstance(), "cosmetics");
@@ -27,7 +28,7 @@ public class InternalData extends Data {
     public void save(CosmeticUser user) {
         Player player = Bukkit.getPlayer(user.getUniqueId());
 
-        player.getPersistentDataContainer().set(key, PersistentDataType.STRING, steralizeData(user));
+        player.getPersistentDataContainer().set(key, PersistentDataType.STRING, serializeData(user));
     }
 
     @Override
@@ -38,7 +39,7 @@ public class InternalData extends Data {
         if (!player.getPersistentDataContainer().has(key, PersistentDataType.STRING)) return user;
         String rawData = player.getPersistentDataContainer().get(key, PersistentDataType.STRING);
 
-        Map<CosmeticSlot, Map<Cosmetic, Color>> a = desteralizedata(user, rawData);
+        Map<CosmeticSlot, Map<Cosmetic, Color>> a = deserializeData(user, rawData);
         for (Map<Cosmetic, Color> cosmeticColors : a.values()) {
             for (Cosmetic cosmetic : cosmeticColors.keySet()) {
                 Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {

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

@@ -58,7 +58,7 @@ public class MySQLData extends Data {
             try {
                 PreparedStatement preparedSt = preparedStatement("REPLACE INTO COSMETICDATABASE(UUID,COSMETICS) VALUES(?,?);");
                 preparedSt.setString(1, user.getUniqueId().toString());
-                preparedSt.setString(2, steralizeData(user));
+                preparedSt.setString(2, serializeData(user));
                 preparedSt.executeUpdate();
             } catch (SQLException e) {
                 throw new RuntimeException(e);
@@ -82,7 +82,7 @@ public class MySQLData extends Data {
                 ResultSet rs = preparedStatement.executeQuery();
                 if (rs.next()) {
                     String rawData = rs.getString("COSMETICS");
-                    Map<CosmeticSlot, Map<Cosmetic, Color>> cosmetics = desteralizedata(user, rawData);
+                    Map<CosmeticSlot, Map<Cosmetic, Color>> cosmetics = deserializeData(user, rawData);
                     for (Map<Cosmetic, Color> cosmeticColors : cosmetics.values()) {
                         for (Cosmetic cosmetic : cosmeticColors.keySet()) {
                             Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
@@ -160,11 +160,7 @@ public class MySQLData extends Data {
 
     private boolean isConnectionOpen() {
         try {
-            if (connection == null || connection.isClosed()) {
+            return connection != null && !connection.isClosed();
-                return false;
-            } else {
-                return true;
-            }
         } catch (SQLException e) {
             throw new RuntimeException(e);
         }

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

@@ -52,7 +52,7 @@ public class SQLiteData extends Data {
             try {
                 PreparedStatement preparedSt = preparedStatement("REPLACE INTO COSMETICDATABASE(UUID,COSMETICS) VALUES(?,?);");
                 preparedSt.setString(1, user.getUniqueId().toString());
-                preparedSt.setString(2, steralizeData(user));
+                preparedSt.setString(2, serializeData(user));
                 preparedSt.executeUpdate();
             } catch (SQLException e) {
                 throw new RuntimeException(e);
@@ -76,7 +76,7 @@ public class SQLiteData extends Data {
                 ResultSet rs = preparedStatement.executeQuery();
                 if (rs.next()) {
                     String rawData = rs.getString("COSMETICS");
-                    Map<CosmeticSlot, Map<Cosmetic, Color>> cosmetics = desteralizedata(user, rawData);
+                    Map<CosmeticSlot, Map<Cosmetic, Color>> cosmetics = deserializeData(user, rawData);
                     for (Map<Cosmetic, Color> cosmeticColors : cosmetics.values()) {
                         for (Cosmetic cosmetic : cosmeticColors.keySet()) {
                             Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
@@ -114,9 +114,6 @@ public class SQLiteData extends Data {
         //Bukkit.getScheduler().runTaskAsynchronously(HMCCosmeticsPlugin.getInstance(), () -> {
 
         //close Connection if still active
-        if (connection != null) {
-            //close();
-        }
 
         File dataFolder = new File(HMCCosmeticsPlugin.getInstance().getDataFolder(), "database.db");
 
@@ -151,11 +148,7 @@ public class SQLiteData extends Data {
 
     private boolean isConnectionOpen() {
         try {
-            if (connection == null || connection.isClosed()) {
+            return connection != null && !connection.isClosed();
-                return false;
-            } else {
-                return true;
-            }
         } catch (SQLException e) {
             throw new RuntimeException(e);
         }

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

@@ -17,6 +17,8 @@ import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 
@@ -25,13 +27,13 @@ import java.util.List;
 
 public class Menu {
 
-    private String id;
+    private final String id;
-    private String title;
+    private final String title;
-    private int rows;
+    private final int rows;
-    private ConfigurationNode config;
+    private final ConfigurationNode config;
-    private String permissionNode;
+    private final String permissionNode;
 
-    public Menu(String id, ConfigurationNode config) {
+    public Menu(String id, @NotNull ConfigurationNode config) {
         this.id = id;
         this.config = config;
 
@@ -58,7 +60,7 @@ public class Menu {
         openMenu(user, false);
     }
 
-    public void openMenu(CosmeticUser user, boolean ignorePermission) {
+    public void openMenu(@NotNull CosmeticUser user, boolean ignorePermission) {
         Player player = user.getPlayer();
         if (player == null) return;
         if (!ignorePermission && !permissionNode.isEmpty()) {
@@ -97,7 +99,8 @@ public class Menu {
 
     }
 
-    private Gui getItems(CosmeticUser user, Gui gui) {
+    @Contract("_, _ -> param2")
+    private Gui getItems(@NotNull CosmeticUser user, Gui gui) {
         Player player = user.getPlayer();
 
         for (ConfigurationNode config : config.node("items").childrenMap().values()) {
@@ -164,7 +167,8 @@ public class Menu {
         return gui;
     }
 
-    private List<Integer> getSlots(List<String> slotString) {
+    @NotNull
+    private List<Integer> getSlots(@NotNull List<String> slotString) {
         List<Integer> slots = new ArrayList<>();
 
         for (String a : slotString) {
@@ -181,6 +185,7 @@ public class Menu {
         return slots;
     }
 
+    @NotNull
     private List<Integer> getSlots(int small, int max) {
         List<Integer> slots = new ArrayList<>();
 
@@ -188,7 +193,9 @@ public class Menu {
         return slots;
     }
 
-    private ItemStack updateLore(CosmeticUser user, ItemStack itemStack, Type type, ConfigurationNode config) {
+    @Contract("_, _, _, _ -> param2")
+    @NotNull
+    private ItemStack updateLore(CosmeticUser user, @NotNull ItemStack itemStack, Type type, ConfigurationNode config) {
         if (itemStack.hasItemMeta()) {
             itemStack.setItemMeta(type.setLore(user, config, itemStack.getItemMeta()));
         }
@@ -201,7 +208,6 @@ public class Menu {
 
     public boolean canOpen(Player player) {
         if (permissionNode.isEmpty()) return true;
-        if (player.isOp() || player.hasPermission(permissionNode)) return true;
+        return player.isOp() || player.hasPermission(permissionNode);
-        return false;
     }
 }

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

@@ -4,6 +4,8 @@ import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import org.apache.commons.io.FilenameUtils;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
 import org.spongepowered.configurate.CommentedConfigurationNode;
 import org.spongepowered.configurate.ConfigurateException;
 import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
@@ -17,21 +19,23 @@ import java.util.logging.Level;
 
 public class Menus {
 
-    private static HashMap<String, Menu> MENUS = new HashMap<>();
+    private static final HashMap<String, Menu> MENUS = new HashMap<>();
 
     public static void addMenu(Menu menu) {
         MENUS.put(menu.getId().toUpperCase(), menu);
     }
 
-    public static Menu getMenu(String id) {
+    public static Menu getMenu(@NotNull String id) {
         return MENUS.get(id.toUpperCase());
     }
 
+    @Contract(pure = true)
+    @NotNull
     public static Collection<Menu> getMenu() {
         return MENUS.values();
     }
 
-    public static boolean hasMenu(String id) {
+    public static boolean hasMenu(@NotNull String id) {
         return MENUS.containsKey(id.toUpperCase());
     }
 
@@ -41,6 +45,7 @@ public class Menus {
 
     public static Menu getDefaultMenu() { return Menus.getMenu(Settings.getDefaultMenu()); }
 
+    @NotNull
     public static List<String> getMenuNames() {
         List<String> names = new ArrayList<>();
 

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/Action.java

@@ -1,12 +1,13 @@
 package com.hibiscusmc.hmccosmetics.gui.action;
 
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import org.jetbrains.annotations.NotNull;
 
 public class Action {
 
-    private String id;
+    private final String id;
 
-    public Action(String id) {
+    public Action(@NotNull String id) {
         this.id = id.toUpperCase();
         Actions.addAction(this);
     }

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/Actions.java

@@ -4,13 +4,14 @@ import com.hibiscusmc.hmccosmetics.gui.action.actions.*;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import org.apache.commons.lang.StringUtils;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
 import java.util.List;
 
 public class Actions {
 
-    private static HashMap<String, Action> actions = new HashMap<>();
+    private static final HashMap<String, Action> actions = new HashMap<>();
 
     // [ID]
     private static ActionMessage ACTION_MESSAGE = new ActionMessage();
@@ -27,11 +28,11 @@ public class Actions {
     private static ActionCosmeticToggle ACTION_TOGGLE = new ActionCosmeticToggle();
 
 
-    public static Action getAction(String id) {
+    public static Action getAction(@NotNull String id) {
         return actions.get(id.toUpperCase());
     }
 
-    public static boolean isAction(String id) {
+    public static boolean isAction(@NotNull String id) {
         return actions.containsKey(id.toUpperCase());
     }
 
@@ -39,7 +40,7 @@ public class Actions {
         actions.put(action.getId().toUpperCase(), action);
     }
 
-    public static void runActions(CosmeticUser user, List<String> raw) {
+    public static void runActions(CosmeticUser user, @NotNull List<String> raw) {
         for (String a : raw) {
             String id = StringUtils.substringBetween(a, "[", "]").toUpperCase();
             String message = StringUtils.substringAfter(a, "] ");

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

@@ -2,6 +2,7 @@ package com.hibiscusmc.hmccosmetics.gui.action.actions;
 
 import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import org.jetbrains.annotations.NotNull;
 
 public class ActionCloseMenu extends Action {
 
@@ -10,7 +11,7 @@ public class ActionCloseMenu extends Action {
     }
 
     @Override
-    public void run(CosmeticUser user, String raw) {
+    public void run(@NotNull CosmeticUser user, String raw) {
         user.getPlayer().closeInventory();
     }
 }

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

@@ -3,6 +3,7 @@ package com.hibiscusmc.hmccosmetics.gui.action.actions;
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import org.jetbrains.annotations.NotNull;
 
 public class ActionConsoleCommand extends Action {
 
@@ -11,7 +12,7 @@ public class ActionConsoleCommand extends Action {
     }
 
     @Override
-    public void run(CosmeticUser user, String raw) {
+    public void run(@NotNull CosmeticUser user, String raw) {
         HMCCosmeticsPlugin.getInstance().getServer().dispatchCommand(user.getPlayer(), raw);
     }
 

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

@@ -2,6 +2,7 @@ package com.hibiscusmc.hmccosmetics.gui.action.actions;
 
 import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import org.jetbrains.annotations.NotNull;
 
 public class ActionCosmeticHide extends Action {
 
@@ -10,10 +11,9 @@ public class ActionCosmeticHide extends Action {
     }
 
     @Override
-    public void run(CosmeticUser user, String raw) {
+    public void run(@NotNull CosmeticUser user, String raw) {
         if (!user.getHidden()) {
             user.hideCosmetics(CosmeticUser.HiddenReason.ACTION);
-            return;
         }
     }
 }

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

@@ -2,6 +2,7 @@ package com.hibiscusmc.hmccosmetics.gui.action.actions;
 
 import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import org.jetbrains.annotations.NotNull;
 
 public class ActionCosmeticShow extends Action {
 
@@ -10,7 +11,7 @@ public class ActionCosmeticShow extends Action {
     }
 
     @Override
-    public void run(CosmeticUser user, String raw) {
+    public void run(@NotNull CosmeticUser user, String raw) {
         if (user.getHidden()) {
             if (user.getHiddenReason() != CosmeticUser.HiddenReason.ACTION && user.getHiddenReason() != CosmeticUser.HiddenReason.COMMAND) return; // Do not hide if its already off for WG
             user.showCosmetics();

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

@@ -2,6 +2,7 @@ package com.hibiscusmc.hmccosmetics.gui.action.actions;
 
 import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import org.jetbrains.annotations.NotNull;
 
 public class ActionCosmeticToggle extends Action {
 
@@ -10,13 +11,12 @@ public class ActionCosmeticToggle extends Action {
     }
 
     @Override
-    public void run(CosmeticUser user, String raw) {
+    public void run(@NotNull CosmeticUser user, String raw) {
         if (user.getHidden()) {
             if (user.getHiddenReason() != CosmeticUser.HiddenReason.ACTION && user.getHiddenReason() != CosmeticUser.HiddenReason.COMMAND) return;
             user.showCosmetics();
             return;
         }
         user.hideCosmetics(CosmeticUser.HiddenReason.ACTION);
-        return;
     }
 }

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

@@ -3,6 +3,7 @@ package com.hibiscusmc.hmccosmetics.gui.action.actions;
 import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
+import org.jetbrains.annotations.NotNull;
 
 public class ActionMessage extends Action {
 
@@ -11,7 +12,7 @@ public class ActionMessage extends Action {
     }
 
     @Override
-    public void run(CosmeticUser user, String raw) {
+    public void run(@NotNull CosmeticUser user, String raw) {
         MessagesUtil.sendMessageNoKey(user.getPlayer(), raw);
     }
 }

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

@@ -5,7 +5,6 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.hibiscusmc.hmccosmetics.util.ServerUtils;
 import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
-import com.owen1212055.particlehelper.api.particle.Particle;
 import com.owen1212055.particlehelper.api.particle.types.BlockDataParticle;
 import com.owen1212055.particlehelper.api.particle.types.DestinationParticle;
 import com.owen1212055.particlehelper.api.particle.types.velocity.VelocityParticle;
@@ -14,6 +13,7 @@ import com.owen1212055.particlehelper.api.type.Particles;
 import org.bukkit.Location;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
 public class ActionParticle extends Action {
 
@@ -22,7 +22,7 @@ public class ActionParticle extends Action {
     }
 
     @Override
-    public void run(CosmeticUser user, String raw) {
+    public void run(CosmeticUser user, @NotNull String raw) {
         String[] rawString = raw.split(" ");
         var particleType = Particles.fromKey(NamespacedKey.minecraft(rawString[0].toLowerCase()));
         if (particleType == null) {

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

@@ -3,6 +3,7 @@ package com.hibiscusmc.hmccosmetics.gui.action.actions;
 import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
+import org.jetbrains.annotations.NotNull;
 
 public class ActionPlayerCommand extends Action {
 
@@ -11,7 +12,7 @@ public class ActionPlayerCommand extends Action {
     }
 
     @Override
-    public void run(CosmeticUser user, String raw) {
+    public void run(@NotNull CosmeticUser user, String raw) {
         user.getPlayer().performCommand(MessagesUtil.processStringNoKeyString(user.getPlayer(), raw));
     }
 }

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

@@ -4,6 +4,7 @@ import com.hibiscusmc.hmccosmetics.gui.action.Action;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.logging.Level;
 
@@ -15,7 +16,7 @@ public class ActionSound extends Action {
     }
 
     @Override
-    public void run(CosmeticUser user, String raw) {
+    public void run(@NotNull CosmeticUser user, @NotNull String raw) {
         Player player = user.getPlayer();
         String[] processedString = raw.split(" ");
 

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

@@ -6,7 +6,9 @@ import com.hibiscusmc.hmccolor.gui.guis.GuiItem;
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
+import com.hibiscusmc.hmccosmetics.hooks.Hooks;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
+import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.hibiscusmc.hmccosmetics.util.misc.Placeholder;
 import org.bukkit.Bukkit;
 import org.bukkit.Color;
@@ -17,17 +19,20 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.LeatherArmorMeta;
 import org.bukkit.inventory.meta.MapMeta;
 import org.bukkit.inventory.meta.PotionMeta;
+import org.jetbrains.annotations.NotNull;
 
 public class DyeMenu {
 
-    // Yes, I do know how tacted on this feels.
+    public static void openMenu(@NotNull CosmeticUser user, Cosmetic cosmetic) {
-
+        Player player = user.getPlayer();
-
+        if (player == null) return;
-    public static void openMenu(CosmeticUser user, Cosmetic cosmetic) {
+        if (!Hooks.isActiveHook("HMCColor")) {
+            addCosmetic(user, cosmetic, null);
+            return;
+        }
         ItemStack originalItem = user.getUserCosmeticItem(cosmetic);
         if (originalItem == null || !cosmetic.isDyable()) return;
 
-        Player player = user.getPlayer();
         Gui gui = HMCColorApi.INSTANCE.colorMenu();
         gui.updateTitle(Placeholder.applyPapiPlaceholders(player, Settings.getDyeMenuName()));
         gui.setItem(Settings.getDyeMenuInputSlot(), new GuiItem(originalItem));
@@ -43,13 +48,7 @@ public class DyeMenu {
                                 meta instanceof MapMeta mapMeta ? mapMeta.getColor() : null;
                 if (color == null) return;
 
-                //user.removeCosmeticSlot(cosmetic);
+                addCosmetic(user, cosmetic, color);
-                user.addPlayerCosmetic(cosmetic, color);
-                player.setItemOnCursor(new ItemStack(Material.AIR));
-                Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
-                    player.closeInventory();
-                    user.updateCosmetic(cosmetic.getSlot());
-                }, 2);
             } else event.setCancelled(true);
         });
 
@@ -57,4 +56,14 @@ public class DyeMenu {
         gui.setCloseGuiAction(event -> {});
         gui.open(player);
     }
+
+    private static void addCosmetic(CosmeticUser user, Cosmetic cosmetic, Color color) {
+        Player player = user.getPlayer();
+        user.addPlayerCosmetic(cosmetic, color);
+        player.setItemOnCursor(new ItemStack(Material.AIR));
+        Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
+            player.closeInventory();
+            user.updateCosmetic(cosmetic.getSlot());
+        }, 2);
+    }
 }

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

@@ -7,7 +7,7 @@ import org.spongepowered.configurate.ConfigurationNode;
 
 public class Type {
 
-    private String id;
+    private final String id;
 
     public Type(String id) {
         this.id = id;

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

@@ -2,21 +2,22 @@ package com.hibiscusmc.hmccosmetics.gui.type;
 
 import com.hibiscusmc.hmccosmetics.gui.type.types.TypeCosmetic;
 import com.hibiscusmc.hmccosmetics.gui.type.types.TypeEmpty;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
 
 public class Types {
 
-    private static HashMap<String, Type> types = new HashMap<>();
+    private static final HashMap<String, Type> types = new HashMap<>();
 
     private static TypeCosmetic TYPE_COSMETIC = new TypeCosmetic();
     private static TypeEmpty TYPE_EMPTY = new TypeEmpty();
 
-    public static Type getType(String id) {
+    public static Type getType(@NotNull String id) {
         return types.get(id.toUpperCase());
     }
 
-    public static boolean isType(String id) {
+    public static boolean isType(@NotNull String id) {
         return types.containsKey(id.toUpperCase());
     }
 

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

@@ -14,9 +14,12 @@ import com.hibiscusmc.hmccosmetics.util.misc.StringUtils;
 import com.hibiscusmc.hmccosmetics.util.misc.Utils;
 import me.clip.placeholderapi.PlaceholderAPI;
 import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.meta.ItemMeta;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 
@@ -31,17 +34,18 @@ public class TypeCosmetic extends Type {
     }
 
     @Override
-    public void run(CosmeticUser user, ConfigurationNode config, ClickType clickType) {
+    public void run(CosmeticUser user, @NotNull ConfigurationNode config, ClickType clickType) {
         if (config.node("cosmetic").virtual()) return;
         String cosmeticName = config.node("cosmetic").getString();
         Cosmetic cosmetic = Cosmetics.getCosmetic(cosmeticName);
+        Player player = user.getPlayer();
         if (cosmetic == null) {
-            MessagesUtil.sendMessage(user.getPlayer(), "invalid-cosmetic");
+            MessagesUtil.sendMessage(player, "invalid-cosmetic");
             return;
         }
 
         if (!user.canEquipCosmetic(cosmetic)) {
-            MessagesUtil.sendMessage(user.getPlayer(), "no-cosmetic-permission");
+            MessagesUtil.sendMessage(player, "no-cosmetic-permission");
             return;
         }
 
@@ -92,7 +96,7 @@ public class TypeCosmetic extends Type {
     }
 
     @Override
-    public ItemMeta setLore(CosmeticUser user, ConfigurationNode config, ItemMeta itemMeta) {
+    public ItemMeta setLore(CosmeticUser user, @NotNull ConfigurationNode config, ItemMeta itemMeta) {
         List<String> processedLore = new ArrayList<>();
 
         if (config.node("cosmetic").virtual()) return processLoreLines(user, itemMeta);;
@@ -143,7 +147,9 @@ public class TypeCosmetic extends Type {
         return itemMeta;
     }
 
-    private ItemMeta processLoreLines(CosmeticUser user, ItemMeta itemMeta) {
+    @Contract("_, _ -> param2")
+    @NotNull
+    private ItemMeta processLoreLines(CosmeticUser user, @NotNull ItemMeta itemMeta) {
         List<String> processedLore = new ArrayList<>();
 
         if (itemMeta.hasLore()) {

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

@@ -8,6 +8,7 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import me.clip.placeholderapi.PlaceholderAPI;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.meta.ItemMeta;
+import org.jetbrains.annotations.NotNull;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 
@@ -25,7 +26,7 @@ public class TypeEmpty extends Type {
 
     // This is the code that's run when the item is clicked.
     @Override
-    public void run(CosmeticUser user, ConfigurationNode config, ClickType clickType) {
+    public void run(CosmeticUser user, @NotNull ConfigurationNode config, ClickType clickType) {
         List<String> actionStrings = new ArrayList<>(); // List where we keep the actions the server will execute.
         ConfigurationNode actionConfig = config.node("actions"); // Configuration node that actions are under.
 
@@ -53,7 +54,7 @@ public class TypeEmpty extends Type {
     }
 
     @Override
-    public ItemMeta setLore(CosmeticUser user, ConfigurationNode config, ItemMeta itemMeta) {
+    public ItemMeta setLore(CosmeticUser user, ConfigurationNode config, @NotNull ItemMeta itemMeta) {
         List<String> processedLore = new ArrayList<>();
 
         if (itemMeta.hasLore()) {

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

@@ -5,7 +5,7 @@ import org.bukkit.inventory.ItemStack;
 
 public class Hook implements Listener {
 
-    private String id;
+    private final String id;
     private boolean active;
     private boolean itemHook;
 
@@ -19,7 +19,7 @@ public class Hook implements Listener {
         // Override
     }
 
-    public ItemStack getItem(String itemid) {
+    public ItemStack getItem(String itemId) {
         return null;
         // Override
     }

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

@@ -2,18 +2,21 @@ package com.hibiscusmc.hmccosmetics.hooks;
 
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.hooks.items.*;
+import com.hibiscusmc.hmccosmetics.hooks.misc.HookHMCColor;
 import com.hibiscusmc.hmccosmetics.hooks.misc.HookPremiumVanish;
 import com.hibiscusmc.hmccosmetics.hooks.misc.HookSuperVanish;
 import com.hibiscusmc.hmccosmetics.hooks.placeholders.HookPlaceholderAPI;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
 
 public class Hooks {
 
-    private static HashMap<String, Hook> hooks = new HashMap<>();
+    private static final HashMap<String, Hook> hooks = new HashMap<>();
     private static HookOraxen ORAXEN_HOOK = new HookOraxen();
     private static HookItemAdder ITEMADDER_HOOK = new HookItemAdder();
     private static HookLooty LOOTY_HOOK = new HookLooty();
@@ -22,12 +25,13 @@ public class Hooks {
     private static HookPlaceholderAPI PAPI_HOOK = new HookPlaceholderAPI();
     private static HookPremiumVanish PREMIUM_VANISH_HOOK = new HookPremiumVanish();
     private static HookSuperVanish SUPER_VANISH_HOOK = new HookSuperVanish();
+    private static HookHMCColor HMC_COLOR_HOOK = new HookHMCColor();
 
-    public static Hook getHook(String id) {
+    public static Hook getHook(@NotNull String id) {
         return hooks.get(id.toLowerCase());
     }
 
-    public static boolean isItemHook(String id) {
+    public static boolean isItemHook(@NotNull String id) {
         return hooks.containsKey(id.toLowerCase());
     }
 
@@ -46,7 +50,8 @@ public class Hooks {
         }
     }
 
-    public static ItemStack getItem(String raw) {
+    @Nullable
+    public static ItemStack getItem(@NotNull String raw) {
         if (!raw.contains(":")) {
             Material mat = Material.getMaterial(raw.toUpperCase());
             if (mat == null) return null;
@@ -61,8 +66,7 @@ public class Hooks {
         Hook hook = getHook(split[0]);
         if (!hook.hasEnabledItemHook()) return null;
         if (!hook.getActive()) return null;
-        ItemStack item = hook.getItem(split[1]);
+        return hook.getItem(split[1]);
-        return item;
     }
 
     public static boolean isActiveHook(String id) {

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

@@ -14,8 +14,8 @@ public class HookHMCCosmetics extends Hook implements Listener {
     }
 
     @Override
-    public ItemStack getItem(String itemid) {
+    public ItemStack getItem(String itemId) {
-        Cosmetic cosmetic = Cosmetics.getCosmetic(itemid);
+        Cosmetic cosmetic = Cosmetics.getCosmetic(itemId);
         if (cosmetic == null) return null;
         return cosmetic.getItem();
     }

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

@@ -21,9 +21,9 @@ public class HookItemAdder extends Hook implements Listener {
     }
 
     @Override
-    public ItemStack getItem(String itemid) {
+    public ItemStack getItem(String itemId) {
         if (enabled) {
-            CustomStack stack = CustomStack.getInstance(itemid);
+            CustomStack stack = CustomStack.getInstance(itemId);
             if (stack == null) return null;
             return stack.getItemStack();
         } else {

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

@@ -14,8 +14,8 @@ public class HookLooty extends Hook implements Listener {
     }
 
     @Override
-    public ItemStack getItem(String itemid) {
+    public ItemStack getItem(String itemId) {
-        PrefabKey prefabKey = PrefabKey.Companion.ofOrNull(itemid);
+        PrefabKey prefabKey = PrefabKey.Companion.ofOrNull(itemId);
         if (prefabKey == null) return null;
         return LootyFactory.INSTANCE.createFromPrefab(prefabKey);
     }

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

@@ -12,7 +12,7 @@ public class HookMythic extends Hook implements Listener {
     }
 
     @Override
-    public ItemStack getItem(String itemid) {
+    public ItemStack getItem(String itemId) {
-        return MythicBukkit.inst().getItemManager().getItemStack(itemid);
+        return MythicBukkit.inst().getItemManager().getItemStack(itemId);
     }
 }

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

@@ -14,8 +14,8 @@ public class HookOraxen extends Hook implements Listener {
     }
 
     @Override
-    public ItemStack getItem(String itemid) {
+    public ItemStack getItem(String itemId) {
-        ItemBuilder builder = OraxenItems.getItemById(itemid);
+        ItemBuilder builder = OraxenItems.getItemById(itemId);
         if (builder == null) return null;
         return builder.build();
     }

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

@@ -0,0 +1,11 @@
+package com.hibiscusmc.hmccosmetics.hooks.misc;
+
+import com.hibiscusmc.hmccosmetics.hooks.Hook;
+import org.bukkit.event.Listener;
+
+public class HookHMCColor extends Hook implements Listener {
+
+    public HookHMCColor() {
+        super("HMCColor");
+    }
+}

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

@@ -8,6 +8,7 @@ import de.myzelyam.api.vanish.PlayerShowEvent;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
+import org.jetbrains.annotations.NotNull;
 
 public class HookPremiumVanish extends Hook implements Listener {
 
@@ -18,7 +19,7 @@ public class HookPremiumVanish extends Hook implements Listener {
     }
 
     @EventHandler
-    public void onPlayerVanish(PlayerHideEvent event) {
+    public void onPlayerVanish(@NotNull PlayerHideEvent event) {
         Player player = event.getPlayer();
         CosmeticUser user = CosmeticUsers.getUser(player);
         if (user == null) return;
@@ -26,7 +27,7 @@ public class HookPremiumVanish extends Hook implements Listener {
     }
 
     @EventHandler
-    public void onPlayerShow(PlayerShowEvent event) {
+    public void onPlayerShow(@NotNull PlayerShowEvent event) {
         Player player = event.getPlayer();
         CosmeticUser user = CosmeticUsers.getUser(player);
         if (user == null) return;

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

@@ -8,6 +8,7 @@ import de.myzelyam.api.vanish.PlayerShowEvent;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
+import org.jetbrains.annotations.NotNull;
 
 public class HookSuperVanish extends Hook implements Listener {
 
@@ -18,7 +19,7 @@ public class HookSuperVanish extends Hook implements Listener {
     }
 
     @EventHandler
-    public void onPlayerVanish(PlayerHideEvent event) {
+    public void onPlayerVanish(@NotNull PlayerHideEvent event) {
         Player player = event.getPlayer();
         CosmeticUser user = CosmeticUsers.getUser(player);
         if (user == null) return;
@@ -26,7 +27,7 @@ public class HookSuperVanish extends Hook implements Listener {
     }
 
     @EventHandler
-    public void onPlayerShow(PlayerShowEvent event) {
+    public void onPlayerShow(@NotNull PlayerShowEvent event) {
         Player player = event.getPlayer();
         CosmeticUser user = CosmeticUsers.getUser(player);
         if (user == null) return;

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

@@ -25,22 +25,25 @@ public class HMCPlaceholderExpansion extends PlaceholderExpansion {
     }
 
     @Override
-    public @NotNull String getIdentifier() {
+    @NotNull
+    public String getIdentifier() {
         return "HMCCosmetics";
     }
 
     @Override
-    public @NotNull String getAuthor() {
+    @NotNull
+    public String getAuthor() {
         return "HibiscusMC";
     }
 
     @Override
-    public @NotNull String getVersion() {
+    @NotNull
+    public String getVersion() {
         return HMCCosmeticsPlugin.getInstance().getDescription().getVersion();
     }
 
     @Override
-    public String onRequest(OfflinePlayer player, String params) {
+    public String onRequest(@NotNull OfflinePlayer player, @NotNull String params) {
         if (!player.isOnline()) return null;
         CosmeticUser user = CosmeticUsers.getUser(player.getPlayer());
         if (user == null) return null;
@@ -132,13 +135,13 @@ public class HMCPlaceholderExpansion extends PlaceholderExpansion {
         return null;
     }
 
-    public String getMaterial(Cosmetic cosmetic) {
+    public String getMaterial(@NotNull Cosmetic cosmetic) {
         ItemStack item = cosmetic.getItem();
         if (item == null) return null;
         return cosmetic.getItem().getType().toString();
     }
 
-    public String getModelData(Cosmetic cosmetic) {
+    public String getModelData(@NotNull Cosmetic cosmetic) {
         ItemStack item = cosmetic.getItem();
         if (item == null) return null;
         if (!item.hasItemMeta()) return null;
@@ -146,7 +149,7 @@ public class HMCPlaceholderExpansion extends PlaceholderExpansion {
         return String.valueOf(itemMeta.getCustomModelData());
     }
 
-    public String getItemName(Cosmetic cosmetic) {
+    public String getItemName(@NotNull Cosmetic cosmetic) {
         ItemStack item = cosmetic.getItem();
         if (item == null) return null;
         if (!item.hasItemMeta()) return null;
@@ -154,7 +157,7 @@ public class HMCPlaceholderExpansion extends PlaceholderExpansion {
         return itemMeta.getDisplayName();
     }
 
-    public String getItemLore(Cosmetic cosmetic) {
+    public String getItemLore(@NotNull Cosmetic cosmetic) {
         ItemStack item = cosmetic.getItem();
         if (item == null) return null;
         if (item.hasItemMeta()) {

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

@@ -12,11 +12,12 @@ import org.bukkit.Location;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerMoveEvent;
+import org.jetbrains.annotations.NotNull;
 
 public class WGListener implements Listener {
 
     @EventHandler
-    public void onPlayerMove(PlayerMoveEvent event) {
+    public void onPlayerMove(@NotNull PlayerMoveEvent event) {
         CosmeticUser user = CosmeticUsers.getUser(event.getPlayer());
         if (user == null) return;
         Location location = event.getPlayer().getLocation();

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

@@ -13,11 +13,12 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
+import org.jetbrains.annotations.NotNull;
 
 public class PlayerConnectionListener implements Listener {
 
     @EventHandler
-    public void onPlayerJoin(PlayerJoinEvent event) {
+    public void onPlayerJoin(@NotNull PlayerJoinEvent event) {
         if (event.getPlayer().isOp() || event.getPlayer().hasPermission("hmccosmetics.notifyupdate")) {
             if (!HMCCosmeticsPlugin.getLatestVersion().equalsIgnoreCase(HMCCosmeticsPlugin.getInstance().getDescription().getVersion()) && HMCCosmeticsPlugin.getLatestVersion() != null)
                 MessagesUtil.sendMessageNoKey(
@@ -46,7 +47,7 @@ public class PlayerConnectionListener implements Listener {
     }
 
     @EventHandler
-    public void onPlayerQuit(PlayerQuitEvent event) {
+    public void onPlayerQuit(@NotNull PlayerQuitEvent event) {
         CosmeticUser user = CosmeticUsers.getUser(event.getPlayer());
         if (user == null) { // Remove any passengers if a user failed to initialize. Bugs can cause this to happen
             if (!event.getPlayer().getPassengers().isEmpty()) {

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

@@ -23,7 +23,6 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
 import com.hibiscusmc.hmccosmetics.util.InventoryUtils;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import org.bukkit.Bukkit;
-import org.bukkit.Color;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Entity;
@@ -105,7 +104,7 @@ public class PlayerGameListener implements Listener {
         if (user.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
             user.getUserBackpackManager().hideBackpack();
 
-            user.getUserBackpackManager().getArmorstand().teleport(event.getTo());
+            user.getUserBackpackManager().getArmorStand().teleport(event.getTo());
 
             Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
                 user.updateCosmetic();
@@ -133,14 +132,14 @@ public class PlayerGameListener implements Listener {
             return;
         }
 
-        final Cosmetic cosmetic = user.getCosmetic(CosmeticSlot.BALLOON);
+        if (user.hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
-        final Color color = user.getCosmeticColor(CosmeticSlot.BALLOON);
+            user.despawnBalloon();
-        user.removeCosmeticSlot(CosmeticSlot.BALLOON);
 
-        Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
+            Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
-            user.addPlayerCosmetic(cosmetic, color);
+                user.spawnBalloon((CosmeticBalloonType) user.getCosmetic(CosmeticSlot.BALLOON));
-            user.updateCosmetic();
+                user.updateCosmetic();
-        }, 4);
+            }, 4);
+        }
     }
 
     @EventHandler
@@ -394,6 +393,10 @@ public class PlayerGameListener implements Listener {
                 Player player = event.getPlayer();
                 CosmeticUser user = CosmeticUsers.getUser(player);
                 if (user == null) return;
+                if (user.getUserEmoteManager().isPlayingEmote()) {
+                    event.setCancelled(true);
+                    return;
+                }
                 if (!user.isInWardrobe()) return;
                 Menu menu = Menus.getDefaultMenu();
                 if (menu == null) return;

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

@@ -19,12 +19,14 @@ public interface NMSHandler {
 
     Entity getEntity(int entityId);
 
-    Entity getInvisibleArmorstand(Location loc);
+    Entity getHMCArmorStand(Location loc);
 
     ArmorStand getMEGEntity(Location loc);
 
     Entity spawnBackpack(CosmeticUser user, CosmeticBackpackType cosmeticBackpackType);
 
+    Entity spawnHMCParticleCloud(Location location);
+
     UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType);
 
     void equipmentSlotUpdate(

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

@@ -37,7 +37,6 @@ public class NMSHandlers {
             MessagesUtil.sendDebugMessages(packageVersion + " has been detected.", Level.INFO);
             version = packageVersion;
             try {
-                //Class.forName("org.bukkit.craftbukkit." + version + ".block.CraftBlock").getName();
                 handler = (NMSHandler) Class.forName("com.hibiscusmc.hmccosmetics.nms." + packageVersion + ".NMSHandler").getConstructor().newInstance();
                 return;
             } catch (ClassNotFoundException | InvocationTargetException | InstantiationException |

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

@@ -401,7 +401,7 @@ public class CosmeticUser {
             PacketManager.sendLeashPacket(getBalloonManager().getPufferfishBalloonId(), -1, viewer);
         }
         if (hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
-            userBackpackManager.getArmorstand().getEquipment().clear();
+            userBackpackManager.getArmorStand().getEquipment().clear();
         }
         updateCosmetic();
         MessagesUtil.sendDebugMessages("HideCosmetics");
@@ -427,7 +427,7 @@ public class CosmeticUser {
         if (hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
             CosmeticBackpackType cosmeticBackpackType = (CosmeticBackpackType) getCosmetic(CosmeticSlot.BACKPACK);
             ItemStack item = getUserCosmeticItem(cosmeticBackpackType);
-            userBackpackManager.getArmorstand().getEquipment().setHelmet(item);
+            userBackpackManager.getArmorStand().getEquipment().setHelmet(item);
         }
         updateCosmetic();
         MessagesUtil.sendDebugMessages("ShowCosmetics");

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

@@ -17,8 +17,8 @@ import java.util.logging.Level;
 public class UserBackpackManager {
 
     private boolean hideBackpack;
-    private ArmorStand invisibleArmorstand;
+    private ArmorStand invisibleArmorStand;
-    private CosmeticUser user;
+    private final CosmeticUser user;
     private BackpackType backpackType;
 
     public UserBackpackManager(CosmeticUser user) {
@@ -27,27 +27,27 @@ public class UserBackpackManager {
         backpackType = BackpackType.NORMAL;
     }
 
-    public int getFirstArmorstandId() {
+    public int getFirstArmorStandId() {
-        return invisibleArmorstand.getEntityId();
+        return invisibleArmorStand.getEntityId();
     }
 
-    public ArmorStand getArmorstand() {
+    public ArmorStand getArmorStand() {
-        return invisibleArmorstand;
+        return invisibleArmorStand;
     }
 
     public void spawnBackpack(CosmeticBackpackType cosmeticBackpackType) {
         MessagesUtil.sendDebugMessages("spawnBackpack Bukkit - Start");
 
-        if (this.invisibleArmorstand != null) return;
+        if (this.invisibleArmorStand != null) return;
 
-        this.invisibleArmorstand = (ArmorStand) NMSHandlers.getHandler().spawnBackpack(user, cosmeticBackpackType);
+        this.invisibleArmorStand = (ArmorStand) NMSHandlers.getHandler().spawnBackpack(user, cosmeticBackpackType);
 
         if (cosmeticBackpackType.getModelName() != null && HMCCosmeticsPlugin.hasModelEngine()) {
             if (ModelEngineAPI.api.getModelRegistry().getBlueprint(cosmeticBackpackType.getModelName()) == null) {
                 MessagesUtil.sendDebugMessages("Invalid Model Engine Blueprint " + cosmeticBackpackType.getModelName(), Level.SEVERE);
                 return;
             }
-            ModeledEntity modeledEntity = ModelEngineAPI.getOrCreateModeledEntity(invisibleArmorstand);
+            ModeledEntity modeledEntity = ModelEngineAPI.getOrCreateModeledEntity(invisibleArmorStand);
             ActiveModel model = ModelEngineAPI.createActiveModel(ModelEngineAPI.getBlueprint(cosmeticBackpackType.getModelName()));
             model.setCanHurt(false);
             modeledEntity.addModel(model, false);
@@ -57,23 +57,23 @@ public class UserBackpackManager {
     }
 
     public void despawnBackpack() {
-        if (invisibleArmorstand == null) return;
+        if (invisibleArmorStand == null) return;
-        invisibleArmorstand.setHealth(0);
+        invisibleArmorStand.setHealth(0);
-        invisibleArmorstand.remove();
+        invisibleArmorStand.remove();
-        this.invisibleArmorstand = null;
+        this.invisibleArmorStand = null;
     }
 
     public void hideBackpack() {
-        if (user.getHidden() == true) return;
+        if (user.getHidden()) return;
-        getArmorstand().getEquipment().clear();
+        getArmorStand().getEquipment().clear();
         hideBackpack = true;
     }
 
     public void showBackpack() {
-        if (hideBackpack == false) return;
+        if (!hideBackpack) return;
         CosmeticBackpackType cosmeticBackpackType = (CosmeticBackpackType) user.getCosmetic(CosmeticSlot.BACKPACK);
         ItemStack item = user.getUserCosmeticItem(cosmeticBackpackType);
-        getArmorstand().getEquipment().setHelmet(item);
+        getArmorStand().getEquipment().setHelmet(item);
         hideBackpack = false;
     }
 

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

@@ -15,6 +15,7 @@ import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.UUID;
 import java.util.logging.Level;
@@ -26,13 +27,13 @@ public class UserBalloonManager {
     private final UUID uniqueID;
     private final ArmorStand modelEntity;
 
-    public UserBalloonManager(Location location) {
+    public UserBalloonManager(@NotNull Location location) {
         this.uniqueID = UUID.randomUUID();
         this.balloonID = NMSHandlers.getHandler().getNextEntityId();
         this.modelEntity = NMSHandlers.getHandler().getMEGEntity(location.add(Settings.getBalloonOffset()));
     }
 
-    public void spawnModel(CosmeticBalloonType cosmeticBalloonType, Color color) {
+    public void spawnModel(@NotNull CosmeticBalloonType cosmeticBalloonType, Color color) {
         // redo this
         if (cosmeticBalloonType.getModelName() != null && HMCCosmeticsPlugin.hasModelEngine()) {
             balloonType = BalloonType.MODELENGINE;

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

@@ -3,6 +3,7 @@ package com.hibiscusmc.hmccosmetics.user.manager;
 import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticEmoteType;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
+import org.jetbrains.annotations.NotNull;
 
 public class UserEmoteManager {
 
@@ -13,13 +14,17 @@ public class UserEmoteManager {
         this.user = user;
     }
 
-    public void playEmote(CosmeticEmoteType cosmeticEmoteType) {
+    public void playEmote(@NotNull CosmeticEmoteType cosmeticEmoteType) {
         MessagesUtil.sendDebugMessages("playEmote " + cosmeticEmoteType.getAnimationId());
+        playEmote(cosmeticEmoteType.getAnimationId());
+    }
+
+    public void playEmote(String animationId) {
         if (isPlayingEmote()) return;
         if (user.isInWardrobe()) return;
         try {
             model = new UserEmoteModel(user);
-            model.playAnimation(cosmeticEmoteType.getAnimationId());
+            model.playAnimation(animationId);
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -14,35 +14,38 @@ import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.EquipmentSlot;
+import org.jetbrains.annotations.NotNull;
-import org.bukkit.inventory.ItemStack;
 
-import java.util.HashMap;
+import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 
 public class UserEmoteModel extends PlayerModel {
 
-    private CosmeticUser user;
+    private final CosmeticUser user;
     private String emotePlaying;
-    private int armorstandId;
+    private final int armorStandId;
     private GameMode originalGamemode;
 
-    public UserEmoteModel(CosmeticUser user) {
+    public UserEmoteModel(@NotNull CosmeticUser user) {
         super(user.getPlayer());
         this.user = user;
-        armorstandId = NMSHandlers.getHandler().getNextEntityId();
+        armorStandId = NMSHandlers.getHandler().getNextEntityId();
         getRangeManager().setRenderDistance(Settings.getViewDistance());
     }
 
     @Override
-    public void playAnimation(String id) {
+    public void playAnimation(@NotNull String id) {
-        id = id + "." + id + "." + id; // Make into a format that playerAnimator works with. Requires 3 splits.
+        if (id.contains(":")) id = id.split(":", 2)[1]; // A:B -> B -> B.B.B
+        if (!id.contains(".")) id = id + "." + id + "." + id; // Make into a format that playerAnimator works with. Requires 3 splits.
+
         super.playAnimation(id);
+
         emotePlaying = id;
+
         // Add config option that either allows player to move or forces them into a spot.
         Player player = user.getPlayer();
-        List<Player> viewer = List.of(user.getPlayer());
+        List<Player> viewer = Collections.singletonList(user.getPlayer());
         List<Player> outsideViewers = PacketManager.getViewers(player.getLocation());
         outsideViewers.remove(player);
 
@@ -50,24 +53,27 @@ public class UserEmoteModel extends PlayerModel {
 
         Location newLocation = player.getLocation().clone();
         newLocation.setPitch(0);
+
         double DISTANCE = Settings.getEmoteDistance();
+
         Location thirdPersonLocation = newLocation.add(newLocation.getDirection().normalize().multiply(DISTANCE));
         if (thirdPersonLocation.getBlock().getType() != Material.AIR) {
             stopAnimation();
             MessagesUtil.sendMessage(player, "emote-blocked");
             return;
         }
+
         user.getPlayer().setInvisible(true);
         user.hideCosmetics(CosmeticUser.HiddenReason.EMOTE);
 
         originalGamemode = player.getGameMode();
 
-        PacketManager.sendEntitySpawnPacket(thirdPersonLocation, armorstandId, EntityType.ARMOR_STAND, UUID.randomUUID(), viewer);
+        PacketManager.sendEntitySpawnPacket(thirdPersonLocation, armorStandId, EntityType.ARMOR_STAND, UUID.randomUUID(), viewer);
-        PacketManager.sendInvisibilityPacket(armorstandId, viewer);
+        PacketManager.sendInvisibilityPacket(armorStandId, viewer);
-        PacketManager.sendLookPacket(armorstandId, player.getLocation(), viewer);
+        PacketManager.sendLookPacket(armorStandId, player.getLocation(), viewer);
 
         PacketManager.gamemodeChangePacket(player, 3);
-        PacketManager.sendCameraPacket(armorstandId, viewer);
+        PacketManager.sendCameraPacket(armorStandId, viewer);
 
         MessagesUtil.sendDebugMessages("playAnimation run");
     }
@@ -89,16 +95,16 @@ public class UserEmoteModel extends PlayerModel {
         emotePlaying = null;
         despawn();
         Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
-            if (user.getPlayer() == null) return;
             Player player = user.getPlayer();
-            List<Player> viewer = List.of(user.getPlayer());
+            if (player == null) return;
-            if (viewer == null) return;
+
+            List<Player> viewer = Collections.singletonList(player);
             List<Player> outsideViewers = PacketManager.getViewers(player.getLocation());
             outsideViewers.remove(player);
 
             int entityId = player.getEntityId();
             PacketManager.sendCameraPacket(entityId, viewer);
-            PacketManager.sendEntityDestroyPacket(armorstandId, viewer);
+            PacketManager.sendEntityDestroyPacket(armorStandId, viewer);
             if (this.originalGamemode != null) {
                 PacketManager.gamemodeChangePacket(player, ServerUtils.convertGamemode(this.originalGamemode));
                 player.setGameMode(this.originalGamemode);
@@ -112,7 +118,6 @@ public class UserEmoteModel extends PlayerModel {
     }
 
     public boolean isPlayingAnimation() {
-        if (emotePlaying == null) return false;
+        return emotePlaying != null;
-        return true;
     }
 }

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

@@ -3,6 +3,7 @@ package com.hibiscusmc.hmccosmetics.user.manager;
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.config.WardrobeSettings;
+import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
 import com.hibiscusmc.hmccosmetics.nms.NMSHandlers;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
@@ -23,38 +24,27 @@ import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.scheduler.BukkitRunnable;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class UserWardrobeManager {
 
-    private int NPC_ID;
+    private final int NPC_ID;
+    private final int ARMORSTAND_ID;
+    private final UUID WARDROBE_UUID;
     private String npcName;
-    private UUID WARDROBE_UUID;
-    private int ARMORSTAND_ID;
     private GameMode originalGamemode;
-    private CosmeticUser user;
+    private final CosmeticUser user;
-    private Location viewingLocation;
+    private final Location viewingLocation;
-    private Location npcLocation;
+    private final Location npcLocation;
     private Location exitLocation;
     private BossBar bossBar;
     private boolean active;
     private WardrobeStatus wardrobeStatus;
 
-    public UserWardrobeManager(CosmeticUser user) {
-        NPC_ID = NMSHandlers.getHandler().getNextEntityId();
-        ARMORSTAND_ID = NMSHandlers.getHandler().getNextEntityId();
-        WARDROBE_UUID = UUID.randomUUID();
-        this.user = user;
-
-        exitLocation = WardrobeSettings.getLeaveLocation();
-        viewingLocation = WardrobeSettings.getViewerLocation();
-        npcLocation = WardrobeSettings.getWardrobeLocation();
-
-        wardrobeStatus = WardrobeStatus.SETUP;
-    }
-
     public UserWardrobeManager(CosmeticUser user, Location exitLocation, Location viewingLocation, Location npcLocation) {
         NPC_ID = NMSHandlers.getHandler().getNextEntityId();
         ARMORSTAND_ID = NMSHandlers.getHandler().getNextEntityId();
@@ -78,7 +68,7 @@ public class UserWardrobeManager {
         }
 
         user.hidePlayer();
-        List<Player> viewer = List.of(player);
+        List<Player> viewer = Collections.singletonList(player);
         List<Player> outsideViewers = PacketManager.getViewers(viewingLocation);
         outsideViewers.remove(player);
 
@@ -114,8 +104,8 @@ public class UserWardrobeManager {
 
             // Misc
             if (user.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
-                user.getUserBackpackManager().getArmorstand().teleport(npcLocation.clone().add(0, 2, 0));
+                user.getUserBackpackManager().getArmorStand().teleport(npcLocation.clone().add(0, 2, 0));
-                PacketManager.ridingMountPacket(NPC_ID, user.getUserBackpackManager().getFirstArmorstandId(), viewer);
+                PacketManager.ridingMountPacket(NPC_ID, user.getUserBackpackManager().getFirstArmorStandId(), viewer);
             }
 
             if (user.hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
@@ -162,7 +152,7 @@ public class UserWardrobeManager {
         setWardrobeStatus(WardrobeStatus.STOPPING);
         Player player = user.getPlayer();
 
-        List<Player> viewer = List.of(player);
+        List<Player> viewer = Collections.singletonList(player);
         List<Player> outsideViewers = PacketManager.getViewers(viewingLocation);
         outsideViewers.remove(player);
 
@@ -197,11 +187,7 @@ public class UserWardrobeManager {
                 //PacketManager.sendLeashPacket(VIEWER.getBalloonEntity().getPufferfishBalloonId(), player.getEntityId(), viewer);
             }
 
-            if (exitLocation == null) {
+            player.teleport(Objects.requireNonNullElseGet(exitLocation, () -> player.getWorld().getSpawnLocation()));
-                player.teleport(player.getWorld().getSpawnLocation());
-            } else {
-                player.teleport(exitLocation);
-            }
 
             if (WardrobeSettings.isEquipPumpkin()) {
                 NMSHandlers.getHandler().equipmentSlotUpdate(user.getPlayer().getEntityId(), EquipmentSlot.HEAD, player.getInventory().getHelmet(), viewer);
@@ -213,6 +199,13 @@ public class UserWardrobeManager {
                 target.hideBossBar(bossBar);
             }
 
+            // For Wardrobe Temp Cosmetics
+            for (Cosmetic cosmetic : user.getCosmetic()) {
+                if (cosmetic.requiresPermission()) {
+                    if (!player.hasPermission(cosmetic.getPermission())) user.removeCosmeticSlot(cosmetic.getSlot());
+                }
+            }
+
             user.updateCosmetic();
         };
         run.run();
@@ -224,15 +217,16 @@ public class UserWardrobeManager {
         BukkitRunnable runnable = new BukkitRunnable() {
             @Override
             public void run() {
-                if (active == false || user.getPlayer() == null) {
+                Player player = user.getPlayer();
+                if (!active || player == null) {
                     MessagesUtil.sendDebugMessages("Active is false");
                     this.cancel();
                     return;
                 }
                 MessagesUtil.sendDebugMessages("Update ");
-                List<Player> viewer = List.of(user.getPlayer());
+                List<Player> viewer = Collections.singletonList(player);
                 List<Player> outsideViewers = PacketManager.getViewers(viewingLocation);
-                outsideViewers.remove(user.getPlayer());
+                outsideViewers.remove(player);
 
                 Location location = WardrobeSettings.getWardrobeLocation().clone();
                 int yaw = data.get();
@@ -251,10 +245,10 @@ public class UserWardrobeManager {
                 }
 
                 if (user.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
-                    PacketManager.sendTeleportPacket(user.getUserBackpackManager().getFirstArmorstandId(), location, false, viewer);
+                    PacketManager.sendTeleportPacket(user.getUserBackpackManager().getFirstArmorStandId(), location, false, viewer);
-                    PacketManager.ridingMountPacket(NPC_ID, user.getUserBackpackManager().getFirstArmorstandId(), viewer);
+                    PacketManager.ridingMountPacket(NPC_ID, user.getUserBackpackManager().getFirstArmorStandId(), viewer);
-                    user.getUserBackpackManager().getArmorstand().setRotation(nextyaw, 0);
+                    user.getUserBackpackManager().getArmorStand().setRotation(nextyaw, 0);
-                    PacketManager.sendEntityDestroyPacket(user.getUserBackpackManager().getFirstArmorstandId(), outsideViewers);
+                    PacketManager.sendEntityDestroyPacket(user.getUserBackpackManager().getFirstArmorStandId(), outsideViewers);
                 }
 
                 if (user.hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
@@ -274,7 +268,7 @@ public class UserWardrobeManager {
         runnable.runTaskTimer(HMCCosmeticsPlugin.getInstance(), 0, 2);
     }
 
-    public int getArmorstandId() {
+    public int getCameraId() {
         return ARMORSTAND_ID;
     }
 

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

@@ -3,6 +3,8 @@ package com.hibiscusmc.hmccosmetics.util;
 import com.comphenix.protocol.wrappers.EnumWrappers;
 import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
 import org.bukkit.inventory.EquipmentSlot;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class InventoryUtils {
@@ -58,6 +60,8 @@ public class InventoryUtils {
         };
     }
 
+    @Contract(pure = true)
+    @Nullable
     public static CosmeticSlot BukkitCosmeticSlot(int slot) {
         switch (slot) {
             case 36 -> {
@@ -81,6 +85,8 @@ public class InventoryUtils {
         }
     }
 
+    @Contract(pure = true)
+    @Nullable
     public static CosmeticSlot NMSCosmeticSlot(int slot) {
         switch (slot) {
             case 5 -> {
@@ -104,7 +110,9 @@ public class InventoryUtils {
         }
     }
 
-    public static EquipmentSlot getEquipmentSlot(CosmeticSlot slot) {
+    @Contract(pure = true)
+    @Nullable
+    public static EquipmentSlot getEquipmentSlot(@NotNull CosmeticSlot slot) {
         switch (slot) {
             case HELMET -> {
                 return EquipmentSlot.HEAD;

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

@@ -15,6 +15,8 @@ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import net.kyori.adventure.title.Title;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.configurate.ConfigurationNode;
 
 import java.time.Duration;
@@ -24,9 +26,9 @@ import java.util.logging.Level;
 public class MessagesUtil {
 
     private static String prefix;
-    private static HashMap<String, String> messages = new HashMap<>();
+    private static final HashMap<String, String> messages = new HashMap<>();
 
-    public static void setup(ConfigurationNode config) {
+    public static void setup(@NotNull ConfigurationNode config) {
         prefix = config.node("prefix").getString("");
         for (ConfigurationNode node : config.childrenMap().values()) {
             if (node.virtual()) continue;
@@ -35,7 +37,7 @@ public class MessagesUtil {
         }
      }
 
-    public static void sendMessage(CosmeticUser user, String key) {
+    public static void sendMessage(@NotNull CosmeticUser user, String key) {
         sendMessage(user.getPlayer(), key);
     }
 
@@ -92,6 +94,7 @@ public class MessagesUtil {
         return processString(player, key, null);
     }
 
+    @Nullable
     public static Component processString(Player player, String key, TagResolver placeholders) {
         if (!messages.containsKey(key)) return null;
         if (messages.get(key) == null) return null;
@@ -104,14 +107,17 @@ public class MessagesUtil {
         return Adventure.MINI_MESSAGE.deserialize(message);
     }
 
+    @NotNull
     public static Component processStringNoKey(String message) {
         return processStringNoKey(null, message, null);
     }
 
+    @NotNull
     public static Component processStringNoKey(Player player, String message) {
         return processStringNoKey(player, message, null);
     }
 
+    @NotNull
     public static Component processStringNoKey(Player player, String message, TagResolver placeholders) {
         message = message.replaceAll("%prefix%", prefix);
         if (Hooks.isActiveHook("PlaceholderAPI") && player != null) message = PlaceholderAPI.setPlaceholders(player, message);

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

@@ -6,12 +6,15 @@ import com.hibiscusmc.hmccosmetics.config.Settings;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class PlayerUtils {
 
+    @Nullable
     public static WrappedSignedProperty getSkin(Player player) {
         WrappedSignedProperty skinData = WrappedGameProfile.fromPlayer(player).getProperties()
                 .get("textures").stream().findAny().orElse(null);
@@ -22,11 +25,13 @@ public class PlayerUtils {
         return new WrappedSignedProperty("textures", skinData.getValue(), skinData.getSignature());
     }
 
-    public static List<Player> getNearbyPlayers(Player player) {
+    @NotNull
+    public static List<Player> getNearbyPlayers(@NotNull Player player) {
         return getNearbyPlayers(player.getLocation());
     }
 
-    public static List<Player> getNearbyPlayers(Location location) {
+    @NotNull
+    public static List<Player> getNearbyPlayers(@NotNull Location location) {
         List<Player> players = new ArrayList<>();
         int viewDistance = Settings.getViewDistance();
         for (Entity entity : location.getWorld().getNearbyEntities(location, viewDistance, viewDistance, viewDistance)) {

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

@@ -6,6 +6,7 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.LeatherArmorMeta;
 import org.bukkit.inventory.meta.PotionMeta;
+import org.jetbrains.annotations.NotNull;
 
 public class ColorBuilder {
 
@@ -13,7 +14,7 @@ public class ColorBuilder {
         return canBeColored(new ItemStack(material));
     }
 
-    public static boolean canBeColored(final ItemStack itemStack) {
+    public static boolean canBeColored(final @NotNull ItemStack itemStack) {
         final ItemMeta itemMeta = itemStack.getItemMeta();
 
         return (itemMeta instanceof LeatherArmorMeta ||

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

@@ -8,6 +8,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,7 +35,7 @@ public class ItemBuilder {
      * @param itemStack builder ItemStack
      */
 
-    ItemBuilder(final ItemStack itemStack) {
+    ItemBuilder(final @NotNull ItemStack itemStack) {
         this.material = itemStack.getType();
         this.itemMeta = itemStack.hasItemMeta() ? itemStack.getItemMeta()
                 : Bukkit.getItemFactory().getItemMeta(this.material);
@@ -44,6 +46,8 @@ public class ItemBuilder {
      * @return
      */
 
+    @Contract("_ -> new")
+    @NotNull
     public static ItemBuilder from(final Material material) {
         return new ItemBuilder(material);
     }
@@ -52,7 +56,8 @@ public class ItemBuilder {
      * @param itemStack builder ItemStack
      * @return
      */
-
+    @Contract("_ -> new")
+    @NotNull
     public static ItemBuilder from(final ItemStack itemStack) {
         return new ItemBuilder(itemStack);
     }

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

@@ -6,6 +6,7 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataType;
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jetbrains.annotations.NotNull;
 
 public class Keys {
 
@@ -13,7 +14,7 @@ public class Keys {
     public static final NamespacedKey ITEM_KEY = new NamespacedKey(plugin, "cosmetic");
     public static final NamespacedKey TOKEN_KEY = new NamespacedKey(plugin, "token-key");
 
-    public static void setKey(final ItemStack itemStack) {
+    public static void setKey(final @NotNull ItemStack itemStack) {
         final ItemMeta itemMeta = itemStack.getItemMeta();
 
         if (itemMeta == null) {
@@ -26,7 +27,7 @@ public class Keys {
     }
 
     public static <T, Z> void setKey(
-            final ItemStack itemStack,
+            final @NotNull ItemStack itemStack,
             final NamespacedKey key,
             final PersistentDataType<T, Z> type,
             final Z value) {
@@ -41,7 +42,7 @@ public class Keys {
         itemStack.setItemMeta(itemMeta);
     }
 
-    public static boolean hasKey(final ItemStack itemStack) {
+    public static boolean hasKey(final @NotNull ItemStack itemStack) {
         final ItemMeta itemMeta = itemStack.getItemMeta();
 
         if (itemMeta == null) {
@@ -51,7 +52,7 @@ public class Keys {
         return itemMeta.getPersistentDataContainer().has(ITEM_KEY, PersistentDataType.BYTE);
     }
 
-    public static <T, Z> boolean hasKey(final ItemStack itemStack, final NamespacedKey key, final PersistentDataType<T, Z> type) {
+    public static <T, Z> boolean hasKey(final @NotNull ItemStack itemStack, final NamespacedKey key, final PersistentDataType<T, Z> type) {
         final ItemMeta itemMeta = itemStack.getItemMeta();
 
         if (itemMeta == null) {
@@ -62,7 +63,7 @@ public class Keys {
     }
 
     @Nullable
-    public static <T, Z> Z getValue(final ItemStack itemStack, final NamespacedKey key, final PersistentDataType<T, Z> type) {
+    public static <T, Z> Z getValue(final @NotNull ItemStack itemStack, final NamespacedKey key, final PersistentDataType<T, Z> type) {
         final ItemMeta itemMeta = itemStack.getItemMeta();
 
         if (itemMeta == null) {

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

@@ -1,6 +1,7 @@
 package com.hibiscusmc.hmccosmetics.util.misc;
 
 import net.kyori.adventure.text.Component;
+import org.jetbrains.annotations.NotNull;
 
 public class StringUtils {
 
@@ -8,15 +9,17 @@ public class StringUtils {
      * @param parsed message to be parsed
      * @return MiniMessage parsed string
      */
-
+    @NotNull
     public static Component parse(final String parsed) {
         return Adventure.MINI_MESSAGE.deserialize(parsed);
     }
 
+    @NotNull
     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(" ");

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

@@ -29,7 +29,7 @@ public class Utils {
         return original;
     }
 
-    public static <T> T replaceIf(final @Nullable T original, final T replacement, final Predicate<T> predicate) {
+    public static <T> T replaceIf(final @Nullable T original, final T replacement, final @NotNull Predicate<T> predicate) {
         if (predicate.test(original)) return replacement;
         return original;
     }

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

@@ -22,6 +22,7 @@ import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -31,11 +32,11 @@ import java.util.UUID;
 public class PacketManager extends BasePacket {
 
     public static void sendEntitySpawnPacket(
-            final Location location,
+            final @NotNull Location location,
             final int entityId,
             final EntityType entityType,
             final UUID uuid,
-            final List<Player> sendTo
+            final @NotNull List<Player> sendTo
     ) {
         PacketContainer packet = new PacketContainer(PacketType.Play.Server.SPAWN_ENTITY);
         packet.getModifier().writeDefaults();
@@ -64,7 +65,7 @@ public class PacketManager extends BasePacket {
     public static void ridingMountPacket(
             int mountId,
             int passengerId,
-            List<Player> sendTo
+            @NotNull List<Player> sendTo
     ) {
         PacketContainer packet = new PacketContainer(PacketType.Play.Server.MOUNT);
         packet.getIntegers().write(0, mountId);
@@ -84,7 +85,7 @@ public class PacketManager extends BasePacket {
         }
     }
     public static void equipmentSlotUpdate(
-            Player player,
+            @NotNull Player player,
             CosmeticSlot cosmetic,
             List<Player> sendTo
     ) {
@@ -111,7 +112,7 @@ public class PacketManager extends BasePacket {
     }
 
     public static void armorStandMetaPacket(
-            Entity entity,
+            @NotNull Entity entity,
             List<Player> sendTo
     ) {
         PacketContainer packet = new PacketContainer(PacketType.Play.Server.ENTITY_METADATA);
@@ -147,9 +148,9 @@ public class PacketManager extends BasePacket {
     }
 
     public static void sendLookPacket(
-             int entityId,
+            int entityId,
-             Location location,
+            @NotNull Location location,
-             List<Player> sendTo
+            @NotNull List<Player> sendTo
     ) {
         PacketContainer packet = new PacketContainer(PacketType.Play.Server.ENTITY_HEAD_ROTATION);
         packet.getIntegers().write(0, entityId);
@@ -166,10 +167,10 @@ public class PacketManager extends BasePacket {
     }
 
     public static void sendRotationPacket(
-             int entityId,
+            int entityId,
-             Location location,
+            @NotNull Location location,
-             boolean onGround,
+            boolean onGround,
-             List<Player> sendTo
+            @NotNull List<Player> sendTo
     ) {
         float ROTATION_FACTOR = 256.0F / 360.0F;
         float yaw = location.getYaw() * ROTATION_FACTOR;
@@ -188,7 +189,7 @@ public class PacketManager extends BasePacket {
             int entityId,
             int yaw,
             boolean onGround,
-            List<Player> sendTo
+            @NotNull List<Player> sendTo
     ) {
         float ROTATION_FACTOR = 256.0F / 360.0F;
         float yaw2 = yaw * ROTATION_FACTOR;
@@ -225,7 +226,7 @@ public class PacketManager extends BasePacket {
     public static void sendRidingPacket(
             final int mountId,
             final int passengerId,
-            final List<Player> sendTo
+            final @NotNull List<Player> sendTo
     ) {
         PacketContainer packet = new PacketContainer(PacketType.Play.Server.MOUNT);
         packet.getIntegers().write(0, mountId);
@@ -240,7 +241,7 @@ public class PacketManager extends BasePacket {
      * @param entityId The entity to delete for a player
      * @param sendTo The players the packet should be sent to
      */
-    public static void sendEntityDestroyPacket(final int entityId, List<Player> sendTo) {
+    public static void sendEntityDestroyPacket(final int entityId, @NotNull List<Player> sendTo) {
         PacketContainer packet = new PacketContainer(PacketType.Play.Server.ENTITY_DESTROY);
         packet.getModifier().write(0, new IntArrayList(new int[]{entityId}));
         for (final Player p : sendTo) sendPacket(p, packet);
@@ -251,7 +252,7 @@ public class PacketManager extends BasePacket {
      * @param entityId The Entity ID that camera will go towards
      * @param sendTo The players that will be sent this packet
      */
-    public static void sendCameraPacket(final int entityId, List<Player> sendTo) {
+    public static void sendCameraPacket(final int entityId, @NotNull List<Player> sendTo) {
         PacketContainer packet = new PacketContainer(PacketType.Play.Server.CAMERA);
         packet.getIntegers().write(0, entityId);
         for (final Player p : sendTo) sendPacket(p, packet);
@@ -266,10 +267,10 @@ public class PacketManager extends BasePacket {
      * @param sendTo Who should it send the packet to?
      */
     public static void sendFakePlayerSpawnPacket(
-            final Location location,
+            final @NotNull Location location,
             final UUID uuid,
             final int entityId,
-            final List<Player> sendTo
+            final @NotNull List<Player> sendTo
     ) {
         WrapperPlayServerNamedEntitySpawn wrapper = new WrapperPlayServerNamedEntitySpawn();
         wrapper.setEntityID(entityId);
@@ -326,7 +327,7 @@ public class PacketManager extends BasePacket {
      */
     public static void sendPlayerOverlayPacket(
             final int playerId,
-            final List<Player> sendTo
+            final @NotNull List<Player> sendTo
     ) {
         /*
         0x01 = Is on fire
@@ -398,7 +399,7 @@ public class PacketManager extends BasePacket {
     public static void sendLeashPacket(
             final int leashedEntity,
             final int entityId,
-            final List<Player> sendTo
+            final @NotNull List<Player> sendTo
     ) {
         PacketContainer packet = new PacketContainer(PacketType.Play.Server.ATTACH_ENTITY);
         packet.getIntegers().write(0, leashedEntity);
@@ -417,9 +418,9 @@ public class PacketManager extends BasePacket {
      */
     public static void sendTeleportPacket(
             final int entityId,
-            final Location location,
+            final @NotNull Location location,
             boolean onGround,
-            final List<Player> sendTo
+            final @NotNull List<Player> sendTo
     ) {
         PacketContainer packet = new PacketContainer(PacketType.Play.Server.ENTITY_TELEPORT);
         packet.getIntegers().write(0, entityId);
@@ -444,10 +445,10 @@ public class PacketManager extends BasePacket {
      */
     public static void sendMovePacket(
             final int entityId,
-            final Location from,
+            final @NotNull Location from,
-            final Location to,
+            final @NotNull Location to,
             final boolean onGround,
-            List<Player> sendTo
+            @NotNull List<Player> sendTo
     ) {
         PacketContainer packet = new PacketContainer(PacketType.Play.Server.REL_ENTITY_MOVE);
         WrapperPlayServerRelEntityMove wrapper = new WrapperPlayServerRelEntityMove(packet);
@@ -470,6 +471,7 @@ public class PacketManager extends BasePacket {
         sendMovePacket(entityId, from, to, onGround, getViewers(to));
     }
 
+    @NotNull
     public static List<Player> getViewers(Location location) {
         ArrayList<Player> viewers = new ArrayList();
         if (Settings.getViewDistance() <= 0) {

common/src/main/java/com/hibiscusmc/hmccosmetics/util/packets/wrappers/WrapperPlayServerNamedEntitySpawn.java

@@ -6,6 +6,7 @@ import com.comphenix.protocol.events.PacketEvent;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
 import org.bukkit.util.Vector;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.UUID;
 
@@ -58,7 +59,7 @@ public class WrapperPlayServerNamedEntitySpawn extends AbstractPacket {
      * @param event - the packet event.
      * @return The spawned entity.
      */
-    public Entity getEntity(PacketEvent event) {
+    public Entity getEntity(@NotNull PacketEvent event) {
         return getEntity(event.getPlayer().getWorld());
     }
 
@@ -96,7 +97,7 @@ public class WrapperPlayServerNamedEntitySpawn extends AbstractPacket {
      *
      * @param position - the new position.
      */
-    public void setPosition(Vector position) {
+    public void setPosition(@NotNull Vector position) {
         setX(position.getX());
         setY(position.getY());
         setZ(position.getZ());

common/src/main/java/com/hibiscusmc/hmccosmetics/util/packets/wrappers/WrapperPlayServerRelEntityMove.java

@@ -5,6 +5,7 @@ import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
+import org.jetbrains.annotations.NotNull;
 
 public class WrapperPlayServerRelEntityMove extends AbstractPacket {
     public static final PacketType TYPE =
@@ -55,7 +56,7 @@ public class WrapperPlayServerRelEntityMove extends AbstractPacket {
      * @param event - the packet event.
      * @return The spawned entity.
      */
-    public Entity getEntity(PacketEvent event) {
+    public Entity getEntity(@NotNull PacketEvent event) {
         return getEntity(event.getPlayer().getWorld());
     }
 

common/src/main/resources/config.yml

@@ -35,7 +35,7 @@ cosmetic-settings:
     y: 3
     z: 0.5
 dye-menu:
-  # If you use ItemsAdder, set this to "§f:offset_-8::cosmetics_gui:"
+  # If you use ItemsAdder, set this to "§f:offset_-8::dye_menu:"
   # If you use Oraxen, set this to "<glyph:neg_shift_8><glyph:dye_menu>"
   title: "§f"
   input-slot: 19

v1_17_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_17_R1/HMCArmorStand.java

@@ -5,13 +5,13 @@ import net.minecraft.world.level.Level;
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.v1_17_R1.CraftWorld;
 
-public class InvisibleArmorstand extends ArmorStand {
+public class HMCArmorStand extends ArmorStand {
 
-    public InvisibleArmorstand(Level world, double x, double y, double z) {
+    public HMCArmorStand(Level world, double x, double y, double z) {
         super(world, x, y, z);
     }
 
-    public InvisibleArmorstand(Location loc) {
+    public HMCArmorStand(Location loc) {
         super(((CraftWorld) loc.getWorld()).getHandle(), loc.getX(), loc.getY(), loc.getZ());
         this.setPos(loc.getX(), loc.getY(), loc.getZ());
         setInvisible(true);

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

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

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

@@ -64,9 +64,15 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
     }
 
     @Override
-    public org.bukkit.entity.Entity getInvisibleArmorstand(Location loc) {
+    public org.bukkit.entity.Entity getHMCArmorStand(Location loc) {
-        InvisibleArmorstand invisibleArmorstand = new InvisibleArmorstand(loc);
+        HMCArmorStand hmcArmorStand = new HMCArmorStand(loc);
-        return invisibleArmorstand.getBukkitEntity();
+        return hmcArmorStand.getBukkitEntity();
+    }
+
+    @Override
+    public org.bukkit.entity.Entity spawnHMCParticleCloud(Location location) {
+        HMCParticleCloud hmcParticleCloud = new HMCParticleCloud(location);
+        return hmcParticleCloud.getBukkitEntity();
     }
 
     @Override
@@ -76,7 +82,7 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
 
     @Override
     public org.bukkit.entity.Entity spawnBackpack(CosmeticUser user, CosmeticBackpackType cosmeticBackpackType) {
-        InvisibleArmorstand invisibleArmorstand = new InvisibleArmorstand(user.getPlayer().getLocation());
+        HMCArmorStand invisibleArmorstand = new HMCArmorStand(user.getPlayer().getLocation());
 
         ItemStack item = user.getUserCosmeticItem(cosmeticBackpackType);
 

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

@@ -5,13 +5,13 @@ import net.minecraft.world.level.Level;
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
 
-public class InvisibleArmorstand extends ArmorStand {
+public class HMCArmorStand extends ArmorStand {
 
-    public InvisibleArmorstand(Level world, double x, double y, double z) {
+    public HMCArmorStand(Level world, double x, double y, double z) {
         super(world, x, y, z);
     }
 
-    public InvisibleArmorstand(Location loc) {
+    public HMCArmorStand(Location loc) {
         super(((CraftWorld) loc.getWorld()).getHandle(), loc.getX(), loc.getY(), loc.getZ());
         this.setPos(loc.getX(), loc.getY(), loc.getZ());
         setInvisible(true);

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

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

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

@@ -66,9 +66,15 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
     }
 
     @Override
-    public org.bukkit.entity.Entity getInvisibleArmorstand(Location loc) {
+    public org.bukkit.entity.Entity getHMCArmorStand(Location loc) {
-        InvisibleArmorstand invisibleArmorstand = new InvisibleArmorstand(loc);
+        HMCArmorStand hmcArmorStand = new HMCArmorStand(loc);
-        return invisibleArmorstand.getBukkitEntity();
+        return hmcArmorStand.getBukkitEntity();
+    }
+
+    @Override
+    public org.bukkit.entity.Entity spawnHMCParticleCloud(Location location) {
+        HMCParticleCloud hmcParticleCloud = new HMCParticleCloud(location);
+        return hmcParticleCloud.getBukkitEntity();
     }
 
     @Override
@@ -78,7 +84,7 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
 
     @Override
     public org.bukkit.entity.Entity spawnBackpack(CosmeticUser user, CosmeticBackpackType cosmeticBackpackType) {
-        InvisibleArmorstand invisibleArmorstand = new InvisibleArmorstand(user.getPlayer().getLocation());
+        HMCArmorStand invisibleArmorstand = new HMCArmorStand(user.getPlayer().getLocation());
 
         ItemStack item = user.getUserCosmeticItem(cosmeticBackpackType);
 

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

@@ -5,13 +5,13 @@ import net.minecraft.world.level.Level;
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.v1_19_R1.CraftWorld;
 
-public class InvisibleArmorstand extends ArmorStand {
+public class HMCArmorStand extends ArmorStand {
 
-    public InvisibleArmorstand(Level world, double x, double y, double z) {
+    public HMCArmorStand(Level world, double x, double y, double z) {
         super(world, x, y, z);
     }
 
-    public InvisibleArmorstand(Location loc) {
+    public HMCArmorStand(Location loc) {
         super(((CraftWorld) loc.getWorld()).getHandle(), loc.getX(), loc.getY(), loc.getZ());
         this.setPos(loc.getX(), loc.getY(), loc.getZ());
         setInvisible(true);

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

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

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

@@ -66,9 +66,15 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
     }
 
     @Override
-    public org.bukkit.entity.Entity getInvisibleArmorstand(Location loc) {
+    public org.bukkit.entity.Entity getHMCArmorStand(Location loc) {
-        InvisibleArmorstand invisibleArmorstand = new InvisibleArmorstand(loc);
+        HMCArmorStand hmcArmorStand = new HMCArmorStand(loc);
-        return invisibleArmorstand.getBukkitEntity();
+        return hmcArmorStand.getBukkitEntity();
+    }
+
+    @Override
+    public org.bukkit.entity.Entity spawnHMCParticleCloud(Location location) {
+        HMCParticleCloud hmcParticleCloud = new HMCParticleCloud(location);
+        return hmcParticleCloud.getBukkitEntity();
     }
 
     @Override
@@ -78,16 +84,16 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
 
     @Override
     public org.bukkit.entity.Entity spawnBackpack(CosmeticUser user, CosmeticBackpackType cosmeticBackpackType) {
-        InvisibleArmorstand invisibleArmorstand = new InvisibleArmorstand(user.getPlayer().getLocation());
+        HMCArmorStand HMCArmorStand = new HMCArmorStand(user.getPlayer().getLocation());
 
         ItemStack item = user.getUserCosmeticItem(cosmeticBackpackType);
 
-        invisibleArmorstand.setItemSlot(EquipmentSlot.HEAD, CraftItemStack.asNMSCopy(item));
+        HMCArmorStand.setItemSlot(EquipmentSlot.HEAD, CraftItemStack.asNMSCopy(item));
-        ((CraftWorld) user.getPlayer().getWorld()).getHandle().addFreshEntity(invisibleArmorstand, CreatureSpawnEvent.SpawnReason.CUSTOM);
+        ((CraftWorld) user.getPlayer().getWorld()).getHandle().addFreshEntity(HMCArmorStand, CreatureSpawnEvent.SpawnReason.CUSTOM);
 
         MessagesUtil.sendDebugMessages("spawnBackpack NMS");
 
-        return invisibleArmorstand.getBukkitLivingEntity();
+        return HMCArmorStand.getBukkitLivingEntity();
         //PacketManager.armorStandMetaPacket(invisibleArmorstand.getBukkitEntity(), sentTo);
         //PacketManager.ridingMountPacket(player.getEntityId(), invisibleArmorstand.getId(), sentTo);
 

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

@@ -5,13 +5,13 @@ import net.minecraft.world.level.Level;
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.v1_19_R2.CraftWorld;
 
-public class InvisibleArmorstand extends ArmorStand {
+public class HMCArmorStand extends ArmorStand {
 
-    public InvisibleArmorstand(Level world, double x, double y, double z) {
+    public HMCArmorStand(Level world, double x, double y, double z) {
         super(world, x, y, z);
     }
 
-    public InvisibleArmorstand(Location loc) {
+    public HMCArmorStand(Location loc) {
         super(((CraftWorld) loc.getWorld()).getHandle(), loc.getX(), loc.getY(), loc.getZ());
         this.setPos(loc.getX(), loc.getY(), loc.getZ());
         setInvisible(true);

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

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

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

@@ -66,9 +66,15 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
     }
 
     @Override
-    public org.bukkit.entity.Entity getInvisibleArmorstand(Location loc) {
+    public org.bukkit.entity.Entity getHMCArmorStand(Location loc) {
-        InvisibleArmorstand invisibleArmorstand = new InvisibleArmorstand(loc);
+        HMCArmorStand hmcArmorStand = new HMCArmorStand(loc);
-        return invisibleArmorstand.getBukkitEntity();
+        return hmcArmorStand.getBukkitEntity();
+    }
+
+    @Override
+    public org.bukkit.entity.Entity spawnHMCParticleCloud(Location location) {
+        HMCParticleCloud hmcParticleCloud = new HMCParticleCloud(location);
+        return hmcParticleCloud.getBukkitEntity();
     }
 
     @Override
@@ -78,7 +84,7 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
 
     @Override
     public org.bukkit.entity.Entity spawnBackpack(CosmeticUser user, CosmeticBackpackType cosmeticBackpackType) {
-        InvisibleArmorstand invisibleArmorstand = new InvisibleArmorstand(user.getPlayer().getLocation());
+        HMCArmorStand invisibleArmorstand = new HMCArmorStand(user.getPlayer().getLocation());
 
         ItemStack item = user.getUserCosmeticItem(cosmeticBackpackType);