From 2f3c26312f8840b9219e61e3aaf1c340b1ec2af7 Mon Sep 17 00:00:00 2001 From: copygirl Date: Sat, 10 Sep 2016 17:26:28 +0200 Subject: [PATCH] Map various things and entity TrackedData fields and related (#65) * Map PotionHelper * Villager & Wolf skin texture fields * Various entity mappings * Map EntityEnderDragonPart * Fix DamageSource attacker/source mixup * Rename BlockPos nested classes & map PooledMutable * Map projectile onCollision & onHit * Map entity TrackedData fields and related * Fix "invulnurable" typing error * Fix Block.DEFAULT_ID -> AIR_ID * Fix Minecart "carried" -> "contained" * Fix isSourceCreativePlayer * Fix Entity.dropItems -> dropStack Also tiny parameter name addition * Fix Entity.AIR -> BREATH * Fix Entity.setOnFire -> setOnFireFor * Fix tamable -> tameable --- mappings/net/minecraft/block/Block.mapping | 2 +- .../client/player/EntityPlayerClient.mapping | 4 ++ ...lParts.mapping => PlayerModelPart.mapping} | 4 +- .../impl/EntityRendererVillager.mapping | 6 ++ .../entity/impl/EntityRendererWolf.mapping | 3 + mappings/net/minecraft/entity/Entity.mapping | 55 ++++++++++++++--- .../net/minecraft/entity/EntityLiving.mapping | 28 +++++++++ .../boss/impl/EntityEnderDragon.mapping | 15 ++++- .../boss/impl/EntityEnderDragonPart.mapping | 10 ++++ .../entity/boss/impl/EntityWither.mapping | 20 ++++++- .../entity/damage/DamageSource.mapping | 5 +- .../entity/damage/DamageSourceEntity.mapping | 6 +- .../damage/DamageSourceProjectile.mapping | 10 ++-- .../decoration/EntityDecorationBase.mapping | 11 ++++ .../decoration/impl/EntityArmorStand.mapping | 28 +++++++++ .../impl/EntityEnderCrystal.mapping | 9 +++ .../decoration/impl/EntityItemFrame.mapping | 23 ++++++++ .../decoration/impl/EntityLeashKnot.mapping | 2 + .../entity/impl/EntityAreaEffectCloud.mapping | 59 +++++++++++++++++++ .../entity/impl/EntityEnderEye.mapping | 1 + .../entity/impl/EntityExperienceOrb.mapping | 12 +++- .../entity/impl/EntityFallingBlock.mapping | 1 + .../entity/impl/EntityFirework.mapping | 2 + .../minecraft/entity/impl/EntityItem.mapping | 4 +- .../entity/impl/EntityLightning.mapping | 1 + .../entity/impl/EntityTNTPrimed.mapping | 17 ++++++ .../entity/mob/EntityAquatic.mapping | 1 + .../entity/mob/EntityAquaticBase.mapping | 1 - .../entity/mob/EntityHostile.mapping} | 4 +- ...ntityMobBase.mapping => EntityMob.mapping} | 18 +++++- .../entity/mob/EntitySkeletonBase.mapping | 10 ++++ .../minecraft/entity/mob/EntityZombie.mapping | 21 +++++++ .../entity/mob/impl/EntityBlaze.mapping | 10 +++- .../entity/mob/impl/EntityCreeper.mapping | 19 ++++++ .../mob/impl/EntityElderGuardian.mapping | 4 +- .../entity/mob/impl/EntityEnderman.mapping | 16 ++++- .../entity/mob/impl/EntityEndermite.mapping | 4 +- .../entity/mob/impl/EntityGhast.mapping | 9 ++- .../entity/mob/impl/EntityGuardian.mapping | 6 +- .../entity/mob/impl/EntityHusk.mapping | 4 +- .../entity/mob/impl/EntityMagmaCube.mapping | 4 ++ .../entity/mob/impl/EntityPigZombie.mapping | 7 ++- .../entity/mob/impl/EntityShulker.mapping | 16 ++++- .../entity/mob/impl/EntitySilverfish.mapping | 4 +- .../entity/mob/impl/EntitySkeleton.mapping | 4 +- .../mob/impl/EntitySkeletonHorse.mapping | 7 ++- .../entity/mob/impl/EntitySlime.mapping | 7 +++ .../entity/mob/impl/EntitySpider.mapping | 9 ++- .../entity/mob/impl/EntityStray.mapping | 4 +- .../entity/mob/impl/EntityWitch.mapping | 9 ++- .../mob/impl/EntityWitherSkeleton.mapping | 4 +- .../entity/mob/impl/EntityZombie.mapping | 8 --- .../entity/mob/impl/EntityZombieHorse.mapping | 7 ++- .../mob/impl/EntityZombieVillager.mapping | 18 +++++- ...nimalBase.mapping => EntityAnimal.mapping} | 5 +- .../entity/passive/EntityHorseBase.mapping | 34 ++++++++++- .../entity/passive/EntityPassive.mapping | 17 ++++++ .../entity/passive/EntityTameable.mapping | 18 ++++++ .../entity/passive/impl/EntityBat.mapping | 10 +++- .../entity/passive/impl/EntityChicken.mapping | 8 ++- .../entity/passive/impl/EntityCow.mapping | 11 +++- .../entity/passive/impl/EntityDonkey.mapping | 6 +- .../passive/impl/EntityDonkeyBase.mapping | 11 ++++ .../entity/passive/impl/EntityHorse.mapping | 18 +++++- .../passive/impl/EntityIronGolem.mapping | 7 +++ .../passive/impl/EntityMooshroom.mapping | 9 +++ .../entity/passive/impl/EntityMule.mapping | 4 +- .../entity/passive/impl/EntityOcelot.mapping | 19 +++++- .../entity/passive/impl/EntityPig.mapping | 18 +++++- .../passive/impl/EntityPolarBear.mapping | 7 ++- .../entity/passive/impl/EntityRabbit.mapping | 14 ++++- .../entity/passive/impl/EntitySheep.mapping | 16 ++++- .../entity/passive/impl/EntitySnowman.mapping | 12 +++- .../entity/passive/impl/EntitySquid.mapping | 4 +- .../passive/impl/EntityVillager.mapping | 19 +++++- .../entity/passive/impl/EntityWolf.mapping | 21 ++++++- .../entity/player/EntityPlayer.mapping | 15 ++++- .../entity/player/EntityPlayerServer.mapping | 3 + .../entity/projectile/EntityArrowBase.mapping | 19 ++++++ .../EntityExplosiveProjectile.mapping | 12 ++++ .../projectile/impl/EntityArrow.mapping | 19 ++++++ .../impl/EntityDragonFireball.mapping | 2 + .../impl/EntityExplodingWitherSkull.mapping | 19 ++++++ .../projectile/impl/EntityFireball.mapping | 2 + .../projectile/impl/EntityFishHook.mapping | 3 + .../impl/EntityShulkerBullet.mapping | 2 + .../impl/EntitySmallFireball.mapping | 2 + .../impl/EntitySpectralArrow.mapping | 3 + .../entity/thrown/EntityThrown.mapping | 20 +++++++ .../entity/thrown/impl/EntitySnowball.mapping | 2 + .../impl/EntityThrowableExpBottle.mapping | 1 - .../thrown/impl/EntityThrownEgg.mapping | 2 + .../impl/EntityThrownEnderpearl.mapping | 2 + .../impl/EntityThrownExperienceBottle.mapping | 3 + .../thrown/impl/EntityThrownPotion.mapping | 17 ++++++ .../entity/tracker/DataTracker.mapping | 2 + .../entity/vehicle/EntityMinecartBase.mapping | 15 +++++ .../entity/vehicle/impl/EntityBoat.mapping | 7 +++ .../vehicle/impl/EntityChestMinecart.mapping | 2 + .../impl/EntityCommandBlockMinecart.mapping | 5 ++ .../impl/EntityFurnaceMinecart.mapping | 6 ++ .../vehicle/impl/EntityHopperMinecart.mapping | 2 + .../impl/EntitySpawnerMinecart.mapping | 1 + .../vehicle/impl/EntityTNTMinecart.mapping | 1 + .../net/minecraft/potion/PotionHelper.mapping | 29 +++++++++ .../net/minecraft/util/math/BlockPos.mapping | 59 ++++++++++++++----- mappings/none/sb.mapping | 4 -- mappings/none/sl.mapping | 1 + mappings/none/st.mapping | 2 + mappings/none/sy.mapping | 3 - mappings/none/wo.mapping | 4 +- mappings/none/xa.mapping | 3 - mappings/none/xn.mapping | 6 -- mappings/none/zb.mapping | 5 -- 114 files changed, 1053 insertions(+), 113 deletions(-) rename mappings/net/minecraft/client/render/entity/{PlayerModelParts.mapping => PlayerModelPart.mapping} (91%) create mode 100644 mappings/net/minecraft/entity/boss/impl/EntityEnderDragonPart.mapping create mode 100644 mappings/net/minecraft/entity/mob/EntityAquatic.mapping delete mode 100644 mappings/net/minecraft/entity/mob/EntityAquaticBase.mapping rename mappings/{none/zo.mapping => net/minecraft/entity/mob/EntityHostile.mapping} (60%) rename mappings/net/minecraft/entity/mob/{EntityMobBase.mapping => EntityMob.mapping} (64%) create mode 100644 mappings/net/minecraft/entity/mob/EntitySkeletonBase.mapping create mode 100644 mappings/net/minecraft/entity/mob/EntityZombie.mapping delete mode 100644 mappings/net/minecraft/entity/mob/impl/EntityZombie.mapping rename mappings/net/minecraft/entity/passive/{EntityAnimalBase.mapping => EntityAnimal.mapping} (52%) create mode 100644 mappings/net/minecraft/entity/passive/EntityPassive.mapping create mode 100644 mappings/net/minecraft/entity/passive/EntityTameable.mapping create mode 100644 mappings/net/minecraft/entity/passive/impl/EntityDonkeyBase.mapping delete mode 100644 mappings/net/minecraft/entity/thrown/impl/EntityThrowableExpBottle.mapping create mode 100644 mappings/net/minecraft/entity/thrown/impl/EntityThrownExperienceBottle.mapping create mode 100644 mappings/net/minecraft/potion/PotionHelper.mapping delete mode 100644 mappings/none/sb.mapping create mode 100644 mappings/none/st.mapping delete mode 100644 mappings/none/sy.mapping delete mode 100644 mappings/none/xa.mapping delete mode 100644 mappings/none/xn.mapping delete mode 100644 mappings/none/zb.mapping diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index f5c16fa19e..02379a9d73 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -1,6 +1,6 @@ CLASS none/akw net/minecraft/block/Block FIELD A stateFactory Lnone/ask; - FIELD a DEFAULT_ID Lnone/kp; + FIELD a AIR_ID Lnone/kp; FIELD b creativeTab Lnone/adq; FIELD c defaultState Lnone/asj; FIELD d unlocalizedName Ljava/lang/String; diff --git a/mappings/net/minecraft/client/player/EntityPlayerClient.mapping b/mappings/net/minecraft/client/player/EntityPlayerClient.mapping index d156adc1e7..17b54c1216 100644 --- a/mappings/net/minecraft/client/player/EntityPlayerClient.mapping +++ b/mappings/net/minecraft/client/player/EntityPlayerClient.mapping @@ -15,6 +15,7 @@ CLASS none/boe net/minecraft/client/player/EntityPlayerClient ARG 0 component METHOD a addChatMsg (Lnone/fa;Z)V METHOD a onTrackedDataSet (Lnone/kj;)V + ARG 0 data METHOD a playSoundAtEntity (Lnone/nk;FF)V ARG 0 sound ARG 1 volume @@ -31,8 +32,11 @@ CLASS none/boe net/minecraft/client/player/EntityPlayerClient ARG 1 damage METHOD a spawnEntityItem (Lnone/yy;)Lnone/aeq; METHOD a dropSelectedItem (Z)Lnone/yy; + METHOD b heal (F)V + ARG 0 amount METHOD c getBlockPos ()Lnone/cn; METHOD c setCurrentHand (Lnone/qz;)V + METHOD cy ()Lnone/qz; METHOD d move (DDD)V METHOD g sendChatMessage (Ljava/lang/String;)V ARG 0 message diff --git a/mappings/net/minecraft/client/render/entity/PlayerModelParts.mapping b/mappings/net/minecraft/client/render/entity/PlayerModelPart.mapping similarity index 91% rename from mappings/net/minecraft/client/render/entity/PlayerModelParts.mapping rename to mappings/net/minecraft/client/render/entity/PlayerModelPart.mapping index 4bf523d68d..54b0a153e7 100644 --- a/mappings/net/minecraft/client/render/entity/PlayerModelParts.mapping +++ b/mappings/net/minecraft/client/render/entity/PlayerModelPart.mapping @@ -1,4 +1,4 @@ -CLASS none/aal net/minecraft/client/render/entity/PlayerModelParts +CLASS none/aal net/minecraft/client/render/entity/PlayerModelPart FIELD a CAPE Lnone/aal; FIELD b BODY Lnone/aal; FIELD c LEFT_ARM Lnone/aal; @@ -7,11 +7,13 @@ CLASS none/aal net/minecraft/client/render/entity/PlayerModelParts FIELD f RIGHT_LEG Lnone/aal; FIELD g HEAD Lnone/aal; FIELD h id I + FIELD i bitFlag I FIELD j name Ljava/lang/String; FIELD k localizedName Lnone/fa; METHOD (Ljava/lang/String;IILjava/lang/String;)V ARG 0 id ARG 1 name + METHOD a getBitFlag ()I METHOD b getId ()I METHOD c getName ()Ljava/lang/String; METHOD d getLocalizedName ()Lnone/fa; diff --git a/mappings/net/minecraft/client/render/entity/impl/EntityRendererVillager.mapping b/mappings/net/minecraft/client/render/entity/impl/EntityRendererVillager.mapping index 147728c1c7..9038340be5 100644 --- a/mappings/net/minecraft/client/render/entity/impl/EntityRendererVillager.mapping +++ b/mappings/net/minecraft/client/render/entity/impl/EntityRendererVillager.mapping @@ -1 +1,7 @@ CLASS none/buu net/minecraft/client/render/entity/impl/EntityRendererVillager + FIELD a VILLAGER_SKIN Lnone/kp; + FIELD b FARMER_SKIN Lnone/kp; + FIELD k LIBRARIAN_SKIN Lnone/kp; + FIELD l PRIEST_SKIN Lnone/kp; + FIELD m BLACKSMITH_SKIN Lnone/kp; + FIELD n BUTCHER_SKIN Lnone/kp; diff --git a/mappings/net/minecraft/client/render/entity/impl/EntityRendererWolf.mapping b/mappings/net/minecraft/client/render/entity/impl/EntityRendererWolf.mapping index ff73a922a8..136c685503 100644 --- a/mappings/net/minecraft/client/render/entity/impl/EntityRendererWolf.mapping +++ b/mappings/net/minecraft/client/render/entity/impl/EntityRendererWolf.mapping @@ -1,4 +1,7 @@ CLASS none/buz net/minecraft/client/render/entity/impl/EntityRendererWolf + FIELD a WILD_SKIN Lnone/kp; + FIELD b TAMED_SKIN Lnone/kp; + FIELD k ANGRY_SKIN Lnone/kp; METHOD a (Lnone/se;DDDFF)V METHOD a (Lnone/sn;DDDFF)V METHOD a (Lnone/so;DDDFF)V diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index ad729f7e9c..d6a947bd26 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -2,13 +2,17 @@ CLASS none/se net/minecraft/entity/Entity FIELD F invalid Z FIELD L fallDistance F FIELD S rand Ljava/util/Random; + FIELD T age I FIELD Z dataTracker Lnone/km; - FIELD aB NAME_TRACKER Lnone/kj; - FIELD aC NAME_VISIBLE_TRACKER Lnone/kj; + FIELD aA BREATH Lnone/kj; + FIELD aB NAME Lnone/kj; + FIELD aC NAME_VISIBLE Lnone/kj; + FIELD aD SILENT Lnone/kj; + FIELD aE NO_GRAVITY Lnone/kj; FIELD aF invulnerable Z FIELD aG commandStats Lnone/o; FIELD a LOGGER Lorg/apache/logging/log4j/Logger; - FIELD aa flags Lnone/kj; + FIELD aa ENTITY_FLAGS Lnone/kj; FIELD ac chunkX I FIELD ad chunkY I FIELD ae chunkZ I @@ -21,6 +25,7 @@ CLASS none/se net/minecraft/entity/Entity FIELD au passengerList Ljava/util/List; FIELD av vehicle Lnone/se; FIELD aw boundingBox Lnone/bcp; + FIELD az fireTimer I FIELD b EMPTY_STACK_LIST Ljava/util/List; FIELD c NULL_BOX Lnone/bcp; FIELD g maxEntityId I @@ -45,6 +50,7 @@ CLASS none/se net/minecraft/entity/Entity METHOD O getEntityId ()I METHOD R getDataTracker ()Lnone/km; METHOD T invalidate ()V + METHOD X extinguish ()V METHOD a setPositionAnglesAndUpdate (DDDFF)V ARG 0 x ARG 1 y @@ -56,6 +62,16 @@ CLASS none/se net/minecraft/entity/Entity ARG 1 commandName METHOD a setUuid (Ljava/util/UUID;)V ARG 0 uuid + METHOD a dropStack (Lnone/aeo;I)Lnone/yy; + ARG 0 item + ARG 1 amount + METHOD a dropStack (Lnone/aeo;IF)Lnone/yy; + ARG 0 item + ARG 1 amount + ARG 2 yOffset + METHOD a dropStack (Lnone/aeq;F)Lnone/yy; + ARG 0 stack + ARG 1 yOffset METHOD a getEffectiveExplosionResistance (Lnone/aip;Lnone/aiu;Lnone/cn;Lnone/asj;)F ARG 0 explosion ARG 1 world @@ -80,6 +96,7 @@ CLASS none/se net/minecraft/entity/Entity METHOD a appendCommandFeedback (Lnone/fa;)V ARG 0 component METHOD a onTrackedDataSet (Lnone/kj;)V + ARG 0 data METHOD a playSoundAtEntity (Lnone/nk;FF)V ARG 0 sound ARG 1 volume @@ -93,6 +110,8 @@ CLASS none/se net/minecraft/entity/Entity METHOD a setEquippedStack (Lnone/sj;Lnone/aeq;)V ARG 0 slot ARG 1 stack + METHOD a onStruckByLightning (Lnone/yv;)V + ARG 0 lightning METHOD a toTagList ([D)Lnone/dz; ARG 0 values METHOD a toTagList ([F)Lnone/dz; @@ -100,12 +119,17 @@ CLASS none/se net/minecraft/entity/Entity METHOD aG getItemsHand ()Ljava/lang/Iterable; METHOD aH getItemsArmor ()Ljava/lang/Iterable; METHOD aI getItemsEquipped ()Ljava/lang/Iterable; + METHOD aJ isOnFire ()Z METHOD aK hasVehicle ()Z METHOD aL hasPassengers ()Z METHOD aO isGlowing ()Z + METHOD aP isInvisible ()Z + METHOD aR getBreath ()I METHOD aU getHeadPitch ()F METHOD aa getSoundSwim ()Lnone/nk; METHOD ab getSoundSplash ()Lnone/nk; + METHOD ad isSilent ()Z + METHOD ae isUnaffectedByGravity ()Z METHOD au isValid ()Z METHOD b setPosition (DDD)V ARG 0 x @@ -120,14 +144,16 @@ CLASS none/se net/minecraft/entity/Entity METHOD b setYawAndPitch (FF)V ARG 0 yaw ARG 1 pitch - METHOD b setTrackedBoolean (IZ)V - ARG 0 id + METHOD b setEntityFlag (IZ)V + ARG 0 index ARG 1 value METHOD b interact (Lnone/aak;Lnone/qz;)Z ARG 0 player ARG 1 playerHand METHOD b serializeEntityTag (Lnone/dt;)V ARG 0 tagCompound + METHOD b isInvulnerableTo (Lnone/rp;)Z + ARG 0 source METHOD bB getVehicle ()Lnone/se; METHOD bC getSoundCategory ()Lnone/nm; METHOD be getUuid ()Ljava/util/UUID; @@ -145,10 +171,14 @@ CLASS none/se net/minecraft/entity/Entity ARG 0 value METHOD c getSquaredDistanceTo (Lnone/cn;)D ARG 0 pos + METHOD c setSilent (Z)V + ARG 0 value METHOD d getPos ()Lnone/bcs; METHOD d move (DDD)V METHOD d getSquaredDistanceToCenter (Lnone/cn;)D ARG 0 pos + METHOD d setUnaffectedByGravity (Z)V + ARG 0 value METHOD e getWorld ()Lnone/aiu; METHOD e getSquaredDistanceTo (DDD)D ARG 0 x @@ -178,12 +208,21 @@ CLASS none/se net/minecraft/entity/Entity ARG 0 value METHOD h getSquaredDistanceTo (Lnone/se;)D ARG 0 entity + METHOD h setInvisible (Z)V + ARG 0 value METHOD h_ getName ()Ljava/lang/String; + METHOD i initDataTracker ()V + METHOD i setOnFireFor (I)V + ARG 0 seconds + METHOD i setInvulnerable (Z)V + ARG 0 value METHOD i_ getNameComponent ()Lnone/fa; METHOD j setCustomNameVisible (Z)V ARG 0 value - METHOD k getTrackedBoolean (I)Z - ARG 0 id + METHOD k getEntityFlag (I)Z + ARG 0 index + METHOD l setBreath (I)V + ARG 0 value METHOD m update ()V METHOD n_ hasCustomName ()Z METHOD o startRiding (Lnone/se;)V @@ -192,6 +231,8 @@ CLASS none/se net/minecraft/entity/Entity METHOD p dismountVehicle ()V METHOD p stopRiding (Lnone/se;)V ARG 0 entity + METHOD u setPositionAndAngles (Lnone/se;)V + ARG 0 other METHOD w hasPassenger (Lnone/se;)Z ARG 0 entity METHOD y_ shouldEchoCommandFeedback ()Z diff --git a/mappings/net/minecraft/entity/EntityLiving.mapping b/mappings/net/minecraft/entity/EntityLiving.mapping index 278fa320a7..9d7055d7ef 100644 --- a/mappings/net/minecraft/entity/EntityLiving.mapping +++ b/mappings/net/minecraft/entity/EntityLiving.mapping @@ -1,7 +1,18 @@ CLASS none/sn net/minecraft/entity/EntityLiving FIELD aQ headPitch F + FIELD au LIVING_FLAGS Lnone/kj; + FIELD ay stuckArrowTimer I + FIELD bt activePotionEffects Ljava/util/Map; + FIELD c HEALTH Lnone/kj; + FIELD f POTION_SWIRLS_COLOR Lnone/kj; + FIELD g POTION_SWIRLS_AMBIENT Lnone/kj; + FIELD h STUCK_ARROWS Lnone/kj; + METHOD F updatePotionVisibility ()V + METHOD a containsOnlyAmbientEffects (Ljava/util/Collection;)Z + ARG 0 effects METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a onTrackedDataSet (Lnone/kj;)V + ARG 0 data METHOD a swingHand (Lnone/qz;)V ARG 0 hand METHOD a setStackInHand (Lnone/qz;Lnone/aeq;)V @@ -21,6 +32,8 @@ CLASS none/sn net/minecraft/entity/EntityLiving METHOD a_ onEquipStack (Lnone/aeq;)V ARG 0 stack METHOD au isValid ()Z + METHOD b heal (F)V + ARG 0 amount METHOD b onBreakItem (Lnone/aeq;)V ARG 0 stack METHOD b serializeEntityTag (Lnone/dt;)V @@ -29,14 +42,29 @@ CLASS none/sn net/minecraft/entity/EntityLiving METHOD b getEquippedStack (Lnone/sj;)Lnone/aeq; ARG 0 slot METHOD bI getRand ()Ljava/util/Random; + METHOD bP clearPotionSwirls ()V + METHOD bT getHealth ()F + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; + METHOD c setHealth (F)V + ARG 0 value METHOD c setCurrentHand (Lnone/qz;)V METHOD c addEffect (Lnone/ry;)V ARG 0 effect + METHOD ca getHealthMaximum ()F + METHOD cb getStuckArrows ()I METHOD cf getMainHandStack ()Lnone/aeq; METHOD cg getOffHandStack ()Lnone/aeq; + METHOD cw getMainHand ()Lnone/sm; + METHOD cy ()Lnone/qz; METHOD e handleFallDamage (FF)V ARG 0 fallDistance + METHOD f setStuckArrows (I)V + ARG 0 value METHOD h setHeadPitch (F)V ARG 0 value + METHOD i initDataTracker ()V + METHOD l_ isChild ()Z METHOD m update ()V + METHOD m_ canClimb ()Z METHOD p dismountVehicle ()V diff --git a/mappings/net/minecraft/entity/boss/impl/EntityEnderDragon.mapping b/mappings/net/minecraft/entity/boss/impl/EntityEnderDragon.mapping index de65fe7a3a..cd6e1bc729 100644 --- a/mappings/net/minecraft/entity/boss/impl/EntityEnderDragon.mapping +++ b/mappings/net/minecraft/entity/boss/impl/EntityEnderDragon.mapping @@ -1,11 +1,24 @@ CLASS none/xp net/minecraft/entity/boss/impl/EntityEnderDragon - METHOD G getSoundDeath ()Lnone/nk; + FIELD bA partTail2 Lnone/xn; + FIELD bB partTail3 Lnone/xn; + FIELD bC partWingRight Lnone/xn; + FIELD bD partWingLeft Lnone/xn; + FIELD bJ LOGGER Lorg/apache/logging/log4j/Logger; + FIELD bv parts [Lnone/xn; + FIELD bw partHead Lnone/xn; + FIELD bx partNeck Lnone/xn; + FIELD by partBody Lnone/xn; + FIELD bz partTail1 Lnone/xn; + METHOD G getSoundAmbient ()Lnone/nk; METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a onTrackedDataSet (Lnone/kj;)V + ARG 0 data METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage METHOD b serializeEntityTag (Lnone/dt;)V METHOD bC getSoundCategory ()Lnone/nm; + METHOD bV getSoundHurt ()Lnone/nk; METHOD c addEffect (Lnone/ry;)V ARG 0 effect + METHOD i initDataTracker ()V diff --git a/mappings/net/minecraft/entity/boss/impl/EntityEnderDragonPart.mapping b/mappings/net/minecraft/entity/boss/impl/EntityEnderDragonPart.mapping new file mode 100644 index 0000000000..48072850eb --- /dev/null +++ b/mappings/net/minecraft/entity/boss/impl/EntityEnderDragonPart.mapping @@ -0,0 +1,10 @@ +CLASS none/xn net/minecraft/entity/boss/impl/EntityEnderDragonPart + FIELD b name Ljava/lang/String; + METHOD (Lnone/xm;Ljava/lang/String;FF)V + ARG 1 name + METHOD a deserializeEntityTag (Lnone/dt;)V + METHOD a damage (Lnone/rp;F)Z + ARG 0 source + ARG 1 damage + METHOD b serializeEntityTag (Lnone/dt;)V + METHOD i initDataTracker ()V diff --git a/mappings/net/minecraft/entity/boss/impl/EntityWither.mapping b/mappings/net/minecraft/entity/boss/impl/EntityWither.mapping index 6e56861891..e1d317cd24 100644 --- a/mappings/net/minecraft/entity/boss/impl/EntityWither.mapping +++ b/mappings/net/minecraft/entity/boss/impl/EntityWither.mapping @@ -1,11 +1,29 @@ CLASS none/yj net/minecraft/entity/boss/impl/EntityWither - METHOD G getSoundDeath ()Lnone/nk; + FIELD a TRACKED_ENTITY_ID_1 Lnone/kj; + FIELD b TRACKED_ENTITY_ID_2 Lnone/kj; + FIELD bx TRACKED_ENTITY_IDS [Lnone/kj; + FIELD by INVUL_TIMER Lnone/kj; + FIELD c TRACKED_ENTITY_ID_3 Lnone/kj; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD a setTrackedEntityId (II)V + ARG 0 headIndex + ARG 1 value + METHOD a canDestroy (Lnone/akw;)Z + ARG 0 block METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage METHOD b serializeEntityTag (Lnone/dt;)V + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; METHOD c addEffect (Lnone/ry;)V ARG 0 effect + METHOD de getInvulTimer ()I METHOD e handleFallDamage (FF)V ARG 0 fallDistance + METHOD g setInvulTimer (I)V + ARG 0 value + METHOD i initDataTracker ()V + METHOD m getTrackedEntityId (I)I + ARG 0 headIndex diff --git a/mappings/net/minecraft/entity/damage/DamageSource.mapping b/mappings/net/minecraft/entity/damage/DamageSource.mapping index 7466c878f3..87100355e5 100644 --- a/mappings/net/minecraft/entity/damage/DamageSource.mapping +++ b/mappings/net/minecraft/entity/damage/DamageSource.mapping @@ -61,8 +61,8 @@ CLASS none/rp net/minecraft/entity/damage/DamageSource METHOD e ()Z METHOD g doesDamageToCreative ()Z METHOD h isUnblockable ()Z - METHOD i getAttacker ()Lnone/se; - METHOD j getSource ()Lnone/se; + METHOD i getSource ()Lnone/se; + METHOD j getAttacker ()Lnone/se; METHOD l setDamageToCreative ()Lnone/rp; METHOD m setUnblockable ()Lnone/rp; METHOD n setFire ()Lnone/rp; @@ -72,3 +72,4 @@ CLASS none/rp net/minecraft/entity/damage/DamageSource METHOD r isScaledWithDifficulty ()Z METHOD s setMagic ()Z METHOD t setMagic ()Lnone/rp; + METHOD u isSourceCreativePlayer ()Z diff --git a/mappings/net/minecraft/entity/damage/DamageSourceEntity.mapping b/mappings/net/minecraft/entity/damage/DamageSourceEntity.mapping index 90cb7d5a4c..901fececb8 100644 --- a/mappings/net/minecraft/entity/damage/DamageSourceEntity.mapping +++ b/mappings/net/minecraft/entity/damage/DamageSourceEntity.mapping @@ -1,8 +1,8 @@ CLASS none/rq net/minecraft/entity/damage/DamageSourceEntity - FIELD t attacker Lnone/se; + FIELD t source Lnone/se; METHOD (Ljava/lang/String;Lnone/se;)V ARG 0 name - ARG 1 attacker + ARG 1 source METHOD c getDeathMessage (Lnone/sn;)Lnone/fa; - METHOD j getSource ()Lnone/se; + METHOD j getAttacker ()Lnone/se; METHOD r isScaledWithDifficulty ()Z diff --git a/mappings/net/minecraft/entity/damage/DamageSourceProjectile.mapping b/mappings/net/minecraft/entity/damage/DamageSourceProjectile.mapping index f38c7ab176..875aa17d82 100644 --- a/mappings/net/minecraft/entity/damage/DamageSourceProjectile.mapping +++ b/mappings/net/minecraft/entity/damage/DamageSourceProjectile.mapping @@ -1,9 +1,9 @@ CLASS none/rr net/minecraft/entity/damage/DamageSourceProjectile - FIELD u projectile Lnone/se; + FIELD u attacker Lnone/se; METHOD (Ljava/lang/String;Lnone/se;Lnone/se;)V ARG 0 name - ARG 1 attacker - ARG 2 projectile + ARG 1 projectile + ARG 2 attacker METHOD c getDeathMessage (Lnone/sn;)Lnone/fa; - METHOD i getAttacker ()Lnone/se; - METHOD j getSource ()Lnone/se; + METHOD i getSource ()Lnone/se; + METHOD j getAttacker ()Lnone/se; diff --git a/mappings/net/minecraft/entity/decoration/EntityDecorationBase.mapping b/mappings/net/minecraft/entity/decoration/EntityDecorationBase.mapping index 2a09182e9d..e6d079971a 100644 --- a/mappings/net/minecraft/entity/decoration/EntityDecorationBase.mapping +++ b/mappings/net/minecraft/entity/decoration/EntityDecorationBase.mapping @@ -1,10 +1,20 @@ CLASS none/ym net/minecraft/entity/decoration/EntityDecorationBase FIELD a blockPos Lnone/cn; FIELD b facing Lnone/cu; + METHOD (Lnone/aiu;Lnone/cn;)V + ARG 0 world + ARG 1 pos + METHOD a dropStack (Lnone/aeq;F)Lnone/yy; + ARG 0 stack + ARG 1 yOffset + METHOD a setFacing (Lnone/cu;)V + ARG 0 facing METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage + METHOD a onStruckByLightning (Lnone/yv;)V + ARG 0 lightning METHOD b setPosition (DDD)V ARG 0 x ARG 1 y @@ -12,5 +22,6 @@ CLASS none/ym net/minecraft/entity/decoration/EntityDecorationBase METHOD b serializeEntityTag (Lnone/dt;)V METHOD bl getHorizontalFacing ()Lnone/cu; METHOD d move (DDD)V + METHOD i initDataTracker ()V METHOD m update ()V METHOD q getBlockPos ()Lnone/cn; diff --git a/mappings/net/minecraft/entity/decoration/impl/EntityArmorStand.mapping b/mappings/net/minecraft/entity/decoration/impl/EntityArmorStand.mapping index c2f19fc7af..45e92c2a7d 100644 --- a/mappings/net/minecraft/entity/decoration/impl/EntityArmorStand.mapping +++ b/mappings/net/minecraft/entity/decoration/impl/EntityArmorStand.mapping @@ -1,4 +1,11 @@ CLASS none/yl net/minecraft/entity/decoration/impl/EntityArmorStand + FIELD a ARMOR_STAND_FLAGS Lnone/kj; + FIELD bB disabledSlots I + METHOD F updatePotionVisibility ()V + METHOD a setBitField (BIZ)B + ARG 0 value + ARG 1 bitField + ARG 2 on METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a damage (Lnone/rp;F)Z ARG 0 source @@ -6,13 +13,34 @@ CLASS none/yl net/minecraft/entity/decoration/impl/EntityArmorStand METHOD a setEquippedStack (Lnone/sj;Lnone/aeq;)V ARG 0 slot ARG 1 stack + METHOD a onStruckByLightning (Lnone/yv;)V + ARG 0 lightning METHOD aG getItemsHand ()Ljava/lang/Iterable; METHOD aH getItemsArmor ()Ljava/lang/Iterable; METHOD b serializeEntityTag (Lnone/dt;)V METHOD b getEquippedStack (Lnone/sj;)Lnone/aeq; ARG 0 slot + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; METHOD bt isImmuneToExplosion ()Z + METHOD cw getMainHand ()Lnone/sm; METHOD h setHeadPitch (F)V ARG 0 value + METHOD h setInvisible (Z)V + ARG 0 value + METHOD i initDataTracker ()V + METHOD l_ isChild ()Z METHOD m update ()V + METHOD m setSmall (Z)V + ARG 0 value + METHOD n setShowArms (Z)V + ARG 0 value + METHOD o isSmall ()Z + METHOD o setHideBasePlate (Z)V + ARG 0 value METHOD o_ getPistonBehavior ()Lnone/ayr; + METHOD p setMarker (Z)V + ARG 0 value + METHOD r shouldShowArms ()Z + METHOD s shouldHideBasePlate ()Z + METHOD t isMarker ()Z diff --git a/mappings/net/minecraft/entity/decoration/impl/EntityEnderCrystal.mapping b/mappings/net/minecraft/entity/decoration/impl/EntityEnderCrystal.mapping index b833650acb..ff8131fd1f 100644 --- a/mappings/net/minecraft/entity/decoration/impl/EntityEnderCrystal.mapping +++ b/mappings/net/minecraft/entity/decoration/impl/EntityEnderCrystal.mapping @@ -1,7 +1,16 @@ CLASS none/xo net/minecraft/entity/decoration/impl/EntityEnderCrystal + FIELD b BEAM_TARGET Lnone/kj; + FIELD c SHOW_BOTTOM Lnone/kj; + METHOD a setBeamTarget (Lnone/cn;)V + ARG 0 value METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage + METHOD a setShowBottom (Z)V + ARG 0 value METHOD b serializeEntityTag (Lnone/dt;)V + METHOD i initDataTracker ()V + METHOD j getBeamTarget ()Lnone/cn; + METHOD k shouldShowBottom ()Z METHOD m update ()V diff --git a/mappings/net/minecraft/entity/decoration/impl/EntityItemFrame.mapping b/mappings/net/minecraft/entity/decoration/impl/EntityItemFrame.mapping index 3a7389d13d..f6f394c41f 100644 --- a/mappings/net/minecraft/entity/decoration/impl/EntityItemFrame.mapping +++ b/mappings/net/minecraft/entity/decoration/impl/EntityItemFrame.mapping @@ -1,8 +1,31 @@ CLASS none/yn net/minecraft/entity/decoration/impl/EntityItemFrame + FIELD c ITEM_STACK Lnone/kj; + FIELD d ROTATION Lnone/kj; + FIELD e itemDropChance F + METHOD (Lnone/aiu;Lnone/cn;Lnone/cu;)V + ARG 0 world + ARG 1 pos + ARG 2 facing + METHOD a setRotation (I)V + ARG 0 value + METHOD a setRotation (IZ)V + ARG 0 value + ARG 1 updateComparator + METHOD a setHeldItemStack (Lnone/aeq;)V + ARG 0 value + METHOD a setHeldItemStack (Lnone/aeq;Z)V + ARG 0 value + ARG 1 updateComparator METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a onTrackedDataSet (Lnone/kj;)V + ARG 0 data METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage METHOD b interact (Lnone/aak;Lnone/qz;)Z + METHOD b (Lnone/aeq;)V + ARG 0 stack METHOD b serializeEntityTag (Lnone/dt;)V + METHOD i initDataTracker ()V + METHOD r getHeldItemStack ()Lnone/aeq; + METHOD s getRotation ()I diff --git a/mappings/net/minecraft/entity/decoration/impl/EntityLeashKnot.mapping b/mappings/net/minecraft/entity/decoration/impl/EntityLeashKnot.mapping index 58dd443db1..0cacdd00fb 100644 --- a/mappings/net/minecraft/entity/decoration/impl/EntityLeashKnot.mapping +++ b/mappings/net/minecraft/entity/decoration/impl/EntityLeashKnot.mapping @@ -1,4 +1,6 @@ CLASS none/yo net/minecraft/entity/decoration/impl/EntityLeashKnot + METHOD a setFacing (Lnone/cu;)V + ARG 0 facing METHOD a deserializeEntityTag (Lnone/dt;)V METHOD b setPosition (DDD)V ARG 0 x diff --git a/mappings/net/minecraft/entity/impl/EntityAreaEffectCloud.mapping b/mappings/net/minecraft/entity/impl/EntityAreaEffectCloud.mapping index 401f156a70..f7837f5fa8 100644 --- a/mappings/net/minecraft/entity/impl/EntityAreaEffectCloud.mapping +++ b/mappings/net/minecraft/entity/impl/EntityAreaEffectCloud.mapping @@ -1,6 +1,65 @@ CLASS none/sc net/minecraft/entity/impl/EntityAreaEffectCloud + FIELD aA radiusStart F + FIELD aB radiusGrowth F + FIELD aC owner Lnone/sn; + FIELD aD ownerUuid Ljava/util/UUID; + FIELD a RADIUS Lnone/kj; + FIELD au affectedEntities Ljava/util/Map; + FIELD av duration I + FIELD aw waitTime I + FIELD ax reapplicationDelay I + FIELD ay customColor Z + FIELD az durationOnUse I + FIELD b COLOR Lnone/kj; + FIELD c WAITING Lnone/kj; + FIELD d PARTICLE_ID Lnone/kj; + FIELD e PARTICLE_PARAM_1 Lnone/kj; + FIELD f PARTICLE_PARAM_2 Lnone/kj; + FIELD g potion Lnone/age; + FIELD h effects Ljava/util/List; + METHOD (Lnone/aiu;DDD)V + ARG 0 world + ARG 1 x + ARG 2 y + ARG 3 z + METHOD a setRadius (F)V + ARG 0 value + METHOD a setColor (I)V + ARG 0 value + METHOD a setPotion (Lnone/age;)V + ARG 0 value + METHOD a setParticleType (Lnone/dd;)V + ARG 0 value METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a onTrackedDataSet (Lnone/kj;)V + ARG 0 data + METHOD a setPotionEffect (Lnone/ry;)V + ARG 0 value + METHOD a setOwner (Lnone/sn;)V + ARG 0 value + METHOD a setWaiting (Z)V + ARG 0 value + METHOD b setRadiusStart (F)V + ARG 0 value + METHOD b setParticleParam1 (I)V + ARG 0 value METHOD b serializeEntityTag (Lnone/dt;)V + METHOD c setRadiusGrowth (F)V + ARG 0 value + METHOD d setParticleParam2 (I)V + ARG 0 value + METHOD e setDuration (I)V + ARG 0 value + METHOD g setWaitTime (I)V + ARG 0 value + METHOD i initDataTracker ()V + METHOD j getRadius ()F + METHOD k getColor ()I + METHOD l getParticleType ()Lnone/dd; METHOD m update ()V + METHOD n getParticleParam1 ()I + METHOD o getParticleParam2 ()I METHOD o_ getPistonBehavior ()Lnone/ayr; + METHOD q isWaiting ()Z + METHOD r getDuration ()I + METHOD y getOwner ()Lnone/sn; diff --git a/mappings/net/minecraft/entity/impl/EntityEnderEye.mapping b/mappings/net/minecraft/entity/impl/EntityEnderEye.mapping index 3fec4a1baf..85c86faac4 100644 --- a/mappings/net/minecraft/entity/impl/EntityEnderEye.mapping +++ b/mappings/net/minecraft/entity/impl/EntityEnderEye.mapping @@ -1,4 +1,5 @@ CLASS none/aap net/minecraft/entity/impl/EntityEnderEye METHOD a deserializeEntityTag (Lnone/dt;)V METHOD b serializeEntityTag (Lnone/dt;)V + METHOD i initDataTracker ()V METHOD m update ()V diff --git a/mappings/net/minecraft/entity/impl/EntityExperienceOrb.mapping b/mappings/net/minecraft/entity/impl/EntityExperienceOrb.mapping index e8470f897e..ce1e254f42 100644 --- a/mappings/net/minecraft/entity/impl/EntityExperienceOrb.mapping +++ b/mappings/net/minecraft/entity/impl/EntityExperienceOrb.mapping @@ -1,10 +1,18 @@ CLASS none/sk net/minecraft/entity/impl/EntityExperienceOrb - FIELD e experience I + FIELD e amount I + METHOD (Lnone/aiu;DDDI)V + ARG 0 world + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 amount + METHOD a (I)I METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage METHOD b serializeEntityTag (Lnone/dt;)V - METHOD j getExperience ()I + METHOD i initDataTracker ()V + METHOD j getExperienceAmount ()I METHOD k getOrbSize ()I METHOD m update ()V diff --git a/mappings/net/minecraft/entity/impl/EntityFallingBlock.mapping b/mappings/net/minecraft/entity/impl/EntityFallingBlock.mapping index 2eda3a2940..6a1e4597a8 100644 --- a/mappings/net/minecraft/entity/impl/EntityFallingBlock.mapping +++ b/mappings/net/minecraft/entity/impl/EntityFallingBlock.mapping @@ -22,6 +22,7 @@ CLASS none/yx net/minecraft/entity/impl/EntityFallingBlock METHOD b serializeEntityTag (Lnone/dt;)V METHOD e handleFallDamage (FF)V ARG 0 fallDistance + METHOD i initDataTracker ()V METHOD j getBlockPos ()Lnone/cn; METHOD k getWorldClient ()Lnone/aiu; METHOD l getBlockState ()Lnone/asj; diff --git a/mappings/net/minecraft/entity/impl/EntityFirework.mapping b/mappings/net/minecraft/entity/impl/EntityFirework.mapping index 01805266b0..8407fe5171 100644 --- a/mappings/net/minecraft/entity/impl/EntityFirework.mapping +++ b/mappings/net/minecraft/entity/impl/EntityFirework.mapping @@ -1,4 +1,6 @@ CLASS none/aar net/minecraft/entity/impl/EntityFirework + FIELD a ITEM_STACK Lnone/kj; METHOD a deserializeEntityTag (Lnone/dt;)V METHOD b serializeEntityTag (Lnone/dt;)V + METHOD i initDataTracker ()V METHOD m update ()V diff --git a/mappings/net/minecraft/entity/impl/EntityItem.mapping b/mappings/net/minecraft/entity/impl/EntityItem.mapping index 1761e66e4f..c6728a6200 100644 --- a/mappings/net/minecraft/entity/impl/EntityItem.mapping +++ b/mappings/net/minecraft/entity/impl/EntityItem.mapping @@ -1,6 +1,6 @@ CLASS none/yy net/minecraft/entity/impl/EntityItem FIELD b LOGGER Lorg/apache/logging/log4j/Logger; - FIELD c STACK_TRACKER Lnone/kj; + FIELD c STACK Lnone/kj; FIELD d age I FIELD e pickupDelay I FIELD f health I @@ -22,7 +22,9 @@ CLASS none/yy net/minecraft/entity/impl/EntityItem METHOD d setOwner (Ljava/lang/String;)V ARG 0 value METHOD e setThrower (Ljava/lang/String;)V + ARG 0 value METHOD h_ getName ()Ljava/lang/String; + METHOD i initDataTracker ()V METHOD k getStack ()Lnone/aeq; METHOD l getOwner ()Ljava/lang/String; METHOD m update ()V diff --git a/mappings/net/minecraft/entity/impl/EntityLightning.mapping b/mappings/net/minecraft/entity/impl/EntityLightning.mapping index ffcf5d08a9..36ce415277 100644 --- a/mappings/net/minecraft/entity/impl/EntityLightning.mapping +++ b/mappings/net/minecraft/entity/impl/EntityLightning.mapping @@ -2,4 +2,5 @@ CLASS none/yv net/minecraft/entity/impl/EntityLightning METHOD a deserializeEntityTag (Lnone/dt;)V METHOD b serializeEntityTag (Lnone/dt;)V METHOD bC getSoundCategory ()Lnone/nm; + METHOD i initDataTracker ()V METHOD m update ()V diff --git a/mappings/net/minecraft/entity/impl/EntityTNTPrimed.mapping b/mappings/net/minecraft/entity/impl/EntityTNTPrimed.mapping index 097fc58944..0b85ca1b97 100644 --- a/mappings/net/minecraft/entity/impl/EntityTNTPrimed.mapping +++ b/mappings/net/minecraft/entity/impl/EntityTNTPrimed.mapping @@ -1,5 +1,22 @@ CLASS none/yz net/minecraft/entity/impl/EntityTNTPrimed + FIELD a FUSE Lnone/kj; + FIELD b causingEntity Lnone/sn; + FIELD c fuseTimer I + METHOD (Lnone/aiu;DDDLnone/sn;)V + ARG 0 world + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 causingEntity + METHOD a setFuse (I)V + ARG 0 value METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a onTrackedDataSet (Lnone/kj;)V + ARG 0 data METHOD b serializeEntityTag (Lnone/dt;)V + METHOD i initDataTracker ()V + METHOD j getCausingEntity ()Lnone/sn; + METHOD k getFuse ()I + METHOD l getFuseTimer ()I METHOD m update ()V + METHOD n explode ()V diff --git a/mappings/net/minecraft/entity/mob/EntityAquatic.mapping b/mappings/net/minecraft/entity/mob/EntityAquatic.mapping new file mode 100644 index 0000000000..9d166892fc --- /dev/null +++ b/mappings/net/minecraft/entity/mob/EntityAquatic.mapping @@ -0,0 +1 @@ +CLASS none/wy net/minecraft/entity/mob/EntityAquatic diff --git a/mappings/net/minecraft/entity/mob/EntityAquaticBase.mapping b/mappings/net/minecraft/entity/mob/EntityAquaticBase.mapping deleted file mode 100644 index 6a31b19086..0000000000 --- a/mappings/net/minecraft/entity/mob/EntityAquaticBase.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/wy net/minecraft/entity/mob/EntityAquaticBase diff --git a/mappings/none/zo.mapping b/mappings/net/minecraft/entity/mob/EntityHostile.mapping similarity index 60% rename from mappings/none/zo.mapping rename to mappings/net/minecraft/entity/mob/EntityHostile.mapping index bf8e01fc1a..9671f07428 100644 --- a/mappings/none/zo.mapping +++ b/mappings/net/minecraft/entity/mob/EntityHostile.mapping @@ -1,8 +1,10 @@ -CLASS none/zo +CLASS none/zo net/minecraft/entity/mob/EntityHostile METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage METHOD aa getSoundSwim ()Lnone/nk; METHOD ab getSoundSplash ()Lnone/nk; METHOD bC getSoundCategory ()Lnone/nm; + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; METHOD m update ()V diff --git a/mappings/net/minecraft/entity/mob/EntityMobBase.mapping b/mappings/net/minecraft/entity/mob/EntityMob.mapping similarity index 64% rename from mappings/net/minecraft/entity/mob/EntityMobBase.mapping rename to mappings/net/minecraft/entity/mob/EntityMob.mapping index 39db0343e6..87c15a478f 100644 --- a/mappings/net/minecraft/entity/mob/EntityMobBase.mapping +++ b/mappings/net/minecraft/entity/mob/EntityMob.mapping @@ -1,12 +1,16 @@ -CLASS none/so net/minecraft/entity/mob/EntityMobBase - FIELD a mobFlags Lnone/kj; +CLASS none/so net/minecraft/entity/mob/EntityMob + FIELD a MOB_FLAGS Lnone/kj; FIELD bE leashed Z FIELD bt handDropChances [F FIELD bu armorDropChances [F + FIELD bv target Lnone/sn; FIELD bx handItems Lnone/dc; FIELD by armorItems Lnone/dc; FIELD bz pickUpLoot Z - METHOD G getSoundDeath ()Lnone/nk; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD a interactMob (Lnone/aak;Lnone/qz;)Z + ARG 0 player + ARG 1 playerHand METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a setEquippedStack (Lnone/sj;Lnone/aeq;)V ARG 0 slot @@ -17,13 +21,21 @@ CLASS none/so net/minecraft/entity/mob/EntityMobBase METHOD b serializeEntityTag (Lnone/dt;)V METHOD b getEquippedStack (Lnone/sj;)Lnone/aeq; ARG 0 slot + METHOD c setTarget (Lnone/sn;)V + ARG 0 value METHOD cR canPickUpLoot ()Z METHOD cU isLeashed ()Z + METHOD cW isAiDisabled ()Z METHOD cX isLeftHanded ()Z + METHOD cw getMainHand ()Lnone/sm; METHOD d getPreferredEquipmentSlot (Lnone/aeq;)Lnone/sj; ARG 0 stack + METHOD i initDataTracker ()V METHOD m update ()V METHOD m setCanPickUpLoot (Z)V ARG 0 value + METHOD n setAiDisabled (Z)V + ARG 0 value METHOD o setLeftHanded (Z)V ARG 0 value + METHOD z getTarget ()Lnone/sn; diff --git a/mappings/net/minecraft/entity/mob/EntitySkeletonBase.mapping b/mappings/net/minecraft/entity/mob/EntitySkeletonBase.mapping new file mode 100644 index 0000000000..05de562d33 --- /dev/null +++ b/mappings/net/minecraft/entity/mob/EntitySkeletonBase.mapping @@ -0,0 +1,10 @@ +CLASS none/zb net/minecraft/entity/mob/EntitySkeletonBase + FIELD a AIMING Lnone/kj; + METHOD a deserializeEntityTag (Lnone/dt;)V + METHOD a setEquippedStack (Lnone/sj;Lnone/aeq;)V + ARG 0 slot + ARG 1 stack + METHOD a setAiming (Z)V + ARG 0 value + METHOD df isAiming ()Z + METHOD i initDataTracker ()V diff --git a/mappings/net/minecraft/entity/mob/EntityZombie.mapping b/mappings/net/minecraft/entity/mob/EntityZombie.mapping new file mode 100644 index 0000000000..53d945ef1a --- /dev/null +++ b/mappings/net/minecraft/entity/mob/EntityZombie.mapping @@ -0,0 +1,21 @@ +CLASS none/aaa net/minecraft/entity/mob/EntityZombie + FIELD bx BABY Lnone/kj; + FIELD bz ARMS_RAISED Lnone/kj; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD a deserializeEntityTag (Lnone/dt;)V + METHOD a onTrackedDataSet (Lnone/kj;)V + ARG 0 data + METHOD a damage (Lnone/rp;F)Z + ARG 0 source + ARG 1 damage + METHOD a setArmsRaised (Z)V + ARG 0 value + METHOD b serializeEntityTag (Lnone/dt;)V + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; + METHOD dj hasArmsRaised ()Z + METHOD i initDataTracker ()V + METHOD l_ isChild ()Z + METHOD p setBreakDoors (Z)V + METHOD q setChild (Z)V + ARG 0 value diff --git a/mappings/net/minecraft/entity/mob/impl/EntityBlaze.mapping b/mappings/net/minecraft/entity/mob/impl/EntityBlaze.mapping index d1f8028e5a..52aef86a36 100644 --- a/mappings/net/minecraft/entity/mob/impl/EntityBlaze.mapping +++ b/mappings/net/minecraft/entity/mob/impl/EntityBlaze.mapping @@ -1,4 +1,12 @@ CLASS none/zc net/minecraft/entity/mob/impl/EntityBlaze - METHOD G getSoundDeath ()Lnone/nk; + FIELD c BLAZE_FLAGS Lnone/kj; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD a setFireActive (Z)V + ARG 0 value + METHOD aJ isOnFire ()Z + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; METHOD e handleFallDamage (FF)V ARG 0 fallDistance + METHOD i initDataTracker ()V + METHOD o isFireActive ()Z diff --git a/mappings/net/minecraft/entity/mob/impl/EntityCreeper.mapping b/mappings/net/minecraft/entity/mob/impl/EntityCreeper.mapping index 6de01789a7..bb60ba2816 100644 --- a/mappings/net/minecraft/entity/mob/impl/EntityCreeper.mapping +++ b/mappings/net/minecraft/entity/mob/impl/EntityCreeper.mapping @@ -1,6 +1,25 @@ CLASS none/ze net/minecraft/entity/mob/impl/EntityCreeper + FIELD a FUSE_SPEED Lnone/kj; + FIELD bA explosionRadius I + FIELD b CHARGED Lnone/kj; + FIELD bz fuse I + FIELD c IGNITED Lnone/kj; + METHOD a setFuseSpeed (I)V + ARG 0 value + METHOD a interactMob (Lnone/aak;Lnone/qz;)Z + ARG 0 player + ARG 1 playerHand METHOD a deserializeEntityTag (Lnone/dt;)V + METHOD a onStruckByLightning (Lnone/yv;)V + ARG 0 lightning METHOD b serializeEntityTag (Lnone/dt;)V + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; + METHOD df getFuseSpeed ()I + METHOD dg getIgnited ()Z + METHOD dh setIgnited ()V METHOD e handleFallDamage (FF)V ARG 0 fallDistance + METHOD i initDataTracker ()V METHOD m update ()V + METHOD o isCharged ()Z diff --git a/mappings/net/minecraft/entity/mob/impl/EntityElderGuardian.mapping b/mappings/net/minecraft/entity/mob/impl/EntityElderGuardian.mapping index 2e5627ca25..5d64371011 100644 --- a/mappings/net/minecraft/entity/mob/impl/EntityElderGuardian.mapping +++ b/mappings/net/minecraft/entity/mob/impl/EntityElderGuardian.mapping @@ -1,2 +1,4 @@ CLASS none/zf net/minecraft/entity/mob/impl/EntityElderGuardian - METHOD G getSoundDeath ()Lnone/nk; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; diff --git a/mappings/net/minecraft/entity/mob/impl/EntityEnderman.mapping b/mappings/net/minecraft/entity/mob/impl/EntityEnderman.mapping index 16360dbc71..edf2893a34 100644 --- a/mappings/net/minecraft/entity/mob/impl/EntityEnderman.mapping +++ b/mappings/net/minecraft/entity/mob/impl/EntityEnderman.mapping @@ -1,8 +1,22 @@ CLASS none/zg net/minecraft/entity/mob/impl/EntityEnderman - METHOD G getSoundDeath ()Lnone/nk; + FIELD bA ageWhenTargetSet I + FIELD bx CARRIED_BLOCK Lnone/kj; + FIELD by ANGRY Lnone/kj; + FIELD c CARRIABLE_BLOCKS Ljava/util/Set; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD a setCarriedBlock (Lnone/asj;)V + ARG 0 value METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a onTrackedDataSet (Lnone/kj;)V + ARG 0 data METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage METHOD b serializeEntityTag (Lnone/dt;)V + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; + METHOD c setTarget (Lnone/sn;)V + ARG 0 value + METHOD dg getCarriedBlock ()Lnone/asj; + METHOD dh isAngry ()Z + METHOD i initDataTracker ()V diff --git a/mappings/net/minecraft/entity/mob/impl/EntityEndermite.mapping b/mappings/net/minecraft/entity/mob/impl/EntityEndermite.mapping index 354125c7f6..f7c083bcb1 100644 --- a/mappings/net/minecraft/entity/mob/impl/EntityEndermite.mapping +++ b/mappings/net/minecraft/entity/mob/impl/EntityEndermite.mapping @@ -1,5 +1,7 @@ CLASS none/zh net/minecraft/entity/mob/impl/EntityEndermite - METHOD G getSoundDeath ()Lnone/nk; + METHOD G getSoundAmbient ()Lnone/nk; METHOD a deserializeEntityTag (Lnone/dt;)V METHOD b serializeEntityTag (Lnone/dt;)V + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; METHOD m update ()V diff --git a/mappings/net/minecraft/entity/mob/impl/EntityGhast.mapping b/mappings/net/minecraft/entity/mob/impl/EntityGhast.mapping index 5d7d79bc92..33254a94f7 100644 --- a/mappings/net/minecraft/entity/mob/impl/EntityGhast.mapping +++ b/mappings/net/minecraft/entity/mob/impl/EntityGhast.mapping @@ -1,9 +1,16 @@ CLASS none/zj net/minecraft/entity/mob/impl/EntityGhast - METHOD G getSoundDeath ()Lnone/nk; + FIELD a SHOOTING Lnone/kj; + METHOD G getSoundAmbient ()Lnone/nk; METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage + METHOD a setShooting (Z)V + ARG 0 value METHOD b serializeEntityTag (Lnone/dt;)V METHOD bC getSoundCategory ()Lnone/nm; + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; + METHOD i initDataTracker ()V METHOD m update ()V + METHOD o isShooting ()Z diff --git a/mappings/net/minecraft/entity/mob/impl/EntityGuardian.mapping b/mappings/net/minecraft/entity/mob/impl/EntityGuardian.mapping index a38a3803ac..da429281f0 100644 --- a/mappings/net/minecraft/entity/mob/impl/EntityGuardian.mapping +++ b/mappings/net/minecraft/entity/mob/impl/EntityGuardian.mapping @@ -1,6 +1,10 @@ CLASS none/zl net/minecraft/entity/mob/impl/EntityGuardian - METHOD G getSoundDeath ()Lnone/nk; + METHOD G getSoundAmbient ()Lnone/nk; METHOD a onTrackedDataSet (Lnone/kj;)V + ARG 0 data METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; + METHOD i initDataTracker ()V diff --git a/mappings/net/minecraft/entity/mob/impl/EntityHusk.mapping b/mappings/net/minecraft/entity/mob/impl/EntityHusk.mapping index 8a2fb863f6..429020d432 100644 --- a/mappings/net/minecraft/entity/mob/impl/EntityHusk.mapping +++ b/mappings/net/minecraft/entity/mob/impl/EntityHusk.mapping @@ -1,2 +1,4 @@ CLASS none/zm net/minecraft/entity/mob/impl/EntityHusk - METHOD G getSoundDeath ()Lnone/nk; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; diff --git a/mappings/net/minecraft/entity/mob/impl/EntityMagmaCube.mapping b/mappings/net/minecraft/entity/mob/impl/EntityMagmaCube.mapping index 3e6d6b570f..3e1a1bf735 100644 --- a/mappings/net/minecraft/entity/mob/impl/EntityMagmaCube.mapping +++ b/mappings/net/minecraft/entity/mob/impl/EntityMagmaCube.mapping @@ -1,3 +1,7 @@ CLASS none/zn net/minecraft/entity/mob/impl/EntityMagmaCube + METHOD a setSize (I)V + METHOD aJ isOnFire ()Z + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; METHOD e handleFallDamage (FF)V ARG 0 fallDistance diff --git a/mappings/net/minecraft/entity/mob/impl/EntityPigZombie.mapping b/mappings/net/minecraft/entity/mob/impl/EntityPigZombie.mapping index bafc89368d..b753dd0064 100644 --- a/mappings/net/minecraft/entity/mob/impl/EntityPigZombie.mapping +++ b/mappings/net/minecraft/entity/mob/impl/EntityPigZombie.mapping @@ -1,8 +1,13 @@ CLASS none/zp net/minecraft/entity/mob/impl/EntityPigZombie - METHOD G getSoundDeath ()Lnone/nk; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD a interactMob (Lnone/aak;Lnone/qz;)Z + ARG 0 player + ARG 1 playerHand METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage METHOD b serializeEntityTag (Lnone/dt;)V + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; METHOD m update ()V diff --git a/mappings/net/minecraft/entity/mob/impl/EntityShulker.mapping b/mappings/net/minecraft/entity/mob/impl/EntityShulker.mapping index 65af98422d..17a888bb49 100644 --- a/mappings/net/minecraft/entity/mob/impl/EntityShulker.mapping +++ b/mappings/net/minecraft/entity/mob/impl/EntityShulker.mapping @@ -1,7 +1,13 @@ CLASS none/zs net/minecraft/entity/mob/impl/EntityShulker - METHOD G getSoundDeath ()Lnone/nk; + FIELD a ATTACHED_FACE Lnone/kj; + FIELD b ATTACHED_BLOCK Lnone/kj; + FIELD c PEEK_AMOUNT Lnone/kj; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD a setPeekAmount (I)V + ARG 0 value METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a onTrackedDataSet (Lnone/kj;)V + ARG 0 data METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage @@ -11,4 +17,12 @@ CLASS none/zs net/minecraft/entity/mob/impl/EntityShulker ARG 2 z METHOD b serializeEntityTag (Lnone/dt;)V METHOD bC getSoundCategory ()Lnone/nm; + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; + METHOD de getAttachedFace ()Lnone/cu; + METHOD df getAttachedBlock ()Lnone/cn; + METHOD dg getPeekAmount ()I + METHOD g setAttachedBlock (Lnone/cn;)V + ARG 0 value + METHOD i initDataTracker ()V METHOD m update ()V diff --git a/mappings/net/minecraft/entity/mob/impl/EntitySilverfish.mapping b/mappings/net/minecraft/entity/mob/impl/EntitySilverfish.mapping index ead49dcbc9..db9cfd5f26 100644 --- a/mappings/net/minecraft/entity/mob/impl/EntitySilverfish.mapping +++ b/mappings/net/minecraft/entity/mob/impl/EntitySilverfish.mapping @@ -1,6 +1,8 @@ CLASS none/zt net/minecraft/entity/mob/impl/EntitySilverfish - METHOD G getSoundDeath ()Lnone/nk; + METHOD G getSoundAmbient ()Lnone/nk; METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; METHOD m update ()V diff --git a/mappings/net/minecraft/entity/mob/impl/EntitySkeleton.mapping b/mappings/net/minecraft/entity/mob/impl/EntitySkeleton.mapping index 8a0638d39b..48cbadf835 100644 --- a/mappings/net/minecraft/entity/mob/impl/EntitySkeleton.mapping +++ b/mappings/net/minecraft/entity/mob/impl/EntitySkeleton.mapping @@ -1,2 +1,4 @@ CLASS none/zu net/minecraft/entity/mob/impl/EntitySkeleton - METHOD G getSoundDeath ()Lnone/nk; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; diff --git a/mappings/net/minecraft/entity/mob/impl/EntitySkeletonHorse.mapping b/mappings/net/minecraft/entity/mob/impl/EntitySkeletonHorse.mapping index 8a7aabd28a..46955e970f 100644 --- a/mappings/net/minecraft/entity/mob/impl/EntitySkeletonHorse.mapping +++ b/mappings/net/minecraft/entity/mob/impl/EntitySkeletonHorse.mapping @@ -1,4 +1,9 @@ CLASS none/xg net/minecraft/entity/mob/impl/EntitySkeletonHorse - METHOD G getSoundDeath ()Lnone/nk; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD a interactMob (Lnone/aak;Lnone/qz;)Z + ARG 0 player + ARG 1 playerHand METHOD a deserializeEntityTag (Lnone/dt;)V METHOD b serializeEntityTag (Lnone/dt;)V + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; diff --git a/mappings/net/minecraft/entity/mob/impl/EntitySlime.mapping b/mappings/net/minecraft/entity/mob/impl/EntitySlime.mapping index 155f8342bd..adfff84d0e 100644 --- a/mappings/net/minecraft/entity/mob/impl/EntitySlime.mapping +++ b/mappings/net/minecraft/entity/mob/impl/EntitySlime.mapping @@ -1,6 +1,13 @@ CLASS none/zv net/minecraft/entity/mob/impl/EntitySlime + FIELD bv SLIME_SIZE Lnone/kj; METHOD T invalidate ()V + METHOD a setSize (I)V METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a onTrackedDataSet (Lnone/kj;)V + ARG 0 data METHOD b serializeEntityTag (Lnone/dt;)V + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; + METHOD df getSize ()I + METHOD i initDataTracker ()V METHOD m update ()V diff --git a/mappings/net/minecraft/entity/mob/impl/EntitySpider.mapping b/mappings/net/minecraft/entity/mob/impl/EntitySpider.mapping index 6b857a5aca..4db4cecdf8 100644 --- a/mappings/net/minecraft/entity/mob/impl/EntitySpider.mapping +++ b/mappings/net/minecraft/entity/mob/impl/EntitySpider.mapping @@ -1,3 +1,10 @@ CLASS none/zw net/minecraft/entity/mob/impl/EntitySpider - METHOD G getSoundDeath ()Lnone/nk; + FIELD a SPIDER_FLAGS Lnone/kj; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD a setCanClimb (Z)V + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; + METHOD i initDataTracker ()V METHOD m update ()V + METHOD m_ canClimb ()Z + METHOD o getCanClimb ()Z diff --git a/mappings/net/minecraft/entity/mob/impl/EntityStray.mapping b/mappings/net/minecraft/entity/mob/impl/EntityStray.mapping index 8a133ba66a..d42c68f176 100644 --- a/mappings/net/minecraft/entity/mob/impl/EntityStray.mapping +++ b/mappings/net/minecraft/entity/mob/impl/EntityStray.mapping @@ -1,2 +1,4 @@ CLASS none/zx net/minecraft/entity/mob/impl/EntityStray - METHOD G getSoundDeath ()Lnone/nk; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; diff --git a/mappings/net/minecraft/entity/mob/impl/EntityWitch.mapping b/mappings/net/minecraft/entity/mob/impl/EntityWitch.mapping index c9cc490ac1..6198d3a982 100644 --- a/mappings/net/minecraft/entity/mob/impl/EntityWitch.mapping +++ b/mappings/net/minecraft/entity/mob/impl/EntityWitch.mapping @@ -1,2 +1,9 @@ CLASS none/zy net/minecraft/entity/mob/impl/EntityWitch - METHOD G getSoundDeath ()Lnone/nk; + FIELD c DRINKING Lnone/kj; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD a setDrinking (Z)V + ARG 0 value + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; + METHOD i initDataTracker ()V + METHOD o isDrinking ()Z diff --git a/mappings/net/minecraft/entity/mob/impl/EntityWitherSkeleton.mapping b/mappings/net/minecraft/entity/mob/impl/EntityWitherSkeleton.mapping index ee4c7dc713..f24849e792 100644 --- a/mappings/net/minecraft/entity/mob/impl/EntityWitherSkeleton.mapping +++ b/mappings/net/minecraft/entity/mob/impl/EntityWitherSkeleton.mapping @@ -1,2 +1,4 @@ CLASS none/zz net/minecraft/entity/mob/impl/EntityWitherSkeleton - METHOD G getSoundDeath ()Lnone/nk; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; diff --git a/mappings/net/minecraft/entity/mob/impl/EntityZombie.mapping b/mappings/net/minecraft/entity/mob/impl/EntityZombie.mapping deleted file mode 100644 index ac58d528f0..0000000000 --- a/mappings/net/minecraft/entity/mob/impl/EntityZombie.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS none/aaa net/minecraft/entity/mob/impl/EntityZombie - METHOD G getSoundDeath ()Lnone/nk; - METHOD a deserializeEntityTag (Lnone/dt;)V - METHOD a onTrackedDataSet (Lnone/kj;)V - METHOD a damage (Lnone/rp;F)Z - ARG 0 source - ARG 1 damage - METHOD b serializeEntityTag (Lnone/dt;)V diff --git a/mappings/net/minecraft/entity/mob/impl/EntityZombieHorse.mapping b/mappings/net/minecraft/entity/mob/impl/EntityZombieHorse.mapping index 00b4f8a9ba..a8d205b360 100644 --- a/mappings/net/minecraft/entity/mob/impl/EntityZombieHorse.mapping +++ b/mappings/net/minecraft/entity/mob/impl/EntityZombieHorse.mapping @@ -1,2 +1,7 @@ CLASS none/xi net/minecraft/entity/mob/impl/EntityZombieHorse - METHOD G getSoundDeath ()Lnone/nk; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD a interactMob (Lnone/aak;Lnone/qz;)Z + ARG 0 player + ARG 1 playerHand + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; diff --git a/mappings/net/minecraft/entity/mob/impl/EntityZombieVillager.mapping b/mappings/net/minecraft/entity/mob/impl/EntityZombieVillager.mapping index a1a65fb15c..7aad1fd80a 100644 --- a/mappings/net/minecraft/entity/mob/impl/EntityZombieVillager.mapping +++ b/mappings/net/minecraft/entity/mob/impl/EntityZombieVillager.mapping @@ -1,5 +1,21 @@ CLASS none/aab net/minecraft/entity/mob/impl/EntityZombieVillager - METHOD G getSoundDeath ()Lnone/nk; + FIELD b CONVERTING Lnone/kj; + FIELD bx conversionTimer I + FIELD c PROFESSION Lnone/kj; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD a setProfession (I)V + ARG 0 value + METHOD a interactMob (Lnone/aak;Lnone/qz;)Z + ARG 0 player + ARG 1 playerHand METHOD a deserializeEntityTag (Lnone/dt;)V + METHOD b setConverting (I)V + ARG 0 remainingTicks METHOD b serializeEntityTag (Lnone/dt;)V + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; + METHOD di getProfession ()I + METHOD dl isConverting ()Z + METHOD dm finishConversion ()V + METHOD i initDataTracker ()V METHOD m update ()V diff --git a/mappings/net/minecraft/entity/passive/EntityAnimalBase.mapping b/mappings/net/minecraft/entity/passive/EntityAnimal.mapping similarity index 52% rename from mappings/net/minecraft/entity/passive/EntityAnimalBase.mapping rename to mappings/net/minecraft/entity/passive/EntityAnimal.mapping index bf07682a10..a698f50493 100644 --- a/mappings/net/minecraft/entity/passive/EntityAnimalBase.mapping +++ b/mappings/net/minecraft/entity/passive/EntityAnimal.mapping @@ -1,4 +1,7 @@ -CLASS none/wl net/minecraft/entity/passive/EntityAnimalBase +CLASS none/wl net/minecraft/entity/passive/EntityAnimal + METHOD a interactMob (Lnone/aak;Lnone/qz;)Z + ARG 0 player + ARG 1 playerHand METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a damage (Lnone/rp;F)Z ARG 0 source diff --git a/mappings/net/minecraft/entity/passive/EntityHorseBase.mapping b/mappings/net/minecraft/entity/passive/EntityHorseBase.mapping index eca0196546..32467e7d1f 100644 --- a/mappings/net/minecraft/entity/passive/EntityHorseBase.mapping +++ b/mappings/net/minecraft/entity/passive/EntityHorseBase.mapping @@ -1,10 +1,42 @@ CLASS none/xb net/minecraft/entity/passive/EntityHorseBase - METHOD G getSoundDeath ()Lnone/nk; + FIELD bD temper I + FIELD bI HORSE_FLAGS Lnone/kj; + FIELD bJ OWNER_UUID Lnone/kj; + METHOD G getSoundAmbient ()Lnone/nk; METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage + METHOD a createChild (Lnone/sb;)Lnone/sb; + ARG 0 other + METHOD b setOwnerUuid (Ljava/util/UUID;)V + ARG 0 uuid METHOD b serializeEntityTag (Lnone/dt;)V + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; + METHOD c setHorseFlag (IZ)V + ARG 0 index + ARG 1 value + METHOD dh isTame ()Z + METHOD di getOwnerUuid ()Ljava/util/UUID; + METHOD do isEating ()Z + METHOD dq isBred ()Z + METHOD dr getTemper ()I + METHOD dv isSaddled ()Z METHOD e handleFallDamage (FF)V ARG 0 fallDistance + METHOD g getHorseFlag (I)Z + ARG 0 index + METHOD i initDataTracker ()V METHOD m update ()V + METHOD m setTemper (I)V + ARG 0 value + METHOD m_ canClimb ()Z + METHOD q setTame (Z)V + ARG 0 value + METHOD s setBred (Z)V + ARG 0 value + METHOD t setSaddled (Z)V + ARG 0 value + METHOD u setEating (Z)V + ARG 0 value diff --git a/mappings/net/minecraft/entity/passive/EntityPassive.mapping b/mappings/net/minecraft/entity/passive/EntityPassive.mapping new file mode 100644 index 0000000000..fc48a63e80 --- /dev/null +++ b/mappings/net/minecraft/entity/passive/EntityPassive.mapping @@ -0,0 +1,17 @@ +CLASS none/sb net/minecraft/entity/passive/EntityPassive + FIELD a age I + FIELD bx CHILD Lnone/kj; + METHOD a interactMob (Lnone/aak;Lnone/qz;)Z + ARG 0 player + ARG 1 playerHand + METHOD a deserializeEntityTag (Lnone/dt;)V + METHOD a onTrackedDataSet (Lnone/kj;)V + ARG 0 data + METHOD a createChild (Lnone/sb;)Lnone/sb; + ARG 0 other + METHOD b serializeEntityTag (Lnone/dt;)V + METHOD b_ setAge (I)V + ARG 0 value + METHOD i initDataTracker ()V + METHOD l getAge ()I + METHOD l_ isChild ()Z diff --git a/mappings/net/minecraft/entity/passive/EntityTameable.mapping b/mappings/net/minecraft/entity/passive/EntityTameable.mapping new file mode 100644 index 0000000000..f80e12cb7c --- /dev/null +++ b/mappings/net/minecraft/entity/passive/EntityTameable.mapping @@ -0,0 +1,18 @@ +CLASS none/sy net/minecraft/entity/passive/EntityTameable + FIELD bx TAMEABLE_FLAGS Lnone/kj; + FIELD by OWNER_UUID Lnone/kj; + METHOD a deserializeEntityTag (Lnone/dt;)V + METHOD b getOwnerUuid ()Ljava/util/UUID; + METHOD b setOwnerUuid (Ljava/util/UUID;)V + ARG 0 value + METHOD b serializeEntityTag (Lnone/dt;)V + METHOD d isOwner (Lnone/sn;)Z + ARG 0 entity + METHOD de isTamed ()Z + METHOD df onTamedChanged ()V + METHOD dg isSitting ()Z + METHOD dh getOwner ()Lnone/sn; + METHOD i initDataTracker ()V + METHOD q setTamed (Z)V + ARG 0 value + METHOD r setSitting (Z)V diff --git a/mappings/net/minecraft/entity/passive/impl/EntityBat.mapping b/mappings/net/minecraft/entity/passive/impl/EntityBat.mapping index fd20c5914a..3e76a1992f 100644 --- a/mappings/net/minecraft/entity/passive/impl/EntityBat.mapping +++ b/mappings/net/minecraft/entity/passive/impl/EntityBat.mapping @@ -1,11 +1,17 @@ CLASS none/wj net/minecraft/entity/passive/impl/EntityBat - FIELD a batFlags Lnone/kj; - METHOD G getSoundDeath ()Lnone/nk; + FIELD a BAT_FLAGS Lnone/kj; + METHOD G getSoundAmbient ()Lnone/nk; METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage + METHOD a setRoosting (Z)V + ARG 0 value METHOD b serializeEntityTag (Lnone/dt;)V + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; METHOD e handleFallDamage (FF)V ARG 0 fallDistance + METHOD i initDataTracker ()V METHOD m update ()V + METHOD o isRoosting ()Z diff --git a/mappings/net/minecraft/entity/passive/impl/EntityChicken.mapping b/mappings/net/minecraft/entity/passive/impl/EntityChicken.mapping index 87aa636145..bc08968ff2 100644 --- a/mappings/net/minecraft/entity/passive/impl/EntityChicken.mapping +++ b/mappings/net/minecraft/entity/passive/impl/EntityChicken.mapping @@ -1,8 +1,14 @@ CLASS none/wm net/minecraft/entity/passive/impl/EntityChicken FIELD bD eggLayTime I - METHOD G getSoundDeath ()Lnone/nk; + METHOD G getSoundAmbient ()Lnone/nk; METHOD a deserializeEntityTag (Lnone/dt;)V + METHOD a createChild (Lnone/sb;)Lnone/sb; + ARG 0 other METHOD b serializeEntityTag (Lnone/dt;)V + METHOD b createChild (Lnone/sb;)Lnone/wm; + ARG 0 other + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; METHOD de ()Z METHOD e handleFallDamage (FF)V ARG 0 fallDistance diff --git a/mappings/net/minecraft/entity/passive/impl/EntityCow.mapping b/mappings/net/minecraft/entity/passive/impl/EntityCow.mapping index bcd7b1d333..bb90ab2450 100644 --- a/mappings/net/minecraft/entity/passive/impl/EntityCow.mapping +++ b/mappings/net/minecraft/entity/passive/impl/EntityCow.mapping @@ -1,2 +1,11 @@ CLASS none/wn net/minecraft/entity/passive/impl/EntityCow - METHOD G getSoundDeath ()Lnone/nk; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD a interactMob (Lnone/aak;Lnone/qz;)Z + ARG 0 player + ARG 1 playerHand + METHOD a createChild (Lnone/sb;)Lnone/sb; + ARG 0 other + METHOD b createChild (Lnone/sb;)Lnone/wn; + ARG 0 other + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; diff --git a/mappings/net/minecraft/entity/passive/impl/EntityDonkey.mapping b/mappings/net/minecraft/entity/passive/impl/EntityDonkey.mapping index fadbf44043..33599e51a4 100644 --- a/mappings/net/minecraft/entity/passive/impl/EntityDonkey.mapping +++ b/mappings/net/minecraft/entity/passive/impl/EntityDonkey.mapping @@ -1,2 +1,6 @@ CLASS none/xc net/minecraft/entity/passive/impl/EntityDonkey - METHOD G getSoundDeath ()Lnone/nk; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD a createChild (Lnone/sb;)Lnone/sb; + ARG 0 other + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; diff --git a/mappings/net/minecraft/entity/passive/impl/EntityDonkeyBase.mapping b/mappings/net/minecraft/entity/passive/impl/EntityDonkeyBase.mapping new file mode 100644 index 0000000000..f7fad5df71 --- /dev/null +++ b/mappings/net/minecraft/entity/passive/impl/EntityDonkeyBase.mapping @@ -0,0 +1,11 @@ +CLASS none/xa net/minecraft/entity/passive/impl/EntityDonkeyBase + FIELD bH CHEST Lnone/kj; + METHOD a interactMob (Lnone/aak;Lnone/qz;)Z + ARG 0 player + ARG 1 playerHand + METHOD a deserializeEntityTag (Lnone/dt;)V + METHOD b serializeEntityTag (Lnone/dt;)V + METHOD de hasChest ()Z + METHOD i initDataTracker ()V + METHOD p setHasChest (Z)V + ARG 0 value diff --git a/mappings/net/minecraft/entity/passive/impl/EntityHorse.mapping b/mappings/net/minecraft/entity/passive/impl/EntityHorse.mapping index 16a87a2fa0..c23aa9a3fc 100644 --- a/mappings/net/minecraft/entity/passive/impl/EntityHorse.mapping +++ b/mappings/net/minecraft/entity/passive/impl/EntityHorse.mapping @@ -1,5 +1,21 @@ CLASS none/xd net/minecraft/entity/passive/impl/EntityHorse - METHOD G getSoundDeath ()Lnone/nk; + FIELD bI VARIANT Lnone/kj; + FIELD bJ ARMOR_TYPE Lnone/kj; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD a interactMob (Lnone/aak;Lnone/qz;)Z + ARG 0 player + ARG 1 playerHand METHOD a deserializeEntityTag (Lnone/dt;)V + METHOD a createChild (Lnone/sb;)Lnone/sb; + ARG 0 other METHOD b serializeEntityTag (Lnone/dt;)V + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; + METHOD dF getArmorType ()Lnone/xe; + METHOD de getVariant ()I + METHOD f setArmorTypeFromStack (Lnone/aeq;)V + ARG 0 stack + METHOD i initDataTracker ()V METHOD m update ()V + METHOD o setVariant (I)V + ARG 0 value diff --git a/mappings/net/minecraft/entity/passive/impl/EntityIronGolem.mapping b/mappings/net/minecraft/entity/passive/impl/EntityIronGolem.mapping index dbaf026720..033189d398 100644 --- a/mappings/net/minecraft/entity/passive/impl/EntityIronGolem.mapping +++ b/mappings/net/minecraft/entity/passive/impl/EntityIronGolem.mapping @@ -1,3 +1,10 @@ CLASS none/wx net/minecraft/entity/passive/impl/EntityIronGolem + FIELD a IRON_GOLEM_FLAGS Lnone/kj; METHOD a deserializeEntityTag (Lnone/dt;)V METHOD b serializeEntityTag (Lnone/dt;)V + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; + METHOD dg isPlayerCreated ()Z + METHOD i initDataTracker ()V + METHOD p setPlayerCreated (Z)V + ARG 0 value diff --git a/mappings/net/minecraft/entity/passive/impl/EntityMooshroom.mapping b/mappings/net/minecraft/entity/passive/impl/EntityMooshroom.mapping index ae42d2175e..2bde112111 100644 --- a/mappings/net/minecraft/entity/passive/impl/EntityMooshroom.mapping +++ b/mappings/net/minecraft/entity/passive/impl/EntityMooshroom.mapping @@ -1 +1,10 @@ CLASS none/wp net/minecraft/entity/passive/impl/EntityMooshroom + METHOD a interactMob (Lnone/aak;Lnone/qz;)Z + ARG 0 player + ARG 1 playerHand + METHOD a createChild (Lnone/sb;)Lnone/sb; + ARG 0 other + METHOD b createChild (Lnone/sb;)Lnone/wn; + ARG 0 other + METHOD c createChild (Lnone/sb;)Lnone/wp; + ARG 0 other diff --git a/mappings/net/minecraft/entity/passive/impl/EntityMule.mapping b/mappings/net/minecraft/entity/passive/impl/EntityMule.mapping index 16b514019d..dcfb120bdf 100644 --- a/mappings/net/minecraft/entity/passive/impl/EntityMule.mapping +++ b/mappings/net/minecraft/entity/passive/impl/EntityMule.mapping @@ -1,2 +1,4 @@ CLASS none/xf net/minecraft/entity/passive/impl/EntityMule - METHOD G getSoundDeath ()Lnone/nk; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; diff --git a/mappings/net/minecraft/entity/passive/impl/EntityOcelot.mapping b/mappings/net/minecraft/entity/passive/impl/EntityOcelot.mapping index 0b49327515..577bd1e8b0 100644 --- a/mappings/net/minecraft/entity/passive/impl/EntityOcelot.mapping +++ b/mappings/net/minecraft/entity/passive/impl/EntityOcelot.mapping @@ -1,10 +1,27 @@ CLASS none/wq net/minecraft/entity/passive/impl/EntityOcelot - METHOD G getSoundDeath ()Lnone/nk; + FIELD bB OCELOT_TYPE Lnone/kj; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD a interactMob (Lnone/aak;Lnone/qz;)Z + ARG 0 player + ARG 1 playerHand METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage + METHOD a createChild (Lnone/sb;)Lnone/sb; + ARG 0 other METHOD b serializeEntityTag (Lnone/dt;)V + METHOD b createChild (Lnone/sb;)Lnone/wq; + ARG 0 other + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; + METHOD df onTamedChanged ()V + METHOD dm getOcelotType ()I METHOD e handleFallDamage (FF)V ARG 0 fallDistance + METHOD g getOcelotType (I)V + ARG 0 value METHOD h_ getName ()Ljava/lang/String; + METHOD i initDataTracker ()V + METHOD q setTamed (Z)V + ARG 0 value diff --git a/mappings/net/minecraft/entity/passive/impl/EntityPig.mapping b/mappings/net/minecraft/entity/passive/impl/EntityPig.mapping index dd3c12c683..292301a81d 100644 --- a/mappings/net/minecraft/entity/passive/impl/EntityPig.mapping +++ b/mappings/net/minecraft/entity/passive/impl/EntityPig.mapping @@ -1,6 +1,22 @@ CLASS none/wr net/minecraft/entity/passive/impl/EntityPig - METHOD G getSoundDeath ()Lnone/nk; + FIELD bx SADDLED Lnone/kj; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD a interactMob (Lnone/aak;Lnone/qz;)Z + ARG 0 player + ARG 1 playerHand METHOD a deserializeEntityTag (Lnone/dt;)V + METHOD a createChild (Lnone/sb;)Lnone/sb; + ARG 0 other + METHOD a onStruckByLightning (Lnone/yv;)V + ARG 0 lightning METHOD b serializeEntityTag (Lnone/dt;)V + METHOD b createChild (Lnone/sb;)Lnone/wr; + ARG 0 other + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; + METHOD de isSaddled ()Z METHOD e handleFallDamage (FF)V ARG 0 fallDistance + METHOD i initDataTracker ()V + METHOD p setSaddled (Z)V + ARG 0 value diff --git a/mappings/net/minecraft/entity/passive/impl/EntityPolarBear.mapping b/mappings/net/minecraft/entity/passive/impl/EntityPolarBear.mapping index 606703be3c..795d23690c 100644 --- a/mappings/net/minecraft/entity/passive/impl/EntityPolarBear.mapping +++ b/mappings/net/minecraft/entity/passive/impl/EntityPolarBear.mapping @@ -1,5 +1,10 @@ CLASS none/ws net/minecraft/entity/passive/impl/EntityPolarBear - METHOD G getSoundDeath ()Lnone/nk; + METHOD G getSoundAmbient ()Lnone/nk; METHOD a deserializeEntityTag (Lnone/dt;)V + METHOD a createChild (Lnone/sb;)Lnone/sb; + ARG 0 other METHOD b serializeEntityTag (Lnone/dt;)V + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; + METHOD i initDataTracker ()V METHOD m update ()V diff --git a/mappings/net/minecraft/entity/passive/impl/EntityRabbit.mapping b/mappings/net/minecraft/entity/passive/impl/EntityRabbit.mapping index 31891add95..5af70782d6 100644 --- a/mappings/net/minecraft/entity/passive/impl/EntityRabbit.mapping +++ b/mappings/net/minecraft/entity/passive/impl/EntityRabbit.mapping @@ -1,9 +1,21 @@ CLASS none/wt net/minecraft/entity/passive/impl/EntityRabbit - METHOD G getSoundDeath ()Lnone/nk; + FIELD bx RABBIT_TYPE Lnone/kj; + METHOD G getSoundAmbient ()Lnone/nk; METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a onTrackedDataSet (Lnone/kj;)V + ARG 0 data METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage + METHOD a createChild (Lnone/sb;)Lnone/sb; + ARG 0 other METHOD b serializeEntityTag (Lnone/dt;)V + METHOD b createChild (Lnone/sb;)Lnone/wt; + ARG 0 other METHOD bC getSoundCategory ()Lnone/nm; + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; + METHOD dg getRabbitType ()I + METHOD g setRabbitType (I)V + ARG 0 value + METHOD i initDataTracker ()V diff --git a/mappings/net/minecraft/entity/passive/impl/EntitySheep.mapping b/mappings/net/minecraft/entity/passive/impl/EntitySheep.mapping index eb44ea0c3e..db5819a5a6 100644 --- a/mappings/net/minecraft/entity/passive/impl/EntitySheep.mapping +++ b/mappings/net/minecraft/entity/passive/impl/EntitySheep.mapping @@ -2,18 +2,28 @@ CLASS none/wu net/minecraft/entity/passive/impl/EntitySheep CLASS none/wu$1 METHOD a canUse (Lnone/aak;)Z ARG 0 player - FIELD bx color Lnone/kj; + FIELD bx COLOR Lnone/kj; FIELD bz DYE_COLORS_RGB Ljava/util/Map; METHOD (Lnone/aiu;)V ARG 0 world - METHOD G getSoundDeath ()Lnone/nk; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD a interactMob (Lnone/aak;Lnone/qz;)Z + ARG 0 player + ARG 1 playerHand METHOD a getRgbColor (Lnone/adt;)[F ARG 0 dyeColor METHOD a deserializeEntityTag (Lnone/dt;)V - METHOD b setWoolColor (Lnone/adt;)V + METHOD a createChild (Lnone/sb;)Lnone/sb; + ARG 0 other + METHOD b setColor (Lnone/adt;)V ARG 0 value METHOD b serializeEntityTag (Lnone/dt;)V + METHOD b createChild (Lnone/sb;)Lnone/wu; + ARG 0 other + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; METHOD de getColor ()Lnone/adt; METHOD df isSheared ()Z + METHOD i initDataTracker ()V METHOD p setSheared (Z)V ARG 0 value diff --git a/mappings/net/minecraft/entity/passive/impl/EntitySnowman.mapping b/mappings/net/minecraft/entity/passive/impl/EntitySnowman.mapping index 5290e46258..552e3bdf94 100644 --- a/mappings/net/minecraft/entity/passive/impl/EntitySnowman.mapping +++ b/mappings/net/minecraft/entity/passive/impl/EntitySnowman.mapping @@ -1,4 +1,14 @@ CLASS none/wv net/minecraft/entity/passive/impl/EntitySnowman - METHOD G getSoundDeath ()Lnone/nk; + FIELD a SNOWMAN_FLAGS Lnone/kj; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD a interactMob (Lnone/aak;Lnone/qz;)Z + ARG 0 player + ARG 1 playerHand METHOD a deserializeEntityTag (Lnone/dt;)V + METHOD a setHasPumpkin (Z)V + ARG 0 value METHOD b serializeEntityTag (Lnone/dt;)V + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; + METHOD i initDataTracker ()V + METHOD o hasPumpkin ()Z diff --git a/mappings/net/minecraft/entity/passive/impl/EntitySquid.mapping b/mappings/net/minecraft/entity/passive/impl/EntitySquid.mapping index f6ea3ef61d..4388bf4dc4 100644 --- a/mappings/net/minecraft/entity/passive/impl/EntitySquid.mapping +++ b/mappings/net/minecraft/entity/passive/impl/EntitySquid.mapping @@ -1,2 +1,4 @@ CLASS none/ww net/minecraft/entity/passive/impl/EntitySquid - METHOD G getSoundDeath ()Lnone/nk; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; diff --git a/mappings/net/minecraft/entity/passive/impl/EntityVillager.mapping b/mappings/net/minecraft/entity/passive/impl/EntityVillager.mapping index 52c08d3533..1060d0203f 100644 --- a/mappings/net/minecraft/entity/passive/impl/EntityVillager.mapping +++ b/mappings/net/minecraft/entity/passive/impl/EntityVillager.mapping @@ -1,5 +1,22 @@ CLASS none/aaf net/minecraft/entity/passive/impl/EntityVillager - METHOD G getSoundDeath ()Lnone/nk; + FIELD by LOGGER Lorg/apache/logging/log4j/Logger; + FIELD bz VILLAGER_TYPE Lnone/kj; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD a interactMob (Lnone/aak;Lnone/qz;)Z + ARG 0 player + ARG 1 playerHand METHOD a deserializeEntityTag (Lnone/dt;)V + METHOD a createChild (Lnone/sb;)Lnone/sb; + ARG 0 other + METHOD a onStruckByLightning (Lnone/yv;)V + ARG 0 lightning METHOD b serializeEntityTag (Lnone/dt;)V + METHOD b createChild (Lnone/sb;)Lnone/aaf; + ARG 0 other + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; + METHOD de getVillagerType ()I + METHOD g setVillagerType (I)V + ARG 0 value + METHOD i initDataTracker ()V METHOD i_ getNameComponent ()Lnone/fa; diff --git a/mappings/net/minecraft/entity/passive/impl/EntityWolf.mapping b/mappings/net/minecraft/entity/passive/impl/EntityWolf.mapping index 537197510d..fa05d52f06 100644 --- a/mappings/net/minecraft/entity/passive/impl/EntityWolf.mapping +++ b/mappings/net/minecraft/entity/passive/impl/EntityWolf.mapping @@ -1,8 +1,27 @@ CLASS none/wz net/minecraft/entity/passive/impl/EntityWolf - METHOD G getSoundDeath ()Lnone/nk; + FIELD bB WOLF_HEALTH Lnone/kj; + FIELD bD COLLAR_COLOR Lnone/kj; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD a interactMob (Lnone/aak;Lnone/qz;)Z + ARG 0 player + ARG 1 playerHand METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage + METHOD a createChild (Lnone/sb;)Lnone/sb; + ARG 0 other METHOD b serializeEntityTag (Lnone/dt;)V + METHOD b createChild (Lnone/sb;)Lnone/wz; + ARG 0 other + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; + METHOD c setTarget (Lnone/sn;)V + ARG 0 value + METHOD do isAngry ()Z + METHOD i initDataTracker ()V METHOD m update ()V + METHOD q setTamed (Z)V + ARG 0 value + METHOD s setAngry (Z)V + ARG 0 value diff --git a/mappings/net/minecraft/entity/player/EntityPlayer.mapping b/mappings/net/minecraft/entity/player/EntityPlayer.mapping index 597719034f..5394b925ac 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayer.mapping @@ -16,12 +16,14 @@ CLASS none/aak net/minecraft/entity/player/EntityPlayer FIELD bH sleeping Z FIELD bI sleepingPos Lnone/cn; FIELD bL abilities Lnone/aai; - FIELD b SCORE_TRACKER Lnone/kj; + FIELD b SCORE Lnone/kj; FIELD bM experience I FIELD bN experienceLevel I FIELD bO experienceBarProgress F FIELD bT gameProfile Lcom/mojang/authlib/GameProfile; FIELD bU reducedDebugInfo Z + FIELD br SKIN_CUSTOMIZATION Lnone/kj; + FIELD bs MAIN_HAND Lnone/kj; FIELD bt inventory Lnone/aaj; FIELD bu containerPlayer Lnone/abv; FIELD bv container Lnone/abv; @@ -32,6 +34,8 @@ CLASS none/aak net/minecraft/entity/player/EntityPlayer METHOD T invalidate ()V METHOD a getUuidFromProfile (Lcom/mojang/authlib/GameProfile;)Ljava/util/UUID; ARG 0 profile + METHOD a isSkinOverlayVisible (Lnone/aal;)Z + ARG 0 part METHOD a dropItem (Lnone/aeq;Z)Lnone/yy; ARG 0 stack METHOD a dropItem (Lnone/aeq;ZZ)Lnone/yy; @@ -60,6 +64,8 @@ CLASS none/aak net/minecraft/entity/player/EntityPlayer METHOD a setEquippedStack (Lnone/sj;Lnone/aeq;)V ARG 0 slot ARG 1 stack + METHOD a setMainHand (Lnone/sm;)V + ARG 0 hand METHOD a spawnEntityItem (Lnone/yy;)Lnone/aeq; METHOD a dropSelectedItem (Z)Lnone/yy; METHOD aG getItemsHand ()Ljava/lang/Iterable; @@ -72,18 +78,25 @@ CLASS none/aak net/minecraft/entity/player/EntityPlayer METHOD b getEquippedStack (Lnone/sj;)Lnone/aeq; ARG 0 slot METHOD bC getSoundCategory ()Lnone/nm; + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; METHOD cK getScore ()I METHOD cP getGameProfile ()Lcom/mojang/authlib/GameProfile; METHOD cZ canModifyWorld ()Z + METHOD cw getMainHand ()Lnone/sm; METHOD d getOfflinePlayerUuid (Ljava/lang/String;)Ljava/util/UUID; ARG 0 nickname METHOD dc getReducedDebugInfo ()Z METHOD e handleFallDamage (FF)V ARG 0 fallDistance METHOD g setScore (I)V + ARG 0 value METHOD h_ getName ()Ljava/lang/String; + METHOD i initDataTracker ()V METHOD i_ getNameComponent ()Lnone/fa; METHOD m update ()V + METHOD m addScore (I)V + ARG 0 amount METHOD n setReducedDebugInfo (Z)V ARG 0 value METHOD p dismountVehicle ()V diff --git a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping index bd053db60e..1989886f69 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping @@ -2,6 +2,7 @@ CLASS none/lw net/minecraft/entity/player/EntityPlayerServer FIELD a networkHandler Lnone/mg; FIELD b server Lnet/minecraft/server/MinecraftServer; METHOD C getChatVisibility ()Lnone/aak$b; + METHOD F updatePotionVisibility ()V METHOD a hasPermission (ILjava/lang/String;)Z ARG 0 permissionLevel ARG 1 commandName @@ -23,6 +24,8 @@ CLASS none/lw net/minecraft/entity/player/EntityPlayerServer ARG 0 source ARG 1 damage METHOD b serializeEntityTag (Lnone/dt;)V + METHOD b isInvulnerableTo (Lnone/rp;)Z + ARG 0 source METHOD c getBlockPos ()Lnone/cn; METHOD c changeDimension (I)Lnone/se; ARG 0 dimensionId diff --git a/mappings/net/minecraft/entity/projectile/EntityArrowBase.mapping b/mappings/net/minecraft/entity/projectile/EntityArrowBase.mapping index 3548c38540..f31318af55 100644 --- a/mappings/net/minecraft/entity/projectile/EntityArrowBase.mapping +++ b/mappings/net/minecraft/entity/projectile/EntityArrowBase.mapping @@ -1,4 +1,23 @@ CLASS none/aan net/minecraft/entity/projectile/EntityArrowBase + FIELD e owner Lnone/se; + FIELD g ARROW_FLAGS Lnone/kj; + METHOD (Lnone/aiu;DDD)V + ARG 0 world + ARG 1 x + ARG 2 y + ARG 3 z + METHOD (Lnone/aiu;Lnone/sn;)V + ARG 0 world + ARG 1 owner + METHOD a onCollision (Lnone/bcq;)V + ARG 0 hit METHOD a deserializeEntityTag (Lnone/dt;)V + METHOD a onHit (Lnone/sn;)V + ARG 0 entity + METHOD a setCritical (Z)V + ARG 0 value METHOD b serializeEntityTag (Lnone/dt;)V + METHOD i initDataTracker ()V + METHOD j asItemStack ()Lnone/aeq; + METHOD l isCritical ()Z METHOD m update ()V diff --git a/mappings/net/minecraft/entity/projectile/EntityExplosiveProjectile.mapping b/mappings/net/minecraft/entity/projectile/EntityExplosiveProjectile.mapping index b7622fd210..d3f7db0b21 100644 --- a/mappings/net/minecraft/entity/projectile/EntityExplosiveProjectile.mapping +++ b/mappings/net/minecraft/entity/projectile/EntityExplosiveProjectile.mapping @@ -1,7 +1,19 @@ CLASS none/aaq net/minecraft/entity/projectile/EntityExplosiveProjectile + FIELD a owner Lnone/sn; + METHOD (Lnone/aiu;DDDDDD)V + ARG 0 world + ARG 1 x + ARG 2 y + ARG 3 z + METHOD (Lnone/aiu;Lnone/sn;DDD)V + ARG 0 world + ARG 1 owner + METHOD a onCollision (Lnone/bcq;)V + ARG 0 hit METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage METHOD b serializeEntityTag (Lnone/dt;)V + METHOD i initDataTracker ()V METHOD m update ()V diff --git a/mappings/net/minecraft/entity/projectile/impl/EntityArrow.mapping b/mappings/net/minecraft/entity/projectile/impl/EntityArrow.mapping index 419c0fee71..41a1946ce4 100644 --- a/mappings/net/minecraft/entity/projectile/impl/EntityArrow.mapping +++ b/mappings/net/minecraft/entity/projectile/impl/EntityArrow.mapping @@ -1,4 +1,23 @@ CLASS none/abe net/minecraft/entity/projectile/impl/EntityArrow + FIELD f COLOR Lnone/kj; + FIELD g potion Lnone/age; + FIELD h effects Ljava/util/Set; + METHOD (Lnone/aiu;DDD)V + ARG 0 world + ARG 1 x + ARG 2 y + ARG 3 z + METHOD (Lnone/aiu;Lnone/sn;)V + ARG 0 world + ARG 1 entity + METHOD a initFromStack (Lnone/aeq;)V + ARG 0 stack METHOD a deserializeEntityTag (Lnone/dt;)V + METHOD a addEffect (Lnone/ry;)V + ARG 0 effect + METHOD a onHit (Lnone/sn;)V + ARG 0 entity METHOD b serializeEntityTag (Lnone/dt;)V + METHOD i initDataTracker ()V + METHOD j asItemStack ()Lnone/aeq; METHOD m update ()V diff --git a/mappings/net/minecraft/entity/projectile/impl/EntityDragonFireball.mapping b/mappings/net/minecraft/entity/projectile/impl/EntityDragonFireball.mapping index ff9865c3d1..3d04fdbaee 100644 --- a/mappings/net/minecraft/entity/projectile/impl/EntityDragonFireball.mapping +++ b/mappings/net/minecraft/entity/projectile/impl/EntityDragonFireball.mapping @@ -1,4 +1,6 @@ CLASS none/aao net/minecraft/entity/projectile/impl/EntityDragonFireball + METHOD a onCollision (Lnone/bcq;)V + ARG 0 hit METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage diff --git a/mappings/net/minecraft/entity/projectile/impl/EntityExplodingWitherSkull.mapping b/mappings/net/minecraft/entity/projectile/impl/EntityExplodingWitherSkull.mapping index eecb562e0d..cd17040235 100644 --- a/mappings/net/minecraft/entity/projectile/impl/EntityExplodingWitherSkull.mapping +++ b/mappings/net/minecraft/entity/projectile/impl/EntityExplodingWitherSkull.mapping @@ -1,9 +1,28 @@ CLASS none/abf net/minecraft/entity/projectile/impl/EntityExplodingWitherSkull + FIELD e CHARGED Lnone/kj; + METHOD (Lnone/aiu;DDDDDD)V + ARG 0 world + ARG 1 x + ARG 2 y + ARG 3 z + METHOD (Lnone/aiu;Lnone/sn;DDD)V + ARG 0 world + ARG 1 entity + ARG 2 x + ARG 3 y + ARG 4 z METHOD a getEffectiveExplosionResistance (Lnone/aip;Lnone/aiu;Lnone/cn;Lnone/asj;)F ARG 0 explosion ARG 1 world ARG 2 pos ARG 3 state + METHOD a onCollision (Lnone/bcq;)V + ARG 0 hit METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage + METHOD a setCharged (Z)V + ARG 0 value + METHOD aJ isOnFire ()Z + METHOD i initDataTracker ()V + METHOD n isCharged ()Z diff --git a/mappings/net/minecraft/entity/projectile/impl/EntityFireball.mapping b/mappings/net/minecraft/entity/projectile/impl/EntityFireball.mapping index 13557bcbe3..290f63e513 100644 --- a/mappings/net/minecraft/entity/projectile/impl/EntityFireball.mapping +++ b/mappings/net/minecraft/entity/projectile/impl/EntityFireball.mapping @@ -1,3 +1,5 @@ CLASS none/aas net/minecraft/entity/projectile/impl/EntityFireball + METHOD a onCollision (Lnone/bcq;)V + ARG 0 hit METHOD a deserializeEntityTag (Lnone/dt;)V METHOD b serializeEntityTag (Lnone/dt;)V diff --git a/mappings/net/minecraft/entity/projectile/impl/EntityFishHook.mapping b/mappings/net/minecraft/entity/projectile/impl/EntityFishHook.mapping index 23b2678b5c..62b537b49e 100644 --- a/mappings/net/minecraft/entity/projectile/impl/EntityFishHook.mapping +++ b/mappings/net/minecraft/entity/projectile/impl/EntityFishHook.mapping @@ -1,6 +1,9 @@ CLASS none/yr net/minecraft/entity/projectile/impl/EntityFishHook + FIELD c HOOK_ENTITY_ID Lnone/kj; METHOD T invalidate ()V METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a onTrackedDataSet (Lnone/kj;)V + ARG 0 data METHOD b serializeEntityTag (Lnone/dt;)V + METHOD i initDataTracker ()V METHOD m update ()V diff --git a/mappings/net/minecraft/entity/projectile/impl/EntityShulkerBullet.mapping b/mappings/net/minecraft/entity/projectile/impl/EntityShulkerBullet.mapping index f41d10cd5a..03e9f52036 100644 --- a/mappings/net/minecraft/entity/projectile/impl/EntityShulkerBullet.mapping +++ b/mappings/net/minecraft/entity/projectile/impl/EntityShulkerBullet.mapping @@ -3,6 +3,8 @@ CLASS none/aav net/minecraft/entity/projectile/impl/EntityShulkerBullet METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage + METHOD aJ isOnFire ()Z METHOD b serializeEntityTag (Lnone/dt;)V METHOD bC getSoundCategory ()Lnone/nm; + METHOD i initDataTracker ()V METHOD m update ()V diff --git a/mappings/net/minecraft/entity/projectile/impl/EntitySmallFireball.mapping b/mappings/net/minecraft/entity/projectile/impl/EntitySmallFireball.mapping index 9b413ae56e..26fb2717dd 100644 --- a/mappings/net/minecraft/entity/projectile/impl/EntitySmallFireball.mapping +++ b/mappings/net/minecraft/entity/projectile/impl/EntitySmallFireball.mapping @@ -1,4 +1,6 @@ CLASS none/aaw net/minecraft/entity/projectile/impl/EntitySmallFireball + METHOD a onCollision (Lnone/bcq;)V + ARG 0 hit METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage diff --git a/mappings/net/minecraft/entity/projectile/impl/EntitySpectralArrow.mapping b/mappings/net/minecraft/entity/projectile/impl/EntitySpectralArrow.mapping index cb74779690..b7f3aacacb 100644 --- a/mappings/net/minecraft/entity/projectile/impl/EntitySpectralArrow.mapping +++ b/mappings/net/minecraft/entity/projectile/impl/EntitySpectralArrow.mapping @@ -1,4 +1,7 @@ CLASS none/aay net/minecraft/entity/projectile/impl/EntitySpectralArrow METHOD a deserializeEntityTag (Lnone/dt;)V + METHOD a onHit (Lnone/sn;)V + ARG 0 entity METHOD b serializeEntityTag (Lnone/dt;)V + METHOD j asItemStack ()Lnone/aeq; METHOD m update ()V diff --git a/mappings/net/minecraft/entity/thrown/EntityThrown.mapping b/mappings/net/minecraft/entity/thrown/EntityThrown.mapping index ce3b12f5a2..3a9164e1d3 100644 --- a/mappings/net/minecraft/entity/thrown/EntityThrown.mapping +++ b/mappings/net/minecraft/entity/thrown/EntityThrown.mapping @@ -1,4 +1,24 @@ CLASS none/aaz net/minecraft/entity/thrown/EntityThrown + FIELD a inGround Z + FIELD au ownerPlayerName Ljava/lang/String; + FIELD b shake I + FIELD d blockX I + FIELD e blockY I + FIELD f blockZ I + FIELD g block Lnone/akw; + FIELD h owner Lnone/sn; + METHOD (Lnone/aiu;DDD)V + ARG 0 world + ARG 1 x + ARG 2 y + ARG 3 z + METHOD (Lnone/aiu;Lnone/sn;)V + ARG 0 world + ARG 1 owner + METHOD a onCollision (Lnone/bcq;)V + ARG 0 hit METHOD a deserializeEntityTag (Lnone/dt;)V METHOD b serializeEntityTag (Lnone/dt;)V + METHOD i initDataTracker ()V + METHOD k getOwner ()Lnone/sn; METHOD m update ()V diff --git a/mappings/net/minecraft/entity/thrown/impl/EntitySnowball.mapping b/mappings/net/minecraft/entity/thrown/impl/EntitySnowball.mapping index c3ac18d75b..7689f0d890 100644 --- a/mappings/net/minecraft/entity/thrown/impl/EntitySnowball.mapping +++ b/mappings/net/minecraft/entity/thrown/impl/EntitySnowball.mapping @@ -1 +1,3 @@ CLASS none/aax net/minecraft/entity/thrown/impl/EntitySnowball + METHOD a onCollision (Lnone/bcq;)V + ARG 0 hit diff --git a/mappings/net/minecraft/entity/thrown/impl/EntityThrowableExpBottle.mapping b/mappings/net/minecraft/entity/thrown/impl/EntityThrowableExpBottle.mapping deleted file mode 100644 index ccd923efea..0000000000 --- a/mappings/net/minecraft/entity/thrown/impl/EntityThrowableExpBottle.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/abc net/minecraft/entity/thrown/impl/EntityThrowableExpBottle diff --git a/mappings/net/minecraft/entity/thrown/impl/EntityThrownEgg.mapping b/mappings/net/minecraft/entity/thrown/impl/EntityThrownEgg.mapping index 7a11306016..1ab15dc4f8 100644 --- a/mappings/net/minecraft/entity/thrown/impl/EntityThrownEgg.mapping +++ b/mappings/net/minecraft/entity/thrown/impl/EntityThrownEgg.mapping @@ -1 +1,3 @@ CLASS none/aba net/minecraft/entity/thrown/impl/EntityThrownEgg + METHOD a onCollision (Lnone/bcq;)V + ARG 0 hit diff --git a/mappings/net/minecraft/entity/thrown/impl/EntityThrownEnderpearl.mapping b/mappings/net/minecraft/entity/thrown/impl/EntityThrownEnderpearl.mapping index 5c5669ff5b..02aed5417f 100644 --- a/mappings/net/minecraft/entity/thrown/impl/EntityThrownEnderpearl.mapping +++ b/mappings/net/minecraft/entity/thrown/impl/EntityThrownEnderpearl.mapping @@ -1,2 +1,4 @@ CLASS none/abb net/minecraft/entity/thrown/impl/EntityThrownEnderpearl + METHOD a onCollision (Lnone/bcq;)V + ARG 0 hit METHOD m update ()V diff --git a/mappings/net/minecraft/entity/thrown/impl/EntityThrownExperienceBottle.mapping b/mappings/net/minecraft/entity/thrown/impl/EntityThrownExperienceBottle.mapping new file mode 100644 index 0000000000..2d7a7fde58 --- /dev/null +++ b/mappings/net/minecraft/entity/thrown/impl/EntityThrownExperienceBottle.mapping @@ -0,0 +1,3 @@ +CLASS none/abc net/minecraft/entity/thrown/impl/EntityThrownExperienceBottle + METHOD a onCollision (Lnone/bcq;)V + ARG 0 hit diff --git a/mappings/net/minecraft/entity/thrown/impl/EntityThrownPotion.mapping b/mappings/net/minecraft/entity/thrown/impl/EntityThrownPotion.mapping index 54f0e16fa5..1e6a1eea2b 100644 --- a/mappings/net/minecraft/entity/thrown/impl/EntityThrownPotion.mapping +++ b/mappings/net/minecraft/entity/thrown/impl/EntityThrownPotion.mapping @@ -1,4 +1,21 @@ CLASS none/abd net/minecraft/entity/thrown/impl/EntityThrownPotion + FIELD d ITEM_STACK Lnone/kj; FIELD e LOGGER Lorg/apache/logging/log4j/Logger; + METHOD (Lnone/aiu;DDDLnone/aeq;)V + ARG 0 world + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 stack + METHOD (Lnone/aiu;Lnone/sn;Lnone/aeq;)V + ARG 0 world + ARG 1 owner + ARG 2 stack + METHOD a setItemStack (Lnone/aeq;)V + ARG 0 value + METHOD a onCollision (Lnone/bcq;)V + ARG 0 hit METHOD a deserializeEntityTag (Lnone/dt;)V METHOD b serializeEntityTag (Lnone/dt;)V + METHOD i initDataTracker ()V + METHOD l getItemStack ()Lnone/aeq; diff --git a/mappings/net/minecraft/entity/tracker/DataTracker.mapping b/mappings/net/minecraft/entity/tracker/DataTracker.mapping index d19593362c..ce9f9c94ff 100644 --- a/mappings/net/minecraft/entity/tracker/DataTracker.mapping +++ b/mappings/net/minecraft/entity/tracker/DataTracker.mapping @@ -29,6 +29,8 @@ CLASS none/km net/minecraft/entity/tracker/DataTracker ARG 1 value METHOD b getDirtyEntries ()Ljava/util/List; METHOD b deserializePacket (Lnone/es;)Ljava/util/List; + METHOD b setDirty (Lnone/kj;)V + ARG 0 key METHOD b set (Lnone/kj;Ljava/lang/Object;)V ARG 0 key ARG 1 value diff --git a/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping b/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping index 974e40fd3d..9ad226dcfc 100644 --- a/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping +++ b/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping @@ -16,8 +16,12 @@ CLASS none/abi net/minecraft/entity/vehicle/EntityMinecartBase METHOD a byId (I)Lnone/abi$a; ARG 0 id METHOD b getEntityId ()Ljava/lang/String; + FIELD d CUSTOM_BLOCK_ID Lnone/kj; + FIELD e CUSTOM_BLOCK_OFFSET Lnone/kj; + FIELD f CUSTOM_BLOCK_PRESENT Lnone/kj; METHOD (Lnone/aiu;)V ARG 0 world + METHOD A hasCustomBlock ()Z METHOD T invalidate ()V METHOD a create (Lnone/aiu;DDDLnone/abi$a;)Lnone/abi; ARG 0 world @@ -25,14 +29,25 @@ CLASS none/abi net/minecraft/entity/vehicle/EntityMinecartBase ARG 2 y ARG 3 z ARG 4 type + METHOD a setCustomBlock (Lnone/asj;)V + ARG 0 value METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage + METHOD a setCustomBlockPresent (Z)V + ARG 0 value METHOD b setPosition (DDD)V ARG 0 x ARG 1 y ARG 2 z METHOD b serializeEntityTag (Lnone/dt;)V + METHOD f setCustomBlockOffset (I)V + ARG 0 value + METHOD i initDataTracker ()V METHOD m update ()V METHOD v getMinecartType ()Lnone/abi$a; + METHOD w getContainedBlock ()Lnone/asj; + METHOD x getDefaultContainedBlock ()Lnone/asj; + METHOD y getBlockOffset ()I + METHOD z getDefaultBlockOffset ()I diff --git a/mappings/net/minecraft/entity/vehicle/impl/EntityBoat.mapping b/mappings/net/minecraft/entity/vehicle/impl/EntityBoat.mapping index 69e136a796..62dc362ec8 100644 --- a/mappings/net/minecraft/entity/vehicle/impl/EntityBoat.mapping +++ b/mappings/net/minecraft/entity/vehicle/impl/EntityBoat.mapping @@ -17,11 +17,18 @@ CLASS none/abh net/minecraft/entity/vehicle/impl/EntityBoat METHOD a getType (Ljava/lang/String;)Lnone/abh$b; ARG 0 name METHOD b getId ()I + FIELD d BOAT_TYPE Lnone/kj; + METHOD (Lnone/aiu;DDD)V + ARG 0 world + ARG 1 x + ARG 2 y + ARG 3 z METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a damage (Lnone/rp;F)Z ARG 0 source ARG 1 damage METHOD b interact (Lnone/aak;Lnone/qz;)Z METHOD b serializeEntityTag (Lnone/dt;)V + METHOD i initDataTracker ()V METHOD m update ()V METHOD r getBoatType ()Lnone/abh$b; diff --git a/mappings/net/minecraft/entity/vehicle/impl/EntityChestMinecart.mapping b/mappings/net/minecraft/entity/vehicle/impl/EntityChestMinecart.mapping index fc9fd27601..863076c75c 100644 --- a/mappings/net/minecraft/entity/vehicle/impl/EntityChestMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/impl/EntityChestMinecart.mapping @@ -5,3 +5,5 @@ CLASS none/abj net/minecraft/entity/vehicle/impl/EntityChestMinecart METHOD k getContainerId ()Ljava/lang/String; METHOD t_ getInvSize ()I METHOD v getMinecartType ()Lnone/abi$a; + METHOD x getDefaultContainedBlock ()Lnone/asj; + METHOD z getDefaultBlockOffset ()I diff --git a/mappings/net/minecraft/entity/vehicle/impl/EntityCommandBlockMinecart.mapping b/mappings/net/minecraft/entity/vehicle/impl/EntityCommandBlockMinecart.mapping index aa24fc4599..98731ebf6d 100644 --- a/mappings/net/minecraft/entity/vehicle/impl/EntityCommandBlockMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/impl/EntityCommandBlockMinecart.mapping @@ -5,8 +5,13 @@ CLASS none/abk net/minecraft/entity/vehicle/impl/EntityCommandBlockMinecart METHOD e getWorld ()Lnone/aiu; METHOD f getEntity ()Lnone/se; METHOD h getServer ()Lnet/minecraft/server/MinecraftServer; + FIELD a COMMAND Lnone/kj; + FIELD b LAST_OUTPUT Lnone/kj; METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a onTrackedDataSet (Lnone/kj;)V + ARG 0 data METHOD b interact (Lnone/aak;Lnone/qz;)Z METHOD b serializeEntityTag (Lnone/dt;)V + METHOD i initDataTracker ()V METHOD v getMinecartType ()Lnone/abi$a; + METHOD x getDefaultContainedBlock ()Lnone/asj; diff --git a/mappings/net/minecraft/entity/vehicle/impl/EntityFurnaceMinecart.mapping b/mappings/net/minecraft/entity/vehicle/impl/EntityFurnaceMinecart.mapping index fbff9c8248..d657e57c03 100644 --- a/mappings/net/minecraft/entity/vehicle/impl/EntityFurnaceMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/impl/EntityFurnaceMinecart.mapping @@ -1,6 +1,12 @@ CLASS none/abm net/minecraft/entity/vehicle/impl/EntityFurnaceMinecart + FIELD c LIT Lnone/kj; METHOD a deserializeEntityTag (Lnone/dt;)V METHOD b interact (Lnone/aak;Lnone/qz;)Z METHOD b serializeEntityTag (Lnone/dt;)V + METHOD i initDataTracker ()V + METHOD j isLit ()Z + METHOD l setLit (Z)V + ARG 0 value METHOD m update ()V METHOD v getMinecartType ()Lnone/abi$a; + METHOD x getDefaultContainedBlock ()Lnone/asj; diff --git a/mappings/net/minecraft/entity/vehicle/impl/EntityHopperMinecart.mapping b/mappings/net/minecraft/entity/vehicle/impl/EntityHopperMinecart.mapping index 6b7234adf8..5f27c4386f 100644 --- a/mappings/net/minecraft/entity/vehicle/impl/EntityHopperMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/impl/EntityHopperMinecart.mapping @@ -14,3 +14,5 @@ CLASS none/abn net/minecraft/entity/vehicle/impl/EntityHopperMinecart METHOD m update ()V METHOD t_ getInvSize ()I METHOD v getMinecartType ()Lnone/abi$a; + METHOD x getDefaultContainedBlock ()Lnone/asj; + METHOD z getDefaultBlockOffset ()I diff --git a/mappings/net/minecraft/entity/vehicle/impl/EntitySpawnerMinecart.mapping b/mappings/net/minecraft/entity/vehicle/impl/EntitySpawnerMinecart.mapping index 4614979886..83c1da6781 100644 --- a/mappings/net/minecraft/entity/vehicle/impl/EntitySpawnerMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/impl/EntitySpawnerMinecart.mapping @@ -3,3 +3,4 @@ CLASS none/abp net/minecraft/entity/vehicle/impl/EntitySpawnerMinecart METHOD b serializeEntityTag (Lnone/dt;)V METHOD m update ()V METHOD v getMinecartType ()Lnone/abi$a; + METHOD x getDefaultContainedBlock ()Lnone/asj; diff --git a/mappings/net/minecraft/entity/vehicle/impl/EntityTNTMinecart.mapping b/mappings/net/minecraft/entity/vehicle/impl/EntityTNTMinecart.mapping index 84c0cb6d3c..fa4092a0fb 100644 --- a/mappings/net/minecraft/entity/vehicle/impl/EntityTNTMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/impl/EntityTNTMinecart.mapping @@ -19,3 +19,4 @@ CLASS none/abq net/minecraft/entity/vehicle/impl/EntityTNTMinecart ARG 0 fallDistance METHOD m update ()V METHOD v getMinecartType ()Lnone/abi$a; + METHOD x getDefaultContainedBlock ()Lnone/asj; diff --git a/mappings/net/minecraft/potion/PotionHelper.mapping b/mappings/net/minecraft/potion/PotionHelper.mapping new file mode 100644 index 0000000000..f8cd3659f4 --- /dev/null +++ b/mappings/net/minecraft/potion/PotionHelper.mapping @@ -0,0 +1,29 @@ +CLASS none/agg net/minecraft/potion/PotionHelper + METHOD a getColor (Ljava/util/Collection;)I + ARG 0 effects + METHOD a getPotionEffects (Lnone/aeq;)Ljava/util/List; + ARG 0 stack + METHOD a setCustomPotionEffects (Lnone/aeq;Ljava/util/Collection;)Lnone/aeq; + ARG 0 stack + ARG 1 effects + METHOD a setPotion (Lnone/aeq;Lnone/age;)Lnone/aeq; + ARG 0 stack + ARG 1 potion + METHOD a getColor (Lnone/age;)I + ARG 0 potion + METHOD a getPotionEffects (Lnone/age;Ljava/util/Collection;)Ljava/util/List; + ARG 0 potion + ARG 1 custom + METHOD a getPotionEffects (Lnone/dt;)Ljava/util/List; + ARG 0 compound + METHOD a getCustomPotionEffects (Lnone/dt;Ljava/util/List;)V + ARG 0 compound + ARG 1 list + METHOD b getCustomPotionEffects (Lnone/aeq;)Ljava/util/List; + ARG 0 stack + METHOD b getCustomPotionEffects (Lnone/dt;)Ljava/util/List; + ARG 0 compund + METHOD c getPotion (Lnone/aeq;)Lnone/age; + ARG 0 stack + METHOD c getPotion (Lnone/dt;)Lnone/age; + ARG 0 compound diff --git a/mappings/net/minecraft/util/math/BlockPos.mapping b/mappings/net/minecraft/util/math/BlockPos.mapping index a42947e6ea..f61e816877 100644 --- a/mappings/net/minecraft/util/math/BlockPos.mapping +++ b/mappings/net/minecraft/util/math/BlockPos.mapping @@ -1,5 +1,5 @@ CLASS none/cn net/minecraft/util/math/BlockPos - CLASS none/cn$a MutableBlockPos + CLASS none/cn$a Mutable FIELD b x I FIELD c y I FIELD d z I @@ -9,22 +9,22 @@ CLASS none/cn net/minecraft/util/math/BlockPos ARG 2 z METHOD (Lnone/cn;)V ARG 0 pos - METHOD a setMutable (Lnone/se;)Lnone/cn$a; + METHOD a set (Lnone/se;)Lnone/cn$a; ARG 0 entity - METHOD c setMutable (DDD)Lnone/cn$a; + METHOD c set (DDD)Lnone/cn$a; ARG 0 x ARG 1 y ARG 2 z - METHOD c setMutable (III)Lnone/cn$a; + METHOD c set (III)Lnone/cn$a; ARG 0 x ARG 1 y ARG 2 z - METHOD c offsetMutable (Lnone/cu;)Lnone/cn$a; + METHOD c setOffset (Lnone/cu;)Lnone/cn$a; ARG 0 facing - METHOD c offsetMutable (Lnone/cu;I)Lnone/cn$a; + METHOD c setOffset (Lnone/cu;I)Lnone/cn$a; ARG 0 facing ARG 1 distance - METHOD g setMutable (Lnone/dk;)Lnone/cn$a; + METHOD g set (Lnone/dk;)Lnone/cn$a; ARG 0 vec METHOD h toImmutable ()Lnone/cn; METHOD p getX ()I @@ -32,13 +32,44 @@ CLASS none/cn net/minecraft/util/math/BlockPos ARG 0 y METHOD q getY ()I METHOD r getZ ()I - CLASS none/cn$b PooledMutableBlockPos - METHOD a setMutable (Lnone/se;)Lnone/cn$a; - METHOD c setMutable (DDD)Lnone/cn$a; - METHOD c setMutable (III)Lnone/cn$a; - METHOD c offsetMutable (Lnone/cu;)Lnone/cn$a; - METHOD c offsetMutable (Lnone/cu;I)Lnone/cn$a; - METHOD g setMutable (Lnone/dk;)Lnone/cn$a; + CLASS none/cn$b PooledMutable + FIELD f usable Z + FIELD g POOL Ljava/util/List; + METHOD a set (Lnone/se;)Lnone/cn$a; + METHOD c set (DDD)Lnone/cn$a; + METHOD c set (III)Lnone/cn$a; + METHOD c setOffset (Lnone/cu;)Lnone/cn$a; + METHOD c setOffset (Lnone/cu;I)Lnone/cn$a; + METHOD c set (Lnone/se;)Lnone/cn$b; + ARG 0 entity + METHOD d get (DDD)Lnone/cn$b; + ARG 0 x + ARG 1 y + ARG 2 z + METHOD d setOffset (Lnone/cu;)Lnone/cn$b; + ARG 0 facing + METHOD d setOffset (Lnone/cu;I)Lnone/cn$b; + ARG 0 facing + ARG 1 distance + METHOD e set (DDD)Lnone/cn$b; + ARG 0 x + ARG 1 y + ARG 2 z + METHOD e get (III)Lnone/cn$b; + ARG 0 x + ARG 1 y + ARG 2 z + METHOD f set (III)Lnone/cn$b; + ARG 0 x + ARG 1 y + ARG 2 z + METHOD g set (Lnone/dk;)Lnone/cn$a; + METHOD i get (Lnone/dk;)Lnone/cn$b; + ARG 0 pos + METHOD j set (Lnone/dk;)Lnone/cn$b; + ARG 0 pos + METHOD s get ()Lnone/cn$b; + METHOD t free ()V FIELD a ORIGIN Lnone/cn; FIELD b LOGGER Lorg/apache/logging/log4j/Logger; METHOD (DDD)V diff --git a/mappings/none/sb.mapping b/mappings/none/sb.mapping deleted file mode 100644 index e54b554f34..0000000000 --- a/mappings/none/sb.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS none/sb - METHOD a deserializeEntityTag (Lnone/dt;)V - METHOD a onTrackedDataSet (Lnone/kj;)V - METHOD b serializeEntityTag (Lnone/dt;)V diff --git a/mappings/none/sl.mapping b/mappings/none/sl.mapping index dd8cad2615..c871d65bac 100644 --- a/mappings/none/sl.mapping +++ b/mappings/none/sl.mapping @@ -1,3 +1,4 @@ CLASS none/sl METHOD e handleFallDamage (FF)V ARG 0 fallDistance + METHOD m_ canClimb ()Z diff --git a/mappings/none/st.mapping b/mappings/none/st.mapping new file mode 100644 index 0000000000..f21ecb7ddd --- /dev/null +++ b/mappings/none/st.mapping @@ -0,0 +1,2 @@ +CLASS none/st + METHOD b getOwnerUuid ()Ljava/util/UUID; diff --git a/mappings/none/sy.mapping b/mappings/none/sy.mapping deleted file mode 100644 index 887d0a2196..0000000000 --- a/mappings/none/sy.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/sy - METHOD a deserializeEntityTag (Lnone/dt;)V - METHOD b serializeEntityTag (Lnone/dt;)V diff --git a/mappings/none/wo.mapping b/mappings/none/wo.mapping index 46a464bd48..ec2aef4bb3 100644 --- a/mappings/none/wo.mapping +++ b/mappings/none/wo.mapping @@ -1,4 +1,6 @@ CLASS none/wo - METHOD G getSoundDeath ()Lnone/nk; + METHOD G getSoundAmbient ()Lnone/nk; + METHOD bV getSoundHurt ()Lnone/nk; + METHOD bW getSoundDeath ()Lnone/nk; METHOD e handleFallDamage (FF)V ARG 0 fallDistance diff --git a/mappings/none/xa.mapping b/mappings/none/xa.mapping deleted file mode 100644 index 3286ff824e..0000000000 --- a/mappings/none/xa.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/xa - METHOD a deserializeEntityTag (Lnone/dt;)V - METHOD b serializeEntityTag (Lnone/dt;)V diff --git a/mappings/none/xn.mapping b/mappings/none/xn.mapping deleted file mode 100644 index 10ce2e6901..0000000000 --- a/mappings/none/xn.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS none/xn - METHOD a deserializeEntityTag (Lnone/dt;)V - METHOD a damage (Lnone/rp;F)Z - ARG 0 source - ARG 1 damage - METHOD b serializeEntityTag (Lnone/dt;)V diff --git a/mappings/none/zb.mapping b/mappings/none/zb.mapping deleted file mode 100644 index 622a18f9b5..0000000000 --- a/mappings/none/zb.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS none/zb - METHOD a deserializeEntityTag (Lnone/dt;)V - METHOD a setEquippedStack (Lnone/sj;Lnone/aeq;)V - ARG 0 slot - ARG 1 stack