Skip to content

Commit

Permalink
Enchantment and tool work (#585)
Browse files Browse the repository at this point in the history 
* complete components, text, and village

* shown in tooltip

* tooltip config

* Completed several enchantment-related classes and ToolComponent

* fixed typos and javadoc references

* refined/reworked some names, added javadoc formatting, fixed hasSpace -> hasSpaceBelow and params

* Update mappings/net/minecraft/entity/player/PlayerEntity.mapping

Fix typo

* requiresTool/doesRequireTool -> toolRequired/isToolRequired

---------

Co-authored-by: ix0rai <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
@supersaiyansubtlety @ix0rai @github-actions
3 people authored May 6, 2024
1 parent 6aed4cb commit 923e1df
Show file tree
Hide file tree
Showing 21 changed files with 176 additions and 14 deletions.
10 changes: 7 additions & 3 deletions mappings/net/minecraft/block/AbstractBlock.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
ARG 1 state
ARG 2 view
ARG 3 pos
METHOD m_enfnjurp (Ljava/util/function/Function;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 1 codecBuilder
METHOD m_ewcsdntg asBlock ()Lnet/minecraft/unmapped/C_mmxmpdoq;
METHOD m_fjkbizwn isRedstonePowerSource (Lnet/minecraft/unmapped/C_txtbiemp;)Z
ARG 1 state
Expand Down Expand Up @@ -133,7 +135,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
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
ARG 5 dropConsumer
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 All @@ -153,6 +155,8 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
ARG 5 moved
METHOD m_rhslbcpd getSoundGroup (Lnet/minecraft/unmapped/C_txtbiemp;)Lnet/minecraft/unmapped/C_aevintex;
METHOD m_rmjjhoiz getRandomTicks (Lnet/minecraft/unmapped/C_txtbiemp;)Z
METHOD m_rwctfady canPathfindThrough (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z
ARG 2 navigationType
METHOD m_sdymngiw randomTick (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 Down Expand Up @@ -526,7 +530,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
METHOD m_yvamjply getBlock ()Lnet/minecraft/unmapped/C_mmxmpdoq;
METHOD m_yylpqepz onExplosion (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
ARG 4 dropConsumer
METHOD m_zntvpiao getLuminance ()I
COMMENT {@return the light level emitted by this block state}
METHOD m_zrpxtrfo isToolRequired ()Z
Expand Down Expand Up @@ -681,7 +685,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
ARG 0 state
ARG 1 world
ARG 2 pos
METHOD m_shyyftwz requiresTool ()Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
METHOD m_shyyftwz toolRequired ()Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
METHOD m_tzpskyoo (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;)Z
ARG 0 state
ARG 1 world
Expand Down
18 changes: 18 additions & 0 deletions mappings/net/minecraft/component/DataComponentTypes.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ CLASS net/minecraft/unmapped/C_icwdaizi net/minecraft/component/DataComponentTyp
ARG 0 builder
METHOD m_buiujako (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
ARG 0 builder
METHOD m_dibhblmp (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
ARG 0 builder
METHOD m_dvuwuczw (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
ARG 0 builder
METHOD m_eczrcxxo (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
Expand All @@ -28,10 +30,14 @@ CLASS net/minecraft/unmapped/C_icwdaizi net/minecraft/component/DataComponentTyp
ARG 0 builder
METHOD m_gdbeaumi (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
ARG 0 builder
METHOD m_gfnpfgmn (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
ARG 0 builder
METHOD m_gpfilwpt (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
ARG 0 builder
METHOD m_hfdkpwbt (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
ARG 0 builder
METHOD m_hffqmrwj (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
ARG 0 builder
METHOD m_hgaesrgo (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
ARG 0 builder
METHOD m_hievveyc (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
Expand All @@ -57,12 +63,16 @@ CLASS net/minecraft/unmapped/C_icwdaizi net/minecraft/component/DataComponentTyp
ARG 0 builder
METHOD m_ntvmrhwv (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
ARG 0 builder
METHOD m_plgvcwty (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
ARG 0 builder
METHOD m_pxuiiira (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
ARG 0 builder
METHOD m_rokrjsrj (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
ARG 0 builder
METHOD m_rzcmsvar (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
ARG 0 builder
METHOD m_sdxwugjv (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
ARG 0 builder
METHOD m_skgfwypo (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
ARG 0 builder
METHOD m_skjsaedy (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
Expand All @@ -77,10 +87,14 @@ CLASS net/minecraft/unmapped/C_icwdaizi net/minecraft/component/DataComponentTyp
ARG 0 builder
METHOD m_udlsqygz (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
ARG 0 builder
METHOD m_udrgvsnp (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
ARG 0 builder
METHOD m_ufwmhtmy (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
ARG 0 builder
METHOD m_ujwzlzjr (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
ARG 0 builder
METHOD m_upfeasuy (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
ARG 0 builder
METHOD m_upyzgvcu (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
ARG 0 builder
METHOD m_uqxvcjsr (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
Expand All @@ -93,7 +107,11 @@ CLASS net/minecraft/unmapped/C_icwdaizi net/minecraft/component/DataComponentTyp
ARG 0 builder
METHOD m_ysadelqv (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
ARG 0 builder
METHOD m_zclgmqbs (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
ARG 0 builder
METHOD m_zexslagx (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
ARG 0 builder
METHOD m_zfatupgv (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
ARG 0 builder
METHOD m_zrnmazhh (Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
ARG 0 builder
25 changes: 25 additions & 0 deletions mappings/net/minecraft/component/type/ToolComponent.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
CLASS net/minecraft/unmapped/C_uippejmz net/minecraft/component/type/ToolComponent
METHOD m_bxeisvxb getSpeed (Lnet/minecraft/unmapped/C_txtbiemp;)F
METHOD m_quryfiwy isCorrectForDrops (Lnet/minecraft/unmapped/C_txtbiemp;)Z
METHOD m_zpgfztks (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 codecBuilder
CLASS C_xaqghtin Rule
METHOD m_ffzafwjh (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 codecBuilder
METHOD m_fwyltyoj of (Ljava/util/List;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_uippejmz$C_xaqghtin;
ARG 0 blocks
METHOD m_mlqvtcbj ofSpeedWithDrops (Lnet/minecraft/unmapped/C_ednuhnnn;F)Lnet/minecraft/unmapped/C_uippejmz$C_xaqghtin;
ARG 0 blocks
ARG 1 speed
METHOD m_nwyzmeet of (Lnet/minecraft/unmapped/C_ednuhnnn;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_uippejmz$C_xaqghtin;
ARG 0 blocks
METHOD m_pagfzxcb ofDeniesDrops (Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_uippejmz$C_xaqghtin;
ARG 0 blocks
METHOD m_pgdfxdeg ofSpeedWithDrops (Ljava/util/List;F)Lnet/minecraft/unmapped/C_uippejmz$C_xaqghtin;
ARG 0 blocks
ARG 1 speed
METHOD m_wkcxqaup ofSpeed (Ljava/util/List;F)Lnet/minecraft/unmapped/C_uippejmz$C_xaqghtin;
ARG 1 speed
METHOD m_yimopssh ofSpeed (Lnet/minecraft/unmapped/C_ednuhnnn;F)Lnet/minecraft/unmapped/C_uippejmz$C_xaqghtin;
ARG 0 blocks
ARG 1 speed
2 changes: 2 additions & 0 deletions mappings/net/minecraft/enchantment/BreachEnchantment.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
CLASS net/minecraft/unmapped/C_byhxpaqf net/minecraft/enchantment/BreachEnchantment
METHOD m_avspyipr getArmorBreach (FF)F
ARG 0 level
ARG 1 baseArmorBreach
19 changes: 14 additions & 5 deletions mappings/net/minecraft/enchantment/Enchantment.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
CLASS net/minecraft/unmapped/C_jxtrubuh net/minecraft/enchantment/Enchantment
FIELD f_cbjwrotz registryEntry Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;
FIELD f_cytkilek properties Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;
FIELD f_idonjvqd translationKey Ljava/lang/String;
METHOD <init> (Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;)V
ARG 1 properties
Expand Down Expand Up @@ -35,11 +36,15 @@ CLASS net/minecraft/unmapped/C_jxtrubuh net/minecraft/enchantment/Enchantment
ARG 1 user
ARG 2 target
ARG 3 level
METHOD m_rtwmhoyh getMinPower (I)I
METHOD m_rtwmhoyh getMinCost (I)I
COMMENT {@return the minimum level required to by the player for the enchantment to be shown in the enchantment table.}
COMMENT It is not a 1:1 ratio. The majority of enchantments return something similar to `10 * level`, often with different scales depending on the maximum level and rarity of the enchantment.
ARG 1 level
METHOD m_rwnmjikl properties (Lnet/minecraft/unmapped/C_ednuhnnn;IILnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;I[Lnet/minecraft/unmapped/C_yuycoehb;)Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;
METHOD m_rwnmjikl createProperties (Lnet/minecraft/unmapped/C_ednuhnnn;IILnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;I[Lnet/minecraft/unmapped/C_yuycoehb;)Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;
METHOD m_sclzujte postHit (Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_astfners;I)V
ARG 1 attacker
ARG 2 target
ARG 3 level
METHOD m_smaihzzt isAvailableForEnchantedBookOffer ()Z
COMMENT {@return whether this enchantment will appear in the enchanted book trade
COMMENT offers of librarian villagers}
Expand All @@ -59,18 +64,20 @@ CLASS net/minecraft/unmapped/C_jxtrubuh net/minecraft/enchantment/Enchantment
METHOD m_vjzmieep cost (I)Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;
METHOD m_vssdpxdz getTranslationKey ()Ljava/lang/String;
COMMENT {@return gets key for translating the enchant in the lang files}
METHOD m_whhririh properties (Lnet/minecraft/unmapped/C_ednuhnnn;Lnet/minecraft/unmapped/C_ednuhnnn;IILnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;I[Lnet/minecraft/unmapped/C_yuycoehb;)Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;
METHOD m_whhririh createProperties (Lnet/minecraft/unmapped/C_ednuhnnn;Lnet/minecraft/unmapped/C_ednuhnnn;IILnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;I[Lnet/minecraft/unmapped/C_yuycoehb;)Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;
ARG 1 primaryItems
METHOD m_xaezlmue getAnvilCost ()I
METHOD m_ygnxsicw cost (II)Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;
METHOD m_zfqdifee getName (I)Lnet/minecraft/unmapped/C_rdaqiwdt;
COMMENT {@return a translation key that is formatted to a specific color}
COMMENT By default this method changes enchantments that return {@code true} from {@code isCursed()} to have red names.
ARG 1 level
METHOD m_zrsimmxr properties (Lnet/minecraft/unmapped/C_ednuhnnn;IILnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;ILnet/minecraft/unmapped/C_czxxrbcp;[Lnet/minecraft/unmapped/C_yuycoehb;)Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;
METHOD m_znzmqxec isPrimaryItem (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
METHOD m_zrsimmxr createProperties (Lnet/minecraft/unmapped/C_ednuhnnn;IILnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;ILnet/minecraft/unmapped/C_czxxrbcp;[Lnet/minecraft/unmapped/C_yuycoehb;)Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;
METHOD m_ztiddpby isAvailableForRandomSelection ()Z
COMMENT {@return whether this enchantment will appear in the enchanting table or
COMMENT loots with random enchant function}
METHOD m_ztycenho getMaxPower (I)I
METHOD m_ztycenho getMaxCost (I)I
COMMENT {@return the maximum level a Player is allowed before the enchant is not shown in the enchantment table}
COMMENT The default return is the minimum power level + 5.
ARG 1 level
Expand All @@ -79,4 +86,6 @@ CLASS net/minecraft/unmapped/C_jxtrubuh net/minecraft/enchantment/Enchantment
ARG 1 level
ARG 2 source
CLASS C_jkttgiwc Cost
METHOD m_lpzheldf forLevel (I)I
ARG 1 level
CLASS C_ryljcnwe Properties
29 changes: 29 additions & 0 deletions mappings/net/minecraft/enchantment/EnchantmentHelper.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ CLASS net/minecraft/unmapped/C_jakrppis net/minecraft/enchantment/EnchantmentHel
COMMENT Gets the level of an enchantment on an item stack.
ARG 0 enchantment
ARG 1 stack
METHOD m_cvzymgsw getSweepingEdgeMultiplier (Lnet/minecraft/unmapped/C_usxaxydn;)F
METHOD m_cwzufrfa hasFrostWalker (Lnet/minecraft/unmapped/C_usxaxydn;)Z
ARG 0 entity
METHOD m_ebcyaldp getLoyalty (Lnet/minecraft/unmapped/C_sddaxwyk;)I
Expand All @@ -15,12 +16,15 @@ CLASS net/minecraft/unmapped/C_jakrppis net/minecraft/enchantment/EnchantmentHel
COMMENT {@code existing} enchantments}
ARG 0 existing
ARG 1 candidate
METHOD m_fbcdwuju getComponentType (Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_pscqxfcs;
METHOD m_gfmalqgf onUserDamaged (Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_astfners;)V
COMMENT This method is called when the user of the Item with the enchantment is damaged.
ARG 0 user
ARG 1 attacker
METHOD m_iaspatfp getRespiration (Lnet/minecraft/unmapped/C_usxaxydn;)I
ARG 0 entity
METHOD m_iefpfmdo updateEnchantments (Lnet/minecraft/unmapped/C_sddaxwyk;Ljava/util/function/Consumer;)Lnet/minecraft/unmapped/C_qlclfxvn;
ARG 1 updater
METHOD m_jewispmg forEachEnchantment (Lnet/minecraft/unmapped/C_jakrppis$C_jdhxivxn;Ljava/lang/Iterable;)V
ARG 0 consumer
ARG 1 stacks
Expand All @@ -34,11 +38,18 @@ CLASS net/minecraft/unmapped/C_jakrppis net/minecraft/enchantment/EnchantmentHel
ARG 0 stack
METHOD m_kkmhqorr hasVanishingCurse (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
ARG 0 stack
METHOD m_knbmveqv (Lorg/apache/commons/lang3/mutable/MutableFloat;Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_jxtrubuh;I)V
ARG 2 enchantment
ARG 3 level
METHOD m_knenpeym getFireAspect (Lnet/minecraft/unmapped/C_usxaxydn;)I
ARG 0 entity
METHOD m_koeurtnx hasEnchantments (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
METHOD m_ktvqzwtx getKnockback (Lnet/minecraft/unmapped/C_usxaxydn;)I
ARG 0 entity
METHOD m_leiaofyl hasSilkTouch (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
METHOD m_lsxqaewb (Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_jxtrubuh;I)V
ARG 2 enchantment
ARG 3 level
METHOD m_mieewhwi chooseEquipmentWith (Lnet/minecraft/unmapped/C_jxtrubuh;Lnet/minecraft/unmapped/C_usxaxydn;Ljava/util/function/Predicate;)Ljava/util/Map$Entry;
COMMENT {@return a pair of an equipment slot and the item stack in the supplied
COMMENT entity's slot} It indicates the item stack has the enchantment supplied
Expand All @@ -52,12 +63,15 @@ CLASS net/minecraft/unmapped/C_jakrppis net/minecraft/enchantment/EnchantmentHel
COMMENT the entity to choose equipments from
ARG 2 condition
COMMENT extra conditions for the item stack to pass for selection
METHOD m_mimuzvcl canStoreEnchantments (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
METHOD m_mnatputa forEachEnchantment (Lnet/minecraft/unmapped/C_jakrppis$C_jdhxivxn;Lnet/minecraft/unmapped/C_sddaxwyk;)V
ARG 0 consumer
ARG 1 stack
METHOD m_mvsjkilb getArmorBreach (Lnet/minecraft/unmapped/C_astfners;F)F
ARG 0 entity
METHOD m_naelqumb enchant (Lnet/minecraft/unmapped/C_czxxrbcp;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_sddaxwyk;IZ)Lnet/minecraft/unmapped/C_sddaxwyk;
COMMENT Enchants the {@code target} item stack and returns it.
ARG 0 features
ARG 2 target
COMMENT the item stack to enchant
ARG 3 level
Expand All @@ -66,6 +80,9 @@ CLASS net/minecraft/unmapped/C_jakrppis net/minecraft/enchantment/EnchantmentHel
COMMENT whether treasure enchantments may appear
METHOD m_nmfzbmmv hasBindingCurse (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
ARG 0 stack
METHOD m_nrticzny (Lorg/apache/commons/lang3/mutable/MutableInt;Lnet/minecraft/unmapped/C_sbxfkpyv;Lnet/minecraft/unmapped/C_jxtrubuh;I)V
ARG 2 enchantment
ARG 3 level
METHOD m_ogntvpbr getRiptide (Lnet/minecraft/unmapped/C_sddaxwyk;)I
ARG 0 stack
METHOD m_pcunrpng calculateRequiredExperienceLevel (Lnet/minecraft/unmapped/C_rlomrsco;IILnet/minecraft/unmapped/C_sddaxwyk;)I
Expand All @@ -91,6 +108,7 @@ CLASS net/minecraft/unmapped/C_jakrppis net/minecraft/enchantment/EnchantmentHel
METHOD m_pngonrhw getPossibleEntries (Lnet/minecraft/unmapped/C_czxxrbcp;ILnet/minecraft/unmapped/C_sddaxwyk;Z)Ljava/util/List;
COMMENT Gets all the possible entries for enchanting the {@code stack} at the
COMMENT given {@code power}.
ARG 0 features
ARG 1 power
ARG 2 stack
ARG 3 treasureAllowed
Expand All @@ -102,19 +120,30 @@ CLASS net/minecraft/unmapped/C_jakrppis net/minecraft/enchantment/EnchantmentHel
ARG 0 entity
METHOD m_udfcqeza generateEnchantments (Lnet/minecraft/unmapped/C_czxxrbcp;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_sddaxwyk;IZ)Ljava/util/List;
COMMENT Generate the enchantments for enchanting the {@code stack}.
ARG 0 features
ARG 2 stack
ARG 3 level
ARG 4 treasureAllowed
METHOD m_uyoiclvv getComponent (Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_qlclfxvn;
METHOD m_vonozfhq hasSoulSpeed (Lnet/minecraft/unmapped/C_usxaxydn;)Z
ARG 0 entity
METHOD m_wfidublc getEnchantmentLevel (Lnet/minecraft/unmapped/C_jxtrubuh;Lnet/minecraft/unmapped/C_usxaxydn;)I
ARG 0 enchantment
METHOD m_wodwsbra (Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_jxtrubuh;I)V
ARG 2 enchantment
ARG 3 level
METHOD m_ybhxtwqv set (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_qlclfxvn;)V
COMMENT Sets the enchantments on an item stack.
COMMENT
COMMENT <p>For enchanted books, it sets the enchantments to the item stack's
COMMENT stored enchantments than regular enchantments.
ARG 0 stack
METHOD m_yhaevnqm postHit (Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_qlclfxvn;)V
ARG 0 attacker
ARG 1 target
ARG 2 component
METHOD m_yivqyckp getSweepingEdgeMultiplier (I)F
ARG 0 level
METHOD m_ymaphuvh chooseEquipmentWith (Lnet/minecraft/unmapped/C_jxtrubuh;Lnet/minecraft/unmapped/C_usxaxydn;)Ljava/util/Map$Entry;
COMMENT {@return a pair of an equipment slot and the item stack in the supplied
COMMENT entity's slot} It indicates the item stack has the enchantment supplied.
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/enchantment/WindBurstEnchantment.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
CLASS net/minecraft/unmapped/C_ffoohmik net/minecraft/enchantment/WindBurstEnchantment
CLASS C_boyqzujk WindBurstExplosionBehavior
FIELD f_otbqmmcr knockbackMultiplier F
Loading

3 comments on commit 923e1df

@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 923e1df, 112 file(s) were updated with 831 line(s) added and 809 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-05-06 17:20:54.752850321 +0000
+++ namedSrc/net/minecraft/block/AbstractBlock.java	2024-05-06 17:19:45.688745264 +0000
@@ -191,7 +191,7 @@
     * @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> settingsFunction) {
-      return RecordCodecBuilder.mapCodec(instance -> instance.group(getSettingsCodec()).apply(instance, settingsFunction));
+      return RecordCodecBuilder.mapCodec(codecBuilder -> codecBuilder.group(getSettingsCodec()).apply(codecBuilder, settingsFunction));
    }
 
    /**
@@ -203,10 +203,10 @@
 
    /**
     * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_triydqro;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/AbstractBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * @mapping {@literal named canPathfindThrough Lnet/minecraft/block/AbstractBlock;canPathfindThrough(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
     */
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
-      switch (arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
+      switch (navigationType) {
          case LAND:
             return !state.isFullCube(EmptyBlockView.INSTANCE, BlockPos.ORIGIN);
          case WATER:
@@ -278,8 +278,8 @@
     * @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 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}
     */
-   protected void onExplosion(BlockState state, World world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> biConsumer) {
-      if (!state.isAir() && explosion.m_vsvasiko() != Explosion.DestructionType.TRIGGER_BLOCK) {
+   protected void onExplosion(BlockState state, World world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> dropConsumer) {
+      if (!state.isAir() && explosion.getDestructionType() != Explosion.DestructionType.TRIGGER_BLOCK) {
          Block lv = state.getBlock();
          boolean bl = explosion.getCausingEntity() instanceof PlayerEntity;
          if (lv.shouldDropItemsOnExplosion(explosion) && world instanceof ServerWorld lv2) {
@@ -289,12 +289,12 @@
                .add(LootContextParameters.TOOL, ItemStack.EMPTY)
                .addOptional(LootContextParameters.BLOCK_ENTITY, lv3)
                .addOptional(LootContextParameters.THIS_ENTITY, explosion.getEntity());
-            if (explosion.m_vsvasiko() == Explosion.DestructionType.DESTROY_WITH_DECAY) {
+            if (explosion.getDestructionType() == Explosion.DestructionType.DESTROY_WITH_DECAY) {
                lv4.add(LootContextParameters.EXPLOSION_RADIUS, explosion.getPower());
             }
 
             state.onStacksDropped(lv2, pos, ItemStack.EMPTY, bl);
-            state.getDroppedStacks(lv4).forEach(stack -> biConsumer.accept(stack, pos));
+            state.getDroppedStacks(lv4).forEach(stack -> dropConsumer.accept(stack, pos));
          }
 
          world.setBlockState(pos, Blocks.AIR.getDefaultState(), Block.NOTIFY_ALL);
@@ -1336,8 +1336,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 onExplosion Lnet/minecraft/block/AbstractBlock$AbstractBlockState;onExplosion(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/explosion/Explosion;Ljava/util/function/BiConsumer;)V}
        */
-      public void onExplosion(World world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> biConsumer) {
-         this.getBlock().onExplosion(this.asBlockState(), world, pos, explosion, biConsumer);
+      public void onExplosion(World world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> dropConsumer) {
+         this.getBlock().onExplosion(this.asBlockState(), world, pos, explosion, dropConsumer);
       }
 
       /**
@@ -1443,7 +1443,7 @@
        * @mapping {@literal named canPathfindThrough Lnet/minecraft/block/AbstractBlock$AbstractBlockState;canPathfindThrough(Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
        */
       public boolean canPathfindThrough(NavigationType type) {
-         return this.getBlock().m_rwctfady(this.asBlockState(), type);
+         return this.getBlock().canPathfindThrough(this.asBlockState(), type);
       }
 
       /**
@@ -2388,9 +2388,9 @@
 
       /**
        * @mapping {@literal hashed m_shyyftwz Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;m_shyyftwz()Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;}
-       * @mapping {@literal named requiresTool Lnet/minecraft/block/AbstractBlock$Settings;requiresTool()Lnet/minecraft/block/AbstractBlock$Settings;}
+       * @mapping {@literal named toolRequired Lnet/minecraft/block/AbstractBlock$Settings;toolRequired()Lnet/minecraft/block/AbstractBlock$Settings;}
        */
-      public AbstractBlock.Settings requiresTool() {
+      public AbstractBlock.Settings toolRequired() {
          this.toolRequired = true;
          return this;
       }
diff -bur namedTargetSrc/net/minecraft/block/AbstractCandleBlock.java namedSrc/net/minecraft/block/AbstractCandleBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractCandleBlock.java	2024-05-06 17:20:54.724850278 +0000
+++ namedSrc/net/minecraft/block/AbstractCandleBlock.java	2024-05-06 17:19:45.656745208 +0000
@@ -157,11 +157,11 @@
     * Mapping not found
     */
    @Override
-   protected void onExplosion(BlockState state, World world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> biConsumer) {
-      if (explosion.m_vsvasiko() == Explosion.DestructionType.TRIGGER_BLOCK && !world.isClient() && (Boolean)state.get(LIT)) {
+   protected void onExplosion(BlockState state, World world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> dropConsumer) {
+      if (explosion.getDestructionType() == Explosion.DestructionType.TRIGGER_BLOCK && !world.isClient() && (Boolean)state.get(LIT)) {
          extinguish(null, state, world, pos);
       }
 
-      super.onExplosion(state, world, pos, explosion, biConsumer);
+      super.onExplosion(state, world, pos, explosion, dropConsumer);
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/AbstractPlantBlock.java namedSrc/net/minecraft/block/AbstractPlantBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractPlantBlock.java	2024-05-06 17:20:54.960850640 +0000
+++ namedSrc/net/minecraft/block/AbstractPlantBlock.java	2024-05-06 17:19:45.936745699 +0000
@@ -66,11 +66,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_bgdokvym;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/AbstractPlantBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
-      return arg2 == NavigationType.AIR && !this.collidable ? true : super.m_rwctfady(state, arg2);
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
+      return navigationType == NavigationType.AIR && !this.collidable ? true : super.canPathfindThrough(state, navigationType);
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/AbstractSkullBlock.java namedSrc/net/minecraft/block/AbstractSkullBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractSkullBlock.java	2024-05-06 17:20:54.816850419 +0000
+++ namedSrc/net/minecraft/block/AbstractSkullBlock.java	2024-05-06 17:19:45.776745419 +0000
@@ -84,11 +84,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_eqvrspmx;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/AbstractSkullBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/AnvilBlock.java namedSrc/net/minecraft/block/AnvilBlock.java
--- namedTargetSrc/net/minecraft/block/AnvilBlock.java	2024-05-06 17:20:54.708850253 +0000
+++ namedSrc/net/minecraft/block/AnvilBlock.java	2024-05-06 17:19:45.636745173 +0000
@@ -228,11 +228,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_tglopszh;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/AnvilBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/BambooBlock.java namedSrc/net/minecraft/block/BambooBlock.java
--- namedTargetSrc/net/minecraft/block/BambooBlock.java	2024-05-06 17:20:54.744850309 +0000
+++ namedSrc/net/minecraft/block/BambooBlock.java	2024-05-06 17:19:45.680745250 +0000
@@ -149,11 +149,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_romdhvev;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/BambooBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/BedBlock.java namedSrc/net/minecraft/block/BedBlock.java
--- namedTargetSrc/net/minecraft/block/BedBlock.java	2024-05-06 17:20:54.852850474 +0000
+++ namedSrc/net/minecraft/block/BedBlock.java	2024-05-06 17:19:45.816745488 +0000
@@ -475,11 +475,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_nvwxmqty;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/BedBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/BeehiveBlock.java namedSrc/net/minecraft/block/BeehiveBlock.java
--- namedTargetSrc/net/minecraft/block/BeehiveBlock.java	2024-05-06 17:20:54.892850535 +0000
+++ namedSrc/net/minecraft/block/BeehiveBlock.java	2024-05-06 17:19:45.860745565 +0000
@@ -180,7 +180,7 @@
          if (stack.isOf(Items.SHEARS)) {
             world.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.BLOCK_BEEHIVE_SHEAR, SoundCategory.BLOCKS, 1.0F, 1.0F);
             dropHoneycomb(world, pos);
-            stack.m_rcukuoag(1, player, LivingEntity.getHand(hand));
+            stack.damageEquipment(1, player, LivingEntity.getHand(hand));
             bl = true;
             world.emitGameEvent(player, GameEvent.SHEAR, pos);
          } else if (stack.isOf(Items.GLASS_BOTTLE)) {
diff -bur namedTargetSrc/net/minecraft/block/BellBlock.java namedSrc/net/minecraft/block/BellBlock.java
--- namedTargetSrc/net/minecraft/block/BellBlock.java	2024-05-06 17:20:54.824850431 +0000
+++ namedSrc/net/minecraft/block/BellBlock.java	2024-05-06 17:19:45.788745439 +0000
@@ -341,12 +341,12 @@
     * Mapping not found
     */
    @Override
-   protected void onExplosion(BlockState state, World world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> biConsumer) {
-      if (explosion.m_vsvasiko() == Explosion.DestructionType.TRIGGER_BLOCK && !world.isClient()) {
+   protected void onExplosion(BlockState state, World world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> dropConsumer) {
+      if (explosion.getDestructionType() == Explosion.DestructionType.TRIGGER_BLOCK && !world.isClient()) {
          this.ring(world, pos, null);
       }
 
-      super.onExplosion(state, world, pos, explosion, biConsumer);
+      super.onExplosion(state, world, pos, explosion, dropConsumer);
    }
 
    /**
@@ -426,11 +426,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_kvzqooxs;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/BellBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return false;
    }

@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/Blocks.java namedSrc/net/minecraft/block/Blocks.java
--- namedTargetSrc/net/minecraft/block/Blocks.java	2024-05-06 17:20:54.796850388 +0000
+++ namedSrc/net/minecraft/block/Blocks.java	2024-05-06 17:19:45.752745376 +0000
@@ -75,7 +75,7 @@
     * @mapping {@literal named STONE Lnet/minecraft/block/Blocks;STONE:Lnet/minecraft/block/Block;}
     */
    public static final Block STONE = register(
-      "stone", new Block(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F))
+      "stone", new Block(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_olptsozb Lnet/minecraft/unmapped/C_jricjyva;f_olptsozb:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -83,7 +83,7 @@
     */
    public static final Block GRANITE = register(
       "granite",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.DIRT).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.DIRT).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_sicwklru Lnet/minecraft/unmapped/C_jricjyva;f_sicwklru:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -91,7 +91,7 @@
     */
    public static final Block POLISHED_GRANITE = register(
       "polished_granite",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.DIRT).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.DIRT).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_ixxcaedz Lnet/minecraft/unmapped/C_jricjyva;f_ixxcaedz:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -99,7 +99,7 @@
     */
    public static final Block DIORITE = register(
       "diorite",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.QUARTZ).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.QUARTZ).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_rqkjaazm Lnet/minecraft/unmapped/C_jricjyva;f_rqkjaazm:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -107,7 +107,7 @@
     */
    public static final Block POLISHED_DIORITE = register(
       "polished_diorite",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.QUARTZ).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.QUARTZ).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_miaaekio Lnet/minecraft/unmapped/C_jricjyva;f_miaaekio:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -115,7 +115,7 @@
     */
    public static final Block ANDESITE = register(
       "andesite",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_jlcriwlw Lnet/minecraft/unmapped/C_jricjyva;f_jlcriwlw:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -123,7 +123,7 @@
     */
    public static final Block POLISHED_ANDESITE = register(
       "polished_andesite",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_cjtfedqw Lnet/minecraft/unmapped/C_jricjyva;f_cjtfedqw:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -159,7 +159,7 @@
     */
    public static final Block COBBLESTONE = register(
       "cobblestone",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(2.0F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(2.0F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_iesajtma Lnet/minecraft/unmapped/C_jricjyva;f_iesajtma:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -580,7 +580,7 @@
       "gold_ore",
       new ExperienceDroppingBlock(
          ConstantIntProvider.create(0),
-         AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(3.0F, 3.0F)
+         AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.0F, 3.0F)
       )
    );
    /**
@@ -602,7 +602,7 @@
       "iron_ore",
       new ExperienceDroppingBlock(
          ConstantIntProvider.create(0),
-         AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(3.0F, 3.0F)
+         AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.0F, 3.0F)
       )
    );
    /**
@@ -624,7 +624,7 @@
       "coal_ore",
       new ExperienceDroppingBlock(
          UniformIntProvider.create(0, 2),
-         AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(3.0F, 3.0F)
+         AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.0F, 3.0F)
       )
    );
    /**
@@ -649,7 +649,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.NETHER)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(3.0F, 3.0F)
             .sounds(BlockSoundGroup.NETHER_GOLD_ORE)
       )
@@ -1125,7 +1125,7 @@
       "lapis_ore",
       new ExperienceDroppingBlock(
          UniformIntProvider.create(2, 5),
-         AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(3.0F, 3.0F)
+         AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.0F, 3.0F)
       )
    );
    /**
@@ -1144,7 +1144,7 @@
     * @mapping {@literal named LAPIS_BLOCK Lnet/minecraft/block/Blocks;LAPIS_BLOCK:Lnet/minecraft/block/Block;}
     */
    public static final Block LAPIS_BLOCK = register(
-      "lapis_block", new Block(AbstractBlock.Settings.create().mapColor(MapColor.LAPIS).requiresTool().strength(3.0F, 3.0F))
+      "lapis_block", new Block(AbstractBlock.Settings.create().mapColor(MapColor.LAPIS).toolRequired().strength(3.0F, 3.0F))
    );
    /**
     * @mapping {@literal hashed f_lhdoydbp Lnet/minecraft/unmapped/C_jricjyva;f_lhdoydbp:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -1152,14 +1152,14 @@
     */
    public static final Block DISPENSER = register(
       "dispenser",
-      new DispenserBlock(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(3.5F))
+      new DispenserBlock(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.5F))
    );
    /**
     * @mapping {@literal hashed f_pwbenjav Lnet/minecraft/unmapped/C_jricjyva;f_pwbenjav:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named SANDSTONE Lnet/minecraft/block/Blocks;SANDSTONE:Lnet/minecraft/block/Block;}
     */
    public static final Block SANDSTONE = register(
-      "sandstone", new Block(AbstractBlock.Settings.create().mapColor(MapColor.SAND).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(0.8F))
+      "sandstone", new Block(AbstractBlock.Settings.create().mapColor(MapColor.SAND).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(0.8F))
    );
    /**
     * @mapping {@literal hashed f_xwlekcgq Lnet/minecraft/unmapped/C_jricjyva;f_xwlekcgq:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -1167,7 +1167,7 @@
     */
    public static final Block CHISELED_SANDSTONE = register(
       "chiseled_sandstone",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.SAND).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(0.8F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.SAND).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(0.8F))
    );
    /**
     * @mapping {@literal hashed f_htsjxxsu Lnet/minecraft/unmapped/C_jricjyva;f_htsjxxsu:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -1175,7 +1175,7 @@
     */
    public static final Block CUT_SANDSTONE = register(
       "cut_sandstone",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.SAND).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(0.8F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.SAND).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(0.8F))
    );
    /**
     * @mapping {@literal hashed f_sevbmkqm Lnet/minecraft/unmapped/C_jricjyva;f_sevbmkqm:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -1303,7 +1303,7 @@
             .sounds(BlockSoundGroup.BLOCK_COBWEB_BREAK)
             .solid()
             .noCollision()
-            .requiresTool()
+            .toolRequired()
             .strength(4.0F)
             .pistonBehavior(PistonBehavior.DESTROY)
       )
@@ -1966,7 +1966,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.GOLD)
             .instrument(NoteBlockInstrument.BELL)
-            .requiresTool()
+            .toolRequired()
             .strength(3.0F, 6.0F)
             .sounds(BlockSoundGroup.METAL)
       )
@@ -1981,7 +1981,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.METAL)
             .instrument(NoteBlockInstrument.IRON_XYLOPHONE)
-            .requiresTool()
+            .toolRequired()
             .strength(5.0F, 6.0F)
             .sounds(BlockSoundGroup.METAL)
       )
@@ -1991,7 +1991,7 @@
     * @mapping {@literal named BRICKS Lnet/minecraft/block/Blocks;BRICKS:Lnet/minecraft/block/Block;}
     */
    public static final Block BRICKS = register(
-      "bricks", new Block(AbstractBlock.Settings.create().mapColor(MapColor.RED).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(2.0F, 6.0F))
+      "bricks", new Block(AbstractBlock.Settings.create().mapColor(MapColor.RED).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(2.0F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_mgkqhmjt Lnet/minecraft/unmapped/C_jricjyva;f_mgkqhmjt:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2039,7 +2039,7 @@
     */
    public static final Block MOSSY_COBBLESTONE = register(
       "mossy_cobblestone",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(2.0F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(2.0F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_vcordhgx Lnet/minecraft/unmapped/C_jricjyva;f_vcordhgx:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2047,7 +2047,7 @@
     */
    public static final Block OBSIDIAN = register(
       "obsidian",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.BLACK).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(50.0F, 1200.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.BLACK).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(50.0F, 1200.0F))
    );
    /**
     * @mapping {@literal hashed f_hwtlreeh Lnet/minecraft/unmapped/C_jricjyva;f_hwtlreeh:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2126,7 +2126,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.STONE)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(5.0F)
             .sounds(BlockSoundGroup.METAL)
             .nonOpaque()
@@ -2168,7 +2168,7 @@
       "diamond_ore",
       new ExperienceDroppingBlock(
          UniformIntProvider.create(3, 7),
-         AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(3.0F, 3.0F)
+         AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.0F, 3.0F)
       )
    );
    /**
@@ -2187,7 +2187,7 @@
     * @mapping {@literal named DIAMOND_BLOCK Lnet/minecraft/block/Blocks;DIAMOND_BLOCK:Lnet/minecraft/block/Block;}
     */
    public static final Block DIAMOND_BLOCK = register(
-      "diamond_block", new Block(AbstractBlock.Settings.create().mapColor(MapColor.DIAMOND).requiresTool().strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL))
+      "diamond_block", new Block(AbstractBlock.Settings.create().mapColor(MapColor.DIAMOND).toolRequired().strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL))
    );
    /**
     * @mapping {@literal hashed f_yrfqvwpt Lnet/minecraft/unmapped/C_jricjyva;f_yrfqvwpt:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2246,7 +2246,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.STONE)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(3.5F)
             .luminance(luminanceOf(13))
       )
@@ -2958,7 +2958,7 @@
             .mapColor(MapColor.STONE)
             .solid()
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .noCollision()
             .strength(0.5F)
             .pistonBehavior(PistonBehavior.DESTROY)
@@ -2972,7 +2972,7 @@
       "iron_door",
       new DoorBlock(
          BlockSetType.IRON,
-         AbstractBlock.Settings.create().mapColor(MapColor.METAL).requiresTool().strength(5.0F).nonOpaque().pistonBehavior(PistonBehavior.DESTROY)
+         AbstractBlock.Settings.create().mapColor(MapColor.METAL).toolRequired().strength(5.0F).nonOpaque().pistonBehavior(PistonBehavior.DESTROY)
       )
    );
    /**
@@ -3147,7 +3147,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.STONE)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .ticksRandomly()
             .luminance(luminanceOf(9))
             .strength(3.0F, 3.0F)
@@ -3210,7 +3210,7 @@
             .nonSolid()
             .ticksRandomly()
             .strength(0.1F)
-            .requiresTool()
+            .toolRequired()
             .sounds(BlockSoundGroup.SNOW)
             .blockVision((state, world, pos) -> (Integer)state.get(SnowBlock.LAYERS) >= 8)
             .pistonBehavior(PistonBehavior.DESTROY)
@@ -3239,7 +3239,7 @@
     * @mapping {@literal named SNOW_BLOCK Lnet/minecraft/block/Blocks;SNOW_BLOCK:Lnet/minecraft/block/Block;}
     */
    public static final Block SNOW_BLOCK = register(
-      "snow_block", new Block(AbstractBlock.Settings.create().mapColor(MapColor.SNOW).requiresTool().strength(0.2F).sounds(BlockSoundGroup.SNOW))
+      "snow_block", new Block(AbstractBlock.Settings.create().mapColor(MapColor.SNOW).toolRequired().strength(0.2F).sounds(BlockSoundGroup.SNOW))
    );
    /**
     * @mapping {@literal hashed f_yuuovhej Lnet/minecraft/unmapped/C_jricjyva;f_yuuovhej:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -3321,7 +3321,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.NETHER)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(0.4F)
             .sounds(BlockSoundGroup.NETHERRACK)
       )
@@ -3362,7 +3362,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.BLACK)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(1.25F, 4.2F)
             .sounds(BlockSoundGroup.BASALT)
       )
@@ -3377,7 +3377,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.BLACK)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(1.25F, 4.2F)
             .sounds(BlockSoundGroup.BASALT)
       )
@@ -3731,7 +3731,7 @@
     */
    public static final Block STONE_BRICKS = register(
       "stone_bricks",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_japwelwp Lnet/minecraft/unmapped/C_jricjyva;f_japwelwp:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -3739,7 +3739,7 @@
     */
    public static final Block MOSSY_STONE_BRICKS = register(
       "mossy_stone_bricks",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_lilezriy Lnet/minecraft/unmapped/C_jricjyva;f_lilezriy:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -3747,7 +3747,7 @@
     */
    public static final Block CRACKED_STONE_BRICKS = register(
       "cracked_stone_bricks",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_lpplonqh Lnet/minecraft/unmapped/C_jricjyva;f_lpplonqh:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -3755,7 +3755,7 @@
     */
    public static final Block CHISELED_STONE_BRICKS = register(
       "chiseled_stone_bricks",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_rpydnzuf Lnet/minecraft/unmapped/C_jricjyva;f_rpydnzuf:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -3774,7 +3774,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.LIGHT_GRAY_TERRACOTTA)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(1.5F, 3.0F)
             .sounds(BlockSoundGroup.MUD_BRICKS)
       )
@@ -3869,14 +3869,14 @@
     * @mapping {@literal named IRON_BARS Lnet/minecraft/block/Blocks;IRON_BARS:Lnet/minecraft/block/Block;}
     */
    public static final Block IRON_BARS = register(
-      "iron_bars", new PaneBlock(AbstractBlock.Settings.create().requiresTool().strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).nonOpaque())
+      "iron_bars", new PaneBlock(AbstractBlock.Settings.create().toolRequired().strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).nonOpaque())
    );
    /**
     * @mapping {@literal hashed f_tpkzwzbm Lnet/minecraft/unmapped/C_jricjyva;f_tpkzwzbm:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named CHAIN Lnet/minecraft/block/Blocks;CHAIN:Lnet/minecraft/block/Block;}
     */
    public static final Block CHAIN = register(
-      "chain", new ChainBlock(AbstractBlock.Settings.create().solid().requiresTool().strength(5.0F, 6.0F).sounds(BlockSoundGroup.CHAIN).nonOpaque())
+      "chain", new ChainBlock(AbstractBlock.Settings.create().solid().toolRequired().strength(5.0F, 6.0F).sounds(BlockSoundGroup.CHAIN).nonOpaque())
    );
    /**
     * @mapping {@literal hashed f_qslthtzk Lnet/minecraft/unmapped/C_jricjyva;f_qslthtzk:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4081,7 +4081,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.NETHER)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(2.0F, 6.0F)
             .sounds(BlockSoundGroup.NETHER_BRICKS)
       )
@@ -4096,7 +4096,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.NETHER)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(2.0F, 6.0F)
             .sounds(BlockSoundGroup.NETHER_BRICKS)
       )
@@ -4131,7 +4131,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.RED)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .luminance(state -> 7)
             .strength(5.0F, 1200.0F)
       )
@@ -4142,14 +4142,14 @@
     */
    public static final Block BREWING_STAND = register(
       "brewing_stand",
-      new BrewingStandBlock(AbstractBlock.Settings.create().mapColor(MapColor.METAL).requiresTool().strength(0.5F).luminance(state -> 1).nonOpaque())
+      new BrewingStandBlock(AbstractBlock.Settings.create().mapColor(MapColor.METAL).toolRequired().strength(0.5F).luminance(state -> 1).nonOpaque())
    );
    /**
     * @mapping {@literal hashed f_plzzioia Lnet/minecraft/unmapped/C_jricjyva;f_plzzioia:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named CAULDRON Lnet/minecraft/block/Blocks;CAULDRON:Lnet/minecraft/block/Block;}
     */
    public static final Block CAULDRON = register(
-      "cauldron", new CauldronBlock(AbstractBlock.Settings.create().mapColor(MapColor.STONE).requiresTool().strength(2.0F).nonOpaque())
+      "cauldron", new CauldronBlock(AbstractBlock.Settings.create().mapColor(MapColor.STONE).toolRequired().strength(2.0F).nonOpaque())
    );
    /**
     * @mapping {@literal hashed f_kyhtklyc Lnet/minecraft/unmapped/C_jricjyva;f_kyhtklyc:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4210,7 +4210,7 @@
     */
    public static final Block END_STONE = register(
       "end_stone",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.SAND).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(3.0F, 9.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.SAND).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.0F, 9.0F))
    );
    /**
     * @mapping {@literal hashed f_wfzjhgom Lnet/minecraft/unmapped/C_jricjyva;f_wfzjhgom:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4261,7 +4261,7 @@
       "emerald_ore",
       new ExperienceDroppingBlock(
          UniformIntProvider.create(3, 7),
-         AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(3.0F, 3.0F)
+         AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.0F, 3.0F)
       )
    );
    /**
@@ -4285,7 +4285,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.STONE)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(22.5F, 600.0F)
             .luminance(state -> 7)
       )
@@ -4314,7 +4314,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.EMERALD)
             .instrument(NoteBlockInstrument.BIT)
-            .requiresTool()
+            .toolRequired()
             .strength(5.0F, 6.0F)
             .sounds(BlockSoundGroup.METAL)
       )
@@ -4340,7 +4340,7 @@
     */
    public static final Block COMMAND_BLOCK = register(
       "command_block",
-      new CommandBlock(false, AbstractBlock.Settings.create().mapColor(MapColor.BROWN).requiresTool().strength(-1.0F, 3600000.0F).dropsNothing())
+      new CommandBlock(false, AbstractBlock.Settings.create().mapColor(MapColor.BROWN).toolRequired().strength(-1.0F, 3600000.0F).dropsNothing())
    );
    /**
     * @mapping {@literal hashed f_tjpthtoh Lnet/minecraft/unmapped/C_jricjyva;f_tjpthtoh:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4719,7 +4719,7 @@
       new AnvilBlock(
          AbstractBlock.Settings.create()
             .mapColor(MapColor.METAL)
-            .requiresTool()
+            .toolRequired()
             .strength(5.0F, 1200.0F)
             .sounds(BlockSoundGroup.ANVIL)
             .pistonBehavior(PistonBehavior.BLOCK)
@@ -4734,7 +4734,7 @@
       new AnvilBlock(
          AbstractBlock.Settings.create()
             .mapColor(MapColor.METAL)
-            .requiresTool()
+            .toolRequired()
             .strength(5.0F, 1200.0F)
             .sounds(BlockSoundGroup.ANVIL)
             .pistonBehavior(PistonBehavior.BLOCK)
@@ -4749,7 +4749,7 @@
       new AnvilBlock(
          AbstractBlock.Settings.create()
             .mapColor(MapColor.METAL)
-            .requiresTool()
+            .toolRequired()
             .strength(5.0F, 1200.0F)
             .sounds(BlockSoundGroup.ANVIL)
             .pistonBehavior(PistonBehavior.BLOCK)
@@ -4779,7 +4779,7 @@
       new WeightedPressurePlateBlock(
          15,
          BlockSetType.GOLD,
-         AbstractBlock.Settings.create().mapColor(MapColor.GOLD).solid().requiresTool().noCollision().strength(0.5F).pistonBehavior(PistonBehavior.DESTROY)
+         AbstractBlock.Settings.create().mapColor(MapColor.GOLD).solid().toolRequired().noCollision().strength(0.5F).pistonBehavior(PistonBehavior.DESTROY)
       )
    );
    /**
@@ -4791,7 +4791,7 @@
       new WeightedPressurePlateBlock(
          150,
          BlockSetType.IRON,
-         AbstractBlock.Settings.create().mapColor(MapColor.METAL).solid().requiresTool().noCollision().strength(0.5F).pistonBehavior(PistonBehavior.DESTROY)
+         AbstractBlock.Settings.create().mapColor(MapColor.METAL).solid().toolRequired().noCollision().strength(0.5F).pistonBehavior(PistonBehavior.DESTROY)
       )
    );
    /**
@@ -4823,7 +4823,7 @@
    public static final Block REDSTONE_BLOCK = register(
       "redstone_block",
       new RedstoneBlock(
-         AbstractBlock.Settings.create().mapColor(MapColor.FIRE).requiresTool().strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).solidBlock(Blocks::nonSolid)
+         AbstractBlock.Settings.create().mapColor(MapColor.FIRE).toolRequired().strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).solidBlock(Blocks::nonSolid)
       )
    );
    /**
@@ -4837,7 +4837,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.NETHER)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(3.0F, 3.0F)
             .sounds(BlockSoundGroup.NETHER_ORE)
       )
@@ -4848,7 +4848,7 @@
     */
    public static final Block HOPPER = register(
       "hopper",
-      new HopperBlock(AbstractBlock.Settings.create().mapColor(MapColor.STONE).requiresTool().strength(3.0F, 4.8F).sounds(BlockSoundGroup.METAL).nonOpaque())
+      new HopperBlock(AbstractBlock.Settings.create().mapColor(MapColor.STONE).toolRequired().strength(3.0F, 4.8F).sounds(BlockSoundGroup.METAL).nonOpaque())
    );
    /**
     * @mapping {@literal hashed f_finfloqz Lnet/minecraft/unmapped/C_jricjyva;f_finfloqz:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4856,7 +4856,7 @@
     */
    public static final Block QUARTZ_BLOCK = register(
       "quartz_block",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.QUARTZ).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(0.8F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.QUARTZ).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(0.8F))
    );
    /**
     * @mapping {@literal hashed f_mgxzrskp Lnet/minecraft/unmapped/C_jricjyva;f_mgxzrskp:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4864,7 +4864,7 @@
     */
    public static final Block CHISELED_QUARTZ_BLOCK = register(
       "chiseled_quartz_block",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.QUARTZ).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(0.8F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.QUARTZ).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(0.8F))
    );
    /**
     * @mapping {@literal hashed f_ymromsah Lnet/minecraft/unmapped/C_jricjyva;f_ymromsah:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4872,7 +4872,7 @@
     */
    public static final Block QUARTZ_PILLAR = register(
       "quartz_pillar",
-      new PillarBlock(AbstractBlock.Settings.create().mapColor(MapColor.QUARTZ).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(0.8F))
+      new PillarBlock(AbstractBlock.Settings.create().mapColor(MapColor.QUARTZ).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(0.8F))
    );
    /**
     * @mapping {@literal hashed f_naiixubt Lnet/minecraft/unmapped/C_jricjyva;f_naiixubt:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4892,7 +4892,7 @@
     */
    public static final Block DROPPER = register(
       "dropper",
-      new DropperBlock(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(3.5F))
+      new DropperBlock(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.5F))
    );
    /**
     * @mapping {@literal hashed f_mwxtaqcx Lnet/minecraft/unmapped/C_jricjyva;f_mwxtaqcx:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4901,7 +4901,7 @@
    public static final Block WHITE_TERRACOTTA = register(
       "white_terracotta",
       new Block(
-         AbstractBlock.Settings.create().mapColor(MapColor.WHITE_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.25F, 4.2F)
+         AbstractBlock.Settings.create().mapColor(MapColor.WHITE_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.25F, 4.2F)
       )
    );
    /**
@@ -4911,7 +4911,7 @@
    public static final Block ORANGE_TERRACOTTA = register(
       "orange_terracotta",
       new Block(
-         AbstractBlock.Settings.create().mapColor(MapColor.ORANGE_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.25F, 4.2F)
+         AbstractBlock.Settings.create().mapColor(MapColor.ORANGE_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.25F, 4.2F)
       )
    );
    /**
@@ -4921,7 +4921,7 @@
    public static final Block MAGENTA_TERRACOTTA = register(
       "magenta_terracotta",
       new Block(
-         AbstractBlock.Settings.create().mapColor(MapColor.MAGENTA_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.25F, 4.2F)
+         AbstractBlock.Settings.create().mapColor(MapColor.MAGENTA_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.25F, 4.2F)
       )
    );
    /**
@@ -4931,7 +4931,7 @@
    public static final Block LIGHT_BLUE_TERRACOTTA = register(
       "light_blue_terracotta",
       new Block(
-         AbstractBlock.Settings.create().mapColor(MapColor.LIGHT_BLUE_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.25F, 4.2F)
+         AbstractBlock.Settings.create().mapColor(MapColor.LIGHT_BLUE_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.25F, 4.2F)
       )
    );
    /**
@@ -4941,7 +4941,7 @@
    public static final Block YELLOW_TERRACOTTA = register(
       "yellow_terracotta",
       new Block(
-         AbstractBlock.Settings.create().mapColor(MapColor.YELLOW_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.25F, 4.2F)
+         AbstractBlock.Settings.create().mapColor(MapColor.YELLOW_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.25F, 4.2F)
       )
    );
    /**
@@ -4951,7 +4951,7 @@
    public static final Block LIME_TERRACOTTA = register(
       "lime_terracotta",
       new Block(
-         AbstractBlock.Settings.create().mapColor(MapColor.LIME_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.25F, 4.2F)
+         AbstractBlock.Settings.create().mapColor(MapColor.LIME_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.25F, 4.2F)
       )
    );
    /**
@@ -4961,7 +4961,7 @@
    public static final Block PINK_TERRACOTTA = register(
       "pink_terracotta",
       new Block(
-         AbstractBlock.Settings.create().mapColor(MapColor.PINK_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.25F, 4.2F)
+         AbstractBlock.Settings.create().mapColor(MapColor.PINK_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.25F, 4.2F)
       )
    );
    /**
@@ -4971,7 +4971,7 @@
    public static final Block GRAY_TERRACOTTA = register(
       "gray_terracotta",
       new Block(
-         AbstractBlock.Settings.create().mapColor(MapColor.GRAY_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.25F, 4.2F)
+         AbstractBlock.Settings.create().mapColor(MapColor.GRAY_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.25F, 4.2F)
       )
    );
    /**
@@ -4981,7 +4981,7 @@
    public static final Block LIGHT_GRAY_TERRACOTTA = register(
       "light_gray_terracotta",
       new Block(
-         AbstractBlock.Settings.create().mapColor(MapColor.LIGHT_GRAY_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.25F, 4.2F)
+         AbstractBlock.Settings.create().mapColor(MapColor.LIGHT_GRAY_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.25F, 4.2F)
       )
    );
    /**
@@ -4991,7 +4991,7 @@
    public static final Block CYAN_TERRACOTTA = register(
       "cyan_terracotta",
       new Block(
-         AbstractBlock.Settings.create().mapColor(MapColor.CYAN_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.25F, 4.2F)
+         AbstractBlock.Settings.create().mapColor(MapColor.CYAN_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.25F, 4.2F)
       )
    );
    /**
@@ -5001,7 +5001,7 @@
    public static final Block PURPLE_TERRACOTTA = register(
       "purple_terracotta",
       new Block(
-         AbstractBlock.Settings.create().mapColor(MapColor.PURPLE_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.25F, 4.2F)
+         AbstractBlock.Settings.create().mapColor(MapColor.PURPLE_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.25F, 4.2F)
       )
    );
    /**
@@ -5011,7 +5011,7 @@
    public static final Block BLUE_TERRACOTTA = register(
       "blue_terracotta",
       new Block(
-         AbstractBlock.Settings.create().mapColor(MapColor.BLUE_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.25F, 4.2F)
+         AbstractBlock.Settings.create().mapColor(MapColor.BLUE_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.25F, 4.2F)
       )
    );
    /**
@@ -5021,7 +5021,7 @@
    public static final Block BROWN_TERRACOTTA = register(
       "brown_terracotta",
       new Block(
-         AbstractBlock.Settings.create().mapColor(MapColor.BROWN_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.25F, 4.2F)
+         AbstractBlock.Settings.create().mapColor(MapColor.BROWN_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.25F, 4.2F)
       )
    );
    /**
@@ -5031,7 +5031,7 @@
    public static final Block GREEN_TERRACOTTA = register(
       "green_terracotta",
       new Block(
-         AbstractBlock.Settings.create().mapColor(MapColor.GREEN_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.25F, 4.2F)
+         AbstractBlock.Settings.create().mapColor(MapColor.GREEN_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.25F, 4.2F)
       )
    );
    /**
@@ -5040,7 +5040,7 @@
     */
    public static final Block RED_TERRACOTTA = register(
       "red_terracotta",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.RED_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.25F, 4.2F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.RED_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.25F, 4.2F))
    );
    /**
     * @mapping {@literal hashed f_wdbjwmic Lnet/minecraft/unmapped/C_jricjyva;f_wdbjwmic:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -5049,7 +5049,7 @@
    public static final Block BLACK_TERRACOTTA = register(
       "black_terracotta",
       new Block(
-         AbstractBlock.Settings.create().mapColor(MapColor.BLACK_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.25F, 4.2F)
+         AbstractBlock.Settings.create().mapColor(MapColor.BLACK_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.25F, 4.2F)
       )
    );
    /**
@@ -5290,7 +5290,7 @@
       "iron_trapdoor",
       new TrapdoorBlock(
          BlockSetType.IRON,
-         AbstractBlock.Settings.create().mapColor(MapColor.METAL).requiresTool().strength(5.0F).nonOpaque().allowsSpawning(Blocks::nonSpawnable)
+         AbstractBlock.Settings.create().mapColor(MapColor.METAL).toolRequired().strength(5.0F).nonOpaque().allowsSpawning(Blocks::nonSpawnable)
       )
    );
    /**
@@ -5299,7 +5299,7 @@
     */
    public static final Block PRISMARINE = register(
       "prismarine",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.CYAN).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.CYAN).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_kotkbuek Lnet/minecraft/unmapped/C_jricjyva;f_kotkbuek:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -5307,7 +5307,7 @@
     */
    public static final Block PRISMARINE_BRICKS = register(
       "prismarine_bricks",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.DIAMOND).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.DIAMOND).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_bpqnyhgq Lnet/minecraft/unmapped/C_jricjyva;f_bpqnyhgq:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -5315,7 +5315,7 @@
     */
    public static final Block DARK_PRISMARINE = register(
       "dark_prismarine",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.DIAMOND).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.DIAMOND).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_punhhbgy Lnet/minecraft/unmapped/C_jricjyva;f_punhhbgy:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -5338,7 +5338,7 @@
     */
    public static final Block PRISMARINE_SLAB = register(
       "prismarine_slab",
-      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.CYAN).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F))
+      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.CYAN).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_pebxwton Lnet/minecraft/unmapped/C_jricjyva;f_pebxwton:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -5346,7 +5346,7 @@
     */
    public static final Block PRISMARINE_BRICK_SLAB = register(
       "prismarine_brick_slab",
-      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.DIAMOND).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F))
+      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.DIAMOND).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_xcpdoyhb Lnet/minecraft/unmapped/C_jricjyva;f_xcpdoyhb:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -5354,7 +5354,7 @@
     */
    public static final Block DARK_PRISMARINE_SLAB = register(
       "dark_prismarine_slab",
-      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.DIAMOND).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F))
+      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.DIAMOND).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_nysmelzi Lnet/minecraft/unmapped/C_jricjyva;f_nysmelzi:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -5526,7 +5526,7 @@
     */
    public static final Block TERRACOTTA = register(
       "terracotta",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.ORANGE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.25F, 4.2F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.ORANGE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.25F, 4.2F))
    );
    /**
     * @mapping {@literal hashed f_ynkpbfvp Lnet/minecraft/unmapped/C_jricjyva;f_ynkpbfvp:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -5534,7 +5534,7 @@
     */
    public static final Block COAL_BLOCK = register(
       "coal_block",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.BLACK).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(5.0F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.BLACK).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(5.0F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_milsxicx Lnet/minecraft/unmapped/C_jricjyva;f_milsxicx:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -6253,7 +6253,7 @@
     */
    public static final Block RED_SANDSTONE = register(
       "red_sandstone",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.ORANGE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(0.8F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.ORANGE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(0.8F))
    );
    /**
     * @mapping {@literal hashed f_ayocfylw Lnet/minecraft/unmapped/C_jricjyva;f_ayocfylw:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -6261,7 +6261,7 @@
     */
    public static final Block CHISELED_RED_SANDSTONE = register(
       "chiseled_red_sandstone",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.ORANGE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(0.8F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.ORANGE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(0.8F))
    );
    /**
     * @mapping {@literal hashed f_qxdwmdhp Lnet/minecraft/unmapped/C_jricjyva;f_qxdwmdhp:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -6269,7 +6269,7 @@
     */
    public static final Block CUT_RED_SANDSTONE = register(
       "cut_red_sandstone",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.ORANGE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(0.8F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.ORANGE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(0.8F))
    );
    /**
     * @mapping {@literal hashed f_ehpsxoyy Lnet/minecraft/unmapped/C_jricjyva;f_ehpsxoyy:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -6432,7 +6432,7 @@
     */
    public static final Block STONE_SLAB = register(
       "stone_slab",
-      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(2.0F, 6.0F))
+      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(2.0F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_dvjtqxfr Lnet/minecraft/unmapped/C_jricjyva;f_dvjtqxfr:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -6440,7 +6440,7 @@
     */
    public static final Block SMOOTH_STONE_SLAB = register(
       "smooth_stone_slab",
-      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(2.0F, 6.0F))
+      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(2.0F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_rquqcbxg Lnet/minecraft/unmapped/C_jricjyva;f_rquqcbxg:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -6448,7 +6448,7 @@
     */
    public static final Block SANDSTONE_SLAB = register(
       "sandstone_slab",
-      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.SAND).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(2.0F, 6.0F))
+      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.SAND).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(2.0F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_kaoblhmn Lnet/minecraft/unmapped/C_jricjyva;f_kaoblhmn:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -6456,7 +6456,7 @@
     */
    public static final Block CUT_SANDSTONE_SLAB = register(
       "cut_sandstone_slab",
-      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.SAND).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(2.0F, 6.0F))
+      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.SAND).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(2.0F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_vgeamjdo Lnet/minecraft/unmapped/C_jricjyva;f_vgeamjdo:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -6464,7 +6464,7 @@
     */
    public static final Block PETRIFIED_OAK_SLAB = register(
       "petrified_oak_slab",
-      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(2.0F, 6.0F))
+      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(2.0F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_upbrmhfs Lnet/minecraft/unmapped/C_jricjyva;f_upbrmhfs:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -6472,7 +6472,7 @@
     */
    public static final Block COBBLESTONE_SLAB = register(
       "cobblestone_slab",
-      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(2.0F, 6.0F))
+      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(2.0F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_twjrmlcl Lnet/minecraft/unmapped/C_jricjyva;f_twjrmlcl:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -6480,7 +6480,7 @@
     */
    public static final Block BRICK_SLAB = register(
       "brick_slab",
-      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.RED).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(2.0F, 6.0F))
+      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.RED).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(2.0F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_gbdhkbav Lnet/minecraft/unmapped/C_jricjyva;f_gbdhkbav:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -6488,7 +6488,7 @@
     */
    public static final Block STONE_BRICK_SLAB = register(
       "stone_brick_slab",
-      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(2.0F, 6.0F))
+      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(2.0F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_bkeksjlq Lnet/minecraft/unmapped/C_jricjyva;f_bkeksjlq:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -6500,7 +6500,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.LIGHT_GRAY_TERRACOTTA)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(1.5F, 3.0F)
             .sounds(BlockSoundGroup.MUD_BRICKS)
       )
@@ -6515,7 +6515,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.NETHER)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(2.0F, 6.0F)
             .sounds(BlockSoundGroup.NETHER_BRICKS)
       )
@@ -6526,7 +6526,7 @@
     */
    public static final Block QUARTZ_SLAB = register(
       "quartz_slab",
-      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.QUARTZ).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(2.0F, 6.0F))
+      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.QUARTZ).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(2.0F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_dikvqeqm Lnet/minecraft/unmapped/C_jricjyva;f_dikvqeqm:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -6534,7 +6534,7 @@
     */
    public static final Block RED_SANDSTONE_SLAB = register(
       "red_sandstone_slab",
-      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.ORANGE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(2.0F, 6.0F))
+      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.ORANGE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(2.0F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_ngsxylqe Lnet/minecraft/unmapped/C_jricjyva;f_ngsxylqe:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -6542,7 +6542,7 @@
     */
    public static final Block CUT_RED_SANDSTONE_SLAB = register(
       "cut_red_sandstone_slab",
-      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.ORANGE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(2.0F, 6.0F))
+      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.ORANGE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(2.0F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_zgvwmmcl Lnet/minecraft/unmapped/C_jricjyva;f_zgvwmmcl:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -6550,7 +6550,7 @@
     */
    public static final Block PURPUR_SLAB = register(
       "purpur_slab",
-      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.MAGENTA).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(2.0F, 6.0F))
+      new SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.MAGENTA).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(2.0F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_dkwsjrtk Lnet/minecraft/unmapped/C_jricjyva;f_dkwsjrtk:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -6558,7 +6558,7 @@
     */
    public static final Block SMOOTH_STONE = register(
       "smooth_stone",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(2.0F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(2.0F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_hykbhcpo Lnet/minecraft/unmapped/C_jricjyva;f_hykbhcpo:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -6566,7 +6566,7 @@
     */
    public static final Block SMOOTH_SANDSTONE = register(
       "smooth_sandstone",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.SAND).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(2.0F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.SAND).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(2.0F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_vphlxplx Lnet/minecraft/unmapped/C_jricjyva;f_vphlxplx:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -6574,7 +6574,7 @@
     */
    public static final Block SMOOTH_QUARTZ = register(
       "smooth_quartz",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.QUARTZ).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(2.0F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.QUARTZ).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(2.0F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_nfltnfsy Lnet/minecraft/unmapped/C_jricjyva;f_nfltnfsy:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -6582,7 +6582,7 @@
     */
    public static final Block SMOOTH_RED_SANDSTONE = register(
       "smooth_red_sandstone",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.ORANGE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(2.0F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.ORANGE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(2.0F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_jpuglbcu Lnet/minecraft/unmapped/C_jricjyva;f_jpuglbcu:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -7017,7 +7017,7 @@
     */
    public static final Block PURPUR_BLOCK = register(
       "purpur_block",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.MAGENTA).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.MAGENTA).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_tcpdfsdu Lnet/minecraft/unmapped/C_jricjyva;f_tcpdfsdu:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -7025,7 +7025,7 @@
     */
    public static final Block PURPUR_PILLAR = register(
       "purpur_pillar",
-      new PillarBlock(AbstractBlock.Settings.create().mapColor(MapColor.MAGENTA).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F))
+      new PillarBlock(AbstractBlock.Settings.create().mapColor(MapColor.MAGENTA).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_yodixcwr Lnet/minecraft/unmapped/C_jricjyva;f_yodixcwr:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -7038,7 +7038,7 @@
     */
    public static final Block END_STONE_BRICKS = register(
       "end_stone_bricks",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.SAND).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(3.0F, 9.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.SAND).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.0F, 9.0F))
    );
    /**
     * @mapping {@literal hashed f_zcfznfuc Lnet/minecraft/unmapped/C_jricjyva;f_zcfznfuc:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -7142,7 +7142,7 @@
     */
    public static final Block REPEATING_COMMAND_BLOCK = register(
       "repeating_command_block",
-      new CommandBlock(false, AbstractBlock.Settings.create().mapColor(MapColor.PURPLE).requiresTool().strength(-1.0F, 3600000.0F).dropsNothing())
+      new CommandBlock(false, AbstractBlock.Settings.create().mapColor(MapColor.PURPLE).toolRequired().strength(-1.0F, 3600000.0F).dropsNothing())
    );
    /**
     * @mapping {@literal hashed f_fepuczbm Lnet/minecraft/unmapped/C_jricjyva;f_fepuczbm:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -7150,7 +7150,7 @@
     */
    public static final Block CHAIN_COMMAND_BLOCK = register(
       "chain_command_block",
-      new CommandBlock(true, AbstractBlock.Settings.create().mapColor(MapColor.GREEN).requiresTool().strength(-1.0F, 3600000.0F).dropsNothing())
+      new CommandBlock(true, AbstractBlock.Settings.create().mapColor(MapColor.GREEN).toolRequired().strength(-1.0F, 3600000.0F).dropsNothing())
    );
    /**
     * @mapping {@literal hashed f_pptxzofe Lnet/minecraft/unmapped/C_jricjyva;f_pptxzofe:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -7180,7 +7180,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.NETHER)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .luminance(state -> 3)
             .strength(0.5F)
             .allowsSpawning((state, world, pos, arg4) -> arg4.isFireImmune())
@@ -7205,7 +7205,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.NETHER)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(2.0F, 6.0F)
             .sounds(BlockSoundGroup.NETHER_BRICKS)
       )
@@ -7220,7 +7220,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.SAND)
             .instrument(NoteBlockInstrument.XYLOPHONE)
-            .requiresTool()
+            .toolRequired()
             .strength(2.0F)
             .sounds(BlockSoundGroup.BONE)
       )
@@ -7246,7 +7246,7 @@
             .mapColor(MapColor.STONE)
             .instrument(NoteBlockInstrument.BASEDRUM)
             .strength(3.0F)
-            .requiresTool()
+            .toolRequired()
             .solidBlock(Blocks::nonSolid)
       )
    );
@@ -7345,7 +7345,7 @@
          AbstractBlock.Settings.create()
             .mapColor(DyeColor.WHITE)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(1.4F)
             .pistonBehavior(PistonBehavior.PUSH_ONLY)
       )
@@ -7360,7 +7360,7 @@
          AbstractBlock.Settings.create()
             .mapColor(DyeColor.ORANGE)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(1.4F)
             .pistonBehavior(PistonBehavior.PUSH_ONLY)
       )
@@ -7375,7 +7375,7 @@
          AbstractBlock.Settings.create()
             .mapColor(DyeColor.MAGENTA)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(1.4F)
             .pistonBehavior(PistonBehavior.PUSH_ONLY)
       )
@@ -7390,7 +7390,7 @@
          AbstractBlock.Settings.create()
             .mapColor(DyeColor.LIGHT_BLUE)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(1.4F)
             .pistonBehavior(PistonBehavior.PUSH_ONLY)
       )
@@ -7405,7 +7405,7 @@
          AbstractBlock.Settings.create()
             .mapColor(DyeColor.YELLOW)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(1.4F)
             .pistonBehavior(PistonBehavior.PUSH_ONLY)
       )
@@ -7420,7 +7420,7 @@
          AbstractBlock.Settings.create()
             .mapColor(DyeColor.LIME)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(1.4F)
             .pistonBehavior(PistonBehavior.PUSH_ONLY)
       )
@@ -7435,7 +7435,7 @@
          AbstractBlock.Settings.create()
             .mapColor(DyeColor.PINK)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(1.4F)
             .pistonBehavior(PistonBehavior.PUSH_ONLY)
       )
@@ -7450,7 +7450,7 @@
          AbstractBlock.Settings.create()
             .mapColor(DyeColor.GRAY)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(1.4F)
             .pistonBehavior(PistonBehavior.PUSH_ONLY)
       )
@@ -7465,7 +7465,7 @@
          AbstractBlock.Settings.create()
             .mapColor(DyeColor.LIGHT_GRAY)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(1.4F)
             .pistonBehavior(PistonBehavior.PUSH_ONLY)
       )
@@ -7480,7 +7480,7 @@
          AbstractBlock.Settings.create()
             .mapColor(DyeColor.CYAN)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(1.4F)
             .pistonBehavior(PistonBehavior.PUSH_ONLY)
       )
@@ -7495,7 +7495,7 @@
          AbstractBlock.Settings.create()
             .mapColor(DyeColor.PURPLE)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(1.4F)
             .pistonBehavior(PistonBehavior.PUSH_ONLY)
       )
@@ -7510,7 +7510,7 @@
          AbstractBlock.Settings.create()
             .mapColor(DyeColor.BLUE)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(1.4F)
             .pistonBehavior(PistonBehavior.PUSH_ONLY)
       )
@@ -7525,7 +7525,7 @@
          AbstractBlock.Settings.create()
             .mapColor(DyeColor.BROWN)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(1.4F)
             .pistonBehavior(PistonBehavior.PUSH_ONLY)
       )
@@ -7540,7 +7540,7 @@
          AbstractBlock.Settings.create()
             .mapColor(DyeColor.GREEN)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(1.4F)
             .pistonBehavior(PistonBehavior.PUSH_ONLY)
       )
@@ -7555,7 +7555,7 @@
          AbstractBlock.Settings.create()
             .mapColor(DyeColor.RED)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(1.4F)
             .pistonBehavior(PistonBehavior.PUSH_ONLY)
       )
@@ -7570,7 +7570,7 @@
          AbstractBlock.Settings.create()
             .mapColor(DyeColor.BLACK)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(1.4F)
             .pistonBehavior(PistonBehavior.PUSH_ONLY)
       )
@@ -7581,7 +7581,7 @@
     */
    public static final Block WHITE_CONCRETE = register(
       "white_concrete",
-      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.WHITE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.8F))
+      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.WHITE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.8F))
    );
    /**
     * @mapping {@literal hashed f_xlkquofs Lnet/minecraft/unmapped/C_jricjyva;f_xlkquofs:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -7589,7 +7589,7 @@
     */
    public static final Block ORANGE_CONCRETE = register(
       "orange_concrete",
-      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.ORANGE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.8F))

The diff for this file is not complete!

@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): 
Continuation of the last diff...
+      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.ORANGE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.8F))
    );
    /**
     * @mapping {@literal hashed f_ovafnoen Lnet/minecraft/unmapped/C_jricjyva;f_ovafnoen:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -7597,7 +7597,7 @@
     */
    public static final Block MAGENTA_CONCRETE = register(
       "magenta_concrete",
-      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.MAGENTA).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.8F))
+      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.MAGENTA).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.8F))
    );
    /**
     * @mapping {@literal hashed f_mxldheur Lnet/minecraft/unmapped/C_jricjyva;f_mxldheur:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -7605,7 +7605,7 @@
     */
    public static final Block LIGHT_BLUE_CONCRETE = register(
       "light_blue_concrete",
-      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.LIGHT_BLUE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.8F))
+      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.LIGHT_BLUE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.8F))
    );
    /**
     * @mapping {@literal hashed f_qqufseie Lnet/minecraft/unmapped/C_jricjyva;f_qqufseie:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -7613,7 +7613,7 @@
     */
    public static final Block YELLOW_CONCRETE = register(
       "yellow_concrete",
-      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.YELLOW).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.8F))
+      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.YELLOW).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.8F))
    );
    /**
     * @mapping {@literal hashed f_avvlreuz Lnet/minecraft/unmapped/C_jricjyva;f_avvlreuz:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -7621,7 +7621,7 @@
     */
    public static final Block LIME_CONCRETE = register(
       "lime_concrete",
-      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.LIME).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.8F))
+      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.LIME).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.8F))
    );
    /**
     * @mapping {@literal hashed f_xlxywqqw Lnet/minecraft/unmapped/C_jricjyva;f_xlxywqqw:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -7629,7 +7629,7 @@
     */
    public static final Block PINK_CONCRETE = register(
       "pink_concrete",
-      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.PINK).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.8F))
+      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.PINK).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.8F))
    );
    /**
     * @mapping {@literal hashed f_qwrdfjut Lnet/minecraft/unmapped/C_jricjyva;f_qwrdfjut:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -7637,7 +7637,7 @@
     */
    public static final Block GRAY_CONCRETE = register(
       "gray_concrete",
-      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.GRAY).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.8F))
+      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.GRAY).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.8F))
    );
    /**
     * @mapping {@literal hashed f_whijebsy Lnet/minecraft/unmapped/C_jricjyva;f_whijebsy:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -7645,7 +7645,7 @@
     */
    public static final Block LIGHT_GRAY_CONCRETE = register(
       "light_gray_concrete",
-      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.LIGHT_GRAY).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.8F))
+      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.LIGHT_GRAY).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.8F))
    );
    /**
     * @mapping {@literal hashed f_ivwnliya Lnet/minecraft/unmapped/C_jricjyva;f_ivwnliya:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -7653,7 +7653,7 @@
     */
    public static final Block CYAN_CONCRETE = register(
       "cyan_concrete",
-      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.CYAN).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.8F))
+      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.CYAN).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.8F))
    );
    /**
     * @mapping {@literal hashed f_mamtnamr Lnet/minecraft/unmapped/C_jricjyva;f_mamtnamr:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -7661,7 +7661,7 @@
     */
    public static final Block PURPLE_CONCRETE = register(
       "purple_concrete",
-      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.PURPLE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.8F))
+      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.PURPLE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.8F))
    );
    /**
     * @mapping {@literal hashed f_qvlnzqgw Lnet/minecraft/unmapped/C_jricjyva;f_qvlnzqgw:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -7669,7 +7669,7 @@
     */
    public static final Block BLUE_CONCRETE = register(
       "blue_concrete",
-      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.BLUE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.8F))
+      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.BLUE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.8F))
    );
    /**
     * @mapping {@literal hashed f_mhhjosje Lnet/minecraft/unmapped/C_jricjyva;f_mhhjosje:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -7677,7 +7677,7 @@
     */
    public static final Block BROWN_CONCRETE = register(
       "brown_concrete",
-      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.BROWN).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.8F))
+      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.BROWN).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.8F))
    );
    /**
     * @mapping {@literal hashed f_zcweycux Lnet/minecraft/unmapped/C_jricjyva;f_zcweycux:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -7685,14 +7685,14 @@
     */
    public static final Block GREEN_CONCRETE = register(
       "green_concrete",
-      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.GREEN).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.8F))
+      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.GREEN).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.8F))
    );
    /**
     * @mapping {@literal hashed f_pjlvkkax Lnet/minecraft/unmapped/C_jricjyva;f_pjlvkkax:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named RED_CONCRETE Lnet/minecraft/block/Blocks;RED_CONCRETE:Lnet/minecraft/block/Block;}
     */
    public static final Block RED_CONCRETE = register(
-      "red_concrete", new Block(AbstractBlock.Settings.create().mapColor(DyeColor.RED).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.8F))
+      "red_concrete", new Block(AbstractBlock.Settings.create().mapColor(DyeColor.RED).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.8F))
    );
    /**
     * @mapping {@literal hashed f_bajzvjwr Lnet/minecraft/unmapped/C_jricjyva;f_bajzvjwr:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -7700,7 +7700,7 @@
     */
    public static final Block BLACK_CONCRETE = register(
       "black_concrete",
-      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.BLACK).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.8F))
+      new Block(AbstractBlock.Settings.create().mapColor(DyeColor.BLACK).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.8F))
    );
    /**
     * @mapping {@literal hashed f_prkddeqv Lnet/minecraft/unmapped/C_jricjyva;f_prkddeqv:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -7945,7 +7945,7 @@
     */
    public static final Block DEAD_TUBE_CORAL_BLOCK = register(
       "dead_tube_coral_block",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_ymdnaqpw Lnet/minecraft/unmapped/C_jricjyva;f_ymdnaqpw:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -7953,7 +7953,7 @@
     */
    public static final Block DEAD_BRAIN_CORAL_BLOCK = register(
       "dead_brain_coral_block",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_wpkaaaef Lnet/minecraft/unmapped/C_jricjyva;f_wpkaaaef:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -7961,7 +7961,7 @@
     */
    public static final Block DEAD_BUBBLE_CORAL_BLOCK = register(
       "dead_bubble_coral_block",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_kxbcofyc Lnet/minecraft/unmapped/C_jricjyva;f_kxbcofyc:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -7969,7 +7969,7 @@
     */
    public static final Block DEAD_FIRE_CORAL_BLOCK = register(
       "dead_fire_coral_block",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_aqnfvxtk Lnet/minecraft/unmapped/C_jricjyva;f_aqnfvxtk:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -7977,7 +7977,7 @@
     */
    public static final Block DEAD_HORN_CORAL_BLOCK = register(
       "dead_horn_coral_block",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_lhlyojgz Lnet/minecraft/unmapped/C_jricjyva;f_lhlyojgz:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -7990,7 +7990,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.BLUE)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(1.5F, 6.0F)
             .sounds(BlockSoundGroup.CORAL)
       )
@@ -8006,7 +8006,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.PINK)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(1.5F, 6.0F)
             .sounds(BlockSoundGroup.CORAL)
       )
@@ -8022,7 +8022,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.PURPLE)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(1.5F, 6.0F)
             .sounds(BlockSoundGroup.CORAL)
       )
