diff --git a/mappings/net/minecraft/client/render/BufferBuilder.mapping b/mappings/net/minecraft/client/render/BufferBuilder.mapping index c767208621..87b661f57e 100644 --- a/mappings/net/minecraft/client/render/BufferBuilder.mapping +++ b/mappings/net/minecraft/client/render/BufferBuilder.mapping @@ -34,6 +34,9 @@ CLASS cuj net/minecraft/client/render/BufferBuilder ARG 3 y ARG 5 z METHOD a sortQuads (FFF)V + ARG 1 cameraX + ARG 2 cameraY + ARG 3 cameraZ METHOD a color (FFFF)Lcuj; ARG 1 red ARG 2 green diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index 16bf40b531..082bee4e2f 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -36,6 +36,7 @@ CLASS dki net/minecraft/client/render/GameRenderer ARG 1 tickDelta METHOD a renderWorld (FJ)V ARG 1 tickDelta + ARG 2 endTime METHOD a render (FJZ)V ARG 1 tickDelta ARG 2 startTime @@ -78,6 +79,7 @@ CLASS dki net/minecraft/client/render/GameRenderer METHOD b renderWeather (F)V METHOD b renderCenter (FJ)V ARG 1 tickDelta + ARG 2 endTime METHOD c toggleShadersEnabled ()V METHOD c getSkyDarkness (F)F ARG 1 tickDelta diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 098646b18f..94888f7eb0 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -24,7 +24,8 @@ CLASS dkm net/minecraft/client/render/WorldRenderer FIELD X chunkRendererList Ldkc; FIELD Y renderDistance I FIELD a DIRECTIONS [Lfa; - FIELD aa renderedEntities I + FIELD aa regularEntityCount I + FIELD ab blockEntityCount I FIELD ad forcedFrustum Ldnn; FIELD af forcedFrustumPosition Lcus; FIELD ag vertexBufferObjectsEnabled Z @@ -87,6 +88,7 @@ CLASS dkm net/minecraft/client/render/WorldRenderer ARG 3 z METHOD a playGlobalEvent (ILev;I)V METHOD a updateChunks (J)V + ARG 1 endTime METHOD a playLevelEvent (Lavx;ILev;I)V ARG 1 source ARG 2 type @@ -118,6 +120,7 @@ CLASS dkm net/minecraft/client/render/WorldRenderer ARG 9 blue ARG 10 alpha METHOD a renderStars (Lcuj;)V + ARG 1 buffer METHOD a buildBoxOutline (Lcuj;DDDDDDFFFF)V ARG 0 buffer ARG 1 minX @@ -132,6 +135,10 @@ CLASS dkm net/minecraft/client/render/WorldRenderer ARG 16 alpha METHOD a renderClouds (Lcuj;DDDLcrv;)V ARG 8 color + METHOD a (Lcuj;FZ)V + ARG 1 bufferBuilder + ARG 2 y + ARG 3 flipX METHOD a renderPartiallyBrokenBlocks (Lcum;Lcuj;Lcux;)V ARG 1 tesselator ARG 2 builder @@ -146,8 +153,10 @@ CLASS dkm net/minecraft/client/render/WorldRenderer METHOD a setWorld (Ldhl;)V METHOD a getOpenChunkFaces (Lev;)Ljava/util/Set; ARG 1 pos - METHOD a getChunkRenderer (Lev;Ldne;Lfa;)Ldne; + METHOD a getAdjacentChunkRenderer (Lev;Ldne;Lfa;)Ldne; ARG 1 pos + ARG 2 chunkRenderer + ARG 3 direction METHOD a scheduleSectionRender (Lev;Z)V ARG 1 pos METHOD a addParticle (Lgd;DDDDDD)V @@ -235,6 +244,7 @@ CLASS dkm net/minecraft/client/render/WorldRenderer ARG 14 velocityZ METHOD c canDrawEntityOutlines ()Z METHOD d reload ()V + METHOD e clearChunkRenderers ()V METHOD f getChunksDebugString ()Ljava/lang/String; METHOD g getChunkNumber ()I METHOD h getEntitiesDebugString ()Ljava/lang/String; @@ -242,7 +252,7 @@ CLASS dkm net/minecraft/client/render/WorldRenderer METHOD m isTerrainRenderComplete ()Z METHOD n scheduleTerrainUpdate ()V METHOD o loadDestroyStageTextures ()V - METHOD r setupStarRendering ()V + METHOD r renderStars ()V METHOD s renderEndSky ()V METHOD t enableBlockOverlayRendering ()V METHOD u disableBlockOverlayRendering ()V diff --git a/mappings/net/minecraft/client/render/chunk/BlockLayeredBufferBuilder.mapping b/mappings/net/minecraft/client/render/chunk/BlockLayeredBufferBuilder.mapping index 8a1f334f67..0f801f3940 100644 --- a/mappings/net/minecraft/client/render/chunk/BlockLayeredBufferBuilder.mapping +++ b/mappings/net/minecraft/client/render/chunk/BlockLayeredBufferBuilder.mapping @@ -1,4 +1,6 @@ CLASS dkb net/minecraft/client/render/chunk/BlockLayeredBufferBuilder FIELD a layerBuilders [Lcuj; METHOD a get (I)Lcuj; + ARG 1 index METHOD a get (Lbgs;)Lcuj; + ARG 1 layer diff --git a/mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping b/mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping index 5ef96ce682..77e6fda973 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping @@ -2,17 +2,48 @@ CLASS dna net/minecraft/client/render/chunk/ChunkBatcher CLASS dna$a ChunkUploadTask FIELD b task Lcom/google/common/util/concurrent/ListenableFutureTask; FIELD c priority D + METHOD (Ldna;Lcom/google/common/util/concurrent/ListenableFutureTask;D)V + ARG 1 task + ARG 2 priority FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b THREAD_FACTORY Ljava/util/concurrent/ThreadFactory; + FIELD c bufferCount I FIELD d workerThreads Ljava/util/List; FIELD e workers Ljava/util/List; FIELD f pendingChunks Ljava/util/concurrent/PriorityBlockingQueue; FIELD g availableBuffers Ljava/util/concurrent/BlockingQueue; - FIELD h bufferRenderer Lcuk; + FIELD h displayListBufferRenderer Lcuk; + FIELD i vboBufferRenderer Lcuo; FIELD j pendingUploads Ljava/util/Queue; - FIELD k activeWorker Ldnb; + FIELD k clientThreadWorker Ldnb; + FIELD l cameraPosition Lcrv; METHOD a getDebugString ()Ljava/lang/String; + METHOD a runTasksSync (J)Z + ARG 1 endTime + METHOD a upload (Lbgs;Lcuj;Ldne;Ldnc;D)Lcom/google/common/util/concurrent/ListenableFuture; + ARG 1 layer + ARG 2 bufferBuilder + ARG 3 chunkRenderer + ARG 4 chunkRenderData + METHOD a setCameraPosition (Lcrv;)V + ARG 1 cameraPosition + METHOD a uploadDisplayList (Lcuj;I)V + ARG 1 bufferBuilder + ARG 2 index + METHOD a uploadVbo (Lcuj;Lcun;)V + ARG 1 bufferBuilder + ARG 2 glBuffer METHOD a addAvailableBuffer (Ldkb;)V + METHOD a rebuild (Ldne;)Z + ARG 1 renderer + METHOD b getCameraPosition ()Lcrv; + METHOD b rebuildSync (Ldne;)Z + ARG 1 renderer + METHOD c reset ()V + METHOD c resortTransparency (Ldne;)Z + ARG 1 renderer METHOD d getNextAvailableBuffer ()Ldkb; METHOD e getNextChunkRenderDataTask ()Ldmz; + METHOD f clear ()V METHOD g isEmpty ()Z + METHOD h stop ()V diff --git a/mappings/net/minecraft/client/render/chunk/ChunkRenderData.mapping b/mappings/net/minecraft/client/render/chunk/ChunkRenderData.mapping index bb112d715c..5d634bf323 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkRenderData.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkRenderData.mapping @@ -1,13 +1,24 @@ CLASS dnc net/minecraft/client/render/chunk/ChunkRenderData FIELD a EMPTY Ldnc; + FIELD b nonEmpty [Z FIELD c initialized [Z FIELD d empty Z FIELD e blockEntities Ljava/util/List; + FIELD f occlusionGraph Ldni; FIELD g bufferState Lcuj$a; METHOD a isEmpty ()Z + METHOD a setNonEmpty (Lbgs;)V + ARG 1 layer METHOD a addBlockEntity (Lbtm;)V METHOD a setBufferState (Lcuj$a;)V + METHOD a setOcclusionGraph (Ldni;)V + ARG 1 occlusionGraph + METHOD a isVisibleThrough (Lfa;Lfa;)Z METHOD b getBlockEntities ()Ljava/util/List; + METHOD b isEmpty (Lbgs;)Z + ARG 1 layer METHOD c getBufferState ()Lcuj$a; METHOD c markBufferInitialized (Lbgs;)V + ARG 1 layer METHOD d isBufferInitialized (Lbgs;)Z + ARG 1 layer diff --git a/mappings/net/minecraft/client/render/chunk/ChunkRenderTask.mapping b/mappings/net/minecraft/client/render/chunk/ChunkRenderTask.mapping index ff1dfe4bb1..27ef8f97c8 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkRenderTask.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkRenderTask.mapping @@ -3,10 +3,10 @@ CLASS dmz net/minecraft/client/render/chunk/ChunkRenderTask CLASS dmz$b Mode FIELD a chunkRenderer Ldne; FIELD b lock Ljava/util/concurrent/locks/ReentrantLock; - FIELD c runnables Ljava/util/List; + FIELD c completionActions Ljava/util/List; FIELD d mode Ldmz$b; - FIELD e distanceToPlayerSquared D - FIELD f worldView Ldng; + FIELD e squaredCameraDistance D + FIELD f region Ldng; FIELD g bufferBuilder Ldkb; FIELD h renderData Ldnc; FIELD i stage Ldmz$a; @@ -14,19 +14,21 @@ CLASS dmz net/minecraft/client/render/chunk/ChunkRenderTask METHOD (Ldne;Ldmz$b;DLdng;)V ARG 1 chunkRenderer ARG 2 mode - ARG 3 distanceToPlayerSquared + ARG 3 squaredCameraDistance + ARG 5 region METHOD a getStage ()Ldmz$a; METHOD a setBufferBuilders (Ldkb;)V METHOD a setStage (Ldmz$a;)V METHOD a setRenderData (Ldnc;)V ARG 1 renderData - METHOD a add (Ljava/lang/Runnable;)V + METHOD a addCompletionAction (Ljava/lang/Runnable;)V + ARG 1 action METHOD b getChunkRenderer ()Ldne; - METHOD c getAndInvalidateWorldView ()Ldng; + METHOD c takeRegion ()Ldng; METHOD d getRenderData ()Ldnc; METHOD e getBufferBuilders ()Ldkb; METHOD f cancel ()V METHOD g getLock ()Ljava/util/concurrent/locks/ReentrantLock; METHOD h getMode ()Ldmz$b; METHOD i isCancelled ()Z - METHOD j getDistanceToPlayerSquared ()D + METHOD j getSquaredCameraDistance ()D diff --git a/mappings/net/minecraft/client/render/chunk/ChunkRenderer.mapping b/mappings/net/minecraft/client/render/chunk/ChunkRenderer.mapping index 8c00529717..330728dae4 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkRenderer.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkRenderer.mapping @@ -1,30 +1,52 @@ CLASS dne net/minecraft/client/render/chunk/ChunkRenderer FIELD a chunkUpdateCount I - FIELD b chunkRenderData Ldnc; + FIELD b data Ldnc; FIELD c boundingBox Lcrq; FIELD d world Lbhh; FIELD e renderer Ldkm; - FIELD f chunkRenderLock Ljava/util/concurrent/locks/ReentrantLock; - FIELD g chunkRenderDataLock Ljava/util/concurrent/locks/ReentrantLock; - FIELD h chunkRenderDataTask Ldmz; + FIELD f lock Ljava/util/concurrent/locks/ReentrantLock; + FIELD g dataLock Ljava/util/concurrent/locks/ReentrantLock; + FIELD h task Ldmz; FIELD i blockEntities Ljava/util/Set; FIELD j buffers [Lcun; - FIELD l renderScheduled Z + FIELD l rebuildScheduled Z FIELD m origin Lev$a; + FIELD n neighborPositions [Lev$a; + FIELD o rebuildOnClientThread Z METHOD a delete ()V METHOD a resortTransparency (FFFLdmz;)V + METHOD a setOrigin (III)V + ARG 1 x + ARG 2 y + ARG 3 z METHOD a endBufferBuilding (Lbgs;FFFLcuj;Ldnc;)V METHOD a beginBufferBuilding (Lcuj;Lev;)V - METHOD a setChunkRenderData (Ldnc;)V - ARG 1 chunkRenderData - METHOD a scheduleRender (Z)V + METHOD a setData (Ldnc;)V + ARG 1 data + METHOD a isChunkNonEmpty (Lev;Lbhh;)Z + ARG 0 pos + ARG 1 world + METHOD a getNeighborPosition (Lfa;)Lev; + ARG 1 direction + METHOD a scheduleRebuild (Z)V + ARG 1 rebuildOnClientThread + METHOD b shouldBuild ()Z METHOD b rebuildChunk (FFFLdmz;)V + ARG 1 cameraX + ARG 2 cameraY + ARG 3 cameraZ + ARG 4 task METHOD b getGlBuffer (I)Lcun; + ARG 1 layer METHOD c cancel ()V - METHOD d getChunkRenderLock ()Ljava/util/concurrent/locks/ReentrantLock; - METHOD f getResortTransparencyTask ()Ldmz; - METHOD g getDistanceToPlayerSquared ()D - METHOD h getChunkRenderData ()Ldnc; + METHOD d getLock ()Ljava/util/concurrent/locks/ReentrantLock; + METHOD e startRebuild ()Ldmz; + METHOD f startResortTransparency ()Ldmz; + METHOD g getSquaredCameraDistance ()D + METHOD h getData ()Ldnc; METHOD i clear ()V METHOD k getOrigin ()Lev; + METHOD l unscheduleRebuild ()V + METHOD m shouldRebuild ()Z + METHOD n shouldRebuildOnClientThread ()Z METHOD o getWorld ()Lbhh; diff --git a/mappings/net/minecraft/client/world/SafeWorldView.mapping b/mappings/net/minecraft/client/render/chunk/ChunkRendererRegion.mapping similarity index 90% rename from mappings/net/minecraft/client/world/SafeWorldView.mapping rename to mappings/net/minecraft/client/render/chunk/ChunkRendererRegion.mapping index 775820d90a..4d28f5ebde 100644 --- a/mappings/net/minecraft/client/world/SafeWorldView.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkRendererRegion.mapping @@ -1,4 +1,4 @@ -CLASS dng net/minecraft/client/world/SafeWorldView +CLASS dng net/minecraft/client/render/chunk/ChunkRendererRegion FIELD a chunkXOffset I FIELD b chunkZOffset I FIELD c offset Lev;