datagen continuation

common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockStateProvider.java

@@ -45,79 +45,22 @@ public class ModBlockStateProvider {
     }
     
     public static void registerBlockStates(BlockStateHelper helper) {
-        //? if >1.20.1 {
-        /*if (ModBlocks.ROYAL_FERN.isPresent()) {
              helper.crossBlock(ModBlocks.ROYAL_FERN.get(), 
                  modLoc("block/" + ModBlocks.ROYAL_FERN.getId().getPath()));
-        }
-        if (ModBlocks.POTTED_ROYAL_FERN.isPresent()) {
              helper.pottedPlantBlock(ModBlocks.POTTED_ROYAL_FERN.get(), 
                  modLoc("block/" + ModBlocks.ROYAL_FERN.getId().getPath()));
-        }
-
-        if (ModBlocks.HORSETAIL_FERN.isPresent()) {
              helper.crossBlock(ModBlocks.HORSETAIL_FERN.get(), 
                  modLoc("block/" + ModBlocks.HORSETAIL_FERN.getId().getPath()));
-        }
-        if (ModBlocks.POTTED_HORSETAIL_FERN.isPresent()) {
              helper.pottedPlantBlock(ModBlocks.POTTED_HORSETAIL_FERN.get(), 
                  modLoc("block/" + ModBlocks.HORSETAIL_FERN.getId().getPath()));
-        }
-
-        if (ModBlocks.WESTERN_SWORD_FERN.isPresent()) {
              helper.crossBlock(ModBlocks.WESTERN_SWORD_FERN.get(), 
                  modLoc("block/" + ModBlocks.WESTERN_SWORD_FERN.getId().getPath()));
-        }
-        if (ModBlocks.POTTED_WESTERN_SWORD_FERN.isPresent()) {
              helper.pottedPlantBlock(ModBlocks.POTTED_WESTERN_SWORD_FERN.get(), 
                  modLoc("block/" + ModBlocks.WESTERN_SWORD_FERN.getId().getPath()));
-        }
-
-        if (ModBlocks.ONYCHIOPSIS.isPresent()) {
              helper.crossBlock(ModBlocks.ONYCHIOPSIS.get(), 
                  modLoc("block/" + ModBlocks.ONYCHIOPSIS.getId().getPath()));
-        }
-        if (ModBlocks.POTTED_ONYCHIOPSIS.isPresent()) {
              helper.pottedPlantBlock(ModBlocks.POTTED_ONYCHIOPSIS.get(), 
                  modLoc("block/" + ModBlocks.ONYCHIOPSIS.getId().getPath()));
-        }
-        *///?} else {
-        if (ModBlocks.ROYAL_FERN.isPresent()) {
-             helper.crossBlock(ModBlocks.ROYAL_FERN.get(), 
-                 modLoc("block/" + ModBlocks.ROYAL_FERN.getId().getPath()));
-        }
-        if (ModBlocks.POTTED_ROYAL_FERN.isPresent()) {
-             helper.pottedPlantBlock(ModBlocks.POTTED_ROYAL_FERN.get(), 
-                 modLoc("block/" + ModBlocks.ROYAL_FERN.getId().getPath()));
-        }
-
-        if (ModBlocks.HORSETAIL_FERN.isPresent()) {
-             helper.crossBlock(ModBlocks.HORSETAIL_FERN.get(), 
-                 modLoc("block/" + ModBlocks.HORSETAIL_FERN.getId().getPath()));
-        }
-        if (ModBlocks.POTTED_HORSETAIL_FERN.isPresent()) {
-             helper.pottedPlantBlock(ModBlocks.POTTED_HORSETAIL_FERN.get(), 
-                 modLoc("block/" + ModBlocks.HORSETAIL_FERN.getId().getPath()));
-        }
-
-        if (ModBlocks.WESTERN_SWORD_FERN.isPresent()) {
-             helper.crossBlock(ModBlocks.WESTERN_SWORD_FERN.get(), 
-                 modLoc("block/" + ModBlocks.WESTERN_SWORD_FERN.getId().getPath()));
-        }
-        if (ModBlocks.POTTED_WESTERN_SWORD_FERN.isPresent()) {
-             helper.pottedPlantBlock(ModBlocks.POTTED_WESTERN_SWORD_FERN.get(), 
-                 modLoc("block/" + ModBlocks.WESTERN_SWORD_FERN.getId().getPath()));
-        }
-
-        if (ModBlocks.ONYCHIOPSIS.isPresent()) {
-             helper.crossBlock(ModBlocks.ONYCHIOPSIS.get(), 
-                 modLoc("block/" + ModBlocks.ONYCHIOPSIS.getId().getPath()));
-        }
-        if (ModBlocks.POTTED_ONYCHIOPSIS.isPresent()) {
-             helper.pottedPlantBlock(ModBlocks.POTTED_ONYCHIOPSIS.get(), 
-                 modLoc("block/" + ModBlocks.ONYCHIOPSIS.getId().getPath()));
-        }
-        //?}
         
         helper.blockWithItem(ModBlocks.GYPSUM_STONE.get());
         helper.blockWithItem(ModBlocks.GYPSUM_COBBLESTONE.get());

minecraftforge/legacy.gradle.kts

@@ -65,6 +65,10 @@ legacyForge {
 	accessTransformers.from(at.absolutePath)
 	validateAccessTransformers = true
 
+    val commonResources = project(":common").file("src/main/resources").absolutePath
+    val localResources = project.file("src/main/resources").absolutePath
+    val generatedResources = project.file("src/generated/resources").absolutePath
+
 	runs {
 		register("client") {
 			client()
@@ -83,9 +87,9 @@ legacyForge {
 			programArguments.addAll(
 				"--mod", commonMod.id,
 				"--all",
-				"--output", file("src/generated/resources").absolutePath,
+				"--output", generatedResources,
-				"--existing", file("src/main/resources").absolutePath,
+				"--existing", localResources,
-				"--existing", project(":common").file("src/main/resources").absolutePath
+				"--existing", commonResources
 			)
 		}
 		register("server") {

neoforge/build.gradle.kts

@@ -66,6 +66,10 @@ neoForge {
 	accessTransformers.from(at.absolutePath)
 	validateAccessTransformers = true
 
+    val commonResources = project(":common").file("src/main/resources").absolutePath
+    val localResources = project.file("src/main/resources").absolutePath
+    val generatedResources = project.file("src/generated/resources").absolutePath
+
 	runs {
 		register("client") {
 			client()
@@ -87,9 +91,9 @@ neoForge {
 				programArguments.addAll(
 					"--mod", commonMod.id,
 					"--all",
-					"--output", file("src/generated/resources").absolutePath,
+					"--output", generatedResources,
-					"--existing", file("src/main/resources").absolutePath,
+					"--existing", localResources,
-					"--existing", project(":common").file("src/main/resources").absolutePath
+					"--existing", commonResources
 				)
 			}
 		}