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

More mappings + fixes

This commit is contained in:
Runemoro 2019-03-31 06:13:09 -04:00
parent fd6b5980ba
commit 60c49258cc
10 changed files with 86 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mappings/net/minecraft/client/network/packet/LightUpdateS2CPacket.mapping
View File

@ -1,14 +1,22 @@
CLASS lo net/minecraft/client/network/packet/LightUpdateS2CPacket
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;
FIELD c skyLightMask I
FIELD d blockLightMask I
FIELD e filledSkyLightMask I
FIELD f filledBlockLightMask I
FIELD g skyLightUpdates Ljava/util/List;
FIELD h blockLightUpdates Ljava/util/List;
METHOD <init> (Lbgi;Lckb;II)V
ARG 1 pos
ARG 2 lightProvider
ARG 3 blockLightUpdatesBits
ARG 4 skyLightUpdateBits
ARG 3 skyLightMask
ARG 4 blockLightMask
METHOD b getChunkX ()I
METHOD c getChunkZ ()I
METHOD d getSkyLightMask ()I
METHOD e getFilledSkyLightMask ()I
METHOD f getSkyLightUpdates ()Ljava/util/List;
METHOD g getBlockLightMask ()I
METHOD h getFilledBlockLightMask ()I
METHOD i getBlockLightUpdates ()Ljava/util/List;

8
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 lastCameraChunkSectionPosition Lfo;
FIELD cv lastCameraPosition Lfo;
FIELD cw containerSyncId I
FIELD d interactionManager Lvg;
FIELD g notInAnyWorld Z
@ -24,12 +24,12 @@ CLASS vf net/minecraft/server/network/ServerPlayerEntity
METHOD H isInTeleportationState ()Z
METHOD I onTeleportationDone ()V
METHOD L getAdvancementManager ()Lra;
METHOD M getLastCameraChunkSectionPosition ()Lfo;
METHOD M getLastCameraPosition ()Lfo;
METHOD a sendUnloadChunkPacket (Lbgi;)V
METHOD a sendInitialChunkPackets (Lbgi;Lka;Lka;)V
METHOD a sendBlockEntityUpdate (Lbsz;)V
METHOD a setLastCameraChunkSectionPosition (Lfo;)V
ARG 1 lastCameraChunkSectionPosition
METHOD a setLastCameraPosition (Lfo;)V
ARG 1 lastCameraPosition
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

