1 files changed, 20 insertions, 5 deletions
diff --git a/src/test/java/org/bukkit/ParticleTest.java b/src/test/java/org/bukkit/ParticleTest.java
index c00869ba..c0cb4a1e 100644
--- a/src/test/java/org/bukkit/ParticleTest.java
+++ b/src/test/java/org/bukkit/ParticleTest.java
@@ -1,19 +1,34 @@
 package org.bukkit;
 
-import net.minecraft.server.EnumParticle;
+import org.bukkit.block.data.BlockData;
 import org.bukkit.craftbukkit.CraftParticle;
+import org.bukkit.craftbukkit.block.data.CraftBlockData;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.material.MaterialData;
+import org.bukkit.support.AbstractTestingBase;
 import org.junit.Assert;
 import org.junit.Test;
 
-public class ParticleTest {
+public class ParticleTest extends AbstractTestingBase {
 
     @Test
     public void verifyMapping() {
         for (Particle bukkit : Particle.values()) {
-            Assert.assertNotNull("Missing Bukkit->NMS particle mapping", CraftParticle.toNMS(bukkit));
+            Object data = null;
+            if (bukkit.getDataType().equals(ItemStack.class)) {
+                data = new ItemStack(Material.STONE);
+            } else if (bukkit.getDataType() == MaterialData.class) {
+                data = new MaterialData(Material.LEGACY_STONE);
+            } else if (bukkit.getDataType() == Particle.DustOptions.class) {
+                data = new Particle.DustOptions(Color.BLACK, 0);
+            } else if (bukkit.getDataType() == BlockData.class) {
+                data = CraftBlockData.newData(Material.STONE, "");
+            }
+
+            Assert.assertNotNull("Missing Bukkit->NMS particle mapping for " + bukkit, CraftParticle.toNMS(bukkit, data));
         }
-        for (EnumParticle nms : EnumParticle.values()) {
-            Assert.assertNotNull("Missing NMS->Bukkit particle mapping", CraftParticle.toBukkit(nms));
+        for (net.minecraft.server.Particle nms : (Iterable<net.minecraft.server.Particle<?>>) net.minecraft.server.Particle.REGISTRY) { // Eclipse fail
+            Assert.assertNotNull("Missing NMS->Bukkit particle mapping for " + nms, CraftParticle.toBukkit(nms));
         }
     }
 }