Use sided map for registry tracker

Fixes #236

Author: Su5eD

fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/ResourceConditionsImpl.java

@@ -23,13 +23,16 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.concurrent.ConcurrentHashMap;
 
 import com.google.common.base.Preconditions;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
+import net.minecraftforge.fml.LogicalSide;
 import net.minecraftforge.fml.ModList;
+import net.minecraftforge.fml.util.thread.EffectiveSide;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -266,7 +269,7 @@ public static boolean featuresEnabledMatch(JsonObject object) {
 		return set.isSubsetOf(CURRENT_FEATURES.get());
 	}
 
-	public static final ThreadLocal<DynamicRegistryManager.Immutable> CURRENT_REGISTRIES = new ThreadLocal<>();
+	public static final Map<LogicalSide, DynamicRegistryManager.Immutable> CURRENT_REGISTRIES = new ConcurrentHashMap<>();
 
 	public static boolean registryContainsMatch(JsonObject object) {
 		String key = JsonHelper.getString(object, "registry", "minecraft:item");
@@ -276,7 +279,7 @@ public static boolean registryContainsMatch(JsonObject object) {
 
 	private static <E> boolean registryContainsMatch(JsonObject object, RegistryKey<? extends Registry<? extends E>> registryRef) {
 		JsonArray array = JsonHelper.getArray(object, "values");
-		DynamicRegistryManager.Immutable registries = CURRENT_REGISTRIES.get();
+		DynamicRegistryManager.Immutable registries = CURRENT_REGISTRIES.get(EffectiveSide.get());
 
 		if (registries == null) {
 			LOGGER.warn("Can't retrieve current registries. Failing registry_contains resource condition check.");

fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/DataPackContentsMixin.java

@@ -19,6 +19,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 
+import net.minecraftforge.fml.util.thread.EffectiveSide;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -45,7 +46,7 @@ public class DataPackContentsMixin {
 	)
 	public void hookRefresh(DynamicRegistryManager dynamicRegistryManager, CallbackInfo ci) {
 		ResourceConditionsImpl.LOADED_TAGS.remove();
-		ResourceConditionsImpl.CURRENT_REGISTRIES.remove();
+		ResourceConditionsImpl.CURRENT_REGISTRIES.remove(EffectiveSide.get());
 	}
 
 	@Inject(
@@ -54,6 +55,6 @@ public void hookRefresh(DynamicRegistryManager dynamicRegistryManager, CallbackI
 	)
 	private static void hookReload(ResourceManager manager, DynamicRegistryManager.Immutable dynamicRegistryManager, FeatureSet enabledFeatures, CommandManager.RegistrationEnvironment environment, int functionPermissionLevel, Executor prepareExecutor, Executor applyExecutor, CallbackInfoReturnable<CompletableFuture<DataPackContents>> cir) {
 		ResourceConditionsImpl.CURRENT_FEATURES.set(enabledFeatures);
-		ResourceConditionsImpl.CURRENT_REGISTRIES.set(dynamicRegistryManager);
+		ResourceConditionsImpl.CURRENT_REGISTRIES.put(EffectiveSide.get(), dynamicRegistryManager);
 	}
 }

fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/LootManagerMixin.java

@@ -28,6 +28,7 @@
 
 import net.minecraft.resource.ResourceManager;
 
+import net.minecraftforge.fml.util.thread.EffectiveSide;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -56,14 +57,14 @@ public class LootManagerMixin {
 
 	@Inject(method = "load", at = @At(value = "INVOKE", target = "Ljava/util/concurrent/CompletableFuture;runAsync(Ljava/lang/Runnable;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;"), locals = LocalCapture.CAPTURE_FAILHARD)
 	private static void load(LootDataType type, ResourceManager resourceManager, Executor executor, Map<LootDataType<?>, Map<Identifier, ?>> results, CallbackInfoReturnable<CompletableFuture<?>> cir, Map map) {
-		dynamicRegistryManagerMap.put(map, ResourceConditionsImpl.CURRENT_REGISTRIES.get());
+		dynamicRegistryManagerMap.put(map, ResourceConditionsImpl.CURRENT_REGISTRIES.get(EffectiveSide.get()));
 	}
 
 	// runAsync Runnable in load method
 	@Inject(method = {"method_51189", "m_278660_"}, at = @At("HEAD"), require = 1)
 	private static void runAsync(ResourceManager resourceManager, LootDataType lootDataType, Map map, CallbackInfo ci) {
-		assert ResourceConditionsImpl.CURRENT_REGISTRIES.get() == null;
-		ResourceConditionsImpl.CURRENT_REGISTRIES.set(Objects.requireNonNull(dynamicRegistryManagerMap.remove(map)));
+		assert ResourceConditionsImpl.CURRENT_REGISTRIES.get(EffectiveSide.get()) == null;
+		ResourceConditionsImpl.CURRENT_REGISTRIES.put(EffectiveSide.get(), Objects.requireNonNull(dynamicRegistryManagerMap.remove(map)));
 	}
 
 	// forEach in load method
@@ -90,6 +91,6 @@ private static void applyResourceConditions(LootDataType lootDataType, ResourceM
 	// runAsync Runnable in load method
 	@Inject(method = {"method_51189", "m_278660_"}, at = @At("RETURN"), require = 1)
 	private static void runAsyncEnd(ResourceManager resourceManager, LootDataType lootDataType, Map map, CallbackInfo ci) {
-		ResourceConditionsImpl.CURRENT_REGISTRIES.remove();
+		ResourceConditionsImpl.CURRENT_REGISTRIES.remove(EffectiveSide.get());
 	}
 }

gradle.properties

@@ -69,5 +69,5 @@ fabric-client-tags-api-v1-version=1.1.2
 loom.platform=forge
 forge_version=1.20.1-47.3.27
 pack_format=15
-forgified_version=1.11.12
+forgified_version=1.11.13
 forge_fabric_loader_version=2.6.0+0.15.0+1.20.1