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 1031e92d..5a7a991e 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/nms/NMSHandler.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/nms/NMSHandler.java @@ -20,8 +20,6 @@ public interface NMSHandler { ArmorStand getMEGEntity(Location loc); - Entity spawnBackpack(CosmeticUser user, CosmeticBackpackType cosmeticBackpackType); - Entity spawnDisplayEntity(Location location, String text); UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType); diff --git a/v1_18_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_18_R2/HMCArmorStand.java b/v1_18_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_18_R2/HMCArmorStand.java deleted file mode 100644 index 51739f17..00000000 --- a/v1_18_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_18_R2/HMCArmorStand.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.hibiscusmc.hmccosmetics.nms.v1_18_R2; - -import net.minecraft.world.entity.decoration.ArmorStand; -import net.minecraft.world.level.Level; -import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_18_R2.CraftWorld; - -public class HMCArmorStand extends ArmorStand { - - public HMCArmorStand(Level world, double x, double y, double z) { - super(world, x, y, z); - } - - public HMCArmorStand(Location loc) { - super(((CraftWorld) loc.getWorld()).getHandle(), loc.getX(), loc.getY(), loc.getZ()); - this.setPos(loc.getX(), loc.getY(), loc.getZ()); - setInvisible(true); - setInvulnerable(true); - setMarker(true); - setSilent(true); - getBukkitLivingEntity().setCollidable(false); - persist = false; - } -} 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 d4dedcf0..9190d99e 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 @@ -1,10 +1,8 @@ package com.hibiscusmc.hmccosmetics.nms.v1_18_R2; -import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType; import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager; -import com.hibiscusmc.hmccosmetics.util.MessagesUtil; import com.mojang.datafixers.util.Pair; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket; @@ -21,13 +19,11 @@ 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.CraftWorld; 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.event.entity.CreatureSpawnEvent; import org.bukkit.inventory.ItemStack; import java.util.ArrayList; @@ -61,20 +57,6 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler { return (ArmorStand) new MEGEntity(loc).getBukkitEntity(); } - @Override - public org.bukkit.entity.Entity spawnBackpack(CosmeticUser user, CosmeticBackpackType cosmeticBackpackType) { - HMCArmorStand invisibleArmorstand = new HMCArmorStand(user.getEntity().getLocation()); - - ItemStack item = user.getUserCosmeticItem(cosmeticBackpackType); - - invisibleArmorstand.setItemSlot(EquipmentSlot.HEAD, CraftItemStack.asNMSCopy(item)); - ((CraftWorld) user.getEntity().getWorld()).getHandle().addFreshEntity(invisibleArmorstand, CreatureSpawnEvent.SpawnReason.CUSTOM); - - MessagesUtil.sendDebugMessages("spawnBackpack NMS"); - - return invisibleArmorstand.getBukkitLivingEntity(); - } - @Override public org.bukkit.entity.Entity spawnDisplayEntity(Location location, String text) { return null; diff --git a/v1_19_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R1/HMCArmorStand.java b/v1_19_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R1/HMCArmorStand.java deleted file mode 100644 index 1970f62e..00000000 --- a/v1_19_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R1/HMCArmorStand.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.hibiscusmc.hmccosmetics.nms.v1_19_R1; - -import net.minecraft.world.entity.decoration.ArmorStand; -import net.minecraft.world.level.Level; -import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_19_R1.CraftWorld; - -public class HMCArmorStand extends ArmorStand { - - public HMCArmorStand(Level world, double x, double y, double z) { - super(world, x, y, z); - } - - public HMCArmorStand(Location loc) { - super(((CraftWorld) loc.getWorld()).getHandle(), loc.getX(), loc.getY(), loc.getZ()); - this.setPos(loc.getX(), loc.getY(), loc.getZ()); - setInvisible(true); - setInvulnerable(true); - setMarker(true); - setSilent(true); - getBukkitLivingEntity().setCollidable(false); - persist = false; - } -} 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 f4346dda..8252b95a 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 @@ -1,10 +1,8 @@ package com.hibiscusmc.hmccosmetics.nms.v1_19_R1; -import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType; import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager; -import com.hibiscusmc.hmccosmetics.util.MessagesUtil; import com.mojang.datafixers.util.Pair; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket; @@ -21,13 +19,11 @@ 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.CraftWorld; 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.event.entity.CreatureSpawnEvent; import org.bukkit.inventory.ItemStack; import java.util.ArrayList; @@ -61,28 +57,11 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler { return (ArmorStand) new MEGEntity(loc).getBukkitEntity(); } - @Override - public org.bukkit.entity.Entity spawnBackpack(CosmeticUser user, CosmeticBackpackType cosmeticBackpackType) { - HMCArmorStand invisibleArmorstand = new HMCArmorStand(user.getEntity().getLocation()); - - ItemStack item = user.getUserCosmeticItem(cosmeticBackpackType); - - invisibleArmorstand.setItemSlot(EquipmentSlot.HEAD, CraftItemStack.asNMSCopy(item)); - ((CraftWorld) user.getEntity().getWorld()).getHandle().addFreshEntity(invisibleArmorstand, CreatureSpawnEvent.SpawnReason.CUSTOM); - - MessagesUtil.sendDebugMessages("spawnBackpack NMS"); - - return invisibleArmorstand.getBukkitLivingEntity(); - } - @Override public org.bukkit.entity.Entity spawnDisplayEntity(Location location, String text) { return null; } - - - @Override public UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType) { org.bukkit.entity.Entity entity = user.getEntity(); diff --git a/v1_19_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R2/HMCArmorStand.java b/v1_19_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R2/HMCArmorStand.java deleted file mode 100644 index eea88292..00000000 --- a/v1_19_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R2/HMCArmorStand.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.hibiscusmc.hmccosmetics.nms.v1_19_R2; - -import net.minecraft.world.entity.decoration.ArmorStand; -import net.minecraft.world.level.Level; -import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_19_R2.CraftWorld; - -public class HMCArmorStand extends ArmorStand { - - public HMCArmorStand(Level world, double x, double y, double z) { - super(world, x, y, z); - } - - public HMCArmorStand(Location loc) { - super(((CraftWorld) loc.getWorld()).getHandle(), loc.getX(), loc.getY(), loc.getZ()); - this.setPos(loc.getX(), loc.getY(), loc.getZ()); - setInvisible(true); - setInvulnerable(true); - setMarker(true); - setSilent(true); - getBukkitLivingEntity().setCollidable(false); - persist = false; - } -} 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 27413b07..07cfd3ea 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 @@ -1,10 +1,8 @@ package com.hibiscusmc.hmccosmetics.nms.v1_19_R2; -import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType; import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager; -import com.hibiscusmc.hmccosmetics.util.MessagesUtil; import com.mojang.datafixers.util.Pair; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket; @@ -21,13 +19,11 @@ 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.CraftWorld; 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.event.entity.CreatureSpawnEvent; import org.bukkit.inventory.ItemStack; import java.util.ArrayList; @@ -61,20 +57,6 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler { return (ArmorStand) new MEGEntity(loc).getBukkitEntity(); } - @Override - public org.bukkit.entity.Entity spawnBackpack(CosmeticUser user, CosmeticBackpackType cosmeticBackpackType) { - HMCArmorStand invisibleArmorstand = new HMCArmorStand(user.getEntity().getLocation()); - - ItemStack item = user.getUserCosmeticItem(cosmeticBackpackType); - - invisibleArmorstand.setItemSlot(EquipmentSlot.HEAD, CraftItemStack.asNMSCopy(item)); - ((CraftWorld) user.getEntity().getWorld()).getHandle().addFreshEntity(invisibleArmorstand, CreatureSpawnEvent.SpawnReason.CUSTOM); - - MessagesUtil.sendDebugMessages("spawnBackpack NMS"); - - return invisibleArmorstand.getBukkitLivingEntity(); - } - @Override public org.bukkit.entity.Entity spawnDisplayEntity(Location location, String text) { return null; diff --git a/v1_19_R3/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R3/HMCArmorStand.java b/v1_19_R3/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R3/HMCArmorStand.java deleted file mode 100644 index 60d2ba39..00000000 --- a/v1_19_R3/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R3/HMCArmorStand.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.hibiscusmc.hmccosmetics.nms.v1_19_R3; - -import net.minecraft.world.entity.decoration.ArmorStand; -import net.minecraft.world.level.Level; -import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_19_R3.CraftWorld; - -public class HMCArmorStand extends ArmorStand { - - public HMCArmorStand(Level world, double x, double y, double z) { - super(world, x, y, z); - } - - public HMCArmorStand(Location loc) { - super(((CraftWorld) loc.getWorld()).getHandle(), loc.getX(), loc.getY(), loc.getZ()); - this.setPos(loc.getX(), loc.getY(), loc.getZ()); - setInvisible(true); - setInvulnerable(true); - setMarker(true); - setSilent(true); - getBukkitLivingEntity().setCollidable(false); - persist = false; - } -} 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 b32b8627..9189f0e3 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 @@ -1,6 +1,5 @@ package com.hibiscusmc.hmccosmetics.nms.v1_19_R3; -import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType; import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager; @@ -64,20 +63,6 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler { return (ArmorStand) new MEGEntity(loc).getBukkitEntity(); } - @Override - public org.bukkit.entity.Entity spawnBackpack(CosmeticUser user, CosmeticBackpackType cosmeticBackpackType) { - HMCArmorStand invisibleArmorstand = new HMCArmorStand(user.getEntity().getLocation()); - - ItemStack item = user.getUserCosmeticItem(cosmeticBackpackType); - - invisibleArmorstand.setItemSlot(EquipmentSlot.HEAD, CraftItemStack.asNMSCopy(item)); - ((CraftWorld) user.getEntity().getWorld()).getHandle().addFreshEntity(invisibleArmorstand, CreatureSpawnEvent.SpawnReason.CUSTOM); - - MessagesUtil.sendDebugMessages("spawnBackpack NMS"); - - return invisibleArmorstand.getBukkitLivingEntity(); - } - @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()); diff --git a/v1_20_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R1/HMCArmorStand.java b/v1_20_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R1/HMCArmorStand.java deleted file mode 100644 index 0592b467..00000000 --- a/v1_20_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R1/HMCArmorStand.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.hibiscusmc.hmccosmetics.nms.v1_20_R1; - -import net.minecraft.world.entity.decoration.ArmorStand; -import net.minecraft.world.level.Level; -import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_20_R1.CraftWorld; - -public class HMCArmorStand extends ArmorStand { - - public HMCArmorStand(Level world, double x, double y, double z) { - super(world, x, y, z); - } - - public HMCArmorStand(Location loc) { - super(((CraftWorld) loc.getWorld()).getHandle(), loc.getX(), loc.getY(), loc.getZ()); - this.setPos(loc.getX(), loc.getY(), loc.getZ()); - setInvisible(true); - setInvulnerable(true); - setMarker(true); - setSilent(true); - getBukkitLivingEntity().setCollidable(false); - persist = false; - } -} 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 a88a8f5c..593a0137 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 @@ -1,6 +1,5 @@ package com.hibiscusmc.hmccosmetics.nms.v1_20_R1; -import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType; import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager; @@ -63,22 +62,6 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler { return (ArmorStand) new MEGEntity(loc).getBukkitEntity(); } - @Override - public org.bukkit.entity.Entity spawnBackpack(CosmeticUser user, CosmeticBackpackType cosmeticBackpackType) { - HMCArmorStand invisibleArmorstand = new HMCArmorStand(user.getEntity().getLocation()); - - ItemStack item = user.getUserCosmeticItem(cosmeticBackpackType); - - invisibleArmorstand.setItemSlot(EquipmentSlot.HEAD, CraftItemStack.asNMSCopy(item)); - ((CraftWorld) user.getEntity().getWorld()).getHandle().addFreshEntity(invisibleArmorstand, CreatureSpawnEvent.SpawnReason.CUSTOM); - - MessagesUtil.sendDebugMessages("spawnBackpack NMS"); - - return invisibleArmorstand.getBukkitLivingEntity(); - //PacketManager.armorStandMetaPacket(invisibleArmorstand.getBukkitEntity(), sentTo); - //PacketManager.ridingMountPacket(player.getEntityId(), invisibleArmorstand.getId(), sentTo); - } - @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());