mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'pull/579' into 19w13b 

# Conflicts:
#	mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping
#	mappings/net/minecraft/world/EntityView.mapping
This commit is contained in:
modmuss50 2019-04-03 16:45:44 +01:00
parent dcf0691315 b8e424d707
commit 087ce6de98
9 changed files with 99 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mappings/net/minecraft/client/render/entity/model/CatEntityModel.mapping
View File

@ -1 +1,8 @@
CLASS ddk net/minecraft/client/render/entity/model/CatEntityModel
FIELD m sleepAnimation F
FIELD n tailCurlAnimation F
FIELD o headDownAnimation F
METHOD a lerpAngle (FFF)F
ARG 1 from
ARG 2 to
ARG 3 intermediate

7
mappings/net/minecraft/client/render/entity/model/EntityModel.mapping
View File

@ -5,7 +5,13 @@ CLASS ddv net/minecraft/client/render/entity/model/EntityModel
METHOD a animateModel (Lahz;FFF)V
ARG 2 swingAmount
ARG 3 swingDelta
ARG 4 tickDelta
METHOD a setAngles (Lahz;FFFFFF)V
ARG 2 limbMoveAngle
ARG 3 limbMoveAmount
ARG 4 age
ARG 5 headYaw
ARG 6 headPitch
METHOD b render (Lahz;FFFFFF)V
ARG 1 entity
ARG 2 limbMoveAngle
@ -13,3 +19,4 @@ CLASS ddv net/minecraft/client/render/entity/model/EntityModel
ARG 4 age
ARG 5 headYaw
ARG 6 headPitch
ARG 7 scale

9
mappings/net/minecraft/client/render/entity/model/OcelotEntityModel.mapping
View File

@ -1 +1,10 @@
CLASS den net/minecraft/client/render/entity/model/OcelotEntityModel
FIELD a frontLegLeft Ldgj;
FIELD b frontLegRight Ldgj;
FIELD f backLegLeft Ldgj;
FIELD g backLegRight Ldgj;
FIELD h tail1 Ldgj;
FIELD i tail2 Ldgj;
FIELD j head Ldgj;
FIELD k body Ldgj;
FIELD l animationState I

28
mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping
View File

@ -1,2 +1,28 @@
CLASS anv net/minecraft/entity/ai/goal/TemptGoal
FIELD c CLOSE_PLAYER_PREDICATE Lapp;
FIELD a owner Laip;
FIELD b closestPlayer Lavm;
FIELD c TEMPTING_ENTITY_PREDICATE Lapp;
FIELD d speed D
FIELD e lastPlayerX D
FIELD f lastPlayerY D
FIELD g lastPlayerZ D
FIELD h lastPlayerPitch D
FIELD i lastPlayerYaw D
FIELD j cooldown I
FIELD k active Z
FIELD l temptItem Lbdu;
FIELD m canBeScared Z
METHOD <init> (Laip;DLbdu;Z)V
ARG 1 owner
ARG 2 speed
ARG 4 temptItem
ARG 5 canBeScared
METHOD <init> (Laip;DZLbdu;)V
ARG 1 owner
ARG 2 speed
ARG 4 canBeScared
ARG 5 temptItem
METHOD a isTempedBy (Lbbp;)Z
ARG 1 stack
METHOD g canBeScared ()Z
METHOD h isActive ()Z

38
mappings/net/minecraft/entity/passive/CatEntity.mapping
View File

