✅ 支持Minecraft 1.20.2、1.20.3

Minecraft-AMS · Oct 25, 2024 · eb8f5e8 · eb8f5e8
1 parent e349c87
commit eb8f5e8
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 22 deletions.
diff --git a/.github/workflows/matrix_includes.json b/.github/workflows/matrix_includes.json
@@ -40,5 +40,8 @@
   },
   {
     "subproject_dir": "1.21.2"
+  },
+  {
+    "subproject_dir": "1.21.3"
   }
 ]
diff --git a/README.md b/README.md
@@ -13,26 +13,27 @@ https://minecraft-ams.github.io/carpetamsaddition/
 
 ## 版本支持
 
-|       游戏版本        | 开发状态 |                         最后支持版本                         |
-| :-------------------: | :------: | :----------------------------------------------------------: |
-|        24w38a         |    ✔     |                             ---                              |
-|        1.21.1         |    ✔     |                             ---                              |
-|         1.21          |    ✔     |                             ---                              |
-|        1.20.6         |    ✔     |                             ---                              |
-|        1.20.5         |    ✔     |                             ---                              |
-|        1.20.4         |    ✔     |                             ---                              |
-|        1.20.3         |    ✔     |                             ---                              |
-|        1.20.2         |    ✔     |                             ---                              |
-|        1.20.1         |    ✔     |                             ---                              |
-|         1.20          |    ✔     |                             ---                              |
-|        1.19.4         |    ✔     |                             ---                              |
-|        1.19.3         |    ✖     | [Carpet-AMS-Addition-mc1.19.3-v1.5.3](https://github.com/Minecraft-AMS/Carpet-AMS-Addition/releases/tag/v1.11.2%26v1.5.3) |
-|        1.19.2         |    ✖     | [Carpet-AMS-Addition-mc1.19.2-v1.5.3](https://github.com/Minecraft-AMS/Carpet-AMS-Addition/releases/tag/v1.11.2%26v1.5.3) |
+|         游戏版本         | 开发状态 |                         最后支持版本                         |
+|:--------------------:| :------: | :----------------------------------------------------------: |
+|        1.21.3        |    ✔     |                             ---                              |
+|        1.21.2        |    ✔     |                             ---                              |
+|        1.21.1        |    ✔     |                             ---                              |
+|         1.21         |    ✔     |                             ---                              |
+|        1.20.6        |    ✔     |                             ---                              |
+|        1.20.5        |    ✔     |                             ---                              |
+|        1.20.4        |    ✔     |                             ---                              |
+|        1.20.3        |    ✔     |                             ---                              |
+|        1.20.2        |    ✔     |                             ---                              |
+|        1.20.1        |    ✔     |                             ---                              |
+|         1.20         |    ✔     |                             ---                              |
+|        1.19.4        |    ✔     |                             ---                              |
+|        1.19.3        |    ✖     | [Carpet-AMS-Addition-mc1.19.3-v1.5.3](https://github.com/Minecraft-AMS/Carpet-AMS-Addition/releases/tag/v1.11.2%26v1.5.3) |
+|        1.19.2        |    ✖     | [Carpet-AMS-Addition-mc1.19.2-v1.5.3](https://github.com/Minecraft-AMS/Carpet-AMS-Addition/releases/tag/v1.11.2%26v1.5.3) |
 | **<u>1.18.2(主)</u>** |    ✔     |                             ---                              |
-|        1.17.1         |    ✔     |                             ---                              |
-|        1.16.5         |    ✔     |                             ---                              |
-|        1.15.2         |    ❓     | [ Carpet-AMS-Addition-Legacy](https://github.com/1024-byteeeee/Carpet-AMS-Addition-Legacy) |
-|        1.14.4         |    ❓     | [ Carpet-AMS-Addition-Legacy](https://github.com/1024-byteeeee/Carpet-AMS-Addition-Legacy) |
+|        1.17.1        |    ✔     |                             ---                              |
+|        1.16.5        |    ✔     |                             ---                              |
+|        1.15.2        |    ❓     | [ Carpet-AMS-Addition-Legacy](https://github.com/1024-byteeeee/Carpet-AMS-Addition-Legacy) |
+|        1.14.4        |    ❓     | [ Carpet-AMS-Addition-Legacy](https://github.com/1024-byteeeee/Carpet-AMS-Addition-Legacy) |
 
 ## 许可
 此项目在 [ LGPL-v3.0 ](https://choosealicense.com/licenses/lgpl-3.0/) 许可证下可用,您可以随意从中学习并将其纳入您自己的项目中。

diff --git a/README_en.md b/README_en.md
@@ -14,8 +14,9 @@ https://minecraft-ams.github.io/carpetamsaddition/
 ## Support Version
 
 |       Game Version        | Development Status |                    Last Supported Version                    |
-| :-----------------------: | :----------------: | :----------------------------------------------------------: |
-|          24w38a           |         ✔          |                             ---                              |
+|:-------------------------:| :----------------: | :----------------------------------------------------------: |
+|          1.21.3           |         ✔          |                             ---                              |
+|          1.21.2           |         ✔          |                             ---                              |
 |          1.21.1           |         ✔          |                             ---                              |
 |           1.21            |         ✔          |                             ---                              |
 |          1.20.6           |         ✔          |                             ---                              |

diff --git a/build.gradle b/build.gradle
@@ -20,6 +20,7 @@ preprocess {
 	def mc121 = createNode('1.21', 1_21_00, 'yarn')
 	def mc1211 = createNode('1.21.1', 1_21_01, 'yarn')
 	def mc1212 = createNode('1.21.2', 1_21_02, 'yarn')
+	def mc1213 = createNode('1.21.3', 1_21_03, 'yarn')
 
 	mc117.link(mc116, file('versions/mapping-1.17-1.16.txt'))
 	mc118.link(mc117, file('versions/mapping-1.18-1.17.txt'))
@@ -34,6 +35,7 @@ preprocess {
 	mc1206.link(mc121, file('versions/mapping-1.20.6-1.21.txt'))
 	mc121.link(mc1211, file('versions/mapping-1.21-1.21.1.txt'))
 	mc1211.link(mc1212, file('versions/mapping-1.21.1-1.21.2.txt'))
+	mc1212.link(mc1213, file('versions/mapping-1.21.2-1.21.3.txt'))
 }
 
 tasks.register('buildAndGather') {

diff --git a/minecraftVersions.json b/minecraftVersions.json
@@ -13,6 +13,7 @@
     "1.20.6",
     "1.21",
     "1.21.1",
-    "1.21.2"
+    "1.21.2",
+    "1.21.3"
   ]
 }
diff --git a/versions/1.21.3/carpetamsaddition.accesswidener b/versions/1.21.3/carpetamsaddition.accesswidener
@@ -0,0 +1,2 @@
+accessWidener	v1	named
+accessible method net/minecraft/recipe/ServerRecipeManager deserialize (Lnet/minecraft/registry/RegistryKey;Lcom/google/gson/JsonObject;Lnet/minecraft/registry/RegistryWrapper$WrapperLookup;)Lnet/minecraft/recipe/RecipeEntry;
diff --git a/versions/1.21.3/gradle.properties b/versions/1.21.3/gradle.properties
@@ -0,0 +1,16 @@
+# Fabric Properties
+# check these on https://www.fabricmc.net/develop/
+minecraft_version = 1.21.3
+yarn_mappings = 1.21.3+build.2
+
+# Fabric Mod Metadata
+carpet_dependency = >=1.4.158
+minecraft_dependency = >=1.21.3
+
+# Build Infomation
+game_versions = 1.21.3
+
+# Mod Dependency
+# check available versions on maven for the given minecraft version you are using
+# https://masa.dy.fi/maven/carpet/fabric-carpet/
+carpet_core_version = 1.21.2-1.4.158+v241022
diff --git a/versions/mapping-1.21.2-1.21.3.txt b/versions/mapping-1.21.2-1.21.3.txt
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,5 +40,8 @@ @@
       },
       {
         "subproject_dir": "1.21.2"
+      },
+      {
+        "subproject_dir": "1.21.3"
       }
     ]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		accessWidener v1 named
		accessible method net/minecraft/recipe/ServerRecipeManager deserialize (Lnet/minecraft/registry/RegistryKey;Lcom/google/gson/JsonObject;Lnet/minecraft/registry/RegistryWrapper$WrapperLookup;)Lnet/minecraft/recipe/RecipeEntry;