26.2 Snapshot 2 (#335)

lowercasebtw · web-flow · commit 76814ebb79c1 · 2026-04-10T13:16:01.000+01:00
* 26.2 Snapshot 1

* Requested Changes &amp; Snapshot 2
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -24,6 +24,7 @@ stonecutter {
         }
 
         mc("26.1", loaders = listOf("fabric", "neoforge"))
+        mc("26.2", loaders = listOf("fabric"))
     }
 }
 rootProject.name = "YetAnotherConfigLib"
diff --git a/src/main/java/dev/isxander/yacl3/api/OptionFlag.java b/src/main/java/dev/isxander/yacl3/api/OptionFlag.java
@@ -1,6 +1,7 @@
 package dev.isxander.yacl3.api;
 
 import dev.isxander.yacl3.gui.RequireRestartScreen;
+import dev.isxander.yacl3.gui.utils.GuiUtils;
 import net.minecraft.client.Minecraft;
 
 import java.util.function.Consumer;
@@ -12,7 +13,7 @@
 @FunctionalInterface
 public interface OptionFlag extends Consumer<Minecraft> {
     /** Warns the user that a game restart is required for the changes to take effect */
-    OptionFlag GAME_RESTART = client -> client.setScreen(new RequireRestartScreen(client.screen));
+    OptionFlag GAME_RESTART = client -> GuiUtils.setScreen(new RequireRestartScreen(GuiUtils.getCurrentScreen()));
 
     /** Reloads chunks upon applying (F3+A) */
     OptionFlag RELOAD_CHUNKS = client -> client.levelRenderer.allChanged();
diff --git a/src/main/java/dev/isxander/yacl3/gui/RequireRestartScreen.java b/src/main/java/dev/isxander/yacl3/gui/RequireRestartScreen.java
@@ -1,5 +1,6 @@
 package dev.isxander.yacl3.gui;
 
+import dev.isxander.yacl3.gui.utils.GuiUtils;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.ConfirmScreen;
@@ -10,7 +11,7 @@ public class RequireRestartScreen extends ConfirmScreen {
     public RequireRestartScreen(Screen parent) {
         super(option -> {
             if (option) Minecraft.getInstance().stop();
-            else Minecraft.getInstance().setScreen(parent);
+            else GuiUtils.setScreen(parent);
         },
                 Component.translatable("yacl.restart.title").withStyle(ChatFormatting.RED, ChatFormatting.BOLD),
                 Component.translatable("yacl.restart.message"),
diff --git a/src/main/java/dev/isxander/yacl3/gui/YACLScreen.java b/src/main/java/dev/isxander/yacl3/gui/YACLScreen.java
@@ -13,7 +13,6 @@
 import dev.isxander.yacl3.impl.utils.YACLConstants;
 import dev.isxander.yacl3.platform.YACLPlatform;
 import net.minecraft.ChatFormatting;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.AbstractWidget;
@@ -110,12 +109,12 @@ public void addPopupControllerWidget(ControllerPopupWidget<?> controllerPopupWid
             optionListWidget = categoryTab.optionList.getType();
         }
         if(optionListWidget != null) {
-            this.minecraft.setScreen(new PopupControllerScreen(this, controllerPopupWidget));
+            GuiUtils.setScreen(new PopupControllerScreen(this, controllerPopupWidget));
         }
     }
 
     public void clearPopupControllerWidget() {
-        if(Minecraft.getInstance().screen instanceof PopupControllerScreen popupControllerScreen) {
+        if (GuiUtils.getCurrentScreen() instanceof PopupControllerScreen popupControllerScreen) {
             popupControllerScreen.onClose();
         }
         popupControllerVisible = false;
@@ -247,7 +246,7 @@ public boolean shouldCloseOnEsc() {
 
     @Override
     public void onClose() {
-        minecraft.setScreen(parent);
+        GuiUtils.setScreen(parent);
     }
 
     public static void renderMultilineTooltip(GuiGraphicsExtractor graphics, Font font, MultiLineLabel text, int centerX, int yAbove, int yBelow, int screenWidth, int screenHeight) {
@@ -469,7 +468,7 @@ public void visitChildren(Consumer<AbstractWidget> consumer) {
 
         @Override
         public void doLayout(ScreenRectangle screenRectangle) {
-            screen.minecraft.setScreen(category.screen().apply(screen.minecraft, screen));
+            GuiUtils.setScreen(category.screen().apply(screen.minecraft, screen));
         }
 
         @Override
diff --git a/src/main/java/dev/isxander/yacl3/gui/controllers/PopupControllerScreen.java b/src/main/java/dev/isxander/yacl3/gui/controllers/PopupControllerScreen.java
@@ -1,6 +1,7 @@
 package dev.isxander.yacl3.gui.controllers;
 
 import dev.isxander.yacl3.gui.YACLScreen;
+import dev.isxander.yacl3.gui.utils.GuiUtils;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.screens.Screen;
 
@@ -90,7 +91,7 @@ public void tick() {
 
     @Override
     public void onClose() {
-        this.minecraft.screen = backgroundYaclScreen;
+        GuiUtils.setScreen(backgroundYaclScreen, true);
         this.controllerPopup.close();
     }
 
diff --git a/src/main/java/dev/isxander/yacl3/gui/utils/GuiUtils.java b/src/main/java/dev/isxander/yacl3/gui/utils/GuiUtils.java
@@ -1,8 +1,11 @@
 package dev.isxander.yacl3.gui.utils;
 
+import dev.isxander.yacl3.mixin.GuiAccessor;
 import dev.isxander.yacl3.platform.YACLPlatform;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.components.WidgetSprites;
+import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.locale.Language;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
@@ -45,4 +48,32 @@ public static String shortenString(String string, Font font, int maxWidth, Strin
     public static FormattedCharSequence overrideStyle(FormattedCharSequence seq, Style style) {
         return output -> seq.accept((c, s, t) -> output.accept(c, style, t));
     }
+
+    public static void setScreen(Screen screen, boolean ignoreVanilla) {
+        if (ignoreVanilla) {
+            //? >=26.2 {
+            /*((GuiAccessor) Minecraft.getInstance().gui).yacl$setScreen(screen);
+             *///? } else {
+            Minecraft.getInstance().screen = screen;
+            //? }
+        } else {
+            //? >=26.2 {
+            /*Minecraft.getInstance().gui.setScreen(screen);
+             *///? } else {
+            Minecraft.getInstance().setScreen(screen);
+            //? }
+        }
+    }
+
+    public static void setScreen(Screen screen) {
+        setScreen(screen, false);
+    }
+
+    public static Screen getCurrentScreen() {
+        //? >=26.2 {
+        /*return Minecraft.getInstance().gui.screen();
+        *///? } else {
+        return Minecraft.getInstance().screen;
+        //? }
+    }
 }
diff --git a/src/main/java/dev/isxander/yacl3/mixin/GuiAccessor.java b/src/main/java/dev/isxander/yacl3/mixin/GuiAccessor.java
@@ -0,0 +1,14 @@
+package dev.isxander.yacl3.mixin;
+
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.screens.Screen;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(Gui.class)
+public interface GuiAccessor {
+    //? >=26.2 {
+    /*@Accessor("screen")
+    void yacl$setScreen(Screen screen);
+    *///? }
+}
diff --git a/src/main/java/dev/isxander/yacl3/mixin/MinecraftMixin.java b/src/main/java/dev/isxander/yacl3/mixin/MinecraftMixin.java
@@ -9,7 +9,14 @@
 
 @Mixin(Minecraft.class)
 public class MinecraftMixin {
-    @Inject(method = "destroy", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;close()V"))
+    @Inject(
+            //? >=26.2 {
+            /*method = "exitWorldAndClose",
+            *///? } else {
+            method = "destroy",
+            //? }
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;close()V")
+    )
     private void closeImages(CallbackInfo ci) {
         ImageRendererManager.closeAll();
     }
diff --git a/src/main/resources/yacl.mixins.json b/src/main/resources/yacl.mixins.json
@@ -9,6 +9,7 @@
   "client": [
     "AbstractSelectionListAccessor",
     "AbstractSelectionListMixin",
+    "GuiAccessor",
     "MinecraftMixin",
     "OptionInstanceAccessor",
     "TabNavigationBarAccessor",
diff --git a/src/testmod/java/dev/isxander/yacl3/test/GuiTest.java b/src/testmod/java/dev/isxander/yacl3/test/GuiTest.java
@@ -14,12 +14,12 @@
 import dev.isxander.yacl3.gui.controllers.string.number.FloatFieldController;
 import dev.isxander.yacl3.gui.controllers.string.number.IntegerFieldController;
 import dev.isxander.yacl3.gui.controllers.string.number.LongFieldController;
+import dev.isxander.yacl3.gui.utils.GuiUtils;
 import dev.isxander.yacl3.impl.SelfContainedBinding;
 import dev.isxander.yacl3.platform.YACLPlatform;
 import net.minecraft.ChatFormatting;
 import net.minecraft.util.Util;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.components.toasts.SystemToast;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.ClickEvent;
 import net.minecraft.network.chat.Component;
@@ -30,7 +30,6 @@
 
 import java.awt.Color;
 import java.net.URI;
-import java.nio.file.Path;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -42,26 +41,26 @@ public static Screen getModConfigScreenFactory(Screen parent) {
                                 .name(Component.literal("Suites"))
                                 .option(ButtonOption.createBuilder()
                                         .name(Component.literal("Full Test Suite"))
-                                        .action((screen, opt) -> Minecraft.getInstance().setScreen(getFullTestSuite(screen)))
+                                        .action((screen, opt) -> GuiUtils.setScreen(getFullTestSuite(screen)))
                                         .build())
                                 .option(ButtonOption.createBuilder()
                                         .name(Component.literal("Auto-gen test"))
                                         .action((screen, opt) -> {
                                             AutogenConfigTest.INSTANCE.load();
-                                            Minecraft.getInstance().setScreen(AutogenConfigTest.INSTANCE.generateGui().generateScreen(screen));
+                                            GuiUtils.setScreen(AutogenConfigTest.INSTANCE.generateGui().generateScreen(screen));
                                         })
                                         .build())
                                 .option(ButtonOption.createBuilder()
                                         .name(Component.literal("Kotlin DSL Test"))
                                         .action((screen, opt) -> {
-                                            Minecraft.getInstance().setScreen(CodecConfigKt.INSTANCE.generateConfigScreen(screen));
+                                            GuiUtils.setScreen(CodecConfigKt.INSTANCE.generateConfigScreen(screen));
                                         })
                                         .build())
                                 .group(OptionGroup.createBuilder()
                                         .name(Component.literal("Wiki"))
                                         .option(ButtonOption.createBuilder()
                                                 .name(Component.literal("Get Started"))
-                                                .action((screen, opt) -> Minecraft.getInstance().setScreen(getWikiGetStarted(screen)))
+                                                .action((screen, opt) -> GuiUtils.setScreen(getWikiGetStarted(screen)))
                                                 .build())
                                         .build())
                                 .build())
diff --git a/src/testmod/java/dev/isxander/yacl3/test/mixin/TitleScreenMixin.java b/src/testmod/java/dev/isxander/yacl3/test/mixin/TitleScreenMixin.java
@@ -1,5 +1,6 @@
 package dev.isxander.yacl3.test.mixin;
 
+import dev.isxander.yacl3.gui.utils.GuiUtils;
 import dev.isxander.yacl3.test.GuiTest;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.screens.Screen;
@@ -19,7 +20,7 @@ protected TitleScreenMixin(Component title) {
     @Inject(method = "init", at = @At("RETURN"))
     private void addButton(CallbackInfo ci) {
         addRenderableWidget(Button.builder(Component.literal("YetAnotherConfigLib Test"), button -> {
-            minecraft.setScreen(GuiTest.getModConfigScreenFactory(minecraft.screen));
+            GuiUtils.setScreen(GuiTest.getModConfigScreenFactory(GuiUtils.getCurrentScreen()));
         }).width(150).build());
     }
 }
diff --git a/versions/26.2-fabric/gradle.properties b/versions/26.2-fabric/gradle.properties
@@ -0,0 +1,10 @@
+modstitch.platform=fabric-loom
+
+mcVersion=26.2-snapshot-2
+
+deps.fabricApi=0.145.5+26.2
+
+meta.mcDep=~26.2-alpha.2
+
+pub.modrinthMC=26.2-snapshot-2
+pub.curseMC=26.2-snapshot

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ stonecutter {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`mc("26.1", loaders = listOf("fabric", "neoforge"))`
	`27`	`+ mc("26.2", loaders = listOf("fabric"))`
`27`	`28`	`}`
`28`	`29`	`}`
`29`	`30`	`rootProject.name = "YetAnotherConfigLib"`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`	`import dev.isxander.yacl3.impl.utils.YACLConstants;`
`14`	`14`	`import dev.isxander.yacl3.platform.YACLPlatform;`
`15`	`15`	`import net.minecraft.ChatFormatting;`
`16`		`-import net.minecraft.client.Minecraft;`
`17`	`16`	`import net.minecraft.client.gui.Font;`
`18`	`17`	`import net.minecraft.client.gui.GuiGraphicsExtractor;`
`19`	`18`	`import net.minecraft.client.gui.components.AbstractWidget;`
`@@ -110,12 +109,12 @@ public void addPopupControllerWidget(ControllerPopupWidget<?> controllerPopupWid`
`110`	`109`	`optionListWidget = categoryTab.optionList.getType();`
`111`	`110`	`}`
`112`	`111`	`if(optionListWidget != null) {`
`113`		`- this.minecraft.setScreen(new PopupControllerScreen(this, controllerPopupWidget));`
	`112`	`+ GuiUtils.setScreen(new PopupControllerScreen(this, controllerPopupWidget));`
`114`	`113`	`}`
`115`	`114`	`}`
`116`	`115`
`117`	`116`	`public void clearPopupControllerWidget() {`
`118`		`- if(Minecraft.getInstance().screen instanceof PopupControllerScreen popupControllerScreen) {`
	`117`	`+ if (GuiUtils.getCurrentScreen() instanceof PopupControllerScreen popupControllerScreen) {`
`119`	`118`	`popupControllerScreen.onClose();`
`120`	`119`	`}`
`121`	`120`	`popupControllerVisible = false;`
`@@ -247,7 +246,7 @@ public boolean shouldCloseOnEsc() {`
`247`	`246`
`248`	`247`	`@Override`
`249`	`248`	`public void onClose() {`
`250`		`- minecraft.setScreen(parent);`
	`249`	`+ GuiUtils.setScreen(parent);`
`251`	`250`	`}`
`252`	`251`
`253`	`252`	`public static void renderMultilineTooltip(GuiGraphicsExtractor graphics, Font font, MultiLineLabel text, int centerX, int yAbove, int yBelow, int screenWidth, int screenHeight) {`
`@@ -469,7 +468,7 @@ public void visitChildren(Consumer<AbstractWidget> consumer) {`
`469`	`468`
`470`	`469`	`@Override`
`471`	`470`	`public void doLayout(ScreenRectangle screenRectangle) {`
`472`		`- screen.minecraft.setScreen(category.screen().apply(screen.minecraft, screen));`
	`471`	`+ GuiUtils.setScreen(category.screen().apply(screen.minecraft, screen));`
`473`	`472`	`}`
`474`	`473`
`475`	`474`	`@Override`