Skip to content

Commit

Permalink
complete n/m/loot
Browse files Browse the repository at this point in the history 
map some of Util's Predicate methods
rename Texts -> TextUtil
add simple type name for LootFunction
  • Loading branch information
@supersaiyansubtlety
supersaiyansubtlety committed Oct 11, 2024
1 parent 14910ef commit ed1eae1
Show file tree
Hide file tree
Showing 36 changed files with 388 additions and 26 deletions.
2 changes: 1 addition & 1 deletion mappings/net/minecraft/component/type/UnbreakableComponent.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ CLASS net/minecraft/unmapped/C_drqhpkfg net/minecraft/component/type/Unbreakable
FIELD f_iaeyiyom TOOLTIP Lnet/minecraft/unmapped/C_rdaqiwdt;
FIELD f_ivwonplx shownInTooltip Z
METHOD m_nnvtyjlt shownInTooltip ()Z
METHOD m_nrzkdjww create (Z)Lnet/minecraft/unmapped/C_drqhpkfg;
METHOD m_nrzkdjww withShownInTooltip (Z)Lnet/minecraft/unmapped/C_drqhpkfg;
ARG 1 shownInTooltip
METHOD m_sksdhjpx (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
2 changes: 1 addition & 1 deletion mappings/net/minecraft/data/server/LootTablesProvider.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ CLASS net/minecraft/unmapped/C_rriyyrek net/minecraft/data/server/LootTablesProv
ARG 1 dataPackOutput
METHOD m_cvuljxmh (Lnet/minecraft/unmapped/C_temnquoh;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Ljava/util/concurrent/CompletableFuture;
ARG 1 writer
ARG 2 lookupProvider
ARG 2 registries
METHOD m_iccnzkqh (Lnet/minecraft/unmapped/C_temnquoh;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Ljava/util/concurrent/CompletionStage;
ARG 2 provider
METHOD m_pkqhglxx (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Ljava/util/Map;Lnet/minecraft/unmapped/C_eexxncvi;Lnet/minecraft/unmapped/C_rriyyrek$C_ujsjtlmo;)V
Expand Down
3 changes: 3 additions & 0 deletions mappings/net/minecraft/data/server/loot_table/EntityLootTableGenerator.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
CLASS net/minecraft/unmapped/C_egeqzyvk net/minecraft/data/server/loot_table/EntityLootTableGenerator
FIELD f_lyzsfsde lootTables Ljava/util/Map;
FIELD f_pordewqu allowedFeatures Lnet/minecraft/unmapped/C_czxxrbcp;
FIELD f_qjcpnzik registries Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;
FIELD f_xwhijief requiredFeatures Lnet/minecraft/unmapped/C_czxxrbcp;
METHOD <init> (Lnet/minecraft/unmapped/C_czxxrbcp;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V
ARG 1 requiredFeatures
METHOD m_dmtatuce frogDamageSource (Lnet/minecraft/unmapped/C_pzdchrcy;)Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn;
METHOD m_ltaoqnev generate ()V
METHOD m_nxkzkqkr putLootTable (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu;)V
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/entity/Entity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
ARG 1 pos
ARG 2 yaw
ARG 3 pitch
METHOD m_cgrdsanb createCommandSource (Lnet/minecraft/unmapped/C_bdwnwhiu;)Lnet/minecraft/unmapped/C_pennblrk;
METHOD m_chpxygjr shouldSpawnSprintingParticles ()Z
METHOD m_cizdqdzz addVelocity (DDD)V
ARG 1 deltaX
Expand Down
3 changes: 3 additions & 0 deletions mappings/net/minecraft/item/ItemStack.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,9 @@ CLASS net/minecraft/unmapped/C_sddaxwyk net/minecraft/item/ItemStack
METHOD m_umudukuf onCraft (Lnet/minecraft/unmapped/C_cdctfzbn;)V
METHOD m_utrmkjnp setCooldown (I)V
ARG 1 cooldown
METHOD m_uzwjgkgy minimizeCount (I)V
COMMENT If the count of items in this item stack is greater than the passed {@code count},
COMMENT sets it to the passed {@code count}.
METHOD m_vchnqfkp applyComponents (Lnet/minecraft/unmapped/C_kouhnfig;)V
METHOD m_vncsdaoo hasGlint ()Z
METHOD m_vprylruv isEmpty ()Z
Expand Down
13 changes: 13 additions & 0 deletions mappings/net/minecraft/loot/ContainerComponentModifier.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
CLASS net/minecraft/unmapped/C_vgxbedbz net/minecraft/loot/ContainerComponentModifier
METHOD m_iecwewrz modifyContents (Lnet/minecraft/unmapped/C_sddaxwyk;Ljava/util/function/UnaryOperator;)V
ARG 2 stackModifier
METHOD m_iqcayxuo getDefault ()Ljava/lang/Object;
METHOD m_mybsxhne modify (Ljava/lang/Object;Ljava/util/stream/Stream;)Ljava/lang/Object;
ARG 1 component
ARG 2 stacks
METHOD m_rewgrlov getType ()Lnet/minecraft/unmapped/C_pscqxfcs;
METHOD m_tpdkdrct modifyWithDefault (Lnet/minecraft/unmapped/C_sddaxwyk;Ljava/util/stream/Stream;)V
METHOD m_wdlgbvpc streamStacks (Ljava/lang/Object;)Ljava/util/stream/Stream;
ARG 1 component
METHOD m_zleqyxzp modify (Lnet/minecraft/unmapped/C_sddaxwyk;Ljava/lang/Object;Ljava/util/stream/Stream;)V
ARG 2 value
9 changes: 9 additions & 0 deletions mappings/net/minecraft/loot/ContainerComponentModifiers.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
CLASS net/minecraft/unmapped/C_ngersqqy net/minecraft/loot/ContainerComponentModifiers
FIELD f_csinryxp CONTAINER Lnet/minecraft/unmapped/C_vgxbedbz;
FIELD f_idsovweb CHANGED_PROJECTILES Lnet/minecraft/unmapped/C_vgxbedbz;
FIELD f_lgdevqfy BY_TYPE Ljava/util/Map;
FIELD f_pslfltxk BUNDLE_CONTENTS Lnet/minecraft/unmapped/C_vgxbedbz;
METHOD m_dzwmzxia (Lnet/minecraft/unmapped/C_pscqxfcs;)Lcom/mojang/serialization/DataResult;
ARG 0 type
METHOD m_sguyqmwp (Lnet/minecraft/unmapped/C_vgxbedbz;)Lnet/minecraft/unmapped/C_vgxbedbz;
ARG 0 modifier
3 changes: 2 additions & 1 deletion mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ CLASS net/minecraft/unmapped/C_krisseon net/minecraft/loot/function/ConditionalL
METHOD m_axzztavb process (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_iakykpgh;)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 1 stack
ARG 2 context
METHOD m_hfvcjbcy addConditionalFunctionFields (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/Products$P1;
METHOD m_vkwiaxpm (Lnet/minecraft/unmapped/C_krisseon;)Ljava/util/List;
ARG 0 function
METHOD m_wklwxxae builder (Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj;
ARG 0 joiner
CLASS C_nhpzaayj Builder
FIELD f_oeqfqpfz conditionList Lcom/google/common/collect/ImmutableList$Builder;
METHOD m_euckszcs getThisBuilder ()Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj;
METHOD m_euckszcs getThisImpl ()Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj;
METHOD m_smtozhrq getConditions ()Ljava/util/List;
CLASS C_sjodwzdq Joiner
FIELD f_whldtbne joiner Ljava/util/function/Function;
Expand Down
24 changes: 24 additions & 0 deletions mappings/net/minecraft/loot/function/CopyComponentsLootFunction.mapping
View file
Original file line number Diff line number Diff line change
@@ -1 +1,25 @@
CLASS net/minecraft/unmapped/C_mbgfajkg net/minecraft/loot/function/CopyComponentsLootFunction
FIELD f_hayoqqro componentFilter Ljava/util/function/Predicate;
METHOD <init> (Ljava/util/List;Lnet/minecraft/unmapped/C_mbgfajkg$C_zcqyfuyv;Ljava/util/Optional;Ljava/util/Optional;)V
ARG 3 include
ARG 4 exclude
METHOD m_hqkxgaeb (Ljava/util/List;Lnet/minecraft/unmapped/C_pscqxfcs;)Z
ARG 1 type
METHOD m_jvkpzbeu (Ljava/util/List;Ljava/util/List;)V
ARG 1 types
METHOD m_senjahqu (Ljava/util/List;Ljava/util/List;)V
ARG 1 types
METHOD m_tzmfkrqo builder (Lnet/minecraft/unmapped/C_mbgfajkg$C_zcqyfuyv;)Lnet/minecraft/unmapped/C_mbgfajkg$C_ecinsisb;
CLASS C_ecinsisb Builder
FIELD f_ccokzamr include Ljava/util/Optional;
FIELD f_hmfjolvo source Lnet/minecraft/unmapped/C_mbgfajkg$C_zcqyfuyv;
FIELD f_lfwthzie exclude Ljava/util/Optional;
METHOD <init> (Lnet/minecraft/unmapped/C_mbgfajkg$C_zcqyfuyv;)V
METHOD m_gbinruor include (Lnet/minecraft/unmapped/C_pscqxfcs;)Lnet/minecraft/unmapped/C_mbgfajkg$C_ecinsisb;
ARG 1 type
METHOD m_ygxketyh exclude (Lnet/minecraft/unmapped/C_pscqxfcs;)Lnet/minecraft/unmapped/C_mbgfajkg$C_ecinsisb;
ARG 1 type
CLASS C_zcqyfuyv Source
FIELD f_dbdmvfhd name Ljava/lang/String;
METHOD m_uyzecabt getRequiredParameters ()Ljava/util/Set;
METHOD m_yfxnxoar getComponents (Lnet/minecraft/unmapped/C_iakykpgh;)Lnet/minecraft/unmapped/C_kouhnfig;
39 changes: 34 additions & 5 deletions mappings/net/minecraft/loot/function/CopyCustomDataLootFunction.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,35 @@
CLASS net/minecraft/unmapped/C_hgtsxeep net/minecraft/loot/function/CopyCustomDataLootFunction
CLASS C_ibykxpue
METHOD m_cdevwyiv (Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/unmapped/C_hgtsxeep$C_ovhlwnni;)Lnet/minecraft/unmapped/C_hgtsxeep$C_ibykxpue;
ARG 1 path
METHOD m_szqnvzac (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/unmapped/C_hgtsxeep$C_ibykxpue;
ARG 1 path
METHOD <init> (Ljava/util/List;Lnet/minecraft/unmapped/C_oipfkqpe;Ljava/util/List;)V
ARG 3 operations
METHOD m_efwytlqp builder (Lnet/minecraft/unmapped/C_iakykpgh$C_qtufoufh;)Lnet/minecraft/unmapped/C_hgtsxeep$C_ibykxpue;
METHOD m_ogmhnixb (Ljava/util/function/Supplier;Lnet/minecraft/unmapped/C_oivssbvb;Lnet/minecraft/unmapped/C_hgtsxeep$C_geisqtwp;)V
ARG 2 op
METHOD m_vxektqqj builder (Lnet/minecraft/unmapped/C_oipfkqpe;)Lnet/minecraft/unmapped/C_hgtsxeep$C_ibykxpue;
ARG 0 provider
CLASS C_geisqtwp Operation
METHOD m_irfmxpvr operate (Ljava/util/function/Supplier;Lnet/minecraft/unmapped/C_oivssbvb;)V
ARG 1 stackNbt
CLASS C_ibykxpue Builder
FIELD f_daykwogq source Lnet/minecraft/unmapped/C_oipfkqpe;
FIELD f_ukxvbsno operations Ljava/util/List;
METHOD m_cdevwyiv operation (Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/unmapped/C_hgtsxeep$C_ovhlwnni;)Lnet/minecraft/unmapped/C_hgtsxeep$C_ibykxpue;
ARG 1 sourcePath
ARG 2 targetPath
ARG 3 operator
METHOD m_szqnvzac replaceOperation (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/unmapped/C_hgtsxeep$C_ibykxpue;
CLASS C_ovhlwnni Operator
FIELD f_hnmhsagm name Ljava/lang/String;
METHOD m_ezqsbzcj operate (Lnet/minecraft/unmapped/C_oivssbvb;Lnet/minecraft/unmapped/C_xondkbcs$C_rgpfrkey;Ljava/util/List;)V
ARG 1 stackNbt
ARG 2 targetPath
ARG 3 sourceElements
CLASS C_kywcprky
METHOD m_apzqxpjv (Ljava/util/List;Lnet/minecraft/unmapped/C_oivssbvb;)V
ARG 1 targetElement
METHOD m_icdbrhhs (Lnet/minecraft/unmapped/C_oivssbvb;Lnet/minecraft/unmapped/C_oivssbvb;)V
ARG 1 sourceElement
CLASS C_nqvmymxp
METHOD m_hgmcquwb (Ljava/util/List;Lnet/minecraft/unmapped/C_oivssbvb;)V
ARG 1 targetElement
METHOD m_kamggycv (Lnet/minecraft/unmapped/C_oivssbvb;Lnet/minecraft/unmapped/C_oivssbvb;)V
ARG 1 sourceElement
4 changes: 4 additions & 0 deletions mappings/net/minecraft/loot/function/CopyStateFunction.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
CLASS net/minecraft/unmapped/C_wvgabkvo net/minecraft/loot/function/CopyStateFunction
FIELD f_pyckvicf block Lnet/minecraft/unmapped/C_cjzoxshv;
FIELD f_webqigsf properties Ljava/util/Set;
METHOD <init> (Ljava/util/List;Lnet/minecraft/unmapped/C_cjzoxshv;Ljava/util/List;)V
ARG 3 properties
METHOD m_nwoyzure getBuilder (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_wvgabkvo$C_hmjhprvz;
ARG 0 block
METHOD m_pezblsdg (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_snokizpi;)Lnet/minecraft/unmapped/C_snokizpi;
ARG 2 stateComponent
CLASS C_hmjhprvz Builder
FIELD f_ranxfdgt properties Lcom/google/common/collect/ImmutableSet$Builder;
FIELD f_togdpkuz block Lnet/minecraft/unmapped/C_cjzoxshv;
Expand Down
15 changes: 14 additions & 1 deletion mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
CLASS net/minecraft/unmapped/C_mcyropux net/minecraft/loot/function/EnchantRandomlyLootFunction
FIELD f_bwriysqi CODEC Lcom/mojang/serialization/MapCodec;
FIELD f_hmtatkky LOGGER Lorg/slf4j/Logger;
METHOD m_oylffrhc create ()Lnet/minecraft/unmapped/C_mcyropux$C_xyziffnb;
METHOD m_hgxjeanh randomLootBuilder (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_mcyropux$C_xyziffnb;
ARG 0 registries
METHOD m_nghyitqa (ZLnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_cjzoxshv;)Z
ARG 2 option
METHOD m_oylffrhc builder ()Lnet/minecraft/unmapped/C_mcyropux$C_xyziffnb;
METHOD m_susyvyur process (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_rlomrsco;)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 1 acceptableOptions
CLASS C_xyziffnb Builder
FIELD f_dtzuffzo options Ljava/util/Optional;
FIELD f_haggbxfm onlyCompatible Z
METHOD m_blmnznah option (Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_mcyropux$C_xyziffnb;
ARG 1 enchantment
METHOD m_gtcilqjz allowIncompatible ()Lnet/minecraft/unmapped/C_mcyropux$C_xyziffnb;
METHOD m_kshsocad options (Lnet/minecraft/unmapped/C_odfnijdo;)Lnet/minecraft/unmapped/C_mcyropux$C_xyziffnb;
ARG 1 enchantments
5 changes: 5 additions & 0 deletions mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
CLASS net/minecraft/unmapped/C_hujvlqyo net/minecraft/loot/function/EnchantWithLevelsLootFunction
FIELD f_uznihzkv range Lnet/minecraft/unmapped/C_iajmfyig;
METHOD m_baumhjth randomLootBuilder (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lnet/minecraft/unmapped/C_iajmfyig;)Lnet/minecraft/unmapped/C_hujvlqyo$C_ukmrinhh;
ARG 0 registries
CLASS C_ukmrinhh Builder
FIELD f_lbjnpjmb range Lnet/minecraft/unmapped/C_iajmfyig;
FIELD f_tagdjzmw options Ljava/util/Optional;
METHOD <init> (Lnet/minecraft/unmapped/C_iajmfyig;)V
ARG 1 range
METHOD m_zuigncps options (Lnet/minecraft/unmapped/C_odfnijdo;)Lnet/minecraft/unmapped/C_hujvlqyo$C_ukmrinhh;
ARG 1 enchantments
10 changes: 10 additions & 0 deletions mappings/net/minecraft/loot/function/EnchantedCountIncreaseLootFunction.mapping
View file
Original file line number Diff line number Diff line change
@@ -1 +1,11 @@
CLASS net/minecraft/unmapped/C_edcogzgr net/minecraft/loot/function/EnchantedCountIncreaseLootFunction
FIELD f_fyibbkne NO_LIMIT I
METHOD m_kgczpckh lootingBuilder (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lnet/minecraft/unmapped/C_iajmfyig;)Lnet/minecraft/unmapped/C_edcogzgr$C_ytmviwuh;
ARG 0 registries
METHOD m_xfeshmzb isLimited ()Z
CLASS C_ytmviwuh Builder
FIELD f_gjjvxujv enchantment Lnet/minecraft/unmapped/C_cjzoxshv;
FIELD f_thzkmtqg limit I
FIELD f_ueiymejd count Lnet/minecraft/unmapped/C_iajmfyig;
METHOD m_tzuglfzu limit (I)Lnet/minecraft/unmapped/C_edcogzgr$C_ytmviwuh;
ARG 1 limit
9 changes: 5 additions & 4 deletions mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@ CLASS net/minecraft/unmapped/C_agamcpit net/minecraft/loot/function/ExplorationM
FIELD f_inollgjt searchRadius I
FIELD f_likgexbt zoom B
FIELD f_tsxpqvag destination Lnet/minecraft/unmapped/C_ednuhnnn;
METHOD m_eiotguys withDecoration (Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_agamcpit$C_iwhmdhnz;
METHOD m_eiotguys decoration (Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_agamcpit$C_iwhmdhnz;
ARG 1 decoration
METHOD m_eyidafyb searchRadius (I)Lnet/minecraft/unmapped/C_agamcpit$C_iwhmdhnz;
ARG 1 searchRadius
METHOD m_klbohnhs withDestination (Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_agamcpit$C_iwhmdhnz;
METHOD m_klbohnhs destination (Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_agamcpit$C_iwhmdhnz;
ARG 1 destination
METHOD m_kqbazcfx withZoom (B)Lnet/minecraft/unmapped/C_agamcpit$C_iwhmdhnz;
METHOD m_kqbazcfx zoom (B)Lnet/minecraft/unmapped/C_agamcpit$C_iwhmdhnz;
ARG 1 zoom
METHOD m_zdjsolou withSkipExistingChunks (Z)Lnet/minecraft/unmapped/C_agamcpit$C_iwhmdhnz;
METHOD m_zdjsolou skipExistingChunks (Z)Lnet/minecraft/unmapped/C_agamcpit$C_iwhmdhnz;
ARG 1 skipExistingChunks
19 changes: 14 additions & 5 deletions mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,20 @@ CLASS net/minecraft/unmapped/C_brhhfbvx net/minecraft/loot/function/SetAttribute
METHOD m_iiczclll create (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;Lnet/minecraft/unmapped/C_iajmfyig;)Lnet/minecraft/unmapped/C_brhhfbvx$C_xadeusls;
ARG 2 operation
ARG 3 amountRange
METHOD m_rmclxjlv process (Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_azfkqhlm;)Lnet/minecraft/unmapped/C_azfkqhlm;
ARG 2 component
METHOD m_snmkxjbk (Lnet/minecraft/unmapped/C_brhhfbvx$C_mhxntjah;)Ljava/util/stream/Stream;
ARG 0 attribute
METHOD m_xzcgajgv (Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_azfkqhlm;)Lnet/minecraft/unmapped/C_azfkqhlm;
ARG 2 component
METHOD m_ynrasumo create ()Lnet/minecraft/unmapped/C_brhhfbvx$C_zekudcle;
CLASS C_mhxntjah Attribute
FIELD f_jhxyegab slots Ljava/util/List;
FIELD f_oicvpvzj amount Lnet/minecraft/unmapped/C_iajmfyig;
FIELD f_omfilcco attribute Lnet/minecraft/unmapped/C_cjzoxshv;
FIELD f_vluieboi operation Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;
FIELD f_xvaghlfs id Lnet/minecraft/unmapped/C_ncpywfca;
FIELD f_qojdchop SLOTS_CODEC Lcom/mojang/serialization/Codec;
FIELD f_tfwdvuqm CODEC Lcom/mojang/serialization/Codec;
METHOD m_qaudcqfq (Ljava/util/List;)Lcom/mojang/datafixers/util/Either;
ARG 0 slots
METHOD m_zayvqrkk (Lcom/mojang/datafixers/util/Either;)Ljava/util/List;
ARG 0 slotOrSlots
CLASS C_xadeusls AttributeBuilder
FIELD f_circzibp operation Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;
FIELD f_dbvpqaqe amount Lnet/minecraft/unmapped/C_iajmfyig;
Expand All @@ -18,7 +25,9 @@ CLASS net/minecraft/unmapped/C_brhhfbvx net/minecraft/loot/function/SetAttribute
FIELD f_zapntexo slots Ljava/util/Set;
METHOD m_fewrdwnz build ()Lnet/minecraft/unmapped/C_brhhfbvx$C_mhxntjah;
METHOD m_gxbzidyh slot (Lnet/minecraft/unmapped/C_qfoqahef;)Lnet/minecraft/unmapped/C_brhhfbvx$C_xadeusls;
ARG 1 slot
CLASS C_zekudcle Builder
FIELD f_bfzkxytx replace Z
FIELD f_ecgxhpqu attributes Ljava/util/List;
METHOD m_thtlqucq attribute (Lnet/minecraft/unmapped/C_brhhfbvx$C_xadeusls;)Lnet/minecraft/unmapped/C_brhhfbvx$C_zekudcle;
ARG 1 attribute
4 changes: 4 additions & 0 deletions mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@ CLASS net/minecraft/unmapped/C_azqpglil net/minecraft/loot/function/SetBannerPat
FIELD f_updalbpy patterns Lnet/minecraft/unmapped/C_wwbphpbp;
METHOD m_lkzkigrd builder (Z)Lnet/minecraft/unmapped/C_azqpglil$C_tfnaakyb;
ARG 0 append
METHOD m_mqbzqcol (Lnet/minecraft/unmapped/C_wwbphpbp;Lnet/minecraft/unmapped/C_wwbphpbp;)Lnet/minecraft/unmapped/C_wwbphpbp;
ARG 0 oldValue
ARG 1 newValue
CLASS C_tfnaakyb Builder
FIELD f_jxdddfui patterns Lnet/minecraft/unmapped/C_wwbphpbp$C_qnptwkxy;
FIELD f_zslcyivh append Z
METHOD <init> (Z)V
ARG 1 append
METHOD m_lqetmkcm pattern (Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_arllgqae;)Lnet/minecraft/unmapped/C_azqpglil$C_tfnaakyb;
2 changes: 2 additions & 0 deletions mappings/net/minecraft/loot/function/SetBookCoverLootFunction.mapping
View file
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
CLASS net/minecraft/unmapped/C_gsgjanri net/minecraft/loot/function/SetBookCoverLootFunction
METHOD m_ydimxenh apply (Lnet/minecraft/unmapped/C_xfpcozbo;)Lnet/minecraft/unmapped/C_xfpcozbo;
ARG 1 component
5 changes: 5 additions & 0 deletions mappings/net/minecraft/loot/function/SetComponentsLootFunction.mapping
View file
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
CLASS net/minecraft/unmapped/C_dpxzhowh net/minecraft/loot/function/SetComponentsLootFunction
METHOD m_ehhrxiiv builder (Lnet/minecraft/unmapped/C_pscqxfcs;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj;
ARG 0 type
ARG 1 value
METHOD m_tqlcyjve (Lnet/minecraft/unmapped/C_pscqxfcs;Ljava/lang/Object;Ljava/util/List;)Lnet/minecraft/unmapped/C_tmxhskql;
ARG 2 conditions
8 changes: 7 additions & 1 deletion mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
CLASS net/minecraft/unmapped/C_zwjmmlxa net/minecraft/loot/function/SetContentsLootFunction
FIELD f_nbcugmpv entries Ljava/util/List;
METHOD <init> (Ljava/util/List;Lnet/minecraft/unmapped/C_vgxbedbz;Ljava/util/List;)V
ARG 3 entries
METHOD m_eupdzfta builder (Lnet/minecraft/unmapped/C_vgxbedbz;)Lnet/minecraft/unmapped/C_zwjmmlxa$C_fgnbywgn;
METHOD m_zsjvvunl (Lnet/minecraft/unmapped/C_iakykpgh;Ljava/util/stream/Stream$Builder;Lnet/minecraft/unmapped/C_rhqekity;)V
ARG 2 entry
METHOD m_zssbbikg (Lnet/minecraft/unmapped/C_iakykpgh;Ljava/util/stream/Stream$Builder;Lnet/minecraft/unmapped/C_iozoltsq;)V
ARG 2 choice
CLASS C_fgnbywgn Builder
FIELD f_jgphturz modifier Lnet/minecraft/unmapped/C_vgxbedbz;
FIELD f_nzftxexh entries Lcom/google/common/collect/ImmutableList$Builder;
METHOD m_gqwizxli withEntry (Lnet/minecraft/unmapped/C_rhqekity$C_ygespcrj;)Lnet/minecraft/unmapped/C_zwjmmlxa$C_fgnbywgn;
ARG 1 entryBuilder
7 changes: 7 additions & 0 deletions mappings/net/minecraft/loot/function/SetCustomDataLootFunction.mapping
View file
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
CLASS net/minecraft/unmapped/C_sxzxxsuj net/minecraft/loot/function/SetCustomDataLootFunction
FIELD f_avtjnnla data Lnet/minecraft/unmapped/C_hhlwcnih;
METHOD m_cejdxzvd (Lnet/minecraft/unmapped/C_hhlwcnih;)V
ARG 1 compound
METHOD m_lhcgfccz (Lnet/minecraft/unmapped/C_hhlwcnih;Ljava/util/List;)Lnet/minecraft/unmapped/C_tmxhskql;
ARG 1 conditions
METHOD m_rxgkcwzi builder (Lnet/minecraft/unmapped/C_hhlwcnih;)Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj;
ARG 0 data
17 changes: 15 additions & 2 deletions mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
CLASS net/minecraft/unmapped/C_bpyfibfg net/minecraft/loot/function/SetEnchantmentsLootFunction
FIELD f_lrrfbeoq enchantments Ljava/util/Map;
FIELD f_unibonct add Z
METHOD <init> (Ljava/util/List;Ljava/util/Map;Z)V
ARG 2 enchantments
METHOD m_bzpmkgqc (Lnet/minecraft/unmapped/C_qlclfxvn$C_vbojeisc;Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_iajmfyig;)V
ARG 2 enchantment
ARG 3 level
METHOD m_pwgtvcbe (Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_qlclfxvn$C_vbojeisc;)V
ARG 2 builder
METHOD m_pxhxknlv (Lnet/minecraft/unmapped/C_iajmfyig;)Ljava/util/stream/Stream;
ARG 0 context
METHOD m_rnzfrcjb (Lnet/minecraft/unmapped/C_qlclfxvn$C_vbojeisc;Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_iajmfyig;)V
ARG 2 enchantment
ARG 3 level
CLASS C_wzimofnb Builder
FIELD f_tftgatba add Z
FIELD f_wllspuwj enchantments Lcom/google/common/collect/ImmutableMap$Builder;
METHOD <init> (Z)V
ARG 1 add
METHOD m_emjssomh enchantment (Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_iajmfyig;)Lnet/minecraft/unmapped/C_bpyfibfg$C_wzimofnb;
ARG 1 enchantment
ARG 2 level
3 changes: 3 additions & 0 deletions mappings/net/minecraft/loot/function/SetFireworkExplosionLootFunction.mapping
View file
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
CLASS net/minecraft/unmapped/C_wvihlkry net/minecraft/loot/function/SetFireworkExplosionLootFunction
FIELD f_mxxbodyk DEFAULT_COMPONENT Lnet/minecraft/unmapped/C_ibwugxba;
METHOD m_vguejlpr process (Lnet/minecraft/unmapped/C_ibwugxba;)Lnet/minecraft/unmapped/C_ibwugxba;
ARG 1 component
Loading

3 comments on commit ed1eae1

@github-actions
Copy link

Choose a reason for hiding this comment

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

With commit ed1eae1, 197 file(s) were updated with 1871 line(s) added and 1675 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
diff -bur namedTargetSrc/net/minecraft/advancement/Advancement.java namedSrc/net/minecraft/advancement/Advancement.java
--- namedTargetSrc/net/minecraft/advancement/Advancement.java	2024-10-11 06:31:03.193210419 +0000
+++ namedSrc/net/minecraft/advancement/Advancement.java	2024-10-11 06:29:55.067816300 +0000
@@ -18,7 +18,7 @@
 import net.minecraft.text.HoverEvent;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.util.ErrorReporter;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
@@ -98,9 +98,9 @@
    private static Text createText(AdvancementDisplay display) {
       Text lv = display.getTitle();
       Formatting lv2 = display.getType().getFormatting();
-      Text lv3 = Texts.setStyleIfAbsent(lv.copy(), Style.EMPTY.withColor(lv2)).append("\n").append(display.getDescription());
+      Text lv3 = TextUtil.setStyleIfAbsent(lv.copy(), Style.EMPTY.withColor(lv2)).append("\n").append(display.getDescription());
       Text lv4 = lv.copy().styled(style -> style.withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, lv3)));
-      return Texts.bracketed(lv4).formatted(lv2);
+      return TextUtil.bracketed(lv4).formatted(lv2);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/advancement/AdvancementRewards.java namedSrc/net/minecraft/advancement/AdvancementRewards.java
--- namedTargetSrc/net/minecraft/advancement/AdvancementRewards.java	2024-10-11 06:31:03.324213101 +0000
+++ namedSrc/net/minecraft/advancement/AdvancementRewards.java	2024-10-11 06:29:55.258820224 +0000
@@ -52,8 +52,8 @@
    public void apply(ServerPlayerEntity player) {
       player.addExperience(this.experience);
       LootContextParameterSet lv = new LootContextParameterSet.Builder(player.getServerWorld())
-         .add(LootContextParameters.f_rcnckitm, player)
-         .add(LootContextParameters.f_mvxqkdcc, player.getPos())
+         .add(LootContextParameters.THIS_ENTITY, player)
+         .add(LootContextParameters.ORIGIN, player.getPos())
          .build(LootContextTypes.ADVANCEMENT_REWARD);
       boolean bl = false;
 
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/AnyBlockUseCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/AnyBlockUseCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/AnyBlockUseCriterionTrigger.java	2024-10-11 06:31:03.170209949 +0000
+++ namedSrc/net/minecraft/advancement/criterion/AnyBlockUseCriterionTrigger.java	2024-10-11 06:29:55.034815622 +0000
@@ -36,10 +36,10 @@
       ServerWorld lv = player.getServerWorld();
       BlockState lv2 = lv.getBlockState(pos);
       LootContextParameterSet lv3 = new LootContextParameterSet.Builder(lv)
-         .add(LootContextParameters.f_mvxqkdcc, pos.ofCenter())
-         .add(LootContextParameters.f_rcnckitm, player)
-         .add(LootContextParameters.f_avxjsfab, lv2)
-         .add(LootContextParameters.f_nxapolcz, stack)
+         .add(LootContextParameters.ORIGIN, pos.ofCenter())
+         .add(LootContextParameters.THIS_ENTITY, player)
+         .add(LootContextParameters.BLOCK_STATE, lv2)
+         .add(LootContextParameters.TOOL, stack)
          .build(LootContextTypes.ADVANCEMENT_LOCATION);
       LootContext lv4 = new LootContext.Builder(lv3).build(Optional.empty());
       this.trigger(player, arg2 -> arg2.test(lv4));
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/CriterionValidator.java namedSrc/net/minecraft/advancement/criterion/CriterionValidator.java
--- namedTargetSrc/net/minecraft/advancement/criterion/CriterionValidator.java	2024-10-11 06:31:03.314212897 +0000
+++ namedSrc/net/minecraft/advancement/criterion/CriterionValidator.java	2024-10-11 06:29:55.245819957 +0000
@@ -62,8 +62,8 @@
     * @mapping {@literal hashed m_aeyodzvy Lnet/minecraft/unmapped/C_zybjffid;m_aeyodzvy(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ykthnceq;Ljava/lang/String;)V}
     * @mapping {@literal named m_aeyodzvy Lnet/minecraft/advancement/criterion/CriterionValidator;m_aeyodzvy(Lnet/minecraft/predicate/ContextAwarePredicate;Lnet/minecraft/util/context/ContextKeySet;Ljava/lang/String;)V}
     */
-   public void m_aeyodzvy(ContextAwarePredicate arg, ContextKeySet arg2, String name) {
-      arg.validateConditions(new LootTableReporter(this.errorReporter.forChild(name), arg2, this.dataLookup));
+   public void m_aeyodzvy(ContextAwarePredicate arg, ContextKeySet type, String name) {
+      arg.validateConditions(new LootTableReporter(this.errorReporter.forChild(name), type, this.dataLookup));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/DefaultBlockUseCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/DefaultBlockUseCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/DefaultBlockUseCriterionTrigger.java	2024-10-11 06:31:03.224211054 +0000
+++ namedSrc/net/minecraft/advancement/criterion/DefaultBlockUseCriterionTrigger.java	2024-10-11 06:29:55.121817410 +0000
@@ -35,9 +35,9 @@
       ServerWorld lv = player.getServerWorld();
       BlockState lv2 = lv.getBlockState(pos);
       LootContextParameterSet lv3 = new LootContextParameterSet.Builder(lv)
-         .add(LootContextParameters.f_mvxqkdcc, pos.ofCenter())
-         .add(LootContextParameters.f_rcnckitm, player)
-         .add(LootContextParameters.f_avxjsfab, lv2)
+         .add(LootContextParameters.ORIGIN, pos.ofCenter())
+         .add(LootContextParameters.THIS_ENTITY, player)
+         .add(LootContextParameters.BLOCK_STATE, lv2)
          .build(LootContextTypes.BLOCK_USE);
       LootContext lv4 = new LootContext.Builder(lv3).build(Optional.empty());
       this.trigger(player, arg2 -> arg2.test(lv4));
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/EnterBlockCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/EnterBlockCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/EnterBlockCriterionTrigger.java	2024-10-11 06:31:03.234211259 +0000
+++ namedSrc/net/minecraft/advancement/criterion/EnterBlockCriterionTrigger.java	2024-10-11 06:29:55.136817718 +0000
@@ -63,7 +63,7 @@
          return (DataResult<EnterBlockCriterionTrigger.Conditions>)conditions.block
             .flatMap(
                arg2 -> conditions.state
-                     .flatMap(arg2x -> arg2x.m_flzybrzb(((Block)arg2.getValue()).getStateManager()))
+                     .flatMap(arg2x -> arg2x.reportFirstMissing(((Block)arg2.getValue()).getStateManager()))
                      .map(string -> DataResult.error(() -> "Block" + arg2 + " has no property " + string))
             )
             .orElseGet(() -> DataResult.success(conditions));
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/FishingRodHookedCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/FishingRodHookedCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/FishingRodHookedCriterionTrigger.java	2024-10-11 06:31:03.396214575 +0000
+++ namedSrc/net/minecraft/advancement/criterion/FishingRodHookedCriterionTrigger.java	2024-10-11 06:29:55.377822669 +0000
@@ -84,7 +84,7 @@
          } else {
             if (this.caughtItem.isPresent()) {
                boolean bl = false;
-               Entity lv = hookedEntityContext.m_cgaxgrxg(LootContextParameters.f_rcnckitm);
+               Entity lv = hookedEntityContext.get(LootContextParameters.THIS_ENTITY);
                if (lv instanceof ItemEntity lv2 && ((ItemPredicate)this.caughtItem.get()).test(lv2.getStack())) {
                   bl = true;
                }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterionTrigger.java	2024-10-11 06:31:03.194210440 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterionTrigger.java	2024-10-11 06:29:55.068816321 +0000
@@ -45,10 +45,10 @@
       ServerWorld lv = player.getServerWorld();
       BlockState lv2 = lv.getBlockState(pos);
       LootContextParameterSet lv3 = new LootContextParameterSet.Builder(lv)
-         .add(LootContextParameters.f_mvxqkdcc, pos.ofCenter())
-         .add(LootContextParameters.f_rcnckitm, player)
-         .add(LootContextParameters.f_avxjsfab, lv2)
-         .add(LootContextParameters.f_nxapolcz, stack)
+         .add(LootContextParameters.ORIGIN, pos.ofCenter())
+         .add(LootContextParameters.THIS_ENTITY, player)
+         .add(LootContextParameters.BLOCK_STATE, lv2)
+         .add(LootContextParameters.TOOL, stack)
          .build(LootContextTypes.ADVANCEMENT_LOCATION);
       LootContext lv4 = new LootContext.Builder(lv3).build(Optional.empty());
       this.trigger(player, conditions -> conditions.matches(lv4));
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger.java	2024-10-11 06:31:03.351213654 +0000
+++ namedSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger.java	2024-10-11 06:29:55.290820882 +0000
@@ -63,7 +63,7 @@
          return (DataResult<SlideDownBlockCriterionTrigger.Conditions>)conditions.block
             .flatMap(
                arg2 -> conditions.state
-                     .flatMap(arg2x -> arg2x.m_flzybrzb(((Block)arg2.getValue()).getStateManager()))
+                     .flatMap(arg2x -> arg2x.reportFirstMissing(((Block)arg2.getValue()).getStateManager()))
                      .map(string -> DataResult.error(() -> "Block" + arg2 + " has no property " + string))
             )
             .orElseGet(() -> DataResult.success(conditions));
diff -bur namedTargetSrc/net/minecraft/block/AbstractBlock.java namedSrc/net/minecraft/block/AbstractBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractBlock.java	2024-10-11 06:31:03.149209519 +0000
+++ namedSrc/net/minecraft/block/AbstractBlock.java	2024-10-11 06:29:55.005815027 +0000
@@ -297,12 +297,12 @@
          if (lv.shouldDropItemsOnExplosion(explosion)) {
             BlockEntity lv2 = state.hasBlockEntity() ? world.getBlockEntity(pos) : null;
             LootContextParameterSet.Builder lv3 = new LootContextParameterSet.Builder(world)
-               .add(LootContextParameters.f_mvxqkdcc, Vec3d.ofCenter(pos))
-               .add(LootContextParameters.f_nxapolcz, ItemStack.EMPTY)
-               .addOptional(LootContextParameters.f_wwaxuttk, lv2)
-               .addOptional(LootContextParameters.f_rcnckitm, explosion.getEntity());
+               .add(LootContextParameters.ORIGIN, Vec3d.ofCenter(pos))
+               .add(LootContextParameters.TOOL, ItemStack.EMPTY)
+               .addOptional(LootContextParameters.BLOCK_ENTITY, lv2)
+               .addOptional(LootContextParameters.THIS_ENTITY, explosion.getEntity());
             if (explosion.getDestructionType() == Explosion.DestructionType.DESTROY_WITH_DECAY) {
-               lv3.add(LootContextParameters.f_pvhqgmwf, explosion.getPower());
+               lv3.add(LootContextParameters.EXPLOSION_RADIUS, explosion.getPower());
             }
 
             state.onStacksDropped(world, pos, ItemStack.EMPTY, bl);
@@ -448,7 +448,7 @@
       if (this.lootTableId.isEmpty()) {
          return Collections.emptyList();
       } else {
-         LootContextParameterSet lv = lootParameterBuilder.add(LootContextParameters.f_avxjsfab, state).build(LootContextTypes.BLOCK);
+         LootContextParameterSet lv = lootParameterBuilder.add(LootContextParameters.BLOCK_STATE, state).build(LootContextTypes.BLOCK);
          ServerWorld lv2 = lv.getWorld();
          LootTable lv3 = lv2.getServer().getReloadableRegistries().getLootTable((RegistryKey<LootTable>)this.lootTableId.get());
          return lv3.generateLoot(lv);
diff -bur namedTargetSrc/net/minecraft/block/BeehiveBlock.java namedSrc/net/minecraft/block/BeehiveBlock.java
--- namedTargetSrc/net/minecraft/block/BeehiveBlock.java	2024-10-11 06:31:03.281212221 +0000
+++ namedSrc/net/minecraft/block/BeehiveBlock.java	2024-10-11 06:29:55.206819156 +0000
@@ -399,13 +399,13 @@
     */
    @Override
    protected List<ItemStack> getDroppedStacks(BlockState state, LootContextParameterSet.Builder lootParameterBuilder) {
-      Entity lv = lootParameterBuilder.getOptionalParameter(LootContextParameters.f_rcnckitm);
+      Entity lv = lootParameterBuilder.getOptionalParameter(LootContextParameters.THIS_ENTITY);
       if (lv instanceof TntEntity
          || lv instanceof CreeperEntity
          || lv instanceof WitherSkullEntity
          || lv instanceof WitherEntity
          || lv instanceof TntMinecartEntity) {
-         BlockEntity lv2 = lootParameterBuilder.getOptionalParameter(LootContextParameters.f_wwaxuttk);
+         BlockEntity lv2 = lootParameterBuilder.getOptionalParameter(LootContextParameters.BLOCK_ENTITY);
          if (lv2 instanceof BeehiveBlockEntity lv3) {
             lv3.angerBees(null, state, BeehiveBlockEntity.BeeState.EMERGENCY);
          }
diff -bur namedTargetSrc/net/minecraft/block/Block.java namedSrc/net/minecraft/block/Block.java
--- namedTargetSrc/net/minecraft/block/Block.java	2024-10-11 06:31:03.404214739 +0000
+++ namedSrc/net/minecraft/block/Block.java	2024-10-11 06:29:55.387822874 +0000
@@ -500,9 +500,9 @@
     */
    public static List<ItemStack> getDroppedStacks(BlockState state, ServerWorld world, BlockPos pos, @Nullable BlockEntity blockEntity) {
       LootContextParameterSet.Builder lv = new LootContextParameterSet.Builder(world)
-         .add(LootContextParameters.f_mvxqkdcc, Vec3d.ofCenter(pos))
-         .add(LootContextParameters.f_nxapolcz, ItemStack.EMPTY)
-         .addOptional(LootContextParameters.f_wwaxuttk, blockEntity);
+         .add(LootContextParameters.ORIGIN, Vec3d.ofCenter(pos))
+         .add(LootContextParameters.TOOL, ItemStack.EMPTY)
+         .addOptional(LootContextParameters.BLOCK_ENTITY, blockEntity);
       return state.getDroppedStacks(lv);
    }
 
@@ -514,10 +514,10 @@
       BlockState state, ServerWorld world, BlockPos pos, @Nullable BlockEntity blockEntity, @Nullable Entity entity, ItemStack stack
    ) {
       LootContextParameterSet.Builder lv = new LootContextParameterSet.Builder(world)
-         .add(LootContextParameters.f_mvxqkdcc, Vec3d.ofCenter(pos))
-         .add(LootContextParameters.f_nxapolcz, stack)
-         .addOptional(LootContextParameters.f_rcnckitm, entity)
-         .addOptional(LootContextParameters.f_wwaxuttk, blockEntity);
+         .add(LootContextParameters.ORIGIN, Vec3d.ofCenter(pos))
+         .add(LootContextParameters.TOOL, stack)
+         .addOptional(LootContextParameters.THIS_ENTITY, entity)
+         .addOptional(LootContextParameters.BLOCK_ENTITY, blockEntity);
       return state.getDroppedStacks(lv);
    }
 
diff -bur namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java namedSrc/net/minecraft/block/DecoratedPotBlock.java
--- namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java	2024-10-11 06:31:03.133209191 +0000
+++ namedSrc/net/minecraft/block/DecoratedPotBlock.java	2024-10-11 06:29:54.987814657 +0000
@@ -247,7 +247,7 @@
     */
    @Override
    protected List<ItemStack> getDroppedStacks(BlockState state, LootContextParameterSet.Builder lootParameterBuilder) {
-      BlockEntity lv = lootParameterBuilder.getOptionalParameter(LootContextParameters.f_wwaxuttk);
+      BlockEntity lv = lootParameterBuilder.getOptionalParameter(LootContextParameters.BLOCK_ENTITY);
       if (lv instanceof DecoratedPotBlockEntity lv2) {
          lootParameterBuilder.withDynamicDrop(SHERDS, consumer -> {
             for (Item lvx : lv2.getSherds().ordered()) {
diff -bur namedTargetSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java namedSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java	2024-10-11 06:31:03.168209907 +0000
+++ namedSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java	2024-10-11 06:29:55.031815561 +0000
@@ -468,7 +468,7 @@
       ItemStack lv = this.inventory.get(slot);
       boolean bl = !stack.isEmpty() && ItemStack.itemsAndComponentsMatch(lv, stack);
       this.inventory.set(slot, stack);
-      stack.m_uzwjgkgy(this.getMaxCount(stack));
+      stack.minimizeCount(this.getMaxCount(stack));
       if (slot == 0 && !bl && this.world instanceof ServerWorld lv2) {
          this.cookTimeTotal = getCookTime(lv2, this);
          this.cookTime = 0;
diff -bur namedTargetSrc/net/minecraft/block/entity/BrushableBlockEntity.java namedSrc/net/minecraft/block/entity/BrushableBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BrushableBlockEntity.java	2024-10-11 06:31:03.288212364 +0000
+++ namedSrc/net/minecraft/block/entity/BrushableBlockEntity.java	2024-10-11 06:29:55.218819403 +0000
@@ -169,10 +169,10 @@
          }
 
          LootContextParameterSet lv3 = new LootContextParameterSet.Builder(world)
-            .add(LootContextParameters.f_mvxqkdcc, Vec3d.ofCenter(this.pos))
+            .add(LootContextParameters.ORIGIN, Vec3d.ofCenter(this.pos))
             .withLuck(player.getLuck())
-            .add(LootContextParameters.f_rcnckitm, player)
-            .add(LootContextParameters.f_nxapolcz, stack)
+            .add(LootContextParameters.THIS_ENTITY, player)
+            .add(LootContextParameters.TOOL, stack)
             .build(LootContextTypes.ARCHAEOLOGY);
          ObjectArrayList<ItemStack> objectArrayList = lv.generateLoot(lv3, this.lootTableSeed);
 
diff -bur namedTargetSrc/net/minecraft/block/entity/HopperBlockEntity.java namedSrc/net/minecraft/block/entity/HopperBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/HopperBlockEntity.java	2024-10-11 06:31:03.132209170 +0000
+++ namedSrc/net/minecraft/block/entity/HopperBlockEntity.java	2024-10-11 06:29:54.987814657 +0000
@@ -129,7 +129,7 @@
    public void setStack(int slot, ItemStack stack) {
       this.setupLoot(null);
       this.getInventory().set(slot, stack);
-      stack.m_uzwjgkgy(this.getMaxCount(stack));
+      stack.minimizeCount(this.getMaxCount(stack));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java namedSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java	2024-10-11 06:31:03.294212487 +0000
+++ namedSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java	2024-10-11 06:29:55.223819505 +0000
@@ -186,7 +186,7 @@
    @Override
    public void setStack(int slot, ItemStack stack) {
       this.getInventory().set(slot, stack);
-      stack.m_uzwjgkgy(this.getMaxCount(stack));
+      stack.minimizeCount(this.getMaxCount(stack));
       this.markDirty();
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/SignBlockEntity.java namedSrc/net/minecraft/block/entity/SignBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SignBlockEntity.java	2024-10-11 06:31:03.388214412 +0000
+++ namedSrc/net/minecraft/block/entity/SignBlockEntity.java	2024-10-11 06:29:55.368822484 +0000
@@ -24,7 +24,7 @@
 import net.minecraft.text.ClickEvent;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec2f;
@@ -207,7 +207,7 @@
    private Text parseLine(Text text) {
       if (this.world instanceof ServerWorld lv) {
          try {
-            return Texts.parse(createCommandSource(null, lv, this.pos), text, null, 0);
+            return TextUtil.parse(createCommandSource(null, lv, this.pos), text, null, 0);
          } catch (CommandSyntaxException var4) {
          }
       }
diff -bur namedTargetSrc/net/minecraft/block/entity/vault/VaultBlockEntity.java namedSrc/net/minecraft/block/entity/vault/VaultBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/vault/VaultBlockEntity.java	2024-10-11 06:31:03.235211279 +0000
+++ namedSrc/net/minecraft/block/entity/vault/VaultBlockEntity.java	2024-10-11 06:29:55.137817738 +0000
@@ -471,9 +471,9 @@
       private static ItemStack getRandomDisplayItem(ServerWorld world, BlockPos pos, RegistryKey<LootTable> key) {
          LootTable lv = world.getServer().getReloadableRegistries().getLootTable(key);
          LootContextParameterSet lv2 = new LootContextParameterSet.Builder(world)
-            .add(LootContextParameters.f_mvxqkdcc, Vec3d.ofCenter(pos))
+            .add(LootContextParameters.ORIGIN, Vec3d.ofCenter(pos))
             .build(LootContextTypes.VAULT);
-         List<ItemStack> list = lv.m_qwijqopm(lv2, world.getRandom());
+         List<ItemStack> list = lv.generateLoot(lv2, world.getRandom());
          return list.isEmpty() ? ItemStack.EMPTY : Util.getRandom(list, world.getRandom());
       }
 
@@ -497,10 +497,10 @@
       private static List<ItemStack> m_rlrwoomb(ServerWorld world, VaultConfig arg2, BlockPos pos, PlayerEntity player, ItemStack stack) {
          LootTable lv = world.getServer().getReloadableRegistries().getLootTable(arg2.lootTable());
          LootContextParameterSet lv2 = new LootContextParameterSet.Builder(world)
-            .add(LootContextParameters.f_mvxqkdcc, Vec3d.ofCenter(pos))
+            .add(LootContextParameters.ORIGIN, Vec3d.ofCenter(pos))
             .withLuck(player.getLuck())
-            .add(LootContextParameters.f_rcnckitm, player)
-            .add(LootContextParameters.f_nxapolcz, stack)
+            .add(LootContextParameters.THIS_ENTITY, player)
+            .add(LootContextParameters.TOOL, stack)
             .build(LootContextTypes.VAULT);
          return lv.generateLoot(lv2);
       }
diff -bur namedTargetSrc/net/minecraft/block/piston/PistonExtensionBlock.java namedSrc/net/minecraft/block/piston/PistonExtensionBlock.java
--- namedTargetSrc/net/minecraft/block/piston/PistonExtensionBlock.java	2024-10-11 06:31:03.313212876 +0000
+++ namedSrc/net/minecraft/block/piston/PistonExtensionBlock.java	2024-10-11 06:29:55.245819957 +0000
@@ -142,7 +142,7 @@
    @Override
    protected List<ItemStack> getDroppedStacks(BlockState state, LootContextParameterSet.Builder lootParameterBuilder) {
       PistonBlockEntity lv = this.getPistonBlockEntity(
-         lootParameterBuilder.getWorld(), BlockPos.fromPosition(lootParameterBuilder.getParameter(LootContextParameters.f_mvxqkdcc))
+         lootParameterBuilder.getWorld(), BlockPos.fromPosition(lootParameterBuilder.getParameter(LootContextParameters.ORIGIN))
       );
       return lv == null ? Collections.emptyList() : lv.getMovedBlockState().getDroppedStacks(lootParameterBuilder);
    }
diff -bur namedTargetSrc/net/minecraft/block/ShulkerBoxBlock.java namedSrc/net/minecraft/block/ShulkerBoxBlock.java
--- namedTargetSrc/net/minecraft/block/ShulkerBoxBlock.java	2024-10-11 06:31:03.268211955 +0000
+++ namedSrc/net/minecraft/block/ShulkerBoxBlock.java	2024-10-11 06:29:55.183818684 +0000
@@ -240,7 +240,7 @@
     */
    @Override
    protected List<ItemStack> getDroppedStacks(BlockState state, LootContextParameterSet.Builder lootParameterBuilder) {
-      BlockEntity lv = lootParameterBuilder.getOptionalParameter(LootContextParameters.f_wwaxuttk);
+      BlockEntity lv = lootParameterBuilder.getOptionalParameter(LootContextParameters.BLOCK_ENTITY);
       if (lv instanceof ShulkerBoxBlockEntity lv2) {
          lootParameterBuilder = lootParameterBuilder.withDynamicDrop(CONTENTS_DYNAMIC_DROP_ID, consumer -> {
             for (int i = 0; i < lv2.size(); i++) {
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/PlayerListHud.java namedSrc/net/minecraft/client/gui/hud/PlayerListHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/PlayerListHud.java	2024-10-11 06:31:03.098208474 +0000
+++ namedSrc/net/minecraft/client/gui/hud/PlayerListHud.java	2024-10-11 06:29:54.946813814 +0000
@@ -31,7 +31,7 @@
 import net.minecraft.text.MutableText;
 import net.minecraft.text.OrderedText;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Nullables;
@@ -209,7 +209,7 @@
          this.healthStates.clear();
          this.visible = visible;
          if (visible) {
-            Text lv = Texts.join(this.getVisibleEntries(), Text.literal(", "), this::getPlayerName);
+            Text lv = TextUtil.join(this.getVisibleEntries(), Text.literal(", "), this::getPlayerName);
             this.client.getChatNarratorManager().narrate(Text.translatable("multiplayer.player.list.narration", lv));
          }
       }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/advancement/AdvancementWidget.java namedSrc/net/minecraft/client/gui/screen/advancement/AdvancementWidget.java
--- namedTargetSrc/net/minecraft/client/gui/screen/advancement/AdvancementWidget.java	2024-10-11 06:31:03.103208577 +0000
+++ namedSrc/net/minecraft/client/gui/screen/advancement/AdvancementWidget.java	2024-10-11 06:29:54.949813876 +0000
@@ -15,7 +15,7 @@
 import net.minecraft.text.StringVisitable;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Language;
 import net.minecraft.util.math.MathHelper;
@@ -175,7 +175,7 @@
       int i = this.computeProgressWidth();
       int j = 29 + client.textRenderer.getWidth(this.title) + i;
       this.description = Language.getInstance()
-         .reorder(this.wrapDescription(Texts.setStyleIfAbsent(display.getDescription().copy(), Style.EMPTY.withColor(display.getType().getFormatting())), j));
+         .reorder(this.wrapDescription(TextUtil.setStyleIfAbsent(display.getDescription().copy(), Style.EMPTY.withColor(display.getType().getFormatting())), j));
 
       for (OrderedText lv : this.description) {
          j = Math.max(j, client.textRenderer.getWidth(lv));
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/BanScreenFactories.java namedSrc/net/minecraft/client/gui/screen/BanScreenFactories.java
--- namedTargetSrc/net/minecraft/client/gui/screen/BanScreenFactories.java	2024-10-11 06:31:03.220210972 +0000
+++ namedSrc/net/minecraft/client/gui/screen/BanScreenFactories.java	2024-10-11 06:29:55.115817286 +0000
@@ -11,7 +11,7 @@
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.UrlConstants;
 import net.minecraft.util.Util;
@@ -124,7 +124,7 @@
          AbuseReportReason lv = AbuseReportReason.get(i);
          Text lv2;
          if (lv != null) {
-            lv2 = Texts.setStyleIfAbsent(lv.getId().copy(), Style.EMPTY.withBold(true));
+            lv2 = TextUtil.setStyleIfAbsent(lv.getId().copy(), Style.EMPTY.withBold(true));
          } else if (string2 != null) {
             lv2 = Text.translatable("gui.banned.description.reason_id_message", i, string2).formatted(Formatting.BOLD);
          } else {
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/CommandSuggestor.java namedSrc/net/minecraft/client/gui/screen/CommandSuggestor.java
--- namedTargetSrc/net/minecraft/client/gui/screen/CommandSuggestor.java	2024-10-11 06:31:03.126209048 +0000
+++ namedSrc/net/minecraft/client/gui/screen/CommandSuggestor.java	2024-10-11 06:29:54.980814513 +0000
@@ -38,7 +38,7 @@
 import net.minecraft.text.OrderedText;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec2f;
@@ -399,7 +399,7 @@
     * @mapping {@literal named formatException Lnet/minecraft/client/gui/screen/CommandSuggestor;formatException(Lcom/mojang/brigadier/exceptions/CommandSyntaxException;)Lnet/minecraft/text/OrderedText;}
     */
    private static OrderedText formatException(CommandSyntaxException exception) {
-      Text lv = Texts.toText(exception.getRawMessage());
+      Text lv = TextUtil.toText(exception.getRawMessage());
       String string = exception.getContext();
       return string == null ? lv.asOrderedText() : Text.translatable("command.context.parse_error", lv, exception.getCursor(), string).asOrderedText();
    }
@@ -727,7 +727,7 @@
          if (bl5) {
             Message message = ((Suggestion)this.suggestions.get(this.selection)).getTooltip();
             if (message != null) {
-               graphics.drawTooltip(CommandSuggestor.this.textRenderer, Texts.toText(message), mouseX, mouseY);
+               graphics.drawTooltip(CommandSuggestor.this.textRenderer, TextUtil.toText(message), mouseX, mouseY);
             }
          }
       }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsBrokenWorldScreen.java namedSrc/net/minecraft/client/gui/screen/realms/RealmsBrokenWorldScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsBrokenWorldScreen.java	2024-10-11 06:31:03.225211075 +0000
+++ namedSrc/net/minecraft/client/gui/screen/realms/RealmsBrokenWorldScreen.java	2024-10-11 06:29:55.122817430 +0000
@@ -24,7 +24,7 @@
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.util.ArgbHelper;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
@@ -120,7 +120,7 @@
     */
    @Override
    public Text getNarratedTitle() {
-      return Texts.join(
+      return TextUtil.join(
          (Collection<? extends Text>)Stream.concat(Stream.of(this.title), Stream.of(this.message)).collect(Collectors.toList()), CommonTexts.SPACE
       );
    }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/UnsupportedGraphicsScreen.java namedSrc/net/minecraft/client/gui/screen/UnsupportedGraphicsScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/UnsupportedGraphicsScreen.java	2024-10-11 06:31:03.254211668 +0000
+++ namedSrc/net/minecraft/client/gui/screen/UnsupportedGraphicsScreen.java	2024-10-11 06:29:55.159818190 +0000
@@ -9,7 +9,7 @@
 import net.minecraft.client.gui.widget.button.ButtonWidget;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_ouqxetay}
@@ -70,7 +70,7 @@
    protected UnsupportedGraphicsScreen(Text title, List<Text> message, ImmutableList<UnsupportedGraphicsScreen.WidgetData> widgets) {
       super(title);
       this.message = message;
-      this.narrationMessage = CommonTexts.joinSentences(title, Texts.join(message, CommonTexts.EMPTY));
+      this.narrationMessage = CommonTexts.joinSentences(title, TextUtil.join(message, CommonTexts.EMPTY));
       this.widgets = widgets;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/world/ExperimentalFeaturesWarningScreen.java namedSrc/net/minecraft/client/gui/screen/world/ExperimentalFeaturesWarningScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/world/ExperimentalFeaturesWarningScreen.java	2024-10-11 06:31:03.358213797 +0000
+++ namedSrc/net/minecraft/client/gui/screen/world/ExperimentalFeaturesWarningScreen.java	2024-10-11 06:29:55.326821621 +0000
@@ -22,7 +22,7 @@
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -263,7 +263,7 @@
             for (PackProfile lv : enabledFeatures) {
                String string = FeatureFlags.showMissing(FeatureFlags.DEFAULT_SET, lv.getRequestedFeatures());
                if (!string.isEmpty()) {
-                  Text lv2 = Texts.setStyleIfAbsent(lv.getDisplayName().copy(), Style.EMPTY.withBold(true));
+                  Text lv2 = TextUtil.setStyleIfAbsent(lv.getDisplayName().copy(), Style.EMPTY.withBold(true));
                   Text lv3 = Text.translatable("selectWorld.experimental.details.entry", string);
                   this.addEntry(
                      DetailsScreen.this.new RequirementEntry(lv2, lv3, MultilineText.create(DetailsScreen.this.textRenderer, lv3, this.getRowWidth()))
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/button/PlainTextButtonWidget.java namedSrc/net/minecraft/client/gui/widget/button/PlainTextButtonWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/button/PlainTextButtonWidget.java	2024-10-11 06:31:03.224211054 +0000
+++ namedSrc/net/minecraft/client/gui/widget/button/PlainTextButtonWidget.java	2024-10-11 06:29:55.121817410 +0000
@@ -6,7 +6,7 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.util.math.MathHelper;
 
 /**
@@ -39,7 +39,7 @@
       super(x, y, width, height, content, empty, DEFAULT_NARRATION);
       this.font = font;
       this.content = content;
-      this.underlinedContent = Texts.setStyleIfAbsent(content.copy(), Style.EMPTY.withUnderline(true));
+      this.underlinedContent = TextUtil.setStyleIfAbsent(content.copy(), Style.EMPTY.withUnderline(true));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/list/multiplayer/ServerEntryListWidget.java namedSrc/net/minecraft/client/gui/widget/list/multiplayer/ServerEntryListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/list/multiplayer/ServerEntryListWidget.java	2024-10-11 06:31:03.250211586 +0000
+++ namedSrc/net/minecraft/client/gui/widget/list/multiplayer/ServerEntryListWidget.java	2024-10-11 06:29:55.154818088 +0000
@@ -27,7 +27,7 @@
 import net.minecraft.text.MutableText;
 import net.minecraft.text.OrderedText;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
@@ -861,7 +861,7 @@
                   lv.append(CommonTexts.SENTENCE_SEPARATOR);
                   lv.append(Text.translatable("multiplayer.status.player_count.narration", this.server.players.online(), this.server.players.max()));
                   lv.append(CommonTexts.SENTENCE_SEPARATOR);
-                  lv.append(Texts.join(this.server.playerListSummary, Text.literal(", ")));
+                  lv.append(TextUtil.join(this.server.playerListSummary, Text.literal(", ")));
                }
          }
 
diff -bur namedTargetSrc/net/minecraft/client/render/model/json/AndMultipartModelSelector.java namedSrc/net/minecraft/client/render/model/json/AndMultipartModelSelector.java
--- namedTargetSrc/net/minecraft/client/render/model/json/AndMultipartModelSelector.java	2024-10-11 06:31:03.239211361 +0000
+++ namedSrc/net/minecraft/client/render/model/json/AndMultipartModelSelector.java	2024-10-11 06:29:55.140817800 +0000
@@ -40,6 +40,6 @@
     */
    @Override
    public Predicate<BlockState> getPredicate(StateManager<Block, BlockState> arg) {
-      return Util.m_sebyursz(Streams.stream(this.selectors).map(selector -> selector.getPredicate(arg)).toList());
+      return Util.allOf(Streams.stream(this.selectors).map(selector -> selector.getPredicate(arg)).toList());
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/model/json/OrMultipartModelSelector.java namedSrc/net/minecraft/client/render/model/json/OrMultipartModelSelector.java
--- namedTargetSrc/net/minecraft/client/render/model/json/OrMultipartModelSelector.java	2024-10-11 06:31:03.121208945 +0000
+++ namedSrc/net/minecraft/client/render/model/json/OrMultipartModelSelector.java	2024-10-11 06:29:54.974814389 +0000
@@ -40,6 +40,6 @@
     */
    @Override
    public Predicate<BlockState> getPredicate(StateManager<Block, BlockState> arg) {
-      return Util.m_vbthhkfm(Streams.stream(this.selectors).map(selector -> selector.getPredicate(arg)).toList());
+      return Util.anyOf(Streams.stream(this.selectors).map(selector -> selector.getPredicate(arg)).toList());
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/model/json/SimpleMultipartModelSelector.java namedSrc/net/minecraft/client/render/model/json/SimpleMultipartModelSelector.java
--- namedTargetSrc/net/minecraft/client/render/model/json/SimpleMultipartModelSelector.java	2024-10-11 06:31:03.087208249 +0000
+++ namedSrc/net/minecraft/client/render/model/json/SimpleMultipartModelSelector.java	2024-10-11 06:29:54.907813013 +0000
@@ -69,7 +69,7 @@
             if (list.size() == 1) {
                predicate = this.createPredicate(arg, lv, string);
             } else {
-               predicate = Util.m_vbthhkfm(list.stream().map(stringx -> this.createPredicate(arg, lv, stringx)).toList());
+               predicate = Util.anyOf(list.stream().map(stringx -> this.createPredicate(arg, lv, stringx)).toList());
             }
 
             return bl ? predicate.negate() : predicate;
diff -bur namedTargetSrc/net/minecraft/client/sound/SoundManager.java namedSrc/net/minecraft/client/sound/SoundManager.java
--- namedTargetSrc/net/minecraft/client/sound/SoundManager.java	2024-10-11 06:31:03.126209048 +0000
+++ namedSrc/net/minecraft/client/sound/SoundManager.java	2024-10-11 06:29:54.980814513 +0000
@@ -25,7 +25,7 @@
 import net.minecraft.resource.SinglePreparationResourceReloader;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.unmapped.C_faujnouj;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.JsonHelper;
@@ -185,7 +185,7 @@
       if (SharedConstants.isDevelopment) {
          for (Identifier lv : this.sounds.keySet()) {
             WeightedSoundSet lv2 = (WeightedSoundSet)this.sounds.get(lv);
-            if (!Texts.canResolve(lv2.getSubtitle()) && Registries.SOUND_EVENT.containsId(lv)) {
+            if (!TextUtil.canResolve(lv2.getSubtitle()) && Registries.SOUND_EVENT.containsId(lv)) {
                LOGGER.error("Missing subtitle {} for sound event: {}", lv2.getSubtitle(), lv);
             }
          }
diff -bur namedTargetSrc/net/minecraft/command/argument/ItemPredicateArgumentType.java namedSrc/net/minecraft/command/argument/ItemPredicateArgumentType.java
--- namedTargetSrc/net/minecraft/command/argument/ItemPredicateArgumentType.java	2024-10-11 06:31:03.114208802 +0000
+++ namedSrc/net/minecraft/command/argument/ItemPredicateArgumentType.java	2024-10-11 06:29:54.964814184 +0000
@@ -141,7 +141,7 @@
     * @mapping {@literal named parse Lnet/minecraft/command/argument/ItemPredicateArgumentType;parse(Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/command/argument/ItemPredicateArgumentType$ItemPredicateArgument;}
     */
    public ItemPredicateArgumentType.ItemPredicateArgument parse(StringReader reader) throws CommandSyntaxException {
-      return Util.m_sebyursz(this.f_gticmpkj.m_onlfahvw(reader))::test;
+      return Util.allOf(this.f_gticmpkj.m_onlfahvw(reader))::test;
    }
 
    /**
@@ -356,7 +356,7 @@
        * @mapping {@literal named m_uqiyvusz Lnet/minecraft/command/argument/ItemPredicateArgumentType$C_wadhfwgl;m_uqiyvusz(Ljava/util/List;)Ljava/util/function/Predicate;}
        */
       public Predicate<ItemStack> m_uqiyvusz(List<Predicate<ItemStack>> list) {
-         return Util.m_vbthhkfm(list);
+         return Util.anyOf(list);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/command/EntitySelector.java namedSrc/net/minecraft/command/EntitySelector.java
--- namedTargetSrc/net/minecraft/command/EntitySelector.java	2024-10-11 06:31:03.378214207 +0000
+++ namedSrc/net/minecraft/command/EntitySelector.java	2024-10-11 06:29:55.356822238 +0000
@@ -16,7 +16,7 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.util.TypeFilter;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.Box;
@@ -395,7 +395,7 @@
          list = list2;
       }
 
-      return Util.m_sebyursz(list);
+      return Util.allOf(list);
    }
 
    /**
@@ -415,6 +415,6 @@
     * @mapping {@literal named getNames Lnet/minecraft/command/EntitySelector;getNames(Ljava/util/List;)Lnet/minecraft/text/Text;}
     */
    public static Text getNames(List<? extends Entity> entities) {
-      return Texts.join(entities, Entity::getDisplayName);
+      return TextUtil.join(entities, Entity::getDisplayName);
    }
 }
diff -bur namedTargetSrc/net/minecraft/command/EntitySelectorOptions.java namedSrc/net/minecraft/command/EntitySelectorOptions.java
--- namedTargetSrc/net/minecraft/command/EntitySelectorOptions.java	2024-10-11 06:31:03.360213838 +0000
+++ namedSrc/net/minecraft/command/EntitySelectorOptions.java	2024-10-11 06:29:55.335821806 +0000
@@ -516,8 +516,8 @@
                            return false;
                         } else {
                            LootContextParameterSet lv2 = new LootContextParameterSet.Builder(lvx)
-                              .add(LootContextParameters.f_rcnckitm, entity)
-                              .add(LootContextParameters.f_mvxqkdcc, entity.getPos())
+                              .add(LootContextParameters.THIS_ENTITY, entity)
+                              .add(LootContextParameters.ORIGIN, entity.getPos())
                               .build(LootContextTypes.SELECTOR);
                            LootContext lv3 = new LootContext.Builder(lv2).build(Optional.empty());
                            lv3.addVisitedElement(LootContext.createEntry((LootCondition)optional.get()));
diff -bur namedTargetSrc/net/minecraft/component/type/JukeboxPlayableComponent.java namedSrc/net/minecraft/component/type/JukeboxPlayableComponent.java
--- namedTargetSrc/net/minecraft/component/type/JukeboxPlayableComponent.java	2024-10-11 06:31:03.184210235 +0000
+++ namedSrc/net/minecraft/component/type/JukeboxPlayableComponent.java	2024-10-11 06:29:55.054816033 +0000
@@ -23,7 +23,7 @@
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.unmapped.C_cemdjcik;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Formatting;
@@ -68,7 +68,7 @@
       if (this.showInTooltip && lv != null) {
          this.song.m_bomacrpw(lv).ifPresent(arg -> {
             MutableText lvx = ((JukeboxSong)arg.getValue()).description().copy();
-            Texts.setStyleIfAbsent(lvx, Style.EMPTY.withColor(Formatting.GRAY));
+            TextUtil.setStyleIfAbsent(lvx, Style.EMPTY.withColor(Formatting.GRAY));
             tooltipConsumer.accept(lvx);
          });
       }
diff -bur namedTargetSrc/net/minecraft/component/type/LoreComponent.java namedSrc/net/minecraft/component/type/LoreComponent.java
--- namedTargetSrc/net/minecraft/component/type/LoreComponent.java	2024-10-11 06:31:03.262211832 +0000
+++ namedSrc/net/minecraft/component/type/LoreComponent.java	2024-10-11 06:29:55.172818457 +0000
@@ -13,7 +13,7 @@
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
 import net.minecraft.text.TextCodecs;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Util;
 
@@ -55,7 +55,7 @@
     * @mapping {@literal named <init> Lnet/minecraft/component/type/LoreComponent;<init>(Ljava/util/List;)V}
     */
    public LoreComponent(List<Text> lines) {
-      this(lines, Lists.transform(lines, line -> Texts.setStyleIfAbsent(line.copy(), STYLE)));
+      this(lines, Lists.transform(lines, line -> TextUtil.setStyleIfAbsent(line.copy(), STYLE)));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/component/type/UnbreakableComponent.java namedSrc/net/minecraft/component/type/UnbreakableComponent.java
--- namedTargetSrc/net/minecraft/component/type/UnbreakableComponent.java	2024-10-11 06:31:03.221210993 +0000
+++ namedSrc/net/minecraft/component/type/UnbreakableComponent.java	2024-10-11 06:29:55.115817286 +0000
@@ -49,9 +49,9 @@
 
    /**
     * @mapping {@literal hashed m_nrzkdjww Lnet/minecraft/unmapped/C_drqhpkfg;m_nrzkdjww(Z)Lnet/minecraft/unmapped/C_drqhpkfg;}
-    * @mapping {@literal named create Lnet/minecraft/component/type/UnbreakableComponent;create(Z)Lnet/minecraft/component/type/UnbreakableComponent;}
+    * @mapping {@literal named withShownInTooltip Lnet/minecraft/component/type/UnbreakableComponent;withShownInTooltip(Z)Lnet/minecraft/component/type/UnbreakableComponent;}
     */
-   public UnbreakableComponent create(boolean shownInTooltip) {
+   public UnbreakableComponent withShownInTooltip(boolean shownInTooltip) {
       return new UnbreakableComponent(shownInTooltip);
    }
 }
diff -bur namedTargetSrc/net/minecraft/component/type/WrittenBookContentComponent.java namedSrc/net/minecraft/component/type/WrittenBookContentComponent.java
--- namedTargetSrc/net/minecraft/component/type/WrittenBookContentComponent.java	2024-10-11 06:31:03.122208966 +0000
+++ namedSrc/net/minecraft/component/type/WrittenBookContentComponent.java	2024-10-11 06:29:54.975814410 +0000
@@ -16,7 +16,7 @@
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.Text;
 import net.minecraft.text.TextCodecs;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.util.dynamic.Codecs;
 import org.jetbrains.annotations.Nullable;
 
@@ -178,7 +178,7 @@
    private static Optional<Filterable<Text>> resolvePage(ServerCommandSource source, @Nullable PlayerEntity player, Filterable<Text> page) {
       return page.resolve(filtered -> {
          try {
-            Text lv = Texts.parse(source, filtered, player, 0);
+            Text lv = TextUtil.parse(source, filtered, player, 0);
             return isPageTooLarge(lv, source.getRegistryManager()) ? Optional.empty() : Optional.of(lv);
          } catch (Exception var4) {
             return Optional.of(filtered);
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/ArchaeologyLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/ArchaeologyLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/ArchaeologyLootTableGenerator.java	2024-10-11 06:31:03.160209744 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/ArchaeologyLootTableGenerator.java	2024-10-11 06:29:55.021815355 +0000
@@ -39,12 +39,12 @@
                      ItemEntry.builder(Items.SUSPICIOUS_STEW)
                         .apply(
                            SetStewEffectLootFunction.builder()
-                              .withEffect(StatusEffects.NIGHT_VISION, UniformLootNumberProvider.create(7.0F, 10.0F))
-                              .withEffect(StatusEffects.JUMP_BOOST, UniformLootNumberProvider.create(7.0F, 10.0F))
-                              .withEffect(StatusEffects.WEAKNESS, UniformLootNumberProvider.create(6.0F, 8.0F))
-                              .withEffect(StatusEffects.BLINDNESS, UniformLootNumberProvider.create(5.0F, 7.0F))
-                              .withEffect(StatusEffects.POISON, UniformLootNumberProvider.create(10.0F, 20.0F))
-                              .withEffect(StatusEffects.SATURATION, UniformLootNumberProvider.create(7.0F, 10.0F))
+                              .effect(StatusEffects.NIGHT_VISION, UniformLootNumberProvider.create(7.0F, 10.0F))
+                              .effect(StatusEffects.JUMP_BOOST, UniformLootNumberProvider.create(7.0F, 10.0F))
+                              .effect(StatusEffects.WEAKNESS, UniformLootNumberProvider.create(6.0F, 8.0F))
+                              .effect(StatusEffects.BLINDNESS, UniformLootNumberProvider.create(5.0F, 7.0F))
+                              .effect(StatusEffects.POISON, UniformLootNumberProvider.create(10.0F, 20.0F))
+                              .effect(StatusEffects.SATURATION, UniformLootNumberProvider.create(7.0F, 10.0F))
                         )
                   )
             )
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/BarteringLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/BarteringLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/BarteringLootTableGenerator.java	2024-10-11 06:31:03.224211054 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/BarteringLootTableGenerator.java	2024-10-11 06:29:55.121817410 +0000
@@ -39,12 +39,12 @@
                   .with(
                      ItemEntry.builder(Items.BOOK)
                         .weight(5)
-                        .apply(new EnchantRandomlyLootFunction.Builder().m_blmnznah(lv.getHolderOrThrow(Enchantments.SOUL_SPEED)))
+                        .apply(new EnchantRandomlyLootFunction.Builder().option(lv.getHolderOrThrow(Enchantments.SOUL_SPEED)))
                   )
                   .with(
                      ItemEntry.builder(Items.IRON_BOOTS)
                         .weight(8)
-                        .apply(new EnchantRandomlyLootFunction.Builder().m_blmnznah(lv.getHolderOrThrow(Enchantments.SOUL_SPEED)))
+                        .apply(new EnchantRandomlyLootFunction.Builder().option(lv.getHolderOrThrow(Enchantments.SOUL_SPEED)))
                   )
                   .with(ItemEntry.builder(Items.POTION).weight(8).apply(SetPotionFunction.builder(Potions.FIRE_RESISTANCE)))
                   .with(ItemEntry.builder(Items.SPLASH_POTION).weight(8).apply(SetPotionFunction.builder(Potions.FIRE_RESISTANCE)))
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java	2024-10-11 06:31:03.097208454 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java	2024-10-11 06:29:54.943813753 +0000
@@ -345,9 +345,7 @@
                   .rolls(ConstantLootNumberProvider.create(1.0F))
                   .with(
                      ItemEntry.builder(drop)
-                        .apply(
-                           CopyComponentsLootFunction.m_tzmfkrqo(CopyComponentsLootFunction.C_zcqyfuyv.BLOCK_ENTITY).m_gbinruor(DataComponentTypes.CUSTOM_NAME)
-                        )
+                        .apply(CopyComponentsLootFunction.builder(CopyComponentsLootFunction.Source.BLOCK_ENTITY).include(DataComponentTypes.CUSTOM_NAME))
                   )
             )
          );
@@ -367,11 +365,11 @@
                   .with(
                      ItemEntry.builder(drop)
                         .apply(
-                           CopyComponentsLootFunction.m_tzmfkrqo(CopyComponentsLootFunction.C_zcqyfuyv.BLOCK_ENTITY)
-                              .m_gbinruor(DataComponentTypes.CUSTOM_NAME)
-                              .m_gbinruor(DataComponentTypes.CONTAINER)
-                              .m_gbinruor(DataComponentTypes.LOCK)
-                              .m_gbinruor(DataComponentTypes.CONTAINER_LOOT)
+                           CopyComponentsLootFunction.builder(CopyComponentsLootFunction.Source.BLOCK_ENTITY)
+                              .include(DataComponentTypes.CUSTOM_NAME)
+                              .include(DataComponentTypes.CONTAINER)
+                              .include(DataComponentTypes.LOCK)
+                              .include(DataComponentTypes.CONTAINER_LOOT)
                         )
                   )
             )
@@ -390,7 +388,7 @@
             drop,
             ItemEntry.builder(Items.RAW_COPPER)
                .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(2.0F, 5.0F)))
-               .apply(ApplyBonusLootFunction.m_lngedsfm(lv.getHolderOrThrow(Enchantments.FORTUNE)))
+               .apply(ApplyBonusLootFunction.oreDropsFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE)))
          )
       );
    }
@@ -407,7 +405,7 @@
             drop,
             ItemEntry.builder(Items.LAPIS_LAZULI)
                .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(4.0F, 9.0F)))
-               .apply(ApplyBonusLootFunction.m_lngedsfm(lv.getHolderOrThrow(Enchantments.FORTUNE)))
+               .apply(ApplyBonusLootFunction.oreDropsFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE)))
          )
       );
    }
@@ -424,7 +422,7 @@
             drop,
             ItemEntry.builder(Items.REDSTONE)
                .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(4.0F, 5.0F)))
-               .apply(ApplyBonusLootFunction.m_xucqilfu(lv.getHolderOrThrow(Enchantments.FORTUNE)))
+               .apply(ApplyBonusLootFunction.baseFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE)))
          )
       );
    }
@@ -443,12 +441,12 @@
                   .with(
                      ItemEntry.builder(drop)
                         .apply(
-                           CopyComponentsLootFunction.m_tzmfkrqo(CopyComponentsLootFunction.C_zcqyfuyv.BLOCK_ENTITY)
-                              .m_gbinruor(DataComponentTypes.CUSTOM_NAME)
-                              .m_gbinruor(DataComponentTypes.ITEM_NAME)
-                              .m_gbinruor(DataComponentTypes.HIDE_ADDITIONAL_TOOLTIP)
-                              .m_gbinruor(DataComponentTypes.BANNER_PATTERNS)
-                              .m_gbinruor(DataComponentTypes.RARITY)
+                           CopyComponentsLootFunction.builder(CopyComponentsLootFunction.Source.BLOCK_ENTITY)
+                              .include(DataComponentTypes.CUSTOM_NAME)
+                              .include(DataComponentTypes.ITEM_NAME)
+                              .include(DataComponentTypes.HIDE_ADDITIONAL_TOOLTIP)
+                              .include(DataComponentTypes.BANNER_PATTERNS)
+                              .include(DataComponentTypes.RARITY)
                         )
                   )
             )
@@ -467,7 +465,7 @@
                .rolls(ConstantLootNumberProvider.create(1.0F))
                .with(
                   ItemEntry.builder(block)
-                     .apply(CopyComponentsLootFunction.m_tzmfkrqo(CopyComponentsLootFunction.C_zcqyfuyv.BLOCK_ENTITY).m_gbinruor(DataComponentTypes.BEES))
+                     .apply(CopyComponentsLootFunction.builder(CopyComponentsLootFunction.Source.BLOCK_ENTITY).include(DataComponentTypes.BEES))
                      .apply(CopyStateFunction.getBuilder(block).addProperty(BeehiveBlock.HONEY_LEVEL))
                )
          );
@@ -485,7 +483,7 @@
                .with(
                   ItemEntry.builder(block)
                      .conditionally(this.m_pjptakrh())
-                     .apply(CopyComponentsLootFunction.m_tzmfkrqo(CopyComponentsLootFunction.C_zcqyfuyv.BLOCK_ENTITY).m_gbinruor(DataComponentTypes.BEES))
+                     .apply(CopyComponentsLootFunction.builder(CopyComponentsLootFunction.Source.BLOCK_ENTITY).include(DataComponentTypes.BEES))
                      .apply(CopyStateFunction.getBuilder(block).addProperty(BeehiveBlock.HONEY_LEVEL))
                      .alternatively(ItemEntry.builder(block))
                )
@@ -514,7 +512,7 @@
       return this.dropsWithSilkTouch(
          dropWithSilkTouch,
          (LootPoolEntry.Builder<?>)this.applyExplosionDecay(
-            dropWithSilkTouch, ItemEntry.builder(drop).apply(ApplyBonusLootFunction.m_lngedsfm(lv.getHolderOrThrow(Enchantments.FORTUNE)))
+            dropWithSilkTouch, ItemEntry.builder(drop).apply(ApplyBonusLootFunction.oreDropsFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE)))
          )
       );
    }
@@ -546,8 +544,8 @@
          (LootPoolEntry.Builder<?>)this.applyExplosionDecay(
             dropWithShears,
             ItemEntry.builder(Items.WHEAT_SEEDS)
-               .conditionally(RandomChanceLootCondition.m_dbenidbq(0.125F))
-               .apply(ApplyBonusLootFunction.m_gomajsny(lv.getHolderOrThrow(Enchantments.FORTUNE), 2))
+               .conditionally(RandomChanceLootCondition.conditionBuilder(0.125F))
+               .apply(ApplyBonusLootFunction.uniformFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE), 2))
          )
       );
    }
@@ -667,7 +665,7 @@
       return this.dropsWithShearsOrSilkTouch(
             leaves,
             ((LeafEntry.Builder)this.applySurvivesExplosionCondition(leaves, ItemEntry.builder(drop)))
-               .conditionally(TableBonusLootCondition.m_tmbdegkn(lv.getHolderOrThrow(Enchantments.FORTUNE), chance))
+               .conditionally(TableBonusLootCondition.conditionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE), chance))
          )
          .pool(
             LootPool.builder()
@@ -677,7 +675,7 @@
                   ((LeafEntry.Builder)this.applyExplosionDecay(
                         leaves, ItemEntry.builder(Items.STICK).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 2.0F)))
                      ))
-                     .conditionally(TableBonusLootCondition.m_tmbdegkn(lv.getHolderOrThrow(Enchantments.FORTUNE), LEAVES_STICK_DROP_CHANCES))
+                     .conditionally(TableBonusLootCondition.conditionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE), LEAVES_STICK_DROP_CHANCES))
                )
          );
    }
@@ -696,7 +694,9 @@
                .with(
                   ((LeafEntry.Builder)this.applySurvivesExplosionCondition(leaves, ItemEntry.builder(Items.APPLE)))
                      .conditionally(
-                        TableBonusLootCondition.m_tmbdegkn(lv.getHolderOrThrow(Enchantments.FORTUNE), 0.005F, 0.0055555557F, 0.00625F, 0.008333334F, 0.025F)
+                        TableBonusLootCondition.conditionBuilder(
+                           lv.getHolderOrThrow(Enchantments.FORTUNE), 0.005F, 0.0055555557F, 0.00625F, 0.008333334F, 0.025F
+                        )
                      )
                )
          );
@@ -713,7 +713,7 @@
          ((LeafEntry.Builder)this.applyExplosionDecay(
                Blocks.MANGROVE_LEAVES, ItemEntry.builder(Items.STICK).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 2.0F)))
             ))
