diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping
index 827f66a2de..6128372aff 100644
--- a/mappings/net/minecraft/block/Block.mapping
+++ b/mappings/net/minecraft/block/Block.mapping
@@ -9,35 +9,55 @@ CLASS bfg net/minecraft/block/Block
 	CLASS bfg$c Builder
 		FIELD a material Lccw;
 		FIELD b mapColor Lccx;
+		FIELD c collidable Z
 		FIELD d soundGroup Lbkh;
-		FIELD e lightOpacityLevel I
+		FIELD e luminance I
+		FIELD f resistance F
+		FIELD g hardness F
+		FIELD h randomTicks Z
+		FIELD i friction F
 		FIELD j dropTableId Lpx;
 		METHOD <init> (Lccw;Lccx;)V
 			ARG 0 material
 			ARG 1 mapColor
-		METHOD a lightOpacityLevel (I)Lbfg$c;
+		METHOD a noCollision ()Lbfg$c;
+		METHOD a setFriction (F)Lbfg$c;
+		METHOD a setStrength (FF)Lbfg$c;
+			ARG 1 hardness
+			ARG 2 resistance
+		METHOD a setLuminance (I)Lbfg$c;
 		METHOD a copy (Lbfg;)Lbfg$c;
-		METHOD a soundGroup (Lbkh;)Lbfg$c;
+		METHOD a setSoundGroup (Lbkh;)Lbfg$c;
 		METHOD a create (Lccw;)Lbfg$c;
 		METHOD a create (Lccw;Laub;)Lbfg$c;
 		METHOD a create (Lccw;Lccx;)Lbfg$c;
+		METHOD b breakInstantly ()Lbfg$c;
+		METHOD b setStrength (F)Lbfg$c;
+			ARG 1 hardness
 		METHOD b copyDropTable (Lbfg;)Lbfg$c;
+		METHOD c acceptRandomTicks ()Lbfg$c;
 		METHOD e withoutDropTable ()Lbfg$c;
+	FIELD b friction F
 	FIELD c defaultState Lbnz;
 	FIELD e dropTableId Lpx;
 	FIELD f translationKey Ljava/lang/String;
 	FIELD g LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD h STATE_IDS Lfb;
-	FIELD i lightOpacityLevel I
+	FIELD i luminance I
+	FIELD j hardness F
+	FIELD k resistance F
+	FIELD l randomTicks Z
 	FIELD m soundGroup Lbkh;
 	FIELD n material Lccw;
 	FIELD o mapColor Lccx;
 	FIELD p stateFactory Lboa;
+	FIELD q collidable Z
 	METHOD Y_ getOffsetType ()Lbfg$b;
 	METHOD a canMobSpawnInside ()Z
 	METHOD a createCubeShape (DDDDDD)Lckm;
 	METHOD a getStateFromRawId (I)Lbnz;
 	METHOD a getPlacementState (Latj;)Lbnz;
+	METHOD a addStacksForDisplay (Latw;Lfg;)V
 	METHOD a getBlockFromItem (Lava;)Lbfg;
 		ARG 0 item
 	METHOD a addInformation (Lavf;Lazq;Ljava/util/List;Lawp;)V
@@ -201,12 +221,14 @@ CLASS bfg net/minecraft/block/Block
 	METHOD j getHardness (Lbnz;Lazq;Les;)F
 		ARG 1 state
 		ARG 2 world
+	METHOD k getBlastResistance ()F
 	METHOD k getLightOpacityLevel (Lbnz;)I
 	METHOD l getTextComponent ()Liz;
 	METHOD l getMaterial (Lbnz;)Lccw;
 	METHOD m getTranslationKey ()Ljava/lang/String;
 	METHOD m hasRandomTicks (Lbnz;)Z
 	METHOD m getRayTraceShape (Lbnz;Lazq;Les;)Lckm;
+	METHOD n getFrictionCoefficient ()F
 	METHOD o getStateFactory ()Lboa;
 	METHOD o hasComparatorOutput (Lbnz;)Z
 	METHOD p getDefaultState ()Lbnz;
diff --git a/mappings/net/minecraft/block/BlockStairs.mapping b/mappings/net/minecraft/block/BlockStairs.mapping
index ac1233f64a..ee3483384d 100644
--- a/mappings/net/minecraft/block/BlockStairs.mapping
+++ b/mappings/net/minecraft/block/BlockStairs.mapping
@@ -60,3 +60,4 @@ CLASS bkn net/minecraft/block/BlockStairs
 	METHOD c canCollideWith (Lbnz;)Z
 	METHOD i canCollideWith ()Z
 	METHOD i hasSolidTopSurface (Lbnz;Lazq;Les;)Z
