25w04a more stuff (#4100)

FabricMC · Jan 25, 2025 · 7319e9c · 7319e9c
1 parent 3bc66c7
commit 7319e9c
Show file tree

Hide file tree

Showing 16 changed files with 55 additions and 2 deletions.
diff --git a/mappings/net/minecraft/block/entity/TestInstanceBlockEntity.mapping b/mappings/net/minecraft/block/entity/TestInstanceBlockEntity.mapping
@@ -78,6 +78,8 @@ CLASS net/minecraft/class_10638 net/minecraft/block/entity/TestInstanceBlockEnti
 	METHOD method_66769 setFinished ()V
 	METHOD method_66770 setRunning ()V
 	METHOD method_66772 getStructurePos ()Lnet/minecraft/class_2338;
+	METHOD method_67243 (Lnet/minecraft/class_1297;)Z
+		ARG 0 entity
 	CLASS class_10639 Data
 		FIELD field_56012 CODEC Lcom/mojang/serialization/Codec;
 		FIELD field_56013 PACKET_CODEC Lnet/minecraft/class_9139;

diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping
@@ -113,5 +113,9 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity
 	METHOD method_65949 shouldStopSprinting ()Z
 	METHOD method_67270 applyMovementSpeedFactors (Lnet/minecraft/class_241;)Lnet/minecraft/class_241;
 		ARG 1 input
+	METHOD method_67271 applyDirectionalMovementSpeedFactors (Lnet/minecraft/class_241;)Lnet/minecraft/class_241;
+		ARG 0 vec
+	METHOD method_67272 getDirectionalMovementSpeedMultiplier (Lnet/minecraft/class_241;)F
+		ARG 0 vec
 	METHOD method_7290 dropSelectedItem (Z)Z
 		ARG 1 entireStack
diff --git a/mappings/net/minecraft/command/argument/ItemStringReader.mapping b/mappings/net/minecraft/command/argument/ItemStringReader.mapping
@@ -57,6 +57,8 @@ CLASS net/minecraft/class_2291 net/minecraft/command/argument/ItemStringReader
 		METHOD method_57808 suggestBracket (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 			ARG 1 builder
 		METHOD method_57811 readComponentValue (Lnet/minecraft/class_6903;Lnet/minecraft/class_9331;)V
+			ARG 1 ops
+			ARG 2 type
 		METHOD method_57812 suggestEndOfComponent (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 			ARG 1 builder
 		METHOD method_57813 suggestEqual (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;

diff --git a/mappings/net/minecraft/command/argument/RegistryEntryArgumentType.mapping b/mappings/net/minecraft/command/argument/RegistryEntryArgumentType.mapping
@@ -19,6 +19,8 @@ CLASS net/minecraft/class_9433 net/minecraft/command/argument/RegistryEntryArgum
 	METHOD method_58483 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 argument
 	METHOD method_58484 parseAsNbt (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/brigadier/StringReader;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 ops
+		ARG 1 reader
 	METHOD method_58485 getLootFunction (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880;
 		ARG 0 context
 		ARG 1 argument

diff --git a/mappings/net/minecraft/component/type/ChargedProjectilesComponent.mapping b/mappings/net/minecraft/component/type/ChargedProjectilesComponent.mapping
@@ -12,6 +12,8 @@ CLASS net/minecraft/class_9278 net/minecraft/component/type/ChargedProjectilesCo
 		ARG 1 item
 	METHOD method_57439 of (Lnet/minecraft/class_1799;)Lnet/minecraft/class_9278;
 		ARG 0 projectile
+	METHOD method_57440 (Lnet/minecraft/class_9278;)Ljava/util/List;
+		ARG 0 component
 	METHOD method_57441 of (Ljava/util/List;)Lnet/minecraft/class_9278;
 		ARG 0 projectiles
 	METHOD method_57442 isEmpty ()Z

diff --git a/mappings/net/minecraft/datafixer/fix/ChoiceFix.mapping b/mappings/net/minecraft/datafixer/fix/ChoiceFix.mapping
@@ -2,5 +2,11 @@ CLASS net/minecraft/class_1197 net/minecraft/datafixer/fix/ChoiceFix
 	FIELD field_5703 name Ljava/lang/String;
 	FIELD field_5704 type Lcom/mojang/datafixers/DSL$TypeReference;
 	FIELD field_5705 choiceName Ljava/lang/String;
+	METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;ZLjava/lang/String;Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;)V
+		ARG 1 outputSchema
+		ARG 2 changesType
+		ARG 3 name
+		ARG 4 type
+		ARG 5 choiceName
 	METHOD method_5105 transform (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;
 		ARG 1 inputTyped
diff --git a/mappings/net/minecraft/datafixer/fix/TypeChangeFix.mapping b/mappings/net/minecraft/datafixer/fix/TypeChangeFix.mapping
@@ -0,0 +1,6 @@
+CLASS net/minecraft/class_10679 net/minecraft/datafixer/fix/TypeChangeFix
+	METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;)V
+		ARG 1 outputSchema
+		ARG 2 name
+		ARG 3 type
+		ARG 4 choiceName
diff --git a/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping b/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping
@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_1686 net/minecraft/entity/projectile/thrown/PotionEntity
-	FIELD field_30668 waterPotionExplosionRadiusSquared D
+	FIELD field_30668 WATER_POTION_EXPLOSION_SQUARED_RADIUS D
 	FIELD field_40737 AFFECTED_BY_WATER Ljava/util/function/Predicate;
 	METHOD <init> (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;DDDLnet/minecraft/class_1799;)V
 		ARG 1 type

diff --git a/mappings/net/minecraft/item/BlockPredicatesChecker.mapping b/mappings/net/minecraft/item/BlockPredicatesChecker.mapping
@@ -34,8 +34,12 @@ CLASS net/minecraft/class_6538 net/minecraft/item/BlockPredicatesChecker
 		ARG 0 predicate
 	METHOD method_57327 (Lnet/minecraft/class_6538;)Ljava/util/List;
 		ARG 0 blockPredicatesChecker
+	METHOD method_57328 (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2561;
+		ARG 0 block
 	METHOD method_57329 createTooltipText (Ljava/util/List;)Ljava/util/List;
 		ARG 0 blockPredicates
 	METHOD method_57330 addTooltips (Ljava/util/function/Consumer;)V
 		ARG 1 adder
 	METHOD method_65042 getOrCreateTooltipText ()Ljava/util/List;
+	METHOD method_67185 (Lnet/minecraft/class_6538;)Ljava/util/List;
+		ARG 0 checker
diff --git a/mappings/net/minecraft/item/CrossbowItem.mapping b/mappings/net/minecraft/item/CrossbowItem.mapping
@@ -23,6 +23,8 @@ CLASS net/minecraft/class_1764 net/minecraft/item/CrossbowItem
 		ARG 2 sound
 	METHOD method_59976 getLoadingSounds (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1764$class_9693;
 		ARG 1 stack
+	METHOD method_67186 (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;Lnet/minecraft/class_6880;)V
+		ARG 2 sound
 	METHOD method_7767 loadProjectiles (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;)Z
 		ARG 0 shooter
 		ARG 1 crossbow

diff --git a/mappings/net/minecraft/item/equipment/trim/ArmorTrimMaterial.mapping b/mappings/net/minecraft/item/equipment/trim/ArmorTrimMaterial.mapping
@@ -3,3 +3,5 @@ CLASS net/minecraft/class_8054 net/minecraft/item/equipment/trim/ArmorTrimMateri
 	FIELD field_42003 ENTRY_CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_49280 PACKET_CODEC Lnet/minecraft/class_9139;
 	FIELD field_49281 ENTRY_PACKET_CODEC Lnet/minecraft/class_9139;
+	METHOD method_67231 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 0 instance
diff --git a/mappings/net/minecraft/item/equipment/trim/ArmorTrimMaterials.mapping b/mappings/net/minecraft/item/equipment/trim/ArmorTrimMaterials.mapping
@@ -9,3 +9,5 @@ CLASS net/minecraft/class_8055 net/minecraft/item/equipment/trim/ArmorTrimMateri
 	METHOD method_48443 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Lnet/minecraft/class_2583;Lnet/minecraft/class_10714;)V
 		ARG 0 registry
 		ARG 1 key
+		ARG 2 style
+		ARG 3 assets
diff --git a/mappings/net/minecraft/nbt/StringNbtReader.mapping b/mappings/net/minecraft/nbt/StringNbtReader.mapping
@@ -49,6 +49,7 @@ CLASS net/minecraft/class_2522 net/minecraft/nbt/StringNbtReader
 	METHOD method_10729 parseList ()Ljava/lang/Object;
 	METHOD method_53502 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult;
 		ARG 0 snbt
+	METHOD method_67309 parsePrimitive ()Ljava/lang/Object;
 	METHOD method_67310 readCompoundAsArgument (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2487;
 		ARG 0 reader
 	METHOD method_67311 expectCompound (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_2520;)Lnet/minecraft/class_2487;
@@ -65,13 +66,15 @@ CLASS net/minecraft/class_2522 net/minecraft/nbt/StringNbtReader
 		ARG 1 arrayType
 	METHOD method_67315 readCompound (Ljava/lang/String;)Lnet/minecraft/class_2487;
 		ARG 0 snbt
+	METHOD method_67316 (Ljava/util/Map$Entry;)Lcom/mojang/datafixers/util/Pair;
+		ARG 1 entry
 	METHOD method_67318 readNumber ()Ljava/lang/Number;
 	METHOD method_67319 readAsArgument (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object;
 		ARG 0 ops
 		ARG 1 reader
 	METHOD method_67320 parseNumber (Ljava/lang/String;)Ljava/lang/Number;
 		ARG 0 string
-	METHOD method_67321 parse (Ljava/lang/String;)Ljava/lang/Object;
+	METHOD method_67321 parseUnquoted (Ljava/lang/String;)Ljava/lang/Object;
 		ARG 1 string
 	METHOD method_67322 parseByteArray ()Ljava/nio/ByteBuffer;
 	METHOD method_67323 parseIntArray ()Ljava/util/stream/IntStream;

diff --git a/mappings/net/minecraft/predicate/item/ItemSubPredicate.mapping b/mappings/net/minecraft/predicate/item/ItemSubPredicate.mapping
@@ -2,4 +2,17 @@ CLASS net/minecraft/class_9360 net/minecraft/predicate/item/ItemSubPredicate
 	FIELD field_49805 PREDICATES_MAP_CODEC Lcom/mojang/serialization/Codec;
 	METHOD method_58161 test (Lnet/minecraft/class_9473;)Z
 		ARG 1 components
+	METHOD method_67301 createCodec (Ljava/lang/String;)Lcom/mojang/serialization/MapCodec;
+		ARG 0 predicateFieldName
+	CLASS class_10727 TypedSubPredicate
 	CLASS class_8745 Type
+		FIELD field_56401 predicateCodec Lcom/mojang/serialization/Codec;
+		FIELD field_56402 typedCodec Lcom/mojang/serialization/MapCodec;
+		METHOD <init> (Lcom/mojang/serialization/Codec;)V
+			ARG 1 predicateCodec
+		METHOD method_67302 getPredicateCodec ()Lcom/mojang/serialization/Codec;
+		METHOD method_67303 (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+			ARG 2 instance
+		METHOD method_67304 (Lnet/minecraft/class_9360;)Lnet/minecraft/class_9360$class_10727;
+			ARG 1 predicate
+		METHOD method_67305 getTypedCodec ()Lcom/mojang/serialization/MapCodec;
diff --git a/mappings/net/minecraft/world/gen/treedecorator/PlaceOnGroundTreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/PlaceOnGroundTreeDecorator.mapping
@@ -16,6 +16,8 @@ CLASS net/minecraft/class_10600 net/minecraft/world/gen/treedecorator/PlaceOnGro
 	METHOD method_66485 generate (Lnet/minecraft/class_4662$class_7402;Lnet/minecraft/class_2338;)V
 		ARG 1 generator
 		ARG 2 pos
+	METHOD method_66486 (Lnet/minecraft/class_2680;)Z
+		ARG 0 state
 	METHOD method_66487 (Lnet/minecraft/class_10600;)Ljava/lang/Integer;
 		ARG 0 treeDecorator
 	METHOD method_66488 (Lnet/minecraft/class_10600;)Ljava/lang/Integer;

diff --git a/mappings/net/minecraft/world/spawner/CatSpawner.mapping b/mappings/net/minecraft/world/spawner/CatSpawner.mapping
@@ -17,6 +17,7 @@ CLASS net/minecraft/class_4274 net/minecraft/world/spawner/CatSpawner
 		COMMENT @return the number of cats spawned
 		ARG 1 pos
 		ARG 2 world
+		ARG 3 persistent
 	METHOD method_20263 spawnInHouse (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V
 		COMMENT Tries to spawn cats in villages.
 		COMMENT