Skip to content

Commit

Permalink
Chunk restoration (#661)
Browse files Browse the repository at this point in the history
* move some classes from n/m/world/ to n/m/world/chunk/
name Chunk.PackedTicks and members
name ChunkSerializer

* complete ChunkSerializer

* complete n/m/world/chunk/light/

* complete n/m/world/chunk/palette/

* complete Chunk, ChunkManager, and ClientChunkManager

* add missing class comments to simple type names for obfuscated classes

* map RegionBoundValues

* map ChunkDependencies

* map most of ChunkLoadingStep and ChunkLoadingSteps
complete ServerWorldAccess
complete and tweak ChunkStatus

* complete WorldChunk

* map ChunkGenerationContext

* move n/m/world/{entity/}EntityView
map ServerEntityView

* map ServerGameEventListenerRegistry

* complete ChunkSection, ChunkTickTracker, ProtoChunk, and UpgradeData

* complete n/m/world/chunk:
map ChunkLoadingTask and ChunkLoadingTasks
complete ChunkLoadingStep and ChunkLoadingSteps
complete ChunkRegion

* re-complete n/m/world/chunk
sort out some chunkX/Z vs x/z params
add simple name for Packet

* fix type and missing simple type class comment
correct another chunkX/Z <-> x/z param
  • Loading branch information
supersaiyansubtlety authored Nov 19, 2024
1 parent 7465c89 commit 4c1f820
Show file tree
Hide file tree
Showing 63 changed files with 550 additions and 49 deletions.
13 changes: 13 additions & 0 deletions mappings/net/minecraft/client/render/BuiltChunkStorage.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,35 @@ CLASS net/minecraft/unmapped/C_rqhfsngs net/minecraft/client/render/BuiltChunkSt
FIELD f_jiixbeeb xGridSections I
FIELD f_llzkkcwf sections [Lnet/minecraft/unmapped/C_sjynkhfr$C_exmylrbc;
FIELD f_mlshnjmi zGridSections I
FIELD f_sqecsiyn sectionPos Lnet/minecraft/unmapped/C_zubvmeye;
FIELD f_ugpffsia yGridSections I
FIELD f_ypmjrpkj world Lnet/minecraft/unmapped/C_cdctfzbn;
METHOD <init> (Lnet/minecraft/unmapped/C_sjynkhfr;Lnet/minecraft/unmapped/C_cdctfzbn;ILnet/minecraft/unmapped/C_sfkkabhx;)V
ARG 1 builder
ARG 3 viewDistance
METHOD m_flvtwfft clear ()V
METHOD m_hibueudp getSectionPos ()Lnet/minecraft/unmapped/C_zubvmeye;
METHOD m_jpnxgjcl getSection (Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_sjynkhfr$C_exmylrbc;
METHOD m_lzwczkxc getViewDistance ()I
METHOD m_paxdewur createSections (Lnet/minecraft/unmapped/C_sjynkhfr;)V
ARG 1 builder
METHOD m_rtueaaeu isWithinViewDistance (III)Z
ARG 1 x
ARG 2 y
ARG 3 z
METHOD m_rxnslrfy updateCameraPosition (Lnet/minecraft/unmapped/C_zubvmeye;)V
ARG 1 pos
METHOD m_sdckahhd scheduleRebuild (IIIZ)V
ARG 1 x
ARG 2 y
ARG 3 z
ARG 4 important
METHOD m_sdyufbzs getRenderSection (III)Lnet/minecraft/unmapped/C_sjynkhfr$C_exmylrbc;
ARG 1 x
ARG 2 y
ARG 3 z
METHOD m_thjqtzzg getRenderSection (J)Lnet/minecraft/unmapped/C_sjynkhfr$C_exmylrbc;
ARG 1 pos
METHOD m_thmsuaoy getWorld ()Lnet/minecraft/unmapped/C_qpninoyb;
METHOD m_uqgbrzua setViewDistance (I)V
ARG 1 viewDistance
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ CLASS net/minecraft/unmapped/C_jnliocmw net/minecraft/client/render/SectionOcclu
METHOD m_viheltip scheduleFullUpdate ()V
METHOD m_xapgsdwa createInitialNodes (Lnet/minecraft/unmapped/C_dcmtgrvm;Ljava/util/Queue;)V
ARG 2 nodes
METHOD m_xhfcuajv schedulePropagationFrom (Lnet/minecraft/unmapped/C_sjynkhfr$C_exmylrbc;)V
ARG 1 section
METHOD m_yxpdbtyy scheduleFullUpdate (ZLnet/minecraft/unmapped/C_dcmtgrvm;Lnet/minecraft/unmapped/C_vgpupfxx;Lit/unimi/dsi/fastutil/longs/LongOpenHashSet;)V
ARG 1 insideCube
ARG 3 cameraPos
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/client/render/WorldRenderer.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,8 @@ CLASS net/minecraft/unmapped/C_sfkkabhx net/minecraft/client/render/WorldRendere
METHOD m_rzgnhorc isSectionCompiled (Lnet/minecraft/unmapped/C_hynzadkk;)Z
METHOD m_tamcgvjw offsetFrustum (Lnet/minecraft/unmapped/C_jwzjqevg;)Lnet/minecraft/unmapped/C_jwzjqevg;
METHOD m_tbgywtxm reload ()V
METHOD m_tboyskxy onSectionBecomingNonEmpty (J)V
ARG 1 chunkSectionPos
METHOD m_tgxmzbib getParticlesFramebuffer ()Lnet/minecraft/unmapped/C_xxwgvelc;
METHOD m_uptmaubw addLateDebugPass (Lnet/minecraft/unmapped/C_obrvgeej;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_vidgpspy;)V
ARG 1 frameGraph
Expand Down
14 changes: 14 additions & 0 deletions mappings/net/minecraft/client/world/ClientChunkManager.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,36 @@ CLASS net/minecraft/unmapped/C_rxbefbuv net/minecraft/client/world/ClientChunkMa
ARG 3 buf
ARG 4 nbt
ARG 5 consumer
METHOD m_yfdsyahd getLoadedEmptySections ()Lit/unimi/dsi/fastutil/longs/LongOpenHashSet;
CLASS C_tfcolboi ClientChunkMap
FIELD f_beqrondb centerChunkX I
FIELD f_iopqblvb loadedEmptySections Lit/unimi/dsi/fastutil/longs/LongOpenHashSet;
FIELD f_iuuqegjv radius I
FIELD f_kbcvrkzo chunks Ljava/util/concurrent/atomic/AtomicReferenceArray;
FIELD f_sxbcqsci loadedChunkCount I
FIELD f_vqnbxpll centerChunkZ I
FIELD f_wfoyaoab diameter I
METHOD <init> (Lnet/minecraft/unmapped/C_rxbefbuv;I)V
ARG 2 radius
METHOD m_amnberdl onSectionEmptinessChanged (IIIZ)V
ARG 1 chunkX
ARG 2 sectionCoord
ARG 3 chunkZ
ARG 4 emptySection
METHOD m_dpjpfdqy isInRadius (II)Z
ARG 1 chunkX
ARG 2 chunkZ
METHOD m_fkdgglmo removeEmptySections (Lnet/minecraft/unmapped/C_hrdsvlkq;)V
ARG 1 chunk
METHOD m_gfizlrgc unload (ILnet/minecraft/unmapped/C_hrdsvlkq;)V
ARG 2 chunk
METHOD m_mjkggrto addEmptySections (Lnet/minecraft/unmapped/C_hrdsvlkq;)V
ARG 1 chunk
METHOD m_pciippob getIndex (II)I
ARG 1 chunkX
ARG 2 chunkZ
METHOD m_qqdzgquf writePositions (Ljava/lang/String;)V
ARG 1 fileName
METHOD m_vlowadnu getChunk (I)Lnet/minecraft/unmapped/C_hrdsvlkq;
ARG 1 index
METHOD m_wufvlhmm replace (ILnet/minecraft/unmapped/C_hrdsvlkq;)V
2 changes: 2 additions & 0 deletions mappings/net/minecraft/client/world/ClientWorld.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ CLASS net/minecraft/unmapped/C_ghdnlrrw net/minecraft/client/world/ClientWorld
METHOD m_alvumyoa getSkyColor (Lnet/minecraft/unmapped/C_vgpupfxx;F)I
ARG 1 cameraPosition
ARG 2 tickDelta
METHOD m_bfurccxk onSectionBecomingNonEmpty (J)V
ARG 1 chunkSectionPos
METHOD m_blplldfx syncBlockState (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_vgpupfxx;)V
ARG 3 playerPos
METHOD m_bmqpmbrd (Lnet/minecraft/unmapped/C_hynzadkk;)I
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/network/packet/Packet.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ CLASS net/minecraft/unmapped/C_zyjtrjrl net/minecraft/network/packet/Packet
COMMENT Returns whether a throwable in writing of this packet allows the
COMMENT connection to simply skip the packet's sending than disconnecting.
METHOD m_rppugqly apply (Lnet/minecraft/unmapped/C_tkgdawqw;)V
ARG 1 listener
METHOD m_ytvbgrrz transitionsNetworkPhase ()Z
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
CLASS net/minecraft/unmapped/C_gdbvnevg net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket
FIELD f_adcbxzny chunkZ I
FIELD f_ipkzrufr chunkX I
FIELD f_adcbxzny z I
FIELD f_ipkzrufr x I
FIELD f_jkrdfkjr lightUpdateData Lnet/minecraft/unmapped/C_qeldjmur;
FIELD f_oqycayzk chunkData Lnet/minecraft/unmapped/C_tilplatb;
FIELD f_oqycayzk data Lnet/minecraft/unmapped/C_tilplatb;
FIELD f_pmiruxtl CODEC Lnet/minecraft/unmapped/C_qsrmwluu;
METHOD <init> (Lnet/minecraft/unmapped/C_bngyzsts;)V
ARG 1 buf
Expand All @@ -11,9 +11,9 @@ CLASS net/minecraft/unmapped/C_gdbvnevg net/minecraft/network/packet/s2c/play/Ch
ARG 2 lightingProvider
ARG 3 skyLightData
ARG 4 blockLightData
METHOD m_bgbhnrvd chunkData ()Lnet/minecraft/unmapped/C_tilplatb;
METHOD m_ihkxzryj chunkZ ()I
METHOD m_bgbhnrvd getData ()Lnet/minecraft/unmapped/C_tilplatb;
METHOD m_ihkxzryj getZ ()I
METHOD m_oyxrmtuz lightUpdateData ()Lnet/minecraft/unmapped/C_qeldjmur;
METHOD m_pavmyvwd chunkX ()I
METHOD m_pavmyvwd getX ()I
METHOD m_uzjldfpt write (Lnet/minecraft/unmapped/C_bngyzsts;)V
ARG 1 buf
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@ CLASS net/minecraft/unmapped/C_ebcmvjwj net/minecraft/server/world/ServerChunkMa
ARG 1 holder
ARG 2 maxLevel
METHOD m_hsnsljxf getChunkFuture (IILnet/minecraft/unmapped/C_kogtzhzt;Z)Ljava/util/concurrent/CompletableFuture;
ARG 1 chunkX
ARG 2 chunkZ
ARG 1 x
ARG 2 z
ARG 3 leastStatus
ARG 4 create
METHOD m_ilfskcor getChunkHolder (J)Lnet/minecraft/unmapped/C_gkderdjo;
ARG 1 pos
METHOD m_iuemgshl getPendingTasks ()I
METHOD m_jgyqtgrc getChunkFutureSyncOnMainThread (IILnet/minecraft/unmapped/C_kogtzhzt;Z)Ljava/util/concurrent/CompletableFuture;
ARG 1 chunkX
ARG 2 chunkZ
ARG 1 x
ARG 2 z
ARG 3 leastStatus
ARG 4 create
METHOD m_kpypddik ifChunkLoaded (JLjava/util/function/Consumer;)V
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/server/world/ServerWorld.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ CLASS net/minecraft/unmapped/C_bdwnwhiu net/minecraft/server/world/ServerWorld
METHOD m_tqvywirw getEntityOrDragonPart (I)Lnet/minecraft/unmapped/C_astfners;
ARG 1 id
METHOD m_tzlitazt sendSleepingStatus ()V
METHOD m_uwauhnel (Lnet/minecraft/unmapped/C_lwzmmmqr;)V
METHOD m_uwauhnel onStructureStartsReady (Lnet/minecraft/unmapped/C_lwzmmmqr;)V
ARG 1 chunk
METHOD m_vgbceyje resetIdleTimeout ()V
METHOD m_wtlcknkv getTopFive (Ljava/lang/Iterable;Ljava/util/function/Function;)Ljava/lang/String;
Expand Down
6 changes: 6 additions & 0 deletions mappings/net/minecraft/structure/StructureManager.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ CLASS net/minecraft/unmapped/C_rhdulivw net/minecraft/structure/StructureManager
METHOD m_dfmsetux getStructureStartAt (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_quklzgtb;)Lnet/minecraft/unmapped/C_efiavfys;
ARG 1 pos
ARG 2 structure
METHOD m_djdnxqsq getStructureStartWithPieceAt (Lnet/minecraft/unmapped/C_hynzadkk;Ljava/util/function/Predicate;)Lnet/minecraft/unmapped/C_efiavfys;
ARG 2 structurePredicate
METHOD m_ewzwrhal incrementStructureReferences (Lnet/minecraft/unmapped/C_efiavfys;)V
ARG 1 start
METHOD m_hqgaiyeh shouldGenerate ()Z
Expand All @@ -37,6 +39,8 @@ CLASS net/minecraft/unmapped/C_rhdulivw net/minecraft/structure/StructureManager
METHOD m_qdndgzdv structureHasPieceAt (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_efiavfys;)Z
ARG 1 pos
ARG 2 start
METHOD m_sfhzyjcm getStructureStartWithPieceAt (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_odfnijdo;)Lnet/minecraft/unmapped/C_efiavfys;
ARG 2 structures
METHOD m_tnwbowrs getStructuresAt (Lnet/minecraft/unmapped/C_hynzadkk;)Ljava/util/Map;
ARG 1 pos
METHOD m_vrmqqpkx setStructureStart (Lnet/minecraft/unmapped/C_zubvmeye;Lnet/minecraft/unmapped/C_quklzgtb;Lnet/minecraft/unmapped/C_efiavfys;Lnet/minecraft/unmapped/C_byiynvyh;)V
Expand All @@ -48,6 +52,8 @@ CLASS net/minecraft/unmapped/C_rhdulivw net/minecraft/structure/StructureManager
METHOD m_woqhycam getStructureStarts (Lnet/minecraft/unmapped/C_zubvmeye;Lnet/minecraft/unmapped/C_quklzgtb;)Ljava/util/List;
ARG 1 sectionPos
ARG 2 structure
METHOD m_xamriycs (Lnet/minecraft/unmapped/C_ednuhnnn;Lnet/minecraft/unmapped/C_cjzoxshv;)Z
ARG 1 structure
METHOD m_xhpkpveo getStructureStartWithPieceAt (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_efiavfys;
ARG 1 pos
ARG 2 structures
Expand Down
28 changes: 28 additions & 0 deletions mappings/net/minecraft/util/RegionBoundValues.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
CLASS net/minecraft/unmapped/C_xgsefppr net/minecraft/util/RegionBoundValues
FIELD f_abhbmwxm minX I
FIELD f_duchftei minZ I
FIELD f_sjobxbbs values [Ljava/lang/Object;
FIELD f_togksayj maxX I
FIELD f_tzkyezrr maxZ I
METHOD <init> (IIIILnet/minecraft/unmapped/C_xgsefppr$C_iualwfgh;)V
ARG 5 initializer
METHOD m_bkxoehdi forEach (Ljava/util/function/Consumer;)V
ARG 1 valueConsumer
METHOD m_exekxunj getImpl (II)I
ARG 1 x
ARG 2 z
METHOD m_faymaync isInRange (II)Z
ARG 1 x
ARG 2 z
METHOD m_pmihppge get (II)Ljava/lang/Object;
ARG 1 x
ARG 2 z
METHOD m_xtaeuwxr of (IIILnet/minecraft/unmapped/C_xgsefppr$C_iualwfgh;)Lnet/minecraft/unmapped/C_xgsefppr;
ARG 0 x
ARG 1 z
ARG 2 range
ARG 3 initializer
CLASS C_iualwfgh Initializer
METHOD get (II)Ljava/lang/Object;
ARG 1 x
ARG 2 z
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@ CLASS net/minecraft/unmapped/C_pdegcfzu net/minecraft/util/profiling/jfr/JvmProf
METHOD m_ampfjuyj isRunning ()Z
METHOD m_fcajjqtj isAvailable ()Z
METHOD m_fkxuyhmv onPacketSent (Lnet/minecraft/unmapped/C_kxdobmrm;Lnet/minecraft/unmapped/C_usugyqlb;Ljava/net/SocketAddress;I)V
METHOD m_kgosmkpg onChunkGenerate (Lnet/minecraft/unmapped/C_ynrszrtu;Lnet/minecraft/unmapped/C_xhhleach;Ljava/lang/String;)Lnet/minecraft/unmapped/C_ubafnjcv;
ARG 2 packetType
ARG 3 remoteAddress
ARG 4 packetId
METHOD m_kgosmkpg onChunkGenerated (Lnet/minecraft/unmapped/C_ynrszrtu;Lnet/minecraft/unmapped/C_xhhleach;Ljava/lang/String;)Lnet/minecraft/unmapped/C_ubafnjcv;
ARG 1 chunkPos
ARG 2 world
ARG 3 targetStatus
METHOD m_lpccagqc stop ()Ljava/nio/file/Path;
METHOD m_momqlrwh onPacketReceived (Lnet/minecraft/unmapped/C_kxdobmrm;Lnet/minecraft/unmapped/C_usugyqlb;Ljava/net/SocketAddress;I)V
METHOD m_nyblkrol onServerTick (F)V
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/world/BlockRenderView.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ CLASS net/minecraft/unmapped/C_xjeuupup net/minecraft/world/BlockRenderView
ARG 1 pos
METHOD m_lqesafyv getBrightness (Lnet/minecraft/unmapped/C_xpuuihxf;Z)F
METHOD m_oskenyjr getColor (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_qodopjcw;)I
ARG 2 colorProvider
METHOD m_qvmixhuq getLightingProvider ()Lnet/minecraft/unmapped/C_ksposksb;
METHOD m_rqndxint getBaseLightLevel (Lnet/minecraft/unmapped/C_hynzadkk;I)I
ARG 1 pos
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/world/CollisionView.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ CLASS net/minecraft/unmapped/C_vxzrjtdu net/minecraft/world/CollisionView
ARG 1 entity
ARG 2 box
METHOD m_cdodgqhq getChunkAsView (II)Lnet/minecraft/unmapped/C_peaveboq;
ARG 1 chunkX
ARG 2 chunkZ
METHOD m_istsheae isSpaceEmpty (Lnet/minecraft/unmapped/C_hbcjzgoe;)Z
ARG 1 box
METHOD m_kamrttpa getBorderCollision (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_hbcjzgoe;)Lnet/minecraft/unmapped/C_zscvhwbd;
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/world/ServerWorldAccess.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ CLASS net/minecraft/unmapped/C_jmnzlycd net/minecraft/world/ServerWorldAccess
METHOD m_imualvpo spawnEntityAndPassengers (Lnet/minecraft/unmapped/C_astfners;)V
COMMENT Spawns an entity and all its passengers (recursively) into the world.
ARG 1 entity
METHOD m_wguextlz getWorld ()Lnet/minecraft/unmapped/C_bdwnwhiu;
7 changes: 7 additions & 0 deletions mappings/net/minecraft/world/StructureHolder.mapping
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
CLASS net/minecraft/unmapped/C_byiynvyh net/minecraft/world/StructureHolder
METHOD m_fejlmeve setStructureReferences (Ljava/util/Map;)V
ARG 1 references
METHOD m_pvlhddmd setStructureStart (Lnet/minecraft/unmapped/C_quklzgtb;Lnet/minecraft/unmapped/C_efiavfys;)V
ARG 1 feature
ARG 2 start
METHOD m_svqvtqfp getStructureReferences (Lnet/minecraft/unmapped/C_quklzgtb;)Lit/unimi/dsi/fastutil/longs/LongSet;
ARG 1 feature
METHOD m_xqpwvlyw addStructureReference (Lnet/minecraft/unmapped/C_quklzgtb;J)V
ARG 1 feature
ARG 2 chunPos
METHOD m_xrnbkauz getStructureStart (Lnet/minecraft/unmapped/C_quklzgtb;)Lnet/minecraft/unmapped/C_efiavfys;
ARG 1 feature
METHOD m_zjjsiikg getStructureReferences ()Ljava/util/Map;
13 changes: 13 additions & 0 deletions mappings/net/minecraft/world/WorldView.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ CLASS net/minecraft/unmapped/C_eemzphbi net/minecraft/world/WorldView
METHOD m_biizoxac getBiome (Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_cjzoxshv;
ARG 1 pos
METHOD m_bqzdiqtj getChunk (IILnet/minecraft/unmapped/C_kogtzhzt;)Lnet/minecraft/unmapped/C_lwzmmmqr;
ARG 1 chunkX
ARG 2 chunkZ
ARG 3 status
METHOD m_btlyapdt getChunk (Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_lwzmmmqr;
ARG 1 pos
METHOD m_cnmhzsof isClient ()Z
Expand Down Expand Up @@ -48,19 +51,29 @@ CLASS net/minecraft/unmapped/C_eemzphbi net/minecraft/world/WorldView
METHOD m_ogigqbxw getLightLevel (Lnet/minecraft/unmapped/C_hynzadkk;)I
ARG 1 pos
METHOD m_ozgszpob filteredLookup (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_vtbxyypo;
ARG 1 registry
METHOD m_qdcvrgsy getBrightness (Lnet/minecraft/unmapped/C_hynzadkk;)F
ARG 1 pos
METHOD m_ttxosgdg getChunk (IILnet/minecraft/unmapped/C_kogtzhzt;Z)Lnet/minecraft/unmapped/C_lwzmmmqr;
ARG 1 chunkX
ARG 2 chunkZ
ARG 3 status
ARG 4 create
METHOD m_ucheokld isSkyVisibleAllowingSea (Lnet/minecraft/unmapped/C_hynzadkk;)Z
ARG 1 pos
METHOD m_uljetols isWater (Lnet/minecraft/unmapped/C_hynzadkk;)Z
ARG 1 pos
METHOD m_vahflkwe isChunkLoaded (II)Z
ARG 1 chunkX
ARG 2 chunkZ
METHOD m_vjliiugt isChunkLoaded (Lnet/minecraft/unmapped/C_hynzadkk;)Z
ARG 1 pos
METHOD m_yirkkvqk getTopPosition (Lnet/minecraft/unmapped/C_ybztoekc$C_wkdeqzbn;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_hynzadkk;
ARG 1 heightmap
ARG 2 pos
METHOD m_yjbibpuo getGeneratorStoredBiome (III)Lnet/minecraft/unmapped/C_cjzoxshv;
ARG 1 x
ARG 2 y
ARG 3 z
METHOD m_zmumzdjx getRegistryManager ()Lnet/minecraft/unmapped/C_wqxmvzdq;
METHOD m_ztjkuhbv getTopY (Lnet/minecraft/unmapped/C_ybztoekc$C_wkdeqzbn;II)I
4 changes: 4 additions & 0 deletions mappings/net/minecraft/world/biome/source/BiomeAccess.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,7 @@ CLASS net/minecraft/unmapped/C_txmmiamu net/minecraft/world/biome/source/BiomeAc
METHOD m_uzbiicev (JIIIDDD)D
ARG 0 seed
CLASS C_sutfgxpu NoiseBiomeSource
METHOD getNoiseBiome (III)Lnet/minecraft/unmapped/C_cjzoxshv;
ARG 1 x
ARG 2 y
ARG 3 z
16 changes: 16 additions & 0 deletions mappings/net/minecraft/world/chunk/Chunk.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ CLASS net/minecraft/unmapped/C_lwzmmmqr net/minecraft/world/chunk/Chunk
METHOD m_fhrvmsma needsSaving ()Z
METHOD m_fmezrwqz getBlockTickScheduler ()Lnet/minecraft/unmapped/C_ncwmpyyu;
METHOD m_hguftcvs setBlockEntity (Lnet/minecraft/unmapped/C_kvegafmh;)V
ARG 1 blockEntity
METHOD m_ifohhonx getUpgradeData ()Lnet/minecraft/unmapped/C_jrivgvxn;
METHOD m_itzisycv getStructureStarts ()Ljava/util/Map;
METHOD m_jnwohgqe getHeightLimitView ()Lnet/minecraft/unmapped/C_qpninoyb;
Expand All @@ -60,23 +61,30 @@ CLASS net/minecraft/unmapped/C_lwzmmmqr net/minecraft/world/chunk/Chunk
ARG 2 consumer
METHOD m_mjwvwhyy (Lnet/minecraft/unmapped/C_quklzgtb;)Lit/unimi/dsi/fastutil/longs/LongSet;
ARG 0 key
METHOD m_mkactvip isSerializable ()Z
METHOD m_ntljehgr getOrCreateChunkNoiseSampler (Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_rvjywqnu;
ARG 1 noiseSamplerCreator
METHOD m_oeshvinu getPos ()Lnet/minecraft/unmapped/C_ynrszrtu;
METHOD m_pcowjlry tryMarkSaved ()Z
METHOD m_pkqflpwq hasBelowZeroRetrogen ()Z
METHOD m_pmdbdcxs getHeightmap (Lnet/minecraft/unmapped/C_ybztoekc$C_wkdeqzbn;)Lnet/minecraft/unmapped/C_ybztoekc;
ARG 1 type
METHOD m_pornhcnk fillSectionArray (Lnet/minecraft/unmapped/C_tqxyjqsk;[Lnet/minecraft/unmapped/C_aurosfgf;)V
ARG 0 biomeRegistry
ARG 1 sectionArray
METHOD m_ptmjitse hasStructureReferences ()Z
METHOD m_puwtdbeb isSectionEmpty (I)Z
ARG 1 coord
METHOD m_pzyvuftt getHighestFilledSectionYOffset ()I
METHOD m_qaecgkls setInhabitedTime (J)V
ARG 1 inhabitedTime
METHOD m_qdoylksi markBlockForPostProcessing (Lit/unimi/dsi/fastutil/shorts/ShortList;I)V
ARG 1 sections
ARG 2 index
METHOD m_qhwssies setBlockState (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Z)Lnet/minecraft/unmapped/C_txtbiemp;
ARG 3 moved
METHOD m_qlsrwmuw getBelowZeroRetrogen ()Lnet/minecraft/unmapped/C_empvvetb;
METHOD m_rbxakgwa getStatus ()Lnet/minecraft/unmapped/C_kogtzhzt;
METHOD m_rgzeprey setBiomesFromNoise (Lnet/minecraft/unmapped/C_nhlknxak;Lnet/minecraft/unmapped/C_ohqwadgy$C_pigoipju;)V
ARG 1 biomeSupplier
ARG 2 sampler
Expand All @@ -88,10 +96,12 @@ CLASS net/minecraft/unmapped/C_lwzmmmqr net/minecraft/world/chunk/Chunk
ARG 1 pos
METHOD m_ryislatp isLightCorrect ()Z
METHOD m_smvmtzoy getPackedBlockEntityNbt (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_hhlwcnih;
ARG 2 registryManager
METHOD m_sogpxvqe getBlockEntityNbt (Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_hhlwcnih;
ARG 1 pos
METHOD m_tmmlzzvg hasHeightmap (Lnet/minecraft/unmapped/C_ybztoekc$C_wkdeqzbn;)Z
ARG 1 type
METHOD m_twktjquw markNeedsSaving ()V
METHOD m_udykeqsw areSectionsEmptyBetween (II)Z
ARG 1 lowerHeight
ARG 2 upperHeight
Expand All @@ -102,6 +112,7 @@ CLASS net/minecraft/unmapped/C_lwzmmmqr net/minecraft/world/chunk/Chunk
ARG 1 type
ARG 2 heightmap
METHOD m_wljtnein getTicksForSerialization (J)Lnet/minecraft/unmapped/C_lwzmmmqr$C_ozbhqkkq;
ARG 1 time
METHOD m_xbdheuaq (Lnet/minecraft/unmapped/C_ybztoekc$C_wkdeqzbn;)Lnet/minecraft/unmapped/C_ybztoekc;
ARG 1 heightmapType
METHOD m_xkejgfig getHeightmaps ()Ljava/util/Collection;
Expand All @@ -110,3 +121,8 @@ CLASS net/minecraft/unmapped/C_lwzmmmqr net/minecraft/world/chunk/Chunk
METHOD m_yrcpifpe setLightCorrect (Z)V
ARG 1 lightCorrect
METHOD m_yuipgvpr getInhabitedTime ()J
CLASS C_ozbhqkkq PackedTicks
FIELD f_juvuxeon blockTicks Ljava/util/List;
FIELD f_rhsbjeav fluidTicks Ljava/util/List;
METHOD m_dpqohxww blockTicks ()Ljava/util/List;
METHOD m_yjluxaun fluidTicks ()Ljava/util/List;
10 changes: 10 additions & 0 deletions mappings/net/minecraft/world/chunk/ChunkDependencies.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
CLASS net/minecraft/unmapped/C_uisfyfhg net/minecraft/world/chunk/ChunkDependencies
FIELD f_ivufksoa radiiByDependencyIndex [I
FIELD f_wffsuakv dependenciesByRadius Lcom/google/common/collect/ImmutableList;
METHOD m_dnwdpeuv get (I)Lnet/minecraft/unmapped/C_kogtzhzt;
ARG 1 radius
METHOD m_dxycnhaa getDependenciesByRadius ()Lcom/google/common/collect/ImmutableList;
METHOD m_grcpkwme getRadius (Lnet/minecraft/unmapped/C_kogtzhzt;)I
ARG 1 dependencyStatus
METHOD m_lqmmnsdk getMaxRadius ()I
METHOD m_ovpkckxs size ()I
Loading

3 comments on commit 4c1f820

@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 4c1f820, 169 file(s) were updated with 2402 line(s) added and 2246 removed compared to the latest Quilt Mappings version.

View the diff here (1/3):
diff -bur namedTargetSrc/net/minecraft/client/MinecraftClient.java namedSrc/net/minecraft/client/MinecraftClient.java
--- namedTargetSrc/net/minecraft/client/MinecraftClient.java	2024-11-19 00:10:32.553942839 +0000
+++ namedSrc/net/minecraft/client/MinecraftClient.java	2024-11-19 00:09:20.986022963 +0000
@@ -2641,7 +2641,7 @@
 
          ClientPlayNetworkHandler lv8 = this.getNetworkHandler();
          if (lv8 != null && !this.paused) {
-            lv8.send(C_wjalbado.f_ejxqztrq);
+            lv8.send(C_wjalbado.PACKET);
          }
       } else if (this.integratedServerConnection != null) {
          lv.swap("pendingConnection");
diff -bur namedTargetSrc/net/minecraft/client/network/AbstractClientNetworkHandler.java namedSrc/net/minecraft/client/network/AbstractClientNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/AbstractClientNetworkHandler.java	2024-11-19 00:10:32.641942788 +0000
+++ namedSrc/net/minecraft/client/network/AbstractClientNetworkHandler.java	2024-11-19 00:09:21.098022824 +0000
@@ -208,27 +208,27 @@
     * Mapping not found
     */
    @Override
-   public void onKeepConnectionAlive(KeepConnectionAliveS2CPacket arg) {
-      this.sendWhen(new KeepConnectionAliveC2SPacket(arg.getId()), () -> !RenderSystem.isFrozenAtPollEvents(), Duration.ofMinutes(1L));
+   public void onKeepConnectionAlive(KeepConnectionAliveS2CPacket packet) {
+      this.sendWhen(new KeepConnectionAliveC2SPacket(packet.getId()), () -> !RenderSystem.isFrozenAtPollEvents(), Duration.ofMinutes(1L));
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onPlayPing(PingS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.send(new PongC2SPacket(arg.getParameter()));
+   public void onPlayPing(PingS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.send(new PongC2SPacket(packet.getParameter()));
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onCustomPayload(CustomPayloadS2CPacket arg) {
-      CustomPayload lv = arg.payload();
+   public void onCustomPayload(CustomPayloadS2CPacket packet) {
+      CustomPayload lv = packet.payload();
       if (!(lv instanceof DiscardedCustomPayload)) {
-         NetworkThreadUtils.forceMainThread(arg, this, this.client);
+         NetworkThreadUtils.forceMainThread(packet, this, this.client);
          if (lv instanceof BrandPayload lv2) {
             this.serverBrand = lv2.brand();
             this.telemetryManager.onServerBrandReceived(lv2.brand());
@@ -248,20 +248,20 @@
     * Mapping not found
     */
    @Override
-   public void onAddResourcePack(AddResourcePackS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      UUID uUID = arg.id();
-      URL uRL = parseResourcePackUrl(arg.url());
+   public void onAddResourcePack(AddResourcePackS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      UUID uUID = packet.id();
+      URL uRL = parseResourcePackUrl(packet.url());
       if (uRL == null) {
          this.connection.send(new ResourcePackStatusUpdateC2SPacket(uUID, ResourcePackStatusUpdateC2SPacket.Status.INVALID_URL));
       } else {
-         String string = arg.hash();
-         boolean bl = arg.required();
+         String string = packet.hash();
+         boolean bl = packet.required();
          ServerInfo.ResourcePackPolicy lv = this.serverInfo != null ? this.serverInfo.getResourcePackPolicy() : ServerInfo.ResourcePackPolicy.PROMPT;
          if (lv != ServerInfo.ResourcePackPolicy.PROMPT && (!bl || lv != ServerInfo.ResourcePackPolicy.DISABLED)) {
             this.client.getRemoteResourcePackProvider().addPack(uUID, uRL, string);
          } else {
-            this.client.setScreen(this.m_uednupdt(uUID, uRL, string, bl, (Text)arg.prompt().orElse(null)));
+            this.client.setScreen(this.m_uednupdt(uUID, uRL, string, bl, (Text)packet.prompt().orElse(null)));
          }
       }
    }
@@ -270,9 +270,9 @@
     * Mapping not found
     */
    @Override
-   public void onRemoveResourcePack(RemoveResourcePackS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      arg.id()
+   public void onRemoveResourcePack(RemoveResourcePackS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      packet.id()
          .ifPresentOrElse(
             uuid -> this.client.getRemoteResourcePackProvider().removePack(uuid), () -> this.client.getRemoteResourcePackProvider().removeAllPacks()
          );
@@ -305,36 +305,36 @@
     * Mapping not found
     */
    @Override
-   public void onCookieRequest(CookieRequestS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.connection.send(new CookieResponseC2SPacket(arg.key(), (byte[])this.serverCookies.get(arg.key())));
+   public void onCookieRequest(CookieRequestS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.connection.send(new CookieResponseC2SPacket(packet.key(), (byte[])this.serverCookies.get(packet.key())));
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onStoreCookie(StoreCookieS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.serverCookies.put(arg.key(), arg.payload());
+   public void onStoreCookie(StoreCookieS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.serverCookies.put(packet.key(), packet.payload());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onCustomReportDetails(CustomReportDetailsS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.customReportDetails = arg.details();
+   public void onCustomReportDetails(CustomReportDetailsS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.customReportDetails = packet.details();
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onServerLinks(ServerLinksS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      List<ServerLinks.StringEntry> list = arg.links();
+   public void onServerLinks(ServerLinksS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      List<ServerLinks.StringEntry> list = packet.links();
       Builder<ServerLinks.UriEntry> builder = ImmutableList.builderWithExpectedSize(list.size());
 
       for (ServerLinks.StringEntry lv : list) {
@@ -353,16 +353,16 @@
     * Mapping not found
     */
    @Override
-   public void onTransfer(TransferS2CPacket arg) {
+   public void onTransfer(TransferS2CPacket packet) {
       this.f_zzouahkl = true;
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
       if (this.serverInfo == null) {
          throw new IllegalStateException("Cannot transfer to server from singleplayer");
       } else {
          this.connection.disconnect(Text.translatable("disconnect.transfer"));
          this.connection.disableAutoRead();
          this.connection.handleDisconnection();
-         ServerAddress lv = new ServerAddress(arg.host(), arg.port());
+         ServerAddress lv = new ServerAddress(packet.host(), packet.port());
          ConnectScreen.connect(
             (Screen)Objects.requireNonNullElseGet(this.postDisconnectScreen, TitleScreen::new),
             this.client,
@@ -378,8 +378,8 @@
     * Mapping not found
     */
    @Override
-   public void onDisconnect(DisconnectS2CPacket arg) {
-      this.connection.disconnect(arg.reason());
+   public void onDisconnect(DisconnectS2CPacket packet) {
+      this.connection.disconnect(packet.reason());
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/network/ClientConfigurationNetworkHandler.java namedSrc/net/minecraft/client/network/ClientConfigurationNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientConfigurationNetworkHandler.java	2024-11-19 00:10:32.521942857 +0000
+++ namedSrc/net/minecraft/client/network/ClientConfigurationNetworkHandler.java	2024-11-19 00:09:20.942023018 +0000
@@ -116,39 +116,39 @@
     * Mapping not found
     */
    @Override
-   public void onRegistryData(RegistryDataS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.f_elfoiiwu.m_ezaggclr(arg.registry(), arg.entries());
+   public void onRegistryData(RegistryDataS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.f_elfoiiwu.m_ezaggclr(packet.registry(), packet.entries());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onTagsSynchronization(TagsSynchronizationS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.f_elfoiiwu.m_liccpfge(arg.getGroups());
+   public void onTagsSynchronization(TagsSynchronizationS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.f_elfoiiwu.m_liccpfge(packet.getGroups());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onSyncEnabledFeatureFlags(SynchronizeEnabledFeatureFlagsS2CPacket arg) {
-      this.enabledFeatures = FeatureFlags.MAIN_REGISTRY.bitSetOf(arg.flagIds());
+   public void onSyncEnabledFeatureFlags(SynchronizeEnabledFeatureFlagsS2CPacket packet) {
+      this.enabledFeatures = FeatureFlags.MAIN_REGISTRY.bitSetOf(packet.flagIds());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onSelectKnownPacks(SelectKnownPacksS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void onSelectKnownPacks(SelectKnownPacksS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
       if (this.f_maiyfuqi == null) {
          this.f_maiyfuqi = new C_wvzzfswm();
       }
 
-      List<KnownPack> list = this.f_maiyfuqi.m_freezzfp(arg.getKnownPacks());
+      List<KnownPack> list = this.f_maiyfuqi.m_freezzfp(packet.getKnownPacks());
       this.send(new SelectKnownPacksC2SPacket(list));
    }
 
@@ -156,7 +156,7 @@
     * Mapping not found
     */
    @Override
-   public void onResetChat(ResetChatS2CPacket arg) {
+   public void onResetChat(ResetChatS2CPacket packet) {
       this.f_npbcqpux = null;
    }
 
@@ -180,9 +180,9 @@
     * Mapping not found
     */
    @Override
-   public void onFinishConfiguration(FinishConfigurationS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      DynamicRegistryManager.Frozen lv = this.m_pglrvykp(argx -> this.f_elfoiiwu.m_mwczbzrr(argx, this.receivedRegistries, this.connection.isLocal()));
+   public void onFinishConfiguration(FinishConfigurationS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      DynamicRegistryManager.Frozen lv = this.m_pglrvykp(arg -> this.f_elfoiiwu.m_mwczbzrr(arg, this.receivedRegistries, this.connection.isLocal()));
       this.connection
          .setupInboundProtocol(
             PlayPhaseProtocols.S2C_TEMPLATE.bind(RegistryByteBuf.makeFactory(lv)),
diff -bur namedTargetSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java namedSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java	2024-11-19 00:10:32.493942873 +0000
+++ namedSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java	2024-11-19 00:09:20.914023052 +0000
@@ -175,7 +175,7 @@
     * Mapping not found
     */
    @Override
-   public void onHello(LoginHelloS2CPacket arg) {
+   public void onHello(LoginHelloS2CPacket packet) {
       this.setStatus(ClientLoginNetworkHandler.ClientLoginStatus.AUTHORIZING);
 
       Cipher cipher;
@@ -184,17 +184,17 @@
       LoginKeyC2SPacket lv;
       try {
          SecretKey secretKey = NetworkEncryptionUtils.generateSecretKey();
-         PublicKey publicKey = arg.getPublicKey();
-         string = new BigInteger(NetworkEncryptionUtils.computeServerId(arg.getServerId(), publicKey, secretKey)).toString(16);
+         PublicKey publicKey = packet.getPublicKey();
+         string = new BigInteger(NetworkEncryptionUtils.computeServerId(packet.getServerId(), publicKey, secretKey)).toString(16);
          cipher = NetworkEncryptionUtils.cipherFromKey(2, secretKey);
          cipher2 = NetworkEncryptionUtils.cipherFromKey(1, secretKey);
-         byte[] bs = arg.getNonce();
+         byte[] bs = packet.getNonce();
          lv = new LoginKeyC2SPacket(secretKey, publicKey, bs);
       } catch (Exception var9) {
          throw new IllegalStateException("Protocol error", var9);
       }
 
-      if (arg.doesNeedAuthentication()) {
+      if (packet.doesNeedAuthentication()) {
          Util.getIoWorkerExecutor().execute(() -> {
             Text lvx = this.joinServerSession(string);
             if (lvx != null) {
@@ -253,12 +253,13 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_wfsvbuzp Lnet/minecraft/unmapped/C_nqcidrhe;m_wfsvbuzp(Lnet/minecraft/unmapped/C_nadjmfrl;)V}
+    * @mapping {@literal named m_wfsvbuzp Lnet/minecraft/client/network/ClientLoginNetworkHandler;m_wfsvbuzp(Lnet/minecraft/unmapped/C_nadjmfrl;)V}
     */
    @Override
-   public void m_wfsvbuzp(C_nadjmfrl arg) {
+   public void m_wfsvbuzp(C_nadjmfrl packet) {
       this.setStatus(ClientLoginNetworkHandler.ClientLoginStatus.JOINING);
-      GameProfile gameProfile = arg.gameProfile();
+      GameProfile gameProfile = packet.gameProfile();
       this.connection
          .setupInboundProtocol(
             ConfigurationPhaseProtocols.S2C,
@@ -311,17 +312,17 @@
     * Mapping not found
     */
    @Override
-   public void onDisconnect(LoginDisconnectS2CPacket arg) {
-      this.connection.disconnect(arg.getReason());
+   public void onDisconnect(LoginDisconnectS2CPacket packet) {
+      this.connection.disconnect(packet.getReason());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onCompression(LoginCompressionS2CPacket arg) {
+   public void onCompression(LoginCompressionS2CPacket packet) {
       if (!this.connection.isLocal()) {
-         this.connection.setCompressionThreshold(arg.getCompressionThreshold(), false);
+         this.connection.setCompressionThreshold(packet.getCompressionThreshold(), false);
       }
    }
 
@@ -329,9 +330,9 @@
     * Mapping not found
     */
    @Override
-   public void onLoginQueryRequest(LoginQueryRequestS2CPacket arg) {
+   public void onLoginQueryRequest(LoginQueryRequestS2CPacket packet) {
       this.statusConsumer.accept(Text.translatable("connect.negotiating"));
-      this.connection.send(new LoginQueryResponseC2SPacket(arg.queryId(), null));
+      this.connection.send(new LoginQueryResponseC2SPacket(packet.queryId(), null));
    }
 
    /**
@@ -346,8 +347,8 @@
     * Mapping not found
     */
    @Override
-   public void onCookieRequest(CookieRequestS2CPacket arg) {
-      this.connection.send(new CookieResponseC2SPacket(arg.key(), (byte[])this.cookies.get(arg.key())));
+   public void onCookieRequest(CookieRequestS2CPacket packet) {
+      this.connection.send(new CookieResponseC2SPacket(packet.key(), (byte[])this.cookies.get(packet.key())));
    }
 
    /**

@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/client/network/ClientPlayNetworkHandler.java namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-11-19 00:10:32.749942725 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-11-19 00:09:21.210022686 +0000
@@ -598,21 +598,21 @@
     * Mapping not found
     */
    @Override
-   public void onGameJoin(GameJoinS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void onGameJoin(GameJoinS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
       this.client.interactionManager = new ClientPlayerInteractionManager(this.client, this);
-      CommonPlayerSpawnInfo lv = arg.commonPlayerSpawnInfo();
-      List<RegistryKey<World>> list = Lists.<RegistryKey<World>>newArrayList(arg.dimensionIds());
+      CommonPlayerSpawnInfo lv = packet.commonPlayerSpawnInfo();
+      List<RegistryKey<World>> list = Lists.<RegistryKey<World>>newArrayList(packet.dimensionIds());
       Collections.shuffle(list);
       this.worldKeys = Sets.<RegistryKey<World>>newLinkedHashSet(list);
       RegistryKey<World> lv2 = lv.dimension();
       Holder<DimensionType> lv3 = lv.dimensionType();
-      this.chunkLoadDistance = arg.viewDistance();
-      this.simulationDistance = arg.simulationDistance();
+      this.chunkLoadDistance = packet.viewDistance();
+      this.simulationDistance = packet.simulationDistance();
       boolean bl = lv.isDebug();
       boolean bl2 = lv.isFlat();
       int i = lv.seaLevel();
-      ClientWorld.Properties lv4 = new ClientWorld.Properties(Difficulty.NORMAL, arg.hardcore(), bl2);
+      ClientWorld.Properties lv4 = new ClientWorld.Properties(Difficulty.NORMAL, packet.hardcore(), bl2);
       this.worldProperties = lv4;
       this.world = new ClientWorld(this, lv4, lv2, lv3, this.chunkLoadDistance, this.simulationDistance, this.client.worldRenderer, bl, lv.seed(), i);
       this.client.joinWorld(this.world, DownloadingTerrainScreen.BackgroundType.OTHER);
@@ -626,19 +626,19 @@
 
       this.client.debugRenderer.reset();
       this.client.player.init();
-      this.client.player.setId(arg.playerEntityId());
+      this.client.player.setId(packet.playerEntityId());
       this.world.addEntityPrivate(this.client.player);
       this.client.player.input = new KeyboardInput(this.client.options);
       this.client.interactionManager.copyAbilities(this.client.player);
       this.client.cameraEntity = this.client.player;
       this.m_tkenwwao(this.client.player, this.world, DownloadingTerrainScreen.BackgroundType.OTHER);
-      this.client.player.setReducedDebugInfo(arg.reducedDebugInfo());
-      this.client.player.setShowsDeathScreen(arg.showDeathScreen());
-      this.client.player.setDoLimitedCrafting(arg.doLimitedCrafting());
+      this.client.player.setReducedDebugInfo(packet.reducedDebugInfo());
+      this.client.player.setShowsDeathScreen(packet.showDeathScreen());
+      this.client.player.setDoLimitedCrafting(packet.doLimitedCrafting());
       this.client.player.setLastDeathPos(lv.lastDeathLocation());
       this.client.player.setNetherPortalCooldown(lv.portalCooldown());
       this.client.interactionManager.setGameModes(lv.gameType(), lv.previousGameType());
-      this.client.options.setServerViewDistance(arg.viewDistance());
+      this.client.options.setServerViewDistance(packet.viewDistance());
       this.chatSession = null;
       this.lastSeenMessageTracker = new LastSeenMessageTracker(20);
       this.messageSignatureStorage = MessageSignatureStorage.create();
@@ -646,9 +646,9 @@
          this.m_iikuaxff();
       }
 
-      this.telemetryManager.onPlayerInfoReceived(lv.gameType(), arg.hardcore());
+      this.telemetryManager.onPlayerInfoReceived(lv.gameType(), packet.hardcore());
       this.client.getQuickPlayLogger().log(this.client);
-      this.f_ywwatonl = arg.enforcesSecureChat();
+      this.f_ywwatonl = packet.enforcesSecureChat();
       if (this.serverInfo != null && !this.seenInsecureChatWarning && !this.isSecureChatEnforced()) {
          SystemToast lv5 = SystemToast.create(this.client, SystemToast.Id.UNSECURE_SERVER_WARNING, UNSECURE_SERVER_TOAST_TITLE, UNSECURE_SERVER_TOAST);
          this.client.m_jyckrxju().m_ifuynxvc(lv5);
@@ -660,19 +660,19 @@
     * Mapping not found
     */
    @Override
-   public void onEntitySpawned(EntitySpawnS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      if (this.f_mhfzfcqe.isPresent() && this.f_mhfzfcqe.getAsInt() == arg.getId()) {
+   public void onEntitySpawned(EntitySpawnS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      if (this.f_mhfzfcqe.isPresent() && this.f_mhfzfcqe.getAsInt() == packet.getId()) {
          this.f_mhfzfcqe = OptionalInt.empty();
       }
 
-      Entity lv = this.getSpawnedEntity(arg);
+      Entity lv = this.getSpawnedEntity(packet);
       if (lv != null) {
-         lv.onSpawnPacket(arg);
+         lv.onSpawnPacket(packet);
          this.world.addEntityPrivate(lv);
          this.playEntitySpawnSound(lv);
       } else {
-         LOGGER.warn("Skipping Entity with id {}", arg.getEntityTypeId());
+         LOGGER.warn("Skipping Entity with id {}", packet.getEntityTypeId());
       }
    }
 
@@ -720,16 +720,16 @@
     * Mapping not found
     */
    @Override
-   public void onExperienceOrbSpawn(ExperienceOrbSpawnS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      double d = arg.getX();
-      double e = arg.getY();
-      double f = arg.getZ();
-      Entity lv = new ExperienceOrbEntity(this.world, d, e, f, arg.getExperience());
+   public void onExperienceOrbSpawn(ExperienceOrbSpawnS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      double d = packet.getX();
+      double e = packet.getY();
+      double f = packet.getZ();
+      Entity lv = new ExperienceOrbEntity(this.world, d, e, f, packet.getExperience());
       lv.syncPacketPositionCodec(d, e, f);
       lv.setYaw(0.0F);
       lv.setPitch(0.0F);
-      lv.setId(arg.getId());
+      lv.setId(packet.getId());
       this.world.addEntityPrivate(lv);
    }
 
@@ -737,11 +737,11 @@
     * Mapping not found
     */
    @Override
-   public void onVelocityUpdate(EntityVelocityUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      Entity lv = this.world.getEntityById(arg.getId());
+   public void onVelocityUpdate(EntityVelocityUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      Entity lv = this.world.getEntityById(packet.getId());
       if (lv != null) {
-         lv.setVelocityClient(arg.getVelocityX(), arg.getVelocityY(), arg.getVelocityZ());
+         lv.setVelocityClient(packet.getVelocityX(), packet.getVelocityY(), packet.getVelocityZ());
       }
    }
 
@@ -749,11 +749,11 @@
     * Mapping not found
     */
    @Override
-   public void onEntityTrackerUpdate(EntityTrackerUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      Entity lv = this.world.getEntityById(arg.id());
+   public void onEntityTrackerUpdate(EntityTrackerUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      Entity lv = this.world.getEntityById(packet.id());
       if (lv != null) {
-         lv.getDataTracker().writeUpdatedEntries(arg.trackedValues());
+         lv.getDataTracker().writeUpdatedEntries(packet.trackedValues());
       }
    }
 
@@ -761,15 +761,15 @@
     * Mapping not found
     */
    @Override
-   public void onEntityPositionUpdate(EntityPositionUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      Entity lv = this.world.getEntityById(arg.id());
+   public void onEntityPositionUpdate(EntityPositionUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      Entity lv = this.world.getEntityById(packet.id());
       if (lv != null) {
-         Vec3d lv2 = arg.values().position();
+         Vec3d lv2 = packet.values().position();
          lv.getPacketPositionCodec().setPos(lv2);
          if (!lv.isLogicalSideForUpdatingMovement()) {
-            float f = arg.values().yRot();
-            float g = arg.values().xRot();
+            float f = packet.values().yRot();
+            float g = packet.values().xRot();
             boolean bl = lv.getPos().squaredDistanceTo(lv2) > 4096.0;
             if (this.world.m_gppbsjis(lv) && !bl) {
                lv.updateTrackedPositionAndAngles(lv2.x, lv2.y, lv2.z, f, g, 3);
@@ -781,7 +781,7 @@
                }
             }
 
-            lv.setOnGround(arg.onGround());
+            lv.setOnGround(packet.onGround());
          }
       }
    }
@@ -790,13 +790,13 @@
     * Mapping not found
     */
    @Override
-   public void onEntityPositionUpdate(EntityTeleportS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      Entity lv = this.world.getEntityById(arg.id());
+   public void onEntityPositionUpdate(EntityTeleportS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      Entity lv = this.world.getEntityById(packet.id());
       if (lv == null) {
-         if (this.f_mhfzfcqe.isPresent() && this.f_mhfzfcqe.getAsInt() == arg.id()) {
-            LOGGER.debug("Trying to teleport entity with id {}, that was formerly player vehicle, applying teleport to player instead", arg.id());
-            m_noarotfs(arg.change(), arg.relatives(), this.client.player, false);
+         if (this.f_mhfzfcqe.isPresent() && this.f_mhfzfcqe.getAsInt() == packet.id()) {
+            LOGGER.debug("Trying to teleport entity with id {}, that was formerly player vehicle, applying teleport to player instead", packet.id());
+            m_noarotfs(packet.change(), packet.relatives(), this.client.player, false);
             this.connection
                .send(
                   new PlayerMoveC2SPacket.Full(
@@ -811,10 +811,10 @@
                );
          }
       } else {
-         boolean bl = arg.relatives().contains(PositionFlag.X) || arg.relatives().contains(PositionFlag.Y) || arg.relatives().contains(PositionFlag.Z);
+         boolean bl = packet.relatives().contains(PositionFlag.X) || packet.relatives().contains(PositionFlag.Y) || packet.relatives().contains(PositionFlag.Z);
          boolean bl2 = this.world.m_gppbsjis(lv) || !lv.isLogicalSideForUpdatingMovement() || bl;
-         boolean bl3 = m_noarotfs(arg.change(), arg.relatives(), lv, bl2);
-         lv.setOnGround(arg.onGround());
+         boolean bl3 = m_noarotfs(packet.change(), packet.relatives(), lv, bl2);
+         lv.setOnGround(packet.onGround());
          if (!bl3 && lv.hasPassengerDeep(this.client.player)) {
             lv.updatePassengerPosition(this.client.player);
             this.client.player.setPrevPosAndAngles();
@@ -829,12 +829,12 @@
     * Mapping not found
     */
    @Override
-   public void onUpdateTickRate(UpdateTickRateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void onUpdateTickRate(UpdateTickRateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
       if (this.client.world != null) {
          TickManager lv = this.client.world.getTickManager();
-         lv.setTickRate(arg.tickRate());
-         lv.setFrozen(arg.isFrozen());
+         lv.setTickRate(packet.tickRate());
+         lv.setFrozen(packet.isFrozen());
       }
    }
 
@@ -842,22 +842,23 @@
     * Mapping not found
     */
    @Override
-   public void onTickStep(TickStepS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void onTickStep(TickStepS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
       if (this.client.world != null) {
          TickManager lv = this.client.world.getTickManager();
-         lv.setToTick(arg.tickSteps());
+         lv.setToTick(packet.tickSteps());
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_jmznxugg Lnet/minecraft/unmapped/C_nuofrxvi;m_jmznxugg(Lnet/minecraft/unmapped/C_uqhumrao;)V}
+    * @mapping {@literal named m_jmznxugg Lnet/minecraft/client/network/ClientPlayNetworkHandler;m_jmznxugg(Lnet/minecraft/unmapped/C_uqhumrao;)V}
     */
    @Override
-   public void m_jmznxugg(C_uqhumrao arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      if (PlayerInventory.isValidHotbarIndex(arg.slot())) {
-         this.client.player.getInventory().selectedSlot = arg.slot();
+   public void m_jmznxugg(C_uqhumrao packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      if (PlayerInventory.isValidHotbarIndex(packet.slot())) {
+         this.client.player.getInventory().selectedSlot = packet.slot();
       }
    }
 
@@ -865,41 +866,42 @@
     * Mapping not found
     */
    @Override
-   public void onEntityUpdate(EntityUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      Entity lv = arg.getEntity(this.world);
+   public void onEntityUpdate(EntityUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      Entity lv = packet.getEntity(this.world);
       if (lv != null) {
          if (lv.isLogicalSideForUpdatingMovement()) {
             PacketPositionCodec lv2 = lv.getPacketPositionCodec();
-            Vec3d lv3 = lv2.offset((long)arg.getDeltaX(), (long)arg.getDeltaY(), (long)arg.getDeltaZ());
+            Vec3d lv3 = lv2.offset((long)packet.getDeltaX(), (long)packet.getDeltaY(), (long)packet.getDeltaZ());
             lv2.setPos(lv3);
          } else {
-            if (arg.isPositionChanged()) {
+            if (packet.isPositionChanged()) {
                PacketPositionCodec lv4 = lv.getPacketPositionCodec();
-               Vec3d lv5 = lv4.offset((long)arg.getDeltaX(), (long)arg.getDeltaY(), (long)arg.getDeltaZ());
+               Vec3d lv5 = lv4.offset((long)packet.getDeltaX(), (long)packet.getDeltaY(), (long)packet.getDeltaZ());
                lv4.setPos(lv5);
-               float f = arg.hasRotation() ? arg.getYaw() : lv.getLerpTargetYaw();
-               float g = arg.hasRotation() ? arg.getPitch() : lv.getLerpTargetPitch();
+               float f = packet.hasRotation() ? packet.getYaw() : lv.getLerpTargetYaw();
+               float g = packet.hasRotation() ? packet.getPitch() : lv.getLerpTargetPitch();
                lv.updateTrackedPositionAndAngles(lv5.getX(), lv5.getY(), lv5.getZ(), f, g, 3);
-            } else if (arg.hasRotation()) {
-               lv.updateTrackedPositionAndAngles(lv.getLerpTargetX(), lv.getLerpTargetY(), lv.getLerpTargetZ(), arg.getYaw(), arg.getPitch(), 3);
+            } else if (packet.hasRotation()) {
+               lv.updateTrackedPositionAndAngles(lv.getLerpTargetX(), lv.getLerpTargetY(), lv.getLerpTargetZ(), packet.getYaw(), packet.getPitch(), 3);
             }
 
-            lv.setOnGround(arg.isOnGround());
+            lv.setOnGround(packet.isOnGround());
          }
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_srpqekvk Lnet/minecraft/unmapped/C_nuofrxvi;m_srpqekvk(Lnet/minecraft/unmapped/C_poljqryj;)V}
+    * @mapping {@literal named m_srpqekvk Lnet/minecraft/client/network/ClientPlayNetworkHandler;m_srpqekvk(Lnet/minecraft/unmapped/C_poljqryj;)V}
     */
    @Override
-   public void m_srpqekvk(C_poljqryj arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      Entity lv = arg.m_jflrgbhx(this.world);
+   public void m_srpqekvk(C_poljqryj packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      Entity lv = packet.m_jflrgbhx(this.world);
       if (lv instanceof AbstractMinecartEntity lv2) {
          if (!lv.isLogicalSideForUpdatingMovement() && lv2.getController() instanceof ExperimentalMinecartController lv4) {
-            lv4.lerpSteps.addAll(arg.lerpSteps());
+            lv4.lerpSteps.addAll(packet.lerpSteps());
          }
       }
    }
@@ -908,11 +910,11 @@
     * Mapping not found
     */
    @Override
-   public void onEntityHeadYawUpdate(EntityHeadYawUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      Entity lv = arg.getEntity(this.world);
+   public void onEntityHeadYawUpdate(EntityHeadYawUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      Entity lv = packet.getEntity(this.world);
       if (lv != null) {
-         lv.updateTrackedHeadRotation(arg.getHeadYaw(), 3);
+         lv.updateTrackedHeadRotation(packet.getHeadYaw(), 3);
       }
    }
 
@@ -920,9 +922,9 @@
     * Mapping not found
     */
    @Override
-   public void onEntityDestruction(EntityDestructionS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      arg.getEntityIds().forEach(i -> {
+   public void onEntityDestruction(EntityDestructionS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      packet.getEntityIds().forEach(i -> {
          Entity lv = this.world.getEntityById(i);
          if (lv != null) {
             if (lv.hasPassengerDeep(this.client.player)) {
@@ -939,15 +941,15 @@
     * Mapping not found
     */
    @Override
-   public void onPlayerPoseUpdate(PlayerPoseUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void onPlayerPoseUpdate(PlayerPoseUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
       PlayerEntity lv = this.client.player;
       if (!lv.hasVehicle()) {
-         m_noarotfs(arg.change(), arg.relatives(), lv, false);
+         m_noarotfs(packet.change(), packet.relatives(), lv, false);
       }
 
       this.connection.send(new PlayerMoveC2SPacket.Full(lv.getX(), lv.getY(), lv.getZ(), lv.getYaw(), lv.getPitch(), false, false));
-      this.connection.send(new TeleportConfirmationC2SPacket(arg.id()));
+      this.connection.send(new TeleportConfirmationC2SPacket(packet.id()));
    }
 
    /**
@@ -975,14 +977,15 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_pgcvqlca Lnet/minecraft/unmapped/C_nuofrxvi;m_pgcvqlca(Lnet/minecraft/unmapped/C_npripfjn;)V}
+    * @mapping {@literal named m_pgcvqlca Lnet/minecraft/client/network/ClientPlayNetworkHandler;m_pgcvqlca(Lnet/minecraft/unmapped/C_npripfjn;)V}
     */
    @Override
-   public void m_pgcvqlca(C_npripfjn arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void m_pgcvqlca(C_npripfjn packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
       PlayerEntity lv = this.client.player;
-      lv.setYaw(arg.yRot());
-      lv.setPitch(arg.xRot());
+      lv.setYaw(packet.yRot());
+      lv.setPitch(packet.xRot());
       lv.setPrevAngles();
       this.connection.send(new PlayerMoveC2SPacket.LookAndOnGround(lv.getYaw(), lv.getPitch(), false, false));
    }
@@ -991,21 +994,21 @@
     * Mapping not found
     */
    @Override
-   public void onChunkDeltaUpdate(ChunkDeltaUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      arg.visitUpdates((pos, state) -> this.world.setVerifiedBlockState(pos, state, 19));
+   public void onChunkDeltaUpdate(ChunkDeltaUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      packet.visitUpdates((pos, state) -> this.world.setVerifiedBlockState(pos, state, 19));
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onChunkData(ChunkDataS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      int i = arg.chunkX();
-      int j = arg.chunkZ();
-      this.updateWorldChunk(i, j, arg.chunkData());
-      LightData lv = arg.lightUpdateData();
+   public void onChunkData(ChunkDataS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      int i = packet.getX();
+      int j = packet.getZ();
+      this.updateWorldChunk(i, j, packet.getData());
+      LightData lv = packet.lightUpdateData();
       this.world.queueLightUpdate(() -> {
          this.readLightData(i, j, lv, false);
          WorldChunk lvx = this.world.getChunkManager().getWorldChunk(i, j, false);
@@ -1020,18 +1023,18 @@
     * Mapping not found
     */
    @Override
-   public void onChunkBiomeData(ChunkBiomeDataS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void onChunkBiomeData(ChunkBiomeDataS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
 
-      for (ChunkBiomeDataS2CPacket.Serialized lv : arg.chunkBiomeData()) {
+      for (ChunkBiomeDataS2CPacket.Serialized lv : packet.chunkBiomeData()) {
          this.world.getChunkManager().loadBiomeFromPacket(lv.pos().x, lv.pos().z, lv.createPacketByteBuf());
       }
 
-      for (ChunkBiomeDataS2CPacket.Serialized lv2 : arg.chunkBiomeData()) {
+      for (ChunkBiomeDataS2CPacket.Serialized lv2 : packet.chunkBiomeData()) {
          this.world.onChunkLoaded(new ChunkPos(lv2.pos().x, lv2.pos().z));
       }
 
-      for (ChunkBiomeDataS2CPacket.Serialized lv3 : arg.chunkBiomeData()) {
+      for (ChunkBiomeDataS2CPacket.Serialized lv3 : packet.chunkBiomeData()) {
          for (int i = -1; i <= 1; i++) {
             for (int j = -1; j <= 1; j++) {
                for (int k = this.world.getBottomSectionCoord(); k <= this.world.getTopSectionCoord(); k++) {
@@ -1072,10 +1075,10 @@
     * Mapping not found
     */
    @Override
-   public void onChunkUnload(ChunkUnloadS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.world.getChunkManager().unload(arg.pos());
-      this.queueLightUnload(arg);
+   public void onChunkUnload(ChunkUnloadS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.world.getChunkManager().unload(packet.pos());
+      this.queueLightUnload(packet);
    }
 
    /**
@@ -1104,17 +1107,17 @@
     * Mapping not found
     */
    @Override
-   public void onBlockUpdate(BlockUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.world.setVerifiedBlockState(arg.getPos(), arg.getState(), 19);
+   public void onBlockUpdate(BlockUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.world.setVerifiedBlockState(packet.getPos(), packet.getState(), 19);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onReconfigure(ReconfigureS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void onReconfigure(ReconfigureS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
       this.client.getChatListener().handleDelayedMessages();
       this.sendMessageAcknowledgment();
       ChatHud.ChatState lv = this.client.inGameHud.getChatHud().toChatState();
@@ -1148,10 +1151,10 @@
     * Mapping not found
     */
    @Override
-   public void onItemPickupAnimation(ItemPickupAnimationS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      Entity lv = this.world.getEntityById(arg.getEntityId());
-      LivingEntity lv2 = (LivingEntity)this.world.getEntityById(arg.getCollectorEntityId());
+   public void onItemPickupAnimation(ItemPickupAnimationS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      Entity lv = this.world.getEntityById(packet.getEntityId());
+      LivingEntity lv2 = (LivingEntity)this.world.getEntityById(packet.getCollectorEntityId());
       if (lv2 == null) {
          lv2 = this.client.player;
       }
@@ -1187,14 +1190,14 @@
          if (lv instanceof ItemEntity lv3) {
             ItemStack lv4 = lv3.getStack();
             if (!lv4.isEmpty()) {
-               lv4.decrement(arg.getStackAmount());
+               lv4.decrement(packet.getStackAmount());
             }
 
             if (lv4.isEmpty()) {
-               this.world.removeEntity(arg.getEntityId(), Entity.RemovalReason.DISCARDED);
+               this.world.removeEntity(packet.getEntityId(), Entity.RemovalReason.DISCARDED);
             }
          } else if (!(lv instanceof ExperienceOrbEntity)) {
-            this.world.removeEntity(arg.getEntityId(), Entity.RemovalReason.DISCARDED);
+            this.world.removeEntity(packet.getEntityId(), Entity.RemovalReason.DISCARDED);
          }
       }
    }
@@ -1203,42 +1206,42 @@
     * Mapping not found
     */
    @Override
-   public void onSystemMessage(SystemMessageS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.client.getChatListener().handleSystemMessage(arg.content(), arg.overlay());
+   public void onSystemMessage(SystemMessageS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.client.getChatListener().handleSystemMessage(packet.content(), packet.overlay());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onChatMessage(ChatMessageS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      Optional<MessageBody> optional = arg.body().createBody(this.messageSignatureStorage);
+   public void onChatMessage(ChatMessageS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      Optional<MessageBody> optional = packet.body().createBody(this.messageSignatureStorage);
       if (optional.isEmpty()) {
          this.connection.disconnect(INVALID_PACKET_DISCONNECT);
       } else {
-         this.messageSignatureStorage.sign((MessageBody)optional.get(), arg.signature());
-         UUID uUID = arg.sender();
+         this.messageSignatureStorage.sign((MessageBody)optional.get(), packet.signature());
+         UUID uUID = packet.sender();
          PlayerListEntry lv = this.getPlayerListEntry(uUID);
          if (lv == null) {
             LOGGER.error("Received player chat packet for unknown player with ID: {}", uUID);
-            this.client.getChatListener().handleInvalidMessage(uUID, arg.messageType());
+            this.client.getChatListener().handleInvalidMessage(uUID, packet.messageType());
          } else {
             PublicChatSession lv2 = lv.getChatSession();
             MessageLink lv3;
             if (lv2 != null) {
-               lv3 = new MessageLink(arg.index(), uUID, lv2.sessionId());
+               lv3 = new MessageLink(packet.index(), uUID, lv2.sessionId());
             } else {
                lv3 = MessageLink.create(uUID);
             }
 
-            SignedChatMessage lv5 = new SignedChatMessage(lv3, arg.signature(), (MessageBody)optional.get(), arg.unsignedContent(), arg.filterMask());
+            SignedChatMessage lv5 = new SignedChatMessage(lv3, packet.signature(), (MessageBody)optional.get(), packet.unsignedContent(), packet.filterMask());
             lv5 = lv.getMessageVerifier().updateAndValidate(lv5);
             if (lv5 != null) {
-               this.client.getChatListener().handlePlayerMessage(lv5, lv.getProfile(), arg.messageType());
+               this.client.getChatListener().handlePlayerMessage(lv5, lv.getProfile(), packet.messageType());
             } else {
-               this.client.getChatListener().handleInvalidMessage(uUID, arg.messageType());
+               this.client.getChatListener().handleInvalidMessage(uUID, packet.messageType());
             }
          }
       }
@@ -1248,18 +1251,18 @@
     * Mapping not found
     */
    @Override
-   public void onProfileIndependentMessage(ProfileIndependentMessageS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.client.getChatListener().handleMessage(arg.message(), arg.messageType());
+   public void onProfileIndependentMessage(ProfileIndependentMessageS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.client.getChatListener().handleMessage(packet.message(), packet.messageType());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onMessageRemoval(MessageRemovalS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      Optional<MessageSignature> optional = arg.signature().get(this.messageSignatureStorage);
+   public void onMessageRemoval(MessageRemovalS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      Optional<MessageSignature> optional = packet.signature().get(this.messageSignatureStorage);
       if (optional.isEmpty()) {
          this.connection.disconnect(INVALID_PACKET_DISCONNECT);
       } else {
@@ -1274,22 +1277,22 @@
     * Mapping not found
     */
    @Override
-   public void onEntityAnimation(EntityAnimationS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      Entity lv = this.world.getEntityById(arg.getId());
+   public void onEntityAnimation(EntityAnimationS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      Entity lv = this.world.getEntityById(packet.getId());
       if (lv != null) {
-         if (arg.getAnimationId() == 0) {
+         if (packet.getAnimationId() == 0) {
             LivingEntity lv2 = (LivingEntity)lv;
             lv2.swingHand(Hand.MAIN_HAND);
-         } else if (arg.getAnimationId() == EntityAnimationS2CPacket.SWING_OFF_HAND) {
+         } else if (packet.getAnimationId() == EntityAnimationS2CPacket.SWING_OFF_HAND) {
             LivingEntity lv3 = (LivingEntity)lv;
             lv3.swingHand(Hand.OFF_HAND);
-         } else if (arg.getAnimationId() == EntityAnimationS2CPacket.WAKE_UP) {
+         } else if (packet.getAnimationId() == EntityAnimationS2CPacket.WAKE_UP) {
             PlayerEntity lv4 = (PlayerEntity)lv;
             lv4.wakeUp(false, false);
-         } else if (arg.getAnimationId() == EntityAnimationS2CPacket.CRIT) {
+         } else if (packet.getAnimationId() == EntityAnimationS2CPacket.CRIT) {
             this.client.particleManager.addEmitter(lv, ParticleTypes.CRIT);
-         } else if (arg.getAnimationId() == EntityAnimationS2CPacket.ENCHANTED_HIT) {
+         } else if (packet.getAnimationId() == EntityAnimationS2CPacket.ENCHANTED_HIT) {
             this.client.particleManager.addEmitter(lv, ParticleTypes.ENCHANTED_HIT);
          }
       }
@@ -1299,11 +1302,11 @@
     * Mapping not found
     */
    @Override
-   public void onDamageAnimation(DamageAnimationS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      Entity lv = this.world.getEntityById(arg.id());
+   public void onDamageAnimation(DamageAnimationS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      Entity lv = this.world.getEntityById(packet.id());
       if (lv != null) {
-         lv.animateDamage(arg.yaw());
+         lv.animateDamage(packet.yaw());
       }
    }
 
@@ -1311,35 +1314,35 @@
     * Mapping not found
     */
    @Override
-   public void onWorldTimeUpdate(WorldTimeUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.world.m_qrszgjes(arg.gameTime(), arg.dayTime(), arg.tickDayTime());
-      this.telemetryManager.setWorldUnloadTime(arg.gameTime());
+   public void onWorldTimeUpdate(WorldTimeUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.world.m_qrszgjes(packet.gameTime(), packet.dayTime(), packet.tickDayTime());
+      this.telemetryManager.setWorldUnloadTime(packet.gameTime());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onPlayerSpawnPositionUpdate(PlayerSpawnPositionUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.client.world.setSpawnPos(arg.getPos(), arg.getAngle());
+   public void onPlayerSpawnPositionUpdate(PlayerSpawnPositionUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.client.world.setSpawnPos(packet.getPos(), packet.getAngle());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onEntityPassengersUpdate(EntityPassengersUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      Entity lv = this.world.getEntityById(arg.getId());
+   public void onEntityPassengersUpdate(EntityPassengersUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      Entity lv = this.world.getEntityById(packet.getId());
       if (lv == null) {
          LOGGER.warn("Received passengers for unknown entity");
       } else {
          boolean bl = lv.hasPassengerDeep(this.client.player);
          lv.removeAllPassengers();
 
-         for (int i : arg.getPassengerIds()) {
+         for (int i : packet.getPassengerIds()) {
             Entity lv2 = this.world.getEntityById(i);
             if (lv2 != null) {
                lv2.startRiding(lv, true);
@@ -1366,10 +1369,10 @@
     * Mapping not found
     */
    @Override
-   public void onEntityAttachment(EntityAttachmentS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      if (this.world.getEntityById(arg.getAttachedEntityId()) instanceof Leashable lv2) {
-         lv2.setDelayedLeashHolderId(arg.getHoldingEntityId());
+   public void onEntityAttachment(EntityAttachmentS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      if (this.world.getEntityById(packet.getAttachedEntityId()) instanceof Leashable lv2) {
+         lv2.setDelayedLeashHolderId(packet.getHoldingEntityId());
       }
    }
 
@@ -1392,11 +1395,11 @@
     * Mapping not found
     */
    @Override
-   public void onEntityEvent(EntityEventS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      Entity lv = arg.getEntity(this.world);
+   public void onEntityEvent(EntityEventS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      Entity lv = packet.getEntity(this.world);
       if (lv != null) {
-         switch (arg.getStatus()) {
+         switch (packet.getStatus()) {
             case 21:
                this.client.getSoundManager().play(new GuardianAttackSoundInstance((GuardianEntity)lv));
                break;
@@ -1412,7 +1415,7 @@
                this.client.getSoundManager().play(new SnifferSoundInstance((SnifferEntity)lv));
                break;
             default:
-               lv.handleStatus(arg.getStatus());
+               lv.handleStatus(packet.getStatus());
          }
       }
    }
@@ -1421,11 +1424,11 @@
     * Mapping not found
     */
    @Override
-   public void handleDamageEvent(DamageEventS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      Entity lv = this.world.getEntityById(arg.entityId());
+   public void handleDamageEvent(DamageEventS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      Entity lv = this.world.getEntityById(packet.entityId());
       if (lv != null) {
-         lv.handleDamagingEvent(arg.getDamageSource(this.world));
+         lv.handleDamagingEvent(packet.getDamageSource(this.world));
       }
    }
 
@@ -1433,29 +1436,29 @@
     * Mapping not found
     */
    @Override
-   public void onHealthUpdate(HealthUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.client.player.updateHealth(arg.getHealth());
-      this.client.player.getHungerManager().setFoodLevel(arg.getFood());
-      this.client.player.getHungerManager().setSaturationLevel(arg.getSaturation());
+   public void onHealthUpdate(HealthUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.client.player.updateHealth(packet.getHealth());
+      this.client.player.getHungerManager().setFoodLevel(packet.getFood());
+      this.client.player.getHungerManager().setSaturationLevel(packet.getSaturation());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onExperienceBarUpdate(ExperienceBarUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.client.player.setExperience(arg.getBarProgress(), arg.getExperienceLevel(), arg.getExperience());
+   public void onExperienceBarUpdate(ExperienceBarUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.client.player.setExperience(packet.getBarProgress(), packet.getExperienceLevel(), packet.getExperience());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onPlayerRespawn(PlayerRespawnS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      CommonPlayerSpawnInfo lv = arg.commonPlayerSpawnInfo();
+   public void onPlayerRespawn(PlayerRespawnS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      CommonPlayerSpawnInfo lv = packet.commonPlayerSpawnInfo();
       RegistryKey<World> lv2 = lv.dimension();
       Holder<DimensionType> lv3 = lv.dimensionType();
       ClientPlayerEntity lv4 = this.client.player;
@@ -1480,7 +1483,7 @@
       }
 
       ClientPlayerEntity lv8;
-      if (arg.hasKeptDataFlag((byte)2)) {
+      if (packet.hasKeptDataFlag((byte)2)) {
          lv8 = this.client.interactionManager.createPlayer(this.world, lv4.getStatHandler(), lv4.getRecipeBook(), lv4.isSneaking(), lv4.isSprinting());
       } else {
          lv8 = this.client.interactionManager.createPlayer(this.world, lv4.getStatHandler(), lv4.getRecipeBook());
@@ -1494,7 +1497,7 @@
       }
 
       this.client.cameraEntity = lv8;
-      if (arg.hasKeptDataFlag((byte)2)) {
+      if (packet.hasKeptDataFlag((byte)2)) {
          List<DataTracker.SerializedEntry<?>> list = lv4.getDataTracker().serializeData();
          if (list != null) {
             lv8.getDataTracker().writeUpdatedEntries(list);
@@ -1508,7 +1511,7 @@
          lv8.setYaw(-180.0F);
       }
 
-      if (arg.hasKeptDataFlag((byte)1)) {
+      if (packet.hasKeptDataFlag((byte)1)) {
          lv8.getAttributes().setValuesFrom(lv4.getAttributes());
       } else {
          lv8.getAttributes().setBaseValuesFrom(lv4.getAttributes());
@@ -1550,36 +1553,36 @@
     * Mapping not found
     */
    @Override
-   public void onExplosionOccurs(ExplosionOccursS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      Vec3d lv = arg.center();
+   public void onExplosionOccurs(ExplosionOccursS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      Vec3d lv = packet.center();
       this.client
          .world
          .playSound(
             lv.getX(),
             lv.getY(),
             lv.getZ(),
-            arg.explosionSound().getValue(),
+            packet.explosionSound().getValue(),
             SoundCategory.BLOCKS,
             4.0F,
             (1.0F + (this.client.world.random.nextFloat() - this.client.world.random.nextFloat()) * 0.2F) * 0.7F,
             false
          );
-      this.client.world.addParticle(arg.explosionParticle(), lv.getX(), lv.getY(), lv.getZ(), 1.0, 0.0, 0.0);
-      arg.playerKnockback().ifPresent(this.client.player::addVelocityInternal);
+      this.client.world.addParticle(packet.explosionParticle(), lv.getX(), lv.getY(), lv.getZ(), 1.0, 0.0, 0.0);
+      packet.playerKnockback().ifPresent(this.client.player::addVelocityInternal);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onHorseScreenOpen(HorseScreenOpenS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      if (this.world.getEntityById(arg.getHorseId()) instanceof AbstractHorseEntity lv2) {
+   public void onHorseScreenOpen(HorseScreenOpenS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      if (this.world.getEntityById(packet.getHorseId()) instanceof AbstractHorseEntity lv2) {
          ClientPlayerEntity lv3 = this.client.player;
-         int i = arg.m_fdbmmudq();
+         int i = packet.m_fdbmmudq();
          SimpleInventory lv4 = new SimpleInventory(AbstractHorseEntity.getInventorySize(i));
-         HorseScreenHandler lv5 = new HorseScreenHandler(arg.getSyncId(), lv3.getInventory(), lv4, lv2, i);
+         HorseScreenHandler lv5 = new HorseScreenHandler(packet.getSyncId(), lv3.getInventory(), lv4, lv2, i);
          lv3.currentScreenHandler = lv5;
          this.client.setScreen(new HorseScreen(lv5, lv3.getInventory(), lv2, i));
       }
@@ -1589,20 +1592,20 @@
     * Mapping not found
     */
    @Override
-   public void onScreenOpen(ScreenOpenS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      HandledScreens.open(arg.getScreenHandlerType(), this.client, arg.getSyncId(), arg.getName());
+   public void onScreenOpen(ScreenOpenS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      HandledScreens.open(packet.getScreenHandlerType(), this.client, packet.getSyncId(), packet.getName());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onScreenHandlerSlotUpdate(ScreenHandlerSlotUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void onScreenHandlerSlotUpdate(ScreenHandlerSlotUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
       PlayerEntity lv = this.client.player;
-      ItemStack lv2 = arg.getItemStack();
-      int i = arg.getSlot();
+      ItemStack lv2 = packet.getItemStack();
+      int i = packet.getSlot();
       this.client.getTutorialManager().onSlotUpdate(lv2);
       boolean bl;
       if (this.client.currentScreen instanceof CreativeInventoryScreen lv3) {
@@ -1611,7 +1614,7 @@
          bl = false;
       }
 
-      if (arg.getSyncId() == 0) {
+      if (packet.getSyncId() == 0) {
          if (PlayerScreenHandler.isHotbarSlot(i) && !lv2.isEmpty()) {
             ItemStack lv4 = lv.playerScreenHandler.getSlot(i).getStack();
             if (lv4.isEmpty() || lv4.getCount() < lv2.getCount()) {
@@ -1619,9 +1622,9 @@
             }
          }
 
-         lv.playerScreenHandler.setStackInSlot(i, arg.getRevision(), lv2);
-      } else if (arg.getSyncId() == lv.currentScreenHandler.syncId && (arg.getSyncId() != 0 || !bl)) {
-         lv.currentScreenHandler.setStackInSlot(i, arg.getRevision(), lv2);
+         lv.playerScreenHandler.setStackInSlot(i, packet.getRevision(), lv2);
+      } else if (packet.getSyncId() == lv.currentScreenHandler.syncId && (packet.getSyncId() != 0 || !bl)) {
+         lv.currentScreenHandler.setStackInSlot(i, packet.getRevision(), lv2);
       }
 
       if (this.client.currentScreen instanceof CreativeInventoryScreen) {
@@ -1631,14 +1634,15 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_hxnzowqu Lnet/minecraft/unmapped/C_nuofrxvi;m_hxnzowqu(Lnet/minecraft/unmapped/C_zqywhkdo;)V}
+    * @mapping {@literal named m_hxnzowqu Lnet/minecraft/client/network/ClientPlayNetworkHandler;m_hxnzowqu(Lnet/minecraft/unmapped/C_zqywhkdo;)V}
     */
    @Override
-   public void m_hxnzowqu(C_zqywhkdo arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.client.getTutorialManager().onSlotUpdate(arg.contents());
+   public void m_hxnzowqu(C_zqywhkdo packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.client.getTutorialManager().onSlotUpdate(packet.contents());
       if (!(this.client.currentScreen instanceof CreativeInventoryScreen)) {
-         this.client.player.currentScreenHandler.setCursorStack(arg.contents());
+         this.client.player.currentScreenHandler.setCursorStack(packet.contents());
       }
    }
 
@@ -1646,23 +1650,23 @@
     * Mapping not found
     */
    @Override
-   public void onPlayerInventoryUpdate(PlayerInventoryUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.client.getTutorialManager().onSlotUpdate(arg.contents());
-      this.client.player.getInventory().setStack(arg.slot(), arg.contents());
+   public void onPlayerInventoryUpdate(PlayerInventoryUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.client.getTutorialManager().onSlotUpdate(packet.contents());
+      this.client.player.getInventory().setStack(packet.slot(), packet.contents());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onInventoryUpdate(InventoryUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void onInventoryUpdate(InventoryUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
       PlayerEntity lv = this.client.player;
-      if (arg.getSyncId() == 0) {
-         lv.playerScreenHandler.updateSlotStacks(arg.getRevision(), arg.getContents(), arg.getCursorStack());
-      } else if (arg.getSyncId() == lv.currentScreenHandler.syncId) {
-         lv.currentScreenHandler.updateSlotStacks(arg.getRevision(), arg.getContents(), arg.getCursorStack());
+      if (packet.getSyncId() == 0) {
+         lv.playerScreenHandler.updateSlotStacks(packet.getRevision(), packet.getContents(), packet.getCursorStack());
+      } else if (packet.getSyncId() == lv.currentScreenHandler.syncId) {
+         lv.currentScreenHandler.updateSlotStacks(packet.getRevision(), packet.getContents(), packet.getCursorStack());
       }
    }
 
@@ -1670,11 +1674,11 @@
     * Mapping not found
     */
    @Override
-   public void onSignEditorOpen(SignEditorOpenS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      BlockPos lv = arg.getPos();
+   public void onSignEditorOpen(SignEditorOpenS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      BlockPos lv = packet.getPos();
       if (this.world.getBlockEntity(lv) instanceof SignBlockEntity lv2) {
-         this.client.player.openEditSignScreen(lv2, arg.isFromFront());
+         this.client.player.openEditSignScreen(lv2, packet.isFromFront());
       } else {
          LOGGER.warn("Ignoring openTextEdit on an invalid entity: {} at pos {}", this.world.getBlockEntity(lv), lv);
       }
@@ -1684,11 +1688,11 @@
     * Mapping not found
     */
    @Override
-   public void onBlockEntityUpdate(BlockEntityUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      BlockPos lv = arg.getPos();
-      this.client.world.getBlockEntity(lv, arg.getBlockEntityType()).ifPresent(arg2 -> {
-         NbtCompound lvx = arg.getNbt();
+   public void onBlockEntityUpdate(BlockEntityUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      BlockPos lv = packet.getPos();
+      this.client.world.getBlockEntity(lv, packet.getBlockEntityType()).ifPresent(arg2 -> {
+         NbtCompound lvx = packet.getNbt();
          if (!lvx.isEmpty()) {
             arg2.read(lvx, this.clientRegistryManager);
          }
@@ -1703,11 +1707,11 @@
     * Mapping not found
     */
    @Override
-   public void onScreenHandlerPropertyUpdate(ScreenHandlerPropertyUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void onScreenHandlerPropertyUpdate(ScreenHandlerPropertyUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
       PlayerEntity lv = this.client.player;
-      if (lv.currentScreenHandler != null && lv.currentScreenHandler.syncId == arg.getSyncId()) {
-         lv.currentScreenHandler.setProperty(arg.getPropertyId(), arg.getValue());
+      if (lv.currentScreenHandler != null && lv.currentScreenHandler.syncId == packet.getSyncId()) {
+         lv.currentScreenHandler.setProperty(packet.getPropertyId(), packet.getValue());
       }
    }
 
@@ -1715,10 +1719,10 @@
     * Mapping not found
     */
    @Override
-   public void onEntityEquipmentUpdate(EntityEquipmentUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      if (this.world.getEntityById(arg.getId()) instanceof LivingEntity lv2) {
-         arg.getEquipmentList().forEach(pair -> lv2.equipStack((EquipmentSlot)pair.getFirst(), (ItemStack)pair.getSecond()));
+   public void onEntityEquipmentUpdate(EntityEquipmentUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      if (this.world.getEntityById(packet.getId()) instanceof LivingEntity lv2) {
+         packet.getEquipmentList().forEach(pair -> lv2.equipStack((EquipmentSlot)pair.getFirst(), (ItemStack)pair.getSecond()));
       }
    }
 
@@ -1726,8 +1730,8 @@
     * Mapping not found
     */
    @Override
-   public void onScreenClose(ScreenCloseS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void onScreenClose(ScreenCloseS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
       this.client.player.closeScreen();
    }
 
@@ -1735,29 +1739,29 @@
     * Mapping not found
     */
    @Override
-   public void onBlockEvent(BlockEventS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.client.world.addSyncedBlockEvent(arg.getPos(), arg.getBlock(), arg.getBlockType(), arg.getData());
+   public void onBlockEvent(BlockEventS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.client.world.addSyncedBlockEvent(packet.getPos(), packet.getBlock(), packet.getBlockType(), packet.getData());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onBlockBreakingProgressUpdate(BlockBreakingProgressUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.client.world.setBlockBreakingInfo(arg.getEntityId(), arg.getPos(), arg.getProgress());
+   public void onBlockBreakingProgressUpdate(BlockBreakingProgressUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.client.world.setBlockBreakingInfo(packet.getEntityId(), packet.getPos(), packet.getProgress());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onGameStateUpdate(GameStateUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void onGameStateUpdate(GameStateUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
       PlayerEntity lv = this.client.player;
-      GameStateUpdateS2CPacket.Reason lv2 = arg.getReason();
-      float f = arg.getValue();
+      GameStateUpdateS2CPacket.Reason lv2 = packet.getReason();
+      float f = packet.getValue();
       int i = MathHelper.floor(f + 0.5F);
       if (lv2 == GameStateUpdateS2CPacket.NO_RESPAWN_BLOCK) {
          lv.sendMessage(Text.translatable("block.minecraft.spawn.not_valid"), false);
@@ -1829,16 +1833,16 @@
     * Mapping not found
     */
    @Override
-   public void onMapUpdate(MapUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      MapId lv = arg.id();
+   public void onMapUpdate(MapUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      MapId lv = packet.id();
       MapState lv2 = this.client.world.getMapState(lv);
       if (lv2 == null) {
-         lv2 = MapState.of(arg.scale(), arg.locked(), this.client.world.getRegistryKey());
+         lv2 = MapState.of(packet.scale(), packet.locked(), this.client.world.getRegistryKey());
          this.client.world.overrideMapState(lv, lv2);
       }
 
-      arg.apply(lv2);
+      packet.apply(lv2);
       this.client.m_owjuhadp().update(lv, lv2);
    }
 
@@ -1846,12 +1850,12 @@
     * Mapping not found
     */
    @Override
-   public void onWorldEvent(WorldEventS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      if (arg.isGlobal()) {
-         this.client.world.syncGlobalEvent(arg.getEventId(), arg.getPos(), arg.getData());
+   public void onWorldEvent(WorldEventS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      if (packet.isGlobal()) {
+         this.client.world.syncGlobalEvent(packet.getEventId(), packet.getPos(), packet.getData());
       } else {
-         this.client.world.syncWorldEvent(arg.getEventId(), arg.getPos(), arg.getData());
+         this.client.world.syncWorldEvent(packet.getEventId(), packet.getPos(), packet.getData());
       }
    }
 
@@ -1859,18 +1863,18 @@
     * Mapping not found
     */
    @Override
-   public void onAdvancementUpdate(AdvancementUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.advancementHandler.onAdvancements(arg);
+   public void onAdvancementUpdate(AdvancementUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.advancementHandler.onAdvancements(packet);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onAdvancementTabSelection(AdvancementTabSelectionS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      Identifier lv = arg.getTabId();
+   public void onAdvancementTabSelection(AdvancementTabSelectionS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      Identifier lv = packet.getTabId();
       if (lv == null) {
          this.advancementHandler.selectTab(null, false);
       } else {
@@ -1883,47 +1887,47 @@
     * Mapping not found
     */
    @Override
-   public void onCommandTreeUpdate(CommandTreeUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.commandDispatcher = new CommandDispatcher<>(arg.getCommandTree(CommandBuildContext.createSimple(this.clientRegistryManager, this.enabledFlags)));
+   public void onCommandTreeUpdate(CommandTreeUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.commandDispatcher = new CommandDispatcher<>(packet.getCommandTree(CommandBuildContext.createSimple(this.clientRegistryManager, this.enabledFlags)));
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onSoundStop(SoundStopS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.client.getSoundManager().stopSounds(arg.getSoundId(), arg.getCategory());
+   public void onSoundStop(SoundStopS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.client.getSoundManager().stopSounds(packet.getSoundId(), packet.getCategory());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onCommandSuggestionsUpdate(CommandSuggestionsUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.commandSource.onCommandSuggestions(arg.getCompletionId(), arg.getSuggestions());
+   public void onCommandSuggestionsUpdate(CommandSuggestionsUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.commandSource.onCommandSuggestions(packet.getCompletionId(), packet.getSuggestions());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onRecipeSynchronization(RecipeSynchronizationS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.f_umrfdpzl = new C_lxgwrlck(arg.itemSets(), arg.stonecutterRecipes());
+   public void onRecipeSynchronization(RecipeSynchronizationS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.f_umrfdpzl = new C_lxgwrlck(packet.itemSets(), packet.stonecutterRecipes());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onPositionFocus(PositionFocusS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      Vec3d lv = arg.getTargetPosition(this.world);
+   public void onPositionFocus(PositionFocusS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      Vec3d lv = packet.getTargetPosition(this.world);
       if (lv != null) {
-         this.client.player.lookAt(arg.getSelfAnchor(), lv);
+         this.client.player.lookAt(packet.getSelfAnchor(), lv);
       }
    }
 
@@ -1931,10 +1935,10 @@
     * Mapping not found
     */
    @Override
-   public void onNbtQueryResponse(NbtQueryResponseS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      if (!this.dataQueryHandler.handleQueryResponse(arg.getTransactionId(), arg.getNbt())) {
-         LOGGER.debug("Got unhandled response to tag query {}", arg.getTransactionId());
+   public void onNbtQueryResponse(NbtQueryResponseS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      if (!this.dataQueryHandler.handleQueryResponse(packet.getTransactionId(), packet.getNbt())) {
+         LOGGER.debug("Got unhandled response to tag query {}", packet.getTransactionId());
       }
    }
 
@@ -1942,10 +1946,10 @@
     * Mapping not found
     */
    @Override
-   public void onStatisticsUpdate(StatisticsUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void onStatisticsUpdate(StatisticsUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
 
-      for (Entry<Stat<?>> entry : arg.stats().object2IntEntrySet()) {
+      for (Entry<Stat<?>> entry : packet.stats().object2IntEntrySet()) {
          Stat<?> lv = (Stat<?>)entry.getKey();
          int i = entry.getIntValue();
          this.client.player.getStatHandler().setStat(this.client.player, lv, i);
@@ -1957,17 +1961,18 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_vghkufeu Lnet/minecraft/unmapped/C_nuofrxvi;m_vghkufeu(Lnet/minecraft/unmapped/C_fiyoolld;)V}
+    * @mapping {@literal named m_vghkufeu Lnet/minecraft/client/network/ClientPlayNetworkHandler;m_vghkufeu(Lnet/minecraft/unmapped/C_fiyoolld;)V}
     */
    @Override
-   public void m_vghkufeu(C_fiyoolld arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void m_vghkufeu(C_fiyoolld packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
       ClientRecipeBook lv = this.client.player.getRecipeBook();
-      if (arg.replace()) {
+      if (packet.replace()) {
          lv.m_oamglwny();
       }
 
-      for (C_fiyoolld.C_akcqghxx lv2 : arg.entries()) {
+      for (C_fiyoolld.C_akcqghxx lv2 : packet.entries()) {
          lv.m_rolghcaa(lv2.contents());
          if (lv2.m_yhfefzoj()) {
             lv.m_qpvxiwdw(lv2.contents().id());
@@ -1982,14 +1987,15 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_pbydvbfl Lnet/minecraft/unmapped/C_nuofrxvi;m_pbydvbfl(Lnet/minecraft/unmapped/C_jqraxkur;)V}
+    * @mapping {@literal named m_pbydvbfl Lnet/minecraft/client/network/ClientPlayNetworkHandler;m_pbydvbfl(Lnet/minecraft/unmapped/C_jqraxkur;)V}
     */
    @Override
-   public void m_pbydvbfl(C_jqraxkur arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void m_pbydvbfl(C_jqraxkur packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
       ClientRecipeBook lv = this.client.player.getRecipeBook();
 
-      for (RecipeDisplayId lv2 : arg.recipes()) {
+      for (RecipeDisplayId lv2 : packet.recipes()) {
          lv.m_vxnpqsmc(lv2);
       }
 
@@ -1997,13 +2003,14 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_vmxxdocv Lnet/minecraft/unmapped/C_nuofrxvi;m_vmxxdocv(Lnet/minecraft/unmapped/C_uepzhiii;)V}
+    * @mapping {@literal named m_vmxxdocv Lnet/minecraft/client/network/ClientPlayNetworkHandler;m_vmxxdocv(Lnet/minecraft/unmapped/C_uepzhiii;)V}
     */
    @Override
-   public void m_vmxxdocv(C_uepzhiii arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void m_vmxxdocv(C_uepzhiii packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
       ClientRecipeBook lv = this.client.player.getRecipeBook();
-      lv.setOptions(arg.bookSettings());
+      lv.setOptions(packet.bookSettings());
       this.m_kkezawlu(lv);
    }
 
@@ -2022,15 +2029,15 @@
     * Mapping not found
     */
    @Override
-   public void onEntityStatusEffectUpdate(EntityStatusEffectUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      Entity lv = this.world.getEntityById(arg.getEntityId());
+   public void onEntityStatusEffectUpdate(EntityStatusEffectUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      Entity lv = this.world.getEntityById(packet.getEntityId());
       if (lv instanceof LivingEntity) {
-         Holder<StatusEffect> lv2 = arg.getEffect();
+         Holder<StatusEffect> lv2 = packet.getEffect();
          StatusEffectInstance lv3 = new StatusEffectInstance(
-            lv2, arg.getDuration(), arg.getAmplifier(), arg.isAmbient(), arg.shouldShowParticles(), arg.shouldShowIcon(), null
+            lv2, packet.getDuration(), packet.getAmplifier(), packet.isAmbient(), packet.shouldShowParticles(), packet.shouldShowIcon(), null
          );
-         if (!arg.shouldBlend()) {
+         if (!packet.shouldBlend()) {
             lv3.skipBlending();
          }
 
@@ -2051,13 +2058,13 @@
     * Mapping not found
     */
    @Override
-   public void onTagsSynchronization(TagsSynchronizationS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      List<Registry.PendingTags<?>> list = new ArrayList(arg.getGroups().size());
+   public void onTagsSynchronization(TagsSynchronizationS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      List<Registry.PendingTags<?>> list = new ArrayList(packet.getGroups().size());
       boolean bl = this.connection.isLocal();
-      arg.getGroups().forEach((argx, payload) -> {
-         if (!bl || DynamicRegistrySync.isSynced(argx)) {
-            list.add(this.m_rqcfgrmg(argx, payload));
+      packet.getGroups().forEach((arg, payload) -> {
+         if (!bl || DynamicRegistrySync.isSynced(arg)) {
+            list.add(this.m_rqcfgrmg(arg, payload));
          }
       });
       list.forEach(Registry.PendingTags::bind);
@@ -2070,26 +2077,26 @@
     * Mapping not found
     */
    @Override
-   public void onEndCombat(EndCombatS2CPacket arg) {
+   public void onEndCombat(EndCombatS2CPacket packet) {
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onEnterCombat(EnterCombatS2CPacket arg) {
+   public void onEnterCombat(EnterCombatS2CPacket packet) {
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onDeathMessage(DeathMessageS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      Entity lv = this.world.getEntityById(arg.playerId());
+   public void onDeathMessage(DeathMessageS2CPacket packet) {

The diff for this file is not complete!

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

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

View the diff here (3/3):
Continuation of the last diff...
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      Entity lv = this.world.getEntityById(packet.playerId());
       if (lv == this.client.player) {
          if (this.client.player.showsDeathScreen()) {
-            this.client.setScreen(new DeathScreen(arg.message(), this.world.getProperties().isHardcore()));
+            this.client.setScreen(new DeathScreen(packet.message(), this.world.getProperties().isHardcore()));
          } else {
             this.client.player.requestRespawn();
          }
@@ -2100,19 +2107,19 @@
     * Mapping not found
     */
    @Override
-   public void onDifficultyUpdate(DifficultyUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.worldProperties.setDifficulty(arg.getDifficulty());
-      this.worldProperties.setDifficultyLocked(arg.isDifficultyLocked());
+   public void onDifficultyUpdate(DifficultyUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.worldProperties.setDifficulty(packet.getDifficulty());
+      this.worldProperties.setDifficultyLocked(packet.isDifficultyLocked());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onCameraEntityUpdate(CameraEntityUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      Entity lv = arg.getEntity(this.world);
+   public void onCameraEntityUpdate(CameraEntityUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      Entity lv = packet.getEntity(this.world);
       if (lv != null) {
          this.client.setCameraEntity(lv);
       }
@@ -2122,75 +2129,75 @@
     * Mapping not found
     */
    @Override
-   public void onWorldBorderInitialization(WorldBorderInitializationS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void onWorldBorderInitialization(WorldBorderInitializationS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
       WorldBorder lv = this.world.getWorldBorder();
-      lv.setCenter(arg.getCenterX(), arg.getCenterZ());
-      long l = arg.getSizeLerpTime();
+      lv.setCenter(packet.getCenterX(), packet.getCenterZ());
+      long l = packet.getSizeLerpTime();
       if (l > 0L) {
-         lv.interpolateSize(arg.getSize(), arg.getSizeLerpTarget(), l);
+         lv.interpolateSize(packet.getSize(), packet.getSizeLerpTarget(), l);
       } else {
-         lv.setSize(arg.getSizeLerpTarget());
+         lv.setSize(packet.getSizeLerpTarget());
       }
 
-      lv.setMaxRadius(arg.getMaxRadius());
-      lv.setWarningBlocks(arg.getWarningBlocks());
-      lv.setWarningTime(arg.getWarningTime());
+      lv.setMaxRadius(packet.getMaxRadius());
+      lv.setWarningBlocks(packet.getWarningBlocks());
+      lv.setWarningTime(packet.getWarningTime());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onWorldBorderCenterUpdate(WorldBorderCenterUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.world.getWorldBorder().setCenter(arg.getCenterX(), arg.getCenterZ());
+   public void onWorldBorderCenterUpdate(WorldBorderCenterUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.world.getWorldBorder().setCenter(packet.getCenterX(), packet.getCenterZ());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onWorldBorderSizeInterpolation(WorldBorderSizeInterpolationS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.world.getWorldBorder().interpolateSize(arg.getSize(), arg.getSizeLerpTarget(), arg.getSizeLerpTime());
+   public void onWorldBorderSizeInterpolation(WorldBorderSizeInterpolationS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.world.getWorldBorder().interpolateSize(packet.getSize(), packet.getSizeLerpTarget(), packet.getSizeLerpTime());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onWorldBorderSizeUpdate(WorldBorderSizeUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.world.getWorldBorder().setSize(arg.getSizeLerpTarget());
+   public void onWorldBorderSizeUpdate(WorldBorderSizeUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.world.getWorldBorder().setSize(packet.getSizeLerpTarget());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onWorldBorderWarningBlocksUpdate(WorldBorderWarningBlocksUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.world.getWorldBorder().setWarningBlocks(arg.getWarningBlocks());
+   public void onWorldBorderWarningBlocksUpdate(WorldBorderWarningBlocksUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.world.getWorldBorder().setWarningBlocks(packet.getWarningBlocks());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onWorldBorderWarningTimeUpdate(WorldBorderWarningTimeUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.world.getWorldBorder().setWarningTime(arg.getWarningTime());
+   public void onWorldBorderWarningTimeUpdate(WorldBorderWarningTimeUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.world.getWorldBorder().setWarningTime(packet.getWarningTime());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onTitleClear(TitleClearS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void onTitleClear(TitleClearS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
       this.client.inGameHud.m_vybqodrb();
-      if (arg.shouldReset()) {
+      if (packet.shouldReset()) {
          this.client.inGameHud.setDefaultTitleFade();
       }
    }
@@ -2199,11 +2206,11 @@
     * Mapping not found
     */
    @Override
-   public void onServerMetadata(ServerMetadataS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void onServerMetadata(ServerMetadataS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
       if (this.serverInfo != null) {
-         this.serverInfo.label = arg.motd();
-         arg.iconBytes().map(ServerInfo::decodeServerFavicon).ifPresent(this.serverInfo::setFavicon);
+         this.serverInfo.label = packet.motd();
+         packet.iconBytes().map(ServerInfo::decodeServerFavicon).ifPresent(this.serverInfo::setFavicon);
          ServerList.updateServerListEntry(this.serverInfo);
       }
    }
@@ -2212,65 +2219,65 @@
     * Mapping not found
     */
    @Override
-   public void onCustomPlayerNamesUpdate(CustomPlayerNamesUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.commandSource.onCustomPlayerNames(arg.mutationType(), arg.names());
+   public void onCustomPlayerNamesUpdate(CustomPlayerNamesUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.commandSource.onCustomPlayerNames(packet.mutationType(), packet.names());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onOverlayMessage(OverlayMessageS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.client.inGameHud.setOverlayMessage(arg.text(), false);
+   public void onOverlayMessage(OverlayMessageS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.client.inGameHud.setOverlayMessage(packet.text(), false);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onTitle(TitleS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.client.inGameHud.setTitle(arg.text());
+   public void onTitle(TitleS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.client.inGameHud.setTitle(packet.text());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onSubtitle(SubtitleS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.client.inGameHud.setSubtitle(arg.text());
+   public void onSubtitle(SubtitleS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.client.inGameHud.setSubtitle(packet.text());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onTitleFade(TitleFadeS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.client.inGameHud.setTitleTicks(arg.getFadeInTicks(), arg.getRemainTicks(), arg.getFadeOutTicks());
+   public void onTitleFade(TitleFadeS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.client.inGameHud.setTitleTicks(packet.getFadeInTicks(), packet.getRemainTicks(), packet.getFadeOutTicks());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onPlayerListHeaderUpdate(PlayerListHeaderUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.client.inGameHud.getPlayerListHud().setHeader(arg.header().getString().isEmpty() ? null : arg.header());
-      this.client.inGameHud.getPlayerListHud().setFooter(arg.footer().getString().isEmpty() ? null : arg.footer());
+   public void onPlayerListHeaderUpdate(PlayerListHeaderUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.client.inGameHud.getPlayerListHud().setHeader(packet.header().getString().isEmpty() ? null : packet.header());
+      this.client.inGameHud.getPlayerListHud().setFooter(packet.footer().getString().isEmpty() ? null : packet.footer());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onEntityStatusEffectRemoval(EntityStatusEffectRemovalS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      if (arg.getEntity(this.world) instanceof LivingEntity lv) {
-         lv.removeStatusEffectInternal(arg.effect());
+   public void onEntityStatusEffectRemoval(EntityStatusEffectRemovalS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      if (packet.getEntity(this.world) instanceof LivingEntity lv) {
+         lv.removeStatusEffectInternal(packet.effect());
       }
    }
 
@@ -2278,10 +2285,10 @@
     * Mapping not found
     */
    @Override
-   public void onPlayerRemoval(PlayerRemovalS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void onPlayerRemoval(PlayerRemovalS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
 
-      for (UUID uUID : arg.profileIds()) {
+      for (UUID uUID : packet.profileIds()) {
          this.client.getSocialInteractionsManager().setPlayerOffline(uUID);
          PlayerListEntry lv = (PlayerListEntry)this.playerListEntries.remove(uUID);
          if (lv != null) {
@@ -2294,22 +2301,22 @@
     * Mapping not found
     */
    @Override
-   public void onPlayerListReceived(PlayerListS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void onPlayerListReceived(PlayerListS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
 
-      for (PlayerListS2CPacket.Entry lv : arg.getNewEntries()) {
+      for (PlayerListS2CPacket.Entry lv : packet.getNewEntries()) {
          PlayerListEntry lv2 = new PlayerListEntry((GameProfile)Objects.requireNonNull(lv.profile()), this.isSecureChatEnforced());
          if (this.playerListEntries.putIfAbsent(lv.profileId(), lv2) == null) {
             this.client.getSocialInteractionsManager().setPlayerOnline(lv2);
          }
       }
 
-      for (PlayerListS2CPacket.Entry lv3 : arg.getEntries()) {
+      for (PlayerListS2CPacket.Entry lv3 : packet.getEntries()) {
          PlayerListEntry lv4 = (PlayerListEntry)this.playerListEntries.get(lv3.profileId());
          if (lv4 == null) {
-            LOGGER.warn("Ignoring player info update for unknown player {} ({})", lv3.profileId(), arg.getActions());
+            LOGGER.warn("Ignoring player info update for unknown player {} ({})", lv3.profileId(), packet.getActions());
          } else {
-            for (PlayerListS2CPacket.Action lv5 : arg.getActions()) {
+            for (PlayerListS2CPacket.Action lv5 : packet.getActions()) {
                this.handlePlayerInfoUpdate(lv5, lv3, lv4);
             }
          }
@@ -2393,37 +2400,49 @@
     * Mapping not found
     */
    @Override
-   public void onPlayerAbilitiesUpdate(PlayerAbilitiesUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void onPlayerAbilitiesUpdate(PlayerAbilitiesUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
       PlayerEntity lv = this.client.player;
-      lv.getAbilities().flying = arg.isFlying();
-      lv.getAbilities().creativeMode = arg.isCreativeMode();
-      lv.getAbilities().invulnerable = arg.isInvulnerable();
-      lv.getAbilities().allowFlying = arg.allowFlying();
-      lv.getAbilities().setFlySpeed(arg.getFlySpeed());
-      lv.getAbilities().setWalkSpeed(arg.getWalkSpeed());
+      lv.getAbilities().flying = packet.isFlying();
+      lv.getAbilities().creativeMode = packet.isCreativeMode();
+      lv.getAbilities().invulnerable = packet.isInvulnerable();
+      lv.getAbilities().allowFlying = packet.allowFlying();
+      lv.getAbilities().setFlySpeed(packet.getFlySpeed());
+      lv.getAbilities().setWalkSpeed(packet.getWalkSpeed());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onSoundPlay(SoundPlayS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void onSoundPlay(SoundPlayS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
       this.client
          .world
-         .playSound(this.client.player, arg.getX(), arg.getY(), arg.getZ(), arg.getSound(), arg.getCategory(), arg.getVolume(), arg.getPitch(), arg.getSeed());
+         .playSound(
+            this.client.player,
+            packet.getX(),
+            packet.getY(),
+            packet.getZ(),
+            packet.getSound(),
+            packet.getCategory(),
+            packet.getVolume(),
+            packet.getPitch(),
+            packet.getSeed()
+         );
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onPlaySoundFromEntity(PlaySoundFromEntityS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      Entity lv = this.world.getEntityById(arg.getEntityId());
+   public void onPlaySoundFromEntity(PlaySoundFromEntityS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      Entity lv = this.world.getEntityById(packet.getEntityId());
       if (lv != null) {
-         this.client.world.playSoundFromEntity(this.client.player, lv, arg.getSound(), arg.getCategory(), arg.getVolume(), arg.getPitch(), arg.getSeed());
+         this.client
+            .world
+            .playSoundFromEntity(this.client.player, lv, packet.getSound(), packet.getCategory(), packet.getVolume(), packet.getPitch(), packet.getSeed());
       }
    }
 
@@ -2431,21 +2450,21 @@
     * Mapping not found
     */
    @Override
-   public void onBossBarUpdate(BossBarUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.client.inGameHud.getBossBarHud().handlePacket(arg);
+   public void onBossBarUpdate(BossBarUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.client.inGameHud.getBossBarHud().handlePacket(packet);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onCooldownUpdate(CooldownUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      if (arg.duration() == 0) {
-         this.client.player.getItemCooldownManager().remove(arg.cooldownGroup());
+   public void onCooldownUpdate(CooldownUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      if (packet.duration() == 0) {
+         this.client.player.getItemCooldownManager().remove(packet.cooldownGroup());
       } else {
-         this.client.player.getItemCooldownManager().set(arg.cooldownGroup(), arg.duration());
+         this.client.player.getItemCooldownManager().set(packet.cooldownGroup(), packet.duration());
       }
    }
 
@@ -2453,15 +2472,15 @@
     * Mapping not found
     */
    @Override
-   public void onVehicleMove(VehicleMoveS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void onVehicleMove(VehicleMoveS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
       Entity lv = this.client.player.getRootVehicle();
       if (lv != this.client.player && lv.isLogicalSideForUpdatingMovement()) {
-         Vec3d lv2 = arg.position();
+         Vec3d lv2 = packet.position();
          Vec3d lv3 = new Vec3d(lv.getLerpTargetX(), lv.getLerpTargetY(), lv.getLerpTargetZ());
          if (lv2.distanceTo(lv3) > 1.0E-5F) {
             lv.cancelLerp();
-            lv.updatePositionAndAngles(lv2.getX(), lv2.getY(), lv2.getZ(), arg.yRot(), arg.xRot());
+            lv.updatePositionAndAngles(lv2.getX(), lv2.getY(), lv2.getZ(), packet.yRot(), packet.xRot());
          }
 
          this.connection.send(VehicleMoveC2SPacket.m_yvvmkuuv(lv));
@@ -2472,9 +2491,9 @@
     * Mapping not found
     */
    @Override
-   public void onWrittenBookOpen(WrittenBookOpenS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      ItemStack lv = this.client.player.getStackInHand(arg.getHand());
+   public void onWrittenBookOpen(WrittenBookOpenS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      ItemStack lv = this.client.player.getStackInHand(packet.getHand());
       BookScreen.Contents lv2 = BookScreen.Contents.create(lv);
       if (lv2 != null) {
          this.client.setScreen(new BookScreen(lv2));
@@ -2545,23 +2564,28 @@
     * Mapping not found
     */
    @Override
-   public void onScoreboardObjectiveUpdate(ScoreboardObjectiveUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      String string = arg.getName();
-      if (arg.getMode() == 0) {
+   public void onScoreboardObjectiveUpdate(ScoreboardObjectiveUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      String string = packet.getName();
+      if (packet.getMode() == 0) {
          this.scoreboard
             .addObjective(
-               string, ScoreboardCriterion.DUMMY, arg.getDisplayName(), arg.getRenderType(), false, (NumberFormatOverride)arg.getFormatOverride().orElse(null)
+               string,
+               ScoreboardCriterion.DUMMY,
+               packet.getDisplayName(),
+               packet.getRenderType(),
+               false,
+               (NumberFormatOverride)packet.getFormatOverride().orElse(null)
             );
       } else {
          ScoreboardObjective lv = this.scoreboard.getNullableObjective(string);
          if (lv != null) {
-            if (arg.getMode() == ScoreboardObjectiveUpdateS2CPacket.REMOVE_MODE) {
+            if (packet.getMode() == ScoreboardObjectiveUpdateS2CPacket.REMOVE_MODE) {
                this.scoreboard.removeObjective(lv);
-            } else if (arg.getMode() == ScoreboardObjectiveUpdateS2CPacket.UPDATE_MODE) {
-               lv.setRenderType(arg.getRenderType());
-               lv.setDisplayName(arg.getDisplayName());
-               lv.setNumberFormatOverride((NumberFormatOverride)arg.getFormatOverride().orElse(null));
+            } else if (packet.getMode() == ScoreboardObjectiveUpdateS2CPacket.UPDATE_MODE) {
+               lv.setRenderType(packet.getRenderType());
+               lv.setDisplayName(packet.getDisplayName());
+               lv.setNumberFormatOverride((NumberFormatOverride)packet.getFormatOverride().orElse(null));
             }
          }
       }
@@ -2571,16 +2595,16 @@
     * Mapping not found
     */
    @Override
-   public void onScoreboardPlayerUpdate(ScoreboardPlayerUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      String string = arg.objectiveName();
-      ScoreHolder lv = ScoreHolder.of(arg.owner());
+   public void onScoreboardPlayerUpdate(ScoreboardPlayerUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      String string = packet.objectiveName();
+      ScoreHolder lv = ScoreHolder.of(packet.owner());
       ScoreboardObjective lv2 = this.scoreboard.getNullableObjective(string);
       if (lv2 != null) {
          ScoreAccess lv3 = this.scoreboard.getOrCreateScore(lv, lv2, true);
-         lv3.setScore(arg.score());
-         lv3.setDisplayText((Text)arg.display().orElse(null));
-         lv3.setFormat((NumberFormatOverride)arg.numberFormat().orElse(null));
+         lv3.setScore(packet.score());
+         lv3.setDisplayText((Text)packet.display().orElse(null));
+         lv3.setFormat((NumberFormatOverride)packet.numberFormat().orElse(null));
       } else {
          LOGGER.warn("Received packet for unknown scoreboard objective: {}", string);
       }
@@ -2590,10 +2614,10 @@
     * Mapping not found
     */
    @Override
-   public void onScoreboardPlayerReset(ResetScoreS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      String string = arg.getObjective();
-      ScoreHolder lv = ScoreHolder.of(arg.getOwner());
+   public void onScoreboardPlayerReset(ResetScoreS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      String string = packet.getObjective();
+      ScoreHolder lv = ScoreHolder.of(packet.getOwner());
       if (string == null) {
          this.scoreboard.removeScores(lv);
       } else {
@@ -2610,37 +2634,37 @@
     * Mapping not found
     */
    @Override
-   public void onScoreboardDisplay(ScoreboardDisplayS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      String string = arg.getName();
+   public void onScoreboardDisplay(ScoreboardDisplayS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      String string = packet.getName();
       ScoreboardObjective lv = string == null ? null : this.scoreboard.getNullableObjective(string);
-      this.scoreboard.setObjectiveSlot(arg.getSlot(), lv);
+      this.scoreboard.setObjectiveSlot(packet.getSlot(), lv);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onTeamUpdate(TeamUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      TeamUpdateS2CPacket.Operation lv = arg.getTeamOperation();
+   public void onTeamUpdate(TeamUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      TeamUpdateS2CPacket.Operation lv = packet.getTeamOperation();
       Team lv2;
       if (lv == TeamUpdateS2CPacket.Operation.ADD) {
-         lv2 = this.scoreboard.addTeam(arg.getTeamName());
+         lv2 = this.scoreboard.addTeam(packet.getTeamName());
       } else {
-         lv2 = this.scoreboard.getTeam(arg.getTeamName());
+         lv2 = this.scoreboard.getTeam(packet.getTeamName());
          if (lv2 == null) {
             LOGGER.warn(
                "Received packet for unknown team {}: team action: {}, player action: {}",
-               arg.getTeamName(),
-               arg.getTeamOperation(),
-               arg.getPlayerListOperation()
+               packet.getTeamName(),
+               packet.getTeamOperation(),
+               packet.getPlayerListOperation()
             );
             return;
          }
       }
 
-      Optional<TeamUpdateS2CPacket.SerializableTeam> optional = arg.getTeam();
+      Optional<TeamUpdateS2CPacket.SerializableTeam> optional = packet.getTeam();
       optional.ifPresent(arg2 -> {
          lv2.setDisplayName(arg2.getDisplayName());
          lv2.setColor(arg2.getColor());
@@ -2658,13 +2682,13 @@
          lv2.setPrefix(arg2.getPrefix());
          lv2.setSuffix(arg2.getSuffix());
       });
-      TeamUpdateS2CPacket.Operation lv4 = arg.getPlayerListOperation();
+      TeamUpdateS2CPacket.Operation lv4 = packet.getPlayerListOperation();
       if (lv4 == TeamUpdateS2CPacket.Operation.ADD) {
-         for (String string : arg.getPlayerNames()) {
+         for (String string : packet.getPlayerNames()) {
             this.scoreboard.addPlayerToTeam(string, lv2);
          }
       } else if (lv4 == TeamUpdateS2CPacket.Operation.REMOVE) {
-         for (String string2 : arg.getPlayerNames()) {
+         for (String string2 : packet.getPlayerNames()) {
             this.scoreboard.removePlayerFromTeam(string2, lv2);
          }
       }
@@ -2678,31 +2702,34 @@
     * Mapping not found
     */
    @Override
-   public void onParticle(ParticleS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      if (arg.getCount() == 0) {
-         double d = (double)(arg.getSpeed() * arg.getOffsetX());
-         double e = (double)(arg.getSpeed() * arg.getOffsetY());
-         double f = (double)(arg.getSpeed() * arg.getOffsetZ());
+   public void onParticle(ParticleS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      if (packet.getCount() == 0) {
+         double d = (double)(packet.getSpeed() * packet.getOffsetX());
+         double e = (double)(packet.getSpeed() * packet.getOffsetY());
+         double f = (double)(packet.getSpeed() * packet.getOffsetZ());
 
          try {
-            this.world.m_qyuqghcs(arg.getParameters(), arg.isLongDistance(), arg.m_ucxcamyy(), arg.getX(), arg.getY(), arg.getZ(), d, e, f);
+            this.world.m_qyuqghcs(packet.getParameters(), packet.isLongDistance(), packet.m_ucxcamyy(), packet.getX(), packet.getY(), packet.getZ(), d, e, f);
          } catch (Throwable var17) {
-            LOGGER.warn("Could not spawn particle effect {}", arg.getParameters());
+            LOGGER.warn("Could not spawn particle effect {}", packet.getParameters());
          }
       } else {
-         for (int i = 0; i < arg.getCount(); i++) {
-            double g = this.random.nextGaussian() * (double)arg.getOffsetX();
-            double h = this.random.nextGaussian() * (double)arg.getOffsetY();
-            double j = this.random.nextGaussian() * (double)arg.getOffsetZ();
-            double k = this.random.nextGaussian() * (double)arg.getSpeed();
-            double l = this.random.nextGaussian() * (double)arg.getSpeed();
-            double m = this.random.nextGaussian() * (double)arg.getSpeed();
+         for (int i = 0; i < packet.getCount(); i++) {
+            double g = this.random.nextGaussian() * (double)packet.getOffsetX();
+            double h = this.random.nextGaussian() * (double)packet.getOffsetY();
+            double j = this.random.nextGaussian() * (double)packet.getOffsetZ();
+            double k = this.random.nextGaussian() * (double)packet.getSpeed();
+            double l = this.random.nextGaussian() * (double)packet.getSpeed();
+            double m = this.random.nextGaussian() * (double)packet.getSpeed();
 
             try {
-               this.world.m_qyuqghcs(arg.getParameters(), arg.isLongDistance(), arg.m_ucxcamyy(), arg.getX() + g, arg.getY() + h, arg.getZ() + j, k, l, m);
+               this.world
+                  .m_qyuqghcs(
+                     packet.getParameters(), packet.isLongDistance(), packet.m_ucxcamyy(), packet.getX() + g, packet.getY() + h, packet.getZ() + j, k, l, m
+                  );
             } catch (Throwable var16) {
-               LOGGER.warn("Could not spawn particle effect {}", arg.getParameters());
+               LOGGER.warn("Could not spawn particle effect {}", packet.getParameters());
                return;
             }
          }
@@ -2713,16 +2740,16 @@
     * Mapping not found
     */
    @Override
-   public void onEntityAttributesUpdate(EntityAttributesUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      Entity lv = this.world.getEntityById(arg.getEntityId());
+   public void onEntityAttributesUpdate(EntityAttributesUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      Entity lv = this.world.getEntityById(packet.getEntityId());
       if (lv != null) {
          if (!(lv instanceof LivingEntity)) {
             throw new IllegalStateException("Server tried to update attributes of a non-living entity (actually: " + lv + ")");
          } else {
             AttributeContainer lv2 = ((LivingEntity)lv).getAttributes();
 
-            for (EntityAttributesUpdateS2CPacket.Entry lv3 : arg.getEntries()) {
+            for (EntityAttributesUpdateS2CPacket.Entry lv3 : packet.getEntries()) {
                EntityAttributeInstance lv4 = lv2.getInstance(lv3.attribute());
                if (lv4 == null) {
                   LOGGER.warn("Entity {} does not have attribute {}", lv, lv3.attribute().getRegisteredName());
@@ -2743,12 +2770,12 @@
     * Mapping not found
     */
    @Override
-   public void onCraftFailure(CraftFailureS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void onCraftFailure(CraftFailureS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
       ScreenHandler lv = this.client.player.currentScreenHandler;
-      if (lv.syncId == arg.containerId()) {
+      if (lv.syncId == packet.containerId()) {
          if (this.client.currentScreen instanceof RecipeBookProvider lv2) {
-            lv2.m_kzaqfzsb(arg.recipeDisplay());
+            lv2.m_kzaqfzsb(packet.recipeDisplay());
          }
       }
    }
@@ -2757,11 +2784,11 @@
     * Mapping not found
     */
    @Override
-   public void onLightUpdate(LightUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      int i = arg.getChunkX();
-      int j = arg.getChunkZ();
-      LightData lv = arg.lightUpdateData();
+   public void onLightUpdate(LightUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      int i = packet.getChunkX();
+      int j = packet.getChunkZ();
+      LightData lv = packet.lightUpdateData();
       this.world.queueLightUpdate(() -> this.readLightData(i, j, lv, true));
    }
 
@@ -2786,15 +2813,15 @@
     * Mapping not found
     */
    @Override
-   public void onTradeOffersUpdate(TradeOffersUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void onTradeOffersUpdate(TradeOffersUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
       ScreenHandler lv = this.client.player.currentScreenHandler;
-      if (arg.getSyncId() == lv.syncId && lv instanceof MerchantScreenHandler lv2) {
-         lv2.setOffers(arg.getOffers());
-         lv2.setExperienceFromServer(arg.getExperience());
-         lv2.setLevelProgress(arg.getLevelProgress());
-         lv2.setCanLevel(arg.isLeveled());
-         lv2.setRefreshTrades(arg.isRefreshable());
+      if (packet.getSyncId() == lv.syncId && lv instanceof MerchantScreenHandler lv2) {
+         lv2.setOffers(packet.getOffers());
+         lv2.setExperienceFromServer(packet.getExperience());
+         lv2.setLevelProgress(packet.getLevelProgress());
+         lv2.setCanLevel(packet.isLeveled());
+         lv2.setRefreshTrades(packet.isRefreshable());
       }
    }
 
@@ -2802,20 +2829,20 @@
     * Mapping not found
     */
    @Override
-   public void onChunkLoadDistanceUpdate(ChunkLoadDistanceUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.chunkLoadDistance = arg.getDistance();
+   public void onChunkLoadDistanceUpdate(ChunkLoadDistanceUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.chunkLoadDistance = packet.getDistance();
       this.client.options.setServerViewDistance(this.chunkLoadDistance);
-      this.world.getChunkManager().updateLoadDistance(arg.getDistance());
+      this.world.getChunkManager().updateLoadDistance(packet.getDistance());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onSimulationDistanceUpdate(SimulationDistanceUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.simulationDistance = arg.simulationDistance();
+   public void onSimulationDistanceUpdate(SimulationDistanceUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.simulationDistance = packet.simulationDistance();
       this.world.setSimulationDistance(this.simulationDistance);
    }
 
@@ -2823,28 +2850,28 @@
     * Mapping not found
     */
    @Override
-   public void onChunkRenderDistanceCenterUpdate(ChunkRenderDistanceCenterUpdateS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.world.getChunkManager().setChunkMapCenter(arg.getChunkX(), arg.getChunkZ());
+   public void onChunkRenderDistanceCenterUpdate(ChunkRenderDistanceCenterUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.world.getChunkManager().setChunkMapCenter(packet.getChunkX(), packet.getChunkZ());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onBlockUpdateAcknowledgment(BlockUpdateAcknowledgmentS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.world.onBlockUpdateAcknowledgement(arg.getActionIndex());
+   public void onBlockUpdateAcknowledgment(BlockUpdateAcknowledgmentS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.world.onBlockUpdateAcknowledgement(packet.getActionIndex());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void handlePacketBundle(PacketBundleS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
+   public void handlePacketBundle(PacketBundleS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
 
-      for (Packet<? super ClientPlayPacketListener> lv : arg.getPackets()) {
+      for (Packet<? super ClientPlayPacketListener> lv : packet.getPackets()) {
          lv.apply(this);
       }
    }
@@ -2853,10 +2880,10 @@
     * Mapping not found
     */
    @Override
-   public void onProjectilePower(ProjectilePowerS2CPacket arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      if (this.world.getEntityById(arg.getEntityId()) instanceof ExplosiveProjectileEntity lv2) {
-         lv2.accelerationPower = arg.m_hxnpbaoh();
+   public void onProjectilePower(ProjectilePowerS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      if (this.world.getEntityById(packet.getEntityId()) instanceof ExplosiveProjectileEntity lv2) {
+         lv2.accelerationPower = packet.m_hxnpbaoh();
       }
    }
 
@@ -2864,7 +2891,7 @@
     * Mapping not found
     */
    @Override
-   public void onStartChunkBatch(StartChunkBatchS2CPacket arg) {
+   public void onStartChunkBatch(StartChunkBatchS2CPacket packet) {
       this.f_mmtqjzrg.m_ibxtyfat();
    }
 
@@ -2872,8 +2899,8 @@
     * Mapping not found
     */
    @Override
-   public void onChunkBatchCompletion(ChunkBatchCompletionS2CPacket arg) {
-      this.f_mmtqjzrg.m_youmwzgx(arg.batchSize());
+   public void onChunkBatchCompletion(ChunkBatchCompletionS2CPacket packet) {
+      this.f_mmtqjzrg.m_youmwzgx(packet.batchSize());
       this.send(new ChunkBatchAcknowledgementC2SPacket(this.f_mmtqjzrg.m_xmqzfyqo()));
    }
 
@@ -2881,16 +2908,16 @@
     * Mapping not found
     */
    @Override
-   public void onDebugSample(DebugSampleS2CPacket arg) {
-      this.client.resetDebugHudChunk().updateServerPerformance(arg.sample(), arg.debugSampleType());
+   public void onDebugSample(DebugSampleS2CPacket packet) {
+      this.client.resetDebugHudChunk().updateServerPerformance(packet.sample(), packet.debugSampleType());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onQueryPong(QueryPongS2CPacket arg) {
-      this.f_lknizddt.m_zjwlgenp(arg);
+   public void onQueryPong(QueryPongS2CPacket packet) {
+      this.f_lknizddt.m_zjwlgenp(packet);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/network/MultiplayerServerListPinger.java namedSrc/net/minecraft/client/network/MultiplayerServerListPinger.java
--- namedTargetSrc/net/minecraft/client/network/MultiplayerServerListPinger.java	2024-11-19 00:10:32.569942829 +0000
+++ namedSrc/net/minecraft/client/network/MultiplayerServerListPinger.java	2024-11-19 00:09:21.002022943 +0000
@@ -91,12 +91,12 @@
              * Mapping not found
              */
             @Override
-            public void onServerMetadata(ServerMetadataS2CPacket arg) {
+            public void onServerMetadata(ServerMetadataS2CPacket packet) {
                if (this.f_vfdkzhcs) {
                   lv2.disconnect(Text.translatable("multiplayer.status.unrequested"));
                } else {
                   this.f_vfdkzhcs = true;
-                  ServerMetadata lv = arg.status();
+                  ServerMetadata lv = packet.status();
                   entry.label = lv.description();
                   lv.version().ifPresentOrElse(arg2 -> {
                      entry.version = Text.literal(arg2.name());
@@ -140,7 +140,7 @@
              * Mapping not found
              */
             @Override
-            public void onQueryPong(QueryPongS2CPacket arg) {
+            public void onQueryPong(QueryPongS2CPacket packet) {
                long l = this.f_ipavcybo;
                long m = Util.getMeasuringTimeMs();
                entry.ping = m - l;
diff -bur namedTargetSrc/net/minecraft/client/render/BuiltChunkStorage.java namedSrc/net/minecraft/client/render/BuiltChunkStorage.java
--- namedTargetSrc/net/minecraft/client/render/BuiltChunkStorage.java	2024-11-19 00:10:32.733942734 +0000
+++ namedSrc/net/minecraft/client/render/BuiltChunkStorage.java	2024-11-19 00:09:21.198022701 +0000
@@ -47,9 +47,10 @@
     */
    private int viewDistance;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_sqecsiyn Lnet/minecraft/unmapped/C_rqhfsngs;f_sqecsiyn:Lnet/minecraft/unmapped/C_zubvmeye;}
+    * @mapping {@literal named sectionPos Lnet/minecraft/client/render/BuiltChunkStorage;sectionPos:Lnet/minecraft/util/math/ChunkSectionPos;}
     */
-   private ChunkSectionPos f_sqecsiyn;
+   private ChunkSectionPos sectionPos;
    /**
     * @mapping {@literal hashed f_llzkkcwf Lnet/minecraft/unmapped/C_rqhfsngs;f_llzkkcwf:[Lnet/minecraft/unmapped/C_sjynkhfr$C_exmylrbc;}
     * @mapping {@literal named sections Lnet/minecraft/client/render/BuiltChunkStorage;sections:[Lnet/minecraft/client/render/chunk/ChunkBuilder$Section;}
@@ -65,7 +66,7 @@
       this.world = world;
       this.setViewDistance(viewDistance);
       this.createSections(builder);
-      this.f_sqecsiyn = ChunkSectionPos.from(this.viewDistance + 1, 0, this.viewDistance + 1);
+      this.sectionPos = ChunkSectionPos.from(this.viewDistance + 1, 0, this.viewDistance + 1);
    }
 
    /**
@@ -140,13 +141,13 @@
     * @mapping {@literal hashed m_rxnslrfy Lnet/minecraft/unmapped/C_rqhfsngs;m_rxnslrfy(Lnet/minecraft/unmapped/C_zubvmeye;)V}
     * @mapping {@literal named updateCameraPosition Lnet/minecraft/client/render/BuiltChunkStorage;updateCameraPosition(Lnet/minecraft/util/math/ChunkSectionPos;)V}
     */
-   public void updateCameraPosition(ChunkSectionPos arg) {
+   public void updateCameraPosition(ChunkSectionPos pos) {
       for (int i = 0; i < this.xGridSections; i++) {
-         int j = arg.getSectionX() - this.viewDistance;
+         int j = pos.getSectionX() - this.viewDistance;
          int k = j + Math.floorMod(i - j, this.xGridSections);
 
          for (int l = 0; l < this.zGridSections; l++) {
-            int m = arg.getSectionZ() - this.viewDistance;
+            int m = pos.getSectionZ() - this.viewDistance;
             int n = m + Math.floorMod(l - m, this.zGridSections);
 
             for (int o = 0; o < this.yGridSections; o++) {
@@ -160,15 +161,16 @@
          }
       }
 
-      this.f_sqecsiyn = arg;
+      this.sectionPos = pos;
       this.worldRenderer.getOcclusionGraph().scheduleFullUpdate();
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_hibueudp Lnet/minecraft/unmapped/C_rqhfsngs;m_hibueudp()Lnet/minecraft/unmapped/C_zubvmeye;}
+    * @mapping {@literal named getSectionPos Lnet/minecraft/client/render/BuiltChunkStorage;getSectionPos()Lnet/minecraft/util/math/ChunkSectionPos;}
     */
-   public ChunkSectionPos m_hibueudp() {
-      return this.f_sqecsiyn;
+   public ChunkSectionPos getSectionPos() {
+      return this.sectionPos;
    }
 
    /**
@@ -176,7 +178,7 @@
     * @mapping {@literal named scheduleRebuild Lnet/minecraft/client/render/BuiltChunkStorage;scheduleRebuild(IIIZ)V}
     */
    public void scheduleRebuild(int x, int y, int z, boolean important) {
-      ChunkBuilder.Section lv = this.m_sdyufbzs(x, y, z);
+      ChunkBuilder.Section lv = this.getRenderSection(x, y, z);
       if (lv != null) {
          lv.needsRebuild(important);
       }
@@ -188,43 +190,46 @@
     */
    @Nullable
    protected ChunkBuilder.Section getSection(BlockPos pos) {
-      return this.m_thjqtzzg(ChunkSectionPos.toLong(pos));
+      return this.getRenderSection(ChunkSectionPos.toLong(pos));
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_thjqtzzg Lnet/minecraft/unmapped/C_rqhfsngs;m_thjqtzzg(J)Lnet/minecraft/unmapped/C_sjynkhfr$C_exmylrbc;}
+    * @mapping {@literal named getRenderSection Lnet/minecraft/client/render/BuiltChunkStorage;getRenderSection(J)Lnet/minecraft/client/render/chunk/ChunkBuilder$Section;}
     */
    @Nullable
-   protected ChunkBuilder.Section m_thjqtzzg(long l) {
-      int i = ChunkSectionPos.unpackX(l);
-      int j = ChunkSectionPos.unpackY(l);
-      int k = ChunkSectionPos.unpackZ(l);
-      return this.m_sdyufbzs(i, j, k);
+   protected ChunkBuilder.Section getRenderSection(long pos) {
+      int i = ChunkSectionPos.unpackX(pos);
+      int j = ChunkSectionPos.unpackY(pos);
+      int k = ChunkSectionPos.unpackZ(pos);
+      return this.getRenderSection(i, j, k);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_sdyufbzs Lnet/minecraft/unmapped/C_rqhfsngs;m_sdyufbzs(III)Lnet/minecraft/unmapped/C_sjynkhfr$C_exmylrbc;}
+    * @mapping {@literal named getRenderSection Lnet/minecraft/client/render/BuiltChunkStorage;getRenderSection(III)Lnet/minecraft/client/render/chunk/ChunkBuilder$Section;}
     */
    @Nullable
-   private ChunkBuilder.Section m_sdyufbzs(int i, int j, int k) {
-      if (!this.m_rtueaaeu(i, j, k)) {
+   private ChunkBuilder.Section getRenderSection(int x, int y, int z) {
+      if (!this.isWithinViewDistance(x, y, z)) {
          return null;
       } else {
-         int l = j - this.world.getBottomSectionCoord();
-         int m = Math.floorMod(i, this.xGridSections);
-         int n = Math.floorMod(k, this.zGridSections);
+         int l = y - this.world.getBottomSectionCoord();
+         int m = Math.floorMod(x, this.xGridSections);
+         int n = Math.floorMod(z, this.zGridSections);
          return this.sections[this.index(m, l, n)];
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_rtueaaeu Lnet/minecraft/unmapped/C_rqhfsngs;m_rtueaaeu(III)Z}
+    * @mapping {@literal named isWithinViewDistance Lnet/minecraft/client/render/BuiltChunkStorage;isWithinViewDistance(III)Z}
     */
-   private boolean m_rtueaaeu(int i, int j, int k) {
-      if (j >= this.world.getBottomSectionCoord() && j <= this.world.getTopSectionCoord()) {
-         return i < this.f_sqecsiyn.getSectionX() - this.viewDistance || i > this.f_sqecsiyn.getSectionX() + this.viewDistance
+   private boolean isWithinViewDistance(int x, int y, int z) {
+      if (y >= this.world.getBottomSectionCoord() && y <= this.world.getTopSectionCoord()) {
+         return x < this.sectionPos.getSectionX() - this.viewDistance || x > this.sectionPos.getSectionX() + this.viewDistance
             ? false
-            : k >= this.f_sqecsiyn.getSectionZ() - this.viewDistance && k <= this.f_sqecsiyn.getSectionZ() + this.viewDistance;
+            : z >= this.sectionPos.getSectionZ() - this.viewDistance && z <= this.sectionPos.getSectionZ() + this.viewDistance;
       } else {
          return false;
       }
diff -bur namedTargetSrc/net/minecraft/client/render/chunk/ChunkBuilder.java namedSrc/net/minecraft/client/render/chunk/ChunkBuilder.java
--- namedTargetSrc/net/minecraft/client/render/chunk/ChunkBuilder.java	2024-11-19 00:10:32.745942727 +0000
+++ namedSrc/net/minecraft/client/render/chunk/ChunkBuilder.java	2024-11-19 00:09:21.206022691 +0000
@@ -592,7 +592,7 @@
        */
       private boolean doesChunkExist(long l) {
          Chunk lv = ChunkBuilder.this.world.getChunk(ChunkSectionPos.unpackX(l), ChunkSectionPos.unpackZ(l), ChunkStatus.FULL, false);
-         return lv != null && ChunkBuilder.this.world.getLightingProvider().m_evyxmccv(ChunkSectionPos.withZeroY(l));
+         return lv != null && ChunkBuilder.this.world.getLightingProvider().isColumnEnabled(ChunkSectionPos.withZeroY(l));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/render/chunk/ChunkRenderRegionCache.java namedSrc/net/minecraft/client/render/chunk/ChunkRenderRegionCache.java
--- namedTargetSrc/net/minecraft/client/render/chunk/ChunkRenderRegionCache.java	2024-11-19 00:10:32.733942734 +0000
+++ namedSrc/net/minecraft/client/render/chunk/ChunkRenderRegionCache.java	2024-11-19 00:09:21.198022701 +0000
@@ -30,7 +30,7 @@
    @Nullable
    public ChunkRenderRegion createRenderRegion(World world, ChunkSectionPos pos) {
       ChunkRenderRegionCache.LazyRenderChunk lv = this.getLazyChunk(world, pos.getSectionX(), pos.getSectionZ());
-      if (lv.getChunk().m_puwtdbeb(pos.getSectionY())) {
+      if (lv.getChunk().isSectionEmpty(pos.getSectionY())) {
          return null;
       } else {
          int i = pos.getSectionX() - 1;
diff -bur namedTargetSrc/net/minecraft/client/render/chunk/ChunkRenderRegion.java namedSrc/net/minecraft/client/render/chunk/ChunkRenderRegion.java
--- namedTargetSrc/net/minecraft/client/render/chunk/ChunkRenderRegion.java	2024-11-19 00:10:32.697942755 +0000
+++ namedSrc/net/minecraft/client/render/chunk/ChunkRenderRegion.java	2024-11-19 00:09:21.158022750 +0000
@@ -115,8 +115,8 @@
     * Mapping not found
     */
    @Override
-   public int getColor(BlockPos pos, BiomeColorProvider arg2) {
-      return this.world.getColor(pos, arg2);
+   public int getColor(BlockPos pos, BiomeColorProvider colorProvider) {
+      return this.world.getColor(pos, colorProvider);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/render/chunk/RenderChunk.java namedSrc/net/minecraft/client/render/chunk/RenderChunk.java
--- namedTargetSrc/net/minecraft/client/render/chunk/RenderChunk.java	2024-11-19 00:10:32.577942825 +0000
+++ namedSrc/net/minecraft/client/render/chunk/RenderChunk.java	2024-11-19 00:09:21.014022928 +0000
@@ -64,7 +64,7 @@
          this.containers = new ArrayList(lvs.length);
 
          for (ChunkSection lv : lvs) {
-            this.containers.add(lv.isEmpty() ? null : lv.getContainer().m_udwavtoj());
+            this.containers.add(lv.isEmpty() ? null : lv.getContainer().copy());
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/render/SectionOcclusionGraph.java namedSrc/net/minecraft/client/render/SectionOcclusionGraph.java
--- namedTargetSrc/net/minecraft/client/render/SectionOcclusionGraph.java	2024-11-19 00:10:32.601942811 +0000
+++ namedSrc/net/minecraft/client/render/SectionOcclusionGraph.java	2024-11-19 00:09:21.034022904 +0000
@@ -168,17 +168,18 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_xhfcuajv Lnet/minecraft/unmapped/C_jnliocmw;m_xhfcuajv(Lnet/minecraft/unmapped/C_sjynkhfr$C_exmylrbc;)V}
+    * @mapping {@literal named schedulePropagationFrom Lnet/minecraft/client/render/SectionOcclusionGraph;schedulePropagationFrom(Lnet/minecraft/client/render/chunk/ChunkBuilder$Section;)V}
     */
-   public void m_xhfcuajv(ChunkBuilder.Section arg) {
+   public void schedulePropagationFrom(ChunkBuilder.Section section) {
       SectionOcclusionGraph.Events lv = (SectionOcclusionGraph.Events)this.events.get();
       if (lv != null) {
-         lv.sectionsToPropagateFrom.add(arg);
+         lv.sectionsToPropagateFrom.add(section);
       }
 
       SectionOcclusionGraph.Events lv2 = ((SectionOcclusionGraph.State)this.state.get()).events;
       if (lv2 != lv) {
-         lv2.sectionsToPropagateFrom.add(arg);
+         lv2.sectionsToPropagateFrom.add(section);
       }
    }
 
@@ -286,7 +287,7 @@
       BlockPos lv = camera.getBlockPos();
       long l = ChunkSectionPos.toLong(lv);
       int i = ChunkSectionPos.unpackY(l);
-      ChunkBuilder.Section lv2 = this.builtChunkStorage.m_thjqtzzg(l);
+      ChunkBuilder.Section lv2 = this.builtChunkStorage.getRenderSection(l);
       if (lv2 == null) {
          HeightLimitView lv3 = this.builtChunkStorage.getWorld();
          boolean bl = i < lv3.getBottomSectionCoord();
@@ -298,7 +299,7 @@
 
          for (int o = -k; o <= k; o++) {
             for (int p = -k; p <= k; p++) {
-               ChunkBuilder.Section lv4 = this.builtChunkStorage.m_thjqtzzg(ChunkSectionPos.asLong(o + m, j, p + n));
+               ChunkBuilder.Section lv4 = this.builtChunkStorage.getRenderSection(ChunkSectionPos.asLong(o + m, j, p + n));
                if (lv4 != null && this.isInViewDistance(l, lv4.m_yauvouyo())) {
                   Direction lv5 = bl ? Direction.UP : Direction.DOWN;
                   SectionOcclusionGraph.Node lv6 = new SectionOcclusionGraph.Node(lv4, lv5, 0);
@@ -457,7 +458,7 @@
       } else {
          return MathHelper.abs(ChunkSectionPos.unpackY(l) - ChunkSectionPos.unpackY(m)) > this.builtChunkStorage.getViewDistance()
             ? null
-            : this.builtChunkStorage.m_thjqtzzg(m);
+            : this.builtChunkStorage.getRenderSection(m);
       }
    }
 
@@ -674,7 +675,7 @@
        */
       public Storage(BuiltChunkStorage arg) {
          this.sectionToNode = new SectionOcclusionGraph.SectionToNodes(arg.sections.length);
-         this.f_kkwcgtiu = new C_jthnrqwz(arg.m_hibueudp(), arg.getViewDistance(), arg.yGridSections, arg.world.getBottomY());
+         this.f_kkwcgtiu = new C_jthnrqwz(arg.getSectionPos(), arg.getViewDistance(), arg.yGridSections, arg.world.getBottomY());
          this.sections = new Long2ObjectOpenHashMap<>();
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/render/WorldRenderer.java namedSrc/net/minecraft/client/render/WorldRenderer.java
--- namedTargetSrc/net/minecraft/client/render/WorldRenderer.java	2024-11-19 00:10:32.541942845 +0000
+++ namedSrc/net/minecraft/client/render/WorldRenderer.java	2024-11-19 00:09:20.966022988 +0000
@@ -616,7 +616,7 @@
          }
 
          lv2.push("section_occlusion_graph");
-         this.occlusionGraph.update(bl3, camera, frustum, this.sections, this.world.getChunkManager().m_yfdsyahd());
+         this.occlusionGraph.update(bl3, camera, frustum, this.sections, this.world.getChunkManager().getLoadedEmptySections());
          lv2.pop();
          double g = Math.floor((double)(camera.getPitch() / 2.0F));
          double h = Math.floor((double)(camera.getYaw() / 2.0F));
@@ -657,8 +657,8 @@
     * @mapping {@literal hashed m_admjmrdo Lnet/minecraft/unmapped/C_sfkkabhx;m_admjmrdo(Lnet/minecraft/unmapped/C_sjynkhfr$C_exmylrbc;)V}
     * @mapping {@literal named onSectionBuilt Lnet/minecraft/client/render/WorldRenderer;onSectionBuilt(Lnet/minecraft/client/render/chunk/ChunkBuilder$Section;)V}
     */
-   public void onSectionBuilt(ChunkBuilder.Section arg) {
-      this.occlusionGraph.m_xhfcuajv(arg);
+   public void onSectionBuilt(ChunkBuilder.Section section) {
+      this.occlusionGraph.schedulePropagationFrom(section);
    }
 
    /**
@@ -1607,12 +1607,13 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_tboyskxy Lnet/minecraft/unmapped/C_sfkkabhx;m_tboyskxy(J)V}
+    * @mapping {@literal named onSectionBecomingNonEmpty Lnet/minecraft/client/render/WorldRenderer;onSectionBecomingNonEmpty(J)V}
     */
-   public void m_tboyskxy(long l) {
-      ChunkBuilder.Section lv = this.chunks.m_thjqtzzg(l);
+   public void onSectionBecomingNonEmpty(long chunkSectionPos) {
+      ChunkBuilder.Section lv = this.chunks.getRenderSection(chunkSectionPos);
       if (lv != null) {
-         this.occlusionGraph.m_xhfcuajv(lv);
+         this.occlusionGraph.schedulePropagationFrom(lv);
       }
    }
 


The remaining diff is too long!

Please sign in to comment.