R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch modded shape caches to be thread-safe

Browse Source 
Related: #260
This commit is contained in:
embeddedt 2023-10-13 10:24:37 -04:00
parent e7277b89d5
commit 49c1bc71ba
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheCyclicMixin.java Normal file
View File

@ -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");
}
}

29
forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheRSMixin.java Normal file
View File

@ -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");
}
}