refactor: update gene requirements structure and codec implementation

aaronhowser1 · aaronhowser1 · commit fd8c2a915219 · 2026-02-01T00:08:17.000-06:00
diff --git a/src/generated/resources/.cache/766ffd27525d6ce0874a2c1776913e7641dddfd0 b/src/generated/resources/.cache/766ffd27525d6ce0874a2c1776913e7641dddfd0
@@ -1,17 +1,17 @@
-// 1.21.1	2026-01-31T23:46:54.7884918	geneticsresequenced/gene_requirements generator for geneticsresequenced
-bd50e30149c648342d40b6dcb06d3ea344549221 data/geneticsresequenced/geneticsresequenced/gene_requirements/bountiful_2.json
-7ed509b8fca794b244e3608ab6f4ccfafb41ebd3 data/geneticsresequenced/geneticsresequenced/gene_requirements/claws_2.json
-921580f13d88c8a9f36ab373b3d5e1b4406ac750 data/geneticsresequenced/geneticsresequenced/gene_requirements/efficiency_4.json
-621ff4c71347606447c1fa7f77fa20e78e41b274 data/geneticsresequenced/geneticsresequenced/gene_requirements/flight.json
-103717ad5176ace9a4cd0dd636502905cc483062 data/geneticsresequenced/geneticsresequenced/gene_requirements/haste_2.json
-369b6d3142b37e1020f202ae6ddb35703d3dafdb data/geneticsresequenced/geneticsresequenced/gene_requirements/lava_proof.json
-05c0855e0619ea5e4ba41594493912fdbc0dbbd6 data/geneticsresequenced/geneticsresequenced/gene_requirements/meaty_2.json
-7cb082afb7b066a46d53ab5a4e888805ccaae4a6 data/geneticsresequenced/geneticsresequenced/gene_requirements/more_hearts_2.json
-d140db3485afb59b34fc43eaa58f7a0fbe9fb03e data/geneticsresequenced/geneticsresequenced/gene_requirements/photosynthesis.json
-3cbc7808c914c34371869308024c1b3399d1013f data/geneticsresequenced/geneticsresequenced/gene_requirements/regeneration_4.json
-f5d80c9330403922c7a0a3b7bf2e6f728027badc data/geneticsresequenced/geneticsresequenced/gene_requirements/resistance_2.json
-3f7a70b73a0cc00f3450ca8827d8319840ee7221 data/geneticsresequenced/geneticsresequenced/gene_requirements/speed_2.json
-f9844d6adab2073b0f3d2a2382beb635ea985536 data/geneticsresequenced/geneticsresequenced/gene_requirements/speed_4.json
-b54f6989c30fba7f7097421f6dd457c9507056e0 data/geneticsresequenced/geneticsresequenced/gene_requirements/strength_2.json
-bd989a13e16060a4b0f7cd25244e9e51eddea036 data/geneticsresequenced/geneticsresequenced/gene_requirements/web_defense.json
-bd989a13e16060a4b0f7cd25244e9e51eddea036 data/geneticsresequenced/geneticsresequenced/gene_requirements/web_walker.json
+// 1.21.1	2026-02-01T00:07:44.8121175	geneticsresequenced/gene_requirements generator for geneticsresequenced
+fbcabfe63463cf3e5127c706d46a5311705c0dae data/geneticsresequenced/geneticsresequenced/gene_requirements/bountiful_2.json
+3c5506f70d168c3a0987405af0b83166bad59a7d data/geneticsresequenced/geneticsresequenced/gene_requirements/claws_2.json
+21aab0acb9bd49e2721390f13d4dab2fb4838a4b data/geneticsresequenced/geneticsresequenced/gene_requirements/efficiency_4.json
+70e697d18afe6d29c32ccf51a854c6a81cc293e3 data/geneticsresequenced/geneticsresequenced/gene_requirements/flight.json
+e0ffc060f2a769fa72d3db2a051eb536bd63d1c8 data/geneticsresequenced/geneticsresequenced/gene_requirements/haste_2.json
+787b9ea38aaadda0467a18302d51aba66f1df1a0 data/geneticsresequenced/geneticsresequenced/gene_requirements/lava_proof.json
+b1d2b4e93047a6a126bbb8bb593cb8ab010354f2 data/geneticsresequenced/geneticsresequenced/gene_requirements/meaty_2.json
+0c4f1ae9156355462202c609a0720a98f44ffed2 data/geneticsresequenced/geneticsresequenced/gene_requirements/more_hearts_2.json
+b60b9230803abc8a20f0bc0f1774d98c416ee7a2 data/geneticsresequenced/geneticsresequenced/gene_requirements/photosynthesis.json
+61e9548fb411104c90b732c608bb5b42097faa80 data/geneticsresequenced/geneticsresequenced/gene_requirements/regeneration_4.json
+2df3542a6259318f2516746dcb9c9c87f6a28414 data/geneticsresequenced/geneticsresequenced/gene_requirements/resistance_2.json
+a3374325bf2e5a8eebc8e16275b371d0f9139141 data/geneticsresequenced/geneticsresequenced/gene_requirements/speed_2.json
+e93240cada44a6219f99aa470129ccf28aab199a data/geneticsresequenced/geneticsresequenced/gene_requirements/speed_4.json
+d69862b183d013c12b9a31e509258ea9dcda4ce1 data/geneticsresequenced/geneticsresequenced/gene_requirements/strength_2.json
+f9031823065466362d50d2f3c81f544227919d0f data/geneticsresequenced/geneticsresequenced/gene_requirements/web_defense.json
+7c2274c0318b3e729c872868d384cc51ca24e448 data/geneticsresequenced/geneticsresequenced/gene_requirements/web_walker.json
diff --git a/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/bountiful_2.json b/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/bountiful_2.json
@@ -1,4 +1,5 @@
 {
+  "gene": "geneticsresequenced:bountiful_2",
   "requirements": [
     "geneticsresequenced:bountiful"
   ]
diff --git a/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/claws_2.json b/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/claws_2.json
@@ -1,4 +1,5 @@
 {
+  "gene": "geneticsresequenced:claws_2",
   "requirements": [
     "geneticsresequenced:claws"
   ]
diff --git a/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/efficiency_4.json b/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/efficiency_4.json
@@ -1,4 +1,5 @@
 {
+  "gene": "geneticsresequenced:efficiency_4",
   "requirements": [
     "geneticsresequenced:efficiency"
   ]
diff --git a/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/flight.json b/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/flight.json
@@ -1,4 +1,5 @@
 {
+  "gene": "geneticsresequenced:flight",
   "requirements": [
     "geneticsresequenced:teleport",
     "geneticsresequenced:step_assist",
diff --git a/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/haste_2.json b/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/haste_2.json
@@ -1,4 +1,5 @@
 {
+  "gene": "geneticsresequenced:haste_2",
   "requirements": [
     "geneticsresequenced:haste"
   ]
diff --git a/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/lava_proof.json b/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/lava_proof.json
@@ -1,4 +1,5 @@
 {
+  "gene": "geneticsresequenced:lava_proof",
   "requirements": [
     "geneticsresequenced:fire_proof"
   ]
diff --git a/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/meaty_2.json b/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/meaty_2.json
@@ -1,4 +1,5 @@
 {
+  "gene": "geneticsresequenced:meaty_2",
   "requirements": [
     "geneticsresequenced:meaty"
   ]
diff --git a/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/more_hearts_2.json b/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/more_hearts_2.json
@@ -1,4 +1,5 @@
 {
+  "gene": "geneticsresequenced:more_hearts_2",
   "requirements": [
     "geneticsresequenced:more_hearts"
   ]
diff --git a/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/photosynthesis.json b/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/photosynthesis.json
@@ -1,4 +1,5 @@
 {
+  "gene": "geneticsresequenced:photosynthesis",
   "requirements": [
     "geneticsresequenced:eat_grass",
     "geneticsresequenced:thorns"
diff --git a/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/regeneration_4.json b/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/regeneration_4.json
@@ -1,4 +1,5 @@
 {
+  "gene": "geneticsresequenced:regeneration_4",
   "requirements": [
     "geneticsresequenced:regeneration"
   ]
diff --git a/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/resistance_2.json b/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/resistance_2.json
@@ -1,4 +1,5 @@
 {
+  "gene": "geneticsresequenced:resistance_2",
   "requirements": [
     "geneticsresequenced:resistance"
   ]
diff --git a/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/speed_2.json b/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/speed_2.json
@@ -1,4 +1,5 @@
 {
+  "gene": "geneticsresequenced:speed_2",
   "requirements": [
     "geneticsresequenced:speed"
   ]
diff --git a/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/speed_4.json b/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/speed_4.json
@@ -1,4 +1,5 @@
 {
+  "gene": "geneticsresequenced:speed_4",
   "requirements": [
     "geneticsresequenced:speed",
     "geneticsresequenced:speed_2"
diff --git a/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/strength_2.json b/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/strength_2.json
@@ -1,4 +1,5 @@
 {
+  "gene": "geneticsresequenced:strength_2",
   "requirements": [
     "geneticsresequenced:strength"
   ]
diff --git a/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/web_defense.json b/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/web_defense.json
@@ -1,4 +1,5 @@
 {
+  "gene": "geneticsresequenced:web_defense",
   "requirements": [
     "geneticsresequenced:weaving"
   ]
diff --git a/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/web_walker.json b/src/generated/resources/data/geneticsresequenced/geneticsresequenced/gene_requirements/web_walker.json
@@ -1,4 +1,5 @@
 {
+  "gene": "geneticsresequenced:web_walker",
   "requirements": [
     "geneticsresequenced:weaving"
   ]
diff --git a/src/main/kotlin/dev/aaronhowser/mods/geneticsresequenced/data/GeneRequirements.kt b/src/main/kotlin/dev/aaronhowser/mods/geneticsresequenced/data/GeneRequirements.kt
@@ -12,49 +12,52 @@ import net.minecraft.core.Registry
 import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
 
-object GeneRequirements {
+class GeneRequirements(
+	val gene: ResourceKey<Gene>,
+	val requirements: List<ResourceKey<Gene>>
+) {
 
-	val REGISTRY_KEY: ResourceKey<Registry<GeneRequirementsData>> =
-		ResourceKey.createRegistryKey(
-			ResourceLocation.fromNamespaceAndPath(
-				GeneticsResequenced.ID,
-				"gene_requirements"
+	companion object {
+		val REGISTRY_KEY: ResourceKey<Registry<GeneRequirements>> =
+			ResourceKey.createRegistryKey(
+				ResourceLocation.fromNamespaceAndPath(
+					GeneticsResequenced.ID,
+					"gene_requirements"
+				)
 			)
-		)
-
-	data class GeneRequirementsData(
-		val requirements: List<ResourceKey<Gene>>
-	) {
-		companion object {
-			val CODEC: Codec<GeneRequirementsData> =
-				RecordCodecBuilder.create { instance ->
-					instance.group(
-						ResourceKey.codec(ModGenes.GENE_REGISTRY_KEY)
-							.listOf()
-							.fieldOf("requirements")
-							.forGetter(GeneRequirementsData::requirements)
-					).apply(instance, ::GeneRequirementsData)
-				}
+
+		val CODEC: Codec<GeneRequirements> =
+			RecordCodecBuilder.create { instance ->
+				instance.group(
+					ResourceKey.codec(ModGenes.GENE_REGISTRY_KEY)
+						.fieldOf("gene")
+						.forGetter(GeneRequirements::gene),
+					ResourceKey.codec(ModGenes.GENE_REGISTRY_KEY)
+						.listOf()
+						.fieldOf("requirements")
+						.forGetter(GeneRequirements::requirements)
+				).apply(instance, ::GeneRequirements)
+			}
+
+		fun getRequiredGeneHolders(
+			gene: Holder<Gene>,
+			registries: HolderLookup.Provider
+		): Set<Holder<Gene>> {
+			val registry = registries.lookupOrThrow(REGISTRY_KEY)
+			val geneRk = gene.key ?: return emptySet()
+			val geneRequirementsRk = ResourceKey.create(REGISTRY_KEY, geneRk.location())
+
+			val requirementsData = registry
+				.get(geneRequirementsRk)
+				.orElse(null)
+				?: return emptySet()
+
+			return requirementsData
+				.value()
+				.requirements
+				.map { it.getHolderOrThrow(registries) }
+				.toSet()
 		}
 	}
 
-	fun getRequiredGeneHolders(
-		gene: Holder<Gene>,
-		registries: HolderLookup.Provider
-	): Set<Holder<Gene>> {
-		val registry = registries.lookupOrThrow(REGISTRY_KEY)
-		val geneRk = gene.key ?: return emptySet()
-		val geneRequirementsRk = ResourceKey.create(REGISTRY_KEY, geneRk.location())
-
-		val requirementsData = registry
-			.get(geneRequirementsRk)
-			.orElse(null)
-			?: return emptySet()
-
-		return requirementsData
-			.value()
-			.requirements
-			.map { it.getHolderOrThrow(registries) }
-			.toSet()
-	}
 }
diff --git a/src/main/kotlin/dev/aaronhowser/mods/geneticsresequenced/datagen/gene/ModGeneRequirementsProvider.kt b/src/main/kotlin/dev/aaronhowser/mods/geneticsresequenced/datagen/gene/ModGeneRequirementsProvider.kt
@@ -16,12 +16,12 @@ class ModGeneRequirementsProvider(
 	output: PackOutput,
 	lookupProvider: CompletableFuture<HolderLookup.Provider>,
 	existingFileHelper: ExistingFileHelper
-) : JsonCodecProvider<GeneRequirements.GeneRequirementsData>(
+) : JsonCodecProvider<GeneRequirements>(
 	output,
 	PackOutput.Target.DATA_PACK,
 	"geneticsresequenced/gene_requirements",
 	PackType.SERVER_DATA,
-	GeneRequirements.GeneRequirementsData.CODEC,
+	GeneRequirements.CODEC,
 	lookupProvider,
 	GeneticsResequenced.ID,
 	existingFileHelper
@@ -33,7 +33,8 @@ class ModGeneRequirementsProvider(
 	) {
 		unconditional(
 			geneRk.location(),
-			GeneRequirements.GeneRequirementsData(
+			GeneRequirements(
+				geneRk,
 				requirements.toList()
 			)
 		)
diff --git a/src/main/kotlin/dev/aaronhowser/mods/geneticsresequenced/event/CommonEvents.kt b/src/main/kotlin/dev/aaronhowser/mods/geneticsresequenced/event/CommonEvents.kt
@@ -56,8 +56,8 @@ object CommonEvents {
 
 		event.dataPackRegistry(
 			GeneRequirements.REGISTRY_KEY,
-			GeneRequirements.GeneRequirementsData.CODEC,
-			GeneRequirements.GeneRequirementsData.CODEC
+			GeneRequirements.CODEC,
+			GeneRequirements.CODEC
 		)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ "gene": "geneticsresequenced:bountiful_2",`
`2`	`3`	`"requirements": [`
`3`	`4`	`"geneticsresequenced:bountiful"`
`4`	`5`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ "gene": "geneticsresequenced:claws_2",`
`2`	`3`	`"requirements": [`
`3`	`4`	`"geneticsresequenced:claws"`
`4`	`5`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ "gene": "geneticsresequenced:efficiency_4",`
`2`	`3`	`"requirements": [`
`3`	`4`	`"geneticsresequenced:efficiency"`
`4`	`5`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ "gene": "geneticsresequenced:flight",`
`2`	`3`	`"requirements": [`
`3`	`4`	`"geneticsresequenced:teleport",`
`4`	`5`	`"geneticsresequenced:step_assist",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ "gene": "geneticsresequenced:haste_2",`
`2`	`3`	`"requirements": [`
`3`	`4`	`"geneticsresequenced:haste"`
`4`	`5`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ "gene": "geneticsresequenced:lava_proof",`
`2`	`3`	`"requirements": [`
`3`	`4`	`"geneticsresequenced:fire_proof"`
`4`	`5`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ "gene": "geneticsresequenced:meaty_2",`
`2`	`3`	`"requirements": [`
`3`	`4`	`"geneticsresequenced:meaty"`
`4`	`5`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ "gene": "geneticsresequenced:more_hearts_2",`
`2`	`3`	`"requirements": [`
`3`	`4`	`"geneticsresequenced:more_hearts"`
`4`	`5`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ "gene": "geneticsresequenced:photosynthesis",`
`2`	`3`	`"requirements": [`
`3`	`4`	`"geneticsresequenced:eat_grass",`
`4`	`5`	`"geneticsresequenced:thorns"`