mirror of https://github.com/FabricMC/yarn.git
fix Entity.getName() conflict
This commit is contained in:
parent
13fa40451a
commit
a1b90d58a7
|
@ -221,7 +221,7 @@ CLASS afy net/minecraft/entity/Entity
|
||||||
METHOD bu doesRenderOnFire ()Z
|
METHOD bu doesRenderOnFire ()Z
|
||||||
METHOD bv getUuid ()Ljava/util/UUID;
|
METHOD bv getUuid ()Ljava/util/UUID;
|
||||||
METHOD bw getUuidAsString ()Ljava/lang/String;
|
METHOD bw getUuidAsString ()Ljava/lang/String;
|
||||||
METHOD bx getName ()Ljava/lang/String;
|
METHOD bx getEntityName ()Ljava/lang/String;
|
||||||
METHOD by canFly ()Z
|
METHOD by canFly ()Z
|
||||||
METHOD bz getRenderDistanceMultiplier ()D
|
METHOD bz getRenderDistanceMultiplier ()D
|
||||||
METHOD c handleFallDamage (FF)V
|
METHOD c handleFallDamage (FF)V
|
||||||
|
|
|
@ -111,7 +111,7 @@ CLASS apv net/minecraft/entity/player/EntityPlayer
|
||||||
METHOD bX getSoundCategory ()Lxb;
|
METHOD bX getSoundCategory ()Lxb;
|
||||||
METHOD bd isSwimming ()Z
|
METHOD bd isSwimming ()Z
|
||||||
METHOD bj stickInWeb ()V
|
METHOD bj stickInWeb ()V
|
||||||
METHOD bx getName ()Ljava/lang/String;
|
METHOD bx getEntityName ()Ljava/lang/String;
|
||||||
METHOD by canFly ()Z
|
METHOD by canFly ()Z
|
||||||
METHOD c handleFallDamage (FF)V
|
METHOD c handleFallDamage (FF)V
|
||||||
ARG 1 fallDistance
|
ARG 1 fallDistance
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
CLASS aey net/minecraft/util/CustomNameable
|
CLASS aey net/minecraft/util/EntityNameable
|
||||||
METHOD O_ getName ()Liz;
|
METHOD O_ getName ()Liz;
|
||||||
METHOD P_ hasCustomName ()Z
|
METHOD P_ hasCustomName ()Z
|
||||||
METHOD Q getDisplayedName ()Liz;
|
METHOD Q getDisplayedName ()Liz;
|
Loading…
Reference in New Issue