From 5955f886337653eb300f0d46ed53774ea444b39a Mon Sep 17 00:00:00 2001 From: Benjamin K Date: Sat, 20 Aug 2016 16:05:19 -0700 Subject: [PATCH] Misc mappings related to items and entities. (#24) * Food related mappings, Entity related mappings, smelting related mappings. * Change item creative tab mapping to match blocks, small change in the smeltingregistry. * SmeltingRegistry areEqual -> matches * remove sendTextNotification as it has more uses. --- .../client/player/EntityPlayerClient.mapping | 1 + .../boss/impl/EntityEnderDragon.mapping | 2 ++ .../entity/boss/impl/EntityWither.mapping | 2 ++ .../player/EntityPlayerAbstract.mapping | 1 + .../entity/player/EntityPlayerServer.mapping | 1 + mappings/net/minecraft/item/Item.mapping | 6 +++- mappings/net/minecraft/item/ItemFood.mapping | 11 ++++--- mappings/net/minecraft/item/ItemStack.mapping | 6 ++++ .../item/impl/ItemArrowTipped.mapping | 1 + .../minecraft/item/impl/ItemBanner.mapping | 1 + .../net/minecraft/item/impl/ItemBlock.mapping | 1 + .../net/minecraft/item/impl/ItemCoal.mapping | 1 + .../net/minecraft/item/impl/ItemDye.mapping | 1 + .../net/minecraft/item/impl/ItemFish.mapping | 31 +++++++++++++++++-- .../item/impl/ItemGoldenApple.mapping | 1 + .../minecraft/item/impl/ItemPotion.mapping | 1 + .../minecraft/item/impl/ItemShield.mapping | 1 + .../net/minecraft/item/impl/ItemSkull.mapping | 1 + .../minecraft/item/impl/ItemSpawnEgg.mapping | 1 + .../sortme/EntitySomethingBase.mapping | 2 ++ .../minecraft/sortme/SmeltingRegistry.mapping | 25 +++++++++++++++ 21 files changed, 91 insertions(+), 7 deletions(-) create mode 100644 mappings/net/minecraft/sortme/SmeltingRegistry.mapping diff --git a/mappings/net/minecraft/client/player/EntityPlayerClient.mapping b/mappings/net/minecraft/client/player/EntityPlayerClient.mapping index 12c508c835..a29539b001 100644 --- a/mappings/net/minecraft/client/player/EntityPlayerClient.mapping +++ b/mappings/net/minecraft/client/player/EntityPlayerClient.mapping @@ -1,5 +1,6 @@ CLASS none/boe net/minecraft/client/player/EntityPlayerClient FIELD d networkHandler Lnone/bmc; + METHOD a (Lnone/fa;Z)V METHOD a onTrackedDataSet (Lnone/kj;)V METHOD a swingHand (Lnone/qz;)V ARG 0 hand diff --git a/mappings/net/minecraft/entity/boss/impl/EntityEnderDragon.mapping b/mappings/net/minecraft/entity/boss/impl/EntityEnderDragon.mapping index 550259a1da..63897240f6 100644 --- a/mappings/net/minecraft/entity/boss/impl/EntityEnderDragon.mapping +++ b/mappings/net/minecraft/entity/boss/impl/EntityEnderDragon.mapping @@ -3,3 +3,5 @@ CLASS none/xp net/minecraft/entity/boss/impl/EntityEnderDragon METHOD a onTrackedDataSet (Lnone/kj;)V METHOD b serializeEntityTag (Lnone/dt;)V METHOD bC getSoundCategory ()Lnone/nm; + METHOD c addEffect (Lnone/ry;)V + ARG 0 effect diff --git a/mappings/net/minecraft/entity/boss/impl/EntityWither.mapping b/mappings/net/minecraft/entity/boss/impl/EntityWither.mapping index da38a12806..fa3a8e3df3 100644 --- a/mappings/net/minecraft/entity/boss/impl/EntityWither.mapping +++ b/mappings/net/minecraft/entity/boss/impl/EntityWither.mapping @@ -1,3 +1,5 @@ CLASS none/yj net/minecraft/entity/boss/impl/EntityWither METHOD a deserializeEntityTag (Lnone/dt;)V METHOD b serializeEntityTag (Lnone/dt;)V + METHOD c addEffect (Lnone/ry;)V + ARG 0 effect diff --git a/mappings/net/minecraft/entity/player/EntityPlayerAbstract.mapping b/mappings/net/minecraft/entity/player/EntityPlayerAbstract.mapping index 18f9d6fb16..f3260a1aca 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayerAbstract.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayerAbstract.mapping @@ -16,6 +16,7 @@ CLASS none/aak net/minecraft/entity/player/EntityPlayerAbstract METHOD a getUuidFromProfile (Lcom/mojang/authlib/GameProfile;)Ljava/util/UUID; ARG 0 profile METHOD a deserializeEntityTag (Lnone/dt;)V + METHOD a (Lnone/fa;Z)V METHOD b serializeEntityTag (Lnone/dt;)V METHOD b getStackInSlot (Lnone/sj;)Lnone/aeq; METHOD bC getSoundCategory ()Lnone/nm; diff --git a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping index 27b937a6f0..e01daa495c 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping @@ -1,6 +1,7 @@ CLASS none/lw net/minecraft/entity/player/EntityPlayerServer FIELD a networkHandler Lnone/mg; METHOD a deserializeEntityTag (Lnone/dt;)V + METHOD a (Lnone/fa;Z)V METHOD a swingHand (Lnone/qz;)V ARG 0 hand METHOD b serializeEntityTag (Lnone/dt;)V diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index 0a8d7c480b..2888767b22 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -14,6 +14,7 @@ CLASS none/aeo net/minecraft/item/Item FIELD j rand Ljava/util/Random; FIELD k maxStackSize I FIELD n creativeTab Lnone/adq; + FIELD o durability I FIELD p containerItem Lnone/aeo; FIELD q translationKey Ljava/lang/String; METHOD a getTranslationKey ()Ljava/lang/String; @@ -38,7 +39,7 @@ CLASS none/aeo net/minecraft/item/Item ARG 0 tab METHOD a getRawIdByItem (Lnone/aeo;)I ARG 0 item - METHOD a (Lnone/aeo;Lnone/adq;Lnone/dc;)V + METHOD a addStacksForDisplay (Lnone/aeo;Lnone/adq;Lnone/dc;)V ARG 0 item ARG 1 tab ARG 2 list @@ -91,6 +92,8 @@ CLASS none/aeo net/minecraft/item/Item ARG 0 maxStackSize METHOD d getItemById (Ljava/lang/String;)Lnone/aeo; ARG 0 id + METHOD e setDurability (I)Lnone/aeo; + ARG 0 durability METHOD e (Lnone/aeq;)I ARG 0 stack METHOD f (Lnone/aeq;)Lnone/aga; @@ -106,6 +109,7 @@ CLASS none/aeo net/minecraft/item/Item METHOD j getMaxStackSize ()I METHOD j getTranslatedName (Lnone/aeq;)Ljava/lang/String; ARG 0 stack + METHOD l getDurability ()I METHOD q getContainerItem ()Lnone/aeo; METHOD r hasContainerItem ()Z METHOD t init ()V diff --git a/mappings/net/minecraft/item/ItemFood.mapping b/mappings/net/minecraft/item/ItemFood.mapping index fff3f49326..86478975eb 100644 --- a/mappings/net/minecraft/item/ItemFood.mapping +++ b/mappings/net/minecraft/item/ItemFood.mapping @@ -1,7 +1,8 @@ CLASS none/aek net/minecraft/item/ItemFood - FIELD b hunger I - FIELD c saturation F + FIELD b hungerRestored I + FIELD c saturationRestored F FIELD d wolfFood Z + FIELD f statusEffect Lnone/ry; METHOD (IFZ)V ARG 0 hunger ARG 1 saturation @@ -17,8 +18,10 @@ CLASS none/aek net/minecraft/item/ItemFood ARG 0 world ARG 1 player ARG 2 hand + METHOD a setStatusEffect (Lnone/ry;F)Lnone/aek; + ARG 0 effect METHOD g isWolfFood ()Z - METHOD h getHunger (Lnone/aeq;)I + METHOD h getHungerRestored (Lnone/aeq;)I ARG 0 stack - METHOD i getSaturation (Lnone/aeq;)F + METHOD i getSaturatationRestored (Lnone/aeq;)F ARG 0 stack diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 381d8b8a87..faa141c139 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -4,6 +4,7 @@ CLASS none/aeq net/minecraft/item/ItemStack FIELD e item Lnone/aeo; FIELD f tag Lnone/dt; FIELD g isInvalid Z + FIELD h metadata I METHOD (Lnone/aeo;)V ARG 0 item METHOD (Lnone/aeo;I)V @@ -31,6 +32,8 @@ CLASS none/aeq net/minecraft/item/ItemStack ARG 0 enchantment ARG 1 level METHOD b isInvalid ()Z + METHOD b setDamage (I)V + ARG 0 damage METHOD b setTag (Lnone/dt;)V ARG 0 tag METHOD c getItem ()Lnone/aeo; @@ -50,6 +53,9 @@ CLASS none/aeq net/minecraft/item/ItemStack ARG 0 amount METHOD g subtractStackSize (I)V ARG 0 amount + METHOD i getDamage ()I + METHOD j getMetadata ()I + METHOD k getDurability ()I METHOD l copy ()Lnone/aeq; METHOD o hasTag ()Z METHOD p getTag ()Lnone/dt; diff --git a/mappings/net/minecraft/item/impl/ItemArrowTipped.mapping b/mappings/net/minecraft/item/impl/ItemArrowTipped.mapping index 04e5cc3a5f..f359e78102 100644 --- a/mappings/net/minecraft/item/impl/ItemArrowTipped.mapping +++ b/mappings/net/minecraft/item/impl/ItemArrowTipped.mapping @@ -1,3 +1,4 @@ CLASS none/afz net/minecraft/item/impl/ItemArrowTipped + METHOD a addStacksForDisplay (Lnone/aeo;Lnone/adq;Lnone/dc;)V METHOD a getTranslatedNameTrimmed (Lnone/aeq;)Ljava/lang/String; METHOD a addInformation (Lnone/aeq;Lnone/aak;Ljava/util/List;Z)V diff --git a/mappings/net/minecraft/item/impl/ItemBanner.mapping b/mappings/net/minecraft/item/impl/ItemBanner.mapping index 7800f4b3b7..068f1ef1dc 100644 --- a/mappings/net/minecraft/item/impl/ItemBanner.mapping +++ b/mappings/net/minecraft/item/impl/ItemBanner.mapping @@ -1,5 +1,6 @@ CLASS none/ada net/minecraft/item/impl/ItemBanner METHOD a activate (Lnone/aak;Lnone/aiu;Lnone/cn;Lnone/qz;Lnone/cu;FFF)Lnone/rb; + METHOD a addStacksForDisplay (Lnone/aeo;Lnone/adq;Lnone/dc;)V METHOD a getTranslatedNameTrimmed (Lnone/aeq;)Ljava/lang/String; METHOD a addInformation (Lnone/aeq;Lnone/aak;Ljava/util/List;Z)V METHOD b getCreativeTab ()Lnone/adq; diff --git a/mappings/net/minecraft/item/impl/ItemBlock.mapping b/mappings/net/minecraft/item/impl/ItemBlock.mapping index 1c60edd3b2..4df9f8eb97 100644 --- a/mappings/net/minecraft/item/impl/ItemBlock.mapping +++ b/mappings/net/minecraft/item/impl/ItemBlock.mapping @@ -4,6 +4,7 @@ CLASS none/adc net/minecraft/item/impl/ItemBlock ARG 0 block METHOD a getTranslationKey ()Ljava/lang/String; METHOD a activate (Lnone/aak;Lnone/aiu;Lnone/cn;Lnone/qz;Lnone/cu;FFF)Lnone/rb; + METHOD a addStacksForDisplay (Lnone/aeo;Lnone/adq;Lnone/dc;)V METHOD b getCreativeTab ()Lnone/adq; METHOD c setTranslationKey (Ljava/lang/String;)Lnone/aeo; METHOD f_ getTranslationKey (Lnone/aeq;)Ljava/lang/String; diff --git a/mappings/net/minecraft/item/impl/ItemCoal.mapping b/mappings/net/minecraft/item/impl/ItemCoal.mapping index 0262c751c4..abdfe2d690 100644 --- a/mappings/net/minecraft/item/impl/ItemCoal.mapping +++ b/mappings/net/minecraft/item/impl/ItemCoal.mapping @@ -1,2 +1,3 @@ CLASS none/adn net/minecraft/item/impl/ItemCoal + METHOD a addStacksForDisplay (Lnone/aeo;Lnone/adq;Lnone/dc;)V METHOD f_ getTranslationKey (Lnone/aeq;)Ljava/lang/String; diff --git a/mappings/net/minecraft/item/impl/ItemDye.mapping b/mappings/net/minecraft/item/impl/ItemDye.mapping index af9a337980..085332dae8 100644 --- a/mappings/net/minecraft/item/impl/ItemDye.mapping +++ b/mappings/net/minecraft/item/impl/ItemDye.mapping @@ -1,4 +1,5 @@ CLASS none/adu net/minecraft/item/impl/ItemDye FIELD a COLOR [I METHOD a activate (Lnone/aak;Lnone/aiu;Lnone/cn;Lnone/qz;Lnone/cu;FFF)Lnone/rb; + METHOD a addStacksForDisplay (Lnone/aeo;Lnone/adq;Lnone/dc;)V METHOD f_ getTranslationKey (Lnone/aeq;)Ljava/lang/String; diff --git a/mappings/net/minecraft/item/impl/ItemFish.mapping b/mappings/net/minecraft/item/impl/ItemFish.mapping index 4e0ed09e48..747f3bc89d 100644 --- a/mappings/net/minecraft/item/impl/ItemFish.mapping +++ b/mappings/net/minecraft/item/impl/ItemFish.mapping @@ -1,9 +1,36 @@ CLASS none/aeh net/minecraft/item/impl/ItemFish + CLASS none/aeh$a FishType + FIELD a COD Lnone/aeh$a; + FIELD b SALMON Lnone/aeh$a; + FIELD c CLOWNFISH Lnone/aeh$a; + FIELD d PUFFERFISH Lnone/aeh$a; + FIELD e TYPES Ljava/util/Map; + FIELD f id I + FIELD g name Ljava/lang/String; + FIELD h rawHungerRestored I + FIELD i rawSaturationRestored F + FIELD j cookedHungerRestored I + FIELD k cookedSaturationRestored F + FIELD l cookable Z + METHOD (Ljava/lang/String;IILjava/lang/String;IF)V + METHOD (Ljava/lang/String;IILjava/lang/String;IFIF)V + METHOD a getId ()I + METHOD a getTypeFromId (I)Lnone/aeh$a; + ARG 0 id + METHOD a getTypeFromStack (Lnone/aeq;)Lnone/aeh$a; + ARG 0 stack + METHOD b getName ()Ljava/lang/String; + METHOD c getRawHungerRestored ()I + METHOD d getRawSaturationRestored ()F + METHOD e getCookedHungerRestored ()I + METHOD f getCookedSaturationRestored ()F + METHOD g isCookable ()Z FIELD b cooked Z METHOD (Z)V ARG 0 cooked + METHOD a addStacksForDisplay (Lnone/aeo;Lnone/adq;Lnone/dc;)V METHOD f_ getTranslationKey (Lnone/aeq;)Ljava/lang/String; - METHOD h getHunger (Lnone/aeq;)I + METHOD h getHungerRestored (Lnone/aeq;)I ARG 0 stack - METHOD i getSaturation (Lnone/aeq;)F + METHOD i getSaturatationRestored (Lnone/aeq;)F ARG 0 stack diff --git a/mappings/net/minecraft/item/impl/ItemGoldenApple.mapping b/mappings/net/minecraft/item/impl/ItemGoldenApple.mapping index 8b29b10670..049a39f6c2 100644 --- a/mappings/net/minecraft/item/impl/ItemGoldenApple.mapping +++ b/mappings/net/minecraft/item/impl/ItemGoldenApple.mapping @@ -1 +1,2 @@ CLASS none/ael net/minecraft/item/impl/ItemGoldenApple + METHOD a addStacksForDisplay (Lnone/aeo;Lnone/adq;Lnone/dc;)V diff --git a/mappings/net/minecraft/item/impl/ItemPotion.mapping b/mappings/net/minecraft/item/impl/ItemPotion.mapping index dd0ee4fc9e..db84d79e46 100644 --- a/mappings/net/minecraft/item/impl/ItemPotion.mapping +++ b/mappings/net/minecraft/item/impl/ItemPotion.mapping @@ -1,4 +1,5 @@ CLASS none/afd net/minecraft/item/impl/ItemPotion + METHOD a addStacksForDisplay (Lnone/aeo;Lnone/adq;Lnone/dc;)V METHOD a getTranslatedNameTrimmed (Lnone/aeq;)Ljava/lang/String; METHOD a addInformation (Lnone/aeq;Lnone/aak;Ljava/util/List;Z)V METHOD a (Lnone/aeq;Lnone/aiu;Lnone/sn;)Lnone/aeq; diff --git a/mappings/net/minecraft/item/impl/ItemShield.mapping b/mappings/net/minecraft/item/impl/ItemShield.mapping index 8b8525967d..30ab7ca71d 100644 --- a/mappings/net/minecraft/item/impl/ItemShield.mapping +++ b/mappings/net/minecraft/item/impl/ItemShield.mapping @@ -1,5 +1,6 @@ CLASS none/afm net/minecraft/item/impl/ItemShield METHOD a activate (Lnone/aak;Lnone/aiu;Lnone/cn;Lnone/qz;Lnone/cu;FFF)Lnone/rb; + METHOD a addStacksForDisplay (Lnone/aeo;Lnone/adq;Lnone/dc;)V METHOD a getTranslatedNameTrimmed (Lnone/aeq;)Ljava/lang/String; METHOD a addInformation (Lnone/aeq;Lnone/aak;Ljava/util/List;Z)V METHOD a (Lnone/aiu;Lnone/aak;Lnone/qz;)Lnone/rc; diff --git a/mappings/net/minecraft/item/impl/ItemSkull.mapping b/mappings/net/minecraft/item/impl/ItemSkull.mapping index 34f4b7060f..855fded8f3 100644 --- a/mappings/net/minecraft/item/impl/ItemSkull.mapping +++ b/mappings/net/minecraft/item/impl/ItemSkull.mapping @@ -1,4 +1,5 @@ CLASS none/afq net/minecraft/item/impl/ItemSkull METHOD a activate (Lnone/aak;Lnone/aiu;Lnone/cn;Lnone/qz;Lnone/cu;FFF)Lnone/rb; + METHOD a addStacksForDisplay (Lnone/aeo;Lnone/adq;Lnone/dc;)V METHOD a getTranslatedNameTrimmed (Lnone/aeq;)Ljava/lang/String; METHOD f_ getTranslationKey (Lnone/aeq;)Ljava/lang/String; diff --git a/mappings/net/minecraft/item/impl/ItemSpawnEgg.mapping b/mappings/net/minecraft/item/impl/ItemSpawnEgg.mapping index e0262ee3d7..845eab4496 100644 --- a/mappings/net/minecraft/item/impl/ItemSpawnEgg.mapping +++ b/mappings/net/minecraft/item/impl/ItemSpawnEgg.mapping @@ -1,5 +1,6 @@ CLASS none/afu net/minecraft/item/impl/ItemSpawnEgg METHOD a activate (Lnone/aak;Lnone/aiu;Lnone/cn;Lnone/qz;Lnone/cu;FFF)Lnone/rb; + METHOD a addStacksForDisplay (Lnone/aeo;Lnone/adq;Lnone/dc;)V METHOD a getTranslatedNameTrimmed (Lnone/aeq;)Ljava/lang/String; METHOD a (Lnone/aiu;Lnone/aak;Lnone/qz;)Lnone/rc; ARG 0 world diff --git a/mappings/net/minecraft/sortme/EntitySomethingBase.mapping b/mappings/net/minecraft/sortme/EntitySomethingBase.mapping index fa57e70402..34051aa810 100644 --- a/mappings/net/minecraft/sortme/EntitySomethingBase.mapping +++ b/mappings/net/minecraft/sortme/EntitySomethingBase.mapping @@ -7,4 +7,6 @@ CLASS none/sn net/minecraft/sortme/EntitySomethingBase METHOD b serializeEntityTag (Lnone/dt;)V METHOD b getStackInHand (Lnone/qz;)Lnone/aeq; METHOD b getStackInSlot (Lnone/sj;)Lnone/aeq; + METHOD c addEffect (Lnone/ry;)V + ARG 0 effect METHOD m update ()V diff --git a/mappings/net/minecraft/sortme/SmeltingRegistry.mapping b/mappings/net/minecraft/sortme/SmeltingRegistry.mapping new file mode 100644 index 0000000000..b6d455c53f --- /dev/null +++ b/mappings/net/minecraft/sortme/SmeltingRegistry.mapping @@ -0,0 +1,25 @@ +CLASS none/agq net/minecraft/sortme/SmeltingRegistry + FIELD a REGISTRY Lnone/agq; + FIELD b inputOutputMap Ljava/util/Map; + FIELD c itemExperienceMap Ljava/util/Map; + METHOD a getRegistry ()Lnone/agq; + METHOD a registerSmeltingRecipe (Lnone/aeo;Lnone/aeq;F)V + ARG 0 input + ARG 1 output + ARG 2 exp + METHOD a getSmeltingResult (Lnone/aeq;)Lnone/aeq; + ARG 0 input + METHOD a matches (Lnone/aeq;Lnone/aeq;)Z + ARG 0 compareStack + ARG 1 baseStack + METHOD a registerSmeltingRecipe (Lnone/aeq;Lnone/aeq;F)V + ARG 0 input + ARG 1 output + ARG 2 exp + METHOD a registerSmeltingRecipe (Lnone/akw;Lnone/aeq;F)V + ARG 0 input + ARG 1 output + ARG 2 exp + METHOD b getInputOutputMap ()Ljava/util/Map; + METHOD b getSmeltingExperience (Lnone/aeq;)F + ARG 0 stack