From d74d922b0b01cff8291fe6f1fa4199bad1b51c87 Mon Sep 17 00:00:00 2001 From: Thalia Nero Date: Sat, 7 Nov 2020 15:28:32 -0500 Subject: [PATCH] Update mappings from review. --- .../client/world/ClientEntityManager.mapping | 2 +- .../server/world/ServerEntityManager.mapping | 18 +++++----- .../net/minecraft/util/TypeFilter.mapping | 2 +- ...ing => FilterableEntityCollection.mapping} | 2 +- .../world/entity/SectionedEntityCache.mapping | 34 +++++++++---------- 5 files changed, 29 insertions(+), 29 deletions(-) rename mappings/net/minecraft/util/collection/{FilterableCollection.mapping => FilterableEntityCollection.mapping} (97%) diff --git a/mappings/net/minecraft/client/world/ClientEntityManager.mapping b/mappings/net/minecraft/client/world/ClientEntityManager.mapping index 521eecdb6b..2c6758b060 100644 --- a/mappings/net/minecraft/client/world/ClientEntityManager.mapping +++ b/mappings/net/minecraft/client/world/ClientEntityManager.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_5582 net/minecraft/client/world/ClientEntityManager FIELD field_27283 tickingChunkSections Lit/unimi/dsi/fastutil/longs/LongSet; FIELD field_27284 entityStore Lnet/minecraft/class_5577; METHOD (Ljava/lang/Class;Lnet/minecraft/class_5576;)V - ARG 1 entityBaseClass + ARG 1 entityClass ARG 2 entityLoader METHOD method_31866 getStore ()Lnet/minecraft/class_5577; METHOD method_31868 removeIfEmpty (JLnet/minecraft/class_5572;)V diff --git a/mappings/net/minecraft/server/world/ServerEntityManager.mapping b/mappings/net/minecraft/server/world/ServerEntityManager.mapping index ed962c9be9..a56fbeedcb 100644 --- a/mappings/net/minecraft/server/world/ServerEntityManager.mapping +++ b/mappings/net/minecraft/server/world/ServerEntityManager.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_5579 net/minecraft/server/world/ServerEntityManager 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_27268 loadingStagesByChunk Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; FIELD field_27269 tickingChunkSections Lit/unimi/dsi/fastutil/longs/LongSet; FIELD field_27270 loadingQueue Ljava/util/Queue; METHOD (Ljava/lang/Class;Lnet/minecraft/class_5576;Lnet/minecraft/class_5571;)V @@ -18,16 +18,16 @@ CLASS net/minecraft/class_5579 net/minecraft/server/world/ServerEntityManager METHOD method_31810 ensureEntityChunkDataLoaded (J)V ARG 1 chunkPos METHOD method_31811 removeIfEmpty (JLnet/minecraft/class_5572;)V - ARG 1 packedChunkSection + ARG 1 sectionPos ARG 3 entities - METHOD method_31812 tryWriteEntityChunkData (JLjava/util/function/Consumer;)Z + METHOD method_31812 tryWriteEntityData (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 1 chunkPos ARG 3 postWriteCallback - METHOD method_31815 updateEntityCuunkStatus (Lnet/minecraft/class_1923;Lnet/minecraft/class_3193$class_3194;)V + METHOD method_31815 updateEntityChunkStatus (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 @@ -44,8 +44,8 @@ CLASS net/minecraft/class_5579 net/minecraft/server/world/ServerEntityManager 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_31830 loadEntityData (J)V + ARG 1 chunkPos 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; @@ -54,8 +54,8 @@ CLASS net/minecraft/class_5579 net/minecraft/server/world/ServerEntityManager METHOD method_31835 addEntitiesWithFlagCleared (Ljava/util/stream/Stream;)V ARG 1 entities METHOD method_31836 writeAllDefinitively ()V - METHOD method_31837 tryUnloadChunkData (J)Z - ARG 1 packedChunkPos + METHOD method_31837 trySaveEntityData (J)Z + ARG 1 chunkPos METHOD method_31838 startTicking (Lnet/minecraft/class_5568;)V ARG 1 entity METHOD method_31841 getStore ()Lnet/minecraft/class_5577; diff --git a/mappings/net/minecraft/util/TypeFilter.mapping b/mappings/net/minecraft/util/TypeFilter.mapping index 451058a289..9f58d0b5dd 100644 --- a/mappings/net/minecraft/util/TypeFilter.mapping +++ b/mappings/net/minecraft/util/TypeFilter.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_5575 net/minecraft/util/TypeFilter COMMENT A filter determines if an object of some supertype {@code B} can be treated as an object COMMENT of some subtype {@code T}. METHOD method_31794 getBaseClass ()Ljava/lang/Class; - METHOD method_31795 forClass (Ljava/lang/Class;)Lnet/minecraft/class_5575; + METHOD method_31795 instanceOf (Ljava/lang/Class;)Lnet/minecraft/class_5575; COMMENT Creates a filter whose filtering condition is whether the object is an instance of the given class. ARG 0 cls METHOD method_31796 downcast (Ljava/lang/Object;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/util/collection/FilterableCollection.mapping b/mappings/net/minecraft/util/collection/FilterableEntityCollection.mapping similarity index 97% rename from mappings/net/minecraft/util/collection/FilterableCollection.mapping rename to mappings/net/minecraft/util/collection/FilterableEntityCollection.mapping index e35f21b879..18e70a9ef4 100644 --- a/mappings/net/minecraft/util/collection/FilterableCollection.mapping +++ b/mappings/net/minecraft/util/collection/FilterableEntityCollection.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5572 net/minecraft/util/collection/FilterableCollection +CLASS net/minecraft/class_5572 net/minecraft/util/collection/FilterableEntityCollection 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; diff --git a/mappings/net/minecraft/world/entity/SectionedEntityCache.mapping b/mappings/net/minecraft/world/entity/SectionedEntityCache.mapping index ab68d6ca03..fc1d1de00b 100644 --- a/mappings/net/minecraft/world/entity/SectionedEntityCache.mapping +++ b/mappings/net/minecraft/world/entity/SectionedEntityCache.mapping @@ -1,43 +1,43 @@ 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; - FIELD field_27252 entitySetsByChunkSection Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; - FIELD field_27253 packedChunkSectionPositions Lit/unimi/dsi/fastutil/longs/LongSortedSet; + 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; METHOD (Ljava/lang/Class;Lit/unimi/dsi/fastutil/longs/Long2ObjectFunction;)V ARG 1 entityClass - ARG 2 managementCategoryDiscriminator + ARG 2 chunkStatusDiscriminator METHOD method_31770 chunkPositions ()Lit/unimi/dsi/fastutil/longs/LongSet; - METHOD method_31771 getChunkSections (II)Lit/unimi/dsi/fastutil/longs/LongSortedSet; + METHOD method_31771 getSections (II)Lit/unimi/dsi/fastutil/longs/LongSortedSet; ARG 1 chunkX ARG 2 chunkZ - METHOD method_31772 getChunkSections (J)Ljava/util/stream/LongStream; - ARG 1 packedChunkPos + 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 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 forEachEntityByChunkSection (Lnet/minecraft/class_238;Ljava/util/function/Consumer;)V + METHOD method_31777 forEachEntityBySection (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 toPackedChunkSectionPos (Lnet/minecraft/class_2338;)J + METHOD method_31779 toPackedSectionPos (Lnet/minecraft/class_2338;)J ARG 0 pos - METHOD method_31781 chunkSectionCount ()I + METHOD method_31781 sectionCount ()I METHOD method_31782 getEntitiesInChunkBySection (J)Ljava/util/stream/Stream; - ARG 1 packedChunkPos + ARG 1 chunkPos METHOD method_31783 forEachEntity (Lnet/minecraft/class_238;Ljava/util/function/Consumer;)V ARG 1 box ARG 2 action METHOD method_31784 getEntities (J)Lnet/minecraft/class_5572; - ARG 1 packedChunkSectionPos + ARG 1 sectionPos METHOD method_31785 getEntitiesIfPresent (J)Lnet/minecraft/class_5572; - ARG 1 packedChunkSectionPos + ARG 1 sectionPos METHOD method_31786 removeChunkSection (J)V - ARG 1 packedChunkSectionPos - METHOD method_31787 packedChunkPosFromChunkSectionPos (J)J - ARG 0 packedChunkSectionPos + ARG 1 sectionPos + METHOD method_31787 chunkPosFromSectionPos (J)J + ARG 0 sectionPos METHOD method_31788 addChunkSection (J)Lnet/minecraft/class_5572; - ARG 1 packedChunkSectionPos + ARG 1 sectionPos