From 62fab3a9e746b7128a85986690eb2c901a235185 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Thu, 9 Feb 2023 23:30:37 +1100 Subject: [PATCH] 23w06a, more stuff (#3485) Things others missed --- .../gui/screen/world/CreateWorldScreen.mapping | 6 ++++++ .../gui/widget/AbstractTextWidget.mapping | 14 ++++++++++++++ .../client/gui/widget/ClickableWidget.mapping | 1 + .../gui/widget/MultilineTextWidget.mapping | 16 ++++++++++++++++ .../widget/NarratedMultilineTextWidget.mapping | 1 + mappings/net/minecraft/entity/Entity.mapping | 3 +++ .../net/minecraft/entity/LivingEntity.mapping | 2 ++ .../entity/damage/DamageTracker.mapping | 1 + .../data/TrackedDataHandlerRegistry.mapping | 3 ++- .../{Wearable.mapping => Equipment.mapping} | 6 ++++-- .../item/SmithingTemplateItem.mapping | 1 + .../listener/ClientPlayPacketListener.mapping | 2 ++ .../s2c/play/EntityDamageS2CPacket.mapping | 18 ++++++++++++++++++ .../minecraft/predicate/TagPredicate.mapping | 16 ++++++++++++++++ .../entity/DamageSourcePredicate.mapping | 8 ++++++++ .../screen/PlayerScreenHandler.mapping | 5 +++++ mappings/net/minecraft/server/Main.mapping | 2 ++ .../integrated/IntegratedServerLoader.mapping | 1 + mappings/net/minecraft/world/World.mapping | 3 +++ 19 files changed, 106 insertions(+), 3 deletions(-) create mode 100644 mappings/net/minecraft/client/gui/widget/AbstractTextWidget.mapping rename mappings/net/minecraft/item/{Wearable.mapping => Equipment.mapping} (73%) create mode 100644 mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping create mode 100644 mappings/net/minecraft/predicate/TagPredicate.mapping diff --git a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping index 836d9b2d2b..0a90c398aa 100644 --- a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping @@ -127,6 +127,8 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS ARG 2 creator METHOD method_48665 (Lnet/minecraft/class_5676;Lnet/minecraft/class_8100;)V ARG 1 creator + METHOD method_49012 (Lnet/minecraft/class_4185;)V + ARG 1 button CLASS class_8094 MoreTab FIELD field_42179 MORE_TAB_TITLE_TEXT Lnet/minecraft/class_2561; FIELD field_42180 GAME_RULES_TEXT Lnet/minecraft/class_2561; @@ -136,6 +138,10 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS METHOD method_48668 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_48669 openGameRulesScreen ()V + METHOD method_49013 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_49014 (Lnet/minecraft/class_4185;)V + ARG 1 button CLASS class_8095 WorldTab FIELD field_42183 WORLD_TAB_TITLE_TEXT Lnet/minecraft/class_2561; FIELD field_42184 AMPLIFIED_GENERATOR_INFO_TEXT Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/gui/widget/AbstractTextWidget.mapping b/mappings/net/minecraft/client/gui/widget/AbstractTextWidget.mapping new file mode 100644 index 0000000000..e1c3b49fcd --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/AbstractTextWidget.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/class_8130 net/minecraft/client/gui/widget/AbstractTextWidget + FIELD field_42483 textRenderer Lnet/minecraft/class_327; + FIELD field_42484 textColor I + METHOD (IIIILnet/minecraft/class_2561;Lnet/minecraft/class_327;)V + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + ARG 5 message + ARG 6 textRenderer + METHOD method_48977 getTextRenderer ()Lnet/minecraft/class_327; + METHOD method_48978 setTextColor (I)Lnet/minecraft/class_8130; + ARG 1 textColor + METHOD method_48979 getTextColor ()I diff --git a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping index 323d68ddfc..6a1b656dc8 100644 --- a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping @@ -53,6 +53,7 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget METHOD method_25358 setWidth (I)V ARG 1 width METHOD method_25359 renderButton (Lnet/minecraft/class_4587;II)V + ARG 1 matrices ARG 2 mouseX ARG 3 mouseY METHOD method_25360 getNarrationMessage ()Lnet/minecraft/class_5250; diff --git a/mappings/net/minecraft/client/gui/widget/MultilineTextWidget.mapping b/mappings/net/minecraft/client/gui/widget/MultilineTextWidget.mapping index 1255f221fe..e38f5248bf 100644 --- a/mappings/net/minecraft/client/gui/widget/MultilineTextWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/MultilineTextWidget.mapping @@ -1,2 +1,18 @@ CLASS net/minecraft/class_7940 net/minecraft/client/gui/widget/MultilineTextWidget FIELD field_41343 centered Z + FIELD field_42486 maxWidth Ljava/util/OptionalInt; + FIELD field_42487 maxRows Ljava/util/OptionalInt; + METHOD (IILnet/minecraft/class_2561;Lnet/minecraft/class_327;)V + ARG 1 x + ARG 2 y + ARG 3 message + ARG 4 textRenderer + METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_327;)V + ARG 1 message + ARG 2 textRenderer + METHOD method_48981 setCentered (Z)Lnet/minecraft/class_7940; + ARG 1 centered + METHOD method_48984 setMaxWidth (I)Lnet/minecraft/class_7940; + ARG 1 maxWidth + METHOD method_48985 setMaxRows (I)Lnet/minecraft/class_7940; + ARG 1 maxRows diff --git a/mappings/net/minecraft/client/gui/widget/NarratedMultilineTextWidget.mapping b/mappings/net/minecraft/client/gui/widget/NarratedMultilineTextWidget.mapping index fa3f0b9979..0e535e8b0c 100644 --- a/mappings/net/minecraft/client/gui/widget/NarratedMultilineTextWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/NarratedMultilineTextWidget.mapping @@ -5,5 +5,6 @@ CLASS net/minecraft/class_8019 net/minecraft/client/gui/widget/NarratedMultiline FIELD field_41802 EXPANSION I FIELD field_41803 BORDER_WIDTH I METHOD (Lnet/minecraft/class_327;Lnet/minecraft/class_2561;I)V + ARG 1 textRenderer ARG 2 text ARG 3 width diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 1a12ce97f7..d17db0641c 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -941,6 +941,9 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_48155 canSprintAsVehicle ()Z METHOD method_48850 onDataTrackerUpdate (Ljava/util/List;)V ARG 1 dataEntries + METHOD method_48922 onDamaged (Lnet/minecraft/class_1282;)V + ARG 1 damageSource + METHOD method_48923 getDamageSources ()Lnet/minecraft/class_8109; METHOD method_5621 getMountedHeightOffset ()D METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V COMMENT Called when this entity's collision box intersects {@code state}. diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index a2dd58c2fd..e6308fb348 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -601,7 +601,9 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 target METHOD method_6115 isUsingItem ()Z METHOD method_6116 onEquipStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)V + ARG 1 slot ARG 2 oldStack + ARG 3 newStack METHOD method_6117 getLastAttackedTime ()I METHOD method_6118 getEquippedStack (Lnet/minecraft/class_1304;)Lnet/minecraft/class_1799; ARG 1 slot diff --git a/mappings/net/minecraft/entity/damage/DamageTracker.mapping b/mappings/net/minecraft/entity/damage/DamageTracker.mapping index 2f8e9551ab..9d490f432c 100644 --- a/mappings/net/minecraft/entity/damage/DamageTracker.mapping +++ b/mappings/net/minecraft/entity/damage/DamageTracker.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_1283 net/minecraft/entity/damage/DamageTracker FIELD field_29967 DAMAGE_COOLDOWN I FIELD field_29968 ATTACK_DAMAGE_COOLDOWN I + FIELD field_42274 INTENTIONAL_GAME_DESIGN_ISSUE_LINK_STYLE Lnet/minecraft/class_2583; FIELD field_5870 recentDamage Ljava/util/List; FIELD field_5871 fallDeathSuffix Ljava/lang/String; FIELD field_5872 hasDamage Z diff --git a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping index 494ab41878..1ea9b0a436 100644 --- a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping +++ b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2943 net/minecraft/entity/data/TrackedDataHandlerRegistry - FIELD field_13312 OPTIONAL_BLOCK_STATE Lnet/minecraft/class_2941; + FIELD field_13312 BLOCK_STATE Lnet/minecraft/class_2941; FIELD field_13313 OPTIONAL_UUID Lnet/minecraft/class_2941; FIELD field_13314 PARTICLE Lnet/minecraft/class_2941; FIELD field_13315 OPTIONAL_BLOCK_POS Lnet/minecraft/class_2941; @@ -25,6 +25,7 @@ CLASS net/minecraft/class_2943 net/minecraft/entity/data/TrackedDataHandlerRegis FIELD field_39017 PAINTING_VARIANT Lnet/minecraft/class_2941; FIELD field_39965 LONG Lnet/minecraft/class_2941; FIELD field_42235 QUATERNIONF Lnet/minecraft/class_2941; + FIELD field_42236 OPTIONAL_BLOCK_STATE Lnet/minecraft/class_2941; FIELD field_42237 VECTOR3F Lnet/minecraft/class_2941; METHOD method_12719 getId (Lnet/minecraft/class_2941;)I ARG 0 handler diff --git a/mappings/net/minecraft/item/Wearable.mapping b/mappings/net/minecraft/item/Equipment.mapping similarity index 73% rename from mappings/net/minecraft/item/Wearable.mapping rename to mappings/net/minecraft/item/Equipment.mapping index ed71d4a9b3..0f4fc4d6b4 100644 --- a/mappings/net/minecraft/item/Wearable.mapping +++ b/mappings/net/minecraft/item/Equipment.mapping @@ -1,5 +1,5 @@ -CLASS net/minecraft/class_5151 net/minecraft/item/Wearable - COMMENT Represents a type of item that is wearable in an armor equipment slot. +CLASS net/minecraft/class_5151 net/minecraft/item/Equipment + COMMENT Represents a type of item that is wearable in an armor equipment slot, or a shield. COMMENT COMMENT

This type of item can be targeted by the {@code minecraft:binding_curse} enchantment. METHOD method_31570 getEquipSound ()Lnet/minecraft/class_3414; @@ -8,4 +8,6 @@ CLASS net/minecraft/class_5151 net/minecraft/item/Wearable ARG 2 world ARG 3 user ARG 4 hand + METHOD method_48957 fromStack (Lnet/minecraft/class_1799;)Lnet/minecraft/class_5151; + ARG 0 stack METHOD method_7685 getSlotType ()Lnet/minecraft/class_1304; diff --git a/mappings/net/minecraft/item/SmithingTemplateItem.mapping b/mappings/net/minecraft/item/SmithingTemplateItem.mapping index e23bfbc3ba..71714918cc 100644 --- a/mappings/net/minecraft/item/SmithingTemplateItem.mapping +++ b/mappings/net/minecraft/item/SmithingTemplateItem.mapping @@ -35,6 +35,7 @@ CLASS net/minecraft/class_8052 net/minecraft/item/SmithingTemplateItem FIELD field_41991 EMPTY_ARMOR_SLOT_BOOTS_TEXTURE Lnet/minecraft/class_2960; FIELD field_41992 EMPTY_SLOT_HOE_TEXTURE Lnet/minecraft/class_2960; FIELD field_41993 EMPTY_SLOT_AXE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_42472 EMPTY_SLOT_AMETHYST_SHARD_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Ljava/util/List;Ljava/util/List;)V ARG 1 appliesToText ARG 2 ingredientsText diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping index efee939566..41f323717d 100644 --- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping @@ -215,3 +215,5 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_48295 onDamageTilt (Lnet/minecraft/class_8043;)V ARG 1 packet + METHOD method_49034 onEntityDamage (Lnet/minecraft/class_8143;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping new file mode 100644 index 0000000000..a6168300cd --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_8143 net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket + METHOD (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;)V + ARG 1 entity + ARG 2 damageSource + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_49071 createDamageSource (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1282; + ARG 1 world + METHOD method_49072 writeOffsetVarInt (Lnet/minecraft/class_2540;I)V + ARG 0 buf + ARG 1 value + METHOD method_49073 (Lnet/minecraft/class_2540;Lnet/minecraft/class_243;)V + ARG 0 buf + ARG 1 pos + METHOD method_49075 readOffsetVarInt (Lnet/minecraft/class_2540;)I + ARG 0 buf + METHOD method_49076 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_243; + ARG 0 pos diff --git a/mappings/net/minecraft/predicate/TagPredicate.mapping b/mappings/net/minecraft/predicate/TagPredicate.mapping new file mode 100644 index 0000000000..2756c21e74 --- /dev/null +++ b/mappings/net/minecraft/predicate/TagPredicate.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_8129 net/minecraft/predicate/TagPredicate + FIELD field_42477 tag Lnet/minecraft/class_6862; + FIELD field_42478 expected Z + METHOD (Lnet/minecraft/class_6862;Z)V + ARG 1 tag + ARG 2 expected + METHOD method_48964 toJson ()Lcom/google/gson/JsonElement; + METHOD method_48965 expected (Lnet/minecraft/class_6862;)Lnet/minecraft/class_8129; + ARG 0 tag + METHOD method_48966 fromJson (Lcom/google/gson/JsonElement;Lnet/minecraft/class_5321;)Lnet/minecraft/class_8129; + ARG 0 json + ARG 1 registry + METHOD method_48967 test (Lnet/minecraft/class_6880;)Z + ARG 1 registryEntry + METHOD method_48968 unexpected (Lnet/minecraft/class_6862;)Lnet/minecraft/class_8129; + ARG 0 tag diff --git a/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping b/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping index f70896e371..c2341dd7c6 100644 --- a/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping @@ -1,7 +1,12 @@ CLASS net/minecraft/class_2022 net/minecraft/predicate/entity/DamageSourcePredicate + FIELD field_42272 tagPredicates Ljava/util/List; FIELD field_9533 EMPTY Lnet/minecraft/class_2022; FIELD field_9534 directEntity Lnet/minecraft/class_2048; FIELD field_9539 sourceEntity Lnet/minecraft/class_2048; + METHOD (Ljava/util/List;Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;)V + ARG 1 tagPredicates + ARG 2 directEntity + ARG 3 sourceEntity METHOD method_8845 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1282;)Z ARG 1 world ARG 2 pos @@ -13,6 +18,7 @@ CLASS net/minecraft/class_2022 net/minecraft/predicate/entity/DamageSourcePredic ARG 2 damageSource METHOD method_8848 toJson ()Lcom/google/gson/JsonElement; CLASS class_2023 Builder + FIELD field_42273 tagPredicates Lcom/google/common/collect/ImmutableList$Builder; FIELD field_9544 directEntity Lnet/minecraft/class_2048; FIELD field_9545 sourceEntity Lnet/minecraft/class_2048; METHOD method_35130 directEntity (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2022$class_2023; @@ -21,6 +27,8 @@ CLASS net/minecraft/class_2022 net/minecraft/predicate/entity/DamageSourcePredic ARG 1 entity METHOD method_35132 sourceEntity (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2022$class_2023; ARG 1 entity + METHOD method_48785 tag (Lnet/minecraft/class_8129;)Lnet/minecraft/class_2022$class_2023; + ARG 1 tagPredicate METHOD method_8851 build ()Lnet/minecraft/class_2022; METHOD method_8854 directEntity (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2022$class_2023; ARG 1 entity diff --git a/mappings/net/minecraft/screen/PlayerScreenHandler.mapping b/mappings/net/minecraft/screen/PlayerScreenHandler.mapping index 3914ec865b..1857c5900e 100644 --- a/mappings/net/minecraft/screen/PlayerScreenHandler.mapping +++ b/mappings/net/minecraft/screen/PlayerScreenHandler.mapping @@ -18,3 +18,8 @@ CLASS net/minecraft/class_1723 net/minecraft/screen/PlayerScreenHandler METHOD method_29281 getCraftingInput ()Lnet/minecraft/class_1715; METHOD method_36211 isInHotbar (I)Z ARG 0 slot + METHOD method_48930 onEquipStack (Lnet/minecraft/class_1657;Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)V + ARG 0 player + ARG 1 slot + ARG 2 newStack + ARG 3 currentStack diff --git a/mappings/net/minecraft/server/Main.mapping b/mappings/net/minecraft/server/Main.mapping index f22591f779..146200ddd6 100644 --- a/mappings/net/minecraft/server/Main.mapping +++ b/mappings/net/minecraft/server/Main.mapping @@ -19,3 +19,5 @@ CLASS net/minecraft/server/Main ARG 1 session ARG 2 safeMode ARG 3 dataPackManager + METHOD method_49066 writePidFile (Ljava/nio/file/Path;)V + ARG 0 path diff --git a/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping b/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping index 84ed090866..06013d8678 100644 --- a/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping +++ b/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping @@ -25,6 +25,7 @@ CLASS net/minecraft/class_7196 net/minecraft/server/integrated/IntegratedServerL ARG 1 parent ARG 2 lifecycle ARG 3 loader + ARG 4 bypassWarnings METHOD method_41893 (Ljava/lang/Runnable;Lnet/minecraft/class_310;Lnet/minecraft/class_525;Z)V ARG 3 confirmed METHOD method_41894 start (Lnet/minecraft/class_437;Ljava/lang/String;)V diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 282133e5e8..0778942193 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -221,6 +221,9 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 10 volume ARG 11 pitch ARG 12 seed + METHOD method_48760 sendEntityDamage (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;)V + ARG 1 entity + ARG 2 damageSource METHOD method_8413 updateListeners (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;I)V ARG 1 pos ARG 2 oldState