-            .conditionally(TableBonusLootCondition.m_tmbdegkn(lv.getHolderOrThrow(Enchantments.FORTUNE), LEAVES_STICK_DROP_CHANCES))
+            .conditionally(TableBonusLootCondition.conditionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE), LEAVES_STICK_DROP_CHANCES))
       );
    }
 
@@ -730,7 +730,9 @@
             .pool(
                LootPool.builder()
                   .conditionally(condition)
-                  .with(ItemEntry.builder(seeds).apply(ApplyBonusLootFunction.m_ziaghyfl(lv.getHolderOrThrow(Enchantments.FORTUNE), 0.5714286F, 3)))
+                  .with(
+                     ItemEntry.builder(seeds).apply(ApplyBonusLootFunction.binomialFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE), 0.5714286F, 3))
+                  )
             )
       );
    }
@@ -759,7 +761,7 @@
          .conditionally(this.m_fdmlfnlz())
          .alternatively(
             ((LeafEntry.Builder)this.applySurvivesExplosionCondition(tallGrass, ItemEntry.builder(Items.WHEAT_SEEDS)))
-               .conditionally(RandomChanceLootCondition.m_dbenidbq(0.125F))
+               .conditionally(RandomChanceLootCondition.conditionBuilder(0.125F))
          );
       return LootTable.builder()
          .pool(
@@ -918,7 +920,7 @@
       HolderLookup.RegistryLookup<Enchantment> lv = this.f_phocahpv.getLookupOrThrow(RegistryKeys.ENCHANTMENT);
       LootTable.Builder lv2 = this.dropsWithShearsOrSilkTouch(
          vines,
-         ItemEntry.builder(vines).conditionally(TableBonusLootCondition.m_tmbdegkn(lv.getHolderOrThrow(Enchantments.FORTUNE), 0.33F, 0.55F, 0.77F, 1.0F))
+         ItemEntry.builder(vines).conditionally(TableBonusLootCondition.conditionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE), 0.33F, 0.55F, 0.77F, 1.0F))
       );
       this.add(vines, lv2);
       this.add(plant, lv2);

