5.27.17 - commit.3

Author: coredex-source

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx2G
 
 # Mod properties
 mod_id=modernfix
-version=5.27.17-build.1
+version=5.27.17-build.2
 
 # Minecraft/Fabric
 minecraft_version=26.2

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

@@ -8,14 +8,18 @@
 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;
 
 @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 +28,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
      */
     @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-source
+     * @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;
+    }
+}