From b44b26d4352a101586e6e49d49fc4cd503f877ef Mon Sep 17 00:00:00 2001 From: LambdAurora Date: Thu, 5 Nov 2020 10:41:29 +0100 Subject: [PATCH] Add entity mappings (#1829) * Add entity mappings * Add javadoc to dismountVehicle. --- mappings/net/minecraft/class_5568.mapping | 3 ++ .../entity/PiglinEntityRenderer.mapping | 5 +++ .../entity/model/EntityModelLayer.mapping | 8 ++++ mappings/net/minecraft/entity/Entity.mapping | 41 +++++++++++++++++++ 4 files changed, 57 insertions(+) create mode 100644 mappings/net/minecraft/client/render/entity/model/EntityModelLayer.mapping diff --git a/mappings/net/minecraft/class_5568.mapping b/mappings/net/minecraft/class_5568.mapping index dcad96144c..516a120cdd 100644 --- a/mappings/net/minecraft/class_5568.mapping +++ b/mappings/net/minecraft/class_5568.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_5568 METHOD method_24515 getBlockPos ()Lnet/minecraft/class_2338; + METHOD method_31745 setRemoved (Lnet/minecraft/class_1297$class_5529;)V + ARG 1 reason + METHOD method_31747 isPlayer ()Z METHOD method_5628 getEntityId ()I METHOD method_5667 getUuid ()Ljava/util/UUID; METHOD method_5829 getBoundingBox ()Lnet/minecraft/class_238; diff --git a/mappings/net/minecraft/client/render/entity/PiglinEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/PiglinEntityRenderer.mapping index b58409e526..e531da72fc 100644 --- a/mappings/net/minecraft/client/render/entity/PiglinEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/PiglinEntityRenderer.mapping @@ -1,2 +1,7 @@ CLASS net/minecraft/class_4842 net/minecraft/client/render/entity/PiglinEntityRenderer + FIELD field_25793 TEXTURES Ljava/util/Map; + METHOD (Lnet/minecraft/class_5617$class_5618;Lnet/minecraft/class_5601;Lnet/minecraft/class_5601;Lnet/minecraft/class_5601;Z)V + ARG 2 mainLayer + ARG 3 innerArmorLayer + ARG 4 outerArmorLayer METHOD method_24875 getPiglinModel (Lnet/minecraft/class_5599;Lnet/minecraft/class_5601;Z)Lnet/minecraft/class_4840; diff --git a/mappings/net/minecraft/client/render/entity/model/EntityModelLayer.mapping b/mappings/net/minecraft/client/render/entity/model/EntityModelLayer.mapping new file mode 100644 index 0000000000..67793e78b8 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/EntityModelLayer.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_5601 net/minecraft/client/render/entity/model/EntityModelLayer + FIELD field_27546 identifier Lnet/minecraft/class_2960; + FIELD field_27547 layer Ljava/lang/String; + METHOD (Lnet/minecraft/class_2960;Ljava/lang/String;)V + ARG 1 identifier + ARG 2 layer + METHOD equals (Ljava/lang/Object;)Z + ARG 1 other diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index eae9b9dc4e..51b1ff3205 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_22468 blockPos Lnet/minecraft/class_2338; FIELD field_23807 inanimate Z FIELD field_25750 trackedPosition Lnet/minecraft/class_243; + FIELD field_26995 removalReason Lnet/minecraft/class_1297$class_5529; FIELD field_5951 ridingCooldown I FIELD field_5952 onGround Z FIELD field_5953 firstUpdate Z @@ -221,6 +222,12 @@ 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_29239 dismountVehicle ()V + COMMENT Dismounts the vehicle if present. + COMMENT

+ COMMENT For players, will not trigger any networking changes. Use {@link #stopRiding()} instead. + COMMENT + COMMENT @see #stopRiding() METHOD method_29495 refreshPositionAfterTeleport (Lnet/minecraft/class_243;)V METHOD method_30227 getTrackedPosition ()Lnet/minecraft/class_243; METHOD method_30228 updateTrackedPosition (Lnet/minecraft/class_243;)V @@ -238,6 +245,16 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 other METHOD method_31166 (F)Lnet/minecraft/class_243; ARG 1 tickDelta + METHOD method_31471 (Lnet/minecraft/class_2604;)V + ARG 1 packet + METHOD method_31472 discard ()V + METHOD method_31476 getChunkPos ()Lnet/minecraft/class_1923; + METHOD method_31477 getBlockX ()I + METHOD method_31478 getBlockY ()I + METHOD method_31479 getBlockZ ()I + METHOD method_31481 isRemoved ()Z + METHOD method_31482 unsetRemoved ()V + METHOD method_31483 getFirstPassenger ()Lnet/minecraft/class_1297; METHOD method_5621 getMountedHeightOffset ()D METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V ARG 1 state @@ -300,6 +317,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 3 y ARG 5 z METHOD method_5650 remove (Lnet/minecraft/class_1297$class_5529;)V + ARG 1 reason METHOD method_5651 fromTag (Lnet/minecraft/class_2487;)V ARG 1 tag METHOD method_5652 writeCustomDataToTag (Lnet/minecraft/class_2487;)V @@ -541,6 +559,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5791 getHeadYaw ()F METHOD method_5792 moveToBoundingBoxCenter ()V METHOD method_5793 removePassenger (Lnet/minecraft/class_1297;)V + ARG 1 passenger METHOD method_5794 isConnectedThroughVehicle (Lnet/minecraft/class_1297;)Z COMMENT Checks if this entity and another entity share the same root vehicle. ARG 1 entity @@ -684,3 +703,25 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 2 x ARG 4 y ARG 6 z + CLASS class_5529 RemovalReason + FIELD field_26998 KILLED Lnet/minecraft/class_1297$class_5529; + COMMENT The entity is killed. + FIELD field_26999 DISCARDED Lnet/minecraft/class_1297$class_5529; + FIELD field_27000 UNLOADED_TO_CHUNK Lnet/minecraft/class_1297$class_5529; + COMMENT The entity is unloaded to chunk. + COMMENT

+ COMMENT The entity should be saved. + FIELD field_27001 UNLOADED_WITH_PLAYER Lnet/minecraft/class_1297$class_5529; + FIELD field_27002 CHANGED_DIMENSION Lnet/minecraft/class_1297$class_5529; + COMMENT The entity changed dimension. + FIELD field_27003 destroy Z + FIELD field_27004 save Z + METHOD (Ljava/lang/String;IZZ)V + ARG 3 destroy + ARG 4 save + METHOD method_31486 shouldDestroy ()Z + COMMENT Returns whether the entity should be destroyed or not. + COMMENT

+ COMMENT If an entity should be destroyed, then the entity should not be re-used and any external data on the entity will be cleared. + METHOD method_31487 shouldSave ()Z + COMMENT Returns whether the entity should be saved or not.