Poke around with particles for 1.20.5. Doesn't work until MockBukkit updates

Author: JorelAli

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

@@ -15,9 +15,13 @@
 import org.bukkit.Location;
 import org.bukkit.NamespacedKey;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.Particle;
 import org.bukkit.World;
+import org.bukkit.Registry.SimpleRegistry;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.BlockData;
+import org.bukkit.craftbukkit.v1_20_R4.CraftParticle;
+import org.bukkit.craftbukkit.v1_20_R4.util.CraftNamespacedKey;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
@@ -27,6 +31,7 @@
 import org.bukkit.potion.PotionEffectType;
 import org.bukkit.scoreboard.Objective;
 import org.bukkit.scoreboard.Team;
+import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 
 import com.mojang.brigadier.Message;
@@ -61,8 +66,11 @@
 import net.minecraft.core.Holder;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.HolderOwner;
+import net.minecraft.core.Registry;
+import net.minecraft.core.particles.ParticleType;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.RegistryOps;
 import net.minecraft.resources.ResourceKey;
 
 /**
@@ -241,6 +249,9 @@ public ArgumentType<?> _ArgumentParticle() {
 		Mockito
 			.when(buildContextMock.lookupOrThrow(any(ResourceKey.class)))
 			.thenReturn(Optional.of(BuiltInRegistries.PARTICLE_TYPE.asLookup()).orElseThrow()); // Registry.PARTICLE_TYPE
+		Mockito
+			.when(buildContextMock.createSerializationContext(any()))
+			.thenAnswer(a -> RegistryOps.create(a.getArgument(0), buildContextMock));
 		return ParticleArgument.particle(buildContextMock);
 	}
 
@@ -531,7 +542,28 @@ public OfflinePlayer getOfflinePlayer(CommandContext cmdCtx, String key) throws
 
 	@Override
 	public ParticleData<?> getParticle(CommandContext cmdCtx, String key) {
-		return baseNMS.getParticle(cmdCtx, key);
+		
+		final ParticleData<?> result;
+		
+		try (MockedStatic<CraftParticle> craftParticle = Mockito.mockStatic(CraftParticle.class)) {
+			craftParticle.when(() -> CraftParticle.minecraftToBukkit(any()))
+			.thenAnswer(args -> {
+				ParticleType minecraft = args.getArgument(0, ParticleType.class);
+				
+				
+				Registry<ParticleType<?>> registry = BuiltInRegistries.PARTICLE_TYPE; //CraftRegistry.getMinecraftRegistry(Registries.PARTICLE_TYPE);
+				org.bukkit.Registry.PARTICLE_TYPE
+				// new SimpleRegistry(Particle.class, (par) -> par.register);
+				
+				Particle bukkit = (Particle) org.bukkit.Registry.PARTICLE_TYPE.get(CraftNamespacedKey
+						.fromMinecraft(((ResourceKey) registry.getResourceKey(minecraft).orElseThrow()).location()));
+				return bukkit;
+			});
+			
+			result = baseNMS.getParticle(cmdCtx, key);
+		}
+		
+		return result;
 	}
 
 	@Override

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

@@ -30,9 +30,11 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.SimpleCommandMap;
 import org.bukkit.craftbukkit.v1_20_R4.CraftParticle;
+import org.bukkit.craftbukkit.v1_20_R4.CraftRegistry;
 import org.bukkit.craftbukkit.v1_20_R4.CraftWorld;
 import org.bukkit.craftbukkit.v1_20_R4.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_20_R4.inventory.CraftItemFactory;
+import org.bukkit.craftbukkit.v1_20_R4.util.CraftNamespacedKey;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
 import org.bukkit.help.HelpTopic;
@@ -41,6 +43,7 @@
 import org.bukkit.scoreboard.Team;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 
 import com.google.gson.JsonParseException;
@@ -67,7 +70,11 @@
 import net.minecraft.commands.functions.CommandFunction;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.HolderLookup;
+import net.minecraft.core.Registry;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.core.particles.ParticleType;
 import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.numbers.BlankFormat;
 import net.minecraft.resources.ResourceKey;
@@ -160,6 +167,24 @@ public MockNMS(CommandAPIBukkit<?> baseNMS) {
 			}
 			return null;
 		});
+		
+		// CraftBukkit's registry is shared across all instances of a test (or all tests?)
+		if (CraftRegistry.getMinecraftRegistry() == null) {
+			RegistryAccess registry = Mockito.mock(RegistryAccess.class);
+			Mockito.when(registry.registry(any())).thenAnswer(args -> {
+				ResourceKey key = args.getArgument(0);
+				System.out.println("Trying to access registry: " + key.registry());
+				Thread.currentThread().dumpStack();
+				return Optional.ofNullable(null);
+			});
+			Mockito.when(registry.registryOrThrow(any())).thenAnswer(args -> {
+				ResourceKey key = args.getArgument(0);
+				System.out.println("Trying to access registry: " + key.registry());
+				Thread.currentThread().dumpStack();
+				return null;
+			});
+			CraftRegistry.setMinecraftRegistry(registry);
+		}
 	}
 
 	/*************************
@@ -412,11 +437,13 @@ public String getBukkitPotionEffectTypeName(PotionEffectType potionEffectType) {
 
 	@Override
 	public String getNMSParticleNameFromBukkit(Particle particle) {
+		// CraftRegistry.setMinecraftRegistry(this.<MinecraftServer>getMinecraftServer().getServer().registryAccess());
 		// Didn't want to do it like this, but it's way easier than going via the
 		// registry to do all sorts of nonsense with lookups. If you ever want to
 		// change your mind, here's how to access it via the registry. This doesn't
 		// scale well for pre 1.19 versions though!
 		// BuiltInRegistries.PARTICLE_TYPE.getKey(CraftParticle.toNMS(particle).getType()).toString();
+		particle.getKey();
 		return BuiltInRegistries.PARTICLE_TYPE.getKey(CraftParticle.bukkitToMinecraft(particle)).toString();
 		// return particle.getKey().toString();
 	}

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

@@ -140,7 +140,11 @@ void executionTestWithParticleArgumentDustRandom() {
 		// caps it off at 4.
 		int size = ThreadLocalRandom.current().nextInt(1, 5);
 
-		server.dispatchCommand(player, "test dust %s %s %s %d".formatted(red, green, blue, size));
+		if (version.greaterThanOrEqualTo(MCVersion.V1_20_5)) {
+			server.dispatchCommand(player, "test dust{color:[%sf,%sf,%sf],scale:%d.0f}".formatted(red, green, blue, size));
+		} else {
+			server.dispatchCommand(player, "test dust %s %s %s %d".formatted(red, green, blue, size));
+		}
 		@SuppressWarnings("unchecked")
 		ParticleData<DustOptions> result = (ParticleData<DustOptions>) results.get();