Update to 26.1

Author: AmberIsFrozen

.github/workflows/build.yml

@@ -11,14 +11,14 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
+        uses: gradle/wrapper-validation-action@v4
+      - name: Set up JDK 25
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: 21
+          java-version: 25
           check-latest: true
       - name: Cache Dependencies
         uses: actions/cache@v3

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version "$loom_version"
+	id 'net.fabricmc.fabric-loom' version "$loom_version"
 	id 'maven-publish'
 }
 
@@ -23,12 +23,11 @@ repositories {
 dependencies {
 	// To change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings loom.officialMojangMappings()
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-    modImplementation "com.terraformersmc:modmenu:${project.mod_menu_version}"
+	implementation "net.fabricmc:fabric-loader:${project.loader_version}"
+    implementation "com.terraformersmc:modmenu:${project.mod_menu_version}"
 
 	// AWs for RenderPipelines.register
-	include(modImplementation(fabricApi.module("fabric-transitive-access-wideners-v1", project.fabric_version)))
+	implementation("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
 }
 
 processResources {
@@ -40,7 +39,7 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	it.options.release = 21
+	it.options.release = 25
 }
 
 java {
@@ -49,8 +48,8 @@ java {
 	// If you remove this line, sources will not be generated.
 	withSourcesJar()
 
-	sourceCompatibility = JavaVersion.VERSION_21
-	targetCompatibility = JavaVersion.VERSION_21
+	sourceCompatibility = JavaVersion.VERSION_25
+	targetCompatibility = JavaVersion.VERSION_25
 }
 
 jar {

gradle.properties

@@ -4,17 +4,17 @@ org.gradle.parallel=true
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-    loom_version=1.14-SNAPSHOT
-	minecraft_version=1.21.11
-	loader_version=0.18.3
+    loom_version=1.15-SNAPSHOT
+	minecraft_version=26.1.1
+	loader_version=0.18.6
 
 # Dependencies
-	mod_menu_version = 17.0.0-alpha.1
+	mod_menu_version = 18.0.0-alpha.8
 
 # Mod Properties
 	mod_version = 1.2.2
 	maven_group = com.lx862
 	archives_base_name = splashfox
 
 # Fabric API
-fabric_version=0.140.0+1.21.11
+fabric_version=0.145.3+26.1.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/com/lx862/splashfox/mixin/LoadingOverlayMixin.java

@@ -6,7 +6,7 @@
 import com.lx862.splashfox.data.FileSystemResourceTexture;
 import com.lx862.splashfox.render.FoxRenderer;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.screens.LoadingOverlay;
 import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.resources.Identifier;
@@ -47,8 +47,8 @@ public class LoadingOverlayMixin {
 		}
 	}
 
-	@Inject(at = @At("TAIL"), method = "render")
-	private void splashfox$render(GuiGraphics guiGraphics, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+	@Inject(at = @At("TAIL"), method = "extractRenderState")
+	private void splashfox$render(GuiGraphicsExtractor guiGraphics, int mouseX, int mouseY, float delta, CallbackInfo ci) {
 		splashfox$ensureTextureRegistered();
 
 		if(renderer == null) renderer = new FoxRenderer();

src/main/java/com/lx862/splashfox/render/FoxRenderer.java

@@ -4,7 +4,7 @@
 import com.lx862.splashfox.data.ImagePosition;
 import com.mojang.blaze3d.pipeline.RenderPipeline;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.resources.Identifier;
 import net.minecraft.util.ARGB;
@@ -16,7 +16,7 @@ public class FoxRenderer {
     private double shiftY = 0;
     private double animationProgress = 0;
 
-    public void render(Minecraft minecraft, GuiGraphics guiGraphics, ImagePosition imagePosition, Config config, int mouseX, int mouseY, double elapsed, float alpha) {
+    public void render(Minecraft minecraft, GuiGraphicsExtractor guiGraphics, ImagePosition imagePosition, Config config, int mouseX, int mouseY, double elapsed, float alpha) {
         Identifier foxImage = config.getImageId();
 
         Matrix3x2fStack matrices = guiGraphics.pose();

src/main/java/com/lx862/splashfox/screen/ChooseImageScreen.java

@@ -2,7 +2,7 @@
 
 import com.lx862.splashfox.config.Config;
 import com.mojang.blaze3d.platform.Window;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.renderer.RenderPipelines;
@@ -41,14 +41,14 @@ protected void init() {
     }
 
     @Override
-    public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float delta) {
-        super.render(guiGraphics, mouseX, mouseY, delta);
+    public void extractRenderState(GuiGraphicsExtractor guiGraphicsExtractor, int mouseX, int mouseY, float delta) {
+        super.extractRenderState(guiGraphicsExtractor, mouseX, mouseY, delta);
 
-        guiGraphics.drawCenteredString(font, title, width / 2, 10, 0xFFFFFFFF);
-        guiGraphics.blit(RenderPipelines.GUI_TEXTURED, Screen.HEADER_SEPARATOR, 0, 30 - 2, 0.0F, 0.0F, this.width, 2, 32, 2);
-        guiGraphics.blit(RenderPipelines.GUI_TEXTURED, Screen.FOOTER_SEPARATOR, 0, height - 40, 0.0F, 0.0F, this.width, 2, 32, 2);
+        guiGraphicsExtractor.centeredText(font, title, width / 2, 10, 0xFFFFFFFF);
+        guiGraphicsExtractor.blit(RenderPipelines.GUI_TEXTURED, Screen.HEADER_SEPARATOR, 0, 30 - 2, 0.0F, 0.0F, this.width, 2, 32, 2);
+        guiGraphicsExtractor.blit(RenderPipelines.GUI_TEXTURED, Screen.FOOTER_SEPARATOR, 0, height - 40, 0.0F, 0.0F, this.width, 2, 32, 2);
 
-        chooseImageWidget.render(guiGraphics, mouseX, mouseY, delta);
+        chooseImageWidget.extractRenderState(guiGraphicsExtractor, mouseX, mouseY, delta);
     }
 
     @Override

src/main/java/com/lx862/splashfox/screen/ChooseImageWidget.java

@@ -6,7 +6,7 @@
 import com.lx862.splashfox.screen.widget.ChooseButton;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.Tooltip;
@@ -135,23 +135,23 @@ private void positionButtonOffset(double offset) {
     }
 
     @Override
-    protected void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float delta) {
-        guiGraphics.enableScissor(getX(), getY(), getX() + getWidth(), getY() + getHeight());
+    protected void extractWidgetRenderState(GuiGraphicsExtractor guiGraphicsExtractor, int mouseX, int mouseY, float delta) {
+        guiGraphicsExtractor.enableScissor(getX(), getY(), getX() + getWidth(), getY() + getHeight());
 
         for(Button button : subWidgets) {
             final boolean buttonInVisibleArea = mouseY >= 30 && mouseY <= Minecraft.getInstance().getWindow().getGuiScaledHeight() - 40;
-            button.render(guiGraphics, mouseX, mouseY, delta);
+            button.extractRenderState(guiGraphicsExtractor, mouseX, mouseY, delta);
             button.active = buttonInVisibleArea;
         }
 
-        guiGraphics.pose().pushMatrix();
-        guiGraphics.pose().translate(getX(), (float)(getY() - scrolledOffset));
+        guiGraphicsExtractor.pose().pushMatrix();
+        guiGraphicsExtractor.pose().translate(getX(), (float)(getY() - scrolledOffset));
         Component customImageText = Component.translatable("splashfox.gui.custom_img");
-        guiGraphics.drawString(font, customImageText, 0, customImageSeparatorY, CommonColors.WHITE);
-        guiGraphics.fill(font.width(customImageText) + 4, customImageSeparatorY + (font.lineHeight / 2), getWidth(), customImageSeparatorY + (font.lineHeight / 2) + 1, 0xFFAAAAAA);
-        guiGraphics.pose().popMatrix();
+        guiGraphicsExtractor.text(font, customImageText, 0, customImageSeparatorY, CommonColors.WHITE);
+        guiGraphicsExtractor.fill(font.width(customImageText) + 4, customImageSeparatorY + (font.lineHeight / 2), getWidth(), customImageSeparatorY + (font.lineHeight / 2) + 1, 0xFFAAAAAA);
+        guiGraphicsExtractor.pose().popMatrix();
 
-        guiGraphics.disableScissor();
+        guiGraphicsExtractor.disableScissor();
     }
 
     @Override

src/main/java/com/lx862/splashfox/screen/ConfigScreen.java

@@ -6,7 +6,7 @@
 import com.lx862.splashfox.SplashFox;
 import com.lx862.splashfox.render.FoxRenderer;
 import com.lx862.splashfox.screen.widget.SplashFoxSlider;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.Checkbox;
@@ -132,14 +132,14 @@ protected void init() {
     }
 
     @Override
-    public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float delta) {
-        super.render(guiGraphics, mouseX, mouseY, delta);
+    public void extractRenderState(GuiGraphicsExtractor guiGraphics, int mouseX, int mouseY, float delta) {
+        super.extractRenderState(guiGraphics, mouseX, mouseY, delta);
         elapsed += delta;
 
         // Render fox preview :D
         foxRenderer.render(minecraft, guiGraphics, ImagePosition.GUI_PREVIEW, tmpConfigInstance, mouseX, mouseY, elapsed, 1.0f);
 
-        guiGraphics.drawCenteredString(font, title, this.width / 2, 12, CommonColors.WHITE);
+        guiGraphics.centeredText(font, title, this.width / 2, 12, CommonColors.WHITE);
         guiGraphics.blit(RenderPipelines.GUI_TEXTURED, Screen.HEADER_SEPARATOR, 0, 30, 0.0F, 0.0F, this.width, 2, 32, 2);
         guiGraphics.blit(RenderPipelines.GUI_TEXTURED, Screen.FOOTER_SEPARATOR, 0, this.height - 40, 0.0F, 0.0F, this.width, 2, 32, 2);
     }

src/main/java/com/lx862/splashfox/screen/widget/ChooseButton.java

@@ -1,7 +1,7 @@
 package com.lx862.splashfox.screen.widget;
 
 import com.mojang.blaze3d.platform.cursor.CursorTypes;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.network.chat.Component;
@@ -21,31 +21,31 @@ public ChooseButton(int x, int y, int width, int height, boolean selected, Ident
     }
 
     @Override
-    protected void renderContents(GuiGraphics guiGraphics, int i, int j, float f) {
+    protected void extractContents(GuiGraphicsExtractor guiGraphicsExtractor, int i, int j, float f) {
         int startX = getX() - PADDING;
         int startY = getY() - PADDING;
         int sizeWidth = getWidth() + PADDING + PADDING;
         int sizeHeight = getHeight() + PADDING + PADDING;
         int endX = getX() + getWidth() + PADDING;
         int endY = getY() + getHeight() + PADDING;
         if(selected) {
-            guiGraphics.fill(startX-1, startY-1, startX + sizeWidth+1, startY + sizeHeight+1, 0xFFFFFFFF);
-            guiGraphics.fill(startX, startY, endX, endY, 0xFF000000);
+            guiGraphicsExtractor.fill(startX-1, startY-1, startX + sizeWidth+1, startY + sizeHeight+1, 0xFFFFFFFF);
+            guiGraphicsExtractor.fill(startX, startY, endX, endY, 0xFF000000);
         } else if (this.isHovered() || this.isFocused()) {
             int eX = startX + sizeWidth;
             int eY = startY + sizeHeight;
             // top bottom
-            guiGraphics.fill(startX, startY-1, eX, startY, 0x66FFFFFF);
-            guiGraphics.fill(startX, eY, eX, eY+1, 0x66FFFFFF);
+            guiGraphicsExtractor.fill(startX, startY-1, eX, startY, 0x66FFFFFF);
+            guiGraphicsExtractor.fill(startX, eY, eX, eY+1, 0x66FFFFFF);
 
             // left right (includ. corner)
-            guiGraphics.fill(startX-1, startY-1, startX, eY+1, 0x66FFFFFF);
-            guiGraphics.fill(eX, startY-1, eX+1, eY+1, 0x66FFFFFF);
+            guiGraphicsExtractor.fill(startX-1, startY-1, startX, eY+1, 0x66FFFFFF);
+            guiGraphicsExtractor.fill(eX, startY-1, eX+1, eY+1, 0x66FFFFFF);
         }
         if (this.isHovered()) {
-            guiGraphics.requestCursor(CursorTypes.POINTING_HAND);
+            guiGraphicsExtractor.requestCursor(CursorTypes.POINTING_HAND);
         }
-        guiGraphics.blit(RenderPipelines.GUI_TEXTURED, buttonTextureId, this.getX(), this.getY(), 0, 0, this.width, this.height, this.width, this.height);
+        guiGraphicsExtractor.blit(RenderPipelines.GUI_TEXTURED, buttonTextureId, this.getX(), this.getY(), 0, 0, this.width, this.height, this.width, this.height);
     }
 
     public void setSelected(boolean bl) {