Merge pull request #44 from jchung01/master

Add compatibility for Chunk-Pregenerator
TerraFirmaCraft-The-Final-Frontier · Apr 2, 2024 · 51b5641 · 51b5641
2 parents 6887eca + 34621ab
commit 51b5641
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/main/java/org/dimdev/jeid/mixin/core/world/MixinChunk.java b/src/main/java/org/dimdev/jeid/mixin/core/world/MixinChunk.java
@@ -10,7 +10,9 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Constant;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyConstant;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@@ -50,13 +52,22 @@ public void setIntBiomeArray(int[] intBiomeArray) {
         cir.setReturnValue(arr);
     }
 
-    // TODO: might want to change getBiome a bit - see issue #14
     @Dynamic("Read biome id from int biome array to int k")
     @ModifyVariable(method = "getBiome", at = @At(value = "STORE", ordinal = 0), name = "k")
     private int reid$fromIntBiomeArray(int original, @Local(name = "i") int i, @Local(name = "j") int j) {
         return this.intBiomeArray[j << 4 | i];
     }
 
+    /**
+     * Compatibility for mods that don't initialize the chunk's biome array on generation (e.g. Chunk-Pregenerator)
+     *
+     * @reason Use intBiomeArray's default value.
+     */
+    @ModifyConstant(method = "getBiome", constant = @Constant(intValue = 255, ordinal = 1))
+    private int reid$modifyDefaultId(int original) {
+        return -1;
+    }
+
     @Inject(method = "getBiome", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/world/biome/Biome;getIdForBiome(Lnet/minecraft/world/biome/Biome;)I"))
     private void reid$toIntBiomeArray(CallbackInfoReturnable<Biome> cir, @Local(name = "i") int i, @Local(name = "j") int j, @Local(name = "k") int k) {
         this.intBiomeArray[j << 4 | i] = k;

diff --git a/src/main/java/org/dimdev/jeid/mixin/core/world/MixinChunkProviderServer.java b/src/main/java/org/dimdev/jeid/mixin/core/world/MixinChunkProviderServer.java
@@ -26,7 +26,8 @@ public class MixinChunkProviderServer {
     public WorldServer world;
 
     /**
-     * @reason Return an empty biome byte array if the chunk is using an int biome array.
+     * @reason Initialize biome array after any calls to {@link net.minecraft.world.gen.IChunkGenerator#generateChunk}.
+     * This guarantees the correct biomes even for modded chunk generators.
      */
     @Inject(method = "provideChunk", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/world/gen/IChunkGenerator;generateChunk(II)Lnet/minecraft/world/chunk/Chunk;"))
     private void reid$initializeBiomeArray(int x, int z, CallbackInfoReturnable<Chunk> cir, @Local Chunk chunk) {