From 8b6942b0bf1d23dc9f10c146c685d83a8ec25e7c Mon Sep 17 00:00:00 2001 From: Tyler Hancock Date: Fri, 19 Aug 2016 19:01:21 -0600 Subject: [PATCH] Mapped enchantments and related files --- .../minecraft/enchantment/Enchantment.mapping | 36 +++++++++++++++++++ .../decoration/impl/EntityArmorStand.mapping | 1 + .../player/EntityPlayerAbstract.mapping | 1 + mappings/net/minecraft/item/ItemStack.mapping | 1 + .../sortme/EntitySomethingBase.mapping | 1 + mappings/none/ahj.mapping | 3 -- mappings/none/aht.mapping | 2 -- mappings/none/ahv.mapping | 2 -- mappings/none/ahy.mapping | 3 -- mappings/none/aia.mapping | 2 -- mappings/none/aib.mapping | 2 -- mappings/none/so.mapping | 1 + 12 files changed, 41 insertions(+), 14 deletions(-) delete mode 100644 mappings/none/ahj.mapping delete mode 100644 mappings/none/aht.mapping delete mode 100644 mappings/none/ahv.mapping delete mode 100644 mappings/none/ahy.mapping delete mode 100644 mappings/none/aia.mapping delete mode 100644 mappings/none/aib.mapping diff --git a/mappings/net/minecraft/enchantment/Enchantment.mapping b/mappings/net/minecraft/enchantment/Enchantment.mapping index 636e5e3faa..21d05d722a 100644 --- a/mappings/net/minecraft/enchantment/Enchantment.mapping +++ b/mappings/net/minecraft/enchantment/Enchantment.mapping @@ -1,17 +1,53 @@ CLASS none/ahm net/minecraft/enchantment/Enchantment + CLASS none/ahm$a Weight + FIELD a COMMON Lnone/ahm$a; + FIELD b UNCOMMON Lnone/ahm$a; + FIELD c RARE Lnone/ahm$a; + FIELD d LEGENDARY Lnone/ahm$a; + FIELD e WEIGHT I + METHOD a getWeight ()I + FIELD a slotTypes [Lnone/sj; FIELD b REGISTRY Lnone/db; + FIELD c type Lnone/ahn; FIELD d translationName Ljava/lang/String; + FIELD e weight Lnone/ahm$a; + METHOD (Lnone/ahm$a;Lnone/ahn;[Lnone/sj;)V + ARG 0 weight + ARG 1 type + ARG 2 slotTypes METHOD a getTranslationKey ()Ljava/lang/String; + METHOD a getProtectionAmount (ILnone/rp;)I + ARG 0 level + ARG 1 source + METHOD a getAdditionalDamge (ILnone/ss;)F + ARG 0 level + ARG 1 entityType + METHOD a isAcceptableItem (Lnone/aeq;)Z + ARG 0 item METHOD a isEqual (Lnone/ahm;)Z ARG 0 other + METHOD a getEquipment (Lnone/sn;)Ljava/util/List; + ARG 0 entity + METHOD a onTargetDamaged (Lnone/sn;Lnone/se;I)V + ARG 0 user + ARG 1 target + ARG 2 level + METHOD b getHighestLevel ()I METHOD b getEnchantmentById (Ljava/lang/String;)Lnone/ahm; ARG 0 id METHOD b getRawIdFromEnchantment (Lnone/ahm;)I ARG 0 enchantment + METHOD b onUserDamaged (Lnone/sn;Lnone/se;I)V + ARG 0 user + ARG 1 attacker + ARG 2 level + METHOD c getWeight ()Lnone/ahm$a; METHOD c getEnchantmentByRawId (I)Lnone/ahm; ARG 0 id METHOD c setTranslationName (Ljava/lang/String;)Lnone/ahm; ARG 0 name + METHOD d getLowestLevel ()I METHOD d getTranslatedNameWithLevel (I)Ljava/lang/String; ARG 0 level + METHOD e isLootOnly ()Z METHOD f init ()V diff --git a/mappings/net/minecraft/entity/decoration/impl/EntityArmorStand.mapping b/mappings/net/minecraft/entity/decoration/impl/EntityArmorStand.mapping index 95fbe55a74..c348beb4d1 100644 --- a/mappings/net/minecraft/entity/decoration/impl/EntityArmorStand.mapping +++ b/mappings/net/minecraft/entity/decoration/impl/EntityArmorStand.mapping @@ -1,5 +1,6 @@ CLASS none/yl net/minecraft/entity/decoration/impl/EntityArmorStand METHOD a deserializeEntityTag (Lnone/dt;)V METHOD b serializeEntityTag (Lnone/dt;)V + METHOD b getStackInSlot (Lnone/sj;)Lnone/aeq; METHOD m update ()V METHOD o_ getPistonBehavior ()Lnone/ayr; diff --git a/mappings/net/minecraft/entity/player/EntityPlayerAbstract.mapping b/mappings/net/minecraft/entity/player/EntityPlayerAbstract.mapping index f311c8a3e5..18f9d6fb16 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayerAbstract.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayerAbstract.mapping @@ -17,6 +17,7 @@ CLASS none/aak net/minecraft/entity/player/EntityPlayerAbstract ARG 0 profile METHOD a deserializeEntityTag (Lnone/dt;)V METHOD b serializeEntityTag (Lnone/dt;)V + METHOD b getStackInSlot (Lnone/sj;)Lnone/aeq; METHOD bC getSoundCategory ()Lnone/nm; METHOD cP getGameProfile ()Lcom/mojang/authlib/GameProfile; METHOD d getOfflinePlayerUuid (Ljava/lang/String;)Ljava/util/UUID; diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 89c0951807..381d8b8a87 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -45,6 +45,7 @@ CLASS none/aeq net/minecraft/item/ItemStack ARG 0 stackSize METHOD e setDisplayName (Ljava/lang/String;)Lnone/aeq; ARG 0 name + METHOD f hasDurability ()Z METHOD f addStackSize (I)V ARG 0 amount METHOD g subtractStackSize (I)V diff --git a/mappings/net/minecraft/sortme/EntitySomethingBase.mapping b/mappings/net/minecraft/sortme/EntitySomethingBase.mapping index dd4ae8ea26..1821319848 100644 --- a/mappings/net/minecraft/sortme/EntitySomethingBase.mapping +++ b/mappings/net/minecraft/sortme/EntitySomethingBase.mapping @@ -4,4 +4,5 @@ CLASS none/sn net/minecraft/sortme/EntitySomethingBase METHOD a onTrackedDataSet (Lnone/kj;)V METHOD b serializeEntityTag (Lnone/dt;)V METHOD b getStackInHand (Lnone/qz;)Lnone/aeq; + METHOD b getStackInSlot (Lnone/sj;)Lnone/aeq; METHOD m update ()V diff --git a/mappings/none/ahj.mapping b/mappings/none/ahj.mapping deleted file mode 100644 index 6e04c06afc..0000000000 --- a/mappings/none/ahj.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/ahj - METHOD a getTranslationKey ()Ljava/lang/String; - METHOD a isEqual (Lnone/ahm;)Z diff --git a/mappings/none/aht.mapping b/mappings/none/aht.mapping deleted file mode 100644 index 75db24f492..0000000000 --- a/mappings/none/aht.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/aht - METHOD a isEqual (Lnone/ahm;)Z diff --git a/mappings/none/ahv.mapping b/mappings/none/ahv.mapping deleted file mode 100644 index a888dc0f67..0000000000 --- a/mappings/none/ahv.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/ahv - METHOD a isEqual (Lnone/ahm;)Z diff --git a/mappings/none/ahy.mapping b/mappings/none/ahy.mapping deleted file mode 100644 index 137cc579ee..0000000000 --- a/mappings/none/ahy.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/ahy - METHOD a getTranslationKey ()Ljava/lang/String; - METHOD a isEqual (Lnone/ahm;)Z diff --git a/mappings/none/aia.mapping b/mappings/none/aia.mapping deleted file mode 100644 index 368cdda500..0000000000 --- a/mappings/none/aia.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/aia - METHOD a isEqual (Lnone/ahm;)Z diff --git a/mappings/none/aib.mapping b/mappings/none/aib.mapping deleted file mode 100644 index 6de90c6352..0000000000 --- a/mappings/none/aib.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/aib - METHOD a isEqual (Lnone/ahm;)Z diff --git a/mappings/none/so.mapping b/mappings/none/so.mapping index 68277f4759..f370877c99 100644 --- a/mappings/none/so.mapping +++ b/mappings/none/so.mapping @@ -2,4 +2,5 @@ CLASS none/so METHOD a deserializeEntityTag (Lnone/dt;)V METHOD b interact (Lnone/aak;Lnone/qz;)Z METHOD b serializeEntityTag (Lnone/dt;)V + METHOD b getStackInSlot (Lnone/sj;)Lnone/aeq; METHOD m update ()V