Merge 1.16 into 1.18

Author: embeddedt

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_sounds/SoundBufferLibraryMixin.java

@@ -1,6 +1,7 @@
 package org.embeddedt.modernfix.common.mixin.perf.dynamic_sounds;
 
 import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.RemovalCause;
 import com.google.common.cache.RemovalNotification;
 import com.mojang.blaze3d.audio.SoundBuffer;
 import net.minecraft.client.sounds.SoundBufferLibrary;
@@ -26,12 +27,15 @@ public abstract class SoundBufferLibraryMixin {
     @Shadow @Final @Mutable
     private Map<ResourceLocation, CompletableFuture<SoundBuffer>> cache = CacheBuilder.newBuilder()
         .expireAfterAccess(DynamicSoundHelpers.MAX_SOUND_LIFETIME_SECS, TimeUnit.SECONDS)
+        .concurrencyLevel(1)
         // Excessive use of type hinting due to it assuming Object as the broadest correct type
         .<ResourceLocation, CompletableFuture<SoundBuffer>>removalListener(this::onSoundRemoval)
         .build()
         .asMap();
 
     private <K extends ResourceLocation, V extends CompletableFuture<SoundBuffer>> void onSoundRemoval(RemovalNotification<K, V> notification) {
+        if(notification.getCause() == RemovalCause.REPLACED && notification.getValue() == cache.get(notification.getKey()))
+            return;
         notification.getValue().thenAccept(SoundBuffer::discardAlBuffer);
         if(debugDynamicSoundLoading) {
             K k = notification.getKey();

fabric/src/main/java/org/embeddedt/modernfix/fabric/mappings/MappingsClearer.java

@@ -21,6 +21,14 @@ public static void clear() {
         if(FabricLoader.getInstance().isDevelopmentEnvironment())
             return; // never do this in dev
         CommonModUtil.runWithoutCrash(() -> {
+            // For now, force the mapping resolver to be initialized. Fabric Loader 0.14.23 stops initializing it early,
+            // which means that we actually need to keep the TinyMappingFactory tree around for initialization to work
+            // later. We force init it now because then we can store less in memory.
+            // Comparing heap dumps on 0.14.23 suggests a savings of 20MB by doing it our way, since many mods will
+            // end up needing the mapping resolver.
+            // This will need to be revisited when https://github.com/FabricMC/fabric-loader/pull/812 is merged.
+            FabricLoader.getInstance().getMappingResolver();
+
             // clear notch->intermediary mappings
             MappingConfiguration config = FabricLauncherBase.getLauncher().getMappingConfiguration();
             Field mappingsField = MappingConfiguration.class.getDeclaredField("mappings");

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheCyclicMixin.java

@@ -0,0 +1,27 @@
+package org.embeddedt.modernfix.forge.mixin.bugfix.unsafe_modded_shape_caches;
+
+import org.embeddedt.modernfix.ModernFix;
+import org.embeddedt.modernfix.annotation.RequiresMod;
+import org.spongepowered.asm.mixin.*;
+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.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * see {@link ShapeCacheRSMixin}
+ */
+@Pseudo
+@Mixin(targets = { "com/lothrazar/cyclic/block/cable/ShapeCache" }, remap = false)
+@RequiresMod("cyclic")
+@SuppressWarnings("rawtypes")
+public class ShapeCacheCyclicMixin {
+    @Shadow @Final @Mutable private static final Map CACHE = new ConcurrentHashMap();
+
+    @Inject(method = "<clinit>", at = @At("RETURN"))
+    private static void mfix$notify(CallbackInfo ci) {
+        ModernFix.LOGGER.info("Made Cyclic shape cache map thread-safe");
+    }
+}

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheRSMixin.java

@@ -0,0 +1,29 @@
+package org.embeddedt.modernfix.forge.mixin.bugfix.unsafe_modded_shape_caches;
+
+import org.embeddedt.modernfix.ModernFix;
+import org.embeddedt.modernfix.annotation.RequiresMod;
+import org.spongepowered.asm.mixin.*;
+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.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Some mods use a custom shape cache with a non-thread-safe map. There is no reason why this wouldn't cause crashes
+ * in vanilla as well if getShape was called on two threads at once. It seems more likely to happen with ModernFix
+ * installed due to the dynamic blockstate cache generation, so we solve it by making the maps thread-safe.
+ */
+@Pseudo
+@Mixin(targets = { "com/refinedmods/refinedstorage/block/shape/ShapeCache" }, remap = false)
+@RequiresMod("refinedstorage")
+@SuppressWarnings("rawtypes")
+public class ShapeCacheRSMixin {
+    @Shadow @Final @Mutable private static final Map CACHE = new ConcurrentHashMap();
+
+    @Inject(method = "<clinit>", at = @At("RETURN"))
+    private static void mfix$notify(CallbackInfo ci) {
+        ModernFix.LOGGER.info("Made Refined Storage shape cache map thread-safe");
+    }
+}