Update 1.21 releases, and add 1.21.1 Branch (With the same 1.21 versi…

…ons)
aria1th · Aug 18, 2024 · bc304aa · bc304aa
1 parent fc079bc
commit bc304aa
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
 	id 'com.replaymod.preprocess' version '6989e16efc'
-	id 'fabric-loom' version '1.6-SNAPSHOT' apply false
+	id 'fabric-loom' version '1.7-SNAPSHOT' apply false
 }
 
 preprocess {
@@ -16,6 +16,7 @@ preprocess {
     def mc1204 = createNode('1.20.4', 1_20_04, 'yarn')
 	def mc1206 = createNode('1.20.6', 1_20_06, 'yarn')
 	def mc1210 = createNode('1.21.0', 1_21_00, 'yarn')
+	def mc1211 = createNode('1.21.1', 1_21_01, 'yarn')
 
 	// mapping difference map
 	// base 1194 -> 1193 -> 1192 ->1190-> 118 -> 117 -> 116
@@ -24,6 +25,7 @@ preprocess {
     mc1204.link(mc1202, file('versions/mapping-1.20.4-1.20.2.txt'))
 	mc1206.link(mc1204, file('versions/mapping-1.20.6-1.20.4.txt'))
 	mc1210.link(mc1206, file('versions/mapping-1.21.0-1.20.6.txt'))
+	mc1211.link(mc1210, file('versions/mapping-1.21.1-1.21.0.txt'))
 	//mc1194.link(mc1193, file('versions/mapping-1.19.4-1.19.3.txt'))
 	//mc1193.link(mc1192, file('versions/mapping-1.19.3-1.19.2.txt'))
 	//mc1192.link(mc1190, file('versions/mapping-1.19.2-1.19.0.txt'))

diff --git a/common.gradle b/common.gradle
@@ -1,13 +1,13 @@
 // common.gradle is a file that called separately by each module.
 plugins {
-    id 'fabric-loom' version '1.6-SNAPSHOT'
+    id 'fabric-loom' version '1.7-SNAPSHOT'
     id 'com.replaymod.preprocess' version '6989e16efc'
 }
 
 int mcVersion = 1
 
 preprocess {
-    mcVersion = vars.get()["MC"]
+    mcVersion = vars.get()["MC"] as Integer
     tabIndentation = true
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -5,6 +5,6 @@ org.gradle.jvmargs=-Xmx6G
     loader_version=0.15.11
 
 # Mod Properties
-    mod_version = 7.2.0
+    mod_version = 7.2.1
     maven_group = aria1th.extensions
     archives_base_name = litematica-printer
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/gradlew.bat b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

diff --git a/settings.gradle b/settings.gradle
@@ -36,7 +36,8 @@ def versions = Arrays.asList(
         "1.20.2",
         "1.20.4",
 		"1.20.6",
-		"1.21.0"
+		"1.21.0",
+		"1.21.1"
 )
 
 for (String version : versions) {

diff --git a/versions/1.21.0/gradle.properties b/versions/1.21.0/gradle.properties
@@ -1,15 +1,15 @@
 # Fabric Properties
     # check these on https://fabricmc.net/use
     minecraft_version=1.21
-    yarn_mappings=1.21+build.1
+    yarn_mappings=1.21+build.9
     fabricapi_version=0.100.1+1.21
     minecraft_version_out = 1.21
 
 # Mod Properties
     # (Jitpack.io) https://github.com/sakura-ryoko/malilib
     malilib_projectid = "sakura-jitpack"
-    malilib_fileid = 1.21-sakura.5
+    malilib_fileid = 1.21-0.20.2
     # (Jitpack.io) https://github.com/sakura-ryoko/litematica
     litematica_projectid = "sakura-jitpack"
-    litematica_fileid = 1.21-sakura.11
+    litematica_fileid = 1.21-0.19.2
     essentialclient_filename = essential-client-1.20.1-1.3.6.jar
diff --git a/versions/1.21.1/gradle.properties b/versions/1.21.1/gradle.properties
@@ -0,0 +1,15 @@
+# Fabric Properties
+    # check these on https://fabricmc.net/use
+    minecraft_version=1.21.1
+    yarn_mappings=1.21.1+build.3
+    fabricapi_version=0.102.1+1.21.1
+    minecraft_version_out = 1.21.1
+
+# Mod Properties
+    # (Jitpack.io) https://github.com/sakura-ryoko/malilib
+    malilib_projectid = "sakura-jitpack"
+    malilib_fileid = 1.21-0.20.2
+    # (Jitpack.io) https://github.com/sakura-ryoko/litematica
+    litematica_projectid = "sakura-jitpack"
+    litematica_fileid = 1.21-0.19.2
+    essentialclient_filename = essential-client-1.20.1-1.3.6.jar
diff --git a/versions/mapping-1.21.1-1.21.0.txt b/versions/mapping-1.21.1-1.21.0.txt