From 034a3c48889507620f04ba36d86e882bbbcd5be7 Mon Sep 17 00:00:00 2001 From: Striker Rocker Date: Fri, 14 Dec 2018 19:07:49 +0530 Subject: [PATCH] Updated some entity fields and class mappings (#288) --- .../net/minecraft/entity/AreaEffectCloudEntity.mapping | 1 + mappings/net/minecraft/entity/FallingBlockEntity.mapping | 3 +++ mappings/net/minecraft/entity/ItemEntity.mapping | 1 + mappings/net/minecraft/entity/LivingEntity.mapping | 1 + .../net/minecraft/entity/WaterCreatureEntity.mapping | 1 + .../net/minecraft/entity/mob/EndermiteEntity.mapping | 2 ++ .../net/minecraft/entity/mob/IllagerBeastEntity.mapping | 3 +++ mappings/net/minecraft/entity/mob/IllagerEntity.mapping | 1 + mappings/net/minecraft/entity/mob/MobEntity.mapping | 1 + mappings/net/minecraft/entity/mob/PatrolEntity.mapping | 3 +++ mappings/net/minecraft/entity/mob/PhantomEntity.mapping | 3 +++ .../net/minecraft/entity/mob/PigZombieEntity.mapping | 2 ++ mappings/net/minecraft/entity/mob/PillagerEntity.mapping | 1 + mappings/net/minecraft/entity/mob/SlimeEntity.mapping | 1 + .../net/minecraft/entity/mob/VindicatorEntity.mapping | 1 + mappings/net/minecraft/entity/mob/ZombieEntity.mapping | 2 ++ .../minecraft/entity/mob/ZombieVillagerEntity.mapping | 2 ++ .../net/minecraft/entity/passive/AnimalEntity.mapping | 3 +++ .../net/minecraft/entity/passive/ChickenEntity.mapping | 2 ++ mappings/net/minecraft/entity/passive/CodEntity.mapping | 1 + mappings/net/minecraft/entity/passive/FishEntity.mapping | 1 + .../minecraft/entity/passive/PufferfishEntity.mapping | 1 + .../net/minecraft/entity/passive/SalmonEntity.mapping | 1 + .../minecraft/entity/passive/TropicalFishEntity.mapping | 1 + .../net/minecraft/entity/passive/TurtleEntity.mapping | 9 +++++++++ .../net/minecraft/entity/player/PlayerEntity.mapping | 1 + 26 files changed, 49 insertions(+) diff --git a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping index c541573e57..a64c42e1aa 100644 --- a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping +++ b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping @@ -35,6 +35,7 @@ CLASS agt net/minecraft/entity/AreaEffectCloudEntity METHOD c setRadiusGrowth (F)V METHOD d setWaitTime (I)V METHOD i getRadius ()F + METHOD k getColor ()I METHOD l getParticleType ()Lft; METHOD m isWaiting ()Z METHOD n getDuration ()I diff --git a/mappings/net/minecraft/entity/FallingBlockEntity.mapping b/mappings/net/minecraft/entity/FallingBlockEntity.mapping index 4fe3e962c4..c530dc5cd6 100644 --- a/mappings/net/minecraft/entity/FallingBlockEntity.mapping +++ b/mappings/net/minecraft/entity/FallingBlockEntity.mapping @@ -1,5 +1,8 @@ CLASS aox net/minecraft/entity/FallingBlockEntity + FIELD a timeFalling I FIELD av hurtEntities Z + FIELD aw fallHurtMax I + FIELD ax fallHurtAmount F FIELD b dropItem Z FIELD c blockEntityData Lhs; FIELD d BLOCK_POS Lpr; diff --git a/mappings/net/minecraft/entity/ItemEntity.mapping b/mappings/net/minecraft/entity/ItemEntity.mapping index 8dfa44a6f7..8b230567c5 100644 --- a/mappings/net/minecraft/entity/ItemEntity.mapping +++ b/mappings/net/minecraft/entity/ItemEntity.mapping @@ -1,4 +1,5 @@ CLASS aoy net/minecraft/entity/ItemEntity + FIELD a hoverHeight F FIELD av owner Ljava/util/UUID; FIELD b STACK Lpr; FIELD c age I diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 250825f0a2..d70d2b6fc0 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -101,6 +101,7 @@ CLASS ahe net/minecraft/entity/LivingEntity METHOD d applyDamage (Lage;F)V ARG 1 damageSource METHOD d isPotionEffective (Lago;)Z + METHOD d getCurrentExperience (Larb;)I METHOD da getActiveItem ()Lawo; METHOD dg isFallFlying ()Z METHOD e getHurtSound (Lage;)Lxm; diff --git a/mappings/net/minecraft/entity/WaterCreatureEntity.mapping b/mappings/net/minecraft/entity/WaterCreatureEntity.mapping index 2488be69d1..68363a3db5 100644 --- a/mappings/net/minecraft/entity/WaterCreatureEntity.mapping +++ b/mappings/net/minecraft/entity/WaterCreatureEntity.mapping @@ -4,3 +4,4 @@ CLASS amx net/minecraft/entity/WaterCreatureEntity METHOD Y updateLogic ()V METHOD a canBeLeashedBy (Larb;)Z METHOD bx canFly ()Z + METHOD d getCurrentExperience (Larb;)I diff --git a/mappings/net/minecraft/entity/mob/EndermiteEntity.mapping b/mappings/net/minecraft/entity/mob/EndermiteEntity.mapping index e68e656f4a..348214ce00 100644 --- a/mappings/net/minecraft/entity/mob/EndermiteEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EndermiteEntity.mapping @@ -1,4 +1,6 @@ CLASS apk net/minecraft/entity/mob/EndermiteEntity + FIELD a lifeTime I + FIELD b playerSpawned Z METHOD D getAmbientSound ()Lxm; METHOD W_ update ()V METHOD a playStepSound (Let;Lbpm;)V diff --git a/mappings/net/minecraft/entity/mob/IllagerBeastEntity.mapping b/mappings/net/minecraft/entity/mob/IllagerBeastEntity.mapping index 8c130b4c26..bb44b67269 100644 --- a/mappings/net/minecraft/entity/mob/IllagerBeastEntity.mapping +++ b/mappings/net/minecraft/entity/mob/IllagerBeastEntity.mapping @@ -3,6 +3,9 @@ CLASS apr net/minecraft/entity/mob/IllagerBeastEntity METHOD (Lahf;Lbbp;)V ARG 1 world METHOD a createPathNodeNavigator ()Lchm; + FIELD bD stunTick I + FIELD bE roarTick I + FIELD b attackTick I METHOD D getAmbientSound ()Lxm; METHOD D canSee (Lagv;)Z METHOD a playStepSound (Let;Lbpm;)V diff --git a/mappings/net/minecraft/entity/mob/IllagerEntity.mapping b/mappings/net/minecraft/entity/mob/IllagerEntity.mapping index 53492e7af6..75c0f1584b 100644 --- a/mappings/net/minecraft/entity/mob/IllagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/IllagerEntity.mapping @@ -1,4 +1,5 @@ CLASS apb net/minecraft/entity/mob/IllagerEntity + CLASS apb$a State METHOD (Lagz;Lbbp;)V ARG 1 type METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 102ad69b9d..942bb06d9f 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -66,6 +66,7 @@ CLASS ahf net/minecraft/entity/mob/MobEntity METHOD bo getSafeFallDistance ()I METHOD cW getMainHand ()Lahd; METHOD ca initAttributes ()V + METHOD d getCurrentExperience (Larb;)I METHOD dk canPickUpLoot ()Z METHOD dl isPersistent ()Z METHOD dn isLeashed ()Z diff --git a/mappings/net/minecraft/entity/mob/PatrolEntity.mapping b/mappings/net/minecraft/entity/mob/PatrolEntity.mapping index 437c742fcb..e38a08fe6a 100644 --- a/mappings/net/minecraft/entity/mob/PatrolEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PatrolEntity.mapping @@ -4,6 +4,9 @@ CLASS apv net/minecraft/entity/mob/PatrolEntity METHOD c start ()V METHOD d onRemove ()V METHOD e tick ()V + FIELD a patrolTarget Let; + FIELD b isLeader Z + FIELD c isPatrolling Z METHOD (Lagz;Lbbp;)V ARG 1 type METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; diff --git a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping index c88ec7d57e..4a4ab9cb17 100644 --- a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping @@ -21,10 +21,12 @@ CLASS apw net/minecraft/entity/mob/PhantomEntity METHOD c start ()V METHOD d onRemove ()V METHOD e tick ()V + FIELD a SIZE Lpr; METHOD D getAmbientSound ()Lxm; METHOD I mobTick ()V METHOD W_ update ()V METHOD a shouldRenderAtDistance (D)Z + METHOD a setSize (I)V METHOD a (Lbbq;Lafn;Lahh;Lahp;Lhs;)Lahp; ARG 3 difficulty METHOD a readCustomDataFromTag (Lhs;)V @@ -36,6 +38,7 @@ CLASS apw net/minecraft/entity/mob/PhantomEntity METHOD cH getSoundVolume ()F METHOD ca initAttributes ()V METHOD cv getDeathSound ()Lxm; + METHOD ds getSize ()I METHOD e getHurtSound (Lage;)Lxm; METHOD k updateMovement ()V METHOD n ()V diff --git a/mappings/net/minecraft/entity/mob/PigZombieEntity.mapping b/mappings/net/minecraft/entity/mob/PigZombieEntity.mapping index 14bef7a4ba..2d3cc6452f 100644 --- a/mappings/net/minecraft/entity/mob/PigZombieEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PigZombieEntity.mapping @@ -1,6 +1,8 @@ CLASS apx net/minecraft/entity/mob/PigZombieEntity CLASS apx$a METHOD a canStart ()Z + FIELD bD anger I + FIELD bF angerTarget Ljava/util/UUID; METHOD D getAmbientSound ()Lxm; METHOD I mobTick ()V METHOD a initEquipment (Lafn;)V diff --git a/mappings/net/minecraft/entity/mob/PillagerEntity.mapping b/mappings/net/minecraft/entity/mob/PillagerEntity.mapping index f817227094..e51380127b 100644 --- a/mappings/net/minecraft/entity/mob/PillagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PillagerEntity.mapping @@ -1,4 +1,5 @@ CLASS apy net/minecraft/entity/mob/PillagerEntity + FIELD bD inventory Lafx; METHOD D getAmbientSound ()Lxm; METHOD G ()Z METHOD N getLimitPerChunk ()I diff --git a/mappings/net/minecraft/entity/mob/SlimeEntity.mapping b/mappings/net/minecraft/entity/mob/SlimeEntity.mapping index 4cb562d6eb..f5fff1b482 100644 --- a/mappings/net/minecraft/entity/mob/SlimeEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SlimeEntity.mapping @@ -17,6 +17,7 @@ CLASS aqe net/minecraft/entity/mob/SlimeEntity METHOD a canStart ()Z METHOD e tick ()V FIELD bD SLIME_SIZE Lpr; + FIELD bE onGroundLastTick Z METHOD (Lagz;Lbbp;)V ARG 1 type METHOD F getLootTableId ()Lqc; diff --git a/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping b/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping index d968a8cef4..0a46e1da7d 100644 --- a/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping +++ b/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping @@ -10,6 +10,7 @@ CLASS aqj net/minecraft/entity/mob/VindicatorEntity METHOD b shouldContinue ()Z METHOD c start ()V METHOD d onRemove ()V + FIELD b isJohnny Z METHOD D getAmbientSound ()Lxm; METHOD I mobTick ()V METHOD a initEquipment (Lafn;)V diff --git a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping index 985ab84515..4ff8408f86 100644 --- a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping @@ -26,8 +26,10 @@ CLASS aqm net/minecraft/entity/mob/ZombieEntity METHOD bG getEyeHeight ()F METHOD ca initAttributes ()V METHOD cv getDeathSound ()Lxm; + METHOD d getCurrentExperience (Larb;)I METHOD dB getSoundStep ()Lxm; METHOD dC getSkull ()Lawo; + METHOD dI isDrowning ()Z METHOD dJ canBreakDoors ()Z METHOD dz hasArmsRaised ()Z METHOD e getHurtSound (Lage;)Lxm; diff --git a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping index 224d58e25e..9e8c334075 100644 --- a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping @@ -1,6 +1,8 @@ CLASS aqn net/minecraft/entity/mob/ZombieVillagerEntity FIELD a CONVERTING Lpr; FIELD bD conversionTimer I + FIELD bE converionStarter Ljava/util/UUID; + FIELD bF offers Lhs; FIELD b PROFESSION Lpr; METHOD D getAmbientSound ()Lxm; METHOD W_ update ()V diff --git a/mappings/net/minecraft/entity/passive/AnimalEntity.mapping b/mappings/net/minecraft/entity/passive/AnimalEntity.mapping index a98cdb6292..cf453f59e0 100644 --- a/mappings/net/minecraft/entity/passive/AnimalEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AnimalEntity.mapping @@ -1,4 +1,6 @@ CLASS ama net/minecraft/entity/passive/AnimalEntity + FIELD bD inLove I + FIELD bE lovingPlayer Ljava/util/UUID; FIELD bG spawningGround Lbgs; METHOD (Lagz;Lbbp;)V ARG 1 type @@ -11,4 +13,5 @@ CLASS ama net/minecraft/entity/passive/AnimalEntity METHOD a readCustomDataFromTag (Lhs;)V METHOD aK getHeightOffset ()D METHOD b writeCustomDataToTag (Lhs;)V + METHOD d getCurrentExperience (Larb;)I METHOD k updateMovement ()V diff --git a/mappings/net/minecraft/entity/passive/ChickenEntity.mapping b/mappings/net/minecraft/entity/passive/ChickenEntity.mapping index de7343056d..1020ca7414 100644 --- a/mappings/net/minecraft/entity/passive/ChickenEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ChickenEntity.mapping @@ -1,5 +1,6 @@ CLASS amc net/minecraft/entity/passive/ChickenEntity FIELD bJ eggLayTime I + FIELD bK isJockey Z METHOD D getAmbientSound ()Lxm; METHOD a createChild (Lags;)Lags; METHOD a playStepSound (Let;Lbpm;)V @@ -12,6 +13,7 @@ CLASS amc net/minecraft/entity/passive/ChickenEntity ARG 1 fallDistance METHOD ca initAttributes ()V METHOD cv getDeathSound ()Lxm; + METHOD d getCurrentExperience (Larb;)I METHOD e getHurtSound (Lage;)Lxm; METHOD k updateMovement ()V METHOD n ()V diff --git a/mappings/net/minecraft/entity/passive/CodEntity.mapping b/mappings/net/minecraft/entity/passive/CodEntity.mapping index a679926167..c1f49da58e 100644 --- a/mappings/net/minecraft/entity/passive/CodEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CodEntity.mapping @@ -1,4 +1,5 @@ CLASS amd net/minecraft/entity/passive/CodEntity METHOD D getAmbientSound ()Lxm; METHOD cv getDeathSound ()Lxm; + METHOD dA getFlopSound ()Lxm; METHOD e getHurtSound (Lage;)Lxm; diff --git a/mappings/net/minecraft/entity/passive/FishEntity.mapping b/mappings/net/minecraft/entity/passive/FishEntity.mapping index 5afee64ee0..a672669b8b 100644 --- a/mappings/net/minecraft/entity/passive/FishEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FishEntity.mapping @@ -16,6 +16,7 @@ CLASS alx net/minecraft/entity/passive/FishEntity METHOD b writeCustomDataToTag (Lhs;)V METHOD bG getEyeHeight ()F METHOD ca initAttributes ()V + METHOD dA getFlopSound ()Lxm; METHOD k updateMovement ()V METHOD n ()V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping b/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping index 234771e3be..ec527ef124 100644 --- a/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping @@ -12,6 +12,7 @@ CLASS amo net/minecraft/entity/passive/PufferfishEntity METHOD a onTrackedDataSet (Lpr;)V METHOD b writeCustomDataToTag (Lhs;)V METHOD cv getDeathSound ()Lxm; + METHOD dA getFlopSound ()Lxm; METHOD e getHurtSound (Lage;)Lxm; METHOD k updateMovement ()V METHOD n ()V diff --git a/mappings/net/minecraft/entity/passive/SalmonEntity.mapping b/mappings/net/minecraft/entity/passive/SalmonEntity.mapping index d8e5771024..96e2c1bb12 100644 --- a/mappings/net/minecraft/entity/passive/SalmonEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SalmonEntity.mapping @@ -1,4 +1,5 @@ CLASS amq net/minecraft/entity/passive/SalmonEntity METHOD D getAmbientSound ()Lxm; METHOD cv getDeathSound ()Lxm; + METHOD dA getFlopSound ()Lxm; METHOD e getHurtSound (Lage;)Lxm; diff --git a/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping b/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping index 56c474bbda..32e9a9c258 100644 --- a/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping @@ -5,6 +5,7 @@ CLASS amv net/minecraft/entity/passive/TropicalFishEntity METHOD a readCustomDataFromTag (Lhs;)V METHOD b writeCustomDataToTag (Lhs;)V METHOD cv getDeathSound ()Lxm; + METHOD dA getFlopSound ()Lxm; METHOD dI getVariant ()I METHOD e getHurtSound (Lage;)Lxm; METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping index 576b6fdfe4..535740c2b4 100644 --- a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping @@ -36,6 +36,9 @@ CLASS amw net/minecraft/entity/passive/TurtleEntity METHOD c start ()V METHOD d onRemove ()V METHOD e tick ()V + FIELD bE HOME_POS Lpr; + FIELD bF HAS_EGG Lpr; + FIELD bI TRAVEL_POS Lpr; METHOD D getAmbientSound ()Lxm; METHOD a createChild (Lags;)Lags; METHOD a onStruckByLightning (Laov;)V @@ -51,7 +54,13 @@ CLASS amw net/minecraft/entity/passive/TurtleEntity METHOD bx canFly ()Z METHOD ca initAttributes ()V METHOD cv getDeathSound ()Lxm; + METHOD dB getHomePos ()Let; + METHOD dC getTravelPos ()Let; + METHOD dz getHasEgg ()Z METHOD e getHurtSound (Lage;)Lxm; + METHOD g setHomePos (Let;)V + METHOD h setTravelPos (Let;)V METHOD k updateMovement ()V METHOD n ()V + METHOD s setHasEgg (Z)V METHOD y_ initDataTracker ()V diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index d4e1bca460..5a2c958563 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -129,6 +129,7 @@ CLASS arb net/minecraft/entity/player/PlayerEntity METHOD d addExperience (I)V METHOD d applyDamage (Lage;F)V ARG 1 damageSource + METHOD d getCurrentExperience (Larb;)I METHOD dA getHungerManager ()Lasu; METHOD dB canFoodHeal ()Z METHOD dC canModifyWorld ()Z