+	METHOD k getBlastResistance ()F
diff --git a/mappings/net/minecraft/fluid/Fluid.mapping b/mappings/net/minecraft/fluid/Fluid.mapping
index 133e7b7ff0..d0e20816ee 100644
--- a/mappings/net/minecraft/fluid/Fluid.mapping
+++ b/mappings/net/minecraft/fluid/Fluid.mapping
@@ -7,6 +7,7 @@ CLASS ccr net/minecraft/fluid/Fluid
 	METHOD a matches (Lxt;)Z
 	METHOD b getBucketItem ()Lava;
 	METHOD b toBlockState (Lccs;)Lbnz;
+	METHOD d getBlastResistance ()F
 	METHOD f setDefaultState (Lccs;)V
 	METHOD h getStateFactory ()Lboa;
 	METHOD i getDefaultState ()Lccs;
diff --git a/mappings/net/minecraft/fluid/FluidEmpty.mapping b/mappings/net/minecraft/fluid/FluidEmpty.mapping
index 4cc0644830..668169323e 100644
--- a/mappings/net/minecraft/fluid/FluidEmpty.mapping
+++ b/mappings/net/minecraft/fluid/FluidEmpty.mapping
@@ -2,3 +2,4 @@ CLASS ccp net/minecraft/fluid/FluidEmpty
 	METHOD a getRenderLayer ()Lazr;
 	METHOD b getBucketItem ()Lava;
 	METHOD b toBlockState (Lccs;)Lbnz;
+	METHOD d getBlastResistance ()F
diff --git a/mappings/net/minecraft/fluid/FluidLava.mapping b/mappings/net/minecraft/fluid/FluidLava.mapping
index 0a311de850..943de06358 100644
--- a/mappings/net/minecraft/fluid/FluidLava.mapping
+++ b/mappings/net/minecraft/fluid/FluidLava.mapping
@@ -5,5 +5,6 @@ CLASS ccv net/minecraft/fluid/FluidLava
 	METHOD a matchesType (Lccr;)Z
 	METHOD b getBucketItem ()Lava;
 	METHOD b toBlockState (Lccs;)Lbnz;
+	METHOD d getBlastResistance ()F
 	METHOD e getFlowing ()Lccr;
 	METHOD f getStill ()Lccr;
diff --git a/mappings/net/minecraft/fluid/FluidState.mapping b/mappings/net/minecraft/fluid/FluidState.mapping
index bb40d9e314..ab6f1d4e03 100644
--- a/mappings/net/minecraft/fluid/FluidState.mapping
+++ b/mappings/net/minecraft/fluid/FluidState.mapping
@@ -1,6 +1,8 @@
 CLASS ccs net/minecraft/fluid/FluidState
+	METHOD a matches (Lxt;)Z
 	METHOD b onRandomTick (Lbae;Les;Ljava/util/Random;)V
 	METHOD c getFluid ()Lccr;
 	METHOD h hasRandomTicks ()Z
 	METHOD i getBlockState ()Lbnz;
 	METHOD k getRenderLayer ()Lazr;
+	METHOD l getBlastResistance ()F
diff --git a/mappings/net/minecraft/fluid/FluidWater.mapping b/mappings/net/minecraft/fluid/FluidWater.mapping
index 21ada49b74..9e40b33863 100644
--- a/mappings/net/minecraft/fluid/FluidWater.mapping
+++ b/mappings/net/minecraft/fluid/FluidWater.mapping
@@ -5,5 +5,6 @@ CLASS ccz net/minecraft/fluid/FluidWater
 	METHOD a matchesType (Lccr;)Z
 	METHOD b getBucketItem ()Lava;
 	METHOD b toBlockState (Lccs;)Lbnz;
+	METHOD d getBlastResistance ()F
 	METHOD e getFlowing ()Lccr;
 	METHOD f getStill ()Lccr;
diff --git a/mappings/net/minecraft/state/AbstractPropertyContainer.mapping b/mappings/net/minecraft/state/AbstractPropertyContainer.mapping
index 5b3e1d0726..6de940976b 100644
--- a/mappings/net/minecraft/state/AbstractPropertyContainer.mapping
+++ b/mappings/net/minecraft/state/AbstractPropertyContainer.mapping
@@ -7,7 +7,7 @@ CLASS bnx net/minecraft/state/AbstractPropertyContainer
 	METHOD <init> (Ljava/lang/Object;Lcom/google/common/collect/ImmutableMap;)V
 		ARG 1 baseObject
 	METHOD a getProperties ()Ljava/util/Collection;
