🐛 Sound fields in sound variants are all required

Author: merak48763

java/data/variants/cat.mcdoc

@@ -1,4 +1,5 @@
 use super::SoundVariant
+use ::java::data::util::SoundEventRef
 
 #[since="1.21.5"]
 dispatch minecraft:resource[cat_variant] to struct CatVariant {
@@ -11,16 +12,14 @@ dispatch minecraft:resource[cat_variant] to struct CatVariant {
 }
 
 #[since="26.1"]
-dispatch minecraft:resource[cat_sound_variant] to SoundVariant<CatSounds>
-
-enum(string) CatSounds {
-	Ambient = "ambient_sound",
-	Stray = "stray_sound",
-	Hiss = "hiss_sound",
-	Hurt = "hurt_sound",
-	Death = "death_sound",
-	Eat = "eat_sound",
-	BegForFood = "beg_for_food_sound",
-	Purr = "purr_sound",
-	Purreow = "purreow_sound",
-}
+dispatch minecraft:resource[cat_sound_variant] to SoundVariant<struct CatSounds {
+	ambient_sound: SoundEventRef,
+	stray_sound: SoundEventRef,
+	hiss_sound: SoundEventRef,
+	hurt_sound: SoundEventRef,
+	death_sound: SoundEventRef,
+	eat_sound: SoundEventRef,
+	beg_for_food_sound: SoundEventRef,
+	purr_sound: SoundEventRef,
+	purreow_sound: SoundEventRef,
+}>

java/data/variants/chicken.mcdoc

@@ -1,4 +1,5 @@
 use super::SoundVariant
+use ::java::data::util::SoundEventRef
 
 #[since="1.21.5"]
 dispatch minecraft:resource[chicken_variant] to struct ChickenVariant {
@@ -12,16 +13,14 @@ dispatch minecraft:resource[chicken_variant] to struct ChickenVariant {
 }
 
 #[since="26.1"]
-dispatch minecraft:resource[chicken_sound_variant] to SoundVariant<ChickenSounds>
+dispatch minecraft:resource[chicken_sound_variant] to SoundVariant<struct ChickenSounds {
+	ambient_sound: SoundEventRef,
+	hurt_sound: SoundEventRef,
+	death_sound: SoundEventRef,
+	step_sound: SoundEventRef,
+}>
 
 enum(string) ChickenModelType {
 	Normal = "normal",
 	Cold = "cold",
 }
-
-enum(string) ChickenSounds {
-	Ambient = "ambient_sound",
-	Hurt = "hurt_sound",
-	Death = "death_sound",
-	Step = "step_sound",
-}

java/data/variants/cow.mcdoc

@@ -1,4 +1,4 @@
-use super::SoundSet
+use ::java::data::util::SoundEventRef
 
 #[since="1.21.5"]
 dispatch minecraft:resource[cow_variant] to struct CowVariant {
@@ -12,17 +12,15 @@ dispatch minecraft:resource[cow_variant] to struct CowVariant {
 }
 
 #[since="26.1"]
-dispatch minecraft:resource[cow_sound_variant] to SoundSet<CowSounds>
+dispatch minecraft:resource[cow_sound_variant] to struct CowSounds {
+	ambient_sound: SoundEventRef,
+	hurt_sound: SoundEventRef,
+	death_sound: SoundEventRef,
+	step_sound: SoundEventRef,
+}
 
 enum(string) CowModelType {
 	Normal = "normal",
 	Cold = "cold",
 	Warm = "warm",
 }
-
-enum(string) CowSounds {
-	Ambient = "ambient_sound",
-	Hurt = "hurt_sound",
-	Death = "death_sound",
-	Step = "step_sound",
-}

java/data/variants/mod.mcdoc

@@ -1,5 +1,4 @@
 use ::java::data::util::MinMaxBounds
-use ::java::data::util::SoundEventRef
 
 struct SpawnPrioritySelectors {
 	/// The spawn conditions for this variant. Selection process:
@@ -37,11 +36,7 @@ dispatch minecraft:spawn_condition[structure] to struct StructureCheck {
 	structures: (#[id=(registry="worldgen/structure",tags="allowed")] string | [#[id="worldgen/structure"] string]),
 }
 
-type SoundSet<T> = struct {
-	[T]: SoundEventRef,
-}
-
 type SoundVariant<T> = struct {
-	adult_sounds: SoundSet<T>,
-	baby_sounds: SoundSet<T>,
+	adult_sounds: T,
+	baby_sounds: T,
 }

java/data/variants/pig.mcdoc

@@ -1,4 +1,5 @@
 use super::SoundVariant
+use ::java::data::util::SoundEventRef
 
 #[since="1.21.5"]
 dispatch minecraft:resource[pig_variant] to struct PigVariant {
@@ -12,16 +13,14 @@ dispatch minecraft:resource[pig_variant] to struct PigVariant {
 }
 
 #[since="26.1"]
-dispatch minecraft:resource[pig_sound_variant] to SoundVariant<PigSounds>
+dispatch minecraft:resource[pig_sound_variant] to SoundVariant<struct PigSounds {
+	ambient_sound: SoundEventRef,
+	hurt_sound: SoundEventRef,
+	death_sound: SoundEventRef,
+	step_sound: SoundEventRef,
+}>
 
 enum(string) PigModelType {
 	Normal = "normal",
 	Cold = "cold",
 }
-
-enum(string) PigSounds {
-	Ambient = "ambient_sound",
-	Hurt = "hurt_sound",
-	Death = "death_sound",
-	Step = "step_sound",
-}

java/data/variants/wolf.mcdoc

@@ -1,5 +1,5 @@
-use super::SoundSet
 use super::SoundVariant
+use ::java::data::util::SoundEventRef
 
 #[since="1.20.5"]
 dispatch minecraft:resource[wolf_variant] to struct WolfVariant {
@@ -29,15 +29,15 @@ struct WolfVariantAssetInfo {
 
 #[since="1.21.5"]
 dispatch minecraft:resource[wolf_sound_variant] to (
-	#[until="26.1"] SoundSet<WolfSounds> |
+	#[until="26.1"] WolfSounds |
 	#[since="26.1"] SoundVariant<WolfSounds> |
 )
 
-enum(string) WolfSounds {
-	Ambient = "ambient_sound",
-	Death = "death_sound",
-	Growl = "growl_sound",
-	Hurt = "hurt_sound",
-	Pant = "pant_sound",
-	Whine = "whine_sound",
+struct WolfSounds {
+	ambient_sound: SoundEventRef,
+	death_sound: SoundEventRef,
+	growl_sound: SoundEventRef,
+	hurt_sound: SoundEventRef,
+	pant_sound: SoundEventRef,
+	whine_sound: SoundEventRef,
 }