diff --git a/mappings/bvm.mapping b/mappings/bvm.mapping
deleted file mode 100644
index 0f4ebc44ad..0000000000
--- a/mappings/bvm.mapping
+++ /dev/null
@@ -1,3 +0,0 @@
-CLASS bvm
-	METHOD a render (Latu;DDDFIF)V
-	METHOD a render (Laum;DDDFIF)V
diff --git a/mappings/cag.mapping b/mappings/cag.mapping
deleted file mode 100644
index 4b512c3608..0000000000
--- a/mappings/cag.mapping
+++ /dev/null
@@ -1,4 +0,0 @@
-CLASS cag
-	METHOD a shouldMergeTextures ()Z
-	METHOD a render (Lacu;FFFFFFF)V
-	METHOD a render (Luk;FFFFFFF)V
diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping
index 3680335e43..95520bf4ff 100644
--- a/mappings/net/minecraft/block/Block.mapping
+++ b/mappings/net/minecraft/block/Block.mapping
@@ -12,6 +12,7 @@ CLASS ank net/minecraft/block/Block
 	FIELD i BLOCKSTATE_ID_LIST Leh;
 	FIELD j FULL_BLOCK_BOX Lbfm;
 	FIELD k NULL_BOX Lbfm;
+	FIELD l fullBounds Z
 	FIELD m lightOpacityLevel I
 	FIELD n allowsLightTransmission Z
 	FIELD o lightEmissionLevel I
@@ -22,6 +23,7 @@ CLASS ank net/minecraft/block/Block
 	FIELD t tickRandomly Z
 	FIELD u hasBlockEntity Z
 	FIELD v soundGroup Lasm;
+	FIELD w particleGravityStrength F
 	FIELD x material Lbbk;
 	FIELD y mapColor Lbbl;
 	FIELD z friction F
diff --git a/mappings/net/minecraft/client/render/block/entity/BlockEntityShulkerBox.mapping b/mappings/net/minecraft/client/render/block/entity/BlockEntityShulkerBox.mapping
new file mode 100644
index 0000000000..c73b202653
--- /dev/null
+++ b/mappings/net/minecraft/client/render/block/entity/BlockEntityShulkerBox.mapping
@@ -0,0 +1,12 @@
+CLASS bvm net/minecraft/client/render/block/entity/BlockEntityShulkerBox
+	FIELD a model Lbpa;
+	METHOD <init> (Lbpa;)V
+		ARG 0 model
+	METHOD a render (Latu;DDDFIF)V
+	METHOD a render (Laum;DDDFIF)V
+		ARG 0 shulkerBox
+		ARG 1 posX
+		ARG 2 posY
+		ARG 3 posZ
+		ARG 5 destroyStage
+		ARG 6 alpha
diff --git a/mappings/net/minecraft/client/render/entity/EntityMobRendererParrot.mapping b/mappings/net/minecraft/client/render/entity/EntityMobRendererParrot.mapping
index 22ae030601..89387a3e3c 100644
--- a/mappings/net/minecraft/client/render/entity/EntityMobRendererParrot.mapping
+++ b/mappings/net/minecraft/client/render/entity/EntityMobRendererParrot.mapping
@@ -1,3 +1,4 @@
 CLASS byp net/minecraft/client/render/entity/EntityMobRendererParrot
