24w37a stuff (#3986)

* 24w37a tracy, client, etc * Fix #3983 * Screen#initTabNavigation -> refreshWidgetPositions * ComponentMapImpl -> MergedComponentMap * Component-related fixes * Fix typo * Revert changes to LongJumpTask.mapping
FabricMC · Sep 13, 2024 · 5eb8941 · 5eb8941
1 parent d116842
commit 5eb8941
Show file tree

Hide file tree

Showing 32 changed files with 253 additions and 19 deletions.
diff --git a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping
@@ -96,6 +96,10 @@ CLASS com/mojang/blaze3d/platform/GlStateManager
 		ARG 0 target
 		ARG 1 data
 		ARG 2 usage
+	METHOD _glClientWaitSync (JII)I
+		ARG 0 sync
+		ARG 2 flags
+		ARG 3 timeout
 	METHOD _glCopyTexSubImage2D (IIIIIIII)V
 		ARG 0 target
 		ARG 1 level
@@ -111,6 +115,8 @@ CLASS com/mojang/blaze3d/platform/GlStateManager
 		ARG 0 framebuffer
 	METHOD _glDeleteRenderbuffers (I)V
 		ARG 0 renderbuffer
+	METHOD _glDeleteSync (J)V
+		ARG 0 sync
 	METHOD _glDeleteVertexArrays (I)V
 		ARG 0 array
 	METHOD _glDrawPixels (IIIIJ)V
@@ -119,6 +125,9 @@ CLASS com/mojang/blaze3d/platform/GlStateManager
 		ARG 2 format
 		ARG 3 type
 		ARG 4 pixels
+	METHOD _glFenceSync (II)J
+		ARG 0 condition
+		ARG 1 flags
 	METHOD _glFramebufferRenderbuffer (IIII)V
 		ARG 0 target
 		ARG 1 attachment
@@ -139,6 +148,11 @@ CLASS com/mojang/blaze3d/platform/GlStateManager
 	METHOD _glMapBuffer mapBuffer (II)Ljava/nio/ByteBuffer;
 		ARG 0 target
 		ARG 1 access
+	METHOD _glMapBufferRange (IIII)Ljava/nio/ByteBuffer;
+		ARG 0 target
+		ARG 1 offset
+		ARG 2 length
+		ARG 3 access
 	METHOD _glRenderbufferStorage (IIII)V
 		ARG 0 target
 		ARG 1 internalFormat

diff --git a/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping b/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping
@@ -56,6 +56,7 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
 		ARG 3 height
 	METHOD flipFrame (JLnet/minecraft/class_10219;)V
 		ARG 0 window
+		ARG 2 capturer
 	METHOD getSequentialBuffer (Lnet/minecraft/class_293$class_5596;)Lcom/mojang/blaze3d/systems/RenderSystem$class_5590;
 		ARG 0 drawMode
 	METHOD getShaderTexture (I)I

diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping
@@ -187,6 +187,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	FIELD field_52753 inactivityFpsLimiter Lnet/minecraft/class_9919;
 	FIELD field_53831 shaderLoader Lnet/minecraft/class_10151;
 	FIELD field_54150 equipmentModelLoader Lnet/minecraft/class_10201;
+	FIELD field_54267 tracyFrameCapturer Lnet/minecraft/class_10219;
 	METHOD <init> (Lnet/minecraft/class_542;)V
 		ARG 1 args
 	METHOD method_1478 getResourceManager ()Lnet/minecraft/class_3300;

diff --git a/mappings/net/minecraft/client/RunArgs.mapping b/mappings/net/minecraft/client/RunArgs.mapping
@@ -27,12 +27,14 @@ CLASS net/minecraft/class_542 net/minecraft/client/RunArgs
 		FIELD field_3291 versionType Ljava/lang/String;
 		FIELD field_3292 demo Z
 		FIELD field_3293 version Ljava/lang/String;
+		FIELD field_54272 tracyEnabled Z
 		METHOD <init> (ZLjava/lang/String;Ljava/lang/String;ZZZ)V
 			ARG 1 demo
 			ARG 2 version
 			ARG 3 versionType
 			ARG 4 multiplayerDisabled
 			ARG 5 onlineChatDisabled
+			ARG 6 tracyEnabled
 	CLASS class_547 Network
 		FIELD field_3296 netProxy Ljava/net/Proxy;
 		FIELD field_3297 profileProperties Lcom/mojang/authlib/properties/PropertyMap;

diff --git a/mappings/net/minecraft/client/font/FontManager.mapping b/mappings/net/minecraft/client/font/FontManager.mapping
@@ -23,6 +23,8 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager
 		ARG 2 executor
 	METHOD method_51609 (Lnet/minecraft/class_8523;Lnet/minecraft/class_378$class_8537;)V
 		ARG 1 entry
+	METHOD method_51610 (Lnet/minecraft/class_378$class_8536;)V
+		ARG 1 index
 	METHOD method_51611 (Lnet/minecraft/class_390$class_9241;Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletableFuture;
 		ARG 3 dest
 	METHOD method_51612 (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Lnet/minecraft/class_378$class_8537;Lnet/minecraft/class_9243$class_9244;Lnet/minecraft/class_389$class_8539;)V
@@ -34,6 +36,7 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager
 		ARG 4 executor
 	METHOD method_51614 reload (Lnet/minecraft/class_378$class_8536;Lnet/minecraft/class_3695;)V
 		ARG 1 index
+		ARG 2 profiler
 	METHOD method_51615 (Lnet/minecraft/class_378$class_8537;Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_9243$class_9244;Lnet/minecraft/class_389$class_8540;)V
 		ARG 3 reference
 	METHOD method_51617 getRequiredFontProviders (Ljava/util/List;)Ljava/util/Map;

diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping
@@ -154,7 +154,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen
 		ARG 1 element
 	METHOD method_48266 getTabNavigation ()Lnet/minecraft/class_8023$class_8026;
 	METHOD method_48267 blur ()V
-	METHOD method_48640 initTabNavigation ()V
+	METHOD method_48640 refreshWidgetPositions ()V
 	METHOD method_49589 onDisplayed ()V
 		COMMENT Called when the screen is displayed using {@link MinecraftClient#setScreen}
 		COMMENT before {@link #init()} or {@link #initTabNavigation()} is called.
@@ -166,7 +166,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen
 		ARG 1 context
 	METHOD method_53870 getUsageNarrationText ()Lnet/minecraft/class_2561;
 	METHOD method_56131 setInitialFocus ()V
-		COMMENT This should be overriden with a call to {@link #setInitialFocus(Element)} to set the element that is initially focused.
+		COMMENT This should be overridden with a call to {@link #setInitialFocus(Element)} to set the element that is initially focused.
 	METHOD method_57728 renderPanoramaBackground (Lnet/minecraft/class_332;F)V
 		ARG 1 context
 		ARG 2 delta

diff --git a/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping b/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping
@@ -131,7 +131,7 @@ CLASS net/minecraft/class_5272 net/minecraft/client/item/ModelPredicateProviderR
 		ARG 0 stack
 	METHOD method_63533 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F
 		ARG 0 stack
-		ARG 1 workd
+		ARG 1 world
 		ARG 2 entity
 		ARG 3 seed
 	METHOD method_63534 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F

diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
@@ -42,7 +42,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
 	METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_2535;Lnet/minecraft/class_8675;)V
 		ARG 1 client
 	METHOD method_16690 getSessionId ()Ljava/util/UUID;
-	METHOD method_19691 getActiveTotemOfUndying (Lnet/minecraft/class_1657;)Lnet/minecraft/class_1799;
+	METHOD method_19691 getActiveDeathProtector (Lnet/minecraft/class_1657;)Lnet/minecraft/class_1799;
 		ARG 0 player
 	METHOD method_2869 getAdvancementHandler ()Lnet/minecraft/class_632;
 	METHOD method_2870 updateLighting (IILnet/minecraft/class_3568;Lnet/minecraft/class_1944;Ljava/util/BitSet;Ljava/util/BitSet;Ljava/util/Iterator;Z)V

diff --git a/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping b/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping
@@ -2,46 +2,62 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPre
 	FIELD field_45617 LOGGER Lorg/slf4j/Logger;
 	FIELD field_45618 DIRECTIONS [Lnet/minecraft/class_2350;
 	FIELD field_45620 CHUNK_INNER_DIAGONAL_LENGTH D
+	FIELD field_45621 terrainUpdateScheduled Z
+	FIELD field_45622 terrainUpdateFuture Ljava/util/concurrent/Future;
 	FIELD field_45623 builtChunkStorage Lnet/minecraft/class_769;
+	FIELD field_45624 state Ljava/util/concurrent/atomic/AtomicReference;
 	FIELD field_45625 events Ljava/util/concurrent/atomic/AtomicReference;
 	METHOD method_52817 scheduleTerrainUpdate ()V
 	METHOD method_52819 addNeighbors (Lnet/minecraft/class_1923;)V
 		ARG 1 chunkPos
 	METHOD method_52821 (Lnet/minecraft/class_4184;Ljava/util/Queue;)V
 		ARG 1 camera
 	METHOD method_52822 addNeighbors (Lnet/minecraft/class_8679$class_8680;Lnet/minecraft/class_1923;)V
+		ARG 1 events
 		ARG 2 chunkPos
+	METHOD method_52824 (Lnet/minecraft/class_8679$class_8681;Lnet/minecraft/class_8679$class_762;)V
+		ARG 1 info
 	METHOD method_52825 (Lnet/minecraft/class_8679$class_6600;Lnet/minecraft/class_243;Ljava/util/Queue;ZLjava/util/function/Consumer;Lit/unimi/dsi/fastutil/longs/LongOpenHashSet;)V
 		ARG 2 pos
 		ARG 4 cullChunks
 	METHOD method_52826 setStorage (Lnet/minecraft/class_769;)V
 		ARG 1 storage
 	METHOD method_52827 schedulePropagationFrom (Lnet/minecraft/class_846$class_851;)V
 		ARG 1 builtChunk
-	METHOD method_52828 (Lnet/minecraft/class_4604;Ljava/util/List;Ljava/util/List;)V
+	METHOD method_52828 collectChunks (Lnet/minecraft/class_4604;Ljava/util/List;Ljava/util/List;)V
 		ARG 1 frustum
 		ARG 2 builtChunks
+		ARG 3 nearbyChunks
 	METHOD method_52831 getRenderedChunk (JLnet/minecraft/class_846$class_851;Lnet/minecraft/class_2350;)Lnet/minecraft/class_846$class_851;
 		ARG 1 sectionPos
 		ARG 3 chunk
 		ARG 4 direction
 	METHOD method_52832 isWithinViewDistance (JJ)Z
 		ARG 1 centerSectionPos
 		ARG 3 otherSectionPos
-	METHOD method_52833 (ZLnet/minecraft/class_4184;Lnet/minecraft/class_243;Lit/unimi/dsi/fastutil/longs/LongOpenHashSet;)V
+	METHOD method_52833 updateTerrain (ZLnet/minecraft/class_4184;Lnet/minecraft/class_243;Lit/unimi/dsi/fastutil/longs/LongOpenHashSet;)V
 		ARG 1 cullChunks
 		ARG 2 camera
 		ARG 3 cameraPos
-	METHOD method_52834 (ZLnet/minecraft/class_4184;Lnet/minecraft/class_4604;Ljava/util/List;Lit/unimi/dsi/fastutil/longs/LongOpenHashSet;)V
+		ARG 4 activeSections
+	METHOD method_52834 updateSectionOcculusionGraph (ZLnet/minecraft/class_4184;Lnet/minecraft/class_4604;Ljava/util/List;Lit/unimi/dsi/fastutil/longs/LongOpenHashSet;)V
 		ARG 1 cullChunks
 		ARG 2 camera
 		ARG 3 frustum
 		ARG 4 builtChunk
+		ARG 5 activeSections
 	METHOD method_52835 (ZLnet/minecraft/class_4604;Ljava/util/List;Lnet/minecraft/class_243;Lit/unimi/dsi/fastutil/longs/LongOpenHashSet;)V
 		ARG 2 frustum
 		ARG 3 builtChunks
+		ARG 4 cameraPos
+		ARG 5 activeSections
 	METHOD method_52837 getInfo (Lnet/minecraft/class_846$class_851;)Lnet/minecraft/class_8679$class_762;
 		ARG 1 chunk
+	METHOD method_62924 (Ljava/util/List;Ljava/util/List;Lnet/minecraft/class_10143$class_10147;ZIZ)V
+		ARG 2 node
+		ARG 3 skipVisibilityCheck
+		ARG 4 depth
+		ARG 5 nearCenter
 	METHOD method_62925 getOctree ()Lnet/minecraft/class_10143;
 	CLASS class_5972 ChunkInfoList
 		FIELD field_29620 current [Lnet/minecraft/class_8679$class_762;
@@ -79,6 +95,6 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPre
 		METHOD method_34816 addDirection (Lnet/minecraft/class_2350;)V
 			ARG 1 direction
 	CLASS class_8680 Events
-	CLASS class_8681
+	CLASS class_8681 PreparerState
 		METHOD <init> (Lnet/minecraft/class_769;)V
 			ARG 1 storage
diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping
@@ -35,6 +35,8 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
 	FIELD field_53081 framebufferSet Lnet/minecraft/class_9960;
 	FIELD field_53900 TRANSPARENCY Lnet/minecraft/class_2960;
 	FIELD field_53901 ENTITY_OUTLINE Lnet/minecraft/class_2960;
+	FIELD field_54160 prevTranslucencySortCameraPos Lnet/minecraft/class_2338;
+	FIELD field_54164 nearbyChunks Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
 	METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_898;Lnet/minecraft/class_824;Lnet/minecraft/class_4599;)V
 		ARG 1 client
 		ARG 2 entityRenderDispatcher
@@ -185,12 +187,13 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
 		ARG 1 camera
 	METHOD method_52815 scheduleNeighborUpdates (Lnet/minecraft/class_1923;)V
 		ARG 1 chunkPos
-	METHOD method_52816 (Lnet/minecraft/class_4604;)Lnet/minecraft/class_4604;
+	METHOD method_52816 offsetFrustum (Lnet/minecraft/class_4604;)Lnet/minecraft/class_4604;
 		ARG 0 frustum
 	METHOD method_62196 getCloudRenderer ()Lnet/minecraft/class_9955;
 	METHOD method_62197 isSkyDark (F)Z
 		ARG 1 tickDelta
-	METHOD method_62198 translucentSort (Lnet/minecraft/class_243;)V
+	METHOD method_62198 translucencySort (Lnet/minecraft/class_243;)V
+		ARG 1 cameraPos
 	METHOD method_62199 renderLateDebug (Lnet/minecraft/class_9909;Lnet/minecraft/class_243;Lnet/minecraft/class_9958;)V
 		ARG 1 frameGraphBuilder
 		ARG 2 pos
@@ -269,6 +272,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
 	METHOD method_62910 isLightingEnabledAround (Lnet/minecraft/class_3568;J)Z
 		ARG 0 lightingProvider
 		ARG 1 sectionPos
+	METHOD method_64059 clear ()V
 	METHOD method_8563 addParticle (Lnet/minecraft/class_2394;ZZDDDDDD)V
 		ARG 1 parameters
 		ARG 2 shouldAlwaysSpawn

diff --git a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping
@@ -10,9 +10,11 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder
 	FIELD field_46908 stopped Z
 	FIELD field_52171 sectionBuilder Lnet/minecraft/class_9810;
 	FIELD field_53957 scheduler Lnet/minecraft/class_10160;
+	FIELD field_54167 consecutiveExecutor Lnet/minecraft/class_10176;
 	METHOD <init> (Lnet/minecraft/class_638;Lnet/minecraft/class_761;Lnet/minecraft/class_10207;Lnet/minecraft/class_4599;Lnet/minecraft/class_776;Lnet/minecraft/class_824;)V
 		ARG 1 world
 		ARG 2 worldRenderer
+		ARG 3 executor
 		ARG 4 bufferBuilderStorage
 		ARG 5 blockRenderManager
 		ARG 6 blockEntityRenderDispatcher
@@ -21,6 +23,9 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder
 	METHOD method_19420 getCameraPosition ()Lnet/minecraft/class_243;
 	METHOD method_22752 setWorld (Lnet/minecraft/class_638;)V
 		ARG 1 world
+	METHOD method_22755 (Lnet/minecraft/class_846$class_851$class_4577;Lnet/minecraft/class_750;Lnet/minecraft/class_846$class_4690;Ljava/lang/Throwable;)V
+		ARG 3 result
+		ARG 4 throwable
 	METHOD method_22756 send (Lnet/minecraft/class_846$class_851$class_4577;)V
 		ARG 1 task
 	METHOD method_22761 upload ()V
@@ -44,13 +49,30 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder
 	METHOD method_60906 scheduleIndexBufferUpload (Lnet/minecraft/class_9799$class_9800;Lnet/minecraft/class_291;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 indexBuffer
 		ARG 2 vertexBuffer
+	CLASS class_10196 NormalizedRelativePos
+		FIELD field_54170 x I
+		FIELD field_54171 y I
+		FIELD field_54172 z I
+		METHOD equals (Ljava/lang/Object;)Z
+			ARG 1 o
+		METHOD method_64067 isOnCameraAxis ()Z
+		METHOD method_64068 normalize (DI)I
+			ARG 0 cameraCoord
+			ARG 2 sectionCoord
+		METHOD method_64069 of (Lnet/minecraft/class_243;J)Lnet/minecraft/class_846$class_10196;
+			ARG 0 cameraPos
+			ARG 1 sectionPos
+		METHOD method_64070 with (Lnet/minecraft/class_243;J)Lnet/minecraft/class_846$class_10196;
+			ARG 1 cameraPos
+			ARG 2 sectionPos
 	CLASS class_4690 Result
 	CLASS class_849 ChunkData
 		FIELD field_4450 nonEmptyLayers Ljava/util/Set;
-		FIELD field_4451 EMPTY Lnet/minecraft/class_846$class_849;
+		FIELD field_4451 UNPROCESSED Lnet/minecraft/class_846$class_849;
 		FIELD field_4453 transparentSortingData Lnet/minecraft/class_9801$class_9802;
 		FIELD field_4455 occlusionGraph Lnet/minecraft/class_854;
 		FIELD field_4456 blockEntities Ljava/util/List;
+		FIELD field_52172 EMPTY Lnet/minecraft/class_846$class_849;
 		METHOD method_3641 isEmpty (Lnet/minecraft/class_1921;)Z
 			ARG 1 layer
 		METHOD method_3642 getBlockEntities ()Ljava/util/List;
@@ -70,10 +92,12 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder
 		FIELD field_4464 needsRebuild Z
 		FIELD field_4467 origin Lnet/minecraft/class_2338$class_2339;
 		FIELD field_53958 sectionPos J
+		FIELD field_54168 relativePos Ljava/util/concurrent/atomic/AtomicReference;
 		METHOD <init> (Lnet/minecraft/class_846;IJ)V
 			ARG 2 index
 			ARG 3 sectionPos
 		METHOD method_22773 scheduleSort (Lnet/minecraft/class_846;)V
+			ARG 1 builder
 		METHOD method_22777 scheduleRebuild (Lnet/minecraft/class_846;Lnet/minecraft/class_6850;)V
 			ARG 1 chunkRenderer
 			ARG 2 builder
@@ -112,9 +136,14 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder
 		METHOD method_62974 getOffsetSectionPos (Lnet/minecraft/class_2350;)J
 			ARG 1 direction
 		METHOD method_62975 getSectionPos ()J
+		METHOD method_64065 hasTranslucentLayer ()Z
+		METHOD method_64066 isCurrentlySorting ()Z
 		CLASS class_4577 Task
 			FIELD field_20836 cancelled Ljava/util/concurrent/atomic/AtomicBoolean;
 			FIELD field_53959 prioritized Z
+			FIELD field_54169 finished Ljava/util/concurrent/atomic/AtomicBoolean;
+			METHOD <init> (Lnet/minecraft/class_846$class_851;Z)V
+				ARG 2 prioritized
 			METHOD method_22782 cancel ()V
 			METHOD method_22783 run (Lnet/minecraft/class_750;)Ljava/util/concurrent/CompletableFuture;
 				ARG 1 buffers
@@ -123,10 +152,21 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder
 			METHOD method_62977 getOrigin ()Lnet/minecraft/class_2338;
 		CLASS class_4578 RebuildTask
 			FIELD field_20838 region Lnet/minecraft/class_853;
+			METHOD <init> (Lnet/minecraft/class_846$class_851;Lnet/minecraft/class_853;Z)V
+				ARG 2 region
+				ARG 3 prioritized
 			METHOD method_22788 (Ljava/util/List;Lnet/minecraft/class_846$class_849;Lnet/minecraft/class_1921;Lnet/minecraft/class_9801;)V
 				ARG 3 renderLayer
 				ARG 4 buffer
+			METHOD method_23619 (Lnet/minecraft/class_846$class_849;Lnet/minecraft/class_846$class_10196;Ljava/util/List;Ljava/lang/Throwable;)Lnet/minecraft/class_846$class_4690;
+				ARG 3 v
+				ARG 4 throwable
 		CLASS class_4579 SortTask
 			FIELD field_20841 data Lnet/minecraft/class_846$class_849;
+			METHOD <init> (Lnet/minecraft/class_846$class_851;Lnet/minecraft/class_846$class_849;)V
+				ARG 2 data
+			METHOD method_22789 (Lnet/minecraft/class_846$class_10196;Lnet/minecraft/class_846$class_4690;Ljava/lang/Throwable;)Lnet/minecraft/class_846$class_4690;
+				ARG 2 result
+				ARG 3 throwable
 			METHOD method_22790 (Ljava/lang/Void;)Lnet/minecraft/class_846$class_4690;
 				ARG 0 v
diff --git a/mappings/net/minecraft/client/render/chunk/Octree.mapping b/mappings/net/minecraft/client/render/chunk/Octree.mapping
@@ -9,8 +9,17 @@ CLASS net/minecraft/class_10143 net/minecraft/client/render/chunk/Octree
 	METHOD method_62911 visit (Lnet/minecraft/class_10143$class_10148;Lnet/minecraft/class_4604;I)V
 		ARG 1 visitor
 		ARG 2 frustum
+		ARG 3 margin
 	METHOD method_62912 add (Lnet/minecraft/class_846$class_851;)Z
 		ARG 1 chunk
+	METHOD method_64061 isCenterWithin (DDDDDDI)Z
+		ARG 1 minX
+		ARG 3 minY
+		ARG 5 minZ
+		ARG 7 maxX
+		ARG 9 maxY
+		ARG 11 maxZ
+		ARG 13 margin
 	CLASS class_10144 AxisOrder
 		FIELD field_53912 x I
 		FIELD field_53913 y I
@@ -54,16 +63,23 @@ CLASS net/minecraft/class_10143 net/minecraft/client/render/chunk/Octree
 			ARG 3 northern
 		METHOD method_62921 areChildrenLeaves ()Z
 	CLASS class_10146 Leaf
+		FIELD field_54166 chunk Lnet/minecraft/class_846$class_851;
+		METHOD <init> (Lnet/minecraft/class_10143;Lnet/minecraft/class_846$class_851;)V
+			ARG 2 chunk
 	CLASS class_10147 Node
 		METHOD method_62915 getBuiltChunk ()Lnet/minecraft/class_846$class_851;
 		METHOD method_62917 visit (Lnet/minecraft/class_10143$class_10148;ZLnet/minecraft/class_4604;IIZ)V
 			ARG 1 visitor
 			ARG 2 skipVisibilityCheck
 			ARG 3 frustum
 			ARG 4 depth
+			ARG 5 margin
+			ARG 6 nearCenter
 		METHOD method_62920 getBoundingBox ()Lnet/minecraft/class_238;
 	CLASS class_10148 Visitor
 		METHOD visit (Lnet/minecraft/class_10143$class_10147;ZIZ)V
 			ARG 1 node
 			ARG 2 skipVisibilityCheck
 			ARG 3 depth
+			ARG 4 nearCenter
+				COMMENT whether the node is near octree's {@linkplain Octree#centerPos center}, that is, camera pos
diff --git a/mappings/net/minecraft/client/render/entity/state/PlayerEntityRenderState.mapping b/mappings/net/minecraft/client/render/entity/state/PlayerEntityRenderState.mapping
@@ -22,6 +22,7 @@ CLASS net/minecraft/class_10055 net/minecraft/client/render/entity/state/PlayerE
 	FIELD field_53544 jacketVisible Z
 	FIELD field_53545 leftPantsLegVisible Z
 	FIELD field_53546 rightPantsLegVisible Z
+	METHOD method_64259 getGlidingProgress ()F
 	CLASS class_10056 HandState
 		FIELD field_53547 empty Z
 		FIELD field_53548 itemUseAction Lnet/minecraft/class_1839;

diff --git a/mappings/net/minecraft/client/texture/NativeImage.mapping b/mappings/net/minecraft/client/texture/NativeImage.mapping
@@ -7,6 +7,7 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage
 	FIELD field_4990 isStbImage Z
 	FIELD field_4991 width I
 	FIELD field_4992 WRITE_TO_FILE_OPEN_OPTIONS Ljava/util/Set;
+	FIELD field_54265 MEMORY_POOL Lcom/mojang/jtracy/MemoryPool;
 	METHOD <init> (IIZ)V
 		ARG 1 width
 		ARG 2 height