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
This commit is contained in:
Pyrofab 2019-04-23 15:47:15 +02:00 committed by Modmuss50
parent 02018a01a8
commit a4d9672e02
9 changed files with 21 additions and 11 deletions

View File

@ -39,7 +39,7 @@ CLASS aif net/minecraft/entity/Entity
FIELD ap uuidString Ljava/lang/String; FIELD ap uuidString Ljava/lang/String;
FIELD aq glowing Z FIELD aq glowing Z
FIELD ar passengerList Ljava/util/List; FIELD ar passengerList Ljava/util/List;
FIELD as riddenEntity Laif; FIELD as vehicle Laif;
FIELD at velocity Lcrv; FIELD at velocity Lcrv;
FIELD au boundingBox Lcrq; FIELD au boundingBox Lcrq;
FIELD ax fireTime I FIELD ax fireTime I
@ -288,7 +288,7 @@ CLASS aif net/minecraft/entity/Entity
METHOD bU getPrimaryPassenger ()Laif; METHOD bU getPrimaryPassenger ()Laif;
METHOD bV getPassengerList ()Ljava/util/List; METHOD bV getPassengerList ()Ljava/util/List;
METHOD bW getPassengersDeep ()Ljava/util/Collection; METHOD bW getPassengersDeep ()Ljava/util/Collection;
METHOD bY getTopmostRiddenEntity ()Laif; METHOD bY getTopmostVehicle ()Laif;
METHOD bZ isLogicalSideForUpdatingMovement ()Z METHOD bZ isLogicalSideForUpdatingMovement ()Z
METHOD ba getItemsEquipped ()Ljava/lang/Iterable; METHOD ba getItemsEquipped ()Ljava/lang/Iterable;
METHOD bb isOnFire ()Z METHOD bb isOnFire ()Z
@ -327,7 +327,7 @@ CLASS aif net/minecraft/entity/Entity
METHOD c saveSelfToTag (Lib;)Z METHOD c saveSelfToTag (Lib;)Z
METHOD c onStoppedTrackingBy (Lvh;)V METHOD c onStoppedTrackingBy (Lvh;)V
METHOD c setSilent (Z)V METHOD c setSilent (Z)V
METHOD ca getRiddenEntity ()Laif; METHOD ca getVehicle ()Laif;
METHOD cb getSoundCategory ()Lyl; METHOD cb getSoundCategory ()Lyl;
METHOD cd getCommandSource ()Lcd; METHOD cd getCommandSource ()Lcd;
METHOD ce getWaterHeight ()D METHOD ce getWaterHeight ()D

View File

@ -47,7 +47,7 @@ CLASS aio net/minecraft/entity/LivingEntity
ARG 1 type ARG 1 type
METHOD A getAttackDistanceScalingFactor (Laif;)D METHOD A getAttackDistanceScalingFactor (Laif;)D
METHOD C updatePotionVisibility ()V METHOD C updatePotionVisibility ()V
METHOD C attack (Laif;)Z METHOD C tryAttack (Laif;)Z
METHOD D pushAway (Laif;)V METHOD D pushAway (Laif;)V
METHOD E canSee (Laif;)Z METHOD E canSee (Laif;)Z
METHOD a teleport (DDDZ)Z METHOD a teleport (DDDZ)Z
@ -215,7 +215,7 @@ CLASS aio net/minecraft/entity/LivingEntity
METHOD f getArrowType (Lbca;)Lbca; METHOD f getArrowType (Lbca;)Lbca;
METHOD g playEquipmentBreakEffects (Lbca;)V METHOD g playEquipmentBreakEffects (Lbca;)V
ARG 1 item ARG 1 item
METHOD k updateMovement ()V METHOD k updateState ()V
METHOD k getNextBreathInWater (I)I METHOD k getNextBreathInWater (I)I
ARG 1 breath ARG 1 breath
METHOD l getHandSwingDuration ()I METHOD l getHandSwingDuration ()I

View File

