mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix worldgen names

This commit is contained in:
Runemoro 2019-03-30 06:27:01 -04:00
parent 0580b466fb
commit 8af4d24f8c
15 changed files with 129 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mappings/net/minecraft/client/audio/SoundTaskQueue.mapping → mappings/net/minecraft/client/audio/SoundExecutor.mapping
View File

@ -1,4 +1,4 @@
CLASS dwz net/minecraft/client/audio/SoundTaskQueue
CLASS dwz net/minecraft/client/audio/SoundExecutor
FIELD a thread Ljava/lang/Thread;
FIELD b stopped Z
METHOD a restart ()V

1
mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
View File

@ -10,6 +10,7 @@ CLASS dgq net/minecraft/client/network/ClientPlayNetworkHandler
FIELD j commandSource Ldgr;
FIELD k tagManager Lzb;
FIELD l queryHandler Lcum;
FIELD m chunkLoadDistance I
FIELD n random Ljava/util/Random;
FIELD o commandDispatcher Lcom/mojang/brigadier/CommandDispatcher;
FIELD p recipeManager Lbdy;

1
mappings/net/minecraft/server/dedicated/DedicatedPlayerManager.mapping
View File

@ -1,4 +1,5 @@
CLASS ue net/minecraft/server/dedicated/DedicatedPlayerManager
FIELD f LOGGER Lorg/apache/logging/log4j/Logger;
METHOD A loadOpList ()V
METHOD B saveOpList ()V
METHOD C loadWhitelist ()V

7
mappings/net/minecraft/server/network/ServerPlayerEntity.mapping
View File

@ -13,7 +13,7 @@ CLASS vf net/minecraft/server/network/ServerPlayerEntity
FIELD cp seenCredits Z
FIELD cq recipeBook Lym;
FIELD cu enteredNetherPos Lcrg;
FIELD cv chunkPos Lfo;
FIELD cv lastCameraChunkSectionPosition Lfo;
FIELD cw containerSyncId I
FIELD d interactionManager Lvg;
FIELD g notInAnyWorld Z
@ -24,11 +24,12 @@ CLASS vf net/minecraft/server/network/ServerPlayerEntity
METHOD H isInTeleportationState ()Z
METHOD I onTeleportationDone ()V
METHOD L getAdvancementManager ()Lra;
METHOD M getChunkPos ()Lfo;
METHOD M getLastCameraChunkSectionPosition ()Lfo;
METHOD a sendUnloadChunkPacket (Lbgi;)V
METHOD a sendInitialChunkPackets (Lbgi;Lka;Lka;)V
METHOD a sendBlockEntityUpdate (Lbsz;)V
METHOD a setChunkPos (Lfo;)V
METHOD a setLastCameraChunkSectionPosition (Lfo;)V
ARG 1 lastCameraChunkSectionPosition
METHOD a sendChatMessage (Ljm;Ljk;)V
METHOD a setClientSettings (Lnw;)V
METHOD c onStoppedTracking (Lahz;)V

30
mappings/net/minecraft/server/world/ChunkHolder.mapping
View File

