diff --git a/mappings/net/minecraft/entity/ai/goal/Goal.mapping b/mappings/net/minecraft/entity/ai/goal/Goal.mapping
index 87174638f0..0f0c9b5e51 100644
--- a/mappings/net/minecraft/entity/ai/goal/Goal.mapping
+++ b/mappings/net/minecraft/entity/ai/goal/Goal.mapping
@@ -1,4 +1,5 @@
 CLASS amm net/minecraft/entity/ai/goal/Goal
+	CLASS amm$a Control
 	FIELD a controls Ljava/util/EnumSet;
 	METHOD C_ canStop ()Z
 	METHOD a canStart ()Z
diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping
index f53b76e877..a7739f3d87 100644
--- a/mappings/net/minecraft/entity/mob/MobEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping
@@ -65,6 +65,7 @@ CLASS aij net/minecraft/entity/mob/MobEntity
 		ARG 1 distanceSquared
 	METHOD c spawnsTooManyForEachTry (I)Z
 		ARG 1 count
+	METHOD c getDropChance (Laie;)F
 	METHOD dA isPersistent ()Z
 	METHOD dB isInWalkTargetRange ()Z
 	METHOD dC getWalkTarget ()Lev;
diff --git a/mappings/net/minecraft/entity/raid/Raid.mapping b/mappings/net/minecraft/entity/raid/Raid.mapping
index d6761e2995..3a226227bb 100644
--- a/mappings/net/minecraft/entity/raid/Raid.mapping
+++ b/mappings/net/minecraft/entity/raid/Raid.mapping
@@ -1,15 +1,26 @@
 CLASS awq net/minecraft/entity/raid/Raid
