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

Map more entity loading stuff.

This commit is contained in:
Thalia Nero 2020-11-06 20:11:11 -05:00
parent 8a30358ef2
commit 4699e0991e
12 changed files with 123 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mappings/net/minecraft/client/world/ClientEntityManager.mapping
View File

@ -2,11 +2,23 @@ CLASS net/minecraft/class_5582 net/minecraft/client/world/ClientEntityManager
FIELD field_27279 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_27280 entityLoader Lnet/minecraft/class_5576;
FIELD field_27281 entities Lnet/minecraft/class_5570;
FIELD field_27282 sectionedEntities Lnet/minecraft/class_5573;
FIELD field_27283 tickingChunkSections Lit/unimi/dsi/fastutil/longs/LongSet;
FIELD field_27284 entityStore Lnet/minecraft/class_5577;
METHOD <init> (Ljava/lang/Class;Lnet/minecraft/class_5576;)V
ARG 1 entityBaseClass
ARG 2 entityLoader
METHOD method_31866 getStore ()Lnet/minecraft/class_5577;
METHOD method_31870 (Lnet/minecraft/class_5568;)V
METHOD method_31868 removeIfEmpty (JLnet/minecraft/class_5572;)V
ARG 1 packedChunkSection
ARG 3 entities
METHOD method_31869 startTicking (Lnet/minecraft/class_1923;)V
ARG 1 pos
METHOD method_31870 addEntity (Lnet/minecraft/class_5568;)V
ARG 1 entity
METHOD method_31874 getEntityCount ()I
METHOD method_31875 stopTicking (Lnet/minecraft/class_1923;)V
ARG 1 pos
METHOD method_31879 getDebugString ()Ljava/lang/String;
CLASS class_5583 ClientEntityChangeHandler
FIELD field_27286 entity Lnet/minecraft/class_5568;

3
mappings/net/minecraft/entity/Entity.mapping
View File

@ -208,7 +208,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
ARG 1 x
ARG 3 y
ARG 5 z
METHOD method_24204 streamPassengersRecursively ()Ljava/util/stream/Stream;
METHOD method_24204 prefixPassengerStream ()Ljava/util/stream/Stream;
METHOD method_24516 isInRange (Lnet/minecraft/class_1297;D)Z
ARG 1 other
ARG 2 radius
@ -257,6 +257,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
METHOD method_31481 isRemoved ()Z
METHOD method_31482 unsetRemoved ()V
METHOD method_31483 getFirstPassenger ()Lnet/minecraft/class_1297;
METHOD method_31484 prefixOrderRecursivePassengers ()Ljava/util/stream/Stream;
METHOD method_5621 getMountedHeightOffset ()D
METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V
ARG 1 state

2
mappings/net/minecraft/entity/EntityLike.mapping
View File

@ -4,7 +4,9 @@ CLASS net/minecraft/class_5568 net/minecraft/entity/EntityLike
ARG 1 listener
METHOD method_31745 setRemoved (Lnet/minecraft/class_1297$class_5529;)V
ARG 1 reason
METHOD method_31746 shouldSave ()Z
METHOD method_31747 isPlayer ()Z
METHOD method_31748 postfixPassengerStream ()Ljava/util/stream/Stream;
METHOD method_5628 getEntityId ()I
METHOD method_5667 getUuid ()Ljava/util/UUID;
METHOD method_5829 getBoundingBox ()Lnet/minecraft/class_238;

62
mappings/net/minecraft/server/world/ServerEntityManager.mapping
View File

