From 1c8fb8d5fe23cefcd7a4912000e89c160cc85f67 Mon Sep 17 00:00:00 2001 From: copygirl Date: Sun, 21 Aug 2016 15:57:57 +0200 Subject: [PATCH] Few Item / ItemBlock related mappings (#26) * Fix INSTANT_HELATH => INSTANT_HEALTH * Name ItemMapBase * Add some ItemBlock mappings --- .../minecraft/item/{impl => block}/ItemBanner.mapping | 2 +- .../net/minecraft/item/{impl => block}/ItemBlock.mapping | 2 +- .../minecraft/item/block/ItemBlockColored.mapping} | 2 +- .../net/minecraft/item/block/ItemBlockLeaves.mapping | 5 +++++ .../net/minecraft/item/block/ItemBlockPiston.mapping | 1 + mappings/net/minecraft/item/block/ItemBlockSlab.mapping | 9 +++++++++ .../minecraft/item/block/ItemBlockSnowLayer.mapping} | 2 +- mappings/net/minecraft/item/impl/ItemMapBase.mapping | 1 + .../net/minecraft/reference/PotionEffectTypes.mapping | 2 +- mappings/none/aeu.mapping | 2 -- mappings/none/afr.mapping | 3 --- 11 files changed, 21 insertions(+), 10 deletions(-) rename mappings/net/minecraft/item/{impl => block}/ItemBanner.mapping (86%) rename mappings/net/minecraft/item/{impl => block}/ItemBlock.mapping (89%) rename mappings/{none/adv.mapping => net/minecraft/item/block/ItemBlockColored.mapping} (51%) create mode 100644 mappings/net/minecraft/item/block/ItemBlockLeaves.mapping create mode 100644 mappings/net/minecraft/item/block/ItemBlockPiston.mapping create mode 100644 mappings/net/minecraft/item/block/ItemBlockSlab.mapping rename mappings/{none/afs.mapping => net/minecraft/item/block/ItemBlockSnowLayer.mapping} (57%) create mode 100644 mappings/net/minecraft/item/impl/ItemMapBase.mapping delete mode 100644 mappings/none/aeu.mapping delete mode 100644 mappings/none/afr.mapping diff --git a/mappings/net/minecraft/item/impl/ItemBanner.mapping b/mappings/net/minecraft/item/block/ItemBanner.mapping similarity index 86% rename from mappings/net/minecraft/item/impl/ItemBanner.mapping rename to mappings/net/minecraft/item/block/ItemBanner.mapping index 068f1ef1dc..afa866f2a6 100644 --- a/mappings/net/minecraft/item/impl/ItemBanner.mapping +++ b/mappings/net/minecraft/item/block/ItemBanner.mapping @@ -1,4 +1,4 @@ -CLASS none/ada net/minecraft/item/impl/ItemBanner +CLASS none/ada net/minecraft/item/block/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; diff --git a/mappings/net/minecraft/item/impl/ItemBlock.mapping b/mappings/net/minecraft/item/block/ItemBlock.mapping similarity index 89% rename from mappings/net/minecraft/item/impl/ItemBlock.mapping rename to mappings/net/minecraft/item/block/ItemBlock.mapping index 4df9f8eb97..4e314afee7 100644 --- a/mappings/net/minecraft/item/impl/ItemBlock.mapping +++ b/mappings/net/minecraft/item/block/ItemBlock.mapping @@ -1,4 +1,4 @@ -CLASS none/adc net/minecraft/item/impl/ItemBlock +CLASS none/adc net/minecraft/item/block/ItemBlock FIELD a block Lnone/akw; METHOD (Lnone/akw;)V ARG 0 block diff --git a/mappings/none/adv.mapping b/mappings/net/minecraft/item/block/ItemBlockColored.mapping similarity index 51% rename from mappings/none/adv.mapping rename to mappings/net/minecraft/item/block/ItemBlockColored.mapping index 8946abbe17..2e61a9d37b 100644 --- a/mappings/none/adv.mapping +++ b/mappings/net/minecraft/item/block/ItemBlockColored.mapping @@ -1,2 +1,2 @@ -CLASS none/adv +CLASS none/adv net/minecraft/item/block/ItemBlockColored METHOD f_ getTranslationKey (Lnone/aeq;)Ljava/lang/String; diff --git a/mappings/net/minecraft/item/block/ItemBlockLeaves.mapping b/mappings/net/minecraft/item/block/ItemBlockLeaves.mapping new file mode 100644 index 0000000000..9c74a2b27b --- /dev/null +++ b/mappings/net/minecraft/item/block/ItemBlockLeaves.mapping @@ -0,0 +1,5 @@ +CLASS none/aeu net/minecraft/item/block/ItemBlockLeaves + FIELD b blockLeaves Lnone/anp; + METHOD (Lnone/anp;)V + ARG 0 blockLeaves + METHOD f_ getTranslationKey (Lnone/aeq;)Ljava/lang/String; diff --git a/mappings/net/minecraft/item/block/ItemBlockPiston.mapping b/mappings/net/minecraft/item/block/ItemBlockPiston.mapping new file mode 100644 index 0000000000..eae7f571a7 --- /dev/null +++ b/mappings/net/minecraft/item/block/ItemBlockPiston.mapping @@ -0,0 +1 @@ +CLASS none/afc net/minecraft/item/block/ItemBlockPiston diff --git a/mappings/net/minecraft/item/block/ItemBlockSlab.mapping b/mappings/net/minecraft/item/block/ItemBlockSlab.mapping new file mode 100644 index 0000000000..89148b568d --- /dev/null +++ b/mappings/net/minecraft/item/block/ItemBlockSlab.mapping @@ -0,0 +1,9 @@ +CLASS none/afr net/minecraft/item/block/ItemBlockSlab + FIELD b blockSingle Lnone/and; + FIELD c blockDouble Lnone/and; + METHOD (Lnone/akw;Lnone/and;Lnone/and;)V + ARG 0 block + ARG 1 blockSingle + ARG 2 blockDouble + METHOD a activate (Lnone/aak;Lnone/aiu;Lnone/cn;Lnone/qz;Lnone/cu;FFF)Lnone/rb; + METHOD f_ getTranslationKey (Lnone/aeq;)Ljava/lang/String; diff --git a/mappings/none/afs.mapping b/mappings/net/minecraft/item/block/ItemBlockSnowLayer.mapping similarity index 57% rename from mappings/none/afs.mapping rename to mappings/net/minecraft/item/block/ItemBlockSnowLayer.mapping index 3457df93cc..42198b498a 100644 --- a/mappings/none/afs.mapping +++ b/mappings/net/minecraft/item/block/ItemBlockSnowLayer.mapping @@ -1,2 +1,2 @@ -CLASS none/afs +CLASS none/afs net/minecraft/item/block/ItemBlockSnowLayer METHOD a activate (Lnone/aak;Lnone/aiu;Lnone/cn;Lnone/qz;Lnone/cu;FFF)Lnone/rb; diff --git a/mappings/net/minecraft/item/impl/ItemMapBase.mapping b/mappings/net/minecraft/item/impl/ItemMapBase.mapping new file mode 100644 index 0000000000..b7b8788b2d --- /dev/null +++ b/mappings/net/minecraft/item/impl/ItemMapBase.mapping @@ -0,0 +1 @@ +CLASS none/adp net/minecraft/item/impl/ItemMapBase diff --git a/mappings/net/minecraft/reference/PotionEffectTypes.mapping b/mappings/net/minecraft/reference/PotionEffectTypes.mapping index 2c0930cc5d..af87c7c469 100644 --- a/mappings/net/minecraft/reference/PotionEffectTypes.mapping +++ b/mappings/net/minecraft/reference/PotionEffectTypes.mapping @@ -5,7 +5,7 @@ CLASS none/rz net/minecraft/reference/PotionEffectTypes FIELD c HASTE Lnone/rx; FIELD d MINING_FATIGUE Lnone/rx; FIELD e STRENGTH Lnone/rx; - FIELD f INSTANT_HELATH Lnone/rx; + FIELD f INSTANT_HEALTH Lnone/rx; FIELD g INSTANT_DAMAGE Lnone/rx; FIELD h JUMP_BOOST Lnone/rx; FIELD i NAUSEA Lnone/rx; diff --git a/mappings/none/aeu.mapping b/mappings/none/aeu.mapping deleted file mode 100644 index 1e9bcb9ebc..0000000000 --- a/mappings/none/aeu.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/aeu - METHOD f_ getTranslationKey (Lnone/aeq;)Ljava/lang/String; diff --git a/mappings/none/afr.mapping b/mappings/none/afr.mapping deleted file mode 100644 index dabe338def..0000000000 --- a/mappings/none/afr.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/afr - METHOD a activate (Lnone/aak;Lnone/aiu;Lnone/cn;Lnone/qz;Lnone/cu;FFF)Lnone/rb; - METHOD f_ getTranslationKey (Lnone/aeq;)Ljava/lang/String;