From 73f3f96ff971e2ef26704ad4a81476ca3513175d Mon Sep 17 00:00:00 2001 From: i509VCB Date: Fri, 10 Jul 2020 13:00:14 +0100 Subject: [PATCH] Actually describe vague "checkChunk" methods. (#1548) * Actually describe vague "checkChunk" methods. These are quite vague, and the profiler call is all we really have to go off of. From looking around the codebase, these methods validate the entity's chunkX/Y/Z positions are correct. If the entity's last and current chunk pos are not the same, move the entity to it's new chunk (which also changes the chunkX/Y/Z values to the correct ones). Oh and some synthetic method params while I was at it. * Update mappings/net/minecraft/server/world/ServerWorld.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Update mappings/net/minecraft/entity/Entity.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Update mappings/net/minecraft/client/world/ClientWorld.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Update mappings/net/minecraft/server/world/ServerWorld.mapping Co-authored-by: Yanis48 * Update mappings/net/minecraft/client/world/ClientWorld.mapping Co-authored-by: Yanis48 * match method name Co-authored-by: liach <7806504+liach@users.noreply.github.com> Co-authored-by: Yanis48 --- .../net/minecraft/client/world/ClientWorld.mapping | 3 ++- mappings/net/minecraft/entity/Entity.mapping | 2 ++ .../net/minecraft/server/world/ServerWorld.mapping | 10 +++++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index c32dda087c..7bc0b5e94b 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -35,7 +35,8 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld METHOD method_18647 tickPassenger (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)V ARG 1 entity ARG 2 passenger - METHOD method_18648 checkChunk (Lnet/minecraft/class_1297;)V + METHOD method_18648 checkEntityChunkPos (Lnet/minecraft/class_1297;)V + COMMENT Validates if an entity's current position matches its chunk position. If the entity's chunk position and actual position don't match, then the entity will be moved to its new chunk. ARG 1 entity METHOD method_23780 calculateColor (Lnet/minecraft/class_2338;Lnet/minecraft/world/level/ColorResolver;)I ARG 1 pos diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 4aa652f2e6..3e2b8763be 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_22467 pos Lnet/minecraft/class_243; FIELD field_22468 blockPos Lnet/minecraft/class_2338; FIELD field_23807 inanimate Z + FIELD field_25154 chunkPosUpdateRequested Z FIELD field_5951 ridingCooldown I FIELD field_5952 onGround Z FIELD field_5953 firstUpdate Z @@ -227,6 +228,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 onGround METHOD method_25936 getLandingBlockState ()Lnet/minecraft/class_2680; METHOD method_27298 shouldSpawnSprintingParticles ()Z + METHOD method_29240 isChunkPosUpdateRequested ()Z METHOD method_30329 getTeleportTarget (Lnet/minecraft/class_3218;)Lnet/minecraft/class_5454; ARG 1 destination METHOD method_30333 getTeleportationScale (Lnet/minecraft/class_2874;Lnet/minecraft/class_2874;)D diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index 4f21a3db2a..cb32289b3d 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -84,6 +84,8 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 2 z ARG 3 forced METHOD method_18198 getEntities (Lnet/minecraft/class_1299;Ljava/util/function/Predicate;)Ljava/util/List; + METHOD method_18199 (Lnet/minecraft/class_1309;)Z + ARG 1 entity METHOD method_18203 tickChunk (Lnet/minecraft/class_2818;I)V ARG 1 chunk ARG 2 randomTickSpeed @@ -110,7 +112,9 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 1 shouldKeepTicking METHOD method_18766 getPlayers (Ljava/util/function/Predicate;)Ljava/util/List; ARG 1 predicate - METHOD method_18767 checkChunk (Lnet/minecraft/class_1297;)V + METHOD method_18767 checkEntityChunkPos (Lnet/minecraft/class_1297;)V + COMMENT Validates if an entity's current position matches its chunk position. If the entity's chunk position and actual position don't match, then the entity will be moved to its new chunk. + ARG 1 entity METHOD method_18768 tryLoadEntity (Lnet/minecraft/class_1297;)Z ARG 1 entity METHOD method_18769 onDimensionChanged (Lnet/minecraft/class_1297;)V @@ -121,8 +125,12 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 1 player METHOD method_18772 unloadEntity (Lnet/minecraft/class_1297;)V ARG 1 entity + METHOD method_18773 (Lnet/minecraft/class_3222;)V + ARG 0 player METHOD method_18774 removeEntity (Lnet/minecraft/class_1297;)V ARG 1 entity + METHOD method_18775 (Lnet/minecraft/class_3222;)Z + ARG 0 player METHOD method_18776 getAliveEnderDragons ()Ljava/util/List; METHOD method_18777 checkUuid (Lnet/minecraft/class_1297;)Z ARG 1 entity