fix a crash with modernui;

try compat draconicevolution;
try compat Gateways to Eternity

Author: Harveykang

common/build.gradle

@@ -35,7 +35,7 @@ dependencies {
 //    modCompileOnly "maven.modrinth:pretty-rain:TGjK6ChS"
 
     /* Effectual */
-    modCompileOnly 'maven.modrinth:effectual:0.5.2-1.20.1'
+    modCompileOnly 'maven.modrinth:effectual:0.6.0-1.20.1'
 
     /* Mmmmmmmmmmmm */
 //    modCompileOnly 'maven.modrinth:mmmmmmmmmmmm:1.20-2.0.5'

common/src/main/java/fun/qu_an/minecraft/asyncparticles/client/APMixinPlugin.java

@@ -70,7 +70,9 @@ yield switch (split[1]) {
 					default -> throw new IllegalArgumentException("Unknown legacy mod mixin: " + mixinClassName);
 				};
 			}
-			case "fake_renders" -> true;
+			case "fake_renders",
+				 "off_thread_access" -> true;
+			case "modernui" -> ModListHelper.MODERN_UI_LOADED;
 			case "vs2" -> ModListHelper.VS_LOADED;
 			case "create" -> ModListHelper.CREATE_LOADED;
 			case "iris_like" -> ModListHelper.IRIS_LIKE_LOADED;

common/src/main/java/fun/qu_an/minecraft/asyncparticles/client/AsyncRenderer.java

@@ -93,7 +93,6 @@ private static void addSyncByClassName(String className) {
 	private static final Map<ParticleRenderType, List<Particle>> SYNC_PARTICLES = Collections.synchronizedMap(new IdentityHashMap<>());
 	public static final ForkJoinPool EXECUTOR;
 	public static final String THREAD_PREFIX = "AsyncParticleRenderer";
-	public static final Set<Thread> PARTICLE_THREADS = Collections.synchronizedSet(Collections.newSetFromMap(new WeakHashMap<>()));
 
 	static {
 		AtomicInteger workerCount = new AtomicInteger(1);
@@ -112,7 +111,6 @@ protected void onTermination(Throwable throwable) {
 			};
 			forkJoinWorkerThread.setName(THREAD_PREFIX + "-" + workerCount.getAndIncrement());
 			forkJoinWorkerThread.setDaemon(true);
-			PARTICLE_THREADS.add(forkJoinWorkerThread);
 			return forkJoinWorkerThread;
 		}, Util::onThreadException, true);
 	}

common/src/main/java/fun/qu_an/minecraft/asyncparticles/client/ModListHelper.java

