From 2bc4ea31881288a39937fee1f6d7c06b43e04d2a Mon Sep 17 00:00:00 2001 From: Eli Gibbs Date: Thu, 15 Jan 2026 17:22:16 -0500 Subject: [PATCH] datagen continuation --- .../datagen/ModBlockStateProvider.java | 57 ------------------- minecraftforge/legacy.gradle.kts | 10 +++- neoforge/build.gradle.kts | 10 +++- 3 files changed, 14 insertions(+), 63 deletions(-) diff --git a/common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockStateProvider.java b/common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockStateProvider.java index e5cc104..2285e8c 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockStateProvider.java +++ b/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()); diff --git a/minecraftforge/legacy.gradle.kts b/minecraftforge/legacy.gradle.kts index 66152ea..0662e8d 100644 --- a/minecraftforge/legacy.gradle.kts +++ b/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, - "--existing", file("src/main/resources").absolutePath, - "--existing", project(":common").file("src/main/resources").absolutePath + "--output", generatedResources, + "--existing", localResources, + "--existing", commonResources ) } register("server") { diff --git a/neoforge/build.gradle.kts b/neoforge/build.gradle.kts index bbbbf42..1a0a8f3 100644 --- a/neoforge/build.gradle.kts +++ b/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, - "--existing", file("src/main/resources").absolutePath, - "--existing", project(":common").file("src/main/resources").absolutePath + "--output", generatedResources, + "--existing", localResources, + "--existing", commonResources ) } }