From f8d75caec231f61e8ec47a5e6fca51f13ff99410 Mon Sep 17 00:00:00 2001 From: Tyler Hancock Date: Sat, 20 Aug 2016 10:08:53 -0600 Subject: [PATCH 1/2] Mapped out Enchantment and related classes (#23) * Mapped enchantments and related files * Normalize line endings --- .../minecraft/enchantment/Enchantment.mapping | 36 +++++++++++++++++++ .../enchantment/EnchantmentType.mapping | 14 ++++++++ .../impl/EnchantmentAquaAffinity.mapping | 5 +++ .../impl/EnchantmentDamage.mapping | 13 +++++++ .../impl/EnchantmentDepthStrider.mapping | 6 ++++ .../impl/EnchantmentEfficiency.mapping | 7 ++++ .../impl/EnchantmentFireAspect.mapping | 5 +++ .../enchantment/impl/EnchantmentFlame.mapping | 5 +++ .../impl/EnchantmentFrostWalker.mapping | 7 ++++ .../impl/EnchantmentInfinity.mapping | 5 +++ .../impl/EnchantmentKnockback.mapping | 5 +++ .../enchantment/impl/EnchantmentLuck.mapping | 6 ++++ .../enchantment/impl/EnchantmentLure.mapping | 5 +++ .../impl/EnchantmentMending.mapping | 3 ++ .../enchantment/impl/EnchantmentPower.mapping | 2 ++ .../impl/EnchantmentProtection.mapping | 22 ++++++++++++ .../enchantment/impl/EnchantmentPunch.mapping | 2 ++ .../impl/EnchantmentRespiration.mapping | 2 ++ .../impl/EnchantmentSilkTouch.mapping | 3 ++ .../impl/EnchantmentThorns.mapping | 8 +++++ .../impl/EnchantmentUnbreaking.mapping | 4 +++ .../net/minecraft/entity/EntityType.mapping | 4 +++ .../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 + 33 files changed, 174 insertions(+), 14 deletions(-) create mode 100644 mappings/net/minecraft/enchantment/EnchantmentType.mapping create mode 100644 mappings/net/minecraft/enchantment/impl/EnchantmentAquaAffinity.mapping create mode 100644 mappings/net/minecraft/enchantment/impl/EnchantmentDamage.mapping create mode 100644 mappings/net/minecraft/enchantment/impl/EnchantmentDepthStrider.mapping create mode 100644 mappings/net/minecraft/enchantment/impl/EnchantmentEfficiency.mapping create mode 100644 mappings/net/minecraft/enchantment/impl/EnchantmentFireAspect.mapping create mode 100644 mappings/net/minecraft/enchantment/impl/EnchantmentFlame.mapping create mode 100644 mappings/net/minecraft/enchantment/impl/EnchantmentFrostWalker.mapping create mode 100644 mappings/net/minecraft/enchantment/impl/EnchantmentInfinity.mapping create mode 100644 mappings/net/minecraft/enchantment/impl/EnchantmentKnockback.mapping create mode 100644 mappings/net/minecraft/enchantment/impl/EnchantmentLuck.mapping create mode 100644 mappings/net/minecraft/enchantment/impl/EnchantmentLure.mapping create mode 100644 mappings/net/minecraft/enchantment/impl/EnchantmentMending.mapping create mode 100644 mappings/net/minecraft/enchantment/impl/EnchantmentPower.mapping create mode 100644 mappings/net/minecraft/enchantment/impl/EnchantmentProtection.mapping create mode 100644 mappings/net/minecraft/enchantment/impl/EnchantmentPunch.mapping create mode 100644 mappings/net/minecraft/enchantment/impl/EnchantmentRespiration.mapping create mode 100644 mappings/net/minecraft/enchantment/impl/EnchantmentSilkTouch.mapping create mode 100644 mappings/net/minecraft/enchantment/impl/EnchantmentThorns.mapping create mode 100644 mappings/net/minecraft/enchantment/impl/EnchantmentUnbreaking.mapping create mode 100644 mappings/net/minecraft/entity/EntityType.mapping 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/enchantment/EnchantmentType.mapping b/mappings/net/minecraft/enchantment/EnchantmentType.mapping new file mode 100644 index 0000000000..f2a056ae17 --- /dev/null +++ b/mappings/net/minecraft/enchantment/EnchantmentType.mapping @@ -0,0 +1,14 @@ +CLASS none/ahn net/minecraft/enchantment/EnchantmentType + FIELD a ALL Lnone/ahn; + FIELD b ARMOR Lnone/ahn; + FIELD c FEET Lnone/ahn; + FIELD d LEGS Lnone/ahn; + FIELD e CHEST Lnone/ahn; + FIELD f HELM Lnone/ahn; + FIELD g WEAPON Lnone/ahn; + FIELD h BREAKER Lnone/ahn; + FIELD i FISHING Lnone/ahn; + FIELD j TOOL Lnone/ahn; + FIELD k BOW Lnone/ahn; + METHOD a isAcceptableItem (Lnone/aeo;)Z + ARG 0 item diff --git a/mappings/net/minecraft/enchantment/impl/EnchantmentAquaAffinity.mapping b/mappings/net/minecraft/enchantment/impl/EnchantmentAquaAffinity.mapping new file mode 100644 index 0000000000..82b0d32a20 --- /dev/null +++ b/mappings/net/minecraft/enchantment/impl/EnchantmentAquaAffinity.mapping @@ -0,0 +1,5 @@ +CLASS none/aic net/minecraft/enchantment/impl/EnchantmentAquaAffinity + METHOD (Lnone/ahm$a;[Lnone/sj;)V + ARG 0 weight + ARG 1 slotTypes + METHOD b getHighestLevel ()I diff --git a/mappings/net/minecraft/enchantment/impl/EnchantmentDamage.mapping b/mappings/net/minecraft/enchantment/impl/EnchantmentDamage.mapping new file mode 100644 index 0000000000..b9251aa986 --- /dev/null +++ b/mappings/net/minecraft/enchantment/impl/EnchantmentDamage.mapping @@ -0,0 +1,13 @@ +CLASS none/ahj net/minecraft/enchantment/impl/EnchantmentDamage + METHOD a getTranslationKey ()Ljava/lang/String; + 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 + METHOD a onTargetDamaged (Lnone/sn;Lnone/se;I)V + ARG 0 user + ARG 1 target + ARG 2 level + METHOD b getHighestLevel ()I diff --git a/mappings/net/minecraft/enchantment/impl/EnchantmentDepthStrider.mapping b/mappings/net/minecraft/enchantment/impl/EnchantmentDepthStrider.mapping new file mode 100644 index 0000000000..5df218a00a --- /dev/null +++ b/mappings/net/minecraft/enchantment/impl/EnchantmentDepthStrider.mapping @@ -0,0 +1,6 @@ +CLASS none/aib net/minecraft/enchantment/impl/EnchantmentDepthStrider + METHOD (Lnone/ahm$a;[Lnone/sj;)V + ARG 0 weight + ARG 1 slotTypes + METHOD a isEqual (Lnone/ahm;)Z + METHOD b getHighestLevel ()I diff --git a/mappings/net/minecraft/enchantment/impl/EnchantmentEfficiency.mapping b/mappings/net/minecraft/enchantment/impl/EnchantmentEfficiency.mapping new file mode 100644 index 0000000000..ea8014472c --- /dev/null +++ b/mappings/net/minecraft/enchantment/impl/EnchantmentEfficiency.mapping @@ -0,0 +1,7 @@ +CLASS none/ahl net/minecraft/enchantment/impl/EnchantmentEfficiency + METHOD (Lnone/ahm$a;[Lnone/sj;)V + ARG 0 weight + ARG 1 slotTypes + METHOD a isAcceptableItem (Lnone/aeq;)Z + ARG 0 item + METHOD b getHighestLevel ()I diff --git a/mappings/net/minecraft/enchantment/impl/EnchantmentFireAspect.mapping b/mappings/net/minecraft/enchantment/impl/EnchantmentFireAspect.mapping new file mode 100644 index 0000000000..720092e86c --- /dev/null +++ b/mappings/net/minecraft/enchantment/impl/EnchantmentFireAspect.mapping @@ -0,0 +1,5 @@ +CLASS none/ahr net/minecraft/enchantment/impl/EnchantmentFireAspect + METHOD (Lnone/ahm$a;[Lnone/sj;)V + ARG 0 weight + ARG 1 slotTypes + METHOD b getHighestLevel ()I diff --git a/mappings/net/minecraft/enchantment/impl/EnchantmentFlame.mapping b/mappings/net/minecraft/enchantment/impl/EnchantmentFlame.mapping new file mode 100644 index 0000000000..3c87706290 --- /dev/null +++ b/mappings/net/minecraft/enchantment/impl/EnchantmentFlame.mapping @@ -0,0 +1,5 @@ +CLASS none/ahg net/minecraft/enchantment/impl/EnchantmentFlame + METHOD (Lnone/ahm$a;[Lnone/sj;)V + ARG 0 weight + ARG 1 slotTypes + METHOD b getHighestLevel ()I diff --git a/mappings/net/minecraft/enchantment/impl/EnchantmentFrostWalker.mapping b/mappings/net/minecraft/enchantment/impl/EnchantmentFrostWalker.mapping new file mode 100644 index 0000000000..d61df27a24 --- /dev/null +++ b/mappings/net/minecraft/enchantment/impl/EnchantmentFrostWalker.mapping @@ -0,0 +1,7 @@ +CLASS none/aht net/minecraft/enchantment/impl/EnchantmentFrostWalker + METHOD (Lnone/ahm$a;[Lnone/sj;)V + ARG 0 weight + ARG 1 slotTypes + METHOD a isEqual (Lnone/ahm;)Z + METHOD b getHighestLevel ()I + METHOD e isLootOnly ()Z diff --git a/mappings/net/minecraft/enchantment/impl/EnchantmentInfinity.mapping b/mappings/net/minecraft/enchantment/impl/EnchantmentInfinity.mapping new file mode 100644 index 0000000000..460604b686 --- /dev/null +++ b/mappings/net/minecraft/enchantment/impl/EnchantmentInfinity.mapping @@ -0,0 +1,5 @@ +CLASS none/ahh net/minecraft/enchantment/impl/EnchantmentInfinity + METHOD (Lnone/ahm$a;[Lnone/sj;)V + ARG 0 weight + ARG 1 slotTypes + METHOD b getHighestLevel ()I diff --git a/mappings/net/minecraft/enchantment/impl/EnchantmentKnockback.mapping b/mappings/net/minecraft/enchantment/impl/EnchantmentKnockback.mapping new file mode 100644 index 0000000000..43ff20d764 --- /dev/null +++ b/mappings/net/minecraft/enchantment/impl/EnchantmentKnockback.mapping @@ -0,0 +1,5 @@ +CLASS none/ahu net/minecraft/enchantment/impl/EnchantmentKnockback + METHOD (Lnone/ahm$a;[Lnone/sj;)V + ARG 0 weight + ARG 1 slotTypes + METHOD b getHighestLevel ()I diff --git a/mappings/net/minecraft/enchantment/impl/EnchantmentLuck.mapping b/mappings/net/minecraft/enchantment/impl/EnchantmentLuck.mapping new file mode 100644 index 0000000000..6367b7493d --- /dev/null +++ b/mappings/net/minecraft/enchantment/impl/EnchantmentLuck.mapping @@ -0,0 +1,6 @@ +CLASS none/ahv net/minecraft/enchantment/impl/EnchantmentLuck + METHOD (Lnone/ahm$a;Lnone/ahn;[Lnone/sj;)V + ARG 0 weight + ARG 2 slotTypes + METHOD a isEqual (Lnone/ahm;)Z + METHOD b getHighestLevel ()I diff --git a/mappings/net/minecraft/enchantment/impl/EnchantmentLure.mapping b/mappings/net/minecraft/enchantment/impl/EnchantmentLure.mapping new file mode 100644 index 0000000000..2d30a5a0b5 --- /dev/null +++ b/mappings/net/minecraft/enchantment/impl/EnchantmentLure.mapping @@ -0,0 +1,5 @@ +CLASS none/ahs net/minecraft/enchantment/impl/EnchantmentLure + METHOD (Lnone/ahm$a;Lnone/ahn;[Lnone/sj;)V + ARG 0 weight + ARG 2 slotTypes + METHOD b getHighestLevel ()I diff --git a/mappings/net/minecraft/enchantment/impl/EnchantmentMending.mapping b/mappings/net/minecraft/enchantment/impl/EnchantmentMending.mapping new file mode 100644 index 0000000000..2a53d7724b --- /dev/null +++ b/mappings/net/minecraft/enchantment/impl/EnchantmentMending.mapping @@ -0,0 +1,3 @@ +CLASS none/ahw net/minecraft/enchantment/impl/EnchantmentMending + METHOD b getHighestLevel ()I + METHOD e isLootOnly ()Z diff --git a/mappings/net/minecraft/enchantment/impl/EnchantmentPower.mapping b/mappings/net/minecraft/enchantment/impl/EnchantmentPower.mapping new file mode 100644 index 0000000000..8261015c79 --- /dev/null +++ b/mappings/net/minecraft/enchantment/impl/EnchantmentPower.mapping @@ -0,0 +1,2 @@ +CLASS none/ahf net/minecraft/enchantment/impl/EnchantmentPower + METHOD b getHighestLevel ()I diff --git a/mappings/net/minecraft/enchantment/impl/EnchantmentProtection.mapping b/mappings/net/minecraft/enchantment/impl/EnchantmentProtection.mapping new file mode 100644 index 0000000000..a06582f654 --- /dev/null +++ b/mappings/net/minecraft/enchantment/impl/EnchantmentProtection.mapping @@ -0,0 +1,22 @@ +CLASS none/ahy net/minecraft/enchantment/impl/EnchantmentProtection + CLASS none/ahy$a Type + FIELD a ALL Lnone/ahy$a; + FIELD b FIRE Lnone/ahy$a; + FIELD c FALL Lnone/ahy$a; + FIELD d EXPLOSION Lnone/ahy$a; + FIELD e PROJECTILE Lnone/ahy$a; + FIELD f name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;III)V + ARG 3 name + METHOD a getName ()Ljava/lang/String; + FIELD a type Lnone/ahy$a; + METHOD (Lnone/ahm$a;Lnone/ahy$a;[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 isEqual (Lnone/ahm;)Z + METHOD b getHighestLevel ()I diff --git a/mappings/net/minecraft/enchantment/impl/EnchantmentPunch.mapping b/mappings/net/minecraft/enchantment/impl/EnchantmentPunch.mapping new file mode 100644 index 0000000000..e83422f86e --- /dev/null +++ b/mappings/net/minecraft/enchantment/impl/EnchantmentPunch.mapping @@ -0,0 +1,2 @@ +CLASS none/ahi net/minecraft/enchantment/impl/EnchantmentPunch + METHOD b getHighestLevel ()I diff --git a/mappings/net/minecraft/enchantment/impl/EnchantmentRespiration.mapping b/mappings/net/minecraft/enchantment/impl/EnchantmentRespiration.mapping new file mode 100644 index 0000000000..6e67f46c5b --- /dev/null +++ b/mappings/net/minecraft/enchantment/impl/EnchantmentRespiration.mapping @@ -0,0 +1,2 @@ +CLASS none/ahx net/minecraft/enchantment/impl/EnchantmentRespiration + METHOD b getHighestLevel ()I diff --git a/mappings/net/minecraft/enchantment/impl/EnchantmentSilkTouch.mapping b/mappings/net/minecraft/enchantment/impl/EnchantmentSilkTouch.mapping new file mode 100644 index 0000000000..ff6bcfe957 --- /dev/null +++ b/mappings/net/minecraft/enchantment/impl/EnchantmentSilkTouch.mapping @@ -0,0 +1,3 @@ +CLASS none/aia net/minecraft/enchantment/impl/EnchantmentSilkTouch + METHOD a isEqual (Lnone/ahm;)Z + METHOD b getHighestLevel ()I diff --git a/mappings/net/minecraft/enchantment/impl/EnchantmentThorns.mapping b/mappings/net/minecraft/enchantment/impl/EnchantmentThorns.mapping new file mode 100644 index 0000000000..9a2b89fccb --- /dev/null +++ b/mappings/net/minecraft/enchantment/impl/EnchantmentThorns.mapping @@ -0,0 +1,8 @@ +CLASS none/ahz net/minecraft/enchantment/impl/EnchantmentThorns + METHOD a isAcceptableItem (Lnone/aeq;)Z + ARG 0 item + METHOD b getHighestLevel ()I + METHOD b onUserDamaged (Lnone/sn;Lnone/se;I)V + ARG 0 user + ARG 1 attacker + ARG 2 level diff --git a/mappings/net/minecraft/enchantment/impl/EnchantmentUnbreaking.mapping b/mappings/net/minecraft/enchantment/impl/EnchantmentUnbreaking.mapping new file mode 100644 index 0000000000..e406e94fc9 --- /dev/null +++ b/mappings/net/minecraft/enchantment/impl/EnchantmentUnbreaking.mapping @@ -0,0 +1,4 @@ +CLASS none/ahk net/minecraft/enchantment/impl/EnchantmentUnbreaking + METHOD a isAcceptableItem (Lnone/aeq;)Z + ARG 0 item + METHOD b getHighestLevel ()I diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping new file mode 100644 index 0000000000..d98039e11f --- /dev/null +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -0,0 +1,4 @@ +CLASS none/ss net/minecraft/entity/EntityType + FIELD a UNKNOWN Lnone/ss; + FIELD b UNDEAD Lnone/ss; + FIELD c ARTHROPOD Lnone/ss; 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 From 7c52be2b59f60d6baf4f465b979364ad1ef07ded Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sat, 20 Aug 2016 18:56:54 +0200 Subject: [PATCH 2/2] map out most of sprite code, minor work in Minecraft/MinecraftServer/World --- .../net/minecraft/client/Minecraft.mapping | 15 ++++++ .../client/player/EntityPlayerClient.mapping | 9 ++++ .../player/EntityPlayerClientAbstract.mapping | 1 + .../minecraft/client/texture/ITexture.mapping | 1 + .../texture/ITextureUpdateMethod.mapping | 2 + .../client/texture/ITextureUpdateable.mapping | 1 + .../minecraft/client/texture/Sprite.mapping | 54 +++++++++++++++++++ .../client/texture/TextureAtlasSprite.mapping | 1 - .../client/texture/TextureManager.mapping | 7 +++ .../client/texture/TextureSpriteAtlas.mapping | 23 ++++++++ .../net/minecraft/command/CommandBase.mapping | 2 + .../entity/player/EntityPlayerClient.mapping | 5 -- .../player/EntityPlayerClientAbstract.mapping | 1 - .../entity/player/EntityPlayerServer.mapping | 2 + .../minecraft/server/IntegratedServer.mapping | 1 + .../minecraft/server/MinecraftServer.mapping | 1 + .../server/dedicated/DedicatedServer.mapping | 1 + .../sortme/EntitySomethingBase.mapping | 2 + mappings/net/minecraft/world/World.mapping | 9 ++++ mappings/none/bjk.mapping | 3 ++ mappings/none/bww.mapping | 3 ++ mappings/none/rk.mapping | 2 + 22 files changed, 139 insertions(+), 7 deletions(-) create mode 100644 mappings/net/minecraft/client/player/EntityPlayerClient.mapping create mode 100644 mappings/net/minecraft/client/player/EntityPlayerClientAbstract.mapping create mode 100644 mappings/net/minecraft/client/texture/ITexture.mapping create mode 100644 mappings/net/minecraft/client/texture/ITextureUpdateMethod.mapping create mode 100644 mappings/net/minecraft/client/texture/ITextureUpdateable.mapping create mode 100644 mappings/net/minecraft/client/texture/Sprite.mapping delete mode 100644 mappings/net/minecraft/client/texture/TextureAtlasSprite.mapping create mode 100644 mappings/net/minecraft/client/texture/TextureSpriteAtlas.mapping delete mode 100644 mappings/net/minecraft/entity/player/EntityPlayerClient.mapping delete mode 100644 mappings/net/minecraft/entity/player/EntityPlayerClientAbstract.mapping create mode 100644 mappings/none/bjk.mapping create mode 100644 mappings/none/bww.mapping create mode 100644 mappings/none/rk.mapping diff --git a/mappings/net/minecraft/client/Minecraft.mapping b/mappings/net/minecraft/client/Minecraft.mapping index 1be064aa9e..bca1b35341 100644 --- a/mappings/net/minecraft/client/Minecraft.mapping +++ b/mappings/net/minecraft/client/Minecraft.mapping @@ -1,30 +1,45 @@ CLASS none/bdo net/minecraft/client/Minecraft + FIELD B profiler Lnone/os; + FIELD C isRunning Z FIELD J LOGGER Lorg/apache/logging/log4j/Logger; FIELD K RESOURCE_LOGO Lnone/kp; FIELD L DISPLAY_MODES Ljava/util/List; FIELD Q textureManager Lnone/bxc; FIELD R instance Lnone/bdo; FIELD Z snooper Lnone/rj; + FIELD aI textureAtlas Lnone/bxa; + FIELD aM sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService; FIELD aP thread Ljava/lang/Thread; FIELD aj server Lnone/caj; + FIELD an netProxy Ljava/net/Proxy; FIELD av isDemo Z FIELD f world Lnone/bme; FIELD h player Lnone/boe; FIELD k fontRenderer Lnone/bec; + FIELD l fontRendererSGA Lnone/bec; FIELD r guiInGame Lnone/bed; + FIELD t hitResult Lnone/bcq; FIELD u settings Lnone/bdq; FIELD w runDirectory Ljava/io/File; METHOD F getServer ()Lnone/caj; METHOD G onShutdown ()V METHOD H getSnooper ()Lnone/rj; METHOD I getCurrentTimeMillis ()J + METHOD M getNetworkProxy ()Ljava/net/Proxy; METHOD N getTextureManager ()Lnone/bxc; + METHOD R getTextureAtlas ()Lnone/bxa; + METHOD Z isSnooperEnabled ()Z METHOD a start ()V METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; METHOD a (Ljava/lang/String;)V + METHOD aB handleMouseEvents ()V METHOD aC doItemPick ()V METHOD aE isMainThread ()Z METHOD aw doAttack ()V METHOD ax doItemUse ()V + METHOD az handleKeyboardEvents ()V METHOD u isDemo ()Z + METHOD v getNetworkHandler ()Lnone/bmc; + METHOD x isFancyGraphicsEnabled ()Z + METHOD y isAmbientOcclusionEnabled ()Z METHOD z getInstance ()Lnone/bdo; diff --git a/mappings/net/minecraft/client/player/EntityPlayerClient.mapping b/mappings/net/minecraft/client/player/EntityPlayerClient.mapping new file mode 100644 index 0000000000..12c508c835 --- /dev/null +++ b/mappings/net/minecraft/client/player/EntityPlayerClient.mapping @@ -0,0 +1,9 @@ +CLASS none/boe net/minecraft/client/player/EntityPlayerClient + FIELD d networkHandler Lnone/bmc; + METHOD a onTrackedDataSet (Lnone/kj;)V + METHOD a swingHand (Lnone/qz;)V + ARG 0 hand + METHOD c getBlockPos ()Lnone/cn; + METHOD g sendChatMessage (Ljava/lang/String;)V + ARG 0 message + METHOD m update ()V diff --git a/mappings/net/minecraft/client/player/EntityPlayerClientAbstract.mapping b/mappings/net/minecraft/client/player/EntityPlayerClientAbstract.mapping new file mode 100644 index 0000000000..9c3419bad9 --- /dev/null +++ b/mappings/net/minecraft/client/player/EntityPlayerClientAbstract.mapping @@ -0,0 +1 @@ +CLASS none/bob net/minecraft/client/player/EntityPlayerClientAbstract diff --git a/mappings/net/minecraft/client/texture/ITexture.mapping b/mappings/net/minecraft/client/texture/ITexture.mapping new file mode 100644 index 0000000000..07dd571ce1 --- /dev/null +++ b/mappings/net/minecraft/client/texture/ITexture.mapping @@ -0,0 +1 @@ +CLASS none/bxd net/minecraft/client/texture/ITexture diff --git a/mappings/net/minecraft/client/texture/ITextureUpdateMethod.mapping b/mappings/net/minecraft/client/texture/ITextureUpdateMethod.mapping new file mode 100644 index 0000000000..3b59c1a927 --- /dev/null +++ b/mappings/net/minecraft/client/texture/ITextureUpdateMethod.mapping @@ -0,0 +1,2 @@ +CLASS none/bxf net/minecraft/client/texture/ITextureUpdateMethod + METHOD e updateTexture ()V diff --git a/mappings/net/minecraft/client/texture/ITextureUpdateable.mapping b/mappings/net/minecraft/client/texture/ITextureUpdateable.mapping new file mode 100644 index 0000000000..37b5015348 --- /dev/null +++ b/mappings/net/minecraft/client/texture/ITextureUpdateable.mapping @@ -0,0 +1 @@ +CLASS none/bxg net/minecraft/client/texture/ITextureUpdateable diff --git a/mappings/net/minecraft/client/texture/Sprite.mapping b/mappings/net/minecraft/client/texture/Sprite.mapping new file mode 100644 index 0000000000..8ab5f20461 --- /dev/null +++ b/mappings/net/minecraft/client/texture/Sprite.mapping @@ -0,0 +1,54 @@ +CLASS none/bxb net/minecraft/client/texture/Sprite + FIELD a frames Ljava/util/List; + FIELD c rotated Z + FIELD d x I + FIELD e y I + FIELD f width I + FIELD g height I + FIELD h framePos I + FIELD i ticks I + FIELD j name Ljava/lang/String; + FIELD l uMin F + FIELD m uMax F + FIELD n vMin F + FIELD o vMax F + METHOD (Ljava/lang/String;)V + ARG 0 name + METHOD a getX ()I + METHOD a getU (D)F + ARG 0 x + METHOD a getFrame (I)[[I + ARG 0 pos + METHOD a init (IIIIZ)V + ARG 0 width + ARG 1 height + ARG 2 x + ARG 3 y + ARG 4 rotated + METHOD a setFrameList (Ljava/util/List;)V + ARG 0 frames + METHOD a copy (Lnone/bxb;)V + ARG 0 src + METHOD a create (Lnone/kp;)Lnone/bxb; + ARG 0 name + METHOD b getY ()I + METHOD b getV (D)F + ARG 0 y + METHOD b setWidth (I)V + ARG 0 width + METHOD c getWidth ()I + METHOD c setHeight (I)V + ARG 0 height + METHOD d getHeight ()I + METHOD d generateMipmaps (I)V + ARG 0 level + METHOD e getMinU ()F + METHOD e growFrameList (I)V + ARG 0 targetSize + METHOD f getMaxU ()F + METHOD g getMinV ()F + METHOD h getMaxV ()F + METHOD i getName ()Ljava/lang/String; + METHOD j update ()V + METHOD k getFrameCount ()I + METHOD l clearFrameList ()V diff --git a/mappings/net/minecraft/client/texture/TextureAtlasSprite.mapping b/mappings/net/minecraft/client/texture/TextureAtlasSprite.mapping deleted file mode 100644 index 6d2473529c..0000000000 --- a/mappings/net/minecraft/client/texture/TextureAtlasSprite.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/bxb net/minecraft/client/texture/TextureAtlasSprite diff --git a/mappings/net/minecraft/client/texture/TextureManager.mapping b/mappings/net/minecraft/client/texture/TextureManager.mapping index 7101d261cb..ff6fbb93e2 100644 --- a/mappings/net/minecraft/client/texture/TextureManager.mapping +++ b/mappings/net/minecraft/client/texture/TextureManager.mapping @@ -1,4 +1,11 @@ CLASS none/bxc net/minecraft/client/texture/TextureManager FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b textures Ljava/util/Map; + FIELD c updateable Ljava/util/List; METHOD a bindTexture (Lnone/kp;)V ARG 0 id + METHOD a (Lnone/kp;Lnone/bxg;)Z + ARG 0 id + METHOD b getTexture (Lnone/kp;)Lnone/bxd; + ARG 0 id + METHOD e updateTexture ()V diff --git a/mappings/net/minecraft/client/texture/TextureSpriteAtlas.mapping b/mappings/net/minecraft/client/texture/TextureSpriteAtlas.mapping new file mode 100644 index 0000000000..12b5eb84eb --- /dev/null +++ b/mappings/net/minecraft/client/texture/TextureSpriteAtlas.mapping @@ -0,0 +1,23 @@ +CLASS none/bxa net/minecraft/client/texture/TextureSpriteAtlas + FIELD f MISSINGNO_LOC Lnone/kp; + FIELD g BLOCK_ATLAS_LOC Lnone/kp; + FIELD h LOGGER Lorg/apache/logging/log4j/Logger; + FIELD i sprites Ljava/util/List; + FIELD l prefix Ljava/lang/String; + FIELD n mipLevel I + FIELD o defaultSprite Lnone/bxb; + METHOD (Ljava/lang/String;)V + ARG 0 prefix + METHOD (Ljava/lang/String;Lnone/bwt;)V + ARG 0 prefix + METHOD a setMipLevel (I)V + ARG 0 value + METHOD a getSprite (Ljava/lang/String;)Lnone/bxb; + ARG 0 id + METHOD a getResourceLocation (Lnone/bxb;)Lnone/kp; + ARG 0 sprite + METHOD a register (Lnone/kp;)Lnone/bxb; + ARG 0 id + METHOD e updateTexture ()V + METHOD f getDefaultSprite ()Lnone/bxb; + METHOD g initDefaultSprite ()V diff --git a/mappings/net/minecraft/command/CommandBase.mapping b/mappings/net/minecraft/command/CommandBase.mapping index f1ab81ae6d..f735b565da 100644 --- a/mappings/net/minecraft/command/CommandBase.mapping +++ b/mappings/net/minecraft/command/CommandBase.mapping @@ -25,6 +25,8 @@ CLASS none/j net/minecraft/command/CommandBase METHOD a matchesBeginning (Ljava/lang/String;Ljava/lang/String;)Z ARG 0 arg ARG 1 target + METHOD a joinPretty (Ljava/util/List;)Lnone/fa; + ARG 0 list METHOD a canExecute (Lnet/minecraft/server/MinecraftServer;Lnone/n;)Z METHOD a getTabCompletionList (Lnet/minecraft/server/MinecraftServer;Lnone/n;[Ljava/lang/String;Lnone/cn;)Ljava/util/List; METHOD a toBlockState (Lnone/akw;Ljava/lang/String;)Lnone/asj; diff --git a/mappings/net/minecraft/entity/player/EntityPlayerClient.mapping b/mappings/net/minecraft/entity/player/EntityPlayerClient.mapping deleted file mode 100644 index 16452f9ae9..0000000000 --- a/mappings/net/minecraft/entity/player/EntityPlayerClient.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS none/boe net/minecraft/entity/player/EntityPlayerClient - FIELD d networkHandler Lnone/bmc; - METHOD a onTrackedDataSet (Lnone/kj;)V - METHOD c getBlockPos ()Lnone/cn; - METHOD m update ()V diff --git a/mappings/net/minecraft/entity/player/EntityPlayerClientAbstract.mapping b/mappings/net/minecraft/entity/player/EntityPlayerClientAbstract.mapping deleted file mode 100644 index a739244113..0000000000 --- a/mappings/net/minecraft/entity/player/EntityPlayerClientAbstract.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS none/bob net/minecraft/entity/player/EntityPlayerClientAbstract diff --git a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping index 087cc1389c..27b937a6f0 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping @@ -1,6 +1,8 @@ CLASS none/lw net/minecraft/entity/player/EntityPlayerServer FIELD a networkHandler Lnone/mg; METHOD a deserializeEntityTag (Lnone/dt;)V + METHOD a swingHand (Lnone/qz;)V + ARG 0 hand METHOD b serializeEntityTag (Lnone/dt;)V METHOD c getBlockPos ()Lnone/cn; METHOD m update ()V diff --git a/mappings/net/minecraft/server/IntegratedServer.mapping b/mappings/net/minecraft/server/IntegratedServer.mapping index 064ff6444e..542ab11cec 100644 --- a/mappings/net/minecraft/server/IntegratedServer.mapping +++ b/mappings/net/minecraft/server/IntegratedServer.mapping @@ -2,6 +2,7 @@ CLASS none/caj net/minecraft/server/IntegratedServer FIELD k LOGGER Lorg/apache/logging/log4j/Logger; FIELD l mc Lnone/bdo; METHOD A getRunDirectory ()Ljava/io/File; + METHOD Z isSnooperEnabled ()Z METHOD a (Lnone/qx;)V METHOD aa isDedicated ()Z METHOD b addServerInfoToCrashReport (Lnone/b;)Lnone/b; diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 9576d7abfa..dc4fb668d3 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -28,6 +28,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD O getKeyPair ()Ljava/security/KeyPair; METHOD P getServerPort ()I METHOD V isDemo ()Z + METHOD Z isSnooperEnabled ()Z METHOD a getWorld (I)Lnone/lu; ARG 0 dimensionId METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; diff --git a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping index 4ee3755ca2..1b5a9d8bf1 100644 --- a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping @@ -1,5 +1,6 @@ CLASS none/lf net/minecraft/server/dedicated/DedicatedServer FIELD k LOGGER Lorg/apache/logging/log4j/Logger; + METHOD Z isSnooperEnabled ()Z METHOD aa isDedicated ()Z METHOD d setPlayerIdleTimeout (I)V METHOD n getGameMode ()Lnone/ais; diff --git a/mappings/net/minecraft/sortme/EntitySomethingBase.mapping b/mappings/net/minecraft/sortme/EntitySomethingBase.mapping index 1821319848..fa57e70402 100644 --- a/mappings/net/minecraft/sortme/EntitySomethingBase.mapping +++ b/mappings/net/minecraft/sortme/EntitySomethingBase.mapping @@ -2,6 +2,8 @@ CLASS none/sn net/minecraft/sortme/EntitySomethingBase FIELD aQ headPitch F METHOD a deserializeEntityTag (Lnone/dt;)V METHOD a onTrackedDataSet (Lnone/kj;)V + METHOD a swingHand (Lnone/qz;)V + ARG 0 hand METHOD b serializeEntityTag (Lnone/dt;)V METHOD b getStackInHand (Lnone/qz;)Lnone/aeq; METHOD b getStackInSlot (Lnone/sj;)Lnone/aeq; diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 25dc7a858d..aa079c8b25 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -1,11 +1,16 @@ CLASS none/aiu net/minecraft/world/World FIELD C profiler Lnone/os; FIELD E isRemote Z + FIELD N border Lnone/atd; FIELD r rand Ljava/util/Random; + FIELD v chunkProvider Lnone/ath; METHOD E isValidHeight (Lnone/cn;)Z ARG 0 pos METHOD U getGameRules ()Lnone/air; METHOD a getEntityById (I)Lnone/se; + METHOD a (II)Lnone/atm; + ARG 0 chunkX + ARG 1 chunkZ METHOD a getEntitiesIn (Ljava/lang/Class;Lnone/bcp;)Ljava/util/List; METHOD a (Ljava/lang/Class;Lnone/bcp;Lcom/google/common/base/Predicate;)Ljava/util/List; METHOD a isValidPos (Lnone/cn;)Z @@ -18,6 +23,10 @@ CLASS none/aiu net/minecraft/world/World METHOD ae getDifficulty ()Lnone/qx; METHOD b getBiome (Lnone/cn;)Lnone/ajh; METHOD d isAir (Lnone/cn;)Z + METHOD f (Lnone/cn;)Lnone/atm; + ARG 0 pos + METHOD g setBlockToAir (Lnone/cn;)Z + ARG 0 pos METHOD k updateEntities ()V METHOD o getBlockState (Lnone/cn;)Lnone/asj; ARG 0 pos diff --git a/mappings/none/bjk.mapping b/mappings/none/bjk.mapping new file mode 100644 index 0000000000..95c6f42e67 --- /dev/null +++ b/mappings/none/bjk.mapping @@ -0,0 +1,3 @@ +CLASS none/bjk + CLASS none/bjk$c + FIELD a isDemo Z diff --git a/mappings/none/bww.mapping b/mappings/none/bww.mapping new file mode 100644 index 0000000000..9048155afa --- /dev/null +++ b/mappings/none/bww.mapping @@ -0,0 +1,3 @@ +CLASS none/bww + FIELD a width I + FIELD b height I diff --git a/mappings/none/rk.mapping b/mappings/none/rk.mapping new file mode 100644 index 0000000000..89c0cb1e6d --- /dev/null +++ b/mappings/none/rk.mapping @@ -0,0 +1,2 @@ +CLASS none/rk + METHOD Z isSnooperEnabled ()Z