diff --git a/mappings/net/minecraft/block/BambooBlock.mapping b/mappings/net/minecraft/block/BambooBlock.mapping
index 862b828b7d..f1fd97917f 100644
--- a/mappings/net/minecraft/block/BambooBlock.mapping
+++ b/mappings/net/minecraft/block/BambooBlock.mapping
@@ -39,7 +39,7 @@ CLASS bgb net/minecraft/block/BambooBlock
 		ARG 6 neighborPos
 	METHOD a appendProperties (Lbpn$a;)V
 		ARG 1 builder
-	METHOD a_ (Lbpm;Lbbb;Let;)Z
+	METHOD a_ isWaterLogged (Lbpm;Lbbb;Let;)Z
 		ARG 1 state
 		ARG 2 view
 		ARG 3 pos
diff --git a/mappings/net/minecraft/block/BarrierBlock.mapping b/mappings/net/minecraft/block/BarrierBlock.mapping
index 44b28a89ac..99a8b08817 100644
--- a/mappings/net/minecraft/block/BarrierBlock.mapping
+++ b/mappings/net/minecraft/block/BarrierBlock.mapping
@@ -1,7 +1,7 @@
 CLASS bgf net/minecraft/block/BarrierBlock
 	METHOD <init> (Lbgs$c;)V
 		ARG 1 settings
-	METHOD a_ (Lbpm;Lbbb;Let;)Z
+	METHOD a_ isWaterLogged (Lbpm;Lbbb;Let;)Z
 		ARG 1 state
 		ARG 2 view
 		ARG 3 pos
diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping
index 50c0332046..78fecf3a1a 100644
--- a/mappings/net/minecraft/block/Block.mapping
+++ b/mappings/net/minecraft/block/Block.mapping
@@ -9,6 +9,7 @@ CLASS bgs net/minecraft/block/Block
 			ARG 3 facing
 		METHOD equals (Ljava/lang/Object;)Z
 			ARG 1 o
+			ARG 2 neighborGroup
 	CLASS bgs$b OffsetType
 		FIELD a NONE Lbgs$b;
 		FIELD b XZ Lbgs$b;
@@ -38,6 +39,7 @@ CLASS bgs net/minecraft/block/Block
 			ARG 1 luminance
 		METHOD a copy (Lbgs;)Lbgs$c;
 			ARG 0 source
+			ARG 1 settings
 		METHOD a sounds (Lblt;)Lbgs$c;
 			ARG 1 soundGroup
 		METHOD a of (Lcfh;)Lbgs$c;
@@ -76,6 +78,7 @@ CLASS bgs net/minecraft/block/Block
 	FIELD v collidable Z
 	METHOD <init> (Lbgs$c;)V
 		ARG 1 settings
+		ARG 2 stateBuilder
 	METHOD a canMobSpawnInside ()Z
 	METHOD a createCubeShape (DDDDDD)Lcmx;
 		ARG 0 xMin
@@ -86,6 +89,7 @@ CLASS bgs net/minecraft/block/Block
 		ARG 10 zMax
 	METHOD a getStateFromRawId (I)Lbpm;
 		ARG 0 stateId
+		ARG 1 state
 	METHOD a getPlacementState (Laus;)Lbpm;
 		ARG 1 ctx
 	METHOD a addStacksForDisplay (Lavg;Lfh;)V
@@ -113,6 +117,7 @@ CLASS bgs net/minecraft/block/Block
 		ARG 3 pos
 		ARG 4 state
 		ARG 5 blockEntity
+		ARG 6 stack
 	METHOD a dropExperience (Lbbp;Let;I)V
 		ARG 1 world
 		ARG 2 pos
@@ -139,6 +144,7 @@ CLASS bgs net/minecraft/block/Block
 		ARG 2 pos
 		ARG 3 state
 		ARG 4 placer
+		ARG 5 itemStack
 	METHOD a onBreak (Lbbp;Let;Lbpm;Larb;)V
 		ARG 1 world
 		ARG 2 pos
@@ -162,6 +168,8 @@ CLASS bgs net/minecraft/block/Block
 		ARG 2 player
 		ARG 3 world
 		ARG 4 pos