@github-actions
Copy link

Choose a reason for hiding this comment

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

View the diff here (3/3): 
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/rebalance/TradeRebalanceChestLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/rebalance/TradeRebalanceChestLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/rebalance/TradeRebalanceChestLootTableGenerator.java	2024-10-11 06:31:03.286212323 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/rebalance/TradeRebalanceChestLootTableGenerator.java	2024-10-11 06:29:55.215819341 +0000
@@ -46,7 +46,7 @@
                   .with(ItemEntry.builder(Items.GOLDEN_APPLE).weight(20))
                   .with(ItemEntry.builder(Items.ENCHANTED_GOLDEN_APPLE))
                   .with(ItemEntry.builder(Items.NAME_TAG).weight(30))
-                  .with(ItemEntry.builder(Items.BOOK).weight(10).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+                  .with(ItemEntry.builder(Items.BOOK).weight(10).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
                   .with(ItemEntry.builder(Items.IRON_PICKAXE).weight(5))
                   .with(EmptyEntry.builder().weight(5))
             )
@@ -81,7 +81,7 @@
                   .with(
                      ItemEntry.builder(Items.BOOK)
                         .weight(1)
-                        .apply(new EnchantRandomlyLootFunction.Builder().m_blmnznah(lv.getHolderOrThrow(Enchantments.EFFICIENCY)))
+                        .apply(new EnchantRandomlyLootFunction.Builder().option(lv.getHolderOrThrow(Enchantments.EFFICIENCY)))
                   )
             )
       );
