diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping
index a1f529dcec..4786700c11 100644
--- a/mappings/net/minecraft/block/AbstractBlock.mapping
+++ b/mappings/net/minecraft/block/AbstractBlock.mapping
@@ -165,6 +165,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
 		ARG 2 world
 		ARG 3 pos
 		ARG 4 block
+		ARG 5 orientation
 		ARG 6 notify
 	METHOD m_umbsjste rotate (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_mboglirk;)Lnet/minecraft/unmapped/C_txtbiemp;
 		COMMENT Applies a block rotation to a block state.
@@ -227,14 +228,19 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
 		ARG 3 pos
 		ARG 4 context
 	CLASS C_eibemhky AbstractBlockState
+		FIELD f_biaogsvo FULL_BLOCK_OCCLUSION_SHAPES [Lnet/minecraft/unmapped/C_zscvhwbd;
+		FIELD f_bsbhmsca cullingShape Lnet/minecraft/unmapped/C_zscvhwbd;
+		FIELD f_bvttwnii EMPTY_OCCLUSION_SHAPES [Lnet/minecraft/unmapped/C_zscvhwbd;
 		FIELD f_ciiuhosx opaque Z
 		FIELD f_cmbiwnda hasSidedTransparency Z
+		FIELD f_gbcdxrgd DIRECTIONS [Lnet/minecraft/unmapped/C_xpuuihxf;
 		FIELD f_jnxtuzdb hardness F
 		FIELD f_jvcpotqu isAir Z
 		FIELD f_lpessbtt pistonBehavior Lnet/minecraft/unmapped/C_mojvzhua;
 		FIELD f_lqzypovm spawnsDustParticles Z
 		FIELD f_mkfwgndk solidBlockPredicate Lnet/minecraft/unmapped/C_triydqro$C_izsedryc;
 		FIELD f_nijrkoes emissiveLightingPredicate Lnet/minecraft/unmapped/C_triydqro$C_izsedryc;
+		FIELD f_nsclhbdi opacity I
 		FIELD f_ochxyzpr solid Z
 		FIELD f_omahusur liquid Z
 		FIELD f_rmmimkow replaceable Z
@@ -246,12 +252,16 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
 		FIELD f_vskisdzk postProcessPredicate Lnet/minecraft/unmapped/C_triydqro$C_izsedryc;
 		FIELD f_wknecqnz luminance I
 		FIELD f_wvbmkgls suffocationPredicate Lnet/minecraft/unmapped/C_triydqro$C_izsedryc;
+		FIELD f_xogzmbzi isTransparent Z
 		FIELD f_xwxdktuf hasRandomTicks Z
+		FIELD f_xxewnzdk isFullCube Z
+		FIELD f_ycbjvypj cullingFaces [Lnet/minecraft/unmapped/C_zscvhwbd;
 		FIELD f_yypdsdkn lavaIgnitable Z
 		FIELD f_zpvdfobl mapColor Lnet/minecraft/unmapped/C_mlrprqox;
 		FIELD f_zzuoeazs instrument Lnet/minecraft/unmapped/C_onjtjtsi;
 		METHOD m_aeqyhmrr neighborUpdate (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ctatbkvy;Z)V
 			ARG 2 pos
+			ARG 4 orientation
 			ARG 5 notify
 		METHOD m_alvmezvc getInstrument ()Lnet/minecraft/unmapped/C_onjtjtsi;
 		METHOD m_aoahmjkt getSoundGroup ()Lnet/minecraft/unmapped/C_aevintex;
@@ -323,6 +333,8 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
 			COMMENT {@return whether this block state is an instance of the given block holder}
 			ARG 1 block
 				COMMENT the block holder to match
+		METHOD m_fpkvjpml ([Lnet/minecraft/unmapped/C_zscvhwbd;)V
+			ARG 0 directions
 		METHOD m_fuqgdrck isOf (Lnet/minecraft/unmapped/C_mmxmpdoq;)Z
 			COMMENT {@return whether this block state is an instance of the given block}
 			ARG 1 block
@@ -393,6 +405,8 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
 			ARG 2 direction
 		METHOD m_pobwdefx exceedsCube ()Z
 		METHOD m_pppprjpr isTransparent ()Z
+		METHOD m_ptlyqoli ([Lnet/minecraft/unmapped/C_zscvhwbd;)V
+			ARG 0 directions
 		METHOD m_pvjmhzzb getOpacity ()I
 		METHOD m_qcyiqint hasComparatorOutput ()Z
 		METHOD m_qilylxum onUse (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_jdakttms;)Lnet/minecraft/unmapped/C_ozuepbyj;
diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping
index 4a3c963fc1..3390efde9b 100644
--- a/mappings/net/minecraft/block/Block.mapping
+++ b/mappings/net/minecraft/block/Block.mapping
@@ -50,6 +50,8 @@ CLASS net/minecraft/unmapped/C_mmxmpdoq net/minecraft/block/Block
 	FIELD f_zatyqcqa CODEC Lcom/mojang/serialization/MapCodec;
 	FIELD f_zeveupfs NO_REDRAW I
 		COMMENT Used in conjunction with {@link #NOTIFY_LISTENERS} to suppress the render pass on clients.
+	FIELD f_zobgxnry SKIP_UPDATE_FOR_REDSTONE_WIRE I
+		COMMENT Skips {@link AbstractBlock#getStateForNeighborUpdate} call for redstone wire.
 	METHOD m_aqcetwet onSteppedOn (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_astfners;)V
 		COMMENT Called when an entity steps on this block.
 		ARG 1 world
@@ -192,6 +194,8 @@ CLASS net/minecraft/unmapped/C_mmxmpdoq net/minecraft/block/Block
 			COMMENT the bitwise flags for {@link net.minecraft.world.ModifiableWorld#setBlockState(BlockPos, BlockState, int, int)}
 		ARG 5 maxUpdateDepth
 			COMMENT the limit for the cascading block updates
+	METHOD m_oscwylqf updateEntityVelocityAfterFall (Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_astfners;)V
+		ARG 2 entity
 	METHOD m_pdzevtfw copyProperty (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_vzlztuyw;)Lnet/minecraft/unmapped/C_txtbiemp;
 		ARG 0 source
 		ARG 1 target
@@ -276,7 +280,9 @@ CLASS net/minecraft/unmapped/C_mmxmpdoq net/minecraft/block/Block
 		ARG 2 stack
 	METHOD m_zpnlglhs shouldDrawSide (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_xpuuihxf;)Z
 		ARG 0 state
+		ARG 1 sideState
 		ARG 2 side
+	CLASS C_epynadow ShapePair
 	CLASS C_miiagdeq
 		METHOD load (Ljava/lang/Object;)Ljava/lang/Object;
 			ARG 1 shape
diff --git a/mappings/net/minecraft/block/CommandBlock.mapping b/mappings/net/minecraft/block/CommandBlock.mapping
index cbe4120e47..e43a9740ae 100644
--- a/mappings/net/minecraft/block/CommandBlock.mapping
+++ b/mappings/net/minecraft/block/CommandBlock.mapping
@@ -16,5 +16,9 @@ CLASS net/minecraft/unmapped/C_tngfqham net/minecraft/block/CommandBlock
 		ARG 3 pos
 		ARG 4 executor
 		ARG 5 hasCommand
+	METHOD m_jlkigzsj (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 0 instance
+	METHOD m_wewzxquc update (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_qpgfeghp;Z)V
+		ARG 3 blockEntity
 	METHOD m_xiigksjk (Lnet/minecraft/unmapped/C_tngfqham;)Ljava/lang/Boolean;
 		ARG 0 block
diff --git a/mappings/net/minecraft/block/EntityShapeContext.mapping b/mappings/net/minecraft/block/EntityShapeContext.mapping
index e57a3ed059..a946d3604a 100644
--- a/mappings/net/minecraft/block/EntityShapeContext.mapping
+++ b/mappings/net/minecraft/block/EntityShapeContext.mapping
@@ -5,6 +5,9 @@ CLASS net/minecraft/unmapped/C_qyrslpru net/minecraft/block/EntityShapeContext
 	FIELD f_sqzftxsg entity Lnet/minecraft/unmapped/C_astfners;
 	FIELD f_ulnpxoti heldItem Lnet/minecraft/unmapped/C_sddaxwyk;
 	FIELD f_wsgxxalk walkOnFluidPredicate Ljava/util/function/Predicate;
+	METHOD <init> (Lnet/minecraft/unmapped/C_astfners;Z)V
+		ARG 1 entity
+		ARG 2 collidesWithFluid
 	METHOD <init> (ZDLnet/minecraft/unmapped/C_sddaxwyk;Ljava/util/function/Predicate;Lnet/minecraft/unmapped/C_astfners;)V
 		ARG 1 descending
 		ARG 2 minY
diff --git a/mappings/net/minecraft/block/HeavyCoreBlock.mapping b/mappings/net/minecraft/block/HeavyCoreBlock.mapping
index 3526b01a16..477e2431e6 100644
--- a/mappings/net/minecraft/block/HeavyCoreBlock.mapping
+++ b/mappings/net/minecraft/block/HeavyCoreBlock.mapping
@@ -1,2 +1,3 @@
 CLASS net/minecraft/unmapped/C_zjbzveiy net/minecraft/block/HeavyCoreBlock
 	FIELD f_ahnlwrmp SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
+	FIELD f_unuqrijj WATERLOGGED Lnet/minecraft/unmapped/C_xhwijdsd;
diff --git a/mappings/net/minecraft/block/PlantBlock.mapping b/mappings/net/minecraft/block/PlantBlock.mapping
index 6968eaf0b3..42472c1e14 100644
--- a/mappings/net/minecraft/block/PlantBlock.mapping
+++ b/mappings/net/minecraft/block/PlantBlock.mapping
@@ -2,3 +2,4 @@ CLASS net/minecraft/unmapped/C_bvcepqzm net/minecraft/block/PlantBlock
 	FIELD f_qyuqzcwy SHAPE_OFFSET F
 	FIELD f_timqrnkw CODEC Lcom/mojang/serialization/MapCodec;
 	FIELD f_wzftyblo SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
+	METHOD m_ufmfqmvb getTallBlock (Lnet/minecraft/unmapped/C_txtbiemp;)Lnet/minecraft/unmapped/C_pomjjrfu;
diff --git a/mappings/net/minecraft/block/RedstoneTorchBlock.mapping b/mappings/net/minecraft/block/RedstoneTorchBlock.mapping
index 42b41a735e..f0be783bc1 100644
--- a/mappings/net/minecraft/block/RedstoneTorchBlock.mapping
+++ b/mappings/net/minecraft/block/RedstoneTorchBlock.mapping
@@ -12,6 +12,8 @@ CLASS net/minecraft/unmapped/C_kohfizdm net/minecraft/block/RedstoneTorchBlock
 		ARG 3 state
 	METHOD m_lbvzpzte (Lnet/minecraft/unmapped/C_peaveboq;)Ljava/util/List;
 		ARG 0 world
+	METHOD m_pquxpinh updateNeighbors (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V
+	METHOD m_vrxftsww getOrientation (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_txtbiemp;)Lnet/minecraft/unmapped/C_ctatbkvy;
 	METHOD m_wseaiskt isBurnedOut (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Z)Z
 		ARG 0 world
 		ARG 1 pos
diff --git a/mappings/net/minecraft/block/RedstoneWireBlock.mapping b/mappings/net/minecraft/block/RedstoneWireBlock.mapping
index 1f3289af8d..6eaaf867ff 100644
--- a/mappings/net/minecraft/block/RedstoneWireBlock.mapping
+++ b/mappings/net/minecraft/block/RedstoneWireBlock.mapping
@@ -16,15 +16,19 @@ CLASS net/minecraft/unmapped/C_hbdlqish net/minecraft/block/RedstoneWireBlock
 	FIELD f_qflzlopt EAST I
 	FIELD f_qomovzle WIRE_CONNECTION_EAST Lnet/minecraft/unmapped/C_cgckxfsw;
 	FIELD f_quuiddba wiresGivePower Z
+	FIELD f_qwcrdmpx controller Lnet/minecraft/unmapped/C_lakkobyv;
 	FIELD f_tfkeexfj SHAPES Ljava/util/Map;
 	FIELD f_vvlqyglw SHAPES_UP Ljava/util/Map;
 	FIELD f_vvxqbtel WEST I
+	METHOD m_ahfsctfo ([Lorg/joml/Vector3f;)V
+		ARG 0 colors
 	METHOD m_brufkqwu updateNeighbors (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)V
 		ARG 1 world
 		ARG 2 pos
 	METHOD m_dbodizuz connectsTo (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_xpuuihxf;)Z
 		ARG 0 state
 		ARG 1 dir
+	METHOD m_djyzrhjp getStrongPower (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)I
 	METHOD m_fpgdlcmq connectsTo (Lnet/minecraft/unmapped/C_txtbiemp;)Z
 		ARG 0 state
 	METHOD m_gqzevazu getPlacementState (Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_txtbiemp;
@@ -56,10 +60,13 @@ CLASS net/minecraft/unmapped/C_hbdlqish net/minecraft/block/RedstoneWireBlock
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 state
+		ARG 4 orientation
+		ARG 5 updateConnections
 	METHOD m_tegvovkt canRunOnTop (Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)Z
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 floor
+	METHOD m_ugolbtvn hasExperiments (Lnet/minecraft/unmapped/C_cdctfzbn;)Z
 	METHOD m_umyfwzyt isNotConnected (Lnet/minecraft/unmapped/C_txtbiemp;)Z
 		ARG 0 state
 	METHOD m_uvclsrei getRenderConnectionType (Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_xpuuihxf;Z)Lnet/minecraft/unmapped/C_gayuosoj;
diff --git a/mappings/net/minecraft/block/ShapeContext.mapping b/mappings/net/minecraft/block/ShapeContext.mapping
index 6afd794b29..3fa9288984 100644
--- a/mappings/net/minecraft/block/ShapeContext.mapping
+++ b/mappings/net/minecraft/block/ShapeContext.mapping
@@ -6,7 +6,11 @@ CLASS net/minecraft/unmapped/C_pbfjvesm net/minecraft/block/ShapeContext
 	METHOD m_ffgvonpe canWalkOnFluid (Lnet/minecraft/unmapped/C_xqketiuf;Lnet/minecraft/unmapped/C_xqketiuf;)Z
 		ARG 1 stateAbove
 		ARG 2 state
+	METHOD m_fuhloafm of (Lnet/minecraft/unmapped/C_astfners;Z)Lnet/minecraft/unmapped/C_pbfjvesm;
 	METHOD m_hussiivc isDescending ()Z
+	METHOD m_jwyjjkqk getCollisionShape (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_vxzrjtdu;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_zscvhwbd;
 	METHOD m_wristroz absent ()Lnet/minecraft/unmapped/C_pbfjvesm;
+	METHOD m_xvebqowz of (Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_pbfjvesm;
+		ARG 0 entity
 	METHOD m_yktbztwe isHolding (Lnet/minecraft/unmapped/C_vorddnax;)Z
 		ARG 1 item
diff --git a/mappings/net/minecraft/block/TrialSpawnerData.mapping b/mappings/net/minecraft/block/TrialSpawnerData.mapping
index a9ef02dd90..1fbfbaeb59 100644
--- a/mappings/net/minecraft/block/TrialSpawnerData.mapping
+++ b/mappings/net/minecraft/block/TrialSpawnerData.mapping
@@ -62,6 +62,7 @@ CLASS net/minecraft/unmapped/C_kxkfzuix net/minecraft/block/TrialSpawnerData
 	METHOD m_rvfytrpa getLastDisplayEntityRotation ()D
 	METHOD m_sccvkbao setEntityType (Lnet/minecraft/unmapped/C_jelkcvqk;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_ogavsvbr;)V
 		ARG 3 entityType
+	METHOD m_tpuunqmz resetStatistics ()V
 	METHOD m_whezyyzf discardMobs (Lnet/minecraft/unmapped/C_jelkcvqk;Lnet/minecraft/unmapped/C_bdwnwhiu;)V
 		ARG 1 logic
 	METHOD m_wlnuwqxo (Lnet/minecraft/unmapped/C_kxkfzuix;)Ljava/util/Set;
diff --git a/mappings/net/minecraft/block/VaultBlock.mapping b/mappings/net/minecraft/block/VaultBlock.mapping
index 7093c5056d..2624e48338 100644
--- a/mappings/net/minecraft/block/VaultBlock.mapping
+++ b/mappings/net/minecraft/block/VaultBlock.mapping
@@ -2,3 +2,11 @@ CLASS net/minecraft/unmapped/C_bxtzknxv net/minecraft/block/VaultBlock
 	FIELD f_cxjeeeot FACING Lnet/minecraft/unmapped/C_tcujuvjb;
 	FIELD f_gxwxcuvd OMINOUS Lnet/minecraft/unmapped/C_xhwijdsd;
 	FIELD f_yjgmpaiu VAULT_STATE Lnet/minecraft/unmapped/C_vzlztuyw;
+	METHOD m_bqwpdjdp (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_xclnoluc;)V
+		ARG 1 blockWorld
+		ARG 3 blockState
+		ARG 4 entity
+	METHOD m_dpxrtzwm (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_xclnoluc;)V
+		ARG 0 blockWorld
+		ARG 2 blockState
+		ARG 3 entity
diff --git a/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping b/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping
index 5f7affa692..53a99aac30 100644
--- a/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping
+++ b/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping
@@ -4,6 +4,9 @@ CLASS net/minecraft/unmapped/C_hwbtrnnh net/minecraft/block/cauldron/CauldronBeh
 	FIELD f_tfprqbdc WATER_CAULDRON_BEHAVIOR Lnet/minecraft/unmapped/C_hwbtrnnh$C_iuwwgckx;
 	FIELD f_udzuwjwe LAVA_CAULDRON_BEHAVIOR Lnet/minecraft/unmapped/C_hwbtrnnh$C_iuwwgckx;
 	FIELD f_xnvptihc EMPTY_CAULDRON_BEHAVIOR Lnet/minecraft/unmapped/C_hwbtrnnh$C_iuwwgckx;
+	METHOD interact (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj;
+		ARG 5 hand
+	METHOD m_bqficzhz fillLavaCauldron (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj;
 	METHOD m_bqgrkcvz (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj;
 		ARG 0 state
 		ARG 1 world
@@ -25,9 +28,18 @@ CLASS net/minecraft/unmapped/C_hwbtrnnh net/minecraft/block/cauldron/CauldronBeh
 		ARG 0 state
 	METHOD m_imlunxvz createMap (Ljava/lang/String;)Lnet/minecraft/unmapped/C_hwbtrnnh$C_iuwwgckx;
 		ARG 0 name
+	METHOD m_mdtmwews fillPowderSnowCauldron (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj;
+	METHOD m_nrpzjycd isUnderWater (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)Z
 	METHOD m_otvisofl registerBucketBehavior (Ljava/util/Map;)V
 		ARG 0 behavior
+	METHOD m_qajrbgzr fillWaterCauldron (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj;
+	METHOD m_qqxoejhi cleanBanner (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj;
+		ARG 4 hand
+	METHOD m_ubhkjwij cleanShulkerBox (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj;
+		ARG 4 hand
 	METHOD m_ucoeawqp registerBehavior ()V
+	METHOD m_vaydxxdu cleanDyeable (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj;
+		ARG 4 hand
 	METHOD m_vtaiddsw emptyCauldron (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;Ljava/util/function/Predicate;Lnet/minecraft/unmapped/C_avavozay;)Lnet/minecraft/unmapped/C_ozuepbyj;
 		ARG 0 state
 		ARG 1 world
diff --git a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping
index 0709fe51ad..39b6f93caf 100644
--- a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping
+++ b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping
@@ -10,6 +10,7 @@ CLASS net/minecraft/unmapped/C_dlxbwxyf net/minecraft/block/entity/AbstractFurna
 	FIELD f_kekgcosu propertyDelegate Lnet/minecraft/unmapped/C_fwwsyhuv;
 	FIELD f_mzaccpku BOTTOM_SLOTS [I
 	FIELD f_nqwyvoxy TOTAL_COOK_TIME_DATA I
+	FIELD f_rclefyez UNKNOWN_LIT_DURATION I
 	FIELD f_rhexgeen recipeCache Lnet/minecraft/unmapped/C_hjseusrb$C_bvtkxdyi;
 	FIELD f_ruznenwn INPUT_SLOT I
 	FIELD f_usgwvvfo cookTime I
@@ -60,4 +61,5 @@ CLASS net/minecraft/unmapped/C_dlxbwxyf net/minecraft/block/entity/AbstractFurna
 		ARG 0 world
 		ARG 1 blockEntity
 	METHOD m_zeyvozgy getFuelTime (Lnet/minecraft/unmapped/C_smdnyqwx;Lnet/minecraft/unmapped/C_sddaxwyk;)I
+		ARG 1 fuelTimes
 		ARG 2 fuel
diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping
index 1f556e55d4..d8420e4d1a 100644
--- a/mappings/net/minecraft/block/entity/BlockEntity.mapping
+++ b/mappings/net/minecraft/block/entity/BlockEntity.mapping
@@ -11,10 +11,12 @@ CLASS net/minecraft/unmapped/C_kvegafmh net/minecraft/block/entity/BlockEntity
 		ARG 1 type
 		ARG 2 pos
 		ARG 3 state
+	METHOD m_aezsotnt validate (Lnet/minecraft/unmapped/C_txtbiemp;)V
 	METHOD m_apmtvpji addComponents (Lnet/minecraft/unmapped/C_kouhnfig$C_vfzyoahz;)V
 		ARG 1 builder
 	METHOD m_auxezlat writeId (Lnet/minecraft/unmapped/C_hhlwcnih;)V
 		ARG 1 nbt
+	METHOD m_bczwkfko getName ()Ljava/lang/String;
 	METHOD m_cckjpvhm readComponents (Lnet/minecraft/unmapped/C_kvegafmh$C_uyhxhbrv;)V
 		ARG 1 access
 	METHOD m_cjlndzcv markDirty (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V
@@ -67,6 +69,7 @@ CLASS net/minecraft/unmapped/C_kvegafmh net/minecraft/block/entity/BlockEntity
 		COMMENT {@link net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket#of(BlockEntity) BlockEntityUpdateS2CPacket.of(this)}.
 		COMMENT <p>
 		COMMENT The NBT will be passed to (TODO: restore link) on the client.
+	METHOD m_ntnawmxi supportsState (Lnet/minecraft/unmapped/C_txtbiemp;)Z
 	METHOD m_nywzerda (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Ljava/lang/String;Lnet/minecraft/unmapped/C_wgqvodus;)Lnet/minecraft/unmapped/C_kvegafmh;
 		ARG 3 type
 	METHOD m_obrnqsbc (Lnet/minecraft/unmapped/C_kouhnfig;)V
diff --git a/mappings/net/minecraft/block/entity/BlockEntityType.mapping b/mappings/net/minecraft/block/entity/BlockEntityType.mapping
index 2d469eb591..f8bf9da762 100644
--- a/mappings/net/minecraft/block/entity/BlockEntityType.mapping
+++ b/mappings/net/minecraft/block/entity/BlockEntityType.mapping
@@ -9,6 +9,8 @@ CLASS net/minecraft/unmapped/C_wgqvodus net/minecraft/block/entity/BlockEntityTy
 		ARG 2 pos
 	METHOD m_jzurwqld create (Ljava/lang/String;Lnet/minecraft/unmapped/C_wgqvodus$C_fcfboksc;[Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_wgqvodus;
 		ARG 0 id
+		ARG 1 factory
+		ARG 2 blocks
 	METHOD m_smqzygry instantiate (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)Lnet/minecraft/unmapped/C_kvegafmh;
 		ARG 1 pos
 		ARG 2 state
diff --git a/mappings/net/minecraft/block/entity/FuelTimes.mapping b/mappings/net/minecraft/block/entity/FuelTimes.mapping
new file mode 100644
index 0000000000..f58b81b255
--- /dev/null
+++ b/mappings/net/minecraft/block/entity/FuelTimes.mapping
@@ -0,0 +1,31 @@
+CLASS net/minecraft/unmapped/C_smdnyqwx net/minecraft/block/entity/FuelTimes
+	FIELD f_tzuddtpi fuelTimes Lit/unimi/dsi/fastutil/objects/Object2IntSortedMap;
+	METHOD m_fgbydbbm isFuel (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
+	METHOD m_frvdpffp getFuelTime (Lnet/minecraft/unmapped/C_sddaxwyk;)I
+	METHOD m_jiniybuf validItems ()Ljava/util/SequencedSet;
+	METHOD m_qszhlppm create (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lnet/minecraft/unmapped/C_czxxrbcp;)Lnet/minecraft/unmapped/C_smdnyqwx;
+	METHOD m_rhanyztn create (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lnet/minecraft/unmapped/C_czxxrbcp;I)Lnet/minecraft/unmapped/C_smdnyqwx;
+		ARG 0 provider
+		ARG 1 flags
+		ARG 2 smeltingTime
+	CLASS C_qmlfsuhv Builder
+		FIELD f_kdbkzstb flags Lnet/minecraft/unmapped/C_czxxrbcp;
+		FIELD f_muvqotbs fuelTimes Lit/unimi/dsi/fastutil/objects/Object2IntSortedMap;
+		FIELD f_ncgakpld lookup Lnet/minecraft/unmapped/C_vtbxyypo;
+		METHOD <init> (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lnet/minecraft/unmapped/C_czxxrbcp;)V
+			ARG 1 provider
+		METHOD m_bscobfnw (ILnet/minecraft/unmapped/C_odfnijdo$C_orinjhqu;)V
+			ARG 2 item
+		METHOD m_prlrxqev (Lnet/minecraft/unmapped/C_ednuhnnn;Lnet/minecraft/unmapped/C_vorddnax;)Z
+			ARG 1 item
+		METHOD m_tfgzjiti add (Lnet/minecraft/unmapped/C_gmbqjnle;I)Lnet/minecraft/unmapped/C_smdnyqwx$C_qmlfsuhv;
+			ARG 1 item
+		METHOD m_urbusdww remove (Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_smdnyqwx$C_qmlfsuhv;
+			ARG 1 tag
+		METHOD m_vqsaqdqp build ()Lnet/minecraft/unmapped/C_smdnyqwx;
+		METHOD m_wcqnypmm add (ILnet/minecraft/unmapped/C_vorddnax;)V
+			ARG 1 fuelTime
+			ARG 2 item
+		METHOD m_ybzuftvz add (Lnet/minecraft/unmapped/C_ednuhnnn;I)Lnet/minecraft/unmapped/C_smdnyqwx$C_qmlfsuhv;
+			ARG 1 tag
+			ARG 2 fuelTime
diff --git a/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping b/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping
index 04497c56c6..16030ea8f6 100644
--- a/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping
+++ b/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping
@@ -44,6 +44,7 @@ CLASS net/minecraft/unmapped/C_wpearmnv net/minecraft/block/entity/PistonBlockEn
 		ARG 0 box1
 		ARG 1 direction
 		ARG 2 box2
+	METHOD m_hjvaaomv getExtensionDirection ()Lnet/minecraft/unmapped/C_xpuuihxf;
 	METHOD m_hlnudkkk isMovingHoneyBlock ()Z
 	METHOD m_hsrsrqug getCollisionShape (Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_zscvhwbd;
 		ARG 1 world
diff --git a/mappings/net/minecraft/block/entity/VaultBlockEntity.mapping b/mappings/net/minecraft/block/entity/VaultBlockEntity.mapping
deleted file mode 100644
index c92b5fef10..0000000000
--- a/mappings/net/minecraft/block/entity/VaultBlockEntity.mapping
+++ /dev/null
@@ -1 +0,0 @@
-CLASS net/minecraft/unmapped/C_xclnoluc net/minecraft/block/entity/VaultBlockEntity
diff --git a/mappings/net/minecraft/block/entity/vault/VaultBlockEntity.mapping b/mappings/net/minecraft/block/entity/vault/VaultBlockEntity.mapping
new file mode 100644
index 0000000000..0cf1a105a1
--- /dev/null
+++ b/mappings/net/minecraft/block/entity/vault/VaultBlockEntity.mapping
@@ -0,0 +1,79 @@
+CLASS net/minecraft/unmapped/C_xclnoluc net/minecraft/block/entity/vault/VaultBlockEntity
+	FIELD f_obqunrna sharedData Lnet/minecraft/unmapped/C_czyoqmgb;
+	FIELD f_rckgphgi clientData Lnet/minecraft/unmapped/C_gyznndxk;
+	FIELD f_uordyfhu serverData Lnet/minecraft/unmapped/C_nsbycoiv;
+	FIELD f_yeczrayj config Lnet/minecraft/unmapped/C_cudfnjix;
+	METHOD m_aqgrjwek (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lnet/minecraft/unmapped/C_hhlwcnih;)V
+		ARG 2 nbt
+	METHOD m_bmrroywl getServerData ()Lnet/minecraft/unmapped/C_nsbycoiv;
+	METHOD m_ksmzflqf getSharedData ()Lnet/minecraft/unmapped/C_czyoqmgb;
+	METHOD m_pdkrtrkx toNbt (Lcom/mojang/serialization/Codec;Ljava/lang/Object;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_oivssbvb;
+		ARG 1 object
+		ARG 2 provider
+	METHOD m_sxksvmgb getConfig ()Lnet/minecraft/unmapped/C_cudfnjix;
+	METHOD m_xqjhnghf setConfig (Lnet/minecraft/unmapped/C_cudfnjix;)V
+		ARG 1 config
+	METHOD m_yvksvmlr getClientData ()Lnet/minecraft/unmapped/C_gyznndxk;
+	CLASS C_qktdibgk Client
+		FIELD f_bzouoldc ACTIVATION_PARTICLE_COUNT I
+		FIELD f_fsaupncd DEACTIVATION_PARTICLE_COUNT I
+		FIELD f_gaqeqnvc PARTICLE_TICK_RATE I
+		FIELD f_vbjguwjg IDLE_PARTICLE_CHANCE F
+		FIELD f_wafgtbgz AMBIENT_SOUND_CHANCE F
+		METHOD m_brlxwfpp isWithinConnectionRange (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_czyoqmgb;Lnet/minecraft/unmapped/C_jzrpycqo;)Z
+			ARG 1 sharedData
+		METHOD m_bwknapnq shouldDisplayItems (Lnet/minecraft/unmapped/C_czyoqmgb;)Z
+			ARG 0 sharedData
+		METHOD m_foedtuhf emitIdleParticles (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_czyoqmgb;Lnet/minecraft/unmapped/C_nqucohct;)V
+			ARG 3 effect
+		METHOD m_gognnvjb tick (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_gyznndxk;Lnet/minecraft/unmapped/C_czyoqmgb;)V
+			ARG 3 clientData
+			ARG 4 sharedData
+		METHOD m_hhgictcy playIdleSounds (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_czyoqmgb;)V
+		METHOD m_hqwddzvl emitActivationParticles (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_czyoqmgb;Lnet/minecraft/unmapped/C_nqucohct;)V
+			ARG 4 effect
+		METHOD m_jpksxuil getRandomCentralPosition (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_rlomrsco;)Lnet/minecraft/unmapped/C_vgpupfxx;
+		METHOD m_sjbrqyhj getKeyholePosition (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_vgpupfxx;
+		METHOD m_stanxzly getRandomInternalPosition (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_rlomrsco;)Lnet/minecraft/unmapped/C_vgpupfxx;
+		METHOD m_tmcqsnlz emitConnectionParticles (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_czyoqmgb;)V
+			ARG 3 sharedData
+		METHOD m_vclomjjx emitDeactivationParticles (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_nqucohct;)V
+			ARG 2 effect
+		METHOD m_xjgorkip emitConnectionParticles (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_jzrpycqo;)V
+			ARG 1 pos
+	CLASS C_vucktnfd Server
+		FIELD f_ttiayxfe INSERT_FAIL_SOUND_BUFFER_TICKS I
+		FIELD f_zjstwohq DISPLAY_CYCLE_RATE I
+		FIELD f_zudiweuu UNLOCKING_DELAY_TICKS I
+		METHOD m_cwaktlsr shouldCycleDisplayItem (JLnet/minecraft/unmapped/C_oocnpsfc;)Z
+			ARG 0 tick
+			ARG 2 state
+		METHOD m_fayzavvf playFailedInsertionSound (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_nsbycoiv;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_avavozay;)V
+			ARG 1 data
+			ARG 3 sound
+		METHOD m_qebtjepa canUnlock (Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_sddaxwyk;)Z
+			ARG 0 config
+		METHOD m_quliyibc cycleDisplayItem (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_oocnpsfc;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_czyoqmgb;Lnet/minecraft/unmapped/C_hynzadkk;)V
+			ARG 1 state
+			ARG 2 config
+			ARG 3 sharedData
+		METHOD m_rlrwoomb getEjectionItems (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;)Ljava/util/List;
+			ARG 1 config
+		METHOD m_suqfgtrx tick (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_nsbycoiv;Lnet/minecraft/unmapped/C_czyoqmgb;)V
+			ARG 3 config
+			ARG 4 serverData
+			ARG 5 sharedData
+		METHOD m_tgurfdgk unlock (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_nsbycoiv;Lnet/minecraft/unmapped/C_czyoqmgb;Ljava/util/List;)V
+			ARG 4 serverData
+		METHOD m_tlposeev setVaultState (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_czyoqmgb;)V
+			ARG 2 old
+			ARG 3 newState
+			ARG 4 config
+			ARG 5 sharedData
+		METHOD m_tvelqevn canEject (Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_oocnpsfc;)Z
+			ARG 0 config
+			ARG 1 state
+		METHOD m_vsawgyip getRandomDisplayItem (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_sddaxwyk;
+		METHOD m_vseniggs tryInsertKey (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_nsbycoiv;Lnet/minecraft/unmapped/C_czyoqmgb;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_sddaxwyk;)V
+			ARG 3 config
+			ARG 4 serverData
diff --git a/mappings/net/minecraft/block/entity/vault/VaultClientData.mapping b/mappings/net/minecraft/block/entity/vault/VaultClientData.mapping
new file mode 100644
index 0000000000..2812871f68
--- /dev/null
+++ b/mappings/net/minecraft/block/entity/vault/VaultClientData.mapping
@@ -0,0 +1,7 @@
+CLASS net/minecraft/unmapped/C_gyznndxk net/minecraft/block/entity/vault/VaultClientData
+	FIELD f_afcpyqze previousSpin F
+	FIELD f_bflpzmfj ROTATION_SPEED F
+	FIELD f_scdptokm currentSpin F
+	METHOD m_galflnte getCurrentSpin ()F
+	METHOD m_jzjpevbj updateSpin ()V
+	METHOD m_lpfqwfru getPreviousSpin ()F
diff --git a/mappings/net/minecraft/block/entity/vault/VaultConfig.mapping b/mappings/net/minecraft/block/entity/vault/VaultConfig.mapping
new file mode 100644
index 0000000000..3da89dab10
--- /dev/null
+++ b/mappings/net/minecraft/block/entity/vault/VaultConfig.mapping
@@ -0,0 +1,8 @@
+CLASS net/minecraft/unmapped/C_cudfnjix net/minecraft/block/entity/vault/VaultConfig
+	FIELD f_kseddngr codec Lcom/mojang/serialization/Codec;
+	FIELD f_nnpabhvn KEY Ljava/lang/String;
+	FIELD f_onpeyrnl defaultConfig Lnet/minecraft/unmapped/C_cudfnjix;
+	METHOD m_gwbttbvm detector ()Lnet/minecraft/unmapped/C_kkiexczn;
+	METHOD m_ldmpgmnp validate ()Lcom/mojang/serialization/DataResult;
+	METHOD m_yyvymusl (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 0 instance
diff --git a/mappings/net/minecraft/block/entity/vault/VaultServerData.mapping b/mappings/net/minecraft/block/entity/vault/VaultServerData.mapping
new file mode 100644
index 0000000000..3ee12eca3a
--- /dev/null
+++ b/mappings/net/minecraft/block/entity/vault/VaultServerData.mapping
@@ -0,0 +1,41 @@
+CLASS net/minecraft/unmapped/C_nsbycoiv net/minecraft/block/entity/vault/VaultServerData
+	FIELD f_bzryaxno itemsToEject Ljava/util/List;
+	FIELD f_gdjgafzz lastFailedInsertTime J
+	FIELD f_pymjabqb stateUpdatingResumesTime J
+	FIELD f_sngaxqvz KEY Ljava/lang/String;
+	FIELD f_taqrjfhn rewardedPlayers Ljava/util/Set;
+	FIELD f_xkrqkjsi totalEjectionsNeeded I
+	FIELD f_ygjbyfsp MAX_REWARDED_PLAYERS I
+	FIELD f_zbsyqpyj dirty Z
+	METHOD <init> (Ljava/util/Set;JLjava/util/List;I)V
+		ARG 1 rewardedPlayers
+		ARG 4 itemsToEject
+	METHOD m_berunhjy copy (Lnet/minecraft/unmapped/C_nsbycoiv;)V
+		ARG 1 data
+	METHOD m_bfphmijp (Lnet/minecraft/unmapped/C_nsbycoiv;)Ljava/util/List;
+		ARG 0 data
+	METHOD m_cklpjupn finishedEjecting ()V
+	METHOD m_dvsjcliz setLastFailedInsertTime (J)V
+		ARG 1 lastFailedInsertTime
+	METHOD m_exoybmys getItemsToEject ()Ljava/util/List;
+	METHOD m_ftzafxcc hasRewarded (Lnet/minecraft/unmapped/C_jzrpycqo;)Z
+	METHOD m_hklwoidq getEjectionProgress ()F
+	METHOD m_ilczptyg (Lnet/minecraft/unmapped/C_nsbycoiv;)Ljava/util/Set;
+		ARG 0 data
+	METHOD m_jkvzabvv getRewardedPlayers ()Ljava/util/Set;
+	METHOD m_qxrhizbg setItemsToEject (Ljava/util/List;)V
+		ARG 1 items
+	METHOD m_rcabptrw getLastFailedInsertTime ()J
+	METHOD m_rgnbkaxh removeNextItemToEject ()Lnet/minecraft/unmapped/C_sddaxwyk;
+	METHOD m_tluakpxm pauseUpdatingUntil (J)V
+		ARG 1 time
+	METHOD m_usfuetff getStateUpdatingResumesAt ()J
+	METHOD m_uttfywbv (Lnet/minecraft/unmapped/C_nsbycoiv;)Ljava/lang/Integer;
+		ARG 0 data
+	METHOD m_vptzlleh getNextTimeToEject ()Lnet/minecraft/unmapped/C_sddaxwyk;
+	METHOD m_wryxeuot markDirty ()V
+	METHOD m_ysqmopma rewardPlayer (Lnet/minecraft/unmapped/C_jzrpycqo;)V
+	METHOD m_yuntwclu (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 0 instance
+	METHOD m_zjcsyotz (Lnet/minecraft/unmapped/C_nsbycoiv;)Ljava/lang/Long;
+		ARG 0 data
diff --git a/mappings/net/minecraft/block/entity/vault/VaultSharedData.mapping b/mappings/net/minecraft/block/entity/vault/VaultSharedData.mapping
new file mode 100644
index 0000000000..496b0b3aa7
--- /dev/null
+++ b/mappings/net/minecraft/block/entity/vault/VaultSharedData.mapping
@@ -0,0 +1,28 @@
+CLASS net/minecraft/unmapped/C_czyoqmgb net/minecraft/block/entity/vault/VaultSharedData
+	FIELD f_mliqmozs connectedParticlesRange D
+	FIELD f_nflhrcpi connectedPlayers Ljava/util/Set;
+	FIELD f_szcuyrxa displayItem Lnet/minecraft/unmapped/C_sddaxwyk;
+	FIELD f_vnlciovk KEY Ljava/lang/String;
+	FIELD f_vrgluckt dirty Z
+	METHOD <init> (Lnet/minecraft/unmapped/C_sddaxwyk;Ljava/util/Set;D)V
+		ARG 2 connectedPlayers
+	METHOD m_cpnwuyzj (Lnet/minecraft/unmapped/C_czyoqmgb;)Lnet/minecraft/unmapped/C_sddaxwyk;
+		ARG 0 data
+	METHOD m_etwnnbjc (Lnet/minecraft/unmapped/C_czyoqmgb;)Ljava/lang/Double;
+		ARG 0 data
+	METHOD m_fgrehwcs (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 0 instance
+	METHOD m_hazdghto setDisplayTime (Lnet/minecraft/unmapped/C_sddaxwyk;)V
+	METHOD m_jamphmeb hasConnectedPlayers ()Z
+	METHOD m_luvxvvfe markDirty ()V
+	METHOD m_peidteny getDisplayItem ()Lnet/minecraft/unmapped/C_sddaxwyk;
+	METHOD m_pudnftib (Lnet/minecraft/unmapped/C_czyoqmgb;)Ljava/util/Set;
+		ARG 0 data
+	METHOD m_pvggzzmu getConnectedParticlesRange ()D
+	METHOD m_qkfeblad copy (Lnet/minecraft/unmapped/C_czyoqmgb;)V
+		ARG 1 data
+	METHOD m_tbrsykxh getConnectedPlayers ()Ljava/util/Set;
+	METHOD m_uflgzskl updateConnectedPlayers (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_nsbycoiv;Lnet/minecraft/unmapped/C_cudfnjix;D)V
+		ARG 3 serverData
+		ARG 4 config
+	METHOD m_urrekdhr hasDisplayItem ()Z
diff --git a/mappings/net/minecraft/block/enums/RailShape.mapping b/mappings/net/minecraft/block/enums/RailShape.mapping
index 1d9ab0881a..5c512055af 100644
--- a/mappings/net/minecraft/block/enums/RailShape.mapping
+++ b/mappings/net/minecraft/block/enums/RailShape.mapping
@@ -3,3 +3,4 @@ CLASS net/minecraft/unmapped/C_wqmdpcsg net/minecraft/block/enums/RailShape
 	METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
 		ARG 3 name
 	METHOD m_jkvgcdyi getName ()Ljava/lang/String;
+	METHOD m_pgjcepuq isAscending ()Z
diff --git a/mappings/net/minecraft/block/enums/VaultState.mapping b/mappings/net/minecraft/block/enums/VaultState.mapping
index f7be440462..b7a58269f3 100644
--- a/mappings/net/minecraft/block/enums/VaultState.mapping
+++ b/mappings/net/minecraft/block/enums/VaultState.mapping
@@ -1,9 +1,30 @@
 CLASS net/minecraft/unmapped/C_oocnpsfc net/minecraft/block/enums/VaultState
-	METHOD m_ekopnsum (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_nsbycoiv;Lnet/minecraft/unmapped/C_czyoqmgb;D)Lnet/minecraft/unmapped/C_oocnpsfc;
+	FIELD f_buwylsjr lightLevel Lnet/minecraft/unmapped/C_oocnpsfc$C_pxwqlhgg;
+	FIELD f_fuzvquig UPDATE_CONNECTED_PLAYERS_RATE I
+	FIELD f_kgtlpqca DELAY_BETWEEN_EJECTIONS I
+	FIELD f_mwvnuftv DELAY_AFTER_LAST_EJECTION I
+	FIELD f_qvnkkvgz DELAY_BEFORE_FIRST_EJECTION I
+	FIELD f_tknehqen name Ljava/lang/String;
+	METHOD m_ekopnsum checkConnectedPlayers (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_nsbycoiv;Lnet/minecraft/unmapped/C_czyoqmgb;D)Lnet/minecraft/unmapped/C_oocnpsfc;
 		ARG 0 world
-	METHOD m_mecavbto (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_oocnpsfc;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_czyoqmgb;Z)V
+		ARG 4 sharedData
+	METHOD m_mecavbto transitionTo (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_oocnpsfc;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_czyoqmgb;Z)V
 		ARG 1 world
 		ARG 3 vaultState
+		ARG 4 config
+		ARG 5 data
+		ARG 6 ominous
 	METHOD m_mrmtyngy getLightLevel ()I
+	METHOD m_nqdxtdvx exit (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_czyoqmgb;)V
+		ARG 3 config
+		ARG 4 data
+	METHOD m_pjcjyvtm getNextState (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_nsbycoiv;Lnet/minecraft/unmapped/C_czyoqmgb;)Lnet/minecraft/unmapped/C_oocnpsfc;
+		ARG 5 sharedData
+	METHOD m_pqwuptlz ejectItem (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_sddaxwyk;F)V
+		ARG 4 ejectionProgress
+	METHOD m_ursykhkw enter (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_czyoqmgb;Z)V
+		ARG 3 config
+		ARG 4 data
+		ARG 5 ominous
 	CLASS C_pxwqlhgg LightLevel
 		FIELD f_rfntbxfm luminance I
diff --git a/mappings/net/minecraft/feature_flags/FeatureFlags.mapping b/mappings/net/minecraft/feature_flags/FeatureFlags.mapping
index 875e4be814..2b51b90638 100644
--- a/mappings/net/minecraft/feature_flags/FeatureFlags.mapping
+++ b/mappings/net/minecraft/feature_flags/FeatureFlags.mapping
@@ -1,7 +1,9 @@
 CLASS net/minecraft/unmapped/C_ozbmlrmw net/minecraft/feature_flags/FeatureFlags
+	FIELD f_bgdekufs MINECART_IMPROVEMENTS Lnet/minecraft/unmapped/C_kksdgidr;
 	FIELD f_frgxzoxk BUNDLE Lnet/minecraft/unmapped/C_kksdgidr;
 	FIELD f_gouzolrt DEFAULT_SET Lnet/minecraft/unmapped/C_czxxrbcp;
 	FIELD f_lwmwbyqg VANILLA_SET Lnet/minecraft/unmapped/C_czxxrbcp;
+	FIELD f_ttbawmfh REDSTONE_EXPERIMENTS Lnet/minecraft/unmapped/C_kksdgidr;
 	FIELD f_vgooiicl VANILLA Lnet/minecraft/unmapped/C_kksdgidr;
 	FIELD f_xstdghyj MAIN_REGISTRY Lnet/minecraft/unmapped/C_asecsefi;
 	FIELD f_xtedwgza TRADE_REBALANCE Lnet/minecraft/unmapped/C_kksdgidr;
diff --git a/mappings/net/minecraft/util/ActionResult.mapping b/mappings/net/minecraft/util/ActionResult.mapping
index 18732320d6..be508fdb04 100644
--- a/mappings/net/minecraft/util/ActionResult.mapping
+++ b/mappings/net/minecraft/util/ActionResult.mapping
@@ -5,6 +5,8 @@ CLASS net/minecraft/unmapped/C_ozuepbyj net/minecraft/util/ActionResult
 	FIELD f_mftskueb PASS Lnet/minecraft/unmapped/C_ozuepbyj$C_vcazubxu;
 		COMMENT Indicates an action is not performed but allows other actions to
 		COMMENT perform.
+	FIELD f_nwhanehc EMPTY_HAND Lnet/minecraft/unmapped/C_ozuepbyj$C_rtqygjoo;
+	FIELD f_pkwbrwkg SUCCESS_SERVER Lnet/minecraft/unmapped/C_ozuepbyj$C_wrerqibd;
 	FIELD f_qcdideat FAIL Lnet/minecraft/unmapped/C_ozuepbyj$C_xvqtmovy;
 		COMMENT Indicates that an action is not performed and prevents other actions
 		COMMENT from performing.
@@ -13,3 +15,15 @@ CLASS net/minecraft/unmapped/C_ozuepbyj net/minecraft/util/ActionResult
 		COMMENT performance.
 	METHOD m_sinzsyip isAccepted ()Z
 		COMMENT Returns whether an action is performed.
+	CLASS C_rtqygjoo EmptyHand
+	CLASS C_txdhdamv HeldItemTransformation
+		FIELD f_aoyznota consume Lnet/minecraft/unmapped/C_ozuepbyj$C_txdhdamv;
+		FIELD f_wcldlwsf none Lnet/minecraft/unmapped/C_ozuepbyj$C_txdhdamv;
+	CLASS C_vcazubxu Pass
+	CLASS C_wrerqibd Success
+		METHOD m_glxhngrt withoutStack ()Lnet/minecraft/unmapped/C_ozuepbyj$C_wrerqibd;
+		METHOD m_lhajzrla heldItemTransformedTo ()Lnet/minecraft/unmapped/C_sddaxwyk;
+		METHOD m_qcetjwqk wasItemInteraction ()Z
+		METHOD m_wnzfvbid withTransformedStack (Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj$C_wrerqibd;
+	CLASS C_xkenowvt Source
+	CLASS C_xvqtmovy Fail
diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping
index 7d829e1334..f1b938907b 100644
--- a/mappings/net/minecraft/world/World.mapping
+++ b/mappings/net/minecraft/world/World.mapping
@@ -71,6 +71,7 @@ CLASS net/minecraft/unmapped/C_cdctfzbn net/minecraft/world/World
 		ARG 1 pos
 		ARG 2 entity
 		ARG 3 direction
+	METHOD m_cgohzhbh getFuelTimes ()Lnet/minecraft/unmapped/C_smdnyqwx;
 	METHOD m_cibeiktq playSound (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_avavozay;Lnet/minecraft/unmapped/C_pqzizukq;FF)V
 		ARG 1 entity
 		ARG 3 sound
diff --git a/mappings/net/minecraft/world/logic/ExperimentalRedstoneUtil.mapping b/mappings/net/minecraft/world/logic/ExperimentalRedstoneUtil.mapping
new file mode 100644
index 0000000000..77df57e599
--- /dev/null
+++ b/mappings/net/minecraft/world/logic/ExperimentalRedstoneUtil.mapping
@@ -0,0 +1,6 @@
+CLASS net/minecraft/unmapped/C_psmtqbgv net/minecraft/world/logic/ExperimentalRedstoneUtil
+	METHOD m_rgctexqu withFrom (Lnet/minecraft/unmapped/C_ctatbkvy;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_ctatbkvy;
+		ARG 0 orientation
+	METHOD m_tsbkkwwq initialOrientation (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_ctatbkvy;
+		ARG 1 front
+		ARG 2 up
diff --git a/mappings/net/minecraft/world/logic/Orientation.mapping b/mappings/net/minecraft/world/logic/Orientation.mapping
new file mode 100644
index 0000000000..e65ad53b79
--- /dev/null
+++ b/mappings/net/minecraft/world/logic/Orientation.mapping
@@ -0,0 +1,42 @@
+CLASS net/minecraft/unmapped/C_ctatbkvy net/minecraft/world/logic/Orientation
+	FIELD f_avakgxvv withFront Ljava/util/Map;
+	FIELD f_fhogeywa up Lnet/minecraft/unmapped/C_xpuuihxf;
+	FIELD f_jhbggyum verticalNeighbors Ljava/util/List;
+	FIELD f_kmncjkkk CACHE [Lnet/minecraft/unmapped/C_ctatbkvy;
+	FIELD f_ljedphah side Lnet/minecraft/unmapped/C_xpuuihxf;
+	FIELD f_mjyggsau bias Lnet/minecraft/unmapped/C_ctatbkvy$C_ugxzsetw;
+	FIELD f_rgdwgbkg withBias Ljava/util/Map;
+	FIELD f_thbclckv withUp Ljava/util/Map;
+	FIELD f_ublfpmzj horizontalNeighbors Ljava/util/List;
+	FIELD f_ucwpcred front Lnet/minecraft/unmapped/C_xpuuihxf;
+	FIELD f_unmshwvq neighbors Ljava/util/List;
+	FIELD f_vikofocg index I
+	METHOD m_adhqcarj getUp ()Lnet/minecraft/unmapped/C_xpuuihxf;
+	METHOD m_bzfueucy getHorizontalNeighbors ()Ljava/util/List;
+	METHOD m_ceostjis of (Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_ctatbkvy$C_ugxzsetw;)Lnet/minecraft/unmapped/C_ctatbkvy;
+	METHOD m_ebqcuxva withFrontPreserveUp (Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_ctatbkvy;
+	METHOD m_ennnjbdo fromIndex (I)Lnet/minecraft/unmapped/C_ctatbkvy;
+		ARG 0 i
+	METHOD m_fgyxqbmz getIndex ()I
+	METHOD m_fqnuqovh random (Lnet/minecraft/unmapped/C_rlomrsco;)Lnet/minecraft/unmapped/C_ctatbkvy;
+	METHOD m_ifqqcsgt getVerticalNeighbors ()Ljava/util/List;
+	METHOD m_lnhidaat getBias ()Lnet/minecraft/unmapped/C_ctatbkvy$C_ugxzsetw;
+	METHOD m_mwludmnc generateIndex (Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_ctatbkvy$C_ugxzsetw;)I
+		ARG 0 up
+		ARG 1 front
+		ARG 2 bias
+	METHOD m_nvoxpxko withUp (Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_ctatbkvy;
+	METHOD m_pobsyssp withFront (Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_ctatbkvy;
+	METHOD m_ritocpgk getSide ()Lnet/minecraft/unmapped/C_xpuuihxf;
+	METHOD m_sgxvutmx getNeighbors ()Ljava/util/List;
+	METHOD m_vbdatnxf generateContext (Lnet/minecraft/unmapped/C_ctatbkvy;[Lnet/minecraft/unmapped/C_ctatbkvy;)Lnet/minecraft/unmapped/C_ctatbkvy;
+		ARG 0 seed
+		ARG 1 orientations
+	METHOD m_wvtsixzb withFrontAdjustBias (Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_ctatbkvy;
+	METHOD m_xmepnwzw getFront ()Lnet/minecraft/unmapped/C_xpuuihxf;
+	METHOD m_xybpsrhj withBias (Lnet/minecraft/unmapped/C_ctatbkvy$C_ugxzsetw;)Lnet/minecraft/unmapped/C_ctatbkvy;
+		ARG 1 bias
+	METHOD m_yqnspsre mirror ()Lnet/minecraft/unmapped/C_ctatbkvy;
+	CLASS C_ugxzsetw Bias
+		FIELD f_odkfbnfz name Ljava/lang/String;
+		METHOD m_uvekbdxo getOpposite ()Lnet/minecraft/unmapped/C_ctatbkvy$C_ugxzsetw;
diff --git a/mappings/net/minecraft/world/logic/RedstoneController.mapping b/mappings/net/minecraft/world/logic/RedstoneController.mapping
new file mode 100644
index 0000000000..a0ca813aca
--- /dev/null
+++ b/mappings/net/minecraft/world/logic/RedstoneController.mapping
@@ -0,0 +1,4 @@
+CLASS net/minecraft/unmapped/C_lakkobyv net/minecraft/world/logic/RedstoneController
+	FIELD f_kvsgrvrs block Lnet/minecraft/unmapped/C_hbdlqish;
+	METHOD <init> (Lnet/minecraft/unmapped/C_hbdlqish;)V
+		ARG 1 block
diff --git a/unpick-definitions/set_block_state_flags.unpick b/unpick-definitions/set_block_state_flags.unpick
index d1ae7d5485..1c481401bf 100644
--- a/unpick-definitions/set_block_state_flags.unpick
+++ b/unpick-definitions/set_block_state_flags.unpick
@@ -8,6 +8,7 @@ flag set_block_state_flags net/minecraft/block/Block REDRAW_ON_MAIN_THREAD
 flag set_block_state_flags net/minecraft/block/Block FORCE_STATE
 flag set_block_state_flags net/minecraft/block/Block SKIP_DROPS
 flag set_block_state_flags net/minecraft/block/Block MOVED
+flag set_block_state_flags net/minecraft/block/Block SKIP_UPDATE_FOR_REDSTONE_WIRE
 
 target_method net/minecraft/world/ModifiableWorld setBlockState (Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;I)Z
 	param 2 set_block_state_flags