+		ARG 5 hardness
+		ARG 6 efficiency
 	METHOD a (Lbpm;Laus;)Z
 		ARG 1 state
 		ARG 2 ctx
@@ -254,6 +262,8 @@ CLASS bgs net/minecraft/block/Block
 		ARG 2 pos
 		ARG 3 from
 		ARG 4 to
+		ARG 5 initalResult
+		ARG 6 perciceResult
 	METHOD a randomDisplayTick (Lbpm;Lbbp;Let;Ljava/util/Random;)V
 		ARG 1 state
 		ARG 2 world
@@ -279,19 +289,25 @@ CLASS bgs net/minecraft/block/Block
 		ARG 1 otherState
 		ARG 2 world
 		ARG 3 pos
+		ARG 4 shape
+		ARG 5 visibleEntities
 	METHOD a replaceBlock (Lbpm;Lbpm;Lbbq;Let;I)V
 		ARG 0 state
 		ARG 1 newState
 		ARG 2 world
 		ARG 3 pos
 		ARG 4 flags
-	METHOD a (Lbpm;Lbpm;Ley;)Z
+	METHOD a isSideVisible (Lbpm;Lbpm;Ley;)Z
 		ARG 1 state
 		ARG 2 neighbor
 		ARG 3 facing
 	METHOD a getDroppedStacks (Lbpm;Lciv$a;)Ljava/util/List;
 		ARG 1 state
 		ARG 2 builder
+		ARG 3 dropIdentifier
+		ARG 4 lootContext
+		ARG 5 world
+		ARG 6 lootSupplier
 	METHOD a getRenderingSeed (Lbpm;Let;)J
 		ARG 1 state
 		ARG 2 pos
@@ -307,6 +323,7 @@ CLASS bgs net/minecraft/block/Block
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 blockEntity
+		ARG 4 lootBuilder
 	METHOD a getDroppedStacks (Lbpm;Luq;Let;Lbnq;Lagv;Lawo;)Ljava/util/List;
 		ARG 0 state
 		ARG 1 world
@@ -314,6 +331,7 @@ CLASS bgs net/minecraft/block/Block
 		ARG 3 blockEntity
 		ARG 4 entity
 		ARG 5 stack
+		ARG 6 lootBuilder
 	METHOD a appendProperties (Lbpn$a;)V
 		ARG 1 builder
 	METHOD a isShapeFullCube (Lcmx;)Z
@@ -321,9 +339,10 @@ CLASS bgs net/minecraft/block/Block
 	METHOD a isFaceFullCube (Lcmx;Ley;)Z
 		ARG 0 shape
 		ARG 1 facing
+		ARG 2 faceShape
 	METHOD a matches (Lye;)Z
 		ARG 1 tag
-	METHOD a_ (Lbpm;Lbbb;Let;)Z
+	METHOD a_ isWaterLogged (Lbpm;Lbbb;Let;)Z
 		ARG 1 state
 		ARG 2 view
 		ARG 3 pos
@@ -350,6 +369,7 @@ CLASS bgs net/minecraft/block/Block
 		ARG 0 state
 		ARG 1 world
 		ARG 2 pos
+		ARG 4 mutablePos
 	METHOD b (Lbpm;Lbbq;Let;I)V
 		ARG 1 state
 		ARG 2 world
@@ -358,6 +378,8 @@ CLASS bgs net/minecraft/block/Block
 	METHOD b dropStacks (Lbpm;Lciv$a;)V
 		ARG 0 state
 		ARG 1 builder
+		ARG 2 world
+		ARG 3 position
 	METHOD c getRenderLayer ()Lbbc;
 	METHOD c onRainTick (Lbbp;Let;)V
 		ARG 1 world
@@ -375,6 +397,11 @@ CLASS bgs net/minecraft/block/Block
 		ARG 1 view
 		ARG 2 pos
 		ARG 3 facing
+		ARG 4 otherPos
+		ARG 5 otherState
+		ARG 6 neighborGroup
+		ARG 9 shape
+		ARG 10 otherShape
 	METHOD c randomTick (Lbpm;Lbbp;Let;Ljava/util/Random;)V
 		ARG 1 world
 		ARG 2 state
