From 6873106509181b0d77c62321451d8bd2b95e82eb Mon Sep 17 00:00:00 2001
From: Chloe Dawn <InsomniaKitten@users.noreply.github.com>
Date: Sun, 5 May 2019 23:23:57 +0100
Subject: [PATCH] VerticalEntityPosition -> EntityContext (#669)

---
 mappings/net/minecraft/entity/EntityContext.mapping   | 11 +++++++++++
 ...PositionImpl.mapping => EntityContextImpl.mapping} |  9 ++++++---
 .../minecraft/entity/VerticalEntityPosition.mapping   |  7 -------
 3 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 mappings/net/minecraft/entity/EntityContext.mapping
 rename mappings/net/minecraft/entity/{VerticalEntityPositionImpl.mapping => EntityContextImpl.mapping} (53%)
 delete mode 100644 mappings/net/minecraft/entity/VerticalEntityPosition.mapping

diff --git a/mappings/net/minecraft/entity/EntityContext.mapping b/mappings/net/minecraft/entity/EntityContext.mapping
new file mode 100644
index 0000000000..cbd5e8d53f
--- /dev/null
+++ b/mappings/net/minecraft/entity/EntityContext.mapping
@@ -0,0 +1,11 @@
+CLASS csa net/minecraft/entity/EntityContext
+	METHOD a absent ()Lcsa;
+	METHOD a of (Laif;)Lcsa;
+		ARG 0 entity
+	METHOD a isHolding (Lbbv;)Z
+		ARG 1 item
+	METHOD a isAbove (Lcsp;Lev;Z)Z
+		ARG 1 shape
+		ARG 2 pos
+		ARG 3 defaultValue
+	METHOD b isSneaking ()Z
diff --git a/mappings/net/minecraft/entity/VerticalEntityPositionImpl.mapping b/mappings/net/minecraft/entity/EntityContextImpl.mapping
similarity index 53%
rename from mappings/net/minecraft/entity/VerticalEntityPositionImpl.mapping
rename to mappings/net/minecraft/entity/EntityContextImpl.mapping
index 67d0d980a9..2d4f1723bb 100644
--- a/mappings/net/minecraft/entity/VerticalEntityPositionImpl.mapping
+++ b/mappings/net/minecraft/entity/EntityContextImpl.mapping
@@ -1,11 +1,14 @@
-CLASS csf net/minecraft/entity/VerticalEntityPositionImpl
+CLASS csf net/minecraft/entity/EntityContextImpl
 	CLASS csf$1
 		METHOD <init> (ZDLbbv;)V
 			ARG 1 sneaking
-	FIELD a MIN_VALUE Lcsa;
+	FIELD a ABSENT Lcsa;
 	FIELD b sneaking Z
-	FIELD c posY D
+	FIELD c minY D
+	FIELD d heldItem Lbbv;
 	METHOD <init> (Laif;)V
 		ARG 1 entity
 	METHOD <init> (ZDLbbv;)V
 		ARG 1 sneaking
+		ARG 2 minY
+		ARG 4 heldItem
diff --git a/mappings/net/minecraft/entity/VerticalEntityPosition.mapping b/mappings/net/minecraft/entity/VerticalEntityPosition.mapping
deleted file mode 100644
index 3ddc1f6572..0000000000
--- a/mappings/net/minecraft/entity/VerticalEntityPosition.mapping
+++ /dev/null
@@ -1,7 +0,0 @@
-CLASS csa net/minecraft/entity/VerticalEntityPosition
-	METHOD a minValue ()Lcsa;
-	METHOD a fromEntity (Laif;)Lcsa;
-		ARG 0 entity
-	METHOD a isAboveBlock (Lcsp;Lev;Z)Z
-		ARG 1 shape
-	METHOD b isSneaking ()Z