Skip to content

Commit

Permalink
Made a few needed changes based on open issues (#645)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Pyrofab authored and modmuss50 committed Apr 23, 2019
1 parent 02018a0 commit a4d9672
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 11 deletions.
6 changes: 3 additions & 3 deletions mappings/net/minecraft/entity/Entity.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions mappings/net/minecraft/entity/LivingEntity.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/item/AliasedBlockItem.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CLASS bby net/minecraft/item/AliasedBlockItem
1 change: 0 additions & 1 deletion mappings/net/minecraft/item/StringItem.mapping

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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 <init> (DDDZ)V
ARG 1 x
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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 <init> (FFF)V
ARG 1 x
ARG 2 y
ARG 3 z
METHOD <init> (Lii;)V
ARG 1 serialized
METHOD a serialize ()Lii;
METHOD b getX ()F
METHOD c getY ()F
Expand Down

0 comments on commit a4d9672

Please sign in to comment.