From 1fd1bad3dc6c0028f8418f4e87fac641f573e81e Mon Sep 17 00:00:00 2001 From: Yanis48 Date: Fri, 17 Jan 2020 20:48:35 +0100 Subject: [PATCH] (Block) entity position fixes (#964, #998, #1046, #1061) (#1051) * fixed things * deserialize2 -> deserialize * (Block) entity position fixes * setPosition -> setPos * fixed #1061 --- mappings/net/minecraft/block/Block.mapping | 2 +- .../net/minecraft/block/entity/BlockEntity.mapping | 3 ++- mappings/net/minecraft/entity/Entity.mapping | 10 +++++----- .../server/integrated/IntegratedServer.mapping | 1 + 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index e24665d176..a7b4fd171e 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -308,7 +308,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 2 view ARG 3 pos METHOD method_9580 getDropTableId ()Lnet/minecraft/class_2960; - METHOD method_9581 canConnect (Lnet/minecraft/class_2248;)Z + METHOD method_9581 cannotConnect (Lnet/minecraft/class_2248;)Z ARG 0 block METHOD method_9582 pushEntitiesUpBeforeBlockChange (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; ARG 0 from diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping index f44ed35146..5670d976df 100644 --- a/mappings/net/minecraft/block/entity/BlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntity.mapping @@ -25,7 +25,8 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity ARG 1 x ARG 3 y ARG 5 z - METHOD method_11009 setWorld (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + METHOD method_11009 setLocation (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 2 pos METHOD method_11010 getCachedState ()Lnet/minecraft/class_2680; METHOD method_11011 shouldNotCopyTagFromItem ()Z METHOD method_11012 markRemoved ()V diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 0e067dab94..26648a711f 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -181,7 +181,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 x ARG 3 y ARG 5 z - METHOD method_23311 updatePosition ()V + METHOD method_23311 refreshPosition ()V METHOD method_23312 getLandingPos ()Lnet/minecraft/class_2338; METHOD method_23313 getJumpVelocityMultiplier ()F METHOD method_23314 getVelocityAffectingPos ()Lnet/minecraft/class_2338; @@ -250,7 +250,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 seconds METHOD method_5640 shouldRender (D)Z ARG 1 distance - METHOD method_5641 setPositionAnglesAndUpdate (DDDFF)V + METHOD method_5641 updatePositionAndAngles (DDDFF)V ARG 1 x ARG 3 y ARG 5 z @@ -397,7 +397,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5724 updateVelocity (FLnet/minecraft/class_243;)V ARG 1 speed ARG 2 movementInput - METHOD method_5725 setPositionAndAngles (Lnet/minecraft/class_2338;FF)V + METHOD method_5725 refreshPositionAndAngles (Lnet/minecraft/class_2338;FF)V ARG 1 pos ARG 2 yaw ARG 3 pitch @@ -541,7 +541,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5805 isAlive ()Z METHOD method_5806 getDefaultNetherPortalCooldown ()I METHOD method_5807 isCustomNameVisible ()Z - METHOD method_5808 setPositionAndAngles (DDDFF)V + METHOD method_5808 refreshPositionAndAngles (DDDFF)V ARG 1 x ARG 3 y ARG 5 z @@ -550,7 +550,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5809 isOnFire ()Z METHOD method_5810 isPushable ()Z METHOD method_5812 getPosVector ()Lnet/minecraft/class_243; - METHOD method_5814 setPosition (DDD)V + METHOD method_5814 updatePosition (DDD)V ARG 1 x ARG 3 y ARG 5 z diff --git a/mappings/net/minecraft/server/integrated/IntegratedServer.mapping b/mappings/net/minecraft/server/integrated/IntegratedServer.mapping index 2f928e9569..72c3264379 100644 --- a/mappings/net/minecraft/server/integrated/IntegratedServer.mapping +++ b/mappings/net/minecraft/server/integrated/IntegratedServer.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_1132 net/minecraft/server/integrated/IntegratedServer FIELD field_5521 localPlayerUuid Ljava/util/UUID; FIELD field_5522 lanPort I FIELD field_5523 levelInfo Lnet/minecraft/class_1940; + FIELD field_5524 paused Z METHOD (Lnet/minecraft/class_310;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_1940;Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Lnet/minecraft/class_3950;)V ARG 1 client ARG 2 levelName