From dd3236b3a6ad88a3af6aab76e34ce187edd2cb37 Mon Sep 17 00:00:00 2001
From: asie <kontakt@asie.pl>
Date: Wed, 21 Nov 2018 21:58:18 +0100
Subject: [PATCH] tweak ItemStack names

---
 mappings/net/minecraft/item/Item.mapping           |  1 +
 mappings/net/minecraft/item/ItemDebugStick.mapping |  1 +
 mappings/net/minecraft/item/ItemStack.mapping      | 10 ++++++----
 mappings/net/minecraft/item/ItemSword.mapping      |  1 +
 mappings/net/minecraft/item/ItemTrident.mapping    |  1 +
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping
index 688546b544..4ab904e25b 100644
--- a/mappings/net/minecraft/item/Item.mapping
+++ b/mappings/net/minecraft/item/Item.mapping
@@ -81,6 +81,7 @@ CLASS avi net/minecraft/item/Item
 	METHOD a getItemFromBlock (Lbfo;)Lavi;
 		ARG 0 block
 	METHOD a isEffectiveOn (Lboh;)Z
+	METHOD a beforeBlockBreak (Lboh;Lbam;Les;Laqf;)Z
 	METHOD a onTagDeserialized (Lho;)Z
 	METHOD a getProperty (Lpx;)Lavm;
 	METHOD a addProperty (Lpx;Lavm;)V
diff --git a/mappings/net/minecraft/item/ItemDebugStick.mapping b/mappings/net/minecraft/item/ItemDebugStick.mapping
index 6f6beaf68c..5e0c463fa0 100644
--- a/mappings/net/minecraft/item/ItemDebugStick.mapping
+++ b/mappings/net/minecraft/item/ItemDebugStick.mapping
@@ -1,3 +1,4 @@
 CLASS aug net/minecraft/item/ItemDebugStick
 	METHOD a useOnBlock (Laxa;)Laez;
+	METHOD a beforeBlockBreak (Lboh;Lbam;Les;Laqf;)Z
 	METHOD e_ hasEnchantmentGlow (Lavn;)Z
diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping
index e5609ce412..ab589e7388 100644
--- a/mappings/net/minecraft/item/ItemStack.mapping
+++ b/mappings/net/minecraft/item/ItemStack.mapping
@@ -1,5 +1,5 @@
 CLASS avn net/minecraft/item/ItemStack
-	FIELD a NULL_STACK Lavn;
+	FIELD a AIR Lavn;
 	FIELD b MODIFIER_FORMAT Ljava/text/DecimalFormat;
 	FIELD c LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD d amount I
@@ -14,14 +14,16 @@ CLASS avn net/minecraft/item/ItemStack
 	FIELD m lastCheckedCanPlaceResult Z
 	METHOD <init> (Lbal;I)V
 		ARG 1 container
+		ARG 2 amount
 	METHOD A getRepairCost ()I
 	METHOD B toTextComponent ()Liz;
 	METHOD C getUpdateCooldown ()I
 	METHOD D getAmount ()I
 	METHOD E createModifierFormat ()Ljava/text/DecimalFormat;
-	METHOD F updateInvalidFlag ()V
-	METHOD a isInvalid ()Z
+	METHOD F updateEmptyFlag ()V
+	METHOD a isEmpty ()Z
 	METHOD a split (I)Lavn;
+		ARG 1 amount
 	METHOD a applyDamage (ILagn;)V
 	METHOD a applyDamage (ILjava/util/Random;Lui;)Z
 		ARG 1 amount
@@ -92,7 +94,7 @@ CLASS avn net/minecraft/item/ItemStack
 		ARG 1 b
 	METHOD c setTag (Lho;)V
 	METHOD c removeSubTag (Ljava/lang/String;)V
-	METHOD d canBeStacked ()Z
+	METHOD d canStack ()Z
 	METHOD d setUpdateCooldown (I)V
 	METHOD d areEqualIgnoreDurability (Lavn;Lavn;)Z
 		ARG 0 a
diff --git a/mappings/net/minecraft/item/ItemSword.mapping b/mappings/net/minecraft/item/ItemSword.mapping
index 363a768b61..c1fb79d548 100644
--- a/mappings/net/minecraft/item/ItemSword.mapping
+++ b/mappings/net/minecraft/item/ItemSword.mapping
@@ -12,3 +12,4 @@ CLASS aws net/minecraft/item/ItemSword
 	METHOD a getBlockBreakingSpeed (Lavn;Lboh;)F
 		ARG 1 stack
 	METHOD a isEffectiveOn (Lboh;)Z
+	METHOD a beforeBlockBreak (Lboh;Lbam;Les;Laqf;)Z
diff --git a/mappings/net/minecraft/item/ItemTrident.mapping b/mappings/net/minecraft/item/ItemTrident.mapping
index e2bbd2fdc8..0f6a22eefa 100644
--- a/mappings/net/minecraft/item/ItemTrident.mapping
+++ b/mappings/net/minecraft/item/ItemTrident.mapping
@@ -15,6 +15,7 @@ CLASS awy net/minecraft/item/ItemTrident
 	METHOD a use (Lbam;Laqf;Laex;)Lafa;
 		ARG 1 world
 		ARG 2 player
+	METHOD a beforeBlockBreak (Lboh;Lbam;Les;Laqf;)Z
 	METHOD b getMaxUseTime (Lavn;)I
 	METHOD c getEnchantability ()I
 	METHOD c getUseAction (Lavn;)Lawz;