Skip to content

Commit

Permalink
Merge branch 'refs/heads/1.21' into fork/pyrox0/another-mappings-branch
Browse files Browse the repository at this point in the history 
# Conflicts:
#	buildSrc/src/main/resources/minecraft_specific_words.txt
#	mappings/net/minecraft/block/Blocks.mapping
#	mappings/net/minecraft/datafixer/fix/EmptyItemInVillagerTradeFix.mapping
#	mappings/net/minecraft/datafixer/fix/JukeboxTicksSinceSongStartedFix.mapping
#	mappings/net/minecraft/datafixer/fix/OptionsMenuBlurrinessFix.mapping
#	mappings/net/minecraft/datafixer/fix/ParticleUnflatteningFix.mapping
#	mappings/net/minecraft/datafixer/schema/Schema3818v5.mapping
#	mappings/net/minecraft/datafixer/schema/Schema3938.mapping
  • Loading branch information
@ix0rai
ix0rai committed Jul 5, 2024
2 parents 2ba11a6 + 847bcf7 commit 568183d
Show file tree
Hide file tree
Showing 29 changed files with 122 additions and 19 deletions.
9 changes: 8 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,14 @@ maven { url = "https://maven.quiltmc.org/repository/release/" }
QM versions are named after the Minecraft version they target, followed by `+build.x`,
with `x` being a number that increments with each new build of QM for that Minecraft version.
For example, `1.18.2+build.1` is the first build of QM for Minecraft `1.18.2`. You can see additional
information and see what the latest QM build for each Minecraft version is with [LambdAurora's import tool](https://lambdaurora.dev/tools/import_quilt.html).
information and see what the latest QM build for each Minecraft version is with the [quilt import tool][quilt-import-tool].
(For automatic queries, try the [versions API][quilt-meta-api-mappings-version-by-game-version].)

[quilt-import-tool]: https://quiltmc.org/en/usage/latest-versions/
[quilt-meta-api-mappings-version-by-game-version]: https://meta.quiltmc.org/#/v3/get_v3_versions_quilt_mappings__game_version_




## Contributing to QM

Expand Down
7 changes: 4 additions & 3 deletions buildSrc/src/main/resources/minecraft_specific_words.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,7 @@ bsol
// color codes
ffff

//remove
lrgsdfwv
bfxofopn
// remove
zbvyjshu
ciosvisu

3 changes: 3 additions & 0 deletions mappings/com/mojang/blaze3d/glfw/Window.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ CLASS net/minecraft/unmapped/C_snosbckc com/mojang/blaze3d/glfw/Window
FIELD f_fiepgowd width I
FIELD f_fiobfsrq windowedX I
FIELD f_flcmttvk monitorTracker Lnet/minecraft/unmapped/C_andxluqa;
FIELD f_gfspdhqb BASE_WIDTH I
FIELD f_gtahwemo vsync Z
FIELD f_iptpuuif windowedHeight I
FIELD f_kghwbcrm eventHandler Lnet/minecraft/unmapped/C_aljqnbab;
FIELD f_lxoizzkt handle J
FIELD f_mfwlewkh scaledWidth I
FIELD f_myqjgeex windowedWidth I
FIELD f_nhnmlenj x I
FIELD f_njxrorbx BASE_HEIGHT I
FIELD f_oizwxgpn videoModeDirty Z
FIELD f_sqdduaqv y I
FIELD f_sybspsfq LOGGER Lorg/slf4j/Logger;
Expand Down Expand Up @@ -43,6 +45,7 @@ CLASS net/minecraft/unmapped/C_snosbckc com/mojang/blaze3d/glfw/Window
ARG 1 window
ARG 3 width
ARG 4 height
METHOD m_dxtquvzd getPlatform ()Ljava/lang/String;
METHOD m_edfmlinr getHeight ()I
METHOD m_epqhgokp setWindowedSize (II)V
ARG 1 width
Expand Down
11 changes: 7 additions & 4 deletions mappings/net/minecraft/block/Blocks.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ CLASS net/minecraft/unmapped/C_jricjyva net/minecraft/block/Blocks
ARG 0 dyeColor
ARG 1 mapColor
METHOD m_fnlerawu (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ogavsvbr;)Z
ARG 3 entityType
ARG 0 state
ARG 1 world
ARG 2 pos
ARG 3 type
METHOD m_fwewvidj legacyStairsOf (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_mmxmpdoq;
METHOD m_ghajpyfj register (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_mmxmpdoq;
METHOD m_gtmmdkuy leavesOf (Lnet/minecraft/unmapped/C_aevintex;)Lnet/minecraft/unmapped/C_mmxmpdoq;
Expand All @@ -20,7 +23,7 @@ CLASS net/minecraft/unmapped/C_jricjyva net/minecraft/block/Blocks
METHOD m_kgmpoexx pottedVariant (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_mmxmpdoq;
METHOD m_knkwxiyx solid (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;)Z
METHOD m_mjiljkwg register (Ljava/lang/String;Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_mmxmpdoq;
ARG 0 type
ARG 0 id
METHOD m_nmstzpxh spawnable (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ogavsvbr;)Ljava/lang/Boolean;
ARG 3 entityType
METHOD m_pelkwenc luminanceOf (I)Ljava/util/function/ToIntFunction;
Expand All @@ -34,10 +37,10 @@ CLASS net/minecraft/unmapped/C_jricjyva net/minecraft/block/Blocks
ARG 0 sticky
METHOD m_sidkwvli createStoneButton ()Lnet/minecraft/unmapped/C_mmxmpdoq;
METHOD m_tetaodtf rebuildShapeCache ()V
METHOD m_tobwsgju waterlogMapColor (Lnet/minecraft/unmapped/C_mlrprqox;)Ljava/util/function/Function;
ARG 0 color
METHOD m_tldmwsps (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ogavsvbr;)Z
ARG 3 entityType
METHOD m_tobwsgju mapColorOf (Lnet/minecraft/unmapped/C_mlrprqox;)Ljava/util/function/Function;
ARG 0 mapColor
METHOD m_uvuszloo logOf (Lnet/minecraft/unmapped/C_mlrprqox;Lnet/minecraft/unmapped/C_mlrprqox;Lnet/minecraft/unmapped/C_aevintex;)Lnet/minecraft/unmapped/C_mmxmpdoq;
ARG 0 topColor
ARG 1 sideColor
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/DecoratedPotPattern.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CLASS net/minecraft/unmapped/C_xtwumkqz net/minecraft/block/DecoratedPotPattern
8 changes: 7 additions & 1 deletion mappings/net/minecraft/block/DecoratedPotPatterns.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
CLASS net/minecraft/unmapped/C_hzdaoazh net/minecraft/block/DecoratedPotPatterns
FIELD f_tssagzls PATTERNS_BY_SHARDS Ljava/util/Map;
FIELD f_tssagzls PATTERNS_BY_ITEM Ljava/util/Map;
METHOD m_aoeizaaw createRegistryKey (Ljava/lang/String;)Lnet/minecraft/unmapped/C_xhhleach;
ARG 0 id
METHOD m_hoejuqye registerPatterns (Lnet/minecraft/unmapped/C_tqxyjqsk;)Lnet/minecraft/unmapped/C_xtwumkqz;
ARG 0 registry
METHOD m_xrykbbna getPattern (Lnet/minecraft/unmapped/C_vorddnax;)Lnet/minecraft/unmapped/C_xhhleach;
ARG 0 sherd
METHOD m_ynjeyckb register (Lnet/minecraft/unmapped/C_tqxyjqsk;Lnet/minecraft/unmapped/C_xhhleach;Ljava/lang/String;)Lnet/minecraft/unmapped/C_xtwumkqz;
ARG 0 registry
ARG 1 registryKey
ARG 2 path
2 changes: 1 addition & 1 deletion ...net/minecraft/block/sign/SignType.mapping → ...ings/net/minecraft/block/WoodType.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_xlaykyai net/minecraft/block/sign/SignType
CLASS net/minecraft/unmapped/C_xlaykyai net/minecraft/block/WoodType
FIELD f_bklshwff SPRUCE Lnet/minecraft/unmapped/C_xlaykyai;
FIELD f_ceylskkb CHERRY Lnet/minecraft/unmapped/C_xlaykyai;
FIELD f_gejzauba CODEC Lcom/mojang/serialization/Codec;
Expand Down
12 changes: 12 additions & 0 deletions mappings/net/minecraft/block/dispenser/ItemDispenserBehavior.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,20 @@ CLASS net/minecraft/unmapped/C_dnfsxzwl net/minecraft/block/dispenser/ItemDispen
METHOD m_clhynwvb dispenseSilently (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 1 pointer
ARG 2 stack
METHOD m_fhxczazc (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)V
ARG 1 pointer
ARG 2 stack
METHOD m_hdvxaiaq consumeWithRemainder (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 1 pointer
ARG 2 stack
ARG 3 remainder
METHOD m_nvxshqvu playSound (Lnet/minecraft/unmapped/C_wzdnszcs;)V
ARG 1 pointer
METHOD m_umjaspru playDefaultSound (Lnet/minecraft/unmapped/C_wzdnszcs;)V
ARG 0 pointer
METHOD m_yfabkxkw (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_xpuuihxf;)V
ARG 0 pointer
ARG 1 direction
METHOD m_zoenssci spawnItem (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_sddaxwyk;ILnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_ogbhoqwb;)V
ARG 0 world
ARG 1 stack
Expand Down
5 changes: 4 additions & 1 deletion mappings/net/minecraft/block/sapling/SaplingBlock.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
CLASS net/minecraft/unmapped/C_zzbhjpvq net/minecraft/block/sapling/SaplingBlock
FIELD f_cewxtiqp SHAPE_OFFSET F
FIELD f_tbvcakjw generator Lnet/minecraft/unmapped/C_hupbiznx;
FIELD f_tbvcakjw grower Lnet/minecraft/unmapped/C_hupbiznx;
FIELD f_tqtogbrh SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
FIELD f_xgrwkids CODEC Lcom/mojang/serialization/MapCodec;
FIELD f_xkirgufi STAGE Lnet/minecraft/unmapped/C_vltzvhxi;
METHOD <init> (Lnet/minecraft/unmapped/C_hupbiznx;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V
ARG 1 grower
ARG 2 settings
METHOD m_gklqfuty (Lnet/minecraft/unmapped/C_zzbhjpvq;)Lnet/minecraft/unmapped/C_hupbiznx;
ARG 0 block
Expand All @@ -13,3 +14,5 @@ CLASS net/minecraft/unmapped/C_zzbhjpvq net/minecraft/block/sapling/SaplingBlock
ARG 2 pos
ARG 3 state
ARG 4 random
METHOD m_qjteoxnk (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
17 changes: 14 additions & 3 deletions ...ngs/net/minecraft/block/WoodTypes.mapping → ...inecraft/block/sapling/TreeGrower.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CLASS net/minecraft/unmapped/C_hupbiznx net/minecraft/block/WoodTypes
FIELD f_bmfivbdv WOOD_TYPES Ljava/util/Map;
CLASS net/minecraft/unmapped/C_hupbiznx net/minecraft/block/sapling/TreeGrower
FIELD f_bmfivbdv TREE_GROWERS Ljava/util/Map;
FIELD f_hlsdagvb beesVariant Ljava/util/Optional;
FIELD f_jrpsmwcm CODEC Lcom/mojang/serialization/Codec;
FIELD f_mkaxrjzq rareBeesVariant Ljava/util/Optional;
Expand All @@ -9,10 +9,21 @@ CLASS net/minecraft/unmapped/C_hupbiznx net/minecraft/block/WoodTypes
FIELD f_xhlwbmgk megaVariant Ljava/util/Optional;
FIELD f_yayjufwl rareChance F
FIELD f_zcchjqbb rareMegaVariant Ljava/util/Optional;
METHOD m_lfmzuxpy (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_kgfalbim;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_rlomrsco;)Z
METHOD m_hgluxdjt (Lnet/minecraft/unmapped/C_hupbiznx;)Ljava/lang/String;
ARG 0 grower
METHOD m_lfmzuxpy growTree (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_kgfalbim;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_rlomrsco;)Z
ARG 1 world
ARG 2 generator
ARG 3 pos
ARG 4 state
ARG 5 random
METHOD m_owklgdcw getMegaConfiguredFeature (Lnet/minecraft/unmapped/C_rlomrsco;)Lnet/minecraft/unmapped/C_xhhleach;
ARG 1 random
METHOD m_purdvmhu areFlowersNearby (Lnet/minecraft/unmapped/C_vdvbsyle;Lnet/minecraft/unmapped/C_hynzadkk;)Z
ARG 1 world
METHOD m_sdzqrysu getConfiguredFeature (Lnet/minecraft/unmapped/C_rlomrsco;Z)Lnet/minecraft/unmapped/C_xhhleach;
ARG 1 random
ARG 2 bees
METHOD m_vmivrjhv canGenerateLargeTree (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;II)Z
ARG 3 x
ARG 4 z
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/MinecraftClient.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ CLASS net/minecraft/unmapped/C_ayfeobid net/minecraft/client/MinecraftClient
COMMENT The Minecraft client instance may be obtained using {@link MinecraftClient#getInstance()}.
COMMENT
COMMENT <p>Rendering on a Minecraft client is split into several facilities.
COMMENT The primary entrypoint for rendering is {@link net.minecraft.client.render.GameRenderer#render(net.minecraft.unmapped.C_lrgsdfwv, boolean)}.
COMMENT The primary entrypoint for rendering is {@link net.minecraft.client.render.GameRenderer#render(net.minecraft.client.render.DeltaTracker, boolean)}.
COMMENT <div class="quilt"><table border=1>
COMMENT <caption>Rendering facilities</caption>
COMMENT <tr>
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/client/gui/screen/GameMenuScreen.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ CLASS net/minecraft/unmapped/C_gxawvqxt net/minecraft/client/gui/screen/GameMenu
FIELD f_ekbxlsnv SEND_FEEDBACK Lnet/minecraft/unmapped/C_rdaqiwdt;
FIELD f_gbcgghlp PAUSED Lnet/minecraft/unmapped/C_rdaqiwdt;
FIELD f_igrcbiod DRAFT_REPORT Lnet/minecraft/unmapped/C_ncpywfca;
FIELD f_jqicrmms SERVER_LINKS Lnet/minecraft/unmapped/C_rdaqiwdt;
FIELD f_kthxtzib BUTTON_PADDING I
FIELD f_kwpuicut FULL_BUTTON_WIDTH I
FIELD f_mmoakwau PLAYER_REPORTING Lnet/minecraft/unmapped/C_rdaqiwdt;
Expand All @@ -17,6 +18,7 @@ CLASS net/minecraft/unmapped/C_gxawvqxt net/minecraft/client/gui/screen/GameMenu
FIELD f_vjmldoku OPTIONS Lnet/minecraft/unmapped/C_rdaqiwdt;
FIELD f_vslrmggb RETURN_TO_MENU Lnet/minecraft/unmapped/C_rdaqiwdt;
FIELD f_vvnclzsg SHARE_TO_LAN Lnet/minecraft/unmapped/C_rdaqiwdt;
FIELD f_wqcewayi FEEDBACK Lnet/minecraft/unmapped/C_rdaqiwdt;
FIELD f_ymykknxo RETURN_TO_GAME Lnet/minecraft/unmapped/C_rdaqiwdt;
FIELD f_yzrhtlpn ADVANCEMENTS Lnet/minecraft/unmapped/C_rdaqiwdt;
METHOD <init> (Z)V
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/client/gui/screen/GenericMessageScreen.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CLASS net/minecraft/unmapped/C_yfulyots net/minecraft/client/gui/screen/GenericMessageScreen
FIELD f_gbhvsydi textWidget Lnet/minecraft/unmapped/C_rugqjeey;
11 changes: 11 additions & 0 deletions mappings/net/minecraft/client/gui/screen/multiplayer/ServerLinksScreen.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
CLASS net/minecraft/unmapped/C_miigerkk net/minecraft/client/gui/screen/multiplayer/ServerLinksScreen
FIELD f_nlhyrwzi TITLE Lnet/minecraft/unmapped/C_rdaqiwdt;
FIELD f_srlpzpll parent Lnet/minecraft/unmapped/C_wrmtlwqx;
METHOD <init> (Lnet/minecraft/unmapped/C_wrmtlwqx;Lnet/minecraft/unmapped/C_ouodvkzu;)V
ARG 1 parent
CLASS C_karntkix ServerLinksElementListWidget
METHOD <init> (Lnet/minecraft/unmapped/C_ayfeobid;ILnet/minecraft/unmapped/C_miigerkk;)V
ARG 1 client
ARG 2 width
CLASS C_lflnyghd Entry
FIELD f_glhvxdzj button Lnet/minecraft/unmapped/C_kpvuxmkp;
6 changes: 3 additions & 3 deletions mappings/net/minecraft/client/gui/widget/list/EntryListWidget.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ CLASS net/minecraft/unmapped/C_nmdfcqgq net/minecraft/client/gui/widget/list/Ent
FIELD f_wgvjqamc client Lnet/minecraft/unmapped/C_ayfeobid;
FIELD f_ymsrddlp renderHeader Z
METHOD <init> (Lnet/minecraft/unmapped/C_ayfeobid;IIII)V
ARG 2 y
ARG 3 width
ARG 4 height
ARG 2 width
ARG 3 height
ARG 4 y
METHOD m_bpkgbhiy nextEntry (Lnet/minecraft/unmapped/C_veciqgge;Ljava/util/function/Predicate;)Lnet/minecraft/unmapped/C_nmdfcqgq$C_rzayyeiy;
ARG 1 direction
ARG 2 predicate
Expand Down
16 changes: 16 additions & 0 deletions mappings/net/minecraft/client/render/DeltaTracker.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
CLASS net/minecraft/unmapped/C_lrgsdfwv net/minecraft/client/render/DeltaTracker
CLASS C_xwflveoj
FIELD f_kxcketak millisPerTick F
FIELD f_opjnojmc paused Z
FIELD f_qomgdqti targetMillisPerTickProvider Lit/unimi/dsi/fastutil/floats/FloatUnaryOperator;
FIELD f_urahvjiy frozen Z
FIELD f_yepfcxoc lastMillis J
METHOD <init> (FJLit/unimi/dsi/fastutil/floats/FloatUnaryOperator;)V
ARG 1 ticksPerSecond
ARG 4 targetMillisPerTickProvider
METHOD m_aemcsiqk pause ()V
METHOD m_dhhbrjet setFrozen (Z)V
ARG 1 frozen
METHOD m_dnvmgdut setPaused (Z)V
ARG 1 paused
METHOD m_kjbaofzm unpause ()V
2 changes: 2 additions & 0 deletions mappings/net/minecraft/client/render/entity/EntityRenderers.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ CLASS net/minecraft/unmapped/C_qcsjcrtc net/minecraft/client/render/entity/Entit
FIELD f_zddgwxtw LOGGER Lorg/slf4j/Logger;
METHOD m_anmoehia reloadPlayerRenderers (Lnet/minecraft/unmapped/C_ycdfjsnw$C_bnclqjzp;)Ljava/util/Map;
ARG 0 ctx
METHOD m_bfxnqarg (Lnet/minecraft/unmapped/C_ycdfjsnw$C_bnclqjzp;)Lnet/minecraft/unmapped/C_oddtxnnw;
ARG 0 ctx
METHOD m_brctolmh isMissingRendererFactories ()Z
METHOD m_cfkkaomj (Lnet/minecraft/unmapped/C_ycdfjsnw$C_bnclqjzp;)Lnet/minecraft/unmapped/C_oddtxnnw;
ARG 0 ctx
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/client/render/entity/OminousItemSpawnerEntityRenderer.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CLASS net/minecraft/unmapped/C_djwyalez net/minecraft/client/render/entity/OminousItemSpawnerEntityRenderer
FIELD f_xtrpvluu itemRenderer Lnet/minecraft/unmapped/C_xjqetogb;
1 change: 1 addition & 0 deletions mappings/net/minecraft/data/server/tag/TradeRebalanceEnchantmentTagsProvider.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CLASS net/minecraft/unmapped/C_vdecfbtc net/minecraft/data/server/tag/TradeRebalanceEnchantmentTagsProvider
5 changes: 5 additions & 0 deletions mappings/net/minecraft/datafixer/fix/AttributeModifierIdFix.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
CLASS net/minecraft/unmapped/C_zjsuejaf net/minecraft/datafixer/fix/AttributeModifierIdFix
METHOD m_jffrakte fixModifiers (Ljava/util/stream/Stream;)Ljava/util/stream/Stream;
METHOD m_omvogmer fixAttribute (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
METHOD m_smnezcpi fixItemStackComponents (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
METHOD m_tuhonugx fixEntity (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;
1 change: 1 addition & 0 deletions mappings/net/minecraft/datafixer/fix/ChoiceWriteReadFix.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ CLASS net/minecraft/unmapped/C_gydoytis net/minecraft/datafixer/fix/ChoiceWriteR
ARG 2 changesType
METHOD m_btslnupd makeRule (Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/types/Type;)Lcom/mojang/datafixers/TypeRewriteRule;
METHOD m_vsyiwjgp makeRule (Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/types/Type;)Lcom/mojang/datafixers/TypeRewriteRule;
METHOD m_yugdcpvb fix (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
METHOD makeRule makeRule ()Lcom/mojang/datafixers/TypeRewriteRule;
3 changes: 3 additions & 0 deletions mappings/net/minecraft/datafixer/fix/EmptyItemInVillagerTradeFix.mapping
View file
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
CLASS net/minecraft/unmapped/C_rmfftleh net/minecraft/datafixer/fix/EmptyItemInVillagerTradeFix
METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;)V
ARG 1 schema
METHOD makeRule makeRule ()Lcom/mojang/datafixers/TypeRewriteRule;
4 changes: 4 additions & 0 deletions mappings/net/minecraft/datafixer/fix/JukeboxTicksSinceSongStartedFix.mapping
View file
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
CLASS net/minecraft/unmapped/C_ndmcqqzd net/minecraft/datafixer/fix/JukeboxTicksSinceSongStartedFix
METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;)V
ARG 1 schema
METHOD m_yhbejfjb fix (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
ARG 1 dynamic
2 changes: 2 additions & 0 deletions mappings/net/minecraft/datafixer/fix/OptionsMenuBlurrinessFix.mapping
View file
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
CLASS net/minecraft/unmapped/C_vhatytxj net/minecraft/datafixer/fix/OptionsMenuBlurrinessFix
METHOD m_esjqxzws convertToIntRange (Ljava/lang/String;)I
METHOD makeRule makeRule ()Lcom/mojang/datafixers/TypeRewriteRule;
1 change: 1 addition & 0 deletions mappings/net/minecraft/datafixer/fix/ParticleUnflatteningFix.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
CLASS net/minecraft/unmapped/C_asohzhmn net/minecraft/datafixer/fix/ParticleUnflatteningFix
METHOD m_llilnhnp parseTag (Ljava/lang/String;)Lnet/minecraft/unmapped/C_hhlwcnih;
ARG 0 tag
METHOD makeRule makeRule ()Lcom/mojang/datafixers/TypeRewriteRule;
2 changes: 2 additions & 0 deletions mappings/net/minecraft/datafixer/fix/RemoveEmptyItemInBrushableBlockFix.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CLASS net/minecraft/unmapped/C_dxtlxcwy net/minecraft/datafixer/fix/RemoveEmptyItemInBrushableBlockFix
METHOD m_grqceiyr isEmptyStack (Lcom/mojang/serialization/Dynamic;)Z
1 change: 1 addition & 0 deletions mappings/net/minecraft/nbt/NbtCrashException.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CLASS net/minecraft/unmapped/C_gjgvzuad net/minecraft/nbt/NbtCrashException
2 changes: 1 addition & 1 deletion mappings/net/minecraft/world/WorldEvents.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ CLASS net/minecraft/unmapped/C_kkbhcwdu net/minecraft/world/WorldEvents
FIELD f_ptnwublh TRAVEL_THROUGH_PORTAL I
COMMENT A Portal is traveled through.
COMMENT <br>Plays the portal travel sound event directly through the client's sound manager.
COMMENT <p>Called by {@link net.minecraft.server.network.ServerPlayerEntity#moveToWorld(net.minecraft.entity.Entity$C_bfxofopn) ServerPlayerEntity#moveToWorld}
COMMENT <p>Called by {@link net.minecraft.unmapped.C_zbvyjshu#m_ciosvisu(net.minecraft.entity.Entity) C_zbvyjshu#m_ciosvisu}
FIELD f_qpsvcqne BLAZE_SHOOTS I
COMMENT A Blaze shoots a fireball or a Fire Charge is shot by a dispenser.
COMMENT <br>Plays the blaze shoot sound event.
Expand Down
1 change: 1 addition & 0 deletions simple_type_field_names.json5
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@
"bakedModel"
]
},
"net/minecraft/unmapped/C_lrgsdfwv": "tracker", // DeltaTracker

// Server
"net/minecraft/unmapped/C_aqemmrby": "tracer",
Expand Down

3 comments on commit 568183d

@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 568183d, 125 file(s) were updated with 1046 line(s) added and 942 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
diff -bur namedTargetSrc/net/minecraft/block/Block.java namedSrc/net/minecraft/block/Block.java
--- namedTargetSrc/net/minecraft/block/Block.java	2024-07-05 03:14:40.768201938 +0000
+++ namedSrc/net/minecraft/block/Block.java	2024-07-05 03:13:33.095786774 +0000
@@ -866,7 +866,7 @@
     * @mapping {@literal hashed m_xfcybcsi Lnet/minecraft/unmapped/C_mmxmpdoq;m_xfcybcsi(Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_vorddnax$C_rdhfmrgz;Ljava/util/List;Lnet/minecraft/unmapped/C_taebrtdw;)V}
     * @mapping {@literal named appendTooltip Lnet/minecraft/block/Block;appendTooltip(Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/Item$TooltipContext;Ljava/util/List;Lnet/minecraft/client/item/TooltipConfig;)V}
     */
-   public void appendTooltip(ItemStack stack, Item.TooltipContext arg2, List<Text> tooltip, TooltipConfig options) {
+   public void appendTooltip(ItemStack stack, Item.TooltipContext tooltipContext, List<Text> tooltip, TooltipConfig options) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/Blocks.java namedSrc/net/minecraft/block/Blocks.java
--- namedTargetSrc/net/minecraft/block/Blocks.java	2024-07-05 03:14:40.568200697 +0000
+++ namedSrc/net/minecraft/block/Blocks.java	2024-07-05 03:13:32.915785660 +0000
@@ -3229,7 +3229,7 @@
             .strength(0.5F)
             .sounds(BlockSoundGroup.GLASS)
             .nonOpaque()
-            .allowsSpawning((state, world, pos, arg4) -> arg4 == EntityType.POLAR_BEAR)
+            .allowsSpawning((state, world, pos, entityType) -> entityType == EntityType.POLAR_BEAR)
             .solidBlock(Blocks::nonSolid)
       )
    );
@@ -7181,7 +7181,7 @@
             .toolRequired()
             .luminance(state -> 3)
             .strength(0.5F)
-            .allowsSpawning((state, world, pos, arg4) -> arg4.isFireImmune())
+            .allowsSpawning((state, world, pos, entityType) -> entityType.isFireImmune())
             .postProcess(Blocks::solid)
             .emissiveLighting(Blocks::solid)
       )
diff -bur namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java namedSrc/net/minecraft/block/DecoratedPotBlock.java
--- namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java	2024-07-05 03:14:40.500200274 +0000
+++ namedSrc/net/minecraft/block/DecoratedPotBlock.java	2024-07-05 03:13:32.855785289 +0000
@@ -289,8 +289,8 @@
     * Mapping not found
     */
    @Override
-   public void appendTooltip(ItemStack stack, Item.TooltipContext arg2, List<Text> tooltip, TooltipConfig options) {
-      super.appendTooltip(stack, arg2, tooltip, options);
+   public void appendTooltip(ItemStack stack, Item.TooltipContext tooltipContext, List<Text> tooltip, TooltipConfig options) {
+      super.appendTooltip(stack, tooltipContext, tooltip, options);
       Sherds lv = stack.getOrDefault(DataComponentTypes.POT_DECORATIONS, Sherds.DEFAULT);
       if (!lv.equals(Sherds.DEFAULT)) {
          tooltip.add(CommonTexts.EMPTY);
diff -bur namedTargetSrc/net/minecraft/block/dispenser/DispenserBlock.java namedSrc/net/minecraft/block/dispenser/DispenserBlock.java
--- namedTargetSrc/net/minecraft/block/dispenser/DispenserBlock.java	2024-07-05 03:14:40.580200771 +0000
+++ namedSrc/net/minecraft/block/dispenser/DispenserBlock.java	2024-07-05 03:13:32.919785685 +0000
@@ -69,14 +69,15 @@
     */
    public static final BooleanProperty TRIGGERED = Properties.TRIGGERED;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_xxtgryhz Lnet/minecraft/unmapped/C_sridforj;f_xxtgryhz:Lnet/minecraft/unmapped/C_dnfsxzwl;}
+    * @mapping {@literal named DEFAULT_BEHAVIOR Lnet/minecraft/block/dispenser/DispenserBlock;DEFAULT_BEHAVIOR:Lnet/minecraft/block/dispenser/ItemDispenserBehavior;}
     */
-   private static final ItemDispenserBehavior f_xxtgryhz = new ItemDispenserBehavior();
+   private static final ItemDispenserBehavior DEFAULT_BEHAVIOR = new ItemDispenserBehavior();
    /**
     * @mapping {@literal hashed f_bkwqoovv Lnet/minecraft/unmapped/C_sridforj;f_bkwqoovv:Ljava/util/Map;}
     * @mapping {@literal named BEHAVIORS Lnet/minecraft/block/dispenser/DispenserBlock;BEHAVIORS:Ljava/util/Map;}
     */
-   public static final Map<Item, DispenserBehavior> BEHAVIORS = Util.make(new Object2ObjectOpenHashMap<>(), map -> map.defaultReturnValue(f_xxtgryhz));
+   public static final Map<Item, DispenserBehavior> BEHAVIORS = Util.make(new Object2ObjectOpenHashMap<>(), map -> map.defaultReturnValue(DEFAULT_BEHAVIOR));
    /**
     * @mapping {@literal hashed f_etrjkrot Lnet/minecraft/unmapped/C_sridforj;f_etrjkrot:I}
     * @mapping {@literal named SCHEDULED_TICK_DELAY Lnet/minecraft/block/dispenser/DispenserBlock;SCHEDULED_TICK_DELAY:I}
@@ -167,7 +168,7 @@
     * @mapping {@literal named getBehaviorForItem Lnet/minecraft/block/dispenser/DispenserBlock;getBehaviorForItem(Lnet/minecraft/world/World;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/block/dispenser/DispenserBehavior;}
     */
    protected DispenserBehavior getBehaviorForItem(World world, ItemStack stack) {
-      return (DispenserBehavior)(!stack.isEnabled(world.getEnabledFlags()) ? f_xxtgryhz : (DispenserBehavior)BEHAVIORS.get(stack.getItem()));
+      return (DispenserBehavior)(!stack.isEnabled(world.getEnabledFlags()) ? DEFAULT_BEHAVIOR : (DispenserBehavior)BEHAVIORS.get(stack.getItem()));
    }
 
    /**
@@ -219,18 +220,21 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_tfzksanp Lnet/minecraft/unmapped/C_sridforj;m_tfzksanp(Lnet/minecraft/unmapped/C_wzdnszcs;)Lnet/minecraft/unmapped/C_ogbhoqwb;}
+    * @mapping {@literal named m_tfzksanp Lnet/minecraft/block/dispenser/DispenserBlock;m_tfzksanp(Lnet/minecraft/util/math/BlockPointer;)Lnet/minecraft/util/math/Position;}
     */
-   public static Position m_tfzksanp(BlockPointer arg) {
-      return m_kmtowdxh(arg, 0.7, Vec3d.ZERO);
+   public static Position m_tfzksanp(BlockPointer block) {
+      return m_kmtowdxh(block, 0.7, Vec3d.ZERO);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_kmtowdxh Lnet/minecraft/unmapped/C_sridforj;m_kmtowdxh(Lnet/minecraft/unmapped/C_wzdnszcs;DLnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_ogbhoqwb;}
+    * @mapping {@literal named m_kmtowdxh Lnet/minecraft/block/dispenser/DispenserBlock;m_kmtowdxh(Lnet/minecraft/util/math/BlockPointer;DLnet/minecraft/util/math/Vec3d;)Lnet/minecraft/util/math/Position;}
     */
-   public static Position m_kmtowdxh(BlockPointer arg, double d, Vec3d arg2) {
-      Direction lv = arg.state().get(FACING);
-      return arg.center().add(d * (double)lv.getOffsetX() + arg2.getX(), d * (double)lv.getOffsetY() + arg2.getY(), d * (double)lv.getOffsetZ() + arg2.getZ());
+   public static Position m_kmtowdxh(BlockPointer block, double d, Vec3d arg2) {
+      Direction lv = block.state().get(FACING);
+      return block.center()
+         .add(d * (double)lv.getOffsetX() + arg2.getX(), d * (double)lv.getOffsetY() + arg2.getY(), d * (double)lv.getOffsetZ() + arg2.getZ());
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/dispenser/ProjectileDispenserBehavior.java namedSrc/net/minecraft/block/dispenser/ProjectileDispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/ProjectileDispenserBehavior.java	2024-07-05 03:14:40.656201243 +0000
+++ namedSrc/net/minecraft/block/dispenser/ProjectileDispenserBehavior.java	2024-07-05 03:13:32.987786106 +0000
@@ -20,9 +20,10 @@
     */
    private final ProjectileItem projectile;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_uupspuna Lnet/minecraft/unmapped/C_bcbkqaaq;f_uupspuna:Lnet/minecraft/unmapped/C_dokwmwgh$C_jscrvllj;}
+    * @mapping {@literal named dispenserConfig Lnet/minecraft/block/dispenser/ProjectileDispenserBehavior;dispenserConfig:Lnet/minecraft/item/ProjectileItem$DispenserConfig;}
     */
-   private final ProjectileItem.DispenserConfig f_uupspuna;
+   private final ProjectileItem.DispenserConfig dispenserConfig;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_bcbkqaaq;<init>(Lnet/minecraft/unmapped/C_vorddnax;)V}
@@ -31,7 +32,7 @@
    public ProjectileDispenserBehavior(Item item) {
       if (item instanceof ProjectileItem lv) {
          this.projectile = lv;
-         this.f_uupspuna = lv.createDispenserConfig();
+         this.dispenserConfig = lv.createDispenserConfig();
       } else {
          throw new IllegalArgumentException(item + " not instance of " + ProjectileItem.class.getSimpleName());
       }
@@ -44,11 +45,11 @@
    public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
       World lv = pointer.world();
       Direction lv2 = pointer.state().get(DispenserBlock.FACING);
-      Position lv3 = this.f_uupspuna.positionFunction().getDispensePosition(pointer, lv2);
+      Position lv3 = this.dispenserConfig.positionFunction().getDispensePosition(pointer, lv2);
       ProjectileEntity lv4 = this.projectile.createEntity(lv, lv3, stack, lv2);
       this.projectile
          .initializeProjectile(
-            lv4, (double)lv2.getOffsetX(), (double)lv2.getOffsetY(), (double)lv2.getOffsetZ(), this.f_uupspuna.power(), this.f_uupspuna.uncertainty()
+            lv4, (double)lv2.getOffsetX(), (double)lv2.getOffsetY(), (double)lv2.getOffsetZ(), this.dispenserConfig.power(), this.dispenserConfig.uncertainty()
          );
       lv.spawnEntity(lv4);
       stack.decrement(1);
@@ -60,6 +61,6 @@
     */
    @Override
    protected void playSound(BlockPointer pointer) {
-      pointer.world().syncWorldEvent(this.f_uupspuna.overrideDispenseEvent().orElse(1002), pointer.pos(), 0);
+      pointer.world().syncWorldEvent(this.dispenserConfig.overrideDispenseEvent().orElse(1002), pointer.pos(), 0);
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/entity/BannerBlockEntity.java namedSrc/net/minecraft/block/entity/BannerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BannerBlockEntity.java	2024-07-05 03:14:40.612200970 +0000
+++ namedSrc/net/minecraft/block/entity/BannerBlockEntity.java	2024-07-05 03:13:32.947785858 +0000
@@ -52,9 +52,10 @@
     */
    private DyeColor baseColor;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_yqkmzniy Lnet/minecraft/unmapped/C_mwamopji;f_yqkmzniy:Lnet/minecraft/unmapped/C_wwbphpbp;}
+    * @mapping {@literal named defaultPatternComponent Lnet/minecraft/block/entity/BannerBlockEntity;defaultPatternComponent:Lnet/minecraft/component/type/BannerPatternsComponent;}
     */
-   private BannerPatternsComponent f_yqkmzniy = BannerPatternsComponent.DEFAULT;
+   private BannerPatternsComponent defaultPatternComponent = BannerPatternsComponent.DEFAULT;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_mwamopji;<init>(Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V}
@@ -78,8 +79,8 @@
     * @mapping {@literal hashed m_igihlswz Lnet/minecraft/unmapped/C_mwamopji;m_igihlswz(Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_arllgqae;)V}
     * @mapping {@literal named m_igihlswz Lnet/minecraft/block/entity/BannerBlockEntity;m_igihlswz(Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/DyeColor;)V}
     */
-   public void m_igihlswz(ItemStack stack, DyeColor arg2) {
-      this.baseColor = arg2;
+   public void m_igihlswz(ItemStack stack, DyeColor dyeColor) {
+      this.baseColor = dyeColor;
       this.m_rloeylgt(stack);
    }
 
@@ -106,9 +107,10 @@
    @Override
    protected void writeNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
       super.writeNbt(nbt, lookupProvider);
-      if (!this.f_yqkmzniy.equals(BannerPatternsComponent.DEFAULT)) {
+      if (!this.defaultPatternComponent.equals(BannerPatternsComponent.DEFAULT)) {
          nbt.put(
-            "patterns", BannerPatternsComponent.CODEC.encodeStart(lookupProvider.createSerializationContext(NbtOps.INSTANCE), this.f_yqkmzniy).getOrThrow()
+            "patterns",
+            BannerPatternsComponent.CODEC.encodeStart(lookupProvider.createSerializationContext(NbtOps.INSTANCE), this.defaultPatternComponent).getOrThrow()
          );
       }
 
@@ -131,7 +133,7 @@
          BannerPatternsComponent.CODEC
             .parse(arg2.createSerializationContext(NbtOps.INSTANCE), arg.get("patterns"))
             .resultOrPartial(string -> LOGGER.error("Failed to parse banner patterns: '{}'", string))
-            .ifPresent(argx -> this.f_yqkmzniy = argx);
+            .ifPresent(argx -> this.defaultPatternComponent = argx);
       }
    }
 
@@ -155,7 +157,7 @@
     * Mapping not found
     */
    public BannerPatternsComponent m_kmayejyb() {
-      return this.f_yqkmzniy;
+      return this.defaultPatternComponent;
    }
 
    /**
@@ -182,7 +184,7 @@
    @Override
    protected void m_cckjpvhm(BlockEntity.C_uyhxhbrv arg) {
       super.m_cckjpvhm(arg);
-      this.f_yqkmzniy = arg.m_uwrxlczq(DataComponentTypes.BANNER_PATTERNS, BannerPatternsComponent.DEFAULT);
+      this.defaultPatternComponent = arg.m_uwrxlczq(DataComponentTypes.BANNER_PATTERNS, BannerPatternsComponent.DEFAULT);
       this.customName = arg.m_gotgrppy(DataComponentTypes.CUSTOM_NAME);
    }
 
@@ -192,7 +194,7 @@
    @Override
    protected void m_apmtvpji(DataComponentMap.Builder arg) {
       super.m_apmtvpji(arg);
-      arg.put(DataComponentTypes.BANNER_PATTERNS, this.f_yqkmzniy);
+      arg.put(DataComponentTypes.BANNER_PATTERNS, this.defaultPatternComponent);
       arg.put(DataComponentTypes.CUSTOM_NAME, this.customName);
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/BlockEntityType.java namedSrc/net/minecraft/block/entity/BlockEntityType.java
--- namedTargetSrc/net/minecraft/block/entity/BlockEntityType.java	2024-07-05 03:14:40.652201218 +0000
+++ namedSrc/net/minecraft/block/entity/BlockEntityType.java	2024-07-05 03:13:32.983786081 +0000
@@ -11,7 +11,6 @@
 import net.minecraft.registry.Holder;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
-import net.minecraft.unmapped.C_zwjpeqhx;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.BlockPos;
@@ -159,8 +158,8 @@
     * @mapping {@literal hashed f_kfuqpyym Lnet/minecraft/unmapped/C_wgqvodus;f_kfuqpyym:Lnet/minecraft/unmapped/C_wgqvodus;}
     * @mapping {@literal named ENCHANTING_TABLE Lnet/minecraft/block/entity/BlockEntityType;ENCHANTING_TABLE:Lnet/minecraft/block/entity/BlockEntityType;}
     */
-   public static final BlockEntityType<C_zwjpeqhx> ENCHANTING_TABLE = create(
-      "enchanting_table", BlockEntityType.Builder.create(C_zwjpeqhx::new, Blocks.ENCHANTING_TABLE)
+   public static final BlockEntityType<EnchantingTableBlockEntity> ENCHANTING_TABLE = create(
+      "enchanting_table", BlockEntityType.Builder.create(EnchantingTableBlockEntity::new, Blocks.ENCHANTING_TABLE)
    );
    /**
     * @mapping {@literal hashed f_vyyhsqle Lnet/minecraft/unmapped/C_wgqvodus;f_vyyhsqle:Lnet/minecraft/unmapped/C_wgqvodus;}
Only in namedSrc/net/minecraft/block/entity: EnchantingTableBlockEntity.java
diff -bur namedTargetSrc/net/minecraft/block/FlowerBlock.java namedSrc/net/minecraft/block/FlowerBlock.java
--- namedTargetSrc/net/minecraft/block/FlowerBlock.java	2024-07-05 03:14:40.720201640 +0000
+++ namedSrc/net/minecraft/block/FlowerBlock.java	2024-07-05 03:13:33.047786477 +0000
@@ -59,8 +59,8 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_zhojkkij;<init>(Lnet/minecraft/unmapped/C_cjzoxshv;FLnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
     * @mapping {@literal named <init> Lnet/minecraft/block/FlowerBlock;<init>(Lnet/minecraft/registry/Holder;FLnet/minecraft/block/AbstractBlock$Settings;)V}
     */
-   public FlowerBlock(Holder<StatusEffect> effect, float f, AbstractBlock.Settings settings) {
-      this(getEffects(effect, f), settings);
+   public FlowerBlock(Holder<StatusEffect> effect, float duration, AbstractBlock.Settings settings) {
+      this(getEffects(effect, duration), settings);
    }
 
    /**
@@ -76,8 +76,8 @@
     * @mapping {@literal hashed m_eohzikrf Lnet/minecraft/unmapped/C_zhojkkij;m_eohzikrf(Lnet/minecraft/unmapped/C_cjzoxshv;F)Lnet/minecraft/unmapped/C_ceasgpks;}
     * @mapping {@literal named getEffects Lnet/minecraft/block/FlowerBlock;getEffects(Lnet/minecraft/registry/Holder;F)Lnet/minecraft/component/type/SuspiciousStewEffectsComponent;}
     */
-   protected static SuspiciousStewEffectsComponent getEffects(Holder<StatusEffect> effect, float f) {
-      return new SuspiciousStewEffectsComponent(List.of(new SuspiciousStewEffectsComponent.Entry(effect, MathHelper.floor(f * 20.0F))));
+   protected static SuspiciousStewEffectsComponent getEffects(Holder<StatusEffect> effect, float duration) {
+      return new SuspiciousStewEffectsComponent(List.of(new SuspiciousStewEffectsComponent.Entry(effect, MathHelper.floor(duration * 20.0F))));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/ShulkerBoxBlock.java namedSrc/net/minecraft/block/ShulkerBoxBlock.java
--- namedTargetSrc/net/minecraft/block/ShulkerBoxBlock.java	2024-07-05 03:14:40.648201193 +0000
+++ namedSrc/net/minecraft/block/ShulkerBoxBlock.java	2024-07-05 03:13:32.979786056 +0000
@@ -59,9 +59,10 @@
             .apply(instance, (optional, settings) -> new ShulkerBoxBlock((DyeColor)optional.orElse(null), settings))
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ihshplar Lnet/minecraft/unmapped/C_buvdtidq;f_ihshplar:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+    * @mapping {@literal named UNKNOWN_CONTENTS_TEXT Lnet/minecraft/block/ShulkerBoxBlock;UNKNOWN_CONTENTS_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text f_ihshplar = Text.translatable("container.shulkerBox.unknownContents");
+   private static final Text UNKNOWN_CONTENTS_TEXT = Text.translatable("container.shulkerBox.unknownContents");
    /**
     * @mapping {@literal hashed f_mzseguaj Lnet/minecraft/unmapped/C_buvdtidq;f_mzseguaj:F}
     * @mapping {@literal named OPEN_BOX_SIZE Lnet/minecraft/block/ShulkerBoxBlock;OPEN_BOX_SIZE:F}
@@ -277,10 +278,10 @@
     * Mapping not found
     */
    @Override
-   public void appendTooltip(ItemStack stack, Item.TooltipContext arg2, List<Text> tooltip, TooltipConfig options) {
-      super.appendTooltip(stack, arg2, tooltip, options);
+   public void appendTooltip(ItemStack stack, Item.TooltipContext tooltipContext, List<Text> tooltip, TooltipConfig options) {
+      super.appendTooltip(stack, tooltipContext, tooltip, options);
       if (stack.contains(DataComponentTypes.CONTAINER_LOOT)) {
-         tooltip.add(f_ihshplar);
+         tooltip.add(UNKNOWN_CONTENTS_TEXT);
       }
 
       int i = 0;
diff -bur namedTargetSrc/net/minecraft/block/SpawnerBlock.java namedSrc/net/minecraft/block/SpawnerBlock.java
--- namedTargetSrc/net/minecraft/block/SpawnerBlock.java	2024-07-05 03:14:40.716201614 +0000
+++ namedSrc/net/minecraft/block/SpawnerBlock.java	2024-07-05 03:13:33.043786452 +0000
@@ -84,8 +84,8 @@
     * Mapping not found
     */
    @Override
-   public void appendTooltip(ItemStack stack, Item.TooltipContext arg2, List<Text> tooltip, TooltipConfig options) {
-      super.appendTooltip(stack, arg2, tooltip, options);
+   public void appendTooltip(ItemStack stack, Item.TooltipContext tooltipContext, List<Text> tooltip, TooltipConfig options) {
+      super.appendTooltip(stack, tooltipContext, tooltip, options);
       C_xheeywhc.m_vysbdnfp(stack, tooltip, "SpawnData");
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/TrialSpawnerBlock.java namedSrc/net/minecraft/block/TrialSpawnerBlock.java
--- namedTargetSrc/net/minecraft/block/TrialSpawnerBlock.java	2024-07-05 03:14:40.540200523 +0000
+++ namedSrc/net/minecraft/block/TrialSpawnerBlock.java	2024-07-05 03:13:32.887785487 +0000
@@ -109,8 +109,8 @@
     * Mapping not found
     */
    @Override
-   public void appendTooltip(ItemStack stack, Item.TooltipContext arg2, List<Text> tooltip, TooltipConfig options) {
-      super.appendTooltip(stack, arg2, tooltip, options);
+   public void appendTooltip(ItemStack stack, Item.TooltipContext tooltipContext, List<Text> tooltip, TooltipConfig options) {
+      super.appendTooltip(stack, tooltipContext, tooltip, options);
       C_xheeywhc.m_vysbdnfp(stack, tooltip, "spawn_data");
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.java namedSrc/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.java	2024-07-05 03:14:40.652201218 +0000
+++ namedSrc/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.java	2024-07-05 03:13:32.983786081 +0000
@@ -26,9 +26,10 @@
 @Environment(EnvType.CLIENT)
 public class AccessibilityOnboardingScreen extends Screen {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_epugxraq Lnet/minecraft/unmapped/C_lmihmwvx;f_epugxraq:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+    * @mapping {@literal named ONBOARDING_SCREEN_TITLE Lnet/minecraft/client/gui/screen/AccessibilityOnboardingScreen;ONBOARDING_SCREEN_TITLE:Lnet/minecraft/text/Text;}
     */
-   private static final Text f_epugxraq = Text.translatable("accessibility.onboarding.screen.title");
+   private static final Text ONBOARDING_SCREEN_TITLE = Text.translatable("accessibility.onboarding.screen.title");
    /**
     * @mapping {@literal hashed f_xlzpandj Lnet/minecraft/unmapped/C_lmihmwvx;f_xlzpandj:Lnet/minecraft/unmapped/C_rdaqiwdt;}
     * @mapping {@literal named ONBOARDING_SCREEN_NARRATOR Lnet/minecraft/client/gui/screen/AccessibilityOnboardingScreen;ONBOARDING_SCREEN_NARRATOR:Lnet/minecraft/text/Text;}
@@ -90,7 +91,7 @@
     * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/AccessibilityOnboardingScreen;<init>(Lnet/minecraft/client/option/GameOptions;Ljava/lang/Runnable;)V}
     */
    public AccessibilityOnboardingScreen(GameOptions options, Runnable onClose) {
-      super(f_epugxraq);
+      super(ONBOARDING_SCREEN_TITLE);
       this.options = options;
       this.onClose = onClose;
       this.logoRenderer = new LogoRenderer(true);
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsBackupScreen.java namedSrc/net/minecraft/client/gui/screen/realms/RealmsBackupScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsBackupScreen.java	2024-07-05 03:14:40.584200796 +0000
+++ namedSrc/net/minecraft/client/gui/screen/realms/RealmsBackupScreen.java	2024-07-05 03:13:32.923785710 +0000
@@ -441,9 +441,10 @@
    @Environment(EnvType.CLIENT)
    class BackupObjectEntryListWidget extends ElementListWidget<RealmsBackupScreen.BackupObjectEntry> {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_rpsgdrtc Lnet/minecraft/unmapped/C_jyywrsnb$C_kneakrny;f_rpsgdrtc:I}
+       * @mapping {@literal named ENTRY_HEIGHT Lnet/minecraft/client/gui/screen/realms/RealmsBackupScreen$BackupObjectEntryListWidget;ENTRY_HEIGHT:I}
        */
-      private static final int f_rpsgdrtc = 36;
+      private static final int ENTRY_HEIGHT = 36;
 
       /**
        * Mapping not found
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsClientOutdatedScreen.java namedSrc/net/minecraft/client/gui/screen/realms/RealmsClientOutdatedScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsClientOutdatedScreen.java	2024-07-05 03:14:40.524200424 +0000
+++ namedSrc/net/minecraft/client/gui/screen/realms/RealmsClientOutdatedScreen.java	2024-07-05 03:13:32.875785412 +0000
@@ -23,17 +23,20 @@
     */
    private static final Text INCOMPATIBLE_TITLE = Text.translatable("mco.client.incompatible.title").setColor(-65536);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_uzbpabbi Lnet/minecraft/unmapped/C_wymgylgm;f_uzbpabbi:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+    * @mapping {@literal named VERSION_NAME_TEXT Lnet/minecraft/client/gui/screen/realms/RealmsClientOutdatedScreen;VERSION_NAME_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text f_uzbpabbi = Text.literal(SharedConstants.getGameVersion().getName()).setColor(-65536);
+   private static final Text VERSION_NAME_TEXT = Text.literal(SharedConstants.getGameVersion().getName()).setColor(-65536);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_twydutnj Lnet/minecraft/unmapped/C_wymgylgm;f_twydutnj:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+    * @mapping {@literal named UNSUPPORTED_SNAPSHOT_VERSION Lnet/minecraft/client/gui/screen/realms/RealmsClientOutdatedScreen;UNSUPPORTED_SNAPSHOT_VERSION:Lnet/minecraft/text/Text;}
     */
-   private static final Text f_twydutnj = Text.translatable("mco.client.unsupported.snapshot.version", f_uzbpabbi);
+   private static final Text UNSUPPORTED_SNAPSHOT_VERSION = Text.translatable("mco.client.unsupported.snapshot.version", VERSION_NAME_TEXT);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_fceomdkp Lnet/minecraft/unmapped/C_wymgylgm;f_fceomdkp:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+    * @mapping {@literal named OUTDATED_STABLE_VERSION Lnet/minecraft/client/gui/screen/realms/RealmsClientOutdatedScreen;OUTDATED_STABLE_VERSION:Lnet/minecraft/text/Text;}
     */
-   private static final Text f_fceomdkp = Text.translatable("mco.client.outdated.stable.version", f_uzbpabbi);
+   private static final Text OUTDATED_STABLE_VERSION = Text.translatable("mco.client.outdated.stable.version", VERSION_NAME_TEXT);
    /**
     * @mapping {@literal hashed f_ueezamsx Lnet/minecraft/unmapped/C_wymgylgm;f_ueezamsx:Lnet/minecraft/unmapped/C_wrmtlwqx;}
     * @mapping {@literal named parent Lnet/minecraft/client/gui/screen/realms/RealmsClientOutdatedScreen;parent:Lnet/minecraft/client/gui/screen/Screen;}
@@ -87,6 +90,6 @@
     * Mapping not found
     */
    private Text m_pohvnken() {
-      return SharedConstants.getGameVersion().isStable() ? f_fceomdkp : f_twydutnj;
+      return SharedConstants.getGameVersion().isStable() ? OUTDATED_STABLE_VERSION : UNSUPPORTED_SNAPSHOT_VERSION;
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsInviteScreen.java namedSrc/net/minecraft/client/gui/screen/realms/RealmsInviteScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsInviteScreen.java	2024-07-05 03:14:40.692201466 +0000
+++ namedSrc/net/minecraft/client/gui/screen/realms/RealmsInviteScreen.java	2024-07-05 03:13:33.019786304 +0000
@@ -33,9 +33,10 @@
     */
    private static final Logger LOGGER = LogUtils.getLogger();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_zvyeivwb Lnet/minecraft/unmapped/C_mxnuwmrp;f_zvyeivwb:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+    * @mapping {@literal named INVITE_BUTTON Lnet/minecraft/client/gui/screen/realms/RealmsInviteScreen;INVITE_BUTTON:Lnet/minecraft/text/Text;}
     */
-   private static final Text f_zvyeivwb = Text.translatable("mco.configure.world.buttons.invite");
+   private static final Text INVITE_BUTTON = Text.translatable("mco.configure.world.buttons.invite");
    /**
     * @mapping {@literal hashed f_clwbaojg Lnet/minecraft/unmapped/C_mxnuwmrp;f_clwbaojg:Lnet/minecraft/unmapped/C_rdaqiwdt;}
     * @mapping {@literal named INVITE_PROFILE_NAME Lnet/minecraft/client/gui/screen/realms/RealmsInviteScreen;INVITE_PROFILE_NAME:Lnet/minecraft/text/Text;}
@@ -92,7 +93,7 @@
     * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/realms/RealmsInviteScreen;<init>(Lnet/minecraft/client/gui/screen/realms/RealmsConfigureWorldScreen;Lnet/minecraft/client/gui/screen/Screen;Lnet/minecraft/client/realms/dto/RealmsServer;)V}
     */
    public RealmsInviteScreen(RealmsConfigureWorldScreen configureScreen, Screen parent, RealmsServer serverData) {
-      super(f_zvyeivwb);
+      super(INVITE_BUTTON);
       this.configureScreen = configureScreen;
       this.parent = parent;
       this.serverData = serverData;
@@ -103,11 +104,11 @@
     */
    @Override
    public void init() {
-      this.f_qwimnbey.m_przyciyv(f_zvyeivwb, this.textRenderer);
+      this.f_qwimnbey.m_przyciyv(INVITE_BUTTON, this.textRenderer);
       LinearLayoutWidget lv = this.f_qwimnbey.addToContents(LinearLayoutWidget.createVertical().setSpacing(8));
       this.nameWidget = new TextFieldWidget(this.client.textRenderer, 200, 20, Text.translatable("mco.configure.world.invite.profile.name"));
       lv.add(LayoutWidgetFactories.createWithTitledRow(this.textRenderer, this.nameWidget, INVITE_PROFILE_NAME));
-      this.button = lv.add(ButtonWidget.builder(f_zvyeivwb, arg -> this.onInvite()).width(200).build());
+      this.button = lv.add(ButtonWidget.builder(INVITE_BUTTON, arg -> this.onInvite()).width(200).build());
       this.f_qwimnbey.addToFooter(ButtonWidget.builder(CommonTexts.BACK, arg -> this.closeScreen()).width(200).build());
       this.f_qwimnbey.visitWidgets(arg2 -> {
          ClickableWidget var10000 = this.addDrawableSelectableElement(arg2);
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsPlayerScreen.java namedSrc/net/minecraft/client/gui/screen/realms/RealmsPlayerScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsPlayerScreen.java	2024-07-05 03:14:40.480200151 +0000
+++ namedSrc/net/minecraft/client/gui/screen/realms/RealmsPlayerScreen.java	2024-07-05 03:13:32.839785189 +0000
@@ -41,9 +41,10 @@
     */
    static final Logger LOGGER = LogUtils.getLogger();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_azlybfyt Lnet/minecraft/unmapped/C_owmmvzoi;f_azlybfyt:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+    * @mapping {@literal named PLAYERS_TITLE Lnet/minecraft/client/gui/screen/realms/RealmsPlayerScreen;PLAYERS_TITLE:Lnet/minecraft/text/Text;}
     */
-   private static final Text f_azlybfyt = Text.translatable("mco.configure.world.players.title");
+   private static final Text PLAYERS_TITLE = Text.translatable("mco.configure.world.players.title");
    /**
     * @mapping {@literal hashed f_dwmjjlji Lnet/minecraft/unmapped/C_owmmvzoi;f_dwmjjlji:Lnet/minecraft/unmapped/C_rdaqiwdt;}
     * @mapping {@literal named QUESTION Lnet/minecraft/client/gui/screen/realms/RealmsPlayerScreen;QUESTION:Lnet/minecraft/text/Text;}
@@ -83,7 +84,7 @@
     * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/realms/RealmsPlayerScreen;<init>(Lnet/minecraft/client/gui/screen/realms/RealmsConfigureWorldScreen;Lnet/minecraft/client/realms/dto/RealmsServer;)V}
     */
    public RealmsPlayerScreen(RealmsConfigureWorldScreen parent, RealmsServer serverData) {
-      super(f_azlybfyt);
+      super(PLAYERS_TITLE);
       this.parent = parent;
       this.serverData = serverData;
    }
@@ -93,7 +94,7 @@
     */
    @Override
    public void init() {
-      this.f_gqittmxw.m_przyciyv(f_azlybfyt, this.textRenderer);
+      this.f_gqittmxw.m_przyciyv(PLAYERS_TITLE, this.textRenderer);
       this.f_axudcdik = this.f_gqittmxw.addToContents(new RealmsPlayerScreen.InvitedObjectEntryListWidget());
       this.m_jvscgeqv();
       LinearLayoutWidget lv = this.f_gqittmxw.addToFooter(LinearLayoutWidget.createHorizontal().setSpacing(8));
diff -bur namedTargetSrc/net/minecraft/client/gui/WorldGenerationProgressTracker.java namedSrc/net/minecraft/client/gui/WorldGenerationProgressTracker.java
--- namedTargetSrc/net/minecraft/client/gui/WorldGenerationProgressTracker.java	2024-07-05 03:14:40.456200002 +0000
+++ namedSrc/net/minecraft/client/gui/WorldGenerationProgressTracker.java	2024-07-05 03:13:32.815785041 +0000
@@ -72,9 +72,9 @@
     */
    public static WorldGenerationProgressTracker m_bpcnlyan(int i) {
       WorldGenerationProgressLogger lv = WorldGenerationProgressLogger.m_dkercgfy(i);
-      int j = WorldGenerationProgressListener.m_cabsswcb(i);
+      int j = WorldGenerationProgressListener.getStartRegionSize(i);
       int k = i + ChunkLevels.f_lwojvwdw;
-      int l = WorldGenerationProgressListener.m_cabsswcb(k);
+      int l = WorldGenerationProgressListener.getStartRegionSize(k);
       return new WorldGenerationProgressTracker(lv, j, k, l);
    }
 
diff -bur namedTargetSrc/net/minecraft/client/network/AbstractClientNetworkHandler.java namedSrc/net/minecraft/client/network/AbstractClientNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/AbstractClientNetworkHandler.java	2024-07-05 03:14:40.632201094 +0000
+++ namedSrc/net/minecraft/client/network/AbstractClientNetworkHandler.java	2024-07-05 03:13:32.967785982 +0000
@@ -44,10 +44,12 @@
 import net.minecraft.network.packet.payload.DiscardedCustomPayload;
 import net.minecraft.network.packet.s2c.common.AddResourcePackS2CPacket;
 import net.minecraft.network.packet.s2c.common.CustomPayloadS2CPacket;
+import net.minecraft.network.packet.s2c.common.CustomReportDetailsS2CPacket;
 import net.minecraft.network.packet.s2c.common.DisconnectS2CPacket;
 import net.minecraft.network.packet.s2c.common.KeepConnectionAliveS2CPacket;
 import net.minecraft.network.packet.s2c.common.PingS2CPacket;
 import net.minecraft.network.packet.s2c.common.RemoveResourcePackS2CPacket;
+import net.minecraft.network.packet.s2c.common.ServerLinksS2CPacket;
 import net.minecraft.network.packet.s2c.configuration.CookieRequestS2CPacket;
 import net.minecraft.network.packet.s2c.payload.BrandPayload;
 import net.minecraft.network.packet.s2c.query.StoreCookieS2CPacket;
@@ -57,8 +59,6 @@
 import net.minecraft.unmapped.C_ccpekhhb;
 import net.minecraft.unmapped.C_igbzvhln;
 import net.minecraft.unmapped.C_ouodvkzu;
-import net.minecraft.unmapped.C_qoushzky;
-import net.minecraft.unmapped.C_zaxzpkwd;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
@@ -191,13 +191,13 @@
     * @mapping {@literal hashed m_yuakheuk Lnet/minecraft/unmapped/C_xcfjcqcn;m_yuakheuk(Lnet/minecraft/unmapped/C_zyjtrjrl;Ljava/lang/Throwable;)Ljava/util/Optional;}
     * @mapping {@literal named m_yuakheuk Lnet/minecraft/client/network/AbstractClientNetworkHandler;m_yuakheuk(Lnet/minecraft/network/packet/Packet;Ljava/lang/Throwable;)Ljava/util/Optional;}
     */
-   private Optional<Path> m_yuakheuk(@Nullable Packet arg, Throwable cause) {
+   private Optional<Path> m_yuakheuk(@Nullable Packet packet, Throwable cause) {
       CrashReport lv = CrashReport.create(cause, "Packet handling error");
-      NetworkThreadUtils.m_yybqntwy(lv, this, arg);
+      NetworkThreadUtils.fillCrashReport(lv, this, packet);
       Path path = this.client.runDirectory.toPath().resolve("debug");
       Path path2 = path.resolve("disconnect-" + Util.getFileNameFormattedDateTime() + "-client.txt");
       Optional<C_ouodvkzu.C_moygobps> optional = this.f_wjciyfll.m_gdegqnaz(C_ouodvkzu.C_ekdhaajb.BUG_REPORT);
-      List<String> list = (List<String>)optional.map(argx -> List.of("Server bug reporting link: " + argx.link())).orElse(List.of());
+      List<String> list = (List<String>)optional.map(arg -> List.of("Server bug reporting link: " + arg.link())).orElse(List.of());
       return lv.m_jipyzcdw(path2, C_ccpekhhb.MINECRAFT_NETWORK_PROTOCOL_ERROR_REPORT, list) ? Optional.of(path2) : Optional.empty();
    }
 
@@ -328,18 +328,18 @@
     * Mapping not found
     */
    @Override
-   public void m_ifiopbgv(C_zaxzpkwd arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.f_vvtetqza = arg.details();
+   public void onCustomReportDetails(CustomReportDetailsS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.f_vvtetqza = packet.details();
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void m_ikewnwne(C_qoushzky arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      List<C_ouodvkzu.C_tkgsynzm> list = arg.links();
+   public void onServerLinks(ServerLinksS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      List<C_ouodvkzu.C_tkgsynzm> list = packet.links();
       Builder<C_ouodvkzu.C_moygobps> builder = ImmutableList.builderWithExpectedSize(list.size());
 
       for (C_ouodvkzu.C_tkgsynzm lv : list) {
@@ -427,9 +427,9 @@
     * Mapping not found
     */
    @Override
-   public void addCrashReportInfo(CrashReport arg, CrashReportSection section) {
-      section.add("Server type", (CrashCallable<String>)(() -> this.serverInfo != null ? this.serverInfo.getServerType().toString() : "<none>"));
-      section.add("Server brand", (CrashCallable<String>)(() -> this.serverBrand));
+   public void m_ksdgvxqp(CrashReport arg, CrashReportSection arg2) {
+      arg2.add("Server type", (CrashCallable<String>)(() -> this.serverInfo != null ? this.serverInfo.getServerType().toString() : "<none>"));
+      arg2.add("Server brand", (CrashCallable<String>)(() -> this.serverBrand));
       if (!this.f_vvtetqza.isEmpty()) {
          CrashReportSection lv = arg.addElement("Custom Server Details");
          this.f_vvtetqza.forEach(lv::add);
diff -bur namedTargetSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java namedSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java	2024-07-05 03:14:40.468200076 +0000
+++ namedSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java	2024-07-05 03:13:32.827785115 +0000
@@ -355,9 +355,9 @@
     * Mapping not found
     */
    @Override
-   public void addCrashReportInfo(CrashReport arg, CrashReportSection section) {
-      section.add("Server type", (CrashCallable<String>)(() -> this.info != null ? this.info.getServerType().toString() : "<unknown>"));
-      section.add("Login phase", (CrashCallable<String>)(() -> ((ClientLoginNetworkHandler.ClientLoginStatus)this.connectionStatus.get()).toString()));
+   public void m_ksdgvxqp(CrashReport arg, CrashReportSection arg2) {
+      arg2.add("Server type", (CrashCallable<String>)(() -> this.info != null ? this.info.getServerType().toString() : "<unknown>"));
+      arg2.add("Login phase", (CrashCallable<String>)(() -> ((ClientLoginNetworkHandler.ClientLoginStatus)this.connectionStatus.get()).toString()));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-07-05 03:14:40.748201814 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-07-05 03:13:33.075786650 +0000
@@ -216,6 +216,7 @@
 import net.minecraft.network.packet.s2c.play.PlayerSpawnPositionUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.PositionFocusS2CPacket;
 import net.minecraft.network.packet.s2c.play.ProfileIndependentMessageS2CPacket;
+import net.minecraft.network.packet.s2c.play.ProjectilePowerS2CPacket;
 import net.minecraft.network.packet.s2c.play.RecipeSynchronizationS2CPacket;
 import net.minecraft.network.packet.s2c.play.RecipesUnlockS2CPacket;
 import net.minecraft.network.packet.s2c.play.ReconfigureS2CPacket;
@@ -283,7 +284,6 @@
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_gbavazgo;
 import net.minecraft.unmapped.C_hgofpcxx;
-import net.minecraft.unmapped.C_jhbjvrtr;
 import net.minecraft.unmapped.C_jvzsxkum;
 import net.minecraft.unmapped.C_ouodvkzu;
 import net.minecraft.unmapped.C_rrcmfgnk;
@@ -2726,10 +2726,10 @@
     * Mapping not found
     */
    @Override
-   public void m_nirbbegl(C_jhbjvrtr arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      if (this.world.getEntityById(arg.m_mxxebkeh()) instanceof ExplosiveProjectileEntity lv2) {
-         lv2.f_omngpikt = arg.m_hxnpbaoh();
+   public void onProjectilePower(ProjectilePowerS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      if (this.world.getEntityById(packet.getEntityId()) instanceof ExplosiveProjectileEntity lv2) {
+         lv2.f_omngpikt = packet.m_hxnpbaoh();
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/client/render/block/entity/EnchantingTableBlockEntityRenderer.java namedSrc/net/minecraft/client/render/block/entity/EnchantingTableBlockEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/block/entity/EnchantingTableBlockEntityRenderer.java	2024-07-05 03:14:40.588200821 +0000
+++ namedSrc/net/minecraft/client/render/block/entity/EnchantingTableBlockEntityRenderer.java	2024-07-05 03:13:32.927785734 +0000
@@ -3,6 +3,7 @@
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.block.entity.EnchantingTableBlockEntity;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.entity.model.BookModel;
@@ -10,7 +11,6 @@
 import net.minecraft.client.resource.Material;
 import net.minecraft.client.texture.SpriteAtlasTexture;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.unmapped.C_zwjpeqhx;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.Axis;
 import net.minecraft.util.math.MathHelper;
@@ -20,7 +20,7 @@
  * @mapping {@literal named net/minecraft/client/render/block/entity/EnchantingTableBlockEntityRenderer}
  */
 @Environment(EnvType.CLIENT)
-public class EnchantingTableBlockEntityRenderer implements BlockEntityRenderer<C_zwjpeqhx> {
+public class EnchantingTableBlockEntityRenderer implements BlockEntityRenderer<EnchantingTableBlockEntity> {
    /**
     * @mapping {@literal hashed f_ueoexqpz Lnet/minecraft/unmapped/C_edwqbivb;f_ueoexqpz:Lnet/minecraft/unmapped/C_djlixbky;}
     * @mapping {@literal named BOOK_TEXTURE Lnet/minecraft/client/render/block/entity/EnchantingTableBlockEntityRenderer;BOOK_TEXTURE:Lnet/minecraft/client/resource/Material;}
@@ -42,9 +42,9 @@
 
    /**
     * @mapping {@literal hashed m_jpqaxmkr Lnet/minecraft/unmapped/C_edwqbivb;m_jpqaxmkr(Lnet/minecraft/unmapped/C_zwjpeqhx;FLnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;II)V}
-    * @mapping {@literal named render Lnet/minecraft/client/render/block/entity/EnchantingTableBlockEntityRenderer;render(Lnet/minecraft/unmapped/C_zwjpeqhx;FLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;II)V}
+    * @mapping {@literal named render Lnet/minecraft/client/render/block/entity/EnchantingTableBlockEntityRenderer;render(Lnet/minecraft/block/entity/EnchantingTableBlockEntity;FLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;II)V}
     */
-   public void render(C_zwjpeqhx arg, float f, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i, int j) {
+   public void render(EnchantingTableBlockEntity arg, float f, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i, int j) {
       matrices.push();
       matrices.translate(0.5F, 0.75F, 0.5F);
       float g = (float)arg.f_hiblwklv + f;
diff -bur namedTargetSrc/net/minecraft/component/type/ContainerContentsComponent.java namedSrc/net/minecraft/component/type/ContainerContentsComponent.java
--- namedTargetSrc/net/minecraft/component/type/ContainerContentsComponent.java	2024-07-05 03:14:40.616200995 +0000
+++ namedSrc/net/minecraft/component/type/ContainerContentsComponent.java	2024-07-05 03:13:32.951785883 +0000
@@ -53,9 +53,10 @@
     */
    private final DefaultedList<ItemStack> stacks;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_dxbajxgt Lnet/minecraft/unmapped/C_tmeipioo;f_dxbajxgt:I}
+    * @mapping {@literal named hashCode Lnet/minecraft/component/type/ContainerContentsComponent;hashCode:I}
     */
-   private final int f_dxbajxgt;
+   private final int hashCode;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_tmeipioo;<init>(Lnet/minecraft/unmapped/C_rnrfftze;)V}
@@ -66,7 +67,7 @@
          throw new IllegalArgumentException("Got " + stacks.size() + " items, but maximum is 256");
       } else {
          this.stacks = stacks;
-         this.f_dxbajxgt = ItemStack.listHashCode(stacks);
+         this.hashCode = ItemStack.listHashCode(stacks);
       }
    }
 
@@ -230,7 +231,7 @@
     * Mapping not found
     */
    public int hashCode() {
-      return this.f_dxbajxgt;
+      return this.hashCode;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/component/type/ItemEnchantmentsComponent.java namedSrc/net/minecraft/component/type/ItemEnchantmentsComponent.java
--- namedTargetSrc/net/minecraft/component/type/ItemEnchantmentsComponent.java	2024-07-05 03:14:40.672201342 +0000
+++ namedSrc/net/minecraft/component/type/ItemEnchantmentsComponent.java	2024-07-05 03:13:32.999786180 +0000
@@ -47,7 +47,7 @@
     * @mapping {@literal hashed f_weawpons Lnet/minecraft/unmapped/C_qlclfxvn;f_weawpons:Lcom/mojang/serialization/Codec;}
     * @mapping {@literal named LEVELS_CODEC Lnet/minecraft/component/type/ItemEnchantmentsComponent;LEVELS_CODEC:Lcom/mojang/serialization/Codec;}
     */
-   private static final Codec<Object2IntOpenHashMap<Holder<Enchantment>>> LEVELS_CODEC = Codec.unboundedMap(Enchantment.f_cvunyugc, LEVEL_CODEC)
+   private static final Codec<Object2IntOpenHashMap<Holder<Enchantment>>> LEVELS_CODEC = Codec.unboundedMap(Enchantment.HOLDER_CODEC, LEVEL_CODEC)
       .xmap(Object2IntOpenHashMap::new, Function.identity());
    /**
     * @mapping {@literal hashed f_nekwvric Lnet/minecraft/unmapped/C_qlclfxvn;f_nekwvric:Lcom/mojang/serialization/Codec;}
@@ -106,10 +106,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ugcgsgdf Lnet/minecraft/unmapped/C_qlclfxvn;m_ugcgsgdf(Lnet/minecraft/unmapped/C_cjzoxshv;)I}
+    * @mapping {@literal named m_ugcgsgdf Lnet/minecraft/component/type/ItemEnchantmentsComponent;m_ugcgsgdf(Lnet/minecraft/registry/Holder;)I}
     */
-   public int m_ugcgsgdf(Holder<Enchantment> arg) {
-      return this.levels.getInt(arg);
+   public int m_ugcgsgdf(Holder<Enchantment> enchantmentHolder) {
+      return this.levels.getInt(enchantmentHolder);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/data/client/ItemModelGenerator.java namedSrc/net/minecraft/data/client/ItemModelGenerator.java
--- namedTargetSrc/net/minecraft/data/client/ItemModelGenerator.java	2024-07-05 03:14:40.752201838 +0000
+++ namedSrc/net/minecraft/data/client/ItemModelGenerator.java	2024-07-05 03:13:33.079786675 +0000
@@ -153,7 +153,7 @@
          JsonObject jsonObject3 = new JsonObject();
          jsonObject3.addProperty(TRIM_TYPE.getPath(), lv.itemModelIndex());
          jsonObject2.add("predicate", jsonObject3);
-         jsonObject2.addProperty("model", this.suffixTrim(id, lv.m_gdhujqwf(armorMaterial)).toString());
+         jsonObject2.addProperty("model", this.suffixTrim(id, lv.material(armorMaterial)).toString());
          jsonArray.add(jsonObject2);
       }
 
@@ -178,7 +178,7 @@
          }
 
          for (ItemModelGenerator.TrimModelData lv4 : TRIM_MATERIALS) {
-            String string = lv4.m_gdhujqwf(armor.getMaterial());
+            String string = lv4.material(armor.getMaterial());
             Identifier lv5 = this.suffixTrim(lv, string);
             String string2 = armor.getArmorSlot().getTranslationKey() + "_trim_" + string;
             Identifier lv6 = Identifier.ofDefault(string2).withPrefix("trims/items/");
@@ -499,9 +499,9 @@
    static record TrimModelData(String name, float itemModelIndex, Map<Holder<ArmorMaterial>, String> overrideArmorMaterials) {
       /**
        * @mapping {@literal hashed m_gdhujqwf Lnet/minecraft/unmapped/C_cfvrpkog$C_cutcputf;m_gdhujqwf(Lnet/minecraft/unmapped/C_cjzoxshv;)Ljava/lang/String;}
-       * @mapping {@literal named m_gdhujqwf Lnet/minecraft/data/client/ItemModelGenerator$TrimModelData;m_gdhujqwf(Lnet/minecraft/registry/Holder;)Ljava/lang/String;}
+       * @mapping {@literal named material Lnet/minecraft/data/client/ItemModelGenerator$TrimModelData;material(Lnet/minecraft/registry/Holder;)Ljava/lang/String;}
        */
-      public String m_gdhujqwf(Holder<ArmorMaterial> key) {
+      public String material(Holder<ArmorMaterial> key) {
          return (String)this.overrideArmorMaterials.getOrDefault(key, this.name);
       }
    }
diff -bur namedTargetSrc/net/minecraft/data/client/model/BlockStateModelGenerator.java namedSrc/net/minecraft/data/client/model/BlockStateModelGenerator.java
--- namedTargetSrc/net/minecraft/data/client/model/BlockStateModelGenerator.java	2024-07-05 03:14:40.632201094 +0000
+++ namedSrc/net/minecraft/data/client/model/BlockStateModelGenerator.java	2024-07-05 03:13:32.971786006 +0000
@@ -193,8 +193,8 @@
       ),
       Pair.of(
          Properties.DOWN,
-         arg -> BlockStateVariant.create()
-               .put(VariantSettings.MODEL, arg)
+         model -> BlockStateVariant.create()
+               .put(VariantSettings.MODEL, model)
                .put(VariantSettings.X, VariantSettings.Rotation.R90)
                .put(VariantSettings.UVLOCK, true)
       )
@@ -3971,22 +3971,23 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_cbfmkwcm Lnet/minecraft/unmapped/C_ysvjbfkt;m_cbfmkwcm()V}
+    * @mapping {@literal named registerVault Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerVault()V}
     */
-   private void m_cbfmkwcm() {
+   private void registerVault() {
       Block lv = Blocks.VAULT;
-      Texture lv2 = Texture.m_jizlqyhw(lv, "_front_off", "_side_off", "_top", "_bottom");
-      Texture lv3 = Texture.m_jizlqyhw(lv, "_front_on", "_side_on", "_top", "_bottom");
-      Texture lv4 = Texture.m_jizlqyhw(lv, "_front_ejecting", "_side_on", "_top", "_bottom");
-      Texture lv5 = Texture.m_jizlqyhw(lv, "_front_ejecting", "_side_on", "_top_ejecting", "_bottom");
+      Texture lv2 = Texture.vault(lv, "_front_off", "_side_off", "_top", "_bottom");
+      Texture lv3 = Texture.vault(lv, "_front_on", "_side_on", "_top", "_bottom");
+      Texture lv4 = Texture.vault(lv, "_front_ejecting", "_side_on", "_top", "_bottom");
+      Texture lv5 = Texture.vault(lv, "_front_ejecting", "_side_on", "_top_ejecting", "_bottom");
       Identifier lv6 = Models.TEMPLATE_VAULT.upload(lv, lv2, this.modelCollector);
       Identifier lv7 = Models.TEMPLATE_VAULT.upload(lv, "_active", lv3, this.modelCollector);
       Identifier lv8 = Models.TEMPLATE_VAULT.upload(lv, "_unlocking", lv4, this.modelCollector);
       Identifier lv9 = Models.TEMPLATE_VAULT.upload(lv, "_ejecting_reward", lv5, this.modelCollector);
-      Texture lv10 = Texture.m_jizlqyhw(lv, "_front_off_ominous", "_side_off_ominous", "_top_ominous", "_bottom_ominous");
-      Texture lv11 = Texture.m_jizlqyhw(lv, "_front_on_ominous", "_side_on_ominous", "_top_ominous", "_bottom_ominous");
-      Texture lv12 = Texture.m_jizlqyhw(lv, "_front_ejecting_ominous", "_side_on_ominous", "_top_ominous", "_bottom_ominous");
-      Texture lv13 = Texture.m_jizlqyhw(lv, "_front_ejecting_ominous", "_side_on_ominous", "_top_ejecting_ominous", "_bottom_ominous");
+      Texture lv10 = Texture.vault(lv, "_front_off_ominous", "_side_off_ominous", "_top_ominous", "_bottom_ominous");
+      Texture lv11 = Texture.vault(lv, "_front_on_ominous", "_side_on_ominous", "_top_ominous", "_bottom_ominous");
+      Texture lv12 = Texture.vault(lv, "_front_ejecting_ominous", "_side_on_ominous", "_top_ominous", "_bottom_ominous");
+      Texture lv13 = Texture.vault(lv, "_front_ejecting_ominous", "_side_on_ominous", "_top_ejecting_ominous", "_bottom_ominous");
       Identifier lv14 = Models.TEMPLATE_VAULT.upload(lv, "_ominous", lv10, this.modelCollector);
       Identifier lv15 = Models.TEMPLATE_VAULT.upload(lv, "_active_ominous", lv11, this.modelCollector);
       Identifier lv16 = Models.TEMPLATE_VAULT.upload(lv, "_unlocking_ominous", lv12, this.modelCollector);
@@ -5236,7 +5237,7 @@
       this.registerMangrovePropagule();
       this.registerMuddyMangroveRoots();
       this.registerTrialSpawner();
-      this.m_cbfmkwcm();
+      this.registerVault();
       this.registerNorthDefaultHorizontalRotation(Blocks.LADDER);
       this.registerItemModel(Blocks.LADDER);
       this.registerNorthDefaultHorizontalRotation(Blocks.LECTERN);
diff -bur namedTargetSrc/net/minecraft/data/client/model/Texture.java namedSrc/net/minecraft/data/client/model/Texture.java
--- namedTargetSrc/net/minecraft/data/client/model/Texture.java	2024-07-05 03:14:40.764201913 +0000
+++ namedSrc/net/minecraft/data/client/model/Texture.java	2024-07-05 03:13:33.095786774 +0000
@@ -440,14 +440,14 @@
 
    /**
     * @mapping {@literal hashed m_jizlqyhw Lnet/minecraft/unmapped/C_pgmmajlq;m_jizlqyhw(Lnet/minecraft/unmapped/C_mmxmpdoq;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/unmapped/C_pgmmajlq;}
-    * @mapping {@literal named m_jizlqyhw Lnet/minecraft/data/client/model/Texture;m_jizlqyhw(Lnet/minecraft/block/Block;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/data/client/model/Texture;}
+    * @mapping {@literal named vault Lnet/minecraft/data/client/model/Texture;vault(Lnet/minecraft/block/Block;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/data/client/model/Texture;}
     */
-   public static Texture m_jizlqyhw(Block block, String string, String string2, String string3, String string4) {
+   public static Texture vault(Block block, String front, String side, String top, String bottom) {
       return new Texture()
-         .put(TextureKey.FRONT, getSubId(block, string))
-         .put(TextureKey.SIDE, getSubId(block, string2))
-         .put(TextureKey.TOP, getSubId(block, string3))
-         .put(TextureKey.BOTTOM, getSubId(block, string4));
+         .put(TextureKey.FRONT, getSubId(block, front))
+         .put(TextureKey.SIDE, getSubId(block, side))
+         .put(TextureKey.TOP, getSubId(block, top))
+         .put(TextureKey.BOTTOM, getSubId(block, bottom));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/data/Main.java namedSrc/net/minecraft/data/Main.java
--- namedTargetSrc/net/minecraft/data/Main.java	2024-07-05 03:14:40.620201019 +0000
+++ namedSrc/net/minecraft/data/Main.java	2024-07-05 03:13:32.951785883 +0000
@@ -34,6 +34,7 @@
 import net.minecraft.data.server.tag.BlockTagsProvider;
 import net.minecraft.data.server.tag.CatTypeTagProvider;
 import net.minecraft.data.server.tag.DamageTypeTagsProvider;
+import net.minecraft.data.server.tag.EnchantmentTagProvider;
 import net.minecraft.data.server.tag.EntityTypeTagsProvider;
 import net.minecraft.data.server.tag.FlatWorldGeneratorPresetTagProvider;
 import net.minecraft.data.server.tag.FluidTagsProvider;
@@ -55,7 +56,6 @@
 import net.minecraft.registry.tag.StructureTagsProvider;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_apbctukq;
-import net.minecraft.unmapped.C_vkynrwhu;
 import net.minecraft.unmapped.C_ythfdxbi;
 import net.minecraft.util.Util;
 import net.minecraft.world.biome.Biome;
@@ -162,7 +162,7 @@
       lv4.addProvider(createFactory(PaintingTagProvider::new, completableFuture));
       lv4.addProvider(createFactory(PoiTagProvider::new, completableFuture));
       lv4.addProvider(createFactory(WorldPresetTagProvider::new, completableFuture));
-      lv4.addProvider(createFactory(C_vkynrwhu::new, completableFuture));
+      lv4.addProvider(createFactory(EnchantmentTagProvider::new, completableFuture));
       lv4 = lv.createVanillaPack(includeDev);
       lv4.addProvider(outputx -> new NbtProvider(outputx, inputs));
       lv4 = lv.createVanillaPack(includeReports);
diff -bur namedTargetSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java namedSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java
--- namedTargetSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java	2024-07-05 03:14:40.724201665 +0000
+++ namedSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java	2024-07-05 03:13:33.047786477 +0000
@@ -1060,9 +1060,9 @@
     * @mapping {@literal named buildAdventuringTime Lnet/minecraft/data/server/advancement/AdventureAdvancementTabGenerator;buildAdventuringTime(Lnet/minecraft/registry/HolderLookup$Provider;Ljava/util/function/Consumer;Lnet/minecraft/advancement/AdvancementHolder;Lnet/minecraft/world/biome/util/MultiNoiseBiomeSourceParameterList$Preset;)V}
     */
    protected static void buildAdventuringTime(
-      HolderLookup.Provider arg, Consumer<AdvancementHolder> exporter, AdvancementHolder parent, MultiNoiseBiomeSourceParameterList.Preset preset
+      HolderLookup.Provider biomeProvider, Consumer<AdvancementHolder> exporter, AdvancementHolder parent, MultiNoiseBiomeSourceParameterList.Preset preset
    ) {
-      appendEnterAllBiomesCriterion(Advancement.Builder.create(), arg, preset.m_vzbcawto().toList())
+      appendEnterAllBiomesCriterion(Advancement.Builder.create(), biomeProvider, preset.m_vzbcawto().toList())
          .parent(parent)
          .display(
             Items.DIAMOND_BOOTS,
@@ -1095,8 +1095,10 @@
     * @mapping {@literal hashed m_mgvgqwrb Lnet/minecraft/unmapped/C_unbelsbg;m_mgvgqwrb(Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Ljava/util/List;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;}
     * @mapping {@literal named appendEnterAllBiomesCriterion Lnet/minecraft/data/server/advancement/AdventureAdvancementTabGenerator;appendEnterAllBiomesCriterion(Lnet/minecraft/advancement/Advancement$Builder;Lnet/minecraft/registry/HolderLookup$Provider;Ljava/util/List;)Lnet/minecraft/advancement/Advancement$Builder;}
     */
-   protected static Advancement.Builder appendEnterAllBiomesCriterion(Advancement.Builder task, HolderLookup.Provider arg2, List<RegistryKey<Biome>> biomes) {
-      HolderProvider<Biome> lv = arg2.getLookupOrThrow(RegistryKeys.BIOME);
+   protected static Advancement.Builder appendEnterAllBiomesCriterion(
+      Advancement.Builder task, HolderLookup.Provider biomeProvider, List<RegistryKey<Biome>> biomes
+   ) {
+      HolderProvider<Biome> lv = biomeProvider.getLookupOrThrow(RegistryKeys.BIOME);
 
       for (RegistryKey<Biome> lv2 : biomes) {
          task.putCriteria(lv2.getValue().toString(), LocationCriterionTrigger.Conditions.create(LocationPredicate.Builder.m_lsutwusu(lv.getHolderOrThrow(lv2))));
diff -bur namedTargetSrc/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.java namedSrc/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.java
--- namedTargetSrc/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.java	2024-07-05 03:14:40.508200325 +0000
+++ namedSrc/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.java	2024-07-05 03:13:32.863785338 +0000
@@ -328,7 +328,7 @@
          )
          .rewards(AdvancementRewards.Builder.experience(50))
          .build(advancementConsumer, "husbandry/complete_catalogue");
-      m_bqvinwli(Advancement.Builder.create(), provider)
+      appendTameAllWolfVariantsCriterion(Advancement.Builder.create(), provider)
          .parent(lv5)
          .display(
             Items.BONE,
@@ -789,16 +789,17 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_bqvinwli Lnet/minecraft/unmapped/C_vfenxpjt;m_bqvinwli(Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;}
+    * @mapping {@literal named appendTameAllWolfVariantsCriterion Lnet/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator;appendTameAllWolfVariantsCriterion(Lnet/minecraft/advancement/Advancement$Builder;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/advancement/Advancement$Builder;}
     */
-   private static Advancement.Builder m_bqvinwli(Advancement.Builder arg, HolderLookup.Provider arg2) {
-      HolderLookup.RegistryLookup<WolfVariant> lv = arg2.getLookupOrThrow(RegistryKeys.WOLF_VARIANT);
+   private static Advancement.Builder appendTameAllWolfVariantsCriterion(Advancement.Builder task, HolderLookup.Provider variantProvider) {
+      HolderLookup.RegistryLookup<WolfVariant> lv = variantProvider.getLookupOrThrow(RegistryKeys.WOLF_VARIANT);
       lv.streamElementKeys()
          .sorted(Comparator.comparing(RegistryKey::getValue))
          .forEach(
             registryKey -> {
                Holder<WolfVariant> lvx = lv.getHolderOrThrow(registryKey);
-               arg.putCriteria(
+               task.putCriteria(
                   registryKey.getValue().toString(),
                   TameAnimalCriterionTrigger.Conditions.create(
                      EntityPredicate.Builder.create().typeSpecific(EntitySubPredicateTypes.m_kfwccmwu(HolderSet.createDirect(lvx)))
@@ -806,6 +807,6 @@
                );
             }
          );
-      return arg;
+      return task;
    }
 }
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/rebalance/TradeRebalanceLootTableProviders.java namedSrc/net/minecraft/data/server/loot_table/rebalance/TradeRebalanceLootTableProviders.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/rebalance/TradeRebalanceLootTableProviders.java	2024-07-05 03:14:40.648201193 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/rebalance/TradeRebalanceLootTableProviders.java	2024-07-05 03:13:32.979786056 +0000
@@ -17,12 +17,12 @@
     * @mapping {@literal hashed m_pjdqpikk Lnet/minecraft/unmapped/C_rkickfza;m_pjdqpikk(Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/unmapped/C_rriyyrek;}
     * @mapping {@literal named createTradeRebalanceProvider Lnet/minecraft/data/server/loot_table/rebalance/TradeRebalanceLootTableProviders;createTradeRebalanceProvider(Lnet/minecraft/data/DataPackOutput;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/data/server/LootTablesProvider;}
     */
-   public static LootTablesProvider createTradeRebalanceProvider(DataPackOutput output, CompletableFuture<HolderLookup.Provider> completableFuture) {
+   public static LootTablesProvider createTradeRebalanceProvider(DataPackOutput output, CompletableFuture<HolderLookup.Provider> lootTableProviderFuture) {
       return new LootTablesProvider(
          output,
          Set.of(),
          List.of(new LootTablesProvider.GeneratorEntry(TradeRebalanceChestLootTableGenerator::new, LootContextTypes.CHEST)),
-         completableFuture
+         lootTableProviderFuture
       );
    }
 }

@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/VanillaEntityLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/VanillaEntityLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/VanillaEntityLootTableGenerator.java	2024-07-05 03:14:40.496200250 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/VanillaEntityLootTableGenerator.java	2024-07-05 03:13:32.851785264 +0000
@@ -12,11 +12,13 @@
 import net.minecraft.loot.condition.EntityPropertiesLootCondition;
 import net.minecraft.loot.condition.KilledByPlayerLootCondition;
 import net.minecraft.loot.condition.RandomChanceLootCondition;
+import net.minecraft.loot.condition.RandomChanceWithEnchantedBonusLootCondition;
 import net.minecraft.loot.context.LootContext;
 import net.minecraft.loot.entry.EmptyEntry;
 import net.minecraft.loot.entry.ItemEntry;
 import net.minecraft.loot.entry.LootTableEntry;
 import net.minecraft.loot.entry.TagEntry;
+import net.minecraft.loot.function.EnchantedCountIncreaseLootFunction;
 import net.minecraft.loot.function.FurnaceSmeltLootFunction;
 import net.minecraft.loot.function.SetCountLootFunction;
 import net.minecraft.loot.function.SetOminousBottleLootFunction;
@@ -34,8 +36,6 @@
 import net.minecraft.registry.tag.DamageTypeTags;
 import net.minecraft.registry.tag.EntityTypeTags;
 import net.minecraft.registry.tag.ItemTags;
-import net.minecraft.unmapped.C_cbexmsqd;
-import net.minecraft.unmapped.C_edcogzgr;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_oftxhywd}
@@ -69,7 +69,7 @@
                   .with(
                      ItemEntry.builder(Items.BLAZE_ROD)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 1.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
                   .conditionally(KilledByPlayerLootCondition.builder())
             )
@@ -83,7 +83,7 @@
                   .with(
                      ItemEntry.builder(Items.ARROW)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
             .pool(
@@ -92,7 +92,7 @@
                   .with(
                      ItemEntry.builder(Items.BONE)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
             .pool(
@@ -101,7 +101,7 @@
                   .with(
                      ItemEntry.builder(Items.TIPPED_ARROW)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 1.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)).m_tzuglfzu(1))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)).m_tzuglfzu(1))
                         .apply(SetPotionFunction.builder(Potions.POISON))
                   )
                   .conditionally(KilledByPlayerLootCondition.builder())
@@ -126,7 +126,7 @@
                   .with(
                      ItemEntry.builder(Items.STRING)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
             .pool(
@@ -135,7 +135,7 @@
                   .with(
                      ItemEntry.builder(Items.SPIDER_EYE)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(-1.0F, 1.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
                   .conditionally(KilledByPlayerLootCondition.builder())
             )
@@ -149,7 +149,7 @@
                   .with(
                      ItemEntry.builder(Items.FEATHER)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
             .pool(
@@ -158,7 +158,7 @@
                   .with(
                      ItemEntry.builder(Items.CHICKEN)
                         .apply(FurnaceSmeltLootFunction.builder().conditionally(this.m_xqssttdx()))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
       );
@@ -186,7 +186,7 @@
                   .with(
                      ItemEntry.builder(Items.LEATHER)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
             .pool(
@@ -196,7 +196,7 @@
                      ItemEntry.builder(Items.BEEF)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F)))
                         .apply(FurnaceSmeltLootFunction.builder().conditionally(this.m_xqssttdx()))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
       );
@@ -209,7 +209,7 @@
                   .with(
                      ItemEntry.builder(Items.GUNPOWDER)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
             .pool(
@@ -229,7 +229,7 @@
                   .with(
                      ItemEntry.builder(Items.COD)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 1.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                         .apply(FurnaceSmeltLootFunction.builder().conditionally(this.m_xqssttdx()))
                   )
             )
@@ -243,7 +243,7 @@
                   .with(
                      ItemEntry.builder(Items.LEATHER)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
       );
@@ -256,7 +256,7 @@
                   .with(
                      ItemEntry.builder(Items.ROTTEN_FLESH)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
             .pool(
@@ -264,7 +264,7 @@
                   .rolls(ConstantLootNumberProvider.create(1.0F))
                   .with(ItemEntry.builder(Items.COPPER_INGOT))
                   .conditionally(KilledByPlayerLootCondition.builder())
-                  .conditionally(C_cbexmsqd.m_qpnviojd(this.f_qjcpnzik, 0.11F, 0.02F))
+                  .conditionally(RandomChanceWithEnchantedBonusLootCondition.m_qpnviojd(this.f_qjcpnzik, 0.11F, 0.02F))
             )
       );
       this.putLootTable(EntityType.ELDER_GUARDIAN, this.createElderGuardianTable());
@@ -278,7 +278,7 @@
                   .with(
                      ItemEntry.builder(Items.ENDER_PEARL)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 1.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
       );
@@ -293,7 +293,7 @@
                   .with(
                      ItemEntry.builder(Items.EMERALD)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 1.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
                   .conditionally(KilledByPlayerLootCondition.builder())
             )
@@ -307,7 +307,7 @@
                   .with(
                      ItemEntry.builder(Items.BREEZE_ROD)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(1.0F, 2.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(1.0F, 2.0F)))
                   )
                   .conditionally(KilledByPlayerLootCondition.builder())
             )
@@ -323,7 +323,7 @@
                   .with(
                      ItemEntry.builder(Items.GHAST_TEAR)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 1.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
             .pool(
@@ -332,7 +332,7 @@
                   .with(
                      ItemEntry.builder(Items.GUNPOWDER)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
       );
@@ -346,7 +346,7 @@
                   .with(
                      ItemEntry.builder(Items.GLOW_INK_SAC)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
       );
@@ -360,7 +360,7 @@
                   .with(
                      ItemEntry.builder(Items.PRISMARINE_SHARD)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
             .pool(
@@ -369,13 +369,13 @@
                   .with(
                      ItemEntry.builder(Items.COD)
                         .weight(2)
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                         .apply(FurnaceSmeltLootFunction.builder().conditionally(this.m_xqssttdx()))
                   )
                   .with(
                      ItemEntry.builder(Items.PRISMARINE_CRYSTALS)
                         .weight(2)
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
                   .with(EmptyEntry.builder())
             )
@@ -384,7 +384,7 @@
                   .rolls(ConstantLootNumberProvider.create(1.0F))
                   .with(LootTableEntry.m_wboqiqkf(LootTables.FISHING_FISH_GAMEPLAY).apply(FurnaceSmeltLootFunction.builder().conditionally(this.m_xqssttdx())))
                   .conditionally(KilledByPlayerLootCondition.builder())
-                  .conditionally(C_cbexmsqd.m_qpnviojd(this.f_qjcpnzik, 0.025F, 0.01F))
+                  .conditionally(RandomChanceWithEnchantedBonusLootCondition.m_qpnviojd(this.f_qjcpnzik, 0.025F, 0.01F))
             )
       );
       this.putLootTable(
@@ -396,7 +396,7 @@
                   .with(
                      ItemEntry.builder(Items.LEATHER)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
       );
@@ -409,7 +409,7 @@
                   .with(
                      ItemEntry.builder(Items.ROTTEN_FLESH)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
             .pool(
@@ -419,7 +419,7 @@
                   .with(ItemEntry.builder(Items.CARROT))
                   .with(ItemEntry.builder(Items.POTATO).apply(FurnaceSmeltLootFunction.builder().conditionally(this.m_xqssttdx())))
                   .conditionally(KilledByPlayerLootCondition.builder())
-                  .conditionally(C_cbexmsqd.m_qpnviojd(this.f_qjcpnzik, 0.025F, 0.01F))
+                  .conditionally(RandomChanceWithEnchantedBonusLootCondition.m_qpnviojd(this.f_qjcpnzik, 0.025F, 0.01F))
             )
       );
       this.putLootTable(
@@ -455,7 +455,7 @@
                   .with(
                      ItemEntry.builder(Items.LEATHER)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
       );
@@ -468,7 +468,7 @@
                   .with(
                      ItemEntry.builder(Items.MAGMA_CREAM)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(-2.0F, 1.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                         .conditionally(this.frogDamageSource().invert())
                         .conditionally(
                            EntityPropertiesLootCondition.builder(
@@ -502,7 +502,7 @@
                   .with(
                      ItemEntry.builder(Items.LEATHER)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
       );
@@ -515,7 +515,7 @@
                   .with(
                      ItemEntry.builder(Items.LEATHER)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
             .pool(
@@ -525,7 +525,7 @@
                      ItemEntry.builder(Items.BEEF)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F)))
                         .apply(FurnaceSmeltLootFunction.builder().conditionally(this.m_xqssttdx()))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
       );
@@ -548,7 +548,7 @@
                   .with(
                      ItemEntry.builder(Items.FEATHER)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
       );
@@ -561,7 +561,7 @@
                   .with(
                      ItemEntry.builder(Items.PHANTOM_MEMBRANE)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 1.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
                   .conditionally(KilledByPlayerLootCondition.builder())
             )
@@ -576,7 +576,7 @@
                      ItemEntry.builder(Items.PORKCHOP)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F)))
                         .apply(FurnaceSmeltLootFunction.builder().conditionally(this.m_xqssttdx()))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
       );
@@ -610,13 +610,13 @@
                         .apply(FurnaceSmeltLootFunction.builder().conditionally(this.m_xqssttdx()))
                         .weight(3)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
                   .with(
                      ItemEntry.builder(Items.SALMON)
                         .apply(FurnaceSmeltLootFunction.builder().conditionally(this.m_xqssttdx()))
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
       );
@@ -644,7 +644,7 @@
                   .with(
                      ItemEntry.builder(Items.RABBIT_HIDE)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 1.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
             .pool(
@@ -654,7 +654,7 @@
                      ItemEntry.builder(Items.RABBIT)
                         .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
                         .apply(FurnaceSmeltLootFunction.builder().conditionally(this.m_xqssttdx()))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
             .pool(
@@ -662,7 +662,7 @@
                   .rolls(ConstantLootNumberProvider.create(1.0F))
                   .with(ItemEntry.builder(Items.RABBIT_FOOT))
                   .conditionally(KilledByPlayerLootCondition.builder())
-                  .conditionally(C_cbexmsqd.m_qpnviojd(this.f_qjcpnzik, 0.1F, 0.03F))
+                  .conditionally(RandomChanceWithEnchantedBonusLootCondition.m_qpnviojd(this.f_qjcpnzik, 0.1F, 0.03F))
             )
       );
       this.putLootTable(
@@ -690,7 +690,7 @@
                      ItemEntry.builder(Items.MUTTON)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 2.0F)))
                         .apply(FurnaceSmeltLootFunction.builder().conditionally(this.m_xqssttdx()))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
       );
@@ -717,7 +717,7 @@
                LootPool.builder()
                   .rolls(ConstantLootNumberProvider.create(1.0F))
                   .with(ItemEntry.builder(Items.SHULKER_SHELL))
-                  .conditionally(C_cbexmsqd.m_qpnviojd(this.f_qjcpnzik, 0.5F, 0.0625F))
+                  .conditionally(RandomChanceWithEnchantedBonusLootCondition.m_qpnviojd(this.f_qjcpnzik, 0.5F, 0.0625F))
             )
       );
       this.putLootTable(EntityType.SILVERFISH, LootTable.builder());
@@ -730,7 +730,7 @@
                   .with(
                      ItemEntry.builder(Items.ARROW)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
             .pool(
@@ -739,7 +739,7 @@
                   .with(
                      ItemEntry.builder(Items.BONE)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
       );
@@ -752,7 +752,7 @@
                   .with(
                      ItemEntry.builder(Items.BONE)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
       );
@@ -765,7 +765,7 @@
                   .with(
                      ItemEntry.builder(Items.SLIME_BALL)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                         .conditionally(this.frogDamageSource().invert())
                   )
                   .with(
@@ -799,7 +799,7 @@
                   .with(
                      ItemEntry.builder(Items.STRING)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
             .pool(
@@ -808,7 +808,7 @@
                   .with(
                      ItemEntry.builder(Items.SPIDER_EYE)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(-1.0F, 1.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
                   .conditionally(KilledByPlayerLootCondition.builder())
             )
@@ -822,7 +822,7 @@
                   .with(
                      ItemEntry.builder(Items.INK_SAC)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
       );
@@ -835,7 +835,7 @@
                   .with(
                      ItemEntry.builder(Items.ARROW)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
             .pool(
@@ -844,7 +844,7 @@
                   .with(
                      ItemEntry.builder(Items.BONE)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
             .pool(
@@ -853,7 +853,7 @@
                   .with(
                      ItemEntry.builder(Items.TIPPED_ARROW)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 1.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)).m_tzuglfzu(1))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)).m_tzuglfzu(1))
                         .apply(SetPotionFunction.builder(Potions.SLOWNESS))
                   )
                   .conditionally(KilledByPlayerLootCondition.builder())
@@ -868,7 +868,7 @@
                   .with(
                      ItemEntry.builder(Items.STRING)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(2.0F, 5.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
       );
@@ -882,7 +882,7 @@
                   .with(
                      ItemEntry.builder(Items.LEATHER)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
       );
@@ -911,7 +911,7 @@
                      ItemEntry.builder(Blocks.SEAGRASS)
                         .weight(3)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
             .pool(
@@ -939,7 +939,7 @@
                   .with(
                      ItemEntry.builder(Items.EMERALD)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 1.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
                   .conditionally(KilledByPlayerLootCondition.builder())
             )
@@ -953,33 +953,33 @@
                   .with(
                      ItemEntry.builder(Items.GLOWSTONE_DUST)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
                   .with(
                      ItemEntry.builder(Items.SUGAR)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
                   .with(
                      ItemEntry.builder(Items.SPIDER_EYE)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
                   .with(
                      ItemEntry.builder(Items.GLASS_BOTTLE)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
                   .with(
                      ItemEntry.builder(Items.GUNPOWDER)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
                   .with(
                      ItemEntry.builder(Items.STICK)
                         .weight(2)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
             .pool(
@@ -988,7 +988,7 @@
                   .with(
                      ItemEntry.builder(Items.REDSTONE)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(4.0F, 8.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
       );
@@ -1002,7 +1002,7 @@
                   .with(
                      ItemEntry.builder(Items.COAL)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(-1.0F, 1.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
             .pool(
@@ -1011,7 +1011,7 @@
                   .with(
                      ItemEntry.builder(Items.BONE)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
             .pool(
@@ -1019,7 +1019,7 @@
                   .rolls(ConstantLootNumberProvider.create(1.0F))
                   .with(ItemEntry.builder(Blocks.WITHER_SKELETON_SKULL))
                   .conditionally(KilledByPlayerLootCondition.builder())
-                  .conditionally(C_cbexmsqd.m_qpnviojd(this.f_qjcpnzik, 0.025F, 0.01F))
+                  .conditionally(RandomChanceWithEnchantedBonusLootCondition.m_qpnviojd(this.f_qjcpnzik, 0.025F, 0.01F))
             )
       );
       this.putLootTable(EntityType.WOLF, LootTable.builder());
@@ -1032,7 +1032,7 @@
                   .with(
                      ItemEntry.builder(Items.ROTTEN_FLESH)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
       );
@@ -1045,7 +1045,7 @@
                   .with(
                      ItemEntry.builder(Items.ROTTEN_FLESH)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
             .pool(
@@ -1055,7 +1055,7 @@
                   .with(ItemEntry.builder(Items.CARROT))
                   .with(ItemEntry.builder(Items.POTATO).apply(FurnaceSmeltLootFunction.builder().conditionally(this.m_xqssttdx())))
                   .conditionally(KilledByPlayerLootCondition.builder())
-                  .conditionally(C_cbexmsqd.m_qpnviojd(this.f_qjcpnzik, 0.025F, 0.01F))
+                  .conditionally(RandomChanceWithEnchantedBonusLootCondition.m_qpnviojd(this.f_qjcpnzik, 0.025F, 0.01F))
             )
       );
       this.putLootTable(
@@ -1067,7 +1067,7 @@
                   .with(
                      ItemEntry.builder(Items.ROTTEN_FLESH)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
       );
@@ -1080,7 +1080,7 @@
                   .with(
                      ItemEntry.builder(Items.ROTTEN_FLESH)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 1.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
             .pool(
@@ -1089,7 +1089,7 @@
                   .with(
                      ItemEntry.builder(Items.GOLD_NUGGET)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 1.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
             .pool(
@@ -1097,7 +1097,7 @@
                   .rolls(ConstantLootNumberProvider.create(1.0F))
                   .with(ItemEntry.builder(Items.GOLD_INGOT))
                   .conditionally(KilledByPlayerLootCondition.builder())
-                  .conditionally(C_cbexmsqd.m_qpnviojd(this.f_qjcpnzik, 0.025F, 0.01F))
+                  .conditionally(RandomChanceWithEnchantedBonusLootCondition.m_qpnviojd(this.f_qjcpnzik, 0.025F, 0.01F))
             )
       );
       this.putLootTable(
@@ -1110,7 +1110,7 @@
                      ItemEntry.builder(Items.PORKCHOP)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(2.0F, 4.0F)))
                         .apply(FurnaceSmeltLootFunction.builder().conditionally(this.m_xqssttdx()))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
             .pool(
@@ -1119,7 +1119,7 @@
                   .with(
                      ItemEntry.builder(Items.LEATHER)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 1.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
       );
@@ -1134,7 +1134,7 @@
                   .with(
                      ItemEntry.builder(Items.ROTTEN_FLESH)
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                        .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
             )
             .pool(
@@ -1144,7 +1144,7 @@
                   .with(ItemEntry.builder(Items.CARROT))
                   .with(ItemEntry.builder(Items.POTATO).apply(FurnaceSmeltLootFunction.builder().conditionally(this.m_xqssttdx())))
                   .conditionally(KilledByPlayerLootCondition.builder())
-                  .conditionally(C_cbexmsqd.m_qpnviojd(this.f_qjcpnzik, 0.025F, 0.01F))
+                  .conditionally(RandomChanceWithEnchantedBonusLootCondition.m_qpnviojd(this.f_qjcpnzik, 0.025F, 0.01F))
             )
       );
    }
@@ -1161,7 +1161,7 @@
                .with(
                   ItemEntry.builder(Items.PRISMARINE_SHARD)
                      .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(0.0F, 2.0F)))
-                     .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                     .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                )
          )
          .pool(
@@ -1170,13 +1170,13 @@
                .with(
                   ItemEntry.builder(Items.COD)
                      .weight(3)
-                     .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                     .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                      .apply(FurnaceSmeltLootFunction.builder().conditionally(this.m_xqssttdx()))
                )
                .with(
                   ItemEntry.builder(Items.PRISMARINE_CRYSTALS)
                      .weight(2)
-                     .apply(C_edcogzgr.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
+                     .apply(EnchantedCountIncreaseLootFunction.m_kgczpckh(this.f_qjcpnzik, UniformLootNumberProvider.create(0.0F, 1.0F)))
                )
                .with(EmptyEntry.builder())
          )
@@ -1191,7 +1191,7 @@
                .rolls(ConstantLootNumberProvider.create(1.0F))
                .with(LootTableEntry.m_wboqiqkf(LootTables.FISHING_FISH_GAMEPLAY).apply(FurnaceSmeltLootFunction.builder().conditionally(this.m_xqssttdx())))
                .conditionally(KilledByPlayerLootCondition.builder())
-               .conditionally(C_cbexmsqd.m_qpnviojd(this.f_qjcpnzik, 0.025F, 0.01F))
+               .conditionally(RandomChanceWithEnchantedBonusLootCondition.m_qpnviojd(this.f_qjcpnzik, 0.025F, 0.01F))
          )
          .pool(
             LootPool.builder()
diff -bur namedTargetSrc/net/minecraft/data/server/LootTablesProvider.java namedSrc/net/minecraft/data/server/LootTablesProvider.java
--- namedTargetSrc/net/minecraft/data/server/LootTablesProvider.java	2024-07-05 03:14:40.520200398 +0000
+++ namedSrc/net/minecraft/data/server/LootTablesProvider.java	2024-07-05 03:13:32.871785388 +0000
@@ -60,24 +60,25 @@
     */
    private final List<LootTablesProvider.GeneratorEntry> lootTypeGenerators;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_hwfthond Lnet/minecraft/unmapped/C_rriyyrek;f_hwfthond:Ljava/util/concurrent/CompletableFuture;}
+    * @mapping {@literal named lootTableProviderFuture Lnet/minecraft/data/server/LootTablesProvider;lootTableProviderFuture:Ljava/util/concurrent/CompletableFuture;}
     */
-   private final CompletableFuture<HolderLookup.Provider> f_hwfthond;
+   private final CompletableFuture<HolderLookup.Provider> lootTableProviderFuture;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_rriyyrek;<init>(Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/Set;Ljava/util/List;Ljava/util/concurrent/CompletableFuture;)V}
     * @mapping {@literal named <init> Lnet/minecraft/data/server/LootTablesProvider;<init>(Lnet/minecraft/data/DataPackOutput;Ljava/util/Set;Ljava/util/List;Ljava/util/concurrent/CompletableFuture;)V}
     */
    public LootTablesProvider(
-      DataPackOutput arg,
+      DataPackOutput dataPackOutput,
       Set<RegistryKey<LootTable>> lootTableIds,
       List<LootTablesProvider.GeneratorEntry> lootTypeGenerators,
-      CompletableFuture<HolderLookup.Provider> completableFuture
+      CompletableFuture<HolderLookup.Provider> lootTableProviderFuture
    ) {
-      this.pathResolver = arg.m_jgqgnctt(RegistryKeys.LOOT_TABLE);
+      this.pathResolver = dataPackOutput.m_jgqgnctt(RegistryKeys.LOOT_TABLE);
       this.lootTypeGenerators = lootTypeGenerators;
       this.lootTableIds = lootTableIds;
-      this.f_hwfthond = completableFuture;
+      this.lootTableProviderFuture = lootTableProviderFuture;
    }
 
    /**
@@ -85,13 +86,14 @@
     */
    @Override
    public CompletableFuture<?> run(DataWriter writer) {
-      return this.f_hwfthond.thenCompose(arg2 -> this.m_cvuljxmh(writer, arg2));
+      return this.lootTableProviderFuture.thenCompose(arg2 -> this.m_cvuljxmh(writer, arg2));
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_cvuljxmh Lnet/minecraft/unmapped/C_rriyyrek;m_cvuljxmh(Lnet/minecraft/unmapped/C_temnquoh;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Ljava/util/concurrent/CompletableFuture;}
+    * @mapping {@literal named m_cvuljxmh Lnet/minecraft/data/server/LootTablesProvider;m_cvuljxmh(Lnet/minecraft/data/DataWriter;Lnet/minecraft/registry/HolderLookup$Provider;)Ljava/util/concurrent/CompletableFuture;}
     */
-   private CompletableFuture<?> m_cvuljxmh(DataWriter arg, HolderLookup.Provider arg2) {
+   private CompletableFuture<?> m_cvuljxmh(DataWriter writer, HolderLookup.Provider arg2) {
       MutableRegistry<LootTable> lv = new SimpleRegistry<>(RegistryKeys.LOOT_TABLE, Lifecycle.experimental());
       Map<RandomSeed.Seed, Identifier> map = new Object2ObjectOpenHashMap<>();
       this.lootTypeGenerators.forEach(arg3 -> ((LootTableGenerator)arg3.provider().apply(arg2)).generate((registryKey, arg4) -> {
@@ -130,7 +132,7 @@
             RegistryKey<LootTable> lvx = (RegistryKey<LootTable>)entry.getKey();
             LootTable lv2x = (LootTable)entry.getValue();
             Path path = this.pathResolver.resolveJsonFile(lvx.getValue());
-            return DataProvider.m_oiidqwdo(arg, arg2, LootTable.f_wvxzdplc, lv2x, path);
+            return DataProvider.m_oiidqwdo(writer, arg2, LootTable.f_wvxzdplc, lv2x, path);
          }).toArray(CompletableFuture[]::new));
       }
    }
diff -bur namedTargetSrc/net/minecraft/data/server/RecipesProvider.java namedSrc/net/minecraft/data/server/RecipesProvider.java
--- namedTargetSrc/net/minecraft/data/server/RecipesProvider.java	2024-07-05 03:14:40.748201814 +0000
+++ namedSrc/net/minecraft/data/server/RecipesProvider.java	2024-07-05 03:13:33.071786625 +0000
@@ -71,9 +71,10 @@
     */
    final DataPackOutput.PathResolver advancementsPathResolver;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_hmgeaffs Lnet/minecraft/unmapped/C_hwlnmobw;f_hmgeaffs:Ljava/util/concurrent/CompletableFuture;}
+    * @mapping {@literal named recipeProviderFuture Lnet/minecraft/data/server/RecipesProvider;recipeProviderFuture:Ljava/util/concurrent/CompletableFuture;}
     */
-   private final CompletableFuture<HolderLookup.Provider> f_hmgeaffs;
+   private final CompletableFuture<HolderLookup.Provider> recipeProviderFuture;
    /**
     * @mapping {@literal hashed f_ysgqrakl Lnet/minecraft/unmapped/C_hwlnmobw;f_ysgqrakl:Ljava/util/Map;}
     * @mapping {@literal named VARIANT_FACTORIES Lnet/minecraft/data/server/RecipesProvider;VARIANT_FACTORIES:Ljava/util/Map;}
@@ -97,12 +98,13 @@
       .build();
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_hwlnmobw;<init>(Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/data/server/RecipesProvider;<init>(Lnet/minecraft/data/DataPackOutput;Ljava/util/concurrent/CompletableFuture;)V}
     */
-   public RecipesProvider(DataPackOutput arg, CompletableFuture<HolderLookup.Provider> completableFuture) {
-      this.recipesPathResolver = arg.m_jgqgnctt(RegistryKeys.RECIPE);
-      this.advancementsPathResolver = arg.m_jgqgnctt(RegistryKeys.ADVANCEMENT);
-      this.f_hmgeaffs = completableFuture;
+   public RecipesProvider(DataPackOutput dataPackOutput, CompletableFuture<HolderLookup.Provider> recipeProviderFuture) {
+      this.recipesPathResolver = dataPackOutput.m_jgqgnctt(RegistryKeys.RECIPE);
+      this.advancementsPathResolver = dataPackOutput.m_jgqgnctt(RegistryKeys.ADVANCEMENT);
+      this.recipeProviderFuture = recipeProviderFuture;
    }
 
    /**
@@ -110,7 +112,7 @@
     */
    @Override
    public final CompletableFuture<?> run(DataWriter writer) {
-      return this.f_hmgeaffs.thenCompose(arg2 -> this.m_omdnsfaq(writer, arg2));
+      return this.recipeProviderFuture.thenCompose(arg2 -> this.m_omdnsfaq(writer, arg2));
    }
 
    /**
Only in namedSrc/net/minecraft/data/server/tag: EnchantmentTagProvider.java
diff -bur namedTargetSrc/net/minecraft/data/server/VanillaLootTableProvider.java namedSrc/net/minecraft/data/server/VanillaLootTableProvider.java
--- namedTargetSrc/net/minecraft/data/server/VanillaLootTableProvider.java	2024-07-05 03:14:40.764201913 +0000
+++ namedSrc/net/minecraft/data/server/VanillaLootTableProvider.java	2024-07-05 03:13:33.091786749 +0000
@@ -25,7 +25,7 @@
     * @mapping {@literal hashed m_anouxifk Lnet/minecraft/unmapped/C_vfvrndvd;m_anouxifk(Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/unmapped/C_rriyyrek;}
     * @mapping {@literal named create Lnet/minecraft/data/server/VanillaLootTableProvider;create(Lnet/minecraft/data/DataPackOutput;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/data/server/LootTablesProvider;}
     */
-   public static LootTablesProvider create(DataPackOutput output, CompletableFuture<HolderLookup.Provider> completableFuture) {
+   public static LootTablesProvider create(DataPackOutput output, CompletableFuture<HolderLookup.Provider> lootTableProviderFuture) {
       return new LootTablesProvider(
          output,
          LootTables.getAll(),
@@ -40,7 +40,7 @@
             new LootTablesProvider.GeneratorEntry(ArchaeologyLootTableGenerator::new, LootContextTypes.ARCHAEOLOGY),
             new LootTablesProvider.GeneratorEntry(ShearingLootTableGenerator::new, LootContextTypes.SHEARING)
          ),
-         completableFuture
+         lootTableProviderFuture
       );
    }
 }
Only in namedSrc/net/minecraft/datafixer/fix: ArrowStoredWeaponFix.java
Only in namedSrc/net/minecraft/datafixer/fix: AttributeIdFix.java
Only in namedTargetSrc/net/minecraft/datafixer/fix: AttributeModifierIdFix.java
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/ParticleUnflatteningFix.java namedSrc/net/minecraft/datafixer/fix/ParticleUnflatteningFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/ParticleUnflatteningFix.java	2024-07-05 03:14:40.496200250 +0000
+++ namedSrc/net/minecraft/datafixer/fix/ParticleUnflatteningFix.java	2024-07-05 03:13:32.851785264 +0000
@@ -92,7 +92,7 @@
          dynamic2 = dynamic2.set("id", dynamic.createString(string));
       } else {
          dynamic2 = dynamic2.set("id", dynamic.createString(string.substring(0, i)));
-         NbtCompound lv = m_llilnhnp(string.substring(i));
+         NbtCompound lv = parseTag(string.substring(i));
          if (lv != null) {
             dynamic2 = dynamic2.set("tag", new Dynamic<>(NbtOps.INSTANCE, lv).convert(dynamic.getOps()));
          }
@@ -103,14 +103,14 @@
 
    /**
     * @mapping {@literal hashed m_llilnhnp Lnet/minecraft/unmapped/C_asohzhmn;m_llilnhnp(Ljava/lang/String;)Lnet/minecraft/unmapped/C_hhlwcnih;}
-    * @mapping {@literal named m_llilnhnp Lnet/minecraft/datafixer/fix/ParticleUnflatteningFix;m_llilnhnp(Ljava/lang/String;)Lnet/minecraft/nbt/NbtCompound;}
+    * @mapping {@literal named parseTag Lnet/minecraft/datafixer/fix/ParticleUnflatteningFix;parseTag(Ljava/lang/String;)Lnet/minecraft/nbt/NbtCompound;}
     */
    @Nullable
-   private static NbtCompound m_llilnhnp(String string) {
+   private static NbtCompound parseTag(String tag) {
       try {
-         return StringNbtReader.parse(string);
+         return StringNbtReader.parse(tag);
       } catch (Exception var2) {
-         LOGGER.warn("Failed to parse tag: {}", string, var2);
+         LOGGER.warn("Failed to parse tag: {}", tag, var2);
          return null;
       }
    }
diff -bur namedTargetSrc/net/minecraft/datafixer/schema/Schema3818v5.java namedSrc/net/minecraft/datafixer/schema/Schema3818v5.java
--- namedTargetSrc/net/minecraft/datafixer/schema/Schema3818v5.java	2024-07-05 03:14:40.692201466 +0000
+++ namedSrc/net/minecraft/datafixer/schema/Schema3818v5.java	2024-07-05 03:13:33.015786279 +0000
@@ -25,8 +25,8 @@
     * @mapping {@literal named registerTypes Lnet/minecraft/datafixer/schema/Schema3818v5;registerTypes(Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V}
     */
    @Override
-   public void registerTypes(Schema schema, Map<String, Supplier<TypeTemplate>> map, Map<String, Supplier<TypeTemplate>> map2) {
-      super.registerTypes(schema, map, map2);
+   public void registerTypes(Schema schema, Map<String, Supplier<TypeTemplate>> entityTypes, Map<String, Supplier<TypeTemplate>> blockEntityTypes) {
+      super.registerTypes(schema, entityTypes, blockEntityTypes);
       schema.registerType(
          true,
          TypeReferences.ITEM_STACK,
diff -bur namedTargetSrc/net/minecraft/datafixer/Schemas.java namedSrc/net/minecraft/datafixer/Schemas.java
--- namedTargetSrc/net/minecraft/datafixer/Schemas.java	2024-07-05 03:14:40.704201541 +0000
+++ namedSrc/net/minecraft/datafixer/Schemas.java	2024-07-05 03:13:33.027786353 +0000
@@ -29,7 +29,8 @@
 import net.minecraft.datafixer.fix.AdvancementsFix;
 import net.minecraft.datafixer.fix.AreaEffectCloudPotionFix;
 import net.minecraft.datafixer.fix.ArrowPickupFix;
-import net.minecraft.datafixer.fix.AttributeModifierIdFix;
+import net.minecraft.datafixer.fix.ArrowStoredWeaponFix;
+import net.minecraft.datafixer.fix.AttributeIdFix;
 import net.minecraft.datafixer.fix.BannerPatternFormatFix;
 import net.minecraft.datafixer.fix.BedBlockEntityFix;
 import net.minecraft.datafixer.fix.BedItemColorFix;
@@ -309,7 +310,6 @@
 import net.minecraft.datafixer.schema.Schema705;
 import net.minecraft.datafixer.schema.Schema808;
 import net.minecraft.datafixer.schema.Schema99;
-import net.minecraft.unmapped.C_sjuegdjy;
 import net.minecraft.util.Util;
 
 /**
@@ -1367,13 +1367,13 @@
       Schema schema222 = builder.addSchema(3833, EMPTY_IDENTIFIER_NORMALIZE);
       builder.addFixer(new RemoveEmptyItemInBrushableBlockFix(schema222));
       Schema schema223 = builder.addSchema(3938, Schema3938::new);
-      builder.addFixer(new C_sjuegdjy(schema223));
+      builder.addFixer(new ArrowStoredWeaponFix(schema223));
       Schema schema224 = builder.addSchema(3939, EMPTY_IDENTIFIER_NORMALIZE);
       builder.addFixer(new RemoveFeatureFlagFix(schema224, "Remove 1.21 feature toggle", Set.of("minecraft:update_1_21")));
       Schema schema225 = builder.addSchema(3943, EMPTY_IDENTIFIER_NORMALIZE);
       builder.addFixer(new OptionsMenuBlurrinessFix(schema225));
       Schema schema226 = builder.addSchema(3945, EMPTY_IDENTIFIER_NORMALIZE);
-      builder.addFixer(new AttributeModifierIdFix(schema226));
+      builder.addFixer(new AttributeIdFix(schema226));
       builder.addFixer(new JukeboxTicksSinceSongStartedFix(schema226));
    }

@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/datafixer/TypeReferences.java namedSrc/net/minecraft/datafixer/TypeReferences.java
--- namedTargetSrc/net/minecraft/datafixer/TypeReferences.java	2024-07-05 03:14:40.548200573 +0000
+++ namedSrc/net/minecraft/datafixer/TypeReferences.java	2024-07-05 03:13:32.895785536 +0000
@@ -13,21 +13,21 @@
     * @mapping {@literal hashed f_eswwjwrw Lnet/minecraft/unmapped/C_rodgceaz;f_eswwjwrw:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named LEVEL Lnet/minecraft/datafixer/TypeReferences;LEVEL:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference LEVEL = m_asfwfitz("level");
+   public static final TypeReference LEVEL = createTypeReference("level");
    /**
     * A type reference which refers to a player.
     * 
     * @mapping {@literal hashed f_yxxgexah Lnet/minecraft/unmapped/C_rodgceaz;f_yxxgexah:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named PLAYER Lnet/minecraft/datafixer/TypeReferences;PLAYER:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference PLAYER = m_asfwfitz("player");
+   public static final TypeReference PLAYER = createTypeReference("player");
    /**
     * A type reference which refers to a chunk.
     * 
     * @mapping {@literal hashed f_mutbrkit Lnet/minecraft/unmapped/C_rodgceaz;f_mutbrkit:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named CHUNK Lnet/minecraft/datafixer/TypeReferences;CHUNK:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference CHUNK = m_asfwfitz("chunk");
+   public static final TypeReference CHUNK = createTypeReference("chunk");
    /**
     * A type reference which refers to the saved creative hotbars.
     * 
@@ -36,131 +36,131 @@
     * @mapping {@literal hashed f_jjtyvuvs Lnet/minecraft/unmapped/C_rodgceaz;f_jjtyvuvs:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named HOTBAR Lnet/minecraft/datafixer/TypeReferences;HOTBAR:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference HOTBAR = m_asfwfitz("hotbar");
+   public static final TypeReference HOTBAR = createTypeReference("hotbar");
    /**
     * A type reference which refers to client game options.
     * 
     * @mapping {@literal hashed f_rzcaxcaf Lnet/minecraft/unmapped/C_rodgceaz;f_rzcaxcaf:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named OPTIONS Lnet/minecraft/datafixer/TypeReferences;OPTIONS:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference OPTIONS = m_asfwfitz("options");
+   public static final TypeReference OPTIONS = createTypeReference("options");
    /**
     * @mapping {@literal hashed f_vnhrgkxx Lnet/minecraft/unmapped/C_rodgceaz;f_vnhrgkxx:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named STRUCTURE Lnet/minecraft/datafixer/TypeReferences;STRUCTURE:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference STRUCTURE = m_asfwfitz("structure");
+   public static final TypeReference STRUCTURE = createTypeReference("structure");
    /**
     * @mapping {@literal hashed f_aoarjbvb Lnet/minecraft/unmapped/C_rodgceaz;f_aoarjbvb:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named STATS Lnet/minecraft/datafixer/TypeReferences;STATS:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference STATS = m_asfwfitz("stats");
+   public static final TypeReference STATS = createTypeReference("stats");
    /**
     * @mapping {@literal hashed f_reccujoc Lnet/minecraft/unmapped/C_rodgceaz;f_reccujoc:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named COMMAND_STORAGE Lnet/minecraft/datafixer/TypeReferences;COMMAND_STORAGE:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference COMMAND_STORAGE = m_asfwfitz("saved_data/command_storage");
+   public static final TypeReference COMMAND_STORAGE = createTypeReference("saved_data/command_storage");
    /**
     * @mapping {@literal hashed f_okisxsvs Lnet/minecraft/unmapped/C_rodgceaz;f_okisxsvs:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named CHUNKS Lnet/minecraft/datafixer/TypeReferences;CHUNKS:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference CHUNKS = m_asfwfitz("saved_data/chunks");
+   public static final TypeReference CHUNKS = createTypeReference("saved_data/chunks");
    /**
     * @mapping {@literal hashed f_hesiyykh Lnet/minecraft/unmapped/C_rodgceaz;f_hesiyykh:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named MAP_DATA Lnet/minecraft/datafixer/TypeReferences;MAP_DATA:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference MAP_DATA = m_asfwfitz("saved_data/map_data");
+   public static final TypeReference MAP_DATA = createTypeReference("saved_data/map_data");
    /**
     * @mapping {@literal hashed f_alwoakvm Lnet/minecraft/unmapped/C_rodgceaz;f_alwoakvm:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named ID_COUNTS Lnet/minecraft/datafixer/TypeReferences;ID_COUNTS:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference ID_COUNTS = m_asfwfitz("saved_data/idcounts");
+   public static final TypeReference ID_COUNTS = createTypeReference("saved_data/idcounts");
    /**
     * @mapping {@literal hashed f_autkdlqy Lnet/minecraft/unmapped/C_rodgceaz;f_autkdlqy:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named RAIDS Lnet/minecraft/datafixer/TypeReferences;RAIDS:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference RAIDS = m_asfwfitz("saved_data/raids");
+   public static final TypeReference RAIDS = createTypeReference("saved_data/raids");
    /**
     * @mapping {@literal hashed f_qgwtgndc Lnet/minecraft/unmapped/C_rodgceaz;f_qgwtgndc:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named RANDOM_SEQUENCES Lnet/minecraft/datafixer/TypeReferences;RANDOM_SEQUENCES:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference RANDOM_SEQUENCES = m_asfwfitz("saved_data/random_sequences");
+   public static final TypeReference RANDOM_SEQUENCES = createTypeReference("saved_data/random_sequences");
    /**
     * @mapping {@literal hashed f_qqzvktvv Lnet/minecraft/unmapped/C_rodgceaz;f_qqzvktvv:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named STRUCTURE_FEATURE_INDICES Lnet/minecraft/datafixer/TypeReferences;STRUCTURE_FEATURE_INDICES:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference STRUCTURE_FEATURE_INDICES = m_asfwfitz("saved_data/structure_feature_indices");
+   public static final TypeReference STRUCTURE_FEATURE_INDICES = createTypeReference("saved_data/structure_feature_indices");
    /**
     * @mapping {@literal hashed f_wpuzmxlb Lnet/minecraft/unmapped/C_rodgceaz;f_wpuzmxlb:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named SCOREBOARD Lnet/minecraft/datafixer/TypeReferences;SCOREBOARD:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference SCOREBOARD = m_asfwfitz("saved_data/scoreboard");
+   public static final TypeReference SCOREBOARD = createTypeReference("saved_data/scoreboard");
    /**
     * @mapping {@literal hashed f_unlslirt Lnet/minecraft/unmapped/C_rodgceaz;f_unlslirt:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named ADVANCEMENTS Lnet/minecraft/datafixer/TypeReferences;ADVANCEMENTS:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference ADVANCEMENTS = m_asfwfitz("advancements");
+   public static final TypeReference ADVANCEMENTS = createTypeReference("advancements");
    /**
     * A type reference which refers to the point of interest data in a chunk.
     * 
     * @mapping {@literal hashed f_rpwknagp Lnet/minecraft/unmapped/C_rodgceaz;f_rpwknagp:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named POI_CHUNK Lnet/minecraft/datafixer/TypeReferences;POI_CHUNK:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference POI_CHUNK = m_asfwfitz("poi_chunk");
+   public static final TypeReference POI_CHUNK = createTypeReference("poi_chunk");
    /**
     * A type reference which refers to the entity data in a chunk.
     * 
     * @mapping {@literal hashed f_oyfacacm Lnet/minecraft/unmapped/C_rodgceaz;f_oyfacacm:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named ENTITY_CHUNK Lnet/minecraft/datafixer/TypeReferences;ENTITY_CHUNK:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference ENTITY_CHUNK = m_asfwfitz("entity_chunk");
+   public static final TypeReference ENTITY_CHUNK = createTypeReference("entity_chunk");
    /**
     * A type reference which refers to a block entity.
     * 
     * @mapping {@literal hashed f_kmwbnjyb Lnet/minecraft/unmapped/C_rodgceaz;f_kmwbnjyb:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named BLOCK_ENTITY Lnet/minecraft/datafixer/TypeReferences;BLOCK_ENTITY:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference BLOCK_ENTITY = m_asfwfitz("block_entity");
+   public static final TypeReference BLOCK_ENTITY = createTypeReference("block_entity");
    /**
     * A type reference which refers to an item stack.
     * 
     * @mapping {@literal hashed f_ibpookaj Lnet/minecraft/unmapped/C_rodgceaz;f_ibpookaj:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named ITEM_STACK Lnet/minecraft/datafixer/TypeReferences;ITEM_STACK:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference ITEM_STACK = m_asfwfitz("item_stack");
+   public static final TypeReference ITEM_STACK = createTypeReference("item_stack");
    /**
     * A type reference which refers to a block state.
     * 
     * @mapping {@literal hashed f_dzejhezi Lnet/minecraft/unmapped/C_rodgceaz;f_dzejhezi:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named BLOCK_STATE Lnet/minecraft/datafixer/TypeReferences;BLOCK_STATE:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference BLOCK_STATE = m_asfwfitz("block_state");
+   public static final TypeReference BLOCK_STATE = createTypeReference("block_state");
    /**
     * @mapping {@literal hashed f_xbzlhabi Lnet/minecraft/unmapped/C_rodgceaz;f_xbzlhabi:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named FLAT_BLOCK_STATE Lnet/minecraft/datafixer/TypeReferences;FLAT_BLOCK_STATE:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference FLAT_BLOCK_STATE = m_asfwfitz("flat_block_state");
+   public static final TypeReference FLAT_BLOCK_STATE = createTypeReference("flat_block_state");
    /**
     * @mapping {@literal hashed f_etntycyl Lnet/minecraft/unmapped/C_rodgceaz;f_etntycyl:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named DATA_COMPONENTS Lnet/minecraft/datafixer/TypeReferences;DATA_COMPONENTS:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference DATA_COMPONENTS = m_asfwfitz("data_components");
+   public static final TypeReference DATA_COMPONENTS = createTypeReference("data_components");
    /**
     * @mapping {@literal hashed f_kqnitoby Lnet/minecraft/unmapped/C_rodgceaz;f_kqnitoby:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named VILLAGER_TRADE Lnet/minecraft/datafixer/TypeReferences;VILLAGER_TRADE:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference VILLAGER_TRADE = m_asfwfitz("villager_trade");
+   public static final TypeReference VILLAGER_TRADE = createTypeReference("villager_trade");
    /**
     * @mapping {@literal hashed f_clcxjfxn Lnet/minecraft/unmapped/C_rodgceaz;f_clcxjfxn:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named PARTICLE Lnet/minecraft/datafixer/TypeReferences;PARTICLE:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference PARTICLE = m_asfwfitz("particle");
+   public static final TypeReference PARTICLE = createTypeReference("particle");
    /**
     * A type reference which refers to an entity's identifier.
     * 
     * @mapping {@literal hashed f_ktucdcfz Lnet/minecraft/unmapped/C_rodgceaz;f_ktucdcfz:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named ENTITY_NAME Lnet/minecraft/datafixer/TypeReferences;ENTITY_NAME:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference ENTITY_NAME = m_asfwfitz("entity_name");
+   public static final TypeReference ENTITY_NAME = createTypeReference("entity_name");
    /**
     * A type reference which refers to an entity tree.
     * 
@@ -169,96 +169,97 @@
     * @mapping {@literal hashed f_jgpiqjom Lnet/minecraft/unmapped/C_rodgceaz;f_jgpiqjom:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named ENTITY_TREE Lnet/minecraft/datafixer/TypeReferences;ENTITY_TREE:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference ENTITY_TREE = m_asfwfitz("entity_tree");
+   public static final TypeReference ENTITY_TREE = createTypeReference("entity_tree");
    /**
     * A type reference which refers to a type of entity.
     * 
     * @mapping {@literal hashed f_gcpbrldn Lnet/minecraft/unmapped/C_rodgceaz;f_gcpbrldn:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named ENTITY Lnet/minecraft/datafixer/TypeReferences;ENTITY:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference ENTITY = m_asfwfitz("entity");
+   public static final TypeReference ENTITY = createTypeReference("entity");
    /**
     * A type reference which refers to a block's identifier.
     * 
     * @mapping {@literal hashed f_rhzuyqjz Lnet/minecraft/unmapped/C_rodgceaz;f_rhzuyqjz:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named BLOCK_NAME Lnet/minecraft/datafixer/TypeReferences;BLOCK_NAME:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference BLOCK_NAME = m_asfwfitz("block_name");
+   public static final TypeReference BLOCK_NAME = createTypeReference("block_name");
    /**
     * A type reference which refers to an item's identifier.
     * 
     * @mapping {@literal hashed f_nwapwxfn Lnet/minecraft/unmapped/C_rodgceaz;f_nwapwxfn:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named ITEM_NAME Lnet/minecraft/datafixer/TypeReferences;ITEM_NAME:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference ITEM_NAME = m_asfwfitz("item_name");
+   public static final TypeReference ITEM_NAME = createTypeReference("item_name");
    /**
     * @mapping {@literal hashed f_ncbjfvfc Lnet/minecraft/unmapped/C_rodgceaz;f_ncbjfvfc:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named GAME_EVENT_NAME Lnet/minecraft/datafixer/TypeReferences;GAME_EVENT_NAME:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference GAME_EVENT_NAME = m_asfwfitz("game_event_name");
+   public static final TypeReference GAME_EVENT_NAME = createTypeReference("game_event_name");
    /**
     * @mapping {@literal hashed f_yrwdjncz Lnet/minecraft/unmapped/C_rodgceaz;f_yrwdjncz:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named UNTAGGED_SPAWNER Lnet/minecraft/datafixer/TypeReferences;UNTAGGED_SPAWNER:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference UNTAGGED_SPAWNER = m_asfwfitz("untagged_spawner");
+   public static final TypeReference UNTAGGED_SPAWNER = createTypeReference("untagged_spawner");
    /**
     * @mapping {@literal hashed f_vukmbbwm Lnet/minecraft/unmapped/C_rodgceaz;f_vukmbbwm:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named STRUCTURE_FEATURE Lnet/minecraft/datafixer/TypeReferences;STRUCTURE_FEATURE:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference STRUCTURE_FEATURE = m_asfwfitz("structure_feature");
+   public static final TypeReference STRUCTURE_FEATURE = createTypeReference("structure_feature");
    /**
     * @mapping {@literal hashed f_buwcxwsf Lnet/minecraft/unmapped/C_rodgceaz;f_buwcxwsf:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named OBJECTIVE Lnet/minecraft/datafixer/TypeReferences;OBJECTIVE:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference OBJECTIVE = m_asfwfitz("objective");
+   public static final TypeReference OBJECTIVE = createTypeReference("objective");
    /**
     * @mapping {@literal hashed f_woljgbsh Lnet/minecraft/unmapped/C_rodgceaz;f_woljgbsh:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named TEAM Lnet/minecraft/datafixer/TypeReferences;TEAM:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference TEAM = m_asfwfitz("team");
+   public static final TypeReference TEAM = createTypeReference("team");
    /**
     * @mapping {@literal hashed f_meegbwnr Lnet/minecraft/unmapped/C_rodgceaz;f_meegbwnr:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named RECIPE Lnet/minecraft/datafixer/TypeReferences;RECIPE:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference RECIPE = m_asfwfitz("recipe");
+   public static final TypeReference RECIPE = createTypeReference("recipe");
    /**
     * A type reference which refers to a biome.
     * 
     * @mapping {@literal hashed f_svatkjon Lnet/minecraft/unmapped/C_rodgceaz;f_svatkjon:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named BIOME Lnet/minecraft/datafixer/TypeReferences;BIOME:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference BIOME = m_asfwfitz("biome");
+   public static final TypeReference BIOME = createTypeReference("biome");
    /**
     * @mapping {@literal hashed f_qmqrxqag Lnet/minecraft/unmapped/C_rodgceaz;f_qmqrxqag:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named MULTI_NOISE_BIOME_SOURCE_PARAMETER_LIST Lnet/minecraft/datafixer/TypeReferences;MULTI_NOISE_BIOME_SOURCE_PARAMETER_LIST:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference MULTI_NOISE_BIOME_SOURCE_PARAMETER_LIST = m_asfwfitz("multi_noise_biome_source_parameter_list");
+   public static final TypeReference MULTI_NOISE_BIOME_SOURCE_PARAMETER_LIST = createTypeReference("multi_noise_biome_source_parameter_list");
    /**
     * A type reference which refers to chunk generator settings.
     * 
     * @mapping {@literal hashed f_fipiwawr Lnet/minecraft/unmapped/C_rodgceaz;f_fipiwawr:Lcom/mojang/datafixers/DSL$TypeReference;}
     * @mapping {@literal named CHUNK_GENERATOR_SETTINGS Lnet/minecraft/datafixer/TypeReferences;CHUNK_GENERATOR_SETTINGS:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference CHUNK_GENERATOR_SETTINGS = m_asfwfitz("world_gen_settings");
+   public static final TypeReference CHUNK_GENERATOR_SETTINGS = createTypeReference("world_gen_settings");
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_asfwfitz Lnet/minecraft/unmapped/C_rodgceaz;m_asfwfitz(Ljava/lang/String;)Lcom/mojang/datafixers/DSL$TypeReference;}
+    * @mapping {@literal named createTypeReference Lnet/minecraft/datafixer/TypeReferences;createTypeReference(Ljava/lang/String;)Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static TypeReference m_asfwfitz(String string) {
+   public static TypeReference createTypeReference(String typeName) {
       return new TypeReference() {
          /**
           * Mapping not found
           */
          @Override
          public String typeName() {
-            return string;
+            return typeName;
          }
 
          /**
           * Mapping not found
           */
          public String toString() {
-            return "@" + string;
+            return "@" + typeName;
          }
       };
    }
diff -bur namedTargetSrc/net/minecraft/enchantment/EnchantmentHelper.java namedSrc/net/minecraft/enchantment/EnchantmentHelper.java
--- namedTargetSrc/net/minecraft/enchantment/EnchantmentHelper.java	2024-07-05 03:14:40.636201119 +0000
+++ namedSrc/net/minecraft/enchantment/EnchantmentHelper.java	2024-07-05 03:13:32.971786006 +0000
@@ -58,9 +58,9 @@
     * @mapping {@literal hashed m_byjosehc Lnet/minecraft/unmapped/C_jakrppis;m_byjosehc(Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_sddaxwyk;)I}
     * @mapping {@literal named m_byjosehc Lnet/minecraft/enchantment/EnchantmentHelper;m_byjosehc(Lnet/minecraft/registry/Holder;Lnet/minecraft/item/ItemStack;)I}
     */
-   public static int m_byjosehc(Holder<Enchantment> arg, ItemStack stack) {
+   public static int m_byjosehc(Holder<Enchantment> enchantmentHolder, ItemStack stack) {
       ItemEnchantmentsComponent lv = stack.getOrDefault(DataComponentTypes.ENCHANTMENTS, ItemEnchantmentsComponent.DEFAULT);
-      return lv.m_ugcgsgdf(arg);
+      return lv.m_ugcgsgdf(enchantmentHolder);
    }
 
    /**
@@ -669,7 +669,7 @@
       }
 
       for (EnchantmentLevelEntry lv : list) {
-         stack.m_nisvbeaw(lv.f_ykbaoghe, lv.level);
+         stack.m_nisvbeaw(lv.enchantmentHolder, lv.level);
       }
 
       return stack;
@@ -722,7 +722,7 @@
     * @mapping {@literal named removeConflicts Lnet/minecraft/enchantment/EnchantmentHelper;removeConflicts(Ljava/util/List;Lnet/minecraft/enchantment/EnchantmentLevelEntry;)V}
     */
    public static void removeConflicts(List<EnchantmentLevelEntry> possibleEntries, EnchantmentLevelEntry pickedEntry) {
-      possibleEntries.removeIf(arg2 -> !Enchantment.m_ycasfcso(pickedEntry.f_ykbaoghe, arg2.f_ykbaoghe));
+      possibleEntries.removeIf(arg2 -> !Enchantment.m_ycasfcso(pickedEntry.enchantmentHolder, arg2.enchantmentHolder));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/enchantment/Enchantment.java namedSrc/net/minecraft/enchantment/Enchantment.java
--- namedTargetSrc/net/minecraft/enchantment/Enchantment.java	2024-07-05 03:14:40.584200796 +0000
+++ namedSrc/net/minecraft/enchantment/Enchantment.java	2024-07-05 03:13:32.923785710 +0000
@@ -66,15 +66,16 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_jxtrubuh}
  * @mapping {@literal named net/minecraft/enchantment/Enchantment}
  */
-public record Enchantment(Text description, Enchantment.Properties definition, HolderSet<Enchantment> exclusiveSet, DataComponentMap effects) {
+public record Enchantment(Text description, Enchantment.Properties properties, HolderSet<Enchantment> exclusiveSet, DataComponentMap effects) {
    /**
     * Mapping not found
     */
    public static final int f_scwbgtxq = 255;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_yozrarfo Lnet/minecraft/unmapped/C_jxtrubuh;f_yozrarfo:Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named CODEC Lnet/minecraft/enchantment/Enchantment;CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<Enchantment> f_yozrarfo = RecordCodecBuilder.create(
+   public static final Codec<Enchantment> CODEC = RecordCodecBuilder.create(
       instance -> instance.group(
                TextCodecs.CODEC.fieldOf("description").forGetter(Enchantment::description),
                Enchantment.Properties.CODEC.forGetter(Enchantment::definition),
@@ -86,9 +87,10 @@
             .apply(instance, Enchantment::new)
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_cvunyugc Lnet/minecraft/unmapped/C_jxtrubuh;f_cvunyugc:Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named HOLDER_CODEC Lnet/minecraft/enchantment/Enchantment;HOLDER_CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<Holder<Enchantment>> f_cvunyugc = RegistryFixedCodec.create(RegistryKeys.ENCHANTMENT);
+   public static final Codec<Holder<Enchantment>> HOLDER_CODEC = RegistryFixedCodec.create(RegistryKeys.ENCHANTMENT);
    /**
     * @mapping {@literal hashed f_jnrqrvxn Lnet/minecraft/unmapped/C_jxtrubuh;f_jnrqrvxn:Lnet/minecraft/unmapped/C_qsrmwluu;}
     * @mapping {@literal named PACKET_CODEC Lnet/minecraft/enchantment/Enchantment;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
@@ -113,9 +115,9 @@
 
    /**
     * @mapping {@literal hashed m_ajxstdmb Lnet/minecraft/unmapped/C_jxtrubuh;m_ajxstdmb(Lnet/minecraft/unmapped/C_odfnijdo;Lnet/minecraft/unmapped/C_odfnijdo;IILnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;I[Lnet/minecraft/unmapped/C_qfoqahef;)Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;}
-    * @mapping {@literal named m_ajxstdmb Lnet/minecraft/enchantment/Enchantment;m_ajxstdmb(Lnet/minecraft/registry/HolderSet;Lnet/minecraft/registry/HolderSet;IILnet/minecraft/enchantment/Enchantment$Cost;Lnet/minecraft/enchantment/Enchantment$Cost;I[Lnet/minecraft/entity/EquipmentSlotGroup;)Lnet/minecraft/enchantment/Enchantment$Properties;}
+    * @mapping {@literal named properties Lnet/minecraft/enchantment/Enchantment;properties(Lnet/minecraft/registry/HolderSet;Lnet/minecraft/registry/HolderSet;IILnet/minecraft/enchantment/Enchantment$Cost;Lnet/minecraft/enchantment/Enchantment$Cost;I[Lnet/minecraft/entity/EquipmentSlotGroup;)Lnet/minecraft/enchantment/Enchantment$Properties;}
     */
-   public static Enchantment.Properties m_ajxstdmb(
+   public static Enchantment.Properties properties(
       HolderSet<Item> supportedItems,
       HolderSet<Item> value,
       int weight,
@@ -130,9 +132,9 @@
 
    /**
     * @mapping {@literal hashed m_rftiggzk Lnet/minecraft/unmapped/C_jxtrubuh;m_rftiggzk(Lnet/minecraft/unmapped/C_odfnijdo;IILnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;I[Lnet/minecraft/unmapped/C_qfoqahef;)Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;}
-    * @mapping {@literal named m_rftiggzk Lnet/minecraft/enchantment/Enchantment;m_rftiggzk(Lnet/minecraft/registry/HolderSet;IILnet/minecraft/enchantment/Enchantment$Cost;Lnet/minecraft/enchantment/Enchantment$Cost;I[Lnet/minecraft/entity/EquipmentSlotGroup;)Lnet/minecraft/enchantment/Enchantment$Properties;}
+    * @mapping {@literal named properties Lnet/minecraft/enchantment/Enchantment;properties(Lnet/minecraft/registry/HolderSet;IILnet/minecraft/enchantment/Enchantment$Cost;Lnet/minecraft/enchantment/Enchantment$Cost;I[Lnet/minecraft/entity/EquipmentSlotGroup;)Lnet/minecraft/enchantment/Enchantment$Properties;}
     */
-   public static Enchantment.Properties m_rftiggzk(
+   public static Enchantment.Properties properties(
       HolderSet<Item> supportedItems,
       int weight,
       int maxLevel,
@@ -164,17 +166,19 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_npijgbpy Lnet/minecraft/unmapped/C_jxtrubuh;m_npijgbpy()Lnet/minecraft/unmapped/C_odfnijdo;}
+    * @mapping {@literal named getSupportedItems Lnet/minecraft/enchantment/Enchantment;getSupportedItems()Lnet/minecraft/registry/HolderSet;}
     */
-   public HolderSet<Item> m_npijgbpy() {
-      return this.definition.supportedItems();
+   public HolderSet<Item> getSupportedItems() {
+      return this.properties.supportedItems();
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_jhglsmkm Lnet/minecraft/unmapped/C_jxtrubuh;m_jhglsmkm(Lnet/minecraft/unmapped/C_yuycoehb;)Z}
+    * @mapping {@literal named m_jhglsmkm Lnet/minecraft/enchantment/Enchantment;m_jhglsmkm(Lnet/minecraft/entity/EquipmentSlot;)Z}
     */
-   public boolean m_jhglsmkm(EquipmentSlot arg) {
-      return this.definition.slots().stream().anyMatch(arg2 -> arg2.matches(arg));
+   public boolean m_jhglsmkm(EquipmentSlot equipmentSlot) {
+      return this.properties.slots().stream().anyMatch(arg2 -> arg2.matches(equipmentSlot));
    }
 
    /**
@@ -182,15 +186,15 @@
     * @mapping {@literal named m_znzmqxec Lnet/minecraft/enchantment/Enchantment;m_znzmqxec(Lnet/minecraft/item/ItemStack;)Z}
     */
    public boolean m_znzmqxec(ItemStack stack) {
-      return this.m_iarnlloo(stack) && (this.definition.primaryItems.isEmpty() || stack.isIn((HolderSet<Item>)this.definition.primaryItems.get()));
+      return this.isSupported(stack) && (this.properties.primaryItems.isEmpty() || stack.isIn((HolderSet<Item>)this.properties.primaryItems.get()));
    }
 
    /**
     * @mapping {@literal hashed m_iarnlloo Lnet/minecraft/unmapped/C_jxtrubuh;m_iarnlloo(Lnet/minecraft/unmapped/C_sddaxwyk;)Z}
-    * @mapping {@literal named m_iarnlloo Lnet/minecraft/enchantment/Enchantment;m_iarnlloo(Lnet/minecraft/item/ItemStack;)Z}
+    * @mapping {@literal named isSupported Lnet/minecraft/enchantment/Enchantment;isSupported(Lnet/minecraft/item/ItemStack;)Z}
     */
-   public boolean m_iarnlloo(ItemStack stack) {
-      return stack.isIn(this.definition.supportedItems);
+   public boolean isSupported(ItemStack stack) {
+      return stack.isIn(this.properties.supportedItems);
    }
 
    /**
@@ -198,7 +202,7 @@
     * @mapping {@literal named getWeight Lnet/minecraft/enchantment/Enchantment;getWeight()I}
     */
    public int getWeight() {
-      return this.definition.weight();
+      return this.properties.weight();
    }
 
    /**
@@ -206,7 +210,7 @@
     * @mapping {@literal named getAnvilCost Lnet/minecraft/enchantment/Enchantment;getAnvilCost()I}
     */
    public int getAnvilCost() {
-      return this.definition.anvilCost();
+      return this.properties.anvilCost();
    }
 
    /**
@@ -226,7 +230,7 @@
     * @mapping {@literal named getMaxLevel Lnet/minecraft/enchantment/Enchantment;getMaxLevel()I}
     */
    public int getMaxLevel() {
-      return this.definition.maxLevel();
+      return this.properties.maxLevel();
    }
 
    /**
@@ -237,7 +241,7 @@
     * @mapping {@literal named getMinPower Lnet/minecraft/enchantment/Enchantment;getMinPower(I)I}
     */
    public int getMinPower(int level) {
-      return this.definition.minCost().m_lpzheldf(level);
+      return this.properties.minCost().m_lpzheldf(level);
    }
 
    /**
@@ -248,7 +252,7 @@
     * @mapping {@literal named getMaxPower Lnet/minecraft/enchantment/Enchantment;getMaxPower(I)I}
     */
    public int getMaxPower(int level) {
-      return this.definition.maxCost().m_lpzheldf(level);
+      return this.properties.maxCost().m_lpzheldf(level);
    }
 
    /**
@@ -291,7 +295,7 @@
     * @mapping {@literal named isAcceptableItem Lnet/minecraft/enchantment/Enchantment;isAcceptableItem(Lnet/minecraft/item/ItemStack;)Z}
     */
    public boolean isAcceptableItem(ItemStack stack) {
-      return this.definition.supportedItems().contains(stack.getHolder());
+      return this.properties.supportedItems().contains(stack.getHolder());
    }
 
    /**
@@ -306,8 +310,8 @@
     * @mapping {@literal hashed m_ujjglmjb Lnet/minecraft/unmapped/C_jxtrubuh;m_ujjglmjb(Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;)Z}
     * @mapping {@literal named m_ujjglmjb Lnet/minecraft/enchantment/Enchantment;m_ujjglmjb(Lnet/minecraft/server/world/ServerWorld;ILnet/minecraft/entity/Entity;Lnet/minecraft/entity/damage/DamageSource;)Z}
     */
-   public boolean m_ujjglmjb(ServerWorld world, int i, Entity arg2, DamageSource arg3) {
-      LootContext lv = m_yyvgkyyg(world, i, arg2, arg3);
+   public boolean m_ujjglmjb(ServerWorld world, int i, Entity entity, DamageSource damageSource) {
+      LootContext lv = m_yyvgkyyg(world, i, entity, damageSource);
 
       for (C_blsrbzwc<C_tetfhtxh> lv2 : this.m_tujulygf(C_rkxlblfn.DAMAGE_IMMUNITY)) {
          if (lv2.m_pxcwohpj(lv)) {
@@ -322,12 +326,12 @@
     * @mapping {@literal hashed m_ysnvykwd Lnet/minecraft/unmapped/C_jxtrubuh;m_ysnvykwd(Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;Lorg/apache/commons/lang3/mutable/MutableFloat;)V}
     * @mapping {@literal named m_ysnvykwd Lnet/minecraft/enchantment/Enchantment;m_ysnvykwd(Lnet/minecraft/server/world/ServerWorld;ILnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/damage/DamageSource;Lorg/apache/commons/lang3/mutable/MutableFloat;)V}
     */
-   public void m_ysnvykwd(ServerWorld world, int i, ItemStack stack, Entity arg3, DamageSource arg4, MutableFloat mutableFloat) {
-      LootContext lv = m_yyvgkyyg(world, i, arg3, arg4);
+   public void m_ysnvykwd(ServerWorld world, int i, ItemStack stack, Entity entity, DamageSource damageSource, MutableFloat mutableFloat) {
+      LootContext lv = m_yyvgkyyg(world, i, entity, damageSource);
 
       for (C_blsrbzwc<C_nzjqewao> lv2 : this.m_tujulygf(C_rkxlblfn.DAMAGE_PROTECTION)) {
          if (lv2.m_pxcwohpj(lv)) {
-            mutableFloat.setValue(lv2.effect().m_usnsfqay(i, arg3.m_dlwxaobh(), mutableFloat.floatValue()));
+            mutableFloat.setValue(lv2.effect().m_usnsfqay(i, entity.m_dlwxaobh(), mutableFloat.floatValue()));
          }
       }
    }
@@ -368,8 +372,8 @@
     * @mapping {@literal hashed m_dktlsnak Lnet/minecraft/unmapped/C_jxtrubuh;m_dktlsnak(Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lorg/apache/commons/lang3/mutable/MutableFloat;)V}
     * @mapping {@literal named m_dktlsnak Lnet/minecraft/enchantment/Enchantment;m_dktlsnak(Lnet/minecraft/server/world/ServerWorld;ILnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;Lorg/apache/commons/lang3/mutable/MutableFloat;)V}
     */
-   public void m_dktlsnak(ServerWorld world, int i, ItemStack stack, Entity arg3, MutableFloat mutableFloat) {
-      this.m_webwhtnd(C_rkxlblfn.MOB_EXPERIENCE, world, i, stack, arg3, mutableFloat);
+   public void m_dktlsnak(ServerWorld world, int i, ItemStack stack, Entity entity, MutableFloat mutableFloat) {
+      this.m_webwhtnd(C_rkxlblfn.MOB_EXPERIENCE, world, i, stack, entity, mutableFloat);
    }
 
    /**
@@ -384,8 +388,8 @@
     * @mapping {@literal hashed m_tdrqsuwy Lnet/minecraft/unmapped/C_jxtrubuh;m_tdrqsuwy(Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lorg/apache/commons/lang3/mutable/MutableFloat;)V}
     * @mapping {@literal named m_tdrqsuwy Lnet/minecraft/enchantment/Enchantment;m_tdrqsuwy(Lnet/minecraft/server/world/ServerWorld;ILnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;Lorg/apache/commons/lang3/mutable/MutableFloat;)V}
     */
-   public void m_tdrqsuwy(ServerWorld world, int i, ItemStack stack, Entity arg3, MutableFloat mutableFloat) {
-      this.m_webwhtnd(C_rkxlblfn.TRIDENT_RETURN_ACCELERATION, world, i, stack, arg3, mutableFloat);
+   public void m_tdrqsuwy(ServerWorld world, int i, ItemStack stack, Entity entity, MutableFloat mutableFloat) {
+      this.m_webwhtnd(C_rkxlblfn.TRIDENT_RETURN_ACCELERATION, world, i, stack, entity, mutableFloat);
    }
 
    /**
@@ -400,60 +404,60 @@
     * @mapping {@literal hashed m_sswkpgks Lnet/minecraft/unmapped/C_jxtrubuh;m_sswkpgks(Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lorg/apache/commons/lang3/mutable/MutableFloat;)V}
     * @mapping {@literal named m_sswkpgks Lnet/minecraft/enchantment/Enchantment;m_sswkpgks(Lnet/minecraft/server/world/ServerWorld;ILnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;Lorg/apache/commons/lang3/mutable/MutableFloat;)V}
     */
-   public void m_sswkpgks(ServerWorld world, int i, ItemStack stack, Entity arg3, MutableFloat mutableFloat) {
-      this.m_webwhtnd(C_rkxlblfn.FISHING_TIME_REDUCTION, world, i, stack, arg3, mutableFloat);
+   public void m_sswkpgks(ServerWorld world, int i, ItemStack stack, Entity entity, MutableFloat mutableFloat) {
+      this.m_webwhtnd(C_rkxlblfn.FISHING_TIME_REDUCTION, world, i, stack, entity, mutableFloat);
    }
 
    /**
     * @mapping {@literal hashed m_kpljywnw Lnet/minecraft/unmapped/C_jxtrubuh;m_kpljywnw(Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lorg/apache/commons/lang3/mutable/MutableFloat;)V}
     * @mapping {@literal named m_kpljywnw Lnet/minecraft/enchantment/Enchantment;m_kpljywnw(Lnet/minecraft/server/world/ServerWorld;ILnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;Lorg/apache/commons/lang3/mutable/MutableFloat;)V}
     */
-   public void m_kpljywnw(ServerWorld world, int i, ItemStack stack, Entity arg3, MutableFloat mutableFloat) {
-      this.m_webwhtnd(C_rkxlblfn.FISHING_LUCK_BONUS, world, i, stack, arg3, mutableFloat);
+   public void m_kpljywnw(ServerWorld world, int i, ItemStack stack, Entity entity, MutableFloat mutableFloat) {
+      this.m_webwhtnd(C_rkxlblfn.FISHING_LUCK_BONUS, world, i, stack, entity, mutableFloat);
    }
 
    /**
     * @mapping {@literal hashed m_hhzjktgj Lnet/minecraft/unmapped/C_jxtrubuh;m_hhzjktgj(Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;Lorg/apache/commons/lang3/mutable/MutableFloat;)V}
     * @mapping {@literal named m_hhzjktgj Lnet/minecraft/enchantment/Enchantment;m_hhzjktgj(Lnet/minecraft/server/world/ServerWorld;ILnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/damage/DamageSource;Lorg/apache/commons/lang3/mutable/MutableFloat;)V}
     */
-   public void m_hhzjktgj(ServerWorld world, int i, ItemStack stack, Entity arg3, DamageSource arg4, MutableFloat mutableFloat) {
-      this.m_ilvfmxkk(C_rkxlblfn.DAMAGE, world, i, stack, arg3, arg4, mutableFloat);
+   public void m_hhzjktgj(ServerWorld world, int i, ItemStack stack, Entity entity, DamageSource damageSource, MutableFloat mutableFloat) {
+      this.m_ilvfmxkk(C_rkxlblfn.DAMAGE, world, i, stack, entity, damageSource, mutableFloat);
    }
 
    /**
     * @mapping {@literal hashed m_bycsoyig Lnet/minecraft/unmapped/C_jxtrubuh;m_bycsoyig(Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;Lorg/apache/commons/lang3/mutable/MutableFloat;)V}
     * @mapping {@literal named m_bycsoyig Lnet/minecraft/enchantment/Enchantment;m_bycsoyig(Lnet/minecraft/server/world/ServerWorld;ILnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/damage/DamageSource;Lorg/apache/commons/lang3/mutable/MutableFloat;)V}
     */
-   public void m_bycsoyig(ServerWorld world, int i, ItemStack stack, Entity arg3, DamageSource arg4, MutableFloat mutableFloat) {
-      this.m_ilvfmxkk(C_rkxlblfn.SMASH_DAMAGE_PER_FALLEN_BLOCK, world, i, stack, arg3, arg4, mutableFloat);
+   public void m_bycsoyig(ServerWorld world, int i, ItemStack stack, Entity entity, DamageSource damageSource, MutableFloat mutableFloat) {
+      this.m_ilvfmxkk(C_rkxlblfn.SMASH_DAMAGE_PER_FALLEN_BLOCK, world, i, stack, entity, damageSource, mutableFloat);
    }
 
    /**
     * @mapping {@literal hashed m_tehyavah Lnet/minecraft/unmapped/C_jxtrubuh;m_tehyavah(Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;Lorg/apache/commons/lang3/mutable/MutableFloat;)V}
     * @mapping {@literal named m_tehyavah Lnet/minecraft/enchantment/Enchantment;m_tehyavah(Lnet/minecraft/server/world/ServerWorld;ILnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/damage/DamageSource;Lorg/apache/commons/lang3/mutable/MutableFloat;)V}
     */
-   public void m_tehyavah(ServerWorld world, int i, ItemStack stack, Entity arg3, DamageSource arg4, MutableFloat mutableFloat) {
-      this.m_ilvfmxkk(C_rkxlblfn.KNOCKBACK, world, i, stack, arg3, arg4, mutableFloat);
+   public void m_tehyavah(ServerWorld world, int i, ItemStack stack, Entity entity, DamageSource damageSource, MutableFloat mutableFloat) {
+      this.m_ilvfmxkk(C_rkxlblfn.KNOCKBACK, world, i, stack, entity, damageSource, mutableFloat);
    }
 
    /**
     * @mapping {@literal hashed m_jaecftnx Lnet/minecraft/unmapped/C_jxtrubuh;m_jaecftnx(Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;Lorg/apache/commons/lang3/mutable/MutableFloat;)V}
     * @mapping {@literal named m_jaecftnx Lnet/minecraft/enchantment/Enchantment;m_jaecftnx(Lnet/minecraft/server/world/ServerWorld;ILnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/damage/DamageSource;Lorg/apache/commons/lang3/mutable/MutableFloat;)V}
     */
-   public void m_jaecftnx(ServerWorld world, int i, ItemStack stack, Entity arg3, DamageSource arg4, MutableFloat mutableFloat) {
-      this.m_ilvfmxkk(C_rkxlblfn.ARMOR_EFFECTIVENESS, world, i, stack, arg3, arg4, mutableFloat);
+   public void m_jaecftnx(ServerWorld world, int i, ItemStack stack, Entity entity, DamageSource damageSource, MutableFloat mutableFloat) {
+      this.m_ilvfmxkk(C_rkxlblfn.ARMOR_EFFECTIVENESS, world, i, stack, entity, damageSource, mutableFloat);
    }
 
    /**
     * @mapping {@literal hashed m_qvvmzgda Lnet/minecraft/unmapped/C_jxtrubuh;m_qvvmzgda(Lnet/minecraft/unmapped/C_idcxfrny;Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_pjrjvgrp;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;)V}
     * @mapping {@literal named m_qvvmzgda Lnet/minecraft/enchantment/Enchantment;m_qvvmzgda(Lnet/minecraft/unmapped/C_idcxfrny;Lnet/minecraft/server/world/ServerWorld;ILnet/minecraft/unmapped/C_pjrjvgrp;Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/damage/DamageSource;)V}
     */
-   public static void m_qvvmzgda(C_idcxfrny<C_hjejeprw> arg, ServerWorld world, int i, C_pjrjvgrp arg3, Entity arg4, DamageSource arg5) {
-      if (arg.m_sbmzbkam(m_yyvgkyyg(world, i, arg4, arg5))) {
+   public static void m_qvvmzgda(C_idcxfrny<C_hjejeprw> arg, ServerWorld world, int i, C_pjrjvgrp arg3, Entity entity, DamageSource damageSource) {
+      if (arg.m_sbmzbkam(m_yyvgkyyg(world, i, entity, damageSource))) {
          Entity lv = switch (arg.affected()) {
-            case ATTACKER -> arg5.getAttacker();
-            case DAMAGING_ENTITY -> arg5.getSource();
-            case VICTIM -> arg4;
+            case ATTACKER -> damageSource.getAttacker();
+            case DAMAGING_ENTITY -> damageSource.getSource();
+            case VICTIM -> entity;
          };
          if (lv != null) {
             arg.effect().m_qtizntqq(world, i, arg3, lv, lv.getPos());
@@ -477,16 +481,16 @@
     * @mapping {@literal hashed m_kevrabge Lnet/minecraft/unmapped/C_jxtrubuh;m_kevrabge(Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lorg/apache/commons/lang3/mutable/MutableFloat;)V}
     * @mapping {@literal named m_kevrabge Lnet/minecraft/enchantment/Enchantment;m_kevrabge(Lnet/minecraft/server/world/ServerWorld;ILnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;Lorg/apache/commons/lang3/mutable/MutableFloat;)V}
     */
-   public void m_kevrabge(ServerWorld world, int i, ItemStack stack, Entity arg3, MutableFloat mutableFloat) {
-      this.m_webwhtnd(C_rkxlblfn.PROJECTILE_COUNT, world, i, stack, arg3, mutableFloat);
+   public void m_kevrabge(ServerWorld world, int level, ItemStack stack, Entity entity, MutableFloat mutableFloat) {
+      this.m_webwhtnd(C_rkxlblfn.PROJECTILE_COUNT, world, level, stack, entity, mutableFloat);
    }
 
    /**
     * @mapping {@literal hashed m_zlpziyyk Lnet/minecraft/unmapped/C_jxtrubuh;m_zlpziyyk(Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lorg/apache/commons/lang3/mutable/MutableFloat;)V}
     * @mapping {@literal named m_zlpziyyk Lnet/minecraft/enchantment/Enchantment;m_zlpziyyk(Lnet/minecraft/server/world/ServerWorld;ILnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;Lorg/apache/commons/lang3/mutable/MutableFloat;)V}
     */
-   public void m_zlpziyyk(ServerWorld world, int i, ItemStack stack, Entity arg3, MutableFloat mutableFloat) {
-      this.m_webwhtnd(C_rkxlblfn.PROJECTILE_SPREAD, world, i, stack, arg3, mutableFloat);
+   public void m_zlpziyyk(ServerWorld world, int i, ItemStack stack, Entity entity, MutableFloat mutableFloat) {
+      this.m_webwhtnd(C_rkxlblfn.PROJECTILE_SPREAD, world, i, stack, entity, mutableFloat);
    }
 
    /**
@@ -512,19 +516,21 @@
     * @mapping {@literal hashed m_laluoqcj Lnet/minecraft/unmapped/C_jxtrubuh;m_laluoqcj(Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_pjrjvgrp;Lnet/minecraft/unmapped/C_astfners;)V}
     * @mapping {@literal named m_laluoqcj Lnet/minecraft/enchantment/Enchantment;m_laluoqcj(Lnet/minecraft/server/world/ServerWorld;ILnet/minecraft/unmapped/C_pjrjvgrp;Lnet/minecraft/entity/Entity;)V}
     */
-   public void m_laluoqcj(ServerWorld world, int i, C_pjrjvgrp arg2, Entity arg3) {
-      m_qirqbtfb(this.m_tujulygf(C_rkxlblfn.TICK), m_ciojbccw(world, i, arg3, arg3.getPos()), arg4 -> arg4.m_qtizntqq(world, i, arg2, arg3, arg3.getPos()));
+   public void m_laluoqcj(ServerWorld world, int i, C_pjrjvgrp arg2, Entity entity) {
+      m_qirqbtfb(
+         this.m_tujulygf(C_rkxlblfn.TICK), m_ciojbccw(world, i, entity, entity.getPos()), arg4 -> arg4.m_qtizntqq(world, i, arg2, entity, entity.getPos())
+      );
    }
 
    /**
     * @mapping {@literal hashed m_dgttciah Lnet/minecraft/unmapped/C_jxtrubuh;m_dgttciah(Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_pjrjvgrp;Lnet/minecraft/unmapped/C_astfners;)V}
     * @mapping {@literal named m_dgttciah Lnet/minecraft/enchantment/Enchantment;m_dgttciah(Lnet/minecraft/server/world/ServerWorld;ILnet/minecraft/unmapped/C_pjrjvgrp;Lnet/minecraft/entity/Entity;)V}
     */
-   public void m_dgttciah(ServerWorld world, int i, C_pjrjvgrp arg2, Entity arg3) {
+   public void m_dgttciah(ServerWorld world, int i, C_pjrjvgrp arg2, Entity entity) {
       m_qirqbtfb(
          this.m_tujulygf(C_rkxlblfn.PROJECTILE_SPAWNED),
-         m_ciojbccw(world, i, arg3, arg3.getPos()),
-         arg4 -> arg4.m_qtizntqq(world, i, arg2, arg3, arg3.getPos())
+         m_ciojbccw(world, i, entity, entity.getPos()),
+         arg4 -> arg4.m_qtizntqq(world, i, arg2, entity, entity.getPos())
       );
    }
 
@@ -551,12 +557,12 @@
     * @mapping {@literal named m_webwhtnd Lnet/minecraft/enchantment/Enchantment;m_webwhtnd(Lnet/minecraft/component/DataComponentType;Lnet/minecraft/server/world/ServerWorld;ILnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;Lorg/apache/commons/lang3/mutable/MutableFloat;)V}
     */
    private void m_webwhtnd(
-      DataComponentType<List<C_blsrbzwc<C_nzjqewao>>> type, ServerWorld world, int i, ItemStack stack, Entity arg4, MutableFloat mutableFloat
+      DataComponentType<List<C_blsrbzwc<C_nzjqewao>>> type, ServerWorld world, int i, ItemStack stack, Entity entity, MutableFloat mutableFloat
    ) {
       m_qirqbtfb(
          this.m_tujulygf(type),
-         m_ciojbccw(world, i, arg4, arg4.getPos()),
-         arg2 -> mutableFloat.setValue(arg2.m_usnsfqay(i, arg4.m_dlwxaobh(), mutableFloat.floatValue()))
+         m_ciojbccw(world, i, entity, entity.getPos()),
+         arg2 -> mutableFloat.setValue(arg2.m_usnsfqay(i, entity.m_dlwxaobh(), mutableFloat.floatValue()))
       );
    }
 
@@ -569,14 +575,14 @@
       ServerWorld world,
       int i,
       ItemStack stack,
-      Entity arg4,
-      DamageSource arg5,
+      Entity entity,
+      DamageSource damageSource,
       MutableFloat mutableFloat
    ) {
       m_qirqbtfb(
          this.m_tujulygf(type),
-         m_yyvgkyyg(world, i, arg4, arg5),
-         arg2 -> mutableFloat.setValue(arg2.m_usnsfqay(i, arg4.m_dlwxaobh(), mutableFloat.floatValue()))
+         m_yyvgkyyg(world, i, entity, damageSource),
+         arg2 -> mutableFloat.setValue(arg2.m_usnsfqay(i, entity.m_dlwxaobh(), mutableFloat.floatValue()))
       );
    }
 
@@ -584,14 +590,14 @@
     * @mapping {@literal hashed m_yyvgkyyg Lnet/minecraft/unmapped/C_jxtrubuh;m_yyvgkyyg(Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;)Lnet/minecraft/unmapped/C_iakykpgh;}
     * @mapping {@literal named m_yyvgkyyg Lnet/minecraft/enchantment/Enchantment;m_yyvgkyyg(Lnet/minecraft/server/world/ServerWorld;ILnet/minecraft/entity/Entity;Lnet/minecraft/entity/damage/DamageSource;)Lnet/minecraft/loot/context/LootContext;}
     */
-   public static LootContext m_yyvgkyyg(ServerWorld world, int i, Entity arg2, DamageSource arg3) {
+   public static LootContext m_yyvgkyyg(ServerWorld world, int level, Entity entity, DamageSource damageSource) {
       LootContextParameterSet lv = new LootContextParameterSet.Builder(world)
-         .add(LootContextParameters.THIS_ENTITY, arg2)
-         .add(LootContextParameters.ENCHANTMENT_LEVEL, i)
-         .add(LootContextParameters.ORIGIN, arg2.getPos())
-         .add(LootContextParameters.DAMAGE_SOURCE, arg3)
-         .addOptional(LootContextParameters.ATTACKING_ENTITY, arg3.getAttacker())
-         .addOptional(LootContextParameters.DIRECT_ATTACKING_ENTITY, arg3.getSource())
+         .add(LootContextParameters.THIS_ENTITY, entity)
+         .add(LootContextParameters.ENCHANTMENT_LEVEL, level)
+         .add(LootContextParameters.ORIGIN, entity.getPos())
+         .add(LootContextParameters.DAMAGE_SOURCE, damageSource)
+         .addOptional(LootContextParameters.ATTACKING_ENTITY, damageSource.getAttacker())
+         .addOptional(LootContextParameters.DIRECT_ATTACKING_ENTITY, damageSource.getSource())
          .build(LootContextTypes.ENCHANTED_DAMAGE);
       return new LootContext.Builder(lv).build(Optional.empty());
    }
@@ -600,9 +606,9 @@
     * @mapping {@literal hashed m_chvflatp Lnet/minecraft/unmapped/C_jxtrubuh;m_chvflatp(Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_iakykpgh;}
     * @mapping {@literal named m_chvflatp Lnet/minecraft/enchantment/Enchantment;m_chvflatp(Lnet/minecraft/server/world/ServerWorld;ILnet/minecraft/item/ItemStack;)Lnet/minecraft/loot/context/LootContext;}
     */
-   private static LootContext m_chvflatp(ServerWorld world, int i, ItemStack stack) {
+   private static LootContext m_chvflatp(ServerWorld world, int i, ItemStack item) {
       LootContextParameterSet lv = new LootContextParameterSet.Builder(world)
-         .add(LootContextParameters.TOOL, stack)
+         .add(LootContextParameters.TOOL, item)
          .add(LootContextParameters.ENCHANTMENT_LEVEL, i)
          .build(LootContextTypes.ENCHANTED_ITEM);
       return new LootContext.Builder(lv).build(Optional.empty());
@@ -612,12 +618,12 @@
     * @mapping {@literal hashed m_zjsipvve Lnet/minecraft/unmapped/C_jxtrubuh;m_zjsipvve(Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_astfners;Z)Lnet/minecraft/unmapped/C_iakykpgh;}
     * @mapping {@literal named m_zjsipvve Lnet/minecraft/enchantment/Enchantment;m_zjsipvve(Lnet/minecraft/server/world/ServerWorld;ILnet/minecraft/entity/Entity;Z)Lnet/minecraft/loot/context/LootContext;}
     */
-   private static LootContext m_zjsipvve(ServerWorld world, int i, Entity value, boolean b) {
+   private static LootContext m_zjsipvve(ServerWorld world, int level, Entity entity, boolean isActive) {
       LootContextParameterSet lv = new LootContextParameterSet.Builder(world)
-         .add(LootContextParameters.THIS_ENTITY, value)
-         .add(LootContextParameters.ENCHANTMENT_LEVEL, i)
-         .add(LootContextParameters.ORIGIN, value.getPos())
-         .add(LootContextParameters.ENCHANTMENT_ACTIVE, b)
+         .add(LootContextParameters.THIS_ENTITY, entity)
+         .add(LootContextParameters.ENCHANTMENT_LEVEL, level)
+         .add(LootContextParameters.ORIGIN, entity.getPos())
+         .add(LootContextParameters.ENCHANTMENT_ACTIVE, isActive)
          .build(LootContextTypes.ENCHANTED_LOCATION);
       return new LootContext.Builder(lv).build(Optional.empty());
    }
@@ -626,11 +632,11 @@
     * @mapping {@literal hashed m_ciojbccw Lnet/minecraft/unmapped/C_jxtrubuh;m_ciojbccw(Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_iakykpgh;}
     * @mapping {@literal named m_ciojbccw Lnet/minecraft/enchantment/Enchantment;m_ciojbccw(Lnet/minecraft/server/world/ServerWorld;ILnet/minecraft/entity/Entity;Lnet/minecraft/util/math/Vec3d;)Lnet/minecraft/loot/context/LootContext;}
     */
-   private static LootContext m_ciojbccw(ServerWorld world, int i, Entity arg2, Vec3d arg3) {
+   private static LootContext m_ciojbccw(ServerWorld world, int i, Entity entity, Vec3d origin) {
       LootContextParameterSet lv = new LootContextParameterSet.Builder(world)
-         .add(LootContextParameters.THIS_ENTITY, arg2)
+         .add(LootContextParameters.THIS_ENTITY, entity)
          .add(LootContextParameters.ENCHANTMENT_LEVEL, i)
-         .add(LootContextParameters.ORIGIN, arg3)
+         .add(LootContextParameters.ORIGIN, origin)
          .build(LootContextTypes.ENCHANTED_ENTITY);
       return new LootContext.Builder(lv).build(Optional.empty());
    }
@@ -650,11 +656,12 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_qirqbtfb Lnet/minecraft/unmapped/C_jxtrubuh;m_qirqbtfb(Ljava/util/List;Lnet/minecraft/unmapped/C_iakykpgh;Ljava/util/function/Consumer;)V}
+    * @mapping {@literal named m_qirqbtfb Lnet/minecraft/enchantment/Enchantment;m_qirqbtfb(Ljava/util/List;Lnet/minecraft/loot/context/LootContext;Ljava/util/function/Consumer;)V}
     */
-   private static <T> void m_qirqbtfb(List<C_blsrbzwc<T>> list, LootContext arg, Consumer<T> consumer) {
+   private static <T> void m_qirqbtfb(List<C_blsrbzwc<T>> list, LootContext lootContext, Consumer<T> consumer) {
       for (C_blsrbzwc<T> lv : list) {
-         if (lv.m_pxcwohpj(arg)) {
+         if (lv.m_pxcwohpj(lootContext)) {
             consumer.accept(lv.effect());
          }
       }
@@ -711,10 +718,19 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_nfuegjdm Lnet/minecraft/unmapped/C_jxtrubuh;m_nfuegjdm(Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;)Lnet/minecraft/unmapped/C_jxtrubuh$C_epmoqirc;}
+    * @mapping {@literal named m_nfuegjdm Lnet/minecraft/enchantment/Enchantment;m_nfuegjdm(Lnet/minecraft/enchantment/Enchantment$Properties;)Lnet/minecraft/enchantment/Enchantment$C_epmoqirc;}
+    */
+   public static Enchantment.C_epmoqirc m_nfuegjdm(Enchantment.Properties properties) {
+      return new Enchantment.C_epmoqirc(properties);
+   }
+
+   /**
+    * @mapping {@literal hashed m_atbrufil Lnet/minecraft/unmapped/C_jxtrubuh;m_atbrufil()Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;}
+    * @mapping {@literal named definition Lnet/minecraft/enchantment/Enchantment;definition()Lnet/minecraft/enchantment/Enchantment$Properties;}
     */
-   public static Enchantment.C_epmoqirc m_nfuegjdm(Enchantment.Properties arg) {
-      return new Enchantment.C_epmoqirc(arg);
+   public Enchantment.Properties definition() {
+      return this.properties;
    }
 
    /**
@@ -723,34 +739,38 @@
     */
    public static class C_epmoqirc {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_radrlqvu Lnet/minecraft/unmapped/C_jxtrubuh$C_epmoqirc;f_radrlqvu:Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;}
+       * @mapping {@literal named properties Lnet/minecraft/enchantment/Enchantment$C_epmoqirc;properties:Lnet/minecraft/enchantment/Enchantment$Properties;}
        */
-      private final Enchantment.Properties f_radrlqvu;
+      private final Enchantment.Properties properties;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_ykzrjano Lnet/minecraft/unmapped/C_jxtrubuh$C_epmoqirc;f_ykzrjano:Lnet/minecraft/unmapped/C_odfnijdo;}
+       * @mapping {@literal named enchantmentHolder Lnet/minecraft/enchantment/Enchantment$C_epmoqirc;enchantmentHolder:Lnet/minecraft/registry/HolderSet;}
        */
-      private HolderSet<Enchantment> f_ykzrjano = HolderSet.createDirect();
+      private HolderSet<Enchantment> enchantmentHolder = HolderSet.createDirect();
       /**
        * Mapping not found
        */
       private final Map<DataComponentType<?>, List<?>> f_wqwudsbq = new HashMap();
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_fmooecif Lnet/minecraft/unmapped/C_jxtrubuh$C_epmoqirc;f_fmooecif:Lnet/minecraft/unmapped/C_kouhnfig$C_vfzyoahz;}
+       * @mapping {@literal named builder Lnet/minecraft/enchantment/Enchantment$C_epmoqirc;builder:Lnet/minecraft/component/DataComponentMap$Builder;}
        */
-      private final DataComponentMap.Builder f_fmooecif = DataComponentMap.builder();
+      private final DataComponentMap.Builder builder = DataComponentMap.builder();
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_jxtrubuh$C_epmoqirc;<init>(Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/enchantment/Enchantment$C_epmoqirc;<init>(Lnet/minecraft/enchantment/Enchantment$Properties;)V}
        */
-      public C_epmoqirc(Enchantment.Properties arg) {
-         this.f_radrlqvu = arg;
+      public C_epmoqirc(Enchantment.Properties properties) {
+         this.properties = properties;
       }
 
       /**
        * Mapping not found
        */
       public Enchantment.C_epmoqirc m_fywpvdlv(HolderSet<Enchantment> arg) {
-         this.f_ykzrjano = arg;
+         this.enchantmentHolder = arg;
          return this;
       }
 
@@ -806,7 +826,7 @@
        * @mapping {@literal named m_vmwohqmn Lnet/minecraft/enchantment/Enchantment$C_epmoqirc;m_vmwohqmn(Lnet/minecraft/component/DataComponentType;Ljava/lang/Object;)Lnet/minecraft/enchantment/Enchantment$C_epmoqirc;}
        */
       public <E> Enchantment.C_epmoqirc m_vmwohqmn(DataComponentType<E> type, E value) {
-         this.f_fmooecif.put(type, value);
+         this.builder.put(type, value);
          return this;
       }
 
@@ -815,7 +835,7 @@
        * @mapping {@literal named m_qoopatrn Lnet/minecraft/enchantment/Enchantment$C_epmoqirc;m_qoopatrn(Lnet/minecraft/component/DataComponentType;)Lnet/minecraft/enchantment/Enchantment$C_epmoqirc;}
        */
       public Enchantment.C_epmoqirc m_qoopatrn(DataComponentType<Unit> type) {
-         this.f_fmooecif.put(type, Unit.INSTANCE);
+         this.builder.put(type, Unit.INSTANCE);
          return this;
       }
 
@@ -826,7 +846,7 @@
       private <E> List<E> m_ijzbgmuo(DataComponentType<List<E>> key) {
          return (List<E>)this.f_wqwudsbq.computeIfAbsent(key, arg2 -> {
             ArrayList<E> arrayList = new ArrayList();
-            this.f_fmooecif.put(key, arrayList);
+            this.builder.put(key, arrayList);
             return arrayList;
          });
       }
@@ -836,7 +856,7 @@
        * @mapping {@literal named m_fcblttrk Lnet/minecraft/enchantment/Enchantment$C_epmoqirc;m_fcblttrk(Lnet/minecraft/util/Identifier;)Lnet/minecraft/enchantment/Enchantment;}
        */
       public Enchantment m_fcblttrk(Identifier id) {
-         return new Enchantment(Text.translatable(Util.createTranslationKey("enchantment", id)), this.f_radrlqvu, this.f_ykzrjano, this.f_fmooecif.build());
+         return new Enchantment(Text.translatable(Util.createTranslationKey("enchantment", id)), this.properties, this.enchantmentHolder, this.builder.build());
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/enchantment/EnchantmentLevelEntry.java namedSrc/net/minecraft/enchantment/EnchantmentLevelEntry.java
--- namedTargetSrc/net/minecraft/enchantment/EnchantmentLevelEntry.java	2024-07-05 03:14:40.584200796 +0000
+++ namedSrc/net/minecraft/enchantment/EnchantmentLevelEntry.java	2024-07-05 03:13:32.923785710 +0000
@@ -19,9 +19,10 @@
  */
 public class EnchantmentLevelEntry extends Weighted.Absent {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ykbaoghe Lnet/minecraft/unmapped/C_gsnkkurc;f_ykbaoghe:Lnet/minecraft/unmapped/C_cjzoxshv;}
+    * @mapping {@literal named enchantmentHolder Lnet/minecraft/enchantment/EnchantmentLevelEntry;enchantmentHolder:Lnet/minecraft/registry/Holder;}
     */
-   public final Holder<Enchantment> f_ykbaoghe;
+   public final Holder<Enchantment> enchantmentHolder;
    /**
     * @mapping {@literal hashed f_otdtqrqd Lnet/minecraft/unmapped/C_gsnkkurc;f_otdtqrqd:I}
     * @mapping {@literal named level Lnet/minecraft/enchantment/EnchantmentLevelEntry;level:I}
@@ -32,9 +33,9 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_gsnkkurc;<init>(Lnet/minecraft/unmapped/C_cjzoxshv;I)V}
     * @mapping {@literal named <init> Lnet/minecraft/enchantment/EnchantmentLevelEntry;<init>(Lnet/minecraft/registry/Holder;I)V}
     */
-   public EnchantmentLevelEntry(Holder<Enchantment> arg, int level) {
-      super(arg.value().getWeight());
-      this.f_ykbaoghe = arg;
+   public EnchantmentLevelEntry(Holder<Enchantment> enchantmentHolder, int level) {
+      super(enchantmentHolder.value().getWeight());
+      this.enchantmentHolder = enchantmentHolder;
       this.level = level;
    }
 }


The remaining diff is too long!

Please sign in to comment.