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

Apply some suggestions & map extra names

This commit is contained in:
Henry Le Grys 2020-12-03 18:56:45 +00:00
parent 411b92b91f
commit cbacd58a0a
13 changed files with 58 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,8 @@ CLASS net/minecraft/class_5582 net/minecraft/client/world/ClientEntityManager
ARG 1 entityClass
ARG 2 entityLoader
METHOD method_31866 getStore ()Lnet/minecraft/class_5577;
METHOD method_31867 (J)Lnet/minecraft/class_5584;
ARG 1 pos
METHOD method_31868 removeIfEmpty (JLnet/minecraft/class_5572;)V
ARG 1 packedChunkSection
ARG 3 entities
@ -20,9 +22,9 @@ CLASS net/minecraft/class_5582 net/minecraft/client/world/ClientEntityManager
METHOD method_31875 stopTicking (Lnet/minecraft/class_1923;)V
ARG 1 pos
METHOD method_31879 getDebugString ()Ljava/lang/String;
CLASS class_5583 ClientEntityChangeHandler
CLASS class_5583 ClientEntityTracker
FIELD field_27286 entity Lnet/minecraft/class_5568;
FIELD field_27287 packedChunkSectionPos J
FIELD field_27287 lastSectionPos J
FIELD field_27288 entities Lnet/minecraft/class_5572;
METHOD <init> (Lnet/minecraft/class_5582;Lnet/minecraft/class_5568;JLnet/minecraft/class_5572;)V
ARG 2 entity

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

@ -210,7 +210,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 streamSelfAndPassengers ()Ljava/util/stream/Stream;
METHOD method_24516 isInRange (Lnet/minecraft/class_1297;D)Z
ARG 1 other
ARG 2 radius
@ -259,6 +259,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 streamPassengers ()Ljava/util/stream/Stream;
METHOD method_5621 getMountedHeightOffset ()D
METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V
ARG 1 state

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

@ -2,7 +2,7 @@ CLASS net/minecraft/class_5568 net/minecraft/entity/EntityLike
COMMENT A superinterface of {@link Entity}.
METHOD method_24515 getBlockPos ()Lnet/minecraft/class_2338;
COMMENT The entity's location in the world.
METHOD method_31744 setChangeHandler (Lnet/minecraft/class_5569;)V
METHOD method_31744 setEntityTracker (Lnet/minecraft/class_5569;)V
COMMENT Sets the behavior to execute when an entity's state updates.
COMMENT
COMMENT @see EntityChangeHandler
@ -11,8 +11,7 @@ CLASS net/minecraft/class_5568 net/minecraft/entity/EntityLike
ARG 1 reason
METHOD method_31746 shouldSave ()Z
METHOD method_31747 isPlayer ()Z
METHOD method_31748 postfixPassengerStream ()Ljava/util/stream/Stream;
COMMENT The entity's passengers, recursively with the deepest nested passengers first, followed by this entity.
METHOD method_31748 streamPassengersAndSelf ()Ljava/util/stream/Stream;
METHOD method_5628 getEntityId ()I
COMMENT The entity's transient network ID.
METHOD method_5667 getUuid ()Ljava/util/UUID;

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

