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 31d960642..e2fc7ee98 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 @@ -36,6 +36,8 @@ fun addBlockModels(provider: MatteryBlockModelProvider) { cubeAll(MBlocks.TRITANIUM_HULL) + cubeAll(MBlocks.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 13b574356..fdb745242 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 @@ -352,6 +352,8 @@ fun addBlockStates(provider: MatteryBlockStateProvider) { provider.block(MBlocks.TRITANIUM_HULL) + provider.block(MBlocks.WOODEN_CRATE) + provider.block(MBlocks.FLYWHEEL_HOUSING) provider.block(MBlocks.FLYWHEEL_BEARING) provider.block(MBlocks.FLYWHEEL_SHAFT) 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 01f193fb3..766e74fcb 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 @@ -266,6 +266,8 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.block(MItems.TRITANIUM_HULL) + provider.block(MItems.WOODEN_CRATE) + provider.block(MItems.GENERATOR_BLOCK) provider.block(MItems.ENERGY_INPUT_INTERFACE) provider.block(MItems.ENERGY_OUTPUT_INTERFACE) 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 408948d2f..24920c772 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt @@ -33,7 +33,8 @@ object MNames { const val MATTER_OUTPUT_HATCH = "matter_output_hatch" const val PAINTER = "painter" const val MATTER_ENTANGLER = "matter_entangler" - const val TRITANIUM_HULL = "tritanium_hull" + + const val WOODEN_CRATE = "wooden_crate" // blocks const val ANDROID_STATION = "android_station" @@ -68,6 +69,7 @@ object MNames { const val FLYWHEEL_SHAFT = "flywheel_shaft" const val FLYWHEEL_HOUSING = "flywheel_housing" + const val TRITANIUM_HULL = "tritanium_hull" const val GENERATOR_BLOCK = "generator_block" const val MODULAR_FRAME = "modular_frame" const val HEAVY_MODULAR_FRAME = "heavy_modular_frame" diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MBlockEntities.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MBlockEntities.kt index b5f8e80df..484370ef7 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MBlockEntities.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MBlockEntities.kt @@ -122,6 +122,7 @@ object MBlockEntities { val BREAKABLE: BlockEntityType by registry.register("breakable") { val blocks = ArrayList() blocks.add(MBlocks.SMALL_CAPSULE) + blocks.add(MBlocks.WOODEN_CRATE) BlockEntityType.Builder.of(::BreakableContainerBlockEntity, *blocks.toTypedArray()).build(null) } 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 d2706b4d6..2620163d9 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 @@ -465,6 +465,16 @@ object MBlocks { ) } + val WOODEN_CRATE by registry.register(MNames.WOODEN_CRATE) { + BreakableContainerBlock( + 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 183ef7c27..4551e4f86 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,6 +693,7 @@ 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) } init { MRegistry.registerItems(registry) diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/wooden_crate.png b/src/main/resources/assets/overdrive_that_matters/textures/block/wooden_crate.png new file mode 100644 index 000000000..7e92a22c2 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/wooden_crate.png differ