@@ -119,7 +119,7 @@
                .with(ItemEntry.builder(Items.ARROW).weight(4).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(2.0F, 7.0F))))
                .with(ItemEntry.builder(Items.TRIPWIRE_HOOK).weight(3).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F))))
                .with(ItemEntry.builder(Items.IRON_INGOT).weight(3).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F))))
-               .with(ItemEntry.builder(Items.BOOK).weight(1).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+               .with(ItemEntry.builder(Items.BOOK).weight(1).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
          )
          .pool(
             LootPool.builder()
@@ -144,7 +144,7 @@
                .with(
                   ItemEntry.builder(Items.BOOK)
                      .weight(2)
-                     .apply(new EnchantRandomlyLootFunction.Builder().m_blmnznah(lv.getHolderOrThrow(Enchantments.QUICK_CHARGE)))
+                     .apply(new EnchantRandomlyLootFunction.Builder().option(lv.getHolderOrThrow(Enchantments.QUICK_CHARGE)))
                )
          );
    }
@@ -170,7 +170,7 @@
                .with(ItemEntry.builder(Items.IRON_HORSE_ARMOR).weight(15))
                .with(ItemEntry.builder(Items.GOLDEN_HORSE_ARMOR).weight(10))
                .with(ItemEntry.builder(Items.DIAMOND_HORSE_ARMOR).weight(5))
