From 5a4244509c5e08aa88873fceabb109f223a82af5 Mon Sep 17 00:00:00 2001 From: kr1viah Date: Thu, 25 Dec 2025 19:46:07 +0100 Subject: [PATCH 1/3] 26.1 support --- fabric/build.gradle.ft | 10 +++++++++- fabric/build.gradle.kts.ft | 11 ++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/fabric/build.gradle.ft b/fabric/build.gradle.ft index 864fc8b..7ccfaa0 100644 --- a/fabric/build.gradle.ft +++ b/fabric/build.gradle.ft @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '${VERSIONS.loom}' + id 'net.fabricmc.fabric-loom' version '${VERSIONS.loom}' id 'maven-publish' } @@ -42,6 +42,7 @@ repositories { dependencies { // To change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" +#if (${VERSIONS.minecraft.compareTo($mcver.MC1_21_11)} <= 0) #if (${VERSIONS.useOfficialMappings}) mappings loom.officialMojangMappings() #else @@ -52,6 +53,13 @@ dependencies { #if (${VERSIONS.useFabricApi}) modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" #end +#else + implementation "net.fabricmc:fabric-loader:${project.loader_version}" + +#if (${VERSIONS.useFabricApi}) + implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" +#end +#end } processResources { diff --git a/fabric/build.gradle.kts.ft b/fabric/build.gradle.kts.ft index 6111583..b183de6 100644 --- a/fabric/build.gradle.kts.ft +++ b/fabric/build.gradle.kts.ft @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { kotlin("jvm") version "${KOTLIN_LOADER_VERSION.toString().split("kotlin.")[1]}" - id("fabric-loom") version "${VERSIONS.loom}" + id("net.fabricmc.fabric-loom") version "${VERSIONS.loom}" id("maven-publish") } @@ -55,6 +55,7 @@ repositories { dependencies { // To change the versions see the gradle.properties file minecraft("com.mojang:minecraft:${project.property("minecraft_version")}") +#if (${VERSIONS.minecraft.compareTo($mcver.MC1_21_11)} <= 0) #if (${VERSIONS.useOfficialMappings}) mappings(loom.officialMojangMappings()) #else @@ -66,6 +67,14 @@ dependencies { #if (${VERSIONS.useFabricApi}) modImplementation("net.fabricmc.fabric-api:fabric-api:${project.property("fabric_version")}") #end +#else + 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 +#end } tasks.processResources { From 4a782b92767ca3d1a9d22834e2abfb4868c216a3 Mon Sep 17 00:00:00 2001 From: kr1viah Date: Thu, 25 Dec 2025 19:55:30 +0100 Subject: [PATCH 2/3] Fix kotlin build script stuff and 26.1 FMJ --- fabric/build.gradle.ft | 5 +++-- fabric/build.gradle.kts.ft | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/fabric/build.gradle.ft b/fabric/build.gradle.ft index 7ccfaa0..cdf2dc0 100644 --- a/fabric/build.gradle.ft +++ b/fabric/build.gradle.ft @@ -63,14 +63,15 @@ dependencies { } processResources { + def mcVer = project.property("minecraft_version").toString().replace("-snapshot-", "-alpha.") inputs.property "version", project.version - inputs.property "minecraft_version", project.minecraft_version + inputs.property "minecraft_version", mcVer inputs.property "loader_version", project.loader_version filteringCharset "UTF-8" filesMatching("fabric.mod.json") { expand "version": project.version, - "minecraft_version": project.minecraft_version, + "minecraft_version": mcVer, "loader_version": project.loader_version } } diff --git a/fabric/build.gradle.kts.ft b/fabric/build.gradle.kts.ft index b183de6..d2445c1 100644 --- a/fabric/build.gradle.kts.ft +++ b/fabric/build.gradle.kts.ft @@ -78,16 +78,17 @@ dependencies { } tasks.processResources { + val mcVer = project.property("minecraft_version").toString().replace("-snapshot-", "-alpha.") inputs.property("version", project.version) - inputs.property("minecraft_version", project.property("minecraft_version")) + inputs.property("minecraft_version", mcVer) inputs.property("loader_version", project.property("loader_version")) filteringCharset = "UTF-8" filesMatching("fabric.mod.json") { expand("version" to project.version, - "minecraft_version" to project.property("minecraft_version"), - "loader_version" to project.property("loader_version"), - "kotlin_loader_version" to project.property("kotlin_loader_version")) + "minecraft_version" to mcVer, + "loader_version" to project.property("loader_version").toString(), + "kotlin_loader_version" to project.property("kotlin_loader_version").toString()) } } From 500975fd799a7e4b42438466b6efd6fabbe5e1c1 Mon Sep 17 00:00:00 2001 From: kr1viah Date: Thu, 25 Dec 2025 20:26:00 +0100 Subject: [PATCH 3/3] Correct loom --- fabric/build.gradle.ft | 4 ++++ fabric/build.gradle.kts.ft | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/fabric/build.gradle.ft b/fabric/build.gradle.ft index cdf2dc0..4900691 100644 --- a/fabric/build.gradle.ft +++ b/fabric/build.gradle.ft @@ -1,5 +1,9 @@ plugins { +#if (${VERSIONS.minecraft.compareTo($mcver.MC1_21_11)} <= 0) id 'net.fabricmc.fabric-loom' version '${VERSIONS.loom}' +#else + id 'fabric-loom' version '${VERSIONS.loom}' +#end id 'maven-publish' } diff --git a/fabric/build.gradle.kts.ft b/fabric/build.gradle.kts.ft index d2445c1..5ad92a5 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.minecraft.compareTo($mcver.MC1_21_11)} <= 0) + id("fabric-loom") version "${VERSIONS.loom}" +#else id("net.fabricmc.fabric-loom") version "${VERSIONS.loom}" +#end id("maven-publish") }