From 1737916671bb4da450335a4c19b4caf93b6d3c0c Mon Sep 17 00:00:00 2001 From: david Date: Sat, 14 Nov 2026 09:47:14 +0100 Subject: [PATCH 1/2] fix: do not add faststats button when no context exists --- .../screen/minecraft/mixin/TelemetryInfoScreenMixin.java | 2 ++ .../screen/minecraft/mixin/TelemetryInfoScreenMixin.java | 3 +++ .../screen/minecraft/mixin/TelemetryInfoScreenMixin.java | 3 +++ 3 files changed, 8 insertions(+) diff --git a/onboarding/versions/1.19.3/src/main/java/dev/faststats/screen/minecraft/mixin/TelemetryInfoScreenMixin.java b/onboarding/versions/1.19.3/src/main/java/dev/faststats/screen/minecraft/mixin/TelemetryInfoScreenMixin.java index 0a5dcbf8..26c4dfb6 100644 --- a/onboarding/versions/1.19.3/src/main/java/dev/faststats/screen/minecraft/mixin/TelemetryInfoScreenMixin.java +++ b/onboarding/versions/1.19.3/src/main/java/dev/faststats/screen/minecraft/mixin/TelemetryInfoScreenMixin.java @@ -2,6 +2,7 @@ import dev.faststats.screen.minecraft.ConsentScreen; import dev.faststats.screen.onboarding.ConsentText; +import dev.faststats.screen.registry.FastStatsRegistry; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.telemetry.TelemetryInfoScreen; @@ -19,6 +20,7 @@ private TelemetryInfoScreenMixin(final Component title) { @Inject(method = "init", at = @At("TAIL")) private void faststats$addButton(final CallbackInfo callback) { + if (FastStatsRegistry.instance().isEmpty()) return; addRenderableWidget(Button.builder(Component.literal(ConsentText.BUTTON), button -> minecraft.setScreen(new ConsentScreen(this))).bounds(width - 104, 6, 98, 20).build()); } } diff --git a/onboarding/versions/1.19.4/src/main/java/dev/faststats/screen/minecraft/mixin/TelemetryInfoScreenMixin.java b/onboarding/versions/1.19.4/src/main/java/dev/faststats/screen/minecraft/mixin/TelemetryInfoScreenMixin.java index 01d2e820..33ced982 100644 --- a/onboarding/versions/1.19.4/src/main/java/dev/faststats/screen/minecraft/mixin/TelemetryInfoScreenMixin.java +++ b/onboarding/versions/1.19.4/src/main/java/dev/faststats/screen/minecraft/mixin/TelemetryInfoScreenMixin.java @@ -2,6 +2,7 @@ import dev.faststats.screen.minecraft.ConsentScreen; import dev.faststats.screen.onboarding.ConsentText; +import dev.faststats.screen.registry.FastStatsRegistry; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.screens.Screen; @@ -29,6 +30,8 @@ private TelemetryInfoScreenMixin(final Component title) { @Inject(method = "init", at = @At("TAIL")) private void faststats$addButton(final CallbackInfo callback) { + faststats$button = null; + if (FastStatsRegistry.instance().isEmpty()) return; faststats$button = addRenderableWidget(Button.builder(Component.literal(ConsentText.BUTTON), button -> { minecraft.setScreen(new ConsentScreen(this)); }).bounds(width - 156, 6, 150, 20).build()); diff --git a/onboarding/versions/26.1/src/main/java/dev/faststats/screen/minecraft/mixin/TelemetryInfoScreenMixin.java b/onboarding/versions/26.1/src/main/java/dev/faststats/screen/minecraft/mixin/TelemetryInfoScreenMixin.java index 394905a2..7d7ca378 100644 --- a/onboarding/versions/26.1/src/main/java/dev/faststats/screen/minecraft/mixin/TelemetryInfoScreenMixin.java +++ b/onboarding/versions/26.1/src/main/java/dev/faststats/screen/minecraft/mixin/TelemetryInfoScreenMixin.java @@ -2,6 +2,7 @@ import dev.faststats.screen.minecraft.ConsentScreen; import dev.faststats.screen.onboarding.ConsentText; +import dev.faststats.screen.registry.FastStatsRegistry; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.events.GuiEventListener; @@ -30,6 +31,8 @@ private TelemetryInfoScreenMixin(final Component title) { @Inject(method = "init", at = @At("TAIL")) private void faststats$addButton(final CallbackInfo callback) { + faststats$button = null; + if (FastStatsRegistry.instance().isEmpty()) return; final Component message = Component.literal(ConsentText.BUTTON); faststats$button = addRenderableWidget(Button.builder(message, ignored -> { Minecraft.getInstance().setScreenAndShow(new ConsentScreen(this)); From c617038a1a276304d1ab4052d1afa99e22fcc849 Mon Sep 17 00:00:00 2001 From: david Date: Sat, 14 Nov 2026 10:00:33 +0100 Subject: [PATCH 2/2] feat: support patch releases --- .../src/main/kotlin/MinecraftVersions.kt | 22 +++++++++++++++++++ .../kotlin/faststats.fabric-compat.gradle.kts | 2 +- .../kotlin/faststats.forge-compat.gradle.kts | 2 +- .../faststats.neoforge-compat.gradle.kts | 2 +- 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/build-logic/src/main/kotlin/MinecraftVersions.kt b/build-logic/src/main/kotlin/MinecraftVersions.kt index 62f75723..b5d1186a 100644 --- a/build-logic/src/main/kotlin/MinecraftVersions.kt +++ b/build-logic/src/main/kotlin/MinecraftVersions.kt @@ -79,6 +79,28 @@ val minecraftPlatforms = setOf("fabric", "forge", "neoforge") fun minecraftVersions(platform: String): List = platformVersions.getValue(platform) +/** + * The version the Minecraft versions an artifact built for [version] runs on end before, exclusive. + * + * It is the next version with its own artifact in the same release (26.3 -> 26.3.1), + * otherwise the next release (26.3 -> 26.4), so the latest artifact keeps working on patches released after it. + * Obfuscated versions stay pinned to the exact version, as every release ships with its own obfuscation. + */ +private fun upperBound(platform: String, version: MinecraftVersion): String? { + if (version.obfuscated) return null + val (major, minor) = version.name.split('.') + val next = minecraftVersions(platform).dropWhile { it.name != version.name }.getOrNull(1) + return next?.name?.takeIf { it.startsWith("$major.$minor.") } ?: "$major.${minor.toInt() + 1}" +} + +// the versions as a Fabric version predicate, the trailing dash excludes the snapshots of the upper bound +fun fabricVersionRange(platform: String, version: MinecraftVersion): String = + upperBound(platform, version)?.let { ">=${version.name} <$it-" } ?: version.name + +// the versions as a Maven version range, used by NeoForge and Forge +fun mavenVersionRange(platform: String, version: MinecraftVersion): String = + upperBound(platform, version)?.let { "[${version.name},$it)" } ?: "[${version.name}]" + // projects are named ::versions: val Project.minecraftPlatform: String get() = path.split(':')[1] diff --git a/build-logic/src/main/kotlin/faststats.fabric-compat.gradle.kts b/build-logic/src/main/kotlin/faststats.fabric-compat.gradle.kts index f28b8855..b521d41a 100644 --- a/build-logic/src/main/kotlin/faststats.fabric-compat.gradle.kts +++ b/build-logic/src/main/kotlin/faststats.fabric-compat.gradle.kts @@ -22,7 +22,7 @@ extra.set("publishVersionSuffix", "mc$minecraft") tasks.processResources { from(project(":fabric").file("src/main/resources")) val version = provider { project.version.toString() } - val minecraftVersion = minecraft.name + val minecraftVersion = fabricVersionRange(minecraftPlatform, minecraft) inputs.property("version", version) inputs.property("minecraft", minecraftVersion) filesMatching("fabric.mod.json") { diff --git a/build-logic/src/main/kotlin/faststats.forge-compat.gradle.kts b/build-logic/src/main/kotlin/faststats.forge-compat.gradle.kts index 99b3bfcd..947957b1 100644 --- a/build-logic/src/main/kotlin/faststats.forge-compat.gradle.kts +++ b/build-logic/src/main/kotlin/faststats.forge-compat.gradle.kts @@ -34,7 +34,7 @@ sourceSets.main { tasks.processResources { from(project(":forge").file("src/main/resources")) val version = provider { project.version.toString() } - val range = "[${minecraft.name}]" + val range = mavenVersionRange(minecraftPlatform, minecraft) inputs.property("version", version) inputs.property("minecraft", range) filesMatching("META-INF/mods.toml") { diff --git a/build-logic/src/main/kotlin/faststats.neoforge-compat.gradle.kts b/build-logic/src/main/kotlin/faststats.neoforge-compat.gradle.kts index 5c68ab67..018c1412 100644 --- a/build-logic/src/main/kotlin/faststats.neoforge-compat.gradle.kts +++ b/build-logic/src/main/kotlin/faststats.neoforge-compat.gradle.kts @@ -16,7 +16,7 @@ extra.set("publishVersionSuffix", "mc$minecraft") tasks.processResources { from(project(":neoforge").file("src/main/resources")) val version = provider { project.version.toString() } - val range = "[${minecraft.name}]" + val range = mavenVersionRange(minecraftPlatform, minecraft) inputs.property("version", version) inputs.property("minecraft", range) filesMatching("META-INF/neoforge.mods.toml") {