@@ -8038,7 +8038,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.RED)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(1.5F, 6.0F)
             .sounds(BlockSoundGroup.CORAL)
       )
@@ -8054,7 +8054,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.YELLOW)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(1.5F, 6.0F)
             .sounds(BlockSoundGroup.CORAL)
       )
@@ -8066,7 +8066,7 @@
    public static final Block DEAD_TUBE_CORAL = register(
       "dead_tube_coral",
       new DeadCoralBlock(
-         AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).requiresTool().noCollision().breakInstantly()
+         AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).toolRequired().noCollision().breakInstantly()
       )
    );
    /**
@@ -8076,7 +8076,7 @@
    public static final Block DEAD_BRAIN_CORAL = register(
       "dead_brain_coral",
       new DeadCoralBlock(
-         AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).requiresTool().noCollision().breakInstantly()
+         AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).toolRequired().noCollision().breakInstantly()
       )
    );
    /**
@@ -8086,7 +8086,7 @@
    public static final Block DEAD_BUBBLE_CORAL = register(
       "dead_bubble_coral",
       new DeadCoralBlock(
-         AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).requiresTool().noCollision().breakInstantly()
+         AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).toolRequired().noCollision().breakInstantly()
       )
    );
    /**
@@ -8096,7 +8096,7 @@
    public static final Block DEAD_FIRE_CORAL = register(
       "dead_fire_coral",
       new DeadCoralBlock(
-         AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).requiresTool().noCollision().breakInstantly()
+         AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).toolRequired().noCollision().breakInstantly()
       )
    );
    /**
@@ -8106,7 +8106,7 @@
    public static final Block DEAD_HORN_CORAL = register(
       "dead_horn_coral",
       new DeadCoralBlock(
-         AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).requiresTool().noCollision().breakInstantly()
+         AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).toolRequired().noCollision().breakInstantly()
       )
    );
    /**
@@ -8196,7 +8196,7 @@
    public static final Block DEAD_TUBE_CORAL_FAN = register(
       "dead_tube_coral_fan",
       new DeadCoralFanBlock(
-         AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).requiresTool().noCollision().breakInstantly()
+         AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).toolRequired().noCollision().breakInstantly()
       )
    );
    /**
@@ -8206,7 +8206,7 @@
    public static final Block DEAD_BRAIN_CORAL_FAN = register(
       "dead_brain_coral_fan",
       new DeadCoralFanBlock(
-         AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).requiresTool().noCollision().breakInstantly()
+         AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).toolRequired().noCollision().breakInstantly()
       )
    );
    /**
@@ -8216,7 +8216,7 @@
    public static final Block DEAD_BUBBLE_CORAL_FAN = register(
       "dead_bubble_coral_fan",
       new DeadCoralFanBlock(
-         AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).requiresTool().noCollision().breakInstantly()
+         AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).toolRequired().noCollision().breakInstantly()
       )
    );
    /**
@@ -8226,7 +8226,7 @@
    public static final Block DEAD_FIRE_CORAL_FAN = register(
       "dead_fire_coral_fan",
       new DeadCoralFanBlock(
-         AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).requiresTool().noCollision().breakInstantly()
+         AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).toolRequired().noCollision().breakInstantly()
       )
    );
    /**
@@ -8236,7 +8236,7 @@
    public static final Block DEAD_HORN_CORAL_FAN = register(
       "dead_horn_coral_fan",
       new DeadCoralFanBlock(
-         AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).requiresTool().noCollision().breakInstantly()
+         AbstractBlock.Settings.create().mapColor(MapColor.GRAY).solid().instrument(NoteBlockInstrument.BASEDRUM).toolRequired().noCollision().breakInstantly()
       )
    );
    /**
@@ -8330,7 +8330,7 @@
             .mapColor(MapColor.GRAY)
             .solid()
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .noCollision()
             .breakInstantly()
             .dropsLike(DEAD_TUBE_CORAL_FAN)
@@ -8347,7 +8347,7 @@
             .mapColor(MapColor.GRAY)
             .solid()
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .noCollision()
             .breakInstantly()
             .dropsLike(DEAD_BRAIN_CORAL_FAN)
@@ -8364,7 +8364,7 @@
             .mapColor(MapColor.GRAY)
             .solid()
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .noCollision()
             .breakInstantly()
             .dropsLike(DEAD_BUBBLE_CORAL_FAN)
@@ -8381,7 +8381,7 @@
             .mapColor(MapColor.GRAY)
             .solid()
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .noCollision()
             .breakInstantly()
             .dropsLike(DEAD_FIRE_CORAL_FAN)
@@ -8398,7 +8398,7 @@
             .mapColor(MapColor.GRAY)
             .solid()
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .noCollision()
             .breakInstantly()
             .dropsLike(DEAD_HORN_CORAL_FAN)
@@ -8865,7 +8865,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.STONE)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(3.5F)
             .luminance(luminanceOf(13))
       )
@@ -8880,7 +8880,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.STONE)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(3.5F)
             .luminance(luminanceOf(13))
       )
@@ -8924,7 +8924,7 @@
       new GrindstoneBlock(
          AbstractBlock.Settings.create()
             .mapColor(MapColor.METAL)
-            .requiresTool()
+            .toolRequired()
             .strength(2.0F, 6.0F)
             .sounds(BlockSoundGroup.STONE)
             .pistonBehavior(PistonBehavior.BLOCK)
@@ -8966,7 +8966,7 @@
     */
    public static final Block STONECUTTER = register(
       "stonecutter",
-      new StonecutterBlock(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(3.5F))
+      new StonecutterBlock(AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.5F))
    );
    /**
     * @mapping {@literal hashed f_qdjdkdwr Lnet/minecraft/unmapped/C_jricjyva;f_qdjdkdwr:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -8978,7 +8978,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.GOLD)
             .solid()
-            .requiresTool()
+            .toolRequired()
             .strength(5.0F)
             .sounds(BlockSoundGroup.ANVIL)
             .pistonBehavior(PistonBehavior.DESTROY)
@@ -8994,7 +8994,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.METAL)
             .solid()
-            .requiresTool()
+            .toolRequired()
             .strength(3.5F)
             .sounds(BlockSoundGroup.LANTERN)
             .luminance(state -> 15)
@@ -9012,7 +9012,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.METAL)
             .solid()
-            .requiresTool()
+            .toolRequired()
             .strength(3.5F)
             .sounds(BlockSoundGroup.LANTERN)
             .luminance(state -> 10)
@@ -9121,7 +9121,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.WARPED_NYLIUM)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(0.4F)
             .sounds(BlockSoundGroup.NYLIUM)
             .ticksRandomly()
@@ -9233,7 +9233,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.CRIMSON_NYLIUM)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(0.4F)
             .sounds(BlockSoundGroup.NYLIUM)
             .ticksRandomly()
@@ -9634,14 +9634,14 @@
     */
    public static final Block STRUCTURE_BLOCK = register(
       "structure_block",
-      new StructureBlock(AbstractBlock.Settings.create().mapColor(MapColor.LIGHT_GRAY).requiresTool().strength(-1.0F, 3600000.0F).dropsNothing())
+      new StructureBlock(AbstractBlock.Settings.create().mapColor(MapColor.LIGHT_GRAY).toolRequired().strength(-1.0F, 3600000.0F).dropsNothing())
    );
    /**
     * @mapping {@literal hashed f_ufygdwmd Lnet/minecraft/unmapped/C_jricjyva;f_ufygdwmd:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named JIGSAW Lnet/minecraft/block/Blocks;JIGSAW:Lnet/minecraft/block/Block;}
     */
    public static final Block JIGSAW = register(
-      "jigsaw", new JigsawBlock(AbstractBlock.Settings.create().mapColor(MapColor.LIGHT_GRAY).requiresTool().strength(-1.0F, 3600000.0F).dropsNothing())
+      "jigsaw", new JigsawBlock(AbstractBlock.Settings.create().mapColor(MapColor.LIGHT_GRAY).toolRequired().strength(-1.0F, 3600000.0F).dropsNothing())
    );
    /**
     * @mapping {@literal hashed f_lovvfzdl Lnet/minecraft/unmapped/C_jricjyva;f_lovvfzdl:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -9723,7 +9723,7 @@
     */
    public static final Block NETHERITE_BLOCK = register(
       "netherite_block",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.BLACK).requiresTool().strength(50.0F, 1200.0F).sounds(BlockSoundGroup.NETHERITE))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.BLACK).toolRequired().strength(50.0F, 1200.0F).sounds(BlockSoundGroup.NETHERITE))
    );
    /**
     * @mapping {@literal hashed f_grrgfetc Lnet/minecraft/unmapped/C_jricjyva;f_grrgfetc:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -9731,7 +9731,7 @@
     */
    public static final Block ANCIENT_DEBRIS = register(
       "ancient_debris",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.BLACK).requiresTool().strength(30.0F, 1200.0F).sounds(BlockSoundGroup.ANCIENT_DEBRIS))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.BLACK).toolRequired().strength(30.0F, 1200.0F).sounds(BlockSoundGroup.ANCIENT_DEBRIS))
    );
    /**
     * @mapping {@literal hashed f_cqeqivse Lnet/minecraft/unmapped/C_jricjyva;f_cqeqivse:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -9743,7 +9743,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.BLACK)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(50.0F, 1200.0F)
             .luminance(state -> 10)
       )
@@ -9758,7 +9758,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.BLACK)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(50.0F, 1200.0F)
             .luminance(state -> RespawnAnchorBlock.getLightLevel(state, 15))
       )
@@ -9792,7 +9792,7 @@
       new Block(
          AbstractBlock.Settings.create()
             .mapColor(MapColor.METAL)
-            .requiresTool()
+            .toolRequired()
             .strength(3.5F)
             .sounds(BlockSoundGroup.LODESTONE)
             .pistonBehavior(PistonBehavior.BLOCK)
@@ -9804,7 +9804,7 @@
     */
    public static final Block BLACKSTONE = register(
       "blackstone",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.BLACK).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.BLACK).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_lszvkiaa Lnet/minecraft/unmapped/C_jricjyva;f_lszvkiaa:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -9897,7 +9897,7 @@
             .mapColor(MapColor.BLACK)
             .solid()
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .noCollision()
             .strength(0.5F)
             .pistonBehavior(PistonBehavior.DESTROY)
