blocks: move material, hardness to block

This commit is contained in:
Bixilon 2023-03-02 19:46:07 +01:00
parent 5c364374f8
commit 329d342c49
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4

View File

@ -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) {