diff --git a/.gitignore b/.gitignore index 34ac73421..da594ae0d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .gradle .settings /.idea/ +/.vs/ /.vscode/ /run/ /build/ diff --git a/dependencies.gradle b/dependencies.gradle index 99af747a4..724908388 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -84,6 +84,8 @@ dependencies { compileOnly(rfg.deobf("curse.maven:extrautils-225561:2264383")) compileOnly(rfg.deobf("curse.maven:dynamiclights-227874:2337326")) + compileOnly("curse.maven:minefactory-reloaded-66672:2277486") + compileOnly("com.github.GTNewHorizons:NotEnoughIds:2.0.3:dev") // Mixin Version compileOnly("com.github.GTNewHorizons:NotEnoughIds-Legacy:1.4.7:dev") // ASM Version diff --git a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java index a6170b167..7c9d6b6ee 100644 --- a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java +++ b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java @@ -110,6 +110,11 @@ public class AngelicaConfig { @Config.RequiresMcRestart public static boolean fixExtraUtilsSodiumCompat; + @Config.Comment("Fix thread-safety issues in MineFactory Reloaded") + @Config.DefaultBoolean(true) + @Config.RequiresMcRestart + public static boolean fixMineFactoryReloadedSodiumCompat; + @Config.Comment("Fix RenderBlockFluid reading the block type from the world access multiple times") @Config.DefaultBoolean(true) @Config.RequiresMcRestart diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index 6e60de7e7..b622271c8 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -207,6 +207,11 @@ public enum Mixins { "client.extrautils.MixinRenderBlockConnectedTexturesEthereal", "client.extrautils.MixinIconConnectedTexture")), + MFR_THREAD_SAFETY(new Builder("Enable thread safety fixes for MineFactory Reloaded").setPhase(Phase.LATE) + .addTargetedMod(TargetedMod.MINEFACTORY_RELOADED).setSide(Side.CLIENT) + .setApplyIf(() -> AngelicaConfig.fixMineFactoryReloadedSodiumCompat) + .addMixinClasses("client.minefactoryreloaded.MixinRedNetCableRenderer")), + SPEEDUP_CAMPFIRE_BACKPORT_ANIMATIONS(new Builder("Add animation speedup support to Campfire Backport").setPhase(Phase.LATE) .addTargetedMod(TargetedMod.CAMPFIRE_BACKPORT).setSide(Side.CLIENT) .setApplyIf(() -> AngelicaConfig.speedupAnimations) diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/TargetedMod.java b/src/main/java/com/gtnewhorizons/angelica/mixins/TargetedMod.java index ead8ec37d..06460c425 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/TargetedMod.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/TargetedMod.java @@ -15,6 +15,7 @@ public enum TargetedMod { , DYNAMIC_SURROUNDINGS_MIST("Dynamic Surroundings", "org.blockartistry.mod.DynSurround.mixinplugin.DynamicSurroundingsEarlyMixins", "dsurround") , DYNAMIC_SURROUNDINGS_ORIGINAL("Dynamic Surroundings", "org.blockartistry.mod.DynSurround.asm.TransformLoader", "dsurround") , EXTRAUTILS("ExtraUtilities", null, "ExtraUtilities") + , MINEFACTORY_RELOADED("MineFactory Reloaded", null, "MineFactoryReloaded") , GTNHLIB("GTNHLib", "com.gtnewhorizon.gtnhlib.core.GTNHLibCore", "gtnhlib") , IC2("IC2", "ic2.core.coremod.IC2core", "IC2") , JABBA("JABBA", null, "JABBA") diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/late/client/minefactoryreloaded/MixinRedNetCableRenderer.java b/src/main/java/com/gtnewhorizons/angelica/mixins/late/client/minefactoryreloaded/MixinRedNetCableRenderer.java new file mode 100644 index 000000000..2dd166d01 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/late/client/minefactoryreloaded/MixinRedNetCableRenderer.java @@ -0,0 +1,31 @@ +package com.gtnewhorizons.angelica.mixins.late.client.minefactoryreloaded; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.world.IBlockAccess; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import org.spongepowered.asm.mixin.injection.callback.LocalCapture; + +import powercrystals.minefactoryreloaded.render.block.RedNetCableRenderer; +import powercrystals.minefactoryreloaded.tile.rednet.TileEntityRedNetCable; + +@Mixin(value = RedNetCableRenderer.class) +public abstract class MixinRedNetCableRenderer extends TileEntitySpecialRenderer { + + /** + * @author JL2210 + * @reason Thread safety compat (check result of getTileEntity for null) + */ + @Inject(method = "renderWorldBlock", at = @At(value = "FIELD", target = "Lpowercrystals/minefactoryreloaded/setup/MFRConfig;TESRCables*:Z"), locals = LocalCapture.CAPTURE_FAILHARD, cancellable = true, remap = false) + public void angelica$checkNullBeforeAccess(IBlockAccess world, int x, int y, int z, Block block, int modelId, + RenderBlocks renderer, CallbackInfoReturnable cir, TileEntityRedNetCable _cable) { + if (_cable == null) { + cir.setReturnValue(false); + } + } +}