From 329d342c4900bbbda8632e474b0a11de3f26a95d Mon Sep 17 00:00:00 2001 From: Bixilon Date: Thu, 2 Mar 2023 19:46:07 +0100 Subject: [PATCH] blocks: move material, hardness to block --- .../pixlyzer/generator/generators/BlockGenerator.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/BlockGenerator.kt b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/BlockGenerator.kt index 08ba5cf..4965dbc 100644 --- a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/BlockGenerator.kt +++ b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/BlockGenerator.kt @@ -104,6 +104,9 @@ object BlockGenerator : Generator( ID_LIST_GET_METHOD.invoke(blockColorProviderList, BlockGenerator.REGISTRY.getRawId(block)) != null } + blockData["material"] = MaterialGenerator.MATERIALS.inverse()[block.material].toString() + blockData["hardness"] = block.hardness + val states = compound() // tints @@ -111,6 +114,7 @@ object BlockGenerator : Generator( Blocks.LARGE_FERN, Blocks.TALL_GRASS -> { blockData["tint"] = "minecraft:shearing_double_plant_tint" } + Blocks.GRASS_BLOCK, Blocks.FERN, Blocks.GRASS, Blocks.POTTED_FERN -> { blockData["tint"] = "minecraft:grass_tint" } @@ -154,15 +158,12 @@ object BlockGenerator : Generator( REQUIRES_CORRECT_TOOL_FOR_DROP_FIELDS?.let { stateData["requires_tool"] = it.getBoolean(state) } - stateData["hardness"] = BLOCK_STATE_GET_HARDNESS_METHOD.invoke(state, null, BlockPos(0, 0, 0)) as Float if (!state.isOpaque) { stateData["is_opaque"] = state.isOpaque } - stateData["material"] = MaterialGenerator.MATERIALS.inverse()[state.getMaterial()].toString() - try { if (hasColorProperties) {