Revert "Merge branch 'fabric/26.2' into fabric/26.1"

This reverts commit 2862436, reversing
changes made to a80c2dd.

Author: coredex-source

gradle.properties

@@ -4,22 +4,22 @@ org.gradle.jvmargs=-Xmx2G
 
 # Mod properties
 mod_id=modernfix
-version=5.27.5-build.3
+version=5.27.7-build.1
 
 # Minecraft/Fabric
-minecraft_version=26.2-snapshot-5
-loader_version=0.19.2
+minecraft_version=26.1.2
+loader_version=0.18.6
 loom_version=1.16-SNAPSHOT
 
 # Fabric API
-fabric_api_version=0.147.1+26.2
+fabric_api_version=0.145.4+26.1.2
 
 # Dependencies
 mixinextras_version=0.4.1
-modmenu_version=18.0.0-alpha.8
+modmenu_version=18.0.0-alpha.5
 
 # For mod sites
-supported_minecraft_versions=~26.2-
+supported_minecraft_versions=~26.1-
 
 # Build
 shadow_version=8.1.1

src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/world_screen_skipped/WorldSelectionListMixin.java

@@ -18,7 +18,7 @@ public class WorldSelectionListMixin {
 
     @Inject(method = "*", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/worldselection/WorldSelectionList$WorldListEntry;doDeleteWorld()V", ordinal = 0, shift = At.Shift.AFTER), cancellable = true)
     private void preventClosingCreateScreenAfterDelete(CallbackInfo ci) {
-        if(minecraft.gui.screen() instanceof CreateWorldScreen)
+        if(minecraft.screen instanceof CreateWorldScreen)
             ci.cancel();
     }
 }

src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/MinecraftMixin.java

@@ -1,10 +1,10 @@
 package org.embeddedt.modernfix.common.mixin.feature.measure_time;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.screens.Overlay;
 import org.embeddedt.modernfix.ModernFixClient;
 import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
-import org.spongepowered.asm.mixin.Final;
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -16,11 +16,11 @@
 @ClientOnlyMixin
 public class MinecraftMixin {
     // TODO re-add datapack reload time measurement
-    @Shadow @Final public Gui gui;
+    @Shadow @Nullable public Overlay overlay;
 
     @Inject(method = "tick", at = @At("HEAD"))
     private void onClientTick(CallbackInfo ci) {
-        if(this.gui.overlay() == null && ModernFixClient.INSTANCE != null) {
+        if(this.overlay == null && ModernFixClient.INSTANCE != null) {
             ModernFixClient.INSTANCE.onGameLaunchFinish();
         }
     }

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

@@ -8,20 +8,14 @@
 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;
-
-// Update the file when embeddedt patches this file for 26.2 in the neoforge version to keep it conisitent with the upstream changes.
+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;
@@ -30,53 +24,27 @@ public class SurfaceRulesContextMixin {
 
     @Shadow private int stoneDepthAbove;
 
-    @Shadow private Holder<Biome> biome;
+    @Shadow private Supplier<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 Keep a reusable biome cache helper instead of rebuilding intermediate state
+     * @reason Reuse supplier object instead of creating new ones every time
      */
     @Overwrite
-    protected void updateY(int stoneDepthAbove, int stoneDepthBelow, int waterHeight, int blockY) {
+    public void updateY(int stoneDepthAbove, int stoneDepthBelow, int waterHeight, int blockX, int blockY, int blockZ) {
         ++this.lastUpdateY;
-
-        var getter = this.modernfix$biomeCache;
+        var getter = this.biome;
         if(getter == null) {
-            this.modernfix$biomeCache = getter = new PositionalBiomeGetter(this.biomeGetter, this.pos);
+            this.biome = getter = new PositionalBiomeGetter(this.biomeGetter, this.pos);
         }
-
-        getter.update(this.blockX, blockY, this.blockZ);
-        this.biome = null;
+        ((PositionalBiomeGetter)getter).update(blockX, blockY, blockZ);
         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;
-    }
 }

src/main/java/org/embeddedt/modernfix/dynresources/DynamicModelSystem.java

@@ -11,11 +11,10 @@
 import it.unimi.dsi.fastutil.objects.ObjectSet;
 import it.unimi.dsi.fastutil.objects.ObjectSets;
 import it.unimi.dsi.fastutil.objects.ReferenceSets;
-// import net.fabricmc.fabric.impl.client.model.loading.UnbakedModelDeserializerRegistry; // Disabled by FRAPI
+import net.fabricmc.fabric.impl.client.model.loading.UnbakedModelDeserializerRegistry;
 import net.minecraft.client.color.block.BlockColors;
 import net.minecraft.client.renderer.item.ClientItem;
 import net.minecraft.client.renderer.block.dispatch.BlockStateModel;
-import net.minecraft.client.resources.model.cuboid.CuboidModel;
 import net.minecraft.client.resources.model.cuboid.ItemModelGenerator;
 import net.minecraft.client.resources.model.BlockStateModelLoader;
 import net.minecraft.client.resources.model.ClientItemInfoLoader;
@@ -65,8 +64,7 @@ public UnbakedModel load(Identifier key) throws Exception {
                     ModernFix.LOGGER.info("Loading unbaked model {}", key);
                 }
                 try (Reader reader = resource.openAsReader()) {
-                    // return UnbakedModelDeserializerRegistry.deserialize(reader); // Disabled by FRAPI
-                    return CuboidModel.fromStream(reader);
+                    return UnbakedModelDeserializerRegistry.deserialize(reader);
                 }
             }
         });

src/main/java/org/embeddedt/modernfix/screen/ModernFixConfigScreen.java

@@ -37,7 +37,7 @@ protected void init() {
 
     @Override
     public void onClose() {
-        this.minecraft.gui.setScreen(lastScreen);
+        this.minecraft.setScreen(lastScreen);
     }
 
     @Override

src/main/java/org/embeddedt/modernfix/screen/ModernFixOptionInfoScreen.java

@@ -35,7 +35,7 @@ protected void init() {
 
     @Override
     public void onClose() {
-        this.minecraft.gui.setScreen(lastScreen);
+        this.minecraft.setScreen(lastScreen);
     }
 
     private void drawMultilineString(GuiGraphicsExtractor guiGraphics, Font fr, Component str, int x, int y) {

src/main/java/org/embeddedt/modernfix/screen/OptionList.java

@@ -107,7 +107,7 @@ public CategoryEntry(Component component) {
 
         public void extractContent(GuiGraphicsExtractor guiGraphics, int mouseX, int mouseY, boolean isMouseOver, float partialTicks) {
             Font var10000 = OptionList.this.minecraft.font;
-            float x = (float)(OptionList.this.minecraft.gui.screen().width / 2 - this.width / 2);
+            float x = (float)(OptionList.this.minecraft.screen.width / 2 - this.width / 2);
             int y = getY() + getHeight() - 10;
             guiGraphics.text(var10000, this.name, (int)x, y, -1);
             /*
@@ -164,7 +164,7 @@ public OptionEntry(String optionName, Option option) {
             updateStatus();
             this.helpButton = new Button.Builder(Component.literal("?"), (arg) -> {
                 mainScreen.setLastScrollAmount(scrollAmount());
-                Minecraft.getInstance().gui.setScreen(new ModernFixOptionInfoScreen(mainScreen, optionName));
+                Minecraft.getInstance().setScreen(new ModernFixOptionInfoScreen(mainScreen, optionName));
             }).pos(75, 0).size(20, 20).build();
             String helpKey = "modernfix.option." + optionName;
             String helpText = I18n.get(helpKey);