From 199c41c52abdfab37798372879928966d0e3fd59 Mon Sep 17 00:00:00 2001 From: Josiah Glosson Date: Fri, 9 Aug 2024 10:04:54 -0500 Subject: [PATCH] Bump to 1.21.1 --- build.gradle.kts | 8 ++--- settings.gradle.kts | 4 +-- .../resources/META-INF/neoforge.mods.toml | 2 ++ src/main/resources/fabric.mod.json | 2 ++ version.gradle.kts | 31 ++++++++++--------- versions/mainProject | 2 +- 6 files changed, 28 insertions(+), 21 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 591de848..c368d78a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,8 +8,8 @@ repositories { } preprocess { - val fabric12100 = createNode("1.21-fabric", 1_21_00, "yarn") - val neoforge12100 = createNode("1.21-neoforge", 1_21_00, "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") @@ -23,8 +23,8 @@ preprocess { val fabric11802 = createNode("1.18.2-fabric", 1_18_02, "yarn") val forge11802 = createNode("1.18.2-forge", 1_18_02, "srg") - fabric12100.link(neoforge12100) - neoforge12100.link(neoforge12006) + fabric12101.link(neoforge12101) + neoforge12101.link(neoforge12006) neoforge12006.link(fabric12006) fabric12006.link(fabric12004) fabric12004.link(neoforge12004) diff --git a/settings.gradle.kts b/settings.gradle.kts index 675da574..5ba1d22c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -31,8 +31,8 @@ listOf( "1.20.4-fabric", "1.20.6-neoforge", "1.20.6-fabric", - "1.21-neoforge", - "1.21-fabric", + "1.21.1-neoforge", + "1.21.1-fabric", ).forEach { version -> include(":$version") project(":$version").apply { diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml index b959c0e5..214ddf5c 100644 --- a/src/main/resources/META-INF/neoforge.mods.toml +++ b/src/main/resources/META-INF/neoforge.mods.toml @@ -28,6 +28,8 @@ side = "BOTH" modId = "minecraft" ##if MC == 1.20.6 #?? versionRange = "[1.20.5,1.20.7)" +##elseif MC == 1.21.1 +#?? versionRange = "[1.21.0,1.21.2)" ##else versionRange = "[$mc_version]" ##endif diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 5ebd3e82..a822f7f2 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -42,6 +42,8 @@ //?? "minecraft": ">=1.20.3- <1.20.5", //#elseif MC == 1.20.6 //?? "minecraft": ">=1.20.5- <1.20.7", + //#elseif MC == 1.21.1 + //?? "minecraft": ">=1.21.0 <1.21.2", //#else "minecraft": "$mc_version", //#endif diff --git a/version.gradle.kts b/version.gradle.kts index 53bf3a36..30fff812 100644 --- a/version.gradle.kts +++ b/version.gradle.kts @@ -17,7 +17,7 @@ plugins { id("io.github.gaming32.gradle.preprocess") id("xyz.wagyourtail.unimined") id("com.modrinth.minotaur") version "2.8.7" - id("xyz.wagyourtail.jvmdowngrader") version "0.8.2" + id("xyz.wagyourtail.jvmdowngrader") version "1.0.1" } fun Any.setGroovyProperty(name: String, value: Any) = withGroovyBuilder { metaClass }.setProperty(this, name, value) @@ -72,10 +72,13 @@ unimined.minecraft { mappings { intermediary() - searge() + if (mcVersion <= 1_19_00) { + searge() + } mojmap() when { - mcVersion >= 1_20_05 -> "1.20.6:2024.06.02" + mcVersion >= 1_21_00 -> "1.21:2024.07.28" + mcVersion >= 1_20_05 -> "1.20.6:2024.06.16" mcVersion >= 1_20_04 -> "1.20.4:2024.04.14" mcVersion >= 1_20_03 -> "1.20.3:2023.12.31" mcVersion >= 1_20_02 -> "1.20.2:2023.12.10" @@ -91,8 +94,8 @@ unimined.minecraft { parchment(it.substringBefore(":"), it.substringAfter(":")) } - stub.withMappings("searge", listOf("mojmap")) { - if (mcVersion <= 1_19_00) { + if (mcVersion <= 1_19_00) { + stub.withMappings("searge", listOf("mojmap")) { c("net/minecraft/client/gui/chat/NarratorChatListener", "net/minecraft/client/GameNarrator") } } @@ -116,7 +119,7 @@ unimined.minecraft { } isNeoForge -> neoForge { loader(when (mcVersion) { - 1_21_00 -> "78-beta" + 1_21_01 -> "1" 1_20_06 -> "115" 1_20_04 -> "167" else -> throw IllegalStateException("Unknown NeoForge version for $mcVersionString") @@ -265,7 +268,7 @@ dependencies { if (isFabric) { when (mcVersion) { - 1_21_00 -> "11.0.0-beta.1" + 1_21_01 -> "11.0.1" 1_20_06 -> "10.0.0-beta.1" 1_20_04 -> "9.0.0" 1_20_01 -> "7.2.2" @@ -287,7 +290,7 @@ dependencies { if (isFabric) { when (mcVersion) { - 1_21_00 -> "0.100.1+1.21" + 1_21_01 -> "0.102.0+1.21.1" 1_20_06 -> "0.100.0+1.20.6" 1_20_04 -> "0.97.1+1.20.4" 1_20_01 -> "0.92.2+1.20.1" @@ -323,13 +326,13 @@ dependencies { compileOnly("de.maxhenkel.voicechat:voicechat-api:2.5.0") when (mcVersion) { - 1_21_00 -> "2.5.19" - 1_20_06 -> "2.5.19" - 1_20_04 -> "2.5.19" - 1_20_01 -> "2.5.19" + 1_21_01 -> "2.5.20" + 1_20_06 -> "2.5.20" + 1_20_04 -> "2.5.20" + 1_20_01 -> "2.5.20" 1_19_04 -> "2.5.12" - 1_19_02 -> "2.5.19" - 1_18_02 -> "2.5.19" + 1_19_02 -> "2.5.20" + 1_18_02 -> "2.5.20" else -> null }?.let { modCompileOnly("maven.modrinth:simple-voice-chat:$loaderName-$mcVersionString-$it") diff --git a/versions/mainProject b/versions/mainProject index dfdd5113..3eadd8bb 100644 --- a/versions/mainProject +++ b/versions/mainProject @@ -1 +1 @@ -1.21-fabric \ No newline at end of file +1.21.1-fabric \ No newline at end of file