@ -10,9 +10,9 @@ CLASS uq net/minecraft/server/world/ChunkHolder
CLASS uq$c LevelUpdateListener
METHOD a updateLevel (Lbgi;Ljava/util/function/IntSupplier;ILjava/util/function/IntConsumer;)V
ARG 1 pos
ARG 2 lastLevelUpdatedToProvider
ARG 3 newLevel
ARG 4 lastLevelUpdatedToConsumer
ARG 2 levelGetter
ARG 3 targetLevel
ARG 4 levelSetter
CLASS uq$d PlayersWatchingChunkProvider
METHOD a getPlayersWatchingChunk (Lbgi;Z)Ljava/util/stream/Stream;
ARG 1 chunkPos
@ -27,16 +27,16 @@ CLASS uq net/minecraft/server/world/ChunkHolder
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 k lastTickLevel I
FIELD l level I
FIELD m levelUpdateListenerLevel I
FIELD n pos Lbgi;
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 s blockLightUpdateBits I
FIELD t skyLightUpdateBits I
FIELD u lightingProvider Lckb;
FIELD v levelUpdateListener Luq$c;
FIELD w playersWatchingChunkProvider Luq$d;
@ -47,17 +47,23 @@ CLASS uq net/minecraft/server/world/ChunkHolder
METHOD a getTickingFuture ()Ljava/util/concurrent/CompletableFuture;
METHOD a setLevel (I)V
ARG 1 level
METHOD a markForUpdate (III)V
METHOD a markForBlockUpdate (III)V
ARG 1 x
ARG 2 y
ARG 3 z
METHOD a sendBlockEntityUpdatePacket (Lbgv;Lev;)V
ARG 1 world
ARG 2 pos
METHOD a markForLightUpdate (Lbhe;I)V
ARG 1 type
ARG 2 y
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
ARG 1 chunk
METHOD a updateFuture (Ljava/util/concurrent/CompletableFuture;)V
ARG 1 newChunkFuture
METHOD a sendPacketToPlayersWatching (Lka;Z)V
@ -67,15 +73,17 @@ CLASS uq net/minecraft/server/world/ChunkHolder
METHOD b getEntityTickingFuture ()Ljava/util/concurrent/CompletableFuture;
METHOD b getTargetGenerationStatus (I)Lbwp;
ARG 0 level
METHOD b getFutureChecked (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 d setLevelUpdateListenerLevel (I)V
ARG 1 level
METHOD e getCompletedChunk ()Lbwk;
METHOD f getFuture ()Ljava/util/concurrent/CompletableFuture;
METHOD g getLevelType ()Luq$b;
METHOD h getPos ()Lbgi;
METHOD i getLevel ()I
METHOD j getLastLevelUpdatedTo ()I
METHOD j getLevelUpdateListenerLevel ()I

19
mappings/net/minecraft/server/world/LevelIndexedQueue.mapping → mappings/net/minecraft/server/world/LevelPrioritizedQueue.mapping
View File

@ -1,19 +1,24 @@
CLASS us net/minecraft/server/world/LevelIndexedQueue
CLASS us net/minecraft/server/world/LevelPrioritizedQueue
FIELD a LEVEL_COUNT I
FIELD b levelToPosToElements Ljava/util/List;
FIELD c currentLevel I
FIELD c firstNonEmptyLevel I
FIELD d name Ljava/lang/String;
FIELD e chunkPositions Lit/unimi/dsi/fastutil/longs/LongSet;
FIELD f maxSize I
METHOD <init> (Ljava/lang/String;I)V
ARG 1 name
ARG 2 maxSize
METHOD a getNext ()Ljava/util/stream/Stream;
METHOD a poll ()Ljava/util/stream/Stream;
METHOD a updateLevel (ILbgi;I)V
ARG 1 lastLevelUpdatedTo
ARG 1 fromLevel
ARG 2 pos
ARG 3 newLevel
ARG 3 toLevel
METHOD a createPositionAdder (J)Ljava/lang/Runnable;
ARG 1 pos
METHOD a (Ljava/util/Optional;JI)V
ARG 4 lastLevelUpdatedTo
METHOD a clearPosition (JZ)V
ARG 1 pos
ARG 3 includePresent
METHOD a add (Ljava/util/Optional;JI)V
ARG 1 element
ARG 2 pos
ARG 4 level

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

@ -17,6 +17,9 @@ CLASS vc net/minecraft/server/world/ServerChunkManager
ARG 5 workerExecutor
METHOD a getChunkHolder (J)Luq;
ARG 1 pos
METHOD a sendToNearbyPlayers (Lahz;Lka;)V
ARG 1 entity
ARG 2 packet
METHOD a getDebugString (Lbgi;)Ljava/lang/String;
ARG 1 pos
METHOD a markForUpdate (Lev;)V
@ -29,22 +32,24 @@ CLASS vc net/minecraft/server/world/ServerChunkManager
METHOD a save (Z)V
ARG 1 flush
METHOD b getTotalChunksLoadedCount ()I
METHOD b getChunkSyncIfServerThread (IILbwp;Z)Ljava/util/concurrent/CompletableFuture;
METHOD b getChunkFutureSyncOnMainThread (IILbwp;Z)Ljava/util/concurrent/CompletableFuture;
ARG 1 chunkX
ARG 2 chunkZ
ARG 3 status
ARG 4 create
METHOD b unloadEntity (Lahz;)V
METHOD b sendToOtherNearbyPlayers (Lahz;Lka;)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;
METHOD c getChunkFuture (IILbwp;Z)Ljava/util/concurrent/CompletableFuture;
ARG 1 chunkX
ARG 2 chunkZ
ARG 3 status
ARG 4 create
METHOD c loadEntity (Lahz;)V
METHOD d executeQueuedTasks ()Z
METHOD g getLoadedChunkCount ()I
METHOD h getPersistentStateManager ()Lcnk;
METHOD i getPointOfInterestStorage ()Lapw;

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

@ -30,7 +30,7 @@ CLASS ve net/minecraft/server/world/ServerWorld
ARG 7 worldGenerationProgressListener
METHOD B getPointOfInterestStorage ()Lapw;
METHOD C getRaidManager ()Laws;
METHOD a getChunkSyncIfServerThread (IIZ)Ljava/util/concurrent/CompletableFuture;
METHOD a getChunkFutureSyncOnMainThread (IIZ)Ljava/util/concurrent/CompletableFuture;
ARG 1 x
ARG 2 z
ARG 3 create

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

@ -6,11 +6,16 @@ CLASS ur net/minecraft/server/world/ThreadedAnvilChunkStorage
CLASS ur$b EntityTracker
FIELD b entry Lvd;
FIELD c entity Lahz;
FIELD e lastCameraPosition Lfo;
FIELD f playersTracking Ljava/util/Set;
METHOD a stopTracking ()V
METHOD a updateCameraPosition (Ljava/util/List;)V
ARG 1 players
METHOD a sendToOtherNearbyPlayers (Lka;)V
ARG 1 packet
METHOD a stopTracking (Lvf;)V
METHOD b sendToNearbyPlayers (Lka;)V
ARG 1 packet
METHOD b updateCameraPosition (Lvf;)V
ARG 1 players
METHOD equals (Ljava/lang/Object;)Z
@ -27,6 +32,7 @@ CLASS ur net/minecraft/server/world/ThreadedAnvilChunkStorage
FIELD l chunkGenerator Lbwl;
FIELD m persistentStateManagerFactory Ljava/util/function/Supplier;
FIELD n pointOfInterestStorage Lapw;
FIELD o fullChunks Lit/unimi/dsi/fastutil/longs/LongSet;
FIELD p posToHolderCopyOutdated Z
FIELD q chunkTaskPrioritySystem Lut;
FIELD r worldgenActor Lagd;
@ -56,18 +62,25 @@ CLASS ur net/minecraft/server/world/ThreadedAnvilChunkStorage
ARG 3 level
ARG 4 holder
METHOD a loadEntity (Lahz;)V
METHOD a sendToOtherNearbyPlayers (Lahz;Lka;)V
ARG 1 entity
ARG 2 packet
METHOD a getDebugString (Lbgi;)Ljava/lang/String;
ARG 1 pos
METHOD a createChunkRegionFuture (Lbgi;ILjava/util/function/IntFunction;)Ljava/util/concurrent/CompletableFuture;
ARG 1 centerChunk
ARG 2 margin
ARG 3 distanceToStatus
METHOD a getSquaredHorizontalDistance (Lbgi;Lahz;)D
ARG 0 pos
ARG 1 entity
METHOD a save (Lbwk;)V
METHOD a convertToFullChunk (Lbwk;Ljava/util/function/IntSupplier;)Ljava/util/concurrent/CompletableFuture;
METHOD a getRequiredStatusForGeneration (Lbwp;I)Lbwp;
ARG 1 centerChunkTargetStatus
ARG 2 distance
METHOD a tick (Ljava/util/function/BooleanSupplier;)V
METHOD a createTickingFuture (Luq;)Ljava/util/concurrent/CompletableFuture;
METHOD a createChunkFuture (Luq;Lbwp;)Ljava/util/concurrent/CompletableFuture;
ARG 1 holder
ARG 2 status
@ -79,20 +92,29 @@ CLASS ur net/minecraft/server/world/ThreadedAnvilChunkStorage
ARG 3 packets
ARG 4 withinMaxWatchDistance
ARG 5 withinViewDistance
METHOD a handlePlayerAddedOrRemoved (Lvf;Z)V
ARG 1 player
ARG 2 added
METHOD a save (Z)V
ARG 1 flush
METHOD b updateHolderMap ()V
METHOD b getCopiedChunkHolder (J)Luq;
ARG 1 pos
METHOD b unloadEntity (Lahz;)V
METHOD b getEntityTickingChunkFuture (Lbgi;)Ljava/util/concurrent/CompletableFuture;
METHOD b sendToNearbyPlayers (Lahz;Lka;)V
ARG 1 entity
ARG 2 packet
METHOD b createEntityTickingChunkFuture (Lbgi;)Ljava/util/concurrent/CompletableFuture;
ARG 1 pos
METHOD b doesNotGenerateChunks (Lvf;)Z
ARG 1 player
METHOD c getTotalChunksLoadedCount ()I
METHOD c isTooFarFromPlayersToSpawnMobs (Lbgi;)Z
ARG 1 pos
METHOD d getLoadedChunkCount ()I
METHOD e getTicketManager ()Lur$a;
METHOD e getUpdatedChunkTag (Lbgi;)Lib;
ARG 1 pos
METHOD f entryIterator ()Lit/unimi/dsi/fastutil/objects/ObjectBidirectionalIterator;
METHOD g tickPlayerMovement ()V
METHOD h getPointOfInterestStorage ()Lapw;

2
mappings/net/minecraft/world/World.mapping
View File

@ -69,7 +69,7 @@ CLASS bgv net/minecraft/world/World
ARG 3 z
METHOD a setBlockBreakingProgress (ILev;I)V
METHOD a setTime (J)V
METHOD a summonParticle (Lahz;B)V
METHOD a setEntityStatus (Lahz;B)V
METHOD a createExplosion (Lahz;DDDFLbgo$a;)Lbgo;
ARG 1 entity
ARG 2 x

2
mappings/net/minecraft/world/chunk/ChunkManager.mapping
View File

@ -2,7 +2,7 @@ CLASS bwo net/minecraft/world/chunk/ChunkManager
METHOD a isChunkLoaded (II)Z
ARG 1 x
ARG 2 z
METHOD a getChunkSync (IILbwp;Z)Lbwk;
METHOD a getChunk (IILbwp;Z)Lbwk;
ARG 1 x
ARG 2 z
ARG 3 status

3
mappings/net/minecraft/world/chunk/ChunkStatus.mapping
View File

@ -51,7 +51,8 @@ CLASS bwp net/minecraft/world/chunk/ChunkStatus
METHOD a runTask (Lve;Lbwl;Lcip;Lvh;Ljava/util/function/Function;Ljava/util/List;)Ljava/util/concurrent/CompletableFuture;
ARG 2 chunkGenerator
METHOD b getMaxTargetGenerationRadius ()I
METHOD b isAfter (Lbwp;)Z
METHOD b isAtLeast (Lbwp;)Z
ARG 1 chunk
METHOD c getIndex ()I
METHOD d getName ()Ljava/lang/String;
METHOD e getPrevious ()Lbwp;