From ee80697cf47ea915978a5e158864def7f7557ecd Mon Sep 17 00:00:00 2001 From: Ryan Leach Date: Tue, 18 Oct 2016 23:35:26 +1030 Subject: [PATCH] Tonights Work for review. (#135) * Various entity & loot names * Revert confusing names. * Remove renamed args on obfuscated methods. * Fix things based on asie's review --- mappings/net/minecraft/entity/Entity.mapping | 3 +++ .../entity/mob/EntityEndermite.mapping | 2 ++ .../minecraft/entity/mob/EntityHusk.mapping | 2 ++ .../minecraft/entity/mob/EntityMob.mapping | 4 ++++ .../entity/mob/EntityPigZombie.mapping | 3 +++ .../entity/mob/EntitySilverfish.mapping | 2 ++ .../entity/mob/EntitySkeletonBase.mapping | 4 ++++ .../minecraft/entity/mob/EntitySpider.mapping | 2 ++ .../entity/mob/EntityWitherSkeleton.mapping | 2 ++ .../minecraft/entity/mob/EntityZombie.mapping | 10 +++++++++ .../entity/mob/EntityZombieVillager.mapping | 2 ++ .../entity/passive/EntityChicken.mapping | 2 ++ .../entity/passive/EntityCow.mapping | 2 ++ .../entity/passive/EntityHorseBase.mapping | 2 ++ .../entity/passive/EntityIronGolem.mapping | 2 ++ .../entity/passive/EntityPig.mapping | 2 ++ .../entity/passive/EntityPolarBear.mapping | 2 ++ .../entity/passive/EntitySheep.mapping | 2 ++ .../entity/passive/EntityWolf.mapping | 2 ++ .../entity/player/EntityPlayer.mapping | 2 ++ .../entity/player/HungerManager.mapping | 1 + .../entity/player/InventoryPlayer.mapping | 7 ++++++ .../entity/projectile/EntityArrow.mapping | 3 +++ .../entity/projectile/EntityArrowBase.mapping | 20 +++++++++++++++++ .../projectile/EntityDragonFireball.mapping | 1 + .../EntityExplosiveProjectile.mapping | 1 + .../entity/projectile/EntityFireball.mapping | 1 + .../entity/projectile/EntityFishHook.mapping | 2 ++ .../projectile/EntitySpectralArrow.mapping | 1 + .../net/minecraft/entity/sortme/IMob.mapping | 6 +++++ .../thrown/EntityThrownEnderpearl.mapping | 1 + .../entity/thrown/EntityThrownPotion.mapping | 5 +++++ .../TrackedDataHandlerRegistry.mapping | 5 +++++ .../vehicle/EntityChestMinecart.mapping | 2 +- .../vehicle/EntityFurnaceMinecart.mapping | 2 +- .../vehicle/EntityHopperMinecart.mapping | 2 +- .../entity/vehicle/EntityMinecartBase.mapping | 5 ++++- .../vehicle/EntityStorageMinecart.mapping | 4 +++- .../entity/vehicle/EntityTNTMinecart.mapping | 2 +- .../util/sortme/ItemScatterer.mapping | 22 +++++++++++++++++++ mappings/none/bmg.mapping | 9 ++++++++ 41 files changed, 150 insertions(+), 6 deletions(-) create mode 100644 mappings/net/minecraft/util/sortme/ItemScatterer.mapping diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 0298525f84..59d502d8e1 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -139,6 +139,8 @@ CLASS none/sg net/minecraft/entity/Entity ARG 1 yaw ARG 2 pitch METHOD a playStepSound (Lnone/cn;Lnone/aky;)V + ARG 0 pos + ARG 1 block METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag METHOD a appendCommandFeedback (Lnone/fa;)V @@ -222,6 +224,7 @@ CLASS none/sg net/minecraft/entity/Entity ARG 0 tag METHOD b isInvulnerableTo (Lnone/rr;)Z ARG 0 source + METHOD b setInWorld (Z)V METHOD bB getRiddenEntity ()Lnone/sg; METHOD bC getSoundCategory ()Lnone/nm; METHOD be getUuid ()Ljava/util/UUID; diff --git a/mappings/net/minecraft/entity/mob/EntityEndermite.mapping b/mappings/net/minecraft/entity/mob/EntityEndermite.mapping index f4304a9e26..88cea6ef50 100644 --- a/mappings/net/minecraft/entity/mob/EntityEndermite.mapping +++ b/mappings/net/minecraft/entity/mob/EntityEndermite.mapping @@ -2,6 +2,8 @@ CLASS none/zj net/minecraft/entity/mob/EntityEndermite METHOD G getSoundAmbient ()Lnone/nk; METHOD J getLootTableId ()Lnone/kp; METHOD a playStepSound (Lnone/cn;Lnone/aky;)V + ARG 0 pos + ARG 1 block METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag METHOD b serializeCustomData (Lnone/dt;)V diff --git a/mappings/net/minecraft/entity/mob/EntityHusk.mapping b/mappings/net/minecraft/entity/mob/EntityHusk.mapping index 1a99e7e928..2c6270f4f4 100644 --- a/mappings/net/minecraft/entity/mob/EntityHusk.mapping +++ b/mappings/net/minecraft/entity/mob/EntityHusk.mapping @@ -5,3 +5,5 @@ CLASS none/zo net/minecraft/entity/mob/EntityHusk ARG 0 handler METHOD bV getSoundHurt ()Lnone/nk; METHOD bW getSoundDeath ()Lnone/nk; + METHOD df getSoundStep ()Lnone/nk; + METHOD dg getSkull ()Lnone/aes; diff --git a/mappings/net/minecraft/entity/mob/EntityMob.mapping b/mappings/net/minecraft/entity/mob/EntityMob.mapping index ce729e02ec..0e79e90f60 100644 --- a/mappings/net/minecraft/entity/mob/EntityMob.mapping +++ b/mappings/net/minecraft/entity/mob/EntityMob.mapping @@ -43,6 +43,10 @@ CLASS none/sq net/minecraft/entity/mob/EntityMob METHOD a registerTagUpgradersFor (Lnone/pf;Ljava/lang/Class;)V ARG 0 handler ARG 1 entityClass + METHOD a initEquipment (Lnone/ra;)V + ARG 0 localDifficulty + METHOD a (Lnone/ra;Lnone/ss;)Lnone/ss; + ARG 0 localDifficulty METHOD a startRiding (Lnone/sg;Z)Z ARG 0 entity ARG 1 ignoreRequirements diff --git a/mappings/net/minecraft/entity/mob/EntityPigZombie.mapping b/mappings/net/minecraft/entity/mob/EntityPigZombie.mapping index c443449c52..768d71627f 100644 --- a/mappings/net/minecraft/entity/mob/EntityPigZombie.mapping +++ b/mappings/net/minecraft/entity/mob/EntityPigZombie.mapping @@ -9,6 +9,8 @@ CLASS none/zr net/minecraft/entity/mob/EntityPigZombie ARG 1 playerHand METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag + METHOD a initEquipment (Lnone/ra;)V + ARG 0 localDifficulty METHOD a damage (Lnone/rr;F)Z ARG 0 source ARG 1 damage @@ -21,4 +23,5 @@ CLASS none/zr net/minecraft/entity/mob/EntityPigZombie METHOD bD initAttributes ()V METHOD bV getSoundHurt ()Lnone/nk; METHOD bW getSoundDeath ()Lnone/nk; + METHOD dg getSkull ()Lnone/aes; METHOD y_ update ()V diff --git a/mappings/net/minecraft/entity/mob/EntitySilverfish.mapping b/mappings/net/minecraft/entity/mob/EntitySilverfish.mapping index 243f3c2190..77be9ebabe 100644 --- a/mappings/net/minecraft/entity/mob/EntitySilverfish.mapping +++ b/mappings/net/minecraft/entity/mob/EntitySilverfish.mapping @@ -9,6 +9,8 @@ CLASS none/zv net/minecraft/entity/mob/EntitySilverfish METHOD G getSoundAmbient ()Lnone/nk; METHOD J getLootTableId ()Lnone/kp; METHOD a playStepSound (Lnone/cn;Lnone/aky;)V + ARG 0 pos + ARG 1 block METHOD a damage (Lnone/rr;F)Z ARG 0 source ARG 1 damage diff --git a/mappings/net/minecraft/entity/mob/EntitySkeletonBase.mapping b/mappings/net/minecraft/entity/mob/EntitySkeletonBase.mapping index 7038e42be4..b52c957e3f 100644 --- a/mappings/net/minecraft/entity/mob/EntitySkeletonBase.mapping +++ b/mappings/net/minecraft/entity/mob/EntitySkeletonBase.mapping @@ -4,8 +4,12 @@ CLASS none/zd net/minecraft/entity/mob/EntitySkeletonBase METHOD d onRemove ()V FIELD a AIMING Lnone/kj; METHOD a playStepSound (Lnone/cn;Lnone/aky;)V + ARG 0 pos + ARG 1 block METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag + METHOD a initEquipment (Lnone/ra;)V + ARG 0 localDifficulty METHOD a onDeath (Lnone/rr;)V ARG 0 damageSource METHOD a setEquippedStack (Lnone/sl;Lnone/aes;)V diff --git a/mappings/net/minecraft/entity/mob/EntitySpider.mapping b/mappings/net/minecraft/entity/mob/EntitySpider.mapping index 1a72627f13..705b036ae2 100644 --- a/mappings/net/minecraft/entity/mob/EntitySpider.mapping +++ b/mappings/net/minecraft/entity/mob/EntitySpider.mapping @@ -7,6 +7,8 @@ CLASS none/zy net/minecraft/entity/mob/EntitySpider METHOD G getSoundAmbient ()Lnone/nk; METHOD J getLootTableId ()Lnone/kp; METHOD a playStepSound (Lnone/cn;Lnone/aky;)V + ARG 0 pos + ARG 1 block METHOD a setCanClimb (Z)V METHOD b createNavigation (Lnone/aiw;)Lnone/vw; ARG 0 world diff --git a/mappings/net/minecraft/entity/mob/EntityWitherSkeleton.mapping b/mappings/net/minecraft/entity/mob/EntityWitherSkeleton.mapping index 3218cffeef..397c677c66 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 getLootTableId ()Lnone/kp; + METHOD a initEquipment (Lnone/ra;)V + ARG 0 localDifficulty METHOD a onDeath (Lnone/rr;)V ARG 0 damageSource METHOD b registerTagUpgraders (Lnone/pf;)V diff --git a/mappings/net/minecraft/entity/mob/EntityZombie.mapping b/mappings/net/minecraft/entity/mob/EntityZombie.mapping index 1e631aeaa7..d660fbd60e 100644 --- a/mappings/net/minecraft/entity/mob/EntityZombie.mapping +++ b/mappings/net/minecraft/entity/mob/EntityZombie.mapping @@ -1,16 +1,23 @@ CLASS none/aac net/minecraft/entity/mob/EntityZombie + FIELD a SPAWN_REINFORCEMENTS Lnone/tb; + FIELD b BABY_SPEED_ID Ljava/util/UUID; FIELD bx BABY Lnone/kj; FIELD bz ARMS_RAISED Lnone/kj; + FIELD c BABY_SPEED_BONUS Lnone/td; METHOD G getSoundAmbient ()Lnone/nk; METHOD J getLootTableId ()Lnone/kp; METHOD a setSize (FF)V ARG 0 width ARG 1 height METHOD a playStepSound (Lnone/cn;Lnone/aky;)V + ARG 0 pos + ARG 1 block METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag METHOD a onTrackedDataSet (Lnone/kj;)V ARG 0 data + METHOD a initEquipment (Lnone/ra;)V + ARG 0 localDifficulty METHOD a onDeath (Lnone/rr;)V ARG 0 damageSource METHOD a damage (Lnone/rr;F)Z @@ -26,7 +33,10 @@ CLASS none/aac net/minecraft/entity/mob/EntityZombie METHOD bq getEyeHeight ()F METHOD c registerTagUpgraders2 (Lnone/pf;)V ARG 0 handler + METHOD df getSoundStep ()Lnone/nk; + METHOD dg getSkull ()Lnone/aes; METHOD dj hasArmsRaised ()Z + METHOD dk canBreakDoors ()Z METHOD i initDataTracker ()V METHOD l_ isChild ()Z METHOD n updateMovement ()V diff --git a/mappings/net/minecraft/entity/mob/EntityZombieVillager.mapping b/mappings/net/minecraft/entity/mob/EntityZombieVillager.mapping index a9f23c1386..2d84e96ae1 100644 --- a/mappings/net/minecraft/entity/mob/EntityZombieVillager.mapping +++ b/mappings/net/minecraft/entity/mob/EntityZombieVillager.mapping @@ -19,6 +19,8 @@ CLASS none/aad net/minecraft/entity/mob/EntityZombieVillager ARG 0 handler METHOD bV getSoundHurt ()Lnone/nk; METHOD bW getSoundDeath ()Lnone/nk; + METHOD df getSoundStep ()Lnone/nk; + METHOD dg getSkull ()Lnone/aes; METHOD di getProfession ()I METHOD dl isConverting ()Z METHOD dm finishConversion ()V diff --git a/mappings/net/minecraft/entity/passive/EntityChicken.mapping b/mappings/net/minecraft/entity/passive/EntityChicken.mapping index bbc9f29b93..bbea1e6436 100644 --- a/mappings/net/minecraft/entity/passive/EntityChicken.mapping +++ b/mappings/net/minecraft/entity/passive/EntityChicken.mapping @@ -3,6 +3,8 @@ CLASS none/wo net/minecraft/entity/passive/EntityChicken METHOD G getSoundAmbient ()Lnone/nk; METHOD J getLootTableId ()Lnone/kp; METHOD a playStepSound (Lnone/cn;Lnone/aky;)V + ARG 0 pos + ARG 1 block METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag METHOD a createChild (Lnone/sd;)Lnone/sd; diff --git a/mappings/net/minecraft/entity/passive/EntityCow.mapping b/mappings/net/minecraft/entity/passive/EntityCow.mapping index c5ccbdae59..812e82406d 100644 --- a/mappings/net/minecraft/entity/passive/EntityCow.mapping +++ b/mappings/net/minecraft/entity/passive/EntityCow.mapping @@ -5,6 +5,8 @@ CLASS none/wp net/minecraft/entity/passive/EntityCow ARG 0 player ARG 1 playerHand METHOD a playStepSound (Lnone/cn;Lnone/aky;)V + ARG 0 pos + ARG 1 block METHOD a createChild (Lnone/sd;)Lnone/sd; ARG 0 other METHOD b registerTagUpgraders (Lnone/pf;)V diff --git a/mappings/net/minecraft/entity/passive/EntityHorseBase.mapping b/mappings/net/minecraft/entity/passive/EntityHorseBase.mapping index f19b18ab56..3007d96c46 100644 --- a/mappings/net/minecraft/entity/passive/EntityHorseBase.mapping +++ b/mappings/net/minecraft/entity/passive/EntityHorseBase.mapping @@ -8,6 +8,8 @@ CLASS none/xd net/minecraft/entity/passive/EntityHorseBase METHOD a canBeLeashedBy (Lnone/aam;)Z ARG 0 player METHOD a playStepSound (Lnone/cn;Lnone/aky;)V + ARG 0 pos + ARG 1 block METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag METHOD a onInvChange (Lnone/qv;)V diff --git a/mappings/net/minecraft/entity/passive/EntityIronGolem.mapping b/mappings/net/minecraft/entity/passive/EntityIronGolem.mapping index 86e508a7cd..919348a801 100644 --- a/mappings/net/minecraft/entity/passive/EntityIronGolem.mapping +++ b/mappings/net/minecraft/entity/passive/EntityIronGolem.mapping @@ -5,6 +5,8 @@ CLASS none/wz net/minecraft/entity/passive/EntityIronGolem METHOD J getLootTableId ()Lnone/kp; METHOD M mobTick ()V METHOD a playStepSound (Lnone/cn;Lnone/aky;)V + ARG 0 pos + ARG 1 block METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag METHOD a onDeath (Lnone/rr;)V diff --git a/mappings/net/minecraft/entity/passive/EntityPig.mapping b/mappings/net/minecraft/entity/passive/EntityPig.mapping index 69b562fe23..611583a91e 100644 --- a/mappings/net/minecraft/entity/passive/EntityPig.mapping +++ b/mappings/net/minecraft/entity/passive/EntityPig.mapping @@ -6,6 +6,8 @@ CLASS none/wt net/minecraft/entity/passive/EntityPig ARG 0 player ARG 1 playerHand METHOD a playStepSound (Lnone/cn;Lnone/aky;)V + ARG 0 pos + ARG 1 block METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag METHOD a onDeath (Lnone/rr;)V diff --git a/mappings/net/minecraft/entity/passive/EntityPolarBear.mapping b/mappings/net/minecraft/entity/passive/EntityPolarBear.mapping index a7c0bdc432..32f222033d 100644 --- a/mappings/net/minecraft/entity/passive/EntityPolarBear.mapping +++ b/mappings/net/minecraft/entity/passive/EntityPolarBear.mapping @@ -10,6 +10,8 @@ CLASS none/wu net/minecraft/entity/passive/EntityPolarBear METHOD G getSoundAmbient ()Lnone/nk; METHOD J getLootTableId ()Lnone/kp; METHOD a playStepSound (Lnone/cn;Lnone/aky;)V + ARG 0 pos + ARG 1 block METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag METHOD a createChild (Lnone/sd;)Lnone/sd; diff --git a/mappings/net/minecraft/entity/passive/EntitySheep.mapping b/mappings/net/minecraft/entity/passive/EntitySheep.mapping index 1f1e83e9b2..461f0db013 100644 --- a/mappings/net/minecraft/entity/passive/EntitySheep.mapping +++ b/mappings/net/minecraft/entity/passive/EntitySheep.mapping @@ -15,6 +15,8 @@ CLASS none/ww net/minecraft/entity/passive/EntitySheep METHOD a getRgbColor (Lnone/adv;)[F ARG 0 dyeColor METHOD a playStepSound (Lnone/cn;Lnone/aky;)V + ARG 0 pos + ARG 1 block METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag METHOD a createChild (Lnone/sd;)Lnone/sd; diff --git a/mappings/net/minecraft/entity/passive/EntityWolf.mapping b/mappings/net/minecraft/entity/passive/EntityWolf.mapping index b1a156c030..4b96797a39 100644 --- a/mappings/net/minecraft/entity/passive/EntityWolf.mapping +++ b/mappings/net/minecraft/entity/passive/EntityWolf.mapping @@ -10,6 +10,8 @@ CLASS none/xb net/minecraft/entity/passive/EntityWolf ARG 0 player ARG 1 playerHand METHOD a playStepSound (Lnone/cn;Lnone/aky;)V + ARG 0 pos + ARG 1 block METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag METHOD a damage (Lnone/rr;F)Z diff --git a/mappings/net/minecraft/entity/player/EntityPlayer.mapping b/mappings/net/minecraft/entity/player/EntityPlayer.mapping index 14cf0aba5a..b6160085a7 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayer.mapping @@ -31,6 +31,7 @@ CLASS none/aam net/minecraft/entity/player/EntityPlayer FIELD bM experience I FIELD bN experienceLevel I FIELD bO experienceBarProgress F + FIELD bR fishHook Lnone/yt; FIELD bT gameProfile Lcom/mojang/authlib/GameProfile; FIELD bU reducedDebugInfo Z FIELD bW itemCooldownManager Lnone/aer; @@ -145,6 +146,7 @@ CLASS none/aam net/minecraft/entity/player/EntityPlayer METHOD cT getSpawnPosition ()Lnone/cn; METHOD cU isSpawnForced ()Z METHOD cX getHungerManager ()Lnone/abv; + METHOD cY canFoodHeal ()Z METHOD cZ canModifyWorld ()Z METHOD cq isSleeping ()Z METHOD cw getMainHand ()Lnone/so; diff --git a/mappings/net/minecraft/entity/player/HungerManager.mapping b/mappings/net/minecraft/entity/player/HungerManager.mapping index 5075e318be..ef3cd38179 100644 --- a/mappings/net/minecraft/entity/player/HungerManager.mapping +++ b/mappings/net/minecraft/entity/player/HungerManager.mapping @@ -3,6 +3,7 @@ CLASS none/abv net/minecraft/entity/player/HungerManager FIELD b foodSaturationLevel F FIELD c exhaustion F FIELD d foodStarvationTimer I + FIELD e prevFoodLevel I METHOD a getFoodLevel ()I METHOD a addExhaustion (F)V ARG 0 value diff --git a/mappings/net/minecraft/entity/player/InventoryPlayer.mapping b/mappings/net/minecraft/entity/player/InventoryPlayer.mapping index f983fdc3a2..cf03259018 100644 --- a/mappings/net/minecraft/entity/player/InventoryPlayer.mapping +++ b/mappings/net/minecraft/entity/player/InventoryPlayer.mapping @@ -41,14 +41,21 @@ CLASS none/aal net/minecraft/entity/player/InventoryPlayer ARG 0 stack METHOD c_ getInvProperty (I)I ARG 0 pos + METHOD d removeOne (Lnone/aes;)V + ARG 0 item + METHOD e isValidHotbarIndex (I)Z + ARG 0 slot METHOD e setCursorStack (Lnone/aes;)V ARG 0 stack + METHOD f scrollSelectedSlot (I)V + ARG 0 amount METHOD g getArmorStack (I)Lnone/aes; ARG 0 slot METHOD h getInvPropertyCount ()I METHOD h_ getName ()Ljava/lang/String; METHOD i getMainHandStack ()Lnone/aes; METHOD i_ getNameAsComponent ()Lnone/fa; + METHOD j getHotbarSize ()I METHOD m clearInv ()V METHOD n updateItems ()V METHOD n_ hasCustomName ()Z diff --git a/mappings/net/minecraft/entity/projectile/EntityArrow.mapping b/mappings/net/minecraft/entity/projectile/EntityArrow.mapping index d01be1e3f5..3f8257246d 100644 --- a/mappings/net/minecraft/entity/projectile/EntityArrow.mapping +++ b/mappings/net/minecraft/entity/projectile/EntityArrow.mapping @@ -18,11 +18,14 @@ CLASS none/abg net/minecraft/entity/projectile/EntityArrow ARG 0 effect METHOD a onHit (Lnone/sp;)V ARG 0 entity + METHOD b spawnParticles (I)V + ARG 0 count METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag METHOD c registerTagUpgraders2 (Lnone/pf;)V ARG 0 handler METHOD i initDataTracker ()V METHOD j asItemStack ()Lnone/aes; + METHOD n initColor ()V METHOD o getColor ()I METHOD y_ update ()V diff --git a/mappings/net/minecraft/entity/projectile/EntityArrowBase.mapping b/mappings/net/minecraft/entity/projectile/EntityArrowBase.mapping index 1030ded92d..ff1e8ab829 100644 --- a/mappings/net/minecraft/entity/projectile/EntityArrowBase.mapping +++ b/mappings/net/minecraft/entity/projectile/EntityArrowBase.mapping @@ -1,5 +1,22 @@ CLASS none/aap net/minecraft/entity/projectile/EntityArrowBase + CLASS none/aap$1 + METHOD a apply (Lnone/sg;)Z + ARG 0 entity + CLASS none/aap$a PickupType + FIELD a NO_PICKUP Lnone/aap$a; + FIELD b PICKUP Lnone/aap$a; + FIELD c CREATIVE_PICKUP Lnone/aap$a; + METHOD a fromOrdinal (I)Lnone/aap$a; + ARG 0 ordinal + METHOD values values ()[Lnone/aap$a; + FIELD aA damage D + FIELD a inGround Z + FIELD aw inBlock Lnone/aky; + FIELD ax inMetaData I + FIELD c pickupType Lnone/aap$a; + FIELD d shake I FIELD e owner Lnone/sg; + FIELD f CAN_HIT Lcom/google/common/base/Predicate; FIELD g ARROW_FLAGS Lnone/kj; METHOD (Lnone/aiw;DDD)V ARG 0 world @@ -37,6 +54,8 @@ CLASS none/aap net/minecraft/entity/projectile/EntityArrowBase METHOD b registerTagUpgraders (Lnone/pf;)V ARG 0 handler METHOD bq getEyeHeight ()F + METHOD c setDamage (D)V + ARG 0 amount METHOD c setVelocity (DDDFF)V ARG 0 dirX ARG 1 dirY @@ -49,5 +68,6 @@ CLASS none/aap net/minecraft/entity/projectile/EntityArrowBase ARG 1 y ARG 2 z METHOD j asItemStack ()Lnone/aes; + METHOD k getDamage ()D METHOD l isCritical ()Z METHOD y_ update ()V diff --git a/mappings/net/minecraft/entity/projectile/EntityDragonFireball.mapping b/mappings/net/minecraft/entity/projectile/EntityDragonFireball.mapping index ca04c35234..887ca563a8 100644 --- a/mappings/net/minecraft/entity/projectile/EntityDragonFireball.mapping +++ b/mappings/net/minecraft/entity/projectile/EntityDragonFireball.mapping @@ -7,3 +7,4 @@ CLASS none/aaq net/minecraft/entity/projectile/EntityDragonFireball METHOD aq doesCollide ()Z METHOD b registerTagUpgraders (Lnone/pf;)V ARG 0 handler + METHOD j getParticleType ()Lnone/dd; diff --git a/mappings/net/minecraft/entity/projectile/EntityExplosiveProjectile.mapping b/mappings/net/minecraft/entity/projectile/EntityExplosiveProjectile.mapping index 922028146a..24cb081f2a 100644 --- a/mappings/net/minecraft/entity/projectile/EntityExplosiveProjectile.mapping +++ b/mappings/net/minecraft/entity/projectile/EntityExplosiveProjectile.mapping @@ -19,4 +19,5 @@ CLASS none/aas net/minecraft/entity/projectile/EntityExplosiveProjectile METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag METHOD i initDataTracker ()V + METHOD j getParticleType ()Lnone/dd; METHOD y_ update ()V diff --git a/mappings/net/minecraft/entity/projectile/EntityFireball.mapping b/mappings/net/minecraft/entity/projectile/EntityFireball.mapping index 93dfb7390b..7d4b18899d 100644 --- a/mappings/net/minecraft/entity/projectile/EntityFireball.mapping +++ b/mappings/net/minecraft/entity/projectile/EntityFireball.mapping @@ -1,4 +1,5 @@ CLASS none/aau net/minecraft/entity/projectile/EntityFireball + FIELD e explosionPower I METHOD a onCollision (Lnone/bct;)V ARG 0 hit METHOD a deserializeCustomData (Lnone/dt;)V diff --git a/mappings/net/minecraft/entity/projectile/EntityFishHook.mapping b/mappings/net/minecraft/entity/projectile/EntityFishHook.mapping index 66c43f7186..2bca0bdc3f 100644 --- a/mappings/net/minecraft/entity/projectile/EntityFishHook.mapping +++ b/mappings/net/minecraft/entity/projectile/EntityFishHook.mapping @@ -1,6 +1,8 @@ CLASS none/yt net/minecraft/entity/projectile/EntityFishHook FIELD a owner Lnone/aam; + FIELD b hookedEntity Lnone/sg; FIELD c HOOK_ENTITY_ID Lnone/kj; + FIELD d pos Lnone/cn; METHOD T invalidate ()V METHOD a (DDDFFIZ)V ARG 0 x diff --git a/mappings/net/minecraft/entity/projectile/EntitySpectralArrow.mapping b/mappings/net/minecraft/entity/projectile/EntitySpectralArrow.mapping index 0497172461..61570c66d3 100644 --- a/mappings/net/minecraft/entity/projectile/EntitySpectralArrow.mapping +++ b/mappings/net/minecraft/entity/projectile/EntitySpectralArrow.mapping @@ -1,4 +1,5 @@ CLASS none/aba net/minecraft/entity/projectile/EntitySpectralArrow + FIELD f duration I METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag METHOD a onHit (Lnone/sp;)V diff --git a/mappings/net/minecraft/entity/sortme/IMob.mapping b/mappings/net/minecraft/entity/sortme/IMob.mapping index 57f8e9cff8..47efb9225c 100644 --- a/mappings/net/minecraft/entity/sortme/IMob.mapping +++ b/mappings/net/minecraft/entity/sortme/IMob.mapping @@ -1,3 +1,9 @@ CLASS none/zk net/minecraft/entity/sortme/IMob + CLASS none/zk$1 + METHOD a apply (Lnone/sg;)Z + ARG 0 entity + CLASS none/zk$2 + METHOD a apply (Lnone/sg;)Z + ARG 0 entity FIELD d MOBS Lcom/google/common/base/Predicate; FIELD e VISIBLE_MOBS Lcom/google/common/base/Predicate; diff --git a/mappings/net/minecraft/entity/thrown/EntityThrownEnderpearl.mapping b/mappings/net/minecraft/entity/thrown/EntityThrownEnderpearl.mapping index e3b1f68b8d..f972c1d396 100644 --- a/mappings/net/minecraft/entity/thrown/EntityThrownEnderpearl.mapping +++ b/mappings/net/minecraft/entity/thrown/EntityThrownEnderpearl.mapping @@ -1,4 +1,5 @@ CLASS none/abd net/minecraft/entity/thrown/EntityThrownEnderpearl + FIELD d owner Lnone/sp; METHOD a onCollision (Lnone/bct;)V ARG 0 hit METHOD b registerTagUpgraders (Lnone/pf;)V diff --git a/mappings/net/minecraft/entity/thrown/EntityThrownPotion.mapping b/mappings/net/minecraft/entity/thrown/EntityThrownPotion.mapping index d4bb46130d..2e1f1cdb14 100644 --- a/mappings/net/minecraft/entity/thrown/EntityThrownPotion.mapping +++ b/mappings/net/minecraft/entity/thrown/EntityThrownPotion.mapping @@ -15,11 +15,16 @@ CLASS none/abf net/minecraft/entity/thrown/EntityThrownPotion ARG 0 value METHOD a onCollision (Lnone/bct;)V ARG 0 hit + METHOD a extinguishFire (Lnone/cn;)V + ARG 0 pos METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag + METHOD a doesWaterHurt (Lnone/sp;)Z + ARG 0 entity METHOD b serializeCustomData (Lnone/dt;)V ARG 0 tag METHOD b registerTagUpgraders (Lnone/pf;)V ARG 0 handler METHOD i initDataTracker ()V METHOD l getItemStack ()Lnone/aes; + METHOD n isLingering ()Z diff --git a/mappings/net/minecraft/entity/tracker/TrackedDataHandlerRegistry.mapping b/mappings/net/minecraft/entity/tracker/TrackedDataHandlerRegistry.mapping index 974efea2af..233356bedc 100644 --- a/mappings/net/minecraft/entity/tracker/TrackedDataHandlerRegistry.mapping +++ b/mappings/net/minecraft/entity/tracker/TrackedDataHandlerRegistry.mapping @@ -176,10 +176,15 @@ CLASS none/kl net/minecraft/entity/tracker/TrackedDataHandlerRegistry FIELD f ITEM_STACK Lnone/kk; FIELD g OPTIONAL_BLOCK_STATE Lnone/kk; FIELD h BOOLEAN Lnone/kk; + FIELD i ROTATION Lnone/kk; FIELD j BLOCK_POS Lnone/kk; FIELD k OPTIONAL_BLOCK_POS Lnone/kk; FIELD l FACING Lnone/kk; FIELD m OPTIONAL_UUID Lnone/kk; FIELD n REGISTRY Lnone/of; + METHOD a get (I)Lnone/kk; + ARG 0 id METHOD a register (Lnone/kk;)V ARG 0 handler + METHOD b getId (Lnone/kk;)I + ARG 0 handler diff --git a/mappings/net/minecraft/entity/vehicle/EntityChestMinecart.mapping b/mappings/net/minecraft/entity/vehicle/EntityChestMinecart.mapping index 040ecbcd38..259d3c711d 100644 --- a/mappings/net/minecraft/entity/vehicle/EntityChestMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/EntityChestMinecart.mapping @@ -2,7 +2,7 @@ CLASS none/abl net/minecraft/entity/vehicle/EntityChestMinecart METHOD a createContainer (Lnone/aal;Lnone/aam;)Lnone/abx; ARG 0 playerInv ARG 1 player - METHOD a (Lnone/rr;)V + METHOD a dropItems (Lnone/rr;)V ARG 0 source METHOD b registerTagUpgraders (Lnone/pf;)V ARG 0 handler diff --git a/mappings/net/minecraft/entity/vehicle/EntityFurnaceMinecart.mapping b/mappings/net/minecraft/entity/vehicle/EntityFurnaceMinecart.mapping index 35be6a71be..8a887c0b60 100644 --- a/mappings/net/minecraft/entity/vehicle/EntityFurnaceMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/EntityFurnaceMinecart.mapping @@ -5,7 +5,7 @@ CLASS none/abo net/minecraft/entity/vehicle/EntityFurnaceMinecart FIELD d fuel I METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag - METHOD a (Lnone/rr;)V + METHOD a dropItems (Lnone/rr;)V ARG 0 source METHOD b interact (Lnone/aam;Lnone/rb;)Z ARG 0 player diff --git a/mappings/net/minecraft/entity/vehicle/EntityHopperMinecart.mapping b/mappings/net/minecraft/entity/vehicle/EntityHopperMinecart.mapping index efaf58ff6d..c91f6fefc4 100644 --- a/mappings/net/minecraft/entity/vehicle/EntityHopperMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/EntityHopperMinecart.mapping @@ -19,7 +19,7 @@ CLASS none/abp net/minecraft/entity/vehicle/EntityHopperMinecart ARG 1 player METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag - METHOD a (Lnone/rr;)V + METHOD a dropItems (Lnone/rr;)V ARG 0 source METHOD b interact (Lnone/aam;Lnone/rb;)Z ARG 0 player diff --git a/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping b/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping index 3b5c9e8404..35ee64bfc6 100644 --- a/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping +++ b/mappings/net/minecraft/entity/vehicle/EntityMinecartBase.mapping @@ -11,11 +11,14 @@ CLASS none/abk net/minecraft/entity/vehicle/EntityMinecartBase FIELD i id I FIELD j entityId Ljava/lang/String; METHOD (Ljava/lang/String;IILjava/lang/String;)V + ARG 0 ordinal + ARG 1 entityId ARG 3 id METHOD a getId ()I METHOD a byId (I)Lnone/abk$a; ARG 0 id METHOD b getEntityId ()Ljava/lang/String; + METHOD values values ()[Lnone/abk$a; FIELD d CUSTOM_BLOCK_ID Lnone/kj; FIELD e CUSTOM_BLOCK_OFFSET Lnone/kj; FIELD f CUSTOM_BLOCK_PRESENT Lnone/kj; @@ -52,7 +55,7 @@ CLASS none/abk net/minecraft/entity/vehicle/EntityMinecartBase METHOD a registerTagUpgradersForStorage (Lnone/pf;Ljava/lang/Class;)V ARG 0 handler ARG 1 minecartClass - METHOD a (Lnone/rr;)V + METHOD a dropItems (Lnone/rr;)V ARG 0 source METHOD a damage (Lnone/rr;F)Z ARG 0 source diff --git a/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping b/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping index ffe9881ee4..40a5be2e43 100644 --- a/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/EntityStorageMinecart.mapping @@ -1,6 +1,7 @@ CLASS none/abn net/minecraft/entity/vehicle/EntityStorageMinecart FIELD a inventory Lnone/dc; FIELD c lootTableId Lnone/kp; + FIELD d lootSeed J METHOD T invalidate ()V METHOD a getInvStack (I)Lnone/aes; ARG 0 slot @@ -19,7 +20,7 @@ CLASS none/abn net/minecraft/entity/vehicle/EntityStorageMinecart ARG 1 seed METHOD a setContainerLock (Lnone/rg;)V ARG 0 lock - METHOD a (Lnone/rr;)V + METHOD a dropItems (Lnone/rr;)V ARG 0 source METHOD b getLootTable ()Lnone/kp; METHOD b removeInvStack (I)Lnone/aes; @@ -40,6 +41,7 @@ CLASS none/abn net/minecraft/entity/vehicle/EntityStorageMinecart METHOD b registerTagUpgradersFor (Lnone/pf;Ljava/lang/Class;)V ARG 0 handler ARG 1 minecartClass + METHOD b setInWorld (Z)V METHOD c changeWorld (I)Lnone/sg; ARG 0 worldId METHOD c onInvClose (Lnone/aam;)V diff --git a/mappings/net/minecraft/entity/vehicle/EntityTNTMinecart.mapping b/mappings/net/minecraft/entity/vehicle/EntityTNTMinecart.mapping index bddcadd229..7917b174b1 100644 --- a/mappings/net/minecraft/entity/vehicle/EntityTNTMinecart.mapping +++ b/mappings/net/minecraft/entity/vehicle/EntityTNTMinecart.mapping @@ -18,7 +18,7 @@ CLASS none/abs net/minecraft/entity/vehicle/EntityTNTMinecart ARG 4 power METHOD a deserializeCustomData (Lnone/dt;)V ARG 0 tag - METHOD a (Lnone/rr;)V + METHOD a dropItems (Lnone/rr;)V ARG 0 source METHOD a damage (Lnone/rr;F)Z ARG 0 source diff --git a/mappings/net/minecraft/util/sortme/ItemScatterer.mapping b/mappings/net/minecraft/util/sortme/ItemScatterer.mapping new file mode 100644 index 0000000000..18e802a5ce --- /dev/null +++ b/mappings/net/minecraft/util/sortme/ItemScatterer.mapping @@ -0,0 +1,22 @@ +CLASS none/qy net/minecraft/util/sortme/ItemScatterer + FIELD a RANDOM Ljava/util/Random; + METHOD a spawn (Lnone/aiw;DDDLnone/aes;)V + ARG 0 world + ARG 1 xOrigin + ARG 2 yOrigin + ARG 3 zOrigin + ARG 4 itemStack + METHOD a spawn (Lnone/aiw;DDDLnone/qv;)V + ARG 0 world + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 inventory + METHOD a spawn (Lnone/aiw;Lnone/cn;Lnone/qv;)V + ARG 0 world + ARG 1 pos + ARG 2 inventory + METHOD a spawn (Lnone/aiw;Lnone/sg;Lnone/qv;)V + ARG 0 world + ARG 1 entity + ARG 2 inventory diff --git a/mappings/none/bmg.mapping b/mappings/none/bmg.mapping index 81e2289590..5a923a85e4 100644 --- a/mappings/none/bmg.mapping +++ b/mappings/none/bmg.mapping @@ -5,9 +5,18 @@ CLASS none/bmg METHOD (Lnone/bdr;Lnone/bmf;)V ARG 0 game ARG 1 networkHandler + METHOD a ()Z + METHOD a copyAbilities (Lnone/aam;)V + ARG 0 playerEntity METHOD a setCurrentGameMode (Lnone/aiu;)V ARG 0 value + METHOD a (Lnone/cn;)Z + ARG 0 pos + METHOD b ()Z + METHOD b (Lnone/aam;)V + ARG 0 player METHOD h isCreativeMode ()Z METHOD i hasExtendedReach ()Z + METHOD j isRidingInventory ()Z METHOD k isSpectatorMode ()Z METHOD l getCurrentGameMode ()Lnone/aiu;