@ -23,11 +23,12 @@ CLASS uq 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 [Luq$b;
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 g futuresByStatus Ljava/util/concurrent/atomic/AtomicReferenceArray;
FIELD h tickingFuture Ljava/util/concurrent/CompletableFuture;
FIELD i entityTickingFuture Ljava/util/concurrent/CompletableFuture;
FIELD j future Ljava/util/concurrent/CompletableFuture;
FIELD k level I
FIELD l futureLevel I
FIELD m lastLevelUpdatedTo I
FIELD n pos Lbgi;
FIELD o blockUpdatePositions [S
@ -43,6 +44,7 @@ CLASS uq net/minecraft/server/world/ChunkHolder
ARG 1 pos
ARG 2 level
ARG 5 playersWatchingChunkProvider
METHOD a getTickingFuture ()Ljava/util/concurrent/CompletableFuture;
METHOD a setLevel (I)V
ARG 1 level
METHOD a markForUpdate (III)V
@ -50,27 +52,29 @@ CLASS uq net/minecraft/server/world/ChunkHolder
ARG 2 y
ARG 3 z
METHOD a sendBlockEntityUpdatePacket (Lbgv;Lev;)V
METHOD a getChunkForStatus (Lbwp;)Ljava/util/concurrent/CompletableFuture;
ARG 1 status
METHOD a getChunk (Lbwp;Lur;)Ljava/util/concurrent/CompletableFuture;
METHOD a getFuture (Lbwp;)Ljava/util/concurrent/CompletableFuture;
ARG 1 status
METHOD a createFuture (Lbwp;Lur;)Ljava/util/concurrent/CompletableFuture;
ARG 1 targetStatus
ARG 2 chunkStorage
METHOD a flushUpdates (Lbww;)V
METHOD a updateChunk (Ljava/util/concurrent/CompletableFuture;)V
METHOD a updateFuture (Ljava/util/concurrent/CompletableFuture;)V
ARG 1 newChunkFuture
METHOD a sendPacketToPlayersWatching (Lka;Z)V
ARG 2 onlyOnWatchDistanceEdge
METHOD a update (Lur;)V
METHOD a tick (Lur;)V
ARG 1 chunkStorage
METHOD b getEntityTickingFuture ()Ljava/util/concurrent/CompletableFuture;
METHOD b getTargetGenerationStatus (I)Lbwp;
ARG 0 level
METHOD b getChunkMinimumStatus (Lbwp;)Ljava/util/concurrent/CompletableFuture;
ARG 1 status
METHOD c getWorldChunk ()Lbww;
METHOD c getLevelType (I)Luq$b;
ARG 0 distance
METHOD d getCompletedStatus ()Lbwp;
METHOD d setLastLevelUpdatedTo (I)V
METHOD e getChunk ()Lbwk;
METHOD f getChunkFuture ()Ljava/util/concurrent/CompletableFuture;
METHOD e getCompletedChunk ()Lbwk;
METHOD f getFuture ()Ljava/util/concurrent/CompletableFuture;
METHOD g getLevelType ()Luq$b;
METHOD h getPos ()Lbgi;
METHOD i getLevel ()I

15
mappings/net/minecraft/server/world/ChunkTaskPrioritySystem.mapping
View File

@ -16,24 +16,25 @@ CLASS ut net/minecraft/server/world/ChunkTaskPrioritySystem
FIELD d sorter Lage;
METHOD <init> (Ljava/util/List;Ljava/util/concurrent/Executor;I)V
ARG 1 actors
ARG 2 sortingExecutor
ARG 2 executor
ARG 3 maxQueues
METHOD a getSortingActor (Lagd;)Lagd;
METHOD a createSortingActor (Lagd;)Lagd;
ARG 1 actor
METHOD a (Lagd;Ljava/util/function/Function;JLjava/util/function/IntSupplier;Z)V
METHOD a sort (Lagd;JLjava/lang/Runnable;Z)V
METHOD a execute (Lagd;Ljava/util/function/Function;JLjava/util/function/IntSupplier;Z)V
ARG 1 actor
ARG 5 lastLevelUpdatedToProvider
METHOD a getExecutingActor (Lagd;Z)Lagd;
METHOD a createExecutingActor (Lagd;Z)Lagd;
ARG 1 actor
METHOD a createRunnableMessage (Ljava/lang/Runnable;JLjava/util/function/IntSupplier;)Lut$a;
ARG 0 runnable
ARG 1 pos
ARG 3 lastLevelUpdatedToProvider
METHOD a createPrioritySorterMessage (Ljava/lang/Runnable;JZ)Lut$b;
METHOD a createRunnableMessage (Luq;Ljava/lang/Runnable;)Lut$a;
METHOD a createSorterMessage (Ljava/lang/Runnable;JZ)Lut$b;
METHOD a createExecutorMessage (Luq;Ljava/lang/Runnable;)Lut$a;
ARG 0 holder
ARG 1 runnable
METHOD a (Lus;Lagd;)V
ARG 2 actor
METHOD b getQueue (Lagd;)Lus;
ARG 1 handle
ARG 1 actor

56
mappings/net/minecraft/server/world/ChunkTicketManager.mapping
View File

@ -1,24 +1,50 @@
CLASS ux net/minecraft/server/world/ChunkTicketManager
CLASS ux$b
FIELD a currentLevels Lit/unimi/dsi/fastutil/longs/Long2ByteMap;
CLASS ux$b DistanceFromNearestPlayerTracker
FIELD a distanceFromNearestPlayer Lit/unimi/dsi/fastutil/longs/Long2ByteMap;
FIELD b maxDistance I
METHOD <init> (Lux;I)V
ARG 1 maxDistance
METHOD a updateLevels ()V
CLASS ux$d
FIELD e viewDistance I
FIELD f posToLastLevelUpdatedTo Lit/unimi/dsi/fastutil/longs/Long2IntMap;
FIELD g chunkPositions Lit/unimi/dsi/fastutil/longs/LongSet;
METHOD a (I)V
ARG 1 viewDistance
METHOD a (JIZZ)V
METHOD a onDistanceChange (JII)V
ARG 1 pos
ARG 3 oldDistance
ARG 4 distance
METHOD d isPlayerInChunk (J)Z
ARG 1 chunkPos
CLASS ux$d NearbyChunkTicketUpdater
FIELD e watchDistance I
FIELD f distances Lit/unimi/dsi/fastutil/longs/Long2IntMap;
FIELD g positionsAffected Lit/unimi/dsi/fastutil/longs/LongSet;
METHOD <init> (Lux;I)V
ARG 1 maxDistance
METHOD a setWatchDistance (I)V
ARG 1 watchDistance
METHOD a updateTicket (JIZZ)V
ARG 1 pos
ARG 3 distance
ARG 4 oldWithinViewDistance
ARG 5 withinViewDistance
METHOD c isWithinViewDistance (I)Z
ARG 1 distance
FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
FIELD e positionToTicketSet Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap;
FIELD c playersByChunkPos Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;
FIELD d playersByChunkSectionPos Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;
FIELD e ticketsByPosition Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap;
FIELD h viewDistance I
FIELD i distanceFromNearestPlayerTracker Lux$b;
FIELD j nearbyChunkTicketUpdater Lux$d;
FIELD k chunkHolders Ljava/util/Set;
FIELD l levelUpdateListener Luq$c;
FIELD m playerTicketThrottler Lagd;
FIELD n playerTicketThrottlerSorter Lagd;
FIELD o chunkPositions Lit/unimi/dsi/fastutil/longs/LongSet;
FIELD p mainThreadExecutor Ljava/util/concurrent/Executor;
FIELD q location J
METHOD <init> (Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)V
ARG 1 workerExecutor
ARG 2 mainThreadExecutor
METHOD a purge ()V
METHOD a setViewDistance (I)V
METHOD a setLevel (JILuq;I)Luq;
ARG 1 pos
ARG 3 level
@ -28,9 +54,12 @@ CLASS ux net/minecraft/server/world/ChunkTicketManager
ARG 3 ticket
METHOD a setChunkForced (Lbgi;Z)V
ARG 2 forced
METHOD a handleChunkEnter (Lfo;Lvf;)V
ARG 1 pos
ARG 2 player
METHOD a getLevel (Lit/unimi/dsi/fastutil/objects/ObjectSortedSet;)I
ARG 1 ticketSet
METHOD a update (Lur;)Z
METHOD a tick (Lur;)Z
ARG 1 chunkStorage
METHOD a addTicketWithLevel (Lvj;Lbgi;ILjava/lang/Object;)V
ARG 1 type
@ -38,13 +67,16 @@ CLASS ux net/minecraft/server/world/ChunkTicketManager
ARG 3 level
ARG 4 argument
METHOD b getLevelCount ()I
METHOD b (I)V
METHOD b setWatchDistance (I)V
ARG 1 viewDistance
METHOD b getChunkHolder (J)Luq;
ARG 1 pos
METHOD b removeTicket (JLvi;)V
ARG 1 pos
ARG 3 ticket
METHOD b handleChunkLeave (Lfo;Lvf;)V
ARG 1 pos
ARG 2 player
METHOD b addTicket (Lvj;Lbgi;ILjava/lang/Object;)V
ARG 1 type
ARG 2 pos

12
mappings/net/minecraft/server/world/ServerChunkManager.mapping
View File

@ -1,5 +1,5 @@
CLASS vc net/minecraft/server/world/ServerChunkManager
CLASS vc$a ChunkTaskQueue
CLASS vc$a MainThreadExecutor
FIELD a threadedAnvilChunkStorage Lur;
FIELD b CHUNKS_ELIGIBLE_FOR_SPAWNING I
FIELD c CHUNK_STATUSES Ljava/util/List;
@ -8,15 +8,21 @@ CLASS vc net/minecraft/server/world/ServerChunkManager
FIELD f world Lve;
FIELD g serverThread Ljava/lang/Thread;
FIELD h lightProvider Lvh;
FIELD i mainThreadExecutor Lvc$a;
FIELD j persistentStateManager Lcnk;
FIELD k lastMobSpawningTime J
FIELD l spawnMonsters Z
FIELD m spawnAnimals Z
METHOD <init> (Lve;Ljava/io/File;Lcom/mojang/datafixers/DataFixer;Lcip;Ljava/util/concurrent/Executor;Lbwl;IILvn;Ljava/util/function/Supplier;)V
ARG 5 workerExecutor
METHOD a getChunkHolder (J)Luq;
ARG 1 pos
METHOD a getDebugString (Lbgi;)Ljava/lang/String;
ARG 1 pos
METHOD a markForUpdate (Lev;)V
METHOD a isMissingForLevel (Luq;I)Z
ARG 1 holder
ARG 2 maxLevel
METHOD a updateCameraPosition (Lvf;)V
ARG 1 player
METHOD a addTicket (Lvj;Lbgi;ILjava/lang/Object;)V
@ -31,6 +37,8 @@ CLASS vc net/minecraft/server/world/ServerChunkManager
METHOD b unloadEntity (Lahz;)V
METHOD b removeTicket (Lvj;Lbgi;ILjava/lang/Object;)V
METHOD c applyViewDistance (II)V
ARG 1 watchDistance
ARG 2 viewDistance
METHOD c getChunkAsync (IILbwp;Z)Ljava/util/concurrent/CompletableFuture;
ARG 1 chunkX
ARG 2 chunkZ
@ -40,5 +48,5 @@ CLASS vc net/minecraft/server/world/ServerChunkManager
METHOD g getLoadedChunkCount ()I
METHOD h getPersistentStateManager ()Lcnk;
METHOD i getPointOfInterestStorage ()Lapw;
METHOD l update ()Z
METHOD l tick ()Z
METHOD m tickChunks ()V

2
mappings/net/minecraft/server/world/ServerWorld.mapping
View File

@ -22,7 +22,7 @@ CLASS ve net/minecraft/server/world/ServerWorld
FIELD z entitiesToLoad Ljava/util/Queue;
METHOD <init> (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lcnm;Lcnl;Lbxq;Lafy;Lvn;)V
ARG 1 server
ARG 2 chunkExecutor
ARG 2 workerExecutor
ARG 3 worldSaveHandler
ARG 4 properties
ARG 5 dimensionType

30
mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping
View File

@ -1,7 +1,8 @@
CLASS ur net/minecraft/server/world/ThreadedAnvilChunkStorage
CLASS ur$a TicketManager
METHOD <init> (Lur;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)V
ARG 1 executor
ARG 1 workerExecutor
ARG 2 mainThreadExecutor
CLASS ur$b EntityTracker
FIELD b entry Lvd;
FIELD c entity Lahz;
@ -14,12 +15,15 @@ CLASS ur net/minecraft/server/world/ThreadedAnvilChunkStorage
ARG 1 players
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
FIELD A watchDistance I
FIELD B viewDistance I
FIELD a MAX_LEVEL I
FIELD d LOGGER Lorg/apache/logging/log4j/Logger;
FIELD e posToHolder Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap;
FIELD f posToHolderCopy Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap;
FIELD i world Lve;
FIELD j serverLightingProvider Lvh;
FIELD k genQueueAdder Lagb;
FIELD k chunkTaskQueue Lagb;
FIELD l chunkGenerator Lbwl;
FIELD m persistentStateManagerFactory Ljava/util/function/Supplier;
FIELD n pointOfInterestStorage Lapw;
@ -32,10 +36,18 @@ CLASS ur net/minecraft/server/world/ThreadedAnvilChunkStorage
FIELD v totalChunksLoadedCount Ljava/util/concurrent/atomic/AtomicInteger;
FIELD w structureManager Lcip;
FIELD x saveDir Ljava/io/File;
FIELD y playerChunkWatchingManager Luz;
FIELD z entityTrackers Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
METHOD <init> (Lve;Ljava/io/File;Lcom/mojang/datafixers/DataFixer;Lcip;Ljava/util/concurrent/Executor;Lagb;Lbwy;Lbwl;Lvn;Ljava/util/function/Supplier;II)V
ARG 1 world
ARG 3 dataFixer
ARG 5 workerExecutor
ARG 6 mainThreadExecutor
ARG 8 chunkGenerator
ARG 9 worldGenerationProgressListener
METHOD a getLightProvider ()Lvh;
METHOD a applyViewDistance (II)V
ARG 1 maxWatchDistance
METHOD a setViewDistance (II)V
ARG 1 watchDistance
ARG 2 viewDistance
METHOD a getChunkHolder (J)Luq;
ARG 1 pos
@ -46,19 +58,21 @@ CLASS ur net/minecraft/server/world/ThreadedAnvilChunkStorage
METHOD a loadEntity (Lahz;)V
METHOD a getDebugString (Lbgi;)Ljava/lang/String;
ARG 1 pos
METHOD a getChunkRegion (Lbgi;ILjava/util/function/IntFunction;)Ljava/util/concurrent/CompletableFuture;
METHOD a createChunkRegionFuture (Lbgi;ILjava/util/function/IntFunction;)Ljava/util/concurrent/CompletableFuture;
ARG 1 centerChunk
ARG 2 margin
ARG 3 distanceToStatus
METHOD a save (Lbwk;)V
METHOD a convertToFullChunk (Lbwk;Ljava/util/function/IntSupplier;)Ljava/util/concurrent/CompletableFuture;
METHOD a getPrecedingTargetChunkGenerationStatus (Lbwp;I)Lbwp;
METHOD a getRequiredStatusForGeneration (Lbwp;I)Lbwp;
ARG 1 centerChunkTargetStatus
ARG 2 distance
METHOD a tick (Ljava/util/function/BooleanSupplier;)V
METHOD a getChunk (Luq;Lbwp;)Ljava/util/concurrent/CompletableFuture;
METHOD a createChunkFuture (Luq;Lbwp;)Ljava/util/concurrent/CompletableFuture;
ARG 1 holder
ARG 2 status
METHOD a updateCameraPosition (Lvf;)V
ARG 1 player
METHOD a sendWatchPackets (Lvf;Lbgi;[Lka;ZZ)V
ARG 1 player
ARG 2 pos
@ -71,6 +85,8 @@ CLASS ur net/minecraft/server/world/ThreadedAnvilChunkStorage
METHOD b getCopiedChunkHolder (J)Luq;
ARG 1 pos
METHOD b unloadEntity (Lahz;)V
METHOD b getEntityTickingChunkFuture (Lbgi;)Ljava/util/concurrent/CompletableFuture;
ARG 1 pos
METHOD b doesNotGenerateChunks (Lvf;)Z
ARG 1 player
METHOD c getTotalChunksLoadedCount ()I

7
mappings/net/minecraft/util/ChunkPosLevelPropagator.mapping
View File

@ -3,4 +3,9 @@ CLASS uu net/minecraft/util/ChunkPosLevelPropagator
ARG 1 levelCount
ARG 2 initLevelCapacity
ARG 3 initTotalCapacity
METHOD b scheduleNewLevelUpdate (JIZ)V
METHOD b getInitialLevel (J)I
ARG 1 id
METHOD b update (JIZ)V
ARG 1 chunkPos
ARG 3 distance
ARG 4 playerPresent

18
mappings/net/minecraft/util/LevelPropagator.mapping
View File

@ -42,23 +42,23 @@ CLASS cjw net/minecraft/util/LevelPropagator
ARG 3 sourceId
ARG 5 limitLevel
METHOD a update (JJIIIZ)V
ARG 1 sourceId
ARG 1 causingId
ARG 3 id
ARG 5 limitLevel
ARG 6 targetLevel
ARG 7 currentLevel
ARG 5 level
ARG 6 currentLevel
ARG 7 previousLevel
ARG 8 mergeAsMin
METHOD a update (JJIZ)V
ARG 1 causingId
ARG 3 id
ARG 5 limitLevel
ARG 5 level
ARG 6 mergeAsMin
METHOD b hasLevelUpdates ()Z
METHOD b updateAllRecursively (I)I
ARG 1 maxSteps
METHOD b getUpdatedLevel (JJI)I
ARG 1 sourceId
ARG 3 id
METHOD b getPropagatedLevel (JJI)I
ARG 1 fromId
ARG 3 toId
ARG 5 currentLevel
METHOD b updateRecursively (JJIZ)V
ARG 1 sourceId
@ -69,5 +69,5 @@ CLASS cjw net/minecraft/util/LevelPropagator
ARG 1 id
METHOD e remove (J)V
ARG 1 id
METHOD f update (J)V
METHOD f fullyUpdate (J)V
ARG 1 id

2
mappings/net/minecraft/util/Mailbox.mapping
View File

@ -12,6 +12,6 @@ CLASS agg net/minecraft/util/Mailbox
METHOD a getPriority ()I
CLASS agg$c QueueMailbox
FIELD a queue Ljava/util/Queue;
METHOD a getNext ()Ljava/lang/Object;
METHOD a poll ()Ljava/lang/Object;
METHOD a add (Ljava/lang/Object;)Z
METHOD b isEmpty ()Z

3
mappings/net/minecraft/util/MailboxProcessor.mapping
View File

@ -1,7 +1,8 @@
CLASS age net/minecraft/util/MailboxProcessor
FIELD a taskList Lagg;
FIELD a mailbox Lagg;
FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
FIELD c stateFlags Ljava/util/concurrent/atomic/AtomicInteger;
FIELD d executor Ljava/util/concurrent/Executor;
FIELD e name Ljava/lang/String;
METHOD <init> (Lagg;Ljava/util/concurrent/Executor;Ljava/lang/String;)V
ARG 1 mailbox

2
mappings/net/minecraft/util/ThreadTaskQueue.mapping → mappings/net/minecraft/util/ThreadExecutor.mapping
View File

@ -1,4 +1,4 @@
CLASS agb net/minecraft/util/ThreadTaskQueue
CLASS agb net/minecraft/util/ThreadExecutor
FIELD b name Ljava/lang/String;
FIELD c LOGGER Lorg/apache/logging/log4j/Logger;
FIELD d taskQueue Ljava/util/Queue;