diff --git a/mappings/net/minecraft/client/render/entity/BoatEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/BoatEntityRenderer.mapping
index 809c796925..53a516842e 100644
--- a/mappings/net/minecraft/client/render/entity/BoatEntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/BoatEntityRenderer.mapping
@@ -1,3 +1,11 @@
 CLASS doq net/minecraft/client/render/entity/BoatEntityRenderer
 	FIELD a model Ldec;
 	FIELD f SKIN [Lqs;
+	METHOD a translateToBoat (DDD)V
+		ARG 1 x
+		ARG 3 y
+		ARG 5 z
+	METHOD a rotateToBoat (Laxo;FF)V
+		ARG 1 boat
+		ARG 2 yaw
+		ARG 3 tickDelta
diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping
index ab2f65173c..8a798da095 100644
--- a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping
+++ b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping
@@ -24,6 +24,7 @@ CLASS dpi net/minecraft/client/render/entity/EntityRenderDispatcher
 	METHOD a getRenderer (Laii;)Ldpj;
 	METHOD a renderHitbox (Laii;DDDFF)V
 	METHOD a render (Laii;DDDFFZ)V
+		ARG 1 entity
 		ARG 2 x
 		ARG 4 y
 		ARG 6 z
@@ -32,6 +33,7 @@ CLASS dpi net/minecraft/client/render/entity/EntityRenderDispatcher
 		ARG 10 forceHideHitbox
 	METHOD a renderSecondPass (Laii;F)V
 	METHOD a render (Laii;FZ)V
+		ARG 1 entity
 		ARG 2 tickDelta
 	METHOD a shouldRender (Laii;Ldnm;DDD)Z
 	METHOD a setWorld (Lbhi;)V
diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping
index 144bd72527..344be879b5 100644
--- a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping
@@ -1,16 +1,20 @@
 CLASS dpj net/minecraft/client/render/entity/EntityRenderer
 	FIELD a SHADOW_TEX Lqs;
 	FIELD b renderManager Ldpi;
+	FIELD e renderOutlines Z
 	METHOD a hasSecondPass ()Z
 	METHOD a getTexture (Laii;)Lqs;
+		ARG 1 boat
 	METHOD a renderLabelIfPresent (Laii;DDD)V
 		ARG 1 entity
 		ARG 2 x
 		ARG 4 y
 		ARG 6 z
 	METHOD a renderEntityOnFire (Laii;DDDF)V
+		ARG 1 entity
 		ARG 2 x
 		ARG 4 y
+		ARG 6 z
 	METHOD a render (Laii;DDDFF)V
 		ARG 1 entity
 		ARG 2 x
@@ -19,11 +23,14 @@ CLASS dpj net/minecraft/client/render/entity/EntityRenderer
 		ARG 8 yaw
 		ARG 9 tickDelta
 	METHOD a renderLabel (Laii;DDDLjava/lang/String;D)V
+		ARG 1 entity
 		ARG 2 x
 		ARG 4 y
 		ARG 6 z
 		ARG 8 text
 	METHOD a isVisible (Laii;Ldnm;DDD)Z
+		ARG 1 entity
+		ARG 2 visibleRegion
 	METHOD a renderLabel (Laii;Ljava/lang/String;DDDI)V
 		ARG 1 entity
 		ARG 2 text
@@ -33,15 +40,37 @@ CLASS dpj net/minecraft/client/render/entity/EntityRenderer
 		ARG 9 maxDistance
 	METHOD a projectShadow (Lbvk;Lbhl;Lev;DDDLev;FFDDD)V
 	METHOD a renderBox (Lcrs;DDD)V
+		ARG 0 box
+		ARG 1 x
+		ARG 3 y
+		ARG 5 z
 	METHOD a bindTexture (Lqs;)V
+		ARG 1 textureId
+	METHOD a setRenderOutlines (Z)V
+		ARG 1 renderOutlines
 	METHOD b getFontRenderer ()Lcwc;
 	METHOD b hasLabel (Laii;)Z
 		ARG 1 entity
 	METHOD b renderSecondPass (Laii;DDDFF)V
+		ARG 1 boat
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+		ARG 8 yaw
+		ARG 9 tickDelta
 	METHOD c getRenderManager ()Ldpi;
 	METHOD c getOutlineColor (Laii;)I
+		ARG 1 entity
 	METHOD c postRender (Laii;DDDFF)V
+		ARG 1 entity
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+		ARG 8 yaw
+		ARG 9 tickDelta
 	METHOD d bindEntityTexture (Laii;)Z
+		ARG 1 entity
 	METHOD d renderShadow (Laii;DDDFF)V
 	METHOD e getWorld ()Lbhl;
 	METHOD e applyLightmapCoordinates (Laii;)V
+		ARG 1 entity
diff --git a/mappings/net/minecraft/client/render/entity/model/BoatEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BoatEntityModel.mapping
index 4d0489c7ee..178c9e2839 100644
--- a/mappings/net/minecraft/client/render/entity/model/BoatEntityModel.mapping
+++ b/mappings/net/minecraft/client/render/entity/model/BoatEntityModel.mapping
@@ -1,2 +1,13 @@
 CLASS dec net/minecraft/client/render/entity/model/BoatEntityModel
+	FIELD a body [Ldhd;
+	FIELD b paddles [Ldhd;
+	METHOD a renderPaddle (Laxo;IFF)V
+		ARG 1 boat
+		ARG 2 paddle
+		ARG 3 scale
+		ARG 4 partialTick
+	METHOD a makePaddle (Z)Ldhd;
+		ARG 1 isLeft
 	METHOD c renderPass (Laii;FFFFFF)V
+		ARG 1 entity
+		ARG 2 tickDelta
diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
index ff0439e8a6..99f304b59e 100644
--- a/mappings/net/minecraft/entity/Entity.mapping
+++ b/mappings/net/minecraft/entity/Entity.mapping
@@ -258,6 +258,7 @@ CLASS aii net/minecraft/entity/Entity
 	METHOD aU getRotationVecClient ()Lcrx;
 	METHOD aV tickPortal ()V
 	METHOD aW getDefaultPortalCooldown ()I
+	METHOD aX animateDamage ()V
 	METHOD aY getItemsHand ()Ljava/lang/Iterable;
 	METHOD aZ getArmorItems ()Ljava/lang/Iterable;
 	METHOD a_ equip (ILbcb;)Z
diff --git a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping
index c9d28e9bff..d279dfd13e 100644
--- a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping
+++ b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping
@@ -1,5 +1,8 @@
 CLASS axm net/minecraft/entity/vehicle/AbstractMinecartEntity
 	CLASS axm$a Type
+	FIELD b DAMAGE_WOBBLE_TICKS Lqh;
+	FIELD c DAMAGE_WOBBLE_SIDE Lqh;
+	FIELD d DAMAGE_WOBBLE_STRENGTH Lqh;
 	FIELD e CUSTOM_BLOCK_ID Lqh;
 	FIELD f CUSTOM_BLOCK_OFFSET Lqh;
 	FIELD g CUSTOM_BLOCK_PRESENT Lqh;
@@ -11,6 +14,7 @@ CLASS axm net/minecraft/entity/vehicle/AbstractMinecartEntity
 		ARG 3 x
 		ARG 5 y
 		ARG 7 z
+	METHOD a setDamageWobbleStrength (F)V
 	METHOD a onActivatorRail (IIIZ)V
 		ARG 1 x
 		ARG 2 y
@@ -25,7 +29,14 @@ CLASS axm net/minecraft/entity/vehicle/AbstractMinecartEntity
 		ARG 7 type
 	METHOD a setCustomBlockPresent (Z)V
 	METHOD b setCustomBlock (Lbvk;)V
+	METHOD c setDamageWobbleTicks (I)V
+		ARG 1 wobbleTicks
+	METHOD d setDamageWobbleSide (I)V
+		ARG 1 wobbleSide
 	METHOD k setCustomBlockOffset (I)V
+	METHOD l getDamageWobbleStrength ()F
+	METHOD m getDamageWobbleTicks ()I
+	METHOD n getDamageWobbleSide ()I
 	METHOD o getMinecartType ()Laxm$a;
 	METHOD p getContainedBlock ()Lbvk;
 	METHOD q getDefaultContainedBlock ()Lbvk;
diff --git a/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping b/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping
index d6325df523..6ffcc256a2 100644
--- a/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping
+++ b/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping
@@ -7,22 +7,72 @@ CLASS axo net/minecraft/entity/vehicle/BoatEntity
 		METHOD a getType (I)Laxo$b;
 		METHOD a getType (Ljava/lang/String;)Laxo$b;
 		METHOD b getBaseBlock ()Lbmm;
+	FIELD aC pressingLeft Z
+	FIELD aD pressingRight Z
+	FIELD aE pressingForward Z
+	FIELD aF pressingBack Z
+	FIELD aG waterLevel D
 	FIELD aI location Laxo$a;
 	FIELD aJ lastLocation Laxo$a;
+	FIELD aK fallVelocity D
+	FIELD aL onBubbleColumnSurface Z
+	FIELD aM bubbleColumnIsDrag Z
+	FIELD aN bubbleWobbleStrength F
+	FIELD aO bubbleWobble F
+	FIELD aP lastBubbleWobble F
+	FIELD ar BUBBLE_WOBBLE_TICKS Lqh;
+	FIELD as paddlePhases [F
+	FIELD at velocityDecay F
+	FIELD au ticksUnderwater F
+	FIELD av yawVelocity F
+	FIELD b DAMAGE_WOBBLE_TICKS Lqh;
+	FIELD c DAMAGE_WOBBLE_SIDE Lqh;
+	FIELD d DAMAGE_WOBBLE_STRENGTH Lqh;
 	FIELD e BOAT_TYPE Lqh;
 	FIELD f LEFT_PADDLE_MOVING Lqh;
 	FIELD g RIGHT_PADDLE_MOVING Lqh;
 	METHOD <init> (Lbhi;DDD)V
 		ARG 1 world
 		ARG 2 x
-	METHOD a getPaddleState (I)Z
+		ARG 4 y
+		ARG 6 z
+	METHOD A getBubbleWobbleTicks ()I
+	METHOD a setDamageWobbleStrength (F)V
+		ARG 1 wobbleStrength
+	METHOD a isPaddleMoving (I)Z
 		ARG 1 paddle
+	METHOD a interpolatePaddlePhase (IF)F
+		ARG 1 paddle
+		ARG 2 tickDelta
 	METHOD a copyEntityData (Laii;)V
+		ARG 1 entity
 	METHOD a setBoatType (Laxo$b;)V
-	METHOD a setPaddleState (ZZ)V
+		ARG 1 type
+	METHOD a setPaddleMovings (ZZ)V
+		ARG 1 leftMoving
+		ARG 2 rightMoving
+	METHOD a setInputs (ZZZZ)V
+		ARG 1 pressingLeft
+		ARG 2 pressingRight
+		ARG 3 pressingForward
+		ARG 4 pressingBack
+	METHOD b interpolateBubbleWobble (F)F
+		ARG 1 tickDelta
+	METHOD b setDamageWobbleTicks (I)V
+		ARG 1 wobbleTicks
+	METHOD c setDamageWobbleSide (I)V
+		ARG 1 side
+	METHOD d setBubbleWobbleTicks (I)V
+		ARG 1 wobbleTicks
 	METHOD f asItem ()Lbbw;
 	METHOD i getPaddleSoundEvent ()Lyj;
+	METHOD m getDamageWobbleStrength ()F
+	METHOD n getDamageWobbleTicks ()I
+	METHOD o getDamageWobbleSide ()I
 	METHOD p getBoatType ()Laxo$b;
+	METHOD q handleBubbleColumn ()V
 	METHOD s checkLocation ()Laxo$a;
 	METHOD u checKBoatInWater ()Z
 	METHOD v getUnderWaterLocation ()Laxo$a;
+	METHOD w updateVelocity ()V
+	METHOD z updatePaddles ()V
diff --git a/mappings/net/minecraft/server/network/packet/BoatPaddleStateC2SPacket.mapping b/mappings/net/minecraft/server/network/packet/BoatPaddleStateC2SPacket.mapping
index 556c759cd0..ce14585319 100644
--- a/mappings/net/minecraft/server/network/packet/BoatPaddleStateC2SPacket.mapping
+++ b/mappings/net/minecraft/server/network/packet/BoatPaddleStateC2SPacket.mapping
@@ -1,5 +1,8 @@
 CLASS ol net/minecraft/server/network/packet/BoatPaddleStateC2SPacket
 	FIELD a leftPaddling Z
 	FIELD b rightPaddling Z
+	METHOD <init> (ZZ)V
+		ARG 1 leftPaddling
+		ARG 2 rightPaddling
 	METHOD b isLeftPaddling ()Z
 	METHOD c isRightPaddling ()Z