Fixed an issue with timing of injecting into possibleBiomes

Glitchfiend · May 13, 2024 · dac7cf6 · dac7cf6
1 parent f591271
commit dac7cf6
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/Common/src/main/java/terrablender/mixin/MixinChunkGenerator.java b/Common/src/main/java/terrablender/mixin/MixinChunkGenerator.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright 2024, the Glitchfiend Team.
+ * All rights reserved.
+ ******************************************************************************/
+package terrablender.mixin;
+
+import net.minecraft.world.level.chunk.ChunkGenerator;
+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;
+
+@Mixin(ChunkGenerator.class)
+public class MixinChunkGenerator
+{
+    @Inject(method = "validate", at = @At("HEAD"), cancellable = true)
+    public void validate(CallbackInfo ci)
+    {
+        // Do not perform validation - this causes featuresPerStep to be resolved before modded biomes have been
+        // injected.
+        ci.cancel();
+    }
+}
diff --git a/Common/src/main/resources/terrablender.mixins.json b/Common/src/main/resources/terrablender.mixins.json
@@ -6,6 +6,7 @@
   "mixins": [
     "MixinBiomeSource",
     "MixinBuiltInRegistries",
+    "MixinChunkGenerator",
     "MixinMultiNoiseBiomeSource",
     "MixinNoiseGeneratorSettings",
     "MixinParameterList",