diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java index 09afbd79..46f65cd7 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java @@ -28,7 +28,6 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; -import java.util.List; import java.util.Set; public class CosmeticCommand implements CommandExecutor { @@ -333,7 +332,7 @@ public class CosmeticCommand implements CommandExecutor { if (user.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) { player.sendMessage("Backpack Location -> " + user.getUserBackpackManager().getArmorStand().getLocation()); } - player.sendMessage("Cosmetics -> " + user.getCosmetic()); + player.sendMessage("Cosmetics -> " + user.getCosmetics()); player.sendMessage("EntityId -> " + player.getEntityId()); return true; } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommandTabComplete.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommandTabComplete.java index 873f3f99..563e79ed 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommandTabComplete.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommandTabComplete.java @@ -56,7 +56,7 @@ public class CosmeticCommandTabComplete implements TabCompleter { completions.addAll(applyCommandComplete(user, args)); } case "unapply" -> { - for (Cosmetic cosmetic : user.getCosmetic()) { + for (Cosmetic cosmetic : user.getCosmetics()) { completions.add(cosmetic.getSlot().toString().toUpperCase()); } completions.add("ALL"); diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/Data.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/Data.java index 9f0f7899..d1974f09 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/Data.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/Data.java @@ -37,7 +37,7 @@ public abstract class Data { data = "HIDDEN=" + user.getHiddenReason(); } } - for (Cosmetic cosmetic : user.getCosmetic()) { + for (Cosmetic cosmetic : user.getCosmetics()) { Color color = user.getCosmeticColor(cosmetic.getSlot()); String input = cosmetic.getSlot() + "=" + cosmetic.getId(); if (color != null) input = input + "&" + color.asRGB(); diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java index d0d75f96..a3e73263 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java @@ -347,7 +347,7 @@ public class PlayerGameListener implements Listener { HashMap items = new HashMap<>(); - for (Cosmetic cosmetic : user.getCosmetic()) { + for (Cosmetic cosmetic : user.getCosmetics()) { if ((cosmetic instanceof CosmeticArmorType cosmeticArmorType)) { items.put(InventoryUtils.getPacketArmorSlot(cosmeticArmorType.getEquipSlot()), user.getUserCosmeticItem(cosmeticArmorType)); } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java index a975d4a3..702bcebc 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java @@ -1,5 +1,7 @@ package com.hibiscusmc.hmccosmetics.user; +import com.google.common.collect.ImmutableCollection; +import com.google.common.collect.ImmutableList; import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin; import com.hibiscusmc.hmccosmetics.api.*; import com.hibiscusmc.hmccosmetics.config.Settings; @@ -77,10 +79,15 @@ public class CosmeticUser { return playerCosmetics.get(slot); } + @Deprecated public Collection getCosmetic() { return playerCosmetics.values(); } + public ImmutableCollection getCosmetics() { + return ImmutableList.copyOf(playerCosmetics.values()); + } + public void addPlayerCosmetic(Cosmetic cosmetic) { addPlayerCosmetic(cosmetic, null); } @@ -358,7 +365,7 @@ public class CosmeticUser { public List getDyeableSlots() { ArrayList dyableSlots = new ArrayList(); - for (Cosmetic cosmetic : getCosmetic()) { + for (Cosmetic cosmetic : getCosmetics()) { if (cosmetic.isDyable()) dyableSlots.add(cosmetic.getSlot()); } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserWardrobeManager.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserWardrobeManager.java index b50ffed4..a6dea78d 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserWardrobeManager.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserWardrobeManager.java @@ -200,7 +200,7 @@ public class UserWardrobeManager { } // For Wardrobe Temp Cosmetics - for (Cosmetic cosmetic : user.getCosmetic()) { + for (Cosmetic cosmetic : user.getCosmetics()) { if (cosmetic.requiresPermission()) { if (!player.hasPermission(cosmetic.getPermission())) user.removeCosmeticSlot(cosmetic.getSlot()); }