From 15234a904ff16ef25e0e6969ff6624dcb1488338 Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Fri, 22 Dec 2023 22:09:22 -0600 Subject: [PATCH] clean: remove barely used text emote feature --- .../hmccosmetics/nms/HMCCNMSHandler.java | 2 -- .../user/manager/UserEmoteManager.java | 3 +- .../nms/v1_18_R2/HMCCNMSHandler.java | 9 ------ .../nms/v1_19_R1/HMCCNMSHandler.java | 15 --------- .../hmccosmetics/nms/v1_19_R1/MEGEntity.java | 31 ------------------- .../nms/v1_19_R2/HMCCNMSHandler.java | 9 ------ .../nms/v1_19_R3/HMCCNMSHandler.java | 22 ------------- .../nms/v1_20_R1/HMCCNMSHandler.java | 22 ------------- .../nms/v1_20_R2/HMCCNMSHandler.java | 22 ------------- .../nms/v1_20_R3/HMCCNMSHandler.java | 22 ------------- 10 files changed, 2 insertions(+), 155 deletions(-) delete mode 100644 v1_19_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R1/MEGEntity.java diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/nms/HMCCNMSHandler.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/nms/HMCCNMSHandler.java index 7029c885..74d23d91 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/nms/HMCCNMSHandler.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/nms/HMCCNMSHandler.java @@ -12,8 +12,6 @@ import java.util.List; public interface HMCCNMSHandler { - Entity spawnDisplayEntity(Location location, String text); - void slotUpdate( Player player, int slot diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserEmoteManager.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserEmoteManager.java index 82d99568..663930fd 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserEmoteManager.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserEmoteManager.java @@ -49,7 +49,8 @@ public class UserEmoteManager { } // Show the text if (text != null && textEntity == null) { - textEntity = HMCCNMSHandlers.getHandler().spawnDisplayEntity(user.getPlayer().getLocation().add(0, 3, 0), text); + // removed in 2.7.0 + //textEntity = HMCCNMSHandlers.getHandler().spawnDisplayEntity(user.getPlayer().getLocation().add(0, 3, 0), text); } } catch (Exception e) { e.printStackTrace(); diff --git a/v1_18_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_18_R2/HMCCNMSHandler.java b/v1_18_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_18_R2/HMCCNMSHandler.java index 53a32498..1055197e 100644 --- a/v1_18_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_18_R2/HMCCNMSHandler.java +++ b/v1_18_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_18_R2/HMCCNMSHandler.java @@ -5,7 +5,6 @@ import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket; import net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket; import net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket; -import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.network.ServerPlayerConnection; import net.minecraft.world.entity.EquipmentSlot; @@ -13,13 +12,10 @@ import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.scores.PlayerTeam; import net.minecraft.world.scores.Team; import org.bukkit.Bukkit; -import org.bukkit.Location; import org.bukkit.craftbukkit.v1_18_R2.CraftEquipmentSlot; -import org.bukkit.craftbukkit.v1_18_R2.CraftServer; import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack; import org.bukkit.craftbukkit.v1_18_R2.scoreboard.CraftScoreboard; -import org.bukkit.entity.ArmorStand; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -30,11 +26,6 @@ import java.util.List; public class HMCCNMSHandler implements com.hibiscusmc.hmccosmetics.nms.HMCCNMSHandler { - @Override - public org.bukkit.entity.Entity spawnDisplayEntity(Location location, String text) { - return null; - } - @Override public void equipmentSlotUpdate( int entityId, diff --git a/v1_19_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R1/HMCCNMSHandler.java b/v1_19_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R1/HMCCNMSHandler.java index fed4ab62..80b66694 100644 --- a/v1_19_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R1/HMCCNMSHandler.java +++ b/v1_19_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R1/HMCCNMSHandler.java @@ -5,7 +5,6 @@ import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket; import net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket; import net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket; -import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.network.ServerPlayerConnection; import net.minecraft.world.entity.EquipmentSlot; @@ -13,13 +12,10 @@ import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.scores.PlayerTeam; import net.minecraft.world.scores.Team; import org.bukkit.Bukkit; -import org.bukkit.Location; import org.bukkit.craftbukkit.v1_19_R1.CraftEquipmentSlot; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack; import org.bukkit.craftbukkit.v1_19_R1.scoreboard.CraftScoreboard; -import org.bukkit.entity.ArmorStand; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -29,17 +25,6 @@ import java.util.HashMap; import java.util.List; public class HMCCNMSHandler implements com.hibiscusmc.hmccosmetics.nms.HMCCNMSHandler { - - @Override - public ArmorStand getMEGEntity(Location loc) { - return (ArmorStand) new MEGEntity(loc).getBukkitEntity(); - } - - @Override - public org.bukkit.entity.Entity spawnDisplayEntity(Location location, String text) { - return null; - } - @Override public void equipmentSlotUpdate( int entityId, diff --git a/v1_19_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R1/MEGEntity.java b/v1_19_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R1/MEGEntity.java deleted file mode 100644 index 4acf8fe9..00000000 --- a/v1_19_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R1/MEGEntity.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.hibiscusmc.hmccosmetics.nms.v1_19_R1; - -import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin; -import com.hibiscusmc.hmccosmetics.util.MessagesUtil; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.decoration.ArmorStand; -import org.bukkit.Location; -import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_19_R1.CraftWorld; -import org.bukkit.persistence.PersistentDataType; - -public class MEGEntity extends ArmorStand { - - public MEGEntity(Location loc) { - super(EntityType.ARMOR_STAND, ((CraftWorld) loc.getWorld()).getHandle()); - this.setPos(loc.getX(), loc.getY(), loc.getZ()); - - MessagesUtil.sendDebugMessages("Spawned MEGEntity at " + loc); - setInvisible(true); - setNoGravity(true); - setSilent(true); - setInvulnerable(true); - setSmall(true); - setMarker(true); - - persist = false; - getBukkitEntity().getPersistentDataContainer().set(new NamespacedKey(HMCCosmeticsPlugin.getInstance(), "cosmeticMob"), PersistentDataType.SHORT, Short.valueOf("1")); - - ((CraftWorld) loc.getWorld()).getHandle().addFreshEntity(this); - } -} diff --git a/v1_19_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R2/HMCCNMSHandler.java b/v1_19_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R2/HMCCNMSHandler.java index 5b6cfb39..e3b8fd3c 100644 --- a/v1_19_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R2/HMCCNMSHandler.java +++ b/v1_19_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R2/HMCCNMSHandler.java @@ -5,7 +5,6 @@ import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket; import net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket; import net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket; -import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.network.ServerPlayerConnection; import net.minecraft.world.entity.EquipmentSlot; @@ -13,13 +12,10 @@ import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.scores.PlayerTeam; import net.minecraft.world.scores.Team; import org.bukkit.Bukkit; -import org.bukkit.Location; import org.bukkit.craftbukkit.v1_19_R2.CraftEquipmentSlot; -import org.bukkit.craftbukkit.v1_19_R2.CraftServer; import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemStack; import org.bukkit.craftbukkit.v1_19_R2.scoreboard.CraftScoreboard; -import org.bukkit.entity.ArmorStand; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -30,11 +26,6 @@ import java.util.List; public class HMCCNMSHandler implements com.hibiscusmc.hmccosmetics.nms.HMCCNMSHandler { - @Override - public org.bukkit.entity.Entity spawnDisplayEntity(Location location, String text) { - return null; - } - @Override public void equipmentSlotUpdate( int entityId, diff --git a/v1_19_R3/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R3/HMCCNMSHandler.java b/v1_19_R3/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R3/HMCCNMSHandler.java index c319457c..c976de63 100644 --- a/v1_19_R3/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R3/HMCCNMSHandler.java +++ b/v1_19_R3/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R3/HMCCNMSHandler.java @@ -1,31 +1,22 @@ package com.hibiscusmc.hmccosmetics.nms.v1_19_R3; -import com.hibiscusmc.hmccosmetics.util.MessagesUtil; import com.mojang.datafixers.util.Pair; -import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket; import net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket; import net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket; -import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.network.ServerPlayerConnection; -import net.minecraft.world.entity.Display; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.scores.PlayerTeam; import net.minecraft.world.scores.Team; import org.bukkit.Bukkit; -import org.bukkit.Location; import org.bukkit.craftbukkit.v1_19_R3.CraftEquipmentSlot; -import org.bukkit.craftbukkit.v1_19_R3.CraftServer; -import org.bukkit.craftbukkit.v1_19_R3.CraftWorld; import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_19_R3.inventory.CraftItemStack; import org.bukkit.craftbukkit.v1_19_R3.scoreboard.CraftScoreboard; -import org.bukkit.entity.ArmorStand; import org.bukkit.entity.Player; -import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.inventory.ItemStack; import java.util.ArrayList; @@ -35,19 +26,6 @@ import java.util.List; public class HMCCNMSHandler implements com.hibiscusmc.hmccosmetics.nms.HMCCNMSHandler { - @Override - public org.bukkit.entity.Entity spawnDisplayEntity(Location location, String text) { - Display.TextDisplay entity = new Display.TextDisplay(net.minecraft.world.entity.EntityType.TEXT_DISPLAY, ((CraftWorld) location.getWorld()).getHandle()); - entity.setPos(location.getX(), location.getY(), location.getZ()); - entity.persist = false; - //entity.setText(net.minecraft.network.chat.Component.literal("TEST!")); - entity.setCustomNameVisible(true); - entity.setCustomName(Component.literal(text)); - MessagesUtil.sendDebugMessages("spawnDisplayEntity - " + entity); - ((CraftWorld) location.getWorld()).getHandle().addFreshEntity(entity, CreatureSpawnEvent.SpawnReason.CUSTOM); - return entity.getBukkitEntity(); - } - @Override public void equipmentSlotUpdate( int entityId, diff --git a/v1_20_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R1/HMCCNMSHandler.java b/v1_20_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R1/HMCCNMSHandler.java index b42a166d..e3b7f86a 100644 --- a/v1_20_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R1/HMCCNMSHandler.java +++ b/v1_20_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R1/HMCCNMSHandler.java @@ -1,31 +1,22 @@ package com.hibiscusmc.hmccosmetics.nms.v1_20_R1; -import com.hibiscusmc.hmccosmetics.util.MessagesUtil; import com.mojang.datafixers.util.Pair; -import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket; import net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket; import net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket; -import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.network.ServerPlayerConnection; -import net.minecraft.world.entity.Display; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.scores.PlayerTeam; import net.minecraft.world.scores.Team; import org.bukkit.Bukkit; -import org.bukkit.Location; import org.bukkit.craftbukkit.v1_20_R1.CraftEquipmentSlot; -import org.bukkit.craftbukkit.v1_20_R1.CraftServer; -import org.bukkit.craftbukkit.v1_20_R1.CraftWorld; import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftItemStack; import org.bukkit.craftbukkit.v1_20_R1.scoreboard.CraftScoreboard; -import org.bukkit.entity.ArmorStand; import org.bukkit.entity.Player; -import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.inventory.ItemStack; import java.util.ArrayList; @@ -35,19 +26,6 @@ import java.util.List; public class HMCCNMSHandler implements com.hibiscusmc.hmccosmetics.nms.HMCCNMSHandler { - @Override - public org.bukkit.entity.Entity spawnDisplayEntity(Location location, String text) { - Display.TextDisplay entity = new Display.TextDisplay(net.minecraft.world.entity.EntityType.TEXT_DISPLAY, ((CraftWorld) location.getWorld()).getHandle()); - entity.setPos(location.getX(), location.getY(), location.getZ()); - entity.persist = false; - //entity.setText(net.minecraft.network.chat.Component.literal("TEST!")); - entity.setCustomNameVisible(true); - entity.setCustomName(Component.literal(text)); - MessagesUtil.sendDebugMessages("spawnDisplayEntity - " + entity); - ((CraftWorld) location.getWorld()).getHandle().addFreshEntity(entity, CreatureSpawnEvent.SpawnReason.CUSTOM); - return entity.getBukkitEntity(); - } - @Override public void equipmentSlotUpdate( int entityId, diff --git a/v1_20_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R2/HMCCNMSHandler.java b/v1_20_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R2/HMCCNMSHandler.java index ca4e47f5..b023ede8 100644 --- a/v1_20_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R2/HMCCNMSHandler.java +++ b/v1_20_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R2/HMCCNMSHandler.java @@ -1,31 +1,22 @@ package com.hibiscusmc.hmccosmetics.nms.v1_20_R2; -import com.hibiscusmc.hmccosmetics.util.MessagesUtil; import com.mojang.datafixers.util.Pair; -import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket; import net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket; import net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket; -import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.network.ServerPlayerConnection; -import net.minecraft.world.entity.Display; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.scores.PlayerTeam; import net.minecraft.world.scores.Team; import org.bukkit.Bukkit; -import org.bukkit.Location; import org.bukkit.craftbukkit.v1_20_R2.CraftEquipmentSlot; -import org.bukkit.craftbukkit.v1_20_R2.CraftServer; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack; import org.bukkit.craftbukkit.v1_20_R2.scoreboard.CraftScoreboard; -import org.bukkit.entity.ArmorStand; import org.bukkit.entity.Player; -import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.inventory.ItemStack; import java.util.ArrayList; @@ -35,19 +26,6 @@ import java.util.List; public class HMCCNMSHandler implements com.hibiscusmc.hmccosmetics.nms.HMCCNMSHandler { - @Override - public org.bukkit.entity.Entity spawnDisplayEntity(Location location, String text) { - Display.TextDisplay entity = new Display.TextDisplay(net.minecraft.world.entity.EntityType.TEXT_DISPLAY, ((CraftWorld) location.getWorld()).getHandle()); - entity.setPos(location.getX(), location.getY(), location.getZ()); - entity.persist = false; - //entity.setText(net.minecraft.network.chat.Component.literal("TEST!")); - entity.setCustomNameVisible(true); - entity.setCustomName(Component.literal(text)); - MessagesUtil.sendDebugMessages("spawnDisplayEntity - " + entity); - ((CraftWorld) location.getWorld()).getHandle().addFreshEntity(entity, CreatureSpawnEvent.SpawnReason.CUSTOM); - return entity.getBukkitEntity(); - } - @Override public void equipmentSlotUpdate( int entityId, diff --git a/v1_20_R3/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R3/HMCCNMSHandler.java b/v1_20_R3/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R3/HMCCNMSHandler.java index 1116fa39..aeb2552a 100644 --- a/v1_20_R3/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R3/HMCCNMSHandler.java +++ b/v1_20_R3/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R3/HMCCNMSHandler.java @@ -1,31 +1,22 @@ package com.hibiscusmc.hmccosmetics.nms.v1_20_R3; -import com.hibiscusmc.hmccosmetics.util.MessagesUtil; import com.mojang.datafixers.util.Pair; -import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket; import net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket; import net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket; -import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.network.ServerPlayerConnection; -import net.minecraft.world.entity.Display; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.scores.PlayerTeam; import net.minecraft.world.scores.Team; import org.bukkit.Bukkit; -import org.bukkit.Location; import org.bukkit.craftbukkit.v1_20_R3.CraftEquipmentSlot; -import org.bukkit.craftbukkit.v1_20_R3.CraftServer; -import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftItemStack; import org.bukkit.craftbukkit.v1_20_R3.scoreboard.CraftScoreboard; -import org.bukkit.entity.ArmorStand; import org.bukkit.entity.Player; -import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.inventory.ItemStack; import java.util.ArrayList; @@ -35,19 +26,6 @@ import java.util.List; public class HMCCNMSHandler implements com.hibiscusmc.hmccosmetics.nms.HMCCNMSHandler { - @Override - public org.bukkit.entity.Entity spawnDisplayEntity(Location location, String text) { - Display.TextDisplay entity = new Display.TextDisplay(net.minecraft.world.entity.EntityType.TEXT_DISPLAY, ((CraftWorld) location.getWorld()).getHandle()); - entity.setPos(location.getX(), location.getY(), location.getZ()); - entity.persist = false; - //entity.setText(net.minecraft.network.chat.Component.literal("TEST!")); - entity.setCustomNameVisible(true); - entity.setCustomName(Component.literal(text)); - MessagesUtil.sendDebugMessages("spawnDisplayEntity - " + entity); - ((CraftWorld) location.getWorld()).getHandle().addFreshEntity(entity, CreatureSpawnEvent.SpawnReason.CUSTOM); - return entity.getBukkitEntity(); - } - @Override public void equipmentSlotUpdate( int entityId,