@@ -422,6 +449,7 @@ CLASS bgs net/minecraft/block/Block
 		ARG 2 view
 		ARG 3 pos
 	METHOD j getDropTableId ()Lqc;
+		ARG 1 blockIdentifier
 	METHOD j getPistonBehavior (Lbpm;)Lcfj;
 		ARG 1 state
 	METHOD j getHardness (Lbpm;Lbbb;Let;)F
@@ -436,6 +464,7 @@ CLASS bgs net/minecraft/block/Block
 	METHOD l getTextComponent ()Ljd;
 	METHOD l getRawIdFromState (Lbpm;)I
 		ARG 0 state
+		ARG 1 rawId
 	METHOD l (Lbpm;Lbbb;Let;)Lcmx;
 		ARG 1 state
 		ARG 2 view
@@ -454,6 +483,8 @@ CLASS bgs net/minecraft/block/Block
 		ARG 1 state
 		ARG 2 view
 		ARG 3 pos
+		ARG 4 fullCube
+		ARG 5 shape
 	METHOD o getStateFactory ()Lbpn;
 	METHOD o (Lbpm;)Z
 		ARG 1 state
@@ -474,3 +505,6 @@ CLASS bgs net/minecraft/block/Block
 	METHOD q getOffsetPos (Lbpm;Lbbb;Let;)Lcmd;
 		ARG 1 state
 		ARG 2 view
+		ARG 3 blockPos
+		ARG 4 offsetType
+		ARG 5 psudoRandomValue
diff --git a/mappings/net/minecraft/block/ConnectedPlantBlock.mapping b/mappings/net/minecraft/block/ConnectedPlantBlock.mapping
index f0c78a4bd6..7e15aec18d 100644
--- a/mappings/net/minecraft/block/ConnectedPlantBlock.mapping
+++ b/mappings/net/minecraft/block/ConnectedPlantBlock.mapping
@@ -11,7 +11,7 @@ CLASS bkj net/minecraft/block/ConnectedPlantBlock
 		ARG 1 state
 		ARG 2 view
 		ARG 3 pos
-	METHOD a_ (Lbpm;Lbbb;Let;)Z
+	METHOD a_ isWaterLogged (Lbpm;Lbbb;Let;)Z
 		ARG 1 state
 		ARG 2 view
 		ARG 3 pos
diff --git a/mappings/net/minecraft/block/FluidBlock.mapping b/mappings/net/minecraft/block/FluidBlock.mapping
index 8f3b837ee4..629caf9fef 100644
--- a/mappings/net/minecraft/block/FluidBlock.mapping
+++ b/mappings/net/minecraft/block/FluidBlock.mapping
@@ -21,7 +21,7 @@ CLASS bjv net/minecraft/block/FluidBlock
 		ARG 2 world
 		ARG 3 pos
 		ARG 4 oldState
-	METHOD a (Lbpm;Lbpm;Ley;)Z
+	METHOD a isSideVisible (Lbpm;Lbpm;Ley;)Z
 		ARG 1 state
 		ARG 2 neighbor
 		ARG 3 facing
@@ -37,7 +37,7 @@ CLASS bjv net/minecraft/block/FluidBlock
 		ARG 6 neighborPos
 	METHOD a appendProperties (Lbpn$a;)V
 		ARG 1 builder
-	METHOD a_ (Lbpm;Lbbb;Let;)Z
+	METHOD a_ isWaterLogged (Lbpm;Lbbb;Let;)Z
 		ARG 1 state
 		ARG 2 view
 		ARG 3 pos
diff --git a/mappings/net/minecraft/block/GlassBlock.mapping b/mappings/net/minecraft/block/GlassBlock.mapping
index 9374930861..799b948f3e 100644
--- a/mappings/net/minecraft/block/GlassBlock.mapping
+++ b/mappings/net/minecraft/block/GlassBlock.mapping
@@ -1,7 +1,7 @@
 CLASS bix net/minecraft/block/GlassBlock
 	METHOD <init> (Lbgs$c;)V
 		ARG 1 settings