@ -2,31 +2,75 @@ CLASS net/minecraft/class_5579 net/minecraft/server/world/ServerEntityManager
FIELD field_27260 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_27261 entityUuids Ljava/util/Set;
FIELD field_27262 entityLoader Lnet/minecraft/class_5576;
FIELD field_27263 entityDataAccess Lnet/minecraft/class_5571;
FIELD field_27264 trackedEntities Lnet/minecraft/class_5570;
FIELD field_27266 entities Lnet/minecraft/class_5577;
FIELD field_27265 sectionedEntities Lnet/minecraft/class_5573;
FIELD field_27266 entityStore Lnet/minecraft/class_5577;
FIELD field_27267 statusByChunk Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;
FIELD field_27268 loadingStagesByChunkPos Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;
FIELD field_27269 tickingChunkSections Lit/unimi/dsi/fastutil/longs/LongSet;
FIELD field_27270 loadingQueue Ljava/util/Queue;
METHOD <init> (Ljava/lang/Class;Lnet/minecraft/class_5576;Lnet/minecraft/class_5571;)V
ARG 1 entityBaseClass
ARG 2 entityLoader
ARG 3 entityDataAccess
METHOD method_31809 tick ()V
METHOD method_31810 ensureEntityChunkDataLoaded (J)V
ARG 1 chunkPos
METHOD method_31811 removeIfEmpty (JLnet/minecraft/class_5572;)V
ARG 1 packedChunkSection
ARG 3 entities
METHOD method_31812 tryWriteEntityChunkData (JLjava/util/function/Consumer;)Z
COMMENT Attempts to write the entity data for entities at the given {@link ChunkPos}, and runs the given
COMMENT action for each entity after saving.
COMMENT
COMMENT @return True if the entities were written, false if they were not.
ARG 1 packedChunkPos
ARG 3 postWriteCallback
METHOD method_31815 updateEntityCuunkStatus (Lnet/minecraft/class_1923;Lnet/minecraft/class_3193$class_3194;)V
ARG 1 pos
ARG 2 levelType
METHOD method_31816 updateEntityChunkStatus (Lnet/minecraft/class_1923;Lnet/minecraft/class_5584;)V
ARG 1 pos
ARG 2 status
METHOD method_31818 addEntity (Lnet/minecraft/class_5568;)Z
ARG 1 entity
METHOD method_31820 addEntity (Lnet/minecraft/class_5568;Z)Z
ARG 1 entity
METHOD method_31826 dumpEntityDataToCsv (Ljava/io/Writer;)V
ARG 1 writer
METHOD method_31827 containsEntity (Ljava/util/UUID;)Z
ARG 1 entityUuid
METHOD method_31828 addEntitiesWithFlagSet (Ljava/util/stream/Stream;)V
ARG 1 entities
METHOD method_31829 writeAll ()V
METHOD method_31830 loadEntityChunkData (J)V
ARG 1 packedChunkPos
METHOD method_31831 canAddEntity (Lnet/minecraft/class_5568;)Z
ARG 1 entity
METHOD method_31832 getPreferredChunkStatus (Lnet/minecraft/class_5568;Lnet/minecraft/class_5584;)Lnet/minecraft/class_5584;
ARG 0 entity
ARG 1 defaultStatus
METHOD method_31835 addEntitiesWithFlagCleared (Ljava/util/stream/Stream;)V
ARG 1 entities
METHOD method_31838 (Lnet/minecraft/class_5568;)V
METHOD method_31836 writeAllDefinitively ()V
METHOD method_31837 tryUnloadChunkData (J)Z
ARG 1 packedChunkPos
METHOD method_31838 startTicking (Lnet/minecraft/class_5568;)V
ARG 1 entity
METHOD method_31843 (Lnet/minecraft/class_5568;)V
METHOD method_31841 getStore ()Lnet/minecraft/class_5577;
METHOD method_31843 stopTicking (Lnet/minecraft/class_5568;)V
ARG 1 entity
METHOD method_31847 (Lnet/minecraft/class_5568;)V
METHOD method_31845 dump ()Ljava/lang/String;
METHOD method_31847 startTracking (Lnet/minecraft/class_5568;)V
ARG 1 entity
METHOD method_31850 (Lnet/minecraft/class_5568;)V
METHOD method_31850 stopTracking (Lnet/minecraft/class_5568;)V
ARG 1 entity
METHOD method_31852 (Lnet/minecraft/class_5568;)V
METHOD method_31851 resetTickingSections ()V
METHOD method_31852 unload (Lnet/minecraft/class_5568;)V
ARG 1 entity
METHOD method_31853 loadAll ()V
METHOD method_31855 chunksWithLoadedData ()Lit/unimi/dsi/fastutil/longs/LongSet;
METHOD method_31863 (Lnet/minecraft/class_5568;)V
ARG 1 entity
METHOD method_31864 (Lnet/minecraft/class_5568;)V
@ -34,6 +78,12 @@ CLASS net/minecraft/class_5579 net/minecraft/server/world/ServerEntityManager
CLASS class_5580 ServerEntityChangeHandler
FIELD field_27272 entity Lnet/minecraft/class_5568;
FIELD field_27273 packedChunkSectionPos J
FIELD field_27274 entities Lnet/minecraft/class_5572;
METHOD <init> (Lnet/minecraft/class_5579;Lnet/minecraft/class_5568;JLnet/minecraft/class_5572;)V
ARG 2 entity
ARG 3 packedChunkSectionPos
ARG 5 entities
METHOD method_31865 updateChunkStatus (Lnet/minecraft/class_5584;Lnet/minecraft/class_5584;)V
ARG 1 oldStatus
ARG 2 newStatus
CLASS class_5581 EntityLoadingStage

