From b4febed4431498918e9ac95eab53bd8cf5eef31a Mon Sep 17 00:00:00 2001
From: asie <kontakt@asie.pl>
Date: Thu, 6 Dec 2018 11:27:17 +0100
Subject: [PATCH] tweaks to previous + DamageSource

---
 ...rryBush.mapping => BerryBusyBlock.mapping} |  2 +-
 mappings/net/minecraft/entity/Entity.mapping  |  2 +-
 .../entity/damage/DamageSource.mapping        | 30 ++++++++++++-------
 3 files changed, 22 insertions(+), 12 deletions(-)
 rename mappings/net/minecraft/block/{SweetBerryBush.mapping => BerryBusyBlock.mapping} (95%)

diff --git a/mappings/net/minecraft/block/SweetBerryBush.mapping b/mappings/net/minecraft/block/BerryBusyBlock.mapping
similarity index 95%
rename from mappings/net/minecraft/block/SweetBerryBush.mapping
rename to mappings/net/minecraft/block/BerryBusyBlock.mapping
index 46d89d9753..95bcaf4d8a 100644
--- a/mappings/net/minecraft/block/SweetBerryBush.mapping
+++ b/mappings/net/minecraft/block/BerryBusyBlock.mapping
@@ -1,4 +1,4 @@
-CLASS blj net/minecraft/block/SweetBerryBush
+CLASS blj net/minecraft/block/BerryBusyBlock
 	FIELD a AGE Lbpl;
 	FIELD b SMALL_SHAPE Lclt;
 	FIELD c LARGE_SHAPE Lclt;
diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
index 1ffccd284f..f7e69cf138 100644
--- a/mappings/net/minecraft/entity/Entity.mapping
+++ b/mappings/net/minecraft/entity/Entity.mapping
@@ -1,5 +1,5 @@
 CLASS agk net/minecraft/entity/Entity
-	FIELD D movementSlowed Z
+	FIELD D movementMultiplierSet Z
 	FIELD E movementMultiplierX F
 	FIELD F movementMultiplierY F
 	FIELD G movementMultiplierZ F
diff --git a/mappings/net/minecraft/entity/damage/DamageSource.mapping b/mappings/net/minecraft/entity/damage/DamageSource.mapping
index 2c8d489d69..3919a56739 100644
--- a/mappings/net/minecraft/entity/damage/DamageSource.mapping
+++ b/mappings/net/minecraft/entity/damage/DamageSource.mapping
@@ -1,4 +1,5 @@
 CLASS aft net/minecraft/entity/damage/DamageSource
+	FIELD A exhaustion F
 	FIELD B fire Z
 	FIELD C projectile Z
 	FIELD D scaleWithDifficulty Z
@@ -25,43 +26,52 @@ CLASS aft net/minecraft/entity/damage/DamageSource
 	FIELD s DRAGON_BREATH Laft;
 	FIELD t FIREWORKS Laft;
 	FIELD u DRYOUT Laft;
+	FIELD v SWEET_BERRY_BUSH Laft;
 	FIELD w name Ljava/lang/String;
+	FIELD x bypassesArmor Z
 	FIELD y damageToCreative Z
 	FIELD z unblockable Z
-	METHOD a byThorns (Lagk;)Laft;
+	METHOD <init> (Ljava/lang/String;)V
+		ARG 1 name
+	METHOD a netherBed ()Laft;
+	METHOD a thorns (Lagk;)Laft;
 		ARG 0 attacker
-	METHOD a byMobProjectile (Lagk;Lagt;)Laft;
+	METHOD a trident (Lagk;Lagk;)Laft;
+	METHOD a mobProjectile (Lagk;Lagt;)Laft;
 		ARG 0 projectile
 		ARG 1 attacker
-	METHOD a byMob (Lagt;)Laft;
+	METHOD a mob (Lagt;)Laft;
 		ARG 0 attacker
-	METHOD a byPlayer (Laql;)Laft;
+	METHOD a player (Laql;)Laft;
 		ARG 0 attacker
-	METHOD a byArrow (Laqp;Lagk;)Laft;
+	METHOD a arrow (Laqp;Lagk;)Laft;
 		ARG 0 projectile
 		ARG 1 attacker
-	METHOD a byExplosiveProjectile (Laqq;Lagk;)Laft;
+	METHOD a explosiveProjectile (Laqq;Lagk;)Laft;
 		ARG 0 projectile
 		ARG 1 attacker
-	METHOD a byExplosion (Lbal;)Laft;
+	METHOD a explosion (Lbal;)Laft;
 		ARG 0 explosion
 	METHOD b isProjectile ()Z
-	METHOD b byThrownProjectile (Lagk;Lagk;)Laft;
+	METHOD b thrownProjectile (Lagk;Lagk;)Laft;
 		ARG 0 projectile
 		ARG 1 attacker
-	METHOD b byExplosion (Lagt;)Laft;
+	METHOD b explosion (Lagt;)Laft;
 		ARG 0 attacker
 	METHOD c setProjectile ()Laft;
-	METHOD c byMagic (Lagk;Lagk;)Laft;
+	METHOD c magic (Lagk;Lagk;)Laft;
 		ARG 0 magic
 		ARG 1 attacker
 	METHOD c getDeathMessage (Lagt;)Ljb;
 	METHOD d isExplosive ()Z
 	METHOD e setExplosive ()Laft;
+	METHOD f doesBypassArmor ()Z
+	METHOD g getExhaustion ()F
 	METHOD h doesDamageToCreative ()Z
 	METHOD i isUnblockable ()Z
 	METHOD j getSource ()Lagk;
 	METHOD k getAttacker ()Lagk;
+	METHOD l setBypassesArmor ()Laft;
 	METHOD m setDamageToCreative ()Laft;
 	METHOD n setUnblockable ()Laft;
 	METHOD o setFire ()Laft;