@@ -9925,7 +9925,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.NETHER)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(2.0F, 6.0F)
             .sounds(BlockSoundGroup.NETHER_BRICKS)
       )
@@ -9940,7 +9940,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.NETHER)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(2.0F, 6.0F)
             .sounds(BlockSoundGroup.NETHER_BRICKS)
       )
@@ -10140,7 +10140,7 @@
     */
    public static final Block AMETHYST_BLOCK = register(
       "amethyst_block",
-      new AmethystBlock(AbstractBlock.Settings.create().mapColor(MapColor.PURPLE).strength(1.5F).sounds(BlockSoundGroup.AMETHYST_BLOCK).requiresTool())
+      new AmethystBlock(AbstractBlock.Settings.create().mapColor(MapColor.PURPLE).strength(1.5F).sounds(BlockSoundGroup.AMETHYST_BLOCK).toolRequired())
    );
    /**
     * @mapping {@literal hashed f_oahyqqhz Lnet/minecraft/unmapped/C_jricjyva;f_oahyqqhz:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -10154,7 +10154,7 @@
             .ticksRandomly()
             .strength(1.5F)
             .sounds(BlockSoundGroup.AMETHYST_BLOCK)
-            .requiresTool()
+            .toolRequired()
             .pistonBehavior(PistonBehavior.DESTROY)
       )
    );
@@ -10212,7 +10212,7 @@
             .mapColor(MapColor.GRAY_TERRACOTTA)
             .instrument(NoteBlockInstrument.BASEDRUM)
             .sounds(BlockSoundGroup.TUFF)
-            .requiresTool()
+            .toolRequired()
             .strength(1.5F, 6.0F)
       )
    );
@@ -10307,7 +10307,7 @@
             .mapColor(MapColor.WHITE_TERRACOTTA)
             .instrument(NoteBlockInstrument.BASEDRUM)
             .sounds(BlockSoundGroup.CALCITE)
-            .requiresTool()
+            .toolRequired()
             .strength(0.75F)
       )
    );
@@ -10413,7 +10413,7 @@
       "copper_block",
       new OxidizableBlock(
          Oxidizable.OxidizationLevel.UNAFFECTED,
-         AbstractBlock.Settings.create().mapColor(MapColor.ORANGE).requiresTool().strength(3.0F, 6.0F).sounds(BlockSoundGroup.COPPER)
+         AbstractBlock.Settings.create().mapColor(MapColor.ORANGE).toolRequired().strength(3.0F, 6.0F).sounds(BlockSoundGroup.COPPER)
       )
    );
    /**
@@ -10667,28 +10667,28 @@
     * @mapping {@literal named WAXED_OXIDIZED_CUT_COPPER_SLAB Lnet/minecraft/block/Blocks;WAXED_OXIDIZED_CUT_COPPER_SLAB:Lnet/minecraft/block/Block;}
     */
    public static final Block WAXED_OXIDIZED_CUT_COPPER_SLAB = register(
-      "waxed_oxidized_cut_copper_slab", new SlabBlock(AbstractBlock.Settings.copy(WAXED_OXIDIZED_CUT_COPPER).requiresTool())
+      "waxed_oxidized_cut_copper_slab", new SlabBlock(AbstractBlock.Settings.copy(WAXED_OXIDIZED_CUT_COPPER).toolRequired())
    );
    /**
     * @mapping {@literal hashed f_cohfdbiq Lnet/minecraft/unmapped/C_jricjyva;f_cohfdbiq:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named WAXED_WEATHERED_CUT_COPPER_SLAB Lnet/minecraft/block/Blocks;WAXED_WEATHERED_CUT_COPPER_SLAB:Lnet/minecraft/block/Block;}
     */
    public static final Block WAXED_WEATHERED_CUT_COPPER_SLAB = register(
-      "waxed_weathered_cut_copper_slab", new SlabBlock(AbstractBlock.Settings.copy(WAXED_WEATHERED_CUT_COPPER).requiresTool())
+      "waxed_weathered_cut_copper_slab", new SlabBlock(AbstractBlock.Settings.copy(WAXED_WEATHERED_CUT_COPPER).toolRequired())
    );
    /**
     * @mapping {@literal hashed f_dyhmbdxf Lnet/minecraft/unmapped/C_jricjyva;f_dyhmbdxf:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named WAXED_EXPOSED_CUT_COPPER_SLAB Lnet/minecraft/block/Blocks;WAXED_EXPOSED_CUT_COPPER_SLAB:Lnet/minecraft/block/Block;}
     */
    public static final Block WAXED_EXPOSED_CUT_COPPER_SLAB = register(
-      "waxed_exposed_cut_copper_slab", new SlabBlock(AbstractBlock.Settings.copy(WAXED_EXPOSED_CUT_COPPER).requiresTool())
+      "waxed_exposed_cut_copper_slab", new SlabBlock(AbstractBlock.Settings.copy(WAXED_EXPOSED_CUT_COPPER).toolRequired())
    );
    /**
     * @mapping {@literal hashed f_huulhhky Lnet/minecraft/unmapped/C_jricjyva;f_huulhhky:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named WAXED_CUT_COPPER_SLAB Lnet/minecraft/block/Blocks;WAXED_CUT_COPPER_SLAB:Lnet/minecraft/block/Block;}
     */
    public static final Block WAXED_CUT_COPPER_SLAB = register(
-      "waxed_cut_copper_slab", new SlabBlock(AbstractBlock.Settings.copy(WAXED_CUT_COPPER).requiresTool())
+      "waxed_cut_copper_slab", new SlabBlock(AbstractBlock.Settings.copy(WAXED_CUT_COPPER).toolRequired())
    );
    /**
     * @mapping {@literal hashed f_izcjzlhq Lnet/minecraft/unmapped/C_jricjyva;f_izcjzlhq:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -10703,7 +10703,7 @@
             .mapColor(COPPER_BLOCK.getDefaultMapColor())
             .strength(3.0F, 6.0F)
             .nonOpaque()
-            .requiresTool()
+            .toolRequired()
             .pistonBehavior(PistonBehavior.DESTROY)
             .requiredFlags(FeatureFlags.UPDATE_1_21)
       )
@@ -10776,7 +10776,7 @@
          AbstractBlock.Settings.create()
             .mapColor(COPPER_BLOCK.getDefaultMapColor())
             .strength(3.0F, 6.0F)
-            .requiresTool()
+            .toolRequired()
             .nonOpaque()
             .allowsSpawning(Blocks::nonSpawnable)
             .requiredFlags(FeatureFlags.UPDATE_1_21)
@@ -10855,7 +10855,7 @@
             .sounds(BlockSoundGroup.BLOCK_COPPER_GRATE_BREAK)
             .mapColor(MapColor.ORANGE)
             .nonOpaque()
-            .requiresTool()
+            .toolRequired()
             .allowsSpawning(Blocks::nonSpawnable)
             .solidBlock(Blocks::nonSolid)
             .suffocates(Blocks::nonSolid)
@@ -10925,7 +10925,7 @@
             .mapColor(COPPER_BLOCK.getDefaultMapColor())
             .strength(3.0F, 6.0F)
             .sounds(BlockSoundGroup.BLOCK_COPPER_BULB_BREAK)
-            .requiresTool()
+            .toolRequired()
             .solidBlock(Blocks::nonSolid)
             .luminance(luminanceOf(15))
             .requiredFlags(FeatureFlags.UPDATE_1_21)
@@ -10994,7 +10994,7 @@
    public static final Block LIGHTNING_ROD = register(
       "lightning_rod",
       new LightningRodBlock(
-         AbstractBlock.Settings.create().mapColor(MapColor.ORANGE).solid().requiresTool().strength(3.0F, 6.0F).sounds(BlockSoundGroup.COPPER).nonOpaque()
+         AbstractBlock.Settings.create().mapColor(MapColor.ORANGE).solid().toolRequired().strength(3.0F, 6.0F).sounds(BlockSoundGroup.COPPER).nonOpaque()
       )
    );
    /**
@@ -11029,7 +11029,7 @@
             .mapColor(MapColor.BROWN_TERRACOTTA)
             .instrument(NoteBlockInstrument.BASEDRUM)
             .sounds(BlockSoundGroup.DRIPSTONE_BLOCK)
-            .requiresTool()
+            .toolRequired()
             .strength(1.5F, 1.0F)
       )
    );
@@ -11240,7 +11240,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.DEEPSLATE)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .strength(3.0F, 6.0F)
             .sounds(BlockSoundGroup.DEEPSLATE)
       )
@@ -11370,7 +11370,7 @@
     */
    public static final Block RAW_IRON_BLOCK = register(
       "raw_iron_block",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.RAW_IRON).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(5.0F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.RAW_IRON).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(5.0F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_ptraaubn Lnet/minecraft/unmapped/C_jricjyva;f_ptraaubn:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -11378,7 +11378,7 @@
     */
    public static final Block RAW_COPPER_BLOCK = register(
       "raw_copper_block",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.ORANGE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(5.0F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.ORANGE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(5.0F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_tiuaikeq Lnet/minecraft/unmapped/C_jricjyva;f_tiuaikeq:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -11386,7 +11386,7 @@
     */
    public static final Block RAW_GOLD_BLOCK = register(
       "raw_gold_block",
-      new Block(AbstractBlock.Settings.create().mapColor(MapColor.GOLD).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(5.0F, 6.0F))
+      new Block(AbstractBlock.Settings.create().mapColor(MapColor.GOLD).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(5.0F, 6.0F))
    );
    /**
     * @mapping {@literal hashed f_zlehrobu Lnet/minecraft/unmapped/C_jricjyva;f_zlehrobu:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -11479,7 +11479,7 @@
          AbstractBlock.Settings.create()
             .mapColor(MapColor.STONE)
             .instrument(NoteBlockInstrument.BASEDRUM)
-            .requiresTool()
+            .toolRequired()
             .luminance(state -> ((TrialSpawnerState)state.get(TrialSpawnerBlock.STATE)).getLuminance())
             .strength(50.0F)
             .sounds(BlockSoundGroup.BLOCK_TRIAL_SPAWNER_BREAK)
@@ -11499,7 +11499,7 @@
             .mapColor(MapColor.STONE)
             .instrument(NoteBlockInstrument.BASEDRUM)
             .nonOpaque()
-            .requiresTool()
+            .toolRequired()
             .sounds(BlockSoundGroup.BLOCK_VAULT_BREAK)
             .luminance(state -> ((VaultState)state.get(VaultBlock.VAULT_STATE)).m_mrmtyngy())
             .strength(50.0F)
diff -bur namedTargetSrc/net/minecraft/block/BrewingStandBlock.java namedSrc/net/minecraft/block/BrewingStandBlock.java
--- namedTargetSrc/net/minecraft/block/BrewingStandBlock.java	2024-05-06 17:20:54.912850566 +0000
+++ namedSrc/net/minecraft/block/BrewingStandBlock.java	2024-05-06 17:19:45.888745614 +0000
@@ -166,11 +166,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_ihqhzswt;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/BrewingStandBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return false;
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/ButtonBlock.java namedSrc/net/minecraft/block/ButtonBlock.java
--- namedTargetSrc/net/minecraft/block/ButtonBlock.java	2024-05-06 17:20:54.804850400 +0000
+++ namedSrc/net/minecraft/block/ButtonBlock.java	2024-05-06 17:19:45.756745383 +0000
@@ -233,12 +233,12 @@
     * Mapping not found
     */
    @Override
-   protected void onExplosion(BlockState state, World world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> biConsumer) {
-      if (explosion.m_vsvasiko() == Explosion.DestructionType.TRIGGER_BLOCK && !world.isClient() && !(Boolean)state.get(POWERED)) {
+   protected void onExplosion(BlockState state, World world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> dropConsumer) {
+      if (explosion.getDestructionType() == Explosion.DestructionType.TRIGGER_BLOCK && !world.isClient() && !(Boolean)state.get(POWERED)) {
          this.powerOn(state, world, pos);
       }
 
-      super.onExplosion(state, world, pos, explosion, biConsumer);
+      super.onExplosion(state, world, pos, explosion, dropConsumer);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/CactusBlock.java namedSrc/net/minecraft/block/CactusBlock.java
--- namedTargetSrc/net/minecraft/block/CactusBlock.java	2024-05-06 17:20:54.792850382 +0000
+++ namedSrc/net/minecraft/block/CactusBlock.java	2024-05-06 17:19:45.744745362 +0000
@@ -171,11 +171,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_yvojkeai;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/CactusBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return false;
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/CakeBlock.java namedSrc/net/minecraft/block/CakeBlock.java
--- namedTargetSrc/net/minecraft/block/CakeBlock.java	2024-05-06 17:20:54.948850621 +0000
+++ namedSrc/net/minecraft/block/CakeBlock.java	2024-05-06 17:19:45.924745678 +0000
@@ -216,11 +216,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_tldtxelx;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/CakeBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return false;
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/CampfireBlock.java namedSrc/net/minecraft/block/CampfireBlock.java
--- namedTargetSrc/net/minecraft/block/CampfireBlock.java	2024-05-06 17:20:54.908850559 +0000
+++ namedSrc/net/minecraft/block/CampfireBlock.java	2024-05-06 17:19:45.880745600 +0000
@@ -452,11 +452,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_gcjouocd;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/CampfireBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/CandleCakeBlock.java namedSrc/net/minecraft/block/CandleCakeBlock.java
--- namedTargetSrc/net/minecraft/block/CandleCakeBlock.java	2024-05-06 17:20:54.748850315 +0000
+++ namedSrc/net/minecraft/block/CandleCakeBlock.java	2024-05-06 17:19:45.684745257 +0000
@@ -211,11 +211,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_hncygpat;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/CandleCakeBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/cauldron/AbstractCauldronBlock.java namedSrc/net/minecraft/block/cauldron/AbstractCauldronBlock.java
--- namedTargetSrc/net/minecraft/block/cauldron/AbstractCauldronBlock.java	2024-05-06 17:20:54.912850566 +0000
+++ namedSrc/net/minecraft/block/cauldron/AbstractCauldronBlock.java	2024-05-06 17:19:45.884745607 +0000
@@ -146,11 +146,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_ukinmebz;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/cauldron/AbstractCauldronBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/ChainBlock.java namedSrc/net/minecraft/block/ChainBlock.java
--- namedTargetSrc/net/minecraft/block/ChainBlock.java	2024-05-06 17:20:54.804850400 +0000
+++ namedSrc/net/minecraft/block/ChainBlock.java	2024-05-06 17:19:45.756745383 +0000
@@ -131,11 +131,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_tcsihbdu;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/ChainBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return false;
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/ChestBlock.java namedSrc/net/minecraft/block/ChestBlock.java
--- namedTargetSrc/net/minecraft/block/ChestBlock.java	2024-05-06 17:20:54.932850597 +0000
+++ namedSrc/net/minecraft/block/ChestBlock.java	2024-05-06 17:19:45.908745650 +0000
@@ -568,11 +568,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_kscsbeif;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/ChestBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/ChorusPlantBlock.java namedSrc/net/minecraft/block/ChorusPlantBlock.java
--- namedTargetSrc/net/minecraft/block/ChorusPlantBlock.java	2024-05-06 17:20:54.724850278 +0000
+++ namedSrc/net/minecraft/block/ChorusPlantBlock.java	2024-05-06 17:19:45.656745208 +0000
@@ -141,11 +141,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_iomuckss;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/ChorusPlantBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return false;
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/CocoaBlock.java namedSrc/net/minecraft/block/CocoaBlock.java
--- namedTargetSrc/net/minecraft/block/CocoaBlock.java	2024-05-06 17:20:54.748850315 +0000
+++ namedSrc/net/minecraft/block/CocoaBlock.java	2024-05-06 17:19:45.684745257 +0000
@@ -253,11 +253,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_voaxbqpr;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/CocoaBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return false;
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/ComposterBlock.java namedSrc/net/minecraft/block/ComposterBlock.java
--- namedTargetSrc/net/minecraft/block/ComposterBlock.java	2024-05-06 17:20:54.872850505 +0000
+++ namedSrc/net/minecraft/block/ComposterBlock.java	2024-05-06 17:19:45.840745531 +0000
@@ -439,11 +439,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_cbvdmcmj;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/ComposterBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/ConduitBlock.java namedSrc/net/minecraft/block/ConduitBlock.java
--- namedTargetSrc/net/minecraft/block/ConduitBlock.java	2024-05-06 17:20:54.820850425 +0000
+++ namedSrc/net/minecraft/block/ConduitBlock.java	2024-05-06 17:19:45.780745425 +0000
@@ -138,11 +138,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_kvcfnskz;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/ConduitBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return false;
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java namedSrc/net/minecraft/block/DecoratedPotBlock.java
--- namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java	2024-05-06 17:20:54.736850296 +0000
+++ namedSrc/net/minecraft/block/DecoratedPotBlock.java	2024-05-06 17:19:45.668745229 +0000
@@ -195,11 +195,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_bnspifpc;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/DecoratedPotBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/DirtPathBlock.java namedSrc/net/minecraft/block/DirtPathBlock.java
--- namedTargetSrc/net/minecraft/block/DirtPathBlock.java	2024-05-06 17:20:54.896850541 +0000
+++ namedSrc/net/minecraft/block/DirtPathBlock.java	2024-05-06 17:19:45.868745579 +0000
@@ -102,11 +102,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_saesgouq;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/DirtPathBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return false;
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2024-05-06 17:20:54.860850486 +0000
+++ namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2024-05-06 17:19:45.828745510 +0000
@@ -346,7 +346,7 @@
             }
 
             if (this.isSuccess()) {
-               stack.m_lwxbsyxh(1, lv.getRandom(), null, () -> stack.setCount(0));
+               stack.damage(1, lv.getRandom(), null, () -> stack.setCount(0));
             }
 
             return stack;
@@ -556,7 +556,7 @@
             } else {
                for (ArmadilloEntity lv3 : list) {
                   if (lv3.onBrushed()) {
-                     stack.m_lwxbsyxh(16, lv.getRandom(), null, () -> {
+                     stack.damage(16, lv.getRandom(), null, () -> {
                         stack.decrement(1);
                         stack.setDamage(0);
                      });
diff -bur namedTargetSrc/net/minecraft/block/dispenser/ShearsDispenserBehavior.java namedSrc/net/minecraft/block/dispenser/ShearsDispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/ShearsDispenserBehavior.java	2024-05-06 17:20:54.832850443 +0000
+++ namedSrc/net/minecraft/block/dispenser/ShearsDispenserBehavior.java	2024-05-06 17:19:45.796745453 +0000
@@ -31,7 +31,7 @@
          BlockPos lv2 = pointer.pos().offset(pointer.state().get(DispenserBlock.FACING));
          this.setSuccess(tryShearBlock(lv, lv2) || tryShearEntity(lv, lv2));
          if (this.isSuccess()) {
-            stack.m_lwxbsyxh(1, lv.getRandom(), null, () -> stack.setCount(0));
+            stack.damage(1, lv.getRandom(), null, () -> stack.setCount(0));
          }
       }
 
diff -bur namedTargetSrc/net/minecraft/block/DoorBlock.java namedSrc/net/minecraft/block/DoorBlock.java
--- namedTargetSrc/net/minecraft/block/DoorBlock.java	2024-05-06 17:20:54.928850590 +0000
+++ namedSrc/net/minecraft/block/DoorBlock.java	2024-05-06 17:19:45.904745643 +0000
@@ -175,8 +175,8 @@
     * Mapping not found
     */
    @Override
-   protected void onExplosion(BlockState state, World world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> biConsumer) {
-      if (explosion.m_vsvasiko() == Explosion.DestructionType.TRIGGER_BLOCK
+   protected void onExplosion(BlockState state, World world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> dropConsumer) {
+      if (explosion.getDestructionType() == Explosion.DestructionType.TRIGGER_BLOCK
          && state.get(HALF) == DoubleBlockHalf.LOWER
          && !world.isClient()
          && this.blockSetType.canOpenByWindCharge()
@@ -184,7 +184,7 @@
          this.setOpen(null, world, state, pos, !this.isOpen(state));
       }
 
-      super.onExplosion(state, world, pos, explosion, biConsumer);
+      super.onExplosion(state, world, pos, explosion, dropConsumer);
    }
 
    /**
@@ -200,12 +200,11 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_dfkdtnby;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/DoorBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
-      return switch (arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
+      return switch (navigationType) {
          case LAND, AIR -> state.get(OPEN);
          case WATER -> false;
          default -> throw new MatchException(null, null);
diff -bur namedTargetSrc/net/minecraft/block/DragonEggBlock.java namedSrc/net/minecraft/block/DragonEggBlock.java
--- namedTargetSrc/net/minecraft/block/DragonEggBlock.java	2024-05-06 17:20:54.848850468 +0000
+++ namedSrc/net/minecraft/block/DragonEggBlock.java	2024-05-06 17:19:45.816745488 +0000
@@ -114,11 +114,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_tmcnlkvg;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/DragonEggBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return false;
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/EnderChestBlock.java namedSrc/net/minecraft/block/EnderChestBlock.java
--- namedTargetSrc/net/minecraft/block/EnderChestBlock.java	2024-05-06 17:20:55.024850737 +0000
+++ namedSrc/net/minecraft/block/EnderChestBlock.java	2024-05-06 17:19:45.976745769 +0000
@@ -231,11 +231,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_cwlqcqzt;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/EnderChestBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/EndPortalFrameBlock.java namedSrc/net/minecraft/block/EndPortalFrameBlock.java
--- namedTargetSrc/net/minecraft/block/EndPortalFrameBlock.java	2024-05-06 17:20:54.920850578 +0000
+++ namedSrc/net/minecraft/block/EndPortalFrameBlock.java	2024-05-06 17:19:45.892745621 +0000
@@ -183,11 +183,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_ebtjecda;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/EndPortalFrameBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return false;
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/FarmlandBlock.java namedSrc/net/minecraft/block/FarmlandBlock.java
--- namedTargetSrc/net/minecraft/block/FarmlandBlock.java	2024-05-06 17:20:54.844850462 +0000
+++ namedSrc/net/minecraft/block/FarmlandBlock.java	2024-05-06 17:19:45.808745474 +0000
@@ -199,11 +199,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_idgmnpbs;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/FarmlandBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return false;
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/FenceBlock.java namedSrc/net/minecraft/block/FenceBlock.java
--- namedTargetSrc/net/minecraft/block/FenceBlock.java	2024-05-06 17:20:54.920850578 +0000
+++ namedSrc/net/minecraft/block/FenceBlock.java	2024-05-06 17:19:45.896745629 +0000
@@ -82,11 +82,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_vhbyklfu;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/FenceBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/FenceGateBlock.java namedSrc/net/minecraft/block/FenceGateBlock.java
--- namedTargetSrc/net/minecraft/block/FenceGateBlock.java	2024-05-06 17:20:54.980850670 +0000
+++ namedSrc/net/minecraft/block/FenceGateBlock.java	2024-05-06 17:19:45.960745741 +0000
@@ -212,12 +212,11 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_nfehypbw;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/FenceGateBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
-      switch (arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
+      switch (navigationType) {
          case LAND:
             return (Boolean)state.get(OPEN);
          case WATER:
@@ -287,8 +286,8 @@
     * Mapping not found
     */
    @Override
-   protected void onExplosion(BlockState state, World world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> biConsumer) {
-      if (explosion.m_vsvasiko() == Explosion.DestructionType.TRIGGER_BLOCK && !world.isClient() && !(Boolean)state.get(POWERED)) {
+   protected void onExplosion(BlockState state, World world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> dropConsumer) {
+      if (explosion.getDestructionType() == Explosion.DestructionType.TRIGGER_BLOCK && !world.isClient() && !(Boolean)state.get(POWERED)) {
          boolean bl = (Boolean)state.get(OPEN);
          world.setBlockState(pos, state.with(OPEN, Boolean.valueOf(!bl)));
          world.playSound(
@@ -302,7 +301,7 @@
          world.emitGameEvent(bl ? GameEvent.BLOCK_CLOSE : GameEvent.BLOCK_OPEN, pos, GameEvent.Context.create(state));
       }
 
-      super.onExplosion(state, world, pos, explosion, biConsumer);
+      super.onExplosion(state, world, pos, explosion, dropConsumer);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/FlowerPotBlock.java namedSrc/net/minecraft/block/FlowerPotBlock.java
--- namedTargetSrc/net/minecraft/block/FlowerPotBlock.java	2024-05-06 17:20:54.876850511 +0000
+++ namedSrc/net/minecraft/block/FlowerPotBlock.java	2024-05-06 17:19:45.844745538 +0000
@@ -161,11 +161,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_urzerdak;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/FlowerPotBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return false;
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/FluidBlock.java namedSrc/net/minecraft/block/FluidBlock.java
--- namedTargetSrc/net/minecraft/block/FluidBlock.java	2024-05-06 17:20:54.832850443 +0000
+++ namedSrc/net/minecraft/block/FluidBlock.java	2024-05-06 17:19:45.796745453 +0000
@@ -143,11 +143,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_vxkgppzz;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/FluidBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return !this.fluid.isIn(FluidTags.LAVA);
    }
 
diff -bur namedTargetSrc/net/minecraft/block/GrindstoneBlock.java namedSrc/net/minecraft/block/GrindstoneBlock.java
--- namedTargetSrc/net/minecraft/block/GrindstoneBlock.java	2024-05-06 17:20:54.744850309 +0000
+++ namedSrc/net/minecraft/block/GrindstoneBlock.java	2024-05-06 17:19:45.680745250 +0000
@@ -493,11 +493,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_lyfxnajv;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/GrindstoneBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return false;
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/HeavyCoreBlock.java namedSrc/net/minecraft/block/HeavyCoreBlock.java
--- namedTargetSrc/net/minecraft/block/HeavyCoreBlock.java	2024-05-06 17:20:54.812850413 +0000
+++ namedSrc/net/minecraft/block/HeavyCoreBlock.java	2024-05-06 17:19:45.768745405 +0000
@@ -94,11 +94,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_rwctfady Lnet/minecraft/unmapped/C_zjbzveiy;m_rwctfady(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_kjwlgpfr;)Z}
-    * @mapping {@literal named m_rwctfady Lnet/minecraft/block/HeavyCoreBlock;m_rwctfady(Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/ai/pathing/NavigationType;)Z}
+    * Mapping not found
     */
    @Override
-   protected boolean m_rwctfady(BlockState state, NavigationType arg2) {
+   protected boolean canPathfindThrough(BlockState state, NavigationType navigationType) {
       return false;
    }
 }


The remaining diff is too long!

Please sign in to comment.