10
mappings/net/minecraft/util/collection/FilterableCollection.mapping
View File

@ -1,17 +1,17 @@
CLASS net/minecraft/class_5572 net/minecraft/util/collection/FilterableCollection
FIELD field_27247 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_27248 backingList Lnet/minecraft/class_3509;
FIELD field_27249 managementCategory Lnet/minecraft/class_5584;
FIELD field_27249 chunkStatus Lnet/minecraft/class_5584;
METHOD <init> (Ljava/lang/Class;Lnet/minecraft/class_5584;)V
ARG 1 cls
ARG 2 managementCategory
ARG 2 status
METHOD method_31761 isEmpty ()Z
METHOD method_31762 forEachFiltered (Lnet/minecraft/class_5575;Ljava/util/function/Predicate;Ljava/util/function/Consumer;)V
ARG 1 filter
ARG 2 predicate
ARG 3 action
METHOD method_31763 getAndSetManagementCategory (Lnet/minecraft/class_5584;)Lnet/minecraft/class_5584;
ARG 1 managementCategory
METHOD method_31763 replaceChunkStatus (Lnet/minecraft/class_5584;)Lnet/minecraft/class_5584;
ARG 1 status
METHOD method_31764 add (Ljava/lang/Object;)V
ARG 1 obj
METHOD method_31765 forEach (Ljava/util/function/Predicate;Ljava/util/function/Consumer;)V
@ -20,5 +20,5 @@ CLASS net/minecraft/class_5572 net/minecraft/util/collection/FilterableCollectio
METHOD method_31766 stream ()Ljava/util/stream/Stream;
METHOD method_31767 remove (Ljava/lang/Object;)Z
ARG 1 obj
METHOD method_31768 getManagementCategory ()Lnet/minecraft/class_5584;
METHOD method_31768 getChunkStatus ()Lnet/minecraft/class_5584;
METHOD method_31769 size ()I

6
mappings/net/minecraft/world/chunk/ChunkDataAccess.mapping Normal file
View File

@ -0,0 +1,6 @@
CLASS net/minecraft/class_5571 net/minecraft/world/chunk/ChunkDataAccess
METHOD method_31758 awaitAll ()V
METHOD method_31759 readChunkData (Lnet/minecraft/class_1923;)Ljava/util/concurrent/CompletableFuture;
ARG 1 pos
METHOD method_31760 writeChunkData (Lnet/minecraft/class_5566;)V
ARG 1 dataList

9
mappings/net/minecraft/world/chunk/ChunkDataList.mapping Normal file
View File

@ -0,0 +1,9 @@
CLASS net/minecraft/class_5566 net/minecraft/world/chunk/ChunkDataList
FIELD field_27241 pos Lnet/minecraft/class_1923;
FIELD field_27242 data Ljava/util/List;
METHOD <init> (Lnet/minecraft/class_1923;Ljava/util/List;)V
ARG 1 pos
ARG 2 data
METHOD method_31741 getChunkPos ()Lnet/minecraft/class_1923;
METHOD method_31742 dataStream ()Ljava/util/stream/Stream;
METHOD method_31743 isEmpty ()Z

