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

Make BlockColors thread-safe

Browse Source 
Workaround for issues like https://github.com/vadis365/Mob-Grinding-Utils/issues/240,
as too many mods do this
This commit is contained in:
embeddedt 2023-01-07 19:03:47 -05:00
parent 24990ba089
commit 572cbaf9bd
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java
View File

@ -32,6 +32,7 @@ public class ModernFixEarlyConfig {
this.addMixinRule("perf.preload_block_classes", true);
this.addMixinRule("perf.parallel_potentially_unsafe", false);
this.addMixinRule("perf.parallel_blockstate_cache_rebuild", true);
this.addMixinRule("safety", true);
/* Mod compat */
if(FMLLoader.getLoadingModList().getModFileById("smoothboot") != null) {

26
src/main/java/org/embeddedt/modernfix/mixin/safety/BlockColorsMixin.java Normal file
View File

@ -0,0 +1,26 @@
package org.embeddedt.modernfix.mixin.safety;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.color.BlockColors;
import net.minecraft.client.renderer.color.IBlockColor;
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;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
@Mixin(value = BlockColors.class, priority = 700)
public class BlockColorsMixin {
private Lock mapLock = new ReentrantLock();
@Inject(method = "register", at = @At("HEAD"))
private void lockMapBeforeAccess(IBlockColor pBlockColor, Block[] pBlocks, CallbackInfo ci) {
mapLock.lock();
}
@Inject(method = "register", at = @At("TAIL"))
private void unlockMap(IBlockColor pBlockColor, Block[] pBlocks, CallbackInfo ci) {
mapLock.unlock();
}
}

3
src/main/resources/modernfix.mixins.json
View File

@ -38,7 +38,8 @@
"perf.async_jei.JeiStarterMixin",
"perf.async_jei.PluginCallerMixin",
"perf.async_jei.RecipeManagerInternalMixin",
"perf.thread_priorities.IntegratedServerMixin"
"perf.thread_priorities.IntegratedServerMixin",
"safety.BlockColorsMixin"
],
"injectors": {
"defaultRequire": 1