diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockModels.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockModels.kt index e2fc7ee98..cd43ba0ff 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockModels.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockModels.kt @@ -35,9 +35,12 @@ fun addBlockModels(provider: MatteryBlockModelProvider) { cubeAll(MBlocks.ENERGY_OUTPUT_INTERFACE) cubeAll(MBlocks.TRITANIUM_HULL) - cubeAll(MBlocks.WOODEN_CRATE) + provider.exec { + provider.cubeAll("wooden_crate_decorative", modLocation("block/wooden_crate")) + } + orientable(MBlocks.MATTER_INPUT_HATCH,"block/tritanium_hull","block/matter_input_hatch") orientable(MBlocks.MATTER_OUTPUT_HATCH,"block/tritanium_hull","block/matter_output_hatch") diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt index fdb745242..92d3fab00 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt @@ -353,6 +353,7 @@ fun addBlockStates(provider: MatteryBlockStateProvider) { provider.block(MBlocks.TRITANIUM_HULL) provider.block(MBlocks.WOODEN_CRATE) + provider.block(MBlocks.WOODEN_CRATE_DECORATIVE) provider.block(MBlocks.FLYWHEEL_HOUSING) provider.block(MBlocks.FLYWHEEL_BEARING) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt index 766e74fcb..3a9d03285 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt @@ -267,6 +267,7 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.block(MItems.TRITANIUM_HULL) provider.block(MItems.WOODEN_CRATE) + provider.block(MItems.WOODEN_CRATE_DECORATIVE) provider.block(MItems.GENERATOR_BLOCK) provider.block(MItems.ENERGY_INPUT_INTERFACE) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt index 656616b15..340ebc20e 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt @@ -134,6 +134,12 @@ class MatteryBlockModelProvider(event: GatherDataEvent) : BlockModelProvider(eve } } + fun cubeBottomTop(block: Block, side: String, bottom: String, top: String){ + exec { + cubeBottomTop(block.registryName!!.path, modLocation(side), modLocation(bottom), modLocation(top)) + } + } + fun decorativeColumn(it: Block, side: String, end: String) { column(it, "block/decorative/$side", "block/decorative/$end") } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt index 24920c772..b44ceaaee 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt @@ -34,6 +34,7 @@ object MNames { const val PAINTER = "painter" const val MATTER_ENTANGLER = "matter_entangler" + const val WOODEN_CRATE_DECORATIVE = "wooden_crate_decorative" const val WOODEN_CRATE = "wooden_crate" // blocks diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MBlocks.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MBlocks.kt index 2620163d9..c623ce65c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MBlocks.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MBlocks.kt @@ -470,11 +470,21 @@ object MBlocks { BlockBehaviour.Properties.of() .mapColor(MapColor.COLOR_BROWN) .sound(SoundType.WOOD) - .destroyTime(1f) + .destroyTime(0.5f) .explosionResistance(1f) ) } + val WOODEN_CRATE_DECORATIVE: Block by registry.register(MNames.WOODEN_CRATE_DECORATIVE) { + Block( + BlockBehaviour.Properties.of() + .mapColor(MapColor.COLOR_BROWN) + .sound(SoundType.WOOD) + .destroyTime(1f) + .explosionResistance(1f) + ) + } + init { MRegistry.registerBlocks(registry) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MItems.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MItems.kt index 4551e4f86..27d42cceb 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MItems.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MItems.kt @@ -693,7 +693,9 @@ object MItems { val CONFIGURATOR: Item by registry.register(MNames.CONFIGURATOR) { ConfiguratorItem() } val SMALL_CAPSULE by registry.register(MNames.SMALL_CAPSULE) { BlockItem(MBlocks.SMALL_CAPSULE, DEFAULT_PROPERTIES) } + val WOODEN_CRATE by registry.register(MNames.WOODEN_CRATE) { BlockItem(MBlocks.WOODEN_CRATE, DEFAULT_PROPERTIES) } + val WOODEN_CRATE_DECORATIVE by registry.register(MNames.WOODEN_CRATE_DECORATIVE) { BlockItem(MBlocks.WOODEN_CRATE_DECORATIVE, DEFAULT_PROPERTIES) } init { MRegistry.registerItems(registry) diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/wooden_crate_loot.png b/src/main/resources/assets/overdrive_that_matters/textures/block/wooden_crate_loot.png new file mode 100644 index 000000000..2f175b66a Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/wooden_crate_loot.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/wooden_crate_loot_top.png b/src/main/resources/assets/overdrive_that_matters/textures/block/wooden_crate_loot_top.png new file mode 100644 index 000000000..568080f68 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/wooden_crate_loot_top.png differ