23
mappings/net/minecraft/world/chunk/EntityChunkDataAccess.mapping Normal file
View File

@ -0,0 +1,23 @@
CLASS net/minecraft/class_5565 net/minecraft/world/chunk/EntityChunkDataAccess
FIELD field_27231 dataFixer Lcom/mojang/datafixers/DataFixer;
FIELD field_27232 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_27233 world Lnet/minecraft/class_3218;
FIELD field_27234 dataLoadWorker Lnet/minecraft/class_4698;
FIELD field_27235 emptyChunks Lit/unimi/dsi/fastutil/longs/LongSet;
FIELD field_27236 executor Ljava/util/concurrent/Executor;
METHOD <init> (Lnet/minecraft/class_3218;Ljava/io/File;Lcom/mojang/datafixers/DataFixer;ZLjava/util/concurrent/Executor;)V
ARG 1 world
ARG 2 chunkFile
ARG 3 dataFixer
ARG 5 executor
METHOD method_31732 getChunkDataVersion (Lnet/minecraft/class_2487;)I
ARG 0 chunkTag
METHOD method_31733 putChunkPos (Lnet/minecraft/class_2487;Lnet/minecraft/class_1923;)V
ARG 0 chunkTag
ARG 1 pos
METHOD method_31735 emptyDataList (Lnet/minecraft/class_1923;)Lnet/minecraft/class_5566;
ARG 0 pos
METHOD method_31736 getChunkPos (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1923;
ARG 0 chunkTag
METHOD method_31737 fixChunkData (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487;
ARG 1 chunkTag

2
mappings/net/minecraft/world/entity/EntityManagementCategory.mapping → mappings/net/minecraft/world/entity/EntityChunkStatus.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_5584 net/minecraft/world/entity/EntityManagementCategory
CLASS net/minecraft/class_5584 net/minecraft/world/entity/EntityChunkStatus
FIELD field_27292 tracked Z
FIELD field_27293 tick Z
METHOD <init> (Ljava/lang/String;IZZ)V

4
mappings/net/minecraft/world/entity/EntityStoreImpl.mapping
View File

@ -1,4 +1,6 @@
CLASS net/minecraft/class_5578 net/minecraft/world/entity/EntityStoreImpl
FIELD field_27258 entityStore Lnet/minecraft/class_5570;
FIELD field_27258 entities Lnet/minecraft/class_5570;
FIELD field_27259 sectionedEntities Lnet/minecraft/class_5573;
METHOD <init> (Lnet/minecraft/class_5570;Lnet/minecraft/class_5573;)V
ARG 1 entityStore
ARG 2 sectionedEntities

2
mappings/net/minecraft/EntityLocationTracker.mapping → mappings/net/minecraft/world/entity/SectionedEntityCache.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_5573 net/minecraft/EntityLocationTracker
CLASS net/minecraft/class_5573 net/minecraft/world/entity/SectionedEntityCache
COMMENT Stores entities with the chunk sections they are in.
FIELD field_27250 entityClass Ljava/lang/Class;
FIELD field_27251 managementCategoryDiscriminator Lit/unimi/dsi/fastutil/longs/Long2ObjectFunction;

2
mappings/net/minecraft/world/storage/StorageIoWorker.mapping
View File

@ -13,6 +13,8 @@ CLASS net/minecraft/class_4698 net/minecraft/world/storage/StorageIoWorker
ARG 2 nbt
METHOD method_23709 run (Ljava/util/function/Supplier;)Ljava/util/concurrent/CompletableFuture;
METHOD method_23719 writeResult ()V
METHOD method_31738 readChunkData (Lnet/minecraft/class_1923;)Ljava/util/concurrent/CompletableFuture;
ARG 1 pos
CLASS class_4699 Result
FIELD field_21503 nbt Lnet/minecraft/class_2487;
FIELD field_21504 future Ljava/util/concurrent/CompletableFuture;