diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 8e2a427c99..9f591e0388 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -13,6 +13,8 @@ CLASS none/sg net/minecraft/entity/Entity CLASS none/sg$5 METHOD a call ()Ljava/lang/String; FIELD F invalid Z + FIELD G width F + FIELD H height F FIELD L fallDistance F FIELD M prevRenderX D FIELD N prevRenderY D @@ -86,6 +88,9 @@ CLASS none/sg net/minecraft/entity/Entity ARG 2 z ARG 3 yaw ARG 4 pitch + METHOD a setSize (FF)V + ARG 0 width + ARG 1 height METHOD a hasPermission (ILjava/lang/String;)Z ARG 0 permissionLevel ARG 1 commandName @@ -177,6 +182,7 @@ CLASS none/sg net/minecraft/entity/Entity METHOD aP isInvisible ()Z METHOD aQ getScoreboardTeam ()Lnone/bdd; METHOD aR getBreath ()I + METHOD aT getParts ()[Lnone/sg; METHOD aU getHeadPitch ()F METHOD aa getSoundSwim ()Lnone/nk; METHOD ab getSoundSplash ()Lnone/nk; @@ -185,6 +191,7 @@ CLASS none/sg net/minecraft/entity/Entity METHOD aj isSwimming ()Z METHOD ak updateSwimming ()Z METHOD al onSwimmingStart ()V + METHOD aq doesCollide ()Z METHOD au isValid ()Z METHOD av isInsideWall ()Z METHOD az removeAllPassengers ()V @@ -322,6 +329,8 @@ CLASS none/sg net/minecraft/entity/Entity ARG 0 entity METHOD r isTeammate (Lnone/sg;)Z ARG 0 entity + METHOD s isPartOf (Lnone/sg;)Z + ARG 0 other METHOD u setPositionAndAngles (Lnone/sg;)V ARG 0 other METHOD w hasPassenger (Lnone/sg;)Z diff --git a/mappings/net/minecraft/entity/EntityFallingBlock.mapping b/mappings/net/minecraft/entity/EntityFallingBlock.mapping index 7c98d3bb21..af00c7eb51 100644 --- a/mappings/net/minecraft/entity/EntityFallingBlock.mapping +++ b/mappings/net/minecraft/entity/EntityFallingBlock.mapping @@ -20,6 +20,7 @@ CLASS none/yz net/minecraft/entity/EntityFallingBlock ARG 0 tag METHOD a setHurtEntities (Z)V ARG 0 value + METHOD aq doesCollide ()Z METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag METHOD b registerTagUpgraders (Lnone/pf;)V diff --git a/mappings/net/minecraft/entity/EntityLiving.mapping b/mappings/net/minecraft/entity/EntityLiving.mapping index c878e8fed8..b9eb6219c7 100644 --- a/mappings/net/minecraft/entity/EntityLiving.mapping +++ b/mappings/net/minecraft/entity/EntityLiving.mapping @@ -63,6 +63,7 @@ CLASS none/sp net/minecraft/entity/EntityLiving METHOD aU getHeadPitch ()F METHOD a_ onEquipStack (Lnone/aes;)V ARG 0 stack + METHOD aq doesCollide ()Z METHOD au isValid ()Z METHOD b heal (F)V ARG 0 amount diff --git a/mappings/net/minecraft/entity/EntityTNTPrimed.mapping b/mappings/net/minecraft/entity/EntityTNTPrimed.mapping index 27a3b4fcbb..7bc7f50cf8 100644 --- a/mappings/net/minecraft/entity/EntityTNTPrimed.mapping +++ b/mappings/net/minecraft/entity/EntityTNTPrimed.mapping @@ -14,6 +14,7 @@ CLASS none/zb net/minecraft/entity/EntityTNTPrimed ARG 0 tag METHOD a onTrackedDataSet (Lnone/kj;)V ARG 0 data + METHOD aq doesCollide ()Z METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag METHOD bq getEyeHeight ()F diff --git a/mappings/net/minecraft/entity/boss/EntityEnderDragon.mapping b/mappings/net/minecraft/entity/boss/EntityEnderDragon.mapping index b77c8c3b01..1f8b7f351a 100644 --- a/mappings/net/minecraft/entity/boss/EntityEnderDragon.mapping +++ b/mappings/net/minecraft/entity/boss/EntityEnderDragon.mapping @@ -10,6 +10,7 @@ CLASS none/xr net/minecraft/entity/boss/EntityEnderDragon FIELD by partBody Lnone/xp; FIELD bz partTail1 Lnone/xp; METHOD G getSoundAmbient ()Lnone/nk; + METHOD a getWorld ()Lnone/aiw; METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag METHOD a onTrackedDataSet (Lnone/kj;)V @@ -17,6 +18,12 @@ CLASS none/xr net/minecraft/entity/boss/EntityEnderDragon METHOD a damage (Lnone/rr;F)Z ARG 0 source ARG 1 damage + METHOD a damage (Lnone/xp;Lnone/rr;F)Z + ARG 0 part + ARG 1 source + ARG 2 amount + METHOD aT getParts ()[Lnone/sg; + METHOD aq doesCollide ()Z METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag METHOD b registerTagUpgraders (Lnone/pf;)V diff --git a/mappings/net/minecraft/entity/decoration/EntityArmorStand.mapping b/mappings/net/minecraft/entity/decoration/EntityArmorStand.mapping index add3bce29c..614118600b 100644 --- a/mappings/net/minecraft/entity/decoration/EntityArmorStand.mapping +++ b/mappings/net/minecraft/entity/decoration/EntityArmorStand.mapping @@ -31,6 +31,9 @@ CLASS none/yn net/minecraft/entity/decoration/EntityArmorStand ARG 0 value ARG 1 bitField ARG 2 on + METHOD a setSize (FF)V + ARG 0 width + ARG 1 height METHOD a interact (Lnone/aam;Lnone/bcv;Lnone/rb;)Lnone/rd; ARG 0 player ARG 1 hitPos @@ -53,6 +56,7 @@ CLASS none/yn net/minecraft/entity/decoration/EntityArmorStand ARG 0 newValue METHOD aG getItemsHand ()Ljava/lang/Iterable; METHOD aH getItemsArmor ()Ljava/lang/Iterable; + METHOD aq doesCollide ()Z METHOD b setBodyRotation (Lnone/dh;)V ARG 0 rotation METHOD b serializeCustomData (Lnone/dt;)V diff --git a/mappings/net/minecraft/entity/decoration/EntityDecorationBase.mapping b/mappings/net/minecraft/entity/decoration/EntityDecorationBase.mapping index 32db61d29e..18ca24882e 100644 --- a/mappings/net/minecraft/entity/decoration/EntityDecorationBase.mapping +++ b/mappings/net/minecraft/entity/decoration/EntityDecorationBase.mapping @@ -23,6 +23,7 @@ CLASS none/yo net/minecraft/entity/decoration/EntityDecorationBase ARG 0 entity METHOD a onStruckByLightning (Lnone/yx;)V ARG 0 lightning + METHOD aq doesCollide ()Z METHOD b setPosition (DDD)V ARG 0 x ARG 1 y diff --git a/mappings/net/minecraft/entity/decoration/EntityEnderCrystal.mapping b/mappings/net/minecraft/entity/decoration/EntityEnderCrystal.mapping index 5f73bd4421..470f54f621 100644 --- a/mappings/net/minecraft/entity/decoration/EntityEnderCrystal.mapping +++ b/mappings/net/minecraft/entity/decoration/EntityEnderCrystal.mapping @@ -10,6 +10,7 @@ CLASS none/xq net/minecraft/entity/decoration/EntityEnderCrystal ARG 1 damage METHOD a setShowBottom (Z)V ARG 0 value + METHOD aq doesCollide ()Z METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag METHOD i initDataTracker ()V diff --git a/mappings/net/minecraft/entity/mob/EntityZombie.mapping b/mappings/net/minecraft/entity/mob/EntityZombie.mapping index f63afd47d2..e525785e63 100644 --- a/mappings/net/minecraft/entity/mob/EntityZombie.mapping +++ b/mappings/net/minecraft/entity/mob/EntityZombie.mapping @@ -3,6 +3,9 @@ CLASS none/aac net/minecraft/entity/mob/EntityZombie FIELD bz ARMS_RAISED Lnone/kj; METHOD G getSoundAmbient ()Lnone/nk; METHOD J getLootTableId ()Lnone/kp; + METHOD a setSize (FF)V + ARG 0 width + ARG 1 height METHOD a playStepSound (Lnone/cn;Lnone/aky;)V METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag diff --git a/mappings/net/minecraft/entity/boss/EntityEnderDragonPart.mapping b/mappings/net/minecraft/entity/parts/EntityPart.mapping similarity index 58% rename from mappings/net/minecraft/entity/boss/EntityEnderDragonPart.mapping rename to mappings/net/minecraft/entity/parts/EntityPart.mapping index 875e62acbd..7127fc557a 100644 --- a/mappings/net/minecraft/entity/boss/EntityEnderDragonPart.mapping +++ b/mappings/net/minecraft/entity/parts/EntityPart.mapping @@ -1,12 +1,19 @@ -CLASS none/xp net/minecraft/entity/boss/EntityEnderDragonPart +CLASS none/xp net/minecraft/entity/parts/EntityPart + FIELD a damageDelegate Lnone/xo; FIELD b name Ljava/lang/String; METHOD (Lnone/xo;Ljava/lang/String;FF)V + ARG 0 damageDelegate ARG 1 name + ARG 2 width + ARG 3 height METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag METHOD a damage (Lnone/rr;F)Z ARG 0 source ARG 1 damage + METHOD aq doesCollide ()Z METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag METHOD i initDataTracker ()V + METHOD s isPartOf (Lnone/sg;)Z + ARG 0 other diff --git a/mappings/net/minecraft/entity/parts/IEntityPartDamageDelegate.mapping b/mappings/net/minecraft/entity/parts/IEntityPartDamageDelegate.mapping new file mode 100644 index 0000000000..5726f37604 --- /dev/null +++ b/mappings/net/minecraft/entity/parts/IEntityPartDamageDelegate.mapping @@ -0,0 +1,6 @@ +CLASS none/xo net/minecraft/entity/parts/IEntityPartDamageDelegate + METHOD a getWorld ()Lnone/aiw; + METHOD a damage (Lnone/xp;Lnone/rr;F)Z + ARG 0 part + ARG 1 source + ARG 2 amount diff --git a/mappings/net/minecraft/entity/passive/EntityPassive.mapping b/mappings/net/minecraft/entity/passive/EntityPassive.mapping index 7b573461ff..62483f4675 100644 --- a/mappings/net/minecraft/entity/passive/EntityPassive.mapping +++ b/mappings/net/minecraft/entity/passive/EntityPassive.mapping @@ -1,6 +1,9 @@ CLASS none/sd net/minecraft/entity/passive/EntityPassive FIELD a age I FIELD bx CHILD Lnone/kj; + METHOD a setSize (FF)V + ARG 0 width + ARG 1 height METHOD a interactMob (Lnone/aam;Lnone/rb;)Z ARG 0 player ARG 1 playerHand diff --git a/mappings/net/minecraft/entity/projectile/EntityDragonFireball.mapping b/mappings/net/minecraft/entity/projectile/EntityDragonFireball.mapping index 26865758d2..ca04c35234 100644 --- a/mappings/net/minecraft/entity/projectile/EntityDragonFireball.mapping +++ b/mappings/net/minecraft/entity/projectile/EntityDragonFireball.mapping @@ -4,5 +4,6 @@ CLASS none/aaq net/minecraft/entity/projectile/EntityDragonFireball METHOD a damage (Lnone/rr;F)Z ARG 0 source ARG 1 damage + METHOD aq doesCollide ()Z METHOD b registerTagUpgraders (Lnone/pf;)V ARG 0 handler diff --git a/mappings/net/minecraft/entity/projectile/EntityExplodingWitherSkull.mapping b/mappings/net/minecraft/entity/projectile/EntityExplodingWitherSkull.mapping index 960a680330..3524871635 100644 --- a/mappings/net/minecraft/entity/projectile/EntityExplodingWitherSkull.mapping +++ b/mappings/net/minecraft/entity/projectile/EntityExplodingWitherSkull.mapping @@ -24,6 +24,7 @@ CLASS none/abh net/minecraft/entity/projectile/EntityExplodingWitherSkull METHOD a setCharged (Z)V ARG 0 value METHOD aJ isOnFire ()Z + METHOD aq doesCollide ()Z METHOD b registerTagUpgraders (Lnone/pf;)V ARG 0 handler METHOD i initDataTracker ()V diff --git a/mappings/net/minecraft/entity/projectile/EntityExplosiveProjectile.mapping b/mappings/net/minecraft/entity/projectile/EntityExplosiveProjectile.mapping index b5d112e753..922028146a 100644 --- a/mappings/net/minecraft/entity/projectile/EntityExplosiveProjectile.mapping +++ b/mappings/net/minecraft/entity/projectile/EntityExplosiveProjectile.mapping @@ -15,6 +15,7 @@ CLASS none/aas net/minecraft/entity/projectile/EntityExplosiveProjectile METHOD a damage (Lnone/rr;F)Z ARG 0 source ARG 1 damage + METHOD aq doesCollide ()Z METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag METHOD i initDataTracker ()V diff --git a/mappings/net/minecraft/entity/projectile/EntityShulkerBullet.mapping b/mappings/net/minecraft/entity/projectile/EntityShulkerBullet.mapping index 2fbbeffc39..2917a1ea76 100644 --- a/mappings/net/minecraft/entity/projectile/EntityShulkerBullet.mapping +++ b/mappings/net/minecraft/entity/projectile/EntityShulkerBullet.mapping @@ -5,6 +5,7 @@ CLASS none/aax net/minecraft/entity/projectile/EntityShulkerBullet ARG 0 source ARG 1 damage METHOD aJ isOnFire ()Z + METHOD aq doesCollide ()Z METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag METHOD bC getSoundCategory ()Lnone/nm; diff --git a/mappings/net/minecraft/entity/projectile/EntitySmallFireball.mapping b/mappings/net/minecraft/entity/projectile/EntitySmallFireball.mapping index 0a768f2d46..79a7c919cf 100644 --- a/mappings/net/minecraft/entity/projectile/EntitySmallFireball.mapping +++ b/mappings/net/minecraft/entity/projectile/EntitySmallFireball.mapping @@ -4,5 +4,6 @@ CLASS none/aay net/minecraft/entity/projectile/EntitySmallFireball METHOD a damage (Lnone/rr;F)Z ARG 0 source ARG 1 damage + METHOD aq doesCollide ()Z METHOD b registerTagUpgraders (Lnone/pf;)V ARG 0 handler diff --git a/mappings/net/minecraft/entity/vehicle/EntityBoat.mapping b/mappings/net/minecraft/entity/vehicle/EntityBoat.mapping index 7120bd42b3..59e5444e84 100644 --- a/mappings/net/minecraft/entity/vehicle/EntityBoat.mapping +++ b/mappings/net/minecraft/entity/vehicle/EntityBoat.mapping @@ -39,6 +39,7 @@ CLASS none/abj net/minecraft/entity/vehicle/EntityBoat ARG 1 damage METHOD a (Lnone/sg;)V ARG 0 entity + METHOD aq doesCollide ()Z METHOD b interact (Lnone/aam;Lnone/rb;)Z ARG 0 player ARG 1 hand diff --git a/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping b/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping index 59cc5c396e..fdc46f982a 100644 --- a/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping +++ b/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping @@ -59,6 +59,7 @@ CLASS none/abk net/minecraft/entity/vehicle/EntityMinecartBase ARG 1 damage METHOD a setCustomBlockPresent (Z)V ARG 0 value + METHOD aq doesCollide ()Z METHOD b setPosition (DDD)V ARG 0 x ARG 1 y