From 2ae7dd43fe6c51b857b66f25e67fb51e96890d30 Mon Sep 17 00:00:00 2001 From: Xujiayao Date: Wed, 26 Mar 2025 12:47:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96+=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0MC=201.21.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 ++ common.gradle | 2 +- gradle.properties | 4 ++-- settings.gradle | 3 ++- versions/1.20.1/gradle.properties | 2 +- versions/1.21.1/gradle.properties | 2 +- versions/1.21.4/gradle.properties | 4 ++-- versions/1.21.5/gradle.properties | 9 +++++++++ versions/mainProject | 2 +- wrapper/build.gradle | 4 ++-- 10 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 versions/1.21.5/gradle.properties diff --git a/build.gradle b/build.gradle index 564ea1f3..981f1f50 100644 --- a/build.gradle +++ b/build.gradle @@ -20,6 +20,7 @@ preprocess { def mc1204 = createNode("1.20.4", 1_20_04, "mojang") def mc1211 = createNode("1.21.1", 1_21_01, "mojang") def mc1214 = createNode("1.21.4", 1_21_04, "mojang") + def mc1215 = createNode("1.21.5", 1_21_05, "mojang") mc1152.link(mc1165, file("versions/mapping-1.15.2-1.16.5.txt")) mc1165.link(mc1171, null) @@ -33,6 +34,7 @@ preprocess { mc1202.link(mc1204, null) mc1204.link(mc1211, null) mc1211.link(mc1214, file("versions/mapping-1.21.1-1.21.4.txt")) + mc1214.link(mc1215, null) } project.afterEvaluate { diff --git a/common.gradle b/common.gradle index 02f1f764..1ba7d6d9 100644 --- a/common.gradle +++ b/common.gradle @@ -37,7 +37,7 @@ dependencies { modImplementation("com.fasterxml.jackson.core:jackson-annotations:2.17.2") modImplementation("com.squareup.okhttp3:okhttp:4.12.0") modImplementation("com.squareup.okio:okio-jvm:3.6.0") - modImplementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.21") + modImplementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.10") modImplementation("net.fellbaum:jemoji:1.7.1") diff --git a/gradle.properties b/gradle.properties index a25ce161..ebb024a6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,6 +9,6 @@ archives_base_name=Discord-MC-Chat # Wrapper Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21.4 +minecraft_version=1.21.5 loader_version=0.16.10 -fabric_version=0.116.1+1.21.4 \ No newline at end of file +fabric_version=0.119.5+1.21.5 \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index d71cb747..4c42c98b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -36,7 +36,8 @@ def versions = Arrays.asList( "1.20.2", "1.20.4", "1.21.1", - "1.21.4" + "1.21.4", + "1.21.5" ) for (String version : versions) { include(":$version") diff --git a/versions/1.20.1/gradle.properties b/versions/1.20.1/gradle.properties index 126a8b6c..60039493 100644 --- a/versions/1.20.1/gradle.properties +++ b/versions/1.20.1/gradle.properties @@ -6,4 +6,4 @@ minecraft_version=1.20.1 minecraft_dependency=1.20,1.20.1 # Dependencies -fabric_version=0.92.3+1.20.1 \ No newline at end of file +fabric_version=0.92.5+1.20.1 \ No newline at end of file diff --git a/versions/1.21.1/gradle.properties b/versions/1.21.1/gradle.properties index 1cb6d33b..16127c23 100644 --- a/versions/1.21.1/gradle.properties +++ b/versions/1.21.1/gradle.properties @@ -6,4 +6,4 @@ minecraft_version=1.21.1 minecraft_dependency=~1.20.5,1.21,1.21.1 # Dependencies -fabric_version=0.115.0+1.21.1 \ No newline at end of file +fabric_version=0.115.3+1.21.1 \ No newline at end of file diff --git a/versions/1.21.4/gradle.properties b/versions/1.21.4/gradle.properties index 5ab89014..96fac487 100644 --- a/versions/1.21.4/gradle.properties +++ b/versions/1.21.4/gradle.properties @@ -3,7 +3,7 @@ minecraft_version=1.21.4 # Fabric Mod Metadata -minecraft_dependency=~1.21.2 +minecraft_dependency=1.21.2,1.21.3,1.21.4 # Dependencies -fabric_version=0.116.1+1.21.4 \ No newline at end of file +fabric_version=0.119.2+1.21.4 \ No newline at end of file diff --git a/versions/1.21.5/gradle.properties b/versions/1.21.5/gradle.properties new file mode 100644 index 00000000..5dc9a5d8 --- /dev/null +++ b/versions/1.21.5/gradle.properties @@ -0,0 +1,9 @@ +# Fabric Properties +# check these on https://fabricmc.net/develop +minecraft_version=1.21.5 + +# Fabric Mod Metadata +minecraft_dependency=~1.21.5 + +# Dependencies +fabric_version=0.119.5+1.21.5 \ No newline at end of file diff --git a/versions/mainProject b/versions/mainProject index 3d8ac637..d6a49eb3 100644 --- a/versions/mainProject +++ b/versions/mainProject @@ -1 +1 @@ -1.21.4 \ No newline at end of file +1.21.5 \ No newline at end of file diff --git a/wrapper/build.gradle b/wrapper/build.gradle index b129dcaa..794f5cb9 100644 --- a/wrapper/build.gradle +++ b/wrapper/build.gradle @@ -43,13 +43,13 @@ dependencies { include("com.fasterxml.jackson.core:jackson-annotations:2.17.2") include("com.squareup.okhttp3:okhttp:4.12.0") include("com.squareup.okio:okio-jvm:3.6.0") - include("org.jetbrains.kotlin:kotlin-stdlib:1.8.21") + include("org.jetbrains.kotlin:kotlin-stdlib:1.9.10") include("net.fellbaum:jemoji:1.7.1") shadow(implementation("com.google.code.gson:gson:2.12.1")) - shadow(implementation("com.jetbrains.intellij.java:java-gui-forms-rt:243.23654.166")) + shadow(implementation("com.jetbrains.intellij.java:java-gui-forms-rt:243.26053.20")) shadow(implementation("com.formdev:flatlaf:3.5.4")) shadow(implementation("com.formdev:flatlaf-extras:3.5.4")) }