Merge branch 'master' into architectury-test

Fallen-Breath · Fallen-Breath · commit 2f5fb6f264fd · 2025-12-10T02:08:15.000+08:00
# Conflicts:
#	build.gradle
#	common.gradle
#	gradle.properties
#	settings.json
#	versions/1.14.4-fabric/gradle.properties
#	versions/1.15.2-fabric/gradle.properties
#	versions/1.16.5-fabric/gradle.properties
#	versions/1.17.1-fabric/gradle.properties
#	versions/1.18.2-fabric/gradle.properties
#	versions/1.19.4-fabric/gradle.properties
#	versions/1.20.4-fabric/gradle.properties
#	versions/1.20.6-fabric/gradle.properties
#	versions/1.21.1-fabric/gradle.properties
#	versions/1.21.10-fabric/gradle.properties
#	versions/1.21.3-fabric/gradle.properties
#	versions/1.21.4-fabric/gradle.properties
#	versions/1.21.5-fabric/gradle.properties
#	versions/1.21.8-fabric/gradle.properties
diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,6 @@ preprocess {
 
 	def settings = new JsonSlurper().parseText(file('settings.json').text)
 	def all_versions = new ArrayList<>(settings.versions)
-	all_versions.sort()  // low -> high
 	Map<String, Node> all_nodes = [:]
 
 	for (String version : all_versions) {
diff --git a/common.gradle b/common.gradle
@@ -18,6 +18,9 @@ preprocess {
 }
 
 repositories {
+	maven {
+		url = 'https://maven.parchmentmc.org'
+	}
 	maven {
 		url = 'https://jitpack.io'
 	}
@@ -37,7 +40,12 @@ configurations {
 dependencies {
 	// loom
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings loom.officialMojangMappings()
+    mappings loom.layered() {
+        officialMojangMappings()
+        if (project.parchment_version.size() > 0) {
+            parchment("org.parchmentmc.data:parchment-${project.minecraft_version}:${project.parchment_version}@zip")
+        }
+    }
 
 	if (mod_brand == 'fabric') {
 		modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}"
diff --git a/jitpack.yml b/jitpack.yml
@@ -1,3 +1,3 @@
 before_install:
-  - sdk install java 21.0.7-tem
-  - sdk use java 21.0.7-tem
+  - sdk install java 21.0.9-tem
+  - sdk use java 21.0.9-tem
diff --git a/settings.json b/settings.json
@@ -14,6 +14,7 @@
     "1.21.5-fabric",
     "1.21.8-fabric",
     "1.21.10-fabric",
+    "1.21.11-fabric",
 
     "1.16.5-forge",
     "1.17.1-forge",
@@ -34,6 +35,7 @@
     "1.21.4-neoforge",
     "1.21.5-neoforge",
     "1.21.8-neoforge",
-    "1.21.10-neoforge"
+    "1.21.10-neoforge",
+    "1.21.11-neoforge"
   ]
 }
diff --git a/versions/1.14.4-fabric/gradle.properties b/versions/1.14.4-fabric/gradle.properties
@@ -1,11 +1,13 @@
 # Loom Properties
 	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.14.4
 	minecraft_version=1.14.4
+	# https://maven.parchmentmc.org/org/parchmentmc/data/
+	parchment_version=
 	loom.platform=fabric
 
 # Mod Metadata
 	# https://fabricmc.net/versions.html
-	fabric_loader_version=0.17.3
+	fabric_loader_version=0.18.1
 	minecraft_dependency=1.14.x
 
 # Build Information
diff --git a/versions/1.15.2-fabric/gradle.properties b/versions/1.15.2-fabric/gradle.properties
@@ -1,11 +1,13 @@
 # Loom Properties
 	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.15.2
 	minecraft_version=1.15.2
+	# https://maven.parchmentmc.org/org/parchmentmc/data/
+	parchment_version=
 	loom.platform=fabric
 
 # Mod Metadata
 	# https://fabricmc.net/versions.html
-	fabric_loader_version=0.17.3
+	fabric_loader_version=0.18.1
 	minecraft_dependency=1.15.x
 
 # Build Information
diff --git a/versions/1.16.5-fabric/gradle.properties b/versions/1.16.5-fabric/gradle.properties
@@ -1,11 +1,13 @@
 # Loom Properties
 	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.16.5
 	minecraft_version=1.16.5
+	# https://maven.parchmentmc.org/org/parchmentmc/data/
+	parchment_version=2022.03.06
 	loom.platform=fabric
 
 # Mod Metadata
 	# https://fabricmc.net/versions.html
-	fabric_loader_version=0.17.3
+	fabric_loader_version=0.18.1
 	minecraft_dependency=1.16.x
 
 # Build Information
diff --git a/versions/1.16.5-forge/gradle.properties b/versions/1.16.5-forge/gradle.properties
@@ -1,6 +1,8 @@
 # Loom Properties
 	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.16.5
 	minecraft_version=1.16.5
+	# https://maven.parchmentmc.org/org/parchmentmc/data/
+	parchment_version=2022.03.06
 	loom.platform=forge
 
 # Mod Metadata
diff --git a/versions/1.17.1-fabric/gradle.properties b/versions/1.17.1-fabric/gradle.properties
@@ -1,11 +1,13 @@
 # Loom Properties
 	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.17.1
 	minecraft_version=1.17.1
+	# https://maven.parchmentmc.org/org/parchmentmc/data/
+	parchment_version=2021.12.12
 	loom.platform=fabric
 
 # Mod Metadata
 	# https://fabricmc.net/versions.html
-	fabric_loader_version=0.17.3
+	fabric_loader_version=0.18.1
 	minecraft_dependency=1.17.x
 
 # Build Information
diff --git a/versions/1.17.1-forge/gradle.properties b/versions/1.17.1-forge/gradle.properties
@@ -1,6 +1,8 @@
 # Loom Properties
 	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.17.1
 	minecraft_version=1.17.1
+	# https://maven.parchmentmc.org/org/parchmentmc/data/
+	parchment_version=2021.12.12
 	loom.platform=forge
 
 # Mod Metadata
diff --git a/versions/1.18.2-fabric/gradle.properties b/versions/1.18.2-fabric/gradle.properties
@@ -1,11 +1,13 @@
 # Loom Properties
 	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.18.2
 	minecraft_version=1.18.2
+	# https://maven.parchmentmc.org/org/parchmentmc/data/
+	parchment_version=2022.11.06
 	loom.platform=fabric
 
 # Mod Metadata
 	# https://fabricmc.net/versions.html
-	fabric_loader_version=0.17.3
+	fabric_loader_version=0.18.1
 	minecraft_dependency=1.18.x
 
 # Build Information
diff --git a/versions/1.18.2-forge/gradle.properties b/versions/1.18.2-forge/gradle.properties
@@ -1,6 +1,8 @@
 # Loom Properties
 	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.18.2
 	minecraft_version=1.18.2
+	# https://maven.parchmentmc.org/org/parchmentmc/data/
+	parchment_version=2022.11.06
 	loom.platform=forge
 
 # Mod Metadata
diff --git a/versions/1.19.4-fabric/gradle.properties b/versions/1.19.4-fabric/gradle.properties
@@ -1,11 +1,13 @@
 # Loom Properties
 	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.19.4
 	minecraft_version=1.19.4
+	# https://maven.parchmentmc.org/org/parchmentmc/data/
+	parchment_version=2023.06.26
 	loom.platform=fabric
 
 # Mod Metadata
 	# https://fabricmc.net/versions.html
-	fabric_loader_version=0.17.3
+	fabric_loader_version=0.18.1
 	minecraft_dependency=1.19.x
 
 # Build Information
diff --git a/versions/1.19.4-forge/gradle.properties b/versions/1.19.4-forge/gradle.properties
@@ -1,6 +1,8 @@
 # Loom Properties
 	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.19.4
 	minecraft_version=1.19.4
+	# https://maven.parchmentmc.org/org/parchmentmc/data/
+	parchment_version=2023.06.26
 	loom.platform=forge
 
 # Mod Metadata
diff --git a/versions/1.20.4-fabric/gradle.properties b/versions/1.20.4-fabric/gradle.properties
@@ -1,11 +1,13 @@
 # Fabric Properties
 	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.20.4
 	minecraft_version=1.20.4
+	# https://maven.parchmentmc.org/org/parchmentmc/data/
+	parchment_version=2024.04.14
 	loom.platform=fabric
 
 # Mod Metadata
 	# https://fabricmc.net/versions.html
-	fabric_loader_version=0.17.3
+	fabric_loader_version=0.18.1
 	minecraft_dependency=>=1.20 <=1.20.4
 
 # Build Information
diff --git a/versions/1.20.4-forge/gradle.properties b/versions/1.20.4-forge/gradle.properties
@@ -1,6 +1,8 @@
 # Loom Properties
 	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.20.4
 	minecraft_version=1.20.4
+	# https://maven.parchmentmc.org/org/parchmentmc/data/
+	parchment_version=2024.04.14
 	loom.platform=forge
 
 # Mod Metadata
diff --git a/versions/1.20.6-fabric/gradle.properties b/versions/1.20.6-fabric/gradle.properties
@@ -1,11 +1,13 @@
 # Loom Properties
 	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.20.6
 	minecraft_version=1.20.6
+	# https://maven.parchmentmc.org/org/parchmentmc/data/
+	parchment_version=2024.06.16
 	loom.platform=fabric
 
 # Mod Metadata
 	# https://fabricmc.net/versions.html
-	fabric_loader_version=0.17.3
+	fabric_loader_version=0.18.1
 	minecraft_dependency=>=1.20.5 <=1.20.6
 
 # Build Information
diff --git a/versions/1.20.6-forge/gradle.properties b/versions/1.20.6-forge/gradle.properties
@@ -1,6 +1,8 @@
 # Loom Properties
 	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.20.6
 	minecraft_version=1.20.6
+	# https://maven.parchmentmc.org/org/parchmentmc/data/
+	parchment_version=2024.06.16
 	loom.platform=forge
 
 # Mod Metadata
diff --git a/versions/1.20.6-neoforge/gradle.properties b/versions/1.20.6-neoforge/gradle.properties
@@ -1,6 +1,8 @@
 # Loom Properties
 	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.20.6
 	minecraft_version=1.20.6
+	# https://maven.parchmentmc.org/org/parchmentmc/data/
+	parchment_version=2024.06.16
 	loom.platform=neoforge
 
 # Mod Metadata
diff --git a/versions/1.21.1-fabric/gradle.properties b/versions/1.21.1-fabric/gradle.properties
@@ -1,11 +1,13 @@
 # Loom Properties
 	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21.1
 	minecraft_version=1.21.1
+	# https://maven.parchmentmc.org/org/parchmentmc/data/
+	parchment_version=2024.11.17
 	loom.platform=fabric
 
 # Mod Metadata
 	# https://fabricmc.net/versions.html
-	fabric_loader_version=0.17.3
+	fabric_loader_version=0.18.1
 	minecraft_dependency=>=1.21 <=1.21.1
 
 # Build Information
diff --git a/versions/1.21.1-forge/gradle.properties b/versions/1.21.1-forge/gradle.properties
@@ -1,6 +1,8 @@
 # Loom Properties
 	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21.1
 	minecraft_version=1.21.1
+	# https://maven.parchmentmc.org/org/parchmentmc/data/
+	parchment_version=2024.11.17
 	loom.platform=forge
 
 # Mod Metadata
diff --git a/versions/1.21.1-neoforge/gradle.properties b/versions/1.21.1-neoforge/gradle.properties
@@ -1,6 +1,8 @@
 # Loom Properties
 	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21.1
 	minecraft_version=1.21.1
+	# https://maven.parchmentmc.org/org/parchmentmc/data/
+	parchment_version=2024.11.17
 	loom.platform=neoforge
 
 # Mod Metadata
diff --git a/versions/1.21.10-fabric/gradle.properties b/versions/1.21.10-fabric/gradle.properties
@@ -1,12 +1,14 @@
 # Fabric Properties
 	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21.10
 	minecraft_version=1.21.10
+	# https://maven.parchmentmc.org/org/parchmentmc/data/
+	parchment_version=2025.10.12
 	loom.platform=fabric
 
 # Mod Metadata
 	# https://fabricmc.net/versions.html
-	fabric_loader_version=0.17.3
-	minecraft_dependency=>=1.21.9 1.21.x
+	fabric_loader_version=0.18.1
+	minecraft_dependency=>=1.21.9 <=1.21.10
 
 # Build Information
 	# The target mc versions for the mod during mod publishing, separated with \n
diff --git a/versions/1.21.10-forge/gradle.properties b/versions/1.21.10-forge/gradle.properties
@@ -1,12 +1,14 @@
 # Fabric Properties
 	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21.10
 	minecraft_version=1.21.10
+	# https://maven.parchmentmc.org/org/parchmentmc/data/
+	parchment_version=2025.10.12
 	loom.platform=forge
 
 # Mod Metadata
 	# https://files.minecraftforge.net/net/minecraftforge/forge/index_1.21.10.html
 	forge_version=60.0.5
-	minecraft_dependency=[1.21.9, )
+	minecraft_dependency=[1.21.9, 1.21.10]
 
 # Build Information
 	# The target mc versions for the mod during mod publishing, separated with \n
diff --git a/versions/1.21.10-neoforge/gradle.properties b/versions/1.21.10-neoforge/gradle.properties
@@ -1,12 +1,14 @@
 # Fabric Properties
 	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21.10
 	minecraft_version=1.21.10
+	# https://maven.parchmentmc.org/org/parchmentmc/data/
+	parchment_version=2025.10.12
 	loom.platform=neoforge
 
 # Mod Metadata
 	# https://projects.neoforged.net/neoforged/neoforge
 	neoforge_version=21.10.16-beta
-	minecraft_dependency=[1.21.9, )
+	minecraft_dependency=[1.21.9, 1.21.10]
 
 # Build Information
 	# The target mc versions for the mod during mod publishing, separated with \n
diff --git a/versions/1.21.11-fabric/gradle.properties b/versions/1.21.11-fabric/gradle.properties
@@ -0,0 +1,18 @@
+# Fabric Properties
+	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21.11
+	minecraft_version=1.21.11
+	# https://maven.parchmentmc.org/org/parchmentmc/data/
+	parchment_version=
+	loom.platform=fabric
+
+# Mod Metadata
+	# https://fabricmc.net/versions.html
+	fabric_loader_version=0.18.1
+	minecraft_dependency=>=1.21.11 <1.22
+
+# Build Information
+	# The target mc versions for the mod during mod publishing, separated with \n
+	game_versions=1.21.11
+
+# Dependencies
+	# fabric_api_version=0.139.4+1.21.11
diff --git a/versions/1.21.11-neoforge/gradle.properties b/versions/1.21.11-neoforge/gradle.properties
@@ -0,0 +1,15 @@
+# Fabric Properties
+	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21.11
+	minecraft_version=1.21.11
+	# https://maven.parchmentmc.org/org/parchmentmc/data/
+	parchment_version=
+	loom.platform=neoforge
+
+# Mod Metadata
+	# https://projects.neoforged.net/neoforged/neoforge
+	neoforge_version=21.11.0-beta
+	minecraft_dependency=[1.21.11, )
+
+# Build Information
+	# The target mc versions for the mod during mod publishing, separated with \n
+	game_versions=1.21.11
diff --git a/versions/1.21.3-fabric/gradle.properties b/versions/1.21.3-fabric/gradle.properties
@@ -1,11 +1,13 @@
 # Fabric Properties
 	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21.3
 	minecraft_version=1.21.3
+	# https://maven.parchmentmc.org/org/parchmentmc/data/
+	parchment_version=2024.12.07
 	loom.platform=fabric
 
 # Mod Metadata
 	# https://fabricmc.net/versions.html
-	fabric_loader_version=0.17.3
+	fabric_loader_version=0.18.1
 	minecraft_dependency=>=1.21.2 <=1.21.3
 
 # Build Information
diff --git a/versions/1.21.3-forge/gradle.properties b/versions/1.21.3-forge/gradle.properties
@@ -1,6 +1,8 @@
 # Fabric Properties
 	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21.3
 	minecraft_version=1.21.3
+	# https://maven.parchmentmc.org/org/parchmentmc/data/
+	parchment_version=2024.12.07
 	loom.platform=forge
 
 # Mod Metadata
diff --git a/versions/1.21.3-neoforge/gradle.properties b/versions/1.21.3-neoforge/gradle.properties
@@ -1,6 +1,8 @@
 # Fabric Properties
 	# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21.3
 	minecraft_version=1.21.3
+	# https://maven.parchmentmc.org/org/parchmentmc/data/
+	parchment_version=2024.12.07
 	loom.platform=neoforge
 
 # Mod Metadata
diff --git a/versions/1.21.4-fabric/gradle.properties b/versions/1.21.4-fabric/gradle.properties
diff --git a/versions/1.21.4-forge/gradle.properties b/versions/1.21.4-forge/gradle.properties
diff --git a/versions/1.21.4-neoforge/gradle.properties b/versions/1.21.4-neoforge/gradle.properties
diff --git a/versions/1.21.5-fabric/gradle.properties b/versions/1.21.5-fabric/gradle.properties
diff --git a/versions/1.21.5-forge/gradle.properties b/versions/1.21.5-forge/gradle.properties
diff --git a/versions/1.21.5-neoforge/gradle.properties b/versions/1.21.5-neoforge/gradle.properties
diff --git a/versions/1.21.8-fabric/gradle.properties b/versions/1.21.8-fabric/gradle.properties
diff --git a/versions/1.21.8-forge/gradle.properties b/versions/1.21.8-forge/gradle.properties
diff --git a/versions/1.21.8-neoforge/gradle.properties b/versions/1.21.8-neoforge/gradle.properties
