Skip to content

Commit

Permalink
Merge branch 'refs/heads/1.21' into pyrox-pr-revival
Browse files Browse the repository at this point in the history
# Conflicts:
#	mappings/net/minecraft/enchantment/Enchantment.mapping
#	mappings/net/minecraft/enchantment/EnchantmentLevelEntry.mapping
#	mappings/net/minecraft/enchantment/Enchantments.mapping
#	mappings/net/minecraft/network/NetworkThreadUtils.mapping
#	mappings/net/minecraft/network/listener/PacketListener.mapping
#	mappings/net/minecraft/network/packet/s2c/common/CustomReportDetailsS2CPacket.mapping
  • Loading branch information
ix0rai committed Jul 9, 2024
2 parents fd35d23 + 00aa214 commit 89edb7b
Show file tree
Hide file tree
Showing 67 changed files with 629 additions and 82 deletions.
2 changes: 2 additions & 0 deletions buildSrc/src/main/resources/minecraft_specific_words.txt
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,8 @@ unmute
unescape
uncraftable
unflattening
unconfigured
uninterruptibly

// -able
abortable
Expand Down
7 changes: 7 additions & 0 deletions mappings/net/minecraft/SharedConstants.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ CLASS net/minecraft/unmapped/C_otltijcb net/minecraft/SharedConstants
FIELD f_ehrxapxz ENABLE_VILLAGE_SECTIONS_DEBUGGER Z
FIELD f_emnchfpb DATA_VERSION_KEY Ljava/lang/String;
FIELD f_epeoxdwh VERBOSE_SERVER_EVENTS Z
FIELD f_ersnpnsa CRASH_ON_UNCAUGHT_THREAD_EXCEPTION Z
FIELD f_faotkdsy DONT_SAVE_WORLD Z
FIELD f_fdxhrrfh AVERAGE_RANDOM_TICKS_PER_BLOCK_PER_MINUTE F
FIELD f_fiiqytbx ENABLE_RAIDS_DEBUGGER Z
Expand All @@ -29,7 +30,9 @@ CLASS net/minecraft/unmapped/C_otltijcb net/minecraft/SharedConstants
FIELD f_gsgwbqxq ENABLE_WORLD_GENERATION_ATTEMPT_DEBUGGER Z
FIELD f_guobkgjz ENABLE_DEBUG_HOTKEYS Z
FIELD f_hbxkjitv FAKE_MS_JITTER I
FIELD f_hlntcltp ENABLE_LOCAL_SERVER_ENTITY_HIT_BOXES_DEBUGGER Z
FIELD f_hselqqov ENABLE_CARVERS_DEBUGGER Z
FIELD f_hskycgyk USE_DEV_ONLY_FEATURES Z
FIELD f_hvdvamsn TICKS_PER_MINUTE I
FIELD f_iavlnkwa ONLY_GENERATE_HALF_OF_THE_WORLD Z
FIELD f_inoiujxk GRAVITY_BLOCK_DUPLICATION_FIX Z
Expand All @@ -39,6 +42,7 @@ CLASS net/minecraft/unmapped/C_otltijcb net/minecraft/SharedConstants
FIELD f_jjrxzfck DISABLE_FEATURES Z
FIELD f_jssgbmds ENABLE_SHAPES_DEBUGGER Z
FIELD f_jvgdpwyv COMMAND_STACK_TRACES Z
FIELD f_kgahljek MAX_PLAYER_NAME_LENGTH I
FIELD f_kgoovenw DISABLE_STRUCTURES Z
FIELD f_kgpztkbc isDevelopment Z
FIELD f_kkorbrvt SERIES Ljava/lang/String;
Expand Down Expand Up @@ -79,6 +83,7 @@ CLASS net/minecraft/unmapped/C_otltijcb net/minecraft/SharedConstants
FIELD f_svzpcqrf SYNCHRONOUS_GL_LOGS Z
FIELD f_szzypgru KEEP_JIGSAW_BLOCKS Z
FIELD f_tgrnftle CHUNK_WIDTH I
FIELD f_umfmtvoq MAX_USER_COMMAND_LENGTH I
FIELD f_unjbqjde DISABLE_BELOW_ZERO_RETROGENERATION Z
FIELD f_uomrhzpy ENABLE_BRAIN_DEBUGGER Z
FIELD f_urxonbdn ENABLE_NEIGHBOR_UPDATES_DEBUGGER Z
Expand All @@ -88,6 +93,7 @@ CLASS net/minecraft/unmapped/C_otltijcb net/minecraft/SharedConstants
FIELD f_vjsmbhin VERSION_NAME Ljava/lang/String;
FIELD f_vmvthkqh IN_GAME_DEBUG_OUTPUT Z
FIELD f_vuaxazth DISABLE_AQUIFERS Z
FIELD f_vvzzzkdn MAXIMUM_EXPLOSION_RESISTANCE F
FIELD f_wcndudyu ENABLE_RESOURCE_LOADING_TIMES_DEBUGGER Z
FIELD f_wevqaylw ENABLE_GAME_EVENT_LISTENERS_DEBUGGER Z
FIELD f_wfneyrli DISABLE_BLENDING Z
Expand All @@ -103,6 +109,7 @@ CLASS net/minecraft/unmapped/C_otltijcb net/minecraft/SharedConstants
FIELD f_yfqonjom ENABLE_JFR_PROFILING_WORLD_LOADING Z
FIELD f_ygjzdxcw DUMP_INTERPOLATED_TEXTURE_FRAMES Z
FIELD f_yjwbijoa SNAPSHOT_PROTOCOL_VERSION_EXTRA_BITS I
FIELD f_yllmvyey MAX_FUNCTION_COMMAND_LENGTH I
FIELD f_ymfzzcau ENABLE_PATHFINDING_DEBUGGER Z
FIELD f_yorvidhs ENABLE_ORE_VEINS_DEBUGGER Z
FIELD f_yoxoqcpx ENABLE_SCULK_CATALYST_DEBUGGING Z
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
CLASS net/minecraft/unmapped/C_xcfjcqcn net/minecraft/client/network/AbstractClientNetworkHandler
FIELD f_cxiqwwpi serverCookies Ljava/util/Map;
FIELD f_epofvvju serverInfo Lnet/minecraft/unmapped/C_xotldzgg;
FIELD f_ifbkjylc strictErrorHandling Z
FIELD f_ixguppmf connection Lnet/minecraft/unmapped/C_oasmcckk;
FIELD f_kjyjkrbj deferredPackets Ljava/util/List;
FIELD f_lhgeaaaz serverBrand Ljava/lang/String;
FIELD f_qcgabfsl CONNECTION_LOST Lnet/minecraft/unmapped/C_rdaqiwdt;
FIELD f_ruhiglgi postDisconnectScreen Lnet/minecraft/unmapped/C_wrmtlwqx;
FIELD f_utwrhkbc telemetryManager Lnet/minecraft/unmapped/C_bfepxqwf;
FIELD f_vvtetqza customReportDetails Ljava/util/Map;
FIELD f_wjciyfll serverLinks Lnet/minecraft/unmapped/C_ouodvkzu;
METHOD <init> (Lnet/minecraft/unmapped/C_ayfeobid;Lnet/minecraft/unmapped/C_oasmcckk;Lnet/minecraft/unmapped/C_qqflkeyp;)V
ARG 3 connectionState
METHOD m_fhwlneml sendWhen (Lnet/minecraft/unmapped/C_zyjtrjrl;Ljava/util/function/BooleanSupplier;Ljava/time/Duration;)V
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CLASS net/minecraft/unmapped/C_rkxlblfn net/minecraft/component/EnchantmentEffectComponentTypes
FIELD f_kbnlxdno COMPONENT_MAP_CODEC Lcom/mojang/serialization/Codec;
FIELD f_xmdgantf COMPONENT_TYPE_CODEC Lcom/mojang/serialization/Codec;
METHOD m_amrsbxlj register (Ljava/lang/String;Ljava/util/function/UnaryOperator;)Lnet/minecraft/unmapped/C_pscqxfcs;
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CLASS net/minecraft/unmapped/C_apbctukq net/minecraft/data/report/PacketReportProvider
FIELD f_nvuvolwd output Lnet/minecraft/unmapped/C_ugkmwocs;
METHOD m_duyocttu createJson ()Lcom/google/gson/JsonElement;
METHOD m_lblwfmow (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_kxdobmrm;Ljava/util/List;)V
148 changes: 127 additions & 21 deletions mappings/net/minecraft/enchantment/Enchantment.mapping
Original file line number Diff line number Diff line change
@@ -1,56 +1,162 @@
CLASS net/minecraft/unmapped/C_jxtrubuh net/minecraft/enchantment/Enchantment
FIELD f_cvunyugc HOLDER_CODEC Lcom/mojang/serialization/Codec;
FIELD f_cytkilek properties Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;
FIELD f_cvunyugc ENTRY_CODEC Lcom/mojang/serialization/Codec;
FIELD f_jnrqrvxn ENTRY_PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu;
FIELD f_scwbgtxq MAX_LEVEL I
FIELD f_yozrarfo CODEC Lcom/mojang/serialization/Codec;
METHOD m_ajxstdmb properties (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;
METHOD m_chvflatp (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_iakykpgh;
ARG 2 item
METHOD m_ciojbccw (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_iakykpgh;
METHOD m_ajxstdmb createProperties (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;
METHOD m_auqlyhrd removeLocationBasedEffects (ILnet/minecraft/unmapped/C_pjrjvgrp;Lnet/minecraft/unmapped/C_usxaxydn;)V
ARG 1 level
ARG 2 context
ARG 3 user
METHOD m_bhhtcbyx modifyCrossbowChargeTime (Lnet/minecraft/unmapped/C_rlomrsco;ILorg/apache/commons/lang3/mutable/MutableFloat;)V
METHOD m_bycsoyig modifyFallBasedDamage (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
ARG 6 value
METHOD m_chvflatp createItemContext (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_iakykpgh;
ARG 1 level
METHOD m_ciojbccw createEntityContext (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_iakykpgh;
ARG 1 level
ARG 2 entity
ARG 3 origin
ARG 3 pos
METHOD m_dgttciah onProjectileSpawned (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_pjrjvgrp;Lnet/minecraft/unmapped/C_astfners;)V
ARG 2 level
ARG 3 context
METHOD m_dktlsnak modifyMobExperience (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lorg/apache/commons/lang3/mutable/MutableFloat;)V
METHOD m_glfcpyqa getMaxLevel ()I
COMMENT Sets the maximum number of levels, such as Sharpness which has a maximum 5 levels, the enchantment has. Default: 1.
METHOD m_hhzjktgj modifyDamage (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
ARG 6 value
METHOD m_iarnlloo isSupported (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
METHOD m_iehcgemg modifyProjectilePiercing (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lorg/apache/commons/lang3/mutable/MutableFloat;)V
METHOD m_igxrorrr getMinLevel ()I
COMMENT Sets the minimum number of levels, such as Sharpness which has a minimum of 1 level, the enchantment has. Default: 1.
METHOD m_jhglsmkm (Lnet/minecraft/unmapped/C_yuycoehb;)Z
ARG 1 equipmentSlot
METHOD m_kevrabge (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lorg/apache/commons/lang3/mutable/MutableFloat;)V
ARG 2 level
METHOD m_ilvfmxkk modifyDamageFilteredValue (Lnet/minecraft/unmapped/C_pscqxfcs;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
ARG 3 level
ARG 7 value
METHOD m_jaecftnx modifyArmorEffectiveness (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
ARG 6 value
METHOD m_jhglsmkm matchesSlot (Lnet/minecraft/unmapped/C_yuycoehb;)Z
ARG 1 slot
METHOD m_kevrabge modifyProjectileCount (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lorg/apache/commons/lang3/mutable/MutableFloat;)V
METHOD m_khmhdqpw isAcceptableItem (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
COMMENT {@return the type of item ({@code stack}) that can have this applied to it}
ARG 1 stack
METHOD m_kpljywnw modifyFishingLuckBonus (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lorg/apache/commons/lang3/mutable/MutableFloat;)V
METHOD m_laluoqcj tick (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_pjrjvgrp;Lnet/minecraft/unmapped/C_astfners;)V
ARG 2 level
ARG 3 context
METHOD m_lcxutjum getWeight ()I
METHOD m_nfuegjdm (Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;)Lnet/minecraft/unmapped/C_jxtrubuh$C_epmoqirc;
METHOD m_leklsjht createBlockHitContext (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_txtbiemp;)Lnet/minecraft/unmapped/C_iakykpgh;
ARG 1 level
ARG 2 entity
ARG 3 pos
METHOD m_lypftmbv modifyUnfilteredValue (Lnet/minecraft/unmapped/C_pscqxfcs;Lnet/minecraft/unmapped/C_rlomrsco;ILorg/apache/commons/lang3/mutable/MutableFloat;)V
ARG 4 value
METHOD m_mfxiclqq applyLocationBasedEffects (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_pjrjvgrp;Lnet/minecraft/unmapped/C_usxaxydn;)V
ARG 2 level
ARG 3 context
ARG 4 entity
METHOD m_nfuegjdm builder (Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;)Lnet/minecraft/unmapped/C_jxtrubuh$C_epmoqirc;
ARG 0 properties
METHOD m_npijgbpy getSupportedItems ()Lnet/minecraft/unmapped/C_odfnijdo;
METHOD m_qirqbtfb (Ljava/util/List;Lnet/minecraft/unmapped/C_iakykpgh;Ljava/util/function/Consumer;)V
METHOD m_orywsswy (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD m_ovgqiywz onHitBlock (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_pjrjvgrp;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_txtbiemp;)V
ARG 2 level
ARG 3 context
METHOD m_qirqbtfb applyEffects (Ljava/util/List;Lnet/minecraft/unmapped/C_iakykpgh;Ljava/util/function/Consumer;)V
ARG 0 effects
ARG 1 lootContext
METHOD m_rftiggzk properties (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;
ARG 2 effectConsumer
METHOD m_qvvmzgda applyTargetedEffect (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
ARG 0 effect
ARG 2 level
ARG 3 context
ARG 4 user
ARG 5 source
METHOD m_rftiggzk createProperties (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;
METHOD m_rtwmhoyh getMinPower (I)I
COMMENT {@return the minimum level required to by the player for the enchantment to be shown in the enchantment table.}
COMMENT It is not a 1:1 ratio. The majority of enchantments return something similar to `10 * level`, often with different scales depending on the maximum level and rarity of the enchantment.
ARG 1 level
METHOD m_smjuddye modifyDurabilityChange (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lorg/apache/commons/lang3/mutable/MutableFloat;)V
METHOD m_sswkpgks modifyFishingTimeReduction (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lorg/apache/commons/lang3/mutable/MutableFloat;)V
METHOD m_stvdursa modifyTridentSpinAttackStrength (Lnet/minecraft/unmapped/C_rlomrsco;ILorg/apache/commons/lang3/mutable/MutableFloat;)V
METHOD m_tdrqsuwy modifyTridentReturnAcceleration (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lorg/apache/commons/lang3/mutable/MutableFloat;)V
METHOD m_tehyavah modifyKnockback (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
ARG 6 value
METHOD m_tfnzpqjx modifyBlockExperience (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lorg/apache/commons/lang3/mutable/MutableFloat;)V
METHOD m_tiaspbpv getEquipment (Lnet/minecraft/unmapped/C_usxaxydn;)Ljava/util/Map;
ARG 1 entity
METHOD m_tujulygf getEffect (Lnet/minecraft/unmapped/C_pscqxfcs;)Ljava/util/List;
METHOD m_ujjglmjb isImmuneToDamageFrom (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;)Z
METHOD m_umpbrnfg onTargetHit (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_pjrjvgrp;Lnet/minecraft/unmapped/C_zjvjrddv;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;)V
ARG 2 level
ARG 3 context
ARG 4 target
ARG 5 user
ARG 6 source
METHOD m_vjzmieep cost (I)Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;
METHOD m_webwhtnd modifyEntityFilteredValue (Lnet/minecraft/unmapped/C_pscqxfcs;Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lorg/apache/commons/lang3/mutable/MutableFloat;)V
ARG 3 level
ARG 6 value
METHOD m_wqtybzdx modifyItemFilteredCount (Lnet/minecraft/unmapped/C_pscqxfcs;Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lorg/apache/commons/lang3/mutable/MutableFloat;)V
ARG 3 level
ARG 5 value
METHOD m_xaezlmue getAnvilCost ()I
METHOD m_xkuqfipi modifyAmmoChange (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lorg/apache/commons/lang3/mutable/MutableFloat;)V
METHOD m_ycasfcso areCompatible (Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_cjzoxshv;)Z
ARG 0 enchantment1
ARG 1 enchantment2
METHOD m_ygnxsicw cost (II)Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;
METHOD m_yyvgkyyg (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;)Lnet/minecraft/unmapped/C_iakykpgh;
METHOD m_ysnvykwd modifyDamageProtection (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
ARG 6 value
METHOD m_yyvgkyyg createDamageContext (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;)Lnet/minecraft/unmapped/C_iakykpgh;
ARG 1 level
ARG 2 entity
ARG 3 damageSource
METHOD m_zjsipvve (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_astfners;Z)Lnet/minecraft/unmapped/C_iakykpgh;
ARG 3 source
METHOD m_zfqdifee getFullName (Lnet/minecraft/unmapped/C_cjzoxshv;I)Lnet/minecraft/unmapped/C_rdaqiwdt;
ARG 0 enchantment
ARG 1 level
METHOD m_zjsipvve createLocationContext (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_astfners;Z)Lnet/minecraft/unmapped/C_iakykpgh;
ARG 1 level
ARG 2 entity
ARG 3 isActive
ARG 3 enchantmentActive
METHOD m_zlpziyyk modifyProjectileSpread (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lorg/apache/commons/lang3/mutable/MutableFloat;)V
METHOD m_znzmqxec isPrimaryItem (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
METHOD m_ztycenho getMaxPower (I)I
COMMENT {@return the maximum level a Player is allowed before the enchant is not shown in the enchantment table}
COMMENT The default return is the minimum power level + 5.
ARG 1 level
CLASS C_epmoqirc
FIELD f_fmooecif builder Lnet/minecraft/unmapped/C_kouhnfig$C_vfzyoahz;
METHOD m_zzkivipg modifyRepairFromXp (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lorg/apache/commons/lang3/mutable/MutableFloat;)V
CLASS C_epmoqirc Builder
FIELD f_fmooecif effectMapBuilder Lnet/minecraft/unmapped/C_kouhnfig$C_vfzyoahz;
FIELD f_radrlqvu properties Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;
FIELD f_ykzrjano enchantmentHolder Lnet/minecraft/unmapped/C_odfnijdo;
FIELD f_wqwudsbq effectLists Ljava/util/Map;
FIELD f_ykzrjano exclusiveSet Lnet/minecraft/unmapped/C_odfnijdo;
METHOD m_bfbkshbc addEffect (Lnet/minecraft/unmapped/C_pscqxfcs;Lnet/minecraft/unmapped/C_zjvjrddv;Lnet/minecraft/unmapped/C_zjvjrddv;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_jxtrubuh$C_epmoqirc;
ARG 1 type
METHOD m_eirhbvlq addEffect (Lnet/minecraft/unmapped/C_pscqxfcs;Ljava/lang/Object;Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn;)Lnet/minecraft/unmapped/C_jxtrubuh$C_epmoqirc;
ARG 1 type
ARG 3 conditions
METHOD m_fcblttrk build (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_jxtrubuh;
METHOD m_fywpvdlv withExclusiveSet (Lnet/minecraft/unmapped/C_odfnijdo;)Lnet/minecraft/unmapped/C_jxtrubuh$C_epmoqirc;
ARG 1 exclusiveSet
METHOD m_ijzbgmuo getEffectsList (Lnet/minecraft/unmapped/C_pscqxfcs;)Ljava/util/List;
METHOD m_ilkklraq addEffect (Lnet/minecraft/unmapped/C_pscqxfcs;Lnet/minecraft/unmapped/C_kyhkwlnd;)Lnet/minecraft/unmapped/C_jxtrubuh$C_epmoqirc;
ARG 1 type
ARG 2 effect
METHOD m_qoopatrn addEffect (Lnet/minecraft/unmapped/C_pscqxfcs;)Lnet/minecraft/unmapped/C_jxtrubuh$C_epmoqirc;
METHOD m_uhlhfpbp addEffect (Lnet/minecraft/unmapped/C_pscqxfcs;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_jxtrubuh$C_epmoqirc;
ARG 1 type
METHOD m_vkishvxp addEffect (Lnet/minecraft/unmapped/C_pscqxfcs;Lnet/minecraft/unmapped/C_zjvjrddv;Lnet/minecraft/unmapped/C_zjvjrddv;Ljava/lang/Object;Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn;)Lnet/minecraft/unmapped/C_jxtrubuh$C_epmoqirc;
ARG 1 type
ARG 5 conditions
METHOD m_vmwohqmn addSpecialEffect (Lnet/minecraft/unmapped/C_pscqxfcs;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_jxtrubuh$C_epmoqirc;
CLASS C_jkttgiwc Cost
METHOD m_lpzheldf forLevel (I)I
ARG 1 level
METHOD m_zfvugdzh (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
CLASS C_ryljcnwe Properties
METHOD m_vxpftpoe (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CLASS net/minecraft/unmapped/C_pjrjvgrp net/minecraft/enchantment/EnchantmentEffectContext
Loading

3 comments on commit 89edb7b

@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 89edb7b, 182 file(s) were updated with 2091 line(s) added and 1897 removed compared to the latest Quilt Mappings version.

View the diff here (1/3):
diff -bur namedTargetSrc/net/minecraft/block/BeehiveBlock.java namedSrc/net/minecraft/block/BeehiveBlock.java
--- namedTargetSrc/net/minecraft/block/BeehiveBlock.java	2024-07-09 01:44:29.783036280 +0000
+++ namedSrc/net/minecraft/block/BeehiveBlock.java	2024-07-09 01:43:13.382948687 +0000
@@ -126,7 +126,7 @@
    public void afterBreak(World world, PlayerEntity player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, ItemStack stack) {
       super.afterBreak(world, player, pos, state, blockEntity, stack);
       if (!world.isClient && blockEntity instanceof BeehiveBlockEntity lv) {
-         if (!EnchantmentHelper.m_ruiicrds(stack, EnchantmentTags.PREVENTS_BEE_SPAWNS_WHEN_MINING)) {
+         if (!EnchantmentHelper.hasTag(stack, EnchantmentTags.PREVENTS_BEE_SPAWNS_WHEN_MINING)) {
             lv.angerBees(player, state, BeehiveBlockEntity.BeeState.EMERGENCY);
             world.updateComparators(pos, this);
             this.angerNearbyBees(world, pos);
diff -bur namedTargetSrc/net/minecraft/block/Block.java namedSrc/net/minecraft/block/Block.java
--- namedTargetSrc/net/minecraft/block/Block.java	2024-07-09 01:44:29.895036395 +0000
+++ namedSrc/net/minecraft/block/Block.java	2024-07-09 01:43:13.526948831 +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) {
    }
 
    /**
@@ -902,7 +902,7 @@
     * @mapping {@literal named dropConditionalExperience Lnet/minecraft/block/Block;dropConditionalExperience(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/math/int_provider/IntProvider;)V}
     */
    protected void dropConditionalExperience(ServerWorld world, BlockPos pos, ItemStack stack, IntProvider experienceProvider) {
-      int i = EnchantmentHelper.m_mcehpxsn(world, stack, experienceProvider.get(world.getRandom()));
+      int i = EnchantmentHelper.getBlockExperience(world, stack, experienceProvider.get(world.getRandom()));
       if (i > 0) {
          this.dropExperience(world, pos, i);
       }
diff -bur namedTargetSrc/net/minecraft/block/Blocks.java namedSrc/net/minecraft/block/Blocks.java
--- namedTargetSrc/net/minecraft/block/Blocks.java	2024-07-09 01:44:29.679036173 +0000
+++ namedSrc/net/minecraft/block/Blocks.java	2024-07-09 01:43:13.254948557 +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-09 01:44:29.615036107 +0000
+++ namedSrc/net/minecraft/block/DecoratedPotBlock.java	2024-07-09 01:43:13.162948465 +0000
@@ -261,7 +261,7 @@
    public BlockState onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player) {
       ItemStack lv = player.getMainHandStack();
       BlockState lv2 = state;
-      if (lv.isIn(ItemTags.BREAKS_DECORATED_POTS) && !EnchantmentHelper.m_ruiicrds(lv, EnchantmentTags.PREVENTS_DECORATED_POT_SHATTERING)) {
+      if (lv.isIn(ItemTags.BREAKS_DECORATED_POTS) && !EnchantmentHelper.hasTag(lv, EnchantmentTags.PREVENTS_DECORATED_POT_SHATTERING)) {
          lv2 = state.with(CRACKED, Boolean.valueOf(true));
          world.setBlockState(pos, lv2, Block.NO_REDRAW);
       }
@@ -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-09 01:44:29.691036185 +0000
+++ namedSrc/net/minecraft/block/dispenser/DispenserBlock.java	2024-07-09 01:43:13.266948570 +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-09 01:44:29.771036268 +0000
+++ namedSrc/net/minecraft/block/dispenser/ProjectileDispenserBehavior.java	2024-07-09 01:43:13.370948674 +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 config Lnet/minecraft/block/dispenser/ProjectileDispenserBehavior;config:Lnet/minecraft/item/ProjectileItem$DispenserConfig;}
     */
-   private final ProjectileItem.DispenserConfig f_uupspuna;
+   private final ProjectileItem.DispenserConfig config;
 
    /**
     * @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.config = 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.config.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.config.power(), this.config.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.config.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-09 01:44:29.719036215 +0000
+++ namedSrc/net/minecraft/block/entity/BannerBlockEntity.java	2024-07-09 01:43:13.314948618 +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 patterns Lnet/minecraft/block/entity/BannerBlockEntity;patterns:Lnet/minecraft/component/type/BannerPatternsComponent;}
     */
-   private BannerPatternsComponent f_yqkmzniy = BannerPatternsComponent.DEFAULT;
+   private BannerPatternsComponent patterns = 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 baseColor) {
+      this.baseColor = baseColor;
       this.m_rloeylgt(stack);
    }
 
@@ -106,10 +107,8 @@
    @Override
    protected void writeNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
       super.writeNbt(nbt, lookupProvider);
-      if (!this.f_yqkmzniy.equals(BannerPatternsComponent.DEFAULT)) {
-         nbt.put(
-            "patterns", BannerPatternsComponent.CODEC.encodeStart(lookupProvider.createSerializationContext(NbtOps.INSTANCE), this.f_yqkmzniy).getOrThrow()
-         );
+      if (!this.patterns.equals(BannerPatternsComponent.DEFAULT)) {
+         nbt.put("patterns", BannerPatternsComponent.CODEC.encodeStart(lookupProvider.createSerializationContext(NbtOps.INSTANCE), this.patterns).getOrThrow());
       }
 
       if (this.customName != null) {
@@ -131,7 +130,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.patterns = argx);
       }
    }
 
@@ -155,7 +154,7 @@
     * Mapping not found
     */
    public BannerPatternsComponent m_kmayejyb() {
-      return this.f_yqkmzniy;
+      return this.patterns;
    }
 
    /**
@@ -182,7 +181,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.patterns = arg.m_uwrxlczq(DataComponentTypes.BANNER_PATTERNS, BannerPatternsComponent.DEFAULT);
       this.customName = arg.m_gotgrppy(DataComponentTypes.CUSTOM_NAME);
    }
 
@@ -192,7 +191,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.patterns);
       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-09 01:44:29.767036263 +0000
+++ namedSrc/net/minecraft/block/entity/BlockEntityType.java	2024-07-09 01:43:13.366948670 +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-09 01:44:29.843036342 +0000
+++ namedSrc/net/minecraft/block/FlowerBlock.java	2024-07-09 01:43:13.458948763 +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/IceBlock.java namedSrc/net/minecraft/block/IceBlock.java
--- namedTargetSrc/net/minecraft/block/IceBlock.java	2024-07-09 01:44:29.903036404 +0000
+++ namedSrc/net/minecraft/block/IceBlock.java	2024-07-09 01:43:13.530948836 +0000
@@ -54,7 +54,7 @@
    @Override
    public void afterBreak(World world, PlayerEntity player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, ItemStack stack) {
       super.afterBreak(world, player, pos, state, blockEntity, stack);
-      if (!EnchantmentHelper.m_ruiicrds(stack, EnchantmentTags.PREVENTS_ICE_MELTING)) {
+      if (!EnchantmentHelper.hasTag(stack, EnchantmentTags.PREVENTS_ICE_MELTING)) {
          if (world.getDimension().ultraWarm()) {
             world.removeBlock(pos, false);
             return;
diff -bur namedTargetSrc/net/minecraft/block/InfestedBlock.java namedSrc/net/minecraft/block/InfestedBlock.java
--- namedTargetSrc/net/minecraft/block/InfestedBlock.java	2024-07-09 01:44:29.659036153 +0000
+++ namedSrc/net/minecraft/block/InfestedBlock.java	2024-07-09 01:43:13.226948529 +0000
@@ -108,7 +108,7 @@
    @Override
    protected void onStacksDropped(BlockState state, ServerWorld world, BlockPos pos, ItemStack stack, boolean dropExperience) {
       super.onStacksDropped(state, world, pos, stack, dropExperience);
-      if (world.getGameRules().getBooleanValue(GameRules.DO_TILE_DROPS) && !EnchantmentHelper.m_ruiicrds(stack, EnchantmentTags.PREVENTS_INFESTED_SPAWNS)) {
+      if (world.getGameRules().getBooleanValue(GameRules.DO_TILE_DROPS) && !EnchantmentHelper.hasTag(stack, EnchantmentTags.PREVENTS_INFESTED_SPAWNS)) {
          this.spawnSilverfish(world, pos);
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/ShulkerBoxBlock.java namedSrc/net/minecraft/block/ShulkerBoxBlock.java
--- namedTargetSrc/net/minecraft/block/ShulkerBoxBlock.java	2024-07-09 01:44:29.767036263 +0000
+++ namedSrc/net/minecraft/block/ShulkerBoxBlock.java	2024-07-09 01:43:13.366948670 +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-09 01:44:29.839036338 +0000
+++ namedSrc/net/minecraft/block/SpawnerBlock.java	2024-07-09 01:43:13.454948759 +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-09 01:44:29.655036149 +0000
+++ namedSrc/net/minecraft/block/TrialSpawnerBlock.java	2024-07-09 01:43:13.218948522 +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-09 01:44:29.767036263 +0000
+++ namedSrc/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.java	2024-07-09 01:43:13.366948670 +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/ingame/EnchantmentScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.java	2024-07-09 01:44:29.663036157 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.java	2024-07-09 01:43:13.230948533 +0000
@@ -277,7 +277,9 @@
             int o = l + 1;
             if (this.isPointWithinBounds(60, 14 + 19 * l, 108, 17, (double)mouseX, (double)mouseY) && m > 0 && n >= 0 && optional != null) {
                List<Text> list = Lists.<Text>newArrayList();
-               list.add(Text.translatable("container.enchant.clue", Enchantment.m_zfqdifee((Holder<Enchantment>)optional.get(), n)).formatted(Formatting.WHITE));
+               list.add(
+                  Text.translatable("container.enchant.clue", Enchantment.getFullName((Holder<Enchantment>)optional.get(), n)).formatted(Formatting.WHITE)
+               );
                if (!bl) {
                   list.add(CommonTexts.EMPTY);
                   if (this.client.player.experienceLevel < m) {
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-09 01:44:29.695036190 +0000
+++ namedSrc/net/minecraft/client/gui/screen/realms/RealmsBackupScreen.java	2024-07-09 01:43:13.274948578 +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-09 01:44:29.639036132 +0000
+++ namedSrc/net/minecraft/client/gui/screen/realms/RealmsClientOutdatedScreen.java	2024-07-09 01:43:13.198948501 +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-09 01:44:29.807036304 +0000
+++ namedSrc/net/minecraft/client/gui/screen/realms/RealmsInviteScreen.java	2024-07-09 01:43:13.414948718 +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-09 01:44:29.595036087 +0000
+++ namedSrc/net/minecraft/client/gui/screen/realms/RealmsPlayerScreen.java	2024-07-09 01:43:13.130948433 +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-09 01:44:29.571036062 +0000
+++ namedSrc/net/minecraft/client/gui/WorldGenerationProgressTracker.java	2024-07-09 01:43:13.066948368 +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-09 01:44:29.747036243 +0000
+++ namedSrc/net/minecraft/client/network/AbstractClientNetworkHandler.java	2024-07-09 01:43:13.342948646 +0000
@@ -331,18 +331,18 @@
     * Mapping not found
     */
    @Override
-   public void m_ifiopbgv(CustomReportDetailsS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.customReportDetails = arg.details();
+   public void onCustomReportDetails(CustomReportDetailsS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.customReportDetails = packet.details();
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void m_ikewnwne(ServerLinksS2CPacket 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) {
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-09 01:44:29.875036375 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-07-09 01:43:13.494948799 +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-09 01:44:29.695036190 +0000
+++ namedSrc/net/minecraft/client/render/block/entity/EnchantingTableBlockEntityRenderer.java	2024-07-09 01:43:13.274948578 +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;
Only in namedSrc/net/minecraft/component: EnchantmentEffectComponentTypes.java
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-09 01:44:29.727036223 +0000
+++ namedSrc/net/minecraft/component/type/ContainerContentsComponent.java	2024-07-09 01:43:13.318948622 +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-09 01:44:29.787036284 +0000
+++ namedSrc/net/minecraft/component/type/ItemEnchantmentsComponent.java	2024-07-09 01:43:13.390948694 +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.ENTRY_CODEC, LEVEL_CODEC)
       .xmap(Object2IntOpenHashMap::new, Function.identity());
    /**
     * @mapping {@literal hashed f_nekwvric Lnet/minecraft/unmapped/C_qlclfxvn;f_nekwvric:Lcom/mojang/serialization/Codec;}
@@ -72,7 +72,7 @@
     * @mapping {@literal named PACKET_CODEC Lnet/minecraft/component/type/ItemEnchantmentsComponent;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
    public static final PacketCodec<RegistryByteBuf, ItemEnchantmentsComponent> PACKET_CODEC = PacketCodec.tuple(
-      PacketCodecs.map(Object2IntOpenHashMap::new, Enchantment.PACKET_CODEC, PacketCodecs.VAR_INT),
+      PacketCodecs.map(Object2IntOpenHashMap::new, Enchantment.ENTRY_PACKET_CODEC, PacketCodecs.VAR_INT),
       component -> component.levels,
       PacketCodecs.BOOL,
       component -> component.shownInTooltip,
@@ -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);
    }
 
    /**
@@ -124,14 +125,14 @@
          for (Holder<Enchantment> lv3 : lv2) {
             int i = this.levels.getInt(lv3);
             if (i > 0) {
-               tooltipConsumer.accept(Enchantment.m_zfqdifee(lv3, i));
+               tooltipConsumer.accept(Enchantment.getFullName(lv3, i));
             }
          }
 
          for (Entry<Holder<Enchantment>> entry : this.levels.object2IntEntrySet()) {
             Holder<Enchantment> lv4 = (Holder<Enchantment>)entry.getKey();
             if (!lv2.contains(lv4)) {
-               tooltipConsumer.accept(Enchantment.m_zfqdifee((Holder<Enchantment>)entry.getKey(), entry.getIntValue()));
+               tooltipConsumer.accept(Enchantment.getFullName((Holder<Enchantment>)entry.getKey(), entry.getIntValue()));
             }
          }
       }
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-09 01:44:29.879036379 +0000
+++ namedSrc/net/minecraft/data/client/ItemModelGenerator.java	2024-07-09 01:43:13.506948812 +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-09 01:44:29.751036247 +0000
+++ namedSrc/net/minecraft/data/client/model/BlockStateModelGenerator.java	2024-07-09 01:43:13.346948650 +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-09 01:44:29.899036399 +0000
+++ namedSrc/net/minecraft/data/client/model/Texture.java	2024-07-09 01:43:13.526948831 +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-09 01:44:29.727036223 +0000
+++ namedSrc/net/minecraft/data/Main.java	2024-07-09 01:43:13.318948622 +0000
@@ -35,6 +35,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.VanillaDynamicRegistries;
 import net.minecraft.registry.tag.StructureTagsProvider;
 import net.minecraft.text.Text;
-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-09 01:44:29.843036342 +0000
+++ namedSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java	2024-07-09 01:43:13.462948767 +0000
@@ -994,7 +994,7 @@
                LootCondition.Builder lv3 = LocationCheckLootCondition.builder(
                   LocationPredicate.Builder.create().block(BlockPredicate.Builder.create().blocks(block)), new BlockPos(direction.getVector())
                );
-               return AllOfLootCondition.m_sibyssbo(lv2, lv3);
+               return AllOfLootCondition.builder(lv2, lv3);
             }
          )
          .toArray(LootCondition.Builder[]::new);
@@ -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-09 01:44:29.623036116 +0000
+++ namedSrc/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.java	2024-07-09 01:43:13.182948485 +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;
    }
 }

@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/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-09 01:44:29.763036260 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/rebalance/TradeRebalanceLootTableProviders.java	2024-07-09 01:43:13.362948666 +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
       );
    }
 }
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-09 01:44:29.611036103 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/VanillaEntityLootTableGenerator.java	2024-07-09 01:43:13.158948461 +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-09 01:44:29.635036128 +0000
+++ namedSrc/net/minecraft/data/server/LootTablesProvider.java	2024-07-09 01:43:13.194948497 +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-09 01:44:29.875036375 +0000
+++ namedSrc/net/minecraft/data/server/RecipesProvider.java	2024-07-09 01:43:13.498948803 +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-09 01:44:29.895036395 +0000
+++ namedSrc/net/minecraft/data/server/VanillaLootTableProvider.java	2024-07-09 01:43:13.522948828 +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-09 01:44:29.611036103 +0000
+++ namedSrc/net/minecraft/datafixer/fix/ParticleUnflatteningFix.java	2024-07-09 01:43:13.158948461 +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-09 01:44:29.807036304 +0000
+++ namedSrc/net/minecraft/datafixer/schema/Schema3818v5.java	2024-07-09 01:43:13.414948718 +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-09 01:44:29.819036317 +0000
+++ namedSrc/net/minecraft/datafixer/Schemas.java	2024-07-09 01:43:13.430948735 +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-09 01:44:29.659036153 +0000
+++ namedSrc/net/minecraft/datafixer/TypeReferences.java	2024-07-09 01:43:13.230948533 +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;
          }
       };
    }
Only in namedSrc/net/minecraft/enchantment: effect
Only in namedSrc/net/minecraft/enchantment: EnchantmentEffectContext.java


The remaining diff is too long!

Please sign in to comment.