+	FIELD a variants [Lmd;
 	METHOD a getTexture (Lub;)Lmd;
 	METHOD a getTexture (Lyw;)Lmd;
diff --git a/mappings/net/minecraft/client/render/entity/EntityRendererShoulderParrot.mapping b/mappings/net/minecraft/client/render/entity/EntityRendererShoulderParrot.mapping
new file mode 100644
index 0000000000..0f3e54178e
--- /dev/null
+++ b/mappings/net/minecraft/client/render/entity/EntityRendererShoulderParrot.mapping
@@ -0,0 +1,28 @@
+CLASS cag net/minecraft/client/render/entity/EntityRendererShoulderParrot
+	CLASS cag$a ParrotData
+		FIELD a uuid Ljava/util/UUID;
+		FIELD b renderer Lbyg;
+		FIELD c model Lbon;
+		FIELD d variant Lmd;
+		FIELD e entityClass Ljava/lang/Class;
+		METHOD <init> (Lcag;Ljava/util/UUID;Lbyg;Lbon;Lmd;Ljava/lang/Class;)V
+			ARG 0 uuid
+			ARG 1 renderer
+			ARG 2 model
+			ARG 3 variant
+			ARG 4 entityClass
+	FIELD c renderManager Lbxm;
+	METHOD <init> (Lbxm;)V
+		ARG 0 renderManager
+	METHOD a shouldMergeTextures ()Z
+	METHOD a render (Lacu;FFFFFFF)V
+		ARG 0 player
+	METHOD a renderShoulderParrot (Lacu;Ljava/util/UUID;Lfc;Lbyg;Lbon;Lmd;Ljava/lang/Class;FFFFFFFZ)Lcag$a;
+		ARG 0 player
+		ARG 1 uuid
+		ARG 2 dataTag
+		ARG 3 renderer
+		ARG 4 model
+		ARG 5 variant
+		ARG 6 entityClass
+	METHOD a render (Luk;FFFFFFF)V
diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping
index 62dfa1f3f7..a7a9047839 100644
--- a/mappings/net/minecraft/item/ItemStack.mapping
+++ b/mappings/net/minecraft/item/ItemStack.mapping
@@ -12,6 +12,26 @@ CLASS ahf net/minecraft/item/ItemStack
 	FIELD k lastCheckedCanHarvestResult Z
 	FIELD l lastCheckedCanPlaceBlock Lank;
 	FIELD m lastCheckedCanPlaceResult Z
+	METHOD <init> (Lahd;)V
+		ARG 0 item
+	METHOD <init> (Lahd;I)V
+		ARG 0 item
+		ARG 1 amount
+	METHOD <init> (Lahd;II)V
+		ARG 0 item
+		ARG 1 amount
+		ARG 2 metadata
+	METHOD <init> (Lank;)V
+		ARG 0 block
+	METHOD <init> (Lank;I)V
+		ARG 0 block
+		ARG 1 amount
+	METHOD <init> (Lank;II)V
+		ARG 0 block
+		ARG 1 amount
+		ARG 2 meta
+	METHOD <init> (Lfc;)V
+		ARG 0 tag
 	METHOD A getHoldingItemFrame ()Laav;
 	METHOD B getRepairCost ()I
 	METHOD C toTextComponent ()Lgk;
@@ -20,53 +40,105 @@ CLASS ahf net/minecraft/item/ItemStack
 	METHOD F updateInvalidFlag ()V
 	METHOD a getTranslationKey ()Ljava/lang/String;
 	METHOD a split (I)Lahf;
+		ARG 0 amount
 	METHOD a damageDirect (ILjava/util/Random;)Z
+		ARG 0 amount
+		ARG 1 rand
 	METHOD a damage (ILuk;)V
+		ARG 0 amount
+		ARG 1 damager
 	METHOD a setHoldingItemFrame (Laav;)V
+		ARG 0 holdingItemFrame
 	METHOD a activate (Lacu;Lali;Ldx;Lsw;Lee;FFF)Lsy;
+		ARG 0 player
+		ARG 1 world
 	METHOD a interactWithEntity (Lacu;Luk;Lsw;)Z
 	METHOD a getTooltip (Lacu;Z)Ljava/util/List;
+		ARG 0 player
+		ARG 1 debugEnabled
 	METHOD a isEqualIgnoreTags (Lahf;)Z
 	METHOD a areTagsEqual (Lahf;Lahf;)Z
 	METHOD a addEnchantment (Lajy;I)V
+		ARG 0 enchantment
+		ARG 1 level
 	METHOD a onCrafted (Lali;Lacu;I)V
+		ARG 0 world
+		ARG 1 player
 	METHOD a onRightClick (Lali;Lacu;Lsw;)Lsz;
+		ARG 0 world
+		ARG 1 player
+		ARG 2 hand
 	METHOD a onBlockBroken (Lali;Lave;Ldx;Lacu;)V
+		ARG 0 world
+		ARG 1 state
 	METHOD a update (Lali;Lub;IZ)V
+		ARG 0 world
+		ARG 1 owner
 	METHOD a onItemFinishedUsing (Lali;Luk;)Lahf;
+		ARG 0 world
+		ARG 1 user
 	METHOD a onItemStopUsing (Lali;Luk;I)V
+		ARG 0 world
+		ARG 1 user
 	METHOD a getCustomCanHarvest (Lank;)Z
+		ARG 0 block
 	METHOD a getBlockBreakingSpeed (Lave;)F
+		ARG 0 state
 	METHOD a serialize (Lfc;)Lfc;
+		ARG 0 tag
 	METHOD a setChildTag (Ljava/lang/String;Lfq;)V
+		ARG 0 tagName
+		ARG 1 tag
 	METHOD a addAttributeModifier (Ljava/lang/String;Luz;Lug;)V
+		ARG 0 attributeName
+		ARG 1 modifier
+		ARG 2 effectiveSlot
 	METHOD a registerTagUpgraders (Lqv;)V
+		ARG 0 migrationHandler
 	METHOD a getAttributeModifiers (Lug;)Lcom/google/common/collect/Multimap;
+		ARG 0 effectiveSlot
 	METHOD a onEntityDamaged (Luk;Lacu;)V
+		ARG 0 attacker
+		ARG 1 player
 	METHOD b isInvalid ()Z
 	METHOD b setDamage (I)V
+		ARG 0 damage
 	METHOD b isEqualIgnoreDurability (Lahf;)Z
 	METHOD b areEqual (Lahf;Lahf;)Z
 	METHOD b getCustomCanPlace (Lank;)Z
+		ARG 0 block
 	METHOD b isEffectiveOn (Lave;)Z
+		ARG 0 state
 	METHOD b setTag (Lfc;)V
+		ARG 0 tag
 	METHOD c getItem ()Lahd;
 	METHOD c setRepairCost (I)V
+		ARG 0 cost
 	METHOD c areEqualIgnoreTags (Lahf;Lahf;)Z
 	METHOD c getOrCreateTagCompound (Ljava/lang/String;)Lfc;
+		ARG 0 tagName
 	METHOD d getMaxAmount ()I
-	METHOD d getUpdateCooldown (I)V
+	METHOD d setUpdateCooldown (I)V
+		ARG 0 cooldownAmount
 	METHOD d isEqual (Lahf;)Z
 	METHOD d areEqualIgnoreDurability (Lahf;Lahf;)Z
 	METHOD d getTagCompound (Ljava/lang/String;)Lfc;
+		ARG 0 tagName
 	METHOD e canBeStacked ()Z
 	METHOD e setAmount (I)V
+		ARG 0 amount
 	METHOD e removeTagCompound (Ljava/lang/String;)V
+		ARG 0 tagName
 	METHOD f hasDurability ()Z
 	METHOD f addAmount (I)V
+		ARG 0 amount
+	METHOD f setLocalizationName (Ljava/lang/String;)Lahf;
+		ARG 0 localizationName
 	METHOD g hasVariants ()Z
 	METHOD g subtractAmount (I)V
+		ARG 0 amount
 	METHOD g setDisplayName (Ljava/lang/String;)Lahf;
+		ARG 0 name
 	METHOD h isDamaged ()Z
 	METHOD i getDamage ()I
 	METHOD j getMetadata ()I
diff --git a/mappings/net/minecraft/potion/Potion.mapping b/mappings/net/minecraft/potion/Potion.mapping
index 13e59cf938..74244b6e99 100644
--- a/mappings/net/minecraft/potion/Potion.mapping
+++ b/mappings/net/minecraft/potion/Potion.mapping
@@ -4,9 +4,18 @@ CLASS aiv net/minecraft/potion/Potion
 	FIELD c rawIdCounter I
 	FIELD d name Ljava/lang/String;
 	FIELD e effectList Lcom/google/common/collect/ImmutableList;
+	METHOD <init> (Ljava/lang/String;[Ltv;)V
+		ARG 0 name
+		ARG 1 effects
+	METHOD <init> ([Ltv;)V
+		ARG 0 effects
 	METHOD a getEffects ()Ljava/util/List;
 	METHOD a getPotionById (Ljava/lang/String;)Laiv;
+		ARG 0 identifier
 	METHOD a register (Ljava/lang/String;Laiv;)V
+		ARG 0 identifier
+		ARG 1 potion
 	METHOD b registerDefaults ()V
 	METHOD b getName (Ljava/lang/String;)Ljava/lang/String;
+		ARG 0 prefix
 	METHOD c hasInstantEffect ()Z
diff --git a/mappings/net/minecraft/potion/PotionEffectType.mapping b/mappings/net/minecraft/potion/PotionEffectType.mapping
index 7adf0641b0..07f9b7abfd 100644
--- a/mappings/net/minecraft/potion/PotionEffectType.mapping
+++ b/mappings/net/minecraft/potion/PotionEffectType.mapping
@@ -1,19 +1,27 @@
 CLASS tu net/minecraft/potion/PotionEffectType
+	FIELD a attributes Ljava/util/Map;
 	FIELD b REGISTRY Lel;
 	FIELD c negative Z
 	FIELD d color I
 	FIELD e translationKey Ljava/lang/String;
 	FIELD f iconIndex I
+	METHOD <init> (ZI)V
+		ARG 0 negative
+		ARG 1 color
 	METHOD a getTranslationKey ()Ljava/lang/String;
 	METHOD a getEffectByRawId (I)Ltu;
+		ARG 0 rawId
 	METHOD a canApplyUpdateEffect (II)Z
 	METHOD a getRawIdFromEffect (Ltu;)I
+		ARG 0 effect
 	METHOD a getDurationString (Ltv;F)Ljava/lang/String;
+		ARG 0 effect
 	METHOD a applyInstantEffect (Lub;Lub;Luk;ID)V
 	METHOD a applyUpdateEffect (Luk;I)V
 	METHOD b isInstant ()Z
 	METHOD b setIcon (II)Ltu;
 	METHOD b getEffectById (Ljava/lang/String;)Ltu;
+		ARG 0 identifier
 	METHOD c hasIcon ()Z
 	METHOD c setTranslationKey (Ljava/lang/String;)Ltu;
 	METHOD d getIconIndex ()I