From 0304c9ff44d6d9087704b00b982e4dceba4be114 Mon Sep 17 00:00:00 2001 From: Craftinators Date: Mon, 13 Mar 2023 08:59:23 -0400 Subject: [PATCH 1/5] fix(CosmeticUser): `getCosmetics()` changes --- .../hibiscusmc/hmccosmetics/command/CosmeticCommand.java | 3 +-- .../hmccosmetics/command/CosmeticCommandTabComplete.java | 2 +- .../com/hibiscusmc/hmccosmetics/database/types/Data.java | 2 +- .../hmccosmetics/listener/PlayerGameListener.java | 2 +- .../java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java | 6 +++--- .../hmccosmetics/user/manager/UserWardrobeManager.java | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) 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..e07e2538 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java @@ -77,8 +77,8 @@ public class CosmeticUser { return playerCosmetics.get(slot); } - public Collection getCosmetic() { - return playerCosmetics.values(); + public Collection getCosmetics() { + return Collections.unmodifiableCollection(playerCosmetics.values()); } public void addPlayerCosmetic(Cosmetic cosmetic) { @@ -358,7 +358,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()); } From 81d6583430696bf08ce810c27dce7128666dd428 Mon Sep 17 00:00:00 2001 From: Craftinators Date: Mon, 13 Mar 2023 09:02:17 -0400 Subject: [PATCH 2/5] fix(CosmeticUser): keep mutable collection --- .../java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e07e2538..45312dac 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java @@ -78,7 +78,7 @@ public class CosmeticUser { } public Collection getCosmetics() { - return Collections.unmodifiableCollection(playerCosmetics.values()); + return playerCosmetics.values(); } public void addPlayerCosmetic(Cosmetic cosmetic) { From 48b9d4fb41f90da3684418ab8040386818af3361 Mon Sep 17 00:00:00 2001 From: Craftinators Date: Mon, 13 Mar 2023 15:05:19 -0400 Subject: [PATCH 3/5] fix(CosmeticUser): add back `getCosmetic()` as deprecated method --- .../java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java | 5 +++++ 1 file changed, 5 insertions(+) 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 45312dac..54c35d74 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java @@ -77,6 +77,11 @@ public class CosmeticUser { return playerCosmetics.get(slot); } + @Deprecated + public Collection getCosmetic() { + return playerCosmetics.values(); + } + public Collection getCosmetics() { return playerCosmetics.values(); } From 178bff37f576b92b4d2d9411689a9dd75002e60e Mon Sep 17 00:00:00 2001 From: Craftinators Date: Mon, 13 Mar 2023 15:15:13 -0400 Subject: [PATCH 4/5] feat(CosmeticUser): new `getPlayerCosmetics()` --- .../java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java | 5 +++++ 1 file changed, 5 insertions(+) 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 54c35d74..408e0303 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,6 @@ package com.hibiscusmc.hmccosmetics.user; +import com.google.common.collect.ImmutableCollection; import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin; import com.hibiscusmc.hmccosmetics.api.*; import com.hibiscusmc.hmccosmetics.config.Settings; @@ -86,6 +87,10 @@ public class CosmeticUser { return playerCosmetics.values(); } + public ImmutableCollection getPlayerCosmetics() { + return (ImmutableCollection) playerCosmetics.values(); + } + public void addPlayerCosmetic(Cosmetic cosmetic) { addPlayerCosmetic(cosmetic, null); } From ac35ef8b5de3b25e633f0b29fe07455fabb0dc69 Mon Sep 17 00:00:00 2001 From: Craftinators Date: Mon, 13 Mar 2023 23:56:02 -0400 Subject: [PATCH 5/5] feat(CosmeticUser): preferred `getCosmetics` method --- .../com/hibiscusmc/hmccosmetics/user/CosmeticUser.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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 408e0303..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,6 +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; @@ -83,12 +84,8 @@ public class CosmeticUser { return playerCosmetics.values(); } - public Collection getCosmetics() { - return playerCosmetics.values(); - } - - public ImmutableCollection getPlayerCosmetics() { - return (ImmutableCollection) playerCosmetics.values(); + public ImmutableCollection getCosmetics() { + return ImmutableList.copyOf(playerCosmetics.values()); } public void addPlayerCosmetic(Cosmetic cosmetic) {