1.21.1-rc1 stuff (#3919)

FabricMC · Aug 7, 2024 · f739b51 · f739b51
1 parent 05ea369
commit f739b51
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 1 deletion.
diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping
@@ -265,6 +265,11 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 	METHOD method_59894 tryParseCustomName (Ljava/lang/String;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2561;
 		ARG 0 json
 		ARG 1 registryLookup
+	METHOD method_61175 validateSupports (Lnet/minecraft/class_2680;)V
+		ARG 1 state
+	METHOD method_61176 supports (Lnet/minecraft/class_2680;)Z
+		ARG 1 state
+	METHOD method_61177 getNameForReport ()Ljava/lang/String;
 	CLASS class_9472 Components
 		FIELD field_50176 CODEC Lcom/mojang/serialization/Codec;
 	CLASS class_9473 ComponentsAccess

diff --git a/mappings/net/minecraft/command/EntitySelectorReader.mapping b/mappings/net/minecraft/command/EntitySelectorReader.mapping
@@ -65,6 +65,8 @@ CLASS net/minecraft/class_2303 net/minecraft/command/EntitySelectorReader
 		ARG 1 builder
 		ARG 2 consumer
 	METHOD method_35818 getSorter ()Ljava/util/function/BiConsumer;
+	METHOD method_61185 shouldAllowAtSelectors (Ljava/lang/Object;)Z
+		ARG 0 source
 	METHOD method_9833 setExcludesTeam (Z)V
 		ARG 1 excludesTeam
 	METHOD method_9834 suggestSelectorRest (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture;

diff --git a/mappings/net/minecraft/command/argument/EntityArgumentType.mapping b/mappings/net/minecraft/command/argument/EntityArgumentType.mapping
@@ -38,8 +38,14 @@ CLASS net/minecraft/class_2186 net/minecraft/command/argument/EntityArgumentType
 	METHOD method_9317 getEntities (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/util/Collection;
 		ARG 0 context
 		ARG 1 name
+	METHOD method_9318 parse (Lcom/mojang/brigadier/StringReader;Z)Lnet/minecraft/class_2300;
+		ARG 1 reader
+		ARG 2 allowAtSelectors
 	METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object;
 		ARG 1 reader
+	METHOD parse (Lcom/mojang/brigadier/StringReader;Ljava/lang/Object;)Ljava/lang/Object;
+		ARG 1 reader
+		ARG 2 source
 	CLASS class_2187 Serializer
 		FIELD field_37850 SINGLE_FLAG B
 		FIELD field_37851 PLAYERS_ONLY_FLAG B

diff --git a/mappings/net/minecraft/command/argument/GameProfileArgumentType.mapping b/mappings/net/minecraft/command/argument/GameProfileArgumentType.mapping
@@ -10,10 +10,16 @@ CLASS net/minecraft/class_2191 net/minecraft/command/argument/GameProfileArgumen
 	METHOD method_9330 getProfileArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/util/Collection;
 		ARG 0 context
 		ARG 1 name
+	METHOD method_9331 parse (Lcom/mojang/brigadier/StringReader;Z)Lnet/minecraft/class_2191$class_2192;
+		ARG 0 reader
+		ARG 1 allowAtSelectors
 	METHOD method_9332 (Lnet/minecraft/class_2172;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)V
 		ARG 1 builder
 	METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object;
 		ARG 1 reader
+	METHOD parse (Lcom/mojang/brigadier/StringReader;Ljava/lang/Object;)Ljava/lang/Object;
+		ARG 1 reader
+		ARG 2 source
 	CLASS class_2192 GameProfileArgument
 		METHOD getNames (Lnet/minecraft/class_2168;)Ljava/util/Collection;
 			ARG 1 source

diff --git a/mappings/net/minecraft/command/argument/MessageArgumentType.mapping b/mappings/net/minecraft/command/argument/MessageArgumentType.mapping
@@ -27,6 +27,9 @@ CLASS net/minecraft/class_2196 net/minecraft/command/argument/MessageArgumentTyp
 	METHOD method_9340 message ()Lnet/minecraft/class_2196;
 	METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object;
 		ARG 1 reader
+	METHOD parse (Lcom/mojang/brigadier/StringReader;Ljava/lang/Object;)Ljava/lang/Object;
+		ARG 1 reader
+		ARG 2 source
 	CLASS class_2197 MessageFormat
 		FIELD comp_2653 contents Ljava/lang/String;
 		FIELD comp_2654 selectors [Lnet/minecraft/class_2196$class_2198;
@@ -42,7 +45,7 @@ CLASS net/minecraft/class_2196 net/minecraft/command/argument/MessageArgumentTyp
 			ARG 2 canUseSelectors
 		METHOD method_9342 parse (Lcom/mojang/brigadier/StringReader;Z)Lnet/minecraft/class_2196$class_2197;
 			ARG 0 reader
-			ARG 1 canUseSelectors
+			ARG 1 allowAtSelectors
 	CLASS class_2198 MessageSelector
 		METHOD <init> (IILnet/minecraft/class_2300;)V
 			ARG 1 start

diff --git a/mappings/net/minecraft/command/argument/ScoreHolderArgumentType.mapping b/mappings/net/minecraft/command/argument/ScoreHolderArgumentType.mapping
@@ -25,6 +25,9 @@ CLASS net/minecraft/class_2233 net/minecraft/command/argument/ScoreHolderArgumen
 	METHOD method_9452 getScoreHolder (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_9015;
 		ARG 0 context
 		ARG 1 name
+	METHOD method_9453 parse (Lcom/mojang/brigadier/StringReader;Z)Lnet/minecraft/class_2233$class_2234;
+		ARG 1 reader
+		ARG 2 allowAtSelectors
 	METHOD method_9455 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 		ARG 0 context
 		ARG 1 builder
@@ -39,6 +42,9 @@ CLASS net/minecraft/class_2233 net/minecraft/command/argument/ScoreHolderArgumen
 		ARG 1 name
 	METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object;
 		ARG 1 reader
+	METHOD parse (Lcom/mojang/brigadier/StringReader;Ljava/lang/Object;)Ljava/lang/Object;
+		ARG 1 reader
+		ARG 2 source
 	CLASS class_2234 ScoreHolders
 		METHOD getNames (Lnet/minecraft/class_2168;Ljava/util/function/Supplier;)Ljava/util/Collection;
 			ARG 1 source