From fe7bdf5af5028467fe7d54d8a9fc041f41fbb0eb Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 10 Apr 2024 15:31:24 +0100 Subject: [PATCH] Fix mappings --- mappings/ba.mapping | 5 ----- mappings/bb.mapping | 5 ----- mappings/bsy.mapping | 3 --- mappings/cf.mapping | 9 --------- mappings/cg.mapping | 2 -- mappings/ch.mapping | 2 -- mappings/cm.mapping | 6 ------ mappings/cn.mapping | 3 --- mappings/cs.mapping | 3 --- mappings/cu.mapping | 4 ---- mappings/cv.mapping | 8 -------- mappings/net/minecraft/class_9639.mapping | 7 +++++++ mappings/net/minecraft/class_9643.mapping | 7 +++++++ mappings/net/minecraft/class_9652.mapping | 5 +++++ mappings/net/minecraft/class_9653.mapping | 16 ++++++++++++++++ mappings/net/minecraft/class_9655.mapping | 3 +++ mappings/net/minecraft/class_9656.mapping | 3 +++ mappings/net/minecraft/class_9657.mapping | 10 ++++++++++ mappings/net/minecraft/class_9659.mapping | 5 +++++ mappings/net/minecraft/class_9660.mapping | 5 +++++ mappings/net/minecraft/class_9661.mapping | 6 ++++++ mappings/net/minecraft/class_9663.mapping | 14 ++++++++++++++ .../net/minecraft/entity/EquipmentHolder.mapping | 2 +- .../net/minecraft/entity/mob/MobEntity.mapping | 2 +- .../function/SetContentsLootFunction.mapping | 6 +++--- .../minecraft/network/codec/PacketCodecs.mapping | 10 +++++----- .../CreativeInventoryActionC2SPacket.mapping | 8 ++++---- .../entity/EntityEquipmentPredicate.mapping | 3 ++- 28 files changed, 97 insertions(+), 65 deletions(-) delete mode 100644 mappings/ba.mapping delete mode 100644 mappings/bb.mapping delete mode 100644 mappings/bsy.mapping delete mode 100644 mappings/cf.mapping delete mode 100644 mappings/cg.mapping delete mode 100644 mappings/ch.mapping delete mode 100644 mappings/cm.mapping delete mode 100644 mappings/cn.mapping delete mode 100644 mappings/cs.mapping delete mode 100644 mappings/cu.mapping delete mode 100644 mappings/cv.mapping create mode 100644 mappings/net/minecraft/class_9639.mapping create mode 100644 mappings/net/minecraft/class_9643.mapping create mode 100644 mappings/net/minecraft/class_9652.mapping create mode 100644 mappings/net/minecraft/class_9653.mapping create mode 100644 mappings/net/minecraft/class_9655.mapping create mode 100644 mappings/net/minecraft/class_9656.mapping create mode 100644 mappings/net/minecraft/class_9657.mapping create mode 100644 mappings/net/minecraft/class_9659.mapping create mode 100644 mappings/net/minecraft/class_9660.mapping create mode 100644 mappings/net/minecraft/class_9661.mapping create mode 100644 mappings/net/minecraft/class_9663.mapping diff --git a/mappings/ba.mapping b/mappings/ba.mapping deleted file mode 100644 index 708418087f..0000000000 --- a/mappings/ba.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS ba - CLASS a - METHOD b a ()Ljava/util/List; - CLASS b - METHOD b a ()Ljava/util/function/Predicate; diff --git a/mappings/bb.mapping b/mappings/bb.mapping deleted file mode 100644 index 96844db6eb..0000000000 --- a/mappings/bb.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS bb - CLASS b - METHOD b a ()Ljava/util/List; - CLASS c - METHOD b a ()Lbb$a; diff --git a/mappings/bsy.mapping b/mappings/bsy.mapping deleted file mode 100644 index 4ec0282083..0000000000 --- a/mappings/bsy.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS bsy - METHOD a c ()Lnet/minecraft/class_5321; - METHOD b d ()Ljava/util/Map; diff --git a/mappings/cf.mapping b/mappings/cf.mapping deleted file mode 100644 index acf51333d0..0000000000 --- a/mappings/cf.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS cf - METHOD b c ()Ljava/util/Optional; - CLASS a - METHOD a b ()Ljava/util/Optional; - METHOD b c ()Ljava/util/Optional; - METHOD c d ()Ljava/util/Optional; - METHOD d e ()Lnet/minecraft/class_2096$class_2099; - METHOD e f ()Ljava/util/Optional; - METHOD f g ()Ljava/util/Optional; diff --git a/mappings/cg.mapping b/mappings/cg.mapping deleted file mode 100644 index 4177471ff2..0000000000 --- a/mappings/cg.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS cg - METHOD b c ()Ljava/util/Optional; diff --git a/mappings/ch.mapping b/mappings/ch.mapping deleted file mode 100644 index 7811be5335..0000000000 --- a/mappings/ch.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS ch - METHOD b c ()Ljava/util/Optional; diff --git a/mappings/cm.mapping b/mappings/cm.mapping deleted file mode 100644 index b74c5fa106..0000000000 --- a/mappings/cm.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS cm - METHOD b c ()Lcm$a; - CLASS a - METHOD a b ()Ljava/util/Optional; - METHOD b c ()Ljava/util/Optional; - METHOD c d ()Ljava/util/Optional; diff --git a/mappings/cn.mapping b/mappings/cn.mapping deleted file mode 100644 index b659912c6d..0000000000 --- a/mappings/cn.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS cn - METHOD b c ()Ljava/util/Optional; - METHOD c d ()Lnet/minecraft/class_2096$class_2100; diff --git a/mappings/cs.mapping b/mappings/cs.mapping deleted file mode 100644 index 64f4550e07..0000000000 --- a/mappings/cs.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS cs - METHOD b c ()Ljava/util/Optional; - METHOD c d ()Ljava/util/Optional; diff --git a/mappings/cu.mapping b/mappings/cu.mapping deleted file mode 100644 index f76ccc15fc..0000000000 --- a/mappings/cu.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS cu - METHOD b c ()Ljava/util/Optional; - CLASS a - METHOD a b ()Ljava/lang/String; diff --git a/mappings/cv.mapping b/mappings/cv.mapping deleted file mode 100644 index bd13431b0b..0000000000 --- a/mappings/cv.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS cv - METHOD b c ()Ljava/util/Optional; - METHOD c d ()Ljava/util/Optional; - METHOD d e ()Ljava/util/Optional; - METHOD e f ()Lnet/minecraft/class_2096$class_2100; - METHOD f g ()Ljava/util/Optional; - CLASS a - METHOD a b ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/class_9639.mapping b/mappings/net/minecraft/class_9639.mapping new file mode 100644 index 0000000000..cd3672a6a5 --- /dev/null +++ b/mappings/net/minecraft/class_9639.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_9639 + CLASS class_9640 + FIELD comp_2611 a Ljava/util/List; + METHOD comp_2611 a ()Ljava/util/List; + CLASS class_9641 + FIELD comp_2612 a Ljava/util/function/Predicate; + METHOD comp_2612 a ()Ljava/util/function/Predicate; diff --git a/mappings/net/minecraft/class_9643.mapping b/mappings/net/minecraft/class_9643.mapping new file mode 100644 index 0000000000..cd32c4c284 --- /dev/null +++ b/mappings/net/minecraft/class_9643.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_9643 + CLASS class_9645 + FIELD comp_2615 a Ljava/util/List; + METHOD comp_2615 a ()Ljava/util/List; + CLASS class_9646 + FIELD comp_2616 a Lnet/minecraft/class_9643$class_9644; + METHOD comp_2616 a ()Lnet/minecraft/class_9643$class_9644; diff --git a/mappings/net/minecraft/class_9652.mapping b/mappings/net/minecraft/class_9652.mapping new file mode 100644 index 0000000000..6fb18e3b58 --- /dev/null +++ b/mappings/net/minecraft/class_9652.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_9652 + FIELD comp_2621 c Lnet/minecraft/class_5321; + FIELD comp_2622 d Ljava/util/Map; + METHOD comp_2621 c ()Lnet/minecraft/class_5321; + METHOD comp_2622 d ()Ljava/util/Map; diff --git a/mappings/net/minecraft/class_9653.mapping b/mappings/net/minecraft/class_9653.mapping new file mode 100644 index 0000000000..6398fabd39 --- /dev/null +++ b/mappings/net/minecraft/class_9653.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_9653 + FIELD comp_2623 c Ljava/util/Optional; + METHOD comp_2623 c ()Ljava/util/Optional; + CLASS class_9654 + FIELD comp_2624 b Ljava/util/Optional; + FIELD comp_2625 c Ljava/util/Optional; + FIELD comp_2626 d Ljava/util/Optional; + FIELD comp_2627 e Lnet/minecraft/class_2096$class_2099; + FIELD comp_2628 f Ljava/util/Optional; + FIELD comp_2629 g Ljava/util/Optional; + METHOD comp_2624 b ()Ljava/util/Optional; + METHOD comp_2625 c ()Ljava/util/Optional; + METHOD comp_2626 d ()Ljava/util/Optional; + METHOD comp_2627 e ()Lnet/minecraft/class_2096$class_2099; + METHOD comp_2628 f ()Ljava/util/Optional; + METHOD comp_2629 g ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/class_9655.mapping b/mappings/net/minecraft/class_9655.mapping new file mode 100644 index 0000000000..034031a369 --- /dev/null +++ b/mappings/net/minecraft/class_9655.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9655 + FIELD comp_2630 c Ljava/util/Optional; + METHOD comp_2630 c ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/class_9656.mapping b/mappings/net/minecraft/class_9656.mapping new file mode 100644 index 0000000000..31c1376389 --- /dev/null +++ b/mappings/net/minecraft/class_9656.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9656 + FIELD comp_2631 c Ljava/util/Optional; + METHOD comp_2631 c ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/class_9657.mapping b/mappings/net/minecraft/class_9657.mapping new file mode 100644 index 0000000000..d7a619e2d8 --- /dev/null +++ b/mappings/net/minecraft/class_9657.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_9657 + FIELD comp_2632 c Lnet/minecraft/class_9657$class_9658; + METHOD comp_2632 c ()Lnet/minecraft/class_9657$class_9658; + CLASS class_9658 + FIELD comp_2633 b Ljava/util/Optional; + FIELD comp_2634 c Ljava/util/Optional; + FIELD comp_2635 d Ljava/util/Optional; + METHOD comp_2633 b ()Ljava/util/Optional; + METHOD comp_2634 c ()Ljava/util/Optional; + METHOD comp_2635 d ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/class_9659.mapping b/mappings/net/minecraft/class_9659.mapping new file mode 100644 index 0000000000..94e6f1f157 --- /dev/null +++ b/mappings/net/minecraft/class_9659.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_9659 + FIELD comp_2636 c Ljava/util/Optional; + FIELD comp_2637 d Lnet/minecraft/class_2096$class_2100; + METHOD comp_2636 c ()Ljava/util/Optional; + METHOD comp_2637 d ()Lnet/minecraft/class_2096$class_2100; diff --git a/mappings/net/minecraft/class_9660.mapping b/mappings/net/minecraft/class_9660.mapping new file mode 100644 index 0000000000..8e4fb5302a --- /dev/null +++ b/mappings/net/minecraft/class_9660.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_9660 + FIELD comp_2638 c Ljava/util/Optional; + FIELD comp_2639 d Ljava/util/Optional; + METHOD comp_2638 c ()Ljava/util/Optional; + METHOD comp_2639 d ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/class_9661.mapping b/mappings/net/minecraft/class_9661.mapping new file mode 100644 index 0000000000..7f03dafec4 --- /dev/null +++ b/mappings/net/minecraft/class_9661.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_9661 + FIELD comp_2640 c Ljava/util/Optional; + METHOD comp_2640 c ()Ljava/util/Optional; + CLASS class_9662 + FIELD comp_2641 b Ljava/lang/String; + METHOD comp_2641 b ()Ljava/lang/String; diff --git a/mappings/net/minecraft/class_9663.mapping b/mappings/net/minecraft/class_9663.mapping new file mode 100644 index 0000000000..aa40a6eebd --- /dev/null +++ b/mappings/net/minecraft/class_9663.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/class_9663 + FIELD comp_2642 c Ljava/util/Optional; + FIELD comp_2643 d Ljava/util/Optional; + FIELD comp_2644 e Ljava/util/Optional; + FIELD comp_2645 f Lnet/minecraft/class_2096$class_2100; + FIELD comp_2646 g Ljava/util/Optional; + METHOD comp_2642 c ()Ljava/util/Optional; + METHOD comp_2643 d ()Ljava/util/Optional; + METHOD comp_2644 e ()Ljava/util/Optional; + METHOD comp_2645 f ()Lnet/minecraft/class_2096$class_2100; + METHOD comp_2646 g ()Ljava/util/Optional; + CLASS class_9664 + FIELD comp_2647 b Lnet/minecraft/class_2561; + METHOD comp_2647 b ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/entity/EquipmentHolder.mapping b/mappings/net/minecraft/entity/EquipmentHolder.mapping index 540650f9fe..397fb17ef9 100644 --- a/mappings/net/minecraft/entity/EquipmentHolder.mapping +++ b/mappings/net/minecraft/entity/EquipmentHolder.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_9460 net/minecraft/entity/EquipmentHolder METHOD method_5673 equipStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V ARG 1 slot ARG 2 stack - METHOD method_58631 setEquipmentFromLootTable (Lbsy;Lnet/minecraft/class_8567;)V + METHOD method_58631 setEquipmentFromLootTable (Lnet/minecraft/class_9652;Lnet/minecraft/class_8567;)V ARG 2 parameters METHOD method_58632 setEquipmentFromLootTable (Lnet/minecraft/class_5321;Lnet/minecraft/class_8567;JLjava/util/Map;)V ARG 2 parameters diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 9addebb005..0dcf8f0d8f 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -159,7 +159,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_57296 hasComponentsOtherThanDamage (Lnet/minecraft/class_1799;)Z ARG 0 stack METHOD method_58151 mightBeLeashed ()Z - METHOD method_58634 setEquipmentFromLootTable (Lbsy;)V + METHOD method_58634 setEquipmentFromLootTable (Lnet/minecraft/class_9652;)V METHOD method_58635 createEquipmentLootParameters (Lnet/minecraft/class_3218;)Lnet/minecraft/class_8567; ARG 1 world METHOD method_5929 getDropChance (Lnet/minecraft/class_1304;)F diff --git a/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping b/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping index 9b5cfe0136..398173caaf 100644 --- a/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping @@ -1,20 +1,20 @@ CLASS net/minecraft/class_134 net/minecraft/loot/function/SetContentsLootFunction FIELD field_1103 entries Ljava/util/List; FIELD field_45841 CODEC Lcom/mojang/serialization/MapCodec; - METHOD (Ljava/util/List;Leqa;Ljava/util/List;)V + METHOD (Ljava/util/List;Lnet/minecraft/class_9666;Ljava/util/List;)V ARG 1 conditions ARG 3 entries METHOD method_53363 (Lnet/minecraft/class_134;)Ljava/util/List; ARG 0 function METHOD method_53364 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_53365 (Lnet/minecraft/class_134;)Leqa; + METHOD method_53365 (Lnet/minecraft/class_134;)Lnet/minecraft/class_9666; ARG 0 function METHOD method_599 (Lnet/minecraft/class_47;Ljava/util/stream/Stream$Builder;Lnet/minecraft/class_79;)V ARG 2 entry METHOD method_600 (Lnet/minecraft/class_47;Ljava/util/stream/Stream$Builder;Lnet/minecraft/class_82;)V ARG 2 choice - METHOD method_601 builder (Leqa;)Lnet/minecraft/class_134$class_135; + METHOD method_601 builder (Lnet/minecraft/class_9666;)Lnet/minecraft/class_134$class_135; CLASS class_135 Builder FIELD field_1104 entries Lcom/google/common/collect/ImmutableList$Builder; METHOD method_602 withEntry (Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_134$class_135; diff --git a/mappings/net/minecraft/network/codec/PacketCodecs.mapping b/mappings/net/minecraft/network/codec/PacketCodecs.mapping index ac13f8efcd..ed42743a5f 100644 --- a/mappings/net/minecraft/network/codec/PacketCodecs.mapping +++ b/mappings/net/minecraft/network/codec/PacketCodecs.mapping @@ -289,19 +289,19 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs ARG 0 registryRef METHOD method_58002 unlimitedRegistryCodec (Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_9139; ARG 0 codec - CLASS 10 13 CLASS 11 - CLASS 13 14 + CLASS 13 + CLASS 14 METHOD method_58010 (Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_9139;Ljava/lang/Object;)V ARG 2 right METHOD method_58011 (Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_9139;Ljava/lang/Object;)V ARG 2 left - CLASS 15 16 + CLASS 16 METHOD method_56424 getIterable (Lnet/minecraft/class_9129;)Lnet/minecraft/class_2359; ARG 1 buf CLASS 17 FIELD field_49690 entryPacketCodec Lnet/minecraft/class_9139; - CLASS 18 19 + CLASS 19 FIELD field_49691 NAME_MAX_LENGTH I FIELD field_49692 VALUE_MAX_LENGTH I FIELD field_49693 SIGNATURE_MAX_LENGTH I @@ -315,7 +315,7 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs METHOD method_56403 decode (Lio/netty/buffer/ByteBuf;)[B ARG 1 buf METHOD method_56404 encode (Lio/netty/buffer/ByteBuf;[B)V - CLASS 5 6 + CLASS 6 METHOD method_56899 (Ljava/lang/Object;Ljava/lang/String;)Lio/netty/handler/codec/EncoderException; ARG 1 error METHOD method_56900 (Lnet/minecraft/class_2520;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException; diff --git a/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping index 1f23ddf714..67f96b6ec5 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_2873 net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket - FIELD field_13070 stack Lnet/minecraft/class_1799; - FIELD field_13071 slot I + FIELD comp_2609 slot I + FIELD comp_2610 stack Lnet/minecraft/class_1799; FIELD field_48219 CODEC Lnet/minecraft/class_9139; - METHOD method_12479 stack ()Lnet/minecraft/class_1799; - METHOD method_12481 slot ()I + METHOD comp_2609 slot ()I + METHOD comp_2610 stack ()Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping index f63469b611..fa7a272316 100644 --- a/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_3735 net/minecraft/predicate/entity/EntityEquipmentPredicate + FIELD comp_2620 f Ljava/util/Optional; FIELD field_45744 CODEC Lcom/mojang/serialization/Codec; - METHOD e f ()Ljava/util/Optional; + METHOD comp_2620 f ()Ljava/util/Optional; METHOD method_16226 test (Lnet/minecraft/class_1297;)Z ARG 1 entity METHOD method_53129 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;