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 e129edac9..b17950ceb 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt @@ -303,6 +303,7 @@ fun addDecorativeData(blockStateProvider: MatteryBlockStateProvider, itemModelPr } DataGen.bars(MBlocks.TRITANIUM_BARS, modLocation("block/decorative/tritanium_bars")) + DataGen.bars(MBlocks.METAL_RAILING, modLocation("block/decorative/metal_railing")) blockStateProvider.block(MBlocks.ENGINE) itemModelProvider.block(MItems.ENGINE) 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 bafe556be..2b176979f 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 @@ -23,6 +23,7 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.block(MItems.METAL_JUNK, MItems.METAL_JUNK.registryName!!.path + "_a") provider.block(MItems.METAL_MESH) provider.generatedTranslucent(MItems.TRITANIUM_BARS, modLocation("block/decorative/tritanium_bars")) + provider.generatedTranslucent(MItems.METAL_RAILING, modLocation("block/decorative/metal_railing")) provider.block(MItems.DEEPSLATE_TRITANIUM_ORE) provider.block(MItems.TRITANIUM_ORE) provider.blocks(MItems.TRITANIUM_STRIPED_BLOCK.values) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt index 7271e56c4..b57c3d6f1 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt @@ -589,7 +589,7 @@ private fun blocks(provider: MatteryLanguageProvider) { add(MBlocks.CARBON_FIBRE_BLOCK, "Carbon Fibre Block") add(MBlocks.METAL_JUNK, "Metal Junk Block") add(MBlocks.METAL_JUNK, "desc", "Useless junk, or is it?") - add(MBlocks.METAL_MESH, "Metal Mesh") + add(MBlocks.METAL_MESH, "Metal Grate") add(MBlocks.TRITANIUM_ORE, "Tritanium Ore") add(MBlocks.DEEPSLATE_TRITANIUM_ORE, "Deepslate Tritanium Ore") @@ -625,6 +625,7 @@ private fun blocks(provider: MatteryLanguageProvider) { add(MBlocks.TRITANIUM_TRAPDOOR[null]!!, "description1", "...feeling safe now?") add(MBlocks.TRITANIUM_BARS, "Tritanium Bars") + add(MBlocks.METAL_RAILING, "Metal Railing") for (block in MBlocks.TRITANIUM_ANVIL) add(block, "Tritanium Anvil") diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt index ccdba5415..c264d6c6f 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt @@ -588,7 +588,7 @@ private fun blocks(provider: MatteryLanguageProvider) { addBlock(MBlocks.ENERGY_SERVO.values, "desc", "Заряжает, разряжает и передаёт энергию между предметами") add(MBlocks.CARBON_FIBRE_BLOCK, "Блок углеродных трубок") - add(MBlocks.METAL_MESH, "Блок металлической сетки") + add(MBlocks.METAL_MESH, "Металлическая решётка") add(MBlocks.METAL_JUNK, "Металлический хлам") add(MBlocks.METAL_JUNK, "desc", "Бесполезный хлам, или нет?") @@ -626,6 +626,7 @@ private fun blocks(provider: MatteryLanguageProvider) { add(MBlocks.TRITANIUM_TRAPDOOR[null]!!, "description1", FEELING_SAFE_NOW) add(MBlocks.TRITANIUM_BARS, "Тритановая решётка") + add(MBlocks.METAL_RAILING, "Металлические перила") for (block in MBlocks.TRITANIUM_ANVIL) add(block, "Тритановая наковальня") diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt index d8497f145..ae287ea26 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt @@ -266,6 +266,7 @@ fun addTags(tagsProvider: TagsProvider) { MBlocks.METAL_JUNK, MBlocks.METAL_MESH, MBlocks.TRITANIUM_BARS, + MBlocks.METAL_RAILING, MBlocks.ENGINE, MBlocks.HOLO_SIGN, diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt index bb4e4b231..61957ba4b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt @@ -211,7 +211,7 @@ object MBlocks { TransparentBlock(BlockBehaviour.Properties.of() .mapColor(MapColor.COLOR_GRAY) .noOcclusion() - .sound(SoundType.COPPER).explosionResistance(30f) + .sound(SoundType.COPPER_GRATE).explosionResistance(30f) .destroyTime(2f).requiresCorrectToolForDrops()) } @@ -225,6 +225,16 @@ object MBlocks { .requiresCorrectToolForDrops()) } + val METAL_RAILING: IronBarsBlock by registry.register(MNames.METAL_RAILING) { + IronBarsBlock(BlockBehaviour.Properties.of() + .mapColor(MapColor.COLOR_GRAY) + .sound(SoundType.COPPER_GRATE) + .explosionResistance(45f) + .noOcclusion() + .destroyTime(2.5f) + .requiresCorrectToolForDrops()) + } + val DEEPSLATE_TRITANIUM_ORE: Block by registry.register(MNames.DEEPSLATE_TRITANIUM_ORE) { DropExperienceBlock( UniformInt.of(0, 3), BlockBehaviour.Properties.of() @@ -275,7 +285,7 @@ object MBlocks { val TRITANIUM_STRIPED_BLOCK = registry.colored(MNames.TRITANIUM_STRIPED_BLOCK) { Block( BlockBehaviour.Properties.of() .mapColor(MapColor.COLOR_LIGHT_BLUE) - .sound(SoundType.BASALT) + .sound(SoundType.DEEPSLATE) .requiresCorrectToolForDrops() .explosionResistance(80f) .destroyTime(2.5f) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MCreativeTabs.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MCreativeTabs.kt index 730f28e94..b8da38b33 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MCreativeTabs.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MCreativeTabs.kt @@ -237,6 +237,7 @@ private fun addDecorativeTabItems(consumer: CreativeModeTab.Output) { accept(MItems.METAL_MESH) accept(MItems.TRITANIUM_BARS) + accept(MItems.METAL_RAILING) colored(MItems.TRITANIUM_DOOR) colored(MItems.TRITANIUM_TRAPDOOR) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt index 9032d1df8..ece9ebf36 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt @@ -320,6 +320,7 @@ object MItems { val TRITANIUM_INGOT: Item by registry.register(MNames.TRITANIUM_INGOT) { Item(DEFAULT_PROPERTIES) } val TRITANIUM_INGOT_BLOCK: BlockItem by registry.register(MNames.TRITANIUM_INGOT_BLOCK) { BlockItem(MBlocks.TRITANIUM_INGOT_BLOCK, DEFAULT_PROPERTIES) } val TRITANIUM_BARS: BlockItem by registry.register(MNames.TRITANIUM_BARS) { BlockItem(MBlocks.TRITANIUM_BARS, DEFAULT_PROPERTIES) } + val METAL_RAILING: BlockItem by registry.register(MNames.METAL_RAILING) { BlockItem(MBlocks.METAL_RAILING, DEFAULT_PROPERTIES) } val REDSTONE_INTERACTOR: RedstoneInteractorItem by registry.register("redstone_interactor") { RedstoneInteractorItem() } 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 890c37f48..52fc4f415 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt @@ -177,6 +177,7 @@ object MNames { const val TRITANIUM_INGOT = "tritanium_ingot" const val TRITANIUM_INGOT_BLOCK = "tritanium_ingot_block" const val TRITANIUM_BARS = "tritanium_bars" + const val METAL_RAILING = "metal_railing" const val MATTER_IO_PORT = "matter_io_port" const val MATTER_TRANSFORM_MATRIX = "matter_transform_matrix" diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt index 7c21ea9af..5ddc1efae 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt @@ -98,7 +98,7 @@ object MRegistry : IBlockItemRegistryAcceptor { val TRITANIUM_BLOCK = DecorativeBlock.simple(MNames.TRITANIUM_BLOCK) { BlockBehaviour.Properties.of() .mapColor(it?.mapColor ?: MapColor.COLOR_LIGHT_BLUE) - .sound(SoundType.BASALT) + .sound(SoundType.DEEPSLATE) .requiresCorrectToolForDrops() .explosionResistance(80f) .destroyTime(2.5f) @@ -127,7 +127,7 @@ object MRegistry : IBlockItemRegistryAcceptor { val VENT = DecorativeBlock.simple(MNames.VENT) { BlockBehaviour.Properties.of() .mapColor(it?.mapColor ?: MapColor.COLOR_LIGHT_BLUE) - .sound(SoundType.BASALT) + .sound(SoundType.DEEPSLATE) .requiresCorrectToolForDrops() .explosionResistance(20f) .destroyTime(1.5f) @@ -136,7 +136,7 @@ object MRegistry : IBlockItemRegistryAcceptor { val VENT_ALTERNATIVE = DecorativeBlock.simple(MNames.VENT_ALTERNATIVE) { BlockBehaviour.Properties.of() .mapColor(it?.mapColor ?: MapColor.COLOR_LIGHT_BLUE) - .sound(SoundType.BASALT) + .sound(SoundType.DEEPSLATE) .requiresCorrectToolForDrops() .explosionResistance(20f) .destroyTime(1.5f) @@ -210,7 +210,7 @@ object MRegistry : IBlockItemRegistryAcceptor { val TRITANIUM_STRIPED_BLOCK = StripedColoredDecorativeBlock(MNames.TRITANIUM_STRIPED_BLOCK, { colorA, _ -> Block(BlockBehaviour.Properties.of() .mapColor(colorA.mapColor) - .sound(SoundType.BASALT) + .sound(SoundType.DEEPSLATE) .requiresCorrectToolForDrops() .explosionResistance(80f) .strength(4f)) diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/metal_railing.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/metal_railing.png new file mode 100644 index 000000000..4e0bce6ab Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/metal_railing.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/grill.png b/src/main/resources/assets/overdrive_that_matters/textures/block/grill.png new file mode 100644 index 000000000..27a99f236 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/grill.png differ