Merge remote-tracking branch 'origin/1.19.4' into 1.20

Author: embeddedt

README.md

@@ -6,7 +6,7 @@ Some fixes are based on prior work in various Forge PRs (check commit history an
 is directly derived from Sodium and used under the terms of the LGPL-3.0 license.
 
 ## Development builds (generally stable, but may occasionally have bugs)
-- 1.16.5, both modloaders: https://nightly.link/embeddedt/ModernFix/workflows/gradle/main/Package.zip
+- 1.16.5, both modloaders: https://nightly.link/embeddedt/ModernFix/workflows/gradle/1.16/Package.zip
 - 1.18.2, both modloaders: https://nightly.link/embeddedt/ModernFix/workflows/gradle/1.18/Package.zip
 - 1.19.2, both modloaders: https://nightly.link/embeddedt/ModernFix/workflows/gradle/1.19.2/Package.zip
 - 1.19.4, both modloaders: https://nightly.link/embeddedt/ModernFix/workflows/gradle/1.19.4/Package.zip

build.gradle

@@ -183,4 +183,4 @@ tasks.register('checkCleanTag') {
             throw new GradleException('Not a clean tree.')
         }
     }
-}
+}

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/ctm_resourceutil_cme/ResourceUtilMixin.java

@@ -0,0 +1,35 @@
+package org.embeddedt.modernfix.forge.mixin.bugfix.ctm_resourceutil_cme;
+
+import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
+import org.embeddedt.modernfix.annotation.RequiresMod;
+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.callback.CallbackInfo;
+import team.chisel.ctm.client.util.ResourceUtil;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.concurrent.ConcurrentMap;
+
+@Mixin(ResourceUtil.class)
+@RequiresMod("ctm")
+@ClientOnlyMixin
+@SuppressWarnings({"rawtypes", "unchecked"})
+public class ResourceUtilMixin {
+    @Shadow @Final @Mutable
+    private static Map metadataCache;
+
+    /**
+     * @author embeddedt
+     * @reason quick fix to prevent rare CMEs
+     */
+    @Inject(method = "<clinit>", at = @At("RETURN"))
+    private static void synchronizeMetadataCache(CallbackInfo ci) {
+        if(!(metadataCache instanceof ConcurrentMap))
+            metadataCache = Collections.synchronizedMap(metadataCache);
+    }
+}