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

Merge branch 'JamiesWhiteShirt-serverchunkprovider' into 18w49a

This commit is contained in:
modmuss50 2018-12-12 15:23:53 +00:00
parent aff4547d93 fc8a71fcaa
commit dc2a07b681
23 changed files with 189 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mappings/ld.mapping
View File

@ -1,8 +0,0 @@
CLASS ld
METHOD a read (Lir;)V
ARG 0 buf
METHOD a apply (Liu;)V
ARG 0 handler
METHOD a apply (Ljs;)V
METHOD b write (Lir;)V
ARG 0 buf

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

@ -46,11 +46,13 @@ CLASS czr net/minecraft/client/network/ClientPlayNetworkHandler
METHOD a onDisconnect (Lku;)V
METHOD a onEntityStatus (Lkv;)V
METHOD a onExplosion (Lkw;)V
METHOD a onUnloadChunk (Lkx;)V
METHOD a onGameStateChange (Lky;)V
METHOD a onKeepAlive (Lkz;)V
METHOD a onChunkData (Lla;)V
METHOD a onWorldEvent (Llb;)V
METHOD a onParticle (Llc;)V
METHOD a onLightUpdate (Lld;)V
METHOD a onGameJoin (Lle;)V
METHOD a onMapUpdate (Llf;)V
METHOD a onEntityUpdate (Llg;)V

12
mappings/net/minecraft/client/network/packet/LightUpdateClientPacket.mapping Normal file
View File

@ -0,0 +1,12 @@
CLASS ld net/minecraft/client/network/packet/LightUpdateClientPacket
FIELD a chunkX I
FIELD b chunkZ I
FIELD g skyUpdates Ljava/util/List;
FIELD h blockUpdates Ljava/util/List;
METHOD a read (Lir;)V
ARG 0 buf
METHOD a apply (Liu;)V
ARG 0 handler
METHOD a apply (Ljs;)V
METHOD b write (Lir;)V
ARG 0 buf

6
mappings/kx.mapping → mappings/net/minecraft/client/network/packet/UnloadChunkClientPacket.mapping
View File

@ -1,8 +1,12 @@
CLASS kx
CLASS kx net/minecraft/client/network/packet/UnloadChunkClientPacket
FIELD a x I
FIELD b z I
METHOD a read (Lir;)V
ARG 0 buf
METHOD a apply (Liu;)V
ARG 0 handler
METHOD a apply (Ljs;)V
METHOD b getX ()I
METHOD b write (Lir;)V
ARG 0 buf
METHOD c getZ ()I

9
mappings/net/minecraft/client/world/ClientChunkProvider.mapping → mappings/net/minecraft/client/world/ClientChunkManager.mapping
View File

@ -1,4 +1,4 @@
CLASS czp net/minecraft/client/world/ClientChunkProvider
CLASS czp net/minecraft/client/world/ClientChunkManager
CLASS czp$a
FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
FIELD b client Lcof;
@ -6,4 +6,11 @@ CLASS czp net/minecraft/client/world/ClientChunkProvider
FIELD d lightingProvider Lcdq;
FIELD i world Lbae;
METHOD a getLightingProvider ()Lcdq;
METHOD a getChunkSync (IILbqe;Z)Lbpz;
ARG 1 x
ARG 2 z
ARG 3 status
ARG 4 require
METHOD a tick (Ljava/util/function/BooleanSupplier;)V
METHOD g getStatus ()Ljava/lang/String;
METHOD h getChunkGenerator ()Lbqa;

2
mappings/net/minecraft/client/world/ClientWorld.mapping
View File

@ -10,7 +10,7 @@ CLASS czu net/minecraft/client/world/ClientWorld
METHOD A getRecipeManager ()Layb;
METHOD B getTagManager ()Lya;
METHOD D getScoreboard ()Lclz;
METHOD E getChunkProvider ()Lbqd;
METHOD E getChunkManager ()Lbqd;
METHOD F getFluidTickScheduler ()Lbbj;
METHOD G getBlockTickScheduler ()Lbbj;
METHOD a playSound (DDDLxg;Lxi;FFZ)V

