diff options
91 files changed, 1026 insertions, 1581 deletions
diff --git a/build.gradle.kts b/build.gradle.kts index 15b7d71..51c981d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -25,7 +25,7 @@ plugins { alias(libs.plugins.kotlin.plugin.ksp) // alias(libs.plugins.loom) // TODO: use arch loom once they update to 1.8 - id("fabric-loom") version "1.8.9" + id("fabric-loom") version "1.9.2" alias(libs.plugins.shadow) id("moe.nea.licenseextractificator") id("moe.nea.mc-auto-translations") version "0.1.0" @@ -129,13 +129,8 @@ val collectTranslations by tasks.registering(CollectTranslations::class) { val compatSourceSets: MutableSet<SourceSet> = mutableSetOf() fun createIsolatedSourceSet(name: String, path: String = "compat/$name", isEnabled: Boolean = true): SourceSet { val ss = sourceSets.create(name) { - if (isEnabled) { - this.java.setSrcDirs(listOf(layout.projectDirectory.dir("src/$path/java"))) - this.kotlin.setSrcDirs(listOf(layout.projectDirectory.dir("src/$path/java"))) - } else { - this.java.setSrcDirs(listOf<File>()) - this.kotlin.setSrcDirs(listOf<File>()) - } + this.java.setSrcDirs(listOf(layout.projectDirectory.dir("src/$path/java"))) + this.kotlin.setSrcDirs(listOf(layout.projectDirectory.dir("src/$path/java"))) } val mainSS = sourceSets.main.get() val upperName = ss.name.capitalizeN() @@ -222,15 +217,16 @@ val testAgent by configurations.creating { val configuredSourceSet = createIsolatedSourceSet("configured", isEnabled = false) // Wait for update (also low prio, because configured sucks) -val sodiumSourceSet = createIsolatedSourceSet("sodium") +val sodiumSourceSet = createIsolatedSourceSet("sodium", isEnabled = false) val citResewnSourceSet = createIsolatedSourceSet("citresewn", isEnabled = false) // TODO: Wait for update -val yaclSourceSet = createIsolatedSourceSet("yacl") +val yaclSourceSet = createIsolatedSourceSet("yacl", isEnabled = false) val explosiveEnhancementSourceSet = createIsolatedSourceSet("explosiveEnhancement", isEnabled = false) // TODO: wait for their port -val wildfireGenderSourceSet = createIsolatedSourceSet("wildfireGender", isEnabled = false) // TODO: wait on their port -val modmenuSourceSet = createIsolatedSourceSet("modmenu") +val wildfireGenderSourceSet = createIsolatedSourceSet("wildfireGender") +val modmenuSourceSet = createIsolatedSourceSet("modmenu", isEnabled = false) val reiSourceSet = createIsolatedSourceSet("rei") val moulconfigSourceSet = createIsolatedSourceSet("moulconfig") +val customTexturesSourceSet = createIsolatedSourceSet("texturePacks", "texturePacks") dependencies { // Minecraft dependencies @@ -273,6 +269,7 @@ dependencies { include(libs.jarvis.fabric) (wildfireGenderSourceSet.modImplementationConfigurationName)(libs.femalegender) + (wildfireGenderSourceSet.implementationConfigurationName)(customTexturesSourceSet.output) (configuredSourceSet.modImplementationConfigurationName)(libs.configured) (sodiumSourceSet.modImplementationConfigurationName)(libs.sodium) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index d89c20e..54719bc 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -3,7 +3,7 @@ // SPDX-License-Identifier: CC0-1.0 plugins { - kotlin("jvm") version "1.8.10" + kotlin("jvm") version "2.1.0" `kotlin-dsl` } repositories { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ffe17b4..9b8a7d6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,21 +3,23 @@ # SPDX-License-Identifier: CC0-1.0 [versions] -minecraft = "1.21.3" +minecraft = "1.21.4" # Update from https://kotlinlang.org/ -kotlin = "2.0.21" +kotlin = "2.1.0" # Update from https://github.com/google/ksp/releases -kotlin_ksp = "2.0.21-1.0.26" +kotlin_ksp = "2.1.0-1.0.29" |