-	METHOD a set (Lbpi;Ljava/lang/Comparable;)Ljava/lang/Object;
+	METHOD a with (Lbpi;Ljava/lang/Comparable;)Ljava/lang/Object;
 	METHOD b getEntries ()Lcom/google/common/collect/ImmutableMap;
 	METHOD b contains (Lbpi;)Z
 	METHOD c get (Lbpi;)Ljava/lang/Comparable;
diff --git a/mappings/net/minecraft/state/PropertyContainer.mapping b/mappings/net/minecraft/state/PropertyContainer.mapping
index 1762f4b9cb..147e1be538 100644
--- a/mappings/net/minecraft/state/PropertyContainer.mapping
+++ b/mappings/net/minecraft/state/PropertyContainer.mapping
@@ -1,5 +1,5 @@
 CLASS bob net/minecraft/state/PropertyContainer
 	FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
-	METHOD a set (Lbpi;Ljava/lang/Comparable;)Ljava/lang/Object;
+	METHOD a with (Lbpi;Ljava/lang/Comparable;)Ljava/lang/Object;
 	METHOD b getEntries ()Lcom/google/common/collect/ImmutableMap;
 	METHOD c get (Lbpi;)Ljava/lang/Comparable;
diff --git a/mappings/net/minecraft/util/MapColor.mapping b/mappings/net/minecraft/util/MapColor.mapping
index 2ab1408c54..6b85810560 100644
--- a/mappings/net/minecraft/util/MapColor.mapping
+++ b/mappings/net/minecraft/util/MapColor.mapping
@@ -10,7 +10,23 @@ CLASS ccx net/minecraft/util/MapColor
 	FIELD I EMERALD Lccx;
 	FIELD J SPRUCE Lccx;
 	FIELD K NETHER Lccx;
+	FIELD L WHITE_TERRACOTTA Lccx;
+	FIELD M ORANGE_TERRACOTTA Lccx;
+	FIELD N MAGENTA_TERRACOTTA Lccx;
+	FIELD O LIGHT_BLUE_TERRACOTTA Lccx;
+	FIELD P YELLOW_TERRACOTTA Lccx;
+	FIELD Q LIME_TERRACOTTA Lccx;
+	FIELD R PINK_TERRACOTTA Lccx;
+	FIELD S GRAY_TERRACOTTA Lccx;
+	FIELD T LIGHT_GRAY_TERRACOTTA Lccx;
+	FIELD U CYAN_TERRACOTTA Lccx;
+	FIELD V PURPLE_TERRACOTTA Lccx;
+	FIELD W BLUE_TERRACOTTA Lccx;
+	FIELD X BROWN_TERRACOTTA Lccx;
+	FIELD Y GREEN_TERRACOTTA Lccx;
+	FIELD Z RED_TERRACOTTA Lccx;
 	FIELD a COLORS [Lccx;
+	FIELD aa BLACK_TERRACOTTA Lccx;
 	FIELD ab color I
 	FIELD ac id I
 	FIELD b AIR Lccx;
@@ -20,7 +36,7 @@ CLASS ccx net/minecraft/util/MapColor
 	FIELD f LAVA Lccx;
 	FIELD g ICE Lccx;
 	FIELD h IRON Lccx;
-	FIELD i LEAVES Lccx;
+	FIELD i FOLIAGE Lccx;
 	FIELD j WHITE Lccx;
 	FIELD k CLAY Lccx;
 	FIELD l DIRT Lccx;
diff --git a/mappings/net/minecraft/util/TagHelper.mapping b/mappings/net/minecraft/util/TagHelper.mapping
index 670ae4a306..34d01909ec 100644
--- a/mappings/net/minecraft/util/TagHelper.mapping
+++ b/mappings/net/minecraft/util/TagHelper.mapping
@@ -3,7 +3,7 @@ CLASS ia net/minecraft/util/TagHelper
 	METHOD a withProperty (Lbob;Lbpi;Ljava/lang/String;Lho;Lho;)Lbob;
 		ARG 0 state
 		ARG 1 property
-	METHOD a getPropertyValue (Lbpi;Ljava/lang/Comparable;)Ljava/lang/String;
+	METHOD a getPropertyValueAsString (Lbpi;Ljava/lang/Comparable;)Ljava/lang/String;
 		ARG 0 property
 		ARG 1 value
 	METHOD a serializeBlockPos (Les;)Lho;