diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt index 29dfcf112..f4fc8279e 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt @@ -134,7 +134,7 @@ object DataGen { blockStateProvider.simplePillar(block) } - fun decorativeLadder(block: Block){ + fun decorativeLadder(block: Block) { blockModelProvider.decorativeLadder(block) blockStateProvider.simpleLadder(block) } diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt index 41f2be4ed..a5d71a1e0 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt @@ -265,7 +265,6 @@ fun addDecorativeData(blockStateProvider: MatteryBlockStateProvider, itemModelPr itemModelProvider.generatedBlockDecorative(MItems.INDUSTRIAL_LADDER) - itemModelProvider.block(MItems.TIRE_BLOCK) blockStateProvider.block(MBlocks.METAL_BEAM_CENTER) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/MatteryBlockStateProvider.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/MatteryBlockStateProvider.kt index 5ee909877..4f628d2c8 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/MatteryBlockStateProvider.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/MatteryBlockStateProvider.kt @@ -124,19 +124,29 @@ class MatteryBlockStateProvider(event: GatherDataEvent) : BlockStateProvider(eve fun simpleLadder(vararg blocks: Block): MatteryBlockStateProvider { for (block in blocks) { exec { - getVariantBuilder(block) .partialState().with(HorizontalDirectionalBlock.FACING, Direction.NORTH) - .modelForState().modelFile(models().getExistingFile(modLocation("block/decorative/${block.registryName!!.path}"))).addModel() + .modelForState() + .modelFile(models().getExistingFile(modLocation("block/${block.registryName!!.path}"))) + .addModel() .partialState().with(HorizontalDirectionalBlock.FACING, Direction.SOUTH) - .modelForState().modelFile(models().getExistingFile(modLocation("block/decorative/${block.registryName!!.path}"))).rotationY(180).addModel() + .modelForState() + .modelFile(models().getExistingFile(modLocation("block/${block.registryName!!.path}"))) + .rotationY(180) + .addModel() .partialState().with(HorizontalDirectionalBlock.FACING, Direction.WEST) - .modelForState().modelFile(models().getExistingFile(modLocation("block/decorative/${block.registryName!!.path}"))).rotationY(270).addModel() + .modelForState() + .modelFile(models().getExistingFile(modLocation("block/${block.registryName!!.path}"))) + .rotationY(270) + .addModel() .partialState().with(HorizontalDirectionalBlock.FACING, Direction.EAST) - .modelForState().modelFile(models().getExistingFile(modLocation("block/decorative/${block.registryName!!.path}"))).rotationY(90).addModel() + .modelForState() + .modelFile(models().getExistingFile(modLocation("block/${block.registryName!!.path}"))) + .rotationY(90) + .addModel() } }