-	METHOD a_ (Lbpm;Lbbb;Let;)Z
+	METHOD a_ isWaterLogged (Lbpm;Lbbb;Let;)Z
 		ARG 1 state
 		ARG 2 view
 		ARG 3 pos
diff --git a/mappings/net/minecraft/block/HorizontalConnectedBlock.mapping b/mappings/net/minecraft/block/HorizontalConnectedBlock.mapping
index a3b28eea30..4d26b2ecb6 100644
--- a/mappings/net/minecraft/block/HorizontalConnectedBlock.mapping
+++ b/mappings/net/minecraft/block/HorizontalConnectedBlock.mapping
@@ -29,7 +29,7 @@ CLASS bhu net/minecraft/block/HorizontalConnectedBlock
 		ARG 1 state
 		ARG 2 rotation
 	METHOD a getDirectionMask (Ley;)I
-	METHOD a_ (Lbpm;Lbbb;Let;)Z
+	METHOD a_ isWaterLogged (Lbpm;Lbbb;Let;)Z
 		ARG 1 state
 		ARG 2 view
 		ARG 3 pos
diff --git a/mappings/net/minecraft/block/PaneBlock.mapping b/mappings/net/minecraft/block/PaneBlock.mapping
index e426dbef8b..bdaab55a1c 100644
--- a/mappings/net/minecraft/block/PaneBlock.mapping
+++ b/mappings/net/minecraft/block/PaneBlock.mapping
@@ -3,7 +3,7 @@ CLASS bjk net/minecraft/block/PaneBlock
 		ARG 1 settings
 	METHOD a getPlacementState (Laus;)Lbpm;
 		ARG 1 ctx
-	METHOD a (Lbpm;Lbpm;Ley;)Z
+	METHOD a isSideVisible (Lbpm;Lbpm;Ley;)Z
 		ARG 1 state
 		ARG 2 neighbor
 		ARG 3 facing
diff --git a/mappings/net/minecraft/block/PlantBlock.mapping b/mappings/net/minecraft/block/PlantBlock.mapping
index 91c9bdeb5d..856997c243 100644
--- a/mappings/net/minecraft/block/PlantBlock.mapping
+++ b/mappings/net/minecraft/block/PlantBlock.mapping
@@ -12,7 +12,7 @@ CLASS bgy net/minecraft/block/PlantBlock
 		ARG 4 world
 		ARG 5 pos
 		ARG 6 neighborPos
-	METHOD a_ (Lbpm;Lbbb;Let;)Z
+	METHOD a_ isWaterLogged (Lbpm;Lbbb;Let;)Z
 		ARG 1 state
 		ARG 2 view
 		ARG 3 pos
diff --git a/mappings/net/minecraft/block/StainedGlassBlock.mapping b/mappings/net/minecraft/block/StainedGlassBlock.mapping
index 384d777eec..3d763519d2 100644
--- a/mappings/net/minecraft/block/StainedGlassBlock.mapping
+++ b/mappings/net/minecraft/block/StainedGlassBlock.mapping
@@ -10,7 +10,7 @@ CLASS blx net/minecraft/block/StainedGlassBlock
 		ARG 2 world
 		ARG 3 pos
 		ARG 4 newState
-	METHOD a_ (Lbpm;Lbbb;Let;)Z
+	METHOD a_ isWaterLogged (Lbpm;Lbbb;Let;)Z
 		ARG 1 state
 		ARG 2 view
 		ARG 3 pos
diff --git a/mappings/net/minecraft/block/TransparentBlock.mapping b/mappings/net/minecraft/block/TransparentBlock.mapping
index 696a2cd230..45de442b4a 100644
--- a/mappings/net/minecraft/block/TransparentBlock.mapping
+++ b/mappings/net/minecraft/block/TransparentBlock.mapping
@@ -1,7 +1,7 @@
 CLASS bjd net/minecraft/block/TransparentBlock
 	METHOD <init> (Lbgs$c;)V
 		ARG 1 settings
-	METHOD a (Lbpm;Lbpm;Ley;)Z
+	METHOD a isSideVisible (Lbpm;Lbpm;Ley;)Z
 		ARG 1 state
 		ARG 2 neighbor
 		ARG 3 facing