From b8e424d7079a9643379df24fb2bae4935d957a75 Mon Sep 17 00:00:00 2001 From: gegy1000 Date: Sun, 31 Mar 2019 16:06:27 +0200 Subject: [PATCH] Cat and Ocelot mapping --- .../entity/model/CatEntityModel.mapping | 7 ++++ .../render/entity/model/EntityModel.mapping | 7 ++++ .../entity/model/OcelotEntityModel.mapping | 9 +++++ .../entity/ai/goal/TemptGoal.mapping | 27 +++++++++++++ .../entity/passive/CatEntity.mapping | 38 ++++++++++++++++--- .../entity/passive/OcelotEntity.mapping | 9 +++++ .../entity/passive/TameableEntity.mapping | 4 ++ .../net/minecraft/world/EntityView.mapping | 29 ++++++++++++++ mappings/net/minecraft/world/IWorld.mapping | 1 + .../net/minecraft/world/ViewableWorld.mapping | 2 + 10 files changed, 128 insertions(+), 5 deletions(-) diff --git a/mappings/net/minecraft/client/render/entity/model/CatEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/CatEntityModel.mapping index 8e46636ab4..904bbb275b 100644 --- a/mappings/net/minecraft/client/render/entity/model/CatEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/CatEntityModel.mapping @@ -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 diff --git a/mappings/net/minecraft/client/render/entity/model/EntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/EntityModel.mapping index 172c6f1248..485ce3f169 100644 --- a/mappings/net/minecraft/client/render/entity/model/EntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/EntityModel.mapping @@ -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 diff --git a/mappings/net/minecraft/client/render/entity/model/OcelotEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/OcelotEntityModel.mapping index 2db764f042..67e9a30dea 100644 --- a/mappings/net/minecraft/client/render/entity/model/OcelotEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/OcelotEntityModel.mapping @@ -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 diff --git a/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping b/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping index ca1bf404da..25e00c7657 100644 --- a/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping @@ -1 +1,28 @@ CLASS anv net/minecraft/entity/ai/goal/TemptGoal + 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 (Laip;DLbdu;Z)V + ARG 1 owner + ARG 2 speed + ARG 4 temptItem + ARG 5 canBeScared + METHOD (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 diff --git a/mappings/net/minecraft/entity/passive/CatEntity.mapping b/mappings/net/minecraft/entity/passive/CatEntity.mapping index 1222fdd4fd..29b4a766d0 100644 --- a/mappings/net/minecraft/entity/passive/CatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CatEntity.mapping @@ -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 diff --git a/mappings/net/minecraft/entity/passive/OcelotEntity.mapping b/mappings/net/minecraft/entity/passive/OcelotEntity.mapping index 5cb7d68d33..c29d1da72e 100644 --- a/mappings/net/minecraft/entity/passive/OcelotEntity.mapping +++ b/mappings/net/minecraft/entity/passive/OcelotEntity.mapping @@ -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 diff --git a/mappings/net/minecraft/entity/passive/TameableEntity.mapping b/mappings/net/minecraft/entity/passive/TameableEntity.mapping index 800aae9545..2a37666670 100644 --- a/mappings/net/minecraft/entity/passive/TameableEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TameableEntity.mapping @@ -4,12 +4,16 @@ CLASS aiw net/minecraft/entity/passive/TameableEntity FIELD bz TAMEABLE_FLAGS Lqg; METHOD (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 diff --git a/mappings/net/minecraft/world/EntityView.mapping b/mappings/net/minecraft/world/EntityView.mapping index 6b51ed781f..fa872eec4d 100644 --- a/mappings/net/minecraft/world/EntityView.mapping +++ b/mappings/net/minecraft/world/EntityView.mapping @@ -13,5 +13,34 @@ CLASS bgn net/minecraft/world/EntityView ARG 1 entity ARG 2 entityBoundingBox ARG 3 otherEntities + METHOD a getClosestPlayerTo (Lapp;DDD)Lavm; + ARG 1 predicate + ARG 2 x + ARG 4 y + ARG 6 z + METHOD a getClosestPlayerTo (Lapp;Laii;)Lavm; + ARG 1 predicate + ARG 2 to + METHOD a getClosestPlayerTo (Lapp;Laii;DDD)Lavm; + ARG 1 predicate + ARG 2 reference + ARG 3 x + ARG 5 y + ARG 7 z + METHOD a getClosestEntityInBoundsTo (Ljava/lang/Class;Lapp;Laii;DDDLcrb;)Laii; + ARG 1 type + ARG 2 predicate + ARG 3 reference + ARG 4 x + ARG 6 y + ARG 8 z + ARG 10 bounds METHOD a getEntities (Ljava/lang/Class;Lcrb;Ljava/util/function/Predicate;)Ljava/util/List; ARG 1 except + METHOD a getClosestEntity (Ljava/util/List;Lapp;Laii;DDD)Laii; + ARG 1 entities + ARG 2 predicate + ARG 3 reference + ARG 4 x + ARG 6 y + ARG 8 z diff --git a/mappings/net/minecraft/world/IWorld.mapping b/mappings/net/minecraft/world/IWorld.mapping index b107a9ed59..6d10611872 100644 --- a/mappings/net/minecraft/world/IWorld.mapping +++ b/mappings/net/minecraft/world/IWorld.mapping @@ -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 diff --git a/mappings/net/minecraft/world/ViewableWorld.mapping b/mappings/net/minecraft/world/ViewableWorld.mapping index 263327b8b0..ab1ec356dd 100644 --- a/mappings/net/minecraft/world/ViewableWorld.mapping +++ b/mappings/net/minecraft/world/ViewableWorld.mapping @@ -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