diff --git a/mappings/net/minecraft/server/world/ChunkHolder.mapping b/mappings/net/minecraft/server/world/ChunkHolder.mapping index f8972efd05..db4b9c36e0 100644 --- a/mappings/net/minecraft/server/world/ChunkHolder.mapping +++ b/mappings/net/minecraft/server/world/ChunkHolder.mapping @@ -21,7 +21,8 @@ CLASS ur net/minecraft/server/world/ChunkHolder FIELD e CHUNK_STATUSES Ljava/util/List; FIELD f LEVEL_TYPES [Lur$b; FIELD g futuresByStatus Ljava/util/concurrent/atomic/AtomicReferenceArray; - FIELD h tickingFuture Ljava/util/concurrent/CompletableFuture; + FIELD h borderFuture Ljava/util/concurrent/CompletableFuture; + FIELD i tickingFuture Ljava/util/concurrent/CompletableFuture; FIELD j entityTickingFuture Ljava/util/concurrent/CompletableFuture; FIELD k future Ljava/util/concurrent/CompletableFuture; FIELD l lastTickLevel I diff --git a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping index 1390519571..7b3f5ad6c7 100644 --- a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping +++ b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping @@ -48,6 +48,7 @@ CLASS uz net/minecraft/server/world/ChunkTicketManager ARG 2 mainThreadExecutor METHOD a purge ()V METHOD a setViewDistance (I)V + ARG 1 distance METHOD a isUnloaded (J)Z ARG 1 pos METHOD a setLevel (JILur;I)Lur; @@ -58,6 +59,7 @@ CLASS uz net/minecraft/server/world/ChunkTicketManager ARG 1 position ARG 3 ticket METHOD a setChunkForced (Lbgu;Z)V + ARG 1 pos ARG 2 forced METHOD a handleChunkEnter (Lfo;Lvh;)V ARG 1 pos @@ -82,6 +84,11 @@ CLASS uz net/minecraft/server/world/ChunkTicketManager METHOD b handleChunkLeave (Lfo;Lvh;)V ARG 1 pos ARG 2 player + METHOD b removeTicketWithLevel (Lvl;Lbgu;ILjava/lang/Object;)V + ARG 1 type + ARG 2 pos + ARG 3 level + ARG 4 argument METHOD c addTicket (Lvl;Lbgu;ILjava/lang/Object;)V ARG 1 type ARG 2 pos diff --git a/mappings/net/minecraft/server/world/ServerChunkManager.mapping b/mappings/net/minecraft/server/world/ServerChunkManager.mapping index b5a6b0c10c..e4e78fc2a8 100644 --- a/mappings/net/minecraft/server/world/ServerChunkManager.mapping +++ b/mappings/net/minecraft/server/world/ServerChunkManager.mapping @@ -13,10 +13,15 @@ CLASS ve net/minecraft/server/world/ServerChunkManager FIELD k lastMobSpawningTime J FIELD l spawnMonsters Z FIELD m spawnAnimals Z + FIELD n chunkPosCache [J + FIELD o chunkStatusCache [Lbxd; + FIELD p chunkCache [Lbwy; METHOD (Lvg;Ljava/io/File;Lcom/mojang/datafixers/DataFixer;Lcjg;Ljava/util/concurrent/Executor;Lbwz;IILvp;Ljava/util/function/Supplier;)V ARG 5 workerExecutor METHOD a getChunkHolder (J)Lur; ARG 1 pos + METHOD a (JLjava/util/function/Function;)Z + ARG 1 pos METHOD a sendToNearbyPlayers (Laii;Lka;)V ARG 1 entity ARG 2 packet @@ -39,6 +44,7 @@ CLASS ve net/minecraft/server/world/ServerChunkManager METHOD b getDebugString (Lbgu;)Ljava/lang/String; ARG 1 pos METHOD b markForUpdate (Lev;)V + ARG 1 pos METHOD b removeTicket (Lvl;Lbgu;ILjava/lang/Object;)V METHOD c applyViewDistance (II)V ARG 1 watchDistance @@ -53,5 +59,6 @@ CLASS ve net/minecraft/server/world/ServerChunkManager METHOD g getLoadedChunkCount ()I METHOD h getPersistentStateManager ()Lcob; METHOD i getPointOfInterestStorage ()Laqh; + METHOD l initChunkCaches ()V METHOD m tick ()Z METHOD n tickChunks ()V diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index 919e78faa2..927379596a 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -49,8 +49,12 @@ CLASS vg net/minecraft/server/world/ServerWorld METHOD a tickChunk (Lbxk;I)V ARG 1 chunk ARG 2 randomTickSpeed + METHOD a (Lev;)Lev; + ARG 1 pos METHOD a isNearOccupiedPointOfInterest (Lev;I)Z + ARG 1 pos ARG 2 maxDistance + METHOD a isNearOccupiedPointOfInterest (Lfo;)Z METHOD a spawnParticles (Lgd;DDDIDDDD)I ARG 1 particle ARG 2 x @@ -86,6 +90,7 @@ CLASS vg net/minecraft/server/world/ServerWorld ARG 9 packet METHOD a save (Lzt;ZZ)V ARG 1 progressListener + ARG 2 flush METHOD ad resetWeather ()V METHOD ae sendBlockActions ()V METHOD b isInsideTick ()Z @@ -97,7 +102,10 @@ CLASS vg net/minecraft/server/world/ServerWorld METHOD b_ isNearOccupiedPointOfInterest (Lev;)Z ARG 1 pos METHOD c_ getRaidAt (Lev;)Laxc; + ARG 1 pos + METHOD d respawnPlayer (Lvh;)V METHOD d_ hasRaidAt (Lev;)Z + ARG 1 pos METHOD e removePlayer (Lvh;)V ARG 1 player METHOD f resetIdleTimeout ()V diff --git a/mappings/net/minecraft/server/world/SimpleTickScheduler.mapping b/mappings/net/minecraft/server/world/SimpleTickScheduler.mapping index cae15052b6..6a47ebc7ed 100644 --- a/mappings/net/minecraft/server/world/SimpleTickScheduler.mapping +++ b/mappings/net/minecraft/server/world/SimpleTickScheduler.mapping @@ -3,3 +3,4 @@ CLASS bgv net/minecraft/server/world/SimpleTickScheduler FIELD b identifierProvider Ljava/util/function/Function; METHOD a stream ()Ljava/util/stream/Stream; METHOD a toTag (J)Lii; + ARG 1 time diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index 0beb426cde..3cd1110b1f 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -119,6 +119,7 @@ CLASS us net/minecraft/server/world/ThreadedAnvilChunkStorage ARG 0 pos ARG 1 player ARG 2 useCameraPosition + METHOD b createBorderFuture (Lur;)Ljava/util/concurrent/CompletableFuture; METHOD b doesNotGenerateChunks (Lvh;)Z ARG 1 player METHOD c getTotalChunksLoadedCount ()I diff --git a/mappings/net/minecraft/world/IWorld.mapping b/mappings/net/minecraft/world/IWorld.mapping index e20f033a90..3535954cc6 100644 --- a/mappings/net/minecraft/world/IWorld.mapping +++ b/mappings/net/minecraft/world/IWorld.mapping @@ -3,6 +3,8 @@ CLASS bhj net/minecraft/world/IWorld METHOD F getFluidTickScheduler ()Lbhx; METHOD G getBlockTickScheduler ()Lbhx; METHOD a playLevelEvent (Lavy;ILev;I)V + ARG 2 eventId + ARG 4 data METHOD a playSound (Lavy;Lev;Lyj;Lyl;FF)V METHOD a updateNeighbors (Lev;Lbmm;)V METHOD a addParticle (Lgd;DDDDDD)V diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index db53981604..ce5209966f 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -64,12 +64,17 @@ CLASS bhi net/minecraft/world/World METHOD a getAmbientLight (F)F ARG 1 delta METHOD a getEntityById (I)Laii; + ARG 1 id METHOD a getRandomPosInChunk (IIII)Lev; ARG 1 x ARG 2 y ARG 3 z METHOD a setBlockBreakingProgress (ILev;I)V + ARG 1 entityId + ARG 2 pos + ARG 3 progress METHOD a setTime (J)V + ARG 1 time METHOD a sendEntityStatus (Laii;B)V ARG 1 entity ARG 2 status @@ -100,8 +105,11 @@ CLASS bhi net/minecraft/world/World ARG 10 volume ARG 11 pitch METHOD a playSoundFromEntity (Lavy;Laii;Lyj;Lyl;FF)V + ARG 5 volume + ARG 6 pitch METHOD a canPlayerModifyAt (Lavy;Lev;)Z ARG 1 player + ARG 2 pos METHOD a addBlockEntity (Lbtn;)Z METHOD a putMapState (Lcnx;)V ARG 1 mapState @@ -162,6 +170,7 @@ CLASS bhi net/minecraft/world/World ARG 1 spawnMonsters ARG 2 spawnAnimals METHOD a_ setSpawnPos (Lev;)V + ARG 1 pos METHOD b getSkyAngleRadians (F)F METHOD b isHeightInvalid (I)Z ARG 0 y diff --git a/mappings/net/minecraft/world/chunk/ChunkManager.mapping b/mappings/net/minecraft/world/chunk/ChunkManager.mapping index 5000396c4b..eff315b450 100644 --- a/mappings/net/minecraft/world/chunk/ChunkManager.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkManager.mapping @@ -9,9 +9,13 @@ CLASS bxc net/minecraft/world/chunk/ChunkManager ARG 4 create METHOD a getWorldChunk (IIZ)Lbxk; METHOD a shouldTickEntity (Laii;)Z + METHOD a shouldTickChunk (Lbgu;)Z + ARG 1 pos METHOD a setChunkForced (Lbgu;Z)V ARG 1 pos ARG 2 forced + METHOD a shouldTickBlock (Lev;)Z + ARG 1 pos METHOD a tick (Ljava/util/function/BooleanSupplier;)V METHOD a setMobSpawnOptions (ZZ)V ARG 1 spawnMonsters