From e8311d0b95e5ce45740e626443bd6bf68496c0a6 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Thu, 2 Mar 2023 16:04:03 -0500
Subject: [PATCH] Fix Twilight Forest CME during game startup

---
 build.gradle                                  |  1 +
 .../core/config/ModernFixEarlyConfig.java     |  1 +
 .../TwilightForestModMixin.java               | 22 +++++++++++++++++++
 src/main/resources/modernfix.mixins.json      |  1 +
 4 files changed, 25 insertions(+)
 create mode 100644 src/main/java/org/embeddedt/modernfix/mixin/bugfix/tf_cme_on_load/TwilightForestModMixin.java

diff --git a/build.gradle b/build.gradle
index db8e0333..a3395261 100644
--- a/build.gradle
+++ b/build.gradle
@@ -94,6 +94,7 @@ dependencies {
     modImplementation("curse.maven:jeresources-240630:3545538")
     modImplementation("curse.maven:jepb-437558:3172880")
     modImplementation("curse.maven:babel-436964:3196072")
+    modCompileOnly("curse.maven:twforest-227639:3575220")
 }
 
 tasks.withType(JavaCompile) {
diff --git a/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java b/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java
index 22c90055..c458a5c0 100644
--- a/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java
+++ b/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java
@@ -37,6 +37,7 @@ public class ModernFixEarlyConfig {
         this.addMixinRule("bugfix.packet_leak", false);
         this.addMixinRule("bugfix.structure_manager_crash", true);
         this.addMixinRule("bugfix.mc218112", true);
+        this.addMixinRule("bugfix.tf_cme_on_load", true);
         this.addMixinRule("perf.async_jei", true);
         this.addMixinRule("perf.thread_priorities", true);
         this.addMixinRule("perf.preload_block_classes", false);
diff --git a/src/main/java/org/embeddedt/modernfix/mixin/bugfix/tf_cme_on_load/TwilightForestModMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/bugfix/tf_cme_on_load/TwilightForestModMixin.java
new file mode 100644
index 00000000..67f0bd2c
--- /dev/null
+++ b/src/main/java/org/embeddedt/modernfix/mixin/bugfix/tf_cme_on_load/TwilightForestModMixin.java
@@ -0,0 +1,22 @@
+package org.embeddedt.modernfix.mixin.bugfix.tf_cme_on_load;
+
+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.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import twilightforest.TwilightForestMod;
+import twilightforest.worldgen.biomes.BiomeKeys;
+
+@Mixin(TwilightForestMod.class)
+public class TwilightForestModMixin {
+    @Redirect(method = "init", at = @At(value = "INVOKE", target = "Ltwilightforest/worldgen/biomes/BiomeKeys;addBiomeTypes()V"), remap = false)
+    private static void avoidBiomeTypes() {
+
+    }
+
+    @Inject(method = "lambda$init$1", at = @At(value = "INVOKE", target = "Ltwilightforest/block/TFBlocks;tfCompostables()V", ordinal = 0))
+    private static void doBiomeTypes(CallbackInfo ci) {
+        BiomeKeys.addBiomeTypes();
+    }
+}
diff --git a/src/main/resources/modernfix.mixins.json b/src/main/resources/modernfix.mixins.json
index 8dc0bbf7..b79452ef 100644
--- a/src/main/resources/modernfix.mixins.json
+++ b/src/main/resources/modernfix.mixins.json
@@ -8,6 +8,7 @@
   "mixins": [
     "bugfix.edge_chunk_not_saved.ChunkManagerMixin",
     "bugfix.structure_manager_crash.StructureManagerMixin",
+    "bugfix.tf_cme_on_load.TwilightForestModMixin",
     "perf.remove_biome_temperature_cache.BiomeMixin",
     "perf.resourcepacks.ModFileResourcePackMixin",
     "perf.resourcepacks.VanillaPackMixin",