build: Expand version range to cover 26.1.x

Author: BlayTheNinth

build-logic/src/main/groovy/multiloader-common.gradle

@@ -127,10 +127,18 @@ jar {
 }
 
 processResources {
+    def minecraftVersion = libs.minecraft.get().version
+    def minecraftVersionMatch = minecraftVersion =~ /^(\d+)\.(\d+)/
+    assert minecraftVersionMatch.find(): "Unsupported Minecraft version format: ${minecraftVersion}"
+
+    def minecraftMajorMinor = "${minecraftVersionMatch.group(1)}.${minecraftVersionMatch.group(2)}"
+    def nextMinecraftMinor = "${minecraftVersionMatch.group(1)}.${minecraftVersionMatch.group(2).toInteger() + 1}"
+
     def expandProps = [
             "version": version,
             "group": project.group, //Else we target the task's group.
-            "minecraft_version": libs.minecraft.get().version.replace('-pre', '-beta.').replace('-rc-', '-rc.').replace('-snapshot-', '-alpha.'),
+            "minecraft_version_range": "[${minecraftMajorMinor}-,${nextMinecraftMinor})",
+            "fabric_minecraft_version_range": "~${minecraftMajorMinor}-",
             "forge_version": libs.forge.get().version,
             "fabric_api_version": libs.fabricApi.get().version,
             "fabric_loader_version": libs.fabricLoader.get().version,

fabric/src/main/resources/fabric.mod.json

@@ -39,7 +39,7 @@
     "fabricloader": ">=${fabric_loader_version}",
     "fabric-api": "*",
     "balm-fabric": ">=${balm_version}",
-    "minecraft": ">=${minecraft_version}",
+    "minecraft": "${fabric_minecraft_version_range}",
     "java": ">=${java_version}"
   },
   "suggests": {

forge/src/main/resources/META-INF/mods.toml

@@ -20,7 +20,7 @@ side="BOTH"
 [[dependencies.cookingforblockheads]]
 modId="minecraft"
 mandatory=true
-versionRange="[${minecraft_version},)"
+versionRange="${minecraft_version_range}"
 ordering="NONE"
 side="BOTH"
 [[dependencies.cookingforblockheads]]

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -24,7 +24,7 @@ side="BOTH"
 [[dependencies.cookingforblockheads]]
 modId="minecraft"
 type="required"
-versionRange="[${minecraft_version},)"
+versionRange="${minecraft_version_range}"
 ordering="NONE"
 side="BOTH"
 [[dependencies.cookingforblockheads]]

repositories.gradle

@@ -23,6 +23,14 @@ repositories {
         }
     }
 
+    maven {
+        name = "Modrinth"
+        url = "https://api.modrinth.com/maven"
+        content {
+            includeGroup "maven.modrinth"
+        }
+    }
+
     maven {
         name = 'Shedaniel'
         url = 'https://maven.shedaniel.me/'
@@ -40,6 +48,7 @@ repositories {
             includeGroup "mezz.jei"
             includeGroup "info.journeymap"
             includeGroup "mysticdrew"
+            includeGroupAndSubgroups "com.blamejared"
         }
     }