2
mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping
View File

@ -29,11 +29,13 @@ CLASS js net/minecraft/network/listener/ClientPlayPacketListener
METHOD a onDisconnect (Lku;)V
METHOD a onEntityStatus (Lkv;)V
METHOD a onExplosion (Lkw;)V
METHOD a onUnloadChunk (Lkx;)V
METHOD a onGameStateChange (Lky;)V
METHOD a onKeepAlive (Lkz;)V
METHOD a onChunkData (Lla;)V
METHOD a onWorldEvent (Llb;)V
METHOD a onParticle (Llc;)V
METHOD a onLightUpdate (Lld;)V
METHOD a onGameJoin (Lle;)V
METHOD a onMapUpdate (Llf;)V
METHOD a onEntityUpdate (Llg;)V

2
mappings/net/minecraft/server/network/EntityTracker.mapping
View File

@ -4,6 +4,7 @@ CLASS uf net/minecraft/server/network/EntityTracker
FIELD c trackedEntities Ljava/util/Set;
FIELD d trackedEntitiesById Lym;
METHOD a toFixedPoint (D)J
METHOD a setViewDistance (I)V
METHOD a add (Lagk;)V
ARG 1 entity
METHOD a (Lagk;DDD)V
@ -18,4 +19,5 @@ CLASS uf net/minecraft/server/network/EntityTracker
ARG 2 trackingRange
ARG 3 updateIntervalTicks
ARG 4 alwaysUpdateVelocity
METHOD a sendEntitiesInChunk (Lum;II)V
METHOD b remove (Lagk;)V

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

@ -2,6 +2,8 @@ CLASS um net/minecraft/server/network/ServerPlayerEntity
FIELD a networkHandler Lva;
FIELD b server Lnet/minecraft/server/MinecraftServer;
FIELD cD enteredNetherPos Lckz;
FIELD cE chunkPos Lbag;
FIELD cF chunkTicket Lup;
FIELD cG containerSyncId I
FIELD c interactionManager Lun;
FIELD cd LOGGER_PLAYER Lorg/apache/logging/log4j/Logger;
@ -15,8 +17,12 @@ CLASS um net/minecraft/server/network/ServerPlayerEntity
METHOD E updatePortalCooldown ()V
METHOD L getAdvancementManager ()Lqj;
METHOD M getEnteredNetherPosition ()Lckz;
METHOD O getChunkPos ()Lbag;
METHOD P getChunkTicket ()Lup;
METHOD T_ update ()V
METHOD U_ stopRiding ()V
METHOD a (JIJ)Lup;
ARG 1 chunkPos
METHOD a openInventory (Laex;)V
METHOD a swingHand (Lafd;)V
METHOD a openContainer (Lafe;)V
@ -41,6 +47,8 @@ CLASS um net/minecraft/server/network/ServerPlayerEntity
ARG 1 container
METHOD a openBookEditor (Lavu;Lafd;)V
METHOD a openVillagerGui (Lazw;)V
METHOD a sendRemoveChunkPacket (Lbag;)V
METHOD a sendInitialChunkPackets (Lbag;Ljp;Ljp;)V
METHOD a setGameMode (Lbap;)V
METHOD a sendBlockEntityUpdate (Lbmq;)V
METHOD a openCommandBlock (Lbmu;)V

13
mappings/net/minecraft/server/world/PlayerChunkWatchingManager.mapping Normal file
View File

