Skip to content

Partially fixes #39 #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kr1viah wants to merge 3 commits into
base: v1
Choose a base branch
from
Open

Partially fixes #39 #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a42445
26.1 support
kr1viah Dec 25, 2025
4a782b9
Fix kotlin build script stuff and 26.1 FMJ
kr1viah Dec 25, 2025
500975f
Correct loom
kr1viah Dec 25, 2025
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
17 changes: 15 additions & 2 deletions fabric/build.gradle.ft
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
}

Expand Down Expand Up @@ -42,6 +46,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
Expand All @@ -52,17 +57,25 @@ 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 {
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
}
}
Expand Down
22 changes: 18 additions & 4 deletions fabric/build.gradle.kts.ft
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down Expand Up @@ -55,6 +59,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
Expand All @@ -66,19 +71,28 @@ 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 {
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())
}
}

Expand Down