diff --git a/build.gradle.kts b/build.gradle.kts index 546446c..42e487c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("io.github.gaming32.gradle.preprocess-root") version "0.4.4" - id("dev.architectury.loom") version "1.7.415" apply false + id("dev.architectury.loom") version "1.7.416" apply false id("com.modrinth.minotaur") version "2.8.7" apply false id("xyz.wagyourtail.jvmdowngrader") version "1.2.1" apply false } @@ -10,14 +10,18 @@ repositories { } preprocess { - val fabric12103 = createNode("1.21.3-fabric", 1_21_03, "yarn") - val neoforge12103 = createNode("1.21.3-neoforge", 1_21_03, "yarn") - val fabric12101 = createNode("1.21.1-fabric", 1_21_01, "yarn") - val neoforge12101 = createNode("1.21.1-neoforge", 1_21_01, "yarn") - val fabric12006 = createNode("1.20.6-fabric", 1_20_06, "yarn") - val neoforge12006 = createNode("1.20.6-neoforge", 1_20_06, "yarn") - val fabric12004 = createNode("1.20.4-fabric", 1_20_04, "yarn") - val neoforge12004 = createNode("1.20.4-neoforge", 1_20_04, "yarn") + fun createNode(project: String, mcVersion: Int) = createNode(project, mcVersion, "yarn") + + val fabric12104 = createNode("1.21.4-fabric", 1_21_04) + val neoforge12104 = createNode("1.21.4-neoforge", 1_21_04) + val fabric12103 = createNode("1.21.3-fabric", 1_21_03) + val neoforge12103 = createNode("1.21.3-neoforge", 1_21_03) + val fabric12101 = createNode("1.21.1-fabric", 1_21_01) + val neoforge12101 = createNode("1.21.1-neoforge", 1_21_01) + val fabric12006 = createNode("1.20.6-fabric", 1_20_06) + val neoforge12006 = createNode("1.20.6-neoforge", 1_20_06) + val fabric12004 = createNode("1.20.4-fabric", 1_20_04) + val neoforge12004 = createNode("1.20.4-neoforge", 1_20_04) val fabric12001 = createNode("1.20.1-fabric", 1_20_01, "yarn") val forge12001 = createNode("1.20.1-forge", 1_20_01, "srg") val fabric11904 = createNode("1.19.4-fabric", 1_19_04, "yarn") @@ -25,19 +29,21 @@ preprocess { val fabric11902 = createNode("1.19.2-fabric", 1_19_02, "yarn") val forge11902 = createNode("1.19.2-forge", 1_19_02, "srg") - fabric12103.link(neoforge12103) - neoforge12103.link(neoforge12101) - neoforge12101.link(fabric12101) - fabric12101.link(fabric12006) - fabric12006.link(neoforge12006) - neoforge12006.link(neoforge12004) - neoforge12004.link(fabric12004) - fabric12004.link(fabric12001) - fabric12001.link(forge12001) - forge12001.link(forge11904) - forge11904.link(fabric11904) - fabric11904.link(fabric11902) - fabric11902.link(forge11902) + fabric12104.link(neoforge12104) + neoforge12104.link(neoforge12103) + neoforge12103.link(fabric12103) + fabric12103.link(fabric12101) + fabric12101.link(neoforge12101) + neoforge12101.link(neoforge12006) + neoforge12006.link(fabric12006) + fabric12006.link(fabric12004) + fabric12004.link(neoforge12004) + neoforge12004.link(forge12001) + forge12001.link(fabric12001) + fabric12001.link(fabric11904) + fabric11904.link(forge11904) + forge11904.link(forge11902) + forge11902.link(fabric11902) } subprojects { diff --git a/settings.gradle.kts b/settings.gradle.kts index 48d44c9..07a7f23 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -32,6 +32,8 @@ listOf( "1.21.1-fabric", "1.21.3-neoforge", "1.21.3-fabric", + "1.21.4-neoforge", + "1.21.4-fabric", ).forEach { version -> include(":$version") project(":$version").apply { diff --git a/version.gradle.kts b/version.gradle.kts index dc56385..d3119e2 100644 --- a/version.gradle.kts +++ b/version.gradle.kts @@ -174,6 +174,7 @@ dependencies { }.let { "forge"("net.minecraftforge:forge:$mcVersionString-$it") } isNeoForge -> when (mcVersion) { + 1_21_04 -> "21.4.1-beta" 1_21_03 -> "21.3.56" 1_21_01 -> "21.1.1" 1_20_06 -> "20.6.115" @@ -189,6 +190,7 @@ dependencies { if (isFabric) { when (mcVersion) { + 1_21_04 -> "12.0.0-beta.1" // TODO: Use actual version 1_21_03 -> "12.0.0-beta.1" 1_21_01 -> "11.0.1" 1_20_06 -> "10.0.0" @@ -211,6 +213,7 @@ dependencies { if (isFabric) { when (mcVersion) { + 1_21_04 -> "0.110.5+1.21.4" 1_21_03 -> "0.106.1+1.21.3" 1_21_01 -> "0.102.0+1.21.1" 1_20_06 -> "0.100.0+1.20.6" @@ -247,6 +250,7 @@ dependencies { compileOnly("de.maxhenkel.voicechat:voicechat-api:2.5.0") when (mcVersion) { + 1_21_04 -> "2.5.26" 1_21_03 -> "2.5.24" 1_21_01 -> "2.5.20" 1_20_06 -> "2.5.20" @@ -330,6 +334,7 @@ tasks.processResources { // TODO: Remove pack.mcmeta in 1.20.4 filesMatching("pack.mcmeta") { expand("pack_format" to when { + mcVersion >= 1_21_04 -> 61 mcVersion >= 1_21_02 -> 42 mcVersion >= 1_21_00 -> 34 mcVersion >= 1_20_05 -> 32