Port to MC 26.2

.github/workflows/build.yml

@@ -14,7 +14,7 @@ jobs:
       - name: setup jdk
         uses: actions/setup-java@v5
         with:
-          java-version: '21'
+          java-version: '25'
           distribution: 'microsoft'
 
       - name: make gradle wrapper executable

build.gradle

@@ -1,6 +1,6 @@
 plugins {
-	id 'dev.architectury.loom' version '1.13.467' apply false
-	id 'architectury-plugin' version '3.4-SNAPSHOT'
+	id "dev.architectury.loom-no-remap" version "1.14-SNAPSHOT" apply false
+	id "architectury-plugin" version "3.5-SNAPSHOT"
 	id 'com.gradleup.shadow' version '8.3.6' apply false
 }
 
@@ -30,7 +30,7 @@ allprojects {
 }
 
 subprojects {
-	apply plugin: 'dev.architectury.loom'
+	apply plugin: "dev.architectury.loom-no-remap"
 	apply plugin: 'architectury-plugin'
 	apply plugin: 'maven-publish'
 
@@ -48,10 +48,6 @@ subprojects {
 		}
 	}
 
-	tasks.named('remapJar') {
-		archiveVersion.set("")
-	}
-
 	loom {
 		silentMojangMappingsLicense()
 
@@ -69,20 +65,16 @@ subprojects {
 
 	dependencies {
 		minecraft "net.minecraft:minecraft:$rootProject.minecraft_version"
-		mappings loom.layered() {
-			officialMojangMappings()
-			parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip")
-		}
 	}
 
 	java {
 		withSourcesJar()
-		sourceCompatibility = JavaVersion.VERSION_21
-		targetCompatibility = JavaVersion.VERSION_21
+		sourceCompatibility = JavaVersion.VERSION_25
+		targetCompatibility = JavaVersion.VERSION_25
 	}
 
 	tasks.withType(JavaCompile).configureEach {
-		it.options.release = 21
+		it.options.release = 25
 	}
 
 	processResources {

common/build.gradle

@@ -3,7 +3,7 @@ architectury {
 }
 
 dependencies {
-    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
+    implementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
 
     testImplementation "org.junit.jupiter:junit-jupiter:${rootProject.junit_version}"
     testRuntimeOnly "org.junit.platform:junit-platform-launcher"

common/src/main/java/net/weyne1/easegui/api/EaseGUIScreenRegistry.java

@@ -52,7 +52,7 @@ public final class EaseGUIScreenRegistry {
         register("statistics", StatsScreen.class, 1000, EaseGUIScreenGroup.BASIC);
         register("warning", WarningScreen.class, 1000, EaseGUIScreenGroup.BASIC);
         register("pause", PauseScreen.class, 1000, EaseGUIScreenGroup.BASIC);
-        register("share_to_lan", ShareToLanScreen.class, 1000, EaseGUIScreenGroup.BASIC);
+        register("multiplayer_options", MultiplayerOptionsScreen.class, 1000, EaseGUIScreenGroup.BASIC);
         register("death", DeathScreen.class, 1000, EaseGUIScreenGroup.BASIC);
         register("social_interactions", SocialInteractionsScreen.class, 1000, EaseGUIScreenGroup.BASIC);
 
@@ -73,7 +73,7 @@ public final class EaseGUIScreenRegistry {
         register("direct_join_server", DirectJoinServerScreen.class, 1000, EaseGUIScreenGroup.WORLDS);
         register("edit_world", EditWorldScreen.class, 1000, EaseGUIScreenGroup.WORLDS);
         register("edit_server", ManageServerScreen.class, 1000, EaseGUIScreenGroup.WORLDS);
-        register("edit_game_rules", EditGameRulesScreen.class, 1000, EaseGUIScreenGroup.WORLDS);
+        register("edit_game_rules", AbstractGameRulesScreen.class, 1000, EaseGUIScreenGroup.WORLDS);
         register("experiments", ExperimentsScreen.class, 1000, EaseGUIScreenGroup.WORLDS);
         register("connecting", ConnectScreen.class, 1000, EaseGUIScreenGroup.WORLDS);
         register("disconnected", DisconnectedScreen.class, 1000, EaseGUIScreenGroup.WORLDS);

common/src/main/java/net/weyne1/easegui/client/animation/AnimationScope.java

@@ -1,13 +1,13 @@
 package net.weyne1.easegui.client.animation;
 
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.weyne1.easegui.client.EaseGUIDebug;
 import org.joml.Matrix3x2fStack;
 
 public final class AnimationScope implements AutoCloseable {
     private static final float MIN_SCALE = 0.001f;
 
-    private final GuiGraphics guiGraphics;
+    private final GuiGraphicsExtractor graphics;
     private final float alpha;
 
     private boolean isClosed = false;
@@ -37,12 +37,12 @@ public boolean isSuspended() {
         return isSuspended;
     }
 
-    public AnimationScope(GuiGraphics guiGraphics, float alpha) {
-        this.guiGraphics = guiGraphics;
+    public AnimationScope(GuiGraphicsExtractor graphics, float alpha) {
+        this.graphics = graphics;
         this.alpha = alpha;
 
         AnimationContext.pushScope(this);
-        this.guiGraphics.pose().pushMatrix();
+        this.graphics.pose().pushMatrix();
     }
 
     public void setTransformParams(float offsetX, float offsetY, float scaleX, float scaleY, float pivotX, float pivotY) {
@@ -53,7 +53,7 @@ public void setTransformParams(float offsetX, float offsetY, float scaleX, float
         this.pivotX = pivotX;
         this.pivotY = pivotY;
 
-        Matrix3x2fStack poseStack = guiGraphics.pose();
+        Matrix3x2fStack poseStack = graphics.pose();
 
         if (this.scaleX != 1.0f || this.scaleY != 1.0f) {
             poseStack.translate(offsetX + pivotX, offsetY + pivotY);
@@ -67,7 +67,7 @@ public void setTransformParams(float offsetX, float offsetY, float scaleX, float
     public void suspend() {
         if (isClosed || isSuspended) return;
 
-        Matrix3x2fStack poseStack = guiGraphics.pose();
+        Matrix3x2fStack poseStack = graphics.pose();
         poseStack.pushMatrix();
 
         if (scaleX != 1.0f || scaleY != 1.0f) {
@@ -84,7 +84,7 @@ public void suspend() {
     public void resume() {
         if (isClosed || !isSuspended) return;
 
-        guiGraphics.pose().popMatrix();
+        graphics.pose().popMatrix();
 
         isSuspended = false;
     }
@@ -95,12 +95,12 @@ public void close() {
         isClosed = true;
 
         if (isSuspended) {
-            guiGraphics.pose().popMatrix();
+            graphics.pose().popMatrix();
             isSuspended = false;
         }
 
         try {
-            guiGraphics.pose().popMatrix();
+            graphics.pose().popMatrix();
         } catch (IllegalStateException e) {
             EaseGUIDebug.reportError("pose_stack_underflow", () -> "PoseStack underflow inside AnimationScope close!");
         }

common/src/main/java/net/weyne1/easegui/client/animation/AnimationSystem.java

@@ -1,6 +1,6 @@
 package net.weyne1.easegui.client.animation;
 
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.util.Util;
 import net.weyne1.easegui.api.animation.AnimationProfile;
 
@@ -10,7 +10,7 @@ public final class AnimationSystem {
      * An entry point for animations with automatic timing and progress calculation.
      */
     public static AnimationScope begin(
-            GuiGraphics gg,
+            GuiGraphicsExtractor graphics,
             int x, int y, int width, int height,
             AnimationProfile profile,
             long startTime,
@@ -25,11 +25,11 @@ public static AnimationScope begin(
 
         float progress = elapsed <= 0 ? 0.0f : AnimationMath.calculateProgress(elapsed, profile.getDuration(), profile.getEasing());
 
-        return begin(gg, x, y, width, height, profile, progress, baseAlpha);
+        return begin(graphics, x, y, width, height, profile, progress, baseAlpha);
     }
 
     public static AnimationScope begin(
-            GuiGraphics gg,
+            GuiGraphicsExtractor graphics,
             int x, int y, int width, int height,
             AnimationProfile profile,
             float progress,
@@ -39,7 +39,7 @@ public static AnimationScope begin(
         float lerpedAlpha = AnimationMath.lerp(profile.getStartAlpha(), 1.0f, alphaProgress);
         float finalAlpha = AnimationMath.clamp(baseAlpha * lerpedAlpha, 0.0f, 1.0f);
 
-        AnimationScope scope = new AnimationScope(gg, finalAlpha);
+        AnimationScope scope = new AnimationScope(graphics, finalAlpha);
         scope.setTransformParams(
                 AnimationMath.calculateCurrentOffset(profile.getOffsetX(), progress),
                 AnimationMath.calculateCurrentOffset(profile.getOffsetY(), progress),
@@ -51,7 +51,7 @@ public static AnimationScope begin(
         return scope;
     }
 
-    public static AnimationScope beginAlphaOnly(GuiGraphics gg, float alpha) {
+    public static AnimationScope beginAlphaOnly(GuiGraphicsExtractor gg, float alpha) {
         return new AnimationScope(gg, alpha);
     }
 }

common/src/main/java/net/weyne1/easegui/client/animator/AdvancementsAnimator.java

@@ -1,7 +1,7 @@
 package net.weyne1.easegui.client.animator;
 
 import net.minecraft.util.Util;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.advancements.AdvancementsScreen;
 import net.weyne1.easegui.client.animation.AnimationContext;
@@ -15,7 +15,7 @@
 
 public class AdvancementsAnimator {
 
-    public static AnimationScope beginRenderWindow(AdvancementsScreen screen, GuiGraphics gg) {
+    public static AnimationScope beginRenderWindow(AdvancementsScreen screen, GuiGraphicsExtractor graphics) {
         EaseGUIScreenType type = EaseGUIScreenRegistry.from(screen);
         var titleSettings = ConfigManager.getConfig().screens.get(type.getId());
 
@@ -31,10 +31,10 @@ public static AnimationScope beginRenderWindow(AdvancementsScreen screen, GuiGra
 
         float progress = elapsed <= 0 ? 0.0f : AnimationMath.calculateProgress(elapsed, profile.getDuration(), profile.getEasing());
 
-        return AnimationSystem.begin(gg, 0, 0, screen.width, screen.height, profile, progress, 1.0f);
+        return AnimationSystem.begin(graphics, 0, 0, screen.width, screen.height, profile, progress, 1.0f);
     }
 
-    public static AnimationScope beginRenderTab(Screen screen, GuiGraphics gg, int tabIndex) {
+    public static AnimationScope beginRenderTab(Screen screen, GuiGraphicsExtractor graphics, int tabIndex) {
         EaseGUIScreenType type = EaseGUIScreenRegistry.from(screen);
         var titleSettings = ConfigManager.getConfig().screens.get(type.getId());
 
@@ -45,7 +45,7 @@ public static AnimationScope beginRenderTab(Screen screen, GuiGraphics gg, int t
         float parentAlpha = AnimationContext.getCurrentAlpha();
 
         if (tabIndex == 0) {
-            return AnimationSystem.beginAlphaOnly(gg, parentAlpha);
+            return AnimationSystem.beginAlphaOnly(graphics, parentAlpha);
         }
 
         var profile = titleSettings.advancements.tabsProfile;
@@ -61,6 +61,6 @@ public static AnimationScope beginRenderTab(Screen screen, GuiGraphics gg, int t
             progress = AnimationMath.calculateProgress(elapsed, profile.getDuration(), profile.getEasing());
         }
 
-        return AnimationSystem.begin(gg, 0, 0, 28, 32, profile, progress, parentAlpha);
+        return AnimationSystem.begin(graphics, 0, 0, 28, 32, profile, progress, parentAlpha);
     }
 }

common/src/main/java/net/weyne1/easegui/client/animator/BackgroundAnimator.java

@@ -1,6 +1,6 @@
 package net.weyne1.easegui.client.animator;
 
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.screens.*;
 import net.weyne1.easegui.client.animation.AnimationScope;
 import net.weyne1.easegui.client.animation.AnimationSystem;
@@ -70,7 +70,7 @@ public static int getAnimatedColor(Screen screen, int originalColor) {
         return (originalColor & 0x00FFFFFF) | (finalAlpha << 24);
     }
 
-    public static AnimationScope beginRenderMenu(Screen screen, GuiGraphics gg) {
+    public static AnimationScope beginRenderMenu(Screen screen, GuiGraphicsExtractor graphics) {
         if (!shouldAnimateBackground(screen) || skipBackgroundFade) {
             return null;
         }
@@ -82,7 +82,7 @@ public static AnimationScope beginRenderMenu(Screen screen, GuiGraphics gg) {
         }
 
         float progress = Math.max(0.0f, Math.min(1.0f, ScreenAnimationTracker.getProgress()));
-        return AnimationSystem.beginAlphaOnly(gg, progress);
+        return AnimationSystem.beginAlphaOnly(graphics, progress);
     }
 
     private static boolean isIgnoredScreen(Screen screen) {

common/src/main/java/net/weyne1/easegui/client/animator/ContainerAnimator.java

@@ -1,6 +1,6 @@
 package net.weyne1.easegui.client.animator;
 
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.recipebook.RecipeBookComponent;
 import net.weyne1.easegui.client.extension.ContainerScreenExtension;
@@ -14,7 +14,7 @@
 
 public class ContainerAnimator {
 
-    public static AnimationScope beginAnimation(Screen screen, GuiGraphics gg) {
+    public static AnimationScope beginAnimation(Screen screen, GuiGraphicsExtractor graphics) {
         if (!(screen instanceof ContainerScreenExtension container)) {
             return null;
         }
@@ -39,6 +39,6 @@ public static AnimationScope beginAnimation(Screen screen, GuiGraphics gg) {
         if (profile == null || !profile.isEnabled()) return null;
 
         long startTime = ScreenStateTracker.getScreenOpenTime();
-        return AnimationSystem.begin(gg, minX, minY, maxX - minX, maxY - minY, profile, startTime, 0L, 1.0f);
+        return AnimationSystem.begin(graphics, minX, minY, maxX - minX, maxY - minY, profile, startTime, 0L, 1.0f);
     }
 }

common/src/main/java/net/weyne1/easegui/client/animator/ListItemAnimator.java

@@ -1,7 +1,7 @@
 package net.weyne1.easegui.client.animator;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.weyne1.easegui.api.animation.AnimationProfile;
 import net.weyne1.easegui.client.animation.AnimationScope;
 import net.weyne1.easegui.client.animation.AnimationSystem;
@@ -11,14 +11,14 @@
 
 public class ListItemAnimator {
 
-    public static AnimationScope beginRender(GuiGraphics gg, int top, int left, int width, int height) {
+    public static AnimationScope beginRender(GuiGraphicsExtractor graphics, int top, int left, int width, int height) {
         var profile = ConfigManager.getProfileForCurrentContext(WidgetCategory.LIST_ENTRY);
         if (profile == null || !profile.isEnabled()) return null;
 
         long delay = getDelay(top, left, profile);
         long startTime = ScreenStateTracker.getScreenOpenTime();
 
-        return AnimationSystem.begin(gg, left, top, width, height, profile, startTime, delay, 1.0f);
+        return AnimationSystem.begin(graphics, left, top, width, height, profile, startTime, delay, 1.0f);
     }
 
     private static long getDelay(int top, int left, AnimationProfile profile) {