Skip to content

Commit

Permalink
Map a whole bunch of stuff (#530)
Browse files Browse the repository at this point in the history
* map n/m/block as much as I can

Now at 99.0%! Up about 4.5% from when I started :)

* fully map n/m/command

100%! 🎉

* fully map n/m/scoreboard

99.8%(471/472), only one that's missing is a mysterious constant in Scoreboard that Yarn doesn't have a name for either, so I didn't map it.

* fully map n/m/client/realms

kaBAM, another mapping bites the dust

* fully map n/m/resource

*DJ Khaled voice* Another one

* Fix indentation in Crafter.mapping

---------

Co-authored-by: Iota <[email protected]>
  • Loading branch information
pyrox0 and IotaBread authored Jan 17, 2024
1 parent 510f7e6 commit 55a4634
Show file tree
Hide file tree
Showing 305 changed files with 884 additions and 26 deletions.
23 changes: 23 additions & 0 deletions mappings/net/minecraft/block/AbstractBlock.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
ARG 3 pos
ARG 4 direction
METHOD m_bmyhbvlk createCodec (Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec;
ARG 0 settingsFunction
METHOD m_bneobcwj scheduledTick (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_rlomrsco;)V
ARG 1 state
ARG 2 world
Expand All @@ -34,6 +35,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
ARG 3 pos
ARG 4 oldState
ARG 5 notify
METHOD m_copdixka getSettingsCodec ()Lcom/mojang/serialization/codecs/RecordCodecBuilder;
METHOD m_csxalmdu calcBlockBreakingDelta (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;)F
ARG 1 state
ARG 2 player
Expand Down Expand Up @@ -69,7 +71,9 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
ARG 2 world
ARG 3 pos
METHOD m_jzhgkbwu onInteract (Lnet/minecraft/unmapped/C_sddaxwyk;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_jdakttms;)Lnet/minecraft/unmapped/C_gqmsalid;
ARG 5 entity
ARG 6 hand
ARG 7 hitResult
METHOD m_ktunuucb onBlockBreakStart (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;)V
ARG 1 state
ARG 2 world
Expand Down Expand Up @@ -109,6 +113,8 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
ARG 2 stateFrom
ARG 3 direction
METHOD m_pguoxmgn onUse (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_jdakttms;)Lnet/minecraft/unmapped/C_ozuepbyj;
ARG 4 entity
ARG 5 hitResult
METHOD m_phzfypqf getCollisionShape (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_pbfjvesm;)Lnet/minecraft/unmapped/C_zscvhwbd;
ARG 1 state
ARG 2 world
Expand All @@ -124,6 +130,9 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
ARG 1 state
ARG 2 world
ARG 3 pos
METHOD m_qjdjbqgu onExplosion (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_aahhrzpf;Ljava/util/function/BiConsumer;)V
ARG 4 explosion
ARG 5 biConsumer
METHOD m_qjteufci onStacksDropped (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_sddaxwyk;Z)V
ARG 1 state
ARG 2 world
Expand Down Expand Up @@ -408,6 +417,13 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
ARG 1 world
ARG 2 pos
METHOD m_qcyiqint hasComparatorOutput ()Z
METHOD m_qilylxum onUse (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_jdakttms;)Lnet/minecraft/unmapped/C_ozuepbyj;
ARG 2 player
ARG 3 hitResult
METHOD m_qxwzfbgy onInteract (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_jdakttms;)Lnet/minecraft/unmapped/C_gqmsalid;
ARG 3 player
ARG 4 hand
ARG 5 hitResult
METHOD m_rkkqwejt hasSolidTopSurface (Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_xpuuihxf;)Z
ARG 1 world
ARG 2 pos
Expand Down Expand Up @@ -438,6 +454,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
ARG 2 pos
METHOD m_tjbimmww canBucketPlace (Lnet/minecraft/unmapped/C_rxhyurmy;)Z
ARG 1 fluid
METHOD m_trxxnxke isRegistryKey (Lnet/minecraft/unmapped/C_xhhleach;)Z
METHOD m_uawreshq getCameraCollisionShape (Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_pbfjvesm;)Lnet/minecraft/unmapped/C_zscvhwbd;
ARG 1 world
ARG 2 pos
Expand Down Expand Up @@ -517,6 +534,9 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
ARG 3 direction
METHOD m_ynpgqgky isLiquid ()Z
METHOD m_yvamjply getBlock ()Lnet/minecraft/unmapped/C_mmxmpdoq;
METHOD m_yylpqepz (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_aahhrzpf;Ljava/util/function/BiConsumer;)V
ARG 3 explosion
ARG 4 biConsumer
METHOD m_zntvpiao getLuminance ()I
COMMENT {@return the light level emitted by this block state}
METHOD m_zrpxtrfo isToolRequired ()Z
Expand Down Expand Up @@ -591,6 +611,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
FIELD f_xndixxsg jumpVelocityMultiplier F
FIELD f_yebtulna pistonBehavior Lnet/minecraft/unmapped/C_mojvzhua;
METHOD m_bcasjlrn variantOf (Lnet/minecraft/unmapped/C_triydqro;)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
ARG 0 block
METHOD m_bwwgnswz solid ()Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
METHOD m_bzhfzklk emissiveLighting (Lnet/minecraft/unmapped/C_triydqro$C_izsedryc;)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
ARG 1 predicate
Expand Down Expand Up @@ -663,6 +684,8 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
ARG 1 instrument
METHOD m_saqwnthq postProcess (Lnet/minecraft/unmapped/C_triydqro$C_izsedryc;)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
ARG 1 predicate
METHOD m_scrsgkaj (Lnet/minecraft/unmapped/C_triydqro;)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
ARG 0 block
METHOD m_secizybe (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;)Z
ARG 0 state
ARG 1 world
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/block/AbstractTorchBlock.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CLASS net/minecraft/unmapped/C_teovrngh net/minecraft/block/AbstractTorchBlock
FIELD f_ysrmomgy SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/AirBlock.mapping
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
CLASS net/minecraft/unmapped/C_yllbgxud net/minecraft/block/AirBlock
FIELD f_uiqkjjtg CODEC Lcom/mojang/serialization/MapCodec;
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/AmethystBlock.mapping
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
CLASS net/minecraft/unmapped/C_ejmfdqcw net/minecraft/block/AmethystBlock
FIELD f_bvrixoth CODEC Lcom/mojang/serialization/MapCodec;
3 changes: 3 additions & 0 deletions mappings/net/minecraft/block/AmethystClusterBlock.mapping
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
CLASS net/minecraft/unmapped/C_sdtaqcut net/minecraft/block/AmethystClusterBlock
FIELD f_ddchctfa southShape Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_fabgpzfk CODEC Lcom/mojang/serialization/MapCodec;
FIELD f_mefpiuon eastShape Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_ohhdwosi northShape Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_ohjviadd westShape Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_rextzkph upShape Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_rsuosfjc FACING Lnet/minecraft/unmapped/C_tcujuvjb;
FIELD f_xmmzpovq downShape Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_ztvojeln WATERLOGGED Lnet/minecraft/unmapped/C_xhwijdsd;
METHOD <init> (FFLnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V
ARG 3 settings
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/AnvilBlock.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ CLASS net/minecraft/unmapped/C_tglopszh net/minecraft/block/AnvilBlock
FIELD f_bnwjvawg FACING Lnet/minecraft/unmapped/C_tcujuvjb;
FIELD f_dlmmjdvu X_AXIS_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_gmmbgpke Z_STEM_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_hyfxvkup CODEC Lcom/mojang/serialization/MapCodec;
FIELD f_isbqlukl Z_AXIS_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_jhomfdxi X_STEP_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_jqyhpuhm TITLE Lnet/minecraft/unmapped/C_rdaqiwdt;
Expand Down
5 changes: 5 additions & 0 deletions mappings/net/minecraft/block/AttachedStemBlock.mapping
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
CLASS net/minecraft/unmapped/C_khgfyxfg net/minecraft/block/AttachedStemBlock
FIELD f_hdxvcbro SHAPE_OFFSET F
FIELD f_hgeorsxr FACING Lnet/minecraft/unmapped/C_tcujuvjb;
FIELD f_lcjxatqe CODEC Lcom/mojang/serialization/MapCodec;
FIELD f_zknbqfxo FACING_TO_SHAPE Ljava/util/Map;
FIELD f_zxdligzi gourdBlock Lnet/minecraft/unmapped/C_xhhleach;
METHOD <init> (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V
ARG 4 settings
METHOD m_bzrxpycp (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 stemBlock
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/AzaleaBlock.mapping
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
CLASS net/minecraft/unmapped/C_snzosjdh net/minecraft/block/AzaleaBlock
FIELD f_mymswsiw CODEC Lcom/mojang/serialization/MapCodec;
FIELD f_vxdlluxf SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/BambooBlock.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ CLASS net/minecraft/unmapped/C_romdhvev net/minecraft/block/BambooBlock
FIELD f_dibcaxwv SMALL_LEAVES_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_hpvtvdhv LEAFLESS_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_pcsjnror LEAVES Lnet/minecraft/unmapped/C_cgckxfsw;
FIELD f_qfjlhxny CODEC Lcom/mojang/serialization/MapCodec;
FIELD f_quorgrfq LARGE_LEAVES_SHAPE_OFFSET F
FIELD f_qyevrnrf AGE_THIN I
FIELD f_twymgqvb LARGE_LEAVES_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/BambooSaplingBlock.mapping
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
CLASS net/minecraft/unmapped/C_zdpkyqwn net/minecraft/block/BambooSaplingBlock
FIELD f_bzvrfxpu SAPLING_SHAPE_OFFSET F
FIELD f_eaceacnw CODEC Lcom/mojang/serialization/MapCodec;
FIELD f_umllrxqm SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
METHOD m_llzxqaxu grow (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)V
ARG 1 world
Expand Down
3 changes: 3 additions & 0 deletions mappings/net/minecraft/block/BannerBlock.mapping
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
CLASS net/minecraft/unmapped/C_awxgdacj net/minecraft/block/BannerBlock
FIELD f_mqfxtiut CODEC Lcom/mojang/serialization/MapCodec;
FIELD f_pakjaafm COLORED_BANNERS Ljava/util/Map;
FIELD f_vuohqcxm SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_ztaiuaag ROTATION Lnet/minecraft/unmapped/C_vltzvhxi;
METHOD m_waigudmi (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 color
METHOD m_yxpgurdc getForColor (Lnet/minecraft/unmapped/C_arllgqae;)Lnet/minecraft/unmapped/C_mmxmpdoq;
ARG 0 color
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/BarrelBlock.mapping
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
CLASS net/minecraft/unmapped/C_jtdjwlez net/minecraft/block/BarrelBlock
FIELD f_ivytrmvu OPEN Lnet/minecraft/unmapped/C_xhwijdsd;
FIELD f_pzndkkwq FACING Lnet/minecraft/unmapped/C_tcujuvjb;
FIELD f_vviyfrpu CODEC Lcom/mojang/serialization/MapCodec;
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/BarrierBlock.mapping
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
CLASS net/minecraft/unmapped/C_flqucikz net/minecraft/block/BarrierBlock
FIELD f_rjhoxnad WATERLOGGED Lnet/minecraft/unmapped/C_xhwijdsd;
FIELD f_zzhakkha CODEC Lcom/mojang/serialization/MapCodec;
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/BeaconBlock.mapping
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
CLASS net/minecraft/unmapped/C_rumbqamo net/minecraft/block/BeaconBlock
FIELD f_zhorvghk CODEC Lcom/mojang/serialization/MapCodec;
3 changes: 3 additions & 0 deletions mappings/net/minecraft/block/BedBlock.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ CLASS net/minecraft/unmapped/C_nvwxmqty net/minecraft/block/BedBlock
FIELD f_ffaooxkb EAST_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_gljxzzaq HEIGHT I
FIELD f_hzcaewbv OCCUPIED Lnet/minecraft/unmapped/C_xhwijdsd;
FIELD f_jbvzrfac CODEC Lcom/mojang/serialization/MapCodec;
FIELD f_kemnvrid LEG_1_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_ksjhatky WEST_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_lyqemyor PART Lnet/minecraft/unmapped/C_cgckxfsw;
Expand Down Expand Up @@ -55,6 +56,8 @@ CLASS net/minecraft/unmapped/C_nvwxmqty net/minecraft/block/BedBlock
METHOD m_uuocayls isBedBelow (Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;)Z
ARG 0 world
ARG 1 pos
METHOD m_vlsvtpfr (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 color
METHOD m_xmwpwuqn findWakeUpPosition (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_vxzrjtdu;Lnet/minecraft/unmapped/C_hynzadkk;[[IZ)Ljava/util/Optional;
ARG 0 type
ARG 1 world
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/BeehiveBlock.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ CLASS net/minecraft/unmapped/C_hzjprknd net/minecraft/block/BeehiveBlock
FIELD f_aquufvvz FULL_HONEY_LEVEL I
FIELD f_kdvvaqkr HONEY_LEVEL Lnet/minecraft/unmapped/C_vltzvhxi;
FIELD f_rbssvvff FACING Lnet/minecraft/unmapped/C_tcujuvjb;
FIELD f_sxgotsrf CODEC Lcom/mojang/serialization/MapCodec;
FIELD f_taupaezd DROPPED_HONEYCOMB_COUNT I
METHOD m_aggjufua hasBees (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)Z
ARG 1 world
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/BeetrootsBlock.mapping
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
CLASS net/minecraft/unmapped/C_nixkqwvu net/minecraft/block/BeetrootsBlock
FIELD f_cwppgobh AGE_TO_SHAPE [Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_dedfsbiq AGE Lnet/minecraft/unmapped/C_vltzvhxi;
FIELD f_eyrftkxb CODEC Lcom/mojang/serialization/MapCodec;
FIELD f_ybicbsei MAX_AGE I
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/BellBlock.mapping
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
CLASS net/minecraft/unmapped/C_kvzqooxs net/minecraft/block/BellBlock
FIELD f_atzrzbco NORTH_SOUTH_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_cmsmkpgi BELL_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_cokbmaex CODEC Lcom/mojang/serialization/MapCodec;
FIELD f_glttjyup BELL_LIP_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_kplrayfy EAST_WEST_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_mrxtkdkv NORTH_WALL_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/BigDripleafBlock.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ CLASS net/minecraft/unmapped/C_gpceuifm net/minecraft/block/BigDripleafBlock
FIELD f_uiurwyaw LOWEST_LEAF_TOP I
FIELD f_xgpbprwa STEM_WIDTH I
FIELD f_xykorkab SHAPES_FOR_TILT Ljava/util/Map;
FIELD f_yfoukkhl CODEC Lcom/mojang/serialization/MapCodec;
FIELD f_yrfqszxv BASE_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
METHOD m_azjszvqk canGrowInto (Lnet/minecraft/unmapped/C_qpninoyb;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)Z
ARG 0 world
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/BigDripleafStemBlock.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ CLASS net/minecraft/unmapped/C_geikjobf net/minecraft/block/BigDripleafStemBlock
FIELD f_hxtuwvrr EAST_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_psevgvex NORTH_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_vhxgeikb SOUTH_SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_xmowzvej CODEC Lcom/mojang/serialization/MapCodec;
METHOD m_qzzihvfg placeStemAt (Lnet/minecraft/unmapped/C_vdvbsyle;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_xqketiuf;Lnet/minecraft/unmapped/C_xpuuihxf;)Z
ARG 0 world
ARG 1 pos
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/BlastFurnaceBlock.mapping
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
CLASS net/minecraft/unmapped/C_wwxrbkkn net/minecraft/block/BlastFurnaceBlock
FIELD f_kxzhoeyp CODEC Lcom/mojang/serialization/MapCodec;
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/Block.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ CLASS net/minecraft/unmapped/C_mmxmpdoq net/minecraft/block/Block
COMMENT Prevents the previous block (container) from dropping items when destroyed.
FIELD f_xxljfqdw NOTIFY_NEIGHBORS I
COMMENT Sends a neighbor update event to surrounding blocks.
FIELD f_zatyqcqa CODEC Lcom/mojang/serialization/MapCodec;
FIELD f_zeveupfs NO_REDRAW I
COMMENT Used in conjunction with {@link #NOTIFY_LISTENERS} to suppress the render pass on clients.
METHOD m_aqcetwet onSteppedOn (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_astfners;)V
Expand Down
26 changes: 13 additions & 13 deletions mappings/net/minecraft/block/Blocks.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -3,48 +3,48 @@ CLASS net/minecraft/unmapped/C_jricjyva net/minecraft/block/Blocks
METHOD m_agroqyjs stainedGlassOf (Lnet/minecraft/unmapped/C_arllgqae;)Lnet/minecraft/unmapped/C_mmxmpdoq;
ARG 0 color
METHOD m_cejxlkjq netherStemOf (Lnet/minecraft/unmapped/C_mlrprqox;)Lnet/minecraft/unmapped/C_mmxmpdoq;
ARG 0 mapColor
METHOD m_dsrskptj shulkerBoxOf (Lnet/minecraft/unmapped/C_arllgqae;Lnet/minecraft/unmapped/C_mlrprqox;)Lnet/minecraft/unmapped/C_mmxmpdoq;
ARG 0 color
METHOD m_dsrskptj shulkerBoxOf (Lnet/minecraft/unmapped/C_arllgqae;Lnet/minecraft/unmapped/C_mlrprqox;)Lnet/minecraft/unmapped/C_mmxmpdoq;
ARG 0 dyeColor
ARG 1 mapColor
METHOD m_fuyaztds (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ogavsvbr;)Z
ARG 3 type
ARG 3 entityType
METHOD m_fwewvidj legacyStairsOf (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_mmxmpdoq;
METHOD m_ghajpyfj register (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_mmxmpdoq;
METHOD m_gtmmdkuy leaveOf (Lnet/minecraft/unmapped/C_aevintex;)Lnet/minecraft/unmapped/C_mmxmpdoq;
METHOD m_gtmmdkuy leavesOf (Lnet/minecraft/unmapped/C_aevintex;)Lnet/minecraft/unmapped/C_mmxmpdoq;
ARG 0 soundGroup
METHOD m_hjyhmutz buttonOf (Lnet/minecraft/unmapped/C_hgpogkhy;)Lnet/minecraft/unmapped/C_mmxmpdoq;
ARG 0 type
METHOD m_ilocxcob candleOf (Lnet/minecraft/unmapped/C_mlrprqox;)Lnet/minecraft/unmapped/C_mmxmpdoq;
ARG 0 mapColor
ARG 0 color
METHOD m_kcksfacw (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ogavsvbr;)Z
ARG 3 type
ARG 3 entityType
METHOD m_kgmpoexx pottedVariant (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_mmxmpdoq;
METHOD m_knkwxiyx solid (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;)Z
METHOD m_mjiljkwg register (Ljava/lang/String;Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_mmxmpdoq;
ARG 0 type
METHOD m_nmstzpxh spawnable (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ogavsvbr;)Ljava/lang/Boolean;
ARG 3 type
ARG 3 entityType
METHOD m_pelkwenc luminanceOf (I)Ljava/util/function/ToIntFunction;
ARG 0 lightLevel
METHOD m_qpxyruwi nonSpawnable (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ogavsvbr;)Ljava/lang/Boolean;
ARG 3 type
ARG 3 entityType
METHOD m_rzfpgupq allowOcelotsAndParrots (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ogavsvbr;)Ljava/lang/Boolean;
ARG 3 type
ARG 3 entityType
METHOD m_sfmefkju stairsOf (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_mmxmpdoq;
METHOD m_sfzscxyj createPiston (Z)Lnet/minecraft/unmapped/C_mmxmpdoq;
ARG 0 sticky
METHOD m_sidkwvli createStoneButton ()Lnet/minecraft/unmapped/C_mmxmpdoq;
METHOD m_tetaodtf rebuildShapeCache ()V
METHOD m_uvuszloo logOf (Lnet/minecraft/unmapped/C_mlrprqox;Lnet/minecraft/unmapped/C_mlrprqox;Lnet/minecraft/unmapped/C_aevintex;)Lnet/minecraft/unmapped/C_mmxmpdoq;
ARG 0 topMapColor
ARG 1 sideMapColor
ARG 0 topColor
ARG 1 sideColor
ARG 2 soundGroup
METHOD m_wgtmwkrm bedOf (Lnet/minecraft/unmapped/C_arllgqae;)Lnet/minecraft/unmapped/C_mmxmpdoq;
ARG 0 color
METHOD m_wjfyifdb nonSolid (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;)Z
METHOD m_xjupgyof (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ogavsvbr;)Z
ARG 3 type
METHOD m_zfebkwem logOf (Lnet/minecraft/unmapped/C_mlrprqox;Lnet/minecraft/unmapped/C_mlrprqox;)Lnet/minecraft/unmapped/C_mmxmpdoq;
ARG 0 topMapColor
ARG 1 sideMapColor
ARG 0 topColor
ARG 1 sideColor
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/BrewingStandBlock.mapping
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
CLASS net/minecraft/unmapped/C_ihqhzswt net/minecraft/block/BrewingStandBlock
FIELD f_awjnsllb SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_jswkqsre BOTTLE_PROPERTIES [Lnet/minecraft/unmapped/C_xhwijdsd;
FIELD f_mhlbeuuo CODEC Lcom/mojang/serialization/MapCodec;
5 changes: 5 additions & 0 deletions mappings/net/minecraft/block/BrushableBlock.mapping
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
CLASS net/minecraft/unmapped/C_nizhkzsc net/minecraft/block/BrushableBlock
FIELD f_bzperbkx brushingSound Lnet/minecraft/unmapped/C_avavozay;
FIELD f_cqdhzuod DUSTED Lnet/minecraft/unmapped/C_vltzvhxi;
FIELD f_dzkmkdrl CODEC Lcom/mojang/serialization/MapCodec;
FIELD f_fkjyhigs block Lnet/minecraft/unmapped/C_mmxmpdoq;
FIELD f_knxwhaav brushingCompleteSound Lnet/minecraft/unmapped/C_avavozay;
FIELD f_synkxdip TICK_DELAY I
METHOD <init> (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_avavozay;Lnet/minecraft/unmapped/C_avavozay;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V
ARG 4 settings
METHOD m_adiryckl getBrushingCompleteSound ()Lnet/minecraft/unmapped/C_avavozay;
METHOD m_arrsnhtm getBrushingSound ()Lnet/minecraft/unmapped/C_avavozay;
METHOD m_npxrvzaz (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 brushable
METHOD m_urcuxito getBlock ()Lnet/minecraft/unmapped/C_mmxmpdoq;
Loading

3 comments on commit 55a4634

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With commit 55a4634, 183 file(s) were updated with 1643 line(s) added and 1419 removed compared to the latest Quilt Mappings version.

View the diff here (1/3):
diff -bur namedTargetSrc/net/minecraft/block/AbstractBlock.java namedSrc/net/minecraft/block/AbstractBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractBlock.java	2024-01-17 18:11:51.351380499 +0000
+++ namedSrc/net/minecraft/block/AbstractBlock.java	2024-01-17 18:10:47.219884660 +0000
@@ -178,9 +178,10 @@
    protected abstract MapCodec<? extends Block> getCodec();
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_copdixka Lnet/minecraft/unmapped/C_triydqro;m_copdixka()Lcom/mojang/serialization/codecs/RecordCodecBuilder;}
+    * @mapping {@literal named getSettingsCodec Lnet/minecraft/block/AbstractBlock;getSettingsCodec()Lcom/mojang/serialization/codecs/RecordCodecBuilder;}
     */
-   protected static <B extends Block> RecordCodecBuilder<B, AbstractBlock.Settings> m_copdixka() {
+   protected static <B extends Block> RecordCodecBuilder<B, AbstractBlock.Settings> getSettingsCodec() {
       return AbstractBlock.Settings.CODEC.fieldOf("properties").forGetter(AbstractBlock::getProperties);
    }
 
@@ -188,8 +189,8 @@
     * @mapping {@literal hashed m_bmyhbvlk Lnet/minecraft/unmapped/C_triydqro;m_bmyhbvlk(Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec;}
     * @mapping {@literal named createCodec Lnet/minecraft/block/AbstractBlock;createCodec(Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec;}
     */
-   public static <B extends Block> MapCodec<B> createCodec(Function<AbstractBlock.Settings, B> function) {
-      return RecordCodecBuilder.mapCodec(instance -> instance.group(m_copdixka()).apply(instance, function));
+   public static <B extends Block> MapCodec<B> createCodec(Function<AbstractBlock.Settings, B> settingsFunction) {
+      return RecordCodecBuilder.mapCodec(instance -> instance.group(getSettingsCodec()).apply(instance, settingsFunction));
    }
 
    /**
@@ -281,22 +282,22 @@
 
    /**
     * @mapping {@literal hashed m_qjdjbqgu Lnet/minecraft/unmapped/C_triydqro;m_qjdjbqgu(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_aahhrzpf;Ljava/util/function/BiConsumer;)V}
-    * @mapping {@literal named m_qjdjbqgu Lnet/minecraft/block/AbstractBlock;m_qjdjbqgu(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/explosion/Explosion;Ljava/util/function/BiConsumer;)V}
+    * @mapping {@literal named onExplosion Lnet/minecraft/block/AbstractBlock;onExplosion(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/explosion/Explosion;Ljava/util/function/BiConsumer;)V}
     */
    @Deprecated
-   public void m_qjdjbqgu(BlockState state, World world, BlockPos pos, Explosion arg4, BiConsumer<ItemStack, BlockPos> biConsumer) {
-      if (!state.isAir() && arg4.m_vsvasiko() != Explosion.DestructionType.TRIGGER_BLOCK) {
+   public void onExplosion(BlockState state, World world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> biConsumer) {
+      if (!state.isAir() && explosion.m_vsvasiko() != Explosion.DestructionType.TRIGGER_BLOCK) {
          Block lv = state.getBlock();
-         boolean bl = arg4.getCausingEntity() instanceof PlayerEntity;
-         if (lv.shouldDropItemsOnExplosion(arg4) && world instanceof ServerWorld lv2) {
+         boolean bl = explosion.getCausingEntity() instanceof PlayerEntity;
+         if (lv.shouldDropItemsOnExplosion(explosion) && world instanceof ServerWorld lv2) {
             BlockEntity lv3 = state.hasBlockEntity() ? world.getBlockEntity(pos) : null;
             LootContextParameterSet.Builder lv4 = new LootContextParameterSet.Builder(lv2)
                .add(LootContextParameters.ORIGIN, Vec3d.ofCenter(pos))
                .add(LootContextParameters.TOOL, ItemStack.EMPTY)
                .addOptional(LootContextParameters.BLOCK_ENTITY, lv3)
-               .addOptional(LootContextParameters.THIS_ENTITY, arg4.getEntity());
-            if (arg4.m_vsvasiko() == Explosion.DestructionType.DESTROY_WITH_DECAY) {
-               lv4.add(LootContextParameters.EXPLOSION_RADIUS, arg4.getPower());
+               .addOptional(LootContextParameters.THIS_ENTITY, explosion.getEntity());
+            if (explosion.m_vsvasiko() == Explosion.DestructionType.DESTROY_WITH_DECAY) {
+               lv4.add(LootContextParameters.EXPLOSION_RADIUS, explosion.getPower());
             }
 
             state.onStacksDropped(lv2, pos, ItemStack.EMPTY, bl);
@@ -304,7 +305,7 @@
          }
 
          world.setBlockState(pos, Blocks.AIR.getDefaultState(), Block.NOTIFY_ALL);
-         lv.onDestroyedByExplosion(world, pos, arg4);
+         lv.onDestroyedByExplosion(world, pos, explosion);
       }
    }
 
@@ -313,7 +314,7 @@
     * @mapping {@literal named onUse Lnet/minecraft/block/AbstractBlock;onUse(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/hit/BlockHitResult;)Lnet/minecraft/util/ActionResult;}
     */
    @Deprecated
-   public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult result) {
+   public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity entity, BlockHitResult hitResult) {
       return ActionResult.PASS;
    }
 
@@ -322,7 +323,7 @@
     * @mapping {@literal named onInteract Lnet/minecraft/block/AbstractBlock;onInteract(Lnet/minecraft/item/ItemStack;Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/util/hit/BlockHitResult;)Lnet/minecraft/unmapped/C_gqmsalid;}
     */
    @Deprecated
-   public C_gqmsalid onInteract(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult result) {
+   public C_gqmsalid onInteract(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity entity, Hand hand, BlockHitResult hitResult) {
       return C_gqmsalid.PASS_TO_DEFAULT_BLOCK_INTERACTION;
    }
 
@@ -1357,8 +1358,8 @@
        * @mapping {@literal hashed m_yylpqepz Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;m_yylpqepz(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_aahhrzpf;Ljava/util/function/BiConsumer;)V}
        * @mapping {@literal named m_yylpqepz Lnet/minecraft/block/AbstractBlock$AbstractBlockState;m_yylpqepz(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/explosion/Explosion;Ljava/util/function/BiConsumer;)V}
        */
-      public void m_yylpqepz(World world, BlockPos pos, Explosion arg3, BiConsumer<ItemStack, BlockPos> biConsumer) {
-         this.getBlock().m_qjdjbqgu(this.asBlockState(), world, pos, arg3, biConsumer);
+      public void m_yylpqepz(World world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> biConsumer) {
+         this.getBlock().onExplosion(this.asBlockState(), world, pos, explosion, biConsumer);
       }
 
       /**
@@ -1403,18 +1404,18 @@
 
       /**
        * @mapping {@literal hashed m_qxwzfbgy Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;m_qxwzfbgy(Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_jdakttms;)Lnet/minecraft/unmapped/C_gqmsalid;}
-       * @mapping {@literal named m_qxwzfbgy Lnet/minecraft/block/AbstractBlock$AbstractBlockState;m_qxwzfbgy(Lnet/minecraft/item/ItemStack;Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/util/hit/BlockHitResult;)Lnet/minecraft/unmapped/C_gqmsalid;}
+       * @mapping {@literal named onInteract Lnet/minecraft/block/AbstractBlock$AbstractBlockState;onInteract(Lnet/minecraft/item/ItemStack;Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/util/hit/BlockHitResult;)Lnet/minecraft/unmapped/C_gqmsalid;}
        */
-      public C_gqmsalid m_qxwzfbgy(ItemStack stack, World world, PlayerEntity player, Hand arg4, BlockHitResult result) {
-         return this.getBlock().onInteract(stack, this.asBlockState(), world, result.getBlockPos(), player, arg4, result);
+      public C_gqmsalid onInteract(ItemStack stack, World world, PlayerEntity player, Hand hand, BlockHitResult hitResult) {
+         return this.getBlock().onInteract(stack, this.asBlockState(), world, hitResult.getBlockPos(), player, hand, hitResult);
       }
 
       /**
        * @mapping {@literal hashed m_qilylxum Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;m_qilylxum(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_jdakttms;)Lnet/minecraft/unmapped/C_ozuepbyj;}
-       * @mapping {@literal named m_qilylxum Lnet/minecraft/block/AbstractBlock$AbstractBlockState;m_qilylxum(Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/hit/BlockHitResult;)Lnet/minecraft/util/ActionResult;}
+       * @mapping {@literal named onUse Lnet/minecraft/block/AbstractBlock$AbstractBlockState;onUse(Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/hit/BlockHitResult;)Lnet/minecraft/util/ActionResult;}
        */
-      public ActionResult m_qilylxum(World world, PlayerEntity player, BlockHitResult result) {
-         return this.getBlock().onUse(this.asBlockState(), world, result.getBlockPos(), player, result);
+      public ActionResult onUse(World world, PlayerEntity player, BlockHitResult hitResult) {
+         return this.getBlock().onUse(this.asBlockState(), world, hitResult.getBlockPos(), player, hitResult);
       }
 
       /**
@@ -1610,9 +1611,9 @@
 
       /**
        * @mapping {@literal hashed m_trxxnxke Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;m_trxxnxke(Lnet/minecraft/unmapped/C_xhhleach;)Z}
-       * @mapping {@literal named m_trxxnxke Lnet/minecraft/block/AbstractBlock$AbstractBlockState;m_trxxnxke(Lnet/minecraft/registry/RegistryKey;)Z}
+       * @mapping {@literal named isRegistryKey Lnet/minecraft/block/AbstractBlock$AbstractBlockState;isRegistryKey(Lnet/minecraft/registry/RegistryKey;)Z}
        */
-      public boolean m_trxxnxke(RegistryKey<Block> registryKey) {
+      public boolean isRegistryKey(RegistryKey<Block> registryKey) {
          return this.getBlock().getBuiltInRegistryHolder().isRegistryKey(registryKey);
       }
 
@@ -2061,11 +2062,12 @@
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_scrsgkaj Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;m_scrsgkaj(Lnet/minecraft/unmapped/C_triydqro;)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;}
+       * @mapping {@literal named m_scrsgkaj Lnet/minecraft/block/AbstractBlock$Settings;m_scrsgkaj(Lnet/minecraft/block/AbstractBlock;)Lnet/minecraft/block/AbstractBlock$Settings;}
        */
-      public static AbstractBlock.Settings m_scrsgkaj(AbstractBlock arg) {
-         AbstractBlock.Settings lv = variantOf(arg);
-         AbstractBlock.Settings lv2 = arg.settings;
+      public static AbstractBlock.Settings m_scrsgkaj(AbstractBlock block) {
+         AbstractBlock.Settings lv = variantOf(block);
+         AbstractBlock.Settings lv2 = block.settings;
          lv.jumpVelocityMultiplier = lv2.jumpVelocityMultiplier;
          lv.solidBlockPredicate = lv2.solidBlockPredicate;
          lv.allowsSpawningPredicate = lv2.allowsSpawningPredicate;
@@ -2081,9 +2083,9 @@
        * @mapping {@literal named variantOf Lnet/minecraft/block/AbstractBlock$Settings;variantOf(Lnet/minecraft/block/AbstractBlock;)Lnet/minecraft/block/AbstractBlock$Settings;}
        */
       @Deprecated
-      public static AbstractBlock.Settings variantOf(AbstractBlock arg) {
+      public static AbstractBlock.Settings variantOf(AbstractBlock block) {
          AbstractBlock.Settings lv = new AbstractBlock.Settings();
-         AbstractBlock.Settings lv2 = arg.settings;
+         AbstractBlock.Settings lv2 = block.settings;
          lv.hardness = lv2.hardness;
          lv.resistance = lv2.resistance;
          lv.collidable = lv2.collidable;
diff -bur namedTargetSrc/net/minecraft/block/AbstractCandleBlock.java namedSrc/net/minecraft/block/AbstractCandleBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractCandleBlock.java	2024-01-17 18:11:51.323380719 +0000
+++ namedSrc/net/minecraft/block/AbstractCandleBlock.java	2024-01-17 18:10:47.191884879 +0000
@@ -154,15 +154,14 @@
    }
 
    /**
-    * @mapping {@literal hashed m_qjdjbqgu Lnet/minecraft/unmapped/C_carcushy;m_qjdjbqgu(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_aahhrzpf;Ljava/util/function/BiConsumer;)V}
-    * @mapping {@literal named m_qjdjbqgu Lnet/minecraft/block/AbstractCandleBlock;m_qjdjbqgu(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/explosion/Explosion;Ljava/util/function/BiConsumer;)V}
+    * Mapping not found
     */
    @Override
-   public void m_qjdjbqgu(BlockState state, World world, BlockPos pos, Explosion arg4, BiConsumer<ItemStack, BlockPos> biConsumer) {
-      if (arg4.m_vsvasiko() == Explosion.DestructionType.TRIGGER_BLOCK && !world.isClient() && state.get(LIT)) {
+   public void onExplosion(BlockState state, World world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> biConsumer) {
+      if (explosion.m_vsvasiko() == Explosion.DestructionType.TRIGGER_BLOCK && !world.isClient() && state.get(LIT)) {
          extinguish(null, state, world, pos);
       }
 
-      super.m_qjdjbqgu(state, world, pos, arg4, biConsumer);
+      super.onExplosion(state, world, pos, explosion, biConsumer);
    }
 }
Only in namedSrc/net/minecraft/block: AbstractTorchBlock.java
diff -bur namedTargetSrc/net/minecraft/block/AmethystClusterBlock.java namedSrc/net/minecraft/block/AmethystClusterBlock.java
--- namedTargetSrc/net/minecraft/block/AmethystClusterBlock.java	2024-01-17 18:11:51.391380185 +0000
+++ namedSrc/net/minecraft/block/AmethystClusterBlock.java	2024-01-17 18:10:47.263884316 +0000
@@ -31,7 +31,9 @@
     */
    public static final MapCodec<AmethystClusterBlock> CODEC = RecordCodecBuilder.mapCodec(
       instance -> instance.group(
-               Codec.FLOAT.fieldOf("height").forGetter(arg -> arg.height), Codec.FLOAT.fieldOf("aabb_offset").forGetter(arg -> arg.aabbOffset), m_copdixka()
+               Codec.FLOAT.fieldOf("height").forGetter(arg -> arg.height),
+               Codec.FLOAT.fieldOf("aabb_offset").forGetter(arg -> arg.aabbOffset),
+               getSettingsCodec()
             )
             .apply(instance, AmethystClusterBlock::new)
    );
diff -bur namedTargetSrc/net/minecraft/block/AttachedStemBlock.java namedSrc/net/minecraft/block/AttachedStemBlock.java
--- namedTargetSrc/net/minecraft/block/AttachedStemBlock.java	2024-01-17 18:11:51.527379119 +0000
+++ namedSrc/net/minecraft/block/AttachedStemBlock.java	2024-01-17 18:10:47.495882501 +0000
@@ -32,13 +32,13 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/AttachedStemBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<AttachedStemBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(
+      stemBlock -> stemBlock.group(
                RegistryKey.codec(RegistryKeys.BLOCK).fieldOf("fruit").forGetter(arg -> arg.gourdBlock),
                RegistryKey.codec(RegistryKeys.BLOCK).fieldOf("stem").forGetter(arg -> arg.stem),
                RegistryKey.codec(RegistryKeys.ITEM).fieldOf("seed").forGetter(arg -> arg.seed),
-               m_copdixka()
+               getSettingsCodec()
             )
-            .apply(instance, AttachedStemBlock::new)
+            .apply(stemBlock, AttachedStemBlock::new)
    );
    /**
     * @mapping {@literal hashed f_hgeorsxr Lnet/minecraft/unmapped/C_khgfyxfg;f_hgeorsxr:Lnet/minecraft/unmapped/C_tcujuvjb;}
@@ -117,7 +117,7 @@
    public BlockState getStateForNeighborUpdate(
       BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos
    ) {
-      if (!neighborState.m_trxxnxke(this.gourdBlock) && direction == state.get(FACING)) {
+      if (!neighborState.isRegistryKey(this.gourdBlock) && direction == state.get(FACING)) {
          Optional<Block> optional = world.getRegistryManager().get(RegistryKeys.BLOCK).getOrEmpty(this.stem);
          if (optional.isPresent()) {
             return ((Block)optional.get()).getDefaultState().withIfExists(StemBlock.AGE, Integer.valueOf(7));
diff -bur namedTargetSrc/net/minecraft/block/BannerBlock.java namedSrc/net/minecraft/block/BannerBlock.java
--- namedTargetSrc/net/minecraft/block/BannerBlock.java	2024-01-17 18:11:51.479379495 +0000
+++ namedSrc/net/minecraft/block/BannerBlock.java	2024-01-17 18:10:47.423883064 +0000
@@ -29,7 +29,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/BannerBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<BannerBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(DyeColor.CODEC.fieldOf("color").forGetter(AbstractBannerBlock::getColor), m_copdixka()).apply(instance, BannerBlock::new)
+      color -> color.group(DyeColor.CODEC.fieldOf("color").forGetter(AbstractBannerBlock::getColor), getSettingsCodec()).apply(color, BannerBlock::new)
    );
    /**
     * @mapping {@literal hashed f_ztaiuaag Lnet/minecraft/unmapped/C_awxgdacj;f_ztaiuaag:Lnet/minecraft/unmapped/C_vltzvhxi;}
diff -bur namedTargetSrc/net/minecraft/block/BedBlock.java namedSrc/net/minecraft/block/BedBlock.java
--- namedTargetSrc/net/minecraft/block/BedBlock.java	2024-01-17 18:11:51.439379809 +0000
+++ namedSrc/net/minecraft/block/BedBlock.java	2024-01-17 18:10:47.367883502 +0000
@@ -49,7 +49,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/BedBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<BedBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(DyeColor.CODEC.fieldOf("color").forGetter(BedBlock::getColor), m_copdixka()).apply(instance, BedBlock::new)
+      color -> color.group(DyeColor.CODEC.fieldOf("color").forGetter(BedBlock::getColor), getSettingsCodec()).apply(color, BedBlock::new)
    );
    /**
     * @mapping {@literal hashed f_lyqemyor Lnet/minecraft/unmapped/C_nvwxmqty;f_lyqemyor:Lnet/minecraft/unmapped/C_cgckxfsw;}
diff -bur namedTargetSrc/net/minecraft/block/BellBlock.java namedSrc/net/minecraft/block/BellBlock.java
--- namedTargetSrc/net/minecraft/block/BellBlock.java	2024-01-17 18:11:51.423379934 +0000
+++ namedSrc/net/minecraft/block/BellBlock.java	2024-01-17 18:10:47.339883721 +0000
@@ -338,16 +338,15 @@
    }
 
    /**
-    * @mapping {@literal hashed m_qjdjbqgu Lnet/minecraft/unmapped/C_kvzqooxs;m_qjdjbqgu(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_aahhrzpf;Ljava/util/function/BiConsumer;)V}
-    * @mapping {@literal named m_qjdjbqgu Lnet/minecraft/block/BellBlock;m_qjdjbqgu(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/explosion/Explosion;Ljava/util/function/BiConsumer;)V}
+    * Mapping not found
     */
    @Override
-   public void m_qjdjbqgu(BlockState state, World world, BlockPos pos, Explosion arg4, BiConsumer<ItemStack, BlockPos> biConsumer) {
-      if (arg4.m_vsvasiko() == Explosion.DestructionType.TRIGGER_BLOCK && !world.isClient()) {
+   public void onExplosion(BlockState state, World world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> biConsumer) {
+      if (explosion.m_vsvasiko() == Explosion.DestructionType.TRIGGER_BLOCK && !world.isClient()) {
          this.ring(world, pos, null);
       }
 
-      super.m_qjdjbqgu(state, world, pos, arg4, biConsumer);
+      super.onExplosion(state, world, pos, explosion, biConsumer);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/Blocks.java namedSrc/net/minecraft/block/Blocks.java
--- namedTargetSrc/net/minecraft/block/Blocks.java	2024-01-17 18:11:51.399380123 +0000
+++ namedSrc/net/minecraft/block/Blocks.java	2024-01-17 18:10:47.271884253 +0000
@@ -1008,27 +1008,27 @@
     * @mapping {@literal hashed f_ylpthxnp Lnet/minecraft/unmapped/C_jricjyva;f_ylpthxnp:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named OAK_LEAVES Lnet/minecraft/block/Blocks;OAK_LEAVES:Lnet/minecraft/block/Block;}
     */
-   public static final Block OAK_LEAVES = register("oak_leaves", leaveOf(BlockSoundGroup.GRASS));
+   public static final Block OAK_LEAVES = register("oak_leaves", leavesOf(BlockSoundGroup.GRASS));
    /**
     * @mapping {@literal hashed f_kfduprdl Lnet/minecraft/unmapped/C_jricjyva;f_kfduprdl:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named SPRUCE_LEAVES Lnet/minecraft/block/Blocks;SPRUCE_LEAVES:Lnet/minecraft/block/Block;}
     */
-   public static final Block SPRUCE_LEAVES = register("spruce_leaves", leaveOf(BlockSoundGroup.GRASS));
+   public static final Block SPRUCE_LEAVES = register("spruce_leaves", leavesOf(BlockSoundGroup.GRASS));
    /**
     * @mapping {@literal hashed f_amydbrmp Lnet/minecraft/unmapped/C_jricjyva;f_amydbrmp:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named BIRCH_LEAVES Lnet/minecraft/block/Blocks;BIRCH_LEAVES:Lnet/minecraft/block/Block;}
     */
-   public static final Block BIRCH_LEAVES = register("birch_leaves", leaveOf(BlockSoundGroup.GRASS));
+   public static final Block BIRCH_LEAVES = register("birch_leaves", leavesOf(BlockSoundGroup.GRASS));
    /**
     * @mapping {@literal hashed f_afelfkfi Lnet/minecraft/unmapped/C_jricjyva;f_afelfkfi:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named JUNGLE_LEAVES Lnet/minecraft/block/Blocks;JUNGLE_LEAVES:Lnet/minecraft/block/Block;}
     */
-   public static final Block JUNGLE_LEAVES = register("jungle_leaves", leaveOf(BlockSoundGroup.GRASS));
+   public static final Block JUNGLE_LEAVES = register("jungle_leaves", leavesOf(BlockSoundGroup.GRASS));
    /**
     * @mapping {@literal hashed f_uonjnlpb Lnet/minecraft/unmapped/C_jricjyva;f_uonjnlpb:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named ACACIA_LEAVES Lnet/minecraft/block/Blocks;ACACIA_LEAVES:Lnet/minecraft/block/Block;}
     */
-   public static final Block ACACIA_LEAVES = register("acacia_leaves", leaveOf(BlockSoundGroup.GRASS));
+   public static final Block ACACIA_LEAVES = register("acacia_leaves", leavesOf(BlockSoundGroup.GRASS));
    /**
     * @mapping {@literal hashed f_frnihrmd Lnet/minecraft/unmapped/C_jricjyva;f_frnihrmd:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named CHERRY_LEAVES Lnet/minecraft/block/Blocks;CHERRY_LEAVES:Lnet/minecraft/block/Block;}
@@ -1054,7 +1054,7 @@
     * @mapping {@literal hashed f_sltjxdtm Lnet/minecraft/unmapped/C_jricjyva;f_sltjxdtm:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named DARK_OAK_LEAVES Lnet/minecraft/block/Blocks;DARK_OAK_LEAVES:Lnet/minecraft/block/Block;}
     */
-   public static final Block DARK_OAK_LEAVES = register("dark_oak_leaves", leaveOf(BlockSoundGroup.GRASS));
+   public static final Block DARK_OAK_LEAVES = register("dark_oak_leaves", leavesOf(BlockSoundGroup.GRASS));
    /**
     * @mapping {@literal hashed f_vveyszak Lnet/minecraft/unmapped/C_jricjyva;f_vveyszak:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named MANGROVE_LEAVES Lnet/minecraft/block/Blocks;MANGROVE_LEAVES:Lnet/minecraft/block/Block;}
@@ -1080,12 +1080,12 @@
     * @mapping {@literal hashed f_jhtkxgzs Lnet/minecraft/unmapped/C_jricjyva;f_jhtkxgzs:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named AZALEA_LEAVES Lnet/minecraft/block/Blocks;AZALEA_LEAVES:Lnet/minecraft/block/Block;}
     */
-   public static final Block AZALEA_LEAVES = register("azalea_leaves", leaveOf(BlockSoundGroup.AZALEA_LEAVES));
+   public static final Block AZALEA_LEAVES = register("azalea_leaves", leavesOf(BlockSoundGroup.AZALEA_LEAVES));
    /**
     * @mapping {@literal hashed f_hexxsrzs Lnet/minecraft/unmapped/C_jricjyva;f_hexxsrzs:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named FLOWERING_AZALEA_LEAVES Lnet/minecraft/block/Blocks;FLOWERING_AZALEA_LEAVES:Lnet/minecraft/block/Block;}
     */
-   public static final Block FLOWERING_AZALEA_LEAVES = register("flowering_azalea_leaves", leaveOf(BlockSoundGroup.AZALEA_LEAVES));
+   public static final Block FLOWERING_AZALEA_LEAVES = register("flowering_azalea_leaves", leavesOf(BlockSoundGroup.AZALEA_LEAVES));
    /**
     * @mapping {@literal hashed f_xdpsznzm Lnet/minecraft/unmapped/C_jricjyva;f_xdpsznzm:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named SPONGE Lnet/minecraft/block/Blocks;SPONGE:Lnet/minecraft/block/Block;}
@@ -3176,7 +3176,7 @@
     */
    public static final Block REDSTONE_WALL_TORCH = register(
       "redstone_wall_torch",
-      new WallRedstoneTorchBlock(
+      new RedstoneWallTorchBlock(
          AbstractBlock.Settings.create()
             .noCollision()
             .breakInstantly()
@@ -3224,7 +3224,7 @@
             .strength(0.5F)
             .sounds(BlockSoundGroup.GLASS)
             .nonOpaque()
-            .allowsSpawning((state, world, pos, type) -> type == EntityType.POLAR_BEAR)
+            .allowsSpawning((state, world, pos, entityType) -> entityType == EntityType.POLAR_BEAR)
             .solidBlock(Blocks::nonSolid)
       )
    );
@@ -4616,7 +4616,7 @@
     */
    public static final Block WITHER_SKELETON_WALL_SKULL = register(
       "wither_skeleton_wall_skull",
-      new WallWitherSkullBlock(AbstractBlock.Settings.create().strength(1.0F).dropsLike(WITHER_SKELETON_SKULL).pistonBehavior(PistonBehavior.DESTROY))
+      new WitherSkeletonWallSkullBlock(AbstractBlock.Settings.create().strength(1.0F).dropsLike(WITHER_SKELETON_SKULL).pistonBehavior(PistonBehavior.DESTROY))
    );
    /**
     * @mapping {@literal hashed f_xfgwpngl Lnet/minecraft/unmapped/C_jricjyva;f_xfgwpngl:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4649,8 +4649,7 @@
     * @mapping {@literal named PLAYER_WALL_HEAD Lnet/minecraft/block/Blocks;PLAYER_WALL_HEAD:Lnet/minecraft/block/Block;}
     */
    public static final Block PLAYER_WALL_HEAD = register(
-      "player_wall_head",
-      new WallPlayerSkullBlock(AbstractBlock.Settings.create().strength(1.0F).dropsLike(PLAYER_HEAD).pistonBehavior(PistonBehavior.DESTROY))
+      "player_wall_head", new PlayerWallHeadBlock(AbstractBlock.Settings.create().strength(1.0F).dropsLike(PLAYER_HEAD).pistonBehavior(PistonBehavior.DESTROY))
    );
    /**
     * @mapping {@literal hashed f_vwacjedw Lnet/minecraft/unmapped/C_jricjyva;f_vwacjedw:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4703,8 +4702,7 @@
     * @mapping {@literal named PIGLIN_WALL_HEAD Lnet/minecraft/block/Blocks;PIGLIN_WALL_HEAD:Lnet/minecraft/block/Block;}
     */
    public static final Block PIGLIN_WALL_HEAD = register(
-      "piglin_wall_head",
-      new WallPiglinSkullBlock(AbstractBlock.Settings.create().strength(1.0F).dropsLike(PIGLIN_HEAD).pistonBehavior(PistonBehavior.DESTROY))
+      "piglin_wall_head", new PiglinWallHeadBlock(AbstractBlock.Settings.create().strength(1.0F).dropsLike(PIGLIN_HEAD).pistonBehavior(PistonBehavior.DESTROY))
    );
    /**
     * @mapping {@literal hashed f_xhsvhuoh Lnet/minecraft/unmapped/C_jricjyva;f_xhsvhuoh:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -7155,7 +7153,7 @@
             .strength(0.5F)
             .sounds(BlockSoundGroup.GLASS)
             .nonOpaque()
-            .allowsSpawning((state, world, pos, type) -> type == EntityType.POLAR_BEAR)
+            .allowsSpawning((state, world, pos, entityType) -> entityType == EntityType.POLAR_BEAR)
             .solidBlock(Blocks::nonSolid)
       )
    );
@@ -11507,7 +11505,7 @@
     * @mapping {@literal hashed m_qpxyruwi Lnet/minecraft/unmapped/C_jricjyva;m_qpxyruwi(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ogavsvbr;)Ljava/lang/Boolean;}
     * @mapping {@literal named nonSpawnable Lnet/minecraft/block/Blocks;nonSpawnable(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/EntityType;)Ljava/lang/Boolean;}
     */
-   private static Boolean nonSpawnable(BlockState state, BlockView world, BlockPos pos, EntityType<?> type) {
+   private static Boolean nonSpawnable(BlockState state, BlockView world, BlockPos pos, EntityType<?> entityType) {
       return false;
    }
 
@@ -11515,7 +11513,7 @@
     * @mapping {@literal hashed m_nmstzpxh Lnet/minecraft/unmapped/C_jricjyva;m_nmstzpxh(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ogavsvbr;)Ljava/lang/Boolean;}
     * @mapping {@literal named spawnable Lnet/minecraft/block/Blocks;spawnable(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/EntityType;)Ljava/lang/Boolean;}
     */
-   private static Boolean spawnable(BlockState state, BlockView world, BlockPos pos, EntityType<?> type) {
+   private static Boolean spawnable(BlockState state, BlockView world, BlockPos pos, EntityType<?> entityType) {
       return true;
    }
 
@@ -11523,8 +11521,8 @@
     * @mapping {@literal hashed m_rzfpgupq Lnet/minecraft/unmapped/C_jricjyva;m_rzfpgupq(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ogavsvbr;)Ljava/lang/Boolean;}
     * @mapping {@literal named allowOcelotsAndParrots Lnet/minecraft/block/Blocks;allowOcelotsAndParrots(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/EntityType;)Ljava/lang/Boolean;}
     */
-   private static Boolean allowOcelotsAndParrots(BlockState state, BlockView world, BlockPos pos, EntityType<?> type) {
-      return type == EntityType.OCELOT || type == EntityType.PARROT;
+   private static Boolean allowOcelotsAndParrots(BlockState state, BlockView world, BlockPos pos, EntityType<?> entityType) {
+      return entityType == EntityType.OCELOT || entityType == EntityType.PARROT;
    }
 
    /**
@@ -11548,10 +11546,10 @@
     * @mapping {@literal hashed m_zfebkwem Lnet/minecraft/unmapped/C_jricjyva;m_zfebkwem(Lnet/minecraft/unmapped/C_mlrprqox;Lnet/minecraft/unmapped/C_mlrprqox;)Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named logOf Lnet/minecraft/block/Blocks;logOf(Lnet/minecraft/block/MapColor;Lnet/minecraft/block/MapColor;)Lnet/minecraft/block/Block;}
     */
-   private static Block logOf(MapColor topMapColor, MapColor sideMapColor) {
+   private static Block logOf(MapColor topColor, MapColor sideColor) {
       return new PillarBlock(
          AbstractBlock.Settings.create()
-            .mapColor(state -> state.get(PillarBlock.AXIS) == Direction.Axis.Y ? topMapColor : sideMapColor)
+            .mapColor(state -> state.get(PillarBlock.AXIS) == Direction.Axis.Y ? topColor : sideColor)
             .instrument(NoteBlockInstrument.BASS)
             .strength(2.0F)
             .sounds(BlockSoundGroup.WOOD)
@@ -11563,10 +11561,10 @@
     * @mapping {@literal hashed m_uvuszloo Lnet/minecraft/unmapped/C_jricjyva;m_uvuszloo(Lnet/minecraft/unmapped/C_mlrprqox;Lnet/minecraft/unmapped/C_mlrprqox;Lnet/minecraft/unmapped/C_aevintex;)Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named logOf Lnet/minecraft/block/Blocks;logOf(Lnet/minecraft/block/MapColor;Lnet/minecraft/block/MapColor;Lnet/minecraft/sound/BlockSoundGroup;)Lnet/minecraft/block/Block;}
     */
-   private static Block logOf(MapColor topMapColor, MapColor sideMapColor, BlockSoundGroup soundGroup) {
+   private static Block logOf(MapColor topColor, MapColor sideColor, BlockSoundGroup soundGroup) {
       return new PillarBlock(
          AbstractBlock.Settings.create()
-            .mapColor(state -> state.get(PillarBlock.AXIS) == Direction.Axis.Y ? topMapColor : sideMapColor)
+            .mapColor(state -> state.get(PillarBlock.AXIS) == Direction.Axis.Y ? topColor : sideColor)
             .instrument(NoteBlockInstrument.BASS)
             .strength(2.0F)
             .sounds(soundGroup)
@@ -11578,9 +11576,9 @@
     * @mapping {@literal hashed m_cejxlkjq Lnet/minecraft/unmapped/C_jricjyva;m_cejxlkjq(Lnet/minecraft/unmapped/C_mlrprqox;)Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named netherStemOf Lnet/minecraft/block/Blocks;netherStemOf(Lnet/minecraft/block/MapColor;)Lnet/minecraft/block/Block;}
     */
-   private static Block netherStemOf(MapColor mapColor) {
+   private static Block netherStemOf(MapColor color) {
       return new PillarBlock(
-         AbstractBlock.Settings.create().mapColor(state -> mapColor).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.NETHER_STEM)
+         AbstractBlock.Settings.create().mapColor(state -> color).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.NETHER_STEM)
       );
    }
 
@@ -11622,9 +11620,9 @@
 
    /**
     * @mapping {@literal hashed m_gtmmdkuy Lnet/minecraft/unmapped/C_jricjyva;m_gtmmdkuy(Lnet/minecraft/unmapped/C_aevintex;)Lnet/minecraft/unmapped/C_mmxmpdoq;}
-    * @mapping {@literal named leaveOf Lnet/minecraft/block/Blocks;leaveOf(Lnet/minecraft/sound/BlockSoundGroup;)Lnet/minecraft/block/Block;}
+    * @mapping {@literal named leavesOf Lnet/minecraft/block/Blocks;leavesOf(Lnet/minecraft/sound/BlockSoundGroup;)Lnet/minecraft/block/Block;}
     */
-   private static Block leaveOf(BlockSoundGroup soundGroup) {
+   private static Block leavesOf(BlockSoundGroup soundGroup) {
       return new LeavesBlock(
          AbstractBlock.Settings.create()
             .mapColor(MapColor.PLANT)
@@ -11645,9 +11643,9 @@
     * @mapping {@literal hashed m_dsrskptj Lnet/minecraft/unmapped/C_jricjyva;m_dsrskptj(Lnet/minecraft/unmapped/C_arllgqae;Lnet/minecraft/unmapped/C_mlrprqox;)Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named shulkerBoxOf Lnet/minecraft/block/Blocks;shulkerBoxOf(Lnet/minecraft/util/DyeColor;Lnet/minecraft/block/MapColor;)Lnet/minecraft/block/Block;}
     */
-   private static Block shulkerBoxOf(@Nullable DyeColor color, MapColor mapColor) {
+   private static Block shulkerBoxOf(@Nullable DyeColor dyeColor, MapColor mapColor) {
       return new ShulkerBoxBlock(
-         color,
+         dyeColor,
          AbstractBlock.Settings.create()
             .mapColor(mapColor)
             .solid()
@@ -11706,10 +11704,10 @@
     * @mapping {@literal hashed m_ilocxcob Lnet/minecraft/unmapped/C_jricjyva;m_ilocxcob(Lnet/minecraft/unmapped/C_mlrprqox;)Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named candleOf Lnet/minecraft/block/Blocks;candleOf(Lnet/minecraft/block/MapColor;)Lnet/minecraft/block/Block;}
     */
-   private static Block candleOf(MapColor mapColor) {
+   private static Block candleOf(MapColor color) {
       return new CandleBlock(
          AbstractBlock.Settings.create()
-            .mapColor(mapColor)
+            .mapColor(color)
             .nonOpaque()
             .strength(0.1F)
             .sounds(BlockSoundGroup.CANDLE)
diff -bur namedTargetSrc/net/minecraft/block/BlockTypes.java namedSrc/net/minecraft/block/BlockTypes.java
--- namedTargetSrc/net/minecraft/block/BlockTypes.java	2024-01-17 18:11:51.471379558 +0000
+++ namedSrc/net/minecraft/block/BlockTypes.java	2024-01-17 18:10:47.415883127 +0000
@@ -124,7 +124,7 @@
       Registry.register(registry, "fence_gate", FenceGateBlock.CODEC);
       Registry.register(registry, "fire", FireBlock.CODEC);
       Registry.register(registry, "fletching_table", FletchingTableBlock.CODEC);
-      Registry.register(registry, "flower", FlowerBlock.f_jprrctms);
+      Registry.register(registry, "flower", FlowerBlock.CODEC);
       Registry.register(registry, "flower_pot", FlowerPotBlock.CODEC);
       Registry.register(registry, "frogspawn", FrogSpawnBlock.CODEC);
       Registry.register(registry, "frosted_ice", FrostedIceBlock.CODEC);
@@ -158,7 +158,7 @@
       Registry.register(registry, "lever", LeverBlock.CODEC);
       Registry.register(registry, "light", LightBlock.CODEC);
       Registry.register(registry, "lightning_rod", LightningRodBlock.CODEC);
-      Registry.register(registry, "liquid", FluidBlock.f_llasnfwf);
+      Registry.register(registry, "liquid", FluidBlock.CODEC);
       Registry.register(registry, "loom", LoomBlock.CODEC);
       Registry.register(registry, "magma", MagmaBlock.CODEC);
       Registry.register(registry, "mangrove_leaves", MangroveLeavesBlock.CODEC);
@@ -176,13 +176,13 @@
       Registry.register(registry, "note", NoteBlock.CODEC);
       Registry.register(registry, "nylium", NyliumBlock.CODEC);
       Registry.register(registry, "observer", ObserverBlock.CODEC);
-      Registry.register(registry, "piglinwallskull", WallPiglinSkullBlock.CODEC);
+      Registry.register(registry, "piglinwallskull", PiglinWallHeadBlock.CODEC);
       Registry.register(registry, "pink_petals", PinkPetalsBlock.CODEC);
       Registry.register(registry, "piston_base", PistonBlock.CODEC);
       Registry.register(registry, "piston_head", PistonHeadBlock.CODEC);
       Registry.register(registry, "pitcher_crop", PitcherCropBlock.CODEC);
       Registry.register(registry, "player_head", PlayerSkullBlock.CODEC);
-      Registry.register(registry, "player_wall_head", WallPlayerSkullBlock.CODEC);
+      Registry.register(registry, "player_wall_head", PlayerWallHeadBlock.CODEC);
       Registry.register(registry, "pointed_dripstone", PointedDripstoneBlock.CODEC);
       Registry.register(registry, "potato", PotatoesBlock.CODEC);
       Registry.register(registry, "powder_snow", PowderSnowBlock.CODEC);
@@ -194,7 +194,7 @@
       Registry.register(registry, "redstone_lamp", RedstoneLampBlock.CODEC);
       Registry.register(registry, "redstone_ore", RedstoneOreBlock.CODEC);
       Registry.register(registry, "redstone_torch", RedstoneTorchBlock.CODEC);
-      Registry.register(registry, "redstone_wall_torch", WallRedstoneTorchBlock.CODEC);
+      Registry.register(registry, "redstone_wall_torch", RedstoneWallTorchBlock.CODEC);
       Registry.register(registry, "redstone_wire", RedstoneWireBlock.CODEC);
       Registry.register(registry, "repeater", RepeaterBlock.CODEC);
       Registry.register(registry, "respawn_anchor", RespawnAnchorBlock.CODEC);
@@ -242,7 +242,7 @@
       Registry.register(registry, "tinted_glass", TintedGlassBlock.CODEC);
       Registry.register(registry, "tnt", TntBlock.CODEC);
       Registry.register(registry, "torchflower_crop", TorchflowerCropBlock.CODEC);
-      Registry.register(registry, "torch", TorchBlock.f_qrcxhpnm);
+      Registry.register(registry, "torch", TorchBlock.CODEC);
       Registry.register(registry, "transparent", GlassBlock.CODEC);
       Registry.register(registry, "trapdoor", TrapdoorBlock.CODEC);
       Registry.register(registry, "trapped_chest", TrappedChestBlock.CODEC);
@@ -275,7 +275,7 @@
       Registry.register(registry, "wet_sponge", WetSpongeBlock.CODEC);
       Registry.register(registry, "wither_rose", WitherRoseBlock.CODEC);
       Registry.register(registry, "wither_skull", WitherSkullBlock.CODEC);
-      Registry.register(registry, "wither_wall_skull", WallWitherSkullBlock.CODEC);
+      Registry.register(registry, "wither_wall_skull", WitherSkeletonWallSkullBlock.CODEC);
       return Registry.register(registry, "wool_carpet", DyedCarpetBlock.CODEC);
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/BrushableBlock.java namedSrc/net/minecraft/block/BrushableBlock.java
--- namedTargetSrc/net/minecraft/block/BrushableBlock.java	2024-01-17 18:11:51.523379150 +0000
+++ namedSrc/net/minecraft/block/BrushableBlock.java	2024-01-17 18:10:47.491882532 +0000
@@ -33,13 +33,13 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/BrushableBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<BrushableBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(
+      brushable -> brushable.group(
                Registries.BLOCK.getCodec().fieldOf("turns_into").forGetter(BrushableBlock::getBlock),
                Registries.SOUND_EVENT.getCodec().fieldOf("brush_sound").forGetter(BrushableBlock::getBrushingSound),
                Registries.SOUND_EVENT.getCodec().fieldOf("brush_comleted_sound").forGetter(BrushableBlock::getBrushingCompleteSound),
-               m_copdixka()
+               getSettingsCodec()
             )
-            .apply(instance, BrushableBlock::new)
+            .apply(brushable, BrushableBlock::new)
    );
    /**
     * @mapping {@literal hashed f_cqdhzuod Lnet/minecraft/unmapped/C_nizhkzsc;f_cqdhzuod:Lnet/minecraft/unmapped/C_vltzvhxi;}
diff -bur namedTargetSrc/net/minecraft/block/ButtonBlock.java namedSrc/net/minecraft/block/ButtonBlock.java
--- namedTargetSrc/net/minecraft/block/ButtonBlock.java	2024-01-17 18:11:51.403380091 +0000
+++ namedSrc/net/minecraft/block/ButtonBlock.java	2024-01-17 18:10:47.279884190 +0000
@@ -38,12 +38,12 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/ButtonBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<ButtonBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(
-               BlockSetType.CODEC.fieldOf("block_set_type").forGetter(arg -> arg.blockSetType),
-               Codec.intRange(1, 1024).fieldOf("ticks_to_stay_pressed").forGetter(arg -> arg.onTicks),
-               m_copdixka()
+      button -> button.group(
+               BlockSetType.CODEC.fieldOf("block_set_type").forGetter(block -> block.blockSetType),
+               Codec.intRange(1, 1024).fieldOf("ticks_to_stay_pressed").forGetter(block -> block.onTicks),
+               getSettingsCodec()
             )
-            .apply(instance, ButtonBlock::new)
+            .apply(button, ButtonBlock::new)
    );
    /**
     * @mapping {@literal hashed f_pzyrfksa Lnet/minecraft/unmapped/C_mvguptux;f_pzyrfksa:Lnet/minecraft/unmapped/C_xhwijdsd;}
@@ -229,16 +229,15 @@
    }
 
    /**
-    * @mapping {@literal hashed m_qjdjbqgu Lnet/minecraft/unmapped/C_mvguptux;m_qjdjbqgu(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_aahhrzpf;Ljava/util/function/BiConsumer;)V}
-    * @mapping {@literal named m_qjdjbqgu Lnet/minecraft/block/ButtonBlock;m_qjdjbqgu(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/explosion/Explosion;Ljava/util/function/BiConsumer;)V}
+    * Mapping not found
     */
    @Override
-   public void m_qjdjbqgu(BlockState state, World world, BlockPos pos, Explosion arg4, BiConsumer<ItemStack, BlockPos> biConsumer) {
-      if (arg4.m_vsvasiko() == Explosion.DestructionType.TRIGGER_BLOCK && !world.isClient() && !state.get(POWERED)) {
+   public void onExplosion(BlockState state, World world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> biConsumer) {
+      if (explosion.m_vsvasiko() == Explosion.DestructionType.TRIGGER_BLOCK && !world.isClient() && !state.get(POWERED)) {
          this.powerOn(state, world, pos);
       }
 
-      super.m_qjdjbqgu(state, world, pos, arg4, biConsumer);
+      super.onExplosion(state, world, pos, explosion, biConsumer);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/CampfireBlock.java namedSrc/net/minecraft/block/CampfireBlock.java
--- namedTargetSrc/net/minecraft/block/CampfireBlock.java	2024-01-17 18:11:51.479379495 +0000
+++ namedSrc/net/minecraft/block/CampfireBlock.java	2024-01-17 18:10:47.427883033 +0000
@@ -58,12 +58,12 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/CampfireBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<CampfireBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(
+      campfire -> campfire.group(
                Codec.BOOL.fieldOf("spawn_particles").forGetter(arg -> arg.emitsParticles),
                Codec.intRange(0, 1000).fieldOf("fire_damage").forGetter(arg -> arg.fireDamage),
-               m_copdixka()
+               getSettingsCodec()
             )
-            .apply(instance, CampfireBlock::new)
+            .apply(campfire, CampfireBlock::new)
    );
    /**
     * @mapping {@literal hashed f_ofxalugw Lnet/minecraft/unmapped/C_gcjouocd;f_ofxalugw:Lnet/minecraft/unmapped/C_zscvhwbd;}
@@ -463,6 +463,8 @@
     * @mapping {@literal named canBeLit Lnet/minecraft/block/CampfireBlock;canBeLit(Lnet/minecraft/block/BlockState;)Z}
     */
    public static boolean canBeLit(BlockState state) {
-      return state.isInAndMatches(BlockTags.CAMPFIRES, arg -> arg.contains(WATERLOGGED) && arg.contains(LIT)) && !state.get(WATERLOGGED) && !state.get(LIT);
+      return state.isInAndMatches(BlockTags.CAMPFIRES, block -> block.contains(WATERLOGGED) && block.contains(LIT))
+         && !state.get(WATERLOGGED)
+         && !state.get(LIT);
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/CandleCakeBlock.java namedSrc/net/minecraft/block/CandleCakeBlock.java
--- namedTargetSrc/net/minecraft/block/CandleCakeBlock.java	2024-01-17 18:11:51.347380530 +0000
+++ namedSrc/net/minecraft/block/CandleCakeBlock.java	2024-01-17 18:10:47.219884660 +0000
@@ -37,7 +37,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/CandleCakeBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<CandleCakeBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(Registries.BLOCK.getCodec().fieldOf("candle").forGetter(arg -> arg.candle), m_copdixka())
+      instance -> instance.group(Registries.BLOCK.getCodec().fieldOf("candle").forGetter(block -> block.candle), getSettingsCodec())
             .apply(instance, CandleCakeBlock::new)
    );
    /**
@@ -220,8 +220,8 @@
     * @mapping {@literal hashed m_twkcupry Lnet/minecraft/unmapped/C_hncygpat;m_twkcupry(Lnet/minecraft/unmapped/C_rrwcrbzt;)Lnet/minecraft/unmapped/C_txtbiemp;}
     * @mapping {@literal named getCandleCakeFromCandle Lnet/minecraft/block/CandleCakeBlock;getCandleCakeFromCandle(Lnet/minecraft/block/CandleBlock;)Lnet/minecraft/block/BlockState;}
     */
-   public static BlockState getCandleCakeFromCandle(CandleBlock arg) {
-      return ((CandleCakeBlock)CANDLES_TO_CANDLE_CAKES.get(arg)).getDefaultState();
+   public static BlockState getCandleCakeFromCandle(CandleBlock candle) {
+      return ((CandleCakeBlock)CANDLES_TO_CANDLE_CAKES.get(candle)).getDefaultState();
    }
 
    /**
@@ -229,6 +229,6 @@
     * @mapping {@literal named canBeLit Lnet/minecraft/block/CandleCakeBlock;canBeLit(Lnet/minecraft/block/BlockState;)Z}
     */
    public static boolean canBeLit(BlockState state) {
-      return state.isInAndMatches(BlockTags.CANDLE_CAKES, arg2 -> arg2.contains(LIT) && !state.get(LIT));
+      return state.isInAndMatches(BlockTags.CANDLE_CAKES, block -> block.contains(LIT) && !state.get(LIT));
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/CarvedPumpkinBlock.java namedSrc/net/minecraft/block/CarvedPumpkinBlock.java
--- namedTargetSrc/net/minecraft/block/CarvedPumpkinBlock.java	2024-01-17 18:11:51.411380029 +0000
+++ namedSrc/net/minecraft/block/CarvedPumpkinBlock.java	2024-01-17 18:10:47.287884128 +0000
@@ -225,7 +225,7 @@
          this.ironGolemDispenserPattern = BlockPatternBuilder.start()
             .aisle("~ ~", "###", "~#~")
             .where('#', CachedBlockPosition.matchesBlockState(BlockStatePredicate.forBlock(Blocks.IRON_BLOCK)))
-            .where('~', arg -> arg.getBlockState().isAir())
+            .where('~', block -> block.getBlockState().isAir())
             .build();
       }
 
@@ -242,7 +242,7 @@
             .aisle("~^~", "###", "~#~")
             .where('^', CachedBlockPosition.matchesBlockState(IS_GOLEM_HEAD_PREDICATE))
             .where('#', CachedBlockPosition.matchesBlockState(BlockStatePredicate.forBlock(Blocks.IRON_BLOCK)))
-            .where('~', arg -> arg.getBlockState().isAir())
+            .where('~', block -> block.getBlockState().isAir())
             .build();
       }
 
diff -bur namedTargetSrc/net/minecraft/block/cauldron/AbstractCauldronBlock.java namedSrc/net/minecraft/block/cauldron/AbstractCauldronBlock.java
--- namedTargetSrc/net/minecraft/block/cauldron/AbstractCauldronBlock.java	2024-01-17 18:11:51.483379464 +0000
+++ namedSrc/net/minecraft/block/cauldron/AbstractCauldronBlock.java	2024-01-17 18:10:47.431883002 +0000
@@ -75,9 +75,9 @@
    );
    /**
     * @mapping {@literal hashed f_rmandepb Lnet/minecraft/unmapped/C_ukinmebz;f_rmandepb:Lnet/minecraft/unmapped/C_hwbtrnnh$C_iuwwgckx;}
-    * @mapping {@literal named behaviorMap Lnet/minecraft/block/cauldron/AbstractCauldronBlock;behaviorMap:Lnet/minecraft/block/cauldron/CauldronBehavior$C_iuwwgckx;}
+    * @mapping {@literal named behaviorMap Lnet/minecraft/block/cauldron/AbstractCauldronBlock;behaviorMap:Lnet/minecraft/block/cauldron/CauldronBehavior$CauldronBehaviorMap;}
     */
-   protected final CauldronBehavior.C_iuwwgckx behaviorMap;
+   protected final CauldronBehavior.CauldronBehaviorMap behaviorMap;
 
    /**
     * Mapping not found
@@ -87,9 +87,9 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ukinmebz;<init>(Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;Lnet/minecraft/unmapped/C_hwbtrnnh$C_iuwwgckx;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/block/cauldron/AbstractCauldronBlock;<init>(Lnet/minecraft/block/AbstractBlock$Settings;Lnet/minecraft/block/cauldron/CauldronBehavior$C_iuwwgckx;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/cauldron/AbstractCauldronBlock;<init>(Lnet/minecraft/block/AbstractBlock$Settings;Lnet/minecraft/block/cauldron/CauldronBehavior$CauldronBehaviorMap;)V}
     */
-   public AbstractCauldronBlock(AbstractBlock.Settings settings, CauldronBehavior.C_iuwwgckx behaviorMap) {
+   public AbstractCauldronBlock(AbstractBlock.Settings settings, CauldronBehavior.CauldronBehaviorMap behaviorMap) {
       super(settings);
       this.behaviorMap = behaviorMap;
    }
diff -bur namedTargetSrc/net/minecraft/block/cauldron/CauldronBehavior.java namedSrc/net/minecraft/block/cauldron/CauldronBehavior.java
--- namedTargetSrc/net/minecraft/block/cauldron/CauldronBehavior.java	2024-01-17 18:11:51.335380625 +0000
+++ namedSrc/net/minecraft/block/cauldron/CauldronBehavior.java	2024-01-17 18:10:47.207884754 +0000
@@ -35,43 +35,44 @@
  */
 public interface CauldronBehavior {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_aegsusmx Lnet/minecraft/unmapped/C_hwbtrnnh;f_aegsusmx:Ljava/util/Map;}
+    * @mapping {@literal named BEHAVIOR_MAPS Lnet/minecraft/block/cauldron/CauldronBehavior;BEHAVIOR_MAPS:Ljava/util/Map;}
     */
-   Map<String, CauldronBehavior.C_iuwwgckx> f_aegsusmx = new Object2ObjectArrayMap<>();
+   Map<String, CauldronBehavior.CauldronBehaviorMap> BEHAVIOR_MAPS = new Object2ObjectArrayMap<>();
    /**
     * @mapping {@literal hashed f_rcuekuky Lnet/minecraft/unmapped/C_hwbtrnnh;f_rcuekuky:Lcom/mojang/serialization/Codec;}
     * @mapping {@literal named CODEC Lnet/minecraft/block/cauldron/CauldronBehavior;CODEC:Lcom/mojang/serialization/Codec;}
     */
-   Codec<CauldronBehavior.C_iuwwgckx> CODEC = Codecs.createStringResolverCodec(CauldronBehavior.C_iuwwgckx::name, f_aegsusmx::get);
+   Codec<CauldronBehavior.CauldronBehaviorMap> CODEC = Codecs.createStringResolverCodec(CauldronBehavior.CauldronBehaviorMap::name, BEHAVIOR_MAPS::get);
    /**
     * @mapping {@literal hashed f_xnvptihc Lnet/minecraft/unmapped/C_hwbtrnnh;f_xnvptihc:Lnet/minecraft/unmapped/C_hwbtrnnh$C_iuwwgckx;}
-    * @mapping {@literal named EMPTY_CAULDRON_BEHAVIOR Lnet/minecraft/block/cauldron/CauldronBehavior;EMPTY_CAULDRON_BEHAVIOR:Lnet/minecraft/block/cauldron/CauldronBehavior$C_iuwwgckx;}
+    * @mapping {@literal named EMPTY_CAULDRON_BEHAVIOR Lnet/minecraft/block/cauldron/CauldronBehavior;EMPTY_CAULDRON_BEHAVIOR:Lnet/minecraft/block/cauldron/CauldronBehavior$CauldronBehaviorMap;}
     */
-   CauldronBehavior.C_iuwwgckx EMPTY_CAULDRON_BEHAVIOR = createMap("empty");
+   CauldronBehavior.CauldronBehaviorMap EMPTY_CAULDRON_BEHAVIOR = createMap("empty");
    /**
     * @mapping {@literal hashed f_tfprqbdc Lnet/minecraft/unmapped/C_hwbtrnnh;f_tfprqbdc:Lnet/minecraft/unmapped/C_hwbtrnnh$C_iuwwgckx;}
-    * @mapping {@literal named WATER_CAULDRON_BEHAVIOR Lnet/minecraft/block/cauldron/CauldronBehavior;WATER_CAULDRON_BEHAVIOR:Lnet/minecraft/block/cauldron/CauldronBehavior$C_iuwwgckx;}
+    * @mapping {@literal named WATER_CAULDRON_BEHAVIOR Lnet/minecraft/block/cauldron/CauldronBehavior;WATER_CAULDRON_BEHAVIOR:Lnet/minecraft/block/cauldron/CauldronBehavior$CauldronBehaviorMap;}
     */
-   CauldronBehavior.C_iuwwgckx WATER_CAULDRON_BEHAVIOR = createMap("water");
+   CauldronBehavior.CauldronBehaviorMap WATER_CAULDRON_BEHAVIOR = createMap("water");
    /**
     * @mapping {@literal hashed f_udzuwjwe Lnet/minecraft/unmapped/C_hwbtrnnh;f_udzuwjwe:Lnet/minecraft/unmapped/C_hwbtrnnh$C_iuwwgckx;}
-    * @mapping {@literal named LAVA_CAULDRON_BEHAVIOR Lnet/minecraft/block/cauldron/CauldronBehavior;LAVA_CAULDRON_BEHAVIOR:Lnet/minecraft/block/cauldron/CauldronBehavior$C_iuwwgckx;}
+    * @mapping {@literal named LAVA_CAULDRON_BEHAVIOR Lnet/minecraft/block/cauldron/CauldronBehavior;LAVA_CAULDRON_BEHAVIOR:Lnet/minecraft/block/cauldron/CauldronBehavior$CauldronBehaviorMap;}
     */
-   CauldronBehavior.C_iuwwgckx LAVA_CAULDRON_BEHAVIOR = createMap("lava");
+   CauldronBehavior.CauldronBehaviorMap LAVA_CAULDRON_BEHAVIOR = createMap("lava");
    /**
     * @mapping {@literal hashed f_jgapiwag Lnet/minecraft/unmapped/C_hwbtrnnh;f_jgapiwag:Lnet/minecraft/unmapped/C_hwbtrnnh$C_iuwwgckx;}
-    * @mapping {@literal named POWDER_SNOW_CAULDRON_BEHAVIOR Lnet/minecraft/block/cauldron/CauldronBehavior;POWDER_SNOW_CAULDRON_BEHAVIOR:Lnet/minecraft/block/cauldron/CauldronBehavior$C_iuwwgckx;}
+    * @mapping {@literal named POWDER_SNOW_CAULDRON_BEHAVIOR Lnet/minecraft/block/cauldron/CauldronBehavior;POWDER_SNOW_CAULDRON_BEHAVIOR:Lnet/minecraft/block/cauldron/CauldronBehavior$CauldronBehaviorMap;}
     */
-   CauldronBehavior.C_iuwwgckx POWDER_SNOW_CAULDRON_BEHAVIOR = createMap("powder_snow");
+   CauldronBehavior.CauldronBehaviorMap POWDER_SNOW_CAULDRON_BEHAVIOR = createMap("powder_snow");
    /**
     * @mapping {@literal hashed f_sgnscjro Lnet/minecraft/unmapped/C_hwbtrnnh;f_sgnscjro:Lnet/minecraft/unmapped/C_hwbtrnnh;}
     * @mapping {@literal named FILL_WITH_WATER Lnet/minecraft/block/cauldron/CauldronBehavior;FILL_WITH_WATER:Lnet/minecraft/block/cauldron/CauldronBehavior;}
     */
-   CauldronBehavior FILL_WITH_WATER = (state, world, pos, player, arg5, stack) -> fillCauldron(
+   CauldronBehavior FILL_WITH_WATER = (state, world, pos, player, hand, stack) -> fillCauldron(
          world,
          pos,
          player,
-         arg5,
+         hand,
          stack,
          Blocks.WATER_CAULDRON.getDefaultState().with(LeveledCauldronBlock.LEVEL, Integer.valueOf(3)),
          SoundEvents.ITEM_BUCKET_EMPTY
@@ -172,13 +173,13 @@
 
    /**
     * @mapping {@literal hashed m_imlunxvz Lnet/minecraft/unmapped/C_hwbtrnnh;m_imlunxvz(Ljava/lang/String;)Lnet/minecraft/unmapped/C_hwbtrnnh$C_iuwwgckx;}
-    * @mapping {@literal named createMap Lnet/minecraft/block/cauldron/CauldronBehavior;createMap(Ljava/lang/String;)Lnet/minecraft/block/cauldron/CauldronBehavior$C_iuwwgckx;}
+    * @mapping {@literal named createMap Lnet/minecraft/block/cauldron/CauldronBehavior;createMap(Ljava/lang/String;)Lnet/minecraft/block/cauldron/CauldronBehavior$CauldronBehaviorMap;}
     */
-   static CauldronBehavior.C_iuwwgckx createMap(String string) {
+   static CauldronBehavior.CauldronBehaviorMap createMap(String name) {
       Object2ObjectOpenHashMap<Item, CauldronBehavior> object2ObjectOpenHashMap = new Object2ObjectOpenHashMap<>();
       object2ObjectOpenHashMap.defaultReturnValue((state, world, pos, player, hand, stack) -> C_gqmsalid.PASS_TO_DEFAULT_BLOCK_INTERACTION);
-      CauldronBehavior.C_iuwwgckx lv = new CauldronBehavior.C_iuwwgckx(string, object2ObjectOpenHashMap);
-      f_aegsusmx.put(string, lv);
+      CauldronBehavior.CauldronBehaviorMap lv = new CauldronBehavior.CauldronBehaviorMap(name, object2ObjectOpenHashMap);
+      BEHAVIOR_MAPS.put(name, lv);
       return lv;
    }
 
@@ -186,7 +187,7 @@
     * @mapping {@literal hashed interact Lnet/minecraft/unmapped/C_hwbtrnnh;interact(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_gqmsalid;}
     * @mapping {@literal named interact Lnet/minecraft/block/cauldron/CauldronBehavior;interact(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/unmapped/C_gqmsalid;}
     */
-   C_gqmsalid interact(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand arg5, ItemStack stack);
+   C_gqmsalid interact(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, ItemStack stack);
 
    /**
     * @mapping {@literal hashed m_ucoeawqp Lnet/minecraft/unmapped/C_hwbtrnnh;m_ucoeawqp()V}
@@ -195,13 +196,13 @@
    static void registerBehavior() {
       Map<Item, CauldronBehavior> map = EMPTY_CAULDRON_BEHAVIOR.map();
       registerBucketBehavior(map);
-      map.put(Items.POTION, (CauldronBehavior)(state, world, pos, player, arg5, stack) -> {
+      map.put(Items.POTION, (CauldronBehavior)(state, world, pos, player, hand, stack) -> {
          if (!PotionUtil.getPotionType(stack).matches(Potions.WATER)) {
             return C_gqmsalid.PASS_TO_DEFAULT_BLOCK_INTERACTION;
          } else {
             if (!world.isClient) {
                Item lv = stack.getItem();
-               player.setStackInHand(arg5, ItemUsage.exchangeStack(stack, player, new ItemStack(Items.GLASS_BOTTLE)));
+               player.setStackInHand(hand, ItemUsage.exchangeStack(stack, player, new ItemStack(Items.GLASS_BOTTLE)));
                player.incrementStat(Stats.USE_CAULDRON);
                player.incrementStat(Stats.USED.getOrCreateStat(lv));
                world.setBlockState(pos, Blocks.WATER_CAULDRON.getDefaultState());
@@ -216,12 +217,12 @@
       registerBucketBehavior(map2);
       map2.put(
          Items.BUCKET,
-         (CauldronBehavior)(state, world, pos, player, arg5, stack) -> emptyCauldron(
+         (CauldronBehavior)(state, world, pos, player, hand, stack) -> emptyCauldron(
                state,
                world,
                pos,
                player,
-               arg5,
+               hand,
                stack,
                new ItemStack(Items.WATER_BUCKET),
                statex -> statex.get(LeveledCauldronBlock.LEVEL) == 3,
@@ -297,20 +298,20 @@
       Map<Item, CauldronBehavior> map3 = LAVA_CAULDRON_BEHAVIOR.map();
       map3.put(
          Items.BUCKET,
-         (CauldronBehavior)(state, world, pos, player, arg5, stack) -> emptyCauldron(
-               state, world, pos, player, arg5, stack, new ItemStack(Items.LAVA_BUCKET), statex -> true, SoundEvents.ITEM_BUCKET_FILL_LAVA
+         (CauldronBehavior)(state, world, pos, player, hand, stack) -> emptyCauldron(
+               state, world, pos, player, hand, stack, new ItemStack(Items.LAVA_BUCKET), statex -> true, SoundEvents.ITEM_BUCKET_FILL_LAVA
             )
       );
       registerBucketBehavior(map3);
       Map<Item, CauldronBehavior> map4 = POWDER_SNOW_CAULDRON_BEHAVIOR.map();
       map4.put(
          Items.BUCKET,
-         (CauldronBehavior)(state, world, pos, player, arg5, stack) -> emptyCauldron(
+         (CauldronBehavior)(state, world, pos, player, hand, stack) -> emptyCauldron(
                state,
                world,
                pos,
                player,
-               arg5,
+               hand,
                stack,
                new ItemStack(Items.POWDER_SNOW_BUCKET),
                statex -> statex.get(LeveledCauldronBlock.LEVEL) == 3,
@@ -382,8 +383,8 @@
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_hwbtrnnh$C_iuwwgckx}
-    * @mapping {@literal named net/minecraft/block/cauldron/CauldronBehavior$C_iuwwgckx}
+    * @mapping {@literal named net/minecraft/block/cauldron/CauldronBehavior$CauldronBehaviorMap}
     */
-   public static record C_iuwwgckx(String name, Map<Item, CauldronBehavior> map) {
+   public static record CauldronBehaviorMap(String name, Map<Item, CauldronBehavior> map) {
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/cauldron/LeveledCauldronBlock.java namedSrc/net/minecraft/block/cauldron/LeveledCauldronBlock.java
--- namedTargetSrc/net/minecraft/block/cauldron/LeveledCauldronBlock.java	2024-01-17 18:11:51.439379809 +0000
+++ namedSrc/net/minecraft/block/cauldron/LeveledCauldronBlock.java	2024-01-17 18:10:47.367883502 +0000
@@ -31,7 +31,7 @@
       instance -> instance.group(
                Biome.Precipitation.CODEC.fieldOf("precipitation").forGetter(arg -> arg.precipitation),
                CauldronBehavior.CODEC.fieldOf("interactions").forGetter(arg -> arg.behaviorMap),
-               m_copdixka()
+               getSettingsCodec()
             )
             .apply(instance, LeveledCauldronBlock::new)
    );
@@ -76,10 +76,10 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_lfbgqelt;<init>(Lnet/minecraft/unmapped/C_orlkpefs$C_xwlyzxea;Lnet/minecraft/unmapped/C_hwbtrnnh$C_iuwwgckx;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/block/cauldron/LeveledCauldronBlock;<init>(Lnet/minecraft/world/biome/Biome$Precipitation;Lnet/minecraft/block/cauldron/CauldronBehavior$C_iuwwgckx;Lnet/minecraft/block/AbstractBlock$Settings;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/cauldron/LeveledCauldronBlock;<init>(Lnet/minecraft/world/biome/Biome$Precipitation;Lnet/minecraft/block/cauldron/CauldronBehavior$CauldronBehaviorMap;Lnet/minecraft/block/AbstractBlock$Settings;)V}
     */
-   public LeveledCauldronBlock(Biome.Precipitation precipitation, CauldronBehavior.C_iuwwgckx arg2, AbstractBlock.Settings settings) {
-      super(settings, arg2);
+   public LeveledCauldronBlock(Biome.Precipitation precipitation, CauldronBehavior.CauldronBehaviorMap behaviorMap, AbstractBlock.Settings settings) {
+      super(settings, behaviorMap);
       this.precipitation = precipitation;
       this.setDefaultState(this.stateManager.getDefaultState().with(LEVEL, Integer.valueOf(1)));
    }
diff -bur namedTargetSrc/net/minecraft/block/ChestBlock.java namedSrc/net/minecraft/block/ChestBlock.java
--- namedTargetSrc/net/minecraft/block/ChestBlock.java	2024-01-17 18:11:51.499379338 +0000
+++ namedSrc/net/minecraft/block/ChestBlock.java	2024-01-17 18:10:47.455882814 +0000
@@ -430,7 +430,7 @@
    ) {
       BiPredicate<WorldAccess, BlockPos> biPredicate;
       if (ignoreBlocked) {
-         biPredicate = (arg, posx) -> false;
+         biPredicate = (worldx, posx) -> false;
       } else {
          biPredicate = ChestBlock::isChestBlocked;
       }

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

View the diff here (2/3):
diff -bur namedTargetSrc/net/minecraft/block/ChiseledBookshelfBlock.java namedSrc/net/minecraft/block/ChiseledBookshelfBlock.java
--- namedTargetSrc/net/minecraft/block/ChiseledBookshelfBlock.java	2024-01-17 18:11:51.295380938 +0000
+++ namedSrc/net/minecraft/block/ChiseledBookshelfBlock.java	2024-01-17 18:10:47.163885098 +0000
@@ -148,10 +148,10 @@
     * @mapping {@literal hashed m_astlfcmg Lnet/minecraft/unmapped/C_ilehnffu;m_astlfcmg(Lnet/minecraft/unmapped/C_jdakttms;Lnet/minecraft/unmapped/C_txtbiemp;)Ljava/util/OptionalInt;}
     * @mapping {@literal named getHitSlot Lnet/minecraft/block/ChiseledBookshelfBlock;getHitSlot(Lnet/minecraft/util/hit/BlockHitResult;Lnet/minecraft/block/BlockState;)Ljava/util/OptionalInt;}
     */
-   private OptionalInt getHitSlot(BlockHitResult result, BlockState state) {
-      return (OptionalInt)getRelativeHitCoordinates(result, state.get(HorizontalFacingBlock.FACING)).map(arg -> {
-         int i = arg.y >= 0.5F ? 0 : 1;
-         int j = getColumn(arg.x);
+   private OptionalInt getHitSlot(BlockHitResult hitResult, BlockState state) {
+      return (OptionalInt)getRelativeHitCoordinates(hitResult, state.get(HorizontalFacingBlock.FACING)).map(block -> {
+         int i = block.y >= 0.5F ? 0 : 1;
+         int j = getColumn(block.x);
          return OptionalInt.of(j + i * 3);
       }).orElseGet(OptionalInt::empty);
    }
@@ -244,7 +244,7 @@
    @Override
    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
       builder.add(HorizontalFacingBlock.FACING);
-      SLOT_OCCUPATION_PROPERTIES.forEach(arg2 -> builder.add(arg2));
+      SLOT_OCCUPATION_PROPERTIES.forEach(property -> builder.add(property));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/ChorusFlowerBlock.java namedSrc/net/minecraft/block/ChorusFlowerBlock.java
--- namedTargetSrc/net/minecraft/block/ChorusFlowerBlock.java	2024-01-17 18:11:51.519379181 +0000
+++ namedSrc/net/minecraft/block/ChorusFlowerBlock.java	2024-01-17 18:10:47.483882595 +0000
@@ -30,7 +30,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/ChorusFlowerBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<ChorusFlowerBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(Registries.BLOCK.getCodec().fieldOf("plant").forGetter(arg -> arg.plantBlock), m_copdixka())
+      instance -> instance.group(Registries.BLOCK.getCodec().fieldOf("plant").forGetter(arg -> arg.plantBlock), getSettingsCodec())
             .apply(instance, ChorusFlowerBlock::new)
    );
    /**
@@ -135,7 +135,7 @@
             }
 
             if (bl && isSurroundedByAir(world, lv, null) && world.isAir(pos.up(2))) {
-               world.setBlockState(pos, ChorusPlantBlock.m_cfzvcixi(world, pos, this.plantBlock.getDefaultState()), Block.NOTIFY_LISTENERS);
+               world.setBlockState(pos, ChorusPlantBlock.withConnectionProperties(world, pos, this.plantBlock.getDefaultState()), Block.NOTIFY_LISTENERS);
                this.grow(world, lv, i);
             } else if (i < 4) {
                int l = random.nextInt(4);
@@ -155,7 +155,7 @@
                }
 
                if (bl3) {
-                  world.setBlockState(pos, ChorusPlantBlock.m_cfzvcixi(world, pos, this.plantBlock.getDefaultState()), Block.NOTIFY_LISTENERS);
+                  world.setBlockState(pos, ChorusPlantBlock.withConnectionProperties(world, pos, this.plantBlock.getDefaultState()), Block.NOTIFY_LISTENERS);
                } else {
                   this.die(world, pos);
                }
@@ -257,7 +257,7 @@
     * @mapping {@literal named generate Lnet/minecraft/block/ChorusFlowerBlock;generate(Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/random/RandomGenerator;I)V}
     */
    public static void generate(WorldAccess world, BlockPos pos, RandomGenerator random, int size) {
-      world.setBlockState(pos, ChorusPlantBlock.m_cfzvcixi(world, pos, Blocks.CHORUS_PLANT.getDefaultState()), Block.NOTIFY_LISTENERS);
+      world.setBlockState(pos, ChorusPlantBlock.withConnectionProperties(world, pos, Blocks.CHORUS_PLANT.getDefaultState()), Block.NOTIFY_LISTENERS);
       generate(world, pos, random, pos, size, 0);
    }
 
@@ -278,8 +278,8 @@
             return;
          }
 
-         world.setBlockState(lv2, ChorusPlantBlock.m_cfzvcixi(world, lv2, lv.getDefaultState()), Block.NOTIFY_LISTENERS);
-         world.setBlockState(lv2.down(), ChorusPlantBlock.m_cfzvcixi(world, lv2.down(), lv.getDefaultState()), Block.NOTIFY_LISTENERS);
+         world.setBlockState(lv2, ChorusPlantBlock.withConnectionProperties(world, lv2, lv.getDefaultState()), Block.NOTIFY_LISTENERS);
+         world.setBlockState(lv2.down(), ChorusPlantBlock.withConnectionProperties(world, lv2.down(), lv.getDefaultState()), Block.NOTIFY_LISTENERS);
       }
 
       boolean bl = false;
@@ -298,10 +298,10 @@
                && world.isAir(lv4.down())
                && isSurroundedByAir(world, lv4, lv3.getOpposite())) {
                bl = true;
-               world.setBlockState(lv4, ChorusPlantBlock.m_cfzvcixi(world, lv4, lv.getDefaultState()), Block.NOTIFY_LISTENERS);
+               world.setBlockState(lv4, ChorusPlantBlock.withConnectionProperties(world, lv4, lv.getDefaultState()), Block.NOTIFY_LISTENERS);
                world.setBlockState(
                   lv4.offset(lv3.getOpposite()),
-                  ChorusPlantBlock.m_cfzvcixi(world, lv4.offset(lv3.getOpposite()), lv.getDefaultState()),
+                  ChorusPlantBlock.withConnectionProperties(world, lv4.offset(lv3.getOpposite()), lv.getDefaultState()),
                   Block.NOTIFY_LISTENERS
                );
                generate(world, lv4, random, rootPos, size, layer + 1);
diff -bur namedTargetSrc/net/minecraft/block/ChorusPlantBlock.java namedSrc/net/minecraft/block/ChorusPlantBlock.java
--- namedTargetSrc/net/minecraft/block/ChorusPlantBlock.java	2024-01-17 18:11:51.319380750 +0000
+++ namedSrc/net/minecraft/block/ChorusPlantBlock.java	2024-01-17 18:10:47.191884879 +0000
@@ -55,14 +55,14 @@
     */
    @Override
    public BlockState getPlacementState(ItemPlacementContext ctx) {
-      return m_cfzvcixi(ctx.getWorld(), ctx.getBlockPos(), this.getDefaultState());
+      return withConnectionProperties(ctx.getWorld(), ctx.getBlockPos(), this.getDefaultState());
    }
 
    /**
     * @mapping {@literal hashed m_cfzvcixi Lnet/minecraft/unmapped/C_iomuckss;m_cfzvcixi(Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)Lnet/minecraft/unmapped/C_txtbiemp;}
-    * @mapping {@literal named m_cfzvcixi Lnet/minecraft/block/ChorusPlantBlock;m_cfzvcixi(Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)Lnet/minecraft/block/BlockState;}
+    * @mapping {@literal named withConnectionProperties Lnet/minecraft/block/ChorusPlantBlock;withConnectionProperties(Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)Lnet/minecraft/block/BlockState;}
     */
-   public static BlockState m_cfzvcixi(BlockView world, BlockPos pos, BlockState state) {
+   public static BlockState withConnectionProperties(BlockView world, BlockPos pos, BlockState state) {
       BlockState lv = world.getBlockState(pos.down());
       BlockState lv2 = world.getBlockState(pos.up());
       BlockState lv3 = world.getBlockState(pos.north());
diff -bur namedTargetSrc/net/minecraft/block/CommandBlock.java namedSrc/net/minecraft/block/CommandBlock.java
--- namedTargetSrc/net/minecraft/block/CommandBlock.java	2024-01-17 18:11:51.467379590 +0000
+++ namedSrc/net/minecraft/block/CommandBlock.java	2024-01-17 18:10:47.407883189 +0000
@@ -39,7 +39,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/CommandBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<CommandBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(Codec.BOOL.fieldOf("automatic").forGetter(arg -> arg.auto), m_copdixka()).apply(instance, CommandBlock::new)
+      instance -> instance.group(Codec.BOOL.fieldOf("automatic").forGetter(block -> block.auto), getSettingsCodec()).apply(instance, CommandBlock::new)
    );
    /**
     * @mapping {@literal hashed f_gfqototj Lnet/minecraft/unmapped/C_tngfqham;f_gfqototj:Lorg/slf4j/Logger;}
diff -bur namedTargetSrc/net/minecraft/block/ComparatorBlock.java namedSrc/net/minecraft/block/ComparatorBlock.java
--- namedTargetSrc/net/minecraft/block/ComparatorBlock.java	2024-01-17 18:11:51.379380280 +0000
+++ namedSrc/net/minecraft/block/ComparatorBlock.java	2024-01-17 18:10:47.251884409 +0000
@@ -75,7 +75,7 @@
    public BlockState getStateForNeighborUpdate(
       BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos
    ) {
-      return direction == Direction.DOWN && !this.m_bgspgxfd(world, neighborPos, neighborState)
+      return direction == Direction.DOWN && !this.canPlaceAbove(world, neighborPos, neighborState)
          ? Blocks.AIR.getDefaultState()
          : super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos);
    }
diff -bur namedTargetSrc/net/minecraft/block/ConcretePowderBlock.java namedSrc/net/minecraft/block/ConcretePowderBlock.java
--- namedTargetSrc/net/minecraft/block/ConcretePowderBlock.java	2024-01-17 18:11:51.531379087 +0000
+++ namedSrc/net/minecraft/block/ConcretePowderBlock.java	2024-01-17 18:10:47.499882470 +0000
@@ -22,7 +22,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/ConcretePowderBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<ConcretePowderBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(Registries.BLOCK.getCodec().fieldOf("concrete").forGetter(arg -> arg.hardenedState), m_copdixka())
+      instance -> instance.group(Registries.BLOCK.getCodec().fieldOf("concrete").forGetter(block -> block.hardenedState), getSettingsCodec())
             .apply(instance, ConcretePowderBlock::new)
    );
    /**
diff -bur namedTargetSrc/net/minecraft/block/CopperBulbBlock.java namedSrc/net/minecraft/block/CopperBulbBlock.java
--- namedTargetSrc/net/minecraft/block/CopperBulbBlock.java	2024-01-17 18:11:51.499379338 +0000
+++ namedSrc/net/minecraft/block/CopperBulbBlock.java	2024-01-17 18:10:47.455882814 +0000
@@ -16,7 +16,9 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/CopperBulbBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<CopperBulbBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(Oxidizable.OxidizationLevel.CODEC.fieldOf("weathering_state").forGetter(CopperBulbBlock::getDegradationLevel), m_copdixka())
+      instance -> instance.group(
+               Oxidizable.OxidizationLevel.CODEC.fieldOf("weathering_state").forGetter(CopperBulbBlock::getDegradationLevel), getSettingsCodec()
+            )
             .apply(instance, CopperBulbBlock::new)
    );
    /**
diff -bur namedTargetSrc/net/minecraft/block/CopperDoorBlock.java namedSrc/net/minecraft/block/CopperDoorBlock.java
--- namedTargetSrc/net/minecraft/block/CopperDoorBlock.java	2024-01-17 18:11:51.379380280 +0000
+++ namedSrc/net/minecraft/block/CopperDoorBlock.java	2024-01-17 18:10:47.251884409 +0000
@@ -20,7 +20,7 @@
       instance -> instance.group(
                BlockSetType.CODEC.fieldOf("block_set_type").forGetter(DoorBlock::getBlockSetType),
                Oxidizable.OxidizationLevel.CODEC.fieldOf("weathering_state").forGetter(CopperDoorBlock::getDegradationLevel),
-               m_copdixka()
+               getSettingsCodec()
             )
             .apply(instance, CopperDoorBlock::new)
    );
@@ -42,8 +42,8 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_dfahqqqb;<init>(Lnet/minecraft/unmapped/C_hgpogkhy;Lnet/minecraft/unmapped/C_nxfuouvr$C_cencorqf;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
     * @mapping {@literal named <init> Lnet/minecraft/block/CopperDoorBlock;<init>(Lnet/minecraft/block/BlockSetType;Lnet/minecraft/block/Oxidizable$OxidizationLevel;Lnet/minecraft/block/AbstractBlock$Settings;)V}
     */
-   protected CopperDoorBlock(BlockSetType type, Oxidizable.OxidizationLevel oxidizationLevel, AbstractBlock.Settings settings) {
-      super(type, settings);
+   protected CopperDoorBlock(BlockSetType blockSetType, Oxidizable.OxidizationLevel oxidizationLevel, AbstractBlock.Settings settings) {
+      super(blockSetType, settings);
       this.oxidizationLevel = oxidizationLevel;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/CopperGrateBlock.java namedSrc/net/minecraft/block/CopperGrateBlock.java
--- namedTargetSrc/net/minecraft/block/CopperGrateBlock.java	2024-01-17 18:11:51.483379464 +0000
+++ namedSrc/net/minecraft/block/CopperGrateBlock.java	2024-01-17 18:10:47.435882970 +0000
@@ -16,7 +16,9 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/CopperGrateBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<CopperGrateBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(Oxidizable.OxidizationLevel.CODEC.fieldOf("weathering_state").forGetter(CopperGrateBlock::getDegradationLevel), m_copdixka())
+      instance -> instance.group(
+               Oxidizable.OxidizationLevel.CODEC.fieldOf("weathering_state").forGetter(CopperGrateBlock::getDegradationLevel), getSettingsCodec()
+            )
             .apply(instance, CopperGrateBlock::new)
    );
    /**
diff -bur namedTargetSrc/net/minecraft/block/CopperTrapdoorBlock.java namedSrc/net/minecraft/block/CopperTrapdoorBlock.java
--- namedTargetSrc/net/minecraft/block/CopperTrapdoorBlock.java	2024-01-17 18:11:51.407380060 +0000
+++ namedSrc/net/minecraft/block/CopperTrapdoorBlock.java	2024-01-17 18:10:47.283884159 +0000
@@ -17,9 +17,9 @@
     */
    public static final MapCodec<CopperTrapdoorBlock> CODEC = RecordCodecBuilder.mapCodec(
       instance -> instance.group(
-               BlockSetType.CODEC.fieldOf("block_set_type").forGetter(TrapdoorBlock::m_ivpnsrmb),
+               BlockSetType.CODEC.fieldOf("block_set_type").forGetter(TrapdoorBlock::getBlockSetType),
                Oxidizable.OxidizationLevel.CODEC.fieldOf("weathering_state").forGetter(CopperTrapdoorBlock::getDegradationLevel),
-               m_copdixka()
+               getSettingsCodec()
             )
             .apply(instance, CopperTrapdoorBlock::new)
    );
@@ -41,8 +41,8 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_likpvjnd;<init>(Lnet/minecraft/unmapped/C_hgpogkhy;Lnet/minecraft/unmapped/C_nxfuouvr$C_cencorqf;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
     * @mapping {@literal named <init> Lnet/minecraft/block/CopperTrapdoorBlock;<init>(Lnet/minecraft/block/BlockSetType;Lnet/minecraft/block/Oxidizable$OxidizationLevel;Lnet/minecraft/block/AbstractBlock$Settings;)V}
     */
-   protected CopperTrapdoorBlock(BlockSetType type, Oxidizable.OxidizationLevel oxidizationLevel, AbstractBlock.Settings settings) {
-      super(type, settings);
+   protected CopperTrapdoorBlock(BlockSetType blockSetType, Oxidizable.OxidizationLevel oxidizationLevel, AbstractBlock.Settings settings) {
+      super(blockSetType, settings);
       this.oxidizationLevel = oxidizationLevel;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/CoralBlockBlock.java namedSrc/net/minecraft/block/CoralBlockBlock.java
--- namedTargetSrc/net/minecraft/block/CoralBlockBlock.java	2024-01-17 18:11:51.359380437 +0000
+++ namedSrc/net/minecraft/block/CoralBlockBlock.java	2024-01-17 18:10:47.227884597 +0000
@@ -29,7 +29,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/CoralBlockBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<CoralBlockBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(DEAD_CODEC.forGetter(arg -> arg.deadCoralBlock), m_copdixka()).apply(instance, CoralBlockBlock::new)
+      instance -> instance.group(DEAD_CODEC.forGetter(arg -> arg.deadCoralBlock), getSettingsCodec()).apply(instance, CoralBlockBlock::new)
    );
    /**
     * @mapping {@literal hashed f_ruciktga Lnet/minecraft/unmapped/C_uokbczcs;f_ruciktga:Lnet/minecraft/unmapped/C_mmxmpdoq;}
diff -bur namedTargetSrc/net/minecraft/block/CoralBlock.java namedSrc/net/minecraft/block/CoralBlock.java
--- namedTargetSrc/net/minecraft/block/CoralBlock.java	2024-01-17 18:11:51.519379181 +0000
+++ namedSrc/net/minecraft/block/CoralBlock.java	2024-01-17 18:10:47.479882626 +0000
@@ -22,7 +22,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/CoralBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<CoralBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(CoralBlockBlock.DEAD_CODEC.forGetter(arg -> arg.deadCoralBlock), m_copdixka()).apply(instance, CoralBlock::new)
+      instance -> instance.group(CoralBlockBlock.DEAD_CODEC.forGetter(block -> block.deadCoralBlock), getSettingsCodec()).apply(instance, CoralBlock::new)
    );
    /**
     * @mapping {@literal hashed f_hrdldytc Lnet/minecraft/unmapped/C_tsfiwgzv;f_hrdldytc:Lnet/minecraft/unmapped/C_mmxmpdoq;}
diff -bur namedTargetSrc/net/minecraft/block/CoralFanBlock.java namedSrc/net/minecraft/block/CoralFanBlock.java
--- namedTargetSrc/net/minecraft/block/CoralFanBlock.java	2024-01-17 18:11:51.431379872 +0000
+++ namedSrc/net/minecraft/block/CoralFanBlock.java	2024-01-17 18:10:47.355883596 +0000
@@ -20,7 +20,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/CoralFanBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<CoralFanBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(CoralBlockBlock.DEAD_CODEC.forGetter(arg -> arg.deadCoralBlock), m_copdixka()).apply(instance, CoralFanBlock::new)
+      instance -> instance.group(CoralBlockBlock.DEAD_CODEC.forGetter(arg -> arg.deadCoralBlock), getSettingsCodec()).apply(instance, CoralFanBlock::new)
    );
    /**
     * @mapping {@literal hashed f_ssdzxogm Lnet/minecraft/unmapped/C_vwyceaew;f_ssdzxogm:Lnet/minecraft/unmapped/C_mmxmpdoq;}
diff -bur namedTargetSrc/net/minecraft/block/CoralWallFanBlock.java namedSrc/net/minecraft/block/CoralWallFanBlock.java
--- namedTargetSrc/net/minecraft/block/CoralWallFanBlock.java	2024-01-17 18:11:51.483379464 +0000
+++ namedSrc/net/minecraft/block/CoralWallFanBlock.java	2024-01-17 18:10:47.431883002 +0000
@@ -20,7 +20,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/CoralWallFanBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<CoralWallFanBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(CoralBlockBlock.DEAD_CODEC.forGetter(arg -> arg.deadCoralBlock), m_copdixka()).apply(instance, CoralWallFanBlock::new)
+      instance -> instance.group(CoralBlockBlock.DEAD_CODEC.forGetter(arg -> arg.deadCoralBlock), getSettingsCodec()).apply(instance, CoralWallFanBlock::new)
    );
    /**
     * @mapping {@literal hashed f_awgjymst Lnet/minecraft/unmapped/C_ubdrwvvh;f_awgjymst:Lnet/minecraft/unmapped/C_mmxmpdoq;}
diff -bur namedTargetSrc/net/minecraft/block/Crafter.java namedSrc/net/minecraft/block/Crafter.java
--- namedTargetSrc/net/minecraft/block/Crafter.java	2024-01-17 18:11:51.371380342 +0000
+++ namedSrc/net/minecraft/block/Crafter.java	2024-01-17 18:10:47.239884503 +0000
@@ -66,9 +66,9 @@
    private static final int MAX_CRAFTING_TICKS = 6;
    /**
     * @mapping {@literal hashed f_agoiltbq Lnet/minecraft/unmapped/C_dmnruvyr;f_agoiltbq:I}
-    * @mapping {@literal named CRAFTING_TICK_DELAY Lnet/minecraft/block/Crafter;CRAFTING_TICK_DELAY:I}
+    * @mapping {@literal named TRIGGER_DELAY Lnet/minecraft/block/Crafter;TRIGGER_DELAY:I}
     */
-   private static final int CRAFTING_TICK_DELAY = 4;
+   private static final int TRIGGER_DELAY = 4;
    /**
     * @mapping {@literal hashed f_qwlpkjjq Lnet/minecraft/unmapped/C_dmnruvyr;f_qwlpkjjq:Lnet/minecraft/unmapped/C_edmnjlch;}
     * @mapping {@literal named RECIPE_CACHE Lnet/minecraft/block/Crafter;RECIPE_CACHE:Lnet/minecraft/recipe/RecipeCache;}
@@ -112,7 +112,7 @@
    @Override
    public int getComparatorOutput(BlockState state, World world, BlockPos pos) {
       BlockEntity lv = world.getBlockEntity(pos);
-      return lv instanceof CrafterBlockEntity lv2 ? lv2.m_ibidmmff() : 0;
+      return lv instanceof CrafterBlockEntity lv2 ? lv2.getComparatorOutput() : 0;
    }
 
    /**
@@ -138,7 +138,7 @@
     */
    @Override
    public void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, RandomGenerator random) {
-      this.craft(state, world, pos);
+      this.m_xwekqozg(state, world, pos);
    }
 
    /**
@@ -147,16 +147,16 @@
    @Nullable
    @Override
    public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state, BlockEntityType<T> type) {
-      return world.isClient ? null : checkType(type, BlockEntityType.CRAFTER, CrafterBlockEntity::m_ycajyjlg);
+      return world.isClient ? null : checkType(type, BlockEntityType.CRAFTER, CrafterBlockEntity::tickCrafting);
    }
 
    /**
     * @mapping {@literal hashed m_llucjdut Lnet/minecraft/unmapped/C_dmnruvyr;m_llucjdut(Lnet/minecraft/unmapped/C_kvegafmh;Z)V}
     * @mapping {@literal named setTriggered Lnet/minecraft/block/Crafter;setTriggered(Lnet/minecraft/block/entity/BlockEntity;Z)V}
     */
-   private void setTriggered(@Nullable BlockEntity arg, boolean bl) {
-      if (arg instanceof CrafterBlockEntity lv) {
-         lv.m_qgwfsxfb(bl);
+   private void setTriggered(@Nullable BlockEntity blockEntity, boolean bl) {
+      if (blockEntity instanceof CrafterBlockEntity lv) {
+         lv.setTriggered(bl);
       }
    }
 
@@ -166,7 +166,7 @@
    @Override
    public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
       CrafterBlockEntity lv = new CrafterBlockEntity(pos, state);
-      lv.m_qgwfsxfb(state.contains(TRIGGERED) && state.get(TRIGGERED));
+      lv.setTriggered(state.contains(TRIGGERED) && state.get(TRIGGERED));
       return lv;
    }
 
@@ -232,22 +232,22 @@
 
    /**
     * @mapping {@literal hashed m_xwekqozg Lnet/minecraft/unmapped/C_dmnruvyr;m_xwekqozg(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;)V}
-    * @mapping {@literal named craft Lnet/minecraft/block/Crafter;craft(Lnet/minecraft/block/BlockState;Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;)V}
+    * @mapping {@literal named m_xwekqozg Lnet/minecraft/block/Crafter;m_xwekqozg(Lnet/minecraft/block/BlockState;Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;)V}
     */
-   protected void craft(BlockState state, ServerWorld world, BlockPos pos) {
+   protected void m_xwekqozg(BlockState state, ServerWorld world, BlockPos pos) {
       BlockEntity optional = world.getBlockEntity(pos);
       if (optional instanceof CrafterBlockEntity lv) {
          Optional<CraftingRecipe> optionalx = getCraftingRecipe(world, lv);
          if (optionalx.isEmpty()) {
             world.syncWorldEvent(1050, pos, 0);
          } else {
-            lv.m_yxqplnvb(6);
+            lv.setCraftingTicksRemaining(6);
             world.setBlockState(pos, state.with(CRAFTING, Boolean.valueOf(true)), Block.NOTIFY_LISTENERS);
             CraftingRecipe lv3 = (CraftingRecipe)optionalx.get();
             ItemStack lv4 = lv3.craft(lv, world.getRegistryManager());
             lv4.onCraft(world);
-            this.m_wbzysgew(world, pos, lv, lv4, state);
-            lv3.getRemainder(lv).forEach(stack -> this.m_wbzysgew(world, pos, lv, stack, state));
+            this.craft(world, pos, lv, lv4, state);
+            lv3.getRemainder(lv).forEach(stack -> this.craft(world, pos, lv, stack, state));
             lv.getInvStack().forEach(stack -> {
                if (!stack.isEmpty()) {
                   stack.decrement(1);
@@ -262,22 +262,22 @@
     * @mapping {@literal hashed m_jtimyngh Lnet/minecraft/unmapped/C_dmnruvyr;m_jtimyngh(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_fcvwjvlq;)Ljava/util/Optional;}
     * @mapping {@literal named getCraftingRecipe Lnet/minecraft/block/Crafter;getCraftingRecipe(Lnet/minecraft/world/World;Lnet/minecraft/inventory/RecipeInputInventory;)Ljava/util/Optional;}
     */
-   public static Optional<CraftingRecipe> getCraftingRecipe(World world, RecipeInputInventory arg2) {
-      return RECIPE_CACHE.m_tipfbwpi(world, arg2);
+   public static Optional<CraftingRecipe> getCraftingRecipe(World world, RecipeInputInventory inputInventory) {
+      return RECIPE_CACHE.m_tipfbwpi(world, inputInventory);
    }
 
    /**
     * @mapping {@literal hashed m_wbzysgew Lnet/minecraft/unmapped/C_dmnruvyr;m_wbzysgew(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_lamqkfie;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_txtbiemp;)V}
-    * @mapping {@literal named m_wbzysgew Lnet/minecraft/block/Crafter;m_wbzysgew(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/entity/CrafterBlockEntity;Lnet/minecraft/item/ItemStack;Lnet/minecraft/block/BlockState;)V}
+    * @mapping {@literal named craft Lnet/minecraft/block/Crafter;craft(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/entity/CrafterBlockEntity;Lnet/minecraft/item/ItemStack;Lnet/minecraft/block/BlockState;)V}
     */
-   private void m_wbzysgew(World world, BlockPos pos, CrafterBlockEntity arg3, ItemStack stack, BlockState state) {
+   private void craft(World world, BlockPos pos, CrafterBlockEntity blockEntity, ItemStack stack, BlockState state) {
       Direction lv = ((JigsawOrientation)state.get(ORIENTATION)).getFacing();
       Inventory lv2 = HopperBlockEntity.getInventoryAt(world, pos.offset(lv));
       ItemStack lv3 = stack.copy();
       if (lv2 != null && (lv2 instanceof CrafterBlockEntity || stack.getCount() > lv2.getMaxCountPerStack())) {
          while (!lv3.isEmpty()) {
             ItemStack lv4 = lv3.withCount(1);
-            ItemStack lv5 = HopperBlockEntity.transfer(arg3, lv2, lv4, lv.getOpposite());
+            ItemStack lv5 = HopperBlockEntity.transfer(blockEntity, lv2, lv4, lv.getOpposite());
             if (!lv5.isEmpty()) {
                break;
             }
@@ -287,7 +287,7 @@
       } else if (lv2 != null) {
          while (!lv3.isEmpty()) {
             int i = lv3.getCount();
-            lv3 = HopperBlockEntity.transfer(arg3, lv2, lv3, lv.getOpposite());
+            lv3 = HopperBlockEntity.transfer(blockEntity, lv2, lv3, lv.getOpposite());
             if (i == lv3.getCount()) {
                break;
             }
diff -bur namedTargetSrc/net/minecraft/block/CropBlock.java namedSrc/net/minecraft/block/CropBlock.java
--- namedTargetSrc/net/minecraft/block/CropBlock.java	2024-01-17 18:11:51.295380938 +0000
+++ namedSrc/net/minecraft/block/CropBlock.java	2024-01-17 18:10:47.155885160 +0000
@@ -226,14 +226,14 @@
     */
    @Override
    public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) {
-      return m_sivtmkfc(world, pos) && super.canPlaceAt(state, world, pos);
+      return hasEnoughLight(world, pos) && super.canPlaceAt(state, world, pos);
    }
 
    /**
     * @mapping {@literal hashed m_sivtmkfc Lnet/minecraft/unmapped/C_rhzoiqkd;m_sivtmkfc(Lnet/minecraft/unmapped/C_eemzphbi;Lnet/minecraft/unmapped/C_hynzadkk;)Z}
-    * @mapping {@literal named m_sivtmkfc Lnet/minecraft/block/CropBlock;m_sivtmkfc(Lnet/minecraft/world/WorldView;Lnet/minecraft/util/math/BlockPos;)Z}
+    * @mapping {@literal named hasEnoughLight Lnet/minecraft/block/CropBlock;hasEnoughLight(Lnet/minecraft/world/WorldView;Lnet/minecraft/util/math/BlockPos;)Z}
     */
-   protected static boolean m_sivtmkfc(WorldView world, BlockPos pos) {
+   protected static boolean hasEnoughLight(WorldView world, BlockPos pos) {
       return world.getBaseLightLevel(pos, 0) >= 8;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2024-01-17 18:11:51.447379746 +0000
+++ namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2024-01-17 18:10:47.379883408 +0000
@@ -392,7 +392,7 @@
          @Override
          public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
             Direction lv = pointer.state().get(DispenserBlock.FACING);
-            Vec3d lv2 = DispenserBehavior.m_kyvaodpv(pointer, EntityType.FIREWORK_ROCKET, lv);
+            Vec3d lv2 = DispenserBehavior.getFireworkLocation(pointer, EntityType.FIREWORK_ROCKET, lv);
             FireworkRocketEntity lv3 = new FireworkRocketEntity(pointer.world(), stack, lv2.getX(), lv2.getY(), lv2.getZ(), true);
             lv3.setVelocity((double)lv.getOffsetX(), (double)lv.getOffsetY(), (double)lv.getOffsetZ(), 0.5F, 1.0F);
             pointer.world().spawnEntity(lv3);
@@ -798,9 +798,10 @@
          Items.POTION,
          new ItemDispenserBehavior() {
             /**
-             * Mapping not found
+             * @mapping {@literal hashed f_ljlamvmz Lnet/minecraft/unmapped/C_ooeeaffg$C_qrgsuruy;f_ljlamvmz:Lnet/minecraft/unmapped/C_dnfsxzwl;}
+             * @mapping {@literal named potionDispenserBehavior Lnet/minecraft/block/dispenser/DispenserBehavior$C_qrgsuruy;potionDispenserBehavior:Lnet/minecraft/block/dispenser/ItemDispenserBehavior;}
              */
-            private final ItemDispenserBehavior f_ljlamvmz = new ItemDispenserBehavior();
+            private final ItemDispenserBehavior potionDispenserBehavior = new ItemDispenserBehavior();
    
             /**
              * Mapping not found
@@ -808,13 +809,13 @@
             @Override
             public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
                if (!PotionUtil.getPotionType(stack).matches(Potions.WATER)) {
-                  return this.f_ljlamvmz.dispense(pointer, stack);
+                  return this.potionDispenserBehavior.dispense(pointer, stack);
                } else {
                   ServerWorld lv = pointer.world();
                   BlockPos lv2 = pointer.pos();
                   BlockPos lv3 = pointer.pos().offset(pointer.state().get(DispenserBlock.FACING));
                   if (!lv.getBlockState(lv3).isIn(BlockTags.CONVERTABLE_TO_MUD)) {
-                     return this.f_ljlamvmz.dispense(pointer, stack);
+                     return this.potionDispenserBehavior.dispense(pointer, stack);
                   } else {
                      if (!lv.isClient) {
                         for (int i = 0; i < 5; ++i) {
@@ -845,14 +846,14 @@
 
    /**
     * @mapping {@literal hashed m_kyvaodpv Lnet/minecraft/unmapped/C_ooeeaffg;m_kyvaodpv(Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_vgpupfxx;}
-    * @mapping {@literal named m_kyvaodpv Lnet/minecraft/block/dispenser/DispenserBehavior;m_kyvaodpv(Lnet/minecraft/util/math/BlockPointer;Lnet/minecraft/entity/EntityType;Lnet/minecraft/util/math/Direction;)Lnet/minecraft/util/math/Vec3d;}
+    * @mapping {@literal named getFireworkLocation Lnet/minecraft/block/dispenser/DispenserBehavior;getFireworkLocation(Lnet/minecraft/util/math/BlockPointer;Lnet/minecraft/entity/EntityType;Lnet/minecraft/util/math/Direction;)Lnet/minecraft/util/math/Vec3d;}
     */
-   static Vec3d m_kyvaodpv(BlockPointer arg, EntityType<?> arg2, Direction direction) {
-      return arg.center()
+   static Vec3d getFireworkLocation(BlockPointer block, EntityType<?> type, Direction direction) {
+      return block.center()
          .add(
-            (double)direction.getOffsetX() * (0.5000099999997474 - (double)arg2.getWidth() / 2.0),
-            (double)direction.getOffsetY() * (0.5000099999997474 - (double)arg2.getHeight() / 2.0) - (double)arg2.getHeight() / 2.0,
-            (double)direction.getOffsetZ() * (0.5000099999997474 - (double)arg2.getWidth() / 2.0)
+            (double)direction.getOffsetX() * (0.5000099999997474 - (double)type.getWidth() / 2.0),
+            (double)direction.getOffsetY() * (0.5000099999997474 - (double)type.getHeight() / 2.0) - (double)type.getHeight() / 2.0,
+            (double)direction.getOffsetZ() * (0.5000099999997474 - (double)type.getWidth() / 2.0)
          );
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/DoorBlock.java namedSrc/net/minecraft/block/DoorBlock.java
--- namedTargetSrc/net/minecraft/block/DoorBlock.java	2024-01-17 18:11:51.499379338 +0000
+++ namedSrc/net/minecraft/block/DoorBlock.java	2024-01-17 18:10:47.451882845 +0000
@@ -44,7 +44,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/DoorBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<DoorBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(BlockSetType.CODEC.fieldOf("block_set_type").forGetter(DoorBlock::getBlockSetType), m_copdixka())
+      instance -> instance.group(BlockSetType.CODEC.fieldOf("block_set_type").forGetter(DoorBlock::getBlockSetType), getSettingsCodec())
             .apply(instance, DoorBlock::new)
    );
    /**
@@ -172,12 +172,11 @@
    }
 
    /**
-    * @mapping {@literal hashed m_qjdjbqgu Lnet/minecraft/unmapped/C_dfkdtnby;m_qjdjbqgu(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_aahhrzpf;Ljava/util/function/BiConsumer;)V}
-    * @mapping {@literal named m_qjdjbqgu Lnet/minecraft/block/DoorBlock;m_qjdjbqgu(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/explosion/Explosion;Ljava/util/function/BiConsumer;)V}
+    * Mapping not found
     */
    @Override
-   public void m_qjdjbqgu(BlockState state, World world, BlockPos pos, Explosion arg4, BiConsumer<ItemStack, BlockPos> biConsumer) {
-      if (arg4.m_vsvasiko() == Explosion.DestructionType.TRIGGER_BLOCK
+   public void onExplosion(BlockState state, World world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> biConsumer) {
+      if (explosion.m_vsvasiko() == Explosion.DestructionType.TRIGGER_BLOCK
          && state.get(HALF) == DoubleBlockHalf.LOWER
          && !world.isClient()
          && this.blockSetType.canOpenByWindCharge()
@@ -185,7 +184,7 @@
          this.setOpen(null, world, state, pos, !this.isOpen(state));
       }
 
-      super.m_qjdjbqgu(state, world, pos, arg4, biConsumer);
+      super.onExplosion(state, world, pos, explosion, biConsumer);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/DyedCarpetBlock.java namedSrc/net/minecraft/block/DyedCarpetBlock.java
--- namedTargetSrc/net/minecraft/block/DyedCarpetBlock.java	2024-01-17 18:11:51.555378899 +0000
+++ namedSrc/net/minecraft/block/DyedCarpetBlock.java	2024-01-17 18:10:47.535882188 +0000
@@ -16,7 +16,8 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/DyedCarpetBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<DyedCarpetBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(DyeColor.CODEC.fieldOf("color").forGetter(DyedCarpetBlock::getDyeColor), m_copdixka()).apply(instance, DyedCarpetBlock::new)
+      instance -> instance.group(DyeColor.CODEC.fieldOf("color").forGetter(DyedCarpetBlock::getDyeColor), getSettingsCodec())
+            .apply(instance, DyedCarpetBlock::new)
    );
    /**
     * @mapping {@literal hashed f_drjgpfxw Lnet/minecraft/unmapped/C_jgxnpxls;f_drjgpfxw:Lnet/minecraft/unmapped/C_arllgqae;}
diff -bur namedTargetSrc/net/minecraft/block/EnderChestBlock.java namedSrc/net/minecraft/block/EnderChestBlock.java
--- namedTargetSrc/net/minecraft/block/EnderChestBlock.java	2024-01-17 18:11:51.551378930 +0000
+++ namedSrc/net/minecraft/block/EnderChestBlock.java	2024-01-17 18:10:47.527882251 +0000
@@ -136,7 +136,9 @@
             EnderChestBlockEntity lv4 = (EnderChestBlockEntity)lv2;
             lv.setActiveBlockEntity(lv4);
             player.openHandledScreen(
-               new SimpleNamedScreenHandlerFactory((i, arg2, playerx) -> GenericContainerScreenHandler.createGeneric9x3(i, arg2, lv), CONTAINER_NAME)
+               new SimpleNamedScreenHandlerFactory(
+                  (syncId, playerInventory, playerEntity) -> GenericContainerScreenHandler.createGeneric9x3(syncId, playerInventory, lv), CONTAINER_NAME
+               )
             );
             player.incrementStat(Stats.OPEN_ENDERCHEST);
             PiglinBrain.onGuardedBlockInteracted(player, true);
diff -bur namedTargetSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java namedSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java	2024-01-17 18:11:51.367380373 +0000
+++ namedSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java	2024-01-17 18:10:47.239884503 +0000
@@ -440,10 +440,10 @@
     * @mapping {@literal named canAcceptRecipeOutput Lnet/minecraft/block/entity/AbstractFurnaceBlockEntity;canAcceptRecipeOutput(Lnet/minecraft/registry/DynamicRegistryManager;Lnet/minecraft/recipe/RecipeHolder;Lnet/minecraft/util/collection/DefaultedList;I)Z}
     */
    private static boolean canAcceptRecipeOutput(
-      DynamicRegistryManager registryManager, @Nullable RecipeHolder<?> arg2, DefaultedList<ItemStack> slots, int count
+      DynamicRegistryManager registryManager, @Nullable RecipeHolder<?> recipe, DefaultedList<ItemStack> slots, int count
    ) {
-      if (!slots.get(0).isEmpty() && arg2 != null) {
-         ItemStack lv = arg2.value().getResult(registryManager);
+      if (!slots.get(0).isEmpty() && recipe != null) {
+         ItemStack lv = recipe.value().getResult(registryManager);
          if (lv.isEmpty()) {
             return false;
          } else {
@@ -467,10 +467,10 @@
     * @mapping {@literal hashed m_szsvrwtz Lnet/minecraft/unmapped/C_dlxbwxyf;m_szsvrwtz(Lnet/minecraft/unmapped/C_wqxmvzdq;Lnet/minecraft/unmapped/C_dscbrwbj;Lnet/minecraft/unmapped/C_rnrfftze;I)Z}
     * @mapping {@literal named craftRecipe Lnet/minecraft/block/entity/AbstractFurnaceBlockEntity;craftRecipe(Lnet/minecraft/registry/DynamicRegistryManager;Lnet/minecraft/recipe/RecipeHolder;Lnet/minecraft/util/collection/DefaultedList;I)Z}
     */
-   private static boolean craftRecipe(DynamicRegistryManager registryManager, @Nullable RecipeHolder<?> arg2, DefaultedList<ItemStack> slots, int count) {
-      if (arg2 != null && canAcceptRecipeOutput(registryManager, arg2, slots, count)) {
+   private static boolean craftRecipe(DynamicRegistryManager registryManager, @Nullable RecipeHolder<?> recipe, DefaultedList<ItemStack> slots, int count) {
+      if (recipe != null && canAcceptRecipeOutput(registryManager, recipe, slots, count)) {
          ItemStack lv = slots.get(0);
-         ItemStack lv2 = arg2.value().getResult(registryManager);
+         ItemStack lv2 = recipe.value().getResult(registryManager);
          ItemStack lv3 = slots.get(2);
          if (lv3.isEmpty()) {
             slots.set(2, lv2.copy());
@@ -507,7 +507,7 @@
     * @mapping {@literal named getCookTime Lnet/minecraft/block/entity/AbstractFurnaceBlockEntity;getCookTime(Lnet/minecraft/world/World;Lnet/minecraft/block/entity/AbstractFurnaceBlockEntity;)I}
     */
    private static int getCookTime(World world, AbstractFurnaceBlockEntity blockEntity) {
-      return (Integer)blockEntity.recipeCache.getRecipeFor(blockEntity, world).map(arg -> ((AbstractCookingRecipe)arg.value()).getCookTime()).orElse(200);
+      return (Integer)blockEntity.recipeCache.getRecipeFor(blockEntity, world).map(recipe -> ((AbstractCookingRecipe)recipe.value()).getCookTime()).orElse(200);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/BeaconBlockEntity.java namedSrc/net/minecraft/block/entity/BeaconBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BeaconBlockEntity.java	2024-01-17 18:11:51.427379903 +0000
+++ namedSrc/net/minecraft/block/entity/BeaconBlockEntity.java	2024-01-17 18:10:47.343883690 +0000
@@ -101,13 +101,15 @@
     */
    private static final Text TITLE = Text.translatable("container.beacon");
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_bjgypucn Lnet/minecraft/unmapped/C_wwadquuj;f_bjgypucn:Ljava/lang/String;}
+    * @mapping {@literal named PRIMARY_EFFECT Lnet/minecraft/block/entity/BeaconBlockEntity;PRIMARY_EFFECT:Ljava/lang/String;}
     */
-   private static final String f_bjgypucn = "primary_effect";
+   private static final String PRIMARY_EFFECT = "primary_effect";
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_lcbehrid Lnet/minecraft/unmapped/C_wwadquuj;f_lcbehrid:Ljava/lang/String;}
+    * @mapping {@literal named SECONDARY_EFFECT Lnet/minecraft/block/entity/BeaconBlockEntity;SECONDARY_EFFECT:Ljava/lang/String;}
     */
-   private static final String f_lcbehrid = "secondary_effect";
+   private static final String SECONDARY_EFFECT = "secondary_effect";
    /**
     * @mapping {@literal hashed f_fjwoaamy Lnet/minecraft/unmapped/C_wwadquuj;f_fjwoaamy:Ljava/util/List;}
     * @mapping {@literal named beamSegments Lnet/minecraft/block/entity/BeaconBlockEntity;beamSegments:Ljava/util/List;}
@@ -206,8 +208,8 @@
     * @mapping {@literal named validate Lnet/minecraft/block/entity/BeaconBlockEntity;validate(Lnet/minecraft/registry/Holder;)Lnet/minecraft/registry/Holder;}
     */
    @Nullable
-   static Holder<StatusEffect> validate(@Nullable Holder<StatusEffect> arg) {
-      return EFFECTS.contains(arg) ? arg : null;
+   static Holder<StatusEffect> validate(@Nullable Holder<StatusEffect> statusEffect) {
+      return EFFECTS.contains(statusEffect) ? statusEffect : null;
    }
 
    /**
@@ -350,11 +352,13 @@
     * @mapping {@literal hashed m_hpgbimed Lnet/minecraft/unmapped/C_wwadquuj;m_hpgbimed(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;ILnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_cjzoxshv;)V}
     * @mapping {@literal named applyPlayerEffects Lnet/minecraft/block/entity/BeaconBlockEntity;applyPlayerEffects(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;ILnet/minecraft/registry/Holder;Lnet/minecraft/registry/Holder;)V}
     */
-   private static void applyPlayerEffects(World world, BlockPos pos, int beaconLevel, @Nullable Holder<StatusEffect> arg3, @Nullable Holder<StatusEffect> arg4) {
-      if (!world.isClient && arg3 != null) {
+   private static void applyPlayerEffects(
+      World world, BlockPos pos, int beaconLevel, @Nullable Holder<StatusEffect> primaryEffect, @Nullable Holder<StatusEffect> secondaryEffect
+   ) {
+      if (!world.isClient && primaryEffect != null) {
          double d = (double)(beaconLevel * 10 + 10);
          int j = 0;
-         if (beaconLevel >= 4 && Objects.equals(arg3, arg4)) {
+         if (beaconLevel >= 4 && Objects.equals(primaryEffect, secondaryEffect)) {
             j = 1;
          }
 
@@ -363,12 +367,12 @@
          List<PlayerEntity> list = world.getNonSpectatingEntities(PlayerEntity.class, lv);
 
          for (PlayerEntity lv2 : list) {
-            lv2.addStatusEffect(new StatusEffectInstance(arg3, k, j, true, true));
+            lv2.addStatusEffect(new StatusEffectInstance(primaryEffect, k, j, true, true));
          }
 
-         if (beaconLevel >= 4 && Objects.equals(arg3, arg4) && arg4 != null) {
+         if (beaconLevel >= 4 && Objects.equals(primaryEffect, secondaryEffect) && secondaryEffect != null) {
             for (PlayerEntity lv3 : list) {
-               lv3.addStatusEffect(new StatusEffectInstance(arg4, k, 0, true, true));
+               lv3.addStatusEffect(new StatusEffectInstance(secondaryEffect, k, 0, true, true));
             }
          }
       }
@@ -407,21 +411,23 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_rubjuwzj Lnet/minecraft/unmapped/C_wwadquuj;m_rubjuwzj(Lnet/minecraft/unmapped/C_hhlwcnih;Ljava/lang/String;Lnet/minecraft/unmapped/C_cjzoxshv;)V}
+    * @mapping {@literal named writeStatusEffect Lnet/minecraft/block/entity/BeaconBlockEntity;writeStatusEffect(Lnet/minecraft/nbt/NbtCompound;Ljava/lang/String;Lnet/minecraft/registry/Holder;)V}
     */
-   private static void m_rubjuwzj(NbtCompound arg, String string, @Nullable Holder<StatusEffect> arg2) {
-      if (arg2 != null) {
-         arg2.getKey().ifPresent(registryKey -> arg.putString(string, registryKey.getValue().toString()));
+   private static void writeStatusEffect(NbtCompound nbt, String effectName, @Nullable Holder<StatusEffect> statusEffect) {
+      if (statusEffect != null) {
+         statusEffect.getKey().ifPresent(registryKey -> nbt.putString(effectName, registryKey.getValue().toString()));
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_aynqdjcm Lnet/minecraft/unmapped/C_wwadquuj;m_aynqdjcm(Lnet/minecraft/unmapped/C_hhlwcnih;Ljava/lang/String;)Lnet/minecraft/unmapped/C_cjzoxshv;}
+    * @mapping {@literal named readStatusEffect Lnet/minecraft/block/entity/BeaconBlockEntity;readStatusEffect(Lnet/minecraft/nbt/NbtCompound;Ljava/lang/String;)Lnet/minecraft/registry/Holder;}
     */
    @Nullable
-   private static Holder<StatusEffect> m_aynqdjcm(NbtCompound arg, String string) {
-      if (arg.contains(string, NbtElement.STRING_TYPE)) {
-         Identifier lv = Identifier.tryParse(arg.getString(string));
+   private static Holder<StatusEffect> readStatusEffect(NbtCompound nbt, String effectName) {
+      if (nbt.contains(effectName, NbtElement.STRING_TYPE)) {
+         Identifier lv = Identifier.tryParse(nbt.getString(effectName));
          return lv == null ? null : (Holder)Registries.STATUS_EFFECT.m_nxhthmir(lv).map(BeaconBlockEntity::validate).orElse(null);
       } else {
          return null;
@@ -434,8 +440,8 @@
    @Override
    public void readNbt(NbtCompound nbt) {
       super.readNbt(nbt);
-      this.primary = m_aynqdjcm(nbt, "primary_effect");
-      this.secondary = m_aynqdjcm(nbt, "secondary_effect");
+      this.primary = readStatusEffect(nbt, "primary_effect");
+      this.secondary = readStatusEffect(nbt, "secondary_effect");
       if (nbt.contains("CustomName", NbtElement.STRING_TYPE)) {
          this.customName = Text.Serializer.fromJson(nbt.getString("CustomName"));
       }
@@ -449,8 +455,8 @@
    @Override
    protected void writeNbt(NbtCompound nbt) {
       super.writeNbt(nbt);
-      m_rubjuwzj(nbt, "primary_effect", this.primary);
-      m_rubjuwzj(nbt, "secondary_effect", this.secondary);
+      writeStatusEffect(nbt, "primary_effect", this.primary);
+      writeStatusEffect(nbt, "secondary_effect", this.secondary);
       nbt.putInt("Levels", this.level);
       if (this.customName != null) {
          nbt.putString("CustomName", Text.Serializer.toJson(this.customName));

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

View the diff here (3/3):
diff -bur namedTargetSrc/net/minecraft/block/entity/CrafterBlockEntity.java namedSrc/net/minecraft/block/entity/CrafterBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/CrafterBlockEntity.java	2024-01-17 18:11:51.523379150 +0000
+++ namedSrc/net/minecraft/block/entity/CrafterBlockEntity.java	2024-01-17 18:10:47.491882532 +0000
@@ -27,60 +27,72 @@
  */
 public class CrafterBlockEntity extends LootableContainerBlockEntity implements RecipeInputInventory {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_drlbgikn Lnet/minecraft/unmapped/C_lamqkfie;f_drlbgikn:I}
+    * @mapping {@literal named GRID_WIDTH Lnet/minecraft/block/entity/CrafterBlockEntity;GRID_WIDTH:I}
     */
-   public static final int f_drlbgikn = 3;
+   public static final int GRID_WIDTH = 3;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_yrnyvuvx Lnet/minecraft/unmapped/C_lamqkfie;f_yrnyvuvx:I}
+    * @mapping {@literal named GRID_HEIGHT Lnet/minecraft/block/entity/CrafterBlockEntity;GRID_HEIGHT:I}
     */
-   public static final int f_yrnyvuvx = 3;
+   public static final int GRID_HEIGHT = 3;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_llifrlpt Lnet/minecraft/unmapped/C_lamqkfie;f_llifrlpt:I}
+    * @mapping {@literal named GRID_SIZE Lnet/minecraft/block/entity/CrafterBlockEntity;GRID_SIZE:I}
     */
-   public static final int f_llifrlpt = 9;
+   public static final int GRID_SIZE = 9;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_jfytfxan Lnet/minecraft/unmapped/C_lamqkfie;f_jfytfxan:I}
+    * @mapping {@literal named SLOT_DISABLED Lnet/minecraft/block/entity/CrafterBlockEntity;SLOT_DISABLED:I}
     */
-   public static final int f_jfytfxan = 1;
+   public static final int SLOT_DISABLED = 1;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_azbhzopk Lnet/minecraft/unmapped/C_lamqkfie;f_azbhzopk:I}
+    * @mapping {@literal named SLOT_ENABLED Lnet/minecraft/block/entity/CrafterBlockEntity;SLOT_ENABLED:I}
     */
-   public static final int f_azbhzopk = 0;
+   public static final int SLOT_ENABLED = 0;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_tbepijuw Lnet/minecraft/unmapped/C_lamqkfie;f_tbepijuw:I}
+    * @mapping {@literal named TRIGGERED_PROPERTY Lnet/minecraft/block/entity/CrafterBlockEntity;TRIGGERED_PROPERTY:I}
     */
-   public static final int f_tbepijuw = 9;
+   public static final int TRIGGERED_PROPERTY = 9;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_xaisqwwk Lnet/minecraft/unmapped/C_lamqkfie;f_xaisqwwk:I}
+    * @mapping {@literal named PROPERTIES_COUNT Lnet/minecraft/block/entity/CrafterBlockEntity;PROPERTIES_COUNT:I}
     */
-   public static final int f_xaisqwwk = 10;
+   public static final int PROPERTIES_COUNT = 10;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_bqaatywv Lnet/minecraft/unmapped/C_lamqkfie;f_bqaatywv:Lnet/minecraft/unmapped/C_rnrfftze;}
+    * @mapping {@literal named inputStacks Lnet/minecraft/block/entity/CrafterBlockEntity;inputStacks:Lnet/minecraft/util/collection/DefaultedList;}
     */
-   private DefaultedList<ItemStack> f_bqaatywv = DefaultedList.ofSize(9, ItemStack.EMPTY);
+   private DefaultedList<ItemStack> inputStacks = DefaultedList.ofSize(9, ItemStack.EMPTY);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_uvbziebv Lnet/minecraft/unmapped/C_lamqkfie;f_uvbziebv:I}
+    * @mapping {@literal named craftingTicksRemaining Lnet/minecraft/block/entity/CrafterBlockEntity;craftingTicksRemaining:I}
     */
-   private int f_uvbziebv = 0;
+   private int craftingTicksRemaining = 0;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_gkepqhms Lnet/minecraft/unmapped/C_lamqkfie;f_gkepqhms:Lnet/minecraft/unmapped/C_fwwsyhuv;}
+    * @mapping {@literal named propertyDelegate Lnet/minecraft/block/entity/CrafterBlockEntity;propertyDelegate:Lnet/minecraft/screen/PropertyDelegate;}
     */
-   protected final PropertyDelegate f_gkepqhms = new PropertyDelegate() {
+   protected final PropertyDelegate propertyDelegate = new PropertyDelegate() {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_khgwqlde Lnet/minecraft/unmapped/C_lamqkfie$C_taourppq;f_khgwqlde:[I}
+       * @mapping {@literal named disabledSlots Lnet/minecraft/block/entity/CrafterBlockEntity$C_taourppq;disabledSlots:[I}
        */
-      private final int[] f_khgwqlde = new int[9];
+      private final int[] disabledSlots = new int[9];
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_krkfhyvh Lnet/minecraft/unmapped/C_lamqkfie$C_taourppq;f_krkfhyvh:I}
+       * @mapping {@literal named triggered Lnet/minecraft/block/entity/CrafterBlockEntity$C_taourppq;triggered:I}
        */
-      private int f_krkfhyvh = 0;
+      private int triggered = 0;
 
       /**
        * Mapping not found
        */
       @Override
       public int get(int index) {
-         return index == 9 ? this.f_krkfhyvh : this.f_khgwqlde[index];
+         return index == 9 ? this.triggered : this.disabledSlots[index];
       }
 
       /**
@@ -89,9 +101,9 @@
       @Override
       public void set(int index, int value) {
          if (index == 9) {
-            this.f_krkfhyvh = value;
+            this.triggered = value;
          } else {
-            this.f_khgwqlde[index] = value;
+            this.disabledSlots[index] = value;
          }
       }
 
@@ -125,25 +137,27 @@
     */
    @Override
    protected ScreenHandler createScreenHandler(int syncId, PlayerInventory playerInventory) {
-      return new CrafterScreen(syncId, playerInventory, this, this.f_gkepqhms);
+      return new CrafterScreen(syncId, playerInventory, this, this.propertyDelegate);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_eemfgjan Lnet/minecraft/unmapped/C_lamqkfie;m_eemfgjan(IZ)V}
+    * @mapping {@literal named setSlotEnabled Lnet/minecraft/block/entity/CrafterBlockEntity;setSlotEnabled(IZ)V}
     */
-   public void m_eemfgjan(int i, boolean bl) {
-      if (this.m_bnilwjgq(i)) {
-         this.f_gkepqhms.set(i, bl ? 0 : 1);
+   public void setSlotEnabled(int slot, boolean enabled) {
+      if (this.canToggleSlot(slot)) {
+         this.propertyDelegate.set(slot, enabled ? 0 : 1);
          this.markDirty();
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_lmihgtns Lnet/minecraft/unmapped/C_lamqkfie;m_lmihgtns(I)Z}
+    * @mapping {@literal named isSlotDisabled Lnet/minecraft/block/entity/CrafterBlockEntity;isSlotDisabled(I)Z}
     */
-   public boolean m_lmihgtns(int i) {
-      if (i >= 0 && i < 9) {
-         return this.f_gkepqhms.get(i) == 1;
+   public boolean isSlotDisabled(int slot) {
+      if (slot >= 0 && slot < 9) {
+         return this.propertyDelegate.get(slot) == 1;
       } else {
          return false;
       }
@@ -154,30 +168,30 @@
     */
    @Override
    public boolean isValid(int slot, ItemStack stack) {
-      if (this.f_gkepqhms.get(slot) == 1) {
+      if (this.propertyDelegate.get(slot) == 1) {
          return false;
       } else {
-         ItemStack lv = this.f_bqaatywv.get(slot);
+         ItemStack lv = this.inputStacks.get(slot);
          int j = lv.getCount();
          if (j >= lv.getMaxCount()) {
             return false;
          } else if (lv.isEmpty()) {
             return true;
          } else {
-            return !this.m_kvgrcbqx(j, lv, slot);
+            return !this.betterSlotExists(j, lv, slot);
          }
       }
    }
 
    /**
     * @mapping {@literal hashed m_kvgrcbqx Lnet/minecraft/unmapped/C_lamqkfie;m_kvgrcbqx(ILnet/minecraft/unmapped/C_sddaxwyk;I)Z}
-    * @mapping {@literal named m_kvgrcbqx Lnet/minecraft/block/entity/CrafterBlockEntity;m_kvgrcbqx(ILnet/minecraft/item/ItemStack;I)Z}
+    * @mapping {@literal named betterSlotExists Lnet/minecraft/block/entity/CrafterBlockEntity;betterSlotExists(ILnet/minecraft/item/ItemStack;I)Z}
     */
-   private boolean m_kvgrcbqx(int i, ItemStack stack, int j) {
-      for (int k = j + 1; k < 9; ++k) {
-         if (!this.m_lmihgtns(k)) {
+   private boolean betterSlotExists(int count, ItemStack stack, int slot) {
+      for (int k = slot + 1; k < 9; ++k) {
+         if (!this.isSlotDisabled(k)) {
             ItemStack lv = this.getStack(k);
-            if (lv.isEmpty() || lv.getCount() < i && ItemStack.canCombine(lv, stack)) {
+            if (lv.isEmpty() || lv.getCount() < count && ItemStack.canCombine(lv, stack)) {
                return true;
             }
          }
@@ -192,25 +206,25 @@
    @Override
    public void readNbt(NbtCompound nbt) {
       super.readNbt(nbt);
-      this.f_uvbziebv = nbt.getInt("crafting_ticks_remaining");
-      this.f_bqaatywv = DefaultedList.ofSize(this.size(), ItemStack.EMPTY);
+      this.craftingTicksRemaining = nbt.getInt("crafting_ticks_remaining");
+      this.inputStacks = DefaultedList.ofSize(this.size(), ItemStack.EMPTY);
       if (!this.readLootTableNbt(nbt)) {
-         Inventories.readNbt(nbt, this.f_bqaatywv);
+         Inventories.readNbt(nbt, this.inputStacks);
       }
 
       int[] is = nbt.getIntArray("disabled_slots");
 
       for (int i = 0; i < 9; ++i) {
-         this.f_gkepqhms.set(i, 0);
+         this.propertyDelegate.set(i, 0);
       }
 
       for (int j : is) {
-         if (this.m_bnilwjgq(j)) {
-            this.f_gkepqhms.set(j, 1);
+         if (this.canToggleSlot(j)) {
+            this.propertyDelegate.set(j, 1);
          }
       }
 
-      this.f_gkepqhms.set(9, nbt.getInt("triggered"));
+      this.propertyDelegate.set(9, nbt.getInt("triggered"));
    }
 
    /**
@@ -219,13 +233,13 @@
    @Override
    protected void writeNbt(NbtCompound nbt) {
       super.writeNbt(nbt);
-      nbt.putInt("crafting_ticks_remaining", this.f_uvbziebv);
+      nbt.putInt("crafting_ticks_remaining", this.craftingTicksRemaining);
       if (!this.writeLootTableNbt(nbt)) {
-         Inventories.writeNbt(nbt, this.f_bqaatywv);
+         Inventories.writeNbt(nbt, this.inputStacks);
       }
 
-      this.m_bzyhguae(nbt);
-      this.m_uufcmiby(nbt);
+      this.putDisabledSlots(nbt);
+      this.putTriggered(nbt);
    }
 
    /**
@@ -241,7 +255,7 @@
     */
    @Override
    public boolean isEmpty() {
-      for (ItemStack lv : this.f_bqaatywv) {
+      for (ItemStack lv : this.inputStacks) {
          if (!lv.isEmpty()) {
             return false;
          }
@@ -255,7 +269,7 @@
     */
    @Override
    public ItemStack getStack(int slot) {
-      return this.f_bqaatywv.get(slot);
+      return this.inputStacks.get(slot);
    }
 
    /**
@@ -263,8 +277,8 @@
     */
    @Override
    public void setStack(int slot, ItemStack stack) {
-      if (this.m_lmihgtns(slot)) {
-         this.m_eemfgjan(slot, true);
+      if (this.isSlotDisabled(slot)) {
+         this.setSlotEnabled(slot, true);
       }
 
       super.setStack(slot, stack);
@@ -287,7 +301,7 @@
     * @mapping {@literal named getInvStack Lnet/minecraft/block/entity/CrafterBlockEntity;getInvStack()Lnet/minecraft/util/collection/DefaultedList;}
     */
    public DefaultedList<ItemStack> getInvStack() {
-      return this.f_bqaatywv;
+      return this.inputStacks;
    }
 
    /**
@@ -295,7 +309,7 @@
     */
    @Override
    protected void setInvStackList(DefaultedList<ItemStack> list) {
-      this.f_bqaatywv = list;
+      this.inputStacks = list;
    }
 
    /**
@@ -319,56 +333,60 @@
     */
    @Override
    public void provideRecipeInputs(RecipeMatcher finder) {
-      for (ItemStack lv : this.f_bqaatywv) {
+      for (ItemStack lv : this.inputStacks) {
          finder.addUnenchantedInput(lv);
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_bzyhguae Lnet/minecraft/unmapped/C_lamqkfie;m_bzyhguae(Lnet/minecraft/unmapped/C_hhlwcnih;)V}
+    * @mapping {@literal named putDisabledSlots Lnet/minecraft/block/entity/CrafterBlockEntity;putDisabledSlots(Lnet/minecraft/nbt/NbtCompound;)V}
     */
-   private void m_bzyhguae(NbtCompound arg) {
+   private void putDisabledSlots(NbtCompound nbt) {
       IntList intList = new IntArrayList();
 
       for (int i = 0; i < 9; ++i) {
-         if (this.m_lmihgtns(i)) {
+         if (this.isSlotDisabled(i)) {
             intList.add(i);
          }
       }
 
-      arg.putIntArray("disabled_slots", intList);
+      nbt.putIntArray("disabled_slots", intList);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_uufcmiby Lnet/minecraft/unmapped/C_lamqkfie;m_uufcmiby(Lnet/minecraft/unmapped/C_hhlwcnih;)V}
+    * @mapping {@literal named putTriggered Lnet/minecraft/block/entity/CrafterBlockEntity;putTriggered(Lnet/minecraft/nbt/NbtCompound;)V}
     */
-   private void m_uufcmiby(NbtCompound arg) {
-      arg.putInt("triggered", this.f_gkepqhms.get(9));
+   private void putTriggered(NbtCompound nbt) {
+      nbt.putInt("triggered", this.propertyDelegate.get(9));
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_qgwfsxfb Lnet/minecraft/unmapped/C_lamqkfie;m_qgwfsxfb(Z)V}
+    * @mapping {@literal named setTriggered Lnet/minecraft/block/entity/CrafterBlockEntity;setTriggered(Z)V}
     */
-   public void m_qgwfsxfb(boolean bl) {
-      this.f_gkepqhms.set(9, bl ? 1 : 0);
+   public void setTriggered(boolean triggered) {
+      this.propertyDelegate.set(9, triggered ? 1 : 0);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_gytzlsub Lnet/minecraft/unmapped/C_lamqkfie;m_gytzlsub()Z}
+    * @mapping {@literal named isTriggered Lnet/minecraft/block/entity/CrafterBlockEntity;isTriggered()Z}
     */
    @VisibleForTesting
-   public boolean m_gytzlsub() {
-      return this.f_gkepqhms.get(9) == 1;
+   public boolean isTriggered() {
+      return this.propertyDelegate.get(9) == 1;
    }
 
    /**
     * @mapping {@literal hashed m_ycajyjlg Lnet/minecraft/unmapped/C_lamqkfie;m_ycajyjlg(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_lamqkfie;)V}
-    * @mapping {@literal named m_ycajyjlg Lnet/minecraft/block/entity/CrafterBlockEntity;m_ycajyjlg(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/block/entity/CrafterBlockEntity;)V}
+    * @mapping {@literal named tickCrafting Lnet/minecraft/block/entity/CrafterBlockEntity;tickCrafting(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/block/entity/CrafterBlockEntity;)V}
     */
-   public static void m_ycajyjlg(World world, BlockPos pos, BlockState state, CrafterBlockEntity arg4) {
-      int i = arg4.f_uvbziebv - 1;
+   public static void tickCrafting(World world, BlockPos pos, BlockState state, CrafterBlockEntity crafterBlockEntity) {
+      int i = crafterBlockEntity.craftingTicksRemaining - 1;
       if (i >= 0) {
-         arg4.f_uvbziebv = i;
+         crafterBlockEntity.craftingTicksRemaining = i;
          if (i == 0) {
             world.setBlockState(pos, state.with(Crafter.CRAFTING, Boolean.valueOf(false)), Block.NOTIFY_ALL);
          }
@@ -376,21 +394,23 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_yxqplnvb Lnet/minecraft/unmapped/C_lamqkfie;m_yxqplnvb(I)V}
+    * @mapping {@literal named setCraftingTicksRemaining Lnet/minecraft/block/entity/CrafterBlockEntity;setCraftingTicksRemaining(I)V}
     */
-   public void m_yxqplnvb(int i) {
-      this.f_uvbziebv = i;
+   public void setCraftingTicksRemaining(int craftingTicksRemaining) {
+      this.craftingTicksRemaining = craftingTicksRemaining;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ibidmmff Lnet/minecraft/unmapped/C_lamqkfie;m_ibidmmff()I}
+    * @mapping {@literal named getComparatorOutput Lnet/minecraft/block/entity/CrafterBlockEntity;getComparatorOutput()I}
     */
-   public int m_ibidmmff() {
+   public int getComparatorOutput() {
       int i = 0;
 
       for (int j = 0; j < this.size(); ++j) {
          ItemStack lv = this.getStack(j);
-         if (!lv.isEmpty() || this.m_lmihgtns(j)) {
+         if (!lv.isEmpty() || this.isSlotDisabled(j)) {
             ++i;
          }
       }
@@ -399,9 +419,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_bnilwjgq Lnet/minecraft/unmapped/C_lamqkfie;m_bnilwjgq(I)Z}
+    * @mapping {@literal named canToggleSlot Lnet/minecraft/block/entity/CrafterBlockEntity;canToggleSlot(I)Z}
     */
-   private boolean m_bnilwjgq(int i) {
-      return i > -1 && i < 9 && this.f_bqaatywv.get(i).isEmpty();
+   private boolean canToggleSlot(int slot) {
+      return slot > -1 && slot < 9 && this.inputStacks.get(slot).isEmpty();
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java namedSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java	2024-01-17 18:11:51.483379464 +0000
+++ namedSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java	2024-01-17 18:10:47.435882970 +0000
@@ -31,17 +31,19 @@
     */
    public static final String SHERDS_KEY = "sherds";
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_hmmflmll Lnet/minecraft/unmapped/C_snnddtnv;f_hmmflmll:Ljava/lang/String;}
+    * @mapping {@literal named ITEM_KEY Lnet/minecraft/block/entity/DecoratedPotBlockEntity;ITEM_KEY:Ljava/lang/String;}
     */
-   public static final String f_hmmflmll = "item";
+   public static final String ITEM_KEY = "item";
    /**
     * Mapping not found
     */
    public static final int f_yprzpvoh = 1;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_bsjlvxwm Lnet/minecraft/unmapped/C_snnddtnv;f_bsjlvxwm:J}
+    * @mapping {@literal named lastWobbleTime Lnet/minecraft/block/entity/DecoratedPotBlockEntity;lastWobbleTime:J}
     */
-   public long f_bsjlvxwm;
+   public long lastWobbleTime;
    /**
     * Mapping not found
     */
@@ -58,14 +60,16 @@
     */
    private ItemStack stack = ItemStack.EMPTY;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_dwwkwusv Lnet/minecraft/unmapped/C_snnddtnv;f_dwwkwusv:Lnet/minecraft/unmapped/C_ncpywfca;}
+    * @mapping {@literal named identifier Lnet/minecraft/block/entity/DecoratedPotBlockEntity;identifier:Lnet/minecraft/util/Identifier;}
     */
    @Nullable
-   protected Identifier f_dwwkwusv;
+   protected Identifier identifier;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_skwmykui Lnet/minecraft/unmapped/C_snnddtnv;f_skwmykui:J}
+    * @mapping {@literal named lootTableSeed Lnet/minecraft/block/entity/DecoratedPotBlockEntity;lootTableSeed:J}
     */
-   protected long f_skwmykui;
+   protected long lootTableSeed;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_snnddtnv;<init>(Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V}
@@ -152,11 +156,12 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_qjeeptjd Lnet/minecraft/unmapped/C_snnddtnv;m_qjeeptjd(Lnet/minecraft/unmapped/C_snnddtnv$C_gxhwrzck;)Lnet/minecraft/unmapped/C_sddaxwyk;}
+    * @mapping {@literal named m_qjeeptjd Lnet/minecraft/block/entity/DecoratedPotBlockEntity;m_qjeeptjd(Lnet/minecraft/block/entity/DecoratedPotBlockEntity$Sherds;)Lnet/minecraft/item/ItemStack;}
     */
-   public static ItemStack m_qjeeptjd(DecoratedPotBlockEntity.Sherds arg) {
+   public static ItemStack m_qjeeptjd(DecoratedPotBlockEntity.Sherds sherds) {
       ItemStack lv = Items.DECORATED_POT.getDefaultStack();
-      NbtCompound lv2 = arg.writeNbt(new NbtCompound());
+      NbtCompound lv2 = sherds.writeNbt(new NbtCompound());
       BlockItem.writeBlockEntityNbtToStack(lv, BlockEntityType.DECORATED_POT, lv2);
       return lv;
    }
@@ -167,7 +172,7 @@
    @Nullable
    @Override
    public Identifier getLootTableId() {
-      return this.f_dwwkwusv;
+      return this.identifier;
    }
 
    /**
@@ -175,7 +180,7 @@
     */
    @Override
    public void setLootTableId(@Nullable Identifier arg) {
-      this.f_dwwkwusv = arg;
+      this.identifier = arg;
    }
 
    /**
@@ -183,7 +188,7 @@
     */
    @Override
    public long getLootTableSeed() {
-      return this.f_skwmykui;
+      return this.lootTableSeed;
    }
 
    /**
@@ -191,7 +196,7 @@
     */
    @Override
    public void setLootTableSeed(long l) {
-      this.f_skwmykui = l;
+      this.lootTableSeed = l;
    }
 
    /**
@@ -250,7 +255,7 @@
    @Override
    public boolean onSyncedBlockEvent(int type, int data) {
       if (this.world != null && type == 1 && data >= 0 && data < DecoratedPotBlockEntity.C_qjewosgd.values().length) {
-         this.f_bsjlvxwm = this.world.getTime();
+         this.lastWobbleTime = this.world.getTime();
          this.f_uumxnicq = DecoratedPotBlockEntity.C_qjewosgd.values()[data];
          return true;
       } else {
diff -bur namedTargetSrc/net/minecraft/block/entity/HangingSignBlockEntity.java namedSrc/net/minecraft/block/entity/HangingSignBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/HangingSignBlockEntity.java	2024-01-17 18:11:51.547378962 +0000
+++ namedSrc/net/minecraft/block/entity/HangingSignBlockEntity.java	2024-01-17 18:10:47.523882282 +0000
@@ -49,7 +49,7 @@
     * Mapping not found
     */
    @Override
-   public SoundEvent m_rhqhsacg() {
+   public SoundEvent getInteractionFailSound() {
       return SoundEvents.BLOCK_HANGING_SIGN_WAXED_INTERACT_FAIL;
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/entity/JigsawBlockEntity.java namedSrc/net/minecraft/block/entity/JigsawBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/JigsawBlockEntity.java	2024-01-17 18:11:51.359380437 +0000
+++ namedSrc/net/minecraft/block/entity/JigsawBlockEntity.java	2024-01-17 18:10:47.231884566 +0000
@@ -40,13 +40,15 @@
     */
    public static final String JOINT_KEY = "joint";
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_bdjzsjak Lnet/minecraft/unmapped/C_epwegwuj;f_bdjzsjak:Ljava/lang/String;}
+    * @mapping {@literal named PLACEMENT_PRIORITY Lnet/minecraft/block/entity/JigsawBlockEntity;PLACEMENT_PRIORITY:Ljava/lang/String;}
     */
-   public static final String f_bdjzsjak = "placement_priority";
+   public static final String PLACEMENT_PRIORITY = "placement_priority";
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_lepmnexz Lnet/minecraft/unmapped/C_epwegwuj;f_lepmnexz:Ljava/lang/String;}
+    * @mapping {@literal named SELECTION_PRIORITY Lnet/minecraft/block/entity/JigsawBlockEntity;SELECTION_PRIORITY:Ljava/lang/String;}
     */
-   public static final String f_lepmnexz = "selection_priority";
+   public static final String SELECTION_PRIORITY = "selection_priority";
    /**
     * @mapping {@literal hashed f_yptqnhuw Lnet/minecraft/unmapped/C_epwegwuj;f_yptqnhuw:Ljava/lang/String;}
     * @mapping {@literal named NAME_KEY Lnet/minecraft/block/entity/JigsawBlockEntity;NAME_KEY:Ljava/lang/String;}
@@ -83,13 +85,15 @@
     */
    private String finalState = "minecraft:air";
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_pjgzefnm Lnet/minecraft/unmapped/C_epwegwuj;f_pjgzefnm:I}
+    * @mapping {@literal named placementPriority Lnet/minecraft/block/entity/JigsawBlockEntity;placementPriority:I}
     */
-   private int f_pjgzefnm;
+   private int placementPriority;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_smoqjtqe Lnet/minecraft/unmapped/C_epwegwuj;f_smoqjtqe:I}
+    * @mapping {@literal named selectionPriority Lnet/minecraft/block/entity/JigsawBlockEntity;selectionPriority:I}
     */
-   private int f_smoqjtqe;
+   private int selectionPriority;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_epwegwuj;<init>(Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V}
@@ -140,17 +144,19 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_erjzevfy Lnet/minecraft/unmapped/C_epwegwuj;m_erjzevfy()I}
+    * @mapping {@literal named getPlacementPriority Lnet/minecraft/block/entity/JigsawBlockEntity;getPlacementPriority()I}
     */
-   public int m_erjzevfy() {
-      return this.f_pjgzefnm;
+   public int getPlacementPriority() {
+      return this.placementPriority;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_lekqpmgq Lnet/minecraft/unmapped/C_epwegwuj;m_lekqpmgq()I}
+    * @mapping {@literal named getSelectionPriority Lnet/minecraft/block/entity/JigsawBlockEntity;getSelectionPriority()I}
     */
-   public int m_lekqpmgq() {
-      return this.f_smoqjtqe;
+   public int getSelectionPriority() {
+      return this.selectionPriority;
    }
 
    /**
@@ -194,17 +200,19 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_taysyesg Lnet/minecraft/unmapped/C_epwegwuj;m_taysyesg(I)V}
+    * @mapping {@literal named setPlacementPriority Lnet/minecraft/block/entity/JigsawBlockEntity;setPlacementPriority(I)V}
     */
-   public void m_taysyesg(int i) {
-      this.f_pjgzefnm = i;
+   public void setPlacementPriority(int priority) {
+      this.placementPriority = priority;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_vmdfkedj Lnet/minecraft/unmapped/C_epwegwuj;m_vmdfkedj(I)V}
+    * @mapping {@literal named setSelectionPriority Lnet/minecraft/block/entity/JigsawBlockEntity;setSelectionPriority(I)V}
     */
-   public void m_vmdfkedj(int i) {
-      this.f_smoqjtqe = i;
+   public void setSelectionPriority(int priority) {
+      this.selectionPriority = priority;
    }
 
    /**
@@ -218,8 +226,8 @@
       nbt.putString("pool", this.pool.getValue().toString());
       nbt.putString("final_state", this.finalState);
       nbt.putString("joint", this.joint.asString());
-      nbt.putInt("placement_priority", this.f_pjgzefnm);
-      nbt.putInt("selection_priority", this.f_smoqjtqe);
+      nbt.putInt("placement_priority", this.placementPriority);
+      nbt.putInt("selection_priority", this.selectionPriority);
    }
 
    /**
@@ -236,8 +244,8 @@
          .orElseGet(
             () -> JigsawBlock.getFacing(this.getCachedState()).getAxis().isHorizontal() ? JigsawBlockEntity.Joint.ALIGNED : JigsawBlockEntity.Joint.ROLLABLE
          );
-      this.f_pjgzefnm = nbt.getInt("placement_priority");
-      this.f_smoqjtqe = nbt.getInt("selection_priority");
+      this.placementPriority = nbt.getInt("placement_priority");
+      this.selectionPriority = nbt.getInt("selection_priority");
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/SignBlockEntity.java namedSrc/net/minecraft/block/entity/SignBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SignBlockEntity.java	2024-01-17 18:11:51.543378994 +0000
+++ namedSrc/net/minecraft/block/entity/SignBlockEntity.java	2024-01-17 18:10:47.515882345 +0000
@@ -435,9 +435,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_rhqhsacg Lnet/minecraft/unmapped/C_axouvzlg;m_rhqhsacg()Lnet/minecraft/unmapped/C_avavozay;}
+    * @mapping {@literal named getInteractionFailSound Lnet/minecraft/block/entity/SignBlockEntity;getInteractionFailSound()Lnet/minecraft/sound/SoundEvent;}
     */
-   public SoundEvent m_rhqhsacg() {
+   public SoundEvent getInteractionFailSound() {
       return SoundEvents.BLOCK_SIGN_WAXED_INTERACT_FAIL;
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/entity/SkullBlockEntity.java namedSrc/net/minecraft/block/entity/SkullBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SkullBlockEntity.java	2024-01-17 18:11:51.535379056 +0000
+++ namedSrc/net/minecraft/block/entity/SkullBlockEntity.java	2024-01-17 18:10:47.507882407 +0000
@@ -128,14 +128,15 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_eoxjszqd Lnet/minecraft/unmapped/C_vrhaavsg;m_eoxjszqd(Ljava/lang/String;Lnet/minecraft/unmapped/C_vmxvaoqe;Ljava/util/function/BooleanSupplier;)Ljava/util/concurrent/CompletableFuture;}
+    * @mapping {@literal named m_eoxjszqd Lnet/minecraft/block/entity/SkullBlockEntity;m_eoxjszqd(Ljava/lang/String;Lnet/minecraft/server/Services;Ljava/util/function/BooleanSupplier;)Ljava/util/concurrent/CompletableFuture;}
     */
-   static CompletableFuture<Optional<GameProfile>> m_eoxjszqd(String string, Services arg, BooleanSupplier booleanSupplier) {
-      return arg.userCache().findByNameAsync(string).thenApplyAsync(optional -> {
-         if (optional.isPresent() && !booleanSupplier.getAsBoolean()) {
-            UUID uUID = ((GameProfile)optional.get()).getId();
-            ProfileResult profileResult = arg.sessionService().fetchProfile(uUID, true);
-            return profileResult != null ? Optional.ofNullable(profileResult.profile()) : optional;
+   static CompletableFuture<Optional<GameProfile>> m_eoxjszqd(String username, Services services, BooleanSupplier booleanSupplier) {
+      return services.userCache().findByNameAsync(username).thenApplyAsync(gameProfile -> {
+         if (gameProfile.isPresent() && !booleanSupplier.getAsBoolean()) {
+            UUID uUID = ((GameProfile)gameProfile.get()).getId();
+            ProfileResult profileResult = services.sessionService().fetchProfile(uUID, true);
+            return profileResult != null ? Optional.ofNullable(profileResult.profile()) : gameProfile;
          } else {
             return Optional.empty();
          }
@@ -251,7 +252,7 @@
     * @mapping {@literal named loadOwnerProperties Lnet/minecraft/block/entity/SkullBlockEntity;loadOwnerProperties()V}
     */
    private void loadOwnerProperties() {
-      if (this.owner != null && !Util.isBlank(this.owner.getName()) && !m_yjhsliqo(this.owner)) {
+      if (this.owner != null && !Util.isBlank(this.owner.getName()) && !hasTextures(this.owner)) {
          m_vsbyiyln(this.owner.getName()).thenAcceptAsync(optional -> {
             this.owner = (GameProfile)optional.orElse(this.owner);
             this.markDirty();
@@ -262,18 +263,19 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_rrmjdeiy Lnet/minecraft/unmapped/C_vrhaavsg;m_rrmjdeiy(Lnet/minecraft/unmapped/C_hhlwcnih;)Lcom/mojang/authlib/GameProfile;}
+    * @mapping {@literal named m_rrmjdeiy Lnet/minecraft/block/entity/SkullBlockEntity;m_rrmjdeiy(Lnet/minecraft/nbt/NbtCompound;)Lcom/mojang/authlib/GameProfile;}
     */
    @Nullable
-   public static GameProfile m_rrmjdeiy(NbtCompound arg) {
-      if (arg.contains("SkullOwner", NbtElement.COMPOUND_TYPE)) {
-         return NbtHelper.toGameProfile(arg.getCompound("SkullOwner"));
+   public static GameProfile m_rrmjdeiy(NbtCompound nbt) {
+      if (nbt.contains("SkullOwner", NbtElement.COMPOUND_TYPE)) {
+         return NbtHelper.toGameProfile(nbt.getCompound("SkullOwner"));
       } else {
-         if (arg.contains("SkullOwner", NbtElement.STRING_TYPE)) {
-            String string = arg.getString("SkullOwner");
+         if (nbt.contains("SkullOwner", NbtElement.STRING_TYPE)) {
+            String string = nbt.getString("SkullOwner");
             if (!Util.isBlank(string)) {
-               arg.remove("SkullOwner");
-               m_ebobyxzo(arg, string);
+               nbt.remove("SkullOwner");
+               m_ebobyxzo(nbt, string);
             }
          }
 
@@ -282,22 +284,24 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_btgpxhvt Lnet/minecraft/unmapped/C_vrhaavsg;m_btgpxhvt(Lnet/minecraft/unmapped/C_hhlwcnih;)V}
+    * @mapping {@literal named m_btgpxhvt Lnet/minecraft/block/entity/SkullBlockEntity;m_btgpxhvt(Lnet/minecraft/nbt/NbtCompound;)V}
     */
-   public static void m_btgpxhvt(NbtCompound arg) {
-      String string = arg.getString("SkullOwner");
+   public static void m_btgpxhvt(NbtCompound nbt) {
+      String string = nbt.getString("SkullOwner");
       if (!Util.isBlank(string)) {
-         m_ebobyxzo(arg, string);
+         m_ebobyxzo(nbt, string);
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ebobyxzo Lnet/minecraft/unmapped/C_vrhaavsg;m_ebobyxzo(Lnet/minecraft/unmapped/C_hhlwcnih;Ljava/lang/String;)V}
+    * @mapping {@literal named m_ebobyxzo Lnet/minecraft/block/entity/SkullBlockEntity;m_ebobyxzo(Lnet/minecraft/nbt/NbtCompound;Ljava/lang/String;)V}
     */
-   private static void m_ebobyxzo(NbtCompound arg, String string) {
+   private static void m_ebobyxzo(NbtCompound nbt, String string) {
       m_vsbyiyln(string)
          .thenAccept(
-            optional -> arg.put(
+            optional -> nbt.put(
                   "SkullOwner", NbtHelper.writeGameProfile(new NbtCompound(), (GameProfile)optional.orElse(new GameProfile(Util.NIL_UUID, string)))
                )
          );
@@ -313,9 +317,9 @@
 
    /**
     * @mapping {@literal hashed m_yjhsliqo Lnet/minecraft/unmapped/C_vrhaavsg;m_yjhsliqo(Lcom/mojang/authlib/GameProfile;)Z}
-    * @mapping {@literal named m_yjhsliqo Lnet/minecraft/block/entity/SkullBlockEntity;m_yjhsliqo(Lcom/mojang/authlib/GameProfile;)Z}
+    * @mapping {@literal named hasTextures Lnet/minecraft/block/entity/SkullBlockEntity;hasTextures(Lcom/mojang/authlib/GameProfile;)Z}
     */
-   private static boolean m_yjhsliqo(GameProfile profile) {
-      return profile.getProperties().containsKey("textures");
+   private static boolean hasTextures(GameProfile gameProfile) {
+      return gameProfile.getProperties().containsKey("textures");
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/enums/DoubleBlockHalf.java namedSrc/net/minecraft/block/enums/DoubleBlockHalf.java
--- namedTargetSrc/net/minecraft/block/enums/DoubleBlockHalf.java	2024-01-17 18:11:51.551378930 +0000
+++ namedSrc/net/minecraft/block/enums/DoubleBlockHalf.java	2024-01-17 18:10:47.527882251 +0000
@@ -34,9 +34,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_rfwrqvkr Lnet/minecraft/unmapped/C_ajkibnbh;m_rfwrqvkr()Lnet/minecraft/unmapped/C_xpuuihxf;}
+    * @mapping {@literal named getDirection Lnet/minecraft/block/enums/DoubleBlockHalf;getDirection()Lnet/minecraft/util/math/Direction;}
     */
-   public Direction m_rfwrqvkr() {
+   public Direction getDirection() {
       return this.direction;
    }
 
@@ -56,9 +57,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_eosvrjsg Lnet/minecraft/unmapped/C_ajkibnbh;m_eosvrjsg()Lnet/minecraft/unmapped/C_ajkibnbh;}
+    * @mapping {@literal named getHalf Lnet/minecraft/block/enums/DoubleBlockHalf;getHalf()Lnet/minecraft/block/enums/DoubleBlockHalf;}
     */
-   public DoubleBlockHalf m_eosvrjsg() {
+   public DoubleBlockHalf getHalf() {
       return this == UPPER ? LOWER : UPPER;
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/ExperienceDroppingBlock.java namedSrc/net/minecraft/block/ExperienceDroppingBlock.java
--- namedTargetSrc/net/minecraft/block/ExperienceDroppingBlock.java	2024-01-17 18:11:51.455379683 +0000
+++ namedSrc/net/minecraft/block/ExperienceDroppingBlock.java	2024-01-17 18:10:47.391883315 +0000
@@ -17,7 +17,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/ExperienceDroppingBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<ExperienceDroppingBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(IntProvider.create(0, 10).fieldOf("experience").forGetter(arg -> arg.experienceProvider), m_copdixka())
+      instance -> instance.group(IntProvider.create(0, 10).fieldOf("experience").forGetter(arg -> arg.experienceProvider), getSettingsCodec())
             .apply(instance, ExperienceDroppingBlock::new)
    );
    /**
diff -bur namedTargetSrc/net/minecraft/block/FenceGateBlock.java namedSrc/net/minecraft/block/FenceGateBlock.java
--- namedTargetSrc/net/minecraft/block/FenceGateBlock.java	2024-01-17 18:11:51.535379056 +0000
+++ namedSrc/net/minecraft/block/FenceGateBlock.java	2024-01-17 18:10:47.507882407 +0000
@@ -35,7 +35,8 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/FenceGateBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<FenceGateBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(SignType.CODEC.fieldOf("wood_type").forGetter(arg -> arg.signType), m_copdixka()).apply(instance, FenceGateBlock::new)
+      instance -> instance.group(SignType.CODEC.fieldOf("wood_type").forGetter(block -> block.signType), getSettingsCodec())
+            .apply(instance, FenceGateBlock::new)
    );
    /**
     * @mapping {@literal hashed f_miphehdo Lnet/minecraft/unmapped/C_nfehypbw;f_miphehdo:Lnet/minecraft/unmapped/C_xhwijdsd;}
@@ -282,12 +283,11 @@
    }
 
    /**
-    * @mapping {@literal hashed m_qjdjbqgu Lnet/minecraft/unmapped/C_nfehypbw;m_qjdjbqgu(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_aahhrzpf;Ljava/util/function/BiConsumer;)V}
-    * @mapping {@literal named m_qjdjbqgu Lnet/minecraft/block/FenceGateBlock;m_qjdjbqgu(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/explosion/Explosion;Ljava/util/function/BiConsumer;)V}
+    * Mapping not found
     */
    @Override
-   public void m_qjdjbqgu(BlockState state, World world, BlockPos pos, Explosion arg4, BiConsumer<ItemStack, BlockPos> biConsumer) {
-      if (arg4.m_vsvasiko() == Explosion.DestructionType.TRIGGER_BLOCK && !world.isClient() && !state.get(POWERED)) {
+   public void onExplosion(BlockState state, World world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> biConsumer) {
+      if (explosion.m_vsvasiko() == Explosion.DestructionType.TRIGGER_BLOCK && !world.isClient() && !state.get(POWERED)) {
          boolean bl = state.get(OPEN);
          world.setBlockState(pos, state.with(OPEN, Boolean.valueOf(!bl)));
          world.playSound(
@@ -301,7 +301,7 @@
          world.emitGameEvent(bl ? GameEvent.BLOCK_CLOSE : GameEvent.BLOCK_OPEN, pos, GameEvent.Context.create(state));
       }
 
-      super.m_qjdjbqgu(state, world, pos, arg4, biConsumer);
+      super.onExplosion(state, world, pos, explosion, biConsumer);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/FlowerBlock.java namedSrc/net/minecraft/block/FlowerBlock.java
--- namedTargetSrc/net/minecraft/block/FlowerBlock.java	2024-01-17 18:11:51.511379244 +0000
+++ namedSrc/net/minecraft/block/FlowerBlock.java	2024-01-17 18:10:47.471882689 +0000
@@ -17,15 +17,17 @@
  */
 public class FlowerBlock extends PlantBlock implements SuspiciousStewEffectContainer {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_itvocsaf Lnet/minecraft/unmapped/C_zhojkkij;f_itvocsaf:Lcom/mojang/serialization/MapCodec;}
+    * @mapping {@literal named SUSPICIOUS_STEW_CODEC Lnet/minecraft/block/FlowerBlock;SUSPICIOUS_STEW_CODEC:Lcom/mojang/serialization/MapCodec;}
     */
-   protected static final MapCodec<List<SuspiciousStewEffectContainer.Effect>> f_itvocsaf = SuspiciousStewEffectContainer.Effect.LIST_CODEC
+   protected static final MapCodec<List<SuspiciousStewEffectContainer.Effect>> SUSPICIOUS_STEW_CODEC = SuspiciousStewEffectContainer.Effect.LIST_CODEC
       .fieldOf("suspicious_stew_effects");
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_jprrctms Lnet/minecraft/unmapped/C_zhojkkij;f_jprrctms:Lcom/mojang/serialization/MapCodec;}
+    * @mapping {@literal named CODEC Lnet/minecraft/block/FlowerBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
-   public static final MapCodec<FlowerBlock> f_jprrctms = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(f_itvocsaf.forGetter(FlowerBlock::getAllEffects), m_copdixka()).apply(instance, FlowerBlock::new)
+   public static final MapCodec<FlowerBlock> CODEC = RecordCodecBuilder.mapCodec(
+      instance -> instance.group(SUSPICIOUS_STEW_CODEC.forGetter(FlowerBlock::getAllEffects), getSettingsCodec()).apply(instance, FlowerBlock::new)
    );
    /**
     * @mapping {@literal hashed f_bfitumpo Lnet/minecraft/unmapped/C_zhojkkij;f_bfitumpo:F}
@@ -48,15 +50,15 @@
     */
    @Override
    public MapCodec<? extends FlowerBlock> getCodec() {
-      return f_jprrctms;
+      return CODEC;
    }
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_zhojkkij;<init>(Lnet/minecraft/unmapped/C_cjzoxshv;ILnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
     * @mapping {@literal named <init> Lnet/minecraft/block/FlowerBlock;<init>(Lnet/minecraft/registry/Holder;ILnet/minecraft/block/AbstractBlock$Settings;)V}
     */
-   public FlowerBlock(Holder<StatusEffect> arg, int i, AbstractBlock.Settings settings) {
-      this(m_eohzikrf(arg, i), settings);
+   public FlowerBlock(Holder<StatusEffect> effect, int duration, AbstractBlock.Settings settings) {
+      this(getEffects(effect, duration), settings);
    }
 
    /**
@@ -69,10 +71,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_eohzikrf Lnet/minecraft/unmapped/C_zhojkkij;m_eohzikrf(Lnet/minecraft/unmapped/C_cjzoxshv;I)Ljava/util/List;}
+    * @mapping {@literal named getEffects Lnet/minecraft/block/FlowerBlock;getEffects(Lnet/minecraft/registry/Holder;I)Ljava/util/List;}
     */
-   protected static List<SuspiciousStewEffectContainer.Effect> m_eohzikrf(Holder<StatusEffect> arg, int i) {
-      return List.of(new SuspiciousStewEffectContainer.Effect(arg, i * 20));
+   protected static List<SuspiciousStewEffectContainer.Effect> getEffects(Holder<StatusEffect> effect, int duration) {
+      return List.of(new SuspiciousStewEffectContainer.Effect(effect, duration * 20));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/FlowerPotBlock.java namedSrc/net/minecraft/block/FlowerPotBlock.java
--- namedTargetSrc/net/minecraft/block/FlowerPotBlock.java	2024-01-17 18:11:51.459379652 +0000
+++ namedSrc/net/minecraft/block/FlowerPotBlock.java	2024-01-17 18:10:47.395883283 +0000
@@ -35,7 +35,8 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/FlowerPotBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<FlowerPotBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(Registries.BLOCK.getCodec().fieldOf("potted").forGetter(arg -> arg.potted), m_copdixka()).apply(instance, FlowerPotBlock::new)
+      instance -> instance.group(Registries.BLOCK.getCodec().fieldOf("potted").forGetter(arg -> arg.potted), getSettingsCodec())
+            .apply(instance, FlowerPotBlock::new)
    );
    /**
     * @mapping {@literal hashed f_ptoelive Lnet/minecraft/unmapped/C_urzerdak;f_ptoelive:Ljava/util/Map;}
@@ -125,9 +126,9 @@
       } else {
          ItemStack lv = new ItemStack(this.potted);
          Stream.of(Hand.MAIN_HAND, Hand.OFF_HAND)
-            .filter(arg2 -> player.getStackInHand(arg2).isEmpty())
+            .filter(hand -> player.getStackInHand(hand).isEmpty())
             .findFirst()
-            .ifPresentOrElse(arg3 -> player.setStackInHand(arg3, lv), () -> {
+            .ifPresentOrElse(hand -> player.setStackInHand(hand, lv), () -> {
                if (!player.giveItemStack(lv)) {
                   player.dropItem(lv, false);
                }
diff -bur namedTargetSrc/net/minecraft/block/FluidBlock.java namedSrc/net/minecraft/block/FluidBlock.java
--- namedTargetSrc/net/minecraft/block/FluidBlock.java	2024-01-17 18:11:51.427379903 +0000
+++ namedSrc/net/minecraft/block/FluidBlock.java	2024-01-17 18:10:47.347883659 +0000
@@ -39,16 +39,18 @@
  */
 public class FluidBlock extends Block implements FluidDrainable {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_htzdkhfn Lnet/minecraft/unmapped/C_vxkgppzz;f_htzdkhfn:Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named FLUID_CODEC Lnet/minecraft/block/FluidBlock;FLUID_CODEC:Lcom/mojang/serialization/Codec;}
     */
-   private static final Codec<FlowableFluid> f_htzdkhfn = Registries.FLUID
+   private static final Codec<FlowableFluid> FLUID_CODEC = Registries.FLUID
       .getCodec()
       .comapFlatMap(arg -> arg instanceof FlowableFluid lv ? DataResult.success(lv) : DataResult.error(() -> "Not a flowing fluid: " + arg), arg -> arg);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_llasnfwf Lnet/minecraft/unmapped/C_vxkgppzz;f_llasnfwf:Lcom/mojang/serialization/MapCodec;}
+    * @mapping {@literal named CODEC Lnet/minecraft/block/FluidBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
-   public static final MapCodec<FluidBlock> f_llasnfwf = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(f_htzdkhfn.fieldOf("fluid").forGetter(arg -> arg.fluid), m_copdixka()).apply(instance, FluidBlock::new)
+   public static final MapCodec<FluidBlock> CODEC = RecordCodecBuilder.mapCodec(
+      instance -> instance.group(FLUID_CODEC.fieldOf("fluid").forGetter(arg -> arg.fluid), getSettingsCodec()).apply(instance, FluidBlock::new)
    );
    /**
     * @mapping {@literal hashed f_udqymsuo Lnet/minecraft/unmapped/C_vxkgppzz;f_udqymsuo:Lnet/minecraft/unmapped/C_vltzvhxi;}
@@ -83,7 +85,7 @@
     */
    @Override
    public MapCodec<FluidBlock> getCodec() {
-      return f_llasnfwf;
+      return CODEC;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/FluidFillable.java namedSrc/net/minecraft/block/FluidFillable.java
--- namedTargetSrc/net/minecraft/block/FluidFillable.java	2024-01-17 18:11:51.479379495 +0000
+++ namedSrc/net/minecraft/block/FluidFillable.java	2024-01-17 18:10:47.427883033 +0000
@@ -17,7 +17,7 @@
     * @mapping {@literal hashed m_wguzozcn Lnet/minecraft/unmapped/C_gvnflrne;m_wguzozcn(Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_rxhyurmy;)Z}
     * @mapping {@literal named canFillWithFluid Lnet/minecraft/block/FluidFillable;canFillWithFluid(Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/fluid/Fluid;)Z}
     */
-   boolean canFillWithFluid(@Nullable PlayerEntity player, BlockView world, BlockPos pos, BlockState state, Fluid fluid);
+   boolean canFillWithFluid(@Nullable PlayerEntity playerEntity, BlockView world, BlockPos pos, BlockState state, Fluid fluid);
 
    /**
     * @mapping {@literal hashed m_ymsxgqxp Lnet/minecraft/unmapped/C_gvnflrne;m_ymsxgqxp(Lnet/minecraft/unmapped/C_vdvbsyle;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_xqketiuf;)Z}
diff -bur namedTargetSrc/net/minecraft/block/FungusBlock.java namedSrc/net/minecraft/block/FungusBlock.java
--- namedTargetSrc/net/minecraft/block/FungusBlock.java	2024-01-17 18:11:51.531379087 +0000
+++ namedSrc/net/minecraft/block/FungusBlock.java	2024-01-17 18:10:47.499882470 +0000
@@ -28,9 +28,9 @@
     */
    public static final MapCodec<FungusBlock> CODEC = RecordCodecBuilder.mapCodec(
       instance -> instance.group(
-               RegistryKey.codec(RegistryKeys.CONFIGURED_FEATURE).fieldOf("feature").forGetter(arg -> arg.feature),
-               Registries.BLOCK.getCodec().fieldOf("grows_on").forGetter(arg -> arg.requiredGroundBlock),
-               m_copdixka()
+               RegistryKey.codec(RegistryKeys.CONFIGURED_FEATURE).fieldOf("feature").forGetter(block -> block.feature),
+               Registries.BLOCK.getCodec().fieldOf("grows_on").forGetter(block -> block.requiredGroundBlock),
+               getSettingsCodec()
             )
             .apply(instance, FungusBlock::new)
    );
diff -bur namedTargetSrc/net/minecraft/block/GravelBlock.java namedSrc/net/minecraft/block/GravelBlock.java
--- namedTargetSrc/net/minecraft/block/GravelBlock.java	2024-01-17 18:11:51.499379338 +0000
+++ namedSrc/net/minecraft/block/GravelBlock.java	2024-01-17 18:10:47.451882845 +0000
@@ -16,7 +16,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/GravelBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<GravelBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(Color.CODEC.fieldOf("falling_dust_color").forGetter(arg -> arg.fallingDustColor), m_copdixka())
+      instance -> instance.group(Color.CODEC.fieldOf("falling_dust_color").forGetter(block -> block.fallingDustColor), getSettingsCodec())
             .apply(instance, GravelBlock::new)
    );
    /**
diff -bur namedTargetSrc/net/minecraft/block/InfestedBlock.java namedSrc/net/minecraft/block/InfestedBlock.java
--- namedTargetSrc/net/minecraft/block/InfestedBlock.java	2024-01-17 18:11:51.375380311 +0000
+++ namedSrc/net/minecraft/block/InfestedBlock.java	2024-01-17 18:10:47.251884409 +0000
@@ -26,7 +26,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/InfestedBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<InfestedBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(Registries.BLOCK.getCodec().fieldOf("host").forGetter(InfestedBlock::getRegularBlock), m_copdixka())
+      instance -> instance.group(Registries.BLOCK.getCodec().fieldOf("host").forGetter(InfestedBlock::getRegularBlock), getSettingsCodec())
             .apply(instance, InfestedBlock::new)
    );
    /**
diff -bur namedTargetSrc/net/minecraft/block/LeverBlock.java namedSrc/net/minecraft/block/LeverBlock.java
--- namedTargetSrc/net/minecraft/block/LeverBlock.java	2024-01-17 18:11:51.551378930 +0000
+++ namedSrc/net/minecraft/block/LeverBlock.java	2024-01-17 18:10:47.531882220 +0000
@@ -173,16 +173,15 @@
    }
 
    /**
-    * @mapping {@literal hashed m_qjdjbqgu Lnet/minecraft/unmapped/C_hcykfprw;m_qjdjbqgu(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_aahhrzpf;Ljava/util/function/BiConsumer;)V}
-    * @mapping {@literal named m_qjdjbqgu Lnet/minecraft/block/LeverBlock;m_qjdjbqgu(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/explosion/Explosion;Ljava/util/function/BiConsumer;)V}
+    * Mapping not found
     */
    @Override
-   public void m_qjdjbqgu(BlockState state, World world, BlockPos pos, Explosion arg4, BiConsumer<ItemStack, BlockPos> biConsumer) {
-      if (arg4.m_vsvasiko() == Explosion.DestructionType.TRIGGER_BLOCK && !world.isClient()) {
+   public void onExplosion(BlockState state, World world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> biConsumer) {
+      if (explosion.m_vsvasiko() == Explosion.DestructionType.TRIGGER_BLOCK && !world.isClient()) {
          this.togglePower(state, world, pos);
       }
 
-      super.m_qjdjbqgu(state, world, pos, arg4, biConsumer);
+      super.onExplosion(state, world, pos, explosion, biConsumer);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/MangrovePropaguleBlock.java namedSrc/net/minecraft/block/MangrovePropaguleBlock.java
--- namedTargetSrc/net/minecraft/block/MangrovePropaguleBlock.java	2024-01-17 18:11:51.327380687 +0000
+++ namedSrc/net/minecraft/block/MangrovePropaguleBlock.java	2024-01-17 18:10:47.199884816 +0000
@@ -32,7 +32,8 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/MangrovePropaguleBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<MangrovePropaguleBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(WoodTypes.CODEC.fieldOf("tree").forGetter(arg -> arg.generator), m_copdixka()).apply(instance, MangrovePropaguleBlock::new)
+      instance -> instance.group(WoodTypes.CODEC.fieldOf("tree").forGetter(arg -> arg.generator), getSettingsCodec())
+            .apply(instance, MangrovePropaguleBlock::new)
    );
    /**
     * @mapping {@literal hashed f_jjebyzyy Lnet/minecraft/unmapped/C_txfkypkg;f_jjebyzyy:Lnet/minecraft/unmapped/C_vltzvhxi;}
diff -bur namedTargetSrc/net/minecraft/block/MushroomPlantBlock.java namedSrc/net/minecraft/block/MushroomPlantBlock.java
--- namedTargetSrc/net/minecraft/block/MushroomPlantBlock.java	2024-01-17 18:11:51.427379903 +0000
+++ namedSrc/net/minecraft/block/MushroomPlantBlock.java	2024-01-17 18:10:47.347883659 +0000
@@ -26,7 +26,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/MushroomPlantBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<MushroomPlantBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(RegistryKey.codec(RegistryKeys.CONFIGURED_FEATURE).fieldOf("feature").forGetter(arg -> arg.feature), m_copdixka())
+      instance -> instance.group(RegistryKey.codec(RegistryKeys.CONFIGURED_FEATURE).fieldOf("feature").forGetter(arg -> arg.feature), getSettingsCodec())
             .apply(instance, MushroomPlantBlock::new)
    );
    /**
diff -bur namedTargetSrc/net/minecraft/block/OxidizableBlock.java namedSrc/net/minecraft/block/OxidizableBlock.java
--- namedTargetSrc/net/minecraft/block/OxidizableBlock.java	2024-01-17 18:11:51.427379903 +0000
+++ namedSrc/net/minecraft/block/OxidizableBlock.java	2024-01-17 18:10:47.347883659 +0000
@@ -16,7 +16,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/OxidizableBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<OxidizableBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(Oxidizable.OxidizationLevel.CODEC.fieldOf("weathering_state").forGetter(Degradable::getDegradationLevel), m_copdixka())
+      instance -> instance.group(Oxidizable.OxidizationLevel.CODEC.fieldOf("weathering_state").forGetter(Degradable::getDegradationLevel), getSettingsCodec())
             .apply(instance, OxidizableBlock::new)
    );
    /**
diff -bur namedTargetSrc/net/minecraft/block/Oxidizable.java namedSrc/net/minecraft/block/Oxidizable.java
--- namedTargetSrc/net/minecraft/block/Oxidizable.java	2024-01-17 18:11:51.427379903 +0000
+++ namedSrc/net/minecraft/block/Oxidizable.java	2024-01-17 18:10:47.347883659 +0000
@@ -148,15 +148,17 @@
        */
       public static final Codec<Oxidizable.OxidizationLevel> CODEC = StringIdentifiable.createCodec(Oxidizable.OxidizationLevel::values);
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_vwbnyiiu Lnet/minecraft/unmapped/C_nxfuouvr$C_cencorqf;f_vwbnyiiu:Ljava/lang/String;}
+       * @mapping {@literal named oxidizationLevel Lnet/minecraft/block/Oxidizable$OxidizationLevel;oxidizationLevel:Ljava/lang/String;}
        */
-      private final String f_vwbnyiiu;
+      private final String oxidizationLevel;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_nxfuouvr$C_cencorqf;<init>(Ljava/lang/String;ILjava/lang/String;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/block/Oxidizable$OxidizationLevel;<init>(Ljava/lang/String;ILjava/lang/String;)V}
        */
-      private OxidizationLevel(String string2) {
-         this.f_vwbnyiiu = string2;
+      private OxidizationLevel(String oxidizationLevel) {
+         this.oxidizationLevel = oxidizationLevel;
       }
 
       /**
@@ -164,7 +166,7 @@
        */
       @Override
       public String asString() {
-         return this.f_vwbnyiiu;
+         return this.oxidizationLevel;
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/OxidizableSlabBlock.java namedSrc/net/minecraft/block/OxidizableSlabBlock.java
--- namedTargetSrc/net/minecraft/block/OxidizableSlabBlock.java	2024-01-17 18:11:51.547378962 +0000
+++ namedSrc/net/minecraft/block/OxidizableSlabBlock.java	2024-01-17 18:10:47.523882282 +0000
@@ -16,7 +16,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/OxidizableSlabBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<OxidizableSlabBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(Oxidizable.OxidizationLevel.CODEC.fieldOf("weathering_state").forGetter(Degradable::getDegradationLevel), m_copdixka())
+      instance -> instance.group(Oxidizable.OxidizationLevel.CODEC.fieldOf("weathering_state").forGetter(Degradable::getDegradationLevel), getSettingsCodec())
             .apply(instance, OxidizableSlabBlock::new)
    );
    /**
diff -bur namedTargetSrc/net/minecraft/block/OxidizableStairsBlock.java namedSrc/net/minecraft/block/OxidizableStairsBlock.java
--- namedTargetSrc/net/minecraft/block/OxidizableStairsBlock.java	2024-01-17 18:11:51.323380719 +0000
+++ namedSrc/net/minecraft/block/OxidizableStairsBlock.java	2024-01-17 18:10:47.195884847 +0000
@@ -18,8 +18,8 @@
    public static final MapCodec<OxidizableStairsBlock> CODEC = RecordCodecBuilder.mapCodec(
       instance -> instance.group(
                Oxidizable.OxidizationLevel.CODEC.fieldOf("weathering_state").forGetter(Degradable::getDegradationLevel),
-               BlockState.CODEC.fieldOf("base_state").forGetter(arg -> arg.baseBlockState),
-               m_copdixka()
+               BlockState.CODEC.fieldOf("base_state").forGetter(block -> block.baseBlockState),
+               getSettingsCodec()
             )
             .apply(instance, OxidizableStairsBlock::new)
    );
Only in namedSrc/net/minecraft/block: PiglinWallHeadBlock.java
diff -bur namedTargetSrc/net/minecraft/block/PinkPetalsBlock.java namedSrc/net/minecraft/block/PinkPetalsBlock.java
--- namedTargetSrc/net/minecraft/block/PinkPetalsBlock.java	2024-01-17 18:11:51.395380154 +0000
+++ namedSrc/net/minecraft/block/PinkPetalsBlock.java	2024-01-17 18:10:47.267884284 +0000
@@ -52,9 +52,10 @@
     */
    public static final IntProperty AMOUNT = Properties.FLOWER_AMOUNT;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_jprjgbfu Lnet/minecraft/unmapped/C_onsqqphm;f_jprjgbfu:Ljava/util/function/BiFunction;}
+    * @mapping {@literal named SHAPE_BY_PROPERTIES Lnet/minecraft/block/PinkPetalsBlock;SHAPE_BY_PROPERTIES:Ljava/util/function/BiFunction;}
     */
-   private static final BiFunction<Direction, Integer, VoxelShape> f_jprjgbfu = Util.memoize(
+   private static final BiFunction<Direction, Integer, VoxelShape> SHAPE_BY_PROPERTIES = Util.memoize(
       (BiFunction<Direction, Integer, VoxelShape>)((direction, integer) -> {
          VoxelShape[] lvs = new VoxelShape[]{
             Block.createCuboidShape(8.0, 0.0, 8.0, 16.0, 3.0, 16.0),
@@ -119,7 +120,7 @@
     */
    @Override
    public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
-      return (VoxelShape)f_jprjgbfu.apply((Direction)state.get(FACING), (Integer)state.get(AMOUNT));
+      return (VoxelShape)SHAPE_BY_PROPERTIES.apply((Direction)state.get(FACING), (Integer)state.get(AMOUNT));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/piston/PistonBlock.java namedSrc/net/minecraft/block/piston/PistonBlock.java
--- namedTargetSrc/net/minecraft/block/piston/PistonBlock.java	2024-01-17 18:11:51.403380091 +0000
+++ namedSrc/net/minecraft/block/piston/PistonBlock.java	2024-01-17 18:10:47.275884222 +0000
@@ -49,7 +49,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/piston/PistonBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<PistonBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(Codec.BOOL.fieldOf("sticky").forGetter(arg -> arg.sticky), m_copdixka()).apply(instance, PistonBlock::new)
+      instance -> instance.group(Codec.BOOL.fieldOf("sticky").forGetter(block -> block.sticky), getSettingsCodec()).apply(instance, PistonBlock::new)
    );
    /**
     * @mapping {@literal hashed f_pvzpicqg Lnet/minecraft/unmapped/C_tpdcefvs;f_pvzpicqg:Lnet/minecraft/unmapped/C_xhwijdsd;}
diff -bur namedTargetSrc/net/minecraft/block/PitcherCropBlock.java namedSrc/net/minecraft/block/PitcherCropBlock.java
--- namedTargetSrc/net/minecraft/block/PitcherCropBlock.java	2024-01-17 18:11:51.503379307 +0000
+++ namedSrc/net/minecraft/block/PitcherCropBlock.java	2024-01-17 18:10:47.463882751 +0000
@@ -143,7 +143,7 @@
    public BlockState getStateForNeighborUpdate(
       BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos
    ) {
-      if (m_comeruhy(state.get(AGE))) {
+      if (isDoubleTallAtAge(state.get(AGE))) {
          return super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos);
       } else {
          return state.canPlaceAt(world, pos) ? state : Blocks.AIR.getDefaultState();
@@ -231,7 +231,7 @@
       if (this.canGrow(world, pos, state, j)) {
          BlockState lv = state.with(AGE, Integer.valueOf(j));
          world.setBlockState(pos, lv, Block.NOTIFY_LISTENERS);
-         if (m_comeruhy(j)) {
+         if (isDoubleTallAtAge(j)) {
             world.setBlockState(pos.up(), lv.with(HALF, DoubleBlockHalf.UPPER), Block.NOTIFY_ALL);
          }
       }
@@ -251,7 +251,7 @@
     * @mapping {@literal named hasEnoughLight Lnet/minecraft/block/PitcherCropBlock;hasEnoughLight(Lnet/minecraft/world/WorldView;Lnet/minecraft/util/math/BlockPos;)Z}
     */
    private static boolean hasEnoughLight(WorldView world, BlockPos pos) {
-      return CropBlock.m_sivtmkfc(world, pos);
+      return CropBlock.hasEnoughLight(world, pos);
    }
 
    /**
@@ -263,10 +263,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_comeruhy Lnet/minecraft/unmapped/C_fntbpikr;m_comeruhy(I)Z}
+    * @mapping {@literal named isDoubleTallAtAge Lnet/minecraft/block/PitcherCropBlock;isDoubleTallAtAge(I)Z}
     */
-   private static boolean m_comeruhy(int i) {
-      return i >= 3;
+   private static boolean isDoubleTallAtAge(int age) {
+      return age >= 3;
    }
 
    /**
@@ -274,7 +275,7 @@
     * @mapping {@literal named canGrow Lnet/minecraft/block/PitcherCropBlock;canGrow(Lnet/minecraft/world/WorldView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;I)Z}
     */
    private boolean canGrow(WorldView world, BlockPos pos, BlockState state, int age) {
-      return !this.isMaxAge(state) && hasEnoughLight(world, pos) && (!m_comeruhy(age) || canGrowInto(world, pos.up()));
+      return !this.isMaxAge(state) && hasEnoughLight(world, pos) && (!isDoubleTallAtAge(age) || canGrowInto(world, pos.up()));
    }
 
    /**
Only in namedSrc/net/minecraft/block: PlayerWallHeadBlock.java


The remaining diff is too long!

Please sign in to comment.