@ -4,16 +4,44 @@ CLASS aqi net/minecraft/entity/passive/CatEntity
CLASS aqi$b SleepWithOwnerGoal
FIELD a entity Laqi;
FIELD b owner Lavm;
FIELD c bedPos Lev;
FIELD d ticksOnBed I
METHOD h dropMorningGifts ()V
CLASS aqi$c CatTemptGoal
FIELD d cat Laqi;
FIELD bD TEXTURES Ljava/util/Map;
FIELD bE TAMING_INGREDIENT Lbdu;
FIELD bF CAT_TYPE Lqg;
FIELD bG SHOULD_PURR Lqg;
FIELD bG SLEEPING_WITH_OWNER Lqg;
FIELD bH HEAD_DOWN Lqg;
FIELD bI COLLAR_COLOR Lqg;
FIELD bJ fleeGoal Laqi$a;
FIELD bK temptGoal Lanv;
FIELD bL sleepAnimation F
FIELD bM prevSleepAnimation F
FIELD bN tailCurlAnimation F
FIELD bO prevTailCurlAnimation F
FIELD bP headDownAnimation F
FIELD bQ prevHeadDownAniamtion F
METHOD a setCollarColor (Lbam;)V
METHOD dZ getOcelotType ()I
METHOD ea shouldPurr ()Z
METHOD dY getTexture ()Lqr;
METHOD dZ getCatType ()I
METHOD ea isSleepingWithOwner ()Z
METHOD eb isHeadDown ()Z
METHOD ec getCollarColor ()Lbam;
METHOD r getOcelotType (I)V
METHOD u setShouldPurr (Z)V
METHOD ed hiss ()V
METHOD ee updateAnimations ()V
METHOD ef updateSleepAnimation ()V
METHOD eg updateHeadDownAnimation ()V
METHOD r setCatType (I)V
ARG 1 type
METHOD u setSleepingWithOwner (Z)V
ARG 1 sleeping
METHOD v getSleepAnimation (F)F
ARG 1 tickDelta
METHOD v setHeadDown (Z)V
ARG 1 headDown
METHOD w getTailCurlAnimation (F)F
ARG 1 tickDelta
METHOD x getHeadDownAnimation (F)F
ARG 1 tickDelta

9
mappings/net/minecraft/entity/passive/OcelotEntity.mapping
View File

@ -1,5 +1,14 @@
CLASS aqr net/minecraft/entity/passive/OcelotEntity
CLASS aqr$a OcelotFleeGoal
FIELD i ocelot Laqr;
CLASS aqr$b OcelotTemptGoal
FIELD c ocelot Laqr;
FIELD bA TRUSTING Lqg;
FIELD bB fleeGoal Laqr$a;
FIELD bD temptGoal Laqr$b;
FIELD bz TAMING_INGREDIENT Lbdu;
METHOD dR isTrusting ()Z
METHOD r setTrusting (Z)V
ARG 1 trusting
METHOD s showEmoteParticle (Z)V
ARG 1 positive

4
mappings/net/minecraft/entity/passive/TameableEntity.mapping
View File

@ -4,12 +4,16 @@ CLASS aiw net/minecraft/entity/passive/TameableEntity
FIELD bz TAMEABLE_FLAGS Lqg;
METHOD <init> (Laid;Lbgv;)V
ARG 1 type
METHOD A_ getOwnerUuid ()Ljava/util/UUID;
METHOD b setOwnerUuid (Ljava/util/UUID;)V
METHOD dP isTamed ()Z
METHOD dQ onTamedChanged ()V
METHOD dR isSitting ()Z
METHOD dS getOwner ()Laii;
METHOD dT getSitGoal ()Lanr;
METHOD e setOwner (Lavm;)V
METHOD h isOwner (Laii;)Z
METHOD r showEmoteParticle (Z)V
ARG 1 positive
METHOD s setTamed (Z)V
METHOD t setSitting (Z)V

1
mappings/net/minecraft/world/IWorld.mapping
View File

@ -2,6 +2,7 @@ CLASS bgw net/minecraft/world/IWorld
METHOD E getChunkManager ()Lbwo;
METHOD F getFluidTickScheduler ()Lbhk;
METHOD G getBlockTickScheduler ()Lbhk;
METHOD Z getMoonSize ()F
METHOD a playSound (Lavm;Lev;Lyh;Lyj;FF)V
METHOD a updateNeighbors (Lev;Lbly;)V
METHOD a addParticle (Lgd;DDDDDD)V

2
mappings/net/minecraft/world/ViewableWorld.mapping
View File

@ -46,6 +46,8 @@ CLASS bgy net/minecraft/world/ViewableWorld
ARG 2 entityBoundingBox
METHOD a_ getLightLevel (Lev;I)I
METHOD b isChunkLoaded (II)Z
ARG 1 chunkX
ARG 2 chunkZ
METHOD b getCollisionShapes (Lahz;Lcrb;Ljava/util/Set;)Ljava/util/stream/Stream;
ARG 1 entity
ARG 2 boundingBox