Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions build-logic/src/main/kotlin/MinecraftVersions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,28 @@ val minecraftPlatforms = setOf("fabric", "forge", "neoforge")

fun minecraftVersions(platform: String): List<MinecraftVersion> = 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 :<platform>:versions:<minecraft version>
val Project.minecraftPlatform: String get() = path.split(':')[1]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down
Loading