From 20a3a508c25a2e7036313f27d5dd9a88bc53b174 Mon Sep 17 00:00:00 2001 From: Boy0000 Date: Tue, 11 Nov 2025 02:40:25 +0100 Subject: [PATCH] refactor: remove AttributeWrapper --- .../cosmetic/types/CosmeticBackpackType.java | 4 +--- .../user/manager/UserBackpackManager.java | 4 +--- .../user/manager/UserWardrobeManager.java | 3 +-- .../hmccosmetics/util/AttributeWrapper.java | 18 ------------------ 4 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 common/src/main/java/com/hibiscusmc/hmccosmetics/util/AttributeWrapper.java diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBackpackType.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBackpackType.java index 47d2cb1b..af412151 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBackpackType.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBackpackType.java @@ -7,7 +7,6 @@ import com.hibiscusmc.hmccosmetics.cosmetic.behavior.CosmeticUpdateBehavior; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import com.hibiscusmc.hmccosmetics.user.manager.UserBackpackManager; import com.hibiscusmc.hmccosmetics.user.manager.UserEntity; -import com.hibiscusmc.hmccosmetics.util.AttributeWrapper; import com.hibiscusmc.hmccosmetics.util.packets.HMCCPacketManager; import lombok.Getter; import me.lojosho.hibiscuscommons.util.packets.PacketManager; @@ -19,7 +18,6 @@ import org.bukkit.entity.Entity; 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.List; @@ -64,7 +62,7 @@ public class CosmeticBackpackType extends Cosmetic implements CosmeticUpdateBeha PacketManager.equipmentSlotUpdate(firstArmorStandId, EquipmentSlot.HEAD, user.getUserCosmeticItem(this, getItem()), newViewers); if (user.getPlayer() != null) { - AttributeInstance scaleAttribute = user.getPlayer().getAttribute(AttributeWrapper.SCALE); + AttributeInstance scaleAttribute = user.getPlayer().getAttribute(Attribute.SCALE); if (scaleAttribute != null) { HMCCPacketManager.sendEntityScalePacket(user.getUserBackpackManager().getFirstArmorStandId(), scaleAttribute.getValue(), newViewers); } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBackpackManager.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBackpackManager.java index 19204714..fa986487 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBackpackManager.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBackpackManager.java @@ -3,7 +3,6 @@ package com.hibiscusmc.hmccosmetics.user.manager; import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot; import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; -import com.hibiscusmc.hmccosmetics.util.AttributeWrapper; import com.hibiscusmc.hmccosmetics.util.MessagesUtil; import com.hibiscusmc.hmccosmetics.util.packets.HMCCPacketManager; import lombok.Getter; @@ -13,7 +12,6 @@ import org.bukkit.Material; import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeInstance; import org.bukkit.entity.Entity; -import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; @@ -61,7 +59,7 @@ public class UserBackpackManager { HMCCPacketManager.spawnInvisibleArmorstand(getFirstArmorStandId(), user.getEntity().getLocation(), UUID.randomUUID(), outsideViewers); if (user.getPlayer() != null) { - AttributeInstance scaleAttribute = user.getPlayer().getAttribute(AttributeWrapper.SCALE); + AttributeInstance scaleAttribute = user.getPlayer().getAttribute(Attribute.SCALE); if (scaleAttribute != null) { HMCCPacketManager.sendEntityScalePacket(getFirstArmorStandId(), scaleAttribute.getValue(), outsideViewers); } 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 002161db..d8f2d09d 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 @@ -10,7 +10,6 @@ import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType; import com.hibiscusmc.hmccosmetics.gui.Menu; import com.hibiscusmc.hmccosmetics.gui.Menus; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; -import com.hibiscusmc.hmccosmetics.util.AttributeWrapper; import com.hibiscusmc.hmccosmetics.util.HMCCInventoryUtils; import com.hibiscusmc.hmccosmetics.util.MessagesUtil; import com.hibiscusmc.hmccosmetics.util.HMCCServerUtils; @@ -144,7 +143,7 @@ public class UserWardrobeManager { HMCCPacketManager.sendPlayerOverlayPacket(NPC_ID, viewer); MessagesUtil.sendDebugMessages("Spawned Fake Player on " + npcLocation); NMSHandlers.getHandler().getPacketHandler().sendScoreboardHideNamePacket(player, npcName); - AttributeInstance scaleAttribute = user.getPlayer().getAttribute(AttributeWrapper.SCALE); + AttributeInstance scaleAttribute = user.getPlayer().getAttribute(Attribute.SCALE); if (scaleAttribute != null) { HMCCPacketManager.sendEntityScalePacket(NPC_ID, scaleAttribute.getValue(), viewer); } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/util/AttributeWrapper.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/util/AttributeWrapper.java deleted file mode 100644 index 3fb88326..00000000 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/util/AttributeWrapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hibiscusmc.hmccosmetics.util; - -import org.bukkit.attribute.Attribute; -import org.jetbrains.annotations.ApiStatus; - -public class AttributeWrapper { - @Deprecated - @ApiStatus.ScheduledForRemoval - public static Attribute SCALE; - - static { - try { - SCALE = Attribute.SCALE; - } catch (Exception e) { - SCALE = Attribute.valueOf("GENERIC_SCALE"); - } - } -}