From c935caa14025617baf085e31828cab6ba93edf7c Mon Sep 17 00:00:00 2001 From: fullwall Date: Sat, 3 Dec 2022 21:02:59 +0800 Subject: [PATCH] Remove some dead code --- .../net/citizensnpcs/WorldPlayerCache.java | 41 ------------------- .../citizensnpcs/npc/CitizensNPCRegistry.java | 2 +- .../nonliving/FallingBlockController.java | 12 ------ .../entity/nonliving/ItemController.java | 12 ------ .../nonliving/FallingBlockController.java | 12 ------ .../entity/nonliving/ItemController.java | 12 ------ .../nonliving/FallingBlockController.java | 12 ------ .../entity/nonliving/ItemController.java | 12 ------ .../nonliving/FallingBlockController.java | 12 ------ .../entity/nonliving/ItemController.java | 12 ------ .../nonliving/FallingBlockController.java | 12 ------ .../entity/nonliving/ItemController.java | 12 ------ .../nonliving/FallingBlockController.java | 12 ------ .../entity/nonliving/ItemController.java | 12 ------ .../nonliving/FallingBlockController.java | 12 ------ .../entity/nonliving/ItemController.java | 12 ------ .../nonliving/FallingBlockController.java | 12 ------ .../entity/nonliving/ItemController.java | 12 ------ .../nonliving/FallingBlockController.java | 12 ------ .../entity/nonliving/ItemController.java | 12 ------ .../nonliving/FallingBlockController.java | 12 ------ .../entity/nonliving/ItemController.java | 16 +------- .../nonliving/FallingBlockController.java | 12 ------ .../entity/nonliving/ItemController.java | 12 ------ 24 files changed, 3 insertions(+), 308 deletions(-) delete mode 100644 main/src/main/java/net/citizensnpcs/WorldPlayerCache.java diff --git a/main/src/main/java/net/citizensnpcs/WorldPlayerCache.java b/main/src/main/java/net/citizensnpcs/WorldPlayerCache.java deleted file mode 100644 index bc6dcab98..000000000 --- a/main/src/main/java/net/citizensnpcs/WorldPlayerCache.java +++ /dev/null @@ -1,41 +0,0 @@ -package net.citizensnpcs; - -import java.util.List; -import java.util.Map; -import java.util.UUID; - -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.World; -import org.bukkit.entity.Player; - -import com.google.common.collect.Maps; - -import ch.ethz.globis.phtree.PhTreeF; - -public class WorldPlayerCache implements Runnable { - private final Map> worlds = Maps.newHashMap(); - - public PhTreeF getPlayersByWorld(World world) { - return worlds.get(world.getUID()); - } - - @Override - public void run() { - worlds.clear(); - for (World world : Bukkit.getServer().getWorlds()) { - List players = world.getPlayers(); - if (players.isEmpty()) - continue; - PhTreeF tree = PhTreeF.create(3); - worlds.put(world.getUID(), tree); - Location loc = new Location(null, 0, 0, 0); - for (Player player : players) { - if (player.hasMetadata("NPC")) - continue; - player.getLocation(loc); - tree.put(new double[] { loc.getX(), loc.getY(), loc.getZ() }, player); - } - } - } -} diff --git a/main/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java b/main/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java index 9ff3615e9..18bd1afce 100644 --- a/main/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java +++ b/main/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java @@ -92,7 +92,7 @@ public class CitizensNPCRegistry implements NPCRegistry { if (type == EntityType.DROPPED_ITEM || type == EntityType.FALLING_BLOCK || type == EntityType.GLOW_ITEM_FRAME || type == EntityType.ITEM_FRAME) { npc.data().set(NPC.Metadata.ITEM_AMOUNT, item.getAmount()); - npc.data().set(NPC.Metadata.ITEM_ID, item.getType().getId()); + npc.data().set(NPC.Metadata.ITEM_ID, item.getType().name()); npc.data().set(NPC.Metadata.ITEM_DATA, item.getData().getData()); npc.setItemProvider(() -> item); } else { diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FallingBlockController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FallingBlockController.java index c0b9bc1c4..02c5eaada 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FallingBlockController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FallingBlockController.java @@ -2,7 +2,6 @@ package net.citizensnpcs.nms.v1_10_R1.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.craftbukkit.v1_10_R1.CraftServer; import org.bukkit.craftbukkit.v1_10_R1.CraftWorld; import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity; @@ -12,8 +11,6 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.FallingBlock; import org.bukkit.util.Vector; -import net.citizensnpcs.api.event.DespawnReason; -import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; @@ -138,14 +135,5 @@ public class FallingBlockController extends AbstractEntityController { public NPC getNPC() { return npc; } - - public void setType(Material material, int data) { - npc.data().setPersistent(NPC.ITEM_ID_METADATA, material.name()); - npc.data().setPersistent(NPC.ITEM_DATA_METADATA, data); - if (npc.isSpawned()) { - npc.despawn(DespawnReason.PENDING_RESPAWN); - npc.spawn(npc.getStoredLocation(), SpawnReason.RESPAWN); - } - } } } \ No newline at end of file diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ItemController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ItemController.java index 3a0fa14b2..70c12ea8f 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ItemController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ItemController.java @@ -2,7 +2,6 @@ package net.citizensnpcs.nms.v1_10_R1.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.craftbukkit.v1_10_R1.CraftServer; import org.bukkit.craftbukkit.v1_10_R1.CraftWorld; import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity; @@ -11,8 +10,6 @@ import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftItemStack; import org.bukkit.entity.Item; import org.bukkit.util.Vector; -import net.citizensnpcs.api.event.DespawnReason; -import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; @@ -119,14 +116,5 @@ public class ItemController extends AbstractEntityController { public NPC getNPC() { return npc; } - - public void setType(Material material, int data) { - npc.data().setPersistent(NPC.ITEM_ID_METADATA, material.name()); - npc.data().setPersistent(NPC.ITEM_DATA_METADATA, data); - if (npc.isSpawned()) { - npc.despawn(DespawnReason.PENDING_RESPAWN); - npc.spawn(npc.getStoredLocation(), SpawnReason.RESPAWN); - } - } } } \ No newline at end of file diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FallingBlockController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FallingBlockController.java index edd0a1ced..6cdf512bb 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FallingBlockController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FallingBlockController.java @@ -2,7 +2,6 @@ package net.citizensnpcs.nms.v1_11_R1.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.craftbukkit.v1_11_R1.CraftServer; import org.bukkit.craftbukkit.v1_11_R1.CraftWorld; import org.bukkit.craftbukkit.v1_11_R1.entity.CraftEntity; @@ -12,8 +11,6 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.FallingBlock; import org.bukkit.util.Vector; -import net.citizensnpcs.api.event.DespawnReason; -import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; @@ -139,14 +136,5 @@ public class FallingBlockController extends AbstractEntityController { public NPC getNPC() { return npc; } - - public void setType(Material material, int data) { - npc.data().setPersistent(NPC.ITEM_ID_METADATA, material.name()); - npc.data().setPersistent(NPC.ITEM_DATA_METADATA, data); - if (npc.isSpawned()) { - npc.despawn(DespawnReason.PENDING_RESPAWN); - npc.spawn(npc.getStoredLocation(), SpawnReason.RESPAWN); - } - } } } \ No newline at end of file diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ItemController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ItemController.java index 5541846c4..4c93486dd 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ItemController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ItemController.java @@ -2,7 +2,6 @@ package net.citizensnpcs.nms.v1_11_R1.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.craftbukkit.v1_11_R1.CraftServer; import org.bukkit.craftbukkit.v1_11_R1.CraftWorld; import org.bukkit.craftbukkit.v1_11_R1.entity.CraftEntity; @@ -11,8 +10,6 @@ import org.bukkit.craftbukkit.v1_11_R1.inventory.CraftItemStack; import org.bukkit.entity.Item; import org.bukkit.util.Vector; -import net.citizensnpcs.api.event.DespawnReason; -import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; @@ -119,14 +116,5 @@ public class ItemController extends AbstractEntityController { public NPC getNPC() { return npc; } - - public void setType(Material material, int data) { - npc.data().setPersistent(NPC.ITEM_ID_METADATA, material.name()); - npc.data().setPersistent(NPC.ITEM_DATA_METADATA, data); - if (npc.isSpawned()) { - npc.despawn(DespawnReason.PENDING_RESPAWN); - npc.spawn(npc.getStoredLocation(), SpawnReason.RESPAWN); - } - } } } \ No newline at end of file diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FallingBlockController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FallingBlockController.java index 4a8c1dd63..ae09d5904 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FallingBlockController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FallingBlockController.java @@ -2,7 +2,6 @@ package net.citizensnpcs.nms.v1_12_R1.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; import org.bukkit.craftbukkit.v1_12_R1.entity.CraftEntity; @@ -12,8 +11,6 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.FallingBlock; import org.bukkit.util.Vector; -import net.citizensnpcs.api.event.DespawnReason; -import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_12_R1.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; @@ -139,14 +136,5 @@ public class FallingBlockController extends AbstractEntityController { public NPC getNPC() { return npc; } - - public void setType(Material material, int data) { - npc.data().setPersistent(NPC.ITEM_ID_METADATA, material.name()); - npc.data().setPersistent(NPC.ITEM_DATA_METADATA, data); - if (npc.isSpawned()) { - npc.despawn(DespawnReason.PENDING_RESPAWN); - npc.spawn(npc.getStoredLocation(), SpawnReason.RESPAWN); - } - } } } \ No newline at end of file diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ItemController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ItemController.java index d9bca21ce..987690578 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ItemController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ItemController.java @@ -2,7 +2,6 @@ package net.citizensnpcs.nms.v1_12_R1.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; import org.bukkit.craftbukkit.v1_12_R1.entity.CraftEntity; @@ -11,8 +10,6 @@ import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; import org.bukkit.entity.Item; import org.bukkit.util.Vector; -import net.citizensnpcs.api.event.DespawnReason; -import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; @@ -119,14 +116,5 @@ public class ItemController extends AbstractEntityController { public NPC getNPC() { return npc; } - - public void setType(Material material, int data) { - npc.data().setPersistent(NPC.ITEM_ID_METADATA, material.name()); - npc.data().setPersistent(NPC.ITEM_DATA_METADATA, data); - if (npc.isSpawned()) { - npc.despawn(DespawnReason.PENDING_RESPAWN); - npc.spawn(npc.getStoredLocation(), SpawnReason.RESPAWN); - } - } } } \ No newline at end of file diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FallingBlockController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FallingBlockController.java index a03d93471..e4520273c 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FallingBlockController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FallingBlockController.java @@ -2,7 +2,6 @@ package net.citizensnpcs.nms.v1_13_R2.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.craftbukkit.v1_13_R2.CraftServer; import org.bukkit.craftbukkit.v1_13_R2.CraftWorld; import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity; @@ -12,8 +11,6 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.FallingBlock; import org.bukkit.util.Vector; -import net.citizensnpcs.api.event.DespawnReason; -import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; @@ -155,14 +152,5 @@ public class FallingBlockController extends AbstractEntityController { public NPC getNPC() { return npc; } - - public void setType(Material material, int data) { - npc.data().setPersistent(NPC.ITEM_ID_METADATA, material.name()); - npc.data().setPersistent(NPC.ITEM_DATA_METADATA, data); - if (npc.isSpawned()) { - npc.despawn(DespawnReason.PENDING_RESPAWN); - npc.spawn(npc.getStoredLocation(), SpawnReason.RESPAWN); - } - } } } \ No newline at end of file diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemController.java index cabc25708..14c003a04 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemController.java @@ -2,7 +2,6 @@ package net.citizensnpcs.nms.v1_13_R2.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.craftbukkit.v1_13_R2.CraftServer; import org.bukkit.craftbukkit.v1_13_R2.CraftWorld; import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity; @@ -11,8 +10,6 @@ import org.bukkit.craftbukkit.v1_13_R2.inventory.CraftItemStack; import org.bukkit.entity.Item; import org.bukkit.util.Vector; -import net.citizensnpcs.api.event.DespawnReason; -import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; @@ -135,14 +132,5 @@ public class ItemController extends AbstractEntityController { public NPC getNPC() { return npc; } - - public void setType(Material material, int data) { - npc.data().setPersistent(NPC.ITEM_ID_METADATA, material.name()); - npc.data().setPersistent(NPC.ITEM_DATA_METADATA, data); - if (npc.isSpawned()) { - npc.despawn(DespawnReason.PENDING_RESPAWN); - npc.spawn(npc.getStoredLocation(), SpawnReason.RESPAWN); - } - } } } \ No newline at end of file diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FallingBlockController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FallingBlockController.java index 191d0f771..f5cc57f1a 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FallingBlockController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FallingBlockController.java @@ -2,7 +2,6 @@ package net.citizensnpcs.nms.v1_14_R1.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.craftbukkit.v1_14_R1.CraftServer; import org.bukkit.craftbukkit.v1_14_R1.CraftWorld; import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEntity; @@ -12,8 +11,6 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.FallingBlock; import org.bukkit.util.Vector; -import net.citizensnpcs.api.event.DespawnReason; -import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; @@ -154,14 +151,5 @@ public class FallingBlockController extends AbstractEntityController { public NPC getNPC() { return npc; } - - public void setType(Material material, int data) { - npc.data().setPersistent(NPC.ITEM_ID_METADATA, material.name()); - npc.data().setPersistent(NPC.ITEM_DATA_METADATA, data); - if (npc.isSpawned()) { - npc.despawn(DespawnReason.PENDING_RESPAWN); - npc.spawn(npc.getStoredLocation(), SpawnReason.RESPAWN); - } - } } } diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemController.java index 3c6a303d0..6f0990c90 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemController.java @@ -2,7 +2,6 @@ package net.citizensnpcs.nms.v1_14_R1.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.craftbukkit.v1_14_R1.CraftServer; import org.bukkit.craftbukkit.v1_14_R1.CraftWorld; import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEntity; @@ -11,8 +10,6 @@ import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; import org.bukkit.entity.Item; import org.bukkit.util.Vector; -import net.citizensnpcs.api.event.DespawnReason; -import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; @@ -134,14 +131,5 @@ public class ItemController extends AbstractEntityController { public NPC getNPC() { return npc; } - - public void setType(Material material, int data) { - npc.data().setPersistent(NPC.ITEM_ID_METADATA, material.name()); - npc.data().setPersistent(NPC.ITEM_DATA_METADATA, data); - if (npc.isSpawned()) { - npc.despawn(DespawnReason.PENDING_RESPAWN); - npc.spawn(npc.getStoredLocation(), SpawnReason.RESPAWN); - } - } } } diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FallingBlockController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FallingBlockController.java index e37de1cf0..6be2cda23 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FallingBlockController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FallingBlockController.java @@ -2,7 +2,6 @@ package net.citizensnpcs.nms.v1_15_R1.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.craftbukkit.v1_15_R1.CraftServer; import org.bukkit.craftbukkit.v1_15_R1.CraftWorld; import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity; @@ -12,8 +11,6 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.FallingBlock; import org.bukkit.util.Vector; -import net.citizensnpcs.api.event.DespawnReason; -import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; @@ -154,14 +151,5 @@ public class FallingBlockController extends AbstractEntityController { public NPC getNPC() { return npc; } - - public void setType(Material material, int data) { - npc.data().setPersistent(NPC.ITEM_ID_METADATA, material.name()); - npc.data().setPersistent(NPC.ITEM_DATA_METADATA, data); - if (npc.isSpawned()) { - npc.despawn(DespawnReason.PENDING_RESPAWN); - npc.spawn(npc.getStoredLocation(), SpawnReason.RESPAWN); - } - } } } diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemController.java index db252b512..257282c5b 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemController.java @@ -2,7 +2,6 @@ package net.citizensnpcs.nms.v1_15_R1.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.craftbukkit.v1_15_R1.CraftServer; import org.bukkit.craftbukkit.v1_15_R1.CraftWorld; import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity; @@ -11,8 +10,6 @@ import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack; import org.bukkit.entity.Item; import org.bukkit.util.Vector; -import net.citizensnpcs.api.event.DespawnReason; -import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; @@ -134,14 +131,5 @@ public class ItemController extends AbstractEntityController { public NPC getNPC() { return npc; } - - public void setType(Material material, int data) { - npc.data().setPersistent(NPC.ITEM_ID_METADATA, material.name()); - npc.data().setPersistent(NPC.ITEM_DATA_METADATA, data); - if (npc.isSpawned()) { - npc.despawn(DespawnReason.PENDING_RESPAWN); - npc.spawn(npc.getStoredLocation(), SpawnReason.RESPAWN); - } - } } } diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FallingBlockController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FallingBlockController.java index d4d14430b..b268fe03d 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FallingBlockController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FallingBlockController.java @@ -2,7 +2,6 @@ package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.craftbukkit.v1_16_R3.CraftServer; import org.bukkit.craftbukkit.v1_16_R3.CraftWorld; import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; @@ -12,8 +11,6 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.FallingBlock; import org.bukkit.util.Vector; -import net.citizensnpcs.api.event.DespawnReason; -import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; @@ -154,14 +151,5 @@ public class FallingBlockController extends AbstractEntityController { public NPC getNPC() { return npc; } - - public void setType(Material material, int data) { - npc.data().setPersistent(NPC.ITEM_ID_METADATA, material.name()); - npc.data().setPersistent(NPC.ITEM_DATA_METADATA, data); - if (npc.isSpawned()) { - npc.despawn(DespawnReason.PENDING_RESPAWN); - npc.spawn(npc.getStoredLocation(), SpawnReason.RESPAWN); - } - } } } diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemController.java index 8c5fcac83..0d771a958 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemController.java @@ -2,7 +2,6 @@ package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.craftbukkit.v1_16_R3.CraftServer; import org.bukkit.craftbukkit.v1_16_R3.CraftWorld; import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; @@ -11,8 +10,6 @@ import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack; import org.bukkit.entity.Item; import org.bukkit.util.Vector; -import net.citizensnpcs.api.event.DespawnReason; -import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; @@ -134,14 +131,5 @@ public class ItemController extends AbstractEntityController { public NPC getNPC() { return npc; } - - public void setType(Material material, int data) { - npc.data().setPersistent(NPC.ITEM_ID_METADATA, material.name()); - npc.data().setPersistent(NPC.ITEM_DATA_METADATA, data); - if (npc.isSpawned()) { - npc.despawn(DespawnReason.PENDING_RESPAWN); - npc.spawn(npc.getStoredLocation(), SpawnReason.RESPAWN); - } - } } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FallingBlockController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FallingBlockController.java index d2eb1364a..313cb5a4e 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FallingBlockController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FallingBlockController.java @@ -2,7 +2,6 @@ package net.citizensnpcs.nms.v1_17_R1.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.craftbukkit.v1_17_R1.CraftServer; import org.bukkit.craftbukkit.v1_17_R1.CraftWorld; import org.bukkit.craftbukkit.v1_17_R1.entity.CraftEntity; @@ -11,8 +10,6 @@ import org.bukkit.craftbukkit.v1_17_R1.util.CraftMagicNumbers; import org.bukkit.entity.FallingBlock; import org.bukkit.util.Vector; -import net.citizensnpcs.api.event.DespawnReason; -import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_17_R1.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; @@ -153,14 +150,5 @@ public class FallingBlockController extends AbstractEntityController { public NPC getNPC() { return npc; } - - public void setType(Material material, int data) { - npc.data().setPersistent(NPC.ITEM_ID_METADATA, material.name()); - npc.data().setPersistent(NPC.ITEM_DATA_METADATA, data); - if (npc.isSpawned()) { - npc.despawn(DespawnReason.PENDING_RESPAWN); - npc.spawn(npc.getStoredLocation(), SpawnReason.RESPAWN); - } - } } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemController.java index 7ed67f3bb..6a9d676fc 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemController.java @@ -2,7 +2,6 @@ package net.citizensnpcs.nms.v1_17_R1.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.craftbukkit.v1_17_R1.CraftServer; import org.bukkit.craftbukkit.v1_17_R1.CraftWorld; import org.bukkit.craftbukkit.v1_17_R1.entity.CraftEntity; @@ -11,8 +10,6 @@ import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack; import org.bukkit.entity.Item; import org.bukkit.util.Vector; -import net.citizensnpcs.api.event.DespawnReason; -import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_17_R1.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; @@ -135,14 +132,5 @@ public class ItemController extends AbstractEntityController { public NPC getNPC() { return npc; } - - public void setType(Material material, int data) { - npc.data().setPersistent(NPC.ITEM_ID_METADATA, material.name()); - npc.data().setPersistent(NPC.ITEM_DATA_METADATA, data); - if (npc.isSpawned()) { - npc.despawn(DespawnReason.PENDING_RESPAWN); - npc.spawn(npc.getStoredLocation(), SpawnReason.RESPAWN); - } - } } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FallingBlockController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FallingBlockController.java index 944878521..7250390ed 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FallingBlockController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FallingBlockController.java @@ -2,7 +2,6 @@ package net.citizensnpcs.nms.v1_18_R2.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.craftbukkit.v1_18_R2.CraftServer; import org.bukkit.craftbukkit.v1_18_R2.CraftWorld; import org.bukkit.craftbukkit.v1_18_R2.entity.CraftEntity; @@ -11,8 +10,6 @@ import org.bukkit.craftbukkit.v1_18_R2.util.CraftMagicNumbers; import org.bukkit.entity.FallingBlock; import org.bukkit.util.Vector; -import net.citizensnpcs.api.event.DespawnReason; -import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_18_R2.util.ForwardingNPCHolder; import net.citizensnpcs.nms.v1_18_R2.util.NMSImpl; @@ -158,14 +155,5 @@ public class FallingBlockController extends AbstractEntityController { public NPC getNPC() { return npc; } - - public void setType(Material material, int data) { - npc.data().setPersistent(NPC.ITEM_ID_METADATA, material.name()); - npc.data().setPersistent(NPC.ITEM_DATA_METADATA, data); - if (npc.isSpawned()) { - npc.despawn(DespawnReason.PENDING_RESPAWN); - npc.spawn(npc.getStoredLocation(), SpawnReason.RESPAWN); - } - } } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemController.java index c0d2ec4fe..5bcd9e221 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemController.java @@ -2,7 +2,6 @@ package net.citizensnpcs.nms.v1_18_R2.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.craftbukkit.v1_18_R2.CraftServer; import org.bukkit.craftbukkit.v1_18_R2.CraftWorld; import org.bukkit.craftbukkit.v1_18_R2.entity.CraftEntity; @@ -11,8 +10,6 @@ import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack; import org.bukkit.entity.Item; import org.bukkit.util.Vector; -import net.citizensnpcs.api.event.DespawnReason; -import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_18_R2.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; @@ -144,14 +141,5 @@ public class ItemController extends AbstractEntityController { public NPC getNPC() { return npc; } - - public void setType(Material material, int data) { - npc.data().setPersistent(NPC.ITEM_ID_METADATA, material.name()); - npc.data().setPersistent(NPC.ITEM_DATA_METADATA, data); - if (npc.isSpawned()) { - npc.despawn(DespawnReason.PENDING_RESPAWN); - npc.spawn(npc.getStoredLocation(), SpawnReason.RESPAWN); - } - } } } diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/FallingBlockController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/FallingBlockController.java index a9f6c8177..f6fe4f638 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/FallingBlockController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/FallingBlockController.java @@ -2,7 +2,6 @@ package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.craftbukkit.v1_19_R1.CraftServer; import org.bukkit.craftbukkit.v1_19_R1.CraftWorld; import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; @@ -11,8 +10,6 @@ import org.bukkit.craftbukkit.v1_19_R1.util.CraftMagicNumbers; import org.bukkit.entity.FallingBlock; import org.bukkit.util.Vector; -import net.citizensnpcs.api.event.DespawnReason; -import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; @@ -157,14 +154,5 @@ public class FallingBlockController extends AbstractEntityController { public NPC getNPC() { return npc; } - - public void setType(Material material, int data) { - npc.data().setPersistent(NPC.ITEM_ID_METADATA, material.name()); - npc.data().setPersistent(NPC.ITEM_DATA_METADATA, data); - if (npc.isSpawned()) { - npc.despawn(DespawnReason.PENDING_RESPAWN); - npc.spawn(npc.getStoredLocation(), SpawnReason.RESPAWN); - } - } } } diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ItemController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ItemController.java index 572cf3738..3bc0e067e 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ItemController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ItemController.java @@ -2,7 +2,6 @@ package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.craftbukkit.v1_19_R1.CraftServer; import org.bukkit.craftbukkit.v1_19_R1.CraftWorld; import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; @@ -11,8 +10,6 @@ import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack; import org.bukkit.entity.Item; import org.bukkit.util.Vector; -import net.citizensnpcs.api.event.DespawnReason; -import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; @@ -39,8 +36,8 @@ public class ItemController extends AbstractEntityController { @Override protected org.bukkit.entity.Entity createEntity(Location at, NPC npc) { - final EntityItemNPC handle = new EntityItemNPC(((CraftWorld) at.getWorld()).getHandle(), npc, at.getX(), at.getY(), at.getZ(), - CraftItemStack.asNMSCopy(npc.getItemProvider().get())); + final EntityItemNPC handle = new EntityItemNPC(((CraftWorld) at.getWorld()).getHandle(), npc, at.getX(), + at.getY(), at.getZ(), CraftItemStack.asNMSCopy(npc.getItemProvider().get())); return handle.getBukkitEntity(); } @@ -144,14 +141,5 @@ public class ItemController extends AbstractEntityController { public NPC getNPC() { return npc; } - - public void setType(Material material, int data) { - npc.data().setPersistent(NPC.ITEM_ID_METADATA, material.name()); - npc.data().setPersistent(NPC.ITEM_DATA_METADATA, data); - if (npc.isSpawned()) { - npc.despawn(DespawnReason.PENDING_RESPAWN); - npc.spawn(npc.getStoredLocation(), SpawnReason.RESPAWN); - } - } } } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FallingBlockController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FallingBlockController.java index 2c916603e..f631f0174 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FallingBlockController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FallingBlockController.java @@ -2,7 +2,6 @@ package net.citizensnpcs.nms.v1_8_R3.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.craftbukkit.v1_8_R3.CraftServer; import org.bukkit.craftbukkit.v1_8_R3.CraftWorld; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity; @@ -12,8 +11,6 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.FallingBlock; import org.bukkit.util.Vector; -import net.citizensnpcs.api.event.DespawnReason; -import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_8_R3.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; @@ -138,14 +135,5 @@ public class FallingBlockController extends AbstractEntityController { public NPC getNPC() { return npc; } - - public void setType(Material material, int data) { - npc.data().setPersistent(NPC.ITEM_ID_METADATA, material.name()); - npc.data().setPersistent(NPC.ITEM_DATA_METADATA, data); - if (npc.isSpawned()) { - npc.despawn(DespawnReason.PENDING_RESPAWN); - npc.spawn(npc.getStoredLocation(), SpawnReason.RESPAWN); - } - } } } \ No newline at end of file diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ItemController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ItemController.java index 490091e71..08609cf62 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ItemController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ItemController.java @@ -2,7 +2,6 @@ package net.citizensnpcs.nms.v1_8_R3.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.craftbukkit.v1_8_R3.CraftServer; import org.bukkit.craftbukkit.v1_8_R3.CraftWorld; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity; @@ -11,8 +10,6 @@ import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftItemStack; import org.bukkit.entity.Item; import org.bukkit.util.Vector; -import net.citizensnpcs.api.event.DespawnReason; -import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; @@ -119,14 +116,5 @@ public class ItemController extends AbstractEntityController { public NPC getNPC() { return npc; } - - public void setType(Material material, int data) { - npc.data().setPersistent(NPC.ITEM_ID_METADATA, material.name()); - npc.data().setPersistent(NPC.ITEM_DATA_METADATA, data); - if (npc.isSpawned()) { - npc.despawn(DespawnReason.PENDING_RESPAWN); - npc.spawn(npc.getStoredLocation(), SpawnReason.RESPAWN); - } - } } } \ No newline at end of file