-               .with(ItemEntry.builder(Items.BOOK).weight(10).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+               .with(ItemEntry.builder(Items.BOOK).weight(10).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
                .with(ItemEntry.builder(Items.GOLDEN_APPLE).weight(20))
                .with(ItemEntry.builder(Items.ENCHANTED_GOLDEN_APPLE).weight(2))
                .with(EmptyEntry.builder().weight(15))
@@ -194,9 +194,7 @@
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(2.0F)))
                )
                .with(
-                  ItemEntry.builder(Items.BOOK)
-                     .weight(2)
-                     .apply(new EnchantRandomlyLootFunction.Builder().m_blmnznah(lv.getHolderOrThrow(Enchantments.UNBREAKING)))
+                  ItemEntry.builder(Items.BOOK).weight(2).apply(new EnchantRandomlyLootFunction.Builder().option(lv.getHolderOrThrow(Enchantments.UNBREAKING)))
                )
          );
    }
@@ -223,7 +221,7 @@
                      .weight(2)
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
                      .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.8F, 1.0F)))
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(30.0F, 50.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(30.0F, 50.0F)))
                )
                .with(ItemEntry.builder(Items.LEAD).weight(2).apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F))))
                .with(ItemEntry.builder(Items.DIAMOND_HORSE_ARMOR).weight(2).apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F))))