@ -8,7 +8,7 @@ CLASS bbw net/minecraft/entity/player/ItemCooldownManager
FIELD a entries Ljava/util/Map; FIELD a entries Ljava/util/Map;
FIELD b tick I FIELD b tick I
METHOD a update ()V METHOD a update ()V
METHOD a isCooldown (Lbbv;)Z METHOD a isCoolingDown (Lbbv;)Z
METHOD a getCooldownProgress (Lbbv;F)F METHOD a getCooldownProgress (Lbbv;F)F
ARG 2 partialTicks ARG 2 partialTicks
METHOD a set (Lbbv;I)V METHOD a set (Lbbv;I)V

View File

@ -0,0 +1 @@
CLASS bby net/minecraft/item/AliasedBlockItem

View File

@ -1 +0,0 @@
CLASS bby net/minecraft/item/StringItem

View File

@ -1,4 +1,4 @@
CLASS oj net/minecraft/server/network/packet/PlayerMoveServerMessage CLASS oj net/minecraft/server/network/packet/PlayerMoveC2SPacket
CLASS oj$a PositionOnly CLASS oj$a PositionOnly
METHOD <init> (DDDZ)V METHOD <init> (DDDZ)V
ARG 1 x ARG 1 x
@ -21,6 +21,7 @@ CLASS oj net/minecraft/server/network/packet/PlayerMoveServerMessage
ARG 1 currentX ARG 1 currentX
METHOD a getYaw (F)F METHOD a getYaw (F)F
ARG 1 currentYaw ARG 1 currentYaw
METHOD a apply (Lnr;)V
METHOD b isOnGround ()Z METHOD b isOnGround ()Z
METHOD b getY (D)D METHOD b getY (D)D
ARG 1 currentY ARG 1 currentY

View File

@ -1,6 +1,9 @@
CLASS bpw net/minecraft/util/Mirror CLASS bpw net/minecraft/util/BlockMirror
FIELD a NONE Lbpw; FIELD a NONE Lbpw;
FIELD b LEFT_RIGHT Lbpw; FIELD b LEFT_RIGHT Lbpw;
FIELD c FRONT_BACK Lbpw; FIELD c FRONT_BACK Lbpw;
METHOD a mirror (II)I
ARG 1 rotation
ARG 2 fullTurn
METHOD a getRotation (Lfa;)Lbqw; METHOD a getRotation (Lfa;)Lbqw;
METHOD b apply (Lfa;)Lfa; METHOD b apply (Lfa;)Lfa;

View File

@ -1,8 +1,11 @@
CLASS bqw net/minecraft/util/Rotation CLASS bqw net/minecraft/util/BlockRotation
FIELD a ROT_0 Lbqw; FIELD a ROT_0 Lbqw;
FIELD b ROT_90 Lbqw; FIELD b ROT_90 Lbqw;
FIELD c ROT_180 Lbqw; FIELD c ROT_180 Lbqw;
FIELD d ROT_270 Lbqw; FIELD d ROT_270 Lbqw;
METHOD a rotate (II)I
ARG 1 rotation
ARG 2 fullTurn
METHOD a rotate (Lbqw;)Lbqw; METHOD a rotate (Lbqw;)Lbqw;
ARG 1 rotation ARG 1 rotation
METHOD a rotate (Lfa;)Lfa; METHOD a rotate (Lfa;)Lfa;

View File

@ -1,10 +1,13 @@
CLASS fn net/minecraft/util/math/Rotation CLASS fn net/minecraft/util/math/EulerRotation
FIELD a x F FIELD a x F
FIELD b y F FIELD b y F
FIELD c z F FIELD c z F
METHOD <init> (FFF)V METHOD <init> (FFF)V
ARG 1 x ARG 1 x
ARG 2 y ARG 2 y
ARG 3 z
METHOD <init> (Lii;)V
ARG 1 serialized
METHOD a serialize ()Lii; METHOD a serialize ()Lii;
METHOD b getX ()F METHOD b getX ()F
METHOD c getY ()F METHOD c getY ()F