@ -11,7 +11,7 @@ CLASS net/minecraft/class_5579 net/minecraft/server/world/ServerEntityManager
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 1 entityClass
ARG 2 entityLoader
ARG 3 entityDataAccess
METHOD method_31809 tick ()V
@ -20,13 +20,15 @@ CLASS net/minecraft/class_5579 net/minecraft/server/world/ServerEntityManager
METHOD method_31811 removeIfEmpty (JLnet/minecraft/class_5572;)V
ARG 1 sectionPos
ARG 3 entities
METHOD method_31812 tryWriteEntityData (JLjava/util/function/Consumer;)Z
METHOD method_31812 tryWriteChunk (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 chunkPos
ARG 3 postWriteCallback
METHOD method_31813 (Lnet/minecraft/class_4456;J)V
ARG 2 pos
METHOD method_31815 updateEntityChunkStatus (Lnet/minecraft/class_1923;Lnet/minecraft/class_3193$class_3194;)V
ARG 1 pos
ARG 2 levelType
@ -46,38 +48,45 @@ CLASS net/minecraft/class_5579 net/minecraft/server/world/ServerEntityManager
METHOD method_31829 writeAll ()V
METHOD method_31830 loadEntityData (J)V
ARG 1 chunkPos
METHOD method_31831 canAddEntity (Lnet/minecraft/class_5568;)Z
METHOD method_31831 addEntityId (Lnet/minecraft/class_5568;)Z
ARG 1 entity
METHOD method_31832 getPreferredChunkStatus (Lnet/minecraft/class_5568;Lnet/minecraft/class_5584;)Lnet/minecraft/class_5584;
METHOD method_31832 getEffectiveStatus (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_31836 writeAllDefinitively ()V
METHOD method_31837 trySaveEntityData (J)Z
METHOD method_31836 flushChunks ()V
METHOD method_31837 tryUnloadChunk (J)Z
COMMENT Attempts to save the chunk, unloading all entities if successful
ARG 1 chunkPos
METHOD method_31838 startTicking (Lnet/minecraft/class_5568;)V
ARG 1 entity
METHOD method_31841 getStore ()Lnet/minecraft/class_5577;
METHOD method_31842 (J)Z
ARG 1 pos
METHOD method_31843 stopTicking (Lnet/minecraft/class_5568;)V
ARG 1 entity
METHOD method_31845 dump ()Ljava/lang/String;
METHOD method_31845 getDebugString ()Ljava/lang/String;
METHOD method_31846 (J)V
ARG 1 pos
METHOD method_31847 startTracking (Lnet/minecraft/class_5568;)V
ARG 1 entity
METHOD method_31849 (J)Z
ARG 1 pos
METHOD method_31850 stopTracking (Lnet/minecraft/class_5568;)V
ARG 1 entity
METHOD method_31851 resetTickingSections ()V
METHOD method_31852 unload (Lnet/minecraft/class_5568;)V
METHOD method_31851 unloadHiddenChunks ()V
METHOD method_31852 unloadEntity (Lnet/minecraft/class_5568;)V
ARG 1 entity
METHOD method_31853 loadAll ()V
METHOD method_31853 loadPendingChunks ()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
ARG 1 entity
CLASS class_5580 ServerEntityChangeHandler
CLASS class_5580 ServerEntityTracker
FIELD field_27272 entity Lnet/minecraft/class_5568;
FIELD field_27273 packedChunkSectionPos J
FIELD field_27273 lastSectionPos 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

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

@ -18,6 +18,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld
FIELD field_25142 enderDragonFight Lnet/minecraft/class_2881;
FIELD field_25143 shouldTickTime Z
FIELD field_25144 END_SPAWN_POS Lnet/minecraft/class_2338;
FIELD field_26932 loadedMobs Ljava/util/Set;
FIELD field_26933 dragonParts Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
FIELD field_26934 entityList Lnet/minecraft/class_5574;
FIELD field_26935 entityManager Lnet/minecraft/class_5579;
@ -182,6 +183,8 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld
METHOD method_29203 tickTime ()V
METHOD method_30630 getSpawnAngle ()F
METHOD method_30736 shouldCreateNewEntityWithPassenger (Lnet/minecraft/class_1297;)Z
METHOD method_31268 getCrashString ()Ljava/lang/String;
METHOD method_31419 getDebugString ()Ljava/lang/String;
METHOD method_31420 (Lnet/minecraft/class_3695;Lnet/minecraft/class_1297;)V
ARG 2 entity
METHOD method_8448 updateSleepingPlayers ()V

6
mappings/net/minecraft/world/chunk/ChunkDataList.mapping
View File

@ -1,9 +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;
FIELD field_27242 backingList Ljava/util/List;
METHOD <init> (Lnet/minecraft/class_1923;Ljava/util/List;)V
ARG 1 pos
ARG 2 data
ARG 2 list
METHOD method_31741 getChunkPos ()Lnet/minecraft/class_1923;
METHOD method_31742 dataStream ()Ljava/util/stream/Stream;
METHOD method_31742 stream ()Ljava/util/stream/Stream;
METHOD method_31743 isEmpty ()Z

1
mappings/net/minecraft/world/chunk/EntityChunkDataAccess.mapping
View File

@ -9,6 +9,7 @@ CLASS net/minecraft/class_5565 net/minecraft/world/chunk/EntityChunkDataAccess
ARG 1 world
ARG 2 chunkFile
ARG 3 dataFixer
ARG 4 dsync
ARG 5 executor
METHOD method_31732 getChunkDataVersion (Lnet/minecraft/class_2487;)I
ARG 0 chunkTag

6
mappings/net/minecraft/world/entity/EntityStore.mapping → mappings/net/minecraft/world/entity/EntityIdMap.mapping
View File

@ -1,16 +1,16 @@
CLASS net/minecraft/class_5577 net/minecraft/world/entity/EntityStore
CLASS net/minecraft/class_5577 net/minecraft/world/entity/EntityIdMap
COMMENT An interface exposing access to stored entities.
METHOD method_31803 entities ()Ljava/lang/Iterable;
METHOD method_31804 getEntityById (I)Lnet/minecraft/class_5568;
ARG 1 id
METHOD method_31805 forEachEntity (Lnet/minecraft/class_5575;Lnet/minecraft/class_238;Ljava/util/function/Consumer;)V
METHOD method_31805 forEachIntersects (Lnet/minecraft/class_5575;Lnet/minecraft/class_238;Ljava/util/function/Consumer;)V
ARG 1 filter
ARG 2 box
ARG 3 action
METHOD method_31806 forEachEntity (Lnet/minecraft/class_5575;Ljava/util/function/Consumer;)V
ARG 1 filter
ARG 2 action
METHOD method_31807 forEachEntity (Lnet/minecraft/class_238;Ljava/util/function/Consumer;)V
METHOD method_31807 forEachIntersects (Lnet/minecraft/class_238;Ljava/util/function/Consumer;)V
ARG 1 box
ARG 2 action
METHOD method_31808 getEntityByUuid (Ljava/util/UUID;)Lnet/minecraft/class_5568;

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

@ -1,5 +1,5 @@
CLASS net/minecraft/class_5578 net/minecraft/world/entity/EntityStoreImpl
COMMENT The implementing class of {@link EntityStore}.
CLASS net/minecraft/class_5578 net/minecraft/world/entity/EntityIdMapSet
COMMENT
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

2
mappings/net/minecraft/world/entity/EntityCollection.mapping → mappings/net/minecraft/world/entity/EntitySet.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_5570 net/minecraft/world/entity/EntityCollection
CLASS net/minecraft/class_5570 net/minecraft/world/entity/EntitySet
COMMENT A collection of entities keyed by network ID and UUID.
FIELD field_27244 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_27245 entitiesById Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;

2
mappings/net/minecraft/world/entity/EntityChangeHandler.mapping → mappings/net/minecraft/world/entity/EntityTracker.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_5569 net/minecraft/world/entity/EntityChangeHandler
CLASS net/minecraft/class_5569 net/minecraft/world/entity/EntityTracker
FIELD field_27243 NO_OP Lnet/minecraft/class_5569;
METHOD method_31749 updateEntityPosition ()V
METHOD method_31750 remove (Lnet/minecraft/class_1297$class_5529;)V

2
mappings/net/minecraft/util/collection/FilterableEntityCollection.mapping → mappings/net/minecraft/world/entity/EntityTrackingGroup.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_5572 net/minecraft/util/collection/FilterableEntityCollection
CLASS net/minecraft/class_5572 net/minecraft/world/entity/EntityTrackingGroup
FIELD field_27247 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_27248 backingList Lnet/minecraft/class_3509;
FIELD field_27249 chunkStatus Lnet/minecraft/class_5584;

26
mappings/net/minecraft/world/entity/SectionedEntityCache.mapping
View File

@ -1,43 +1,45 @@
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 chunkStatusDescriminator Lit/unimi/dsi/fastutil/longs/Long2ObjectFunction;
FIELD field_27252 entitySetsBySection Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;
FIELD field_27253 chunkSectionPositions Lit/unimi/dsi/fastutil/longs/LongSortedSet;
FIELD field_27251 posToStatus Lit/unimi/dsi/fastutil/longs/Long2ObjectFunction;
FIELD field_27252 chunkSections Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;
FIELD field_27253 trackedSections Lit/unimi/dsi/fastutil/longs/LongSortedSet;
METHOD <init> (Ljava/lang/Class;Lit/unimi/dsi/fastutil/longs/Long2ObjectFunction;)V
ARG 1 entityClass
ARG 2 chunkStatusDiscriminator
METHOD method_31770 chunkPositions ()Lit/unimi/dsi/fastutil/longs/LongSet;
METHOD method_31770 getChunkPositions ()Lit/unimi/dsi/fastutil/longs/LongSet;
METHOD method_31771 getSections (II)Lit/unimi/dsi/fastutil/longs/LongSortedSet;
ARG 1 chunkX
ARG 2 chunkZ
METHOD method_31772 getSections (J)Ljava/util/stream/LongStream;
ARG 1 chunkPos
METHOD method_31773 forEachFilteredEntity (Lnet/minecraft/class_5575;Lnet/minecraft/class_238;Ljava/util/function/Consumer;)V
METHOD method_31773 forEachIntersects (Lnet/minecraft/class_5575;Lnet/minecraft/class_238;Ljava/util/function/Consumer;)V
ARG 1 filter
ARG 2 box
ARG 3 action
METHOD method_31775 intersecting (Lnet/minecraft/class_238;)Ljava/util/function/Predicate;
ARG 0 box
METHOD method_31777 forEachEntityBySection (Lnet/minecraft/class_238;Ljava/util/function/Consumer;)V
METHOD method_31777 forEachInBox (Lnet/minecraft/class_238;Ljava/util/function/Consumer;)V
COMMENT Runs the given action on each collection of entities in the chunk sections within the given box.
ARG 1 box
ARG 2 action
METHOD method_31779 toPackedSectionPos (Lnet/minecraft/class_2338;)J
ARG 0 pos
METHOD method_31780 (Lit/unimi/dsi/fastutil/longs/LongSet;J)V
ARG 1 sectionPos
METHOD method_31781 sectionCount ()I
METHOD method_31782 getEntitiesInChunkBySection (J)Ljava/util/stream/Stream;
METHOD method_31782 getGroupsInChunk (J)Ljava/util/stream/Stream;
ARG 1 chunkPos
METHOD method_31783 forEachEntity (Lnet/minecraft/class_238;Ljava/util/function/Consumer;)V
METHOD method_31783 forEachIntersects (Lnet/minecraft/class_238;Ljava/util/function/Consumer;)V
ARG 1 box
ARG 2 action
METHOD method_31784 getEntities (J)Lnet/minecraft/class_5572;
METHOD method_31784 ensureEntityGroup (J)Lnet/minecraft/class_5572;
ARG 1 sectionPos
METHOD method_31785 getEntitiesIfPresent (J)Lnet/minecraft/class_5572;
METHOD method_31785 getEntityGroup (J)Lnet/minecraft/class_5572;
ARG 1 sectionPos
METHOD method_31786 removeChunkSection (J)V
METHOD method_31786 removeSection (J)V
ARG 1 sectionPos
METHOD method_31787 chunkPosFromSectionPos (J)J
ARG 0 sectionPos
METHOD method_31788 addChunkSection (J)Lnet/minecraft/class_5572;
METHOD method_31788 addSection (J)Lnet/minecraft/class_5572;
ARG 1 sectionPos