From 923bba28bc5e496cbfbcc0cf9c52d8278f6ffdf9 Mon Sep 17 00:00:00 2001 From: MicrocontrollersDev Date: Fri, 8 May 2026 01:19:33 -0500 Subject: [PATCH 1/2] port to 26.1 --- build.gradle | 11 +++++------ gradle.properties | 5 ++--- gradle/wrapper/gradle-wrapper.properties | 2 +- .../{DrawContextMixin.java => GuiGraphicsMixin.java} | 10 +++++----- src/main/resources/darkgraph.mixins.json | 2 +- src/main/resources/fabric.mod.json | 3 +-- src/main/resources/quilt.mod.json | 3 +-- 7 files changed, 16 insertions(+), 20 deletions(-) rename src/main/java/net/mchorizons/darkgraph/mixin/{DrawContextMixin.java => GuiGraphicsMixin.java} (54%) diff --git a/build.gradle b/build.gradle index 4457b83..90f0bd3 100644 --- a/build.gradle +++ b/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 { diff --git a/gradle.properties b/gradle.properties index 627b819..3bfc268 100644 --- a/gradle.properties +++ b/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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e18bc25..dbc3ce4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/src/main/java/net/mchorizons/darkgraph/mixin/DrawContextMixin.java b/src/main/java/net/mchorizons/darkgraph/mixin/GuiGraphicsMixin.java similarity index 54% rename from src/main/java/net/mchorizons/darkgraph/mixin/DrawContextMixin.java rename to src/main/java/net/mchorizons/darkgraph/mixin/GuiGraphicsMixin.java index 274fb3e..b4ae352 100644 --- a/src/main/java/net/mchorizons/darkgraph/mixin/DrawContextMixin.java +++ b/src/main/java/net/mchorizons/darkgraph/mixin/GuiGraphicsMixin.java @@ -2,23 +2,23 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.GuiGraphicsExtractor; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.ModifyArg; -@Mixin(DrawContext.class) +@Mixin(GuiGraphicsExtractor.class) @Environment(EnvType.CLIENT) -public class DrawContextMixin { +public class GuiGraphicsMixin { //background color: -1873784752 - @ModifyArg(method="drawHorizontalLine", at=@At(value="INVOKE", target="Lnet/minecraft/client/gui/DrawContext;fill(IIIII)V"), index=4) + @ModifyArg(method= "horizontalLine", at=@At(value="INVOKE", target= "Lnet/minecraft/client/gui/GuiGraphicsExtractor;fill(IIIII)V"), index=4) private int drawHorizontalLine(int color) { return -1873784742; } - @ModifyArg(method="drawVerticalLine", at=@At(value="INVOKE", target="Lnet/minecraft/client/gui/DrawContext;fill(IIIII)V"), index=4) + @ModifyArg(method= "verticalLine", at=@At(value="INVOKE", target= "Lnet/minecraft/client/gui/GuiGraphicsExtractor;fill(IIIII)V"), index=4) private int drawVerticalLine(int color) { return -1873784742; } diff --git a/src/main/resources/darkgraph.mixins.json b/src/main/resources/darkgraph.mixins.json index 70bfe98..ebcef78 100644 --- a/src/main/resources/darkgraph.mixins.json +++ b/src/main/resources/darkgraph.mixins.json @@ -3,7 +3,7 @@ "package": "net.mchorizons.darkgraph.mixin", "compatibilityLevel": "JAVA_21", "client": [ - "DrawContextMixin" + "GuiGraphicsMixin" ], "injectors": { "defaultRequire": 1 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index f5fac8d..d82af95 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -21,8 +21,7 @@ "depends": { "fabricloader": ">=0.16.14", "minecraft": [ - ">=1.21.6", - "<1.22" + ">=26.1" ] } } diff --git a/src/main/resources/quilt.mod.json b/src/main/resources/quilt.mod.json index 6149454..0980ce8 100644 --- a/src/main/resources/quilt.mod.json +++ b/src/main/resources/quilt.mod.json @@ -8,8 +8,7 @@ { "id": "minecraft", "versions": [ - ">=1.21.6", - "<1.22" + ">=26.1" ] }, { From 7be3c41209e0a26bfe2bb5c5da0f8d09b5474ba7 Mon Sep 17 00:00:00 2001 From: MicrocontrollersDev Date: Sun, 31 May 2026 00:10:30 -0700 Subject: [PATCH 2/2] switch to more compat friendly injections --- .github/workflows/build.yml | 4 +-- .github/workflows/pull_request.yml | 4 +-- .../mixin/AbstractDebugChartMixin.java | 21 ++++++++++++++++ .../darkgraph/mixin/FpsDebugChartMixin.java | 19 ++++++++++++++ .../darkgraph/mixin/GuiGraphicsMixin.java | 25 ------------------- src/main/resources/darkgraph.mixins.json | 17 +++++++------ 6 files changed, 53 insertions(+), 37 deletions(-) create mode 100644 src/main/java/net/mchorizons/darkgraph/mixin/AbstractDebugChartMixin.java create mode 100644 src/main/java/net/mchorizons/darkgraph/mixin/FpsDebugChartMixin.java delete mode 100644 src/main/java/net/mchorizons/darkgraph/mixin/GuiGraphicsMixin.java diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 27e5550..93a2c32 100644 --- a/.github/workflows/build.yml +++ b/.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 diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 2ad886e..38a4660 100644 --- a/.github/workflows/pull_request.yml +++ b/.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 diff --git a/src/main/java/net/mchorizons/darkgraph/mixin/AbstractDebugChartMixin.java b/src/main/java/net/mchorizons/darkgraph/mixin/AbstractDebugChartMixin.java new file mode 100644 index 0000000..828de43 --- /dev/null +++ b/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; + } + +} diff --git a/src/main/java/net/mchorizons/darkgraph/mixin/FpsDebugChartMixin.java b/src/main/java/net/mchorizons/darkgraph/mixin/FpsDebugChartMixin.java new file mode 100644 index 0000000..1b13f10 --- /dev/null +++ b/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; + } + +} diff --git a/src/main/java/net/mchorizons/darkgraph/mixin/GuiGraphicsMixin.java b/src/main/java/net/mchorizons/darkgraph/mixin/GuiGraphicsMixin.java deleted file mode 100644 index b4ae352..0000000 --- a/src/main/java/net/mchorizons/darkgraph/mixin/GuiGraphicsMixin.java +++ /dev/null @@ -1,25 +0,0 @@ -package net.mchorizons.darkgraph.mixin; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.gui.GuiGraphicsExtractor; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.ModifyArg; - -@Mixin(GuiGraphicsExtractor.class) -@Environment(EnvType.CLIENT) -public class GuiGraphicsMixin { - - //background color: -1873784752 - - @ModifyArg(method= "horizontalLine", at=@At(value="INVOKE", target= "Lnet/minecraft/client/gui/GuiGraphicsExtractor;fill(IIIII)V"), index=4) - private int drawHorizontalLine(int color) { - return -1873784742; - } - - @ModifyArg(method= "verticalLine", at=@At(value="INVOKE", target= "Lnet/minecraft/client/gui/GuiGraphicsExtractor;fill(IIIII)V"), index=4) - private int drawVerticalLine(int color) { - return -1873784742; - } -} diff --git a/src/main/resources/darkgraph.mixins.json b/src/main/resources/darkgraph.mixins.json index ebcef78..9b90fcc 100644 --- a/src/main/resources/darkgraph.mixins.json +++ b/src/main/resources/darkgraph.mixins.json @@ -1,11 +1,12 @@ { - "required": true, - "package": "net.mchorizons.darkgraph.mixin", - "compatibilityLevel": "JAVA_21", - "client": [ - "GuiGraphicsMixin" - ], - "injectors": { - "defaultRequire": 1 + "required": true, + "package": "net.mchorizons.darkgraph.mixin", + "compatibilityLevel": "JAVA_25", + "client": [ + "AbstractDebugChartMixin", + "FpsDebugChartMixin" + ], + "injectors": { + "defaultRequire": 1 } }