From 8a6f9480a96a99d472e8b2d11831ccd69e485913 Mon Sep 17 00:00:00 2001 From: Tyler Hancock Date: Sat, 20 Aug 2016 16:50:38 -0600 Subject: [PATCH] Mapped out tools and related things --- .../minecraft/block/BlockStateFactory.mapping | 1 + mappings/net/minecraft/item/Item.mapping | 28 ++++++++++++++++ mappings/net/minecraft/item/ItemArmor.mapping | 6 ++++ mappings/net/minecraft/item/ItemStack.mapping | 1 + .../net/minecraft/item/impl/ItemBook.mapping | 1 + .../net/minecraft/item/impl/ItemBow.mapping | 1 + .../minecraft/item/impl/ItemElytra.mapping | 3 ++ .../item/impl/ItemFishingRod.mapping | 1 + .../minecraft/item/impl/ItemSaddle.mapping | 4 +++ .../minecraft/item/impl/ItemShears.mapping | 11 +++++++ .../minecraft/item/impl/ItemShield.mapping | 3 ++ .../net/minecraft/item/tool/ItemAxe.mapping | 3 ++ .../net/minecraft/item/tool/ItemHoe.mapping | 17 ++++++++++ .../minecraft/item/tool/ItemPickaxe.mapping | 8 +++++ .../minecraft/item/tool/ItemShovel.mapping | 5 +++ .../net/minecraft/item/tool/ItemSword.mapping | 27 ++++++++++++++++ .../net/minecraft/item/tool/ItemTool.mapping | 32 ++++++++++++++++++- mappings/net/minecraft/world/World.mapping | 2 ++ mappings/none/asi.mapping | 1 + 19 files changed, 154 insertions(+), 1 deletion(-) diff --git a/mappings/net/minecraft/block/BlockStateFactory.mapping b/mappings/net/minecraft/block/BlockStateFactory.mapping index 3873573dbf..1e0ae328ea 100644 --- a/mappings/net/minecraft/block/BlockStateFactory.mapping +++ b/mappings/net/minecraft/block/BlockStateFactory.mapping @@ -7,6 +7,7 @@ CLASS none/ask net/minecraft/block/BlockStateFactory ARG 1 values METHOD a getMaterial ()Lnone/ayo; METHOD a with (Lnone/asz;Ljava/lang/Comparable;)Lnone/asj; + METHOD b getHardness (Lnone/aiu;Lnone/cn;)F METHOD c get (Lnone/asz;)Ljava/lang/Comparable; METHOD g getMapColor ()Lnone/ayp; METHOD s getValues ()Lcom/google/common/collect/ImmutableMap; diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index 0a8d7c480b..8a695f6a84 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -8,9 +8,15 @@ CLASS none/aeo net/minecraft/item/Item FIELD f miningLevel I FIELD g durability I METHOD a getDurability ()I + METHOD b getEfficiency ()F + METHOD c getWeaponDamage ()F METHOD d getMiningLevel ()I + METHOD e getEnchantability ()I + METHOD f getRepairItem ()Lnone/aeo; FIELD a BLOCK_ITEM_MAP Ljava/util/Map; FIELD g REGISTRY Lnone/db; + FIELD h MODIFIER_DAMAGE Ljava/util/UUID; + FIELD i MODIFIER_SWING_SPEED Ljava/util/UUID; FIELD j rand Ljava/util/Random; FIELD k maxStackSize I FIELD n creativeTab Lnone/adq; @@ -49,6 +55,15 @@ CLASS none/aeo net/minecraft/item/Item ARG 1 player ARG 2 list ARG 3 advancedTooltips + METHOD a canRepair (Lnone/aeq;Lnone/aeq;)Z + ARG 0 tool + ARG 1 repairItem + METHOD a onBlockBroken (Lnone/aeq;Lnone/aiu;Lnone/asj;Lnone/cn;Lnone/sn;)Z + ARG 0 stack + ARG 1 world + ARG 2 state + ARG 3 pos + ARG 4 user METHOD a (Lnone/aeq;Lnone/aiu;Lnone/se;IZ)V ARG 0 stack ARG 1 world @@ -61,6 +76,13 @@ CLASS none/aeo net/minecraft/item/Item ARG 0 stack ARG 1 world ARG 2 player + METHOD a getMiningStrength (Lnone/aeq;Lnone/asj;)F + ARG 0 stack + ARG 1 state + METHOD a onEntityDamaged (Lnone/aeq;Lnone/sn;Lnone/sn;)Z + ARG 0 stack + ARG 1 target + ARG 2 user METHOD a (Lnone/aiu;Lnone/aak;Lnone/qz;)Lnone/rc; ARG 0 world ARG 1 player @@ -73,7 +95,11 @@ CLASS none/aeo net/minecraft/item/Item METHOD a register (Lnone/akw;Lnone/aeo;)V ARG 0 block ARG 1 itemBlock + METHOD a canHarvestBlock (Lnone/asj;)Z + ARG 0 state METHOD a (Lnone/dt;)Z + METHOD a getAttributeModifiers (Lnone/sj;)Lcom/google/common/collect/Multimap; + ARG 0 slotType METHOD b getCreativeTab ()Lnone/adq; METHOD b setContainerItem (Lnone/aeo;)Lnone/aeo; ARG 0 containerItem @@ -83,6 +109,7 @@ CLASS none/aeo net/minecraft/item/Item ARG 2 player METHOD b registerItemBlock (Lnone/akw;)V ARG 0 block + METHOD c getEnchantability ()I METHOD c getItemByRawId (I)Lnone/aeo; ARG 0 id METHOD c setTranslationKey (Ljava/lang/String;)Lnone/aeo; @@ -91,6 +118,7 @@ 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; METHOD e (Lnone/aeq;)I ARG 0 stack METHOD f (Lnone/aeq;)Lnone/aga; diff --git a/mappings/net/minecraft/item/ItemArmor.mapping b/mappings/net/minecraft/item/ItemArmor.mapping index 380e19c9c3..07ecc6f554 100644 --- a/mappings/net/minecraft/item/ItemArmor.mapping +++ b/mappings/net/minecraft/item/ItemArmor.mapping @@ -13,8 +13,14 @@ CLASS none/acw net/minecraft/item/ItemArmor FIELD p material Lnone/acw$a; METHOD (Lnone/acw$a;ILnone/sj;)V ARG 0 material + METHOD a canRepair (Lnone/aeq;Lnone/aeq;)Z + ARG 0 tool + ARG 1 repairItem METHOD a (Lnone/aiu;Lnone/aak;Lnone/qz;)Lnone/rc; ARG 0 world ARG 1 player ARG 2 hand + METHOD a getAttributeModifiers (Lnone/sj;)Lcom/google/common/collect/Multimap; + ARG 0 slotType + METHOD c getEnchantability ()I METHOD d getMaterial ()Lnone/acw$a; diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 381d8b8a87..d8e9e2350a 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -23,6 +23,7 @@ CLASS none/aeq net/minecraft/item/ItemStack METHOD B getRepairCost ()I METHOD E getStackSize ()I METHOD F updateIsInvalid ()V + METHOD a damageStack (ILnone/sn;)V METHOD a setTagCompound (Ljava/lang/String;Lnone/eh;)V METHOD a getTooltip (Lnone/aak;Z)Ljava/util/List; ARG 0 player diff --git a/mappings/net/minecraft/item/impl/ItemBook.mapping b/mappings/net/minecraft/item/impl/ItemBook.mapping index 06bc5e806e..c88b118566 100644 --- a/mappings/net/minecraft/item/impl/ItemBook.mapping +++ b/mappings/net/minecraft/item/impl/ItemBook.mapping @@ -1 +1,2 @@ CLASS none/adf net/minecraft/item/impl/ItemBook + METHOD c getEnchantability ()I diff --git a/mappings/net/minecraft/item/impl/ItemBow.mapping b/mappings/net/minecraft/item/impl/ItemBow.mapping index 63abcde008..e055d4667e 100644 --- a/mappings/net/minecraft/item/impl/ItemBow.mapping +++ b/mappings/net/minecraft/item/impl/ItemBow.mapping @@ -3,3 +3,4 @@ CLASS none/adh net/minecraft/item/impl/ItemBow ARG 0 world ARG 1 player ARG 2 hand + METHOD c getEnchantability ()I diff --git a/mappings/net/minecraft/item/impl/ItemElytra.mapping b/mappings/net/minecraft/item/impl/ItemElytra.mapping index c5514356a6..50786410c1 100644 --- a/mappings/net/minecraft/item/impl/ItemElytra.mapping +++ b/mappings/net/minecraft/item/impl/ItemElytra.mapping @@ -1,4 +1,7 @@ CLASS none/adx net/minecraft/item/impl/ItemElytra + METHOD a canRepair (Lnone/aeq;Lnone/aeq;)Z + ARG 0 tool + ARG 1 repairItem METHOD a (Lnone/aiu;Lnone/aak;Lnone/qz;)Lnone/rc; ARG 0 world ARG 1 player diff --git a/mappings/net/minecraft/item/impl/ItemFishingRod.mapping b/mappings/net/minecraft/item/impl/ItemFishingRod.mapping index 44b2122c03..a9b768be7c 100644 --- a/mappings/net/minecraft/item/impl/ItemFishingRod.mapping +++ b/mappings/net/minecraft/item/impl/ItemFishingRod.mapping @@ -3,3 +3,4 @@ CLASS none/aei net/minecraft/item/impl/ItemFishingRod ARG 0 world ARG 1 player ARG 2 hand + METHOD c getEnchantability ()I diff --git a/mappings/net/minecraft/item/impl/ItemSaddle.mapping b/mappings/net/minecraft/item/impl/ItemSaddle.mapping index 3e7c8f369e..d6baab2494 100644 --- a/mappings/net/minecraft/item/impl/ItemSaddle.mapping +++ b/mappings/net/minecraft/item/impl/ItemSaddle.mapping @@ -1 +1,5 @@ CLASS none/afh net/minecraft/item/impl/ItemSaddle + METHOD a onEntityDamaged (Lnone/aeq;Lnone/sn;Lnone/sn;)Z + ARG 0 stack + ARG 1 target + ARG 2 user diff --git a/mappings/net/minecraft/item/impl/ItemShears.mapping b/mappings/net/minecraft/item/impl/ItemShears.mapping index 19248a2f5c..e955572dc0 100644 --- a/mappings/net/minecraft/item/impl/ItemShears.mapping +++ b/mappings/net/minecraft/item/impl/ItemShears.mapping @@ -1 +1,12 @@ CLASS none/afl net/minecraft/item/impl/ItemShears + METHOD a onBlockBroken (Lnone/aeq;Lnone/aiu;Lnone/asj;Lnone/cn;Lnone/sn;)Z + ARG 0 stack + ARG 1 world + ARG 2 state + ARG 3 pos + ARG 4 user + METHOD a getMiningStrength (Lnone/aeq;Lnone/asj;)F + ARG 0 stack + ARG 1 state + METHOD a canHarvestBlock (Lnone/asj;)Z + ARG 0 state diff --git a/mappings/net/minecraft/item/impl/ItemShield.mapping b/mappings/net/minecraft/item/impl/ItemShield.mapping index 8b8525967d..3b8136f8b9 100644 --- a/mappings/net/minecraft/item/impl/ItemShield.mapping +++ b/mappings/net/minecraft/item/impl/ItemShield.mapping @@ -2,6 +2,9 @@ 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 getTranslatedNameTrimmed (Lnone/aeq;)Ljava/lang/String; METHOD a addInformation (Lnone/aeq;Lnone/aak;Ljava/util/List;Z)V + METHOD a canRepair (Lnone/aeq;Lnone/aeq;)Z + ARG 0 tool + ARG 1 repairItem METHOD a (Lnone/aiu;Lnone/aak;Lnone/qz;)Lnone/rc; ARG 0 world ARG 1 player diff --git a/mappings/net/minecraft/item/tool/ItemAxe.mapping b/mappings/net/minecraft/item/tool/ItemAxe.mapping index 91c43ea31b..91d75ded68 100644 --- a/mappings/net/minecraft/item/tool/ItemAxe.mapping +++ b/mappings/net/minecraft/item/tool/ItemAxe.mapping @@ -1 +1,4 @@ CLASS none/acz net/minecraft/item/tool/ItemAxe + METHOD a getMiningStrength (Lnone/aeq;Lnone/asj;)F + ARG 0 stack + ARG 1 state diff --git a/mappings/net/minecraft/item/tool/ItemHoe.mapping b/mappings/net/minecraft/item/tool/ItemHoe.mapping index 11183e1dec..1ee135061c 100644 --- a/mappings/net/minecraft/item/tool/ItemHoe.mapping +++ b/mappings/net/minecraft/item/tool/ItemHoe.mapping @@ -1,2 +1,19 @@ CLASS none/aen net/minecraft/item/tool/ItemHoe + FIELD a material Lnone/aeo$a; + FIELD b swingSpeed F + METHOD (Lnone/aeo$a;)V + ARG 0 material METHOD a activate (Lnone/aak;Lnone/aiu;Lnone/cn;Lnone/qz;Lnone/cu;FFF)Lnone/rb; + METHOD a tillSoil (Lnone/aeq;Lnone/aak;Lnone/aiu;Lnone/cn;Lnone/asj;)V + ARG 0 stack + ARG 1 user + ARG 2 world + ARG 3 pos + ARG 4 newState + METHOD a onEntityDamaged (Lnone/aeq;Lnone/sn;Lnone/sn;)Z + ARG 0 stack + ARG 1 target + ARG 2 user + METHOD a getAttributeModifiers (Lnone/sj;)Lcom/google/common/collect/Multimap; + ARG 0 slotType + METHOD g getMaterial ()Ljava/lang/String; diff --git a/mappings/net/minecraft/item/tool/ItemPickaxe.mapping b/mappings/net/minecraft/item/tool/ItemPickaxe.mapping index a5913bc918..baaa0e8a50 100644 --- a/mappings/net/minecraft/item/tool/ItemPickaxe.mapping +++ b/mappings/net/minecraft/item/tool/ItemPickaxe.mapping @@ -1 +1,9 @@ CLASS none/afb net/minecraft/item/tool/ItemPickaxe + FIELD e EFFECTIVE_BLOCKS Ljava/util/Set; + METHOD (Lnone/aeo$a;)V + ARG 0 material + METHOD a getMiningStrength (Lnone/aeq;Lnone/asj;)F + ARG 0 stack + ARG 1 state + METHOD a canHarvestBlock (Lnone/asj;)Z + ARG 0 state diff --git a/mappings/net/minecraft/item/tool/ItemShovel.mapping b/mappings/net/minecraft/item/tool/ItemShovel.mapping index 942a02d380..d5c89bd9dc 100644 --- a/mappings/net/minecraft/item/tool/ItemShovel.mapping +++ b/mappings/net/minecraft/item/tool/ItemShovel.mapping @@ -1,2 +1,7 @@ CLASS none/afn net/minecraft/item/tool/ItemShovel + FIELD e EFFECTIVE_BLOCKS Ljava/util/Set; + METHOD (Lnone/aeo$a;)V + ARG 0 material METHOD a activate (Lnone/aak;Lnone/aiu;Lnone/cn;Lnone/qz;Lnone/cu;FFF)Lnone/rb; + METHOD a canHarvestBlock (Lnone/asj;)Z + ARG 0 state diff --git a/mappings/net/minecraft/item/tool/ItemSword.mapping b/mappings/net/minecraft/item/tool/ItemSword.mapping index 6bc30f0bd3..5d2f8a56f5 100644 --- a/mappings/net/minecraft/item/tool/ItemSword.mapping +++ b/mappings/net/minecraft/item/tool/ItemSword.mapping @@ -1 +1,28 @@ CLASS none/afx net/minecraft/item/tool/ItemSword + FIELD a weaponDamage F + FIELD b material Lnone/aeo$a; + METHOD (Lnone/aeo$a;)V + ARG 0 material + METHOD a canRepair (Lnone/aeq;Lnone/aeq;)Z + ARG 0 tool + ARG 1 repairItem + METHOD a onBlockBroken (Lnone/aeq;Lnone/aiu;Lnone/asj;Lnone/cn;Lnone/sn;)Z + ARG 0 stack + ARG 1 world + ARG 2 state + ARG 3 pos + ARG 4 user + METHOD a getMiningStrength (Lnone/aeq;Lnone/asj;)F + ARG 0 stack + ARG 1 state + METHOD a onEntityDamaged (Lnone/aeq;Lnone/sn;Lnone/sn;)Z + ARG 0 stack + ARG 1 target + ARG 2 user + METHOD a canHarvestBlock (Lnone/asj;)Z + ARG 0 state + METHOD a getAttributeModifiers (Lnone/sj;)Lcom/google/common/collect/Multimap; + ARG 0 slotType + METHOD c getEnchantability ()I + METHOD g getWeaponDamage ()F + METHOD h getMaterialName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/item/tool/ItemTool.mapping b/mappings/net/minecraft/item/tool/ItemTool.mapping index 7c2a7e8594..72a1439c66 100644 --- a/mappings/net/minecraft/item/tool/ItemTool.mapping +++ b/mappings/net/minecraft/item/tool/ItemTool.mapping @@ -1,5 +1,35 @@ CLASS none/adr net/minecraft/item/tool/ItemTool + FIELD a efficiency F + FIELD b weaponDamage F + FIELD c swingSpeed F FIELD d material Lnone/aeo$a; + FIELD e EFFECTIVE_BLOCKS Ljava/util/Set; METHOD (FFLnone/aeo$a;Ljava/util/Set;)V - ARG 2 toolMaterial + ARG 0 damageModifier + ARG 1 swingSpeed + ARG 2 material + ARG 3 effectiveBlocks + METHOD (Lnone/aeo$a;Ljava/util/Set;)V + ARG 0 material + ARG 1 effectiveBlocks + METHOD a canRepair (Lnone/aeq;Lnone/aeq;)Z + ARG 0 tool + ARG 1 repairItem + METHOD a onBlockBroken (Lnone/aeq;Lnone/aiu;Lnone/asj;Lnone/cn;Lnone/sn;)Z + ARG 0 stack + ARG 1 world + ARG 2 state + ARG 3 pos + ARG 4 user + METHOD a getMiningStrength (Lnone/aeq;Lnone/asj;)F + ARG 0 stack + ARG 1 state + METHOD a onEntityDamaged (Lnone/aeq;Lnone/sn;Lnone/sn;)Z + ARG 0 stack + ARG 1 target + ARG 2 user + METHOD a getAttributeModifiers (Lnone/sj;)Lcom/google/common/collect/Multimap; + ARG 0 slotType + METHOD c getEnchantability ()I METHOD g getMaterial ()Lnone/aeo$a; + METHOD h getMaterial ()Ljava/lang/String; diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 7ebde48cfa..0de9465522 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -4,6 +4,7 @@ CLASS none/aiu net/minecraft/world/World FIELD N border Lnone/atd; FIELD r rand Ljava/util/Random; FIELD v chunkProvider Lnone/ath; + FIELD x info Lnone/bar; METHOD E isValidHeight (Lnone/cn;)Z ARG 0 pos METHOD U getGameRules ()Lnone/air; @@ -37,6 +38,7 @@ CLASS none/aiu net/minecraft/world/World ARG 2 flags METHOD a createEntity (Lnone/se;)Z METHOD ae getDifficulty ()Lnone/qx; + METHOD aj getWorldBorder ()Lnone/atd; METHOD b getBiome (Lnone/cn;)Lnone/ajh; METHOD d isAir (Lnone/cn;)Z METHOD f (Lnone/cn;)Lnone/atm; diff --git a/mappings/none/asi.mapping b/mappings/none/asi.mapping index be38bb2378..f8ae4f41a6 100644 --- a/mappings/none/asi.mapping +++ b/mappings/none/asi.mapping @@ -1,3 +1,4 @@ CLASS none/asi METHOD a getMaterial ()Lnone/ayo; + METHOD b getHardness (Lnone/aiu;Lnone/cn;)F METHOD g getMapColor ()Lnone/ayp;