From 4965322e41ca38a47220409f6f8634ce9432ef04 Mon Sep 17 00:00:00 2001 From: bdev42 <140114350+bdev42@users.noreply.github.com> Date: Tue, 7 Jul 2026 15:36:32 +0200 Subject: [PATCH 1/2] Fixes fabric templates for MC26.1+ --- fabric/.mcdev.template.json | 2 +- fabric/build.gradle.ft | 27 ++++++++++++++++++++------- fabric/build.gradle.kts.ft | 28 ++++++++++++++++++++-------- 3 files changed, 41 insertions(+), 16 deletions(-) diff --git a/fabric/.mcdev.template.json b/fabric/.mcdev.template.json index 7bb1415..167bdb8 100644 --- a/fabric/.mcdev.template.json +++ b/fabric/.mcdev.template.json @@ -187,7 +187,7 @@ "template": "../gradle-wrapper.properties.ft", "destination": "gradle/wrapper/gradle-wrapper.properties", "properties": { - "GRADLE_VERSION": "9.2.1" + "GRADLE_VERSION": "9.6.1" } }, { diff --git a/fabric/build.gradle.ft b/fabric/build.gradle.ft index 8d3245a..92b7a92 100644 --- a/fabric/build.gradle.ft +++ b/fabric/build.gradle.ft @@ -1,8 +1,13 @@ plugins { +#if ($VERSIONS.minecraftVersion.compareTo($mcver.MC26_1) >= 0) + id 'net.fabricmc.fabric-loom' version '${VERSIONS.loom}' +#else id 'fabric-loom' version '${VERSIONS.loom}' +#end id 'maven-publish' } + version = project.mod_version group = project.maven_group @@ -42,15 +47,23 @@ repositories { dependencies { // To change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" -#if (${VERSIONS.useOfficialMappings}) - mappings loom.officialMojangMappings() +#if ($VERSIONS.minecraftVersion.compareTo($mcver.MC26_1) >= 0) + implementation "net.fabricmc:fabric-loader:${project.loader_version}" + + #if (${VERSIONS.useFabricApi}) + implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + #end #else - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" -#end - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + #if (${VERSIONS.useOfficialMappings}) + mappings loom.officialMojangMappings() + #else + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + #end + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" -#if (${VERSIONS.useFabricApi}) - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + #if (${VERSIONS.useFabricApi}) + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + #end #end } diff --git a/fabric/build.gradle.kts.ft b/fabric/build.gradle.kts.ft index 6111583..2af57d8 100644 --- a/fabric/build.gradle.kts.ft +++ b/fabric/build.gradle.kts.ft @@ -3,7 +3,11 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { kotlin("jvm") version "${KOTLIN_LOADER_VERSION.toString().split("kotlin.")[1]}" +#if ($VERSIONS.minecraftVersion.compareTo($mcver.MC26_1) >= 0) + id("net.fabricmc.fabric-loom") version "${VERSIONS.loom}" +#else id("fabric-loom") version "${VERSIONS.loom}" +#end id("maven-publish") } @@ -55,18 +59,26 @@ repositories { dependencies { // To change the versions see the gradle.properties file minecraft("com.mojang:minecraft:${project.property("minecraft_version")}") -#if (${VERSIONS.useOfficialMappings}) - mappings(loom.officialMojangMappings()) +#if ($VERSIONS.minecraftVersion.compareTo($mcver.MC26_1) >= 0) + implementation("net.fabricmc:fabric-loader:${project.property("loader_version")}") + implementation("net.fabricmc:fabric-language-kotlin:${project.property("kotlin_loader_version")}") + + #if (${VERSIONS.useFabricApi}) + implementation("net.fabricmc.fabric-api:fabric-api:${project.property("fabric_version")}") + #end #else - mappings("net.fabricmc:yarn:${project.property("yarn_mappings")}:v2") -#end - modImplementation("net.fabricmc:fabric-loader:${project.property("loader_version")}") + #if (${VERSIONS.useOfficialMappings}) + mappings(loom.officialMojangMappings()) + #else + mappings("net.fabricmc:yarn:${project.property("yarn_mappings")}:v2") + #end + modImplementation("net.fabricmc:fabric-loader:${project.property("loader_version")}") modImplementation("net.fabricmc:fabric-language-kotlin:${project.property("kotlin_loader_version")}") -#if (${VERSIONS.useFabricApi}) - modImplementation("net.fabricmc.fabric-api:fabric-api:${project.property("fabric_version")}") + #if (${VERSIONS.useFabricApi}) + modImplementation("net.fabricmc.fabric-api:fabric-api:${project.property("fabric_version")}") + #end #end -} tasks.processResources { inputs.property("version", project.version) From ef6b93c2e3caa257511e56af67fa21e552567ba4 Mon Sep 17 00:00:00 2001 From: bdev42 <140114350+bdev42@users.noreply.github.com> Date: Tue, 7 Jul 2026 16:18:16 +0200 Subject: [PATCH 2/2] Remove extra line and missing closing bracket --- fabric/build.gradle.ft | 1 - fabric/build.gradle.kts.ft | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/fabric/build.gradle.ft b/fabric/build.gradle.ft index 92b7a92..b9de802 100644 --- a/fabric/build.gradle.ft +++ b/fabric/build.gradle.ft @@ -7,7 +7,6 @@ plugins { id 'maven-publish' } - version = project.mod_version group = project.maven_group diff --git a/fabric/build.gradle.kts.ft b/fabric/build.gradle.kts.ft index 2af57d8..efab376 100644 --- a/fabric/build.gradle.kts.ft +++ b/fabric/build.gradle.kts.ft @@ -79,6 +79,7 @@ dependencies { modImplementation("net.fabricmc.fabric-api:fabric-api:${project.property("fabric_version")}") #end #end +} tasks.processResources { inputs.property("version", project.version)