From a4d9672e0263bd7a94ba3e59356232d7240d4bb9 Mon Sep 17 00:00:00 2001 From: Pyrofab Date: Tue, 23 Apr 2019 15:47:15 +0200 Subject: [PATCH] Made a few needed changes based on open issues (#645) * Rename LivingEntity#attack, fixes #482 * Rename ItemCooldownManager#isCooldown, fixes #488 * Rename StringItem, fixes #525 * Rename *riddenEntity to *vehicle, closes #589 * Rename PlayerMoveServerMessage, closes #623 * Disambiguate Rotation, fixes #630 * Distinguish rotation classes more * Revert to BlockRotation --- mappings/net/minecraft/entity/Entity.mapping | 6 +++--- mappings/net/minecraft/entity/LivingEntity.mapping | 4 ++-- .../net/minecraft/entity/player/ItemCooldownManager.mapping | 2 +- mappings/net/minecraft/item/AliasedBlockItem.mapping | 1 + mappings/net/minecraft/item/StringItem.mapping | 1 - ...oveServerMessage.mapping => PlayerMoveC2SPacket.mapping} | 3 ++- .../minecraft/util/{Mirror.mapping => BlockMirror.mapping} | 5 ++++- .../util/{Rotation.mapping => BlockRotation.mapping} | 5 ++++- .../util/math/{Rotation.mapping => EulerRotation.mapping} | 5 ++++- 9 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 mappings/net/minecraft/item/AliasedBlockItem.mapping delete mode 100644 mappings/net/minecraft/item/StringItem.mapping rename mappings/net/minecraft/server/network/packet/{PlayerMoveServerMessage.mapping => PlayerMoveC2SPacket.mapping} (85%) rename mappings/net/minecraft/util/{Mirror.mapping => BlockMirror.mapping} (57%) rename mappings/net/minecraft/util/{Rotation.mapping => BlockRotation.mapping} (76%) rename mappings/net/minecraft/util/math/{Rotation.mapping => EulerRotation.mapping} (68%) diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index cb0e6cc94b..f710e5fae7 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -39,7 +39,7 @@ CLASS aif net/minecraft/entity/Entity FIELD ap uuidString Ljava/lang/String; FIELD aq glowing Z FIELD ar passengerList Ljava/util/List; - FIELD as riddenEntity Laif; + FIELD as vehicle Laif; FIELD at velocity Lcrv; FIELD au boundingBox Lcrq; FIELD ax fireTime I @@ -288,7 +288,7 @@ CLASS aif net/minecraft/entity/Entity METHOD bU getPrimaryPassenger ()Laif; METHOD bV getPassengerList ()Ljava/util/List; METHOD bW getPassengersDeep ()Ljava/util/Collection; - METHOD bY getTopmostRiddenEntity ()Laif; + METHOD bY getTopmostVehicle ()Laif; METHOD bZ isLogicalSideForUpdatingMovement ()Z METHOD ba getItemsEquipped ()Ljava/lang/Iterable; METHOD bb isOnFire ()Z @@ -327,7 +327,7 @@ CLASS aif net/minecraft/entity/Entity METHOD c saveSelfToTag (Lib;)Z METHOD c onStoppedTrackingBy (Lvh;)V METHOD c setSilent (Z)V - METHOD ca getRiddenEntity ()Laif; + METHOD ca getVehicle ()Laif; METHOD cb getSoundCategory ()Lyl; METHOD cd getCommandSource ()Lcd; METHOD ce getWaterHeight ()D diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 4ce91d05e8..c7918dbd88 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -47,7 +47,7 @@ CLASS aio net/minecraft/entity/LivingEntity ARG 1 type METHOD A getAttackDistanceScalingFactor (Laif;)D METHOD C updatePotionVisibility ()V - METHOD C attack (Laif;)Z + METHOD C tryAttack (Laif;)Z METHOD D pushAway (Laif;)V METHOD E canSee (Laif;)Z METHOD a teleport (DDDZ)Z @@ -215,7 +215,7 @@ CLASS aio net/minecraft/entity/LivingEntity METHOD f getArrowType (Lbca;)Lbca; METHOD g playEquipmentBreakEffects (Lbca;)V ARG 1 item - METHOD k updateMovement ()V + METHOD k updateState ()V METHOD k getNextBreathInWater (I)I ARG 1 breath METHOD l getHandSwingDuration ()I diff --git a/mappings/net/minecraft/entity/player/ItemCooldownManager.mapping b/mappings/net/minecraft/entity/player/ItemCooldownManager.mapping index 0fa3cba09a..f72664629c 100644 --- a/mappings/net/minecraft/entity/player/ItemCooldownManager.mapping +++ b/mappings/net/minecraft/entity/player/ItemCooldownManager.mapping @@ -8,7 +8,7 @@ CLASS bbw net/minecraft/entity/player/ItemCooldownManager FIELD a entries Ljava/util/Map; FIELD b tick I METHOD a update ()V - METHOD a isCooldown (Lbbv;)Z + METHOD a isCoolingDown (Lbbv;)Z METHOD a getCooldownProgress (Lbbv;F)F ARG 2 partialTicks METHOD a set (Lbbv;I)V diff --git a/mappings/net/minecraft/item/AliasedBlockItem.mapping b/mappings/net/minecraft/item/AliasedBlockItem.mapping new file mode 100644 index 0000000000..07962781d6 --- /dev/null +++ b/mappings/net/minecraft/item/AliasedBlockItem.mapping @@ -0,0 +1 @@ +CLASS bby net/minecraft/item/AliasedBlockItem diff --git a/mappings/net/minecraft/item/StringItem.mapping b/mappings/net/minecraft/item/StringItem.mapping deleted file mode 100644 index fe286cf24e..0000000000 --- a/mappings/net/minecraft/item/StringItem.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS bby net/minecraft/item/StringItem diff --git a/mappings/net/minecraft/server/network/packet/PlayerMoveServerMessage.mapping b/mappings/net/minecraft/server/network/packet/PlayerMoveC2SPacket.mapping similarity index 85% rename from mappings/net/minecraft/server/network/packet/PlayerMoveServerMessage.mapping rename to mappings/net/minecraft/server/network/packet/PlayerMoveC2SPacket.mapping index acf796d9fb..ddce57adfa 100644 --- a/mappings/net/minecraft/server/network/packet/PlayerMoveServerMessage.mapping +++ b/mappings/net/minecraft/server/network/packet/PlayerMoveC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS oj net/minecraft/server/network/packet/PlayerMoveServerMessage +CLASS oj net/minecraft/server/network/packet/PlayerMoveC2SPacket CLASS oj$a PositionOnly METHOD (DDDZ)V ARG 1 x @@ -21,6 +21,7 @@ CLASS oj net/minecraft/server/network/packet/PlayerMoveServerMessage ARG 1 currentX METHOD a getYaw (F)F ARG 1 currentYaw + METHOD a apply (Lnr;)V METHOD b isOnGround ()Z METHOD b getY (D)D ARG 1 currentY diff --git a/mappings/net/minecraft/util/Mirror.mapping b/mappings/net/minecraft/util/BlockMirror.mapping similarity index 57% rename from mappings/net/minecraft/util/Mirror.mapping rename to mappings/net/minecraft/util/BlockMirror.mapping index 4a10d9a39a..3ba8c1027a 100644 --- a/mappings/net/minecraft/util/Mirror.mapping +++ b/mappings/net/minecraft/util/BlockMirror.mapping @@ -1,6 +1,9 @@ -CLASS bpw net/minecraft/util/Mirror +CLASS bpw net/minecraft/util/BlockMirror FIELD a NONE Lbpw; FIELD b LEFT_RIGHT Lbpw; FIELD c FRONT_BACK Lbpw; + METHOD a mirror (II)I + ARG 1 rotation + ARG 2 fullTurn METHOD a getRotation (Lfa;)Lbqw; METHOD b apply (Lfa;)Lfa; diff --git a/mappings/net/minecraft/util/Rotation.mapping b/mappings/net/minecraft/util/BlockRotation.mapping similarity index 76% rename from mappings/net/minecraft/util/Rotation.mapping rename to mappings/net/minecraft/util/BlockRotation.mapping index a7eb391c06..3fab754ceb 100644 --- a/mappings/net/minecraft/util/Rotation.mapping +++ b/mappings/net/minecraft/util/BlockRotation.mapping @@ -1,8 +1,11 @@ -CLASS bqw net/minecraft/util/Rotation +CLASS bqw net/minecraft/util/BlockRotation FIELD a ROT_0 Lbqw; FIELD b ROT_90 Lbqw; FIELD c ROT_180 Lbqw; FIELD d ROT_270 Lbqw; + METHOD a rotate (II)I + ARG 1 rotation + ARG 2 fullTurn METHOD a rotate (Lbqw;)Lbqw; ARG 1 rotation METHOD a rotate (Lfa;)Lfa; diff --git a/mappings/net/minecraft/util/math/Rotation.mapping b/mappings/net/minecraft/util/math/EulerRotation.mapping similarity index 68% rename from mappings/net/minecraft/util/math/Rotation.mapping rename to mappings/net/minecraft/util/math/EulerRotation.mapping index 23a6c17bae..651396425a 100644 --- a/mappings/net/minecraft/util/math/Rotation.mapping +++ b/mappings/net/minecraft/util/math/EulerRotation.mapping @@ -1,10 +1,13 @@ -CLASS fn net/minecraft/util/math/Rotation +CLASS fn net/minecraft/util/math/EulerRotation FIELD a x F FIELD b y F FIELD c z F METHOD (FFF)V ARG 1 x ARG 2 y + ARG 3 z + METHOD (Lii;)V + ARG 1 serialized METHOD a serialize ()Lii; METHOD b getX ()F METHOD c getY ()F