@@ -61,6 +61,8 @@ public class ModListHelper {
 	public static final boolean PHYSICSMOD_LOADED = isModLoaded("physicsmod");
 	/* Draconic Evolution */
 	public static final boolean FORGE_DRACONIC_EVOLUTION_LOADED = isForgeModLoaded("draconicevolution");
+	/* Modern UI */
+	public static final boolean MODERN_UI_LOADED = isModLoaded("modernui");
 
 	@ExpectPlatform
 	private static boolean isForge() {

common/src/main/java/fun/qu_an/minecraft/asyncparticles/client/compat/create/CreateCompat.java

@@ -5,7 +5,6 @@
 import com.simibubi.create.foundation.collision.Matrix3d;
 import com.simibubi.create.foundation.collision.OrientedBB;
 import com.simibubi.create.foundation.utility.BlockHelper;
-import dev.architectury.injectables.annotations.ExpectPlatform;
 import fun.qu_an.minecraft.asyncparticles.client.ModListHelper;
 import fun.qu_an.minecraft.asyncparticles.client.mixin.create.InvokerContraptionCollider;
 import net.minecraft.client.multiplayer.ClientLevel;
@@ -134,7 +133,7 @@ public static boolean collideWithContraption(ClientLevel level,
 	public static Vec3 collideMotionWithContraptions(ClientLevel level, Vec3 position, Vec3 motion, AABB bounds) {
 		AABB bounds1 = bounds.inflate(0.1).move(motion);
 		Vector3d result = new Vector3d(Double.MAX_VALUE, Double.MAX_VALUE, Double.MAX_VALUE);
-		forEachContraption(level, bounds1, contraptionEntity -> {
+		forEachContraption(level, contraptionEntity -> {
 			Vec3 vec3 = collideMotionWithContraption(level, position, motion, bounds1, contraptionEntity);
 			if (vec3 == null) {
 				return true;
@@ -149,7 +148,7 @@ public static Vec3 collideMotionWithContraptions(ClientLevel level, Vec3 positio
 		return new Vec3(result.x, result.y, result.z);
 	}
 
-	public static void forEachContraption(ClientLevel level, AABB bounds1, Predicate<AbstractContraptionEntity> consumer) {
+	public static void forEachContraption(ClientLevel level, Predicate<AbstractContraptionEntity> consumer) {
 		try {
 			for (WeakReference<AbstractContraptionEntity> r : contraptions(level)) {
 				AbstractContraptionEntity contraptionEntity = r.get();
@@ -426,7 +425,7 @@ public static boolean isUnderContraption(ClientLevel level, double x, double y,
 		boolean[] b = {false};
 		Vec3 pos = new Vec3(x, y, z);
 		AABB bounds = new AABB(x - 1, y - 1, z - 1, x + 1, Math.max(y + 16, level.getMaxBuildHeight()), z + 1);
-		forEachContraption(level, bounds, contraptionEntity -> {
+		forEachContraption(level, contraptionEntity -> {
 			boolean b1 = collideWithContraption(level, pos, Vec3.ZERO, bounds, contraptionEntity, true);
 			// estimate = true for a better performance
 			if (!b1) {

common/src/main/java/fun/qu_an/minecraft/asyncparticles/client/compat/particlerain/fabric/ParticleRainCompatImpl.java

@@ -71,7 +71,7 @@ public static void onCreateCollision(@NotNull ClientLevel level, Vec3 originalMo
 		AABB aabb1 = new AABB(center.x, aabb.minY - 1, center.z, center.x, aabb.minY, center.z);
 		Vec3 spawnPos = new Vec3(center.x, aabb.minY, center.z);
 		Vec3 motion1 = originalMotion.scale(2);
-		CreateCompat.forEachContraption(level, aabb1, contraptionEntity -> {
+		CreateCompat.forEachContraption(level, contraptionEntity -> {
 			if (CreateCompat.collideWithContraption(level, spawnPos, motion1, aabb1, contraptionEntity)) {
 				Minecraft.getInstance().particleEngine
 					.createParticle(ParticleTypes.RAIN, spawnPos.x, spawnPos.y, spawnPos.z, 0, 0, 0);

common/src/main/java/fun/qu_an/minecraft/asyncparticles/client/mixin/MixinClassInstanceMultiMap.java

@@ -2,6 +2,7 @@
 
 import com.imeetake.effects.Bubbles.BubbleBreathEffect;
 import com.imeetake.effects.Bubbles.BubbleChestEffect;
+import com.imeetake.effects.Bubbles.BubblePotsEffect;
 import com.imeetake.effects.CaveDust.CaveDustEffect;
 import com.imeetake.effects.Firefly.FireflyEffect;
 import com.imeetake.effects.GoldGlow.LanternGlowEffect;
@@ -19,9 +20,11 @@
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.event.Event;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
+@Pseudo
 @Mixin(value = {
 	SteamEffect.class,
 	WaterDripEffect.class,
@@ -38,6 +41,7 @@
 	CaveDustEffect.class,
 	BubbleBreathEffect.class,
 	BubbleChestEffect.class,
+	BubblePotsEffect.class,
 })
 public abstract class MixinAllEffects {
 	@Redirect(method = "register", remap = false, at = @At(value = "INVOKE", remap = false, target = "Lnet/fabricmc/fabric/api/event/Event;register(Ljava/lang/Object;)V"))

common/src/main/java/fun/qu_an/minecraft/asyncparticles/client/mixin/fabric/effectual/MixinAllEffects.java

@@ -0,0 +1,16 @@
+package fun.qu_an.minecraft.asyncparticles.client.mixin.modernui;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+import fun.qu_an.minecraft.asyncparticles.client.util.ThreadUtil;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(value = RenderSystem.class, remap = false)
+public class MixinRenderSystem {
+	@Inject(method = "assertOnRenderThread", at = @At("HEAD"))
+	private static void onRenderThread(CallbackInfo ci) {
+		ThreadUtil.assertNotParticleRendererThread();
+	}
+}

common/src/main/java/fun/qu_an/minecraft/asyncparticles/client/mixin/modernui/MixinRenderSystem.java

@@ -1,4 +1,4 @@
-package fun.qu_an.minecraft.asyncparticles.client.mixin;
+package fun.qu_an.minecraft.asyncparticles.client.mixin.off_thread_access;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;

common/src/main/java/fun/qu_an/minecraft/asyncparticles/client/mixin/MixinChunkAccess.java common/src/main/java/fun/qu_an/minecraft/asyncparticles/client/mixin/off_thread_access/MixinChunkAccess.java

@@ -0,0 +1,51 @@
+package fun.qu_an.minecraft.asyncparticles.client.mixin.off_thread_access;
+
+import fun.qu_an.minecraft.asyncparticles.client.util.IterationSafeArrayList;
+import net.minecraft.util.ClassInstanceMultiMap;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Mutable;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+
+// some mod get entities when ticking particles, may cause a CME
+@Mixin(ClassInstanceMultiMap.class)
+public class MixinClassInstanceMultiMap {
+	@Final
+	@Mutable
+	@Shadow
+	private Map<Class<?>, List<?>> byClass;
+
+	@Mutable
+	@Final
+	@Shadow
+	private List<?> allInstances;
+
+	// FIXME: 这样不行啊，到处漏风
+	@Inject(method = "<init>", at = @At(value = "RETURN"))
+	private void newHashMap(Class<?> baseClass, CallbackInfo ci) {
+		byClass = new ConcurrentHashMap<>();
+		allInstances = new IterationSafeArrayList<>();
+		byClass.put(baseClass, allInstances);
+	}
+
+	@Redirect(method = "<init>", at = @At(value = "INVOKE", target = "Ljava/util/Map;put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"))
+	private <K, V> V put(Map<K, V> map, K key, V value) {
+		// do nothing
+		return null;
+	}
+
+	@Redirect(method = "method_15217", at = @At(value = "INVOKE", target = "Ljava/util/stream/Collectors;toList()Ljava/util/stream/Collector;"))
+	private <T> Collector<T, ?, List<T>> collect() {
+		return Collectors.toCollection(IterationSafeArrayList::new);
+	}
+}

common/src/main/java/fun/qu_an/minecraft/asyncparticles/client/mixin/off_thread_access/MixinClassInstanceMultiMap.java

@@ -0,0 +1,43 @@
+package fun.qu_an.minecraft.asyncparticles.client.mixin.off_thread_access;
+
+import net.minecraft.core.Registry;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.LevelHeightAccessor;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.level.chunk.LevelChunk;
+import net.minecraft.world.level.chunk.LevelChunkSection;
+import net.minecraft.world.level.chunk.UpgradeData;
+import net.minecraft.world.level.levelgen.blending.BlendingData;
+import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.HashMap;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Mixin(LevelChunk.class)
+public abstract class MixinLevelChunk extends ChunkAccess {
+	@Shadow
+	@Final
+	Level level;
+
+	public MixinLevelChunk(ChunkPos chunkPos, UpgradeData upgradeData, LevelHeightAccessor levelHeightAccessor, Registry<Biome> biomeRegistry, long inhabitedTime, @Nullable LevelChunkSection[] sections, @Nullable BlendingData blendingData) {
+		super(chunkPos, upgradeData, levelHeightAccessor, biomeRegistry, inhabitedTime, sections, blendingData);
+	}
+
+	// FIXME: any better way to do this?
+	@Inject(method = "<init>(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/world/level/chunk/UpgradeData;Lnet/minecraft/world/ticks/LevelChunkTicks;Lnet/minecraft/world/ticks/LevelChunkTicks;J[Lnet/minecraft/world/level/chunk/LevelChunkSection;Lnet/minecraft/world/level/chunk/LevelChunk$PostLoadProcessor;Lnet/minecraft/world/level/levelgen/blending/BlendingData;)V", at = @At("RETURN"))
+	private void onInit(CallbackInfo ci) {
+		if (level.isClientSide) {
+			blockEntities = new ConcurrentHashMap<>();
+		} else {
+			blockEntities = new HashMap<>();
+		}
+	}
+}