5.27.17 - commit.2

- Patch for 26.2 again.

Author: coredex-source

gradle.properties

@@ -1,6 +1,5 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx2G
-# org.gradle.java.home=C:/jdk-25.0.2
 
 # Mod properties
 mod_id=modernfix
@@ -19,7 +18,7 @@ mixinextras_version=0.5.4
 modmenu_version=20.0.0-beta.2
 
 # For mod sites
-supported_minecraft_versions=~26.1-
+supported_minecraft_versions=~26.2-
 
 # 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.screen instanceof CreateWorldScreen)
+        if(minecraft.gui.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.screens.Overlay;
+import net.minecraft.client.gui.Gui;
 import org.embeddedt.modernfix.ModernFixClient;
 import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
-import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Final;
 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 @Nullable public Overlay overlay;
+    @Shadow @Final public Gui gui;
 
     @Inject(method = "tick", at = @At("HEAD"))
     private void onClientTick(CallbackInfo ci) {
-        if(this.overlay == null && ModernFixClient.INSTANCE != null) {
+        if(this.gui.screen() == null && ModernFixClient.INSTANCE != null) {
             ModernFixClient.INSTANCE.onGameLaunchFinish();
         }
     }

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

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

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

@@ -108,7 +108,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.screen.width / 2 - this.width / 2);
+            float x = (float)(OptionList.this.minecraft.gui.screen().width / 2 - this.width / 2);
             int y = getY() + getHeight() - 10;
             guiGraphics.text(var10000, this.name, (int)x, y, -1);
             /*
@@ -165,7 +165,7 @@ public OptionEntry(String optionName, Option option) {
             updateStatus();
             this.helpButton = new Button.Builder(Component.literal("?"), (arg) -> {
                 mainScreen.setLastScrollAmount(scrollAmount());
-                Minecraft.getInstance().setScreen(new ModernFixOptionInfoScreen(mainScreen, optionName));
+                Minecraft.getInstance().gui.setScreen(new ModernFixOptionInfoScreen(mainScreen, optionName));
             }).pos(75, 0).size(20, 20).build();
             String helpKey = "modernfix.option." + optionName;
             String helpText = I18n.get(helpKey);