diff --git a/gradle.properties b/gradle.properties
index 6a0c2e8648..fc44b8214f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G
 
 enigma_version=0.26.0
 stitch_version=0.5.1+build.77
-unpick_version=2.1.0
+unpick_version=2.1.1
 # Loader is only used by javadoc generation/linking
 fabric_loader_version=0.11.1
 jetbrains_annotations_version=20.1.0
diff --git a/src/constants/java/net/fabricmc/yarn/constants/SetBlockStateFlags.java b/src/constants/java/net/fabricmc/yarn/constants/SetBlockStateFlags.java
index 852af85789..b0445c73e0 100644
--- a/src/constants/java/net/fabricmc/yarn/constants/SetBlockStateFlags.java
+++ b/src/constants/java/net/fabricmc/yarn/constants/SetBlockStateFlags.java
@@ -11,6 +11,11 @@ public final class SetBlockStateFlags {
 	 */
 	public static final int NOTIFY_LISTENERS = 2;
 
+	/**
+	 * The default setBlockState behavior. Same as {@code PROPAGATE_CHANGE | NOTIFY_LISTENERS}.
+	 */
+	public static final int DEFAULT = PROPAGATE_CHANGE | NOTIFY_LISTENERS;
+
 	/**
 	 * Used in conjunction with {@link NOTIFY_LISTENERS} to suppress the render pass on clients.
 	 */
diff --git a/unpick-definitions/set_block_state_flags.unpick b/unpick-definitions/set_block_state_flags.unpick
index faaf9e745e..8e90003478 100644
--- a/unpick-definitions/set_block_state_flags.unpick
+++ b/unpick-definitions/set_block_state_flags.unpick
@@ -1,5 +1,6 @@
 v2
 
+flag set_block_state_flags net/fabricmc/yarn/constants/SetBlockStateFlags DEFAULT
 flag set_block_state_flags net/fabricmc/yarn/constants/SetBlockStateFlags PROPAGATE_CHANGE
 flag set_block_state_flags net/fabricmc/yarn/constants/SetBlockStateFlags NOTIFY_LISTENERS
 flag set_block_state_flags net/fabricmc/yarn/constants/SetBlockStateFlags NO_REDRAW
@@ -10,4 +11,28 @@ flag set_block_state_flags net/fabricmc/yarn/constants/SetBlockStateFlags MOVED
 flag set_block_state_flags net/fabricmc/yarn/constants/SetBlockStateFlags SKIP_LIGHTING_UPDATES
 
 target_method net/minecraft/world/ModifiableWorld setBlockState (Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;I)Z
-	param 2 set_block_state_flags
\ No newline at end of file
+	param 2 set_block_state_flags
+target_method net/minecraft/world/ModifiableWorld setBlockState (Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;II)Z
+	param 2 set_block_state_flags
+target_method net/minecraft/world/World updateListeners (Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/block/BlockState;I)V
+	param 3 set_block_state_flags
+target_method net/minecraft/block/AbstractBlock$AbstractBlockState prepare (Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;II)V
+	param 2 set_block_state_flags
+target_method net/minecraft/block/AbstractBlock$AbstractBlockState updateNeighbors (Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;I)V
+	param 2 set_block_state_flags
+target_method net/minecraft/block/AbstractBlock$AbstractBlockState updateNeighbors (Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;II)V
+	param 2 set_block_state_flags
+target_method net/minecraft/block/Block replace (Lnet/minecraft/block/BlockState;Lnet/minecraft/block/BlockState;Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;II)V
+	param 4 set_block_state_flags
+target_method net/minecraft/block/AbstractBlock prepare (Lnet/minecraft/block/BlockState;Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;II)V
+	param 3 set_block_state_flags
+target_method net/minecraft/block/TallPlantBlock placeAt (Lnet/minecraft/world/WorldAccess;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;I)V
+	param 2 set_block_state_flags
+target_method net/minecraft/client/network/ClientPlayNetworkHandler method_34007 (ILnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V
+	param 0 set_block_state_flags
+target_method net/minecraft/command/argument/BlockStateArgument setBlockState (Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;I)Z
+	param 2 set_block_state_flags
+target_method net/minecraft/structure/Structure place (Lnet/minecraft/world/ServerWorldAccess;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/structure/StructurePlacementData;Ljava/util/Random;I)Z
+	param 5 set_block_state_flags
+target_method net/minecraft/structure/Structure updateCorner (Lnet/minecraft/world/WorldAccess;ILnet/minecraft/util/shape/VoxelSet;III)V
+	param 1 set_block_state_flags