From 14d298d55e33d889157f5e5a64b8df6e136978dd Mon Sep 17 00:00:00 2001
From: apple502j <33279053+apple502j@users.noreply.github.com>
Date: Thu, 1 Apr 2021 17:00:11 +0900
Subject: [PATCH] Map RaidCommand and new raid methods (#2218)

---
 .../server/command/RaidCommand.mapping        | 38 +++++++++++++++++++
 .../net/minecraft/village/raid/Raid.mapping   |  8 ++++
 2 files changed, 46 insertions(+)
 create mode 100644 mappings/net/minecraft/server/command/RaidCommand.mapping

diff --git a/mappings/net/minecraft/server/command/RaidCommand.mapping b/mappings/net/minecraft/server/command/RaidCommand.mapping
new file mode 100644
index 0000000000..f3f73f9fec
--- /dev/null
+++ b/mappings/net/minecraft/server/command/RaidCommand.mapping
@@ -0,0 +1,38 @@
+CLASS net/minecraft/class_6329 net/minecraft/server/command/RaidCommand
+	METHOD method_36191 getRaid (Lnet/minecraft/class_3222;)Lnet/minecraft/class_3765;
+		ARG 0 player
+	METHOD method_36192 register (Lcom/mojang/brigadier/CommandDispatcher;)V
+		ARG 0 dispatcher
+	METHOD method_36193 (Lcom/mojang/brigadier/context/CommandContext;)I
+		ARG 0 context
+	METHOD method_36194 executeGlow (Lnet/minecraft/class_2168;)I
+		ARG 0 source
+	METHOD method_36195 executeSetOmen (Lnet/minecraft/class_2168;I)I
+		ARG 0 source
+		ARG 1 level
+	METHOD method_36196 executeSound (Lnet/minecraft/class_2168;Lnet/minecraft/class_2561;)I
+		ARG 0 source
+		ARG 1 type
+	METHOD method_36197 (Lcom/mojang/brigadier/context/CommandContext;)I
+		ARG 0 context
+	METHOD method_36198 executeSpawnLeader (Lnet/minecraft/class_2168;)I
+		ARG 0 source
+	METHOD method_36199 executeStart (Lnet/minecraft/class_2168;I)I
+		ARG 0 source
+		ARG 1 level
+	METHOD method_36200 (Lcom/mojang/brigadier/context/CommandContext;)I
+		ARG 0 context
+	METHOD method_36201 executeStop (Lnet/minecraft/class_2168;)I
+		ARG 0 source
+	METHOD method_36202 (Lcom/mojang/brigadier/context/CommandContext;)I
+		ARG 0 context
+	METHOD method_36203 executeCheck (Lnet/minecraft/class_2168;)I
+		ARG 0 source
+	METHOD method_36204 (Lcom/mojang/brigadier/context/CommandContext;)I
+		ARG 0 context
+	METHOD method_36205 (Lnet/minecraft/class_2168;)Z
+		ARG 0 source
+	METHOD method_36206 (Lcom/mojang/brigadier/context/CommandContext;)I
+		ARG 0 context
+	METHOD method_36207 (Lcom/mojang/brigadier/context/CommandContext;)I
+		ARG 0 context
diff --git a/mappings/net/minecraft/village/raid/Raid.mapping b/mappings/net/minecraft/village/raid/Raid.mapping
index 5a2cd6c4b1..20467441cc 100644
--- a/mappings/net/minecraft/village/raid/Raid.mapping
+++ b/mappings/net/minecraft/village/raid/Raid.mapping
@@ -24,6 +24,8 @@ CLASS net/minecraft/class_3765 net/minecraft/village/raid/Raid
 	FIELD field_19023 status Lnet/minecraft/class_3765$class_4259;
 	FIELD field_19024 finishCooldown I
 	FIELD field_19172 preCalculatedRavagerSpawnLocation Ljava/util/Optional;
+	FIELD field_30683 OMNIOUS_BANNER_TRANSLATION_KEY Ljava/lang/String;
+	FIELD field_30684 RAIDERS_REMAINING_TRANSLATION_KEY Ljava/lang/String;
 	METHOD <init> (ILnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V
 		ARG 1 id
 		ARG 2 world
@@ -55,6 +57,8 @@ CLASS net/minecraft/class_3765 net/minecraft/village/raid/Raid
 		ARG 1 wave
 		ARG 2 entity
 	METHOD method_16506 invalidate ()V
+	METHOD method_16508 (Ljava/lang/Integer;)Ljava/util/Set;
+		ARG 0 wave
 	METHOD method_16509 tick ()V
 	METHOD method_16510 removeFromWave (Lnet/minecraft/class_3763;Z)V
 		ARG 1 entity
@@ -116,6 +120,10 @@ CLASS net/minecraft/class_3765 net/minecraft/village/raid/Raid
 	METHOD method_20509 setCenter (Lnet/minecraft/class_2338;)V
 		ARG 1 center
 	METHOD method_20511 moveRaidCenter ()V
+	METHOD method_35211 setBadOmenLevel (I)V
+		ARG 1 level
+	METHOD method_35212 getTotalHealth ()F
+	METHOD method_35213 getAllRaiders ()Ljava/util/Set;
 	CLASS class_3766 Member
 		FIELD field_16628 countInWave [I
 		FIELD field_16629 type Lnet/minecraft/class_1299;