+	CLASS awq$a Status
+		FIELD e VALUES [Lawq$a;
+		METHOD a getName ()Ljava/lang/String;
+		METHOD b fromName (Ljava/lang/String;)Lawq$a;
 	CLASS awq$b Member
 		FIELD a VINDICATOR Lawq$b;
 		FIELD b EVOKER Lawq$b;
 		FIELD c PILLAGER Lawq$b;
 		FIELD d WITCH Lawq$b;
 		FIELD e RAVAGER Lawq$b;
+		FIELD f VALUES [Lawq$b;
 		FIELD g type Laid;
-		FIELD h firstWave [I
+		FIELD h waveToCount [I
 	FIELD a ILLAGER_BANNER Lbbp;
+	FIELD b EVENT_TEXT Ljw;
+	FIELD c VICTORY_SUFFIX_TEXT Ljw;
+	FIELD d DEFEAT_SUFFIX_TEXT Ljw;
+	FIELD e VICTORY_TITLE Ljm;
+	FIELD f DEFEAT_TITLE Ljm;
 	FIELD g waveToLeader Ljava/util/Map;
 	FIELD h waveToRaiders Ljava/util/Map;
+	FIELD i heroesOfTheVillage Ljava/util/Set;
 	FIELD j ticksActive J
 	FIELD k center Lev;
 	FIELD l world Lve;
@@ -23,13 +34,20 @@ CLASS awq net/minecraft/entity/raid/Raid
 	FIELD t postRaidTicks I
 	FIELD u preRaidTicks I
 	FIELD v random Ljava/util/Random;
+	FIELD w waveCount I
+	FIELD x status Lawq$a;
+	FIELD y finishCooldown I
 	METHOD <init> (ILve;Lev;)V
 		ARG 1 id
+	METHOD A hasSpawnedFinalWave ()Z
+	METHOD B hasExtraWave ()Z
+	METHOD C hasSpawnedExtraWave ()Z
+	METHOD D isSpawningExtraWave ()Z
 	METHOD E removeObsoleteRaiders ()V
 	METHOD F canSpawnRaiders ()Z
 	METHOD G markDirty ()V
 	METHOD H getIllagerBanner ()Lbbp;
-	METHOD a isOnGoing ()Z
+	METHOD a isFinished ()Z
 	METHOD a setRaidLeader (ILawr;)V
 		ARG 1 wave
 	METHOD a addRaider (ILawr;Lev;Z)V
@@ -40,18 +58,31 @@ CLASS awq net/minecraft/entity/raid/Raid
 	METHOD a addToWave (ILawr;Z)Z
 		ARG 1 wave
 		ARG 3 countHealth
+	METHOD a getMaxWaves (Lagr;)I
+	METHOD a addHero (Lahz;)V
 	METHOD a start (Lavm;)V
+	METHOD a getCount (Lawq$b;IZ)I
+		ARG 2 wave
+		ARG 3 extra
+	METHOD a getBonusCount (Lawq$b;Ljava/util/Random;ILags;Z)I
+		ARG 3 wave
+		ARG 5 extra
 	METHOD a removeFromWave (Lawr;Z)V
 		ARG 2 countHealth
 	METHOD a playRaidHorn (Lev;)V
 	METHOD a toTag (Lib;)Lib;
+	METHOD b isPreRaid ()Z
 	METHOD b getLeader (I)Lawr;
 	METHOD b addToWave (ILawr;)Z
 		ARG 1 wave
 	METHOD b spawnNextWave (Lev;)V
+	METHOD c hasSpawned ()Z
 	METHOD c removeLeader (I)V
 		ARG 1 wave
+	METHOD d hasStopped ()Z
 	METHOD d getPillagerSpawnLocation (I)Lev;
+	METHOD e hasWon ()Z
+	METHOD f hasLost ()Z
 	METHOD i getWorld ()Lbgv;
 	METHOD k hasStarted ()Z
 	METHOD l getGroupsSpawned ()I
@@ -65,6 +96,7 @@ CLASS awq net/minecraft/entity/raid/Raid
 	METHOD t getCenter ()Lev;
 	METHOD u getRaidId ()I
 	METHOD v isActive ()Z
+	METHOD w getEnchantmentChance ()F
 	METHOD x isInRaidDistance ()Ljava/util/function/Predicate;
 	METHOD y updateBarToPlayers ()V
-	METHOD z hasSpawnedAllGroups ()Z
+	METHOD z shouldSpawnMoreGroups ()Z
diff --git a/mappings/net/minecraft/entity/raid/RaiderEntity.mapping b/mappings/net/minecraft/entity/raid/RaiderEntity.mapping
index 151b50f208..141a7683f8 100644
--- a/mappings/net/minecraft/entity/raid/RaiderEntity.mapping
+++ b/mappings/net/minecraft/entity/raid/RaiderEntity.mapping
@@ -1,9 +1,30 @@
 CLASS awr net/minecraft/entity/raid/RaiderEntity
+	CLASS awr$a PatrolApproachGoal
+		FIELD a targetPredicate Lapp;
+		FIELD d squaredDistance F
+		METHOD <init> (Lawr;Lath;F)V
+			ARG 3 distance
 	CLASS awr$b PickupBannerAsLeaderGoal
-	FIELD bA hasRaidGoal Z
+	CLASS awr$c CelebrateGoal
+	CLASS awr$d AttackHomeGoal
+		FIELD a owner Lawr;
+		FIELD b speed D
+		FIELD c home Lev;
+		FIELD d lastHomes Ljava/util/List;
+		FIELD e distance I
+		FIELD f finished Z
+		METHOD <init> (Lawr;DI)V
+			ARG 2 speed
+			ARG 4 distance
+		METHOD a canLootHome (Lev;)Z
+		METHOD g isRaiding ()Z
+		METHOD h tryFindHome ()Z
+		METHOD j purgeMemory ()V
+	FIELD bA ableToJoinRaid Z
 	FIELD bB outOfRaidCounter I
 	FIELD b OBTAINABLE_ILLAGER_BANNER_ITEM Ljava/util/function/Predicate;
 	FIELD bz wave I
+	FIELD c CELEBRATING Lqg;
 	FIELD d raid Lawq;
 	METHOD <init> (Laid;Lbgv;)V
 		ARG 1 type
@@ -12,9 +33,12 @@ CLASS awr net/minecraft/entity/raid/RaiderEntity
 		ARG 1 wave
 	METHOD a setRaid (Lawq;)V
 	METHOD b setOutOfRaidCounter (I)V
-	METHOD ed hasRaidGoal ()Z
+	METHOD dQ getCelebratingSound ()Lyh;
+	METHOD ed canJoinRaid ()Z
 	METHOD ee getRaid ()Lawq;
 	METHOD ef hasActiveRaid ()Z
 	METHOD eg getWave ()I
+	METHOD eh isCelebrating ()Z
 	METHOD ei getOutOfRaidCounter ()I
-	METHOD t setHasRaidGoal (Z)V
+	METHOD t setAbleToJoinRaid (Z)V
+	METHOD u setCelebrating (Z)V