✨ Add split boat entity types from 24w39a + pale oak boats from 24w40a

SpyglassMC · Oct 8, 2024 · 445f44e · 445f44e
1 parent f34940f
commit 445f44e
Showing 1 changed file with 37 additions and 3 deletions.
diff --git a/java/server/world/entity/boat.mcdoc b/java/server/world/entity/boat.mcdoc
@@ -1,11 +1,29 @@
 use ::java::server::util::inventory::SlottedItem
 
-dispatch minecraft:entity[boat] to struct Boat {
+struct Boat {
 	...super::EntityBase,
 	/// Wood type of this boat
+	#[until="1.21.2"]
 	Type?: BoatType,
 }
 
+#[until="1.21.2"]
+dispatch minecraft:entity[boat] to Boat
+
+#[since="1.21.2"]
+dispatch minecraft:entity[
+	acacia_boat,
+	bamboo_raft,
+	birch_boat,
+	cherry_boat,
+	dark_oak_boat,
+	jungle_boat,
+	mangrove_boat,
+	oak_boat,
+	pale_oak_boat,
+	spruce_boat,
+] to Boat
+
 enum(string) BoatType {
 	Oak = "oak",
 	Spruce = "spruce",
@@ -21,8 +39,7 @@ enum(string) BoatType {
 	Cherry = "cherry",
 }
 
-#[since="1.19"]
-dispatch minecraft:entity[chest_boat] to struct ChestBoat {
+struct ChestBoat {
 	...Boat,
 	/// Loot table that will populate this chest boat.
 	LootTable?: #[id(registry="loot_table", empty="allowed")] string,
@@ -31,3 +48,20 @@ dispatch minecraft:entity[chest_boat] to struct ChestBoat {
 	/// Slots from 0 to 26.
 	Items?: [SlottedItem<byte @ 0..26>] @ 0..27,
 }
+
+#[since="1.19"] #[until="1.21.2"]
+dispatch minecraft:entity[chest_boat] to ChestBoat
+
+#[since="1.21.2"]
+dispatch minecraft:entity[
+	acacia_chest_boat,
+	bamboo_chest_raft,
+	birch_chest_boat,
+	cherry_chest_boat,
+	dark_oak_chest_boat,
+	jungle_chest_boat,
+	mangrove_chest_boat,
+	oak_chest_boat,
+	pale_oak_chest_boat,
+	spruce_chest_boat,
+] to ChestBoat