port to 26.1

.github/workflows/build.yml

@@ -8,11 +8,11 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-      - name: Setup JDK 21
+      - name: Setup JDK 25
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 21
+          java-version: 25
       - name: Make Gradle executable
         run: chmod +x ./gradlew
       - name: build

.github/workflows/pull_request.yml

@@ -8,11 +8,11 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-      - name: Setup JDK 21
+      - name: Setup JDK 25
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 21
+          java-version: 25
       - name: Make Gradle executable
         run: chmod +x ./gradlew
       - name: build

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.10-SNAPSHOT'
+	id 'net.fabricmc.fabric-loom' version '1.16-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -17,8 +17,7 @@ repositories {
 dependencies {
 	// To change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+	implementation "net.fabricmc:fabric-loader:${project.loader_version}"
 }
 
 processResources {
@@ -34,14 +33,14 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	it.options.release = 21
+	it.options.release = 25
 }
 
 java {
 	withSourcesJar()
 
-	sourceCompatibility = JavaVersion.VERSION_21
-	targetCompatibility = JavaVersion.VERSION_21
+	sourceCompatibility = JavaVersion.VERSION_25
+	targetCompatibility = JavaVersion.VERSION_25
 }
 
 jar {

gradle.properties

@@ -4,9 +4,8 @@ org.gradle.parallel = true
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop/
-	minecraft_version=1.21.6
-	yarn_mappings=1.21.6+build.1
-	loader_version=0.16.14
+	minecraft_version=26.1.2
+	loader_version=0.19.2
 
 # Mod Properties
 	mod_version = 1.2.2

gradle/wrapper/gradle-wrapper.properties

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

src/main/java/net/mchorizons/darkgraph/mixin/AbstractDebugChartMixin.java

@@ -0,0 +1,21 @@
+package net.mchorizons.darkgraph.mixin;
+
+import net.minecraft.client.gui.components.debugchart.AbstractDebugChart;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+
+@Mixin(AbstractDebugChart.class)
+public class AbstractDebugChartMixin {
+
+    @ModifyArg(method="extractRenderState", at=@At(value="INVOKE", target="Lnet/minecraft/client/gui/GuiGraphicsExtractor;horizontalLine(IIII)V"), index=3)
+    private int drawHorizontalLine(int color) {
+        return -1873784742;
+    }
+
+    @ModifyArg(method="extractRenderState", at=@At(value="INVOKE", target="Lnet/minecraft/client/gui/GuiGraphicsExtractor;verticalLine(IIII)V"), index=3)
+    private int drawVerticalLine(int color) {
+        return -1873784742;
+    }
+
+}

src/main/java/net/mchorizons/darkgraph/mixin/FpsDebugChartMixin.java

@@ -0,0 +1,19 @@
+package net.mchorizons.darkgraph.mixin;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.gui.components.debugchart.FpsDebugChart;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+
+@Mixin(FpsDebugChart.class)
+@Environment(EnvType.CLIENT)
+public class FpsDebugChartMixin {
+
+    @ModifyArg(method="extractAdditionalLinesAndLabels", at=@At(value="INVOKE", target= "Lnet/minecraft/client/gui/GuiGraphicsExtractor;horizontalLine(IIII)V"), index=3)
+    private int drawHorizontalLine(int color) {
+        return -1873784742;
+    }
+
+}

src/main/resources/darkgraph.mixins.json

@@ -1,11 +1,12 @@
 {
-	"required": true,
-	"package": "net.mchorizons.darkgraph.mixin",
-	"compatibilityLevel": "JAVA_21",
-	"client": [
-		"DrawContextMixin"
-	],
-	"injectors": {
-		"defaultRequire": 1
+  "required": true,
+  "package": "net.mchorizons.darkgraph.mixin",
+  "compatibilityLevel": "JAVA_25",
+  "client": [
+    "AbstractDebugChartMixin",
+    "FpsDebugChartMixin"
+  ],
+  "injectors": {
+    "defaultRequire": 1
 	}
 }

src/main/resources/fabric.mod.json

@@ -21,8 +21,7 @@
 	"depends": {
 		"fabricloader": ">=0.16.14",
 		"minecraft": [
-			">=1.21.6",
-			"<1.22"
+			">=26.1"
 		]
 	}
 }

src/main/resources/quilt.mod.json

@@ -8,8 +8,7 @@
 			{
 				"id": "minecraft",
 				"versions": [
-					">=1.21.6",
-					"<1.22"
+					">=26.1"
 				]
 			},
 			{