@@ -233,12 +231,12 @@
                .with(
                   ItemEntry.builder(Items.DIAMOND_LEGGINGS)
                      .weight(2)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(30.0F, 50.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(30.0F, 50.0F)))
                )
                .with(
                   ItemEntry.builder(Items.BOOK)
                      .weight(3)
-                     .apply(new EnchantRandomlyLootFunction.Builder().m_blmnznah(lv.getHolderOrThrow(Enchantments.SWIFT_SNEAK)))
+                     .apply(new EnchantRandomlyLootFunction.Builder().option(lv.getHolderOrThrow(Enchantments.SWIFT_SNEAK)))
                )
                .with(ItemEntry.builder(Items.SCULK).weight(3).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(4.0F, 10.0F))))
                .with(ItemEntry.builder(Items.SCULK_SENSOR).weight(3).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F))))
@@ -249,7 +247,7 @@
                .with(
                   ItemEntry.builder(Items.IRON_LEGGINGS)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(ItemEntry.builder(Items.ECHO_SHARD).weight(4).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F))))
                .with(ItemEntry.builder(Items.DISC_FRAGMENT_5).weight(4).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F))))
@@ -259,7 +257,7 @@
                      .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F)))
                      .apply(SetPotionFunction.builder(Potions.STRONG_REGENERATION))
                )
-               .with(ItemEntry.builder(Items.BOOK).weight(5).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+               .with(ItemEntry.builder(Items.BOOK).weight(5).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
                .with(ItemEntry.builder(Items.BOOK).weight(5).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(3.0F, 10.0F))))
                .with(ItemEntry.builder(Items.BONE).weight(5).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 15.0F))))
                .with(ItemEntry.builder(Items.SOUL_TORCH).weight(5).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 15.0F))))
@@ -269,11 +267,7 @@
             LootPool.builder()
                .rolls(ConstantLootNumberProvider.create(1.0F))
                .with(EmptyEntry.builder().weight(71))
-               .with(
-                  ItemEntry.builder(Items.BOOK)
-                     .weight(4)
-                     .apply(new EnchantRandomlyLootFunction.Builder().m_blmnznah(lv.getHolderOrThrow(Enchantments.MENDING)))
-               )
+               .with(ItemEntry.builder(Items.BOOK).weight(4).apply(new EnchantRandomlyLootFunction.Builder().option(lv.getHolderOrThrow(Enchantments.MENDING))))
                .with(ItemEntry.builder(Items.WARD_ARMOR_TRIM_SMITHING_TEMPLATE).weight(4))
                .with(ItemEntry.builder(Items.SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE).weight(1))
          );
@@ -300,7 +294,10 @@
                .with(ItemEntry.builder(Items.IRON_HORSE_ARMOR))
                .with(ItemEntry.builder(Items.GOLDEN_HORSE_ARMOR))
                .with(ItemEntry.builder(Items.DIAMOND_HORSE_ARMOR))
-               .with(ItemEntry.builder(Items.BOOK).apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, ConstantLootNumberProvider.create(30.0F))))
+               .with(
+                  ItemEntry.builder(Items.BOOK)
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, ConstantLootNumberProvider.create(30.0F)))
+               )
          )
          .pool(
             LootPool.builder()
@@ -316,7 +313,7 @@
             LootPool.builder()
                .rolls(ConstantLootNumberProvider.create(1.0F))
                .with(EmptyEntry.builder().weight(1))
-               .with(ItemEntry.builder(Items.BOOK).apply(new EnchantRandomlyLootFunction.Builder().m_blmnznah(lv.getHolderOrThrow(Enchantments.UNBREAKING))))
+               .with(ItemEntry.builder(Items.BOOK).apply(new EnchantRandomlyLootFunction.Builder().option(lv.getHolderOrThrow(Enchantments.UNBREAKING))))
          );
    }
 }
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/VanillaBlockLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/VanillaBlockLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/VanillaBlockLootTableGenerator.java	2024-10-11 06:31:03.258211750 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/VanillaBlockLootTableGenerator.java	2024-10-11 06:29:55.161818231 +0000
@@ -1027,10 +1027,10 @@
                         .with(
                            ItemEntry.builder(block)
                               .apply(
-                                 CopyComponentsLootFunction.m_tzmfkrqo(CopyComponentsLootFunction.C_zcqyfuyv.BLOCK_ENTITY)
-                                    .m_gbinruor(DataComponentTypes.PROFILE)
-                                    .m_gbinruor(DataComponentTypes.NOTE_BLOCK_SOUND)
-                                    .m_gbinruor(DataComponentTypes.CUSTOM_NAME)
+                                 CopyComponentsLootFunction.builder(CopyComponentsLootFunction.Source.BLOCK_ENTITY)
+                                    .include(DataComponentTypes.PROFILE)
+                                    .include(DataComponentTypes.NOTE_BLOCK_SOUND)
+                                    .include(DataComponentTypes.CUSTOM_NAME)
                               )
                         )
                   )
@@ -1097,7 +1097,10 @@
                .pool(
                   LootPool.builder()
                      .conditionally(lv5)
-                     .with(ItemEntry.builder(Items.CARROT).apply(ApplyBonusLootFunction.m_ziaghyfl(lv.getHolderOrThrow(Enchantments.FORTUNE), 0.5714286F, 3)))
+                     .with(
+                        ItemEntry.builder(Items.CARROT)
+                           .apply(ApplyBonusLootFunction.binomialFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE), 0.5714286F, 3))
+                     )
                )
          )
       );
@@ -1112,12 +1115,15 @@
                .pool(
                   LootPool.builder()
                      .conditionally(lv7)
-                     .with(ItemEntry.builder(Items.POTATO).apply(ApplyBonusLootFunction.m_ziaghyfl(lv.getHolderOrThrow(Enchantments.FORTUNE), 0.5714286F, 3)))
+                     .with(
+                        ItemEntry.builder(Items.POTATO)
+                           .apply(ApplyBonusLootFunction.binomialFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE), 0.5714286F, 3))
+                     )
                )
                .pool(
                   LootPool.builder()
                      .conditionally(lv7)
-                     .with(ItemEntry.builder(Items.POISONOUS_POTATO).conditionally(RandomChanceLootCondition.m_dbenidbq(0.02F)))
+                     .with(ItemEntry.builder(Items.POISONOUS_POTATO).conditionally(RandomChanceLootCondition.conditionBuilder(0.02F)))
                )
          )
       );
@@ -1134,7 +1140,7 @@
                         )
                         .with(ItemEntry.builder(Items.SWEET_BERRIES))
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(2.0F, 3.0F)))
-                        .apply(ApplyBonusLootFunction.m_xucqilfu(lv.getHolderOrThrow(Enchantments.FORTUNE)))
+                        .apply(ApplyBonusLootFunction.baseFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE)))
                   )
                   .pool(
                      LootPool.builder()
@@ -1144,7 +1150,7 @@
                         )
                         .with(ItemEntry.builder(Items.SWEET_BERRIES))
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 2.0F)))
-                        .apply(ApplyBonusLootFunction.m_xucqilfu(lv.getHolderOrThrow(Enchantments.FORTUNE)))
+                        .apply(ApplyBonusLootFunction.baseFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE)))
                   )
             )
       );
@@ -1171,7 +1177,7 @@
                   block,
                   ItemEntry.builder(Items.GOLD_NUGGET)
                      .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(2.0F, 6.0F)))
-                     .apply(ApplyBonusLootFunction.m_lngedsfm(lv.getHolderOrThrow(Enchantments.FORTUNE)))
+                     .apply(ApplyBonusLootFunction.oreDropsFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE)))
                )
             )
       );
@@ -1226,7 +1232,7 @@
                   block,
                   ItemEntry.builder(Items.GLOWSTONE_DUST)
                      .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(2.0F, 4.0F)))
-                     .apply(ApplyBonusLootFunction.m_xucqilfu(lv.getHolderOrThrow(Enchantments.FORTUNE)))
+                     .apply(ApplyBonusLootFunction.baseFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE)))
                      .apply(LimitCountLootFunction.builder(BoundedIntUnaryOperator.create(1, 4)))
                )
             )
@@ -1239,7 +1245,7 @@
                   block,
                   ItemEntry.builder(Items.MELON_SLICE)
                      .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(3.0F, 7.0F)))
-                     .apply(ApplyBonusLootFunction.m_xucqilfu(lv.getHolderOrThrow(Enchantments.FORTUNE)))
+                     .apply(ApplyBonusLootFunction.baseFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE)))
                      .apply(LimitCountLootFunction.builder(BoundedIntUnaryOperator.createMax(9)))
                )
             )
@@ -1254,7 +1260,7 @@
                   block,
                   ItemEntry.builder(Items.PRISMARINE_CRYSTALS)
                      .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(2.0F, 3.0F)))
-                     .apply(ApplyBonusLootFunction.m_xucqilfu(lv.getHolderOrThrow(Enchantments.FORTUNE)))
+                     .apply(ApplyBonusLootFunction.baseFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE)))
                      .apply(LimitCountLootFunction.builder(BoundedIntUnaryOperator.create(1, 5)))
                )
             )
@@ -1277,7 +1283,7 @@
                                     )
                               )
                               .apply(
-                                 ApplyBonusLootFunction.m_xucqilfu(lv.getHolderOrThrow(Enchantments.FORTUNE))
+                                 ApplyBonusLootFunction.baseFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE))
                                     .conditionally(
                                        BlockStatePropertyLootCondition.builder(block)
                                           .properties(StatePredicate.Builder.create().exactMatch(NetherWartBlock.AGE, 3))
@@ -1327,7 +1333,7 @@
                this.applySurvivesExplosionCondition(
                   block,
                   ItemEntry.builder(Items.FLINT)
-                     .conditionally(TableBonusLootCondition.m_tmbdegkn(lv.getHolderOrThrow(Enchantments.FORTUNE), 0.1F, 0.14285715F, 0.25F, 1.0F))
+                     .conditionally(TableBonusLootCondition.conditionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE), 0.1F, 0.14285715F, 0.25F, 1.0F))
                      .alternatively(ItemEntry.builder(block))
                )
             )
@@ -1349,7 +1355,7 @@
                   block,
                   ItemEntry.builder(Items.GOLD_NUGGET)
                      .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(2.0F, 5.0F)))
-                     .conditionally(TableBonusLootCondition.m_tmbdegkn(lv.getHolderOrThrow(Enchantments.FORTUNE), 0.1F, 0.14285715F, 0.25F, 1.0F))
+                     .conditionally(TableBonusLootCondition.conditionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE), 0.1F, 0.14285715F, 0.25F, 1.0F))
                      .alternatively(ItemEntry.builder(block))
                )
             )
@@ -1369,7 +1375,7 @@
                block,
                ItemEntry.builder(Items.AMETHYST_SHARD)
                   .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(4.0F)))
-                  .apply(ApplyBonusLootFunction.m_lngedsfm(lv.getHolderOrThrow(Enchantments.FORTUNE)))
+                  .apply(ApplyBonusLootFunction.oreDropsFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE)))
                   .conditionally(MatchToolLootCondition.builder(ItemPredicate.Builder.create().m_lubfxdrb(lv2, ItemTags.CLUSTER_MAX_HARVESTABLES)))
                   .alternatively(
                      (LootPoolEntry.Builder<?>)this.applyExplosionDecay(
@@ -1500,8 +1506,7 @@
                      .alternatively(
                         ItemEntry.builder(pot)
                            .apply(
-                              CopyComponentsLootFunction.m_tzmfkrqo(CopyComponentsLootFunction.C_zcqyfuyv.BLOCK_ENTITY)
-                                 .m_gbinruor(DataComponentTypes.POT_DECORATIONS)
+                              CopyComponentsLootFunction.builder(CopyComponentsLootFunction.Source.BLOCK_ENTITY).include(DataComponentTypes.POT_DECORATIONS)
                            )
                      )
                )


The remaining diff is too long!

@github-actions
Copy link

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/data/server/loot_table/ChestLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/ChestLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/ChestLootTableGenerator.java	2024-10-11 06:31:03.360213838 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/ChestLootTableGenerator.java	2024-10-11 06:29:55.336821827 +0000
@@ -57,7 +57,7 @@
                   .with(ItemEntry.builder(Items.GOLDEN_APPLE).weight(20))
                   .with(ItemEntry.builder(Items.ENCHANTED_GOLDEN_APPLE))
                   .with(ItemEntry.builder(Items.NAME_TAG).weight(30))
-                  .with(ItemEntry.builder(Items.BOOK).weight(10).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+                  .with(ItemEntry.builder(Items.BOOK).weight(10).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
                   .with(ItemEntry.builder(Items.IRON_PICKAXE).weight(5))
                   .with(EmptyEntry.builder().weight(5))
             )
@@ -141,8 +141,8 @@
                         .weight(1)
                         .apply(
                            SetStewEffectLootFunction.builder()
-                              .withEffect(StatusEffects.NIGHT_VISION, UniformLootNumberProvider.create(7.0F, 10.0F))
-                              .withEffect(StatusEffects.BLINDNESS, UniformLootNumberProvider.create(5.0F, 7.0F))
+                              .effect(StatusEffects.NIGHT_VISION, UniformLootNumberProvider.create(7.0F, 10.0F))
+                              .effect(StatusEffects.BLINDNESS, UniformLootNumberProvider.create(5.0F, 7.0F))
                         )
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(2.0F, 6.0F)))
                   )
@@ -201,7 +201,7 @@
                   .with(ItemEntry.builder(Items.GOLDEN_HORSE_ARMOR).weight(10))
                   .with(ItemEntry.builder(Items.IRON_HORSE_ARMOR).weight(15))
                   .with(ItemEntry.builder(Items.DIAMOND_HORSE_ARMOR).weight(5))
-                  .with(ItemEntry.builder(Items.BOOK).weight(10).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+                  .with(ItemEntry.builder(Items.BOOK).weight(10).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
             )
             .pool(
                LootPool.builder()
@@ -277,7 +277,8 @@
                   .with(ItemEntry.builder(Items.APPLE).weight(15).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F))))
                   .with(ItemEntry.builder(Items.IRON_PICKAXE))
                   .with(
-                     ItemEntry.builder(Items.BOOK).apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, ConstantLootNumberProvider.create(30.0F)))
+                     ItemEntry.builder(Items.BOOK)
+                        .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, ConstantLootNumberProvider.create(30.0F)))
                   )
             )
       );
@@ -297,21 +298,21 @@
                LootPool.builder()
                   .rolls(ConstantLootNumberProvider.create(1.0F))
                   .with(ItemEntry.builder(Items.GOLDEN_APPLE))
