fix race condition in COFH's oredict initialization

GTNewHorizons · Jan 3, 2025 · 303126f · 303126f
1 parent c811df4
commit 303126f
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 0 deletions.
diff --git a/src/main/java/com/mitchej123/hodgepodge/config/FixesConfig.java b/src/main/java/com/mitchej123/hodgepodge/config/FixesConfig.java
@@ -401,6 +401,10 @@ public class FixesConfig {
     @Config.DefaultBoolean(true)
     public static boolean fixCofhOreDictNPE;
 
+    @Config.Comment("Fix race condition in COFH's oredict")
+    @Config.DefaultBoolean(true)
+    public static boolean fixCofhOreDictCME;
+
     // Extra TiC
 
     @Config.Comment("Disable ExtraTic's Integration with Metallurgy 3 Precious Materials Module: (Brass, Silver, Electrum & Platinum)")

diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/Mixins.java b/src/main/java/com/mitchej123/hodgepodge/mixins/Mixins.java
@@ -674,6 +674,9 @@ public enum Mixins {
     FIX_ORE_DICT_NPE(new Builder("Fix NPE in OreDictionaryArbiter")
             .addMixinClasses("cofhcore.MixinOreDictionaryArbiter").setPhase(Phase.EARLY).setSide(Side.BOTH)
             .addTargetedMod(TargetedMod.COFH_CORE).setApplyIf(() -> FixesConfig.fixCofhOreDictNPE)),
+    FIX_ORE_DICT_CME(new Builder("Fix race condition in CoFH oredict").addMixinClasses("cofhcore.MixinFMLEventHandler")
+            .setPhase(Phase.EARLY).setSide(Side.CLIENT).addTargetedMod(TargetedMod.COFH_CORE)
+            .setApplyIf(() -> FixesConfig.fixCofhOreDictCME)),
 
     // Minefactory Reloaded
     DISARM_SACRED_TREE(new Builder("Prevents Sacred Rubber Tree Generation")

diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/cofhcore/MixinFMLEventHandler.java b/src/main/java/com/mitchej123/hodgepodge/mixins/early/cofhcore/MixinFMLEventHandler.java
@@ -0,0 +1,21 @@
+package com.mitchej123.hodgepodge.mixins.early.cofhcore;
+
+import net.minecraft.client.Minecraft;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
+
+import cofh.core.util.FMLEventHandler;
+
+@Mixin(value = FMLEventHandler.class, remap = false)
+public abstract class MixinFMLEventHandler {
+
+    @WrapWithCondition(
+            method = "handleIdMappingEvent",
+            at = @At(value = "INVOKE", target = "Lcofh/core/util/oredict/OreDictionaryArbiter;initialize()V"))
+    private boolean hodgepodge$fixNPE() {
+        return !Minecraft.getMinecraft().isSingleplayer();
+    }
+}