From 1fecf26f1bbce458d948d80cc49fe0f0f7ce1135 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Thu, 29 Feb 2024 15:21:44 +0900 Subject: [PATCH] Map components --- .../net/minecraft/component/Component.mapping | 4 ++ .../minecraft/component/ComponentMap.mapping | 2 +- .../component/DataComponentType.mapping | 2 +- .../component/ItemComponentMap.mapping | 13 ----- .../type/AttributeModifiersComponent.mapping | 6 +++ .../type/BannerPatternsComponent.mapping | 2 + .../type/BundleContentsComponent.mapping | 43 +++++++++++++++ .../type/ChargedProjectilesComponent.mapping | 2 + .../component/type/ContainerComponent.mapping | 25 +++++++++ .../type/ContainerLootComponent.mapping | 2 + .../type/DebugStickStateComponent.mapping | 7 +++ .../component/type/DyedColorComponent.mapping | 6 ++- .../type/FireworkExplosionComponent.mapping | 2 + .../component/type/FireworksComponent.mapping | 5 ++ .../type/ItemEnchantmentsComponent.mapping | 15 ++++++ .../type/LodestoneTargetComponent.mapping | 2 + .../component/type/LoreComponent.mapping | 1 + .../type/MapDecorationsComponent.mapping | 3 ++ .../component/type/NbtComponent.mapping | 21 ++++++-- .../type/PotionContentsComponent.mapping | 5 +- .../component/type/ProfileComponent.mapping | 2 + .../type/UnbreakableComponent.mapping | 2 + .../type/WritableBookContentComponent.mapping | 9 ++++ .../type/WrittenBookContentComponent.mapping | 26 +++++++++ .../network/ServerPlayNetworkHandler.mapping | 2 +- .../net/minecraft/text/TextCodecs.mapping | 16 ++++++ .../net/minecraft/util/StringHelper.mapping | 20 +++++++ .../net/minecraft/util/dynamic/Codecs.mapping | 54 +++++++++++++++++++ 28 files changed, 277 insertions(+), 22 deletions(-) delete mode 100644 mappings/net/minecraft/component/ItemComponentMap.mapping diff --git a/mappings/net/minecraft/component/Component.mapping b/mappings/net/minecraft/component/Component.mapping index 20a3bda9eb..1f9a683fe3 100644 --- a/mappings/net/minecraft/component/Component.mapping +++ b/mappings/net/minecraft/component/Component.mapping @@ -1,10 +1,14 @@ CLASS net/minecraft/class_9336 net/minecraft/component/Component FIELD field_49657 PACKET_CODEC Lnet/minecraft/class_9139; + METHOD method_57943 encode (Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/DataResult; + ARG 1 ops METHOD method_57944 of (Ljava/util/Map$Entry;)Lnet/minecraft/class_9336; ARG 0 entry METHOD method_57945 of (Lnet/minecraft/class_9331;Ljava/lang/Object;)Lnet/minecraft/class_9336; ARG 0 type ARG 1 value + METHOD method_57946 apply (Lnet/minecraft/class_9335;)V + ARG 1 components CLASS 1 METHOD method_57949 read (Lnet/minecraft/class_9129;Lnet/minecraft/class_9331;)Lnet/minecraft/class_9336; ARG 0 buf diff --git a/mappings/net/minecraft/component/ComponentMap.mapping b/mappings/net/minecraft/component/ComponentMap.mapping index 633b555b97..57864f102b 100644 --- a/mappings/net/minecraft/component/ComponentMap.mapping +++ b/mappings/net/minecraft/component/ComponentMap.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_9323 net/minecraft/component/ComponentMap METHOD method_57833 stream ()Ljava/util/stream/Stream; METHOD method_57834 copy (Lnet/minecraft/class_9331;)Lnet/minecraft/class_9336; ARG 1 type - METHOD method_57835 getSize ()I + METHOD method_57835 size ()I METHOD method_57836 (Lnet/minecraft/class_9331;)Lnet/minecraft/class_9336; ARG 1 type METHOD method_57837 isEmpty ()Z diff --git a/mappings/net/minecraft/component/DataComponentType.mapping b/mappings/net/minecraft/component/DataComponentType.mapping index 29a1ad35c3..5a5ff62fb1 100644 --- a/mappings/net/minecraft/component/DataComponentType.mapping +++ b/mappings/net/minecraft/component/DataComponentType.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_9331 net/minecraft/component/DataComponentType METHOD method_57873 builder ()Lnet/minecraft/class_9331$class_9332; METHOD method_57875 getCodec ()Lcom/mojang/serialization/Codec; METHOD method_57876 getCodecOrThrow ()Lcom/mojang/serialization/Codec; - METHOD method_57877 hasNoCodec ()Z + METHOD method_57877 shouldSkipSerialization ()Z METHOD method_57878 getPacketCodec ()Lnet/minecraft/class_9139; CLASS class_9332 Builder FIELD field_49602 codec Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/component/ItemComponentMap.mapping b/mappings/net/minecraft/component/ItemComponentMap.mapping deleted file mode 100644 index 889a6fc306..0000000000 --- a/mappings/net/minecraft/component/ItemComponentMap.mapping +++ /dev/null @@ -1,13 +0,0 @@ -CLASS net/minecraft/class_9335 net/minecraft/component/ItemComponentMap - FIELD field_49654 baseComponents Lnet/minecraft/class_9323; - FIELD field_49655 extraComponents Lit/unimi/dsi/fastutil/objects/Reference2ObjectMap; - METHOD (Lnet/minecraft/class_9323;)V - ARG 1 baseComponents - METHOD (Lnet/minecraft/class_9323;Lit/unimi/dsi/fastutil/objects/Reference2ObjectMap;Z)V - ARG 1 baseComponents - ARG 2 extraComponents - METHOD method_57935 create (Lnet/minecraft/class_9323;Lnet/minecraft/class_9326;)Lnet/minecraft/class_9335; - ARG 0 baseComponents - METHOD method_57938 set (Lnet/minecraft/class_9331;Ljava/lang/Object;)Ljava/lang/Object; - ARG 1 type - ARG 2 value diff --git a/mappings/net/minecraft/component/type/AttributeModifiersComponent.mapping b/mappings/net/minecraft/component/type/AttributeModifiersComponent.mapping index 2be52424a9..b4b724e373 100644 --- a/mappings/net/minecraft/component/type/AttributeModifiersComponent.mapping +++ b/mappings/net/minecraft/component/type/AttributeModifiersComponent.mapping @@ -10,10 +10,14 @@ CLASS net/minecraft/class_9285 net/minecraft/component/type/AttributeModifiersCo METHOD method_57482 applyModifiers (Lnet/minecraft/class_1304;Ljava/util/function/BiConsumer;)V ARG 1 slot ARG 2 attributeConsumer + METHOD method_57483 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_57484 with (Lnet/minecraft/class_6880;Lnet/minecraft/class_1322;Lnet/minecraft/class_9274;)Lnet/minecraft/class_9285; ARG 1 attribute ARG 2 modifier ARG 3 slot + METHOD method_57485 (Ljava/text/DecimalFormat;)V + ARG 0 format CLASS class_9286 Builder FIELD field_49331 entries Lcom/google/common/collect/ImmutableList$Builder; METHOD method_57486 build ()Lnet/minecraft/class_9285; @@ -24,3 +28,5 @@ CLASS net/minecraft/class_9285 net/minecraft/component/type/AttributeModifiersCo CLASS class_9287 Entry FIELD field_49332 CODEC Lcom/mojang/serialization/Codec; FIELD field_49333 PACKET_CODEC Lnet/minecraft/class_9139; + METHOD method_57488 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/component/type/BannerPatternsComponent.mapping b/mappings/net/minecraft/component/type/BannerPatternsComponent.mapping index 39c6df9ba9..de8c6e07af 100644 --- a/mappings/net/minecraft/component/type/BannerPatternsComponent.mapping +++ b/mappings/net/minecraft/component/type/BannerPatternsComponent.mapping @@ -21,3 +21,5 @@ CLASS net/minecraft/class_9307 net/minecraft/component/type/BannerPatternsCompon CLASS class_9308 Layer FIELD field_49407 CODEC Lcom/mojang/serialization/Codec; FIELD field_49408 PACKET_CODEC Lnet/minecraft/class_9139; + METHOD method_57576 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/component/type/BundleContentsComponent.mapping b/mappings/net/minecraft/component/type/BundleContentsComponent.mapping index b8fcb247a7..e41a4dae50 100644 --- a/mappings/net/minecraft/component/type/BundleContentsComponent.mapping +++ b/mappings/net/minecraft/component/type/BundleContentsComponent.mapping @@ -1,4 +1,47 @@ CLASS net/minecraft/class_9276 net/minecraft/component/type/BundleContentsComponent + FIELD field_49288 MAX_SIZE I FIELD field_49289 DEFAULT Lnet/minecraft/class_9276; FIELD field_49290 CODEC Lcom/mojang/serialization/Codec; FIELD field_49291 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_49292 NESTED_BUNDLE_OCCUPANCY I + FIELD field_49293 ADD_TO_NEW_SLOT I + FIELD field_49294 stacks Ljava/util/List; + FIELD field_49295 occupancy I + METHOD (Ljava/util/List;)V + ARG 1 stacks + METHOD (Ljava/util/List;I)V + ARG 1 stacks + ARG 2 occupancy + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o + METHOD method_57421 stream ()Ljava/util/stream/Stream; + METHOD method_57422 get (I)Lnet/minecraft/class_1799; + ARG 1 index + METHOD method_57423 getOccupancy (Lnet/minecraft/class_1799;)I + ARG 0 stack + METHOD method_57424 (Lnet/minecraft/class_9276;)Ljava/util/List; + ARG 0 component + METHOD method_57425 calculateOccupancy (Ljava/util/List;)I + ARG 0 stacks + METHOD method_57426 size ()I + METHOD method_57427 (Lnet/minecraft/class_9276;)Ljava/util/List; + ARG 0 component + METHOD method_57428 getOccupancy ()I + METHOD method_57429 isEmpty ()Z + CLASS class_9277 Builder + FIELD field_49296 stacks Ljava/util/List; + FIELD field_49297 occupancy I + METHOD (Lnet/minecraft/class_9276;)V + ARG 1 base + METHOD method_57430 removeFirst ()Lnet/minecraft/class_1799; + METHOD method_57431 add (Lnet/minecraft/class_1735;Lnet/minecraft/class_1657;)I + ARG 1 slot + ARG 2 player + METHOD method_57432 add (Lnet/minecraft/class_1799;)I + ARG 1 stack + METHOD method_57433 getOccupancy ()I + METHOD method_57434 addInternal (Lnet/minecraft/class_1799;)I + ARG 1 stack + METHOD method_57435 build ()Lnet/minecraft/class_9276; + METHOD method_57436 getMaxAllowed (Lnet/minecraft/class_1799;)I + ARG 1 stack diff --git a/mappings/net/minecraft/component/type/ChargedProjectilesComponent.mapping b/mappings/net/minecraft/component/type/ChargedProjectilesComponent.mapping index d7cce296a6..8f48795d03 100644 --- a/mappings/net/minecraft/component/type/ChargedProjectilesComponent.mapping +++ b/mappings/net/minecraft/component/type/ChargedProjectilesComponent.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_9278 net/minecraft/component/type/ChargedProjectilesCo FIELD field_49301 projectiles Ljava/util/List; METHOD (Ljava/util/List;)V ARG 1 projectiles + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o METHOD method_57437 getProjectiles ()Ljava/util/List; METHOD method_57438 contains (Lnet/minecraft/class_1792;)Z ARG 1 item diff --git a/mappings/net/minecraft/component/type/ContainerComponent.mapping b/mappings/net/minecraft/component/type/ContainerComponent.mapping index a42be0a5af..ce5e02e1f1 100644 --- a/mappings/net/minecraft/component/type/ContainerComponent.mapping +++ b/mappings/net/minecraft/component/type/ContainerComponent.mapping @@ -2,8 +2,33 @@ CLASS net/minecraft/class_9288 net/minecraft/component/type/ContainerComponent FIELD field_49334 DEFAULT Lnet/minecraft/class_9288; FIELD field_49335 CODEC Lcom/mojang/serialization/Codec; FIELD field_49336 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_49337 MAX_SLOTS I FIELD field_49338 stacks Lnet/minecraft/class_2371; + METHOD (I)V + ARG 1 size + METHOD (Ljava/util/List;)V + ARG 1 stacks METHOD (Lnet/minecraft/class_2371;)V ARG 1 stacks + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o + METHOD method_57489 stream ()Ljava/util/stream/Stream; + METHOD method_57490 (Lnet/minecraft/class_1799;)Z + ARG 0 stack + METHOD method_57491 (Lnet/minecraft/class_9288;)Ljava/util/List; + ARG 0 component + METHOD method_57492 copyTo (Lnet/minecraft/class_2371;)V + ARG 1 stacks + METHOD method_57493 fromStacks (Ljava/util/List;)Lnet/minecraft/class_9288; + ARG 0 stacks + METHOD method_57494 collectSlots ()Ljava/util/List; + METHOD method_57495 (Lnet/minecraft/class_1799;)Z + ARG 0 stack + METHOD method_57496 fromSlots (Ljava/util/List;)Lnet/minecraft/class_9288; + ARG 0 slots + METHOD method_57497 getSize (Ljava/util/List;)I + ARG 0 size CLASS class_9289 Slot FIELD field_49339 CODEC Lcom/mojang/serialization/Codec; + METHOD method_57498 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/component/type/ContainerLootComponent.mapping b/mappings/net/minecraft/component/type/ContainerLootComponent.mapping index 56353fea94..05d3405758 100644 --- a/mappings/net/minecraft/component/type/ContainerLootComponent.mapping +++ b/mappings/net/minecraft/component/type/ContainerLootComponent.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_9297 net/minecraft/component/type/ContainerLootComponent FIELD field_49361 CODEC Lcom/mojang/serialization/Codec; + METHOD method_57513 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/component/type/DebugStickStateComponent.mapping b/mappings/net/minecraft/component/type/DebugStickStateComponent.mapping index 50da071106..29419515db 100644 --- a/mappings/net/minecraft/component/type/DebugStickStateComponent.mapping +++ b/mappings/net/minecraft/component/type/DebugStickStateComponent.mapping @@ -1,3 +1,10 @@ CLASS net/minecraft/class_9281 net/minecraft/component/type/DebugStickStateComponent FIELD field_49310 DEFAULT Lnet/minecraft/class_9281; FIELD field_49311 CODEC Lcom/mojang/serialization/Codec; + METHOD method_57465 (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/Codec; + ARG 0 block + METHOD method_57466 with (Lnet/minecraft/class_6880;Lnet/minecraft/class_2769;)Lnet/minecraft/class_9281; + ARG 1 block + ARG 2 property + METHOD method_57467 (Lnet/minecraft/class_6880;Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 1 property diff --git a/mappings/net/minecraft/component/type/DyedColorComponent.mapping b/mappings/net/minecraft/component/type/DyedColorComponent.mapping index 14c77f1c87..433c89e46f 100644 --- a/mappings/net/minecraft/component/type/DyedColorComponent.mapping +++ b/mappings/net/minecraft/component/type/DyedColorComponent.mapping @@ -1,9 +1,11 @@ CLASS net/minecraft/class_9282 net/minecraft/component/type/DyedColorComponent FIELD field_49312 CODEC Lcom/mojang/serialization/Codec; FIELD field_49313 PACKET_CODEC Lnet/minecraft/class_9139; - METHOD method_57470 (Lnet/minecraft/class_1799;I)I + METHOD method_57469 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_57470 getColor (Lnet/minecraft/class_1799;I)I ARG 0 stack ARG 1 defaultColor - METHOD method_57471 (Lnet/minecraft/class_1799;Ljava/util/List;)Lnet/minecraft/class_1799; + METHOD method_57471 setColor (Lnet/minecraft/class_1799;Ljava/util/List;)Lnet/minecraft/class_1799; ARG 0 stack ARG 1 dyes diff --git a/mappings/net/minecraft/component/type/FireworkExplosionComponent.mapping b/mappings/net/minecraft/component/type/FireworkExplosionComponent.mapping index 0f51630bc1..181c629986 100644 --- a/mappings/net/minecraft/component/type/FireworkExplosionComponent.mapping +++ b/mappings/net/minecraft/component/type/FireworkExplosionComponent.mapping @@ -7,6 +7,8 @@ CLASS net/minecraft/class_9283 net/minecraft/component/type/FireworkExplosionCom FIELD field_49320 CUSTOM_COLOR_TEXT Lnet/minecraft/class_2561; METHOD method_57472 getColorText (I)Lnet/minecraft/class_2561; ARG 0 color + METHOD method_57473 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_57474 withFadeColors (Lit/unimi/dsi/fastutil/ints/IntList;)Lnet/minecraft/class_9283; ARG 1 fadeColors METHOD method_57475 appendShapeTooltip (Ljava/util/function/Consumer;)V diff --git a/mappings/net/minecraft/component/type/FireworksComponent.mapping b/mappings/net/minecraft/component/type/FireworksComponent.mapping index fa3efd97d6..287b24e517 100644 --- a/mappings/net/minecraft/component/type/FireworksComponent.mapping +++ b/mappings/net/minecraft/component/type/FireworksComponent.mapping @@ -1,3 +1,8 @@ CLASS net/minecraft/class_9284 net/minecraft/component/type/FireworksComponent FIELD field_49323 CODEC Lcom/mojang/serialization/Codec; FIELD field_49324 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_49325 MAX_EXPLOSIONS I + METHOD method_57478 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_57479 (Ljava/util/function/Consumer;Lnet/minecraft/class_2561;)V + ARG 1 text diff --git a/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping b/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping index ce266d11e6..8c8aefddd4 100644 --- a/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping +++ b/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping @@ -8,12 +8,27 @@ CLASS net/minecraft/class_9304 net/minecraft/component/type/ItemEnchantmentsComp METHOD (Lit/unimi/dsi/fastutil/objects/Object2IntLinkedOpenHashMap;Z)V ARG 1 enchantments ARG 2 showInTooltip + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o METHOD method_57534 getEnchantments ()Ljava/util/Set; + METHOD method_57535 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_57536 getLevel (Lnet/minecraft/class_1887;)I ARG 1 enchantment + METHOD method_57537 (Lnet/minecraft/class_9304;)Ljava/lang/Boolean; + ARG 0 component + METHOD method_57538 (Ljava/util/Map;Ljava/lang/Boolean;)Lnet/minecraft/class_9304; + ARG 0 enchantments + ARG 1 showInTooltip METHOD method_57539 getEnchantmentsMap ()Ljava/util/Set; + METHOD method_57540 (Lnet/minecraft/class_9304;)Lit/unimi/dsi/fastutil/objects/Object2IntLinkedOpenHashMap; + ARG 0 component METHOD method_57541 getSize ()I + METHOD method_57542 (Lnet/minecraft/class_9304;)Ljava/lang/Boolean; + ARG 0 component METHOD method_57543 isEmpty ()Z + METHOD method_57544 (Lnet/minecraft/class_9304;)Ljava/util/Map; + ARG 0 component CLASS class_9305 Builder FIELD field_49391 enchantments Lit/unimi/dsi/fastutil/objects/Object2IntLinkedOpenHashMap; FIELD field_49392 showInTooltip Z diff --git a/mappings/net/minecraft/component/type/LodestoneTargetComponent.mapping b/mappings/net/minecraft/component/type/LodestoneTargetComponent.mapping index 597459ca59..55879571e2 100644 --- a/mappings/net/minecraft/component/type/LodestoneTargetComponent.mapping +++ b/mappings/net/minecraft/component/type/LodestoneTargetComponent.mapping @@ -3,3 +3,5 @@ CLASS net/minecraft/class_9291 net/minecraft/component/type/LodestoneTargetCompo FIELD field_49346 PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_57501 isInvalid (Lnet/minecraft/class_3218;)Z ARG 1 world + METHOD method_57502 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/component/type/LoreComponent.mapping b/mappings/net/minecraft/component/type/LoreComponent.mapping index 537f39b7e8..196fa3dd33 100644 --- a/mappings/net/minecraft/component/type/LoreComponent.mapping +++ b/mappings/net/minecraft/component/type/LoreComponent.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_9290 net/minecraft/component/type/LoreComponent FIELD field_49340 DEFAULT Lnet/minecraft/class_9290; FIELD field_49341 CODEC Lcom/mojang/serialization/Codec; FIELD field_49342 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_49343 MAX_LORES I FIELD field_49344 STYLE Lnet/minecraft/class_2583; METHOD (Ljava/util/List;)V ARG 1 lines diff --git a/mappings/net/minecraft/component/type/MapDecorationsComponent.mapping b/mappings/net/minecraft/component/type/MapDecorationsComponent.mapping index f8026a48cf..09d8096966 100644 --- a/mappings/net/minecraft/component/type/MapDecorationsComponent.mapping +++ b/mappings/net/minecraft/component/type/MapDecorationsComponent.mapping @@ -2,6 +2,9 @@ CLASS net/minecraft/class_9292 net/minecraft/component/type/MapDecorationsCompon FIELD field_49347 DEFAULT Lnet/minecraft/class_9292; FIELD field_49348 CODEC Lcom/mojang/serialization/Codec; METHOD method_57503 with (Ljava/lang/String;Lnet/minecraft/class_9292$class_9293;)Lnet/minecraft/class_9292; + ARG 1 id ARG 2 decoration CLASS class_9293 Decoration FIELD field_49349 CODEC Lcom/mojang/serialization/Codec; + METHOD method_57504 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/component/type/NbtComponent.mapping b/mappings/net/minecraft/component/type/NbtComponent.mapping index 950f56c5fc..86ff3f95c9 100644 --- a/mappings/net/minecraft/component/type/NbtComponent.mapping +++ b/mappings/net/minecraft/component/type/NbtComponent.mapping @@ -6,9 +6,18 @@ CLASS net/minecraft/class_9279 net/minecraft/component/type/NbtComponent FIELD field_49306 nbt Lnet/minecraft/class_2487; METHOD (Lnet/minecraft/class_2487;)V ARG 1 nbt + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o METHOD method_57444 getSize ()I METHOD method_57445 applyToEntity (Lnet/minecraft/class_1297;)V ARG 1 entity + METHOD method_57446 get (Lcom/mojang/serialization/MapDecoder;)Lcom/mojang/serialization/DataResult; + ARG 1 decoder + METHOD method_57447 with (Lcom/mojang/serialization/MapEncoder;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 encoder + ARG 2 value + METHOD method_57448 (Lnet/minecraft/class_9279;)Lnet/minecraft/class_2487; + ARG 0 component METHOD method_57449 applyToBlockEntity (Lnet/minecraft/class_2586;Lnet/minecraft/class_7225$class_7874;)Z ARG 1 blockEntity ARG 2 registryLookup @@ -16,11 +25,11 @@ CLASS net/minecraft/class_9279 net/minecraft/component/type/NbtComponent ARG 1 key METHOD method_57451 apply (Ljava/util/function/Consumer;)Lnet/minecraft/class_9279; ARG 1 nbtConsumer - METHOD method_57452 (Lnet/minecraft/class_9331;Lnet/minecraft/class_1799;Ljava/util/function/Consumer;)V + METHOD method_57452 set (Lnet/minecraft/class_9331;Lnet/minecraft/class_1799;Ljava/util/function/Consumer;)V ARG 0 type ARG 1 stack - ARG 2 nbtConsumer - METHOD method_57453 (Lnet/minecraft/class_9331;Lnet/minecraft/class_1799;Lnet/minecraft/class_2487;)V + ARG 2 nbtSetter + METHOD method_57453 set (Lnet/minecraft/class_9331;Lnet/minecraft/class_1799;Lnet/minecraft/class_2487;)V ARG 0 type ARG 1 stack ARG 2 nbt @@ -31,8 +40,14 @@ CLASS net/minecraft/class_9279 net/minecraft/component/type/NbtComponent ARG 2 stack METHOD method_57456 of (Lnet/minecraft/class_2487;)Lnet/minecraft/class_9279; ARG 0 nbt + METHOD method_57457 (Lnet/minecraft/class_2520;)Lnet/minecraft/class_9279; + ARG 0 nbt METHOD method_57458 isEmpty ()Z + METHOD method_57459 (Lnet/minecraft/class_9279;)Lcom/mojang/serialization/DataResult; + ARG 0 component METHOD method_57460 matches (Lnet/minecraft/class_2487;)Z ARG 1 nbt METHOD method_57461 copyNbt ()Lnet/minecraft/class_2487; METHOD method_57463 getNbt ()Lnet/minecraft/class_2487; + METHOD method_57464 (Lnet/minecraft/class_9279;)Lnet/minecraft/class_2487; + ARG 0 component diff --git a/mappings/net/minecraft/component/type/PotionContentsComponent.mapping b/mappings/net/minecraft/component/type/PotionContentsComponent.mapping index c01d5bbcbf..2567dfa59c 100644 --- a/mappings/net/minecraft/component/type/PotionContentsComponent.mapping +++ b/mappings/net/minecraft/component/type/PotionContentsComponent.mapping @@ -1,9 +1,10 @@ CLASS net/minecraft/class_1844 net/minecraft/component/type/PotionContentsComponent FIELD field_25817 NONE_TEXT Lnet/minecraft/class_2561; - FIELD field_30946 DEFAULT_COLOR I + FIELD field_30946 UNCRAFTABLE_COLOR I FIELD field_49274 DEFAULT Lnet/minecraft/class_1844; FIELD field_49275 CODEC Lcom/mojang/serialization/Codec; FIELD field_49276 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_49277 EFFECTLESS_COLOR I METHOD (Lnet/minecraft/class_6880;)V ARG 1 potion METHOD method_47372 buildTooltip (Ljava/util/function/Consumer;FF)V @@ -16,6 +17,8 @@ CLASS net/minecraft/class_1844 net/minecraft/component/type/PotionContentsCompon METHOD method_57397 getEffects ()Ljava/lang/Iterable; METHOD method_57398 with (Lnet/minecraft/class_1293;)Lnet/minecraft/class_1844; ARG 1 customEffect + METHOD method_57399 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_57400 createStack (Lnet/minecraft/class_1792;Lnet/minecraft/class_6880;)Lnet/minecraft/class_1799; ARG 0 item ARG 1 potion diff --git a/mappings/net/minecraft/component/type/ProfileComponent.mapping b/mappings/net/minecraft/component/type/ProfileComponent.mapping index 52786a3f1c..7107bd28ea 100644 --- a/mappings/net/minecraft/component/type/ProfileComponent.mapping +++ b/mappings/net/minecraft/component/type/ProfileComponent.mapping @@ -8,6 +8,8 @@ CLASS net/minecraft/class_9296 net/minecraft/component/type/ProfileComponent ARG 2 id ARG 3 properties METHOD method_57507 getFuture ()Ljava/util/concurrent/CompletableFuture; + METHOD method_57508 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_57509 createProfile (Ljava/lang/String;Ljava/util/Optional;Lcom/mojang/authlib/properties/PropertyMap;)Lcom/mojang/authlib/GameProfile; ARG 0 name ARG 1 id diff --git a/mappings/net/minecraft/component/type/UnbreakableComponent.mapping b/mappings/net/minecraft/component/type/UnbreakableComponent.mapping index 8079dd3af5..18027a21d4 100644 --- a/mappings/net/minecraft/component/type/UnbreakableComponent.mapping +++ b/mappings/net/minecraft/component/type/UnbreakableComponent.mapping @@ -2,3 +2,5 @@ CLASS net/minecraft/class_9300 net/minecraft/component/type/UnbreakableComponent FIELD field_49366 CODEC Lcom/mojang/serialization/Codec; FIELD field_49367 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_49368 TOOLTIP_TEXT Lnet/minecraft/class_2561; + METHOD method_57515 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/component/type/WritableBookContentComponent.mapping b/mappings/net/minecraft/component/type/WritableBookContentComponent.mapping index 0cd8c316b4..7bd62f0ffe 100644 --- a/mappings/net/minecraft/component/type/WritableBookContentComponent.mapping +++ b/mappings/net/minecraft/component/type/WritableBookContentComponent.mapping @@ -1,4 +1,13 @@ CLASS net/minecraft/class_9301 net/minecraft/component/type/WritableBookContentComponent FIELD field_49369 DEFAULT Lnet/minecraft/class_9301; + FIELD field_49370 MAX_PAGE_LENGTH I FIELD field_49371 CODEC Lcom/mojang/serialization/Codec; FIELD field_49372 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_49373 PAGE_CODEC Lcom/mojang/serialization/Codec; + FIELD field_49374 PAGES_CODEC Lcom/mojang/serialization/Codec; + METHOD method_57516 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_57517 stream (Z)Ljava/util/stream/Stream; + ARG 1 shouldFilter + METHOD method_57518 (ZLnet/minecraft/class_9262;)Ljava/lang/String; + ARG 1 page diff --git a/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping b/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping index 3825115d23..5ecce41da0 100644 --- a/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping +++ b/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping @@ -1,4 +1,30 @@ CLASS net/minecraft/class_9302 net/minecraft/component/type/WrittenBookContentComponent + FIELD field_49375 MAX_SERIALIZED_PAGE_LENGTH I + FIELD field_49376 MAX_PAGE_COUNT I + FIELD field_49378 MAX_TITLE_LENGTH I + FIELD field_49379 MAX_GENERATION I + FIELD field_49380 UNCOPIABLE_GENERATION I FIELD field_49381 CODEC Lcom/mojang/serialization/Codec; FIELD field_49382 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_49383 PAGE_CODEC Lcom/mojang/serialization/Codec; + FIELD field_49384 PAGES_CODEC Lcom/mojang/serialization/Codec; METHOD method_57519 copy ()Lnet/minecraft/class_9302; + METHOD method_57520 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_57521 resolve (Lnet/minecraft/class_2168;Lnet/minecraft/class_1657;)Lnet/minecraft/class_9302; + ARG 1 source + ARG 2 player + METHOD method_57522 resolve (Lnet/minecraft/class_2168;Lnet/minecraft/class_1657;Lnet/minecraft/class_9262;)Ljava/util/Optional; + ARG 0 source + ARG 1 player + ARG 2 page + METHOD method_57523 (Lnet/minecraft/class_2168;Lnet/minecraft/class_1657;Lnet/minecraft/class_2561;)Ljava/util/Optional; + ARG 2 text + METHOD method_57524 exceedsSerializedLengthLimit (Lnet/minecraft/class_2561;Lnet/minecraft/class_7225$class_7874;)Z + ARG 0 text + ARG 1 lookup + METHOD method_57525 getPages (Z)Ljava/util/List; + ARG 1 shouldFilter + METHOD method_57526 (ZLnet/minecraft/class_9262;)Lnet/minecraft/class_2561; + ARG 1 page + METHOD method_57527 asResolved ()Lnet/minecraft/class_9302; diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index ca132f87ef..ee331933e1 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -119,7 +119,7 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan METHOD method_43508 hasIllegalCharacter (Ljava/lang/String;)Z COMMENT {@return whether {@code message} contains an illegal character} COMMENT - COMMENT @see net.minecraft.SharedConstants#isValidChar(char) + COMMENT @see net.minecraft.util.StringHelper#isValidChar(char) ARG 0 message METHOD method_43669 checkForSpam ()V METHOD method_44155 handleDecoratedMessage (Lnet/minecraft/class_7471;)V diff --git a/mappings/net/minecraft/text/TextCodecs.mapping b/mappings/net/minecraft/text/TextCodecs.mapping index 52047eed12..7d00741ef4 100644 --- a/mappings/net/minecraft/text/TextCodecs.mapping +++ b/mappings/net/minecraft/text/TextCodecs.mapping @@ -26,6 +26,22 @@ CLASS net/minecraft/class_8824 net/minecraft/text/TextCodecs ARG 0 either2 METHOD method_54177 (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; ARG 0 text + METHOD method_57973 codec (I)Lcom/mojang/serialization/Codec; + ARG 0 maxSerializedLength + CLASS 1 + METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 ops + ARG 2 input + METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 input + ARG 2 ops + ARG 3 prefix + METHOD method_57975 (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/DynamicOps;Lcom/google/gson/JsonElement;)Lcom/mojang/serialization/DataResult; + ARG 2 json + METHOD method_57976 toJsonOps (Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/DynamicOps; + ARG 0 ops + METHOD method_57977 (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/serialization/DataResult; + ARG 1 pair CLASS class_8825 FuzzyCodec FIELD field_46599 codecs Ljava/util/List; FIELD field_46600 codecGetter Ljava/util/function/Function; diff --git a/mappings/net/minecraft/util/StringHelper.mapping b/mappings/net/minecraft/util/StringHelper.mapping index 73f36f5b5c..367f25d89b 100644 --- a/mappings/net/minecraft/util/StringHelper.mapping +++ b/mappings/net/minecraft/util/StringHelper.mapping @@ -40,5 +40,25 @@ CLASS net/minecraft/class_3544 net/minecraft/util/StringHelper COMMENT COMMENT @apiNote This is used when sending chat messages. ARG 0 text + METHOD method_57175 isValidChar (C)Z + COMMENT {@return whether {@code c} is a valid character} + COMMENT + COMMENT

Characters are valid if they are not an ASCII control code or {@code ยง}. + ARG 0 c + METHOD method_57176 isWhitespace (I)Z + ARG 0 c + METHOD method_57177 stripInvalidChars (Ljava/lang/String;Z)Ljava/lang/String; + COMMENT {@return {@code string} with all {@linkplain #isValidChar invalid characters} + COMMENT removed} + ARG 0 string + ARG 1 allowLinebreak + METHOD method_57178 (I)Z + ARG 0 c METHOD method_57179 isValidPlayerName (Ljava/lang/String;)Z ARG 0 name + METHOD method_57180 stripInvalidChars (Ljava/lang/String;)Ljava/lang/String; + COMMENT {@return {@code string} with all {@linkplain #isValidChar invalid characters}, + COMMENT including linebreak ({@code \\n}), removed} + ARG 0 string + METHOD method_57181 isBlank (Ljava/lang/String;)Z + ARG 0 string diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index e02da0607d..48e9b7fda5 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -305,14 +305,28 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs METHOD method_56942 withLifecycle (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; ARG 0 originalCodec ARG 1 lifecycleGetter + METHOD method_57148 (ILjava/util/List;)Lcom/mojang/serialization/DataResult; + ARG 1 list + METHOD method_57149 (ILjava/util/Map;)Lcom/mojang/serialization/DataResult; + ARG 1 map METHOD method_57150 list (Lcom/mojang/serialization/Codec;I)Lcom/mojang/serialization/Codec; ARG 0 codec ARG 1 maxLength METHOD method_57153 map (Lcom/mojang/serialization/Codec;I)Lcom/mojang/serialization/Codec; ARG 0 codec ARG 1 maxLength + METHOD method_57154 keyDispatching (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; + COMMENT {@return a codec for a map, given the codec for the key {@code Codec} and a + COMMENT function from the key to the codec for the value, {@code Codec}} + COMMENT + COMMENT @param K the type of the map keys + COMMENT @param V the type of the map values + ARG 0 keyCodec + ARG 1 keyToValueCodec METHOD method_57155 optional (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; ARG 0 codec + METHOD method_57156 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 0 name CLASS 1 METHOD apply (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Lcom/mojang/serialization/DataResult;)Lcom/mojang/serialization/DataResult; ARG 1 ops @@ -371,12 +385,52 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 3 ops METHOD method_54943 (Lcom/mojang/serialization/MapLike;Ljava/lang/String;Lcom/mojang/serialization/DynamicOps;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/serialization/DataResult; ARG 4 pair + CLASS 7 + METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 ops + ARG 2 input + METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 input + ARG 2 ops + ARG 3 prefix + METHOD method_57158 (Lcom/google/common/collect/ImmutableMap$Builder;Lcom/mojang/datafixers/util/Pair;)V + ARG 1 decoded + METHOD method_57159 (Lcom/mojang/datafixers/util/Unit;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/datafixers/util/Unit; + ARG 0 unit + ARG 1 pair + METHOD method_57160 (Lcom/mojang/datafixers/util/Unit;Lcom/mojang/datafixers/util/Unit;)Lcom/mojang/datafixers/util/Unit; + ARG 0 unit + ARG 1 unit2 + METHOD method_57161 (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/DynamicOps;Ljava/util/function/Function;Lcom/google/common/collect/ImmutableMap$Builder;Ljava/util/stream/Stream$Builder;Lcom/mojang/serialization/DataResult;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/serialization/DataResult; + ARG 5 result + ARG 6 entry + METHOD method_57162 (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/DynamicOps;Ljava/util/function/Function;Ljava/lang/Object;Lcom/mojang/serialization/MapLike;)Lcom/mojang/serialization/DataResult; + ARG 4 map + METHOD method_57163 encode (Lcom/mojang/serialization/Codec;Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/DataResult; + ARG 1 codec + ARG 2 value + ARG 3 ops + METHOD method_57164 (Lcom/mojang/serialization/DataResult;Lcom/mojang/serialization/DataResult;)Lcom/mojang/serialization/DataResult; + ARG 0 a + ARG 1 b + METHOD method_57165 (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/datafixers/util/Pair;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/DataResult; + ARG 2 codec + METHOD method_57166 (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String; + ARG 1 error + METHOD method_57168 (Ljava/util/Map;Ljava/lang/Object;Lcom/mojang/datafixers/util/Unit;)Lcom/mojang/datafixers/util/Pair; + ARG 2 unit + METHOD method_57169 (Ljava/util/stream/Stream$Builder;Lcom/mojang/datafixers/util/Pair;Lcom/mojang/serialization/DataResult$PartialResult;)V + ARG 2 result CLASS 8 METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 1 ops ARG 2 input METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 input ARG 2 ops + ARG 3 prefix + METHOD method_57170 (Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/datafixers/util/Pair; + ARG 0 pair METHOD method_57171 isEmpty (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Z ARG 0 ops ARG 1 input