-                  .with(ItemEntry.builder(Items.BOOK).weight(5).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+                  .with(ItemEntry.builder(Items.BOOK).weight(5).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
                   .with(ItemEntry.builder(Items.LEATHER_CHESTPLATE))
                   .with(ItemEntry.builder(Items.GOLDEN_HELMET))
-                  .with(ItemEntry.builder(Items.FISHING_ROD).weight(5).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+                  .with(ItemEntry.builder(Items.FISHING_ROD).weight(5).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
                   .with(
                      ItemEntry.builder(Items.MAP)
                         .weight(10)
                         .apply(
                            ExplorationMapLootFunction.create()
-                              .withDestination(StructureTags.ON_TREASURE_MAPS)
-                              .withDecoration(MapDecorationTypes.RED_X)
-                              .withZoom((byte)1)
-                              .withSkipExistingChunks(false)
+                              .destination(StructureTags.ON_TREASURE_MAPS)
+                              .decoration(MapDecorationTypes.RED_X)
+                              .zoom((byte)1)
+                              .skipExistingChunks(false)
                         )
-                        .apply(SetNameLootFunction.m_qjkvclgt(Text.translatable("filled_map.buried_treasure"), SetNameLootFunction.C_pyscauma.ITEM_NAME))
+                        .apply(SetNameLootFunction.builder(Text.translatable("filled_map.buried_treasure"), SetNameLootFunction.Target.ITEM_NAME))
                   )
             )
       );
@@ -332,18 +333,18 @@
                   .rolls(ConstantLootNumberProvider.create(1.0F))
                   .with(ItemEntry.builder(Items.LEATHER_CHESTPLATE))
                   .with(ItemEntry.builder(Items.GOLDEN_HELMET))
-                  .with(ItemEntry.builder(Items.FISHING_ROD).weight(5).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+                  .with(ItemEntry.builder(Items.FISHING_ROD).weight(5).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
                   .with(
                      ItemEntry.builder(Items.MAP)
                         .weight(5)
                         .apply(
                            ExplorationMapLootFunction.create()
-                              .withDestination(StructureTags.ON_TREASURE_MAPS)
-                              .withDecoration(MapDecorationTypes.RED_X)
-                              .withZoom((byte)1)
-                              .withSkipExistingChunks(false)
+                              .destination(StructureTags.ON_TREASURE_MAPS)
+                              .decoration(MapDecorationTypes.RED_X)
+                              .zoom((byte)1)
+                              .skipExistingChunks(false)
                         )
-                        .apply(SetNameLootFunction.m_qjkvclgt(Text.translatable("filled_map.buried_treasure"), SetNameLootFunction.C_pyscauma.ITEM_NAME))
+                        .apply(SetNameLootFunction.builder(Text.translatable("filled_map.buried_treasure"), SetNameLootFunction.Target.ITEM_NAME))
                   )
             )
       );
@@ -622,15 +623,15 @@
                   .with(ItemEntry.builder(Items.FIRE_CHARGE).weight(40))
                   .with(ItemEntry.builder(Items.GOLDEN_APPLE).weight(15))
                   .with(ItemEntry.builder(Items.GOLD_NUGGET).weight(15).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(4.0F, 24.0F))))
-                  .with(ItemEntry.builder(Items.GOLDEN_SWORD).weight(15).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
-                  .with(ItemEntry.builder(Items.GOLDEN_AXE).weight(15).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
-                  .with(ItemEntry.builder(Items.GOLDEN_HOE).weight(15).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
-                  .with(ItemEntry.builder(Items.GOLDEN_SHOVEL).weight(15).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
-                  .with(ItemEntry.builder(Items.GOLDEN_PICKAXE).weight(15).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
-                  .with(ItemEntry.builder(Items.GOLDEN_BOOTS).weight(15).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
-                  .with(ItemEntry.builder(Items.GOLDEN_CHESTPLATE).weight(15).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
-                  .with(ItemEntry.builder(Items.GOLDEN_HELMET).weight(15).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
-                  .with(ItemEntry.builder(Items.GOLDEN_LEGGINGS).weight(15).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+                  .with(ItemEntry.builder(Items.GOLDEN_SWORD).weight(15).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
+                  .with(ItemEntry.builder(Items.GOLDEN_AXE).weight(15).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
+                  .with(ItemEntry.builder(Items.GOLDEN_HOE).weight(15).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
+                  .with(ItemEntry.builder(Items.GOLDEN_SHOVEL).weight(15).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
+                  .with(ItemEntry.builder(Items.GOLDEN_PICKAXE).weight(15).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
+                  .with(ItemEntry.builder(Items.GOLDEN_BOOTS).weight(15).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
+                  .with(ItemEntry.builder(Items.GOLDEN_CHESTPLATE).weight(15).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
+                  .with(ItemEntry.builder(Items.GOLDEN_HELMET).weight(15).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
+                  .with(ItemEntry.builder(Items.GOLDEN_LEGGINGS).weight(15).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
                   .with(
                      ItemEntry.builder(Items.GLISTERING_MELON_SLICE)
                         .weight(5)
@@ -829,7 +830,7 @@
                      ItemEntry.builder(Items.DIAMOND_AXE)
                         .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
                         .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.4F, 0.9F)))
-                        .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                        .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                         .weight(1)
                   )
                   .with(
@@ -872,7 +873,7 @@
                      ItemEntry.builder(Items.IRON_AXE)
                         .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
                         .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.4F, 0.9F)))
-                        .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                        .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                         .weight(1)
                   )
                   .with(ItemEntry.builder(Items.HONEYCOMB).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(2.0F, 8.0F))).weight(1))
@@ -909,22 +910,22 @@
                   .with(
                      ItemEntry.builder(Items.BOW)
                         .weight(3)
-                        .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(5.0F, 15.0F)))
+                        .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(5.0F, 15.0F)))
                   )
                   .with(
                      ItemEntry.builder(Items.CROSSBOW)
                         .weight(2)
-                        .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(5.0F, 20.0F)))
+                        .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(5.0F, 20.0F)))
                   )
                   .with(
                      ItemEntry.builder(Items.IRON_AXE)
                         .weight(2)
-                        .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(0.0F, 10.0F)))
+                        .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(0.0F, 10.0F)))
                   )
                   .with(
                      ItemEntry.builder(Items.IRON_CHESTPLATE)
                         .weight(2)
-                        .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(0.0F, 10.0F)))
+                        .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(0.0F, 10.0F)))
                   )
                   .with(ItemEntry.builder(Items.GOLDEN_CARROT).weight(2).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 2.0F))))
                   .with(
@@ -932,7 +933,7 @@
                         .weight(2)
                         .apply(
                            new EnchantRandomlyLootFunction.Builder()
-                              .m_kshsocad(
+                              .options(
                                  HolderSet.createDirect(
                                     lv.getHolderOrThrow(Enchantments.SHARPNESS),
                                     lv.getHolderOrThrow(Enchantments.BANE_OF_ARTHROPODS),
@@ -949,7 +950,7 @@
                         .weight(2)
                         .apply(
                            new EnchantRandomlyLootFunction.Builder()
-                              .m_kshsocad(
+                              .options(
                                  HolderSet.createDirect(
                                     lv.getHolderOrThrow(Enchantments.RIPTIDE),
                                     lv.getHolderOrThrow(Enchantments.LOYALTY),
@@ -963,12 +964,12 @@
                   .with(
                      ItemEntry.builder(Items.DIAMOND_CHESTPLATE)
                         .weight(1)
-                        .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(5.0F, 15.0F)))
+                        .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(5.0F, 15.0F)))
                   )
                   .with(
                      ItemEntry.builder(Items.DIAMOND_AXE)
                         .weight(1)
-                        .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(5.0F, 15.0F)))
+                        .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(5.0F, 15.0F)))
                   )
             )
       );
@@ -993,7 +994,7 @@
                      ItemEntry.builder(Items.OMINOUS_BOTTLE)
                         .weight(2)
                         .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
-                        .apply(SetOminousBottleLootFunction.m_brubuqjn(UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(SetOminousBottleLootFunction.builder(UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
                   .with(ItemEntry.builder(Items.WIND_CHARGE).weight(1).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(4.0F, 12.0F))))
                   .with(ItemEntry.builder(Items.DIAMOND).weight(1).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 2.0F))))
@@ -1029,7 +1030,7 @@
             .pool(
                LootPool.builder()
                   .rolls(ConstantLootNumberProvider.create(1.0F))
-                  .conditionally(RandomChanceLootCondition.m_dbenidbq(0.25F))
+                  .conditionally(RandomChanceLootCondition.conditionBuilder(0.25F))
                   .with(LootTableEntry.builder(LootTables.TRIAL_CHAMBERS_REWARD_UNIQUE_CHEST))
             )
       );
@@ -1044,25 +1045,25 @@
                   .with(
                      ItemEntry.builder(Items.CROSSBOW)
                         .weight(4)
-                        .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(5.0F, 20.0F)))
+                        .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(5.0F, 20.0F)))
                   )
                   .with(ItemEntry.builder(Items.GOLDEN_APPLE).weight(3))
                   .with(
                      ItemEntry.builder(Items.DIAMOND_AXE)
                         .weight(3)
-                        .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(10.0F, 20.0F)))
+                        .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(10.0F, 20.0F)))
                   )
                   .with(
                      ItemEntry.builder(Items.DIAMOND_CHESTPLATE)
                         .weight(3)
-                        .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(10.0F, 20.0F)))
+                        .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(10.0F, 20.0F)))
                   )
                   .with(
                      ItemEntry.builder(Items.BOOK)
                         .weight(2)
                         .apply(
                            new EnchantRandomlyLootFunction.Builder()
-                              .m_kshsocad(
+                              .options(
                                  HolderSet.createDirect(
                                     lv.getHolderOrThrow(Enchantments.KNOCKBACK),
                                     lv.getHolderOrThrow(Enchantments.PUNCH),
@@ -1078,7 +1079,7 @@
                         .weight(2)
                         .apply(
                            new EnchantRandomlyLootFunction.Builder()
-                              .m_kshsocad(HolderSet.createDirect(lv.getHolderOrThrow(Enchantments.BREACH), lv.getHolderOrThrow(Enchantments.DENSITY)))
+                              .options(HolderSet.createDirect(lv.getHolderOrThrow(Enchantments.BREACH), lv.getHolderOrThrow(Enchantments.DENSITY)))
                         )
                   )
                   .with(
@@ -1086,7 +1087,7 @@
                         .weight(2)
                         .apply(
                            new SetEnchantmentsLootFunction.Builder()
-                              .m_emjssomh(lv.getHolderOrThrow(Enchantments.WIND_BURST), ConstantLootNumberProvider.create(1.0F))
+                              .enchantment(lv.getHolderOrThrow(Enchantments.WIND_BURST), ConstantLootNumberProvider.create(1.0F))
                         )
                   )
                   .with(ItemEntry.builder(Items.DIAMOND_BLOCK).weight(1))
@@ -1111,7 +1112,7 @@
                      ItemEntry.builder(Items.OMINOUS_BOTTLE)
                         .weight(1)
                         .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
-                        .apply(SetOminousBottleLootFunction.m_brubuqjn(UniformLootNumberProvider.create(2.0F, 4.0F)))
+                        .apply(SetOminousBottleLootFunction.builder(UniformLootNumberProvider.create(2.0F, 4.0F)))
                   )
             )
       );
@@ -1145,7 +1146,7 @@
             .pool(
                LootPool.builder()
                   .rolls(ConstantLootNumberProvider.create(1.0F))
-                  .conditionally(RandomChanceLootCondition.m_dbenidbq(0.75F))
+                  .conditionally(RandomChanceLootCondition.conditionBuilder(0.75F))
                   .with(LootTableEntry.builder(LootTables.TRIAL_CHAMBERS_REWARD_OMINOUS_UNIQUE_CHEST))
             )
       );
@@ -1290,12 +1291,12 @@
                      .weight(10)
                      .apply(
                         SetStewEffectLootFunction.builder()
-                           .withEffect(StatusEffects.NIGHT_VISION, UniformLootNumberProvider.create(7.0F, 10.0F))
-                           .withEffect(StatusEffects.JUMP_BOOST, UniformLootNumberProvider.create(7.0F, 10.0F))
-                           .withEffect(StatusEffects.WEAKNESS, UniformLootNumberProvider.create(6.0F, 8.0F))
-                           .withEffect(StatusEffects.BLINDNESS, UniformLootNumberProvider.create(5.0F, 7.0F))
-                           .withEffect(StatusEffects.POISON, UniformLootNumberProvider.create(10.0F, 20.0F))
-                           .withEffect(StatusEffects.SATURATION, UniformLootNumberProvider.create(7.0F, 10.0F))
+                           .effect(StatusEffects.NIGHT_VISION, UniformLootNumberProvider.create(7.0F, 10.0F))
+                           .effect(StatusEffects.JUMP_BOOST, UniformLootNumberProvider.create(7.0F, 10.0F))
+                           .effect(StatusEffects.WEAKNESS, UniformLootNumberProvider.create(6.0F, 8.0F))
+                           .effect(StatusEffects.BLINDNESS, UniformLootNumberProvider.create(5.0F, 7.0F))
+                           .effect(StatusEffects.POISON, UniformLootNumberProvider.create(10.0F, 20.0F))
+                           .effect(StatusEffects.SATURATION, UniformLootNumberProvider.create(7.0F, 10.0F))
                      )
                )
                .with(ItemEntry.builder(Items.COAL).weight(6).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(2.0F, 8.0F))))
@@ -1304,10 +1305,10 @@
                .with(ItemEntry.builder(Blocks.BAMBOO).weight(2).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F))))
                .with(ItemEntry.builder(Items.GUNPOWDER).weight(3).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 5.0F))))
                .with(ItemEntry.builder(Blocks.TNT).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 2.0F))))
-               .with(ItemEntry.builder(Items.LEATHER_HELMET).weight(3).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
-               .with(ItemEntry.builder(Items.LEATHER_CHESTPLATE).weight(3).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
-               .with(ItemEntry.builder(Items.LEATHER_LEGGINGS).weight(3).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
-               .with(ItemEntry.builder(Items.LEATHER_BOOTS).weight(3).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+               .with(ItemEntry.builder(Items.LEATHER_HELMET).weight(3).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
+               .with(ItemEntry.builder(Items.LEATHER_CHESTPLATE).weight(3).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
+               .with(ItemEntry.builder(Items.LEATHER_LEGGINGS).weight(3).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
+               .with(ItemEntry.builder(Items.LEATHER_BOOTS).weight(3).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
          )
          .pool(
             LootPool.builder()
@@ -1334,12 +1335,12 @@
                   ItemEntry.builder(Items.MAP)
                      .apply(
                         ExplorationMapLootFunction.create()
-                           .withDestination(StructureTags.ON_TREASURE_MAPS)
-                           .withDecoration(MapDecorationTypes.RED_X)
-                           .withZoom((byte)1)
-                           .withSkipExistingChunks(false)
+                           .destination(StructureTags.ON_TREASURE_MAPS)
+                           .decoration(MapDecorationTypes.RED_X)
+                           .zoom((byte)1)
+                           .skipExistingChunks(false)
                      )
-                     .apply(SetNameLootFunction.m_qjkvclgt(Text.translatable("filled_map.buried_treasure"), SetNameLootFunction.C_pyscauma.ITEM_NAME))
+                     .apply(SetNameLootFunction.builder(Text.translatable("filled_map.buried_treasure"), SetNameLootFunction.Target.ITEM_NAME))
                )
          )
          .pool(
@@ -1377,14 +1378,14 @@
                   ItemEntry.builder(Items.DIAMOND_SHOVEL)
                      .weight(15)
                      .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.15F, 0.8F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(
                   ItemEntry.builder(Items.DIAMOND_PICKAXE)
                      .weight(12)
                      .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.15F, 0.95F)))
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(ItemEntry.builder(Items.NETHERITE_SCRAP).weight(8).apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F))))
                .with(ItemEntry.builder(Items.ANCIENT_DEBRIS).weight(12).apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F))))
@@ -1400,7 +1401,7 @@
                .with(
                   ItemEntry.builder(Items.GOLDEN_AXE)
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(ItemEntry.builder(Blocks.CRYING_OBSIDIAN).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 5.0F))))
                .with(ItemEntry.builder(Blocks.GLOWSTONE).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(3.0F, 6.0F))))
@@ -1447,7 +1448,7 @@
                .with(
                   ItemEntry.builder(Items.CROSSBOW)
                      .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.1F, 0.5F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(ItemEntry.builder(Items.SPECTRAL_ARROW).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(10.0F, 28.0F))))
                .with(ItemEntry.builder(Blocks.GILDED_BLACKSTONE).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(8.0F, 12.0F))))
