Remove some dead code

CitizensDev · Dec 3, 2022 · c935caa · c935caa
1 parent ac387b2
commit c935caa
Show file tree

Hide file tree

Showing 24 changed files with 3 additions and 308 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/WorldPlayerCache.java b/main/src/main/java/net/citizensnpcs/WorldPlayerCache.java
diff --git 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 NPC createNPCUsingItem(EntityType type, String name, ItemStack item) {
         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/.../src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FallingBlockController.java b/.../src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FallingBlockController.java
@@ -2,7 +2,6 @@
 
 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.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 FallingBlockNPC(EntityFallingBlockNPC entity) {
         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_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 @@
 
 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.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 ItemNPC(EntityItemNPC entity) {
         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/.../src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FallingBlockController.java b/.../src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FallingBlockController.java
@@ -2,7 +2,6 @@
 
 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.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 FallingBlockNPC(EntityFallingBlockNPC entity) {
         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_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 @@
 
 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.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 ItemNPC(EntityItemNPC entity) {
         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/.../src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FallingBlockController.java b/.../src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FallingBlockController.java
@@ -2,7 +2,6 @@
 
 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.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 FallingBlockNPC(EntityFallingBlockNPC entity) {
         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_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 @@
 
 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.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 ItemNPC(EntityItemNPC entity) {
         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/.../src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FallingBlockController.java b/.../src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FallingBlockController.java
@@ -2,7 +2,6 @@
 
 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.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 FallingBlockNPC(EntityFallingBlockNPC entity) {
         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_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 @@
 
 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.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 ItemNPC(EntityItemNPC entity) {
         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/.../src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FallingBlockController.java b/.../src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FallingBlockController.java
@@ -2,7 +2,6 @@
 
 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.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 FallingBlockNPC(EntityFallingBlockNPC entity) {
         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
@@ -2,7 +2,6 @@
 
 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.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 ItemNPC(EntityItemNPC entity) {
         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);
-            }
-        }
     }
 }