From 6255f81c736a505f9ece7f8d40900cf0346c9dbc Mon Sep 17 00:00:00 2001 From: copygirl Date: Sat, 15 Oct 2016 11:17:41 +0200 Subject: [PATCH] Map some various things (#112) * Map some EnchantmentHelper * Map BlockFire.registerFlammable(s) Still missing mappings for the two maps used by these methods regarding fire spread. * Map some entity death / loot stuff * Map some entity sound stuff * Map a few small things * Rename init => registerDefaults And registerFlammables => registerDefaultFlammables --- mappings/net/minecraft/block/Block.mapping | 2 +- .../net/minecraft/block/BlockFire.mapping | 4 ++-- .../net/minecraft/block/BlockSkull.mapping | 4 ++++ .../minecraft/enchantment/Enchantment.mapping | 2 +- .../enchantment/EnchantmentHelper.mapping | 23 +++++++++++++++++++ .../net/minecraft/entity/EntityLiving.mapping | 19 +++++++++++++++ .../minecraft/entity/EntityRegistry.mapping | 2 +- .../minecraft/entity/EquipmentSlot.mapping | 5 ++++ .../entity/boss/EntityEnderDragon.mapping | 2 ++ .../entity/boss/EntityWither.mapping | 3 +++ .../entity/mob/EntityCreeper.mapping | 2 ++ .../entity/mob/EntityEnderman.mapping | 3 +++ .../minecraft/entity/mob/EntityGhast.mapping | 1 + .../entity/mob/EntityHostile.mapping | 1 + .../minecraft/entity/mob/EntityMob.mapping | 18 +++++++++++++++ .../entity/mob/EntityShulker.mapping | 1 + .../entity/mob/EntitySkeleton.mapping | 2 ++ .../entity/mob/EntitySkeletonBase.mapping | 2 ++ .../minecraft/entity/mob/EntitySlime.mapping | 2 ++ .../entity/mob/EntityWitherSkeleton.mapping | 2 ++ .../minecraft/entity/mob/EntityZombie.mapping | 2 ++ .../entity/passive/EntityBat.mapping | 2 ++ .../entity/passive/EntityCow.mapping | 1 + .../entity/passive/EntityDonkeyBase.mapping | 2 ++ .../entity/passive/EntityHorseBase.mapping | 3 +++ .../entity/passive/EntityIronGolem.mapping | 2 ++ .../entity/passive/EntityOcelot.mapping | 1 + .../entity/passive/EntityPig.mapping | 2 ++ .../entity/passive/EntitySquid.mapping | 1 + .../entity/passive/EntityTameable.mapping | 2 ++ .../entity/passive/EntityVillager.mapping | 2 ++ .../entity/passive/EntityWolf.mapping | 1 + .../entity/player/EntityPlayer.mapping | 2 ++ .../entity/player/EntityPlayerServer.mapping | 2 ++ mappings/net/minecraft/item/Item.mapping | 14 ++++++++++- mappings/net/minecraft/potion/Potion.mapping | 2 +- .../minecraft/potion/PotionEffectType.mapping | 2 +- .../recipe/BrewingRecipeRegistry.mapping | 2 +- .../net/minecraft/reference/Bootstrap.mapping | 3 ++- mappings/net/minecraft/sound/Sound.mapping | 2 +- mappings/net/minecraft/stat/Stats.mapping | 2 +- mappings/net/minecraft/world/World.mapping | 4 +++- .../net/minecraft/world/biome/Biome.mapping | 2 +- 43 files changed, 144 insertions(+), 14 deletions(-) diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 5038acbf64..55baee6e73 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -360,4 +360,4 @@ CLASS none/aky net/minecraft/block/Block METHOD w getSoundGroup ()Lnone/apw; METHOD w setDefaultState (Lnone/asm;)V ARG 0 state - METHOD x registerBlocks ()V + METHOD x registerDefaults ()V diff --git a/mappings/net/minecraft/block/BlockFire.mapping b/mappings/net/minecraft/block/BlockFire.mapping index 2127393df2..74df9c7fdb 100644 --- a/mappings/net/minecraft/block/BlockFire.mapping +++ b/mappings/net/minecraft/block/BlockFire.mapping @@ -14,7 +14,7 @@ CLASS none/amr net/minecraft/block/BlockFire METHOD a canPlaceAt (Lnone/aiw;Lnone/cn;)Z ARG 0 world ARG 1 pos - METHOD a (Lnone/aky;II)V + METHOD a registerFlammable (Lnone/aky;II)V ARG 0 block METHOD a (Lnone/asm;Lnone/aiw;Lnone/cn;Ljava/util/Random;)V ARG 0 state @@ -48,7 +48,7 @@ CLASS none/amr net/minecraft/block/BlockFire ARG 0 state ARG 1 view ARG 2 pos - METHOD e ()V + METHOD e registerDefaultFlammables ()V METHOD e serializeState (Lnone/asm;)I ARG 0 state METHOD f getRenderLayer ()Lnone/aio; diff --git a/mappings/net/minecraft/block/BlockSkull.mapping b/mappings/net/minecraft/block/BlockSkull.mapping index 8b766853e8..f56a5460aa 100644 --- a/mappings/net/minecraft/block/BlockSkull.mapping +++ b/mappings/net/minecraft/block/BlockSkull.mapping @@ -6,6 +6,10 @@ CLASS none/apr net/minecraft/block/BlockSkull METHOD a createBlockEntity (Lnone/aiw;I)Lnone/are; ARG 0 world ARG 1 metadata + METHOD a checkWitherMultiblock (Lnone/aiw;Lnone/cn;Lnone/arx;)V + ARG 0 world + ARG 1 pos + ARG 2 skull METHOD a getPickStack (Lnone/aiw;Lnone/cn;Lnone/asm;)Lnone/aes; ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/enchantment/Enchantment.mapping b/mappings/net/minecraft/enchantment/Enchantment.mapping index 2798bdb8ba..b0a7f94e75 100644 --- a/mappings/net/minecraft/enchantment/Enchantment.mapping +++ b/mappings/net/minecraft/enchantment/Enchantment.mapping @@ -52,4 +52,4 @@ CLASS none/aho net/minecraft/enchantment/Enchantment METHOD d getTranslatedNameWithLevel (I)Ljava/lang/String; ARG 0 level METHOD e isLootOnly ()Z - METHOD f init ()V + METHOD f registerDefaults ()V diff --git a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping index 10cce5f86b..51ce6ccf5a 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping @@ -8,3 +8,26 @@ CLASS none/ahq net/minecraft/enchantment/EnchantmentHelper METHOD a getLevel (Lnone/aho;Lnone/aes;)I ARG 0 enchantment ARG 1 stack + METHOD a getEquipmentLevel (Lnone/aho;Lnone/sp;)I + ARG 0 ench + ARG 1 entity + METHOD a getKnockback (Lnone/sp;)I + ARG 0 entity + METHOD b getFireAspect (Lnone/sp;)I + ARG 0 entity + METHOD c getRespiration (Lnone/sp;)I + ARG 0 entity + METHOD d getDepthStrider (Lnone/sp;)I + ARG 0 entity + METHOD e getEfficiency (Lnone/sp;)I + ARG 0 entity + METHOD f getLuckOfTheSea (Lnone/sp;)I + ARG 0 entity + METHOD g getLure (Lnone/sp;)I + ARG 0 entity + METHOD h getLooting (Lnone/sp;)I + ARG 0 entity + METHOD i hasAquaAffinity (Lnone/sp;)Z + ARG 0 entity + METHOD j hasFrostWalker (Lnone/sp;)Z + ARG 0 entity diff --git a/mappings/net/minecraft/entity/EntityLiving.mapping b/mappings/net/minecraft/entity/EntityLiving.mapping index 9ff61a079f..3f53428140 100644 --- a/mappings/net/minecraft/entity/EntityLiving.mapping +++ b/mappings/net/minecraft/entity/EntityLiving.mapping @@ -1,6 +1,9 @@ CLASS none/sp net/minecraft/entity/EntityLiving + FIELD aC deathCounter I FIELD a ATTR_SPRINTING_SPEED_BOOST_ID Ljava/util/UUID; FIELD aQ headPitch F + FIELD aU playerHitTimer I + FIELD aV dead Z FIELD au LIVING_FLAGS Lnone/kj; FIELD ay stuckArrowTimer I FIELD b ATTR_SPRINTING_SPEED_BOOST Lnone/td; @@ -31,6 +34,8 @@ CLASS none/sp net/minecraft/entity/EntityLiving METHOD a setStackInHand (Lnone/rb;Lnone/aes;)V ARG 0 hand ARG 1 stack + METHOD a onDeath (Lnone/rr;)V + ARG 0 damageSource METHOD a damage (Lnone/rr;F)Z ARG 0 source ARG 1 damage @@ -43,6 +48,13 @@ CLASS none/sp net/minecraft/entity/EntityLiving ARG 1 stack METHOD a getAttributeInstance (Lnone/tb;)Lnone/tc; ARG 0 attribute + METHOD a dropEquipment (ZI)V + ARG 0 recentlyHitByPlayer + ARG 1 looting + METHOD a dropLoot (ZILnone/rr;)V + ARG 0 recentlyHitByPlayer + ARG 1 looting + ARG 2 damageSource METHOD aH getItemsArmor ()Ljava/lang/Iterable; METHOD aU getHeadPitch ()F METHOD a_ onEquipStack (Lnone/aes;)V @@ -60,7 +72,12 @@ CLASS none/sp net/minecraft/entity/EntityLiving ARG 0 type METHOD b getEquippedStack (Lnone/sl;)Lnone/aes; ARG 0 slot + METHOD b dropDefaultLoot (ZI)V + ARG 0 recentlyHitByPlayer + ARG 1 looting METHOD bD initAttributes ()V + METHOD bF updatePostDeath ()V + METHOD bG canDropLootAndXp ()Z METHOD bI getRand ()Ljava/util/Random; METHOD bP clearPotionSwirls ()V METHOD bQ clearPotionEffects ()V @@ -79,6 +96,8 @@ CLASS none/sp net/minecraft/entity/EntityLiving METHOD cd getAttributeContainer ()Lnone/tf; METHOD cf getMainHandStack ()Lnone/aes; METHOD cg getOffHandStack ()Lnone/aes; + METHOD ch getSoundVolume ()F + METHOD ci getSoundPitch ()F METHOD cq isSleeping ()Z METHOD cw getMainHand ()Lnone/so; METHOD cy ()Lnone/rb; diff --git a/mappings/net/minecraft/entity/EntityRegistry.mapping b/mappings/net/minecraft/entity/EntityRegistry.mapping index 6d1e6156f7..9d6e8d5904 100644 --- a/mappings/net/minecraft/entity/EntityRegistry.mapping +++ b/mappings/net/minecraft/entity/EntityRegistry.mapping @@ -27,6 +27,6 @@ CLASS none/si net/minecraft/entity/EntityRegistry ARG 1 world METHOD a getId (Lnone/sg;)Lnone/kp; ARG 0 entity - METHOD b init ()V + METHOD b registerDefaults ()V METHOD b getName (Lnone/sg;)Ljava/lang/String; ARG 0 entity diff --git a/mappings/net/minecraft/entity/EquipmentSlot.mapping b/mappings/net/minecraft/entity/EquipmentSlot.mapping index dd48c10cb5..336690b3ec 100644 --- a/mappings/net/minecraft/entity/EquipmentSlot.mapping +++ b/mappings/net/minecraft/entity/EquipmentSlot.mapping @@ -13,9 +13,14 @@ CLASS none/sl net/minecraft/entity/EquipmentSlot FIELD i armorStandId I FIELD j name Ljava/lang/String; METHOD (Ljava/lang/String;ILnone/sl$a;IILjava/lang/String;)V + ARG 0 type + ARG 1 entityId + ARG 2 armorStandId + ARG 3 name METHOD a getType ()Lnone/sl$a; METHOD a byName (Ljava/lang/String;)Lnone/sl; ARG 0 name METHOD b getEntitySlotId ()I METHOD c getArmorStandSlotId ()I METHOD d getName ()Ljava/lang/String; + METHOD values values ()[Lnone/sl; diff --git a/mappings/net/minecraft/entity/boss/EntityEnderDragon.mapping b/mappings/net/minecraft/entity/boss/EntityEnderDragon.mapping index 4f9b9ee67a..d42cd084f6 100644 --- a/mappings/net/minecraft/entity/boss/EntityEnderDragon.mapping +++ b/mappings/net/minecraft/entity/boss/EntityEnderDragon.mapping @@ -23,9 +23,11 @@ CLASS none/xr net/minecraft/entity/boss/EntityEnderDragon ARG 0 handler METHOD bC getSoundCategory ()Lnone/nm; METHOD bD initAttributes ()V + METHOD bF updatePostDeath ()V METHOD bV getSoundHurt ()Lnone/nk; METHOD c addPotionEffect (Lnone/sa;)V ARG 0 effect + METHOD ch getSoundVolume ()F METHOD i initDataTracker ()V METHOD n canStartRiding (Lnone/sg;)Z ARG 0 entity diff --git a/mappings/net/minecraft/entity/boss/EntityWither.mapping b/mappings/net/minecraft/entity/boss/EntityWither.mapping index ea335daee2..95a9ae46fb 100644 --- a/mappings/net/minecraft/entity/boss/EntityWither.mapping +++ b/mappings/net/minecraft/entity/boss/EntityWither.mapping @@ -23,6 +23,9 @@ CLASS none/yl net/minecraft/entity/boss/EntityWither ARG 0 tag METHOD b registerTagUpgraders (Lnone/pf;)V ARG 0 handler + METHOD b dropDefaultLoot (ZI)V + ARG 0 recentlyHitByPlayer + ARG 1 looting METHOD bD initAttributes ()V METHOD bV getSoundHurt ()Lnone/nk; METHOD bW getSoundDeath ()Lnone/nk; diff --git a/mappings/net/minecraft/entity/mob/EntityCreeper.mapping b/mappings/net/minecraft/entity/mob/EntityCreeper.mapping index 7a4cda44ca..dde3f0dc7c 100644 --- a/mappings/net/minecraft/entity/mob/EntityCreeper.mapping +++ b/mappings/net/minecraft/entity/mob/EntityCreeper.mapping @@ -12,6 +12,8 @@ CLASS none/zg net/minecraft/entity/mob/EntityCreeper ARG 1 playerHand METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag + METHOD a onDeath (Lnone/rr;)V + ARG 0 damageSource METHOD a onStruckByLightning (Lnone/yx;)V ARG 0 lightning METHOD b serializeCustomData (Lnone/dt;)V diff --git a/mappings/net/minecraft/entity/mob/EntityEnderman.mapping b/mappings/net/minecraft/entity/mob/EntityEnderman.mapping index ecedca3899..7de385ea47 100644 --- a/mappings/net/minecraft/entity/mob/EntityEnderman.mapping +++ b/mappings/net/minecraft/entity/mob/EntityEnderman.mapping @@ -31,6 +31,9 @@ CLASS none/zi net/minecraft/entity/mob/EntityEnderman METHOD a damage (Lnone/rr;F)Z ARG 0 source ARG 1 damage + METHOD a dropEquipment (ZI)V + ARG 0 recentlyHitByPlayer + ARG 1 looting METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag METHOD b registerTagUpgraders (Lnone/pf;)V diff --git a/mappings/net/minecraft/entity/mob/EntityGhast.mapping b/mappings/net/minecraft/entity/mob/EntityGhast.mapping index 1865cdc5b4..ac9b39284d 100644 --- a/mappings/net/minecraft/entity/mob/EntityGhast.mapping +++ b/mappings/net/minecraft/entity/mob/EntityGhast.mapping @@ -29,6 +29,7 @@ CLASS none/zl net/minecraft/entity/mob/EntityGhast METHOD bD initAttributes ()V METHOD bV getSoundHurt ()Lnone/nk; METHOD bW getSoundDeath ()Lnone/nk; + METHOD ch getSoundVolume ()F METHOD i initDataTracker ()V METHOD o isShooting ()Z METHOD y_ update ()V diff --git a/mappings/net/minecraft/entity/mob/EntityHostile.mapping b/mappings/net/minecraft/entity/mob/EntityHostile.mapping index 8b601dcb9b..7090e8297e 100644 --- a/mappings/net/minecraft/entity/mob/EntityHostile.mapping +++ b/mappings/net/minecraft/entity/mob/EntityHostile.mapping @@ -6,6 +6,7 @@ CLASS none/zq net/minecraft/entity/mob/EntityHostile METHOD ab getSoundSplash ()Lnone/nk; METHOD bC getSoundCategory ()Lnone/nm; METHOD bD initAttributes ()V + METHOD bG canDropLootAndXp ()Z METHOD bV getSoundHurt ()Lnone/nk; METHOD bW getSoundDeath ()Lnone/nk; METHOD y_ update ()V diff --git a/mappings/net/minecraft/entity/mob/EntityMob.mapping b/mappings/net/minecraft/entity/mob/EntityMob.mapping index 836ac9efd3..e6fbc6537f 100644 --- a/mappings/net/minecraft/entity/mob/EntityMob.mapping +++ b/mappings/net/minecraft/entity/mob/EntityMob.mapping @@ -1,6 +1,9 @@ CLASS none/sq net/minecraft/entity/mob/EntityMob + CLASS none/sq$a FIELD a MOB_FLAGS Lnone/kj; FIELD bA persistent Z + FIELD bC lootTable Lnone/kp; + FIELD bD lootTableSeed J FIELD bE leashed Z FIELD bF holdingEntity Lnone/sg; FIELD bG leashTag Lnone/dt; @@ -11,7 +14,9 @@ CLASS none/sq net/minecraft/entity/mob/EntityMob FIELD bx handItems Lnone/dc; FIELD by armorItems Lnone/dc; FIELD bz pickUpLoot Z + METHOD D playSoundAmbient ()V METHOD G getSoundAmbient ()Lnone/nk; + METHOD I getLootItem ()Lnone/aeq; METHOD J ()Lnone/kp; METHOD U ()V METHOD a canBeLeashedBy (Lnone/aam;)Z @@ -27,9 +32,19 @@ CLASS none/sq net/minecraft/entity/mob/EntityMob METHOD a startRiding (Lnone/sg;Z)Z ARG 0 entity ARG 1 ignoreRequirements + METHOD a setEquipmentDropChance (Lnone/sl;F)V + ARG 0 slot + ARG 1 value METHOD a setEquippedStack (Lnone/sl;Lnone/aes;)V ARG 0 slot ARG 1 stack + METHOD a dropEquipment (ZI)V + ARG 0 recentlyHitByPlayer + ARG 1 looting + METHOD a dropLoot (ZILnone/rr;)V + ARG 0 recentlyHitByPlayer + ARG 1 looting + ARG 2 damageSource METHOD a detachLeash (ZZ)V ARG 0 sendPacket ARG 1 dropLeadStack @@ -45,6 +60,9 @@ CLASS none/sq net/minecraft/entity/mob/EntityMob ARG 1 sendPacket METHOD b getEquippedStack (Lnone/sl;)Lnone/aes; ARG 0 slot + METHOD b dropDefaultLoot (ZI)V + ARG 0 recentlyHitByPlayer + ARG 1 looting METHOD bD initAttributes ()V METHOD c setTarget (Lnone/sp;)V ARG 0 value diff --git a/mappings/net/minecraft/entity/mob/EntityShulker.mapping b/mappings/net/minecraft/entity/mob/EntityShulker.mapping index 51817ef508..efda702b2c 100644 --- a/mappings/net/minecraft/entity/mob/EntityShulker.mapping +++ b/mappings/net/minecraft/entity/mob/EntityShulker.mapping @@ -17,6 +17,7 @@ CLASS none/zu net/minecraft/entity/mob/EntityShulker FIELD a ATTACHED_FACE Lnone/kj; FIELD b ATTACHED_BLOCK Lnone/kj; FIELD c PEEK_AMOUNT Lnone/kj; + METHOD D playSoundAmbient ()V METHOD G getSoundAmbient ()Lnone/nk; METHOD J ()Lnone/kp; METHOD a (DDDFFIZ)V diff --git a/mappings/net/minecraft/entity/mob/EntitySkeleton.mapping b/mappings/net/minecraft/entity/mob/EntitySkeleton.mapping index 6570f59b16..3cb46033e1 100644 --- a/mappings/net/minecraft/entity/mob/EntitySkeleton.mapping +++ b/mappings/net/minecraft/entity/mob/EntitySkeleton.mapping @@ -1,6 +1,8 @@ CLASS none/zw net/minecraft/entity/mob/EntitySkeleton METHOD G getSoundAmbient ()Lnone/nk; METHOD J ()Lnone/kp; + METHOD a onDeath (Lnone/rr;)V + ARG 0 damageSource METHOD b registerTagUpgraders (Lnone/pf;)V ARG 0 handler METHOD bV getSoundHurt ()Lnone/nk; diff --git a/mappings/net/minecraft/entity/mob/EntitySkeletonBase.mapping b/mappings/net/minecraft/entity/mob/EntitySkeletonBase.mapping index af106416db..6c99175db0 100644 --- a/mappings/net/minecraft/entity/mob/EntitySkeletonBase.mapping +++ b/mappings/net/minecraft/entity/mob/EntitySkeletonBase.mapping @@ -5,6 +5,8 @@ CLASS none/zd net/minecraft/entity/mob/EntitySkeletonBase FIELD a AIMING Lnone/kj; METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag + METHOD a onDeath (Lnone/rr;)V + ARG 0 damageSource METHOD a setEquippedStack (Lnone/sl;Lnone/aes;)V ARG 0 slot ARG 1 stack diff --git a/mappings/net/minecraft/entity/mob/EntitySlime.mapping b/mappings/net/minecraft/entity/mob/EntitySlime.mapping index d21cebea64..4a0d537a34 100644 --- a/mappings/net/minecraft/entity/mob/EntitySlime.mapping +++ b/mappings/net/minecraft/entity/mob/EntitySlime.mapping @@ -14,6 +14,7 @@ CLASS none/zx net/minecraft/entity/mob/EntitySlime METHOD a canStart ()Z METHOD e tick ()V FIELD bv SLIME_SIZE Lnone/kj; + METHOD I getLootItem ()Lnone/aeq; METHOD J ()Lnone/kp; METHOD T invalidate ()V METHOD a deserializeCustomData (Lnone/dt;)V @@ -26,6 +27,7 @@ CLASS none/zx net/minecraft/entity/mob/EntitySlime METHOD bW getSoundDeath ()Lnone/nk; METHOD c registerTagUpgraders (Lnone/pf;)V ARG 0 handler + METHOD ch getSoundVolume ()F METHOD df getSize ()I METHOD i initDataTracker ()V METHOD y_ update ()V diff --git a/mappings/net/minecraft/entity/mob/EntityWitherSkeleton.mapping b/mappings/net/minecraft/entity/mob/EntityWitherSkeleton.mapping index 8754873a6d..848b318221 100644 --- a/mappings/net/minecraft/entity/mob/EntityWitherSkeleton.mapping +++ b/mappings/net/minecraft/entity/mob/EntityWitherSkeleton.mapping @@ -1,6 +1,8 @@ CLASS none/aab net/minecraft/entity/mob/EntityWitherSkeleton METHOD G getSoundAmbient ()Lnone/nk; METHOD J ()Lnone/kp; + METHOD a onDeath (Lnone/rr;)V + ARG 0 damageSource METHOD b registerTagUpgraders (Lnone/pf;)V ARG 0 handler METHOD bV getSoundHurt ()Lnone/nk; diff --git a/mappings/net/minecraft/entity/mob/EntityZombie.mapping b/mappings/net/minecraft/entity/mob/EntityZombie.mapping index f06dd38bb8..809722b6a0 100644 --- a/mappings/net/minecraft/entity/mob/EntityZombie.mapping +++ b/mappings/net/minecraft/entity/mob/EntityZombie.mapping @@ -7,6 +7,8 @@ CLASS none/aac net/minecraft/entity/mob/EntityZombie ARG 0 tag METHOD a onTrackedDataSet (Lnone/kj;)V ARG 0 data + METHOD a onDeath (Lnone/rr;)V + ARG 0 damageSource METHOD a damage (Lnone/rr;F)Z ARG 0 source ARG 1 damage diff --git a/mappings/net/minecraft/entity/passive/EntityBat.mapping b/mappings/net/minecraft/entity/passive/EntityBat.mapping index 65bd236fa6..64d57a20e3 100644 --- a/mappings/net/minecraft/entity/passive/EntityBat.mapping +++ b/mappings/net/minecraft/entity/passive/EntityBat.mapping @@ -16,6 +16,8 @@ CLASS none/wl net/minecraft/entity/passive/EntityBat METHOD bD initAttributes ()V METHOD bV getSoundHurt ()Lnone/nk; METHOD bW getSoundDeath ()Lnone/nk; + METHOD ch getSoundVolume ()F + METHOD ci getSoundPitch ()F METHOD e handleFallDamage (FF)V ARG 0 fallDistance METHOD i initDataTracker ()V diff --git a/mappings/net/minecraft/entity/passive/EntityCow.mapping b/mappings/net/minecraft/entity/passive/EntityCow.mapping index 3f79cf3e33..b738319f8a 100644 --- a/mappings/net/minecraft/entity/passive/EntityCow.mapping +++ b/mappings/net/minecraft/entity/passive/EntityCow.mapping @@ -13,3 +13,4 @@ CLASS none/wp net/minecraft/entity/passive/EntityCow METHOD bD initAttributes ()V METHOD bV getSoundHurt ()Lnone/nk; METHOD bW getSoundDeath ()Lnone/nk; + METHOD ch getSoundVolume ()F diff --git a/mappings/net/minecraft/entity/passive/EntityDonkeyBase.mapping b/mappings/net/minecraft/entity/passive/EntityDonkeyBase.mapping index bb0a37bec3..b4385ee685 100644 --- a/mappings/net/minecraft/entity/passive/EntityDonkeyBase.mapping +++ b/mappings/net/minecraft/entity/passive/EntityDonkeyBase.mapping @@ -5,6 +5,8 @@ CLASS none/xc net/minecraft/entity/passive/EntityDonkeyBase ARG 1 playerHand METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag + METHOD a onDeath (Lnone/rr;)V + ARG 0 damageSource METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag METHOD bD initAttributes ()V diff --git a/mappings/net/minecraft/entity/passive/EntityHorseBase.mapping b/mappings/net/minecraft/entity/passive/EntityHorseBase.mapping index 9e813bbec0..2bd254f900 100644 --- a/mappings/net/minecraft/entity/passive/EntityHorseBase.mapping +++ b/mappings/net/minecraft/entity/passive/EntityHorseBase.mapping @@ -10,6 +10,8 @@ CLASS none/xd net/minecraft/entity/passive/EntityHorseBase ARG 0 tag METHOD a onInvChange (Lnone/qv;)V ARG 0 inventory + METHOD a onDeath (Lnone/rr;)V + ARG 0 damageSource METHOD a damage (Lnone/rr;F)Z ARG 0 source ARG 1 damage @@ -25,6 +27,7 @@ CLASS none/xd net/minecraft/entity/passive/EntityHorseBase METHOD c setHorseFlag (IZ)V ARG 0 index ARG 1 value + METHOD ch getSoundVolume ()F METHOD dh isTame ()Z METHOD di getOwnerUuid ()Ljava/util/UUID; METHOD do isEating ()Z diff --git a/mappings/net/minecraft/entity/passive/EntityIronGolem.mapping b/mappings/net/minecraft/entity/passive/EntityIronGolem.mapping index f305ff203a..19e76b5027 100644 --- a/mappings/net/minecraft/entity/passive/EntityIronGolem.mapping +++ b/mappings/net/minecraft/entity/passive/EntityIronGolem.mapping @@ -3,6 +3,8 @@ CLASS none/wz net/minecraft/entity/passive/EntityIronGolem METHOD J ()Lnone/kp; METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag + METHOD a onDeath (Lnone/rr;)V + ARG 0 damageSource METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag METHOD b registerTagUpgraders (Lnone/pf;)V diff --git a/mappings/net/minecraft/entity/passive/EntityOcelot.mapping b/mappings/net/minecraft/entity/passive/EntityOcelot.mapping index cf02187e4a..bc2ced85e3 100644 --- a/mappings/net/minecraft/entity/passive/EntityOcelot.mapping +++ b/mappings/net/minecraft/entity/passive/EntityOcelot.mapping @@ -21,6 +21,7 @@ CLASS none/ws net/minecraft/entity/passive/EntityOcelot METHOD bD initAttributes ()V METHOD bV getSoundHurt ()Lnone/nk; METHOD bW getSoundDeath ()Lnone/nk; + METHOD ch getSoundVolume ()F METHOD df onTamedChanged ()V METHOD dm getOcelotType ()I METHOD e handleFallDamage (FF)V diff --git a/mappings/net/minecraft/entity/passive/EntityPig.mapping b/mappings/net/minecraft/entity/passive/EntityPig.mapping index af26f5e6a0..13949e7880 100644 --- a/mappings/net/minecraft/entity/passive/EntityPig.mapping +++ b/mappings/net/minecraft/entity/passive/EntityPig.mapping @@ -7,6 +7,8 @@ CLASS none/wt net/minecraft/entity/passive/EntityPig ARG 1 playerHand METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag + METHOD a onDeath (Lnone/rr;)V + ARG 0 damageSource METHOD a createChild (Lnone/sd;)Lnone/sd; ARG 0 other METHOD a onStruckByLightning (Lnone/yx;)V diff --git a/mappings/net/minecraft/entity/passive/EntitySquid.mapping b/mappings/net/minecraft/entity/passive/EntitySquid.mapping index 62320555c6..c788503bd1 100644 --- a/mappings/net/minecraft/entity/passive/EntitySquid.mapping +++ b/mappings/net/minecraft/entity/passive/EntitySquid.mapping @@ -9,3 +9,4 @@ CLASS none/wy net/minecraft/entity/passive/EntitySquid METHOD bD initAttributes ()V METHOD bV getSoundHurt ()Lnone/nk; METHOD bW getSoundDeath ()Lnone/nk; + METHOD ch getSoundVolume ()F diff --git a/mappings/net/minecraft/entity/passive/EntityTameable.mapping b/mappings/net/minecraft/entity/passive/EntityTameable.mapping index b83581bf39..0a9569a0a1 100644 --- a/mappings/net/minecraft/entity/passive/EntityTameable.mapping +++ b/mappings/net/minecraft/entity/passive/EntityTameable.mapping @@ -5,6 +5,8 @@ CLASS none/ta net/minecraft/entity/passive/EntityTameable ARG 0 player METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag + METHOD a onDeath (Lnone/rr;)V + ARG 0 damageSource METHOD aQ getScoreboardTeam ()Lnone/bdd; METHOD b getOwnerUuid ()Ljava/util/UUID; METHOD b setOwnerUuid (Ljava/util/UUID;)V diff --git a/mappings/net/minecraft/entity/passive/EntityVillager.mapping b/mappings/net/minecraft/entity/passive/EntityVillager.mapping index abf43dc61b..db3d8ff5e1 100644 --- a/mappings/net/minecraft/entity/passive/EntityVillager.mapping +++ b/mappings/net/minecraft/entity/passive/EntityVillager.mapping @@ -14,6 +14,8 @@ CLASS none/aah net/minecraft/entity/passive/EntityVillager ARG 1 playerHand METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag + METHOD a onDeath (Lnone/rr;)V + ARG 0 damageSource METHOD a createChild (Lnone/sd;)Lnone/sd; ARG 0 other METHOD a onStruckByLightning (Lnone/yx;)V diff --git a/mappings/net/minecraft/entity/passive/EntityWolf.mapping b/mappings/net/minecraft/entity/passive/EntityWolf.mapping index 530c956e9f..e41c330058 100644 --- a/mappings/net/minecraft/entity/passive/EntityWolf.mapping +++ b/mappings/net/minecraft/entity/passive/EntityWolf.mapping @@ -26,6 +26,7 @@ CLASS none/xb net/minecraft/entity/passive/EntityWolf METHOD bW getSoundDeath ()Lnone/nk; METHOD c setTarget (Lnone/sp;)V ARG 0 value + METHOD ch getSoundVolume ()F METHOD do isAngry ()Z METHOD i initDataTracker ()V METHOD q setTamed (Z)V diff --git a/mappings/net/minecraft/entity/player/EntityPlayer.mapping b/mappings/net/minecraft/entity/player/EntityPlayer.mapping index e73a6ecc07..4df4cb0781 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayer.mapping @@ -85,6 +85,8 @@ CLASS none/aam net/minecraft/entity/player/EntityPlayer METHOD a openContainer (Lnone/rc;)V METHOD a canUnlock (Lnone/rg;)Z ARG 0 lock + METHOD a onDeath (Lnone/rr;)V + ARG 0 damageSource METHOD a damage (Lnone/rr;F)Z ARG 0 source ARG 1 damage diff --git a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping index 312f79392f..73520faa88 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping @@ -51,6 +51,8 @@ CLASS none/lw net/minecraft/entity/player/EntityPlayerServer METHOD a swingHand (Lnone/rb;)V ARG 0 hand METHOD a openContainer (Lnone/rc;)V + METHOD a onDeath (Lnone/rr;)V + ARG 0 damageSource METHOD a damage (Lnone/rr;F)Z ARG 0 source ARG 1 damage diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index ccfe36dc8d..19c102f6ef 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -6,6 +6,7 @@ CLASS none/aeq net/minecraft/item/Item ARG 2 user CLASS none/aeq$2 METHOD a apply (Lnone/aes;)Ljava/lang/String; + ARG 0 stack CLASS none/aeq$3 METHOD a apply (Lnone/aes;)Ljava/lang/String; ARG 0 stack @@ -14,6 +15,7 @@ CLASS none/aeq net/minecraft/item/Item ARG 0 stack CLASS none/aeq$5 METHOD a apply (Lnone/aes;)Ljava/lang/String; + ARG 0 stack CLASS none/aeq$6 METHOD a apply (Lnone/aes;)Ljava/lang/String; ARG 0 stack @@ -22,8 +24,10 @@ CLASS none/aeq net/minecraft/item/Item ARG 0 stack CLASS none/aeq$8 METHOD a apply (Lnone/aes;)Ljava/lang/String; + ARG 0 stack CLASS none/aeq$9 METHOD a apply (Lnone/aes;)Ljava/lang/String; + ARG 0 stack CLASS none/aeq$a ToolMaterial FIELD a WOOD Lnone/aeq$a; FIELD b COBBLESTONE Lnone/aeq$a; @@ -49,8 +53,10 @@ CLASS none/aeq net/minecraft/item/Item METHOD f getRepairItem ()Lnone/aeq; CLASS none/aeq$10 METHOD a apply (Lnone/aes;)Ljava/lang/String; + ARG 0 stack CLASS none/aeq$11 METHOD a apply (Lnone/aes;)Ljava/lang/String; + ARG 0 stack CLASS none/aeq$12 METHOD a getProperty (Lnone/aes;Lnone/aiw;Lnone/sp;)F ARG 0 stack @@ -58,8 +64,10 @@ CLASS none/aeq net/minecraft/item/Item ARG 2 user CLASS none/aeq$13 METHOD a apply (Lnone/aes;)Ljava/lang/String; + ARG 0 stack CLASS none/aeq$14 METHOD a apply (Lnone/aes;)Ljava/lang/String; + ARG 0 stack CLASS none/aeq$15 METHOD a getProperty (Lnone/aes;Lnone/aiw;Lnone/sp;)F ARG 0 stack @@ -72,12 +80,16 @@ CLASS none/aeq net/minecraft/item/Item ARG 2 user CLASS none/aeq$17 METHOD a apply (Lnone/aes;)Ljava/lang/String; + ARG 0 stack CLASS none/aeq$18 METHOD a apply (Lnone/aes;)Ljava/lang/String; + ARG 0 stack CLASS none/aeq$19 METHOD a apply (Lnone/aes;)Ljava/lang/String; + ARG 0 stack CLASS none/aeq$20 METHOD a apply (Lnone/aes;)Ljava/lang/String; + ARG 0 stack CLASS none/aeq$21 METHOD a apply (Lnone/aes;)Ljava/lang/String; ARG 0 stack @@ -242,4 +254,4 @@ CLASS none/aeq net/minecraft/item/Item METHOD q getContainerItem ()Lnone/aeq; METHOD r hasContainerItem ()Z METHOD s hasBlockInteraction ()Z - METHOD t init ()V + METHOD t registerDefaults ()V diff --git a/mappings/net/minecraft/potion/Potion.mapping b/mappings/net/minecraft/potion/Potion.mapping index bc7f73993d..163c609aa0 100644 --- a/mappings/net/minecraft/potion/Potion.mapping +++ b/mappings/net/minecraft/potion/Potion.mapping @@ -19,7 +19,7 @@ CLASS none/agg net/minecraft/potion/Potion ARG 1 potion METHOD a getRawIdFromPotion (Lnone/agg;)I ARG 0 potion - METHOD b init ()V + METHOD b registerDefaults ()V METHOD b getName (Ljava/lang/String;)Ljava/lang/String; ARG 0 prefix METHOD c hasInstantEffect ()Z diff --git a/mappings/net/minecraft/potion/PotionEffectType.mapping b/mappings/net/minecraft/potion/PotionEffectType.mapping index 06e777d987..eb007cd685 100644 --- a/mappings/net/minecraft/potion/PotionEffectType.mapping +++ b/mappings/net/minecraft/potion/PotionEffectType.mapping @@ -38,4 +38,4 @@ CLASS none/rz net/minecraft/potion/PotionEffectType METHOD d getIconIndex ()I METHOD e isNegative ()Z METHOD g getColor ()I - METHOD k init ()V + METHOD k registerDefaults ()V diff --git a/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping b/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping index 9b0afe20c7..5a859d346d 100644 --- a/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping +++ b/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping @@ -21,7 +21,7 @@ CLASS none/agh net/minecraft/recipe/BrewingRecipeRegistry FIELD b ITEM_RECIPES Ljava/util/List; FIELD c POTION_TYPES Ljava/util/List; FIELD d POTION_TYPE_MATCHER Lcom/google/common/base/Predicate; - METHOD a init ()V + METHOD a registerDefaults ()V METHOD a isValidIngredient (Lnone/aes;)Z ARG 0 stack METHOD a hasRecipe (Lnone/aes;Lnone/aes;)Z diff --git a/mappings/net/minecraft/reference/Bootstrap.mapping b/mappings/net/minecraft/reference/Bootstrap.mapping index 883b7e3bda..94dbc7b711 100644 --- a/mappings/net/minecraft/reference/Bootstrap.mapping +++ b/mappings/net/minecraft/reference/Bootstrap.mapping @@ -14,6 +14,7 @@ CLASS none/ks net/minecraft/reference/Bootstrap FIELD c LOGGER Lorg/apache/logging/log4j/Logger; METHOD a isInitialized ()Z METHOD a printStdout (Ljava/lang/String;)V - METHOD b initDispenserBehaviors ()V + ARG 0 message + METHOD b registerDefaultDispenserBehaviors ()V METHOD c init ()V METHOD d redirectOutputStreams ()V diff --git a/mappings/net/minecraft/sound/Sound.mapping b/mappings/net/minecraft/sound/Sound.mapping index 04fe112e0e..de22124d8c 100644 --- a/mappings/net/minecraft/sound/Sound.mapping +++ b/mappings/net/minecraft/sound/Sound.mapping @@ -7,4 +7,4 @@ CLASS none/nk net/minecraft/sound/Sound METHOD a getSoundId ()Lnone/kp; METHOD a registerSound (Ljava/lang/String;)V ARG 0 name - METHOD b init ()V + METHOD b registerDefaults ()V diff --git a/mappings/net/minecraft/stat/Stats.mapping b/mappings/net/minecraft/stat/Stats.mapping index 754dc1fb97..bfabdee50e 100644 --- a/mappings/net/minecraft/stat/Stats.mapping +++ b/mappings/net/minecraft/stat/Stats.mapping @@ -61,7 +61,7 @@ CLASS none/ny net/minecraft/stat/Stats FIELD x DROP Lnone/nu; FIELD y DAMAGE_DEALT Lnone/nu; FIELD z DAMAGE_TAKEN Lnone/nu; - METHOD a init ()V + METHOD a registerDefaults ()V METHOD a getStatById (Ljava/lang/String;)Lnone/nu; ARG 0 id METHOD a getCraftingStat (Lnone/aeq;)Lnone/nu; diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 84b59cb366..d78a031f09 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -154,7 +154,9 @@ CLASS none/aiw net/minecraft/world/World METHOD a (Lnone/cn;Lnone/are;)V ARG 0 pos ARG 1 blockEntity - METHOD a (Lnone/cn;Lnone/asm;)Z + METHOD a setBlockState (Lnone/cn;Lnone/asm;)Z + ARG 0 pos + ARG 1 state METHOD a setBlockState (Lnone/cn;Lnone/asm;I)Z ARG 0 pos ARG 1 state diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index acc36c8775..e2a650bcdd 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -68,4 +68,4 @@ CLASS none/ajj net/minecraft/world/biome/Biome METHOD h getTemperatureGroup ()Lnone/ajj$b; METHOD l getId ()Ljava/lang/String; METHOD n getTemperature ()F - METHOD q init ()V + METHOD q registerDefaults ()V