From 7816af101142e75d9b81be8f93ad77e2fd1e4088 Mon Sep 17 00:00:00 2001 From: Liyan Zhao Date: Thu, 25 Jan 2024 19:34:12 +0800 Subject: [PATCH 1/4] update mapping for ChunkRenderingDataPreparer --- .../render/ChunkRenderingDataPreparer.mapping | 16 ++++++++++++++++ .../client/render/WorldRenderer.mapping | 2 ++ 2 files changed, 18 insertions(+) diff --git a/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping b/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping index 71cbbca858..2d3bae8e1e 100644 --- a/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping +++ b/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping @@ -1,4 +1,15 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPreparer + FIELD field_45617 LOGGER Lorg/slf4j/Logger; + FIELD field_45625 propagatationContext Ljava/util/concurrent/atomic/AtomicReference; + METHOD method_52821 (Lnet/minecraft/class_4184;Ljava/util/Queue;)V + ARG 1 camera + METHOD method_52825 (Lnet/minecraft/class_8679$class_6600;Lnet/minecraft/class_243;Ljava/util/Queue;ZLjava/util/function/Consumer;)V + ARG 2 cameraPos + METHOD method_52826 updateBuiltChunkStorage (Lnet/minecraft/class_769;)V + METHOD method_52828 applyFrustum (Lnet/minecraft/class_4604;Ljava/util/List;)V + METHOD method_52832 shouldRenderBlock (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Z + ARG 1 cameraPos + ARG 2 pos CLASS class_762 ChunkInfo FIELD field_4122 propagationLevel I FIELD field_4124 chunk Lnet/minecraft/class_846$class_851; @@ -31,5 +42,10 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPre ARG 2 info CLASS class_6600 RenderableChunks FIELD field_34819 chunks Ljava/util/LinkedHashSet; + FIELD field_45628 builtChunks Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; METHOD (I)V ARG 1 chunkCount + CLASS class_8680 BuilderPropagatationContext + CLASS class_8681 + METHOD (I)V + ARG 1 size diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 3cd347e178..0600809f6a 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -65,6 +65,8 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_4118 lastTranslucentSortZ D FIELD field_4119 playingSongs Ljava/util/Map; FIELD field_4121 cameraChunkZ I + FIELD field_45614 chunkBuilder Lnet/minecraft/class_846; + FIELD field_45616 builtChunks Lit/unimi/dsi/fastutil/objects/ObjectArrayList; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_898;Lnet/minecraft/class_824;Lnet/minecraft/class_4599;)V ARG 1 client ARG 2 entityRenderDispatcher From e7901ae0368c0d02ebd4549c369725b5c1659cb5 Mon Sep 17 00:00:00 2001 From: Liyan Zhao Date: Thu, 25 Jan 2024 19:56:09 +0800 Subject: [PATCH 2/4] update mapping for ChunkRenderingDataPreparer --- .../client/render/ChunkRenderingDataPreparer.mapping | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping b/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping index 2d3bae8e1e..5dcc3a43e9 100644 --- a/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping +++ b/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping @@ -1,6 +1,10 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPreparer FIELD field_45617 LOGGER Lorg/slf4j/Logger; + FIELD field_45618 DIRECTIONS [Lnet/minecraft/class_2350; + FIELD field_45621 isFree Z FIELD field_45625 propagatationContext Ljava/util/concurrent/atomic/AtomicReference; + FIELD field_45626 finished Ljava/util/concurrent/atomic/AtomicBoolean; + METHOD method_52817 markFree ()V METHOD method_52821 (Lnet/minecraft/class_4184;Ljava/util/Queue;)V ARG 1 camera METHOD method_52825 (Lnet/minecraft/class_8679$class_6600;Lnet/minecraft/class_243;Ljava/util/Queue;ZLjava/util/function/Consumer;)V @@ -10,6 +14,7 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPre METHOD method_52832 shouldRenderBlock (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Z ARG 1 cameraPos ARG 2 pos + METHOD method_52836 resetFinished ()Z CLASS class_762 ChunkInfo FIELD field_4122 propagationLevel I FIELD field_4124 chunk Lnet/minecraft/class_846$class_851; From 47419e570dd9cb454874f64088c6d4abbae0cde0 Mon Sep 17 00:00:00 2001 From: Liyan Zhao Date: Thu, 25 Jan 2024 20:38:25 +0800 Subject: [PATCH 3/4] update mapping for ChunkRenderingDataPreparer --- .../render/ChunkRenderingDataPreparer.mapping | 23 +++++++++++++++---- .../client/render/WorldRenderer.mapping | 1 + 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping b/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping index 5dcc3a43e9..155a17f94e 100644 --- a/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping +++ b/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping @@ -2,18 +2,32 @@ 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_45621 isFree Z + FIELD field_45622 reloadChunksFuture Ljava/util/concurrent/Future; + FIELD field_45623 builtChunkStorage Lnet/minecraft/class_769; + FIELD field_45624 chunks Ljava/util/concurrent/atomic/AtomicReference; FIELD field_45625 propagatationContext Ljava/util/concurrent/atomic/AtomicReference; FIELD field_45626 finished Ljava/util/concurrent/atomic/AtomicBoolean; METHOD method_52817 markFree ()V - METHOD method_52821 (Lnet/minecraft/class_4184;Ljava/util/Queue;)V + METHOD method_52821 addChunksToQueue (Lnet/minecraft/class_4184;Ljava/util/Queue;)V ARG 1 camera - METHOD method_52825 (Lnet/minecraft/class_8679$class_6600;Lnet/minecraft/class_243;Ljava/util/Queue;ZLjava/util/function/Consumer;)V + METHOD method_52824 (Lnet/minecraft/class_8679$class_8681;Lnet/minecraft/class_8679$class_762;)V + ARG 1 chunkInfo + METHOD method_52825 __temp_somethingFrustum (Lnet/minecraft/class_8679$class_6600;Lnet/minecraft/class_243;Ljava/util/Queue;ZLjava/util/function/Consumer;)V ARG 2 cameraPos + ARG 4 chunkCulling METHOD method_52826 updateBuiltChunkStorage (Lnet/minecraft/class_769;)V METHOD method_52828 applyFrustum (Lnet/minecraft/class_4604;Ljava/util/List;)V METHOD method_52832 shouldRenderBlock (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Z ARG 1 cameraPos ARG 2 pos + METHOD method_52833 reloadChunks (ZLnet/minecraft/class_4184;Lnet/minecraft/class_243;)V + ARG 1 chunkCulling + ARG 2 camera + ARG 3 cameraPos + METHOD method_52834 buildOcclusionGraph (ZLnet/minecraft/class_4184;Lnet/minecraft/class_4604;Ljava/util/List;)V + ARG 1 chunkCulling + METHOD method_52835 (ZLnet/minecraft/class_4604;Ljava/util/List;Lnet/minecraft/class_243;)V + ARG 1 chunkCulling METHOD method_52836 resetFinished ()Z CLASS class_762 ChunkInfo FIELD field_4122 propagationLevel I @@ -47,10 +61,11 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPre ARG 2 info CLASS class_6600 RenderableChunks FIELD field_34819 chunks Ljava/util/LinkedHashSet; + FIELD field_45627 chunkInfoList Lnet/minecraft/class_8679$class_5972; FIELD field_45628 builtChunks Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; METHOD (I)V ARG 1 chunkCount - CLASS class_8680 BuilderPropagatationContext - CLASS class_8681 + CLASS class_8680 PropagatationContext + CLASS class_8681 OcclusionGraphChunks METHOD (I)V ARG 1 size diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 0600809f6a..214ebaf1fd 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -66,6 +66,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_4119 playingSongs Ljava/util/Map; FIELD field_4121 cameraChunkZ I FIELD field_45614 chunkBuilder Lnet/minecraft/class_846; + FIELD field_45615 renderingDataPreparer Lnet/minecraft/class_8679; FIELD field_45616 builtChunks Lit/unimi/dsi/fastutil/objects/ObjectArrayList; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_898;Lnet/minecraft/class_824;Lnet/minecraft/class_4599;)V ARG 1 client From 2116332cb513a1ca48fa4755435bc10fb85f4302 Mon Sep 17 00:00:00 2001 From: Liyan Zhao Date: Thu, 25 Jan 2024 21:07:57 +0800 Subject: [PATCH 4/4] update mapping for ChunkRenderingDataPreparer --- .../client/render/ChunkRenderingDataPreparer.mapping | 10 ++++++++-- .../net/minecraft/client/render/WorldRenderer.mapping | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping b/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping index 155a17f94e..5c30002f9d 100644 --- a/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping +++ b/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping @@ -8,11 +8,15 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPre FIELD field_45625 propagatationContext Ljava/util/concurrent/atomic/AtomicReference; FIELD field_45626 finished Ljava/util/concurrent/atomic/AtomicBoolean; METHOD method_52817 markFree ()V + METHOD method_52819 scheduleChunkRendering (Lnet/minecraft/class_1923;)V + ARG 1 pos METHOD method_52821 addChunksToQueue (Lnet/minecraft/class_4184;Ljava/util/Queue;)V ARG 1 camera + METHOD method_52822 schedulePropagatating (Lnet/minecraft/class_8679$class_8680;Lnet/minecraft/class_1923;)V + METHOD method_52823 preparePropagate (Lnet/minecraft/class_8679$class_8681;)V METHOD method_52824 (Lnet/minecraft/class_8679$class_8681;Lnet/minecraft/class_8679$class_762;)V ARG 1 chunkInfo - METHOD method_52825 __temp_somethingFrustum (Lnet/minecraft/class_8679$class_6600;Lnet/minecraft/class_243;Ljava/util/Queue;ZLjava/util/function/Consumer;)V + METHOD method_52825 checkFrustum (Lnet/minecraft/class_8679$class_6600;Lnet/minecraft/class_243;Ljava/util/Queue;ZLjava/util/function/Consumer;)V ARG 2 cameraPos ARG 4 chunkCulling METHOD method_52826 updateBuiltChunkStorage (Lnet/minecraft/class_769;)V @@ -26,8 +30,10 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPre ARG 3 cameraPos METHOD method_52834 buildOcclusionGraph (ZLnet/minecraft/class_4184;Lnet/minecraft/class_4604;Ljava/util/List;)V ARG 1 chunkCulling - METHOD method_52835 (ZLnet/minecraft/class_4604;Ljava/util/List;Lnet/minecraft/class_243;)V + ARG 4 result + METHOD method_52835 applyFrustum (ZLnet/minecraft/class_4604;Ljava/util/List;Lnet/minecraft/class_243;)V ARG 1 chunkCulling + ARG 3 result METHOD method_52836 resetFinished ()Z CLASS class_762 ChunkInfo FIELD field_4122 propagationLevel I diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 214ebaf1fd..359df34e29 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -412,6 +412,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 1 green ARG 2 blue ARG 3 hueOffset + METHOD method_52815 scheduleChunkRendering (Lnet/minecraft/class_1923;)V METHOD method_54638 shootParticles (ILnet/minecraft/class_2338;Lnet/minecraft/class_5819;Lnet/minecraft/class_2400;)V ARG 1 direction ARG 2 pos