From 5a4697d9671ad4950583b7bf6e87e3983dc454c5 Mon Sep 17 00:00:00 2001
From: asie <kontakt@asie.pl>
Date: Wed, 30 Jan 2019 23:55:59 +0100
Subject: [PATCH] fix EntityType.category, Entity.createSpawnPacket

---
 .../minecraft/entity/AreaEffectCloudEntity.mapping  |  1 +
 mappings/net/minecraft/entity/Entity.mapping        |  1 +
 mappings/net/minecraft/entity/EntityType.mapping    |  2 +-
 mappings/net/minecraft/entity/EquipmentSlot.mapping |  1 +
 mappings/net/minecraft/entity/MovementType.mapping  |  5 -----
 .../net/minecraft/entity/PrimedTntEntity.mapping    | 13 +++++++++++++
 6 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 mappings/net/minecraft/entity/PrimedTntEntity.mapping

diff --git a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping
index 51d8c729db..8a6138f5a5 100644
--- a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping
+++ b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping
@@ -10,6 +10,7 @@ CLASS ahd net/minecraft/entity/AreaEffectCloudEntity
 	FIELD ax waitTime I
 	FIELD ay reapplicationDelay I
 	FIELD az customColor Z
+	FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD c RADIUS Lps;
 	FIELD d COLOR Lps;
 	FIELD e WAITING Lps;
diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
index d7fa51ff2b..ffb352d094 100644
--- a/mappings/net/minecraft/entity/Entity.mapping
+++ b/mappings/net/minecraft/entity/Entity.mapping
@@ -74,6 +74,7 @@ CLASS ahe net/minecraft/entity/Entity
 	METHOD <init> (Lahi;Lbcq;)V
 		ARG 1 type
 	METHOD E updatePortalCooldown ()V
+	METHOD P createSpawnPacket ()Ljq;
 	METHOD T getType ()Lahi;
 	METHOD U getEntityId ()I
 	METHOD V getScoreboardTags ()Ljava/util/Set;
diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping
index 3280a3466d..d418306d7c 100644
--- a/mappings/net/minecraft/entity/EntityType.mapping
+++ b/mappings/net/minecraft/entity/EntityType.mapping
@@ -65,7 +65,7 @@ CLASS ahi net/minecraft/entity/EntityType
 	FIELD aW FISHING_BOBBER Lahi;
 	FIELD aX LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD aY factory Ljava/util/function/Function;
-	FIELD aZ entityClass Lahp;
+	FIELD aZ category Lahp;
 	FIELD aa PARROT Lahi;
 	FIELD ab PIG Lahi;
 	FIELD ac PUFFERFISH Lahi;
diff --git a/mappings/net/minecraft/entity/EquipmentSlot.mapping b/mappings/net/minecraft/entity/EquipmentSlot.mapping
index 9ead320733..e2d93892fd 100644
--- a/mappings/net/minecraft/entity/EquipmentSlot.mapping
+++ b/mappings/net/minecraft/entity/EquipmentSlot.mapping
@@ -16,6 +16,7 @@ CLASS ahj net/minecraft/entity/EquipmentSlot
 		ARG 3 type
 		ARG 4 entityId
 		ARG 5 armorStandId
+		ARG 6 name
 	METHOD a getType ()Lahj$a;
 	METHOD a byName (Ljava/lang/String;)Lahj;
 		ARG 0 name
diff --git a/mappings/net/minecraft/entity/MovementType.mapping b/mappings/net/minecraft/entity/MovementType.mapping
index c55a2ba858..a3779a1496 100644
--- a/mappings/net/minecraft/entity/MovementType.mapping
+++ b/mappings/net/minecraft/entity/MovementType.mapping
@@ -1,6 +1 @@
 CLASS ahs net/minecraft/entity/MovementType
-	FIELD a SELF Lahs;
-	FIELD b PLAYER Lahs;
-	FIELD c PISTON Lahs;
-	FIELD d SHULKER_BOX Lahs;
-	FIELD e SHULKER_ENTITY Lahs;
diff --git a/mappings/net/minecraft/entity/PrimedTntEntity.mapping b/mappings/net/minecraft/entity/PrimedTntEntity.mapping
new file mode 100644
index 0000000000..66df05de70
--- /dev/null
+++ b/mappings/net/minecraft/entity/PrimedTntEntity.mapping
@@ -0,0 +1,13 @@
+CLASS apj net/minecraft/entity/PrimedTntEntity
+	FIELD b FUSE Lps;
+	FIELD c causingEntity Lahn;
+	FIELD d fuseTimer I
+	METHOD <init> (Lbcq;DDDLahn;)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+	METHOD a setFuse (I)V
+	METHOD e getCausingEntity ()Lahn;
+	METHOD f getFuse ()I
+	METHOD i getFuseTimer ()I
+	METHOD k explode ()V