5.27.5 - commit.3

- Patched SurfaceRulesContext to work on 26.2-snapshot-4

Author: coredex-source

gradle.properties

@@ -7,12 +7,12 @@ mod_id=modernfix
 version=5.27.5-build.2
 
 # Minecraft/Fabric
-minecraft_version=26.2-snapshot-2
-loader_version=0.19.1
+minecraft_version=26.2-snapshot-4
+loader_version=0.19.2
 loom_version=1.16-SNAPSHOT
 
 # Fabric API
-fabric_api_version=0.145.5+26.2
+fabric_api_version=0.146.2+26.2
 
 # Dependencies
 mixinextras_version=0.4.1

src/main/java/org/embeddedt/modernfix/common/mixin/perf/worldgen_allocation/SurfaceRulesContextMixin.java

@@ -8,14 +8,20 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 
 import java.util.function.Function;
-import java.util.function.Supplier;
+
+// Update the file when embeddedt patches this file for 26.2 in the neoforge version to keep it conisitent with the upstream changes.
 
 @Mixin(targets = {"net/minecraft/world/level/levelgen/SurfaceRules$Context"}, priority = 100)
 public class SurfaceRulesContextMixin {
     @Shadow private long lastUpdateY;
 
+    @Shadow private int blockX;
+
+    @Shadow private int blockZ;
+
     @Shadow private int blockY;
 
     @Shadow private int waterHeight;
@@ -24,27 +30,53 @@ public class SurfaceRulesContextMixin {
 
     @Shadow private int stoneDepthAbove;
 
-    @Shadow private Supplier<Holder<Biome>> biome;
+    @Shadow private Holder<Biome> biome;
 
     @Shadow @Final private Function<BlockPos, Holder<Biome>> biomeGetter;
 
     @Shadow @Final private BlockPos.MutableBlockPos pos;
 
+    @Unique
+    private PositionalBiomeGetter modernfix$biomeCache;
+
     /**
      * @author embeddedt
-     * @reason Reuse supplier object instead of creating new ones every time
+     * @reason Keep a reusable biome cache helper instead of rebuilding intermediate state
      */
     @Overwrite
-    public void updateY(int stoneDepthAbove, int stoneDepthBelow, int waterHeight, int blockX, int blockY, int blockZ) {
+    protected void updateY(int stoneDepthAbove, int stoneDepthBelow, int waterHeight, int blockY) {
         ++this.lastUpdateY;
-        var getter = this.biome;
+
+        var getter = this.modernfix$biomeCache;
         if(getter == null) {
-            this.biome = getter = new PositionalBiomeGetter(this.biomeGetter, this.pos);
+            this.modernfix$biomeCache = getter = new PositionalBiomeGetter(this.biomeGetter, this.pos);
         }
-        ((PositionalBiomeGetter)getter).update(blockX, blockY, blockZ);
+
+        getter.update(this.blockX, blockY, this.blockZ);
+        this.biome = null;
         this.blockY = blockY;
         this.waterHeight = waterHeight;
         this.stoneDepthBelow = stoneDepthBelow;
         this.stoneDepthAbove = stoneDepthAbove;
     }
+
+    /**
+     * @author coredex
+     * @reason Reuse a single positional getter object for biome lookups
+     */
+    @Overwrite
+    protected Holder<Biome> getBiome() {
+        var biome = this.biome;
+        if(biome == null) {
+            var getter = this.modernfix$biomeCache;
+            if(getter == null) {
+                this.modernfix$biomeCache = getter = new PositionalBiomeGetter(this.biomeGetter, this.pos);
+            }
+
+            getter.update(this.blockX, this.blockY, this.blockZ);
+            this.biome = biome = getter.get();
+        }
+
+        return biome;
+    }
 }