From 3678cb6171d5160b3733aef1778fc44fb69dd302 Mon Sep 17 00:00:00 2001 From: Blake Redenius Date: Sun, 10 Mar 2019 00:13:29 +1000 Subject: [PATCH] Add 2 new methods mappings and rename a few others. (#516) * Change ItemStack#invalid to ItemStack#empty. Only ever used when checking if the stack is empty * Rename BucketMilkItem to MilkBucketItem * Change FireworksItem to FireworkItem (registry name is also singular, not plural) * Rename EntityType.ILLAGER_BEAST to RAVAGER to match the class / actual entity name. * Map 2 of FenceBlock's connection-related methods. --- mappings/net/minecraft/block/FenceBlock.mapping | 2 ++ mappings/net/minecraft/entity/EntityType.mapping | 2 +- mappings/net/minecraft/item/BucketMilkItem.mapping | 1 - .../item/{FireworksItem.mapping => FireworkItem.mapping} | 2 +- mappings/net/minecraft/item/ItemStack.mapping | 2 +- mappings/net/minecraft/item/MilkBucketItem.mapping | 1 + 6 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 mappings/net/minecraft/item/BucketMilkItem.mapping rename mappings/net/minecraft/item/{FireworksItem.mapping => FireworkItem.mapping} (86%) create mode 100644 mappings/net/minecraft/item/MilkBucketItem.mapping diff --git a/mappings/net/minecraft/block/FenceBlock.mapping b/mappings/net/minecraft/block/FenceBlock.mapping index 4dccefe8c4..e1debc6af1 100644 --- a/mappings/net/minecraft/block/FenceBlock.mapping +++ b/mappings/net/minecraft/block/FenceBlock.mapping @@ -2,6 +2,8 @@ CLASS bkf net/minecraft/block/FenceBlock FIELD i SHAPES [Lcof; METHOD (Lbig$c;)V ARG 1 settings + METHOD a canConnect (Lbre;ZLex;)Z + METHOD f preventsConnection (Lbig;)Z METHOD k (Lbre;Lbcq;Les;)Lcof; ARG 1 state ARG 2 view diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index 5f7c0aec24..030e151563 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -57,7 +57,7 @@ CLASS ahq net/minecraft/entity/EntityType FIELD aR ZOMBIE_HORSE Lahq; FIELD aS ZOMBIE_VILLAGER Lahq; FIELD aT PHANTOM Lahq; - FIELD aU ILLAGER_BEAST Lahq; + FIELD aU RAVAGER Lahq; FIELD aV LIGHTNING_BOLT Lahq; FIELD aW PLAYER Lahq; FIELD aX FISHING_BOBBER Lahq; diff --git a/mappings/net/minecraft/item/BucketMilkItem.mapping b/mappings/net/minecraft/item/BucketMilkItem.mapping deleted file mode 100644 index 7ad6257c05..0000000000 --- a/mappings/net/minecraft/item/BucketMilkItem.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS ayd net/minecraft/item/BucketMilkItem diff --git a/mappings/net/minecraft/item/FireworksItem.mapping b/mappings/net/minecraft/item/FireworkItem.mapping similarity index 86% rename from mappings/net/minecraft/item/FireworksItem.mapping rename to mappings/net/minecraft/item/FireworkItem.mapping index 9e7ba34353..a10b7e21d2 100644 --- a/mappings/net/minecraft/item/FireworksItem.mapping +++ b/mappings/net/minecraft/item/FireworkItem.mapping @@ -1,4 +1,4 @@ -CLASS axg net/minecraft/item/FireworksItem +CLASS axg net/minecraft/item/FireworkItem CLASS axg$a Type FIELD f TYPES [Laxg$a; FIELD g id I diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 58a563ad6d..970a730a80 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -6,7 +6,7 @@ CLASS axx net/minecraft/item/ItemStack FIELD e updateCooldown I FIELD f item Laxs; FIELD g tag Lhx; - FIELD h invalid Z + FIELD h empty Z FIELD i holdingItemFrame Lapi; FIELD j lastCheckedCanHarvestBlock Lbri; FIELD k lastCheckedCanHarvestResult Z diff --git a/mappings/net/minecraft/item/MilkBucketItem.mapping b/mappings/net/minecraft/item/MilkBucketItem.mapping new file mode 100644 index 0000000000..4c0c7037dd --- /dev/null +++ b/mappings/net/minecraft/item/MilkBucketItem.mapping @@ -0,0 +1 @@ +CLASS ayd net/minecraft/item/MilkBucketItem