Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 0 additions & 19 deletions build-logic/loom-adapter/build.gradle.kts

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion build-logic/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ include(
"api:plugin",
"conventions",
"i18n-plugin",
"loom-adapter",
"metadata",
"release-metadata",
"settings",
Expand Down
1 change: 1 addition & 0 deletions build-logic/settings/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ plugins {

dependencies {
implementation(libs.plugins.stonecutter.coords)
implementation(libs.plugins.loomx.coords)
implementation(libs.plugins.foojay.resolver.coords)
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
plugins {
id("dev.kikugie.stonecutter")
id("dev.kikugie.loom-back-compat")
id("org.gradle.toolchains.foojay-resolver-convention")
}
4 changes: 2 additions & 2 deletions cloth-config/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
plugins {
alias(libs.plugins.fletchingtable.fabric)
id("freecam.loom-adapter")
id("dev.kikugie.loom-back-compat")
id("freecam.common")
}

dependencies {
minecraft("com.mojang:minecraft:${meta.mc}")
loomAdapter.applyMojangMappings()
loomx.applyMojangMappings()
modCompileOnly(libs.fabric.loader)

// Loader project should provide their own :common and cloth-config dependencies
Expand Down
4 changes: 2 additions & 2 deletions common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import dev.kikugie.stonecutter.StonecutterExperimentalAPI

plugins {
alias(libs.plugins.fletchingtable.fabric)
id("freecam.loom-adapter")
id("dev.kikugie.loom-back-compat")
id("freecam.common")
}

Expand Down Expand Up @@ -41,7 +41,7 @@ val i18nResources by configurations.registering {

dependencies {
minecraft("com.mojang:minecraft:${meta.mc}")
loomAdapter.applyMojangMappings()
loomx.applyMojangMappings()
modCompileOnly(libs.fabric.loader)
i18nResources(project(":i18n"))
}
Expand Down
8 changes: 4 additions & 4 deletions fabric/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import net.fabricmc.loom.task.FabricModJsonV1Task

plugins {
alias(libs.plugins.fletchingtable.fabric)
id("freecam.loom-adapter")
id("dev.kikugie.loom-back-compat")
id("freecam.loaders")
}

Expand All @@ -17,7 +17,7 @@ stonecutter replacements {

dependencies {
minecraft("com.mojang:minecraft:${meta.mc}")
loomAdapter.applyMojangMappings()
loomx.applyMojangMappings()
modImplementation(libs.fabric.loader)

sequenceOf(
Expand Down Expand Up @@ -82,7 +82,7 @@ loom {

tasks.register<Copy>("buildAndCollect") {
group = "build"
from(loomAdapter.modJar.map { it.archiveFile })
from(loomx.modJar.map { it.archiveFile })
into(rootProject.layout.buildDirectory.file("libs/${meta.version}"))
dependsOn(tasks.build)
}
Expand Down Expand Up @@ -149,6 +149,6 @@ tasks {
}

generateReleaseMetadata {
artifactFileName = loomAdapter.modJar.flatMap { it.archiveFileName }
artifactFileName = loomx.modJar.flatMap { it.archiveFileName }
}
}
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
org.gradle.jvmargs=-Xmx4G
loomx.loom_version=1.16-SNAPSHOT
fabric.loom.multiProjectOptimisation=true
5 changes: 2 additions & 3 deletions libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
kotlin = "2.3.0"
stonecutter = "0.9.1-beta.5"
fabric-loom = "1.16-SNAPSHOT"
loom-back-compat = "0.2"
fabric-loader = "0.18.6"
mapping-io = "0.8.0"
mixin = "0.8.5"
Expand Down Expand Up @@ -42,8 +42,7 @@ mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" }
[plugins]
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
stonecutter = { id = "dev.kikugie.stonecutter", version.ref = "stonecutter" }
fabric-loom = { id = "net.fabricmc.fabric-loom", version.ref = "fabric-loom" }
fabric-loom-remap = { id = "net.fabricmc.fabric-loom-remap", version.ref = "fabric-loom" }
loomx = { id = "dev.kikugie.loom-back-compat", version.ref = "loom-back-compat" }
moddev = { id = "net.neoforged.moddev", version.ref = "moddev" }
moddev-legacy = {id = "net.neoforged.moddev.legacyforge", version.ref = "moddev"}
fletchingtable = { id = "dev.kikugie.fletching-table", version.ref = "fletchingtable" }
Expand Down
Loading