From 28622b1ae176dfcd7a34941eac426fb76744076a Mon Sep 17 00:00:00 2001 From: supersaiyansubtlety Date: Thu, 21 Nov 2024 22:29:11 -0800 Subject: [PATCH 01/12] rename n/m/util/math/BlockPointer -> n/m/block/dispenser/DispenserContext: it holds a DispenserBlockEntity and is used by DispenserBehaviors, context is more conventional than pointer --- .../minecraft/block/dispenser/DispenserBehavior.mapping | 4 +++- .../dispenser/DispenserContext.mapping} | 2 +- .../block/dispenser/ItemDispenserBehavior.mapping | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) rename mappings/net/minecraft/{util/math/BlockPointer.mapping => block/dispenser/DispenserContext.mapping} (68%) diff --git a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping index e57ee143d5..79e5b493bf 100644 --- a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/unmapped/C_ooeeaffg net/minecraft/block/dispenser/DispenserBehavior FIELD f_qafvtfzb LOGGER Lorg/slf4j/Logger; FIELD f_szadkszc NOOP Lnet/minecraft/unmapped/C_ooeeaffg; + METHOD dispense (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk; + ARG 1 context METHOD m_ujgviwhs doDispense (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk; - ARG 0 pointer + ARG 0 context ARG 1 stack METHOD m_ummkrstn registerDefaults ()V diff --git a/mappings/net/minecraft/util/math/BlockPointer.mapping b/mappings/net/minecraft/block/dispenser/DispenserContext.mapping similarity index 68% rename from mappings/net/minecraft/util/math/BlockPointer.mapping rename to mappings/net/minecraft/block/dispenser/DispenserContext.mapping index f55f53de53..3e48a271f1 100644 --- a/mappings/net/minecraft/util/math/BlockPointer.mapping +++ b/mappings/net/minecraft/block/dispenser/DispenserContext.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_wzdnszcs net/minecraft/util/math/BlockPointer +CLASS net/minecraft/unmapped/C_wzdnszcs net/minecraft/block/dispenser/DispenserContext FIELD f_iumwlodc world Lnet/minecraft/unmapped/C_bdwnwhiu; METHOD m_eildmjnz world ()Lnet/minecraft/unmapped/C_bdwnwhiu; METHOD m_jqrqggsy center ()Lnet/minecraft/unmapped/C_vgpupfxx; diff --git a/mappings/net/minecraft/block/dispenser/ItemDispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/ItemDispenserBehavior.mapping index 53c3137b2c..37addbdf11 100644 --- a/mappings/net/minecraft/block/dispenser/ItemDispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/ItemDispenserBehavior.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/unmapped/C_dnfsxzwl net/minecraft/block/dispenser/ItemDispenserBehavior FIELD f_vkzertet DEFAULT_SPAWN_VELOCITY_DEVIATION I METHOD m_bzvzsacf spawnParticles (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_xpuuihxf;)V - ARG 1 pointer + ARG 1 context ARG 2 side METHOD m_clhynwvb dispenseSilently (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk; - ARG 1 pointer + ARG 1 context ARG 2 stack METHOD m_fhxczazc insertAndSpawnExcess (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)V ARG 1 block @@ -14,9 +14,9 @@ CLASS net/minecraft/unmapped/C_dnfsxzwl net/minecraft/block/dispenser/ItemDispen ARG 2 dispensedStack ARG 3 remainder METHOD m_nvxshqvu playSound (Lnet/minecraft/unmapped/C_wzdnszcs;)V - ARG 1 pointer + ARG 1 context METHOD m_umjaspru playDefaultSound (Lnet/minecraft/unmapped/C_wzdnszcs;)V - ARG 0 pointer + ARG 0 context METHOD m_yfabkxkw spawnDefaultParticles (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_xpuuihxf;)V ARG 0 block ARG 1 direction From 72bddfedd7c38fef883fb0bd9b667dd63b20b298 Mon Sep 17 00:00:00 2001 From: supersaiyansubtlety Date: Thu, 21 Nov 2024 23:12:38 -0800 Subject: [PATCH 02/12] complete and clarify BlockHitResult --- mappings/net/minecraft/util/hit/BlockHitResult.mapping | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mappings/net/minecraft/util/hit/BlockHitResult.mapping b/mappings/net/minecraft/util/hit/BlockHitResult.mapping index cd289d07e0..72ec903759 100644 --- a/mappings/net/minecraft/util/hit/BlockHitResult.mapping +++ b/mappings/net/minecraft/util/hit/BlockHitResult.mapping @@ -7,20 +7,21 @@ CLASS net/minecraft/unmapped/C_jdakttms net/minecraft/util/hit/BlockHitResult METHOD (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_hynzadkk;Z)V ARG 2 side ARG 3 blockPos - ARG 4 insideBlock METHOD (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_hynzadkk;ZZ)V + ARG 2 side ARG 3 blockPos METHOD (ZLnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_hynzadkk;ZZ)V + ARG 3 side ARG 4 blockPos METHOD m_ajzjlusu withSide (Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_jdakttms; ARG 1 side - METHOD m_bvfnqjyq createMissed (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_jdakttms; - ARG 0 pos + METHOD m_bvfnqjyq missOf (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_jdakttms; ARG 1 side ARG 2 blockPos METHOD m_cftjzwqf getSide ()Lnet/minecraft/unmapped/C_xpuuihxf; METHOD m_nallecrp withBlockPos (Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_jdakttms; ARG 1 blockPos METHOD m_pfrejwjs hitWorldBorder ()Z + METHOD m_rzuzqmeh withHitWorldBorder ()Lnet/minecraft/unmapped/C_jdakttms; METHOD m_ufhsbnfs isInsideBlock ()Z METHOD m_vjgmulgm getBlockPos ()Lnet/minecraft/unmapped/C_hynzadkk; From 4d7df7f40e5b0095ead298417d61ab16c422c8fc Mon Sep 17 00:00:00 2001 From: supersaiyansubtlety Date: Thu, 21 Nov 2024 23:41:16 -0800 Subject: [PATCH 03/12] map MinecartDispenserBehavior --- .../block/dispenser/MinecartDispenserBehavior.mapping | 4 ++++ mappings/net/minecraft/world/BlockView.mapping | 1 + 2 files changed, 5 insertions(+) create mode 100644 mappings/net/minecraft/block/dispenser/MinecartDispenserBehavior.mapping diff --git a/mappings/net/minecraft/block/dispenser/MinecartDispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/MinecartDispenserBehavior.mapping new file mode 100644 index 0000000000..c7e74eafa5 --- /dev/null +++ b/mappings/net/minecraft/block/dispenser/MinecartDispenserBehavior.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/unmapped/C_ueplrtkn net/minecraft/block/dispenser/MinecartDispenserBehavior + FIELD f_cncndyni minecartType Lnet/minecraft/unmapped/C_ogavsvbr; + FIELD f_vkvgsepf fallbackBehavior Lnet/minecraft/unmapped/C_dnfsxzwl; + METHOD m_usvwpxuu getRailShape (Lnet/minecraft/unmapped/C_txtbiemp;)Lnet/minecraft/unmapped/C_wqmdpcsg; diff --git a/mappings/net/minecraft/world/BlockView.mapping b/mappings/net/minecraft/world/BlockView.mapping index 4fc2dcfd86..b65cbca0da 100644 --- a/mappings/net/minecraft/world/BlockView.mapping +++ b/mappings/net/minecraft/world/BlockView.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/unmapped/C_peaveboq net/minecraft/world/BlockView COMMENT Represents a scoped, read-only view of block states, fluid states and block entities. + FIELD f_evjnqixv MAX_COLLISION_COLLECTION_BLOCK_ITERATIONS I METHOD m_bwuplpck (Lnet/minecraft/unmapped/C_rvvvywqd;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_jdakttms; ARG 1 context ARG 2 pos From d783f48e51e1340337f61980ea8213e349e74004 Mon Sep 17 00:00:00 2001 From: supersaiyansubtlety Date: Fri, 22 Nov 2024 01:21:41 -0800 Subject: [PATCH 04/12] add simple type for Hand --- simple_type_field_names.json5 | 1 + 1 file changed, 1 insertion(+) diff --git a/simple_type_field_names.json5 b/simple_type_field_names.json5 index 6b1d525789..884d599cdb 100644 --- a/simple_type_field_names.json5 +++ b/simple_type_field_names.json5 @@ -163,6 +163,7 @@ "contextKey" ] }, + "net/minecraft/unmapped/C_laxmzoqs": "hand", // Hand // Village "net/minecraft/unmapped/C_argwryfu": { // TradeOffer From b9a2ddd7d3bc95936f12c678ba041ac84665e951 Mon Sep 17 00:00:00 2001 From: supersaiyansubtlety Date: Fri, 22 Nov 2024 01:25:27 -0800 Subject: [PATCH 05/12] map EquipmentDispenserBehavior --- .../block/dispenser/EquipmentDispenserBehavior.mapping | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 mappings/net/minecraft/block/dispenser/EquipmentDispenserBehavior.mapping diff --git a/mappings/net/minecraft/block/dispenser/EquipmentDispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/EquipmentDispenserBehavior.mapping new file mode 100644 index 0000000000..a4e0ec757c --- /dev/null +++ b/mappings/net/minecraft/block/dispenser/EquipmentDispenserBehavior.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/unmapped/C_grwaorwt net/minecraft/block/dispenser/EquipmentDispenserBehavior + FIELD f_fngceafg INSTANCE Lnet/minecraft/unmapped/C_grwaorwt; + METHOD m_rnoitqxu tryDispensingEquipment (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Z + ARG 0 context From e723c40d54018b4bd7a85a7153806c8f3aa149c7 Mon Sep 17 00:00:00 2001 From: supersaiyansubtlety Date: Fri, 22 Nov 2024 01:26:15 -0800 Subject: [PATCH 06/12] complete n/m/block/dispenser complete CauldronBehavior rename Bootstrap -> Bootstrapper and make bootstrap methods names consistent --- ...Bootstrap.mapping => Bootstrapper.mapping} | 6 ++--- .../block/cauldron/CauldronBehavior.mapping | 14 +---------- .../block/dispenser/DispenserBehavior.mapping | 25 ++++++++++++++++++- .../block/dispenser/DispenserBlock.mapping | 3 ++- .../dispenser/ItemDispenserBehavior.mapping | 2 +- .../ClientPlayerInteractionManager.mapping | 2 +- .../command/EntitySelectorOptions.mapping | 2 +- .../net/minecraft/world/WorldEvents.mapping | 2 +- .../java/net/minecraft/package-info.java | 2 +- 9 files changed, 35 insertions(+), 23 deletions(-) rename mappings/net/minecraft/{Bootstrap.mapping => Bootstrapper.mapping} (89%) diff --git a/mappings/net/minecraft/Bootstrap.mapping b/mappings/net/minecraft/Bootstrapper.mapping similarity index 89% rename from mappings/net/minecraft/Bootstrap.mapping rename to mappings/net/minecraft/Bootstrapper.mapping index 058657385f..6d711dae5d 100644 --- a/mappings/net/minecraft/Bootstrap.mapping +++ b/mappings/net/minecraft/Bootstrapper.mapping @@ -1,5 +1,5 @@ -CLASS net/minecraft/unmapped/C_ntskruzf net/minecraft/Bootstrap - FIELD f_jltdqkzo initialized Z +CLASS net/minecraft/unmapped/C_ntskruzf net/minecraft/Bootstrapper + FIELD f_jltdqkzo bootstrapped Z FIELD f_ngridedi LOGGER Lorg/slf4j/Logger; FIELD f_xjyhgcuw SYSOUT Ljava/io/PrintStream; FIELD f_zebjlhsd bootstrapTime Ljava/util/concurrent/atomic/AtomicLong; @@ -16,7 +16,7 @@ CLASS net/minecraft/unmapped/C_ntskruzf net/minecraft/Bootstrap ARG 0 translations METHOD m_kjgvbqvf (Ljava/util/function/Function;Lnet/minecraft/unmapped/C_gedhbjjb;Ljava/util/Set;Ljava/lang/Object;)V ARG 3 object - METHOD m_prdfbylm initialize ()V + METHOD m_prdfbylm bootstrap ()V METHOD m_ttynpujp getMissingTranslations ()Ljava/util/Set; METHOD m_zldxcyiq (Ljava/lang/String;)V ARG 0 key diff --git a/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping b/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping index 78c8ec3622..f433c57905 100644 --- a/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping +++ b/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping @@ -10,16 +10,13 @@ CLASS net/minecraft/unmapped/C_hwbtrnnh net/minecraft/block/cauldron/CauldronBeh ARG 1 world ARG 2 pos ARG 3 player - ARG 4 hand ARG 5 stack METHOD m_cdnivare (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj; ARG 0 state ARG 3 player - ARG 4 hand METHOD m_cwysngpe (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj; ARG 0 state ARG 3 player - ARG 4 hand METHOD m_gzbzxllj (Lnet/minecraft/unmapped/C_txtbiemp;)Z ARG 0 state METHOD m_ilwjclcm (Lnet/minecraft/unmapped/C_txtbiemp;)Z @@ -32,18 +29,14 @@ CLASS net/minecraft/unmapped/C_hwbtrnnh net/minecraft/block/cauldron/CauldronBeh ARG 0 behavior METHOD m_qajrbgzr fillWaterCauldron (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj; METHOD m_qqxoejhi cleanBanner (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj; - ARG 4 hand METHOD m_ubhkjwij cleanShulkerBox (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj; - ARG 4 hand - METHOD m_ucoeawqp registerBehavior ()V + METHOD m_ucoeawqp bootstrap ()V METHOD m_vaydxxdu cleanDyeable (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj; - ARG 4 hand METHOD m_vtaiddsw emptyCauldron (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;Ljava/util/function/Predicate;Lnet/minecraft/unmapped/C_avavozay;)Lnet/minecraft/unmapped/C_ozuepbyj; ARG 0 state ARG 1 world ARG 2 pos ARG 3 player - ARG 4 hand ARG 5 stack ARG 6 output ARG 7 predicate @@ -53,27 +46,22 @@ CLASS net/minecraft/unmapped/C_hwbtrnnh net/minecraft/block/cauldron/CauldronBeh ARG 1 world ARG 2 pos ARG 3 player - ARG 4 hand ARG 5 stack METHOD m_wzwvxxvl (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj; ARG 3 player - ARG 4 hand METHOD m_xhjoujgn (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj; ARG 0 state ARG 1 world ARG 2 pos ARG 3 player - ARG 4 hand ARG 5 stack METHOD m_ygjkpclc (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj; ARG 0 state ARG 3 player - ARG 4 hand METHOD m_zebtxswi fillCauldron (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_avavozay;)Lnet/minecraft/unmapped/C_ozuepbyj; ARG 0 world ARG 1 pos ARG 2 player - ARG 3 hand ARG 4 stack ARG 5 state ARG 6 soundEvent diff --git a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping index 79e5b493bf..3ca5853e2a 100644 --- a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping @@ -6,4 +6,27 @@ CLASS net/minecraft/unmapped/C_ooeeaffg net/minecraft/block/dispenser/DispenserB METHOD m_ujgviwhs doDispense (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk; ARG 0 context ARG 1 stack - METHOD m_ummkrstn registerDefaults ()V + METHOD m_ummkrstn bootstrap ()V + CLASS C_genfnnji + FIELD f_rnenkqvi fallbackBehavior Lnet/minecraft/unmapped/C_dnfsxzwl; + CLASS C_gwoiejxt + METHOD m_fbmpzyvo (Lnet/minecraft/unmapped/C_vorddnax;)V + ARG 0 unused + CLASS C_hbfucibf + METHOD m_idvddspb (Lnet/minecraft/unmapped/C_javurlgg;)Z + ARG 0 donkey + CLASS C_ivungvuf + FIELD f_guppwqen fallbackBehavior Lnet/minecraft/unmapped/C_dnfsxzwl; + CLASS C_kaaebxym + METHOD m_nisfpukw (Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_nknvrhfn;)V + ARG 1 armorStand + CLASS C_pgomfdlr + METHOD m_yngxetbi (Lnet/minecraft/unmapped/C_vorddnax;)V + ARG 0 unused + CLASS C_wocbrvrh + METHOD m_eihslyjq consumeBottle (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk; + ARG 1 pointer + ARG 2 dispensedStack + ARG 3 remainder + METHOD m_fsqwlyud (Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;)Z + ARG 0 state diff --git a/mappings/net/minecraft/block/dispenser/DispenserBlock.mapping b/mappings/net/minecraft/block/dispenser/DispenserBlock.mapping index 5d6d111e08..ca6a96ae91 100644 --- a/mappings/net/minecraft/block/dispenser/DispenserBlock.mapping +++ b/mappings/net/minecraft/block/dispenser/DispenserBlock.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/unmapped/C_sridforj net/minecraft/block/dispenser/DispenserB FIELD f_kigvivjn FACING Lnet/minecraft/unmapped/C_cgckxfsw; FIELD f_mqswtdqm TRIGGERED Lnet/minecraft/unmapped/C_xhwijdsd; FIELD f_xxtgryhz DEFAULT_BEHAVIOR Lnet/minecraft/unmapped/C_dnfsxzwl; - METHOD m_fnobacze getBehaviorForItem (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ooeeaffg; + METHOD m_fnobacze getBehavior (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ooeeaffg; ARG 2 stack METHOD m_jiinrsul registerBehavior (Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_ooeeaffg;)V ARG 0 provider @@ -16,6 +16,7 @@ CLASS net/minecraft/unmapped/C_sridforj net/minecraft/block/dispenser/DispenserB ARG 3 offset METHOD m_omkokomw registerBehavior (Lnet/minecraft/unmapped/C_gmbqjnle;)V ARG 0 item + METHOD m_pktcfwfi getBehavior (Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ooeeaffg; METHOD m_tfzksanp getDispensePos (Lnet/minecraft/unmapped/C_wzdnszcs;)Lnet/minecraft/unmapped/C_ogbhoqwb; ARG 0 block METHOD m_xmkonidr dispense (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_hynzadkk;)V diff --git a/mappings/net/minecraft/block/dispenser/ItemDispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/ItemDispenserBehavior.mapping index 37addbdf11..814f51e843 100644 --- a/mappings/net/minecraft/block/dispenser/ItemDispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/ItemDispenserBehavior.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/unmapped/C_dnfsxzwl net/minecraft/block/dispenser/ItemDispen ARG 1 context ARG 2 side METHOD m_clhynwvb dispenseSilently (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk; - ARG 1 context + ARG 1 pointer ARG 2 stack METHOD m_fhxczazc insertAndSpawnExcess (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)V ARG 1 block diff --git a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping index fbf8c3abbc..5d04044e95 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping @@ -92,7 +92,7 @@ CLASS net/minecraft/unmapped/C_uxbydbcj net/minecraft/client/network/ClientPlaye METHOD m_vvsqjptk sendActionPacket (Lnet/minecraft/unmapped/C_ghdnlrrw;Lnet/minecraft/unmapped/C_suesdakf;)V ARG 2 packetFactory METHOD m_wflwwroo hasRidingInventory ()Z - METHOD m_wiqrsdhj doInteractBlock (Lnet/minecraft/unmapped/C_jlopmfei;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_jdakttms;)Lnet/minecraft/unmapped/C_ozuepbyj; + METHOD m_wiqrsdhj interactBlockImpl (Lnet/minecraft/unmapped/C_jlopmfei;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_jdakttms;)Lnet/minecraft/unmapped/C_ozuepbyj; ARG 1 player ARG 2 hand ARG 3 hitResult diff --git a/mappings/net/minecraft/command/EntitySelectorOptions.mapping b/mappings/net/minecraft/command/EntitySelectorOptions.mapping index 0d5cf61297..453caf0359 100644 --- a/mappings/net/minecraft/command/EntitySelectorOptions.mapping +++ b/mappings/net/minecraft/command/EntitySelectorOptions.mapping @@ -73,7 +73,7 @@ CLASS net/minecraft/unmapped/C_pgmsoxco net/minecraft/command/EntitySelectorOpti ARG 0 reader METHOD m_onjxcyst (Lnet/minecraft/unmapped/C_iejqjrhb;)V ARG 0 reader - METHOD m_otjwzrqy register ()V + METHOD m_otjwzrqy bootstrap ()V METHOD m_pcivztzq (Lnet/minecraft/unmapped/C_iejqjrhb;)V ARG 0 reader METHOD m_ptvtrdeo (Lnet/minecraft/unmapped/C_iejqjrhb;)V diff --git a/mappings/net/minecraft/world/WorldEvents.mapping b/mappings/net/minecraft/world/WorldEvents.mapping index 3e7c57cf75..1767b238bd 100644 --- a/mappings/net/minecraft/world/WorldEvents.mapping +++ b/mappings/net/minecraft/world/WorldEvents.mapping @@ -149,7 +149,7 @@ CLASS net/minecraft/unmapped/C_kkbhcwdu net/minecraft/world/WorldEvents COMMENT Bone meal is used. COMMENT
Plays the bone meal item used sound event and spawns happy villager particles. COMMENT

Called by {@link net.minecraft.item.BoneMealItem#useOnBlock(net.minecraft.item.ItemUsageContext) BoneMealItem#useOnBlock}, - COMMENT an anonymus class in {@link net.minecraft.block.dispenser.DispenserBehavior#registerDefaults() DispenserBehavior#registerDefaults}, + COMMENT an anonymus class in {@link net.minecraft.block.dispenser.DispenserBehavior#bootstrap() DispenserBehavior#bootstrap}, COMMENT and {@link net.minecraft.entity.ai.brain.task.BoneMealTask#keepRunning(net.minecraft.server.world.ServerWorld, net.minecraft.entity.passive.VillagerEntity, long) BoneMealTask#keepRunning} FIELD f_mraaptwq TRIAL_SPAWNER_DETECTS_PLAYER I FIELD f_mwaqmoge DISPENSER_LAUNCHES_PROJECTILE I diff --git a/src/packageDocs/java/net/minecraft/package-info.java b/src/packageDocs/java/net/minecraft/package-info.java index 76a34b4468..5ebc19da8c 100644 --- a/src/packageDocs/java/net/minecraft/package-info.java +++ b/src/packageDocs/java/net/minecraft/package-info.java @@ -7,7 +7,7 @@ * in their intermediary names. * *

Unmapped classes go into this package by default. This package additionally contains - * {@link Bootstrap}, {@link SharedConstants}, and {@link MinecraftVersion} classes. + * {@link Bootstrapper}, {@link SharedConstants}, and {@link MinecraftVersion} classes. * */ From b4c8a8e24c185be7aea97a5fd12c6eeb729ecb79 Mon Sep 17 00:00:00 2001 From: supersaiyansubtlety Date: Fri, 22 Nov 2024 02:52:47 -0800 Subject: [PATCH 07/12] rename ItemDispenserBehavior -> DefaultDispenserBehavior rename FallibleItemDispenserBehavior -> FallibleDispenserBehavior --- ...serBehavior.mapping => DefaultDispenserBehavior.mapping} | 2 +- ...erBehavior.mapping => FallibleDispenserBehavior.mapping} | 2 +- mappings/net/minecraft/world/WorldEvents.mapping | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename mappings/net/minecraft/block/dispenser/{ItemDispenserBehavior.mapping => DefaultDispenserBehavior.mapping} (97%) rename mappings/net/minecraft/block/dispenser/{FallibleItemDispenserBehavior.mapping => FallibleDispenserBehavior.mapping} (83%) diff --git a/mappings/net/minecraft/block/dispenser/ItemDispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/DefaultDispenserBehavior.mapping similarity index 97% rename from mappings/net/minecraft/block/dispenser/ItemDispenserBehavior.mapping rename to mappings/net/minecraft/block/dispenser/DefaultDispenserBehavior.mapping index 814f51e843..c6b5943714 100644 --- a/mappings/net/minecraft/block/dispenser/ItemDispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/DefaultDispenserBehavior.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_dnfsxzwl net/minecraft/block/dispenser/ItemDispenserBehavior +CLASS net/minecraft/unmapped/C_dnfsxzwl net/minecraft/block/dispenser/DefaultDispenserBehavior FIELD f_vkzertet DEFAULT_SPAWN_VELOCITY_DEVIATION I METHOD m_bzvzsacf spawnParticles (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_xpuuihxf;)V ARG 1 context diff --git a/mappings/net/minecraft/block/dispenser/FallibleItemDispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/FallibleDispenserBehavior.mapping similarity index 83% rename from mappings/net/minecraft/block/dispenser/FallibleItemDispenserBehavior.mapping rename to mappings/net/minecraft/block/dispenser/FallibleDispenserBehavior.mapping index ffc5d436a0..f2dbafc2f4 100644 --- a/mappings/net/minecraft/block/dispenser/FallibleItemDispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/FallibleDispenserBehavior.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_hptpezss net/minecraft/block/dispenser/FallibleItemDispenserBehavior +CLASS net/minecraft/unmapped/C_hptpezss net/minecraft/block/dispenser/FallibleDispenserBehavior FIELD f_esneqxoh success Z METHOD m_lqrzzjek setSuccess (Z)V ARG 1 success diff --git a/mappings/net/minecraft/world/WorldEvents.mapping b/mappings/net/minecraft/world/WorldEvents.mapping index 1767b238bd..3fe9a92137 100644 --- a/mappings/net/minecraft/world/WorldEvents.mapping +++ b/mappings/net/minecraft/world/WorldEvents.mapping @@ -40,7 +40,7 @@ CLASS net/minecraft/unmapped/C_kkbhcwdu net/minecraft/world/WorldEvents COMMENT
Plays the dispenser fail sound event. COMMENT

Called by {@link net.minecraft.block.dispenser.DispenserBlock#dispense(net.minecraft.server.world.ServerWorld, net.minecraft.block.BlockState, net.minecraft.util.math.BlockPos) DispenserBlock#dispense}, COMMENT {@link net.minecraft.block.DropperBlock#dispense(net.minecraft.server.world.ServerWorld, net.minecraft.block.BlockState, net.minecraft.util.math.BlockPos) DropperBlock#dispense}, - COMMENT and {@link net.minecraft.block.dispenser.FallibleItemDispenserBehavior#playSound(net.minecraft.util.math.BlockPointer) FallibleItemDispenserBehavior#playSound} + COMMENT and {@link net.minecraft.block.dispenser.FallibleDispenserBehavior#playSound(net.minecraft.util.math.BlockPointer) FallibleDispenserBehavior#playSound} FIELD f_dxpbmduz HUSK_CONVERTS_TO_ZOMBIE I COMMENT A Husk converts into a Zombie. COMMENT
Plays the husk convert to zombie sound event. @@ -101,8 +101,8 @@ CLASS net/minecraft/unmapped/C_kkbhcwdu net/minecraft/world/WorldEvents COMMENT A Dispenser dispenses an item. COMMENT
Plays the dispensing sound event. COMMENT

Called by {@link net.minecraft.block.dispenser.BoatDispenserBehavior#playSound(net.minecraft.util.math.BlockPointer) BoatDispenserBehavior#playSound}, - COMMENT {@link net.minecraft.block.dispenser.FallibleItemDispenserBehavior#playSound(net.minecraft.util.math.BlockPointer) FallibleItemDispenserBehavior#playSound}, - COMMENT and {@link net.minecraft.block.dispenser.ItemDispenserBehavior#playSound(net.minecraft.util.math.BlockPointer) ItemDispenserBehavior#playSound} + COMMENT {@link net.minecraft.block.dispenser.FallibleDispenserBehavior#playSound(net.minecraft.util.math.BlockPointer) FallibleDispenserBehavior#playSound}, + COMMENT and {@link net.minecraft.block.dispenser.DefaultDispenserBehavior#playSound(net.minecraft.util.math.BlockPointer) DefaultDispenserBehavior#playSound} FIELD f_inmlykmt ENDER_DRAGON_BREAKS_BLOCK I COMMENT An Ender Dragon breaks a block. COMMENT
Spawns an explosion particle. From f8cdca0c7f14e7577f669aadfadd294b2ee944cf Mon Sep 17 00:00:00 2001 From: supersaiyansubtlety Date: Sun, 24 Nov 2024 19:07:50 -0800 Subject: [PATCH 08/12] restore old name Bootstrapper -> Bootstrap --- .../net/minecraft/{Bootstrapper.mapping => Bootstrap.mapping} | 2 +- src/packageDocs/java/net/minecraft/package-info.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename mappings/net/minecraft/{Bootstrapper.mapping => Bootstrap.mapping} (94%) diff --git a/mappings/net/minecraft/Bootstrapper.mapping b/mappings/net/minecraft/Bootstrap.mapping similarity index 94% rename from mappings/net/minecraft/Bootstrapper.mapping rename to mappings/net/minecraft/Bootstrap.mapping index 6d711dae5d..deb1793dde 100644 --- a/mappings/net/minecraft/Bootstrapper.mapping +++ b/mappings/net/minecraft/Bootstrap.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_ntskruzf net/minecraft/Bootstrapper +CLASS net/minecraft/unmapped/C_ntskruzf net/minecraft/Bootstrap FIELD f_jltdqkzo bootstrapped Z FIELD f_ngridedi LOGGER Lorg/slf4j/Logger; FIELD f_xjyhgcuw SYSOUT Ljava/io/PrintStream; diff --git a/src/packageDocs/java/net/minecraft/package-info.java b/src/packageDocs/java/net/minecraft/package-info.java index 5ebc19da8c..76a34b4468 100644 --- a/src/packageDocs/java/net/minecraft/package-info.java +++ b/src/packageDocs/java/net/minecraft/package-info.java @@ -7,7 +7,7 @@ * in their intermediary names. * *

Unmapped classes go into this package by default. This package additionally contains - * {@link Bootstrapper}, {@link SharedConstants}, and {@link MinecraftVersion} classes. + * {@link Bootstrap}, {@link SharedConstants}, and {@link MinecraftVersion} classes. * */ From 2d4e8bfdaa213b5b35de01af2127a532fe2d98e6 Mon Sep 17 00:00:00 2001 From: actions-user Date: Mon, 2 Dec 2024 23:44:12 +0000 Subject: [PATCH 09/12] Drop invalid mappings --- .../block/dispenser/DispenserBehavior.mapping | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping index 3ca5853e2a..4ba35ba1cf 100644 --- a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping @@ -1,32 +1,11 @@ CLASS net/minecraft/unmapped/C_ooeeaffg net/minecraft/block/dispenser/DispenserBehavior FIELD f_qafvtfzb LOGGER Lorg/slf4j/Logger; FIELD f_szadkszc NOOP Lnet/minecraft/unmapped/C_ooeeaffg; - METHOD dispense (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk; - ARG 1 context METHOD m_ujgviwhs doDispense (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk; ARG 0 context ARG 1 stack METHOD m_ummkrstn bootstrap ()V CLASS C_genfnnji FIELD f_rnenkqvi fallbackBehavior Lnet/minecraft/unmapped/C_dnfsxzwl; - CLASS C_gwoiejxt - METHOD m_fbmpzyvo (Lnet/minecraft/unmapped/C_vorddnax;)V - ARG 0 unused - CLASS C_hbfucibf - METHOD m_idvddspb (Lnet/minecraft/unmapped/C_javurlgg;)Z - ARG 0 donkey CLASS C_ivungvuf FIELD f_guppwqen fallbackBehavior Lnet/minecraft/unmapped/C_dnfsxzwl; - CLASS C_kaaebxym - METHOD m_nisfpukw (Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_nknvrhfn;)V - ARG 1 armorStand - CLASS C_pgomfdlr - METHOD m_yngxetbi (Lnet/minecraft/unmapped/C_vorddnax;)V - ARG 0 unused - CLASS C_wocbrvrh - METHOD m_eihslyjq consumeBottle (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk; - ARG 1 pointer - ARG 2 dispensedStack - ARG 3 remainder - METHOD m_fsqwlyud (Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;)Z - ARG 0 state From f95f53f5c2e4be6cb9ffd10fb60032cc0c69ba5e Mon Sep 17 00:00:00 2001 From: supersaiyansubtlety Date: Mon, 2 Dec 2024 16:02:40 -0800 Subject: [PATCH 10/12] re-complete DispenserBehavior rename DefaultDispenserBehavior dispenseSilently -> dispenseImpl and correct its old pointer param name --- .../DefaultDispenserBehavior.mapping | 4 ++-- .../block/dispenser/DispenserBehavior.mapping | 21 +++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/block/dispenser/DefaultDispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/DefaultDispenserBehavior.mapping index c6b5943714..1b48fc51c3 100644 --- a/mappings/net/minecraft/block/dispenser/DefaultDispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/DefaultDispenserBehavior.mapping @@ -3,8 +3,8 @@ CLASS net/minecraft/unmapped/C_dnfsxzwl net/minecraft/block/dispenser/DefaultDis METHOD m_bzvzsacf spawnParticles (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_xpuuihxf;)V ARG 1 context ARG 2 side - METHOD m_clhynwvb dispenseSilently (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk; - ARG 1 pointer + METHOD m_clhynwvb dispenseImpl (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk; + ARG 1 context ARG 2 stack METHOD m_fhxczazc insertAndSpawnExcess (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)V ARG 1 block diff --git a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping index 4ba35ba1cf..7a34068da6 100644 --- a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping @@ -1,11 +1,32 @@ CLASS net/minecraft/unmapped/C_ooeeaffg net/minecraft/block/dispenser/DispenserBehavior FIELD f_qafvtfzb LOGGER Lorg/slf4j/Logger; FIELD f_szadkszc NOOP Lnet/minecraft/unmapped/C_ooeeaffg; + METHOD dispense (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk; + ARG 1 context METHOD m_ujgviwhs doDispense (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk; ARG 0 context ARG 1 stack METHOD m_ummkrstn bootstrap ()V CLASS C_genfnnji FIELD f_rnenkqvi fallbackBehavior Lnet/minecraft/unmapped/C_dnfsxzwl; + CLASS C_gwoiejxt + METHOD m_fbmpzyvo (Lnet/minecraft/unmapped/C_vorddnax;)V + ARG 0 unused + CLASS C_hbfucibf + METHOD m_idvddspb (Lnet/minecraft/unmapped/C_javurlgg;)Z + ARG 0 donkey CLASS C_ivungvuf FIELD f_guppwqen fallbackBehavior Lnet/minecraft/unmapped/C_dnfsxzwl; + CLASS C_kaaebxym + METHOD m_nisfpukw (Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_nknvrhfn;)V + ARG 1 armorStand + CLASS C_pgomfdlr + METHOD m_yngxetbi (Lnet/minecraft/unmapped/C_vorddnax;)V + ARG 0 unused + CLASS C_wocbrvrh + METHOD m_eihslyjq consumeBottle (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk; + ARG 1 context + ARG 2 dispensedStack + ARG 3 remainder + METHOD m_fsqwlyud (Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;)Z + ARG 0 state From 809f8dc82204fce46632c8a5a72c121c07fe2b6f Mon Sep 17 00:00:00 2001 From: actions-user Date: Wed, 4 Dec 2024 00:37:30 +0000 Subject: [PATCH 11/12] Drop invalid mappings --- .../block/dispenser/DispenserBehavior.mapping | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping index 7a34068da6..4ba35ba1cf 100644 --- a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping @@ -1,32 +1,11 @@ CLASS net/minecraft/unmapped/C_ooeeaffg net/minecraft/block/dispenser/DispenserBehavior FIELD f_qafvtfzb LOGGER Lorg/slf4j/Logger; FIELD f_szadkszc NOOP Lnet/minecraft/unmapped/C_ooeeaffg; - METHOD dispense (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk; - ARG 1 context METHOD m_ujgviwhs doDispense (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk; ARG 0 context ARG 1 stack METHOD m_ummkrstn bootstrap ()V CLASS C_genfnnji FIELD f_rnenkqvi fallbackBehavior Lnet/minecraft/unmapped/C_dnfsxzwl; - CLASS C_gwoiejxt - METHOD m_fbmpzyvo (Lnet/minecraft/unmapped/C_vorddnax;)V - ARG 0 unused - CLASS C_hbfucibf - METHOD m_idvddspb (Lnet/minecraft/unmapped/C_javurlgg;)Z - ARG 0 donkey CLASS C_ivungvuf FIELD f_guppwqen fallbackBehavior Lnet/minecraft/unmapped/C_dnfsxzwl; - CLASS C_kaaebxym - METHOD m_nisfpukw (Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_nknvrhfn;)V - ARG 1 armorStand - CLASS C_pgomfdlr - METHOD m_yngxetbi (Lnet/minecraft/unmapped/C_vorddnax;)V - ARG 0 unused - CLASS C_wocbrvrh - METHOD m_eihslyjq consumeBottle (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk; - ARG 1 context - ARG 2 dispensedStack - ARG 3 remainder - METHOD m_fsqwlyud (Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;)Z - ARG 0 state From bbbb9681b9e2e99a624c399f598f7d16385ff3ba Mon Sep 17 00:00:00 2001 From: supersaiyansubtlety Date: Fri, 17 Jan 2025 17:20:31 -0800 Subject: [PATCH 12/12] update javadoc references in WorldEvents --- mappings/net/minecraft/world/WorldEvents.mapping | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mappings/net/minecraft/world/WorldEvents.mapping b/mappings/net/minecraft/world/WorldEvents.mapping index 20f2e26f2b..8aac472056 100644 --- a/mappings/net/minecraft/world/WorldEvents.mapping +++ b/mappings/net/minecraft/world/WorldEvents.mapping @@ -40,7 +40,7 @@ CLASS net/minecraft/unmapped/C_kkbhcwdu net/minecraft/world/WorldEvents COMMENT
Plays the dispenser fail sound event. COMMENT

Called by {@link net.minecraft.block.dispenser.DispenserBlock#dispense(net.minecraft.server.world.ServerWorld, net.minecraft.block.BlockState, net.minecraft.util.math.BlockPos) DispenserBlock#dispense}, COMMENT {@link net.minecraft.block.DropperBlock#dispense(net.minecraft.server.world.ServerWorld, net.minecraft.block.BlockState, net.minecraft.util.math.BlockPos) DropperBlock#dispense}, - COMMENT and {@link net.minecraft.block.dispenser.FallibleDispenserBehavior#playSound(net.minecraft.util.math.BlockPointer) FallibleDispenserBehavior#playSound} + COMMENT and {@link net.minecraft.block.dispenser.FallibleDispenserBehavior#playSound(net.minecraft.block.dispenser.DispenserContext) FallibleDispenserBehavior#playSound} FIELD f_dxpbmduz HUSK_CONVERTS_TO_ZOMBIE I COMMENT A Husk converts into a Zombie. COMMENT
Plays the husk convert to zombie sound event. @@ -100,9 +100,9 @@ CLASS net/minecraft/unmapped/C_kkbhcwdu net/minecraft/world/WorldEvents FIELD f_hcwfwxmp DISPENSER_DISPENSES I COMMENT A Dispenser dispenses an item. COMMENT
Plays the dispensing sound event. - COMMENT

Called by {@link net.minecraft.block.dispenser.BoatDispenserBehavior#playSound(net.minecraft.util.math.BlockPointer) BoatDispenserBehavior#playSound}, - COMMENT {@link net.minecraft.block.dispenser.FallibleDispenserBehavior#playSound(net.minecraft.util.math.BlockPointer) FallibleDispenserBehavior#playSound}, - COMMENT and {@link net.minecraft.block.dispenser.DefaultDispenserBehavior#playSound(net.minecraft.util.math.BlockPointer) DefaultDispenserBehavior#playSound} + COMMENT

Called by {@link net.minecraft.block.dispenser.BoatDispenserBehavior#playSound(net.minecraft.block.dispenser.DispenserContext) BoatDispenserBehavior#playSound}, + COMMENT {@link net.minecraft.block.dispenser.FallibleDispenserBehavior#playSound(net.minecraft.block.dispenser.DispenserContext) FallibleItemDispenserBehavior#playSound}, + COMMENT and {@link net.minecraft.block.dispenser.DefaultDispenserBehavior#playSound(net.minecraft.block.dispenser.DispenserContext) ItemDispenserBehavior#playSound} FIELD f_inmlykmt ENDER_DRAGON_BREAKS_BLOCK I COMMENT An Ender Dragon breaks a block. COMMENT
Spawns an explosion particle.