diff --git a/mappings/net/minecraft/container/ContainerEnchantingTable.mapping b/mappings/net/minecraft/container/ContainerEnchantingTable.mapping
index b4c20d3150..c56601064d 100644
--- a/mappings/net/minecraft/container/ContainerEnchantingTable.mapping
+++ b/mappings/net/minecraft/container/ContainerEnchantingTable.mapping
@@ -10,7 +10,7 @@ CLASS none/ach net/minecraft/container/ContainerEnchantingTable
 		METHOD a canInsert (Lnone/aes;)Z
 			ARG 0 stack
 	FIELD a inventory Lnone/qv;
-	FIELD f xpSeed I
+	FIELD f enchantmentTableSeed I
 	FIELD g experienceLevels [I
 	FIELD h enchantmentIds [I
 	FIELD i enchantmentLevels [I
@@ -31,7 +31,7 @@ CLASS none/ach net/minecraft/container/ContainerEnchantingTable
 		ARG 1 buttonId
 	METHOD a addListener (Lnone/acc;)V
 		ARG 0 listener
-	METHOD a (Lnone/aes;II)Ljava/util/List;
+	METHOD a getRandomEnchantments (Lnone/aes;II)Ljava/util/List;
 		ARG 0 stack
 	METHOD a onContentChanged (Lnone/qv;)V
 		ARG 0 inventory
diff --git a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping
index a6209e2bd5..dd09fe434d 100644
--- a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping
+++ b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping
@@ -1,28 +1,89 @@
 CLASS none/ahq net/minecraft/enchantment/EnchantmentHelper
+	CLASS none/ahq$a DamageTargetHandler
+		FIELD a user Lnone/sp;
+		FIELD b target Lnone/sg;
+		METHOD a handleEnchantment (Lnone/aho;I)V
+			ARG 0 enchantment
+			ARG 1 enchantmentLevel
+	CLASS none/ahq$b DamageUserHandler
+		FIELD a user Lnone/sp;
+		FIELD b attacker Lnone/sg;
+		METHOD a handleEnchantment (Lnone/aho;I)V
+			ARG 0 enchantment
+			ARG 1 enchantmentLevel
+	CLASS none/ahq$c EnchantmentHandler
+		METHOD a handleEnchantment (Lnone/aho;I)V
+			ARG 0 enchantment
+			ARG 1 enchantmentLevel
+	CLASS none/ahq$d AdditionalDamgeHandler
+		FIELD a additionalDamge F
+		FIELD b entityType Lnone/su;
+		METHOD a handleEnchantment (Lnone/aho;I)V
+			ARG 0 enchantment
+			ARG 1 enchantmentLevel
+	CLASS none/ahq$e ProtectionHandler
+		FIELD a protectionAmount I
+		FIELD b source Lnone/rr;
+		METHOD a handleEnchantment (Lnone/aho;I)V
+			ARG 0 enchantment
+			ARG 1 enchantmentLevel
 	FIELD a rand Ljava/util/Random;
+	FIELD b protectionHandler Lnone/ahq$e;
+	FIELD c additionalDamgeHandler Lnone/ahq$d;
+	FIELD d damageUserHandler Lnone/ahq$b;
+	FIELD e damageTargetHandler Lnone/ahq$a;
+	METHOD a (ILnone/aes;Z)Ljava/util/List;
+		ARG 1 stack
+	METHOD a getProtectionAmount (Ljava/lang/Iterable;Lnone/rr;)I
+		ARG 0 stacks
+		ARG 1 source
+	METHOD a removeInvalidEnchantments (Ljava/util/List;Lnone/ahr;)V
+		ARG 0 infos
+		ARG 1 info
 	METHOD a setEnchantments (Ljava/util/Map;Lnone/aes;)V
 		ARG 0 enchantmentMap
 		ARG 1 stack
-	METHOD a (Ljava/util/Random;IILnone/aes;)I
+	METHOD a geExperienceLevel (Ljava/util/Random;IILnone/aes;)I
 		ARG 0 rand
 		ARG 1 num
 		ARG 2 enchantmentPower
 		ARG 3 rstack
+	METHOD a (Ljava/util/Random;Lnone/aes;IZ)Lnone/aes;
+		ARG 0 rand
+		ARG 1 stack
 	METHOD a getEnchantments (Lnone/aes;)Ljava/util/Map;
 		ARG 0 stack
+	METHOD a getAdditionalDamge (Lnone/aes;Lnone/su;)F
+		ARG 0 rstack
+		ARG 1 attribute
 	METHOD a getLevel (Lnone/aho;Lnone/aes;)I
 		ARG 0 enchantment
 		ARG 1 stack
 	METHOD a getEquipmentLevel (Lnone/aho;Lnone/sp;)I
 		ARG 0 ench
 		ARG 1 entity
+	METHOD a handleEnchantmentArray (Lnone/ahq$c;Ljava/lang/Iterable;)V
+		ARG 0 EnchantmentHandler
+		ARG 1 stacks
+	METHOD a handleEnchantments (Lnone/ahq$c;Lnone/aes;)V
+		ARG 0 enchantmentHandler
+		ARG 1 stack
 	METHOD a getKnockback (Lnone/sp;)I
 		ARG 0 entity
-	METHOD b (Lnone/aho;Lnone/sp;)Lnone/aes;
+	METHOD a handleDamageUser (Lnone/sp;Lnone/sg;)V
+		ARG 0 attackingEntity
+		ARG 1 attackedEntity
+	METHOD b getEnchantmentList (Ljava/util/Random;Lnone/aes;IZ)Ljava/util/List;
+		ARG 0 rand
+		ARG 1 stack
+	METHOD b getHighestEnchantmentLevel (Lnone/aho;Lnone/sp;)Lnone/aes;
 		ARG 0 enchantment
 		ARG 1 entity
 	METHOD b getFireAspect (Lnone/sp;)I
 		ARG 0 entity
+	METHOD b handleDamageTarget (Lnone/sp;Lnone/sg;)V
+		ARG 0 attackingEntity
+		ARG 1 attackedEntity
 	METHOD c getRespiration (Lnone/sp;)I
 		ARG 0 entity
 	METHOD d getDepthStrider (Lnone/sp;)I
diff --git a/mappings/net/minecraft/entity/player/EntityPlayer.mapping b/mappings/net/minecraft/entity/player/EntityPlayer.mapping
index cbb8c04bd6..d79b25f840 100644
--- a/mappings/net/minecraft/entity/player/EntityPlayer.mapping
+++ b/mappings/net/minecraft/entity/player/EntityPlayer.mapping
@@ -44,7 +44,7 @@ CLASS none/aam net/minecraft/entity/player/EntityPlayer
 	FIELD d sleepTimer I
 	FIELD e spawnPosition Lnone/cn;
 	FIELD f spawnForced Z
-	FIELD h xpSeed I
+	FIELD h enchantmentTableSeed I
 	METHOD T invalidate ()V
 	METHOD a addExhaustion (F)V
 		ARG 0 value
@@ -141,7 +141,7 @@ CLASS none/aam net/minecraft/entity/player/EntityPlayer
 	METHOD cS getSleepTimer ()I
 	METHOD cT getSpawnPosition ()Lnone/cn;
 	METHOD cU isSpawnForced ()Z
-	METHOD cV getXpSeed ()I
+	METHOD cV getEnchantmentTableSeed ()I
 	METHOD cX getHungerManager ()Lnone/abv;
 	METHOD cZ canModifyWorld ()Z
 	METHOD cq isSleeping ()Z
diff --git a/mappings/net/minecraft/item/ItemBookEnchanted.mapping b/mappings/net/minecraft/item/ItemBookEnchanted.mapping
index 05572b19c9..43517e29a9 100644
--- a/mappings/net/minecraft/item/ItemBookEnchanted.mapping
+++ b/mappings/net/minecraft/item/ItemBookEnchanted.mapping
@@ -4,6 +4,14 @@ CLASS none/aeb net/minecraft/item/ItemBookEnchanted
 		ARG 1 player
 		ARG 2 list
 		ARG 3 advancedTooltips
+	METHOD a addEnchantment (Lnone/aes;Lnone/ahr;)V
+		ARG 0 stack
+		ARG 1 rinfo
+	METHOD a (Lnone/aho;Ljava/util/List;)V
+		ARG 0 enchantment
+		ARG 1 stacks
+	METHOD a getEnchantmentBook (Lnone/ahr;)Lnone/aes;
+		ARG 0 info
 	METHOD g getRarity (Lnone/aes;)Lnone/afg;
 		ARG 0 stack
 	METHOD g_ isTool (Lnone/aes;)Z