From 31f4f209024e0a33ad04b9ddf79e89b6e1656793 Mon Sep 17 00:00:00 2001 From: Bartosz Skrzypczak Date: Wed, 6 Feb 2019 19:13:57 +0100 Subject: [PATCH] Add more chunkloading-related mappings (#447) --- .../packet/LightUpdateClientPacket.mapping | 9 ++++ .../client/world/ClientChunkManager.mapping | 52 +++++++++++++++++++ .../server/world/ChunkHolder.mapping | 9 +++- .../server/world/ServerChunkManager.mapping | 5 ++ .../net/minecraft/sortme/SpawnHelper.mapping | 5 ++ .../world/chunk/ChunkProvider.mapping | 4 ++ .../minecraft/world/chunk/WorldChunk.mapping | 5 ++ 7 files changed, 88 insertions(+), 1 deletion(-) diff --git a/mappings/net/minecraft/client/network/packet/LightUpdateClientPacket.mapping b/mappings/net/minecraft/client/network/packet/LightUpdateClientPacket.mapping index 24a954c48c..ca420f3703 100644 --- a/mappings/net/minecraft/client/network/packet/LightUpdateClientPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/LightUpdateClientPacket.mapping @@ -1,5 +1,14 @@ CLASS le net/minecraft/client/network/packet/LightUpdateClientPacket FIELD a chunkX I FIELD b chunkZ I + FIELD c blockLightUpdateBits I + FIELD d skyLightUpdateBits I + FIELD e filledBlockLightBits I + FIELD f filledSkyLightBits I FIELD g skyUpdates Ljava/util/List; FIELD h blockUpdates Ljava/util/List; + METHOD (Lbcd;Lcfs;II)V + ARG 1 pos + ARG 2 lightProvider + ARG 3 blockLightUpdatesBits + ARG 4 skyLightUpdateBits diff --git a/mappings/net/minecraft/client/world/ClientChunkManager.mapping b/mappings/net/minecraft/client/world/ClientChunkManager.mapping index 35c5c58f1f..2995a52b54 100644 --- a/mappings/net/minecraft/client/world/ClientChunkManager.mapping +++ b/mappings/net/minecraft/client/world/ClientChunkManager.mapping @@ -1,6 +1,58 @@ CLASS dce net/minecraft/client/world/ClientChunkManager + CLASS dce$a ClientChunkMap + FIELD b chunks Ljava/util/concurrent/atomic/AtomicReferenceArray; + FIELD c loadDistance I + FIELD d loadDiameter I + METHOD (Ldce;I)V + ARG 2 loadDistance + METHOD a unload (II)V + ARG 1 chunkX + ARG 2 chunkZ + METHOD b getChunk (II)Lbsp; + ARG 1 chunkX + ARG 2 chunkZ + METHOD c index (II)I + ARG 1 chunkX + ARG 2 chunkZ + METHOD d hasChunk (II)Z + ARG 1 chunkX + ARG 2 chunkZ FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b client Lcqd; FIELD c emptyChunk Lbsp; FIELD d lightingProvider Lcfs; + FIELD e chunks Ldce$a; + FIELD f loadedChunkCount I + FIELD g playerChunkX I + FIELD h playerChunkZ I FIELD i world Lbcb; + METHOD (Lbcq;)V + ARG 1 world + METHOD a updateChunkList ()V + METHOD a loadChunkFromPacket (Lbcq;IILis;Lhr;IZ)V + ARG 1 world + ARG 2 chunkX + ARG 3 chunkZ + ARG 4 data + ARG 5 nbt + ARG 6 updatedSectionsBits + ARG 7 clearOld + METHOD a (Lbda;III)V + ARG 1 arg1 + ARG 2 arg2 + ARG 3 arg3 + ARG 4 arg4 + METHOD b isWithinDistance (IIIII)Z + ARG 0 x1 + ARG 1 z1 + ARG 2 x2 + ARG 3 z2 + ARG 4 distance + METHOD b getChunk (IILbsi;Z)Lbsp; + ARG 1 chunkX + ARG 2 chunkZ + ARG 3 status + ARG 4 allowEmpty + METHOD c unload (II)V + ARG 1 chunkX + ARG 2 chunkZ diff --git a/mappings/net/minecraft/server/world/ChunkHolder.mapping b/mappings/net/minecraft/server/world/ChunkHolder.mapping index f5e1acbb40..b168846475 100644 --- a/mappings/net/minecraft/server/world/ChunkHolder.mapping +++ b/mappings/net/minecraft/server/world/ChunkHolder.mapping @@ -26,7 +26,9 @@ CLASS ue net/minecraft/server/world/ChunkHolder FIELD d UNLOADED_WORLD_CHUNK_FUTURE Ljava/util/concurrent/CompletableFuture; FIELD e CHUNK_STATUSES Ljava/util/List; FIELD f LEVEL_TYPES [Lue$b; - FIELD g statusToChunk Ljava/util/concurrent/atomic/AtomicReferenceArray; + FIELD g chunkByStatus Ljava/util/concurrent/atomic/AtomicReferenceArray; + FIELD h tickingFutureChunk Ljava/util/concurrent/CompletableFuture; + FIELD i entityTickingFutureChunk Ljava/util/concurrent/CompletableFuture; FIELD j chunk Ljava/util/concurrent/CompletableFuture; FIELD l level I FIELD m lastLevelUpdatedTo I @@ -34,6 +36,9 @@ CLASS ue net/minecraft/server/world/ChunkHolder FIELD o blockUpdatePositions [S FIELD p blockUpdateCount I FIELD q sectionsNeedingUpdateMask I + FIELD r lightSentWithBlocksBits I + FIELD s skyLightUpdateBits I + FIELD t blockLightUpdateBits I FIELD u lightingProvider Lcfs; FIELD v levelUpdateListener Lue$c; FIELD w playersWatchingChunkProvider Lue$d; @@ -41,6 +46,8 @@ CLASS ue net/minecraft/server/world/ChunkHolder ARG 1 pos ARG 2 level ARG 5 playersWatchingChunkProvider + METHOD (Ljava/lang/String;)V + ARG 1 name METHOD a setLevel (I)V ARG 1 level METHOD a markForUpdate (III)V diff --git a/mappings/net/minecraft/server/world/ServerChunkManager.mapping b/mappings/net/minecraft/server/world/ServerChunkManager.mapping index b03b04ca6d..d434138610 100644 --- a/mappings/net/minecraft/server/world/ServerChunkManager.mapping +++ b/mappings/net/minecraft/server/world/ServerChunkManager.mapping @@ -27,6 +27,11 @@ CLASS uq net/minecraft/server/world/ServerChunkManager METHOD a getWatchDistance (Lbcd;Lut;Z)I ARG 0 chunkPos ARG 1 player + METHOD a (Lbda;III)V + ARG 1 arg1 + ARG 2 arg2 + ARG 3 arg3 + ARG 4 arg4 METHOD a markForUpdate (Let;)V METHOD a addPlayer (Lut;)V ARG 1 player diff --git a/mappings/net/minecraft/sortme/SpawnHelper.mapping b/mappings/net/minecraft/sortme/SpawnHelper.mapping index c1cced1cc9..3413294dc1 100644 --- a/mappings/net/minecraft/sortme/SpawnHelper.mapping +++ b/mappings/net/minecraft/sortme/SpawnHelper.mapping @@ -1,5 +1,10 @@ CLASS bdb net/minecraft/sortme/SpawnHelper FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + METHOD a spawnEntitiesInChunk (Lahp;Lbcq;Lbsp;Let;)V + ARG 0 category + ARG 1 world + ARG 2 chunk + ARG 3 spawnPos METHOD a canSpawn (Lahz$b;Lbcu;Let;Lahi;)Z METHOD a isClearForSpawn (Lbcb;Let;Lbqp;Lcgb;)Z METHOD a populateEntities (Lbcr;Lbdo;IILjava/util/Random;)V diff --git a/mappings/net/minecraft/world/chunk/ChunkProvider.mapping b/mappings/net/minecraft/world/chunk/ChunkProvider.mapping index c847a3b262..0f6e6b50c2 100644 --- a/mappings/net/minecraft/world/chunk/ChunkProvider.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkProvider.mapping @@ -1,5 +1,9 @@ CLASS bsr net/minecraft/world/chunk/ChunkProvider METHOD a onLightUpdate (Lbda;III)V + ARG 1 type + ARG 2 chunkX + ARG 3 sectionY + ARG 4 chunkZ METHOD b getChunk (II)Lbcb; ARG 1 chunkX ARG 2 chunkZ diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index 1b8b96cd61..3ae41e86b2 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -43,6 +43,11 @@ CLASS bsp net/minecraft/world/chunk/WorldChunk ARG 1 pos METHOD a loadBlockEntity (Let;Lhr;)Lbot; ARG 1 pos + METHOD a loadFromPacket (Lis;Lhr;IZ)V + ARG 1 data + ARG 2 nbt + ARG 3 updatedSectionsBits + ARG 4 clearOld METHOD a appendEntities (Ljava/lang/Class;Lcmr;Ljava/util/List;Ljava/util/function/Predicate;)V ARG 1 entityClass ARG 2 box