From 7fa3cd6cb77eef41e0e00207d847b896e102c7dd Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Sun, 27 Aug 2023 10:11:59 -0500 Subject: [PATCH] clean: removed unused NMS methods --- .../hmccosmetics/nms/NMSHandler.java | 10 ---- .../hmccosmetics/nms/v1_18_R2/NMSHandler.java | 54 ------------------ .../hmccosmetics/nms/v1_19_R1/NMSHandler.java | 54 ------------------ .../hmccosmetics/nms/v1_19_R2/NMSHandler.java | 55 ------------------- .../hmccosmetics/nms/v1_19_R3/NMSHandler.java | 54 ------------------ .../hmccosmetics/nms/v1_20_R1/NMSHandler.java | 54 ------------------ 6 files changed, 281 deletions(-) diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/nms/NMSHandler.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/nms/NMSHandler.java index dc39cf32..0f2f1e01 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/nms/NMSHandler.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/nms/NMSHandler.java @@ -19,8 +19,6 @@ public interface NMSHandler { Entity getEntity(int entityId); - Entity getHMCArmorStand(Location loc); - ArmorStand getMEGEntity(Location loc); Entity spawnBackpack(CosmeticUser user, CosmeticBackpackType cosmeticBackpackType); @@ -29,14 +27,6 @@ public interface NMSHandler { UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType); - @Deprecated(since = "2.6.0") - void equipmentSlotUpdate( - int entityId, - CosmeticUser user, - CosmeticSlot cosmeticSlot, - List sendTo - ); - void slotUpdate( Player player, int slot diff --git a/v1_18_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_18_R2/NMSHandler.java b/v1_18_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_18_R2/NMSHandler.java index 899fc62e..8e6c6937 100644 --- a/v1_18_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_18_R2/NMSHandler.java +++ b/v1_18_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_18_R2/NMSHandler.java @@ -61,12 +61,6 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler { return null; } - @Override - public org.bukkit.entity.Entity getHMCArmorStand(Location loc) { - HMCArmorStand hmcArmorStand = new HMCArmorStand(loc); - return hmcArmorStand.getBukkitEntity(); - } - @Override public ArmorStand getMEGEntity(Location loc) { return (ArmorStand) new MEGEntity(loc).getBukkitEntity(); @@ -105,54 +99,6 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler { return userBalloonManager1; } - @Override - public void equipmentSlotUpdate( - int entityId, - CosmeticUser user, - CosmeticSlot cosmeticSlot, - List sendTo - ) { - - EquipmentSlot nmsSlot = null; - net.minecraft.world.item.ItemStack nmsItem = null; - - if (!(user.getCosmetic(cosmeticSlot) instanceof CosmeticArmorType)) { - - if (user.getCosmetic(cosmeticSlot) instanceof CosmeticMainhandType) { - CosmeticMainhandType cosmeticMainhandType = (CosmeticMainhandType) user.getCosmetic(CosmeticSlot.MAINHAND); - nmsItem = CraftItemStack.asNMSCopy(user.getUserCosmeticItem(cosmeticMainhandType)); - } else { - nmsItem = CraftItemStack.asNMSCopy(user.getPlayer().getInventory().getItem(InventoryUtils.getEquipmentSlot(cosmeticSlot))); - } - - nmsSlot = CraftEquipmentSlot.getNMS(InventoryUtils.getEquipmentSlot(cosmeticSlot)); - - if (nmsSlot == null) return; - - Pair pair = new Pair<>(nmsSlot, nmsItem); - - List> pairs = Collections.singletonList(pair); - - ClientboundSetEquipmentPacket packet = new ClientboundSetEquipmentPacket(entityId, pairs); - for (Player p : sendTo) sendPacket(p, packet); - return; - } - CosmeticArmorType cosmeticArmor = (CosmeticArmorType) user.getCosmetic(cosmeticSlot); - - // Converting EquipmentSlot and ItemStack to NMS ones. - nmsSlot = CraftEquipmentSlot.getNMS(cosmeticArmor.getEquipSlot()); - nmsItem = CraftItemStack.asNMSCopy(user.getUserCosmeticItem(cosmeticArmor)); - - if (nmsSlot == null) return; - - Pair pair = new Pair<>(nmsSlot, nmsItem); - - List> pairs = Collections.singletonList(pair); - - ClientboundSetEquipmentPacket packet = new ClientboundSetEquipmentPacket(entityId, pairs); - for (Player p : sendTo) sendPacket(p, packet); - } - @Override public void equipmentSlotUpdate( diff --git a/v1_19_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R1/NMSHandler.java b/v1_19_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R1/NMSHandler.java index 4287d987..c800b1ea 100644 --- a/v1_19_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R1/NMSHandler.java +++ b/v1_19_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R1/NMSHandler.java @@ -61,12 +61,6 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler { return null; } - @Override - public org.bukkit.entity.Entity getHMCArmorStand(Location loc) { - HMCArmorStand hmcArmorStand = new HMCArmorStand(loc); - return hmcArmorStand.getBukkitEntity(); - } - @Override public ArmorStand getMEGEntity(Location loc) { return (ArmorStand) new MEGEntity(loc).getBukkitEntity(); @@ -107,54 +101,6 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler { return userBalloonManager1; } - @Override - public void equipmentSlotUpdate( - int entityId, - CosmeticUser user, - CosmeticSlot cosmeticSlot, - List sendTo - ) { - - EquipmentSlot nmsSlot = null; - net.minecraft.world.item.ItemStack nmsItem = null; - - if (!(user.getCosmetic(cosmeticSlot) instanceof CosmeticArmorType)) { - - if (user.getCosmetic(cosmeticSlot) instanceof CosmeticMainhandType) { - CosmeticMainhandType cosmeticMainhandType = (CosmeticMainhandType) user.getCosmetic(CosmeticSlot.MAINHAND); - nmsItem = CraftItemStack.asNMSCopy(user.getUserCosmeticItem(cosmeticMainhandType)); - } else { - nmsItem = CraftItemStack.asNMSCopy(user.getPlayer().getInventory().getItem(InventoryUtils.getEquipmentSlot(cosmeticSlot))); - } - - nmsSlot = CraftEquipmentSlot.getNMS(InventoryUtils.getEquipmentSlot(cosmeticSlot)); - - if (nmsSlot == null) return; - - Pair pair = new Pair<>(nmsSlot, nmsItem); - - List> pairs = Collections.singletonList(pair); - - ClientboundSetEquipmentPacket packet = new ClientboundSetEquipmentPacket(entityId, pairs); - for (Player p : sendTo) sendPacket(p, packet); - return; - } - CosmeticArmorType cosmeticArmor = (CosmeticArmorType) user.getCosmetic(cosmeticSlot); - - // Converting EquipmentSlot and ItemStack to NMS ones. - nmsSlot = CraftEquipmentSlot.getNMS(cosmeticArmor.getEquipSlot()); - nmsItem = CraftItemStack.asNMSCopy(user.getUserCosmeticItem(cosmeticArmor)); - - if (nmsSlot == null) return; - - Pair pair = new Pair<>(nmsSlot, nmsItem); - - List> pairs = Collections.singletonList(pair); - - ClientboundSetEquipmentPacket packet = new ClientboundSetEquipmentPacket(entityId, pairs); - for (Player p : sendTo) sendPacket(p, packet); - } - @Override public void equipmentSlotUpdate( diff --git a/v1_19_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R2/NMSHandler.java b/v1_19_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R2/NMSHandler.java index a1f428b1..85b36eb4 100644 --- a/v1_19_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R2/NMSHandler.java +++ b/v1_19_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R2/NMSHandler.java @@ -61,12 +61,6 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler { return null; } - @Override - public org.bukkit.entity.Entity getHMCArmorStand(Location loc) { - HMCArmorStand hmcArmorStand = new HMCArmorStand(loc); - return hmcArmorStand.getBukkitEntity(); - } - @Override public ArmorStand getMEGEntity(Location loc) { return (ArmorStand) new MEGEntity(loc).getBukkitEntity(); @@ -106,55 +100,6 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler { return userBalloonManager1; } - @Override - public void equipmentSlotUpdate( - int entityId, - CosmeticUser user, - CosmeticSlot cosmeticSlot, - List sendTo - ) { - - EquipmentSlot nmsSlot = null; - net.minecraft.world.item.ItemStack nmsItem = null; - - if (!(user.getCosmetic(cosmeticSlot) instanceof CosmeticArmorType)) { - - if (user.getCosmetic(cosmeticSlot) instanceof CosmeticMainhandType) { - CosmeticMainhandType cosmeticMainhandType = (CosmeticMainhandType) user.getCosmetic(CosmeticSlot.MAINHAND); - nmsItem = CraftItemStack.asNMSCopy(user.getUserCosmeticItem(cosmeticMainhandType)); - } else { - nmsItem = CraftItemStack.asNMSCopy(user.getPlayer().getInventory().getItem(InventoryUtils.getEquipmentSlot(cosmeticSlot))); - } - - nmsSlot = CraftEquipmentSlot.getNMS(InventoryUtils.getEquipmentSlot(cosmeticSlot)); - - if (nmsSlot == null) return; - - Pair pair = new Pair<>(nmsSlot, nmsItem); - - List> pairs = Collections.singletonList(pair); - - ClientboundSetEquipmentPacket packet = new ClientboundSetEquipmentPacket(entityId, pairs); - for (Player p : sendTo) sendPacket(p, packet); - return; - } - CosmeticArmorType cosmeticArmor = (CosmeticArmorType) user.getCosmetic(cosmeticSlot); - - // Converting EquipmentSlot and ItemStack to NMS ones. - nmsSlot = CraftEquipmentSlot.getNMS(cosmeticArmor.getEquipSlot()); - nmsItem = CraftItemStack.asNMSCopy(user.getUserCosmeticItem(cosmeticArmor)); - - if (nmsSlot == null) return; - - Pair pair = new Pair<>(nmsSlot, nmsItem); - - List> pairs = Collections.singletonList(pair); - - ClientboundSetEquipmentPacket packet = new ClientboundSetEquipmentPacket(entityId, pairs); - for (Player p : sendTo) sendPacket(p, packet); - } - - @Override public void equipmentSlotUpdate( int entityId, diff --git a/v1_19_R3/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R3/NMSHandler.java b/v1_19_R3/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R3/NMSHandler.java index b2c283f3..a6c6eabb 100644 --- a/v1_19_R3/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R3/NMSHandler.java +++ b/v1_19_R3/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R3/NMSHandler.java @@ -64,12 +64,6 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler { return null; } - @Override - public org.bukkit.entity.Entity getHMCArmorStand(Location loc) { - HMCArmorStand hmcArmorStand = new HMCArmorStand(loc); - return hmcArmorStand.getBukkitEntity(); - } - @Override public ArmorStand getMEGEntity(Location loc) { return (ArmorStand) new MEGEntity(loc).getBukkitEntity(); @@ -115,54 +109,6 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler { return userBalloonManager1; } - @Override - public void equipmentSlotUpdate( - int entityId, - CosmeticUser user, - CosmeticSlot cosmeticSlot, - List sendTo - ) { - - EquipmentSlot nmsSlot = null; - net.minecraft.world.item.ItemStack nmsItem = null; - - if (!(user.getCosmetic(cosmeticSlot) instanceof CosmeticArmorType)) { - - if (user.getCosmetic(cosmeticSlot) instanceof CosmeticMainhandType) { - CosmeticMainhandType cosmeticMainhandType = (CosmeticMainhandType) user.getCosmetic(CosmeticSlot.MAINHAND); - nmsItem = CraftItemStack.asNMSCopy(user.getUserCosmeticItem(cosmeticMainhandType)); - } else { - nmsItem = CraftItemStack.asNMSCopy(user.getPlayer().getInventory().getItem(InventoryUtils.getEquipmentSlot(cosmeticSlot))); - } - - nmsSlot = CraftEquipmentSlot.getNMS(InventoryUtils.getEquipmentSlot(cosmeticSlot)); - - if (nmsSlot == null) return; - - Pair pair = new Pair<>(nmsSlot, nmsItem); - - List> pairs = Collections.singletonList(pair); - - ClientboundSetEquipmentPacket packet = new ClientboundSetEquipmentPacket(entityId, pairs); - for (Player p : sendTo) sendPacket(p, packet); - return; - } - CosmeticArmorType cosmeticArmor = (CosmeticArmorType) user.getCosmetic(cosmeticSlot); - - // Converting EquipmentSlot and ItemStack to NMS ones. - nmsSlot = CraftEquipmentSlot.getNMS(cosmeticArmor.getEquipSlot()); - nmsItem = CraftItemStack.asNMSCopy(user.getUserCosmeticItem(cosmeticArmor)); - - if (nmsSlot == null) return; - - Pair pair = new Pair<>(nmsSlot, nmsItem); - - List> pairs = Collections.singletonList(pair); - - ClientboundSetEquipmentPacket packet = new ClientboundSetEquipmentPacket(entityId, pairs); - for (Player p : sendTo) sendPacket(p, packet); - } - @Override public void equipmentSlotUpdate( diff --git a/v1_20_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R1/NMSHandler.java b/v1_20_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R1/NMSHandler.java index 59f940c3..1068fcbd 100644 --- a/v1_20_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R1/NMSHandler.java +++ b/v1_20_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R1/NMSHandler.java @@ -63,12 +63,6 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler { return null; } - @Override - public org.bukkit.entity.Entity getHMCArmorStand(Location loc) { - HMCArmorStand hmcArmorStand = new HMCArmorStand(loc); - return hmcArmorStand.getBukkitEntity(); - } - @Override public ArmorStand getMEGEntity(Location loc) { return (ArmorStand) new MEGEntity(loc).getBukkitEntity(); @@ -116,54 +110,6 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler { return userBalloonManager1; } - @Override - public void equipmentSlotUpdate( - int entityId, - CosmeticUser user, - CosmeticSlot cosmeticSlot, - List sendTo - ) { - - EquipmentSlot nmsSlot = null; - net.minecraft.world.item.ItemStack nmsItem = null; - - if (!(user.getCosmetic(cosmeticSlot) instanceof CosmeticArmorType)) { - - if (user.getCosmetic(cosmeticSlot) instanceof CosmeticMainhandType) { - CosmeticMainhandType cosmeticMainhandType = (CosmeticMainhandType) user.getCosmetic(CosmeticSlot.MAINHAND); - nmsItem = CraftItemStack.asNMSCopy(user.getUserCosmeticItem(cosmeticMainhandType)); - } else { - nmsItem = CraftItemStack.asNMSCopy(user.getPlayer().getInventory().getItem(InventoryUtils.getEquipmentSlot(cosmeticSlot))); - } - - nmsSlot = CraftEquipmentSlot.getNMS(InventoryUtils.getEquipmentSlot(cosmeticSlot)); - - if (nmsSlot == null) return; - - Pair pair = new Pair<>(nmsSlot, nmsItem); - - List> pairs = Collections.singletonList(pair); - - ClientboundSetEquipmentPacket packet = new ClientboundSetEquipmentPacket(entityId, pairs); - for (Player p : sendTo) sendPacket(p, packet); - return; - } - CosmeticArmorType cosmeticArmor = (CosmeticArmorType) user.getCosmetic(cosmeticSlot); - - // Converting EquipmentSlot and ItemStack to NMS ones. - nmsSlot = CraftEquipmentSlot.getNMS(cosmeticArmor.getEquipSlot()); - nmsItem = CraftItemStack.asNMSCopy(user.getUserCosmeticItem(cosmeticArmor)); - - if (nmsSlot == null) return; - - Pair pair = new Pair<>(nmsSlot, nmsItem); - - List> pairs = Collections.singletonList(pair); - - ClientboundSetEquipmentPacket packet = new ClientboundSetEquipmentPacket(entityId, pairs); - for (Player p : sendTo) sendPacket(p, packet); - } - @Override public void equipmentSlotUpdate(