From d9df910db40309b04373f9d43f829def3fb7c7f5 Mon Sep 17 00:00:00 2001 From: CPTProgrammer <46586216+CPTProgrammer@users.noreply.github.com> Date: Thu, 2 Jul 2026 17:21:47 +0800 Subject: [PATCH] Add compatibility for new Minecraft version numbering - Use ^ version range for major version 26+ instead of ~ - Match only major version for 26+ in latest compatible version lookup --- build.gradle | 4 +++- settings.gradle | 2 +- src/main/resources/fabric.mod.json | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 4ea139d..d57e417 100644 --- a/build.gradle +++ b/build.gradle @@ -20,6 +20,8 @@ assert loomRemapStr in ["true", "false"] : def loomRemap = loomRemapStr.toBoolean() apply plugin: loomRemap ? "net.fabricmc.fabric-loom-remap" : "net.fabricmc.fabric-loom" +boolean hasNewVersionScheme = project.targetVersion.tokenize(".")*.toInteger()[0] >= 26 + generateBuildProperties(project.minecraftVersions, project.targetVersion) version = "${project.mod_version}-mc${project.targetVersion}" @@ -119,7 +121,7 @@ processResources { def expandProperties = [ "version": mod_version, "group": maven_group, - "minecraft_version": minecraft_version, + "minecraft_version_range": "${hasNewVersionScheme ? "^" : "~"}${targetVersion}", "java_version": java_version, "fabric_loader_version": fabric_loader_version, "fabric_loader_version_range": hasProperty("min_fabric_loader_version") && !min_fabric_loader_version.allWhitespace ? ">=${min_fabric_loader_version}" : "*", diff --git a/settings.gradle b/settings.gradle index d82df25..51525d5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -60,7 +60,7 @@ static String findLatestCompatibleVersion(List sortedVersions, String ve sortedVersions.findAll { def versionList = it.tokenize(".")*.toInteger() compareMinecraftVersion(versionList, targetVersionList) <= 0 && - (targetVersionList[0] == versionList[0] && targetVersionList[1] == versionList[1]) + (targetVersionList[0] == versionList[0] && (targetVersionList[0] >= 26 || targetVersionList[1] == versionList[1])) }.max { a, b -> compareMinecraftVersion(a, b) } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 73c5d4e..b31990a 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -25,7 +25,7 @@ ], "depends": { "fabricloader": "${fabric_loader_version_range}", - "minecraft": "~${minecraft_version}", + "minecraft": "${minecraft_version_range}", "java": ">=${java_version}", "${fabric_api_mod_id}": ">=${fabric_api_version}" }