24w40a a bit more (#4007)

* 24w40a a little more * more
FabricMC · Oct 2, 2024 · a897ce1 · a897ce1
1 parent e5b3afa
commit a897ce1
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 1 deletion.
diff --git a/mappings/net/minecraft/item/AnimalArmorItem.mapping b/mappings/net/minecraft/item/AnimalArmorItem.mapping
@@ -8,6 +8,8 @@ CLASS net/minecraft/class_4059 net/minecraft/item/AnimalArmorItem
 		ARG 1 material
 		ARG 2 type
 		ARG 3 equipSound
+		ARG 4 damageOnHurt
+		ARG 5 settings
 	CLASS class_9076 Type
 		FIELD field_49256 breakSound Lnet/minecraft/class_3414;
 		FIELD field_54108 allowedEntities Lnet/minecraft/class_6885;

diff --git a/mappings/net/minecraft/item/BundleItem.mapping b/mappings/net/minecraft/item/BundleItem.mapping
@@ -21,6 +21,8 @@ CLASS net/minecraft/class_5537 net/minecraft/item/BundleItem
 	METHOD method_38076 playInsertSound (Lnet/minecraft/class_1297;)V
 		ARG 0 entity
 	METHOD method_38077 playDropContentsSound (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;)V
+		ARG 0 world
+		ARG 1 entity
 	METHOD method_61637 setSelectedStackIndex (Lnet/minecraft/class_1799;I)V
 		ARG 0 stack
 		ARG 1 selectedStackIndex
@@ -35,6 +37,9 @@ CLASS net/minecraft/class_5537 net/minecraft/item/BundleItem
 	METHOD method_61645 getNumberOfStacksShown (Lnet/minecraft/class_1799;)I
 		ARG 0 stack
 	METHOD method_63675 dropContentsOnUse (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V
+		ARG 1 world
+		ARG 2 player
+		ARG 3 stack
 	METHOD method_63676 popFirstBundledStack (Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;Lnet/minecraft/class_9276;)Ljava/util/Optional;
 		ARG 0 stack
 		ARG 1 player

diff --git a/mappings/net/minecraft/item/equipment/ArmorMaterial.mapping b/mappings/net/minecraft/item/equipment/ArmorMaterial.mapping
@@ -14,3 +14,5 @@ CLASS net/minecraft/class_1741 net/minecraft/item/equipment/ArmorMaterial
 	METHOD method_64503 applyBodyArmorSettings (Lnet/minecraft/class_1792$class_1793;Lnet/minecraft/class_3414;ZLnet/minecraft/class_6885;)Lnet/minecraft/class_1792$class_1793;
 		ARG 1 settings
 		ARG 2 equipSound
+		ARG 3 damageOnHurt
+		ARG 4 allowedEntities
diff --git a/mappings/net/minecraft/network/codec/PacketCodecs.mapping b/mappings/net/minecraft/network/codec/PacketCodecs.mapping
@@ -108,6 +108,7 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs
 		COMMENT
 		COMMENT @see io.netty.buffer.ByteBuf#readLong
 		COMMENT @see io.netty.buffer.ByteBuf#writeLong
+	FIELD field_54890 OPTIONAL_INT Lnet/minecraft/class_9139;
 	METHOD method_56363 toList ()Lnet/minecraft/class_9139$class_9140;
 		COMMENT Used to make a codec for a list of values using {@link PacketCodec#collect}.
 		COMMENT This creates an {@link java.util.ArrayList}, so the decoded result can be modified.

diff --git a/mappings/net/minecraft/registry/tag/TagEntry.mapping b/mappings/net/minecraft/registry/tag/TagEntry.mapping
@@ -45,5 +45,6 @@ CLASS net/minecraft/class_3497 net/minecraft/registry/tag/TagEntry
 	CLASS class_7474 ValueGetter
 		METHOD method_43948 direct (Lnet/minecraft/class_2960;Z)Ljava/lang/Object;
 			ARG 1 id
+			ARG 2 required
 		METHOD method_43949 tag (Lnet/minecraft/class_2960;)Ljava/util/Collection;
 			ARG 1 id
diff --git a/mappings/net/minecraft/structure/pool/StructurePools.mapping b/mappings/net/minecraft/structure/pool/StructurePools.mapping
@@ -10,3 +10,5 @@ CLASS net/minecraft/class_5468 net/minecraft/structure/pool/StructurePools
 		ARG 0 id
 	METHOD method_60923 of (Ljava/lang/String;)Lnet/minecraft/class_5321;
 		ARG 0 id
+	METHOD method_64955 of (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321;
+		ARG 0 id
diff --git a/mappings/net/minecraft/util/Colors.mapping b/mappings/net/minecraft/util/Colors.mapping
@@ -25,3 +25,5 @@ CLASS net/minecraft/class_8012 net/minecraft/util/Colors
 		COMMENT Represents the color blue, {@code 0xFF0000FF}.
 	FIELD field_52393 PURPLE I
 		COMMENT Represents the color purple, {@code 0xFF500050}.
+	FIELD field_54557 CYAN I
+		COMMENT Represents the color cyan, {@code 0xFF57FFE1}.
diff --git a/...raft/world/biome/WinterDropBiomes.mapping → ...rld/biome/WinterDropBuiltinBiomes.mapping b/...raft/world/biome/WinterDropBiomes.mapping → ...rld/biome/WinterDropBuiltinBiomes.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_10351 net/minecraft/world/biome/WinterDropBiomes
+CLASS net/minecraft/class_10351 net/minecraft/world/biome/WinterDropBuiltinBiomes
 	METHOD method_64956 keyOf (Ljava/lang/String;)Lnet/minecraft/class_5321;
 		ARG 0 id
 	METHOD method_64957 bootstrap (Lnet/minecraft/class_7891;)V

diff --git a/unpick-definitions/colors.unpick b/unpick-definitions/colors.unpick
@@ -12,6 +12,7 @@ constant argb_color net/minecraft/util/Colors LIGHT_RED
 constant argb_color net/minecraft/util/Colors YELLOW
 constant argb_color net/minecraft/util/Colors LIGHT_YELLOW
 constant argb_color net/minecraft/util/Colors PURPLE
+constant argb_color net/minecraft/util/Colors CYAN
 
 target_method net/minecraft/util/math/ColorHelper getAlpha (I)I
 	param 0 argb_color