diff --git a/mappings/afi.mapping b/mappings/afi.mapping deleted file mode 100644 index 9290884a36..0000000000 --- a/mappings/afi.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS afi - FIELD b LOGGER Lorg/apache/logging/log4j/Logger; - FIELD d executor Ljava/util/concurrent/Executor; - METHOD a schedule (Ljava/lang/Object;)V diff --git a/mappings/net/minecraft/client/network/packet/ChunkDataClientPacket.mapping b/mappings/net/minecraft/client/network/packet/ChunkDataClientPacket.mapping index d6a763980b..7bf87e8ff8 100644 --- a/mappings/net/minecraft/client/network/packet/ChunkDataClientPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/ChunkDataClientPacket.mapping @@ -4,7 +4,9 @@ CLASS lc net/minecraft/client/network/packet/ChunkDataClientPacket FIELD c verticalStripBitmask I FIELD e data [B FIELD f blockEntityList Ljava/util/List; - FIELD g containsVerticalStrip Z + FIELD g isFullChunk Z + METHOD (Lbse;I)V + ARG 2 includedSectionsMask METHOD a read (Lit;)V ARG 1 buf METHOD a apply (Liw;)V @@ -16,5 +18,5 @@ CLASS lc net/minecraft/client/network/packet/ChunkDataClientPacket METHOD c getX ()I METHOD d getZ ()I METHOD e getVerticalStripBitmask ()I - METHOD f containsVerticalStrip ()Z + METHOD f isFullChunk ()Z METHOD h getBlockEntityTagList ()Ljava/util/List; diff --git a/mappings/net/minecraft/client/world/ClientChunkManager.mapping b/mappings/net/minecraft/client/world/ClientChunkManager.mapping index 87bdd0ad7b..5010252f67 100644 --- a/mappings/net/minecraft/client/world/ClientChunkManager.mapping +++ b/mappings/net/minecraft/client/world/ClientChunkManager.mapping @@ -14,4 +14,4 @@ CLASS dbx net/minecraft/client/world/ClientChunkManager METHOD e getStatus ()Ljava/lang/String; METHOD f getChunkGenerator ()Lbrt; METHOD h getLightingProvider ()Lcfj; - METHOD i getWorldAsView ()Lbbr; + METHOD i getWorld ()Lbbr; diff --git a/mappings/net/minecraft/command/arguments/ColumnPosArgumentType.mapping b/mappings/net/minecraft/command/arguments/ColumnPosArgumentType.mapping index 865457907d..64a48d34bf 100644 --- a/mappings/net/minecraft/command/arguments/ColumnPosArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/ColumnPosArgumentType.mapping @@ -1,3 +1,13 @@ CLASS dh net/minecraft/command/arguments/ColumnPosArgumentType + CLASS dh$a SimpleColumnPos + FIELD a x I + FIELD b z I + FIELD a INCOMPLETE_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD b EXAMPLES Ljava/util/Collection; METHOD a create ()Ldh; + METHOD a parse (Lcom/mojang/brigadier/StringReader;)Ldi; + ARG 1 reader + METHOD a parseSimple (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ldh$a; + METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + ARG 1 context + ARG 2 builder diff --git a/mappings/net/minecraft/server/command/ColumnPos.mapping b/mappings/net/minecraft/server/command/ColumnPos.mapping new file mode 100644 index 0000000000..e67657b78e --- /dev/null +++ b/mappings/net/minecraft/server/command/ColumnPos.mapping @@ -0,0 +1 @@ +CLASS di net/minecraft/server/command/ColumnPos diff --git a/mappings/net/minecraft/server/command/ForceLoadCommand.mapping b/mappings/net/minecraft/server/command/ForceLoadCommand.mapping index 83b1cba259..8a1e897fb1 100644 --- a/mappings/net/minecraft/server/command/ForceLoadCommand.mapping +++ b/mappings/net/minecraft/server/command/ForceLoadCommand.mapping @@ -3,4 +3,10 @@ CLASS rr net/minecraft/server/command/ForceLoadCommand FIELD b QUERY_FAILURE_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; FIELD c ADDED_FAILURE_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD d REMOVED_FAILURE_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD a setForceLoaded (Lca;Ldh$a;Ldh$a;Z)I + ARG 0 source + ARG 1 from + ARG 2 to + ARG 3 isForceLoaded METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD b clearAllForceLoaded (Lca;)I diff --git a/mappings/net/minecraft/server/world/ChunkHolder.mapping b/mappings/net/minecraft/server/world/ChunkHolder.mapping new file mode 100644 index 0000000000..f8ab2a8741 --- /dev/null +++ b/mappings/net/minecraft/server/world/ChunkHolder.mapping @@ -0,0 +1,75 @@ +CLASS uf net/minecraft/server/world/ChunkHolder + CLASS uf$a Unloaded + FIELD b INSTANCE Luf$a; + CLASS uf$b LevelType + FIELD a BORDER Luf$b; + FIELD b TICKING Luf$b; + FIELD c ENTITY_TICKING Luf$b; + METHOD a isAfter (Luf$b;)Z + ARG 1 levelType + CLASS uf$c LevelUpdateListener + METHOD a updateLevel (Lbbt;Ljava/util/function/IntSupplier;ILjava/util/function/IntConsumer;)V + ARG 1 pos + ARG 2 lastLevelUpdatedToProvider + ARG 3 newLevel + ARG 4 lastLevelUpdatedToConsumer + CLASS uf$d PlayersWatchingChunkProvider + METHOD a getPlayersWatchingChunk (Lbbt;Z)Ljava/util/stream/Stream; + ARG 1 chunkPos + ARG 2 onlyOnWatchDistanceEdge + METHOD a getPlayersWatchingChunk (Lbbt;ZZ)Ljava/util/stream/Stream; + ARG 1 chunkPos + ARG 2 onlyOnWatchDistanceEdge + FIELD a UNLOADED_CHUNK Lcom/mojang/datafixers/util/Either; + FIELD b UNLOADED_CHUNK_FUTURE Ljava/util/concurrent/CompletableFuture; + FIELD c UNLOADED_WORLD_CHUNK Lcom/mojang/datafixers/util/Either; + FIELD d UNLOADED_WORLD_CHUNK_FUTURE Ljava/util/concurrent/CompletableFuture; + FIELD e CHUNK_STATUSES Ljava/util/List; + FIELD f LEVEL_TYPES [Luf$b; + FIELD g statusToChunk Ljava/util/concurrent/atomic/AtomicReferenceArray; + FIELD j chunk Ljava/util/concurrent/CompletableFuture; + FIELD l level I + FIELD m lastLevelUpdatedTo I + FIELD n pos Lbbt; + FIELD o blockUpdatePositions [S + FIELD p blockUpdateCount I + FIELD q sectionsNeedingUpdateMask I + FIELD u lightingProvider Lcfj; + FIELD v levelUpdateListener Luf$c; + FIELD w playersWatchingChunkProvider Luf$d; + METHOD (Lbbt;ILcfj;Luf$c;Luf$d;)V + ARG 1 pos + ARG 2 level + ARG 5 playersWatchingChunkProvider + METHOD a setLevel (I)V + ARG 1 level + METHOD a markForUpdate (III)V + ARG 1 x + ARG 2 y + ARG 3 z + METHOD a sendBlockEntityUpdatePacket (Lbcf;Let;)V + METHOD a getChunkForStatus (Lbrx;)Ljava/util/concurrent/CompletableFuture; + ARG 1 status + METHOD a getChunk (Lbrx;Lug;)Ljava/util/concurrent/CompletableFuture; + ARG 1 status + ARG 2 chunkHolderManager + METHOD a flushUpdates (Lbse;)V + METHOD a updateChunk (Ljava/util/concurrent/CompletableFuture;)V + METHOD a sendPacketToPlayersWatching (Ljr;Z)V + ARG 2 onlyOnWatchDistanceEdge + METHOD a update (Lug;)V + ARG 1 chunkHolderManager + METHOD b getTargetGenerationStatus (I)Lbrx; + ARG 0 level + METHOD b getChunkMinimumStatus (Lbrx;)Ljava/util/concurrent/CompletableFuture; + ARG 1 status + METHOD c getWorldChunk ()Lbse; + METHOD c getLevelType (I)Luf$b; + ARG 0 distance + METHOD d setLastLevelUpdatedTo (I)V + METHOD e getChunk ()Lbrs; + METHOD f getChunkFuture ()Ljava/util/concurrent/CompletableFuture; + METHOD g getLevelType ()Luf$b; + METHOD h getPos ()Lbbt; + METHOD i getLevel ()I + METHOD j getLastLevelUpdatedTo ()I diff --git a/mappings/net/minecraft/server/world/ChunkHolderManager.mapping b/mappings/net/minecraft/server/world/ChunkHolderManager.mapping new file mode 100644 index 0000000000..2fe7eb235b --- /dev/null +++ b/mappings/net/minecraft/server/world/ChunkHolderManager.mapping @@ -0,0 +1,62 @@ +CLASS ug net/minecraft/server/world/ChunkHolderManager + CLASS ug$a TicketManager + METHOD (Lug;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)V + ARG 1 executor + METHOD a setLevel (JILuf;I)Luf; + ARG 1 pos + ARG 3 level + ARG 4 holder + METHOD b getChunkHolder (J)Luf; + ARG 1 pos + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b posToHolder Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap; + FIELD c world Lbcf; + FIELD d serverLightingProvider Lux; + FIELD e genQueueAdder Ljava/util/concurrent/Executor; + FIELD f playersWatchingChunkProvider Luf$d; + FIELD g chunkGenerator Lbrt; + FIELD h posToHolderCopy Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap; + FIELD j posToHolderCopyOutdated Z + FIELD k chunkTaskPrioritySystem Lui; + FIELD l worldgenActor Lafh; + FIELD m mainActor Lafh; + FIELD n progressListener Lvh; + FIELD o chunkSaveHandler Lbsr; + FIELD p ticketManager Lug$a; + FIELD q totalChunksLoadedCount Ljava/util/concurrent/atomic/AtomicInteger; + METHOD (Ljava/util/concurrent/Executor;Luf$d;Ljava/util/concurrent/Executor;Lbsr;Lbsg;Lbcf;Lbrt;Lvh;)V + ARG 3 genQueueAdder + METHOD a getLightProvider ()Lux; + METHOD a applyViewDistance (II)V + METHOD a getChunkHolder (J)Luf; + ARG 1 pos + METHOD a setLevel (JILuf;I)Luf; + ARG 1 pos + ARG 3 level + ARG 4 holder + METHOD a getDebugString (Lbbt;)Ljava/lang/String; + ARG 1 pos + METHOD a getChunkRegion (Lbbt;ILjava/util/function/IntFunction;)Ljava/util/concurrent/CompletableFuture; + ARG 1 centerChunk + ARG 2 margin + ARG 3 distanceToStatus + METHOD a convertToFullChunk (Lbrs;)Ljava/util/concurrent/CompletableFuture; + METHOD a save (Lbrs;Z)V + ARG 1 chunk + ARG 2 unload + METHOD a getPrecedingTargetChunkGenerationStatus (Lbrx;I)Lbrx; + ARG 2 distance + METHOD a unload (Ljava/util/function/BooleanSupplier;)V + METHOD a generateChunk (Luf;Lbrx;)Ljava/util/concurrent/CompletableFuture; + ARG 1 holder + ARG 2 status + METHOD a save (Z)V + ARG 1 flush + METHOD b updateHolderMap ()V + METHOD b getCopiedChunkHolder (J)Luf; + ARG 1 pos + METHOD b save (Ljava/util/function/BooleanSupplier;)V + METHOD c getTotalChunksLoadedCount ()I + METHOD d getLoadedChunkCount ()I + METHOD e getTicketManager ()Lug$a; + METHOD f entryIterator ()Lit/unimi/dsi/fastutil/objects/ObjectBidirectionalIterator; diff --git a/mappings/uj.mapping b/mappings/net/minecraft/server/world/ChunkLevelIndexedProcessor.mapping similarity index 79% rename from mappings/uj.mapping rename to mappings/net/minecraft/server/world/ChunkLevelIndexedProcessor.mapping index 05c7dc1e4b..b100c7c7fe 100644 --- a/mappings/uj.mapping +++ b/mappings/net/minecraft/server/world/ChunkLevelIndexedProcessor.mapping @@ -1,4 +1,4 @@ -CLASS uj +CLASS uj net/minecraft/server/world/ChunkLevelIndexedProcessor METHOD (III)V ARG 1 levelCount ARG 2 initLevelCapacity @@ -17,3 +17,5 @@ CLASS uj ARG 5 previousLevel METHOD c isInvalidIndex (J)Z ARG 1 index + METHOD d getLevel (J)I + ARG 1 chunkPos diff --git a/mappings/net/minecraft/server/world/ChunkTaskPrioritySystem.mapping b/mappings/net/minecraft/server/world/ChunkTaskPrioritySystem.mapping new file mode 100644 index 0000000000..58d4703584 --- /dev/null +++ b/mappings/net/minecraft/server/world/ChunkTaskPrioritySystem.mapping @@ -0,0 +1,44 @@ +CLASS ui net/minecraft/server/world/ChunkTaskPrioritySystem + CLASS ui$a RunnableMessage + FIELD a function Ljava/util/function/Function; + FIELD b pos J + FIELD c lastLevelUpdatedToProvider Ljava/util/function/IntSupplier; + METHOD (Ljava/util/function/Function;JLjava/util/function/IntSupplier;)V + ARG 1 function + ARG 2 pos + ARG 4 lastLevelUpdatedToProvider + CLASS ui$b SorterMessage + FIELD a runnable Ljava/lang/Runnable; + FIELD b pos J + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b queues Ljava/util/Map; + FIELD c actors Ljava/util/Set; + FIELD d sorter Lafi; + METHOD (Ljava/util/List;Ljava/util/concurrent/Executor;I)V + ARG 1 actors + ARG 2 sortingExecutor + ARG 3 maxQueues + METHOD a getSortingActor (Lafh;)Lafh; + ARG 1 actor + METHOD a (Lafh;Ljava/util/function/Function;JLjava/util/function/IntSupplier;Z)V + ARG 1 actor + ARG 5 lastLevelUpdatedToProvider + METHOD a getExecutingActor (Lafh;Z)Lafh; + ARG 1 actor + METHOD a updateLevel (Lbbt;Ljava/util/function/IntSupplier;ILjava/util/function/IntConsumer;)V + ARG 1 pos + ARG 2 lastLevelUpdatedToProvider + ARG 3 newLevel + ARG 4 lastLevelUpdatedToConsumer + METHOD a createRunnableMessage (Ljava/lang/Runnable;JLjava/util/function/IntSupplier;)Lui$a; + ARG 0 runnable + ARG 1 pos + ARG 3 lastLevelUpdatedToProvider + METHOD a createPrioritySorterMessage (Ljava/lang/Runnable;JZ)Lui$b; + METHOD a createRunnableMessage (Luf;Ljava/lang/Runnable;)Lui$a; + ARG 0 holder + ARG 1 runnable + METHOD a (Luh;Lafh;)V + ARG 2 actor + METHOD b getQueue (Lafh;)Luh; + ARG 1 handle diff --git a/mappings/net/minecraft/server/world/ChunkTicket.mapping b/mappings/net/minecraft/server/world/ChunkTicket.mapping index 08e981a636..97d856cea7 100644 --- a/mappings/net/minecraft/server/world/ChunkTicket.mapping +++ b/mappings/net/minecraft/server/world/ChunkTicket.mapping @@ -8,8 +8,10 @@ CLASS uy net/minecraft/server/world/ChunkTicket ARG 2 level ARG 3 argument ARG 4 location + METHOD a getType ()Luz; METHOD a compareTo (Luy;)I + ARG 1 o METHOD b getLevel ()I METHOD c getLocation ()J METHOD equals (Ljava/lang/Object;)Z - ARG 1 o + ARG 1 obj diff --git a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping index ead3823c70..66021156a7 100644 --- a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping +++ b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping @@ -5,19 +5,37 @@ CLASS un net/minecraft/server/world/ChunkTicketManager METHOD a setLevelFor (JI)V ARG 1 index ARG 3 level + METHOD d getLevel (J)I + ARG 1 chunkPos METHOD e getCurrentLevelFor (J)I ARG 1 index CLASS un$b + FIELD e viewDistance I + FIELD f posToLastLevelUpdatedTo Lit/unimi/dsi/fastutil/longs/Long2IntMap; + FIELD g chunkPositions Lit/unimi/dsi/fastutil/longs/LongSet; METHOD a updateLevels ()V + METHOD a applyViewDistance (I)V + ARG 1 viewDistance + METHOD a (JIZZ)V + ARG 1 pos FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD d positionToTicketSet Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap; + FIELD g chunkHolders Ljava/util/Set; + FIELD h levelUpdateListener Luf$c; + FIELD i playerTicketThrottler Lafh; + FIELD j playerTicketThrottlerSorter Lafh; + FIELD k chunkPositions Lit/unimi/dsi/fastutil/longs/LongSet; FIELD m location J + METHOD a purge ()V + METHOD a applyViewDistance (I)V + ARG 1 viewDistance METHOD a setLevelFor (JI)V ARG 1 index ARG 3 level - METHOD a (JILuf;I)Luf; - ARG 1 index + METHOD a setLevel (JILuf;I)Luf; + ARG 1 pos ARG 3 level + ARG 4 holder METHOD a addTicket (JLuy;)V ARG 1 position ARG 3 ticket @@ -26,20 +44,29 @@ CLASS un net/minecraft/server/world/ChunkTicketManager METHOD a getLevel (Lit/unimi/dsi/fastutil/objects/ObjectSortedSet;)I ARG 1 ticketSet METHOD a update (Lug;)Z - METHOD a addTicketAtLevel (Luz;Lbbt;ILjava/lang/Object;)V + METHOD a addTicketWithLevel (Luz;Lbbt;ILjava/lang/Object;)V ARG 1 type ARG 2 pos ARG 3 level ARG 4 argument + METHOD b getChunkHolder (J)Luf; + ARG 1 pos + METHOD b removeTicket (JLuy;)V + ARG 1 pos + ARG 3 ticket METHOD b addTicket (Luz;Lbbt;ILjava/lang/Object;)V ARG 1 type ARG 2 pos + ARG 3 radius ARG 4 argument METHOD c removeTicket (Luz;Lbbt;ILjava/lang/Object;)V ARG 1 type ARG 2 pos + ARG 3 radius ARG 4 argument + METHOD d getLevel (J)I + ARG 1 chunkPos METHOD e getCurrentLevelFor (J)I - ARG 1 index + ARG 1 pos METHOD i getTicketSet (J)Lit/unimi/dsi/fastutil/objects/ObjectSortedSet; ARG 1 position diff --git a/mappings/net/minecraft/server/world/LevelIndexedQueue.mapping b/mappings/net/minecraft/server/world/LevelIndexedQueue.mapping new file mode 100644 index 0000000000..73e5a7d022 --- /dev/null +++ b/mappings/net/minecraft/server/world/LevelIndexedQueue.mapping @@ -0,0 +1,19 @@ +CLASS uh net/minecraft/server/world/LevelIndexedQueue + FIELD a LEVEL_COUNT I + FIELD b levelToPosToElements Ljava/util/List; + FIELD c currentLevel I + FIELD d name Ljava/lang/String; + FIELD e chunkPositions Lit/unimi/dsi/fastutil/longs/LongSet; + FIELD f maxSize I + METHOD (Ljava/lang/String;I)V + ARG 1 name + ARG 2 maxSize + METHOD a getNext ()Ljava/util/stream/Stream; + METHOD a updateLevel (ILbbt;I)V + ARG 1 lastLevelUpdatedTo + ARG 2 pos + ARG 3 newLevel + METHOD a createPositionAdder (J)Ljava/lang/Runnable; + ARG 1 pos + METHOD a (Ljava/util/Optional;JI)V + ARG 4 lastLevelUpdatedTo diff --git a/mappings/net/minecraft/server/world/ServerChunkManager.mapping b/mappings/net/minecraft/server/world/ServerChunkManager.mapping index 29ec7943f7..e62eca0671 100644 --- a/mappings/net/minecraft/server/world/ServerChunkManager.mapping +++ b/mappings/net/minecraft/server/world/ServerChunkManager.mapping @@ -1,5 +1,5 @@ CLASS us net/minecraft/server/world/ServerChunkManager - FIELD a FULL_CHUNK_LEVEL I + FIELD a LEVEL_COUNT I FIELD b CHUNKS_ELIGIBLE_FOR_SPAWNING I FIELD c CHUNK_STATUSES Ljava/util/List; FIELD d ticketManager Lun; @@ -9,7 +9,9 @@ CLASS us net/minecraft/server/world/ServerChunkManager FIELD h lightProvider Lux; FIELD i genQueue Ljava/util/Queue; FIELD j players Luq; + FIELD k chunkHolderManager Lug; FIELD l maxWatchDistance I + FIELD m lastMobSpawningTime J FIELD n spawnMonsters Z FIELD o spawnAnimals Z METHOD (Lbcf;Lbsr;Ljava/util/concurrent/Executor;Lbrt;ILve;)V @@ -25,10 +27,18 @@ CLASS us net/minecraft/server/world/ServerChunkManager ARG 2 z ARG 3 status ARG 4 create - METHOD a getEntry (J)Luf; + METHOD a getChunkHolder (J)Luf; + ARG 1 pos + METHOD a isEntityInLoadedChunk (Lahd;)Z + METHOD a getDebugString (Lbbt;)Ljava/lang/String; ARG 1 pos METHOD a getWatchDistance (Lbbt;II)I METHOD a getWatchDistance (Lbbt;Lahd;)I + METHOD a getWatchDistance (Lbbt;Luv;Z)I + ARG 0 chunkPos + ARG 1 player + METHOD a getPlayersWatchingChunk (Lbbt;ZZ)Ljava/util/stream/Stream; + ARG 2 onlyOnWatchDistanceEdge METHOD a onLightUpdate (Lbcq;III)V METHOD a markForUpdate (Let;)V METHOD a tick (Ljava/util/function/BooleanSupplier;)V @@ -38,11 +48,13 @@ CLASS us net/minecraft/server/world/ServerChunkManager ARG 3 z METHOD a addOrRemovePlayer (Luv;Z)V ARG 2 add + METHOD a addTicket (Luz;Lbbt;ILjava/lang/Object;)V METHOD a save (Z)V ARG 1 flush METHOD a setMobSpawnOptions (ZZ)V ARG 1 spawnMonsters ARG 2 spawnAnimals + METHOD b getTotalChunksLoadedCount ()I METHOD b getChunk (II)Lbbr; ARG 1 chunkX ARG 2 chunkZ @@ -52,7 +64,11 @@ CLASS us net/minecraft/server/world/ServerChunkManager ARG 3 status ARG 4 create METHOD b getSqDistance (Lbbt;Lahd;)D + METHOD b setChunkForced (Lbbt;Z)V + ARG 1 pos + ARG 2 forced METHOD b removePlayer (Luv;)V + METHOD b removeTicket (Luz;Lbbt;ILjava/lang/Object;)V METHOD c getWorld ()Lbcf; METHOD c getChunkAsync (IILbrx;Z)Ljava/util/concurrent/CompletableFuture; ARG 1 chunkX diff --git a/mappings/net/minecraft/server/world/ServerChunkManagerEntry.mapping b/mappings/net/minecraft/server/world/ServerChunkManagerEntry.mapping deleted file mode 100644 index a9a7fe4bac..0000000000 --- a/mappings/net/minecraft/server/world/ServerChunkManagerEntry.mapping +++ /dev/null @@ -1,34 +0,0 @@ -CLASS uf net/minecraft/server/world/ServerChunkManagerEntry - CLASS uf$a Unloaded - FIELD b INSTANCE Luf$a; - FIELD a UNLOADED_CHUNK Lcom/mojang/datafixers/util/Either; - FIELD b UNLOADED_CHUNK_FUTURE Ljava/util/concurrent/CompletableFuture; - FIELD c UNLOADED_WORLD_CHUNK Lcom/mojang/datafixers/util/Either; - FIELD d UNLOADED_WORLD_CHUNK_FUTURE Ljava/util/concurrent/CompletableFuture; - FIELD e chunkStatuses Ljava/util/List; - FIELD g statusToChunk Ljava/util/concurrent/atomic/AtomicReferenceArray; - FIELD j chunk Ljava/util/concurrent/CompletableFuture; - FIELD l level I - FIELD n pos Lbbt; - FIELD o blockUpdatePositions [S - FIELD p blockUpdateCount I - FIELD u lightingProvider Lcfj; - METHOD (Lbbt;ILcfj;Luf$c;Luf$d;)V - ARG 2 level - METHOD a setLevel (I)V - ARG 1 level - METHOD a markForUpdate (III)V - METHOD a sendBlockEntityUpdatePacket (Lbcf;Let;)V - METHOD a getChunkForStatus (Lbrx;)Ljava/util/concurrent/CompletableFuture; - ARG 1 status - METHOD a flushUpdates (Lbse;)V - METHOD a updateChunk (Ljava/util/concurrent/CompletableFuture;)V - METHOD a sendPacket (Ljr;Z)V - METHOD b getStatusByLevel (I)Lbrx; - ARG 0 level - METHOD b getChunkMinimumStatus (Lbrx;)Ljava/util/concurrent/CompletableFuture; - ARG 1 status - METHOD c getChunk ()Lbse; - METHOD f getChunkFuture ()Ljava/util/concurrent/CompletableFuture; - METHOD h getPos ()Lbbt; - METHOD i getLevel ()I diff --git a/mappings/net/minecraft/server/world/chunk/light/ServerLightingProvider.mapping b/mappings/net/minecraft/server/world/chunk/light/ServerLightingProvider.mapping index c8c8b1255b..da4dd0aa54 100644 --- a/mappings/net/minecraft/server/world/chunk/light/ServerLightingProvider.mapping +++ b/mappings/net/minecraft/server/world/chunk/light/ServerLightingProvider.mapping @@ -1,4 +1,6 @@ CLASS ux net/minecraft/server/world/chunk/light/ServerLightingProvider + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + METHOD A_ tick ()V METHOD a scheduleChunkLightUpdate (IIIZ)V ARG 1 chunkX ARG 2 chunkY @@ -12,6 +14,9 @@ CLASS ux net/minecraft/server/world/chunk/light/ServerLightingProvider ARG 3 sectionY ARG 4 sectionZ ARG 5 data + METHOD a light (Lbrs;IIZ)Ljava/util/concurrent/CompletableFuture; + ARG 2 x + ARG 3 z METHOD a enqueueLightUpdate (Let;)V ARG 1 pos METHOD a (Let;I)V diff --git a/mappings/net/minecraft/util/Actor.mapping b/mappings/net/minecraft/util/Actor.mapping new file mode 100644 index 0000000000..31d2b75c6c --- /dev/null +++ b/mappings/net/minecraft/util/Actor.mapping @@ -0,0 +1,8 @@ +CLASS afh net/minecraft/util/Actor + CLASS afh$1 + METHOD a getName ()Ljava/lang/String; + METHOD a sendMessage (Ljava/lang/Object;)V + ARG 1 message + METHOD a getName ()Ljava/lang/String; + METHOD a createConsumerActor (Ljava/lang/String;Ljava/util/function/Consumer;)Lafh; + METHOD a createAndSendFutureActor (Ljava/util/function/Function;)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/sortme/LevelIndexedProcessor.mapping b/mappings/net/minecraft/util/LevelIndexedProcessor.mapping similarity index 96% rename from mappings/net/minecraft/sortme/LevelIndexedProcessor.mapping rename to mappings/net/minecraft/util/LevelIndexedProcessor.mapping index f10305fb5e..dd775dfab7 100644 --- a/mappings/net/minecraft/sortme/LevelIndexedProcessor.mapping +++ b/mappings/net/minecraft/util/LevelIndexedProcessor.mapping @@ -1,4 +1,4 @@ -CLASS cfe net/minecraft/sortme/LevelIndexedProcessor +CLASS cfe net/minecraft/util/LevelIndexedProcessor CLASS cfe$1 METHOD rehash (I)V ARG 1 newN diff --git a/mappings/net/minecraft/util/Mailbox.mapping b/mappings/net/minecraft/util/Mailbox.mapping new file mode 100644 index 0000000000..7d0057d215 --- /dev/null +++ b/mappings/net/minecraft/util/Mailbox.mapping @@ -0,0 +1,24 @@ +CLASS afk net/minecraft/util/Mailbox + CLASS afk$a PrioritizedQueueMailbox + FIELD a queues Ljava/util/List; + METHOD (I)V + ARG 1 priorityCount + METHOD a add (Lafk$b;)Z + ARG 1 message + METHOD b isEmpty ()Z + METHOD c getNext ()Ljava/lang/Runnable; + CLASS afk$b PrioritizedMessage + FIELD a priority I + FIELD b runnable Ljava/lang/Runnable; + METHOD (ILjava/lang/Runnable;)V + ARG 1 priority + ARG 2 runnable + METHOD a getPriority ()I + CLASS afk$c QueueMailbox + FIELD a queue Ljava/util/Queue; + METHOD a getNext ()Ljava/lang/Object; + METHOD a add (Ljava/lang/Object;)Z + METHOD b isEmpty ()Z + METHOD a getNext ()Ljava/lang/Object; + METHOD a add (Ljava/lang/Object;)Z + METHOD b isEmpty ()Z diff --git a/mappings/net/minecraft/util/MailboxProcessor.mapping b/mappings/net/minecraft/util/MailboxProcessor.mapping new file mode 100644 index 0000000000..42a08e9455 --- /dev/null +++ b/mappings/net/minecraft/util/MailboxProcessor.mapping @@ -0,0 +1,20 @@ +CLASS afi net/minecraft/util/MailboxProcessor + FIELD a taskList Lafk; + FIELD b LOGGER Lorg/apache/logging/log4j/Logger; + FIELD c stateFlags Ljava/util/concurrent/atomic/AtomicInteger; + FIELD e name Ljava/lang/String; + METHOD (Lafk;Ljava/util/concurrent/Executor;Ljava/lang/String;)V + ARG 1 mailbox + ARG 3 name + METHOD a getName ()Ljava/lang/String; + METHOD a run (Lit/unimi/dsi/fastutil/ints/Int2BooleanFunction;)I + ARG 1 keepRunningProvider + METHOD a create (Ljava/util/concurrent/Executor;Ljava/lang/String;)Lafi; + ARG 0 executor + ARG 1 name + METHOD b lock ()Z + METHOD c unlock ()V + METHOD d hasMessages ()Z + METHOD e isLocked ()Z + METHOD f runNext ()Z + METHOD g execute ()V diff --git a/mappings/net/minecraft/util/SystemUtil.mapping b/mappings/net/minecraft/util/SystemUtil.mapping index 00625c9133..4dc30eabe5 100644 --- a/mappings/net/minecraft/util/SystemUtil.mapping +++ b/mappings/net/minecraft/util/SystemUtil.mapping @@ -18,6 +18,7 @@ CLASS m net/minecraft/util/SystemUtil METHOD b getURLOpenCommand (Ljava/net/URL;)[Ljava/lang/String; FIELD a NANO_TIME_SUPPLIER Ljava/util/function/LongSupplier; FIELD b LOGGER Lorg/apache/logging/log4j/Logger; + FIELD c ILLEGAL_FILE_NAME_PATTERN Ljava/util/regex/Pattern; METHOD a toMap ()Ljava/util/stream/Collector; METHOD a getValueAsString (Lbrh;Ljava/lang/Object;)Ljava/lang/String; METHOD a consume (Ljava/lang/Object;Ljava/util/function/Consumer;)Ljava/lang/Object; @@ -27,6 +28,9 @@ CLASS m net/minecraft/util/SystemUtil METHOD a get (Ljava/util/function/Supplier;)Ljava/lang/Object; ARG 0 supplier METHOD b getMeasuringTimeMs ()J + METHOD b isPathIllegal (Ljava/nio/file/Path;)Z + METHOD b thenCombine (Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; + ARG 0 futures METHOD c getMeasuringTimeNano ()J METHOD d getEpochTimeMs ()J METHOD e getOperatingSystem ()Lm$b; diff --git a/mappings/net/minecraft/util/Void.mapping b/mappings/net/minecraft/util/Void.mapping new file mode 100644 index 0000000000..ce60fa1115 --- /dev/null +++ b/mappings/net/minecraft/util/Void.mapping @@ -0,0 +1,2 @@ +CLASS zk net/minecraft/util/Void + FIELD a INSTANCE Lzk; diff --git a/mappings/net/minecraft/world/chunk/ChunkManager.mapping b/mappings/net/minecraft/world/chunk/ChunkManager.mapping index 028932987e..2972707897 100644 --- a/mappings/net/minecraft/world/chunk/ChunkManager.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkManager.mapping @@ -8,6 +8,7 @@ CLASS brw net/minecraft/world/chunk/ChunkManager ARG 3 status ARG 4 create METHOD a getWorldChunk (IIZ)Lbse; + METHOD a isEntityInLoadedChunk (Lahd;)Z METHOD a tick (Ljava/util/function/BooleanSupplier;)V METHOD a setMobSpawnOptions (ZZ)V ARG 1 spawnMonsters @@ -15,6 +16,9 @@ CLASS brw net/minecraft/world/chunk/ChunkManager METHOD b getChunk (II)Lbbr; ARG 1 chunkX ARG 2 chunkZ + METHOD b setChunkForced (Lbbt;Z)V + ARG 1 pos + ARG 2 forced METHOD e getStatus ()Ljava/lang/String; METHOD f getChunkGenerator ()Lbrt; METHOD h getLightingProvider ()Lcfj; diff --git a/mappings/net/minecraft/world/chunk/ChunkPos.mapping b/mappings/net/minecraft/world/chunk/ChunkPos.mapping index a437bc18d3..5ef39efd7a 100644 --- a/mappings/net/minecraft/world/chunk/ChunkPos.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkPos.mapping @@ -1,4 +1,5 @@ CLASS bbt net/minecraft/world/chunk/ChunkPos + FIELD a INVALID J FIELD b x I FIELD c z I METHOD (II)V diff --git a/mappings/net/minecraft/world/chunk/ChunkProvider.mapping b/mappings/net/minecraft/world/chunk/ChunkProvider.mapping index b53785417c..108da8e8f6 100644 --- a/mappings/net/minecraft/world/chunk/ChunkProvider.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkProvider.mapping @@ -3,4 +3,4 @@ CLASS bsg net/minecraft/world/chunk/ChunkProvider METHOD b getChunk (II)Lbbr; ARG 1 chunkX ARG 2 chunkZ - METHOD i getWorldAsView ()Lbbr; + METHOD i getWorld ()Lbbr; diff --git a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping index ca8dcb7feb..8ed204819b 100644 --- a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping @@ -1,19 +1,26 @@ CLASS brx net/minecraft/world/chunk/ChunkStatus - CLASS brx$a + CLASS brx$a Task METHOD doWork (Lbrx;Lbcf;Lbrt;Lux;Ljava/util/function/Function;Ljava/util/List;Lbrs;)Ljava/util/concurrent/CompletableFuture; - ARG 1 status + ARG 1 targetStatus ARG 2 world ARG 3 generator ARG 4 lightingProvider + ARG 5 toFullChunkConverter + ARG 7 chunk CLASS brx$b ChunkType FIELD a PROTOCHUNK Lbrx$b; FIELD b LEVELCHUNK Lbrx$b; - CLASS brx$c + CLASS brx$c SimpleTask + METHOD doWork (Lbcf;Lbrt;Ljava/util/List;Lbrs;)V + ARG 1 world + ARG 2 generator + ARG 4 chunk METHOD doWork (Lbrx;Lbcf;Lbrt;Lux;Ljava/util/function/Function;Ljava/util/List;Lbrs;)Ljava/util/concurrent/CompletableFuture; - ARG 1 status + ARG 1 targetStatus ARG 2 world ARG 3 generator ARG 4 lightingProvider + ARG 5 toFullChunkConverter FIELD a EMPTY Lbrx; FIELD b STRUCTURE_STARTS Lbrx; FIELD c STRUCTURE_REFERENCES Lbrx; @@ -27,26 +34,48 @@ CLASS brx net/minecraft/world/chunk/ChunkStatus FIELD k SPAWN Lbrx; FIELD l HEIGHTMAPS Lbrx; FIELD m FULL Lbrx; - FIELD n ORDERED Ljava/util/List; - FIELD o STATUS_ORDER Lit/unimi/dsi/fastutil/ints/IntList; + FIELD n DISTANCE_TO_TARGET_GENERATION_STATUS Ljava/util/List; + FIELD o STATUS_TO_TARGET_GENERATION_RADIUS Lit/unimi/dsi/fastutil/ints/IntList; FIELD p name Ljava/lang/String; FIELD q index I FIELD r previous Lbrx; + FIELD s task Lbrx$a; + FIELD t taskMargin I FIELD u chunkType Lbrx$b; + FIELD v surfaceGenerated Z + METHOD (Ljava/lang/String;Lbrx;IZLbrx$b;Lbrx$a;)V + ARG 1 name + ARG 2 previous + ARG 6 task METHOD a createOrderedList ()Ljava/util/List; - METHOD a getByIndex (I)Lbrx; - ARG 0 pos - METHOD a getIndex (Lbrx;)I + METHOD a getTargetGenerationStatus (I)Lbrx; + ARG 0 distance + METHOD a runTask (Lbcf;Lbrt;Lux;Ljava/util/function/Function;Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; + ARG 2 chunkGenerator + ARG 3 lightingProvider + ARG 4 toFullChunkConverter + ARG 5 region + METHOD a getTargetGenerationRadius (Lbrx;)I ARG 0 status METHOD a get (Ljava/lang/String;)Lbrx; ARG 0 id METHOD a register (Ljava/lang/String;Lbrx;IZLbrx$b;Lbrx$a;)Lbrx; + ARG 0 name + ARG 1 status + ARG 2 taskMargin + ARG 5 task METHOD a register (Ljava/lang/String;Lbrx;IZLbrx$b;Lbrx$c;)Lbrx; ARG 0 name ARG 1 previousStatus - METHOD b getStatusCount ()I + ARG 2 taskMargin + ARG 4 type + ARG 5 task + METHOD b getMaxTargetGenerationRadius ()I METHOD b isAfter (Lbrx;)Z METHOD c getIndex ()I METHOD d getName ()Ljava/lang/String; METHOD e getPrevious ()Lbrx; + METHOD f getTaskMargin ()I METHOD g getChunkType ()Lbrx$b; + METHOD h isSurfaceGenerated ()Z + METHOD i getLightStatus ()Lbrx; diff --git a/mappings/net/minecraft/world/chunk/ReadOnlyChunk.mapping b/mappings/net/minecraft/world/chunk/ReadOnlyChunk.mapping index 5c00b5eb11..fb280e71a2 100644 --- a/mappings/net/minecraft/world/chunk/ReadOnlyChunk.mapping +++ b/mappings/net/minecraft/world/chunk/ReadOnlyChunk.mapping @@ -65,4 +65,5 @@ CLASS bsd net/minecraft/world/chunk/ReadOnlyChunk METHOD r isLightOn ()Z METHOD s getBlockTickScheduler ()Lbsn; METHOD t getFluidTickScheduler ()Lbsn; + METHOD u getWrappedChunk ()Lbse; METHOD x getStructureReferences ()Ljava/util/Map; diff --git a/mappings/net/minecraft/world/gen/GenerationStep.mapping b/mappings/net/minecraft/world/gen/GenerationStep.mapping index 65143e4669..283f728c4e 100644 --- a/mappings/net/minecraft/world/gen/GenerationStep.mapping +++ b/mappings/net/minecraft/world/gen/GenerationStep.mapping @@ -1,11 +1,21 @@ CLASS btk net/minecraft/world/gen/GenerationStep CLASS btk$a Carver + FIELD a AIR Lbtk$a; + FIELD b LIQUID Lbtk$a; FIELD c BY_NAME Ljava/util/Map; FIELD d name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name METHOD a getName ()Ljava/lang/String; CLASS btk$b Feature + FIELD a RAW_GENERATION Lbtk$b; + FIELD b LOCAL_MODIFICATIONS Lbtk$b; + FIELD c UNDERGROUND_STRUCTURES Lbtk$b; + FIELD d SURFACE_STRUCTURES Lbtk$b; + FIELD e UNDERGROUND_ORES Lbtk$b; + FIELD f UNDERGROUND_DECORATION Lbtk$b; + FIELD g VEGETAL_DECORATION Lbtk$b; + FIELD h TOP_LAYER_MODIFICATION Lbtk$b; FIELD i BY_NAME Ljava/util/Map; FIELD j name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping index 713984a28c..8faabe2324 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping @@ -26,6 +26,7 @@ CLASS brt net/minecraft/world/gen/chunk/ChunkGenerator ARG 1 world METHOD a hasStructure (Lbde;Lbzc;)Z METHOD a populateBiomes (Lbrs;)V + METHOD a setStructureStarts (Lbrs;Lbrt;Lcdx;)V METHOD a carve (Lbrs;Lbtk$a;)V ARG 1 chunk ARG 2 carverStep diff --git a/mappings/ug.mapping b/mappings/ug.mapping deleted file mode 100644 index 59c7933bd5..0000000000 --- a/mappings/ug.mapping +++ /dev/null @@ -1,29 +0,0 @@ -CLASS ug - CLASS ug$a - METHOD a (JILuf;I)Luf; - ARG 1 index - ARG 3 level - FIELD a LOGGER Lorg/apache/logging/log4j/Logger; - FIELD b posToEntryMapSource Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap; - FIELD c world Lbcf; - FIELD d serverLightingProvider Lux; - FIELD g chunkGenerator Lbrt; - FIELD h posToEntryMap Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap; - FIELD j posToEntryMapSourceDirty Z - FIELD o chunkSaveHandler Lbsr; - METHOD a getLightProvider ()Lux; - METHOD a (JILuf;I)Luf; - ARG 1 index - ARG 3 level - METHOD a save (Lbrs;Z)V - ARG 1 chunk - ARG 2 unload - METHOD a (Luf;Lbrx;)Ljava/util/concurrent/CompletableFuture; - ARG 1 entry - ARG 2 status - METHOD a save (Z)V - ARG 1 flush - METHOD b syncPosToEntryMap ()V - METHOD b getEntry (J)Luf; - ARG 1 pos - METHOD e getTicketManager ()Lug$a;