diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java
index 477629b3e..62a6cab69 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java
@@ -143,6 +143,7 @@ import net.citizensnpcs.nms.v1_10_R1.entity.nonliving.MinecartCommandController;
 import net.citizensnpcs.nms.v1_10_R1.entity.nonliving.MinecartFurnaceController;
 import net.citizensnpcs.nms.v1_10_R1.entity.nonliving.MinecartHopperController;
 import net.citizensnpcs.nms.v1_10_R1.entity.nonliving.MinecartRideableController;
+import net.citizensnpcs.nms.v1_10_R1.entity.nonliving.MinecartSpawnerController;
 import net.citizensnpcs.nms.v1_10_R1.entity.nonliving.MinecartTNTController;
 import net.citizensnpcs.nms.v1_10_R1.entity.nonliving.PaintingController;
 import net.citizensnpcs.nms.v1_10_R1.entity.nonliving.ShulkerBulletController;
@@ -762,6 +763,7 @@ public class NMSImpl implements NMSBridge {
         EntityControllers.setEntityControllerForType(EntityType.MINECART_FURNACE, MinecartFurnaceController.class);
         EntityControllers.setEntityControllerForType(EntityType.MINECART_HOPPER, MinecartHopperController.class);
         EntityControllers.setEntityControllerForType(EntityType.MINECART_TNT, MinecartTNTController.class);
+        EntityControllers.setEntityControllerForType(EntityType.MINECART_MOB_SPAWNER, MinecartSpawnerController.class);
         EntityControllers.setEntityControllerForType(EntityType.MUSHROOM_COW, MushroomCowController.class);
         EntityControllers.setEntityControllerForType(EntityType.OCELOT, OcelotController.class);
         EntityControllers.setEntityControllerForType(EntityType.PAINTING, PaintingController.class);
@@ -784,7 +786,7 @@ public class NMSImpl implements NMSBridge {
         EntityControllers.setEntityControllerForType(EntityType.SPLASH_POTION, ThrownPotionController.class);
         EntityControllers.setEntityControllerForType(EntityType.SQUID, SquidController.class);
         EntityControllers.setEntityControllerForType(EntityType.EXPERIENCE_ORB, ExperienceOrbController.class);
-        EntityControllers.setEntityControllerForType(EntityType.TIPPED_ARROW, TippedArrowController.class);
+        EntityControllers.setEntityControllerForType(EntityType.SPECTRAL_ARROW, SpectralArrowController.class);
         EntityControllers.setEntityControllerForType(EntityType.THROWN_EXP_BOTTLE, ThrownExpBottleController.class);
         EntityControllers.setEntityControllerForType(EntityType.PRIMED_TNT, TNTPrimedController.class);
         EntityControllers.setEntityControllerForType(EntityType.VILLAGER, VillagerController.class);
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java
index 40e09b828..5489aeb94 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java
@@ -158,6 +158,7 @@ import net.citizensnpcs.nms.v1_11_R1.entity.nonliving.MinecartCommandController;
 import net.citizensnpcs.nms.v1_11_R1.entity.nonliving.MinecartFurnaceController;
 import net.citizensnpcs.nms.v1_11_R1.entity.nonliving.MinecartHopperController;
 import net.citizensnpcs.nms.v1_11_R1.entity.nonliving.MinecartRideableController;
+import net.citizensnpcs.nms.v1_11_R1.entity.nonliving.MinecartSpawnerController;
 import net.citizensnpcs.nms.v1_11_R1.entity.nonliving.MinecartTNTController;
 import net.citizensnpcs.nms.v1_11_R1.entity.nonliving.PaintingController;
 import net.citizensnpcs.nms.v1_11_R1.entity.nonliving.ShulkerBulletController;
@@ -810,6 +811,7 @@ public class NMSImpl implements NMSBridge {
         EntityControllers.setEntityControllerForType(EntityType.MINECART_FURNACE, MinecartFurnaceController.class);
         EntityControllers.setEntityControllerForType(EntityType.MINECART_HOPPER, MinecartHopperController.class);
         EntityControllers.setEntityControllerForType(EntityType.MINECART_TNT, MinecartTNTController.class);
+        EntityControllers.setEntityControllerForType(EntityType.MINECART_MOB_SPAWNER, MinecartSpawnerController.class);
         EntityControllers.setEntityControllerForType(EntityType.MUSHROOM_COW, MushroomCowController.class);
         EntityControllers.setEntityControllerForType(EntityType.OCELOT, OcelotController.class);
         EntityControllers.setEntityControllerForType(EntityType.PAINTING, PaintingController.class);
@@ -833,7 +835,7 @@ public class NMSImpl implements NMSBridge {
         EntityControllers.setEntityControllerForType(EntityType.SPLASH_POTION, ThrownPotionController.class);
         EntityControllers.setEntityControllerForType(EntityType.SQUID, SquidController.class);
         EntityControllers.setEntityControllerForType(EntityType.EXPERIENCE_ORB, ExperienceOrbController.class);
-        EntityControllers.setEntityControllerForType(EntityType.TIPPED_ARROW, TippedArrowController.class);
+        EntityControllers.setEntityControllerForType(EntityType.SPECTRAL_ARROW, SpectralArrowController.class);
         EntityControllers.setEntityControllerForType(EntityType.THROWN_EXP_BOTTLE, ThrownExpBottleController.class);
         EntityControllers.setEntityControllerForType(EntityType.PRIMED_TNT, TNTPrimedController.class);
         EntityControllers.setEntityControllerForType(EntityType.VEX, VexController.class);
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java
index eb296540c..18f6e2fad 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java
@@ -161,6 +161,7 @@ import net.citizensnpcs.nms.v1_12_R1.entity.nonliving.MinecartCommandController;
 import net.citizensnpcs.nms.v1_12_R1.entity.nonliving.MinecartFurnaceController;
 import net.citizensnpcs.nms.v1_12_R1.entity.nonliving.MinecartHopperController;
 import net.citizensnpcs.nms.v1_12_R1.entity.nonliving.MinecartRideableController;
+import net.citizensnpcs.nms.v1_12_R1.entity.nonliving.MinecartSpawnerController;
 import net.citizensnpcs.nms.v1_12_R1.entity.nonliving.MinecartTNTController;
 import net.citizensnpcs.nms.v1_12_R1.entity.nonliving.PaintingController;
 import net.citizensnpcs.nms.v1_12_R1.entity.nonliving.ShulkerBulletController;
@@ -814,6 +815,7 @@ public class NMSImpl implements NMSBridge {
         EntityControllers.setEntityControllerForType(EntityType.MINECART_FURNACE, MinecartFurnaceController.class);
         EntityControllers.setEntityControllerForType(EntityType.MINECART_HOPPER, MinecartHopperController.class);
         EntityControllers.setEntityControllerForType(EntityType.MINECART_TNT, MinecartTNTController.class);
+        EntityControllers.setEntityControllerForType(EntityType.MINECART_MOB_SPAWNER, MinecartSpawnerController.class);
         EntityControllers.setEntityControllerForType(EntityType.MUSHROOM_COW, MushroomCowController.class);
         EntityControllers.setEntityControllerForType(EntityType.OCELOT, OcelotController.class);
         EntityControllers.setEntityControllerForType(EntityType.PAINTING, PaintingController.class);
@@ -838,7 +840,7 @@ public class NMSImpl implements NMSBridge {
         EntityControllers.setEntityControllerForType(EntityType.SPLASH_POTION, ThrownPotionController.class);
         EntityControllers.setEntityControllerForType(EntityType.SQUID, SquidController.class);
         EntityControllers.setEntityControllerForType(EntityType.EXPERIENCE_ORB, ExperienceOrbController.class);
-        EntityControllers.setEntityControllerForType(EntityType.TIPPED_ARROW, TippedArrowController.class);
+        EntityControllers.setEntityControllerForType(EntityType.SPECTRAL_ARROW, SpectralArrowController.class);
         EntityControllers.setEntityControllerForType(EntityType.THROWN_EXP_BOTTLE, ThrownExpBottleController.class);
         EntityControllers.setEntityControllerForType(EntityType.PRIMED_TNT, TNTPrimedController.class);
         EntityControllers.setEntityControllerForType(EntityType.VEX, VexController.class);
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java
index a7310f03b..631200b58 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java
@@ -169,6 +169,7 @@ import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.MinecartCommandController;
 import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.MinecartFurnaceController;
 import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.MinecartHopperController;
 import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.MinecartRideableController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.MinecartSpawnerController;
 import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.MinecartTNTController;
 import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.PaintingController;
 import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.ShulkerBulletController;
@@ -844,6 +845,7 @@ public class NMSImpl implements NMSBridge {
         EntityControllers.setEntityControllerForType(EntityType.MINECART_HOPPER, MinecartHopperController.class);
         EntityControllers.setEntityControllerForType(EntityType.MINECART_TNT, MinecartTNTController.class);
         EntityControllers.setEntityControllerForType(EntityType.MUSHROOM_COW, MushroomCowController.class);
+        EntityControllers.setEntityControllerForType(EntityType.MINECART_MOB_SPAWNER, MinecartSpawnerController.class);
         EntityControllers.setEntityControllerForType(EntityType.OCELOT, OcelotController.class);
         EntityControllers.setEntityControllerForType(EntityType.PAINTING, PaintingController.class);
         EntityControllers.setEntityControllerForType(EntityType.PARROT, ParrotController.class);
@@ -870,7 +872,7 @@ public class NMSImpl implements NMSBridge {
         EntityControllers.setEntityControllerForType(EntityType.SPLASH_POTION, ThrownPotionController.class);
         EntityControllers.setEntityControllerForType(EntityType.SQUID, SquidController.class);
         EntityControllers.setEntityControllerForType(EntityType.EXPERIENCE_ORB, ExperienceOrbController.class);
-        EntityControllers.setEntityControllerForType(EntityType.TIPPED_ARROW, TippedArrowController.class);
+        EntityControllers.setEntityControllerForType(EntityType.SPECTRAL_ARROW, SpectralArrowController.class);
         EntityControllers.setEntityControllerForType(EntityType.THROWN_EXP_BOTTLE, ThrownExpBottleController.class);
         EntityControllers.setEntityControllerForType(EntityType.TRIDENT, ThrownTridentController.class);
         EntityControllers.setEntityControllerForType(EntityType.TROPICAL_FISH, TropicalFishController.class);
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java
index fcf164eb6..d3d8d83f6 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java
@@ -173,6 +173,7 @@ import net.citizensnpcs.nms.v1_14_R1.entity.nonliving.MinecartCommandController;
 import net.citizensnpcs.nms.v1_14_R1.entity.nonliving.MinecartFurnaceController;
 import net.citizensnpcs.nms.v1_14_R1.entity.nonliving.MinecartHopperController;
 import net.citizensnpcs.nms.v1_14_R1.entity.nonliving.MinecartRideableController;
+import net.citizensnpcs.nms.v1_14_R1.entity.nonliving.MinecartSpawnerController;
 import net.citizensnpcs.nms.v1_14_R1.entity.nonliving.MinecartTNTController;
 import net.citizensnpcs.nms.v1_14_R1.entity.nonliving.PaintingController;
 import net.citizensnpcs.nms.v1_14_R1.entity.nonliving.ShulkerBulletController;
@@ -908,6 +909,7 @@ public class NMSImpl implements NMSBridge {
         EntityControllers.setEntityControllerForType(EntityType.MINECART_HOPPER, MinecartHopperController.class);
         EntityControllers.setEntityControllerForType(EntityType.MINECART_TNT, MinecartTNTController.class);
         EntityControllers.setEntityControllerForType(EntityType.MUSHROOM_COW, MushroomCowController.class);
+        EntityControllers.setEntityControllerForType(EntityType.MINECART_MOB_SPAWNER, MinecartSpawnerController.class);
         EntityControllers.setEntityControllerForType(EntityType.OCELOT, OcelotController.class);
         EntityControllers.setEntityControllerForType(EntityType.PANDA, PandaController.class);
         EntityControllers.setEntityControllerForType(EntityType.PAINTING, PaintingController.class);
@@ -937,6 +939,7 @@ public class NMSImpl implements NMSBridge {
         EntityControllers.setEntityControllerForType(EntityType.SPLASH_POTION, ThrownPotionController.class);
         EntityControllers.setEntityControllerForType(EntityType.SQUID, SquidController.class);
         EntityControllers.setEntityControllerForType(EntityType.EXPERIENCE_ORB, ExperienceOrbController.class);
+        EntityControllers.setEntityControllerForType(EntityType.SPECTRAL_ARROW, SpectralArrowController.class);
         EntityControllers.setEntityControllerForType(EntityType.THROWN_EXP_BOTTLE, ThrownExpBottleController.class);
         EntityControllers.setEntityControllerForType(EntityType.TRIDENT, ThrownTridentController.class);
         EntityControllers.setEntityControllerForType(EntityType.TROPICAL_FISH, TropicalFishController.class);
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java
index becc0c103..1d2d5530e 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java
@@ -174,6 +174,7 @@ import net.citizensnpcs.nms.v1_15_R1.entity.nonliving.MinecartCommandController;
 import net.citizensnpcs.nms.v1_15_R1.entity.nonliving.MinecartFurnaceController;
 import net.citizensnpcs.nms.v1_15_R1.entity.nonliving.MinecartHopperController;
 import net.citizensnpcs.nms.v1_15_R1.entity.nonliving.MinecartRideableController;
+import net.citizensnpcs.nms.v1_15_R1.entity.nonliving.MinecartSpawnerController;
 import net.citizensnpcs.nms.v1_15_R1.entity.nonliving.MinecartTNTController;
 import net.citizensnpcs.nms.v1_15_R1.entity.nonliving.PaintingController;
 import net.citizensnpcs.nms.v1_15_R1.entity.nonliving.ShulkerBulletController;
@@ -925,6 +926,7 @@ public class NMSImpl implements NMSBridge {
         EntityControllers.setEntityControllerForType(EntityType.MINECART_HOPPER, MinecartHopperController.class);
         EntityControllers.setEntityControllerForType(EntityType.MINECART_TNT, MinecartTNTController.class);
         EntityControllers.setEntityControllerForType(EntityType.MUSHROOM_COW, MushroomCowController.class);
+        EntityControllers.setEntityControllerForType(EntityType.MINECART_MOB_SPAWNER, MinecartSpawnerController.class);
         EntityControllers.setEntityControllerForType(EntityType.OCELOT, OcelotController.class);
         EntityControllers.setEntityControllerForType(EntityType.PANDA, PandaController.class);
         EntityControllers.setEntityControllerForType(EntityType.PAINTING, PaintingController.class);
@@ -954,6 +956,7 @@ public class NMSImpl implements NMSBridge {
         EntityControllers.setEntityControllerForType(EntityType.SPLASH_POTION, ThrownPotionController.class);
         EntityControllers.setEntityControllerForType(EntityType.SQUID, SquidController.class);
         EntityControllers.setEntityControllerForType(EntityType.EXPERIENCE_ORB, ExperienceOrbController.class);
+        EntityControllers.setEntityControllerForType(EntityType.SPECTRAL_ARROW, SpectralArrowController.class);
         EntityControllers.setEntityControllerForType(EntityType.THROWN_EXP_BOTTLE, ThrownExpBottleController.class);
         EntityControllers.setEntityControllerForType(EntityType.TRIDENT, ThrownTridentController.class);
         EntityControllers.setEntityControllerForType(EntityType.TROPICAL_FISH, TropicalFishController.class);
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java
index e578b625a..7046917f0 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java
@@ -180,6 +180,7 @@ import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.MinecartCommandController;
 import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.MinecartFurnaceController;
 import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.MinecartHopperController;
 import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.MinecartRideableController;
+import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.MinecartSpawnerController;
 import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.MinecartTNTController;
 import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.PaintingController;
 import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.ShulkerBulletController;
@@ -949,6 +950,7 @@ public class NMSImpl implements NMSBridge {
         EntityControllers.setEntityControllerForType(EntityType.MINECART_HOPPER, MinecartHopperController.class);
         EntityControllers.setEntityControllerForType(EntityType.MINECART_TNT, MinecartTNTController.class);
         EntityControllers.setEntityControllerForType(EntityType.MUSHROOM_COW, MushroomCowController.class);
+        EntityControllers.setEntityControllerForType(EntityType.MINECART_MOB_SPAWNER, MinecartSpawnerController.class);
         EntityControllers.setEntityControllerForType(EntityType.OCELOT, OcelotController.class);
         EntityControllers.setEntityControllerForType(EntityType.PANDA, PandaController.class);
         EntityControllers.setEntityControllerForType(EntityType.PAINTING, PaintingController.class);
@@ -983,6 +985,7 @@ public class NMSImpl implements NMSBridge {
         EntityControllers.setEntityControllerForType(EntityType.SPLASH_POTION, ThrownPotionController.class);
         EntityControllers.setEntityControllerForType(EntityType.SQUID, SquidController.class);
         EntityControllers.setEntityControllerForType(EntityType.EXPERIENCE_ORB, ExperienceOrbController.class);
+        EntityControllers.setEntityControllerForType(EntityType.SPECTRAL_ARROW, SpectralArrowController.class);
         EntityControllers.setEntityControllerForType(EntityType.THROWN_EXP_BOTTLE, ThrownExpBottleController.class);
         EntityControllers.setEntityControllerForType(EntityType.TRIDENT, ThrownTridentController.class);
         EntityControllers.setEntityControllerForType(EntityType.TROPICAL_FISH, TropicalFishController.class);
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java
index ff15a32c3..05a5ad7e9 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java
@@ -180,6 +180,7 @@ import net.citizensnpcs.nms.v1_17_R1.entity.nonliving.MinecartCommandController;
 import net.citizensnpcs.nms.v1_17_R1.entity.nonliving.MinecartFurnaceController;
 import net.citizensnpcs.nms.v1_17_R1.entity.nonliving.MinecartHopperController;
 import net.citizensnpcs.nms.v1_17_R1.entity.nonliving.MinecartRideableController;
+import net.citizensnpcs.nms.v1_17_R1.entity.nonliving.MinecartSpawnerController;
 import net.citizensnpcs.nms.v1_17_R1.entity.nonliving.MinecartTNTController;
 import net.citizensnpcs.nms.v1_17_R1.entity.nonliving.PaintingController;
 import net.citizensnpcs.nms.v1_17_R1.entity.nonliving.ShulkerBulletController;
@@ -956,6 +957,7 @@ public class NMSImpl implements NMSBridge {
         EntityControllers.setEntityControllerForType(EntityType.MINECART_FURNACE, MinecartFurnaceController.class);
         EntityControllers.setEntityControllerForType(EntityType.MINECART_HOPPER, MinecartHopperController.class);
         EntityControllers.setEntityControllerForType(EntityType.MINECART_TNT, MinecartTNTController.class);
+        EntityControllers.setEntityControllerForType(EntityType.MINECART_MOB_SPAWNER, MinecartSpawnerController.class);
         EntityControllers.setEntityControllerForType(EntityType.MUSHROOM_COW, MushroomCowController.class);
         EntityControllers.setEntityControllerForType(EntityType.OCELOT, OcelotController.class);
         EntityControllers.setEntityControllerForType(EntityType.PANDA, PandaController.class);
@@ -992,6 +994,7 @@ public class NMSImpl implements NMSBridge {
         EntityControllers.setEntityControllerForType(EntityType.SQUID, SquidController.class);
         EntityControllers.setEntityControllerForType(EntityType.EXPERIENCE_ORB, ExperienceOrbController.class);
         EntityControllers.setEntityControllerForType(EntityType.GLOW_SQUID, GlowSquidController.class);
+        EntityControllers.setEntityControllerForType(EntityType.SPECTRAL_ARROW, SpectralArrowController.class);
         EntityControllers.setEntityControllerForType(EntityType.THROWN_EXP_BOTTLE, ThrownExpBottleController.class);
         EntityControllers.setEntityControllerForType(EntityType.TRIDENT, ThrownTridentController.class);
         EntityControllers.setEntityControllerForType(EntityType.TROPICAL_FISH, TropicalFishController.class);
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java
index daead3fb9..444767419 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java
@@ -181,6 +181,7 @@ import net.citizensnpcs.nms.v1_18_R2.entity.nonliving.MinecartCommandController;
 import net.citizensnpcs.nms.v1_18_R2.entity.nonliving.MinecartFurnaceController;
 import net.citizensnpcs.nms.v1_18_R2.entity.nonliving.MinecartHopperController;
 import net.citizensnpcs.nms.v1_18_R2.entity.nonliving.MinecartRideableController;
+import net.citizensnpcs.nms.v1_18_R2.entity.nonliving.MinecartSpawnerController;
 import net.citizensnpcs.nms.v1_18_R2.entity.nonliving.MinecartTNTController;
 import net.citizensnpcs.nms.v1_18_R2.entity.nonliving.PaintingController;
 import net.citizensnpcs.nms.v1_18_R2.entity.nonliving.ShulkerBulletController;
@@ -964,6 +965,7 @@ public class NMSImpl implements NMSBridge {
         EntityControllers.setEntityControllerForType(EntityType.MINECART_HOPPER, MinecartHopperController.class);
         EntityControllers.setEntityControllerForType(EntityType.MINECART_TNT, MinecartTNTController.class);
         EntityControllers.setEntityControllerForType(EntityType.MUSHROOM_COW, MushroomCowController.class);
+        EntityControllers.setEntityControllerForType(EntityType.MINECART_MOB_SPAWNER, MinecartSpawnerController.class);
         EntityControllers.setEntityControllerForType(EntityType.OCELOT, OcelotController.class);
         EntityControllers.setEntityControllerForType(EntityType.PANDA, PandaController.class);
         EntityControllers.setEntityControllerForType(EntityType.PAINTING, PaintingController.class);
@@ -999,6 +1001,7 @@ public class NMSImpl implements NMSBridge {
         EntityControllers.setEntityControllerForType(EntityType.SQUID, SquidController.class);
         EntityControllers.setEntityControllerForType(EntityType.EXPERIENCE_ORB, ExperienceOrbController.class);
         EntityControllers.setEntityControllerForType(EntityType.GLOW_SQUID, GlowSquidController.class);
+        EntityControllers.setEntityControllerForType(EntityType.SPECTRAL_ARROW, SpectralArrowController.class);
         EntityControllers.setEntityControllerForType(EntityType.THROWN_EXP_BOTTLE, ThrownExpBottleController.class);
         EntityControllers.setEntityControllerForType(EntityType.TRIDENT, ThrownTridentController.class);
         EntityControllers.setEntityControllerForType(EntityType.TROPICAL_FISH, TropicalFishController.class);
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
index b39d6bfe5..c26cca4c5 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
@@ -198,6 +198,7 @@ import net.citizensnpcs.nms.v1_19_R3.entity.nonliving.MinecartCommandController;
 import net.citizensnpcs.nms.v1_19_R3.entity.nonliving.MinecartFurnaceController;
 import net.citizensnpcs.nms.v1_19_R3.entity.nonliving.MinecartHopperController;
 import net.citizensnpcs.nms.v1_19_R3.entity.nonliving.MinecartRideableController;
+import net.citizensnpcs.nms.v1_19_R3.entity.nonliving.MinecartSpawnerController;
 import net.citizensnpcs.nms.v1_19_R3.entity.nonliving.MinecartTNTController;
 import net.citizensnpcs.nms.v1_19_R3.entity.nonliving.PaintingController;
 import net.citizensnpcs.nms.v1_19_R3.entity.nonliving.ShulkerBulletController;
@@ -1022,6 +1023,7 @@ public class NMSImpl implements NMSBridge {
         EntityControllers.setEntityControllerForType(EntityType.MINECART_FURNACE, MinecartFurnaceController.class);
         EntityControllers.setEntityControllerForType(EntityType.MINECART_HOPPER, MinecartHopperController.class);
         EntityControllers.setEntityControllerForType(EntityType.MINECART_TNT, MinecartTNTController.class);
+        EntityControllers.setEntityControllerForType(EntityType.MINECART_MOB_SPAWNER, MinecartSpawnerController.class);
         EntityControllers.setEntityControllerForType(EntityType.MUSHROOM_COW, MushroomCowController.class);
         EntityControllers.setEntityControllerForType(EntityType.OCELOT, OcelotController.class);
         EntityControllers.setEntityControllerForType(EntityType.PANDA, PandaController.class);
@@ -1058,6 +1060,7 @@ public class NMSImpl implements NMSBridge {
         EntityControllers.setEntityControllerForType(EntityType.SQUID, SquidController.class);
         EntityControllers.setEntityControllerForType(EntityType.EXPERIENCE_ORB, ExperienceOrbController.class);
         EntityControllers.setEntityControllerForType(EntityType.GLOW_SQUID, GlowSquidController.class);
+        EntityControllers.setEntityControllerForType(EntityType.SPECTRAL_ARROW, SpectralArrowController.class);
         EntityControllers.setEntityControllerForType(EntityType.THROWN_EXP_BOTTLE, ThrownExpBottleController.class);
         EntityControllers.setEntityControllerForType(EntityType.TRIDENT, ThrownTridentController.class);
         EntityControllers.setEntityControllerForType(EntityType.TROPICAL_FISH, TropicalFishController.class);
diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java
index a1fb8058a..f55db83d0 100644
--- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java
+++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java
@@ -198,6 +198,7 @@ import net.citizensnpcs.nms.v1_20_R4.entity.nonliving.MinecartCommandController;
 import net.citizensnpcs.nms.v1_20_R4.entity.nonliving.MinecartFurnaceController;
 import net.citizensnpcs.nms.v1_20_R4.entity.nonliving.MinecartHopperController;
 import net.citizensnpcs.nms.v1_20_R4.entity.nonliving.MinecartRideableController;
+import net.citizensnpcs.nms.v1_20_R4.entity.nonliving.MinecartSpawnerController;
 import net.citizensnpcs.nms.v1_20_R4.entity.nonliving.MinecartTNTController;
 import net.citizensnpcs.nms.v1_20_R4.entity.nonliving.OminousItemSpawnerController;
 import net.citizensnpcs.nms.v1_20_R4.entity.nonliving.PaintingController;
@@ -1053,6 +1054,7 @@ public class NMSImpl implements NMSBridge {
         EntityControllers.setEntityControllerForType(EntityType.LLAMA_SPIT, LlamaSpitController.class);
         EntityControllers.setEntityControllerForType(EntityType.MAGMA_CUBE, MagmaCubeController.class);
         EntityControllers.setEntityControllerForType(EntityType.MARKER, MarkerController.class);
+        EntityControllers.setEntityControllerForType(EntityType.SPAWNER_MINECART, MinecartSpawnerController.class);
         EntityControllers.setEntityControllerForType(EntityType.MINECART, MinecartRideableController.class);
         EntityControllers.setEntityControllerForType(EntityType.MOOSHROOM, MushroomCowController.class);
         EntityControllers.setEntityControllerForType(EntityType.MULE, HorseMuleController.class);
diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java
index d4f572650..08a742d8b 100644
--- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java
+++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java
@@ -198,6 +198,7 @@ import net.citizensnpcs.nms.v1_21_R1.entity.nonliving.MinecartCommandController;
 import net.citizensnpcs.nms.v1_21_R1.entity.nonliving.MinecartFurnaceController;
 import net.citizensnpcs.nms.v1_21_R1.entity.nonliving.MinecartHopperController;
 import net.citizensnpcs.nms.v1_21_R1.entity.nonliving.MinecartRideableController;
+import net.citizensnpcs.nms.v1_21_R1.entity.nonliving.MinecartSpawnerController;
 import net.citizensnpcs.nms.v1_21_R1.entity.nonliving.MinecartTNTController;
 import net.citizensnpcs.nms.v1_21_R1.entity.nonliving.OminousItemSpawnerController;
 import net.citizensnpcs.nms.v1_21_R1.entity.nonliving.PaintingController;
@@ -1033,6 +1034,7 @@ public class NMSImpl implements NMSBridge {
         EntityControllers.setEntityControllerForType(EntityType.MAGMA_CUBE, MagmaCubeController.class);
         EntityControllers.setEntityControllerForType(EntityType.MARKER, MarkerController.class);
         EntityControllers.setEntityControllerForType(EntityType.MINECART, MinecartRideableController.class);
+        EntityControllers.setEntityControllerForType(EntityType.SPAWNER_MINECART, MinecartSpawnerController.class);
         EntityControllers.setEntityControllerForType(EntityType.MOOSHROOM, MushroomCowController.class);
         EntityControllers.setEntityControllerForType(EntityType.MULE, HorseMuleController.class);
         EntityControllers.setEntityControllerForType(EntityType.OCELOT, OcelotController.class);
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java
index 314913dea..9184c7265 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java
@@ -136,6 +136,7 @@ import net.citizensnpcs.nms.v1_8_R3.entity.nonliving.MinecartCommandController;
 import net.citizensnpcs.nms.v1_8_R3.entity.nonliving.MinecartFurnaceController;
 import net.citizensnpcs.nms.v1_8_R3.entity.nonliving.MinecartHopperController;
 import net.citizensnpcs.nms.v1_8_R3.entity.nonliving.MinecartRideableController;
+import net.citizensnpcs.nms.v1_8_R3.entity.nonliving.MinecartSpawnerController;
 import net.citizensnpcs.nms.v1_8_R3.entity.nonliving.MinecartTNTController;
 import net.citizensnpcs.nms.v1_8_R3.entity.nonliving.PaintingController;
 import net.citizensnpcs.nms.v1_8_R3.entity.nonliving.SmallFireballController;
@@ -705,6 +706,7 @@ public class NMSImpl implements NMSBridge {
         EntityControllers.setEntityControllerForType(EntityType.MINECART_FURNACE, MinecartFurnaceController.class);
         EntityControllers.setEntityControllerForType(EntityType.MINECART_HOPPER, MinecartHopperController.class);
         EntityControllers.setEntityControllerForType(EntityType.MINECART_TNT, MinecartTNTController.class);
+        EntityControllers.setEntityControllerForType(EntityType.MINECART_MOB_SPAWNER, MinecartSpawnerController.class);
         EntityControllers.setEntityControllerForType(EntityType.MUSHROOM_COW, MushroomCowController.class);
         EntityControllers.setEntityControllerForType(EntityType.OCELOT, OcelotController.class);
         EntityControllers.setEntityControllerForType(EntityType.PAINTING, PaintingController.class);