feat(pigvariants): Introduce PigVariant feature with model, texture, and biome support; add PigVariant and PigVariantTag arguments, and implement related tests.

Author: Ayfri

generation/src/main/kotlin/generators/generators.kt

@@ -15,11 +15,12 @@ suspend fun launchAllSimpleGenerators() {
 		gen("Enchantments", "enchantments"),
 		gen("Instruments", "instruments"),
 		gen("JukeboxSongs", "jukebox_songs"),
-		gen("PaintingVariants", "painting_variants"),
+		gen("PaintingVariants", "paintings"),
 		gen("Recipes", "recipes"),
 		gen("TrimMaterials", "trim_materials"),
 		gen("TrimPatterns", "trim_patterns"),
-		gen("WolfVariants", "wolf_variants"),
+		gen("PigVariants", "pigs"),
+		gen("WolfVariants", "wolfs"),
 		gen("Biomes", "worldgen/biome"),
 		gen("BiomePresets", "worldgen/multi_noise_biome_source_parameter_list"),
 		gen("ConfiguredFeatures", "worldgen/configured_feature"),
@@ -48,6 +49,7 @@ suspend fun launchAllSimpleGenerators() {
 				"instrument" to "InstrumentTag",
 				"item" to "ItemTag",
 				"painting_variant" to "PaintingVariantTag",
+				"pig_variant" to "PigVariantTag",
 				"wolf_variant" to "WolfVariantTag",
 				"worldgen/biome" to "BiomeTag",
 				"worldgen/structure" to "ConfiguredStructureTag",

kore/src/main/kotlin/io/github/ayfri/kore/DataPack.kt

@@ -14,6 +14,7 @@ import io.github.ayfri.kore.features.itemmodifiers.ItemModifier
 import io.github.ayfri.kore.features.jukeboxsongs.JukeboxSong
 import io.github.ayfri.kore.features.loottables.LootTable
 import io.github.ayfri.kore.features.paintingvariant.PaintingVariant
+import io.github.ayfri.kore.features.pigvariants.PigVariant
 import io.github.ayfri.kore.features.predicates.Predicate
 import io.github.ayfri.kore.features.recipes.RecipeFile
 import io.github.ayfri.kore.features.tags.Tag
@@ -78,6 +79,7 @@ class DataPack(val name: String) {
 	val noises = registerGenerator<Noise>()
 	val noiseSettings = registerGenerator<NoiseSettings>()
 	val paintingVariants = registerGenerator<PaintingVariant>()
+	val pigVariants = registerGenerator<PigVariant>()
 	val placedFeatures = registerGenerator<PlacedFeature>()
 	val predicates = registerGenerator<Predicate>()
 	val processorLists = registerGenerator<ProcessorList>()

kore/src/main/kotlin/io/github/ayfri/kore/arguments/types/PigVariantOrTagArgument.kt

@@ -0,0 +1,7 @@
+package io.github.ayfri.kore.arguments.types
+
+import io.github.ayfri.kore.arguments.Argument
+import kotlinx.serialization.Serializable
+
+@Serializable(with = Argument.ArgumentSerializer::class)
+interface PigVariantOrTagArgument : Argument

kore/src/main/kotlin/io/github/ayfri/kore/arguments/types/resources/PigVariantArgument.kt

@@ -0,0 +1,16 @@
+package io.github.ayfri.kore.arguments.types.resources
+
+import io.github.ayfri.kore.arguments.Argument
+import io.github.ayfri.kore.arguments.types.PigVariantOrTagArgument
+import io.github.ayfri.kore.arguments.types.ResourceLocationArgument
+import kotlinx.serialization.Serializable
+
+@Serializable(with = Argument.ArgumentSerializer::class)
+interface PigVariantArgument : ResourceLocationArgument, PigVariantOrTagArgument {
+	companion object {
+		operator fun invoke(name: String, namespace: String = "minecraft") = object : PigVariantArgument {
+			override val name = name
+			override val namespace = namespace
+		}
+	}
+}

kore/src/main/kotlin/io/github/ayfri/kore/arguments/types/resources/tagged/PigVariantTagArgument.kt

@@ -0,0 +1,16 @@
+package io.github.ayfri.kore.arguments.types.resources.tagged
+
+import io.github.ayfri.kore.arguments.Argument
+import io.github.ayfri.kore.arguments.types.PigVariantOrTagArgument
+import io.github.ayfri.kore.arguments.types.TaggedResourceLocationArgument
+import kotlinx.serialization.Serializable
+
+@Serializable(with = Argument.ArgumentSerializer::class)
+interface PigVariantTagArgument : TaggedResourceLocationArgument, PigVariantOrTagArgument {
+	companion object {
+		operator fun invoke(name: String, namespace: String = "minecraft") = object : PigVariantTagArgument {
+			override val name = name
+			override val namespace = namespace
+		}
+	}
+}

kore/src/main/kotlin/io/github/ayfri/kore/features/pigvariants/PigModel.kt

@@ -0,0 +1,14 @@
+package io.github.ayfri.kore.features.pigvariants
+
+import io.github.ayfri.kore.serializers.LowercaseSerializer
+import kotlinx.serialization.Serializable
+
+@Serializable(with = PigModel.Companion.PigModelSerializer::class)
+enum class PigModel {
+	NORMAL,
+	COLD;
+
+	companion object {
+		data object PigModelSerializer : LowercaseSerializer<PigModel>(entries)
+	}
+}

kore/src/main/kotlin/io/github/ayfri/kore/features/pigvariants/PigVariant.kt

@@ -0,0 +1,31 @@
+package io.github.ayfri.kore.features.pigvariants
+
+import io.github.ayfri.kore.DataPack
+import io.github.ayfri.kore.Generator
+import io.github.ayfri.kore.arguments.types.resources.PigVariantArgument
+import io.github.ayfri.kore.arguments.types.resources.worldgen.BiomeArgument
+import io.github.ayfri.kore.generated.Biomes
+import io.github.ayfri.kore.serializers.InlinableList
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
+import kotlinx.serialization.encodeToString
+
+@Serializable
+data class PigVariant(
+	@Transient
+	override var fileName: String = "pig_variant",
+	var model: PigModel = PigModel.NORMAL,
+	var texture: String = "minecraft:entity/pig/pig",
+	var biome: InlinableList<BiomeArgument> = listOf(Biomes.PLAINS),
+) : Generator("pig_variant") {
+	override fun generateJson(dataPack: DataPack) = dataPack.jsonEncoder.encodeToString(this)
+}
+
+fun DataPack.pigVariant(
+	fileName: String = "pig_variant",
+	block: PigVariant.() -> Unit = {},
+): PigVariantArgument {
+	val pigVariant = PigVariant(fileName).apply(block)
+	pigVariants += pigVariant
+	return PigVariantArgument(fileName, pigVariant.namespace ?: name)
+}

kore/src/main/kotlin/io/github/ayfri/kore/features/predicates/sub/entityspecific/Pig.kt

@@ -0,0 +1,15 @@
+package io.github.ayfri.kore.features.predicates.sub.entityspecific
+
+import io.github.ayfri.kore.arguments.types.PigVariantOrTagArgument
+import io.github.ayfri.kore.features.predicates.sub.Entity
+import io.github.ayfri.kore.serializers.InlinableList
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Pig(
+	override var variant: InlinableList<PigVariantOrTagArgument>,
+) : EntityTypeSpecific(), VariantEntityTypeSpecific<PigVariantOrTagArgument>
+
+fun Entity.pigTypeSpecific(vararg variants: PigVariantOrTagArgument, block: Pig.() -> Unit = {}) = apply {
+	typeSpecific = Pig(variants.toList()).apply(block)
+}

kore/src/main/kotlin/io/github/ayfri/kore/features/tags/commonTags.kt

@@ -143,6 +143,13 @@ fun DataPack.trimPatternTag(
 	block: Tag<TrimPatternTagArgument>.() -> Unit = {},
 ) = tag(fileName, "trim_pattern", namespace, replace, block)
 
+fun DataPack.pigVariantTag(
+	fileName: String = "pig_variant",
+	namespace: String = name,
+	replace: Boolean = false,
+	block: Tag<PigVariantTagArgument>.() -> Unit = {},
+) = tag(fileName, "pig_variant", namespace, replace, block)
+
 fun DataPack.wolfVariantTag(
 	fileName: String = "wolf_variant",
 	namespace: String = name,

kore/src/test/kotlin/io/github/ayfri/kore/features/PigVariantTests.kt

@@ -0,0 +1,43 @@
+package io.github.ayfri.kore.features
+
+import io.github.ayfri.kore.DataPack
+import io.github.ayfri.kore.assertions.assertsIs
+import io.github.ayfri.kore.features.pigvariants.PigModel
+import io.github.ayfri.kore.features.pigvariants.pigVariant
+import io.github.ayfri.kore.generated.Biomes
+
+fun DataPack.pigVariantTests() {
+	pigVariant("test_pig_variant") {
+		model = PigModel.COLD
+		texture = "my_datapack:entity/cold_pig/pig"
+		biome = listOf(Biomes.SNOWY_TAIGA, Biomes.SNOWY_PLAINS)
+	}
+
+	pigVariants.last() assertsIs """
+		{
+			"model": "cold",
+			"texture": "my_datapack:entity/cold_pig/pig",
+			"biome": [
+				"minecraft:snowy_taiga",
+				"minecraft:snowy_plains"
+			]
+		}
+	""".trimIndent()
+
+	pigVariant("normal_pig_variant") {
+		model = PigModel.NORMAL
+		texture = "my_datapack:entity/normal_pig/pig"
+		biome = listOf(Biomes.PLAINS, Biomes.FOREST)
+	}
+
+	pigVariants.last() assertsIs """
+		{
+			"model": "normal",
+			"texture": "my_datapack:entity/normal_pig/pig",
+			"biome": [
+				"minecraft:plains",
+				"minecraft:forest"
+			]
+		}
+	""".trimIndent()
+}