Implement particle data testing for 1.20.5 (albeit a bit hacky)

Author: JorelAli

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.20.5/src/main/java/dev/jorel/commandapi/nms/NMS_1_20_R4.java

@@ -662,7 +662,21 @@ public final org.bukkit.loot.LootTable getLootTable(CommandContext<CommandSource
 	@Override
 	public final ParticleData<?> getParticle(CommandContext<CommandSourceStack> cmdCtx, String key) {
 		final ParticleOptions particleOptions = ParticleArgument.getParticle(cmdCtx, key);
-		final Particle particle = CraftParticle.minecraftToBukkit(particleOptions.getType());
+
+		// In our test suite, we can't parse particles via CraftParticle.minecraftToBukkit
+		// on 1.20.3+ because initializing CraftParticle's static constructor requires
+		// implementing a registry. We don't care about a registry for the sake of testing,
+		// all we're actually interested in is testing that the particle data is being parsed
+		// and converted to Bukkit properly, because that's what actually matters. If the
+		// Bukkit#getServer is a CraftServer, that means we're running on a normal (Bukkit/Spigot/Paper)
+		// server. If it isn't, that means we're running in our test environment (i.e. a mocked
+		// server instance), or some weird flavour of Bukkit that we're not supposed to use.
+		final Particle particle;
+		if (Bukkit.getServer() instanceof CraftServer server) {
+			particle = CraftParticle.minecraftToBukkit(particleOptions.getType());
+		} else {
+			particle = null;
+		}
 
 		if (particleOptions instanceof SimpleParticleType) {
 			return new ParticleData<Void>(particle, null);

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-impl-1.20.5/src/main/java/dev/jorel/commandapi/test/ArgumentNMS.java

@@ -782,11 +782,12 @@ public ParticleData<?> getParticle(CommandContext cmdCtx, String key) {
 			Registry<ParticleType<?>> registry = BuiltInRegistries.PARTICLE_TYPE; //CraftRegistry.getMinecraftRegistry(Registries.PARTICLE_TYPE);
 
 			final ParticleOptions particleOptions = ParticleArgument.getParticle(cmdCtx, key);
-			
 			String nmsKey = registry.getResourceKey(particleOptions.getType()).get().location().getPath();
-			result = new ParticleData(map.get(nmsKey), null); //baseNMS.getParticle(cmdCtx, key);
+			result = new ParticleData(map.get(nmsKey), baseNMS.getParticle(cmdCtx, key).data());
 		}
 
+		
+		
 		return result;
 	}
 

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-tests/src/test/java/dev/jorel/commandapi/test/arguments/ArgumentParticleTests.java

@@ -137,9 +137,6 @@ void executionTestWithParticleArgumentDust() {
 
 		// Check the particle type is correct
 		assertEquals(Particle.REDSTONE, result.particle());
-		
-		// TODO: Can't handle particle data yet in 1.20.5
-		assumeTrue(version.lessThan(MCVersion.V1_20_5));
 
 		// Check the particle properties
 		assertEquals(4, result.data().getSize());
@@ -180,9 +177,6 @@ void executionTestWithParticleArgumentDustRandom() {
 
 		// Check the particle type is correct
 		assertEquals(Particle.REDSTONE, result.particle());
-		
-		// TODO: Can't handle particle data yet in 1.20.5
-		assumeTrue(version.lessThan(MCVersion.V1_20_5));
 
 		// Check the particle properties
 		assertEquals(size, result.data().getSize());
@@ -217,9 +211,6 @@ void executionTestWithParticleArgumentBlock() {
 
 		// Check the particle type is correct
 		assertEquals(Particle.BLOCK_CRACK, result.particle());
-		
-		// TODO: Can't handle particle data yet in 1.20.5
-		assumeTrue(version.lessThan(MCVersion.V1_20_5));
 
 		// Check the particle properties
 		assertEquals(Material.GRASS_BLOCK, result.data().getMaterial());
@@ -253,9 +244,6 @@ void executionTestWithParticleArgumentItem() {
 
 		// Check the particle type is correct
 		assertEquals(Particle.ITEM_CRACK, result.particle());
-		
-		// TODO: Can't handle particle data yet in 1.20.5
-		assumeTrue(version.lessThan(MCVersion.V1_20_5));
 
 		// Check the particle properties
 		assertEquals(new ItemStack(Material.APPLE), (ItemStack) result.data());
@@ -290,9 +278,6 @@ void executionTestWithParticleArgumentEntityEffect() {
 
 		// Check the particle type is correct
 		assertEquals(Particle.valueOf("ENTITY_EFFECT"), result.particle());
-		
-		// TODO: Can't handle particle data yet in 1.20.5
-		assumeTrue(version.lessThan(MCVersion.V1_20_5));
 
 		// Check the particle properties
 		assertEquals(255, result.data().getRed());