DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 64 Pull Requests Packages Releases Wiki Activity

Merge remote-tracking branch 'origin/1.21' into 1.21

Browse Source
This commit is contained in:
DBotThePony 2025-01-11 10:24:06 +07:00
commit 0673fbf352
Signed by: DBot
GPG Key ID: DCC23B5715498507
12 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt
View File

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

1
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt
View File

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

3
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt
View File

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

3
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt
View File

@ -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, "Тритановая наковальня")

1
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt
View File

@ -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,

14
src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt
View File

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

1
src/main/kotlin/ru/dbotthepony/mc/otm/registry/MCreativeTabs.kt
View File

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

1
src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt
View File

@ -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() }

1
src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt
View File

@ -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"

8
src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt
View File

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

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/decorative/metal_railing.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 458 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/grill.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 473 B