From 2f9325b2fb0f059d39cead3adaef5bf014dd7460 Mon Sep 17 00:00:00 2001 From: Oak <55620516+OakLoaf@users.noreply.github.com> Date: Sat, 5 Jul 2025 22:15:01 +0100 Subject: [PATCH] Added scale attribute support to backpacks (#186) --- build.gradle.kts | 6 ++--- .../hmccosmetics/api/HMCCosmeticsAPI.java | 2 -- .../api/events/PlayerCosmeticEvent.java | 1 - .../cosmetic/CosmeticProvider.java | 2 -- .../cosmetic/types/CosmeticArmorType.java | 6 +++-- .../cosmetic/types/CosmeticBackpackType.java | 13 +++++++--- .../cosmetic/types/CosmeticMainhandType.java | 1 - .../hmccosmetics/database/types/Data.java | 2 -- .../hmccosmetics/database/types/SQLData.java | 1 - .../com/hibiscusmc/hmccosmetics/gui/Menu.java | 3 --- .../hibiscusmc/hmccosmetics/gui/Menus.java | 2 -- .../hmccosmetics/gui/special/DyeMenu.java | 1 - .../placeholders/HMCPlaceholderExpansion.java | 1 - .../hooks/worldguard/WGListener.java | 1 - .../packets/CosmeticPacketInterface.java | 24 +++++++++++++++++++ .../hmccosmetics/user/CosmeticUser.java | 2 -- .../user/manager/UserBackpackManager.java | 12 +++++++--- .../user/manager/UserBalloonPufferfish.java | 6 ----- .../hmccosmetics/user/manager/UserEntity.java | 1 - .../hmccosmetics/util/TranslationUtil.java | 1 - .../util/packets/HMCCPacketManager.java | 8 +++++++ 21 files changed, 58 insertions(+), 38 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3769d0b5..862077fc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -91,7 +91,7 @@ allprojects { compileOnly("io.github.toxicity188:BetterCommand:1.3") //BetterCommand library //compileOnly("it.unimi.dsi:fastutil:8.5.14") compileOnly("org.projectlombok:lombok:1.18.34") - compileOnly("me.lojosho:HibiscusCommons:0.7.0-9ced7fd8") + compileOnly("me.lojosho:HibiscusCommons:0.7.1-6c4e262c") // Handled by Spigot Library Loader compileOnly("net.kyori:adventure-api:4.23.0") @@ -106,7 +106,7 @@ allprojects { exclude("net.kyori") // Already have adventure API } implementation("com.owen1212055:particlehelper:1.0.0-SNAPSHOT") - implementation("com.ticxo.playeranimator:PlayerAnimator:R1.2.7") + implementation("com.ticxo.playeranimator:PlayerAnimator:R1.2.8") } tasks { @@ -303,4 +303,4 @@ fun getGitCommitHash(): String { } } return "" -} \ No newline at end of file +} diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/HMCCosmeticsAPI.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/HMCCosmeticsAPI.java index 0e340687..a97f7c95 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/HMCCosmeticsAPI.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/HMCCosmeticsAPI.java @@ -12,7 +12,6 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUserProvider; import com.hibiscusmc.hmccosmetics.user.CosmeticUsers; import me.lojosho.hibiscuscommons.nms.MinecraftVersion; import me.lojosho.hibiscuscommons.nms.NMSHandlers; -import me.lojosho.shaded.configurate.ConfigurationNode; import org.bukkit.Color; import org.bukkit.plugin.java.JavaPlugin; import org.jetbrains.annotations.NotNull; @@ -21,7 +20,6 @@ import org.jetbrains.annotations.Nullable; import java.util.List; import java.util.Map; import java.util.UUID; -import java.util.function.BiConsumer; /** * The main API class for HMCCosmetics. This class provides methods to interact with the plugin. diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticEvent.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticEvent.java index b39bf73e..ed0a9970 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticEvent.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticEvent.java @@ -1,7 +1,6 @@ package com.hibiscusmc.hmccosmetics.api.events; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; -import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; /** diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/CosmeticProvider.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/CosmeticProvider.java index 8e411023..97002e1d 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/CosmeticProvider.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/CosmeticProvider.java @@ -2,12 +2,10 @@ package com.hibiscusmc.hmccosmetics.cosmetic; import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin; import com.hibiscusmc.hmccosmetics.cosmetic.types.*; -import com.hibiscusmc.hmccosmetics.util.MessagesUtil; import lombok.extern.slf4j.Slf4j; import me.lojosho.shaded.configurate.ConfigurationNode; import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.util.Map; import java.util.function.BiFunction; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticArmorType.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticArmorType.java index 17905aa9..71cb6a90 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticArmorType.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticArmorType.java @@ -48,9 +48,11 @@ public class CosmeticArmorType extends Cosmetic { } public ItemStack getItem(@NotNull CosmeticUser user, ItemStack cosmeticItem) { - if (!(user.getEntity() instanceof HumanEntity humanEntity)) return null; + Player player = user.getPlayer(); + if (player == null) return null; + if (Settings.getSlotOption(equipSlot).isAddEnchantments()) { - ItemStack equippedItem = humanEntity.getInventory().getItem(equipSlot); + ItemStack equippedItem = player.getInventory().getItem(equipSlot); cosmeticItem.addUnsafeEnchantments(equippedItem.getEnchantments()); } // Basically, if force offhand is off AND there is no item in an offhand slot, then the equipment packet to add the cosmetic 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 89bf753d..c911fca3 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 @@ -5,13 +5,13 @@ import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic; 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.MessagesUtil; import com.hibiscusmc.hmccosmetics.util.packets.HMCCPacketManager; import lombok.Getter; import me.lojosho.hibiscuscommons.util.packets.PacketManager; import me.lojosho.shaded.configurate.ConfigurationNode; -import org.bukkit.Bukkit; import org.bukkit.Location; +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; @@ -22,7 +22,6 @@ import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import java.util.logging.Level; public class CosmeticBackpackType extends Cosmetic { @@ -65,6 +64,14 @@ public class CosmeticBackpackType extends Cosmetic { HMCCPacketManager.sendEntitySpawnPacket(entityLocation, firstArmorStandId, EntityType.ARMOR_STAND, UUID.randomUUID(), outsideViewers); HMCCPacketManager.sendArmorstandMetadata(firstArmorStandId, outsideViewers); + + if (user.getPlayer() != null) { + AttributeInstance scaleAttribute = user.getPlayer().getAttribute(Attribute.GENERIC_SCALE); + if (scaleAttribute != null) { + HMCCPacketManager.sendEntityScalePacket(user.getUserBackpackManager().getFirstArmorStandId(), scaleAttribute.getValue(), outsideViewers); + } + } + PacketManager.equipmentSlotUpdate(firstArmorStandId, EquipmentSlot.HEAD, user.getUserCosmeticItem(this, getItem()), outsideViewers); // If true, it will send the riding packet to all players. If false, it will send the riding packet only to new players if (Settings.isBackpackForceRidingEnabled()) HMCCPacketManager.sendRidingPacket(entity.getEntityId(), firstArmorStandId, entityManager.getViewers()); diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticMainhandType.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticMainhandType.java index 35bd7fe7..a382889a 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticMainhandType.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticMainhandType.java @@ -2,7 +2,6 @@ package com.hibiscusmc.hmccosmetics.cosmetic.types; import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; -import com.hibiscusmc.hmccosmetics.util.HMCCPlayerUtils; import com.hibiscusmc.hmccosmetics.util.packets.HMCCPacketManager; import me.lojosho.shaded.configurate.ConfigurationNode; import org.bukkit.entity.Player; 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 1b43d2c4..46e2f38d 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 @@ -1,6 +1,5 @@ package com.hibiscusmc.hmccosmetics.database.types; -import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin; import com.hibiscusmc.hmccosmetics.config.Settings; import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic; import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot; @@ -9,7 +8,6 @@ import com.hibiscusmc.hmccosmetics.database.UserData; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; 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; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/SQLData.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/SQLData.java index de8274a0..1d0c1260 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/SQLData.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/SQLData.java @@ -6,7 +6,6 @@ import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot; import com.hibiscusmc.hmccosmetics.database.UserData; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import org.bukkit.Bukkit; -import org.bukkit.Color; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java index 4186c0e7..d2f6f5d3 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java @@ -14,21 +14,18 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import com.hibiscusmc.hmccosmetics.util.MessagesUtil; import dev.triumphteam.gui.builder.item.ItemBuilder; import dev.triumphteam.gui.components.GuiType; -import dev.triumphteam.gui.components.InventoryProvider; import dev.triumphteam.gui.guis.Gui; import dev.triumphteam.gui.guis.GuiItem; import lombok.Getter; import me.lojosho.hibiscuscommons.config.serializer.ItemSerializer; import me.lojosho.hibiscuscommons.hooks.Hooks; import me.lojosho.hibiscuscommons.util.AdventureUtils; -import me.lojosho.hibiscuscommons.util.StringUtils; import me.lojosho.shaded.configurate.ConfigurationNode; import me.lojosho.shaded.configurate.serialize.SerializationException; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; -import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menus.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menus.java index 2ee86a2b..b1ad8145 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menus.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menus.java @@ -3,8 +3,6 @@ package com.hibiscusmc.hmccosmetics.gui; import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin; import com.hibiscusmc.hmccosmetics.config.Settings; import com.hibiscusmc.hmccosmetics.util.MessagesUtil; -import lombok.Getter; -import lombok.Setter; import me.lojosho.shaded.configurate.CommentedConfigurationNode; import me.lojosho.shaded.configurate.ConfigurateException; import me.lojosho.shaded.configurate.yaml.YamlConfigurationLoader; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/special/DyeMenu.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/special/DyeMenu.java index 7bd00dec..f43d2608 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/special/DyeMenu.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/special/DyeMenu.java @@ -11,7 +11,6 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import me.lojosho.hibiscuscommons.hooks.Hooks; import me.lojosho.hibiscuscommons.nms.NMSHandlers; import me.lojosho.hibiscuscommons.util.AdventureUtils; -import me.lojosho.hibiscuscommons.util.StringUtils; import org.bukkit.Bukkit; import org.bukkit.Color; import org.bukkit.Material; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/placeholders/HMCPlaceholderExpansion.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/placeholders/HMCPlaceholderExpansion.java index b62ee62a..3616afb5 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/placeholders/HMCPlaceholderExpansion.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/placeholders/HMCPlaceholderExpansion.java @@ -9,7 +9,6 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUsers; import com.hibiscusmc.hmccosmetics.util.MessagesUtil; import com.hibiscusmc.hmccosmetics.util.TranslationUtil; import me.clip.placeholderapi.expansion.PlaceholderExpansion; -import org.apache.commons.lang3.EnumUtils; import org.bukkit.OfflinePlayer; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGListener.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGListener.java index 834018a1..29910b56 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGListener.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGListener.java @@ -20,7 +20,6 @@ import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.event.player.PlayerTeleportEvent; import org.jetbrains.annotations.NotNull; -import java.util.List; import java.util.Map; import java.util.Set; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/packets/CosmeticPacketInterface.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/packets/CosmeticPacketInterface.java index 57668216..6076c9ee 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/packets/CosmeticPacketInterface.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/packets/CosmeticPacketInterface.java @@ -8,9 +8,11 @@ import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticArmorType; import com.hibiscusmc.hmccosmetics.gui.Menu; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import com.hibiscusmc.hmccosmetics.user.CosmeticUsers; +import com.hibiscusmc.hmccosmetics.user.manager.UserBackpackManager; import com.hibiscusmc.hmccosmetics.user.manager.UserWardrobeManager; import com.hibiscusmc.hmccosmetics.util.HMCCInventoryUtils; import com.hibiscusmc.hmccosmetics.util.MessagesUtil; +import com.hibiscusmc.hmccosmetics.util.packets.HMCCPacketManager; import me.lojosho.hibiscuscommons.packets.PacketAction; import me.lojosho.hibiscuscommons.packets.PacketInterface; import me.lojosho.hibiscuscommons.packets.wrapper.*; @@ -149,6 +151,28 @@ public class CosmeticPacketInterface implements PacketInterface { */ } + @Override + public PacketAction readPlayerScale(@NotNull Player player, @NotNull PlayerScaleWrapper wrapper) { + int entityId = wrapper.getEntityId(); + Player changedPlayer = Bukkit.getOnlinePlayers().stream() + .filter(onlinePlayer -> onlinePlayer.getEntityId() == entityId) + .findFirst() + .orElse(null); + if (changedPlayer == null) return PacketAction.NOTHING; + + CosmeticUser cosmeticUser = CosmeticUsers.getUser(changedPlayer.getUniqueId()); + if (cosmeticUser == null || cosmeticUser.isInWardrobe()) return PacketAction.NOTHING; + + UserBackpackManager backpack = cosmeticUser.getUserBackpackManager(); + if (backpack != null) { + for (int cosmeticId : backpack.getEntityManager().getIds()) { + HMCCPacketManager.sendEntityScalePacket(cosmeticId, wrapper.getScale(), Collections.singletonList(player)); + } + } + + return PacketAction.NOTHING; + } + @Override public @NotNull PacketAction readInventoryClick(@NotNull Player player, @NotNull InventoryClickWrapper wrapper) { int clickType = wrapper.getClickType(); 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 df15c468..e84236b7 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java @@ -22,7 +22,6 @@ import com.hibiscusmc.hmccosmetics.user.manager.UserWardrobeManager; import com.hibiscusmc.hmccosmetics.util.HMCCInventoryUtils; import com.hibiscusmc.hmccosmetics.util.MessagesUtil; import com.hibiscusmc.hmccosmetics.util.packets.HMCCPacketManager; -import com.ticxo.modelengine.api.nms.NMSHandler; import lombok.Getter; import me.lojosho.hibiscuscommons.hooks.Hooks; import me.lojosho.hibiscuscommons.nms.NMSHandlers; @@ -30,7 +29,6 @@ import me.lojosho.hibiscuscommons.util.InventoryUtils; import me.lojosho.hibiscuscommons.util.packets.PacketManager; import org.bukkit.Bukkit; import org.bukkit.Color; -import org.bukkit.FireworkEffect; import org.bukkit.Material; import org.bukkit.entity.Entity; import org.bukkit.entity.HumanEntity; 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 3f544010..9ba9bd99 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 @@ -5,12 +5,12 @@ import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import com.hibiscusmc.hmccosmetics.util.MessagesUtil; import com.hibiscusmc.hmccosmetics.util.packets.HMCCPacketManager; -import com.ticxo.modelengine.api.ModelEngineAPI; import lombok.Getter; -import me.lojosho.hibiscuscommons.hooks.Hooks; import me.lojosho.hibiscuscommons.util.ServerUtils; import me.lojosho.hibiscuscommons.util.packets.PacketManager; 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; @@ -20,7 +20,6 @@ import org.bukkit.inventory.ItemStack; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import java.util.logging.Level; public class UserBackpackManager { @@ -59,6 +58,13 @@ public class UserBackpackManager { HMCCPacketManager.sendEntitySpawnPacket(user.getEntity().getLocation(), getFirstArmorStandId(), EntityType.ARMOR_STAND, UUID.randomUUID(), getEntityManager().getViewers()); HMCCPacketManager.sendArmorstandMetadata(getFirstArmorStandId(), outsideViewers); + if (user.getPlayer() != null) { + AttributeInstance scaleAttribute = user.getPlayer().getAttribute(Attribute.GENERIC_SCALE); + if (scaleAttribute != null) { + HMCCPacketManager.sendEntityScalePacket(getFirstArmorStandId(), scaleAttribute.getValue(), outsideViewers); + } + } + Entity entity = user.getEntity(); int[] passengerIDs = new int[entity.getPassengers().size() + 1]; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBalloonPufferfish.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBalloonPufferfish.java index fe57902c..14c65ce5 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBalloonPufferfish.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBalloonPufferfish.java @@ -1,17 +1,11 @@ package com.hibiscusmc.hmccosmetics.user.manager; -import com.hibiscusmc.hmccosmetics.user.CosmeticUser; -import com.hibiscusmc.hmccosmetics.user.CosmeticUsers; -import com.hibiscusmc.hmccosmetics.util.HMCCPlayerUtils; -import com.hibiscusmc.hmccosmetics.util.MessagesUtil; import com.hibiscusmc.hmccosmetics.util.packets.HMCCPacketManager; import lombok.Getter; -import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; -import java.util.ArrayList; import java.util.List; import java.util.UUID; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserEntity.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserEntity.java index ab0c765e..a6be6803 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserEntity.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserEntity.java @@ -3,7 +3,6 @@ package com.hibiscusmc.hmccosmetics.user.manager; import com.hibiscusmc.hmccosmetics.config.Settings; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import com.hibiscusmc.hmccosmetics.user.CosmeticUsers; -import com.hibiscusmc.hmccosmetics.util.HMCCPlayerUtils; import com.hibiscusmc.hmccosmetics.util.MessagesUtil; import com.hibiscusmc.hmccosmetics.util.packets.HMCCPacketManager; import lombok.Getter; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/util/TranslationUtil.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/util/TranslationUtil.java index a4ba7c73..094feb17 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/util/TranslationUtil.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/util/TranslationUtil.java @@ -1,6 +1,5 @@ package com.hibiscusmc.hmccosmetics.util; -import me.lojosho.hibiscuscommons.util.StringUtils; import me.lojosho.shaded.configurate.ConfigurationNode; import java.util.ArrayList; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/util/packets/HMCCPacketManager.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/util/packets/HMCCPacketManager.java index a22aa543..f7920999 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/util/packets/HMCCPacketManager.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/util/packets/HMCCPacketManager.java @@ -271,6 +271,14 @@ public class HMCCPacketManager extends PacketManager { NMSHandlers.getHandler().getPacketHandler().sendMovePacket(entityId, from, to, onGround, sendTo); } + public static void sendEntityScalePacket( + int entityId, + double scale, + List sendTo + ) { + NMSHandlers.getHandler().getPacketHandler().sendEntityScalePacket(entityId, scale, sendTo); + } + // For future transition to display entities public static void sendDisplayEntityMetadataPacket( int entityid,