Skip to content

Commit

Permalink
Misc updates to a bunch of things (#545)
Browse files Browse the repository at this point in the history 
* n/m/item mapping updates

* n/m/network mapping updates

* n/m/particle fully remapped

* n/m/text mapping updates

* n/m/command remappings after 24w05b

* n/m/screen mappings

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
@pyrox0 @github-actions
pyrox0 and github-actions[bot] authored Feb 17, 2024
1 parent af16c09 commit 4a53b1f
Show file tree
Hide file tree
Showing 35 changed files with 269 additions and 22 deletions.
1 change: 1 addition & 0 deletions mappings/net/minecraft/command/argument/ItemStackArgumentType.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
CLASS net/minecraft/unmapped/C_agnltlqe net/minecraft/command/argument/ItemStackArgumentType
FIELD f_mbzoucud reader Lnet/minecraft/unmapped/C_aggscjva;
FIELD f_qwukbfcu EXAMPLES Ljava/util/Collection;
METHOD <init> (Lnet/minecraft/unmapped/C_bprdujxm;)V
ARG 1 context
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
CLASS net/minecraft/unmapped/C_wvjakmzf net/minecraft/command/argument/ParticleEffectArgumentType
FIELD f_aoiuihtg context Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;
FIELD f_blferatl UNKNOWN_PARTICLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
FIELD f_dqyoljeq EXAMPLES Ljava/util/Collection;
METHOD <init> (Lnet/minecraft/unmapped/C_bprdujxm;)V
Expand All @@ -13,6 +14,7 @@ CLASS net/minecraft/unmapped/C_wvjakmzf net/minecraft/command/argument/ParticleE
METHOD m_fsbmnwhr getParticle (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/unmapped/C_nqucohct;
ARG 0 context
ARG 1 name
METHOD m_gdaxvlny getParameters (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/unmapped/C_qlzoaopu;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_nqucohct;
METHOD m_jytmlznx particleEffect (Lnet/minecraft/unmapped/C_bprdujxm;)Lnet/minecraft/unmapped/C_wvjakmzf;
ARG 0 context
METHOD m_okcgtylw parse (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_nqucohct;
Expand Down
4 changes: 4 additions & 0 deletions mappings/net/minecraft/command/argument/TextArgumentType.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
CLASS net/minecraft/unmapped/C_aluvpfjr net/minecraft/command/argument/TextArgumentType
FIELD f_bfxwevpw INVALID_COMPONENT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
FIELD f_fuqvrage context Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;
FIELD f_mmzvznhy EXAMPLES Ljava/util/Collection;
METHOD <init> (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V
ARG 1 context
METHOD getExamples getExamples ()Ljava/util/Collection;
METHOD m_bjuoourz text (Lnet/minecraft/unmapped/C_bprdujxm;)Lnet/minecraft/unmapped/C_aluvpfjr;
ARG 0 context
METHOD m_gtqzgjdc getTextArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/unmapped/C_rdaqiwdt;
ARG 0 context
ARG 1 name
Expand Down
6 changes: 6 additions & 0 deletions mappings/net/minecraft/item/FilledMapItem.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ CLASS net/minecraft/unmapped/C_dojvtveo net/minecraft/item/FilledMapItem
ARG 1 world
ARG 2 entity
ARG 3 state
METHOD m_fdlqyaof getTooltipMapNumberText (Lnet/minecraft/unmapped/C_qqxyyzzm;)Lnet/minecraft/unmapped/C_rdaqiwdt;
ARG 0 mapId
METHOD m_lflngaej createMapState (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_cdctfzbn;IIIZZLnet/minecraft/unmapped/C_xhhleach;)V
ARG 0 stack
ARG 1 world
Expand All @@ -20,6 +22,7 @@ CLASS net/minecraft/unmapped/C_dojvtveo net/minecraft/item/FilledMapItem
ARG 7 dimension
METHOD m_lonanumc setMapId (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_qqxyyzzm;)V
ARG 0 stack
ARG 1 mapId
METHOD m_mpaybwls getOrCreateMapState (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_cdctfzbn;)Lnet/minecraft/unmapped/C_nvpllgmg;
ARG 0 map
ARG 1 world
Expand All @@ -40,7 +43,10 @@ CLASS net/minecraft/unmapped/C_dojvtveo net/minecraft/item/FilledMapItem
ARG 3 scale
ARG 4 showIcons
ARG 5 unlimitedTracking
METHOD m_ptxvacys getMapState (Lnet/minecraft/unmapped/C_qqxyyzzm;Lnet/minecraft/unmapped/C_cdctfzbn;)Lnet/minecraft/unmapped/C_nvpllgmg;
ARG 0 mapId
METHOD m_rrjmrkhw getTooltipMapNumberText (Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_rdaqiwdt;
ARG 0 item
METHOD m_umfrihvk allocateMapId (Lnet/minecraft/unmapped/C_cdctfzbn;IIIZZLnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_qqxyyzzm;
ARG 0 world
ARG 1 x
Expand Down
7 changes: 7 additions & 0 deletions mappings/net/minecraft/item/ItemStack.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ CLASS net/minecraft/unmapped/C_sddaxwyk net/minecraft/item/ItemStack
FIELD f_aasxeeyb NON_AIR_CODEC Lcom/mojang/serialization/Codec;
FIELD f_beccreye NAME_KEY Ljava/lang/String;
COMMENT The key of the item stack's name in the {@linkplain #DISPLAY_KEY display NBT}, whose value is {@value}.
FIELD f_bnghiwgu PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu;
FIELD f_cjxcfrfc COLOR_KEY Ljava/lang/String;
COMMENT The key of the item's color in the {@linkplain #DISPLAY_KEY display NBT}, whose value is {@value}.
FIELD f_eqmyksbs item Lnet/minecraft/unmapped/C_vorddnax;
Expand Down Expand Up @@ -226,6 +227,7 @@ CLASS net/minecraft/unmapped/C_sddaxwyk net/minecraft/item/ItemStack
ARG 1 user
ARG 2 entity
ARG 3 hand
METHOD m_jhwlsqpw isUnbreakable ()Z
METHOD m_jowurkjh copy ()Lnet/minecraft/unmapped/C_sddaxwyk;
COMMENT Creates and returns a copy of this item stack.
METHOD m_jqebbfhj finishUsing (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_usxaxydn;)Lnet/minecraft/unmapped/C_sddaxwyk;
Expand Down Expand Up @@ -298,6 +300,9 @@ CLASS net/minecraft/unmapped/C_sddaxwyk net/minecraft/item/ItemStack
ARG 1 nbt
COMMENT the NBT compound to write to
METHOD m_qxfxfsuy getItem ()Lnet/minecraft/unmapped/C_vorddnax;
METHOD m_rcukuoag (ILnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_yuycoehb;)V
ARG 2 entity
ARG 3 slot
METHOD m_rdrbrcjp addAttributeModifier (Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_hdbqsqsm;Lnet/minecraft/unmapped/C_yuycoehb;)V
ARG 1 attribute
ARG 2 modifier
Expand Down Expand Up @@ -408,6 +413,8 @@ CLASS net/minecraft/unmapped/C_sddaxwyk net/minecraft/item/ItemStack
ARG 2 player
ARG 3 amount
METHOD m_zszkcovn hasEnchantments ()Z
CLASS C_qbkytozl
FIELD f_ejfbjbgz ITEM_PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu;
CLASS C_xgjxqlij TooltipSection
FIELD f_gnssdrqy flag I
METHOD m_lmmhbsev getFlag ()I
2 changes: 2 additions & 0 deletions mappings/net/minecraft/item/map/MapBannerMarker.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ CLASS net/minecraft/unmapped/C_cdpawxua net/minecraft/item/map/MapBannerMarker
COMMENT <p>
COMMENT Used to track banners in a map state.
FIELD f_bwyminhf color Lnet/minecraft/unmapped/C_arllgqae;
FIELD f_nmqnnwct LIST_CODEC Lcom/mojang/serialization/Codec;
FIELD f_wsovgxmc name Ljava/util/Optional;
FIELD f_ywbdupsc pos Lnet/minecraft/unmapped/C_hynzadkk;
FIELD f_zegcular CODEC Lcom/mojang/serialization/Codec;
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD m_mtoayvbk getIconType ()Lnet/minecraft/unmapped/C_lptbbwvu$C_ooswjmee;
Expand Down
13 changes: 13 additions & 0 deletions mappings/net/minecraft/item/map/MapIcon.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ CLASS net/minecraft/unmapped/C_lptbbwvu net/minecraft/item/map/MapIcon
FIELD f_jixtosua text Ljava/util/Optional;
FIELD f_rqtgzrxy type Lnet/minecraft/unmapped/C_lptbbwvu$C_ooswjmee;
FIELD f_tqtqwngy z B
FIELD f_xprnzxvn PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu;
FIELD f_yaubvcjq rotation B
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
Expand All @@ -11,15 +12,27 @@ CLASS net/minecraft/unmapped/C_lptbbwvu net/minecraft/item/map/MapIcon
CLASS C_ooswjmee Type
FIELD f_aqhsaoet name Ljava/lang/String;
FIELD f_cruvlxnu explorationPoi Z
FIELD f_fevyugav PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu;
FIELD f_hckokdxw tintColor I
FIELD f_kqdssutz trackCount Z
FIELD f_lqhzwwnk alwaysRender Z
FIELD f_rwtbkllx INDEX_TO_TYPE Ljava/util/function/IntFunction;
FIELD f_skfrxrmz index I
FIELD f_tzdiknso id B
FIELD f_vuoafzic CODEC Lcom/mojang/serialization/Codec;
METHOD <init> (Ljava/lang/String;IILjava/lang/String;ZIZZ)V
ARG 3 index
ARG 4 name
ARG 5 alwaysRender
ARG 6 tintColor
ARG 7 trackCount
ARG 8 explorationPoi
METHOD m_aivrrufe shouldTrackCount ()Z
METHOD m_bkxqwhsz isAlwaysRendered ()Z
METHOD m_cefcwcvf getTintColor ()I
METHOD m_enbyrnxn byId (B)Lnet/minecraft/unmapped/C_lptbbwvu$C_ooswjmee;
ARG 0 id
METHOD m_kgujprpi getIndex ()I
METHOD m_lsigusku isExplorationPoi ()Z
METHOD m_mxjqurrn getId ()B
METHOD m_vswgulnf hasTintColor ()Z
5 changes: 5 additions & 0 deletions mappings/net/minecraft/item/map/MapId.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
CLASS net/minecraft/unmapped/C_qqxyyzzm net/minecraft/item/map/MapId
FIELD f_bjqncxrj id I
FIELD f_qwhcskfq PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu;
METHOD m_giwujoqd id ()I
METHOD m_xpqsuwlt asString ()Ljava/lang/String;
9 changes: 9 additions & 0 deletions mappings/net/minecraft/item/map/MapState.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,13 @@ CLASS net/minecraft/unmapped/C_nvpllgmg net/minecraft/item/map/MapState
ARG 1 showIcons
ARG 2 dimension
METHOD m_iiszqazf getPlayerMarkerPacket (Lnet/minecraft/unmapped/C_qqxyyzzm;Lnet/minecraft/unmapped/C_jzrpycqo;)Lnet/minecraft/unmapped/C_zyjtrjrl;
ARG 1 mapId
ARG 2 player
METHOD m_kpdzsvus getPlayerSyncData (Lnet/minecraft/unmapped/C_jzrpycqo;)Lnet/minecraft/unmapped/C_nvpllgmg$C_xlzqccwa;
ARG 1 player
METHOD m_kwgphzej fromNbt (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_nvpllgmg;
ARG 0 nbt
ARG 1 provider
METHOD m_laaivkum getMatchingMapPredicate (Lnet/minecraft/unmapped/C_sddaxwyk;)Ljava/util/function/Predicate;
ARG 0 map
METHOD m_lropqhen markIconsDirty ()V
Expand Down Expand Up @@ -127,6 +129,7 @@ CLASS net/minecraft/unmapped/C_nvpllgmg net/minecraft/item/map/MapState
METHOD <init> (Lnet/minecraft/unmapped/C_nvpllgmg;Lnet/minecraft/unmapped/C_jzrpycqo;)V
ARG 2 player
METHOD m_imwcnxuw getPacket (Lnet/minecraft/unmapped/C_qqxyyzzm;)Lnet/minecraft/unmapped/C_zyjtrjrl;
ARG 1 mapId
METHOD m_kzvvepxb markDirty (II)V
ARG 1 startX
ARG 2 startZ
Expand All @@ -137,6 +140,7 @@ CLASS net/minecraft/unmapped/C_nvpllgmg net/minecraft/item/map/MapState
FIELD f_fszlhajl height I
FIELD f_gqkxdszn colors [B
FIELD f_mvgeedzq width I
FIELD f_nkoevnxw PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu;
FIELD f_pjlmhvsq startZ I
METHOD <init> (IIII[B)V
ARG 1 startX
Expand All @@ -146,3 +150,8 @@ CLASS net/minecraft/unmapped/C_nvpllgmg net/minecraft/item/map/MapState
ARG 5 colors
METHOD m_fclihvij setColorsTo (Lnet/minecraft/unmapped/C_nvpllgmg;)V
ARG 1 mapState
METHOD m_rpkebrem read (Lio/netty/buffer/ByteBuf;)Ljava/util/Optional;
ARG 0 buf
METHOD m_wtzdwnbe write (Lio/netty/buffer/ByteBuf;Ljava/util/Optional;)V
ARG 0 buf
ARG 1 updateData
15 changes: 15 additions & 0 deletions mappings/net/minecraft/item/trim/ArmorTrimMaterials.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,23 @@
CLASS net/minecraft/unmapped/C_txvwkqwx net/minecraft/item/trim/ArmorTrimMaterials
METHOD m_ggcdyhpf register (Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_cpwnhism;FLjava/util/Map;)V
ARG 0 trimMaterials
ARG 1 registryKey
ARG 2 item
ARG 3 style
ARG 4 itemModelIndex
ARG 5 materials
METHOD m_jzudvacc (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)Z
ARG 1 material
METHOD m_kkcwbibv register (Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_cpwnhism;F)V
ARG 0 trimMaterials
ARG 1 registryKey
ARG 2 item
ARG 3 style
ARG 4 itemModelIndex
METHOD m_lxvfhxsj getMaterial (Lnet/minecraft/unmapped/C_wqxmvzdq;Lnet/minecraft/unmapped/C_sddaxwyk;)Ljava/util/Optional;
ARG 0 registryManager
ARG 1 stack
METHOD m_xkrjiqjp createKey (Ljava/lang/String;)Lnet/minecraft/unmapped/C_xhhleach;
ARG 0 id
METHOD m_yhwgdlmi bootstrapVanilla (Lnet/minecraft/unmapped/C_hqoyyfco;)V
ARG 0 trimMaterials
2 changes: 2 additions & 0 deletions mappings/net/minecraft/item/trim/ArmorTrimPatterns.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
CLASS net/minecraft/unmapped/C_vdhaofle net/minecraft/item/trim/ArmorTrimPatterns
METHOD m_hmydulmo bootstrapVanilla (Lnet/minecraft/unmapped/C_hqoyyfco;)V
ARG 0 patterns
METHOD m_lyppycad createKey (Ljava/lang/String;)Lnet/minecraft/unmapped/C_xhhleach;
ARG 0 id
METHOD m_mamumeet register (Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_xhhleach;)V
ARG 0 patterns
ARG 1 templateItem
ARG 2 key
METHOD m_ssloiwdo getTrimPattern (Lnet/minecraft/unmapped/C_wqxmvzdq;Lnet/minecraft/unmapped/C_sddaxwyk;)Ljava/util/Optional;
Expand Down
19 changes: 19 additions & 0 deletions mappings/net/minecraft/network/ClientConnection.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,14 @@ CLASS net/minecraft/unmapped/C_oasmcckk net/minecraft/network/ClientConnection
METHOD m_faopouol flushInternal ()V
METHOD m_fqnxiapg submit (Ljava/util/function/Consumer;)V
ARG 1 task
METHOD m_goioywdq (Lnet/minecraft/unmapped/C_xyumsucd;Lio/netty/channel/ChannelHandlerContext;)V
ARG 1 channelHandlerContext
METHOD m_gwpixgaq connect (Ljava/lang/String;ILnet/minecraft/unmapped/C_ppzmqyxe;Lnet/minecraft/unmapped/C_ppzmqyxe;Lnet/minecraft/unmapped/C_ifnchbtj;Lnet/minecraft/unmapped/C_uxoyljpb;)V
ARG 1 address
ARG 2 port
ARG 3 serverConnection
ARG 4 clientConnection
ARG 5 client
ARG 6 intent
METHOD m_hnclvsil getInboundHandlerConfig (Z)Ljava/lang/String;
ARG 0 receivingSide
Expand All @@ -94,14 +99,20 @@ CLASS net/minecraft/unmapped/C_oasmcckk net/minecraft/network/ClientConnection
COMMENT sent by this connection.
METHOD m_kxmmachs setHandshakeListener (Lnet/minecraft/unmapped/C_tkgdawqw;)V
ARG 1 listener
METHOD m_luflhjqj connect (Ljava/lang/String;ILnet/minecraft/unmapped/C_jsvwwjov;)V
ARG 1 address
ARG 2 port
METHOD m_luuskhlm initPerformanceSampleLog (Lnet/minecraft/unmapped/C_pwpucsml;)V
METHOD m_lyptmghi connectLocal (Ljava/net/SocketAddress;)Lnet/minecraft/unmapped/C_oasmcckk;
ARG 0 address
METHOD m_mnslofbm (Lnet/minecraft/unmapped/C_ppzmqyxe;Lnet/minecraft/unmapped/C_tkgdawqw;)V
ARG 1 phase
ARG 2 listener
METHOD m_qeznuhlz (ZLio/netty/channel/ChannelHandlerContext;)V
ARG 2 channelHandlerContext
METHOD m_qjeqlspr (Lnet/minecraft/unmapped/C_ppzmqyxe;Lnet/minecraft/unmapped/C_tkgdawqw;)V
ARG 1 phase
ARG 2 listener
METHOD m_qoorbrdh connect (Ljava/lang/String;ILnet/minecraft/unmapped/C_nyzvjqyd;)V
ARG 1 address
ARG 2 port
Expand All @@ -114,6 +125,8 @@ CLASS net/minecraft/unmapped/C_oasmcckk net/minecraft/network/ClientConnection
ARG 2 listener
METHOD m_rvagcspt getLoggableAddress (Z)Ljava/lang/String;
ARG 1 logIps
METHOD m_seunbusw (Lnet/minecraft/unmapped/C_iypsxyqr;Lio/netty/channel/ChannelHandlerContext;)V
ARG 1 channelHandlerContext
METHOD m_sigcqeza getAddress ()Ljava/net/SocketAddress;
METHOD m_sprgohsj flush ()V
METHOD m_ttkdcwpg getOutboundHandlerConfig (Z)Ljava/lang/String;
Expand Down Expand Up @@ -146,6 +159,12 @@ CLASS net/minecraft/unmapped/C_oasmcckk net/minecraft/network/ClientConnection
METHOD m_wzyhrrka (Lorg/slf4j/Marker;)V
ARG 0 marker
METHOD m_xphjmqxa isOpen ()Z
METHOD m_xqhcjeev connect (Ljava/lang/String;ILnet/minecraft/unmapped/C_ppzmqyxe;Lnet/minecraft/unmapped/C_ppzmqyxe;Lnet/minecraft/unmapped/C_ifnchbtj;Z)V
ARG 1 address
ARG 2 port
ARG 3 serverConnection
ARG 4 clientConnection
ARG 5 client
METHOD m_yylgxjga addFlowControlHandler (Lio/netty/channel/ChannelPipeline;)V
ARG 1 pipeline
METHOD m_zbfykobd send (Lnet/minecraft/unmapped/C_zyjtrjrl;Lnet/minecraft/unmapped/C_zddpfpkk;Z)V
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/network/NetworkSide.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ CLASS net/minecraft/unmapped/C_exeqxqdd net/minecraft/network/NetworkSide
COMMENT Represents client to ("2") server.
FIELD f_emyipaly S2C Lnet/minecraft/unmapped/C_exeqxqdd;
COMMENT Represents server to ("2") client.
FIELD f_kqdxaxcy side Ljava/lang/String;
METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
ARG 3 side
METHOD m_hckeqeny getSide ()Ljava/lang/String;
Expand Down
6 changes: 4 additions & 2 deletions mappings/net/minecraft/network/NetworkStateTransitionHandler.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
CLASS net/minecraft/unmapped/C_vlkysaje net/minecraft/network/NetworkStateTransitionHandler
METHOD m_camzphge (Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/unmapped/C_zyjtrjrl;)V
METHOD m_camzphge onEncoded (Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/unmapped/C_zyjtrjrl;)V
ARG 0 channelHandlerContext
ARG 1 packet
METHOD m_lecsavnm (Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/unmapped/C_zyjtrjrl;)V
METHOD m_lecsavnm onDecoded (Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/unmapped/C_zyjtrjrl;)V
ARG 0 channelHandlerContext
ARG 1 packet
2 changes: 1 addition & 1 deletion mappings/net/minecraft/network/PacketBundler.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ CLASS net/minecraft/unmapped/C_xyumsucd net/minecraft/network/PacketBundler
ARG 1 context
ARG 2 packet
ARG 3 packets
METHOD m_kysktzfb (Lnet/minecraft/unmapped/C_zyjtrjrl;)V
METHOD m_kysktzfb ensureNotInTransition (Lnet/minecraft/unmapped/C_zyjtrjrl;)V
ARG 0 packet
Loading

3 comments on commit 4a53b1f

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

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

With commit 4a53b1f, 135 file(s) were updated with 979 line(s) added and 822 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
diff -bur namedTargetSrc/net/minecraft/advancement/AdvancementDisplay.java namedSrc/net/minecraft/advancement/AdvancementDisplay.java
--- namedTargetSrc/net/minecraft/advancement/AdvancementDisplay.java	2024-02-17 04:15:30.157688071 +0000
+++ namedSrc/net/minecraft/advancement/AdvancementDisplay.java	2024-02-17 04:14:10.386038872 +0000
@@ -209,9 +209,9 @@
     * @mapping {@literal named toPacket Lnet/minecraft/advancement/AdvancementDisplay;toPacket(Lnet/minecraft/network/RegistryByteBuf;)V}
     */
    private void toPacket(RegistryByteBuf buf) {
-      TextCodecs.f_byaedzcu.encode(buf, this.title);
-      TextCodecs.f_byaedzcu.encode(buf, this.description);
-      ItemStack.f_bnghiwgu.encode(buf, this.icon);
+      TextCodecs.REGISTRY_TEXT_CODEC.encode(buf, this.title);
+      TextCodecs.REGISTRY_TEXT_CODEC.encode(buf, this.description);
+      ItemStack.PACKET_CODEC.encode(buf, this.icon);
       buf.writeEnumConstant(this.type);
       int i = 0;
       if (this.background.isPresent()) {
@@ -237,9 +237,9 @@
     * @mapping {@literal named fromPacket Lnet/minecraft/advancement/AdvancementDisplay;fromPacket(Lnet/minecraft/network/RegistryByteBuf;)Lnet/minecraft/advancement/AdvancementDisplay;}
     */
    private static AdvancementDisplay fromPacket(RegistryByteBuf buf) {
-      Text lv = TextCodecs.f_byaedzcu.decode(buf);
-      Text lv2 = TextCodecs.f_byaedzcu.decode(buf);
-      ItemStack lv3 = ItemStack.f_bnghiwgu.decode(buf);
+      Text lv = TextCodecs.REGISTRY_TEXT_CODEC.decode(buf);
+      Text lv2 = TextCodecs.REGISTRY_TEXT_CODEC.decode(buf);
+      ItemStack lv3 = ItemStack.PACKET_CODEC.decode(buf);
       AdvancementType lv4 = buf.readEnumConstant(AdvancementType.class);
       int i = buf.readInt();
       Optional<Identifier> optional = (i & 1) != 0 ? Optional.of(buf.readIdentifier()) : Optional.empty();
diff -bur namedTargetSrc/net/minecraft/advancement/AdvancementProgress.java namedSrc/net/minecraft/advancement/AdvancementProgress.java
--- namedTargetSrc/net/minecraft/advancement/AdvancementProgress.java	2024-02-17 04:15:30.177687996 +0000
+++ namedSrc/net/minecraft/advancement/AdvancementProgress.java	2024-02-17 04:14:10.406038784 +0000
@@ -172,7 +172,7 @@
     * @mapping {@literal named fromPacket Lnet/minecraft/advancement/AdvancementProgress;fromPacket(Lnet/minecraft/network/PacketByteBuf;)Lnet/minecraft/advancement/AdvancementProgress;}
     */
    public static AdvancementProgress fromPacket(PacketByteBuf buf) {
-      Map<String, CriterionProgress> map = buf.m_eznoskdd(PacketByteBuf::readString, CriterionProgress::fromPacket);
+      Map<String, CriterionProgress> map = buf.readMap(PacketByteBuf::readString, CriterionProgress::fromPacket);
       return new AdvancementProgress(map);
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/BeaconBlockEntity.java namedSrc/net/minecraft/block/entity/BeaconBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BeaconBlockEntity.java	2024-02-17 04:15:30.265687662 +0000
+++ namedSrc/net/minecraft/block/entity/BeaconBlockEntity.java	2024-02-17 04:14:10.518038289 +0000
@@ -166,8 +166,8 @@
       public int get(int index) {
          return switch (index) {
             case 0 -> BeaconBlockEntity.this.level;
-            case 1 -> BeaconScreenHandler.m_mymmcskr(BeaconBlockEntity.this.primary);
-            case 2 -> BeaconScreenHandler.m_mymmcskr(BeaconBlockEntity.this.secondary);
+            case 1 -> BeaconScreenHandler.getRawIdForStatus(BeaconBlockEntity.this.primary);
+            case 2 -> BeaconScreenHandler.getRawIdForStatus(BeaconBlockEntity.this.secondary);
             default -> 0;
          };
       }
@@ -186,10 +186,10 @@
                   BeaconBlockEntity.playSound(BeaconBlockEntity.this.world, BeaconBlockEntity.this.pos, SoundEvents.BLOCK_BEACON_POWER_SELECT);
                }
 
-               BeaconBlockEntity.this.primary = BeaconBlockEntity.validate(BeaconScreenHandler.m_wqcsrehz(value));
+               BeaconBlockEntity.this.primary = BeaconBlockEntity.validate(BeaconScreenHandler.getStatusEffectForRawId(value));
                break;
             case 2:
-               BeaconBlockEntity.this.secondary = BeaconBlockEntity.validate(BeaconScreenHandler.m_wqcsrehz(value));
+               BeaconBlockEntity.this.secondary = BeaconBlockEntity.validate(BeaconScreenHandler.getStatusEffectForRawId(value));
          }
       }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ConnectScreen.java namedSrc/net/minecraft/client/gui/screen/ConnectScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ConnectScreen.java	2024-02-17 04:15:30.381687220 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ConnectScreen.java	2024-02-17 04:14:10.646037723 +0000
@@ -129,7 +129,7 @@
       } else {
          Text lv;
          if (cookies != null) {
-            lv = CommonTexts.f_qozeclso;
+            lv = CommonTexts.FAILED_TRANSFER;
          } else if (quickPlay) {
             lv = QuickPlay.ERROR;
          } else {
@@ -207,7 +207,7 @@
                }
 
                ConnectScreen.this.connection
-                  .m_xqhcjeev(
+                  .connect(
                      inetSocketAddress.getHostName(),
                      inetSocketAddress.getPort(),
                      LoginPhases.C2S,
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.java	2024-02-17 04:15:30.165688041 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.java	2024-02-17 04:14:10.394038837 +0000
@@ -7,10 +7,10 @@
 import net.minecraft.item.FilledMapItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
+import net.minecraft.item.map.MapId;
 import net.minecraft.item.map.MapState;
 import net.minecraft.screen.CartographyTableScreenHandler;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_qqxyyzzm;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
 
@@ -83,11 +83,11 @@
       boolean bl3 = lv.isOf(Items.GLASS_PANE);
       ItemStack lv2 = this.handler.getSlot(0).getStack();
       boolean bl4 = false;
-      C_qqxyyzzm lv3;
+      MapId lv3;
       MapState lv4;
       if (lv2.isOf(Items.FILLED_MAP)) {
          lv3 = FilledMapItem.getMapId(lv2);
-         lv4 = FilledMapItem.m_ptxvacys(lv3, this.client.world);
+         lv4 = FilledMapItem.getMapState(lv3, this.client.world);
          if (lv4 != null) {
             if (lv4.locked) {
                bl4 = true;
@@ -111,16 +111,10 @@
 
    /**
     * @mapping {@literal hashed m_lgkculxb Lnet/minecraft/unmapped/C_hqccoyeq;m_lgkculxb(Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_qqxyyzzm;Lnet/minecraft/unmapped/C_nvpllgmg;ZZZZ)V}
-    * @mapping {@literal named drawMap Lnet/minecraft/client/gui/screen/ingame/CartographyTableScreen;drawMap(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/unmapped/C_qqxyyzzm;Lnet/minecraft/item/map/MapState;ZZZZ)V}
+    * @mapping {@literal named drawMap Lnet/minecraft/client/gui/screen/ingame/CartographyTableScreen;drawMap(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/item/map/MapId;Lnet/minecraft/item/map/MapState;ZZZZ)V}
     */
    private void drawMap(
-      GuiGraphics graphics,
-      @Nullable C_qqxyyzzm arg2,
-      @Nullable MapState mapState,
-      boolean cloneMode,
-      boolean expandMode,
-      boolean lockMode,
-      boolean cannotExpand
+      GuiGraphics graphics, @Nullable MapId arg2, @Nullable MapState mapState, boolean cloneMode, boolean expandMode, boolean lockMode, boolean cannotExpand
    ) {
       int i = this.x;
       int j = this.y;
@@ -150,9 +144,9 @@
 
    /**
     * @mapping {@literal hashed m_ijxrpkxf Lnet/minecraft/unmapped/C_hqccoyeq;m_ijxrpkxf(Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_qqxyyzzm;Lnet/minecraft/unmapped/C_nvpllgmg;IIF)V}
-    * @mapping {@literal named drawMap Lnet/minecraft/client/gui/screen/ingame/CartographyTableScreen;drawMap(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/unmapped/C_qqxyyzzm;Lnet/minecraft/item/map/MapState;IIF)V}
+    * @mapping {@literal named drawMap Lnet/minecraft/client/gui/screen/ingame/CartographyTableScreen;drawMap(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/item/map/MapId;Lnet/minecraft/item/map/MapState;IIF)V}
     */
-   private void drawMap(GuiGraphics graphics, @Nullable C_qqxyyzzm arg2, @Nullable MapState mapState, int x, int y, float scale) {
+   private void drawMap(GuiGraphics graphics, @Nullable MapId arg2, @Nullable MapState mapState, int x, int y, float scale) {
       if (arg2 != null && mapState != null) {
          graphics.getMatrices().push();
          graphics.getMatrices().translate((float)x, (float)y, 1.0F);
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java	2024-02-17 04:15:30.181687981 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java	2024-02-17 04:14:10.414038748 +0000
@@ -1263,8 +1263,8 @@
        * Mapping not found
        */
       @Override
-      public void m_fzmtuflx(ItemStack arg, ItemStack arg2) {
-         this.slot.m_fzmtuflx(arg, arg2);
+      public void setStack(ItemStack stack, ItemStack previousStack) {
+         this.slot.setStack(stack, previousStack);
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/HandledScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/HandledScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/HandledScreen.java	2024-02-17 04:15:30.197687920 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/HandledScreen.java	2024-02-17 04:14:10.430038678 +0000
@@ -398,7 +398,7 @@
             bl = true;
             int k = Math.min(lv2.getMaxCount(), slot.getMaxItemCount(lv2));
             int l = slot.getStack().isEmpty() ? 0 : slot.getStack().getCount();
-            int m = ScreenHandler.m_xsvwbxsr(this.cursorDragSlots, this.heldButtonType, lv2) + l;
+            int m = ScreenHandler.calculateStackSize(this.cursorDragSlots, this.heldButtonType, lv2) + l;
             if (m > k) {
                m = k;
                string = Formatting.YELLOW.toString() + k;
@@ -456,7 +456,7 @@
                ItemStack lv3 = lv2.getStack();
                int i = lv3.isEmpty() ? 0 : lv3.getCount();
                int j = Math.min(lv.getMaxCount(), lv2.getMaxItemCount(lv));
-               int k = Math.min(ScreenHandler.m_xsvwbxsr(this.cursorDragSlots, this.heldButtonType, lv) + i, j);
+               int k = Math.min(ScreenHandler.calculateStackSize(this.cursorDragSlots, this.heldButtonType, lv) + i, j);
                this.draggedStackRemainder -= k - i;
             }
          }
diff -bur namedTargetSrc/net/minecraft/client/MinecraftClient.java namedSrc/net/minecraft/client/MinecraftClient.java
--- namedTargetSrc/net/minecraft/client/MinecraftClient.java	2024-02-17 04:15:30.201687905 +0000
+++ namedSrc/net/minecraft/client/MinecraftClient.java	2024-02-17 04:14:10.434038660 +0000
@@ -3022,7 +3022,7 @@
       Duration duration = Duration.between(instant, Instant.now());
       SocketAddress socketAddress = this.server.getNetworkIo().bindLocal();
       ClientConnection lv5 = ClientConnection.connectLocal(socketAddress);
-      lv5.m_luflhjqj(socketAddress.toString(), 0, new ClientLoginNetworkHandler(lv5, this, null, null, isNewWorld, duration, arg -> {
+      lv5.connect(socketAddress.toString(), 0, new ClientLoginNetworkHandler(lv5, this, null, null, isNewWorld, duration, arg -> {
       }, null));
       lv5.send(new LoginHelloC2SPacket(this.getSession().getUsername(), this.getSession().getPlayerUuid()));
       this.integratedServerConnection = lv5;
diff -bur namedTargetSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java namedSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java	2024-02-17 04:15:30.141688132 +0000
+++ namedSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java	2024-02-17 04:14:10.358038996 +0000
@@ -285,7 +285,7 @@
     */
    @Override
    public void onDisconnected(Text reason) {
-      Text lv = this.f_bpdsyxzv ? CommonTexts.f_qozeclso : CommonTexts.CONNECT_FAILED;
+      Text lv = this.f_bpdsyxzv ? CommonTexts.FAILED_TRANSFER : CommonTexts.CONNECT_FAILED;
       if (this.info != null && this.info.isRealm()) {
          this.client.setScreen(new DisconnectedRealmsScreen(this.parentScreen, lv, reason));
       } else {
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-02-17 04:15:30.409687113 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-02-17 04:14:10.670037617 +0000
@@ -92,6 +92,7 @@
 import net.minecraft.inventory.SimpleInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
+import net.minecraft.item.map.MapId;
 import net.minecraft.item.map.MapState;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.network.ClientConnection;
@@ -279,7 +280,6 @@
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_hgofpcxx;
 import net.minecraft.unmapped.C_jvzsxkum;
-import net.minecraft.unmapped.C_qqxyyzzm;
 import net.minecraft.unmapped.C_rrcmfgnk;
 import net.minecraft.unmapped.C_wkpqgkjo;
 import net.minecraft.util.Hand;
@@ -1350,7 +1350,7 @@
       Holder<DimensionType> lv3 = lv.dimensionType();
       ClientPlayerEntity lv4 = this.client.player;
       if (lv2 != lv4.getWorld().getRegistryKey()) {
-         Map<C_qqxyyzzm, MapState> map = this.world.getMapStates();
+         Map<MapId, MapState> map = this.world.getMapStates();
          boolean bl = lv.isDebug();
          boolean bl2 = lv.isFlat();
          ClientWorld.Properties lv5 = new ClientWorld.Properties(this.worldProperties.getDifficulty(), this.worldProperties.isHardcore(), bl2);
@@ -1687,7 +1687,7 @@
    public void onMapUpdate(MapUpdateS2CPacket packet) {
       NetworkThreadUtils.forceMainThread(packet, this, this.client);
       MapRenderer lv = this.client.gameRenderer.getMapRenderer();
-      C_qqxyyzzm lv2 = packet.mapId();
+      MapId lv2 = packet.id();
       MapState lv3 = this.client.world.getMapState(lv2);
       if (lv3 == null) {
          lv3 = MapState.of(packet.scale(), packet.locked(), this.client.world.getRegistryKey());
@@ -1759,7 +1759,7 @@
    @Override
    public void onCommandSuggestionsUpdate(CommandSuggestionsUpdateS2CPacket packet) {
       NetworkThreadUtils.forceMainThread(packet, this, this.client);
-      this.commandSource.onCommandSuggestions(packet.id(), packet.m_ubcbgqsi());
+      this.commandSource.onCommandSuggestions(packet.getCompletionId(), packet.getSuggestions());
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/realms/RealmsConnection.java namedSrc/net/minecraft/client/realms/RealmsConnection.java
--- namedTargetSrc/net/minecraft/client/realms/RealmsConnection.java	2024-02-17 04:15:30.401687144 +0000
+++ namedSrc/net/minecraft/client/realms/RealmsConnection.java	2024-02-17 04:14:10.662037651 +0000
@@ -99,7 +99,7 @@
                      return;
                   }
    
-                  RealmsConnection.this.connection.m_luflhjqj(string, i, lv);
+                  RealmsConnection.this.connection.connect(string, i, lv);
                   if (RealmsConnection.this.aborted) {
                      return;
                   }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/ItemFrameEntityRenderer.java namedSrc/net/minecraft/client/render/entity/ItemFrameEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/ItemFrameEntityRenderer.java	2024-02-17 04:15:30.217687844 +0000
+++ namedSrc/net/minecraft/client/render/entity/ItemFrameEntityRenderer.java	2024-02-17 04:14:10.454038572 +0000
@@ -19,9 +19,9 @@
 import net.minecraft.item.FilledMapItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
+import net.minecraft.item.map.MapId;
 import net.minecraft.item.map.MapState;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_qqxyyzzm;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.Axis;
 import net.minecraft.util.math.BlockPos;
@@ -130,7 +130,7 @@
       }
 
       if (!lv3.isEmpty()) {
-         C_qqxyyzzm lv6 = arg.getMapId();
+         MapId lv6 = arg.getMapId();
          if (bl) {
             matrices.translate(0.0F, 0.0F, 0.5F);
          } else {
@@ -144,7 +144,7 @@
             float h = 0.0078125F;
             matrices.scale(0.0078125F, 0.0078125F, 0.0078125F);
             matrices.translate(-64.0F, -64.0F, 0.0F);
-            MapState lv7 = FilledMapItem.m_ptxvacys(lv6, arg.getWorld());
+            MapState lv7 = FilledMapItem.getMapState(lv6, arg.getWorld());
             matrices.translate(0.0F, 0.0F, -1.0F);
             if (lv7 != null) {
                int k = this.getLight(arg, LightmapTextureManager.MAX_SKY_LIGHT_COORDINATE | 210, i);
diff -bur namedTargetSrc/net/minecraft/client/render/item/HeldItemRenderer.java namedSrc/net/minecraft/client/render/item/HeldItemRenderer.java
--- namedTargetSrc/net/minecraft/client/render/item/HeldItemRenderer.java	2024-02-17 04:15:30.221687828 +0000
+++ namedSrc/net/minecraft/client/render/item/HeldItemRenderer.java	2024-02-17 04:14:10.462038536 +0000
@@ -20,8 +20,8 @@
 import net.minecraft.item.FilledMapItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
+import net.minecraft.item.map.MapId;
 import net.minecraft.item.map.MapState;
-import net.minecraft.unmapped.C_qqxyyzzm;
 import net.minecraft.util.Arm;
 import net.minecraft.util.Hand;
 import net.minecraft.util.Identifier;
@@ -580,8 +580,8 @@
       matrices.scale(0.38F, 0.38F, 0.38F);
       matrices.translate(-0.5F, -0.5F, 0.0F);
       matrices.scale(0.0078125F, 0.0078125F, 0.0078125F);
-      C_qqxyyzzm lv = FilledMapItem.getMapId(stack);
-      MapState lv2 = FilledMapItem.m_ptxvacys(lv, this.client.world);
+      MapId lv = FilledMapItem.getMapId(stack);
+      MapState lv2 = FilledMapItem.getMapState(lv, this.client.world);
       VertexConsumer lv3 = vertexConsumers.getBuffer(lv2 == null ? MAP_BACKGROUND : MAP_BACKGROUND_CHECKERBOARD);
       Matrix4f matrix4f = matrices.peek().getModel();
       lv3.vertex(matrix4f, -7.0F, 135.0F, 0.0F).color(255, 255, 255, 255).uv(0.0F, 1.0F).light(swingProgress).next();
diff -bur namedTargetSrc/net/minecraft/client/render/MapRenderer.java namedSrc/net/minecraft/client/render/MapRenderer.java
--- namedTargetSrc/net/minecraft/client/render/MapRenderer.java	2024-02-17 04:15:30.213687859 +0000
+++ namedSrc/net/minecraft/client/render/MapRenderer.java	2024-02-17 04:14:10.450038589 +0000
@@ -12,9 +12,9 @@
 import net.minecraft.client.texture.TextureManager;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.map.MapIcon;
+import net.minecraft.item.map.MapId;
 import net.minecraft.item.map.MapState;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_qqxyyzzm;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.Axis;
 import net.minecraft.util.math.MathHelper;
@@ -67,25 +67,25 @@
 
    /**
     * @mapping {@literal hashed m_vevlwede Lnet/minecraft/unmapped/C_yzoxmlsd;m_vevlwede(Lnet/minecraft/unmapped/C_qqxyyzzm;Lnet/minecraft/unmapped/C_nvpllgmg;)V}
-    * @mapping {@literal named updateTexture Lnet/minecraft/client/render/MapRenderer;updateTexture(Lnet/minecraft/unmapped/C_qqxyyzzm;Lnet/minecraft/item/map/MapState;)V}
+    * @mapping {@literal named updateTexture Lnet/minecraft/client/render/MapRenderer;updateTexture(Lnet/minecraft/item/map/MapId;Lnet/minecraft/item/map/MapState;)V}
     */
-   public void updateTexture(C_qqxyyzzm arg, MapState state) {
+   public void updateTexture(MapId arg, MapState state) {
       this.getOrCreateMapTexture(arg, state).needsUpdate();
    }
 
    /**
     * @mapping {@literal hashed m_oieajmss Lnet/minecraft/unmapped/C_yzoxmlsd;m_oieajmss(Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;Lnet/minecraft/unmapped/C_qqxyyzzm;Lnet/minecraft/unmapped/C_nvpllgmg;ZI)V}
-    * @mapping {@literal named render Lnet/minecraft/client/render/MapRenderer;render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/unmapped/C_qqxyyzzm;Lnet/minecraft/item/map/MapState;ZI)V}
+    * @mapping {@literal named render Lnet/minecraft/client/render/MapRenderer;render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/item/map/MapId;Lnet/minecraft/item/map/MapState;ZI)V}
     */
-   public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, C_qqxyyzzm arg3, MapState state, boolean hidePlayerIcons, int id) {
+   public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, MapId arg3, MapState state, boolean hidePlayerIcons, int id) {
       this.getOrCreateMapTexture(arg3, state).render(matrices, vertexConsumers, hidePlayerIcons, id);
    }
 
    /**
     * @mapping {@literal hashed m_lnhkslft Lnet/minecraft/unmapped/C_yzoxmlsd;m_lnhkslft(Lnet/minecraft/unmapped/C_qqxyyzzm;Lnet/minecraft/unmapped/C_nvpllgmg;)Lnet/minecraft/unmapped/C_yzoxmlsd$C_gvzlcncw;}
-    * @mapping {@literal named getOrCreateMapTexture Lnet/minecraft/client/render/MapRenderer;getOrCreateMapTexture(Lnet/minecraft/unmapped/C_qqxyyzzm;Lnet/minecraft/item/map/MapState;)Lnet/minecraft/client/render/MapRenderer$MapTexture;}
+    * @mapping {@literal named getOrCreateMapTexture Lnet/minecraft/client/render/MapRenderer;getOrCreateMapTexture(Lnet/minecraft/item/map/MapId;Lnet/minecraft/item/map/MapState;)Lnet/minecraft/client/render/MapRenderer$MapTexture;}
     */
-   private MapRenderer.MapTexture getOrCreateMapTexture(C_qqxyyzzm arg, MapState state) {
+   private MapRenderer.MapTexture getOrCreateMapTexture(MapId arg, MapState state) {
       return this.mapTextures.compute(arg.id(), (id, mapTexture) -> {
          if (mapTexture == null) {
             return new MapRenderer.MapTexture(id, state);
diff -bur namedTargetSrc/net/minecraft/client/world/ClientWorld.java namedSrc/net/minecraft/client/world/ClientWorld.java
--- namedTargetSrc/net/minecraft/client/world/ClientWorld.java	2024-02-17 04:15:30.333687402 +0000
+++ namedSrc/net/minecraft/client/world/ClientWorld.java	2024-02-17 04:14:10.606037900 +0000
@@ -36,6 +36,7 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
+import net.minecraft.item.map.MapId;
 import net.minecraft.item.map.MapState;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.network.packet.Packet;
@@ -52,7 +53,6 @@
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_qqxyyzzm;
 import net.minecraft.util.CubicSampler;
 import net.minecraft.util.CuboidBlockIterator;
 import net.minecraft.util.Util;
@@ -165,7 +165,7 @@
     * @mapping {@literal hashed f_vketyvfj Lnet/minecraft/unmapped/C_ghdnlrrw;f_vketyvfj:Ljava/util/Map;}
     * @mapping {@literal named mapStates Lnet/minecraft/client/world/ClientWorld;mapStates:Ljava/util/Map;}
     */
-   private final Map<C_qqxyyzzm, MapState> mapStates = Maps.<C_qqxyyzzm, MapState>newHashMap();
+   private final Map<MapId, MapState> mapStates = Maps.<MapId, MapState>newHashMap();
    /**
     * @mapping {@literal hashed f_vjffukyr Lnet/minecraft/unmapped/C_ghdnlrrw;f_vjffukyr:J}
     * @mapping {@literal named CLOUD_COLOR Lnet/minecraft/client/world/ClientWorld;CLOUD_COLOR:J}
@@ -811,15 +811,15 @@
     */
    @Nullable
    @Override
-   public MapState getMapState(C_qqxyyzzm arg) {
+   public MapState getMapState(MapId arg) {
       return (MapState)this.mapStates.get(arg);
    }
 
    /**
     * @mapping {@literal hashed m_emdmfdsn Lnet/minecraft/unmapped/C_ghdnlrrw;m_emdmfdsn(Lnet/minecraft/unmapped/C_qqxyyzzm;Lnet/minecraft/unmapped/C_nvpllgmg;)V}
-    * @mapping {@literal named overrideMapState Lnet/minecraft/client/world/ClientWorld;overrideMapState(Lnet/minecraft/unmapped/C_qqxyyzzm;Lnet/minecraft/item/map/MapState;)V}
+    * @mapping {@literal named overrideMapState Lnet/minecraft/client/world/ClientWorld;overrideMapState(Lnet/minecraft/item/map/MapId;Lnet/minecraft/item/map/MapState;)V}
     */
-   public void overrideMapState(C_qqxyyzzm arg, MapState state) {
+   public void overrideMapState(MapId arg, MapState state) {
       this.mapStates.put(arg, state);
    }
 
@@ -827,15 +827,15 @@
     * Mapping not found
     */
    @Override
-   public void putMapState(C_qqxyyzzm arg, MapState state) {
+   public void putMapState(MapId arg, MapState state) {
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public C_qqxyyzzm getNextMapId() {
-      return new C_qqxyyzzm(0);
+   public MapId getNextMapId() {
+      return new MapId(0);
    }
 
    /**
@@ -1175,7 +1175,7 @@
     * @mapping {@literal hashed m_ondfgyqt Lnet/minecraft/unmapped/C_ghdnlrrw;m_ondfgyqt()Ljava/util/Map;}
     * @mapping {@literal named getMapStates Lnet/minecraft/client/world/ClientWorld;getMapStates()Ljava/util/Map;}
     */
-   protected Map<C_qqxyyzzm, MapState> getMapStates() {
+   protected Map<MapId, MapState> getMapStates() {
       return ImmutableMap.copyOf(this.mapStates);
    }
 
@@ -1183,7 +1183,7 @@
     * @mapping {@literal hashed m_hoqetuzo Lnet/minecraft/unmapped/C_ghdnlrrw;m_hoqetuzo(Ljava/util/Map;)V}
     * @mapping {@literal named putMapStates Lnet/minecraft/client/world/ClientWorld;putMapStates(Ljava/util/Map;)V}
     */
-   protected void putMapStates(Map<C_qqxyyzzm, MapState> mapStates) {
+   protected void putMapStates(Map<MapId, MapState> mapStates) {
       this.mapStates.putAll(mapStates);
    }
 
diff -bur namedTargetSrc/net/minecraft/command/argument/ItemStackArgumentType.java namedSrc/net/minecraft/command/argument/ItemStackArgumentType.java
--- namedTargetSrc/net/minecraft/command/argument/ItemStackArgumentType.java	2024-02-17 04:15:30.293687555 +0000
+++ namedSrc/net/minecraft/command/argument/ItemStackArgumentType.java	2024-02-17 04:14:10.558038112 +0000
@@ -22,16 +22,17 @@
     */
    private static final Collection<String> EXAMPLES = Arrays.asList("stick", "minecraft:stick", "stick{foo=bar}");
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_mbzoucud Lnet/minecraft/unmapped/C_agnltlqe;f_mbzoucud:Lnet/minecraft/unmapped/C_aggscjva;}
+    * @mapping {@literal named reader Lnet/minecraft/command/argument/ItemStackArgumentType;reader:Lnet/minecraft/command/argument/ItemStringReader;}
     */
-   private final ItemStringReader f_mbzoucud;
+   private final ItemStringReader reader;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_agnltlqe;<init>(Lnet/minecraft/unmapped/C_bprdujxm;)V}
     * @mapping {@literal named <init> Lnet/minecraft/command/argument/ItemStackArgumentType;<init>(Lnet/minecraft/command/CommandBuildContext;)V}
     */
    public ItemStackArgumentType(CommandBuildContext context) {
-      this.f_mbzoucud = new ItemStringReader(context);
+      this.reader = new ItemStringReader(context);
    }
 
    /**
@@ -47,7 +48,7 @@
     * @mapping {@literal named parse Lnet/minecraft/command/argument/ItemStackArgumentType;parse(Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/command/argument/ItemStackArgument;}
     */
    public ItemStackArgument parse(StringReader reader) throws CommandSyntaxException {
-      ItemStringReader.ItemResult lv = this.f_mbzoucud.consume(reader);
+      ItemStringReader.ItemResult lv = this.reader.consume(reader);
       return new ItemStackArgument(lv.item(), lv.nbt());
    }
 
@@ -65,7 +66,7 @@
     */
    @Override
    public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
-      return this.f_mbzoucud.getSuggestions(builder);
+      return this.reader.getSuggestions(builder);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/command/argument/ParticleEffectArgumentType.java namedSrc/net/minecraft/command/argument/ParticleEffectArgumentType.java
--- namedTargetSrc/net/minecraft/command/argument/ParticleEffectArgumentType.java	2024-02-17 04:15:30.261687676 +0000
+++ namedSrc/net/minecraft/command/argument/ParticleEffectArgumentType.java	2024-02-17 04:14:10.514038306 +0000
@@ -40,16 +40,17 @@
       particleEffect -> Text.stringifiedTranslatable("particle.notFound", particleEffect)
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_aoiuihtg Lnet/minecraft/unmapped/C_wvjakmzf;f_aoiuihtg:Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;}
+    * @mapping {@literal named context Lnet/minecraft/command/argument/ParticleEffectArgumentType;context:Lnet/minecraft/registry/HolderLookup$Provider;}
     */
-   private final HolderLookup.Provider f_aoiuihtg;
+   private final HolderLookup.Provider context;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_wvjakmzf;<init>(Lnet/minecraft/unmapped/C_bprdujxm;)V}
     * @mapping {@literal named <init> Lnet/minecraft/command/argument/ParticleEffectArgumentType;<init>(Lnet/minecraft/command/CommandBuildContext;)V}
     */
    public ParticleEffectArgumentType(CommandBuildContext context) {
-      this.f_aoiuihtg = context;
+      this.context = context;
    }
 
    /**
@@ -73,7 +74,7 @@
     * @mapping {@literal named parse Lnet/minecraft/command/argument/ParticleEffectArgumentType;parse(Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/particle/ParticleEffect;}
     */
    public ParticleEffect parse(StringReader reader) throws CommandSyntaxException {
-      return parse(reader, this.f_aoiuihtg);
+      return parse(reader, this.context);
    }
 
    /**
@@ -89,9 +90,9 @@
     * @mapping {@literal hashed m_okcgtylw Lnet/minecraft/unmapped/C_wvjakmzf;m_okcgtylw(Lcom/mojang/brigadier/StringReader;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_nqucohct;}
     * @mapping {@literal named parse Lnet/minecraft/command/argument/ParticleEffectArgumentType;parse(Lcom/mojang/brigadier/StringReader;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/particle/ParticleEffect;}
     */
-   public static ParticleEffect parse(StringReader reader, HolderLookup.Provider arg) throws CommandSyntaxException {
-      ParticleType<?> lv = parse(reader, arg.getLookupOrThrow(RegistryKeys.PARTICLE_TYPE));
-      return m_gdaxvlny(reader, (ParticleType<ParticleEffect>)lv, arg);
+   public static ParticleEffect parse(StringReader reader, HolderLookup.Provider provider) throws CommandSyntaxException {
+      ParticleType<?> lv = parse(reader, provider.getLookupOrThrow(RegistryKeys.PARTICLE_TYPE));
+      return getParameters(reader, (ParticleType<ParticleEffect>)lv, provider);
    }
 
    /**
@@ -106,10 +107,10 @@
 
    /**
     * @mapping {@literal hashed m_gdaxvlny Lnet/minecraft/unmapped/C_wvjakmzf;m_gdaxvlny(Lcom/mojang/brigadier/StringReader;Lnet/minecraft/unmapped/C_qlzoaopu;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_nqucohct;}
-    * @mapping {@literal named m_gdaxvlny Lnet/minecraft/command/argument/ParticleEffectArgumentType;m_gdaxvlny(Lcom/mojang/brigadier/StringReader;Lnet/minecraft/particle/ParticleType;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/particle/ParticleEffect;}
+    * @mapping {@literal named getParameters Lnet/minecraft/command/argument/ParticleEffectArgumentType;getParameters(Lcom/mojang/brigadier/StringReader;Lnet/minecraft/particle/ParticleType;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/particle/ParticleEffect;}
     */
-   private static <T extends ParticleEffect> T m_gdaxvlny(StringReader reader, ParticleType<T> type, HolderLookup.Provider arg2) throws CommandSyntaxException {
-      return type.getParametersFactory().read(type, reader, arg2);
+   private static <T extends ParticleEffect> T getParameters(StringReader reader, ParticleType<T> type, HolderLookup.Provider provider) throws CommandSyntaxException {
+      return type.getParametersFactory().read(type, reader, provider);
    }
 
    /**
@@ -118,7 +119,7 @@
     */
    @Override
    public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
-      HolderLookup.RegistryLookup<ParticleType<?>> lv = this.f_aoiuihtg.getLookupOrThrow(RegistryKeys.PARTICLE_TYPE);
+      HolderLookup.RegistryLookup<ParticleType<?>> lv = this.context.getLookupOrThrow(RegistryKeys.PARTICLE_TYPE);
       return CommandSource.suggestIdentifiers(lv.streamElementKeys().map(RegistryKey::getValue), builder);
    }
 }
diff -bur namedTargetSrc/net/minecraft/command/argument/TextArgumentType.java namedSrc/net/minecraft/command/argument/TextArgumentType.java
--- namedTargetSrc/net/minecraft/command/argument/TextArgumentType.java	2024-02-17 04:15:30.317687463 +0000
+++ namedSrc/net/minecraft/command/argument/TextArgumentType.java	2024-02-17 04:14:10.586037987 +0000
@@ -32,15 +32,17 @@
       text -> Text.stringifiedTranslatable("argument.component.invalid", text)
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_fuqvrage Lnet/minecraft/unmapped/C_aluvpfjr;f_fuqvrage:Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;}
+    * @mapping {@literal named context Lnet/minecraft/command/argument/TextArgumentType;context:Lnet/minecraft/registry/HolderLookup$Provider;}
     */
-   private final HolderLookup.Provider f_fuqvrage;
+   private final HolderLookup.Provider context;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_aluvpfjr;<init>(Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/command/argument/TextArgumentType;<init>(Lnet/minecraft/registry/HolderLookup$Provider;)V}
     */
-   private TextArgumentType(HolderLookup.Provider arg) {
-      this.f_fuqvrage = arg;
+   private TextArgumentType(HolderLookup.Provider context) {
+      this.context = context;
    }
 
    /**
@@ -55,8 +57,8 @@
     * @mapping {@literal hashed m_bjuoourz Lnet/minecraft/unmapped/C_aluvpfjr;m_bjuoourz(Lnet/minecraft/unmapped/C_bprdujxm;)Lnet/minecraft/unmapped/C_aluvpfjr;}
     * @mapping {@literal named text Lnet/minecraft/command/argument/TextArgumentType;text(Lnet/minecraft/command/CommandBuildContext;)Lnet/minecraft/command/argument/TextArgumentType;}
     */
-   public static TextArgumentType text(CommandBuildContext arg) {
-      return new TextArgumentType(arg);
+   public static TextArgumentType text(CommandBuildContext context) {
+      return new TextArgumentType(context);
    }
 
    /**
@@ -65,7 +67,7 @@
     */
    public Text parse(StringReader reader) throws CommandSyntaxException {
       try {
-         return C_lirdakbw.m_pbxfhdmc(this.f_fuqvrage, reader, TextCodecs.CODEC);
+         return C_lirdakbw.m_pbxfhdmc(this.context, reader, TextCodecs.CODEC);
       } catch (Exception var4) {
          String string = var4.getCause() != null ? var4.getCause().getMessage() : var4.getMessage();
          throw INVALID_COMPONENT_EXCEPTION.createWithContext(reader, string);
diff -bur namedTargetSrc/net/minecraft/enchantment/UnbreakingEnchantment.java namedSrc/net/minecraft/enchantment/UnbreakingEnchantment.java
--- namedTargetSrc/net/minecraft/enchantment/UnbreakingEnchantment.java	2024-02-17 04:15:30.397687160 +0000
+++ namedSrc/net/minecraft/enchantment/UnbreakingEnchantment.java	2024-02-17 04:14:10.658037670 +0000
@@ -48,7 +48,7 @@
     */
    @Override
    public boolean isAcceptableItem(ItemStack stack) {
-      return stack.m_jhwlsqpw() ? false : super.isAcceptableItem(stack);
+      return stack.isUnbreakable() ? false : super.isAcceptableItem(stack);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java namedSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java
--- namedTargetSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java	2024-02-17 04:15:30.273687631 +0000
+++ namedSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java	2024-02-17 04:14:10.530038236 +0000
@@ -74,12 +74,12 @@
     * @mapping {@literal hashed f_ssxntddt Lnet/minecraft/unmapped/C_fegtripb;f_ssxntddt:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named TEXT_COMPONENT Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;TEXT_COMPONENT:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<Text> TEXT_COMPONENT = TrackedDataHandler.m_eoamrvbe(TextCodecs.f_byaedzcu);
+   public static final TrackedDataHandler<Text> TEXT_COMPONENT = TrackedDataHandler.m_eoamrvbe(TextCodecs.REGISTRY_TEXT_CODEC);
    /**
     * @mapping {@literal hashed f_uzqfcssr Lnet/minecraft/unmapped/C_fegtripb;f_uzqfcssr:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named OPTIONAL_TEXT_COMPONENT Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;OPTIONAL_TEXT_COMPONENT:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<Optional<Text>> OPTIONAL_TEXT_COMPONENT = TrackedDataHandler.m_eoamrvbe(TextCodecs.f_vzatxplp);
+   public static final TrackedDataHandler<Optional<Text>> OPTIONAL_TEXT_COMPONENT = TrackedDataHandler.m_eoamrvbe(TextCodecs.REGISTRY_OPTIONAL_TEXT_CODEC);
    /**
     * @mapping {@literal hashed f_hdycstqt Lnet/minecraft/unmapped/C_fegtripb;f_hdycstqt:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named ITEM_STACK Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;ITEM_STACK:Lnet/minecraft/entity/data/TrackedDataHandler;}
@@ -90,7 +90,7 @@
        */
       @Override
       public PacketCodec<? super RegistryByteBuf, ItemStack> codec() {
-         return ItemStack.f_bnghiwgu;
+         return ItemStack.PACKET_CODEC;
       }
 
       /**
@@ -241,18 +241,18 @@
     * @mapping {@literal hashed f_ykhchcdb Lnet/minecraft/unmapped/C_fegtripb;f_ykhchcdb:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named CAT_VARIANT Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;CAT_VARIANT:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<CatVariant> CAT_VARIANT = TrackedDataHandler.m_eoamrvbe(PacketCodecs.m_fhfovxvd(RegistryKeys.CAT_VARIANT));
+   public static final TrackedDataHandler<CatVariant> CAT_VARIANT = TrackedDataHandler.m_eoamrvbe(PacketCodecs.registryValue(RegistryKeys.CAT_VARIANT));
    /**
     * @mapping {@literal hashed f_vcohujss Lnet/minecraft/unmapped/C_fegtripb;f_vcohujss:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named FROG_VARIANT Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;FROG_VARIANT:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<FrogVariant> FROG_VARIANT = TrackedDataHandler.m_eoamrvbe(PacketCodecs.m_fhfovxvd(RegistryKeys.FROG_VARIANT));
+   public static final TrackedDataHandler<FrogVariant> FROG_VARIANT = TrackedDataHandler.m_eoamrvbe(PacketCodecs.registryValue(RegistryKeys.FROG_VARIANT));
    /**
     * @mapping {@literal hashed f_itlfqmle Lnet/minecraft/unmapped/C_fegtripb;f_itlfqmle:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named PAINTING_VARIANT Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;PAINTING_VARIANT:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
    public static final TrackedDataHandler<Holder<PaintingVariant>> PAINTING_VARIANT = TrackedDataHandler.m_eoamrvbe(
-      PacketCodecs.m_hbizjcsr(RegistryKeys.PAINTING_VARIANT)
+      PacketCodecs.registryEntry(RegistryKeys.PAINTING_VARIANT)
    );
    /**
     * @mapping {@literal hashed f_zxvfivae Lnet/minecraft/unmapped/C_fegtripb;f_zxvfivae:Lnet/minecraft/unmapped/C_xrzqxzbg;}
diff -bur namedTargetSrc/net/minecraft/entity/decoration/ItemFrameEntity.java namedSrc/net/minecraft/entity/decoration/ItemFrameEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/ItemFrameEntity.java	2024-02-17 04:15:30.213687859 +0000
+++ namedSrc/net/minecraft/entity/decoration/ItemFrameEntity.java	2024-02-17 04:14:10.446038607 +0000
@@ -16,6 +16,7 @@
 import net.minecraft.item.FilledMapItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
+import net.minecraft.item.map.MapId;
 import net.minecraft.item.map.MapState;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
@@ -25,7 +26,6 @@
 import net.minecraft.registry.tag.DamageTypeTags;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_qqxyyzzm;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
@@ -337,9 +337,9 @@
     * @mapping {@literal named removeFromFrame Lnet/minecraft/entity/decoration/ItemFrameEntity;removeFromFrame(Lnet/minecraft/item/ItemStack;)V}
     */
    private void removeFromFrame(ItemStack map) {
-      C_qqxyyzzm lv = this.getMapId();
+      MapId lv = this.getMapId();
       if (lv != null) {
-         MapState lv2 = FilledMapItem.m_ptxvacys(lv, this.getWorld());
+         MapState lv2 = FilledMapItem.getMapState(lv, this.getWorld());
          if (lv2 != null) {
             lv2.removeFrame(this.attachmentPos, this.getId());
             lv2.setDirty(true);
@@ -359,10 +359,10 @@
 
    /**
     * @mapping {@literal hashed m_vpjoitzo Lnet/minecraft/unmapped/C_hywnolpn;m_vpjoitzo()Lnet/minecraft/unmapped/C_qqxyyzzm;}
-    * @mapping {@literal named getMapId Lnet/minecraft/entity/decoration/ItemFrameEntity;getMapId()Lnet/minecraft/unmapped/C_qqxyyzzm;}
+    * @mapping {@literal named getMapId Lnet/minecraft/entity/decoration/ItemFrameEntity;getMapId()Lnet/minecraft/item/map/MapId;}
     */
    @Nullable
-   public C_qqxyyzzm getMapId() {
+   public MapId getMapId() {
       return FilledMapItem.getMapId(this.getHeldItemStack());
    }
 
diff -bur namedTargetSrc/net/minecraft/item/FilledMapItem.java namedSrc/net/minecraft/item/FilledMapItem.java
--- namedTargetSrc/net/minecraft/item/FilledMapItem.java	2024-02-17 04:15:30.237687768 +0000
+++ namedSrc/net/minecraft/item/FilledMapItem.java	2024-02-17 04:14:10.486038430 +0000
@@ -12,6 +12,7 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.fluid.FluidState;
+import net.minecraft.item.map.MapId;
 import net.minecraft.item.map.MapState;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
@@ -22,7 +23,6 @@
 import net.minecraft.registry.tag.BlockTags;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_qqxyyzzm;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.math.BlockPos;
@@ -90,11 +90,11 @@
 
    /**
     * @mapping {@literal hashed m_ptxvacys Lnet/minecraft/unmapped/C_dojvtveo;m_ptxvacys(Lnet/minecraft/unmapped/C_qqxyyzzm;Lnet/minecraft/unmapped/C_cdctfzbn;)Lnet/minecraft/unmapped/C_nvpllgmg;}
-    * @mapping {@literal named m_ptxvacys Lnet/minecraft/item/FilledMapItem;m_ptxvacys(Lnet/minecraft/unmapped/C_qqxyyzzm;Lnet/minecraft/world/World;)Lnet/minecraft/item/map/MapState;}
+    * @mapping {@literal named getMapState Lnet/minecraft/item/FilledMapItem;getMapState(Lnet/minecraft/item/map/MapId;Lnet/minecraft/world/World;)Lnet/minecraft/item/map/MapState;}
     */
    @Nullable
-   public static MapState m_ptxvacys(@Nullable C_qqxyyzzm arg, World world) {
-      return arg == null ? null : world.getMapState(arg);
+   public static MapState getMapState(@Nullable MapId mapId, World world) {
+      return mapId == null ? null : world.getMapState(mapId);
    }
 
    /**
@@ -103,37 +103,37 @@
     */
    @Nullable
    public static MapState getOrCreateMapState(ItemStack map, World world) {
-      C_qqxyyzzm lv = getMapId(map);
-      return m_ptxvacys(lv, world);
+      MapId lv = getMapId(map);
+      return getMapState(lv, world);
    }
 
    /**
     * @mapping {@literal hashed m_xlxzuimm Lnet/minecraft/unmapped/C_dojvtveo;m_xlxzuimm(Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_qqxyyzzm;}
-    * @mapping {@literal named getMapId Lnet/minecraft/item/FilledMapItem;getMapId(Lnet/minecraft/item/ItemStack;)Lnet/minecraft/unmapped/C_qqxyyzzm;}
+    * @mapping {@literal named getMapId Lnet/minecraft/item/FilledMapItem;getMapId(Lnet/minecraft/item/ItemStack;)Lnet/minecraft/item/map/MapId;}
     */
    @Nullable
-   public static C_qqxyyzzm getMapId(ItemStack stack) {
+   public static MapId getMapId(ItemStack stack) {
       NbtCompound lv = stack.getNbt();
-      return lv != null && lv.contains("map", NbtElement.NUMBER_TYPE) ? new C_qqxyyzzm(lv.getInt("map")) : null;
+      return lv != null && lv.contains("map", NbtElement.NUMBER_TYPE) ? new MapId(lv.getInt("map")) : null;
    }
 
    /**
     * @mapping {@literal hashed m_umfrihvk Lnet/minecraft/unmapped/C_dojvtveo;m_umfrihvk(Lnet/minecraft/unmapped/C_cdctfzbn;IIIZZLnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_qqxyyzzm;}
-    * @mapping {@literal named allocateMapId Lnet/minecraft/item/FilledMapItem;allocateMapId(Lnet/minecraft/world/World;IIIZZLnet/minecraft/registry/RegistryKey;)Lnet/minecraft/unmapped/C_qqxyyzzm;}
+    * @mapping {@literal named allocateMapId Lnet/minecraft/item/FilledMapItem;allocateMapId(Lnet/minecraft/world/World;IIIZZLnet/minecraft/registry/RegistryKey;)Lnet/minecraft/item/map/MapId;}
     */
-   private static C_qqxyyzzm allocateMapId(World world, int x, int z, int scale, boolean showIcons, boolean unlimitedTracking, RegistryKey<World> dimension) {
+   private static MapId allocateMapId(World world, int x, int z, int scale, boolean showIcons, boolean unlimitedTracking, RegistryKey<World> dimension) {
       MapState lv = MapState.of((double)x, (double)z, (byte)scale, showIcons, unlimitedTracking, dimension);
-      C_qqxyyzzm lv2 = world.getNextMapId();
+      MapId lv2 = world.getNextMapId();
       world.putMapState(lv2, lv);
       return lv2;
    }
 
    /**
     * @mapping {@literal hashed m_lonanumc Lnet/minecraft/unmapped/C_dojvtveo;m_lonanumc(Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_qqxyyzzm;)V}
-    * @mapping {@literal named setMapId Lnet/minecraft/item/FilledMapItem;setMapId(Lnet/minecraft/item/ItemStack;Lnet/minecraft/unmapped/C_qqxyyzzm;)V}
+    * @mapping {@literal named setMapId Lnet/minecraft/item/FilledMapItem;setMapId(Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/map/MapId;)V}
     */
-   private static void setMapId(ItemStack stack, C_qqxyyzzm arg2) {
-      stack.getOrCreateNbt().putInt("map", arg2.id());
+   private static void setMapId(ItemStack stack, MapId mapId) {
+      stack.getOrCreateNbt().putInt("map", mapId.id());
    }
 
    /**
@@ -143,7 +143,7 @@
    private static void createMapState(
       ItemStack stack, World world, int x, int z, int scale, boolean showIcons, boolean unlimitedTracking, RegistryKey<World> dimension
    ) {
-      C_qqxyyzzm lv = allocateMapId(world, x, z, scale, showIcons, unlimitedTracking, dimension);
+      MapId lv = allocateMapId(world, x, z, scale, showIcons, unlimitedTracking, dimension);
       setMapId(stack, lv);
    }
 
@@ -387,8 +387,8 @@
    @Nullable
    @Override
    public Packet<?> createSyncPacket(ItemStack stack, World world, PlayerEntity player) {
-      C_qqxyyzzm lv = getMapId(stack);
-      MapState lv2 = m_ptxvacys(lv, world);
+      MapId lv = getMapId(stack);
+      MapState lv2 = getMapState(lv, world);
       return lv2 != null ? lv2.getPlayerMarkerPacket(lv, player) : null;
    }
 
@@ -414,7 +414,7 @@
    private static void scale(ItemStack map, World world, int amount) {
       MapState lv = getOrCreateMapState(map, world);
       if (lv != null) {
-         C_qqxyyzzm lv2 = world.getNextMapId();
+         MapId lv2 = world.getNextMapId();
          world.putMapState(lv2, lv.zoomOut(amount));
          setMapId(map, lv2);
       }
@@ -427,7 +427,7 @@
    public static void copyMap(World world, ItemStack stack) {
       MapState lv = getOrCreateMapState(stack, world);
       if (lv != null) {
-         C_qqxyyzzm lv2 = world.getNextMapId();
+         MapId lv2 = world.getNextMapId();
          MapState lv3 = lv.copy();
          world.putMapState(lv2, lv3);
          setMapId(stack, lv2);
@@ -439,8 +439,8 @@
     */
    @Override
    public void appendTooltip(ItemStack stack, @Nullable World world, List<Text> tooltip, TooltipContext context) {
-      C_qqxyyzzm lv = getMapId(stack);
-      MapState lv2 = world == null ? null : m_ptxvacys(lv, world);
+      MapId lv = getMapId(stack);
+      MapState lv2 = world == null ? null : getMapState(lv, world);
       NbtCompound lv3 = stack.getNbt();
       boolean bl;
       byte b;
@@ -459,7 +459,7 @@
       if (context.shouldShowAdvancedDetails()) {
          if (lv2 != null) {
             if (!bl && b == 0) {
-               tooltip.add(m_fdlqyaof(lv));
+               tooltip.add(getTooltipMapNumberText(lv));
             }
 
             int i = Math.min(lv2.scale + b, 4);
@@ -472,18 +472,19 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_fdlqyaof Lnet/minecraft/unmapped/C_dojvtveo;m_fdlqyaof(Lnet/minecraft/unmapped/C_qqxyyzzm;)Lnet/minecraft/unmapped/C_rdaqiwdt;}
+    * @mapping {@literal named getTooltipMapNumberText Lnet/minecraft/item/FilledMapItem;getTooltipMapNumberText(Lnet/minecraft/item/map/MapId;)Lnet/minecraft/text/Text;}
     */
-   private static Text m_fdlqyaof(C_qqxyyzzm arg) {
-      return Text.translatable("filled_map.id", arg.id()).formatted(Formatting.GRAY);
+   private static Text getTooltipMapNumberText(MapId mapId) {
+      return Text.translatable("filled_map.id", mapId.id()).formatted(Formatting.GRAY);
    }
 
    /**
     * @mapping {@literal hashed m_rrjmrkhw Lnet/minecraft/unmapped/C_dojvtveo;m_rrjmrkhw(Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_rdaqiwdt;}
     * @mapping {@literal named getTooltipMapNumberText Lnet/minecraft/item/FilledMapItem;getTooltipMapNumberText(Lnet/minecraft/item/ItemStack;)Lnet/minecraft/text/Text;}
     */
-   public static Text getTooltipMapNumberText(ItemStack stack) {
-      return m_fdlqyaof(getMapId(stack));
+   public static Text getTooltipMapNumberText(ItemStack item) {
+      return getTooltipMapNumberText(getMapId(item));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/item/ItemStack.java namedSrc/net/minecraft/item/ItemStack.java
--- namedTargetSrc/net/minecraft/item/ItemStack.java	2024-02-17 04:15:30.201687905 +0000
+++ namedSrc/net/minecraft/item/ItemStack.java	2024-02-17 04:14:10.438038642 +0000
@@ -43,6 +43,7 @@
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.feature_flags.FeatureFlagBitSet;
 import net.minecraft.inventory.StackReference;
+import net.minecraft.item.map.MapId;
 import net.minecraft.item.trim.ArmorTrimPermutation;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
@@ -69,7 +70,6 @@
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
 import net.minecraft.text.Texts;
-import net.minecraft.unmapped.C_qqxyyzzm;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.ClickType;
 import net.minecraft.util.Formatting;
@@ -217,13 +217,15 @@
             .apply(instance, ItemStack::new)
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_bnghiwgu Lnet/minecraft/unmapped/C_sddaxwyk;f_bnghiwgu:Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named PACKET_CODEC Lnet/minecraft/item/ItemStack;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   public static final PacketCodec<RegistryByteBuf, ItemStack> f_bnghiwgu = new PacketCodec<RegistryByteBuf, ItemStack>() {
+   public static final PacketCodec<RegistryByteBuf, ItemStack> PACKET_CODEC = new PacketCodec<RegistryByteBuf, ItemStack>() {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_ejfbjbgz Lnet/minecraft/unmapped/C_sddaxwyk$C_qbkytozl;f_ejfbjbgz:Lnet/minecraft/unmapped/C_qsrmwluu;}
+       * @mapping {@literal named ITEM_PACKET_CODEC Lnet/minecraft/item/ItemStack$C_qbkytozl;ITEM_PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
        */
-      private static final PacketCodec<RegistryByteBuf, Item> f_ejfbjbgz = PacketCodecs.m_fhfovxvd(RegistryKeys.ITEM);
+      private static final PacketCodec<RegistryByteBuf, Item> ITEM_PACKET_CODEC = PacketCodecs.registryValue(RegistryKeys.ITEM);
 
       /**
        * @mapping {@literal hashed decode Lnet/minecraft/unmapped/C_sddaxwyk$C_qbkytozl;decode(Lnet/minecraft/unmapped/C_bngyzsts;)Lnet/minecraft/unmapped/C_sddaxwyk;}
@@ -233,10 +235,10 @@
          if (!arg.readBoolean()) {
             return ItemStack.EMPTY;
          } else {
-            Item lv = f_ejfbjbgz.decode(arg);
+            Item lv = ITEM_PACKET_CODEC.decode(arg);
             int i = arg.readByte();
             ItemStack lv2 = new ItemStack(lv, i);
-            lv2.setNbt(PacketByteBuf.m_kjijcwgo(arg));
+            lv2.setNbt(PacketByteBuf.readNbtCompound(arg));
             return lv2;
          }
       }
@@ -251,7 +253,7 @@
          } else {
             arg.writeBoolean(true);
             Item lv = stack.getItem();
-            f_ejfbjbgz.encode(arg, lv);
+            ITEM_PACKET_CODEC.encode(arg, lv);
             arg.writeByte(stack.getCount());
             NbtCompound lv2 = null;
             if (lv.isDamageable() || lv.isNbtSynced()) {
@@ -265,7 +267,7 @@
    /**
     * Mapping not found
     */
-   public static final PacketCodec<RegistryByteBuf, List<ItemStack>> f_hnyuumqo = f_bnghiwgu.apply(PacketCodecs.m_yypssatp(DefaultedList::ofSize));
+   public static final PacketCodec<RegistryByteBuf, List<ItemStack>> f_hnyuumqo = PACKET_CODEC.apply(PacketCodecs.m_yypssatp(DefaultedList::ofSize));
    /**
     * @mapping {@literal hashed f_ohakxxel Lnet/minecraft/unmapped/C_sddaxwyk;f_ohakxxel:Lorg/slf4j/Logger;}
     * @mapping {@literal named LOGGER Lnet/minecraft/item/ItemStack;LOGGER:Lorg/slf4j/Logger;}
@@ -721,13 +723,14 @@
     * @mapping {@literal named isDamageable Lnet/minecraft/item/ItemStack;isDamageable()Z}
     */
    public boolean isDamageable() {
-      return !this.isEmpty() && this.getItem().getMaxDamage() > 0 ? !this.m_jhwlsqpw() : false;
+      return !this.isEmpty() && this.getItem().getMaxDamage() > 0 ? !this.isUnbreakable() : false;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_jhwlsqpw Lnet/minecraft/unmapped/C_sddaxwyk;m_jhwlsqpw()Z}
+    * @mapping {@literal named isUnbreakable Lnet/minecraft/item/ItemStack;isUnbreakable()Z}
     */
-   public boolean m_jhwlsqpw() {
+   public boolean isUnbreakable() {
       NbtCompound lv = this.getNbt();
       return lv != null && lv.getBoolean("Unbreakable");
    }
@@ -799,20 +802,21 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_rcukuoag Lnet/minecraft/unmapped/C_sddaxwyk;m_rcukuoag(ILnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_yuycoehb;)V}
+    * @mapping {@literal named m_rcukuoag Lnet/minecraft/item/ItemStack;m_rcukuoag(ILnet/minecraft/entity/LivingEntity;Lnet/minecraft/entity/EquipmentSlot;)V}
     */
-   public void m_rcukuoag(int i, LivingEntity arg, EquipmentSlot arg2) {
-      if (!arg.getWorld().isClient) {
-         if (arg instanceof PlayerEntity lv && lv.m_wunuznfv()) {
+   public void m_rcukuoag(int i, LivingEntity entity, EquipmentSlot slot) {
+      if (!entity.getWorld().isClient) {
+         if (entity instanceof PlayerEntity lv && lv.m_wunuznfv()) {
             return;
          }
 
-         this.m_lwxbsyxh(i, arg.getRandom(), arg instanceof ServerPlayerEntity lv2 ? lv2 : null, () -> {
-            arg.m_nwdilhgs(arg2);
+         this.m_lwxbsyxh(i, entity.getRandom(), entity instanceof ServerPlayerEntity lv2 ? lv2 : null, () -> {
+            entity.m_nwdilhgs(slot);
             Item lv = this.getItem();
             this.decrement(1);
-            if (arg instanceof PlayerEntity) {
-               ((PlayerEntity)arg).incrementStat(Stats.BROKEN.getOrCreateStat(lv));
+            if (entity instanceof PlayerEntity) {
+               ((PlayerEntity)entity).incrementStat(Stats.BROKEN.getOrCreateStat(lv));
             }
 
             this.setDamage(0);
@@ -1305,7 +1309,7 @@
 
       list.add(lv);
       if (!context.shouldShowAdvancedDetails() && !this.hasCustomName() && this.isOf(Items.FILLED_MAP)) {
-         C_qqxyyzzm lv2 = FilledMapItem.getMapId(this);
+         MapId lv2 = FilledMapItem.getMapId(this);
          if (lv2 != null) {
             list.add(FilledMapItem.getTooltipMapNumberText(this));
          }
diff -bur namedTargetSrc/net/minecraft/item/map/MapBannerMarker.java namedSrc/net/minecraft/item/map/MapBannerMarker.java
--- namedTargetSrc/net/minecraft/item/map/MapBannerMarker.java	2024-02-17 04:15:30.185687965 +0000
+++ namedSrc/net/minecraft/item/map/MapBannerMarker.java	2024-02-17 04:14:10.414038748 +0000
@@ -22,9 +22,10 @@
  */
 public record MapBannerMarker(BlockPos pos, DyeColor color, Optional<Text> name) {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_zegcular Lnet/minecraft/unmapped/C_cdpawxua;f_zegcular:Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named CODEC Lnet/minecraft/item/map/MapBannerMarker;CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<MapBannerMarker> f_zegcular = RecordCodecBuilder.create(
+   public static final Codec<MapBannerMarker> CODEC = RecordCodecBuilder.create(
       instance -> instance.group(
                BlockPos.CODEC.fieldOf("pos").forGetter(MapBannerMarker::pos),
                DyeColor.CODEC.optionalFieldOf("color", DyeColor.WHITE).forGetter(MapBannerMarker::color),
@@ -33,9 +34,10 @@
             .apply(instance, MapBannerMarker::new)
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_nmqnnwct Lnet/minecraft/unmapped/C_cdpawxua;f_nmqnnwct:Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named LIST_CODEC Lnet/minecraft/item/map/MapBannerMarker;LIST_CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<List<MapBannerMarker>> f_nmqnnwct = f_zegcular.listOf();
+   public static final Codec<List<MapBannerMarker>> LIST_CODEC = CODEC.listOf();
 
    /**
     * @mapping {@literal hashed m_tjahiefy Lnet/minecraft/unmapped/C_cdpawxua;m_tjahiefy(Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_cdpawxua;}

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

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

View the diff here (2/3): 
diff -bur namedTargetSrc/net/minecraft/item/map/MapIcon.java namedSrc/net/minecraft/item/map/MapIcon.java
--- namedTargetSrc/net/minecraft/item/map/MapIcon.java	2024-02-17 04:15:30.369687266 +0000
+++ namedSrc/net/minecraft/item/map/MapIcon.java	2024-02-17 04:14:10.634037776 +0000
@@ -19,10 +19,11 @@
  */
 public record MapIcon(MapIcon.Type type, byte x, byte z, byte rotation, Optional<Text> text) {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_xprnzxvn Lnet/minecraft/unmapped/C_lptbbwvu;f_xprnzxvn:Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named PACKET_CODEC Lnet/minecraft/item/map/MapIcon;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   public static final PacketCodec<RegistryByteBuf, MapIcon> f_xprnzxvn = PacketCodec.m_whbpgkrx(
-      MapIcon.Type.f_fevyugav,
+   public static final PacketCodec<RegistryByteBuf, MapIcon> PACKET_CODEC = PacketCodec.m_whbpgkrx(
+      MapIcon.Type.PACKET_CODEC,
       MapIcon::type,
       PacketCodecs.BYTE,
       MapIcon::x,
@@ -30,7 +31,7 @@
       MapIcon::y,
       PacketCodecs.BYTE,
       MapIcon::rot,
-      TextCodecs.f_vzatxplp,
+      TextCodecs.REGISTRY_OPTIONAL_TEXT_CODEC,
       MapIcon::name,
       MapIcon::new
    );
@@ -265,22 +266,25 @@
       SWAMP_HUT(33, "swamp_hut", true, MapColor.LIGHT_GRAY.color, false, true);
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_rwtbkllx Lnet/minecraft/unmapped/C_lptbbwvu$C_ooswjmee;f_rwtbkllx:Ljava/util/function/IntFunction;}
+       * @mapping {@literal named INDEX_TO_TYPE Lnet/minecraft/item/map/MapIcon$Type;INDEX_TO_TYPE:Ljava/util/function/IntFunction;}
        */
-      public static final IntFunction<MapIcon.Type> f_rwtbkllx = IdListUtil.sortArray(MapIcon.Type::m_kgujprpi, values(), IdListUtil.OutOfBoundsHandler.ZERO);
+      public static final IntFunction<MapIcon.Type> INDEX_TO_TYPE = IdListUtil.sortArray(MapIcon.Type::getIndex, values(), IdListUtil.OutOfBoundsHandler.ZERO);
       /**
        * @mapping {@literal hashed f_vuoafzic Lnet/minecraft/unmapped/C_lptbbwvu$C_ooswjmee;f_vuoafzic:Lcom/mojang/serialization/Codec;}
        * @mapping {@literal named CODEC Lnet/minecraft/item/map/MapIcon$Type;CODEC:Lcom/mojang/serialization/Codec;}
        */
       public static final com.mojang.serialization.Codec<MapIcon.Type> CODEC = StringIdentifiable.createEnumCodec(MapIcon.Type::values);
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_fevyugav Lnet/minecraft/unmapped/C_lptbbwvu$C_ooswjmee;f_fevyugav:Lnet/minecraft/unmapped/C_qsrmwluu;}
+       * @mapping {@literal named PACKET_CODEC Lnet/minecraft/item/map/MapIcon$Type;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
        */
-      public static final PacketCodec<ByteBuf, MapIcon.Type> f_fevyugav = PacketCodecs.m_oxatcqxo(f_rwtbkllx, MapIcon.Type::m_kgujprpi);
+      public static final PacketCodec<ByteBuf, MapIcon.Type> PACKET_CODEC = PacketCodecs.m_oxatcqxo(INDEX_TO_TYPE, MapIcon.Type::getIndex);
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_skfrxrmz Lnet/minecraft/unmapped/C_lptbbwvu$C_ooswjmee;f_skfrxrmz:I}
+       * @mapping {@literal named index Lnet/minecraft/item/map/MapIcon$Type;index:I}
        */
-      private final int f_skfrxrmz;
+      private final int index;
       /**
        * @mapping {@literal hashed f_aqhsaoet Lnet/minecraft/unmapped/C_lptbbwvu$C_ooswjmee;f_aqhsaoet:Ljava/lang/String;}
        * @mapping {@literal named name Lnet/minecraft/item/map/MapIcon$Type;name:Ljava/lang/String;}
@@ -316,16 +320,16 @@
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_lptbbwvu$C_ooswjmee;<init>(Ljava/lang/String;IILjava/lang/String;ZZ)V}
        * @mapping {@literal named <init> Lnet/minecraft/item/map/MapIcon$Type;<init>(Ljava/lang/String;IILjava/lang/String;ZZ)V}
        */
-      private Type(int j, String name, boolean alwaysRender, boolean trackCount) {
-         this(j, name, alwaysRender, -1, trackCount, false);
+      private Type(int index, String name, boolean alwaysRender, boolean trackCount) {
+         this(index, name, alwaysRender, -1, trackCount, false);
       }
 
       /**
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_lptbbwvu$C_ooswjmee;<init>(Ljava/lang/String;IILjava/lang/String;ZIZZ)V}
        * @mapping {@literal named <init> Lnet/minecraft/item/map/MapIcon$Type;<init>(Ljava/lang/String;IILjava/lang/String;ZIZZ)V}
        */
-      private Type(int j, String name, boolean alwaysRender, int tintColor, boolean trackCount, boolean explorationPoi) {
-         this.f_skfrxrmz = j;
+      private Type(int index, String name, boolean alwaysRender, int tintColor, boolean trackCount, boolean explorationPoi) {
+         this.index = index;
          this.name = name;
          this.trackCount = trackCount;
          this.id = (byte)this.ordinal();
@@ -335,10 +339,11 @@
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_kgujprpi Lnet/minecraft/unmapped/C_lptbbwvu$C_ooswjmee;m_kgujprpi()I}
+       * @mapping {@literal named getIndex Lnet/minecraft/item/map/MapIcon$Type;getIndex()I}
        */
-      public int m_kgujprpi() {
-         return this.f_skfrxrmz;
+      public int getIndex() {
+         return this.index;
       }
 
       /**
Only in namedSrc/net/minecraft/item/map: MapId.java
diff -bur namedTargetSrc/net/minecraft/item/map/MapState.java namedSrc/net/minecraft/item/map/MapState.java
--- namedTargetSrc/net/minecraft/item/map/MapState.java	2024-02-17 04:15:30.197687920 +0000
+++ namedSrc/net/minecraft/item/map/MapState.java	2024-02-17 04:14:10.430038678 +0000
@@ -28,7 +28,6 @@
 import net.minecraft.registry.HolderLookup;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_qqxyyzzm;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.BlockPos;
@@ -205,7 +204,7 @@
     * @mapping {@literal hashed m_kwgphzej Lnet/minecraft/unmapped/C_nvpllgmg;m_kwgphzej(Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_nvpllgmg;}
     * @mapping {@literal named fromNbt Lnet/minecraft/item/map/MapState;fromNbt(Lnet/minecraft/nbt/NbtCompound;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/item/map/MapState;}
     */
-   public static MapState fromNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
+   public static MapState fromNbt(NbtCompound nbt, HolderLookup.Provider provider) {
       RegistryKey<World> lv = (RegistryKey<World>)DimensionType.worldFromDimensionNbt(new Dynamic<>(NbtOps.INSTANCE, nbt.get("dimension")))
          .resultOrPartial(LOGGER::error)
          .orElseThrow(() -> new IllegalArgumentException("Invalid map dimension: " + nbt.get("dimension")));
@@ -221,7 +220,7 @@
          lv2.colors = bs;
       }
 
-      for (MapBannerMarker lv3 : (List)MapBannerMarker.f_nmqnnwct
+      for (MapBannerMarker lv3 : (List)MapBannerMarker.LIST_CODEC
          .parse(NbtOps.INSTANCE, nbt.get("banners"))
          .resultOrPartial(string -> LOGGER.warn("Failed to parse map banner: '{}'", string))
          .orElse(List.of())) {
@@ -264,7 +263,7 @@
       arg.putBoolean("unlimitedTracking", this.unlimitedTracking);
       arg.putBoolean("locked", this.locked);
       arg.put(
-         "banners", Util.getOrThrow(MapBannerMarker.f_nmqnnwct.encodeStart(NbtOps.INSTANCE, List.copyOf(this.banners.values())), IllegalStateException::new)
+         "banners", Util.getOrThrow(MapBannerMarker.LIST_CODEC.encodeStart(NbtOps.INSTANCE, List.copyOf(this.banners.values())), IllegalStateException::new)
       );
       NbtList lv = new NbtList();
 
@@ -318,7 +317,7 @@
     * @mapping {@literal named getMatchingMapPredicate Lnet/minecraft/item/map/MapState;getMatchingMapPredicate(Lnet/minecraft/item/ItemStack;)Ljava/util/function/Predicate;}
     */
    private static Predicate<ItemStack> getMatchingMapPredicate(ItemStack map) {
-      C_qqxyyzzm lv = FilledMapItem.getMapId(map);
+      MapId lv = FilledMapItem.getMapId(map);
       return arg3 -> arg3 == map ? true : arg3.isOf(map.getItem()) && Objects.equals(lv, FilledMapItem.getMapId(arg3));
    }
 
@@ -505,12 +504,12 @@
 
    /**
     * @mapping {@literal hashed m_iiszqazf Lnet/minecraft/unmapped/C_nvpllgmg;m_iiszqazf(Lnet/minecraft/unmapped/C_qqxyyzzm;Lnet/minecraft/unmapped/C_jzrpycqo;)Lnet/minecraft/unmapped/C_zyjtrjrl;}
-    * @mapping {@literal named getPlayerMarkerPacket Lnet/minecraft/item/map/MapState;getPlayerMarkerPacket(Lnet/minecraft/unmapped/C_qqxyyzzm;Lnet/minecraft/entity/player/PlayerEntity;)Lnet/minecraft/network/packet/Packet;}
+    * @mapping {@literal named getPlayerMarkerPacket Lnet/minecraft/item/map/MapState;getPlayerMarkerPacket(Lnet/minecraft/item/map/MapId;Lnet/minecraft/entity/player/PlayerEntity;)Lnet/minecraft/network/packet/Packet;}
     */
    @Nullable
-   public Packet<?> getPlayerMarkerPacket(C_qqxyyzzm arg, PlayerEntity player) {
+   public Packet<?> getPlayerMarkerPacket(MapId mapId, PlayerEntity player) {
       MapState.PlayerUpdateTracker lv = (MapState.PlayerUpdateTracker)this.updateTrackersByPlayer.get(player);
-      return lv == null ? null : lv.getPacket(arg);
+      return lv == null ? null : lv.getPacket(mapId);
    }
 
    /**
@@ -772,10 +771,10 @@
 
       /**
        * @mapping {@literal hashed m_imwcnxuw Lnet/minecraft/unmapped/C_nvpllgmg$C_xlzqccwa;m_imwcnxuw(Lnet/minecraft/unmapped/C_qqxyyzzm;)Lnet/minecraft/unmapped/C_zyjtrjrl;}
-       * @mapping {@literal named getPacket Lnet/minecraft/item/map/MapState$PlayerUpdateTracker;getPacket(Lnet/minecraft/unmapped/C_qqxyyzzm;)Lnet/minecraft/network/packet/Packet;}
+       * @mapping {@literal named getPacket Lnet/minecraft/item/map/MapState$PlayerUpdateTracker;getPacket(Lnet/minecraft/item/map/MapId;)Lnet/minecraft/network/packet/Packet;}
        */
       @Nullable
-      Packet<?> getPacket(C_qqxyyzzm arg) {
+      Packet<?> getPacket(MapId mapId) {
          MapState.UpdateData lv;
          if (this.dirty) {
             this.dirty = false;
@@ -792,7 +791,7 @@
             collection = null;
          }
 
-         return collection == null && lv == null ? null : new MapUpdateS2CPacket(arg, MapState.this.scale, MapState.this.locked, collection, lv);
+         return collection == null && lv == null ? null : new MapUpdateS2CPacket(mapId, MapState.this.scale, MapState.this.locked, collection, lv);
       }
 
       /**
@@ -829,24 +828,25 @@
     */
    public static record UpdateData(int startX, int startZ, int width, int height, byte[] colors) {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_nkoevnxw Lnet/minecraft/unmapped/C_nvpllgmg$C_yvxjvbon;f_nkoevnxw:Lnet/minecraft/unmapped/C_qsrmwluu;}
+       * @mapping {@literal named PACKET_CODEC Lnet/minecraft/item/map/MapState$UpdateData;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
        */
-      public static final PacketCodec<ByteBuf, Optional<MapState.UpdateData>> f_nkoevnxw = PacketCodec.create(
-         MapState.UpdateData::m_wtzdwnbe, MapState.UpdateData::m_rpkebrem
+      public static final PacketCodec<ByteBuf, Optional<MapState.UpdateData>> PACKET_CODEC = PacketCodec.create(
+         MapState.UpdateData::write, MapState.UpdateData::read
       );
 
       /**
        * @mapping {@literal hashed m_wtzdwnbe Lnet/minecraft/unmapped/C_nvpllgmg$C_yvxjvbon;m_wtzdwnbe(Lio/netty/buffer/ByteBuf;Ljava/util/Optional;)V}
-       * @mapping {@literal named m_wtzdwnbe Lnet/minecraft/item/map/MapState$UpdateData;m_wtzdwnbe(Lio/netty/buffer/ByteBuf;Ljava/util/Optional;)V}
+       * @mapping {@literal named write Lnet/minecraft/item/map/MapState$UpdateData;write(Lio/netty/buffer/ByteBuf;Ljava/util/Optional;)V}
        */
-      private static void m_wtzdwnbe(ByteBuf buf, Optional<MapState.UpdateData> optional) {
-         if (optional.isPresent()) {
-            MapState.UpdateData lv = (MapState.UpdateData)optional.get();
+      private static void write(ByteBuf buf, Optional<MapState.UpdateData> updateData) {
+         if (updateData.isPresent()) {
+            MapState.UpdateData lv = (MapState.UpdateData)updateData.get();
             buf.writeByte(lv.width);
             buf.writeByte(lv.height);
             buf.writeByte(lv.startX);
             buf.writeByte(lv.startZ);
-            PacketByteBuf.m_elpmwnes(buf, lv.colors);
+            PacketByteBuf.writeByteArray(buf, lv.colors);
          } else {
             buf.writeByte(0);
          }
@@ -854,15 +854,15 @@
 
       /**
        * @mapping {@literal hashed m_rpkebrem Lnet/minecraft/unmapped/C_nvpllgmg$C_yvxjvbon;m_rpkebrem(Lio/netty/buffer/ByteBuf;)Ljava/util/Optional;}
-       * @mapping {@literal named m_rpkebrem Lnet/minecraft/item/map/MapState$UpdateData;m_rpkebrem(Lio/netty/buffer/ByteBuf;)Ljava/util/Optional;}
+       * @mapping {@literal named read Lnet/minecraft/item/map/MapState$UpdateData;read(Lio/netty/buffer/ByteBuf;)Ljava/util/Optional;}
        */
-      private static Optional<MapState.UpdateData> m_rpkebrem(ByteBuf buf) {
+      private static Optional<MapState.UpdateData> read(ByteBuf buf) {
          int i = buf.readUnsignedByte();
          if (i > 0) {
             int j = buf.readUnsignedByte();
             int k = buf.readUnsignedByte();
             int l = buf.readUnsignedByte();
-            byte[] bs = PacketByteBuf.m_kgkdgazl(buf);
+            byte[] bs = PacketByteBuf.readByteArray(buf);
             return Optional.of(new MapState.UpdateData(k, l, i, j, bs));
          } else {
             return Optional.empty();
diff -bur namedTargetSrc/net/minecraft/item/trim/ArmorTrimMaterials.java namedSrc/net/minecraft/item/trim/ArmorTrimMaterials.java
--- namedTargetSrc/net/minecraft/item/trim/ArmorTrimMaterials.java	2024-02-17 04:15:30.441686992 +0000
+++ namedSrc/net/minecraft/item/trim/ArmorTrimMaterials.java	2024-02-17 04:14:10.694037510 +0000
@@ -77,17 +77,17 @@
     * @mapping {@literal hashed m_yhwgdlmi Lnet/minecraft/unmapped/C_txvwkqwx;m_yhwgdlmi(Lnet/minecraft/unmapped/C_hqoyyfco;)V}
     * @mapping {@literal named bootstrapVanilla Lnet/minecraft/item/trim/ArmorTrimMaterials;bootstrapVanilla(Lnet/minecraft/unmapped/C_hqoyyfco;)V}
     */
-   public static void bootstrapVanilla(C_hqoyyfco<ArmorTrimMaterial> arg) {
-      m_kkcwbibv(arg, QUARTZ, Items.QUARTZ, Style.EMPTY.withColor(14931140), 0.1F);
-      m_ggcdyhpf(arg, IRON, Items.IRON_INGOT, Style.EMPTY.withColor(15527148), 0.2F, Map.of(ArmorMaterials.IRON, "iron_darker"));
-      m_ggcdyhpf(arg, NETHERITE, Items.NETHERITE_INGOT, Style.EMPTY.withColor(6445145), 0.3F, Map.of(ArmorMaterials.NETHERITE, "netherite_darker"));
-      m_kkcwbibv(arg, REDSTONE, Items.REDSTONE, Style.EMPTY.withColor(9901575), 0.4F);
-      m_kkcwbibv(arg, COPPER, Items.COPPER_INGOT, Style.EMPTY.withColor(11823181), 0.5F);
-      m_ggcdyhpf(arg, GOLD, Items.GOLD_INGOT, Style.EMPTY.withColor(14594349), 0.6F, Map.of(ArmorMaterials.GOLD, "gold_darker"));
-      m_kkcwbibv(arg, EMERALD, Items.EMERALD, Style.EMPTY.withColor(1155126), 0.7F);
-      m_ggcdyhpf(arg, DIAMOND, Items.DIAMOND, Style.EMPTY.withColor(7269586), 0.8F, Map.of(ArmorMaterials.DIAMOND, "diamond_darker"));
-      m_kkcwbibv(arg, LAPIS, Items.LAPIS_LAZULI, Style.EMPTY.withColor(4288151), 0.9F);
-      m_kkcwbibv(arg, AMETHYST, Items.AMETHYST_SHARD, Style.EMPTY.withColor(10116294), 1.0F);
+   public static void bootstrapVanilla(C_hqoyyfco<ArmorTrimMaterial> trimMaterials) {
+      register(trimMaterials, QUARTZ, Items.QUARTZ, Style.EMPTY.withColor(14931140), 0.1F);
+      register(trimMaterials, IRON, Items.IRON_INGOT, Style.EMPTY.withColor(15527148), 0.2F, Map.of(ArmorMaterials.IRON, "iron_darker"));
+      register(trimMaterials, NETHERITE, Items.NETHERITE_INGOT, Style.EMPTY.withColor(6445145), 0.3F, Map.of(ArmorMaterials.NETHERITE, "netherite_darker"));
+      register(trimMaterials, REDSTONE, Items.REDSTONE, Style.EMPTY.withColor(9901575), 0.4F);
+      register(trimMaterials, COPPER, Items.COPPER_INGOT, Style.EMPTY.withColor(11823181), 0.5F);
+      register(trimMaterials, GOLD, Items.GOLD_INGOT, Style.EMPTY.withColor(14594349), 0.6F, Map.of(ArmorMaterials.GOLD, "gold_darker"));
+      register(trimMaterials, EMERALD, Items.EMERALD, Style.EMPTY.withColor(1155126), 0.7F);
+      register(trimMaterials, DIAMOND, Items.DIAMOND, Style.EMPTY.withColor(7269586), 0.8F, Map.of(ArmorMaterials.DIAMOND, "diamond_darker"));
+      register(trimMaterials, LAPIS, Items.LAPIS_LAZULI, Style.EMPTY.withColor(4288151), 0.9F);
+      register(trimMaterials, AMETHYST, Items.AMETHYST_SHARD, Style.EMPTY.withColor(10116294), 1.0F);
    }
 
    /**
@@ -103,34 +103,34 @@
 
    /**
     * @mapping {@literal hashed m_kkcwbibv Lnet/minecraft/unmapped/C_txvwkqwx;m_kkcwbibv(Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_cpwnhism;F)V}
-    * @mapping {@literal named m_kkcwbibv Lnet/minecraft/item/trim/ArmorTrimMaterials;m_kkcwbibv(Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/item/Item;Lnet/minecraft/text/Style;F)V}
+    * @mapping {@literal named register Lnet/minecraft/item/trim/ArmorTrimMaterials;register(Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/item/Item;Lnet/minecraft/text/Style;F)V}
     */
-   private static void m_kkcwbibv(
-      C_hqoyyfco<ArmorTrimMaterial> arg, RegistryKey<ArmorTrimMaterial> registryKey, Item ingredient, Style styleOverride, float itemModelIndex
+   private static void register(
+      C_hqoyyfco<ArmorTrimMaterial> trimMaterials, RegistryKey<ArmorTrimMaterial> registryKey, Item item, Style style, float itemModelIndex
    ) {
-      m_ggcdyhpf(arg, registryKey, ingredient, styleOverride, itemModelIndex, Map.of());
+      register(trimMaterials, registryKey, item, style, itemModelIndex, Map.of());
    }
 
    /**
     * @mapping {@literal hashed m_ggcdyhpf Lnet/minecraft/unmapped/C_txvwkqwx;m_ggcdyhpf(Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_cpwnhism;FLjava/util/Map;)V}
-    * @mapping {@literal named m_ggcdyhpf Lnet/minecraft/item/trim/ArmorTrimMaterials;m_ggcdyhpf(Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/item/Item;Lnet/minecraft/text/Style;FLjava/util/Map;)V}
+    * @mapping {@literal named register Lnet/minecraft/item/trim/ArmorTrimMaterials;register(Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/item/Item;Lnet/minecraft/text/Style;FLjava/util/Map;)V}
     */
-   private static void m_ggcdyhpf(
-      C_hqoyyfco<ArmorTrimMaterial> arg,
+   private static void register(
+      C_hqoyyfco<ArmorTrimMaterial> trimMaterials,
       RegistryKey<ArmorTrimMaterial> registryKey,
-      Item ingredient,
-      Style styleOverride,
+      Item item,
+      Style style,
       float itemModelIndex,
-      Map<Holder<ArmorMaterial>, String> overrideArmorMaterials
+      Map<Holder<ArmorMaterial>, String> materials
    ) {
       ArmorTrimMaterial lv = ArmorTrimMaterial.of(
          registryKey.getValue().getPath(),
-         ingredient,
+         item,
          itemModelIndex,
-         Text.translatable(Util.createTranslationKey("trim_material", registryKey.getValue())).fillStyle(styleOverride),
-         overrideArmorMaterials
+         Text.translatable(Util.createTranslationKey("trim_material", registryKey.getValue())).fillStyle(style),
+         materials
       );
-      arg.m_pymxizhb(registryKey, lv);
+      trimMaterials.m_pymxizhb(registryKey, lv);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/item/trim/ArmorTrimPatterns.java namedSrc/net/minecraft/item/trim/ArmorTrimPatterns.java
--- namedTargetSrc/net/minecraft/item/trim/ArmorTrimPatterns.java	2024-02-17 04:15:30.409687113 +0000
+++ namedSrc/net/minecraft/item/trim/ArmorTrimPatterns.java	2024-02-17 04:14:10.670037617 +0000
@@ -104,23 +104,23 @@
     * @mapping {@literal hashed m_hmydulmo Lnet/minecraft/unmapped/C_vdhaofle;m_hmydulmo(Lnet/minecraft/unmapped/C_hqoyyfco;)V}
     * @mapping {@literal named bootstrapVanilla Lnet/minecraft/item/trim/ArmorTrimPatterns;bootstrapVanilla(Lnet/minecraft/unmapped/C_hqoyyfco;)V}
     */
-   public static void bootstrapVanilla(C_hqoyyfco<ArmorTrimPattern> arg) {
-      register(arg, Items.SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE, SENTRY);
-      register(arg, Items.DUNE_ARMOR_TRIM_SMITHING_TEMPLATE, DUNE);
-      register(arg, Items.COAST_ARMOR_TRIM_SMITHING_TEMPLATE, COAST);
-      register(arg, Items.WILD_ARMOR_TRIM_SMITHING_TEMPLATE, WILD);
-      register(arg, Items.WARD_ARMOR_TRIM_SMITHING_TEMPLATE, WARD);
-      register(arg, Items.EYE_ARMOR_TRIM_SMITHING_TEMPLATE, EYE);
-      register(arg, Items.VEX_ARMOR_TRIM_SMITHING_TEMPLATE, VEX);
-      register(arg, Items.TIDE_ARMOR_TRIM_SMITHING_TEMPLATE, TIDE);
-      register(arg, Items.SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE, SNOUT);
-      register(arg, Items.RIB_ARMOR_TRIM_SMITHING_TEMPLATE, RIB);
-      register(arg, Items.SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE, SPIRE);
-      register(arg, Items.WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE, WAYFINDER);
-      register(arg, Items.SHAPER_ARMOR_TRIM_SMITHING_TEMPLATE, SHAPER);
-      register(arg, Items.SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE, SILENCE);
-      register(arg, Items.RAISER_ARMOR_TRIM_SMITHING_TEMPLATE, RAISER);
-      register(arg, Items.HOST_ARMOR_TRIM_SMITHING_TEMPLATE, HOST);
+   public static void bootstrapVanilla(C_hqoyyfco<ArmorTrimPattern> patterns) {
+      register(patterns, Items.SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE, SENTRY);
+      register(patterns, Items.DUNE_ARMOR_TRIM_SMITHING_TEMPLATE, DUNE);
+      register(patterns, Items.COAST_ARMOR_TRIM_SMITHING_TEMPLATE, COAST);
+      register(patterns, Items.WILD_ARMOR_TRIM_SMITHING_TEMPLATE, WILD);
+      register(patterns, Items.WARD_ARMOR_TRIM_SMITHING_TEMPLATE, WARD);
+      register(patterns, Items.EYE_ARMOR_TRIM_SMITHING_TEMPLATE, EYE);
+      register(patterns, Items.VEX_ARMOR_TRIM_SMITHING_TEMPLATE, VEX);
+      register(patterns, Items.TIDE_ARMOR_TRIM_SMITHING_TEMPLATE, TIDE);
+      register(patterns, Items.SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE, SNOUT);
+      register(patterns, Items.RIB_ARMOR_TRIM_SMITHING_TEMPLATE, RIB);
+      register(patterns, Items.SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE, SPIRE);
+      register(patterns, Items.WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE, WAYFINDER);
+      register(patterns, Items.SHAPER_ARMOR_TRIM_SMITHING_TEMPLATE, SHAPER);
+      register(patterns, Items.SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE, SILENCE);
+      register(patterns, Items.RAISER_ARMOR_TRIM_SMITHING_TEMPLATE, RAISER);
+      register(patterns, Items.HOST_ARMOR_TRIM_SMITHING_TEMPLATE, HOST);
    }
 
    /**
@@ -138,11 +138,11 @@
     * @mapping {@literal hashed m_mamumeet Lnet/minecraft/unmapped/C_vdhaofle;m_mamumeet(Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_xhhleach;)V}
     * @mapping {@literal named register Lnet/minecraft/item/trim/ArmorTrimPatterns;register(Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/item/Item;Lnet/minecraft/registry/RegistryKey;)V}
     */
-   private static void register(C_hqoyyfco<ArmorTrimPattern> arg, Item templateItem, RegistryKey<ArmorTrimPattern> key) {
+   private static void register(C_hqoyyfco<ArmorTrimPattern> patterns, Item templateItem, RegistryKey<ArmorTrimPattern> key) {
       ArmorTrimPattern lv = new ArmorTrimPattern(
          key.getValue(), Registries.ITEM.wrapAsHolder(templateItem), Text.translatable(Util.createTranslationKey("trim_pattern", key.getValue())), false
       );
-      arg.m_pymxizhb(key, lv);
+      patterns.m_pymxizhb(key, lv);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/network/ClientConnection.java namedSrc/net/minecraft/network/ClientConnection.java
--- namedTargetSrc/net/minecraft/network/ClientConnection.java	2024-02-17 04:15:30.297687539 +0000
+++ namedSrc/net/minecraft/network/ClientConnection.java	2024-02-17 04:14:10.566038077 +0000
@@ -419,19 +419,20 @@
 
    /**
     * @mapping {@literal hashed m_luflhjqj Lnet/minecraft/unmapped/C_oasmcckk;m_luflhjqj(Ljava/lang/String;ILnet/minecraft/unmapped/C_jsvwwjov;)V}
-    * @mapping {@literal named m_luflhjqj Lnet/minecraft/network/ClientConnection;m_luflhjqj(Ljava/lang/String;ILnet/minecraft/network/listener/ClientLoginPacketListener;)V}
+    * @mapping {@literal named connect Lnet/minecraft/network/ClientConnection;connect(Ljava/lang/String;ILnet/minecraft/network/listener/ClientLoginPacketListener;)V}
     */
-   public void m_luflhjqj(String address, int port, ClientLoginPacketListener arg) {
-      this.connect(address, port, LoginPhases.C2S, LoginPhases.S2C, arg, ConnectionIntent.LOGIN);
+   public void connect(String address, int port, ClientLoginPacketListener client) {
+      this.connect(address, port, LoginPhases.C2S, LoginPhases.S2C, client, ConnectionIntent.LOGIN);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_xqhcjeev Lnet/minecraft/unmapped/C_oasmcckk;m_xqhcjeev(Ljava/lang/String;ILnet/minecraft/unmapped/C_ppzmqyxe;Lnet/minecraft/unmapped/C_ppzmqyxe;Lnet/minecraft/unmapped/C_ifnchbtj;Z)V}
+    * @mapping {@literal named connect Lnet/minecraft/network/ClientConnection;connect(Ljava/lang/String;ILnet/minecraft/network/ConnectionPhase;Lnet/minecraft/network/ConnectionPhase;Lnet/minecraft/client/listener/ClientPacketListener;Z)V}
     */
-   public <S extends ServerPacketListener, C extends ClientPacketListener> void m_xqhcjeev(
-      String string, int i, ConnectionPhase<S> arg, ConnectionPhase<C> arg2, C arg3, boolean bl
+   public <S extends ServerPacketListener, C extends ClientPacketListener> void connect(
+      String address, int port, ConnectionPhase<S> serverConnection, ConnectionPhase<C> clientConnection, C client, boolean bl
    ) {
-      this.connect(string, i, arg, arg2, arg3, bl ? ConnectionIntent.TRANSFER : ConnectionIntent.LOGIN);
+      this.connect(address, port, serverConnection, clientConnection, client, bl ? ConnectionIntent.TRANSFER : ConnectionIntent.LOGIN);
    }
 
    /**
@@ -439,16 +440,16 @@
     * @mapping {@literal named connect Lnet/minecraft/network/ClientConnection;connect(Ljava/lang/String;ILnet/minecraft/network/ConnectionPhase;Lnet/minecraft/network/ConnectionPhase;Lnet/minecraft/client/listener/ClientPacketListener;Lnet/minecraft/network/ConnectionIntent;)V}
     */
    private <S extends ServerPacketListener, C extends ClientPacketListener> void connect(
-      String address, int port, ConnectionPhase<S> arg, ConnectionPhase<C> arg2, C arg3, ConnectionIntent intent
+      String address, int port, ConnectionPhase<S> serverConnection, ConnectionPhase<C> clientConnection, C client, ConnectionIntent intent
    ) {
-      if (arg.id() != arg2.id()) {
+      if (serverConnection.id() != clientConnection.id()) {
          throw new IllegalStateException("Mismatched initial protocols");
       } else {
-         this.disconnectListener = arg3;
+         this.disconnectListener = client;
          this.submit(arg5 -> {
-            this.m_qjeqlspr(arg2, arg3);
+            this.m_qjeqlspr(clientConnection, client);
             arg5.sendImmediately(new HandshakeC2SPacket(SharedConstants.getGameVersion().getProtocolVersion(), address, port, intent), null, true);
-            this.m_tckzsnsu(arg);
+            this.m_tckzsnsu(serverConnection);
          });
       }
    }
diff -bur namedTargetSrc/net/minecraft/network/codec/PacketCodec.java namedSrc/net/minecraft/network/codec/PacketCodec.java
--- namedTargetSrc/net/minecraft/network/codec/PacketCodec.java	2024-02-17 04:15:30.173688011 +0000
+++ namedSrc/net/minecraft/network/codec/PacketCodec.java	2024-02-17 04:14:10.402038801 +0000
@@ -6,18 +6,17 @@
 import io.netty.buffer.ByteBuf;
 import java.util.function.BiFunction;
 import java.util.function.Function;
-import net.minecraft.unmapped.C_hiksfskl;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_qsrmwluu}
  * @mapping {@literal named net/minecraft/network/codec/PacketCodec}
  */
-public interface PacketCodec<B, V> extends PacketDecoder<B, V>, C_hiksfskl<B, V> {
+public interface PacketCodec<B, V> extends PacketDecoder<B, V>, PacketEncoder<B, V> {
    /**
     * @mapping {@literal hashed m_rgewxgtr Lnet/minecraft/unmapped/C_qsrmwluu;m_rgewxgtr(Lnet/minecraft/unmapped/C_hiksfskl;Lnet/minecraft/unmapped/C_ajdohfrc;)Lnet/minecraft/unmapped/C_qsrmwluu;}
-    * @mapping {@literal named create Lnet/minecraft/network/codec/PacketCodec;create(Lnet/minecraft/unmapped/C_hiksfskl;Lnet/minecraft/network/codec/PacketDecoder;)Lnet/minecraft/network/codec/PacketCodec;}
+    * @mapping {@literal named create Lnet/minecraft/network/codec/PacketCodec;create(Lnet/minecraft/network/codec/PacketEncoder;Lnet/minecraft/network/codec/PacketDecoder;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static <B, V> PacketCodec<B, V> create(C_hiksfskl<B, V> encoder, PacketDecoder<B, V> decoder) {
+   static <B, V> PacketCodec<B, V> create(PacketEncoder<B, V> encoder, PacketDecoder<B, V> decoder) {
       return new PacketCodec<B, V>() {
          /**
           * Mapping not found
diff -bur namedTargetSrc/net/minecraft/network/codec/PacketCodecs.java namedSrc/net/minecraft/network/codec/PacketCodecs.java
--- namedTargetSrc/net/minecraft/network/codec/PacketCodecs.java	2024-02-17 04:15:30.185687965 +0000
+++ namedSrc/net/minecraft/network/codec/PacketCodecs.java	2024-02-17 04:14:10.418038731 +0000
@@ -192,14 +192,14 @@
        * Mapping not found
        */
       public byte[] m_meevnjcw(ByteBuf byteBuf) {
-         return PacketByteBuf.m_kgkdgazl(byteBuf);
+         return PacketByteBuf.readByteArray(byteBuf);
       }
 
       /**
        * Mapping not found
        */
       public void m_zwyjwjob(ByteBuf byteBuf, byte[] bs) {
-         PacketByteBuf.m_elpmwnes(byteBuf, bs);
+         PacketByteBuf.writeByteArray(byteBuf, bs);
       }
    };
    /**
@@ -233,7 +233,7 @@
        * @mapping {@literal named decode Lnet/minecraft/network/codec/PacketCodecs$C_qocgsfeq;decode(Lio/netty/buffer/ByteBuf;)Ljava/util/Optional;}
        */
       public Optional<NbtCompound> decode(ByteBuf byteBuf) {
-         return Optional.ofNullable(PacketByteBuf.m_kjijcwgo(byteBuf));
+         return Optional.ofNullable(PacketByteBuf.readNbtCompound(byteBuf));
       }
 
       /**
@@ -254,7 +254,7 @@
        * @mapping {@literal named decode Lnet/minecraft/network/codec/PacketCodecs$C_ihoymean;decode(Lio/netty/buffer/ByteBuf;)Lorg/joml/Vector3f;}
        */
       public Vector3f decode(ByteBuf byteBuf) {
-         return PacketByteBuf.m_vbjdgyoz(byteBuf);
+         return PacketByteBuf.readVector3f(byteBuf);
       }
 
       /**
@@ -262,7 +262,7 @@
        * @mapping {@literal named encode Lnet/minecraft/network/codec/PacketCodecs$C_ihoymean;encode(Lio/netty/buffer/ByteBuf;Lorg/joml/Vector3f;)V}
        */
       public void encode(ByteBuf byteBuf, Vector3f vector3f) {
-         PacketByteBuf.m_cozckjjh(byteBuf, vector3f);
+         PacketByteBuf.writeVector3f(byteBuf, vector3f);
       }
    };
    /**
@@ -275,7 +275,7 @@
        * @mapping {@literal named decode Lnet/minecraft/network/codec/PacketCodecs$C_ufqwkxxt;decode(Lio/netty/buffer/ByteBuf;)Lorg/joml/Quaternionf;}
        */
       public Quaternionf decode(ByteBuf byteBuf) {
-         return PacketByteBuf.m_appecnpy(byteBuf);
+         return PacketByteBuf.readQuaternion(byteBuf);
       }
 
       /**
@@ -283,7 +283,7 @@
        * @mapping {@literal named encode Lnet/minecraft/network/codec/PacketCodecs$C_ufqwkxxt;encode(Lio/netty/buffer/ByteBuf;Lorg/joml/Quaternionf;)V}
        */
       public void encode(ByteBuf byteBuf, Quaternionf quaternionf) {
-         PacketByteBuf.m_hpbnyaqq(byteBuf, quaternionf);
+         PacketByteBuf.writeQuaternion(byteBuf, quaternionf);
       }
    };
 
@@ -296,7 +296,7 @@
           * Mapping not found
           */
          public byte[] m_mgtdkvbu(ByteBuf byteBuf) {
-            return PacketByteBuf.m_jqypukxt(byteBuf, i);
+            return PacketByteBuf.readByteArray(byteBuf, i);
          }
 
          /**
@@ -306,7 +306,7 @@
             if (bs.length > i) {
                throw new EncoderException("ByteArray with size " + bs.length + " is bigger than allowed " + i);
             } else {
-               PacketByteBuf.m_elpmwnes(byteBuf, bs);
+               PacketByteBuf.writeByteArray(byteBuf, bs);
             }
          }
       };
@@ -346,7 +346,7 @@
           * @mapping {@literal named decode Lnet/minecraft/network/codec/PacketCodecs$C_qovzsqii;decode(Lio/netty/buffer/ByteBuf;)Lnet/minecraft/nbt/NbtElement;}
           */
          public NbtElement decode(ByteBuf byteBuf) {
-            NbtElement lv = PacketByteBuf.m_mafeqoqe(byteBuf, (NbtTagSizeTracker)supplier.get());
+            NbtElement lv = PacketByteBuf.readNbt(byteBuf, (NbtTagSizeTracker)supplier.get());
             if (lv == null) {
                throw new DecoderException("Expected non-null compound tag");
             } else {
@@ -556,9 +556,9 @@
 
    /**
     * @mapping {@literal hashed m_ugyvwjlm Lnet/minecraft/unmapped/C_anfarvhg;m_ugyvwjlm(Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_qsrmwluu;}
-    * @mapping {@literal named m_ugyvwjlm Lnet/minecraft/network/codec/PacketCodecs;m_ugyvwjlm(Lnet/minecraft/registry/RegistryKey;Ljava/util/function/Function;)Lnet/minecraft/network/codec/PacketCodec;}
+    * @mapping {@literal named registry Lnet/minecraft/network/codec/PacketCodecs;registry(Lnet/minecraft/registry/RegistryKey;Ljava/util/function/Function;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   private static <T, R> PacketCodec<RegistryByteBuf, R> m_ugyvwjlm(
+   private static <T, R> PacketCodec<RegistryByteBuf, R> registry(
       RegistryKey<? extends Registry<T>> registryKey, Function<Registry<T>, IndexedIterable<R>> function
    ) {
       return new PacketCodec<RegistryByteBuf, R>() {
@@ -591,25 +591,27 @@
 
    /**
     * @mapping {@literal hashed m_fhfovxvd Lnet/minecraft/unmapped/C_anfarvhg;m_fhfovxvd(Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_qsrmwluu;}
-    * @mapping {@literal named m_fhfovxvd Lnet/minecraft/network/codec/PacketCodecs;m_fhfovxvd(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/network/codec/PacketCodec;}
+    * @mapping {@literal named registryValue Lnet/minecraft/network/codec/PacketCodecs;registryValue(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static <T> PacketCodec<RegistryByteBuf, T> m_fhfovxvd(RegistryKey<? extends Registry<T>> registryKey) {
-      return m_ugyvwjlm(registryKey, registry -> registry);
+   static <T> PacketCodec<RegistryByteBuf, T> registryValue(RegistryKey<? extends Registry<T>> registryKey) {
+      return registry(registryKey, registry -> registry);
    }
 
    /**
     * @mapping {@literal hashed m_hbizjcsr Lnet/minecraft/unmapped/C_anfarvhg;m_hbizjcsr(Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_qsrmwluu;}
-    * @mapping {@literal named m_hbizjcsr Lnet/minecraft/network/codec/PacketCodecs;m_hbizjcsr(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/network/codec/PacketCodec;}
+    * @mapping {@literal named registryEntry Lnet/minecraft/network/codec/PacketCodecs;registryEntry(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static <T> PacketCodec<RegistryByteBuf, Holder<T>> m_hbizjcsr(RegistryKey<? extends Registry<T>> registryKey) {
-      return m_ugyvwjlm(registryKey, Registry::asHolderIdMap);
+   static <T> PacketCodec<RegistryByteBuf, Holder<T>> registryEntry(RegistryKey<? extends Registry<T>> registryKey) {
+      return registry(registryKey, Registry::asHolderIdMap);
    }
 
    /**
     * @mapping {@literal hashed m_vpmnqxks Lnet/minecraft/unmapped/C_anfarvhg;m_vpmnqxks(Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_qsrmwluu;)Lnet/minecraft/unmapped/C_qsrmwluu;}
-    * @mapping {@literal named m_vpmnqxks Lnet/minecraft/network/codec/PacketCodecs;m_vpmnqxks(Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/network/codec/PacketCodec;)Lnet/minecraft/network/codec/PacketCodec;}
+    * @mapping {@literal named registryEntry Lnet/minecraft/network/codec/PacketCodecs;registryEntry(Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/network/codec/PacketCodec;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static <T> PacketCodec<RegistryByteBuf, Holder<T>> m_vpmnqxks(RegistryKey<? extends Registry<T>> registryKey, PacketCodec<? super RegistryByteBuf, T> arg2) {
+   static <T> PacketCodec<RegistryByteBuf, Holder<T>> registryEntry(
+      RegistryKey<? extends Registry<T>> registryKey, PacketCodec<? super RegistryByteBuf, T> arg2
+   ) {
       return new PacketCodec<RegistryByteBuf, Holder<T>>() {
          /**
           * Mapping not found
Only in namedSrc/net/minecraft/network/codec: PacketEncoder.java
diff -bur namedTargetSrc/net/minecraft/network/DecoderHandler.java namedSrc/net/minecraft/network/DecoderHandler.java
--- namedTargetSrc/net/minecraft/network/DecoderHandler.java	2024-02-17 04:15:30.153688087 +0000
+++ namedSrc/net/minecraft/network/DecoderHandler.java	2024-02-17 04:14:10.370038943 +0000
@@ -66,7 +66,7 @@
                LOGGER.debug(ClientConnection.PACKET_RECEIVED_MARKER, " IN: [{}:{}] {}", this.connectionPhase.id().getStateId(), lv2, lv.getClass().getName());
             }
 
-            NetworkStateTransitionHandler.m_lecsavnm(context, lv);
+            NetworkStateTransitionHandler.onDecoded(context, lv);
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/network/encryption/NetworkEncryptionUtils.java namedSrc/net/minecraft/network/encryption/NetworkEncryptionUtils.java
--- namedTargetSrc/net/minecraft/network/encryption/NetworkEncryptionUtils.java	2024-02-17 04:15:30.417687084 +0000
+++ namedSrc/net/minecraft/network/encryption/NetworkEncryptionUtils.java	2024-02-17 04:14:10.678037581 +0000
@@ -540,7 +540,7 @@
        */
       public static void write(PacketByteBuf buf, NetworkEncryptionUtils.SignaturePair signaturePair) {
          buf.writeLong(signaturePair.salt);
-         buf.m_ueausfqv(signaturePair.signature);
+         buf.writeByteArray(signaturePair.signature);
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/network/encryption/PlayerPublicKey.java namedSrc/net/minecraft/network/encryption/PlayerPublicKey.java
--- namedTargetSrc/net/minecraft/network/encryption/PlayerPublicKey.java	2024-02-17 04:15:30.305687509 +0000
+++ namedSrc/net/minecraft/network/encryption/PlayerPublicKey.java	2024-02-17 04:14:10.578038023 +0000
@@ -98,7 +98,7 @@
       public void write(PacketByteBuf buf) {
          buf.writeInstant(this.expiresAt);
          buf.writePublicKey(this.key);
-         buf.m_ueausfqv(this.keySignature);
+         buf.writeByteArray(this.keySignature);
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/network/message/MessageStyle.java namedSrc/net/minecraft/network/message/MessageStyle.java
--- namedTargetSrc/net/minecraft/network/message/MessageStyle.java	2024-02-17 04:15:30.337687387 +0000
+++ namedSrc/net/minecraft/network/message/MessageStyle.java	2024-02-17 04:14:10.602037917 +0000
@@ -22,7 +22,7 @@
       instance -> instance.group(
                Codec.STRING.fieldOf("translation_key").forGetter(MessageStyle::translationKey),
                MessageStyle.Parameter.CODEC.listOf().fieldOf("parameters").forGetter(MessageStyle::parameters),
-               Style.Serializer.f_rgppuvfm.optionalFieldOf("style", Style.EMPTY).forGetter(MessageStyle::style)
+               Style.Serializer.CODEC.optionalFieldOf("style", Style.EMPTY).forGetter(MessageStyle::style)
             )
             .apply(instance, MessageStyle::new)
    );
diff -bur namedTargetSrc/net/minecraft/network/message/MessageType.java namedSrc/net/minecraft/network/message/MessageType.java
--- namedTargetSrc/net/minecraft/network/message/MessageType.java	2024-02-17 04:15:30.197687920 +0000
+++ namedSrc/net/minecraft/network/message/MessageType.java	2024-02-17 04:14:10.430038678 +0000
@@ -143,11 +143,11 @@
        * @mapping {@literal named CODEC Lnet/minecraft/network/message/MessageType$Parameters;CODEC:Lnet/minecraft/network/codec/PacketCodec;}
        */
       public static final PacketCodec<RegistryByteBuf, MessageType.Parameters> CODEC = PacketCodec.m_kqzabmpi(
-         PacketCodecs.m_hbizjcsr(RegistryKeys.MESSAGE_TYPE),
+         PacketCodecs.registryEntry(RegistryKeys.MESSAGE_TYPE),
          MessageType.Parameters::messageType,
-         TextCodecs.f_byaedzcu,
+         TextCodecs.REGISTRY_TEXT_CODEC,
          MessageType.Parameters::name,
-         TextCodecs.f_vzatxplp,
+         TextCodecs.REGISTRY_OPTIONAL_TEXT_CODEC,
          MessageType.Parameters::targetName,
          MessageType.Parameters::new
       );
diff -bur namedTargetSrc/net/minecraft/network/NetworkSide.java namedSrc/net/minecraft/network/NetworkSide.java
--- namedTargetSrc/net/minecraft/network/NetworkSide.java	2024-02-17 04:15:30.369687266 +0000
+++ namedSrc/net/minecraft/network/NetworkSide.java	2024-02-17 04:14:10.634037776 +0000
@@ -21,16 +21,17 @@
    S2C("clientbound");
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_kqdxaxcy Lnet/minecraft/unmapped/C_exeqxqdd;f_kqdxaxcy:Ljava/lang/String;}
+    * @mapping {@literal named side Lnet/minecraft/network/NetworkSide;side:Ljava/lang/String;}
     */
-   private final String f_kqdxaxcy;
+   private final String side;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_exeqxqdd;<init>(Ljava/lang/String;ILjava/lang/String;)V}
     * @mapping {@literal named <init> Lnet/minecraft/network/NetworkSide;<init>(Ljava/lang/String;ILjava/lang/String;)V}
     */
    private NetworkSide(String side) {
-      this.f_kqdxaxcy = side;
+      this.side = side;
    }
 
    /**
@@ -46,6 +47,6 @@
     * @mapping {@literal named getSide Lnet/minecraft/network/NetworkSide;getSide()Ljava/lang/String;}
     */
    public String getSide() {
-      return this.f_kqdxaxcy;
+      return this.side;
    }
 }
diff -bur namedTargetSrc/net/minecraft/network/NetworkStateTransitionHandler.java namedSrc/net/minecraft/network/NetworkStateTransitionHandler.java
--- namedTargetSrc/net/minecraft/network/NetworkStateTransitionHandler.java	2024-02-17 04:15:30.385687205 +0000
+++ namedSrc/net/minecraft/network/NetworkStateTransitionHandler.java	2024-02-17 04:14:10.650037704 +0000
@@ -11,9 +11,9 @@
 public interface NetworkStateTransitionHandler {
    /**
     * @mapping {@literal hashed m_lecsavnm Lnet/minecraft/unmapped/C_vlkysaje;m_lecsavnm(Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/unmapped/C_zyjtrjrl;)V}
-    * @mapping {@literal named m_lecsavnm Lnet/minecraft/network/NetworkStateTransitionHandler;m_lecsavnm(Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/network/packet/Packet;)V}
+    * @mapping {@literal named onDecoded Lnet/minecraft/network/NetworkStateTransitionHandler;onDecoded(Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/network/packet/Packet;)V}
     */
-   static void m_lecsavnm(ChannelHandlerContext channelHandlerContext, Packet<?> packet) {
+   static void onDecoded(ChannelHandlerContext channelHandlerContext, Packet<?> packet) {
       if (packet.transitionsNetworkState()) {
          channelHandlerContext.channel().config().setAutoRead(false);
          channelHandlerContext.pipeline().addBefore(channelHandlerContext.name(), "inbound_config", new C_wkoxpylw.C_nsmxmfzy());
@@ -23,9 +23,9 @@
 
    /**
     * @mapping {@literal hashed m_camzphge Lnet/minecraft/unmapped/C_vlkysaje;m_camzphge(Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/unmapped/C_zyjtrjrl;)V}
-    * @mapping {@literal named m_camzphge Lnet/minecraft/network/NetworkStateTransitionHandler;m_camzphge(Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/network/packet/Packet;)V}
+    * @mapping {@literal named onEncoded Lnet/minecraft/network/NetworkStateTransitionHandler;onEncoded(Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/network/packet/Packet;)V}
     */
-   static void m_camzphge(ChannelHandlerContext channelHandlerContext, Packet<?> packet) {
+   static void onEncoded(ChannelHandlerContext channelHandlerContext, Packet<?> packet) {
       if (packet.transitionsNetworkState()) {
          channelHandlerContext.pipeline().addAfter(channelHandlerContext.name(), "outbound_config", new C_wkoxpylw.C_oqajvmrd());
          channelHandlerContext.pipeline().remove(channelHandlerContext.name());
diff -bur namedTargetSrc/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.java namedSrc/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.java
--- namedTargetSrc/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.java	2024-02-17 04:15:30.337687387 +0000
+++ namedSrc/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.java	2024-02-17 04:14:10.606037900 +0000
@@ -60,8 +60,8 @@
     * @mapping {@literal named write Lnet/minecraft/network/packet/c2s/login/LoginKeyC2SPacket;write(Lnet/minecraft/network/PacketByteBuf;)V}
     */
    private void write(PacketByteBuf buf) {
-      buf.m_ueausfqv(this.encryptedSecretKey);
-      buf.m_ueausfqv(this.nonce);
+      buf.writeByteArray(this.encryptedSecretKey);
+      buf.writeByteArray(this.nonce);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/network/packet/c2s/play/BeaconUpdateC2SPacket.java namedSrc/net/minecraft/network/packet/c2s/play/BeaconUpdateC2SPacket.java
--- namedTargetSrc/net/minecraft/network/packet/c2s/play/BeaconUpdateC2SPacket.java	2024-02-17 04:15:30.285687586 +0000
+++ namedSrc/net/minecraft/network/packet/c2s/play/BeaconUpdateC2SPacket.java	2024-02-17 04:14:10.546038165 +0000
@@ -23,9 +23,9 @@
     * @mapping {@literal named CODEC Lnet/minecraft/network/packet/c2s/play/BeaconUpdateC2SPacket;CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
    public static final PacketCodec<RegistryByteBuf, BeaconUpdateC2SPacket> CODEC = PacketCodec.create(
-      PacketCodecs.m_hbizjcsr(RegistryKeys.STATUS_EFFECT).apply(PacketCodecs::m_ciouqnhu),
+      PacketCodecs.registryEntry(RegistryKeys.STATUS_EFFECT).apply(PacketCodecs::m_ciouqnhu),
       BeaconUpdateC2SPacket::primary,
-      PacketCodecs.m_hbizjcsr(RegistryKeys.STATUS_EFFECT).apply(PacketCodecs::m_ciouqnhu),
+      PacketCodecs.registryEntry(RegistryKeys.STATUS_EFFECT).apply(PacketCodecs::m_ciouqnhu),
       BeaconUpdateC2SPacket::secondary,
       BeaconUpdateC2SPacket::new
    );
diff -bur namedTargetSrc/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.java namedSrc/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.java
--- namedTargetSrc/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.java	2024-02-17 04:15:30.225687813 +0000
+++ namedSrc/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.java	2024-02-17 04:14:10.466038519 +0000
@@ -46,7 +46,7 @@
     */
    private CreativeInventoryActionC2SPacket(RegistryByteBuf slot) {
       this.slot = slot.readShort();
-      this.stack = ItemStack.f_bnghiwgu.decode(slot);
+      this.stack = ItemStack.PACKET_CODEC.decode(slot);
    }
 
    /**
@@ -55,7 +55,7 @@
     */
    private void write(RegistryByteBuf buf) {
       buf.writeShort(this.slot);
-      ItemStack.f_bnghiwgu.encode(buf, this.stack);
+      ItemStack.PACKET_CODEC.encode(buf, this.stack);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/network/packet/c2s/play/SlotClickC2SPacket.java namedSrc/net/minecraft/network/packet/c2s/play/SlotClickC2SPacket.java
--- namedTargetSrc/net/minecraft/network/packet/c2s/play/SlotClickC2SPacket.java	2024-02-17 04:15:30.317687463 +0000
+++ namedSrc/net/minecraft/network/packet/c2s/play/SlotClickC2SPacket.java	2024-02-17 04:14:10.590037970 +0000
@@ -34,7 +34,7 @@
     * @mapping {@literal named STACK_MAP_CODEC Lnet/minecraft/network/packet/c2s/play/SlotClickC2SPacket;STACK_MAP_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
    private static final PacketCodec<RegistryByteBuf, Int2ObjectMap<ItemStack>> STACK_MAP_CODEC = PacketCodecs.m_geuyjopi(
-      PacketByteBuf.getMaxValidator(Int2ObjectOpenHashMap::new, 128), PacketCodecs.SHORT.create(Short::intValue, Integer::shortValue), ItemStack.f_bnghiwgu
+      PacketByteBuf.getMaxValidator(Int2ObjectOpenHashMap::new, 128), PacketCodecs.SHORT.create(Short::intValue, Integer::shortValue), ItemStack.PACKET_CODEC
    );
    /**
     * @mapping {@literal hashed f_wdmowzhx Lnet/minecraft/unmapped/C_enzhnfdg;f_wdmowzhx:I}
@@ -99,7 +99,7 @@
       this.button = buf.readByte();
       this.actionType = buf.readEnumConstant(SlotActionType.class);
       this.modifiedStacks = Int2ObjectMaps.unmodifiable(STACK_MAP_CODEC.decode(buf));
-      this.stack = ItemStack.f_bnghiwgu.decode(buf);
+      this.stack = ItemStack.PACKET_CODEC.decode(buf);
    }
 
    /**
@@ -113,7 +113,7 @@
       buf.writeByte(this.button);
       buf.writeEnumConstant(this.actionType);
       STACK_MAP_CODEC.encode(buf, this.modifiedStacks);
-      ItemStack.f_bnghiwgu.encode(buf, this.stack);
+      ItemStack.PACKET_CODEC.encode(buf, this.stack);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/ChunkBiomeDataS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/ChunkBiomeDataS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/ChunkBiomeDataS2CPacket.java	2024-02-17 04:15:30.429687037 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/ChunkBiomeDataS2CPacket.java	2024-02-17 04:14:10.686037545 +0000
@@ -139,7 +139,7 @@
        */
       public void write(PacketByteBuf buf) {
          buf.writeChunkPos(this.pos);
-         buf.m_ueausfqv(this.buffer);
+         buf.writeByteArray(this.buffer);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/common/AddResourcePackS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/common/AddResourcePackS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/common/AddResourcePackS2CPacket.java	2024-02-17 04:15:30.241687752 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/common/AddResourcePackS2CPacket.java	2024-02-17 04:14:10.490038413 +0000
@@ -36,7 +36,7 @@
       AddResourcePackS2CPacket::hash,
       PacketCodecs.BOOL,
       AddResourcePackS2CPacket::required,
-      TextCodecs.f_opceizjo.apply(PacketCodecs::m_ciouqnhu),
+      TextCodecs.BUFFER_TEXT_CODEC.apply(PacketCodecs::m_ciouqnhu),
       AddResourcePackS2CPacket::prompt,
       AddResourcePackS2CPacket::new
    );
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.java	2024-02-17 04:15:30.181687981 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.java	2024-02-17 04:14:10.414038748 +0000
@@ -18,7 +18,8 @@
     * @mapping {@literal hashed f_qkookjdc Lnet/minecraft/unmapped/C_xcpuaily;f_qkookjdc:Lnet/minecraft/unmapped/C_qsrmwluu;}
     * @mapping {@literal named CODEC Lnet/minecraft/network/packet/s2c/common/DisconnectS2CPacket;CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   public static final PacketCodec<ByteBuf, DisconnectS2CPacket> CODEC = TextCodecs.f_opceizjo.create(DisconnectS2CPacket::new, DisconnectS2CPacket::reason);
+   public static final PacketCodec<ByteBuf, DisconnectS2CPacket> CODEC = TextCodecs.BUFFER_TEXT_CODEC
+      .create(DisconnectS2CPacket::new, DisconnectS2CPacket::reason);
 
    /**
     * Mapping not found
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/common/TagsSynchronizationS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/common/TagsSynchronizationS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/common/TagsSynchronizationS2CPacket.java	2024-02-17 04:15:30.413687098 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/common/TagsSynchronizationS2CPacket.java	2024-02-17 04:14:10.670037617 +0000
@@ -42,7 +42,7 @@
     * @mapping {@literal named <init> Lnet/minecraft/network/packet/s2c/common/TagsSynchronizationS2CPacket;<init>(Lnet/minecraft/network/PacketByteBuf;)V}
     */
    private TagsSynchronizationS2CPacket(PacketByteBuf buf) {
-      this.groups = buf.m_eznoskdd(PacketByteBuf::readRegistryKey, TagNetworkSerialization.NetworkPayload::read);
+      this.groups = buf.readMap(PacketByteBuf::readRegistryKey, TagNetworkSerialization.NetworkPayload::read);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.java	2024-02-17 04:15:30.205687889 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.java	2024-02-17 04:14:10.442038625 +0000
@@ -72,8 +72,8 @@
     */
    private void write(PacketByteBuf buf) {
       buf.writeString(this.serverId);
-      buf.m_ueausfqv(this.publicKey);
-      buf.m_ueausfqv(this.nonce);
+      buf.writeByteArray(this.publicKey);
+      buf.writeByteArray(this.nonce);
       buf.writeBoolean(this.needsAuthentication);
    }
 
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.java	2024-02-17 04:15:30.181687981 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.java	2024-02-17 04:14:10.414038748 +0000
@@ -70,7 +70,7 @@
       this.clearCurrent = buf.readBoolean();
       this.toShow = AdvancementHolder.LIST_PACKET_CODEC.decode(buf);
       this.toHide = buf.readCollection(Sets::newLinkedHashSetWithExpectedSize, PacketByteBuf::readIdentifier);
-      this.toProgress = buf.m_eznoskdd(PacketByteBuf::readIdentifier, AdvancementProgress::fromPacket);
+      this.toProgress = buf.readMap(PacketByteBuf::readIdentifier, AdvancementProgress::fromPacket);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.java	2024-02-17 04:15:30.329687418 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.java	2024-02-17 04:14:10.598037934 +0000
@@ -27,7 +27,7 @@
    public static final PacketCodec<RegistryByteBuf, BlockEntityUpdateS2CPacket> CODEC = PacketCodec.m_kqzabmpi(
       BlockPos.f_mcthbtbh,
       BlockEntityUpdateS2CPacket::getPos,
-      PacketCodecs.m_fhfovxvd(RegistryKeys.BLOCK_ENTITY_TYPE),
+      PacketCodecs.registryValue(RegistryKeys.BLOCK_ENTITY_TYPE),
       BlockEntityUpdateS2CPacket::getBlockEntityType,
       PacketCodecs.NBT_COMPOUND,
       BlockEntityUpdateS2CPacket::getNbt,
@@ -50,11 +50,12 @@
    private final NbtCompound nbt;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_gjvnmenv Lnet/minecraft/unmapped/C_knypsere;m_gjvnmenv(Lnet/minecraft/unmapped/C_kvegafmh;Ljava/util/function/BiFunction;)Lnet/minecraft/unmapped/C_knypsere;}
+    * @mapping {@literal named create Lnet/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket;create(Lnet/minecraft/block/entity/BlockEntity;Ljava/util/function/BiFunction;)Lnet/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket;}
     */
-   public static BlockEntityUpdateS2CPacket m_gjvnmenv(BlockEntity arg, BiFunction<BlockEntity, DynamicRegistryManager, NbtCompound> biFunction) {
-      DynamicRegistryManager lv = arg.getWorld().getRegistryManager();
-      return new BlockEntityUpdateS2CPacket(arg.getPos(), arg.getType(), (NbtCompound)biFunction.apply(arg, lv));
+   public static BlockEntityUpdateS2CPacket create(BlockEntity blockEntity, BiFunction<BlockEntity, DynamicRegistryManager, NbtCompound> nbtGetter) {
+      DynamicRegistryManager lv = blockEntity.getWorld().getRegistryManager();
+      return new BlockEntityUpdateS2CPacket(blockEntity.getPos(), blockEntity.getType(), (NbtCompound)nbtGetter.apply(blockEntity, lv));
    }
 
    /**
@@ -62,7 +63,7 @@
     * @mapping {@literal named of Lnet/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket;of(Lnet/minecraft/block/entity/BlockEntity;)Lnet/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket;}
     */
    public static BlockEntityUpdateS2CPacket of(BlockEntity blockEntity) {
-      return m_gjvnmenv(blockEntity, BlockEntity::toSyncedNbt);
+      return create(blockEntity, BlockEntity::toSyncedNbt);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/BlockEventS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/BlockEventS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/BlockEventS2CPacket.java	2024-02-17 04:15:30.333687402 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/BlockEventS2CPacket.java	2024-02-17 04:14:10.606037900 +0000
@@ -61,7 +61,7 @@
       this.pos = buf.readPos();
       this.type = buf.readUnsignedByte();
       this.data = buf.readUnsignedByte();
-      this.block = PacketCodecs.m_fhfovxvd(RegistryKeys.BLOCK).decode(buf);
+      this.block = PacketCodecs.registryValue(RegistryKeys.BLOCK).decode(buf);
    }
 
    /**
@@ -72,7 +72,7 @@
       buf.writePos(this.pos);
       buf.writeByte(this.type);
       buf.writeByte(this.data);
-      PacketCodecs.m_fhfovxvd(RegistryKeys.BLOCK).encode(buf, this.block);
+      PacketCodecs.registryValue(RegistryKeys.BLOCK).encode(buf, this.block);
    }
 
    /**

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

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

View the diff here (3/3): 
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/BossBarUpdateS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/BossBarUpdateS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/BossBarUpdateS2CPacket.java	2024-02-17 04:15:30.289687570 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/BossBarUpdateS2CPacket.java	2024-02-17 04:14:10.554038130 +0000
@@ -72,7 +72,7 @@
        * Mapping not found
        */
       @Override
-      public void toPacket(RegistryByteBuf arg) {
+      public void toPacket(RegistryByteBuf buf) {
       }
    };
 
@@ -149,10 +149,10 @@
     * @mapping {@literal hashed m_qlrpoohv Lnet/minecraft/unmapped/C_hrrcorkm;m_qlrpoohv(Lnet/minecraft/unmapped/C_bngyzsts;)V}
     * @mapping {@literal named write Lnet/minecraft/network/packet/s2c/play/BossBarUpdateS2CPacket;write(Lnet/minecraft/network/RegistryByteBuf;)V}
     */
-   private void write(RegistryByteBuf arg) {
-      arg.writeUuid(this.uuid);
-      arg.writeEnumConstant(this.action.getType());
-      this.action.toPacket(arg);
+   private void write(RegistryByteBuf buf) {
+      buf.writeUuid(this.uuid);
+      buf.writeEnumConstant(this.action.getType());
+      this.action.toPacket(buf);
    }
 
    /**
@@ -221,7 +221,7 @@
        * @mapping {@literal hashed m_dhjuplto Lnet/minecraft/unmapped/C_hrrcorkm$C_hvffpqqu;m_dhjuplto(Lnet/minecraft/unmapped/C_bngyzsts;)V}
        * @mapping {@literal named toPacket Lnet/minecraft/network/packet/s2c/play/BossBarUpdateS2CPacket$Action;toPacket(Lnet/minecraft/network/RegistryByteBuf;)V}
        */
-      void toPacket(RegistryByteBuf arg);
+      void toPacket(RegistryByteBuf buf);
    }
 
    /**
@@ -280,14 +280,15 @@
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_hrrcorkm$C_ttreinih;<init>(Lnet/minecraft/unmapped/C_bngyzsts;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/network/packet/s2c/play/BossBarUpdateS2CPacket$AddAction;<init>(Lnet/minecraft/network/RegistryByteBuf;)V}
        */
-      private AddAction(RegistryByteBuf arg) {
-         this.name = TextCodecs.f_byaedzcu.decode(arg);
-         this.percent = arg.readFloat();
-         this.color = arg.readEnumConstant(BossBar.Color.class);
-         this.style = arg.readEnumConstant(BossBar.Style.class);
-         int i = arg.readUnsignedByte();
+      private AddAction(RegistryByteBuf buf) {
+         this.name = TextCodecs.REGISTRY_TEXT_CODEC.decode(buf);
+         this.percent = buf.readFloat();
+         this.color = buf.readEnumConstant(BossBar.Color.class);
+         this.style = buf.readEnumConstant(BossBar.Style.class);
+         int i = buf.readUnsignedByte();
          this.darkenSky = (i & 1) > 0;
          this.dragonMusic = (i & 2) > 0;
          this.thickenFog = (i & 4) > 0;
@@ -313,12 +314,12 @@
        * Mapping not found
        */
       @Override
-      public void toPacket(RegistryByteBuf arg) {
-         TextCodecs.f_byaedzcu.encode(arg, this.name);
-         arg.writeFloat(this.percent);
-         arg.writeEnumConstant(this.color);
-         arg.writeEnumConstant(this.style);
-         arg.writeByte(BossBarUpdateS2CPacket.maskProperties(this.darkenSky, this.dragonMusic, this.thickenFog));
+      public void toPacket(RegistryByteBuf buf) {
+         TextCodecs.REGISTRY_TEXT_CODEC.encode(buf, this.name);
+         buf.writeFloat(this.percent);
+         buf.writeEnumConstant(this.color);
+         buf.writeEnumConstant(this.style);
+         buf.writeByte(BossBarUpdateS2CPacket.maskProperties(this.darkenSky, this.dragonMusic, this.thickenFog));
       }
    }
 
@@ -429,10 +430,11 @@
     */
    static record UpdateNameAction(Text name) implements BossBarUpdateS2CPacket.Action {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_hrrcorkm$C_aeysdcul;<init>(Lnet/minecraft/unmapped/C_bngyzsts;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/network/packet/s2c/play/BossBarUpdateS2CPacket$UpdateNameAction;<init>(Lnet/minecraft/network/RegistryByteBuf;)V}
        */
-      private UpdateNameAction(RegistryByteBuf arg) {
-         this(TextCodecs.f_byaedzcu.decode(arg));
+      private UpdateNameAction(RegistryByteBuf buf) {
+         this(TextCodecs.REGISTRY_TEXT_CODEC.decode(buf));
       }
 
       /**
@@ -455,8 +457,8 @@
        * Mapping not found
        */
       @Override
-      public void toPacket(RegistryByteBuf arg) {
-         TextCodecs.f_byaedzcu.encode(arg, this.name);
+      public void toPacket(RegistryByteBuf buf) {
+         TextCodecs.REGISTRY_TEXT_CODEC.encode(buf, this.name);
       }
    }
 
@@ -466,10 +468,11 @@
     */
    static record UpdateProgressAction(float percent) implements BossBarUpdateS2CPacket.Action {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_hrrcorkm$C_lipnrhbz;<init>(Lnet/minecraft/unmapped/C_bngyzsts;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/network/packet/s2c/play/BossBarUpdateS2CPacket$UpdateProgressAction;<init>(Lnet/minecraft/network/RegistryByteBuf;)V}
        */
-      private UpdateProgressAction(RegistryByteBuf arg) {
-         this(arg.readFloat());
+      private UpdateProgressAction(RegistryByteBuf buf) {
+         this(buf.readFloat());
       }
 
       /**
@@ -492,8 +495,8 @@
        * Mapping not found
        */
       @Override
-      public void toPacket(RegistryByteBuf arg) {
-         arg.writeFloat(this.percent);
+      public void toPacket(RegistryByteBuf buf) {
+         buf.writeFloat(this.percent);
       }
 
       /**
@@ -537,10 +540,11 @@
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_hrrcorkm$C_iicixhaw;<init>(Lnet/minecraft/unmapped/C_bngyzsts;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/network/packet/s2c/play/BossBarUpdateS2CPacket$UpdatePropertiesAction;<init>(Lnet/minecraft/network/RegistryByteBuf;)V}
        */
-      private UpdatePropertiesAction(RegistryByteBuf arg) {
-         int i = arg.readUnsignedByte();
+      private UpdatePropertiesAction(RegistryByteBuf buf) {
+         int i = buf.readUnsignedByte();
          this.darkenSky = (i & 1) > 0;
          this.dragonMusic = (i & 2) > 0;
          this.thickenFog = (i & 4) > 0;
@@ -566,8 +570,8 @@
        * Mapping not found
        */
       @Override
-      public void toPacket(RegistryByteBuf arg) {
-         arg.writeByte(BossBarUpdateS2CPacket.maskProperties(this.darkenSky, this.dragonMusic, this.thickenFog));
+      public void toPacket(RegistryByteBuf buf) {
+         buf.writeByte(BossBarUpdateS2CPacket.maskProperties(this.darkenSky, this.dragonMusic, this.thickenFog));
       }
    }
 
@@ -597,11 +601,12 @@
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_hrrcorkm$C_kaedlsss;<init>(Lnet/minecraft/unmapped/C_bngyzsts;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/network/packet/s2c/play/BossBarUpdateS2CPacket$UpdateStyleAction;<init>(Lnet/minecraft/network/RegistryByteBuf;)V}
        */
-      private UpdateStyleAction(RegistryByteBuf arg) {
-         this.color = arg.readEnumConstant(BossBar.Color.class);
-         this.style = arg.readEnumConstant(BossBar.Style.class);
+      private UpdateStyleAction(RegistryByteBuf buf) {
+         this.color = buf.readEnumConstant(BossBar.Color.class);
+         this.style = buf.readEnumConstant(BossBar.Style.class);
       }
 
       /**
@@ -624,9 +629,9 @@
        * Mapping not found
        */
       @Override
-      public void toPacket(RegistryByteBuf arg) {
-         arg.writeEnumConstant(this.color);
-         arg.writeEnumConstant(this.style);
+      public void toPacket(RegistryByteBuf buf) {
+         buf.writeEnumConstant(this.color);
+         buf.writeEnumConstant(this.style);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.java	2024-02-17 04:15:30.141688132 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.java	2024-02-17 04:14:10.358038996 +0000
@@ -45,7 +45,7 @@
          buf.readVarInt(),
          buf.m_fjolbvuh(MessageSignature::read),
          new MessageBody.Serialized(buf),
-         PacketByteBuf.m_mdkhzffo(buf, TextCodecs.f_byaedzcu),
+         PacketByteBuf.m_mdkhzffo(buf, TextCodecs.REGISTRY_TEXT_CODEC),
          FilterMask.create(buf),
          MessageType.Parameters.CODEC.decode(buf)
       );
@@ -60,7 +60,7 @@
       buf.writeVarInt(this.index);
       buf.m_zcmiuaxl(this.signature, MessageSignature::write);
       this.body.write(buf);
-      PacketByteBuf.m_omssfaex(buf, this.unsignedContent, TextCodecs.f_byaedzcu);
+      PacketByteBuf.m_omssfaex(buf, this.unsignedContent, TextCodecs.REGISTRY_TEXT_CODEC);
       FilterMask.write(buf, this.filterMask);
       MessageType.Parameters.CODEC.encode(buf, this.messageType);
    }
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/CommandSuggestionsUpdateS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/CommandSuggestionsUpdateS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/CommandSuggestionsUpdateS2CPacket.java	2024-02-17 04:15:30.325687433 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/CommandSuggestionsUpdateS2CPacket.java	2024-02-17 04:14:10.594037953 +0000
@@ -3,7 +3,6 @@
 import com.mojang.brigadier.Message;
 import com.mojang.brigadier.context.StringRange;
 import com.mojang.brigadier.suggestion.Suggestion;
-import com.mojang.brigadier.suggestion.Suggestions;
 import java.util.List;
 import java.util.Optional;
 import net.minecraft.network.RegistryByteBuf;
@@ -21,7 +20,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_lwlmssje}
  * @mapping {@literal named net/minecraft/network/packet/s2c/play/CommandSuggestionsUpdateS2CPacket}
  */
-public record CommandSuggestionsUpdateS2CPacket(int completionId, int start, int length, List<CommandSuggestionsUpdateS2CPacket.C_qvxpqcwj> suggestions)
+public record CommandSuggestionsUpdateS2CPacket(int completionId, int start, int length, List<CommandSuggestionsUpdateS2CPacket.Suggestions> suggestions)
    implements Packet<ClientPlayPacketListener> {
    /**
     * @mapping {@literal hashed f_xxntxtxl Lnet/minecraft/unmapped/C_lwlmssje;f_xxntxtxl:Lnet/minecraft/unmapped/C_qsrmwluu;}
@@ -29,12 +28,12 @@
     */
    public static final PacketCodec<RegistryByteBuf, CommandSuggestionsUpdateS2CPacket> CODEC = PacketCodec.m_ouxffrgo(
       PacketCodecs.VAR_INT,
-      CommandSuggestionsUpdateS2CPacket::id,
+      CommandSuggestionsUpdateS2CPacket::getCompletionId,
       PacketCodecs.VAR_INT,
-      CommandSuggestionsUpdateS2CPacket::start,
+      CommandSuggestionsUpdateS2CPacket::getStart,
       PacketCodecs.VAR_INT,
       CommandSuggestionsUpdateS2CPacket::length,
-      CommandSuggestionsUpdateS2CPacket.C_qvxpqcwj.f_jrhfqohx.apply(PacketCodecs.m_bobeiocn()),
+      CommandSuggestionsUpdateS2CPacket.Suggestions.PACKET_CODEC.apply(PacketCodecs.m_bobeiocn()),
       CommandSuggestionsUpdateS2CPacket::suggestions,
       CommandSuggestionsUpdateS2CPacket::new
    );
@@ -43,7 +42,7 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_lwlmssje;<init>(ILcom/mojang/brigadier/suggestion/Suggestions;)V}
     * @mapping {@literal named <init> Lnet/minecraft/network/packet/s2c/play/CommandSuggestionsUpdateS2CPacket;<init>(ILcom/mojang/brigadier/suggestion/Suggestions;)V}
     */
-   public CommandSuggestionsUpdateS2CPacket(int completionId, Suggestions suggestions) {
+   public CommandSuggestionsUpdateS2CPacket(int completionId, com.mojang.brigadier.suggestion.Suggestions suggestions) {
       this(
          completionId,
          suggestions.getRange().getStart(),
@@ -51,7 +50,7 @@
          suggestions.getList()
             .stream()
             .map(
-               suggestion -> new CommandSuggestionsUpdateS2CPacket.C_qvxpqcwj(
+               suggestion -> new CommandSuggestionsUpdateS2CPacket.Suggestions(
                      suggestion.getText(), Optional.ofNullable(suggestion.getTooltip()).map(Texts::toText)
                   )
             )
@@ -76,37 +75,47 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ubcbgqsi Lnet/minecraft/unmapped/C_lwlmssje;m_ubcbgqsi()Lcom/mojang/brigadier/suggestion/Suggestions;}
+    * @mapping {@literal named getSuggestions Lnet/minecraft/network/packet/s2c/play/CommandSuggestionsUpdateS2CPacket;getSuggestions()Lcom/mojang/brigadier/suggestion/Suggestions;}
     */
-   public Suggestions m_ubcbgqsi() {
+   public com.mojang.brigadier.suggestion.Suggestions getSuggestions() {
       StringRange stringRange = StringRange.between(this.start, this.start + this.length);
-      return new Suggestions(
+      return new com.mojang.brigadier.suggestion.Suggestions(
          stringRange, this.suggestions.stream().map(arg -> new Suggestion(stringRange, arg.text(), (Message)arg.tooltip().orElse(null))).toList()
       );
    }
 
    /**
     * @mapping {@literal hashed m_ilmhbyya Lnet/minecraft/unmapped/C_lwlmssje;m_ilmhbyya()I}
-    * @mapping {@literal named id Lnet/minecraft/network/packet/s2c/play/CommandSuggestionsUpdateS2CPacket;id()I}
+    * @mapping {@literal named getCompletionId Lnet/minecraft/network/packet/s2c/play/CommandSuggestionsUpdateS2CPacket;getCompletionId()I}
     */
-   public int id() {
+   public int getCompletionId() {
       return this.completionId;
    }
 
    /**
+    * @mapping {@literal hashed m_beqywmzd Lnet/minecraft/unmapped/C_lwlmssje;m_beqywmzd()I}
+    * @mapping {@literal named getStart Lnet/minecraft/network/packet/s2c/play/CommandSuggestionsUpdateS2CPacket;getStart()I}
+    */
+   public int getStart() {
+      return this.start;
+   }
+
+   /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_lwlmssje$C_qvxpqcwj}
-    * @mapping {@literal named net/minecraft/network/packet/s2c/play/CommandSuggestionsUpdateS2CPacket$C_qvxpqcwj}
+    * @mapping {@literal named net/minecraft/network/packet/s2c/play/CommandSuggestionsUpdateS2CPacket$Suggestions}
     */
-   public static record C_qvxpqcwj(String text, Optional<Text> tooltip) {
+   public static record Suggestions(String text, Optional<Text> tooltip) {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_jrhfqohx Lnet/minecraft/unmapped/C_lwlmssje$C_qvxpqcwj;f_jrhfqohx:Lnet/minecraft/unmapped/C_qsrmwluu;}
+       * @mapping {@literal named PACKET_CODEC Lnet/minecraft/network/packet/s2c/play/CommandSuggestionsUpdateS2CPacket$Suggestions;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
        */
-      public static final PacketCodec<RegistryByteBuf, CommandSuggestionsUpdateS2CPacket.C_qvxpqcwj> f_jrhfqohx = PacketCodec.create(
+      public static final PacketCodec<RegistryByteBuf, CommandSuggestionsUpdateS2CPacket.Suggestions> PACKET_CODEC = PacketCodec.create(
          PacketCodecs.STRING,
-         CommandSuggestionsUpdateS2CPacket.C_qvxpqcwj::text,
-         TextCodecs.f_vzatxplp,
-         CommandSuggestionsUpdateS2CPacket.C_qvxpqcwj::tooltip,
-         CommandSuggestionsUpdateS2CPacket.C_qvxpqcwj::new
+         CommandSuggestionsUpdateS2CPacket.Suggestions::text,
+         TextCodecs.REGISTRY_OPTIONAL_TEXT_CODEC,
+         CommandSuggestionsUpdateS2CPacket.Suggestions::tooltip,
+         CommandSuggestionsUpdateS2CPacket.Suggestions::new
       );
    }
 }
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo.java namedSrc/net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo.java	2024-02-17 04:15:30.233687783 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo.java	2024-02-17 04:14:10.478038466 +0000
@@ -33,7 +33,7 @@
     * @mapping {@literal hashed f_ymypgavv Lnet/minecraft/unmapped/C_zsjubkei;f_ymypgavv:Lnet/minecraft/unmapped/C_qsrmwluu;}
     * @mapping {@literal named CODEC Lnet/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo;CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   private static final PacketCodec<RegistryByteBuf, Holder<DimensionType>> CODEC = PacketCodecs.m_hbizjcsr(RegistryKeys.DIMENSION_TYPE);
+   private static final PacketCodec<RegistryByteBuf, Holder<DimensionType>> CODEC = PacketCodecs.registryEntry(RegistryKeys.DIMENSION_TYPE);
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_zsjubkei;<init>(Lnet/minecraft/unmapped/C_bngyzsts;)V}
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/CooldownUpdateS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/CooldownUpdateS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/CooldownUpdateS2CPacket.java	2024-02-17 04:15:30.309687494 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/CooldownUpdateS2CPacket.java	2024-02-17 04:14:10.582038006 +0000
@@ -20,7 +20,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/network/packet/s2c/play/CooldownUpdateS2CPacket;CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
    public static final PacketCodec<RegistryByteBuf, CooldownUpdateS2CPacket> CODEC = PacketCodec.create(
-      PacketCodecs.m_fhfovxvd(RegistryKeys.ITEM),
+      PacketCodecs.registryValue(RegistryKeys.ITEM),
       CooldownUpdateS2CPacket::item,
       PacketCodecs.VAR_INT,
       CooldownUpdateS2CPacket::duration,
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/DamageEventS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/DamageEventS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/DamageEventS2CPacket.java	2024-02-17 04:15:30.229687798 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/DamageEventS2CPacket.java	2024-02-17 04:14:10.474038483 +0000
@@ -32,7 +32,7 @@
     * @mapping {@literal hashed f_bnqijobb Lnet/minecraft/unmapped/C_jpgyajxg;f_bnqijobb:Lnet/minecraft/unmapped/C_qsrmwluu;}
     * @mapping {@literal named DAMAGE_TYPE_CODEC Lnet/minecraft/network/packet/s2c/play/DamageEventS2CPacket;DAMAGE_TYPE_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   private static final PacketCodec<RegistryByteBuf, Holder<DamageType>> DAMAGE_TYPE_CODEC = PacketCodecs.m_hbizjcsr(RegistryKeys.DAMAGE_TYPE);
+   private static final PacketCodec<RegistryByteBuf, Holder<DamageType>> DAMAGE_TYPE_CODEC = PacketCodecs.registryEntry(RegistryKeys.DAMAGE_TYPE);
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_jpgyajxg;<init>(Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;)V}
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/data/ChunkData.java namedSrc/net/minecraft/network/packet/s2c/play/data/ChunkData.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/data/ChunkData.java	2024-02-17 04:15:30.277687615 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/data/ChunkData.java	2024-02-17 04:14:10.534038218 +0000
@@ -75,7 +75,7 @@
     * @mapping {@literal named <init> Lnet/minecraft/network/packet/s2c/play/data/ChunkData;<init>(Lnet/minecraft/network/RegistryByteBuf;II)V}
     */
    public ChunkData(RegistryByteBuf buf, int x, int z) {
-      this.nbt = buf.readNbt();
+      this.nbt = buf.readNbtCompound();
       if (this.nbt == null) {
          throw new RuntimeException("Can't read heightmap in packet for [" + x + ", " + z + "]");
       } else {
@@ -233,8 +233,8 @@
       private BlockEntityData(RegistryByteBuf buf) {
          this.horizontalLocalCoordinates = buf.readByte();
          this.y = buf.readShort();
-         this.blockEntityType = PacketCodecs.m_fhfovxvd(RegistryKeys.BLOCK_ENTITY_TYPE).decode(buf);
-         this.nbt = buf.readNbt();
+         this.blockEntityType = PacketCodecs.registryValue(RegistryKeys.BLOCK_ENTITY_TYPE).decode(buf);
+         this.nbt = buf.readNbtCompound();
       }
 
       /**
@@ -244,7 +244,7 @@
       private void write(RegistryByteBuf buf) {
          buf.writeByte(this.horizontalLocalCoordinates);
          buf.writeShort(this.y);
-         PacketCodecs.m_fhfovxvd(RegistryKeys.BLOCK_ENTITY_TYPE).encode(buf, this.blockEntityType);
+         PacketCodecs.registryValue(RegistryKeys.BLOCK_ENTITY_TYPE).encode(buf, this.blockEntityType);
          buf.writeNbt(this.nbt);
       }
 
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.java	2024-02-17 04:15:30.393687174 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.java	2024-02-17 04:14:10.654037687 +0000
@@ -20,7 +20,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/network/packet/s2c/play/DeathMessageS2CPacket;CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
    public static final PacketCodec<RegistryByteBuf, DeathMessageS2CPacket> CODEC = PacketCodec.create(
-      PacketCodecs.VAR_INT, DeathMessageS2CPacket::playerId, TextCodecs.f_byaedzcu, DeathMessageS2CPacket::message, DeathMessageS2CPacket::new
+      PacketCodecs.VAR_INT, DeathMessageS2CPacket::playerId, TextCodecs.REGISTRY_TEXT_CODEC, DeathMessageS2CPacket::message, DeathMessageS2CPacket::new
    );
 
    /**
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/EntityAttributesUpdateS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/EntityAttributesUpdateS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/EntityAttributesUpdateS2CPacket.java	2024-02-17 04:15:30.213687859 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/EntityAttributesUpdateS2CPacket.java	2024-02-17 04:14:10.450038589 +0000
@@ -123,7 +123,7 @@
        * @mapping {@literal named PACKET_CODEC Lnet/minecraft/network/packet/s2c/play/EntityAttributesUpdateS2CPacket$Entry;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
        */
       public static final PacketCodec<RegistryByteBuf, EntityAttributesUpdateS2CPacket.Entry> PACKET_CODEC = PacketCodec.m_kqzabmpi(
-         PacketCodecs.m_hbizjcsr(RegistryKeys.ENTITY_ATTRIBUTE),
+         PacketCodecs.registryEntry(RegistryKeys.ENTITY_ATTRIBUTE),
          EntityAttributesUpdateS2CPacket.Entry::attribute,
          PacketCodecs.DOUBLE,
          EntityAttributesUpdateS2CPacket.Entry::base,
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket.java	2024-02-17 04:15:30.177687996 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket.java	2024-02-17 04:14:10.410038766 +0000
@@ -62,7 +62,7 @@
       do {
          i = buf.readByte();
          EquipmentSlot lv = lvs[i & 127];
-         ItemStack lv2 = ItemStack.f_bnghiwgu.decode(buf);
+         ItemStack lv2 = ItemStack.PACKET_CODEC.decode(buf);
          this.equipmentList.add(Pair.of(lv, lv2));
       } while ((i & -128) != 0);
    }
@@ -81,7 +81,7 @@
          boolean bl = j != i - 1;
          int k = lv.ordinal();
          buf.writeByte(bl ? k | -128 : k);
-         ItemStack.f_bnghiwgu.encode(buf, pair.getSecond());
+         ItemStack.PACKET_CODEC.encode(buf, pair.getSecond());
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.java	2024-02-17 04:15:30.305687509 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.java	2024-02-17 04:14:10.578038023 +0000
@@ -181,7 +181,7 @@
    private EntitySpawnS2CPacket(RegistryByteBuf buf) {
       this.id = buf.readVarInt();
       this.uuid = buf.readUuid();
-      this.entityTypeId = PacketCodecs.m_fhfovxvd(RegistryKeys.ENTITY_TYPE).decode(buf);
+      this.entityTypeId = PacketCodecs.registryValue(RegistryKeys.ENTITY_TYPE).decode(buf);
       this.x = buf.readDouble();
       this.y = buf.readDouble();
       this.z = buf.readDouble();
@@ -201,7 +201,7 @@
    private void write(RegistryByteBuf buf) {
       buf.writeVarInt(this.id);
       buf.writeUuid(this.uuid);
-      PacketCodecs.m_fhfovxvd(RegistryKeys.ENTITY_TYPE).encode(buf, this.entityTypeId);
+      PacketCodecs.registryValue(RegistryKeys.ENTITY_TYPE).encode(buf, this.entityTypeId);
       buf.writeDouble(this.x);
       buf.writeDouble(this.y);
       buf.writeDouble(this.z);
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/EntityStatusEffectRemovalS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/EntityStatusEffectRemovalS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/EntityStatusEffectRemovalS2CPacket.java	2024-02-17 04:15:30.397687160 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/EntityStatusEffectRemovalS2CPacket.java	2024-02-17 04:14:10.658037670 +0000
@@ -26,7 +26,7 @@
    public static final PacketCodec<RegistryByteBuf, EntityStatusEffectRemovalS2CPacket> CODEC = PacketCodec.create(
       PacketCodecs.VAR_INT,
       arg -> arg.entityId,
-      PacketCodecs.m_hbizjcsr(RegistryKeys.STATUS_EFFECT),
+      PacketCodecs.registryEntry(RegistryKeys.STATUS_EFFECT),
       EntityStatusEffectRemovalS2CPacket::effect,
       EntityStatusEffectRemovalS2CPacket::new
    );
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/EntityStatusEffectUpdateS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/EntityStatusEffectUpdateS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/EntityStatusEffectUpdateS2CPacket.java	2024-02-17 04:15:30.437687007 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/EntityStatusEffectUpdateS2CPacket.java	2024-02-17 04:14:10.690037528 +0000
@@ -105,7 +105,7 @@
     */
    private EntityStatusEffectUpdateS2CPacket(RegistryByteBuf buf) {
       this.entityId = buf.readVarInt();
-      this.effect = PacketCodecs.m_hbizjcsr(RegistryKeys.STATUS_EFFECT).decode(buf);
+      this.effect = PacketCodecs.registryEntry(RegistryKeys.STATUS_EFFECT).decode(buf);
       this.amplifier = buf.readVarInt();
       this.duration = buf.readVarInt();
       this.flags = buf.readByte();
@@ -117,7 +117,7 @@
     */
    private void write(RegistryByteBuf buf) {
       buf.writeVarInt(this.entityId);
-      PacketCodecs.m_hbizjcsr(RegistryKeys.STATUS_EFFECT).encode(buf, this.effect);
+      PacketCodecs.registryEntry(RegistryKeys.STATUS_EFFECT).encode(buf, this.effect);
       buf.writeVarInt(this.amplifier);
       buf.writeVarInt(this.duration);
       buf.writeByte(this.flags);
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/InventoryUpdateS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/InventoryUpdateS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/InventoryUpdateS2CPacket.java	2024-02-17 04:15:30.201687905 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/InventoryUpdateS2CPacket.java	2024-02-17 04:14:10.438038642 +0000
@@ -72,7 +72,7 @@
       this.syncId = buf.readUnsignedByte();
       this.revision = buf.readVarInt();
       this.contents = ItemStack.f_hnyuumqo.decode(buf);
-      this.cursorStack = ItemStack.f_bnghiwgu.decode(buf);
+      this.cursorStack = ItemStack.PACKET_CODEC.decode(buf);
    }
 
    /**
@@ -83,7 +83,7 @@
       buf.writeByte(this.syncId);
       buf.writeVarInt(this.revision);
       ItemStack.f_hnyuumqo.encode(buf, this.contents);
-      ItemStack.f_bnghiwgu.encode(buf, this.cursorStack);
+      ItemStack.PACKET_CODEC.encode(buf, this.cursorStack);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.java	2024-02-17 04:15:30.345687357 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.java	2024-02-17 04:14:10.614037864 +0000
@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.Optional;
 import net.minecraft.item.map.MapIcon;
+import net.minecraft.item.map.MapId;
 import net.minecraft.item.map.MapState;
 import net.minecraft.network.RegistryByteBuf;
 import net.minecraft.network.codec.PacketCodec;
@@ -12,39 +13,38 @@
 import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.PacketType;
 import net.minecraft.network.packet.PlayPacketTypes;
-import net.minecraft.unmapped.C_qqxyyzzm;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_ymykrtki}
  * @mapping {@literal named net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket}
  */
-public record MapUpdateS2CPacket(C_qqxyyzzm id, byte scale, boolean locked, Optional<List<MapIcon>> icons, Optional<MapState.UpdateData> updateData)
+public record MapUpdateS2CPacket(MapId id, byte scale, boolean locked, Optional<List<MapIcon>> icons, Optional<MapState.UpdateData> updateData)
    implements Packet<ClientPlayPacketListener> {
    /**
     * @mapping {@literal hashed f_ggaxflwy Lnet/minecraft/unmapped/C_ymykrtki;f_ggaxflwy:Lnet/minecraft/unmapped/C_qsrmwluu;}
     * @mapping {@literal named CODEC Lnet/minecraft/network/packet/s2c/play/MapUpdateS2CPacket;CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
    public static final PacketCodec<RegistryByteBuf, MapUpdateS2CPacket> CODEC = PacketCodec.m_whbpgkrx(
-      C_qqxyyzzm.f_qwhcskfq,
-      MapUpdateS2CPacket::mapId,
+      MapId.PACKET_CODEC,
+      MapUpdateS2CPacket::id,
       PacketCodecs.BYTE,
       MapUpdateS2CPacket::scale,
       PacketCodecs.BOOL,
       MapUpdateS2CPacket::locked,
-      MapIcon.f_xprnzxvn.apply(PacketCodecs.m_bobeiocn()).apply(PacketCodecs::m_ciouqnhu),
-      MapUpdateS2CPacket::decorations,
-      MapState.UpdateData.f_nkoevnxw,
-      MapUpdateS2CPacket::colorPatch,
+      MapIcon.PACKET_CODEC.apply(PacketCodecs.m_bobeiocn()).apply(PacketCodecs::m_ciouqnhu),
+      MapUpdateS2CPacket::icons,
+      MapState.UpdateData.PACKET_CODEC,
+      MapUpdateS2CPacket::updateData,
       MapUpdateS2CPacket::new
    );
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ymykrtki;<init>(Lnet/minecraft/unmapped/C_qqxyyzzm;BZLjava/util/Collection;Lnet/minecraft/unmapped/C_nvpllgmg$C_yvxjvbon;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/network/packet/s2c/play/MapUpdateS2CPacket;<init>(Lnet/minecraft/unmapped/C_qqxyyzzm;BZLjava/util/Collection;Lnet/minecraft/item/map/MapState$UpdateData;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/network/packet/s2c/play/MapUpdateS2CPacket;<init>(Lnet/minecraft/item/map/MapId;BZLjava/util/Collection;Lnet/minecraft/item/map/MapState$UpdateData;)V}
     */
-   public MapUpdateS2CPacket(C_qqxyyzzm arg, byte b, boolean bl, @Nullable Collection<MapIcon> coll, @Nullable MapState.UpdateData arg2) {
-      this(arg, b, bl, coll != null ? Optional.of(List.copyOf(coll)) : Optional.empty(), Optional.ofNullable(arg2));
+   public MapUpdateS2CPacket(MapId mapId, byte scale, boolean locked, @Nullable Collection<MapIcon> mapIcons, @Nullable MapState.UpdateData updateData) {
+      this(mapId, scale, locked, mapIcons != null ? Optional.of(List.copyOf(mapIcons)) : Optional.empty(), Optional.ofNullable(updateData));
    }
 
    /**
@@ -71,28 +71,4 @@
       this.icons.ifPresent(mapState::replaceIcons);
       this.updateData.ifPresent(arg2 -> arg2.setColorsTo(mapState));
    }
-
-   /**
-    * @mapping {@literal hashed m_qkmrctue Lnet/minecraft/unmapped/C_ymykrtki;m_qkmrctue()Lnet/minecraft/unmapped/C_qqxyyzzm;}
-    * @mapping {@literal named mapId Lnet/minecraft/network/packet/s2c/play/MapUpdateS2CPacket;mapId()Lnet/minecraft/unmapped/C_qqxyyzzm;}
-    */
-   public C_qqxyyzzm mapId() {
-      return this.id;
-   }
-
-   /**
-    * @mapping {@literal hashed m_sdbdlhqr Lnet/minecraft/unmapped/C_ymykrtki;m_sdbdlhqr()Ljava/util/Optional;}
-    * @mapping {@literal named decorations Lnet/minecraft/network/packet/s2c/play/MapUpdateS2CPacket;decorations()Ljava/util/Optional;}
-    */
-   public Optional<List<MapIcon>> decorations() {
-      return this.icons;
-   }
-
-   /**
-    * @mapping {@literal hashed m_kmdgapjf Lnet/minecraft/unmapped/C_ymykrtki;m_kmdgapjf()Ljava/util/Optional;}
-    * @mapping {@literal named colorPatch Lnet/minecraft/network/packet/s2c/play/MapUpdateS2CPacket;colorPatch()Ljava/util/Optional;}
-    */
-   public Optional<MapState.UpdateData> colorPatch() {
-      return this.updateData;
-   }
 }
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/NbtQueryResponseS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/NbtQueryResponseS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/NbtQueryResponseS2CPacket.java	2024-02-17 04:15:30.269687646 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/NbtQueryResponseS2CPacket.java	2024-02-17 04:14:10.522038271 +0000
@@ -48,7 +48,7 @@
     */
    private NbtQueryResponseS2CPacket(PacketByteBuf buf) {
       this.transactionId = buf.readVarInt();
-      this.nbt = buf.readNbt();
+      this.nbt = buf.readNbtCompound();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.java	2024-02-17 04:15:30.437687007 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.java	2024-02-17 04:14:10.690037528 +0000
@@ -19,7 +19,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket;CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
    public static final PacketCodec<RegistryByteBuf, OverlayMessageS2CPacket> CODEC = PacketCodec.create(
-      TextCodecs.f_byaedzcu, OverlayMessageS2CPacket::text, OverlayMessageS2CPacket::new
+      TextCodecs.REGISTRY_TEXT_CODEC, OverlayMessageS2CPacket::text, OverlayMessageS2CPacket::new
    );
 
    /**
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/PlayerListHeaderUpdateS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/PlayerListHeaderUpdateS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/PlayerListHeaderUpdateS2CPacket.java	2024-02-17 04:15:30.341687373 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/PlayerListHeaderUpdateS2CPacket.java	2024-02-17 04:14:10.610037881 +0000
@@ -19,9 +19,9 @@
     * @mapping {@literal named CODEC Lnet/minecraft/network/packet/s2c/play/PlayerListHeaderUpdateS2CPacket;CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
    public static final PacketCodec<RegistryByteBuf, PlayerListHeaderUpdateS2CPacket> CODEC = PacketCodec.create(
-      TextCodecs.f_byaedzcu,
+      TextCodecs.REGISTRY_TEXT_CODEC,
       PlayerListHeaderUpdateS2CPacket::header,
-      TextCodecs.f_byaedzcu,
+      TextCodecs.REGISTRY_TEXT_CODEC,
       PlayerListHeaderUpdateS2CPacket::footer,
       PlayerListHeaderUpdateS2CPacket::new
    );
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.java	2024-02-17 04:15:30.333687402 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.java	2024-02-17 04:14:10.598037934 +0000
@@ -201,8 +201,8 @@
        * @mapping {@literal named UPDATE_DISPLAY_NAME Lnet/minecraft/network/packet/s2c/play/PlayerListS2CPacket$Action;UPDATE_DISPLAY_NAME:Lnet/minecraft/network/packet/s2c/play/PlayerListS2CPacket$Action;}
        */
       UPDATE_DISPLAY_NAME(
-         (builder, arg2) -> builder.displayName = PacketByteBuf.m_mdkhzffo(arg2, TextCodecs.f_byaedzcu),
-         (arg, entry) -> PacketByteBuf.m_omssfaex(arg, entry.displayName(), TextCodecs.f_byaedzcu)
+         (builder, arg2) -> builder.displayName = PacketByteBuf.m_mdkhzffo(arg2, TextCodecs.REGISTRY_TEXT_CODEC),
+         (arg, entry) -> PacketByteBuf.m_omssfaex(arg, entry.displayName(), TextCodecs.REGISTRY_TEXT_CODEC)
       );
 
       /**
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/ProfileIndependentMessageS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/ProfileIndependentMessageS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/ProfileIndependentMessageS2CPacket.java	2024-02-17 04:15:30.437687007 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/ProfileIndependentMessageS2CPacket.java	2024-02-17 04:14:10.690037528 +0000
@@ -20,7 +20,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/network/packet/s2c/play/ProfileIndependentMessageS2CPacket;CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
    public static final PacketCodec<RegistryByteBuf, ProfileIndependentMessageS2CPacket> CODEC = PacketCodec.create(
-      TextCodecs.f_byaedzcu,
+      TextCodecs.REGISTRY_TEXT_CODEC,
       ProfileIndependentMessageS2CPacket::message,
       MessageType.Parameters.CODEC,
       ProfileIndependentMessageS2CPacket::messageType,
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/ScoreboardDisplayS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/ScoreboardDisplayS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/ScoreboardDisplayS2CPacket.java	2024-02-17 04:15:30.293687555 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/ScoreboardDisplayS2CPacket.java	2024-02-17 04:14:10.558038112 +0000
@@ -52,7 +52,7 @@
     * @mapping {@literal named <init> Lnet/minecraft/network/packet/s2c/play/ScoreboardDisplayS2CPacket;<init>(Lnet/minecraft/network/PacketByteBuf;)V}
     */
    private ScoreboardDisplayS2CPacket(PacketByteBuf buf) {
-      this.slot = buf.m_htwizfmu(ScoreboardDisplaySlot.BY_ID);
+      this.slot = buf.readVarInt(ScoreboardDisplaySlot.BY_ID);
       this.name = buf.readString();
    }
 
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/ScoreboardObjectiveUpdateS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/ScoreboardObjectiveUpdateS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/ScoreboardObjectiveUpdateS2CPacket.java	2024-02-17 04:15:30.161688057 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/ScoreboardObjectiveUpdateS2CPacket.java	2024-02-17 04:14:10.386038872 +0000
@@ -92,7 +92,7 @@
          this.type = ScoreboardCriterion.RenderType.INTEGER;
          this.formatOverride = Optional.empty();
       } else {
-         this.displayName = TextCodecs.f_byaedzcu.decode(buf);
+         this.displayName = TextCodecs.REGISTRY_TEXT_CODEC.decode(buf);
          this.type = buf.readEnumConstant(ScoreboardCriterion.RenderType.class);
          this.formatOverride = NumberFormatTypes.f_imdypwdd.decode(buf);
       }
@@ -106,7 +106,7 @@
       buf.writeString(this.name);
       buf.writeByte(this.mode);
       if (this.mode == 0 || this.mode == 2) {
-         TextCodecs.f_byaedzcu.encode(buf, this.displayName);
+         TextCodecs.REGISTRY_TEXT_CODEC.encode(buf, this.displayName);
          buf.writeEnumConstant(this.type);
          NumberFormatTypes.f_imdypwdd.encode(buf, this.formatOverride);
       }
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/ScoreboardPlayerUpdateS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/ScoreboardPlayerUpdateS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/ScoreboardPlayerUpdateS2CPacket.java	2024-02-17 04:15:30.309687494 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/ScoreboardPlayerUpdateS2CPacket.java	2024-02-17 04:14:10.582038006 +0000
@@ -31,7 +31,7 @@
       ScoreboardPlayerUpdateS2CPacket::objectiveName,
       PacketCodecs.VAR_INT,
       ScoreboardPlayerUpdateS2CPacket::score,
-      TextCodecs.f_vzatxplp,
+      TextCodecs.REGISTRY_OPTIONAL_TEXT_CODEC,
       ScoreboardPlayerUpdateS2CPacket::display,
       NumberFormatTypes.f_imdypwdd,
       ScoreboardPlayerUpdateS2CPacket::numberFormat,
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.java	2024-02-17 04:15:30.185687965 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.java	2024-02-17 04:14:10.414038748 +0000
@@ -70,7 +70,7 @@
       this.syncId = buf.readByte();
       this.revision = buf.readVarInt();
       this.slot = buf.readShort();
-      this.stack = ItemStack.f_bnghiwgu.decode(buf);
+      this.stack = ItemStack.PACKET_CODEC.decode(buf);
    }
 
    /**
@@ -81,7 +81,7 @@
       buf.writeByte(this.syncId);
       buf.writeVarInt(this.revision);
       buf.writeShort(this.slot);
-      ItemStack.f_bnghiwgu.encode(buf, this.stack);
+      ItemStack.PACKET_CODEC.encode(buf, this.stack);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/ScreenOpenS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/ScreenOpenS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/ScreenOpenS2CPacket.java	2024-02-17 04:15:30.389687189 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/ScreenOpenS2CPacket.java	2024-02-17 04:14:10.650037704 +0000
@@ -24,9 +24,9 @@
    public static final PacketCodec<RegistryByteBuf, ScreenOpenS2CPacket> CODEC = PacketCodec.m_kqzabmpi(
       PacketCodecs.VAR_INT,
       ScreenOpenS2CPacket::getSyncId,
-      PacketCodecs.m_fhfovxvd(RegistryKeys.SCREEN_HANDLER_TYPE),
+      PacketCodecs.registryValue(RegistryKeys.SCREEN_HANDLER_TYPE),
       ScreenOpenS2CPacket::getScreenHandlerType,
-      TextCodecs.f_byaedzcu,
+      TextCodecs.REGISTRY_TEXT_CODEC,
       ScreenOpenS2CPacket::getName,
       ScreenOpenS2CPacket::new
    );
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.java	2024-02-17 04:15:30.385687205 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.java	2024-02-17 04:14:10.650037704 +0000
@@ -21,7 +21,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket;CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
    public static final PacketCodec<ByteBuf, ServerMetadataS2CPacket> CODEC = PacketCodec.create(
-      TextCodecs.f_opceizjo,
+      TextCodecs.BUFFER_TEXT_CODEC,
       ServerMetadataS2CPacket::motd,
       PacketCodecs.f_ggqudulf.apply(PacketCodecs::m_ciouqnhu),
       ServerMetadataS2CPacket::iconBytes,
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.java	2024-02-17 04:15:30.345687357 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.java	2024-02-17 04:14:10.614037864 +0000
@@ -19,7 +19,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/network/packet/s2c/play/SubtitleS2CPacket;CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
    public static final PacketCodec<RegistryByteBuf, SubtitleS2CPacket> CODEC = PacketCodec.create(
-      TextCodecs.f_byaedzcu, SubtitleS2CPacket::text, SubtitleS2CPacket::new
+      TextCodecs.REGISTRY_TEXT_CODEC, SubtitleS2CPacket::text, SubtitleS2CPacket::new
    );
 
    /**
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/SystemMessageS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/SystemMessageS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/SystemMessageS2CPacket.java	2024-02-17 04:15:30.153688087 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/SystemMessageS2CPacket.java	2024-02-17 04:14:10.374038925 +0000
@@ -20,7 +20,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/network/packet/s2c/play/SystemMessageS2CPacket;CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
    public static final PacketCodec<RegistryByteBuf, SystemMessageS2CPacket> CODEC = PacketCodec.create(
-      TextCodecs.f_byaedzcu, SystemMessageS2CPacket::content, PacketCodecs.BOOL, SystemMessageS2CPacket::overlay, SystemMessageS2CPacket::new
+      TextCodecs.REGISTRY_TEXT_CODEC, SystemMessageS2CPacket::content, PacketCodecs.BOOL, SystemMessageS2CPacket::overlay, SystemMessageS2CPacket::new
    );
 
    /**
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/TeamUpdateS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/TeamUpdateS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/TeamUpdateS2CPacket.java	2024-02-17 04:15:30.301687525 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/TeamUpdateS2CPacket.java	2024-02-17 04:14:10.570038059 +0000
@@ -339,13 +339,13 @@
        * Mapping not found
        */
       public SerializableTeam(RegistryByteBuf arg) {
-         this.displayName = TextCodecs.f_byaedzcu.decode(arg);
+         this.displayName = TextCodecs.REGISTRY_TEXT_CODEC.decode(arg);
          this.friendlyFlags = arg.readByte();
          this.nameTagVisibilityRule = arg.readString(40);
          this.collisionRule = arg.readString(40);
          this.color = arg.readEnumConstant(Formatting.class);
-         this.prefix = TextCodecs.f_byaedzcu.decode(arg);
-         this.suffix = TextCodecs.f_byaedzcu.decode(arg);
+         this.prefix = TextCodecs.REGISTRY_TEXT_CODEC.decode(arg);
+         this.suffix = TextCodecs.REGISTRY_TEXT_CODEC.decode(arg);
       }
 
       /**
@@ -409,13 +409,13 @@
        * @mapping {@literal named write Lnet/minecraft/network/packet/s2c/play/TeamUpdateS2CPacket$SerializableTeam;write(Lnet/minecraft/network/RegistryByteBuf;)V}
        */
       public void write(RegistryByteBuf arg) {
-         TextCodecs.f_byaedzcu.encode(arg, this.displayName);
+         TextCodecs.REGISTRY_TEXT_CODEC.encode(arg, this.displayName);
          arg.writeByte(this.friendlyFlags);
          arg.writeString(this.nameTagVisibilityRule);
          arg.writeString(this.collisionRule);
          arg.writeEnumConstant(this.color);
-         TextCodecs.f_byaedzcu.encode(arg, this.prefix);
-         TextCodecs.f_byaedzcu.encode(arg, this.suffix);
+         TextCodecs.REGISTRY_TEXT_CODEC.encode(arg, this.prefix);
+         TextCodecs.REGISTRY_TEXT_CODEC.encode(arg, this.suffix);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/TitleS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/TitleS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/TitleS2CPacket.java	2024-02-17 04:15:30.425687053 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/TitleS2CPacket.java	2024-02-17 04:14:10.682037563 +0000
@@ -18,7 +18,9 @@
     * @mapping {@literal hashed f_rntmuuic Lnet/minecraft/unmapped/C_wztuyhgf;f_rntmuuic:Lnet/minecraft/unmapped/C_qsrmwluu;}
     * @mapping {@literal named CODEC Lnet/minecraft/network/packet/s2c/play/TitleS2CPacket;CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   public static final PacketCodec<RegistryByteBuf, TitleS2CPacket> CODEC = PacketCodec.create(TextCodecs.f_byaedzcu, TitleS2CPacket::text, TitleS2CPacket::new);
+   public static final PacketCodec<RegistryByteBuf, TitleS2CPacket> CODEC = PacketCodec.create(
+      TextCodecs.REGISTRY_TEXT_CODEC, TitleS2CPacket::text, TitleS2CPacket::new
+   );
 
    /**
     * Mapping not found
diff -bur namedTargetSrc/net/minecraft/network/PacketBundler.java namedSrc/net/minecraft/network/PacketBundler.java
--- namedTargetSrc/net/minecraft/network/PacketBundler.java	2024-02-17 04:15:30.221687828 +0000
+++ namedSrc/net/minecraft/network/PacketBundler.java	2024-02-17 04:14:10.458038554 +0000
@@ -38,7 +38,7 @@
     */
    protected void decode(ChannelHandlerContext channelHandlerContext, Packet<?> arg, List<Object> list) throws Exception {
       if (this.currentBundler != null) {
-         m_kysktzfb(arg);
+         ensureNotInTransition(arg);
          Packet<?> lv = this.currentBundler.addPacket(arg);
          if (lv != null) {
             this.currentBundler = null;
@@ -47,7 +47,7 @@
       } else {
          PacketBundlerInfo.BundleHandler lv2 = this.handler.createBundleHandler(arg);
          if (lv2 != null) {
-            m_kysktzfb(arg);
+            ensureNotInTransition(arg);
             this.currentBundler = lv2;
          } else {
             list.add(arg);
@@ -60,9 +60,9 @@
 
    /**
     * @mapping {@literal hashed m_kysktzfb Lnet/minecraft/unmapped/C_xyumsucd;m_kysktzfb(Lnet/minecraft/unmapped/C_zyjtrjrl;)V}
-    * @mapping {@literal named m_kysktzfb Lnet/minecraft/network/PacketBundler;m_kysktzfb(Lnet/minecraft/network/packet/Packet;)V}
+    * @mapping {@literal named ensureNotInTransition Lnet/minecraft/network/PacketBundler;ensureNotInTransition(Lnet/minecraft/network/packet/Packet;)V}
     */
-   private static void m_kysktzfb(Packet<?> packet) {
+   private static void ensureNotInTransition(Packet<?> packet) {
       if (packet.transitionsNetworkState()) {
          throw new DecoderException("Terminal message received in bundle");
       }


The remaining diff is too long!

Please sign in to comment.