From 4726d6317f949bbeb4f5df68d77b443bc00c8541 Mon Sep 17 00:00:00 2001 From: kb1000 Date: Mon, 10 Jun 2024 02:52:33 +0200 Subject: [PATCH] Rename id in entity-related packets to entityId --- .../packet/s2c/play/EntityAnimationS2CPacket.mapping | 4 ++-- .../packet/s2c/play/EntityEquipmentUpdateS2CPacket.mapping | 6 +++--- .../packet/s2c/play/EntityPassengersSetS2CPacket.mapping | 4 ++-- .../network/packet/s2c/play/EntityPositionS2CPacket.mapping | 4 ++-- .../packet/s2c/play/EntitySetHeadYawS2CPacket.mapping | 2 +- .../network/packet/s2c/play/EntitySpawnS2CPacket.mapping | 6 +++--- .../network/packet/s2c/play/EntityStatusS2CPacket.mapping | 2 +- .../packet/s2c/play/EntityVelocityUpdateS2CPacket.mapping | 6 +++--- .../packet/s2c/play/ExperienceOrbSpawnS2CPacket.mapping | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket.mapping index 5a638477d4..3053fc3e83 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_2616 net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket FIELD field_12028 animationId I - FIELD field_12029 id I + FIELD field_12029 entityId I FIELD field_33295 SWING_MAIN_HAND I FIELD field_33297 WAKE_UP I FIELD field_33298 SWING_OFF_HAND I @@ -13,6 +13,6 @@ CLASS net/minecraft/class_2616 net/minecraft/network/packet/s2c/play/EntityAnima METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_11267 getAnimationId ()I - METHOD method_11269 getId ()I + METHOD method_11269 getEntityId ()I METHOD method_55857 write (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket.mapping index 0cbb178a49..35c7ad7580 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket.mapping @@ -1,13 +1,13 @@ CLASS net/minecraft/class_2744 net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket - FIELD field_12565 id I + FIELD field_12565 entityId I FIELD field_25721 equipmentList Ljava/util/List; FIELD field_47982 CODEC Lnet/minecraft/class_9139; METHOD (ILjava/util/List;)V - ARG 1 id + ARG 1 entityId ARG 2 equipmentList METHOD (Lnet/minecraft/class_9129;)V ARG 1 buf - METHOD method_11820 getId ()I + METHOD method_11820 getEntityId ()I METHOD method_30145 getEquipmentList ()Ljava/util/List; METHOD method_55929 write (Lnet/minecraft/class_9129;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityPassengersSetS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityPassengersSetS2CPacket.mapping index 424a0783ff..2b67a20d1f 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityPassengersSetS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityPassengersSetS2CPacket.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/class_2752 net/minecraft/network/packet/s2c/play/EntityPassengersSetS2CPacket FIELD field_12593 passengerIds [I - FIELD field_12594 id I + FIELD field_12594 entityId I FIELD field_47986 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_11840 getPassengerIds ()[I - METHOD method_11841 getId ()I + METHOD method_11841 getEntityId ()I METHOD method_55933 write (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityPositionS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityPositionS2CPacket.mapping index c5f20e3890..050a792dab 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityPositionS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityPositionS2CPacket.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_2777 net/minecraft/network/packet/s2c/play/EntityPosit FIELD field_12702 y D FIELD field_12703 x D FIELD field_12704 onGround Z - FIELD field_12705 id I + FIELD field_12705 entityId I FIELD field_12706 pitch B FIELD field_12707 yaw B FIELD field_48004 CODEC Lnet/minecraft/class_9139; @@ -11,7 +11,7 @@ CLASS net/minecraft/class_2777 net/minecraft/network/packet/s2c/play/EntityPosit ARG 1 entity METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_11916 getId ()I + METHOD method_11916 getEntityId ()I METHOD method_11917 getX ()D METHOD method_11918 getZ ()D METHOD method_11919 getY ()D diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntitySetHeadYawS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntitySetHeadYawS2CPacket.mapping index d9557197f1..becdc7ee02 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntitySetHeadYawS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntitySetHeadYawS2CPacket.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_2726 net/minecraft/network/packet/s2c/play/EntitySetHeadYawS2CPacket FIELD field_12436 headYaw B - FIELD field_12437 entity I + FIELD field_12437 entityId I FIELD field_47963 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1297;B)V ARG 1 entity diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping index 8cfc936ef8..3eab8bec2c 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_2604 net/minecraft/network/packet/s2c/play/EntitySpawn FIELD field_11950 velocityY I FIELD field_11951 velocityX I FIELD field_11952 uuid Ljava/util/UUID; - FIELD field_11953 id I + FIELD field_11953 entityId I FIELD field_11954 entityData I FIELD field_11955 entityType Lnet/minecraft/class_1299; FIELD field_11956 z D @@ -18,7 +18,7 @@ CLASS net/minecraft/class_2604 net/minecraft/network/packet/s2c/play/EntitySpawn FIELD field_38817 headYaw B FIELD field_47896 CODEC Lnet/minecraft/class_9139; METHOD (ILjava/util/UUID;DDDFFLnet/minecraft/class_1299;ILnet/minecraft/class_243;D)V - ARG 1 id + ARG 1 entityId ARG 2 uuid ARG 3 x ARG 5 y @@ -44,7 +44,7 @@ CLASS net/minecraft/class_2604 net/minecraft/network/packet/s2c/play/EntitySpawn ARG 1 buf METHOD method_11164 getUuid ()Ljava/util/UUID; METHOD method_11166 getEntityData ()I - METHOD method_11167 getId ()I + METHOD method_11167 getEntityId ()I METHOD method_11168 getYaw ()F METHOD method_11169 getEntityType ()Lnet/minecraft/class_1299; METHOD method_11170 getVelocityX ()D diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusS2CPacket.mapping index 2f077708a0..b757c06ac2 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusS2CPacket.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_2663 net/minecraft/network/packet/s2c/play/EntityStatusS2CPacket FIELD field_12174 status B - FIELD field_12175 id I + FIELD field_12175 entityId I FIELD field_47924 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1297;B)V ARG 1 entity diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityVelocityUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityVelocityUpdateS2CPacket.mapping index 89965c7c57..b61daa300d 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityVelocityUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityVelocityUpdateS2CPacket.mapping @@ -7,10 +7,10 @@ CLASS net/minecraft/class_2743 net/minecraft/network/packet/s2c/play/EntityVeloc FIELD field_12561 velocityZ I FIELD field_12562 velocityY I FIELD field_12563 velocityX I - FIELD field_12564 id I + FIELD field_12564 entityId I FIELD field_47981 CODEC Lnet/minecraft/class_9139; METHOD (ILnet/minecraft/class_243;)V - ARG 1 id + ARG 1 entityId ARG 2 velocity METHOD (Lnet/minecraft/class_1297;)V ARG 1 entity @@ -18,7 +18,7 @@ CLASS net/minecraft/class_2743 net/minecraft/network/packet/s2c/play/EntityVeloc ARG 1 buf METHOD method_11815 getVelocityX ()D METHOD method_11816 getVelocityY ()D - METHOD method_11818 getId ()I + METHOD method_11818 getEntityId ()I METHOD method_11819 getVelocityZ ()D METHOD method_55928 write (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/ExperienceOrbSpawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ExperienceOrbSpawnS2CPacket.mapping index 18a76d5e52..9c6ca282c4 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ExperienceOrbSpawnS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ExperienceOrbSpawnS2CPacket.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_2606 net/minecraft/network/packet/s2c/play/ExperienceO FIELD field_11971 y D FIELD field_11972 x D FIELD field_11973 experience I - FIELD field_11974 id I + FIELD field_11974 entityId I FIELD field_47897 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1303;Lnet/minecraft/class_3231;)V ARG 1 orb @@ -12,7 +12,7 @@ CLASS net/minecraft/class_2606 net/minecraft/network/packet/s2c/play/ExperienceO ARG 1 buf METHOD method_11180 getZ ()D METHOD method_11181 getY ()D - METHOD method_11183 getId ()I + METHOD method_11183 getEntityId ()I METHOD method_11184 getExperience ()I METHOD method_11185 getX ()D METHOD method_55856 write (Lnet/minecraft/class_2540;)V