@@ -1459,27 +1460,27 @@
                .with(
                   ItemEntry.builder(Items.GOLDEN_CHESTPLATE)
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(
                   ItemEntry.builder(Items.GOLDEN_HELMET)
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(
                   ItemEntry.builder(Items.GOLDEN_LEGGINGS)
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(
                   ItemEntry.builder(Items.GOLDEN_BOOTS)
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(
                   ItemEntry.builder(Items.GOLDEN_AXE)
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
          )
          .pool(
@@ -1526,72 +1527,72 @@
                .with(
                   ItemEntry.builder(Items.DIAMOND_SWORD)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(
                   ItemEntry.builder(Items.DIAMOND_BOOTS)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(
                   ItemEntry.builder(Items.DIAMOND_CHESTPLATE)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(
                   ItemEntry.builder(Items.DIAMOND_LEGGINGS)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(
                   ItemEntry.builder(Items.DIAMOND_HELMET)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(
                   ItemEntry.builder(Items.DIAMOND_PICKAXE)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(
                   ItemEntry.builder(Items.DIAMOND_SHOVEL)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(
                   ItemEntry.builder(Items.IRON_SWORD)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(
                   ItemEntry.builder(Items.IRON_BOOTS)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(
                   ItemEntry.builder(Items.IRON_CHESTPLATE)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(
                   ItemEntry.builder(Items.IRON_LEGGINGS)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(
                   ItemEntry.builder(Items.IRON_HELMET)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(
                   ItemEntry.builder(Items.IRON_PICKAXE)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(
                   ItemEntry.builder(Items.IRON_SHOVEL)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
          )
          .pool(
@@ -1649,31 +1650,31 @@
                   ItemEntry.builder(Items.DIAMOND_SWORD)
                      .weight(6)
                      .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.8F, 1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(
                   ItemEntry.builder(Items.DIAMOND_CHESTPLATE)
                      .weight(6)
                      .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.8F, 1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(
                   ItemEntry.builder(Items.DIAMOND_HELMET)
                      .weight(6)
                      .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.8F, 1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(
                   ItemEntry.builder(Items.DIAMOND_LEGGINGS)
                      .weight(6)
                      .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.8F, 1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(
                   ItemEntry.builder(Items.DIAMOND_BOOTS)
                      .weight(6)
                      .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.8F, 1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(ItemEntry.builder(Items.DIAMOND_SWORD).weight(6))
                .with(ItemEntry.builder(Items.DIAMOND_CHESTPLATE).weight(5))
@@ -1719,14 +1720,14 @@
                   ItemEntry.builder(Items.DIAMOND_PICKAXE)
                      .weight(6)
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(ItemEntry.builder(Items.DIAMOND_SHOVEL).weight(6).apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F))))
                .with(
                   ItemEntry.builder(Items.CROSSBOW)
                      .weight(6)
                      .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.1F, 0.9F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(ItemEntry.builder(Items.ANCIENT_DEBRIS).weight(12).apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F))))
                .with(ItemEntry.builder(Items.NETHERITE_SCRAP).weight(4).apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F))))
@@ -1738,7 +1739,7 @@
                .with(
                   ItemEntry.builder(Items.BOOK)
                      .weight(10)
-                     .apply(new EnchantRandomlyLootFunction.Builder().m_blmnznah(lv.getHolderOrThrow(Enchantments.SOUL_SPEED)))
+                     .apply(new EnchantRandomlyLootFunction.Builder().option(lv.getHolderOrThrow(Enchantments.SOUL_SPEED)))
                )
          )
          .pool(
@@ -1749,18 +1750,18 @@
                      .weight(2)
                      .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.1F, 0.9F)))
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(ItemEntry.builder(Blocks.IRON_BLOCK).weight(2).apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F))))
                .with(
                   ItemEntry.builder(Items.GOLDEN_BOOTS)
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
-                     .apply(new EnchantRandomlyLootFunction.Builder().m_blmnznah(lv.getHolderOrThrow(Enchantments.SOUL_SPEED)))
+                     .apply(new EnchantRandomlyLootFunction.Builder().option(lv.getHolderOrThrow(Enchantments.SOUL_SPEED)))
                )
                .with(
                   ItemEntry.builder(Items.GOLDEN_AXE)
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(ItemEntry.builder(Blocks.GOLD_BLOCK).weight(2).apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F))))
                .with(ItemEntry.builder(Items.CROSSBOW).apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F))))
@@ -1819,7 +1820,7 @@
                .with(ItemEntry.builder(Items.CHAINMAIL_CHESTPLATE).weight(10))
                .with(ItemEntry.builder(Items.DIAMOND_HOE).weight(15))
                .with(ItemEntry.builder(Items.DIAMOND_CHESTPLATE).weight(5))
-               .with(ItemEntry.builder(Items.BOOK).weight(10).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+               .with(ItemEntry.builder(Items.BOOK).weight(10).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
          )
          .pool(
             LootPool.builder()
@@ -1867,7 +1868,7 @@
                .with(
                   ItemEntry.builder(Items.BOOK)
                      .weight(10)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, ConstantLootNumberProvider.create(30.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, ConstantLootNumberProvider.create(30.0F)))
                )
          )
          .pool(LootPool.builder().rolls(ConstantLootNumberProvider.create(1.0F)).with(ItemEntry.builder(Items.EYE_ARMOR_TRIM_SMITHING_TEMPLATE).weight(1)));
@@ -1901,7 +1902,10 @@
                .with(ItemEntry.builder(Items.GOLDEN_HORSE_ARMOR))
                .with(ItemEntry.builder(Items.DIAMOND_HORSE_ARMOR))
                .with(ItemEntry.builder(Items.MUSIC_DISC_OTHERSIDE))
-               .with(ItemEntry.builder(Items.BOOK).apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, ConstantLootNumberProvider.create(30.0F))))
+               .with(
+                  ItemEntry.builder(Items.BOOK)
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, ConstantLootNumberProvider.create(30.0F)))
+               )
          )
          .pool(
             LootPool.builder()
@@ -1933,7 +1937,7 @@
                      .weight(2)
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
                      .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.8F, 1.0F)))
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(30.0F, 50.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(30.0F, 50.0F)))
                )
                .with(ItemEntry.builder(Items.LEAD).weight(2).apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F))))
                .with(ItemEntry.builder(Items.DIAMOND_HORSE_ARMOR).weight(2).apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F))))
@@ -1943,12 +1947,12 @@
                .with(
                   ItemEntry.builder(Items.DIAMOND_LEGGINGS)
                      .weight(2)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(30.0F, 50.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(30.0F, 50.0F)))
                )
                .with(
                   ItemEntry.builder(Items.BOOK)
                      .weight(3)
-                     .apply(new EnchantRandomlyLootFunction.Builder().m_blmnznah(lv.getHolderOrThrow(Enchantments.SWIFT_SNEAK)))
+                     .apply(new EnchantRandomlyLootFunction.Builder().option(lv.getHolderOrThrow(Enchantments.SWIFT_SNEAK)))
                )
                .with(ItemEntry.builder(Items.SCULK).weight(3).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(4.0F, 10.0F))))
                .with(ItemEntry.builder(Items.SCULK_SENSOR).weight(3).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F))))
@@ -1959,7 +1963,7 @@
                .with(
                   ItemEntry.builder(Items.IRON_LEGGINGS)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(ItemEntry.builder(Items.ECHO_SHARD).weight(4).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F))))
                .with(ItemEntry.builder(Items.DISC_FRAGMENT_5).weight(4).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F))))
@@ -1969,7 +1973,7 @@
                      .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F)))
                      .apply(SetPotionFunction.builder(Potions.STRONG_REGENERATION))
                )
-               .with(ItemEntry.builder(Items.BOOK).weight(5).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+               .with(ItemEntry.builder(Items.BOOK).weight(5).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
                .with(ItemEntry.builder(Items.BOOK).weight(5).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(3.0F, 10.0F))))
                .with(ItemEntry.builder(Items.BONE).weight(5).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 15.0F))))
                .with(ItemEntry.builder(Items.SOUL_TORCH).weight(5).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 15.0F))))
@@ -2004,7 +2008,10 @@
                .with(ItemEntry.builder(Items.IRON_HORSE_ARMOR))
                .with(ItemEntry.builder(Items.GOLDEN_HORSE_ARMOR))
                .with(ItemEntry.builder(Items.DIAMOND_HORSE_ARMOR))
-               .with(ItemEntry.builder(Items.BOOK).apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, ConstantLootNumberProvider.create(30.0F))))
+               .with(
+                  ItemEntry.builder(Items.BOOK)
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, ConstantLootNumberProvider.create(30.0F)))
+               )
          )
          .pool(
             LootPool.builder()
@@ -2079,7 +2086,7 @@
                .with(ItemEntry.builder(Items.ARROW).weight(4).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(2.0F, 7.0F))))
                .with(ItemEntry.builder(Items.TRIPWIRE_HOOK).weight(3).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F))))
                .with(ItemEntry.builder(Items.IRON_INGOT).weight(3).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F))))
-               .with(ItemEntry.builder(Items.BOOK).weight(1).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+               .with(ItemEntry.builder(Items.BOOK).weight(1).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
          )
          .pool(
             LootPool.builder()
@@ -2119,7 +2126,7 @@
                .with(ItemEntry.builder(Items.IRON_HORSE_ARMOR).weight(15))
                .with(ItemEntry.builder(Items.GOLDEN_HORSE_ARMOR).weight(10))
                .with(ItemEntry.builder(Items.DIAMOND_HORSE_ARMOR).weight(5))
-               .with(ItemEntry.builder(Items.BOOK).weight(20).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+               .with(ItemEntry.builder(Items.BOOK).weight(20).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
                .with(ItemEntry.builder(Items.GOLDEN_APPLE).weight(20))
                .with(ItemEntry.builder(Items.ENCHANTED_GOLDEN_APPLE).weight(2))
                .with(EmptyEntry.builder().weight(15))
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/EntityLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/EntityLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/EntityLootTableGenerator.java	2024-10-11 06:31:03.290212405 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/EntityLootTableGenerator.java	2024-10-11 06:29:55.219819423 +0000
@@ -49,9 +49,10 @@
  */
 public abstract class EntityLootTableGenerator implements LootTableGenerator {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_qjcpnzik Lnet/minecraft/unmapped/C_egeqzyvk;f_qjcpnzik:Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;}
+    * @mapping {@literal named registries Lnet/minecraft/data/server/loot_table/EntityLootTableGenerator;registries:Lnet/minecraft/registry/HolderLookup$Provider;}
     */
-   protected final HolderLookup.Provider f_qjcpnzik;
+   protected final HolderLookup.Provider registries;
    /**
     * @mapping {@literal hashed f_pordewqu Lnet/minecraft/unmapped/C_egeqzyvk;f_pordewqu:Lnet/minecraft/unmapped/C_czxxrbcp;}
     * @mapping {@literal named allowedFeatures Lnet/minecraft/data/server/loot_table/EntityLootTableGenerator;allowedFeatures:Lnet/minecraft/feature_flags/FeatureFlagBitSet;}
@@ -72,7 +73,7 @@
     * Mapping not found
     */
    protected final AnyOfLootCondition.Builder m_xqssttdx() {
-      HolderLookup.RegistryLookup<Enchantment> lv = this.f_qjcpnzik.getLookupOrThrow(RegistryKeys.ENCHANTMENT);
+      HolderLookup.RegistryLookup<Enchantment> lv = this.registries.getLookupOrThrow(RegistryKeys.ENCHANTMENT);
       return AnyOfLootCondition.create(
          EntityPropertiesLootCondition.builder(
             LootContext.EntityTarget.THIS, EntityPredicate.Builder.create().flags(EntityFlagsPredicate.Builder.create().onFire(true))
@@ -98,18 +99,18 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_egeqzyvk;<init>(Lnet/minecraft/unmapped/C_czxxrbcp;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V}
     * @mapping {@literal named <init> Lnet/minecraft/data/server/loot_table/EntityLootTableGenerator;<init>(Lnet/minecraft/feature_flags/FeatureFlagBitSet;Lnet/minecraft/registry/HolderLookup$Provider;)V}
     */
-   protected EntityLootTableGenerator(FeatureFlagBitSet arg, HolderLookup.Provider arg2) {
-      this(arg, arg, arg2);
+   protected EntityLootTableGenerator(FeatureFlagBitSet requiredFeatures, HolderLookup.Provider registries) {
+      this(requiredFeatures, requiredFeatures, registries);
    }
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_egeqzyvk;<init>(Lnet/minecraft/unmapped/C_czxxrbcp;Lnet/minecraft/unmapped/C_czxxrbcp;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V}
     * @mapping {@literal named <init> Lnet/minecraft/data/server/loot_table/EntityLootTableGenerator;<init>(Lnet/minecraft/feature_flags/FeatureFlagBitSet;Lnet/minecraft/feature_flags/FeatureFlagBitSet;Lnet/minecraft/registry/HolderLookup$Provider;)V}
     */
-   protected EntityLootTableGenerator(FeatureFlagBitSet allowedFeatures, FeatureFlagBitSet requiredFeatures, HolderLookup.Provider arg3) {
+   protected EntityLootTableGenerator(FeatureFlagBitSet allowedFeatures, FeatureFlagBitSet requiredFeatures, HolderLookup.Provider registries) {
       this.allowedFeatures = allowedFeatures;
       this.requiredFeatures = requiredFeatures;
-      this.f_qjcpnzik = arg3;
+      this.registries = registries;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/EquipmentLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/EquipmentLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/EquipmentLootTableGenerator.java	2024-10-11 06:31:03.372214084 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/EquipmentLootTableGenerator.java	2024-10-11 06:29:55.349822094 +0000
@@ -63,14 +63,14 @@
                      ItemEntry.builder(Items.IRON_SWORD)
                         .apply(
                            new SetEnchantmentsLootFunction.Builder()
-                              .m_emjssomh(lv3.getHolderOrThrow(Enchantments.SHARPNESS), ConstantLootNumberProvider.create(1.0F))
+                              .enchantment(lv3.getHolderOrThrow(Enchantments.SHARPNESS), ConstantLootNumberProvider.create(1.0F))
                         )
                   )
                   .with(
                      ItemEntry.builder(Items.IRON_SWORD)
                         .apply(
                            new SetEnchantmentsLootFunction.Builder()
-                              .m_emjssomh(lv3.getHolderOrThrow(Enchantments.KNOCKBACK), ConstantLootNumberProvider.create(1.0F))
+                              .enchantment(lv3.getHolderOrThrow(Enchantments.KNOCKBACK), ConstantLootNumberProvider.create(1.0F))
                         )
                   )
                   .with(ItemEntry.builder(Items.DIAMOND_SWORD))
@@ -88,14 +88,14 @@
                      ItemEntry.builder(Items.BOW)
                         .apply(
                            new SetEnchantmentsLootFunction.Builder()
-                              .m_emjssomh(lv3.getHolderOrThrow(Enchantments.POWER), ConstantLootNumberProvider.create(1.0F))
+                              .enchantment(lv3.getHolderOrThrow(Enchantments.POWER), ConstantLootNumberProvider.create(1.0F))
                         )
                   )
                   .with(
                      ItemEntry.builder(Items.BOW)
                         .apply(
                            new SetEnchantmentsLootFunction.Builder()
-                              .m_emjssomh(lv3.getHolderOrThrow(Enchantments.PUNCH), ConstantLootNumberProvider.create(1.0F))
+                              .enchantment(lv3.getHolderOrThrow(Enchantments.PUNCH), ConstantLootNumberProvider.create(1.0F))
                         )
                   )
             )
@@ -103,37 +103,38 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_fdxfyfno Lnet/minecraft/unmapped/C_noaidmgc;m_fdxfyfno(Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_vglbnrob;Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl;)Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu;}
+    * @mapping {@literal named m_fdxfyfno Lnet/minecraft/data/server/loot_table/EquipmentLootTableGenerator;m_fdxfyfno(Lnet/minecraft/item/Item;Lnet/minecraft/item/Item;Lnet/minecraft/item/trim/ArmorTrimPermutation;Lnet/minecraft/registry/HolderLookup$RegistryLookup;)Lnet/minecraft/loot/LootTable$Builder;}
     */
-   public static LootTable.Builder m_fdxfyfno(Item arg, Item arg2, ArmorTrimPermutation arg3, HolderLookup.RegistryLookup<Enchantment> arg4) {
+   public static LootTable.Builder m_fdxfyfno(Item arg, Item arg2, ArmorTrimPermutation value, HolderLookup.RegistryLookup<Enchantment> arg4) {
       return LootTable.builder()
          .pool(
             LootPool.builder()
                .rolls(ConstantLootNumberProvider.create(1.0F))
-               .conditionally(RandomChanceLootCondition.m_dbenidbq(0.5F))
+               .conditionally(RandomChanceLootCondition.conditionBuilder(0.5F))
                .with(
                   ItemEntry.builder(arg)
-                     .apply(SetComponentsLootFunction.m_ehhrxiiv(DataComponentTypes.TRIM, arg3))
+                     .apply(SetComponentsLootFunction.builder(DataComponentTypes.TRIM, value))
                      .apply(
                         new SetEnchantmentsLootFunction.Builder()
-                           .m_emjssomh(arg4.getHolderOrThrow(Enchantments.PROTECTION), ConstantLootNumberProvider.create(4.0F))
-                           .m_emjssomh(arg4.getHolderOrThrow(Enchantments.PROJECTILE_PROTECTION), ConstantLootNumberProvider.create(4.0F))
-                           .m_emjssomh(arg4.getHolderOrThrow(Enchantments.FIRE_PROTECTION), ConstantLootNumberProvider.create(4.0F))
+                           .enchantment(arg4.getHolderOrThrow(Enchantments.PROTECTION), ConstantLootNumberProvider.create(4.0F))
+                           .enchantment(arg4.getHolderOrThrow(Enchantments.PROJECTILE_PROTECTION), ConstantLootNumberProvider.create(4.0F))
+                           .enchantment(arg4.getHolderOrThrow(Enchantments.FIRE_PROTECTION), ConstantLootNumberProvider.create(4.0F))
                      )
                )
          )
          .pool(
             LootPool.builder()
                .rolls(ConstantLootNumberProvider.create(1.0F))
-               .conditionally(RandomChanceLootCondition.m_dbenidbq(0.5F))
+               .conditionally(RandomChanceLootCondition.conditionBuilder(0.5F))
                .with(
                   ItemEntry.builder(arg2)
-                     .apply(SetComponentsLootFunction.m_ehhrxiiv(DataComponentTypes.TRIM, arg3))
+                     .apply(SetComponentsLootFunction.builder(DataComponentTypes.TRIM, value))
                      .apply(
                         new SetEnchantmentsLootFunction.Builder()
-                           .m_emjssomh(arg4.getHolderOrThrow(Enchantments.PROTECTION), ConstantLootNumberProvider.create(4.0F))
-                           .m_emjssomh(arg4.getHolderOrThrow(Enchantments.PROJECTILE_PROTECTION), ConstantLootNumberProvider.create(4.0F))
-                           .m_emjssomh(arg4.getHolderOrThrow(Enchantments.FIRE_PROTECTION), ConstantLootNumberProvider.create(4.0F))
+                           .enchantment(arg4.getHolderOrThrow(Enchantments.PROTECTION), ConstantLootNumberProvider.create(4.0F))
+                           .enchantment(arg4.getHolderOrThrow(Enchantments.PROJECTILE_PROTECTION), ConstantLootNumberProvider.create(4.0F))
+                           .enchantment(arg4.getHolderOrThrow(Enchantments.FIRE_PROTECTION), ConstantLootNumberProvider.create(4.0F))
                      )
                )
          );
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/FishingLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/FishingLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/FishingLootTableGenerator.java	2024-10-11 06:31:03.097208454 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/FishingLootTableGenerator.java	2024-10-11 06:29:54.942813732 +0000
@@ -104,15 +104,16 @@
                   .with(
                      ItemEntry.builder(Items.BOW)
                         .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.0F, 0.25F)))
-                        .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, ConstantLootNumberProvider.create(30.0F)))
+                        .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, ConstantLootNumberProvider.create(30.0F)))
                   )
                   .with(
                      ItemEntry.builder(Items.FISHING_ROD)
                         .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.0F, 0.25F)))
-                        .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, ConstantLootNumberProvider.create(30.0F)))
+                        .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, ConstantLootNumberProvider.create(30.0F)))
                   )
                   .with(
-                     ItemEntry.builder(Items.BOOK).apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, ConstantLootNumberProvider.create(30.0F)))
+                     ItemEntry.builder(Items.BOOK)
+                        .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, ConstantLootNumberProvider.create(30.0F)))
                   )
                   .with(ItemEntry.builder(Items.NAUTILUS_SHELL))
             )

Please sign in to comment.