@ -0,0 +1,13 @@
CLASS uh net/minecraft/server/world/PlayerChunkWatchingManager
FIELD a watchingPlayers Ljava/util/Set;
FIELD b notWatchingPlayers Ljava/util/Set;
METHOD a getPlayersWatchingChunk (J)Ljava/util/stream/Stream;
METHOD a movePlayer (JJLum;)V
ARG 1 prevPos
ARG 3 currentPos
METHOD a remove (JLum;)V
METHOD a add (JLum;Z)V
ARG 4 watchDisabled
METHOD a disableWatch (Lum;)V
METHOD b enableWatch (Lum;)V
METHOD c isWatchDisabled (Lum;)Z

84
mappings/net/minecraft/server/world/ServerChunkManager.mapping Normal file
View File

@ -0,0 +1,84 @@
CLASS uj net/minecraft/server/world/ServerChunkManager
CLASS uj$a
FIELD A spawnMonsters Z
FIELD B spawnAnimals Z
FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
FIELD d chunkStatuses Ljava/util/List;
FIELD f chunkGenerator Lbqa;
FIELD g chunkSaveHandler Lbqy;
FIELD h world Lbas;
FIELD i worldThread Ljava/lang/Thread;
FIELD j genQueue Ljava/util/Queue;
FIELD k players Luh;
FIELD l loadedChunkMap Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap;
FIELD p maxWatchDistance I
FIELD r genWorkerPool Ljava/util/concurrent/ExecutorService;
FIELD s genWorkerId Ljava/util/concurrent/atomic/AtomicInteger;
FIELD v lightProvider Luo;
METHOD a getLightingProvider ()Lcdq;
METHOD a getChunkSync (IILbqe;Z)Lbpz;
ARG 1 x
ARG 2 z
ARG 3 status
ARG 4 require
ARG 5 isWorldThread
METHOD a getWatchDistance (Lbag;II)I
METHOD a getSqDistance (Lbag;Lagk;)D
METHOD a markForUpdate (Let;)V
METHOD a tick (Ljava/util/function/BooleanSupplier;)V
METHOD a addPlayer (Lum;)V
METHOD a (Lum;II)Z
ARG 2 x
ARG 3 z
METHOD a sendChunkPackets (Lum;Lbag;[Ljp;ZZ)V
ARG 4 previouslyWatching
ARG 5 currentlyWatching
METHOD a addOrRemovePlayer (Lum;Z)V
ARG 2 add
ARG 3 canNotGenerate
ARG 4 notWatching
ARG 5 x
ARG 6 z
METHOD a save (Z)V
ARG 1 saveChunks
ARG 4 chunk
METHOD a setMobSpawnOptions (ZZ)V
ARG 1 spawnMonsters
ARG 2 spawnAnimals
METHOD b getProgressString ()Ljava/lang/String;
METHOD b applyViewDistance (I)V
METHOD b get (II)Lbae;
ARG 1 chunkX
METHOD b getChunkAsync (IILbqe;Z)Ljava/util/concurrent/CompletableFuture;
ARG 1 x
ARG 2 z
ARG 3 status
METHOD b (J)Ltz;
METHOD b getWatchDistance (Lbag;Lagk;)I
METHOD b removePlayer (Lum;)V
METHOD c updateChunkWatchingForPlayer (Lum;)V
ARG 1 playerEntity
ARG 2 currentX
ARG 3 currentZ
ARG 4 prevX
ARG 5 prevZ
ARG 6 prevPos
ARG 8 currentPos
ARG 10 prevWatchDisabled
ARG 11 currentWatchDisabled
ARG 12 mojangPleaseFix
ARG 13 minX
ARG 14 minZ
ARG 15 maxX
ARG 16 maxZ
ARG 19 pos
ARG 20 previouslyWatching
ARG 21 currentlyWatching
METHOD d getWorld ()Lbas;
METHOD d isWatchDisabled (Lum;)Z
METHOD f updateLight ()V
METHOD g getStatus ()Ljava/lang/String;
METHOD h getChunkGenerator ()Lbqa;
METHOD i getLoadedChunkCount ()I
METHOD k getRemainingWatchDistance ()I
METHOD o doMobSpawning ()V

23
mappings/net/minecraft/server/world/ServerChunkManagerEntry.mapping Normal file
View File

@ -0,0 +1,23 @@
CLASS tz net/minecraft/server/world/ServerChunkManagerEntry
CLASS tz$a Unloaded
FIELD a INSTANCE Ltz$a;
CLASS tz$b
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 j chunk Ljava/util/concurrent/CompletableFuture;
FIELD m players Luh;
FIELD n pos Lbag;
FIELD o blockUpdatePositions [S
FIELD p blockUpdateCount I
FIELD u lightingProvider Lcdq;
METHOD a markForUpdate (III)V
METHOD a sendBlockEntityUpdatePacket (Lbas;Let;I)V
METHOD a flushUpdates (Lbql;I)V
METHOD a updateChunk (Ljava/util/concurrent/CompletableFuture;)V
METHOD a sendPacket (Ljp;ZI)V
METHOD c getChunk ()Lbql;
METHOD f getChunkFuture ()Ljava/util/concurrent/CompletableFuture;
METHOD h getPos ()Lbag;

16
mappings/net/minecraft/server/world/ServerChunkProvider.mapping
View File

@ -1,16 +0,0 @@
CLASS uj net/minecraft/server/world/ServerChunkProvider
FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
FIELD g chunkSaveHandler Lbqy;
FIELD h world Lbas;
FIELD l loadedChunkMap Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap;
FIELD r genWorkerPool Ljava/util/concurrent/ExecutorService;
FIELD s genWorkerId Ljava/util/concurrent/atomic/AtomicInteger;
METHOD a getLightingProvider ()Lcdq;
METHOD a save (Z)V
ARG 1 saveChunks
ARG 4 chunk
METHOD b get (II)Lbae;
ARG 1 chunkX
METHOD d isGenerationDisabled (Lum;)Z
METHOD g getStatus ()Ljava/lang/String;
METHOD i getLoadedChunkCount ()I

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

@ -8,7 +8,7 @@ CLASS uk net/minecraft/server/world/ServerWorld
METHOD A getRecipeManager ()Layb;
METHOD B getTagManager ()Lya;
METHOD D getScoreboard ()Lclz;
METHOD E getChunkProvider ()Lbqd;
METHOD E getChunkManager ()Lbqd;
METHOD F getFluidTickScheduler ()Lbbj;
METHOD G getBlockTickScheduler ()Lbbj;
METHOD a isChunkLoaded (II)Z
@ -42,7 +42,7 @@ CLASS uk net/minecraft/server/world/ServerWorld
METHOD m_ updateEntities ()V
METHOD p tickScheduledTicks ()V
METHOD r getForcedSpawnPoint ()Let;
METHOD s getChunkProvider ()Luj;
METHOD s getChunkManager ()Luj;
METHOD t updateWeather ()V
METHOD u getBlockTickScheduler ()Lbbh;
METHOD v getFluidTickScheduler ()Lbbh;

2
mappings/net/minecraft/server/world/chunk/light/ServerLightingProvider.mapping Normal file
View File

@ -0,0 +1,2 @@
CLASS uo net/minecraft/server/world/chunk/light/ServerLightingProvider
METHOD a queueLightCheck (Let;)V

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

@ -1,5 +1,5 @@
CLASS bat net/minecraft/world/IWorld
METHOD E getChunkProvider ()Lbqd;
METHOD E getChunkManager ()Lbqd;
METHOD F getFluidTickScheduler ()Lbbj;
METHOD G getBlockTickScheduler ()Lbbj;
METHOD a getChunk (IILbqe;)Lbpz;

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

@ -28,7 +28,7 @@ CLASS bas net/minecraft/world/World
FIELD t dimension Lbre;
FIELD u pathingCoordinator Lakw;
FIELD v listeners Ljava/util/List;
FIELD w chunkProvider Lbqd;
FIELD w chunkManager Lbqd;
FIELD x saveHandler Lche;
FIELD y properties Lchd;
FIELD z villageManager Lalh;
@ -41,7 +41,7 @@ CLASS bas net/minecraft/world/World
METHOD A hasHighHumidity (Let;)Z
METHOD B getTagManager ()Lya;
METHOD D getScoreboard ()Lclz;
METHOD E getChunkProvider ()Lbqd;
METHOD E getChunkManager ()Lbqd;
METHOD H getPendingBlockEntity (Let;)Lbmq;
METHOD J isDaylight ()Z
METHOD L getEntityCountAsString ()Ljava/lang/String;
@ -183,6 +183,9 @@ CLASS bas net/minecraft/world/World
METHOD a tick (Ljava/util/function/BooleanSupplier;)V
METHOD a loadEntities (Ljava/util/stream/Stream;)V
METHOD a sendPacket (Ljp;)V
METHOD a setMobSpawnOptions (ZZ)V
ARG 1 spawnMonsters
ARG 2 spawnAnimals
METHOD aa getTicksSinceLightningClient ()I
METHOD ab getVillageManager ()Lalh;
METHOD ac getRaidState ()Laro;

15
mappings/net/minecraft/world/chunk/ChunkManager.mapping Normal file
View File

@ -0,0 +1,15 @@
CLASS bqd net/minecraft/world/chunk/ChunkManager
METHOD a getLightingProvider ()Lcdq;
METHOD a getChunkSync (IILbqe;Z)Lbpz;
ARG 1 x
ARG 2 z
ARG 3 status
ARG 4 require
METHOD a tick (Ljava/util/function/BooleanSupplier;)V
METHOD a setMobSpawnOptions (ZZ)V
ARG 1 spawnMonsters
ARG 2 spawnAnimals
METHOD b get (II)Lbae;
ARG 1 chunkX
METHOD g getStatus ()Ljava/lang/String;
METHOD h getChunkGenerator ()Lbqa;

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

@ -3,12 +3,15 @@ CLASS bag net/minecraft/world/chunk/ChunkPos
FIELD b z I
METHOD <init> (II)V
ARG 1 x
METHOD a toLong ()J
METHOD a toLong (II)J
ARG 0 chunkX
ARG 1 chunkZ
METHOD a toBlockPos (III)Let;
ARG 1 xOffset
ARG 2 y
METHOD a longX (J)I
METHOD b longZ (J)I
METHOD d getXStart ()I
METHOD e getZStart ()I
METHOD equals (Ljava/lang/Object;)Z

5
mappings/net/minecraft/world/chunk/ChunkProvider.mapping
View File

@ -1,5 +0,0 @@
CLASS bqd net/minecraft/world/chunk/ChunkProvider
METHOD a getLightingProvider ()Lcdq;
METHOD b get (II)Lbae;
ARG 1 chunkX
METHOD g getStatus ()Ljava/lang/String;

2
mappings/tz.mapping
View File

@ -1,2 +0,0 @@
CLASS tz
METHOD c getChunk ()Lbql;

2
mappings/uo.mapping
View File

@ -1,2 +0,0 @@
CLASS uo
METHOD a queueLightCheck (Let;)V

5
mappings/us.mapping
View File

@ -10,10 +10,7 @@ CLASS us
FIELD k dimension Lbre;
FIELD m blockTickScheduler Lbbj;
FIELD n fluidTickScheduler Lbbj;
METHOD <init> (Lbas;Ljava/util/List;)V
ARG 1 world
ARG 2 chunks
METHOD E getChunkProvider ()Lbqd;
METHOD E getChunkManager ()Lbqd;
METHOD F getFluidTickScheduler ()Lbbj;
METHOD G getBlockTickScheduler ()Lbbj;
METHOD a getClosestPlayer (DDDDLjava/util/function/Predicate;)Laql;