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 545302ddb..f0a8d5251 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt @@ -62,6 +62,11 @@ object DataGen { blockStateProvider.simpleBlockM(*blocks) } + private fun decorativeCubeAll(subdir: String, suffix: String, vararg blocks: Block) { + blockModelProvider.decorativeCubeAll(subdir, suffix, *blocks) + blockStateProvider.simpleBlockM(*blocks) + } + private fun decorativeCubeAll(blocks: List) { blockModelProvider.decorativeCubeAll(blocks) blockStateProvider.simpleBlockM(blocks) @@ -139,6 +144,46 @@ object DataGen { } } + private fun decoratives(subdir: String, list: ColoredDecorativeBlock) { + for (block in list.blocks.values) { + decorativeCubeAll(subdir, block) + } + + for (item in list.items.values) { + itemModelProvider.block(item) + } + } + + private fun decoratives(subdir: String, list: DecorativeBlock) { + for (block in list.blocks.values) { + decorativeCubeAll(subdir, block) + } + + for (item in list.items.values) { + itemModelProvider.block(item) + } + } + + private fun decoratives(subdir: String, suffix: String, list: ColoredDecorativeBlock) { + for (block in list.blocks.values) { + decorativeCubeAll(subdir, suffix, block) + } + + for (item in list.items.values) { + itemModelProvider.block(item) + } + } + + private fun decoratives(subdir: String, suffix: String, list: DecorativeBlock) { + for (block in list.blocks.values) { + decorativeCubeAll(subdir, suffix, block) + } + + for (item in list.items.values) { + itemModelProvider.block(item) + } + } + @SubscribeEvent @JvmStatic @Suppress("unused") @@ -165,7 +210,16 @@ object DataGen { event.generator.addProvider(true, lootTableProvider) event.generator.addProvider(true, lootModifier) - decorativeCubeAll(MBlocks.CRATE_LIST) + for ((color, block) in MRegistry.DECORATIVE_CRATE.allBlocks) { + if (color == null) { + blockModelProvider.decorativeCubeAll(block, "crates/crate_colorless_borderless") + } else { + blockModelProvider.decorativeCubeAll(block, "crates/crate_borderless_${color.name.lowercase()}") + } + + blockStateProvider.simpleBlockM(block) + } + decorativeCubeAll(MBlocks.CARBON_FIBRE_BLOCK) decoratives(MRegistry.TRITANIUM_BLOCK) @@ -393,7 +447,7 @@ object DataGen { generated(glass, ResourceLocation(MOD_ID, "block/decorative/${MRegistry.INDUSTRIAL_GLASS.allItems[color]!!.registryName!!.path}")) } - blocks(MItems.CRATE_LIST) + blocks(MRegistry.DECORATIVE_CRATE.allItems.values) components(MItems.DATAGEN_COMPONENTS) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/MatteryItemModelProvider.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/MatteryItemModelProvider.kt index 5828e6b8d..83d822ff2 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/MatteryItemModelProvider.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/MatteryItemModelProvider.kt @@ -55,7 +55,7 @@ class MatteryItemModelProvider(event: GatherDataEvent) : ItemModelProvider(event fun block(item: Item) = delegates.add(SimpleItemModel(item.registryName!!.path, ResourceLocation(DataGen.MOD_ID, "block/${item.registryName!!.path}"))) fun block(item: Item, path: String) = delegates.add(SimpleItemModel(item.registryName!!.path, ResourceLocation(DataGen.MOD_ID, "block/$path"))) fun blocks(vararg items: Item) = items.forEach(this::block) - fun blocks(items: List) = items.forEach(this::block) + fun blocks(items: Collection) = items.forEach(this::block) fun generated(item: Item, texture: ResourceLocation) { generated.add(SimpleItemModel(item.registryName!!.path, texture)) @@ -67,18 +67,18 @@ class MatteryItemModelProvider(event: GatherDataEvent) : ItemModelProvider(event fun generated(vararg items: Item) = items.forEach { generated(it, ResourceLocation(DataGen.MOD_ID, "item/${it.registryName!!.path}")) } fun KOT(vararg items: Item) = items.forEach { generated(it, ResourceLocation(DataGen.MOD_ID, "block/ph_kitty")) } - fun generated(items: List) = items.forEach { generated(it, ResourceLocation(DataGen.MOD_ID, "item/${it.registryName!!.path}")) } + fun generated(items: Collection) = items.forEach { generated(it, ResourceLocation(DataGen.MOD_ID, "item/${it.registryName!!.path}")) } fun generatedBlock(vararg items: Item) = items.forEach { generated(it, ResourceLocation(DataGen.MOD_ID, "block/${it.registryName!!.path}")) } fun generatedBlockDecorative(vararg items: Item) = items.forEach { generated(it, ResourceLocation(DataGen.MOD_ID, "block/decorative/${it.registryName!!.path}")) } fun handheld(vararg items: Item) = items.forEach { handheld(it, ResourceLocation(DataGen.MOD_ID, "item/${it.registryName!!.path}")) } - fun handheld(items: List) = items.forEach { handheld(it, ResourceLocation(DataGen.MOD_ID, "item/${it.registryName!!.path}")) } + fun handheld(items: Collection) = items.forEach { handheld(it, ResourceLocation(DataGen.MOD_ID, "item/${it.registryName!!.path}")) } fun generated(item: Item, prefix: String) = generated(item, ResourceLocation(DataGen.MOD_ID, "item/${prefix}${item.registryName!!.path}")) fun handheld(item: Item, prefix: String) = handheld(item, ResourceLocation(DataGen.MOD_ID, "item/${prefix}${item.registryName!!.path}")) fun component(item: Item) = generated(item, "component/") fun components(vararg items: Item) = items.forEach(this::component) - fun components(items: List) = items.forEach(this::component) + fun components(items: Collection) = items.forEach(this::component) fun resource(item: Item) = generated(item, "resources/") fun resources(vararg items: Item) = items.forEach(this::resource) @@ -91,7 +91,7 @@ class MatteryItemModelProvider(event: GatherDataEvent) : ItemModelProvider(event } } - fun generatedTiered(items: List, prefix: String) { + fun generatedTiered(items: Collection, prefix: String) { var i = 0 for (item in items) { 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 ca6e91217..b0e57ff4c 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 @@ -14,6 +14,7 @@ private fun decoratives(provider: MatteryLanguageProvider) { provider.englishColors.add(MRegistry.INDUSTRIAL_GLASS_PANE, "%s Stained Industrial Glass Pane") provider.englishColors.add(MRegistry.CARGO_CRATES, "%s Cargo Crate") + provider.englishColors.add(MRegistry.DECORATIVE_CRATE, "%s Container Block") with(provider.english) { add(MRegistry.CARGO_CRATES.block, "Cargo Crate") @@ -22,6 +23,8 @@ private fun decoratives(provider: MatteryLanguageProvider) { add(MRegistry.INDUSTRIAL_GLASS.block, "Industrial Glass") add(MRegistry.INDUSTRIAL_GLASS_PANE.block, "Industrial Glass Pane") + add(MRegistry.DECORATIVE_CRATE.block, "Rusty Container Block") + add(MRegistry.VENT.block, "Vent") add(MRegistry.VENT_ALTERNATIVE.block, "Alternative Vent") @@ -291,14 +294,6 @@ private fun blocks(provider: MatteryLanguageProvider) { add(MBlocks.MATTER_RECYCLER, "Matter Recycler") - add(MBlocks.CRATE_RED, "Red Container Block") - add(MBlocks.CRATE_BLUE, "Blue Container Block") - add(MBlocks.CRATE_GREEN, "Green Container Block") - add(MBlocks.CRATE_YELLOW, "Yellow Container Block") - add(MBlocks.CRATE_BLACK, "Black Container Block") - add(MBlocks.CRATE_PINK, "Pink Container Block") - add(MBlocks.CRATE_PURPLE, "Purple Container Block") - add(MBlocks.CARBON_FIBRE_BLOCK, "Carbon fibre Block") add(MBlocks.TRITANIUM_STRIPED_BLOCK, "Tritanium Striped Block") diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesData.kt index 9abe73580..4b3dd5b04 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesData.kt @@ -13,14 +13,14 @@ import ru.dbotthepony.mc.otm.registry.MBlocks import ru.dbotthepony.mc.otm.registry.MRegistry fun addLootTables(lootTables: LootTables) { - lootTables.dropsSelf(MBlocks.CRATE_LIST) + lootTables.dropsSelf(MRegistry.DECORATIVE_CRATE.allBlocks.values) - lootTables.dropsSelf(MRegistry.CARGO_CRATES.blocks.values) - lootTables.dropsSelf(MRegistry.INDUSTRIAL_GLASS.blocks.values) - lootTables.dropsSelf(MRegistry.INDUSTRIAL_GLASS_PANE.blocks.values) - lootTables.dropsSelf(MRegistry.TRITANIUM_BLOCK.blocks.values) - lootTables.dropsSelf(MRegistry.VENT.blocks.values) - lootTables.dropsSelf(MRegistry.VENT_ALTERNATIVE.blocks.values) + lootTables.dropsSelf(MRegistry.CARGO_CRATES.allBlocks.values) + lootTables.dropsSelf(MRegistry.INDUSTRIAL_GLASS.allBlocks.values) + lootTables.dropsSelf(MRegistry.INDUSTRIAL_GLASS_PANE.allBlocks.values) + lootTables.dropsSelf(MRegistry.TRITANIUM_BLOCK.allBlocks.values) + lootTables.dropsSelf(MRegistry.VENT.allBlocks.values) + lootTables.dropsSelf(MRegistry.VENT_ALTERNATIVE.allBlocks.values) lootTables.dropsSelf(MRegistry.FLOOR_TILES.blocks.values) lootTables.dropsSelf(MRegistry.UNREFINED_FLOOR_TILES.blocks.values) lootTables.dropsSelf(MRegistry.TRITANIUM_STRIPED_BLOCK.flatBlocks) 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 c2f57c610..a7aec60f7 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 @@ -67,7 +67,7 @@ class BlockMatteryModelProvider(event: GatherDataEvent) : MatteryModelProvider(e super.registerModels() for ((path, texture) in cubeAll) { - val s = cubeAll(path, texture) + cubeAll(path, texture) } for ((path, end, side) in cubeColumn) { @@ -87,12 +87,22 @@ class BlockMatteryModelProvider(event: GatherDataEvent) : MatteryModelProvider(e } } - fun decorativeCubeAll(blocks: List) { + fun decorativeCubeAll(subdir: String, suffix: String, vararg blocks: Block) { + for (it in blocks) { + cubeAll.add(CubeAllEntry(it.registryName!!.path, ResourceLocation("overdrive_that_matters:block/decorative/${subdir}/${it.registryName!!.path}$suffix"))) + } + } + + fun decorativeCubeAll(blocks: Collection) { for (it in blocks) { cubeAll.add(CubeAllEntry(it.registryName!!.path, ResourceLocation("overdrive_that_matters:block/decorative/${it.registryName!!.path}"))) } } + fun decorativeCubeAll(block: Block, texture: String) { + cubeAll.add(CubeAllEntry(block.registryName!!.path, ResourceLocation("overdrive_that_matters:block/decorative/$texture"))) + } + fun column(it: Block, end: String, side: String) { cubeColumn.add(CubeColumnEntry(it.registryName!!.path, ResourceLocation(DataGen.MOD_ID, end), ResourceLocation(DataGen.MOD_ID, side))) } diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt index 2c145522c..e493dba8b 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt @@ -121,21 +121,19 @@ fun addCraftingTableRecipes(consumer: Consumer) { ShapelessRecipeBuilder(other, 1).requires(item).unlockedBy(other).save(consumer, ResourceLocation(OverdriveThatMatters.MOD_ID, "${other.registryName!!.path}_from_alt")) } - for ((crate, color) in listOf( - MItems.CRATE_RED to Tags.Items.DYES_RED, - MItems.CRATE_BLUE to Tags.Items.DYES_BLUE, - MItems.CRATE_YELLOW to Tags.Items.DYES_YELLOW, - MItems.CRATE_GREEN to Tags.Items.DYES_GREEN, - MItems.CRATE_BLACK to Tags.Items.DYES_BLACK, - MItems.CRATE_PINK to Tags.Items.DYES_PINK, - MItems.CRATE_PURPLE to Tags.Items.DYES_PURPLE, - )) { - MatteryRecipe(crate, 24) - .rowBC(MItemTags.PLATE_IRON, color) - .row(MItemTags.PLATE_IRON, COBBLESTONE, MItemTags.PLATE_IRON) - .rowB(MItemTags.PLATE_IRON) - .unlockedBy(MItemTags.PLATE_IRON) - .unlockedBy(color) + MatteryRecipe(MRegistry.DECORATIVE_CRATE.item, 24) + .rowB(MItemTags.PLATE_IRON) + .row(MItemTags.PLATE_IRON, COBBLESTONE, MItemTags.PLATE_IRON) + .rowB(MItemTags.PLATE_IRON) + .unlockedBy(MItemTags.PLATE_IRON) + .build(consumer) + + for ((color, crate) in MRegistry.DECORATIVE_CRATE.items) { + MatteryRecipe(crate, 8) + .row(MRegistry.DECORATIVE_CRATE.item, MRegistry.DECORATIVE_CRATE.item, MRegistry.DECORATIVE_CRATE.item) + .row(MRegistry.DECORATIVE_CRATE.item, color.tag, MRegistry.DECORATIVE_CRATE.item) + .row(MRegistry.DECORATIVE_CRATE.item, MRegistry.DECORATIVE_CRATE.item, MRegistry.DECORATIVE_CRATE.item) + .unlockedBy(MRegistry.DECORATIVE_CRATE.item) .build(consumer) } 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 9a8f9e4bd..c99398a8f 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 @@ -60,19 +60,19 @@ fun addTags(tagsProvider: TagsProvider) { tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_STRIPED_BLOCK, Tiers.IRON) tagsProvider.requiresPickaxe(MBlocks.CARBON_FIBRE_BLOCK, Tiers.IRON) - tagsProvider.requiresPickaxe(MRegistry.CARGO_CRATES.blocks.values, Tiers.IRON) + tagsProvider.requiresPickaxe(MRegistry.CARGO_CRATES.allBlocks.values, Tiers.IRON) - tagsProvider.requiresPickaxe(MRegistry.VENT.blocks.values, Tiers.IRON) - tagsProvider.requiresPickaxe(MRegistry.VENT_ALTERNATIVE.blocks.values, Tiers.IRON) - tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_BLOCK.blocks.values, Tiers.IRON) + tagsProvider.requiresPickaxe(MRegistry.VENT.allBlocks.values, Tiers.IRON) + tagsProvider.requiresPickaxe(MRegistry.VENT_ALTERNATIVE.allBlocks.values, Tiers.IRON) + tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_BLOCK.allBlocks.values, Tiers.IRON) tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_STRIPED_BLOCK.flatBlocks, Tiers.IRON) - tagsProvider.requiresPickaxe(MRegistry.FLOOR_TILES.blocks.values) + tagsProvider.requiresPickaxe(MRegistry.FLOOR_TILES.blocks.values) tagsProvider.requiresShovel(MRegistry.UNREFINED_FLOOR_TILES.blocks.values) - tagsProvider.requiresPickaxe(MRegistry.INDUSTRIAL_GLASS.blocks.values, Tiers.STONE) - tagsProvider.requiresPickaxe(MRegistry.INDUSTRIAL_GLASS_PANE.blocks.values, Tiers.STONE) - tagsProvider.requiresPickaxe(MBlocks.CRATE_LIST, Tiers.STONE) + tagsProvider.requiresPickaxe(MRegistry.INDUSTRIAL_GLASS.allBlocks.values, Tiers.STONE) + tagsProvider.requiresPickaxe(MRegistry.INDUSTRIAL_GLASS_PANE.allBlocks.values, Tiers.STONE) + tagsProvider.requiresPickaxe(MRegistry.DECORATIVE_CRATE.allBlocks.values, Tiers.STONE) tagsProvider.requiresPickaxe(listOf( MBlocks.GRAVITATION_STABILIZER, 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 519619f60..b0d85fa5b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt @@ -95,6 +95,7 @@ object MBlocks { ) } init { + MRegistry.CARGO_CRATES.registerBlocks(registry) MRegistry.TRITANIUM_BLOCK.registerBlocks(registry) } @@ -115,32 +116,13 @@ object MBlocks { ) } init { - MRegistry.CARGO_CRATES.registerBlocks(registry) - MRegistry.INDUSTRIAL_GLASS.registerBlocks(registry) MRegistry.INDUSTRIAL_GLASS_PANE.registerBlocks(registry) MRegistry.UNREFINED_FLOOR_TILES.registerBlocks(registry) MRegistry.FLOOR_TILES.registerBlocks(registry) MRegistry.VENT.registerBlocks(registry) MRegistry.VENT_ALTERNATIVE.registerBlocks(registry) + MRegistry.DECORATIVE_CRATE.registerBlocks(registry) MRegistry.TRITANIUM_STRIPED_BLOCK.registerBlocks(registry) } - - val CRATE_RED: Block by registry.register(MRegistry.CRATE_RED.name) { MRegistry.CRATE_RED.makeBlock() } - val CRATE_BLUE: Block by registry.register(MRegistry.CRATE_BLUE.name) { MRegistry.CRATE_BLUE.makeBlock() } - val CRATE_YELLOW: Block by registry.register(MRegistry.CRATE_YELLOW.name) { MRegistry.CRATE_YELLOW.makeBlock() } - val CRATE_GREEN: Block by registry.register(MRegistry.CRATE_GREEN.name) { MRegistry.CRATE_GREEN.makeBlock() } - val CRATE_BLACK: Block by registry.register(MRegistry.CRATE_BLACK.name) { MRegistry.CRATE_BLACK.makeBlock() } - val CRATE_PINK: Block by registry.register(MRegistry.CRATE_PINK.name) { MRegistry.CRATE_PINK.makeBlock() } - val CRATE_PURPLE: Block by registry.register(MRegistry.CRATE_PURPLE.name) { MRegistry.CRATE_PURPLE.makeBlock() } - - val CRATE_LIST = LazyList( - { CRATE_RED }, - { CRATE_BLUE }, - { CRATE_YELLOW }, - { CRATE_GREEN }, - { CRATE_BLACK }, - { CRATE_PINK }, - { CRATE_PURPLE }, - ) } 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 97e1ea2d0..46eda9d98 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt @@ -260,27 +260,8 @@ object MItems { val NUTRIENT_PASTE: Item by registry.register(MNames.NUTRIENT_PASTE) { Item(Item.Properties().stacksTo(64).food( FoodProperties.Builder().meat().nutrition(8).saturationMod(0.9F).build()).tab(OverdriveThatMatters.INSTANCE.CREATIVE_TAB)) } - val CRATE_RED: Item by registry.register(MRegistry.CRATE_RED.name) { BlockItem(MBlocks.CRATE_RED, DEFAULT_PROPERTIES_DECORATIVE) } - val CRATE_BLUE: Item by registry.register(MRegistry.CRATE_BLUE.name) { BlockItem(MBlocks.CRATE_BLUE, DEFAULT_PROPERTIES_DECORATIVE) } - val CRATE_YELLOW: Item by registry.register(MRegistry.CRATE_YELLOW.name) { BlockItem(MBlocks.CRATE_YELLOW, DEFAULT_PROPERTIES_DECORATIVE) } - val CRATE_GREEN: Item by registry.register(MRegistry.CRATE_GREEN.name) { BlockItem(MBlocks.CRATE_GREEN, DEFAULT_PROPERTIES_DECORATIVE) } - val CRATE_BLACK: Item by registry.register(MRegistry.CRATE_BLACK.name) { BlockItem(MBlocks.CRATE_BLACK, DEFAULT_PROPERTIES_DECORATIVE) } - val CRATE_PINK: Item by registry.register(MRegistry.CRATE_PINK.name) { BlockItem(MBlocks.CRATE_PINK, DEFAULT_PROPERTIES_DECORATIVE) } - val CRATE_PURPLE: Item by registry.register(MRegistry.CRATE_PURPLE.name) { BlockItem(MBlocks.CRATE_PURPLE, DEFAULT_PROPERTIES_DECORATIVE) } - - val CRATE_LIST = LazyList( - { CRATE_RED }, - { CRATE_BLUE }, - { CRATE_YELLOW }, - { CRATE_GREEN }, - { CRATE_BLACK }, - { CRATE_PINK }, - { CRATE_PURPLE }, - ) - init { MRegistry.CARGO_CRATES.registerItems(registry) - MRegistry.TRITANIUM_BLOCK.registerItems(registry) } @@ -294,6 +275,7 @@ object MItems { MRegistry.FLOOR_TILES.registerItems(registry) MRegistry.VENT.registerItems(registry) MRegistry.VENT_ALTERNATIVE.registerItems(registry) + MRegistry.DECORATIVE_CRATE.registerItems(registry) MRegistry.TRITANIUM_STRIPED_BLOCK.registerItems(registry) } } 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 faf3a4e0e..fc8e2d99e 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 GRAVITATION_STABILIZER_LENS = "gravitation_stabilizer_lens" const val CARGO_CRATE = "cargo_crate" + const val DECORATIVE_CRATE = "decorative_crate" const val STORAGE_BUS = "storage_bus" const val STORAGE_IMPORTER = "storage_importer" 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 fd99c8b5a..722734f55 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt @@ -101,12 +101,20 @@ object MRegistry { val CARGO_CRATES = DecorativeBlock(MNames.CARGO_CRATE, ::CargoCrateBlock, baseItemGroup = OverdriveThatMatters.INSTANCE.CREATIVE_TAB) + val DECORATIVE_CRATE = DecorativeBlock.simple(MNames.DECORATIVE_CRATE, { + BlockBehaviour.Properties.of(Material.METAL, it?.materialColor ?: MaterialColor.SNOW) + .sound(SoundType.METAL) + .requiresCorrectToolForDrops() + .explosionResistance(10f) + .strength(1f) + }) + val TRITANIUM_BLOCK = DecorativeBlock.simple(MNames.TRITANIUM_BLOCK, { BlockBehaviour.Properties.of(Material.METAL, it?.materialColor ?: MaterialColor.COLOR_LIGHT_BLUE) .sound(SoundType.BASALT) .requiresCorrectToolForDrops() .explosionResistance(80f) - .strength(4f) + .strength(2.5f) }) val VENT = DecorativeBlock.simple(MNames.VENT, { @@ -129,13 +137,13 @@ object MRegistry { BlockBehaviour.Properties.of(Material.STONE, it.materialColor) .sound(SoundType.STONE) .requiresCorrectToolForDrops() - .strength(2f, 1.5f) + .strength(1.5f, 6f) }) val UNREFINED_FLOOR_TILES = ColoredDecorativeBlock.simple(MNames.UNREFINED_FLOOR_TILES, { BlockBehaviour.Properties.of(Material.CLAY, it.materialColor) .sound(SoundType.GRAVEL) - .strength(1f, 1f) + .strength(1f, 2f) }) val INDUSTRIAL_GLASS = DecorativeBlock(MNames.INDUSTRIAL_GLASS, { color -> diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_black.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_black.png deleted file mode 100644 index 3cb182df3..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_black.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_blue.png deleted file mode 100644 index ae2729385..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_blue.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_green.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_green.png deleted file mode 100644 index 4040f42c2..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_green.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_pink.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_pink.png deleted file mode 100644 index 929e55c22..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_pink.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_purple.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_purple.png deleted file mode 100644 index 5c68c3726..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_purple.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_red.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_red.png deleted file mode 100644 index c7b337ff7..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_red.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_yellow.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_yellow.png deleted file mode 100644 index 373544824..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_yellow.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_black.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_black.png new file mode 100644 index 000000000..ce37b2612 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_black.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_blue.png new file mode 100644 index 000000000..e8912ad2e Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_black.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_black.png new file mode 100644 index 000000000..bd5d1f70e Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_black.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_blue.png new file mode 100644 index 000000000..274e05ef3 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_brown.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_brown.png new file mode 100644 index 000000000..40b6e4078 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_brown.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_cyan.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_cyan.png new file mode 100644 index 000000000..43b6304e3 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_cyan.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_gray.png new file mode 100644 index 000000000..9d69d10f3 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_green.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_green.png new file mode 100644 index 000000000..f91f2c7cc Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_green.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_light_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_light_blue.png new file mode 100644 index 000000000..8df129c04 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_light_blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_light_gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_light_gray.png new file mode 100644 index 000000000..7dbcd025f Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_light_gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_lime.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_lime.png new file mode 100644 index 000000000..8237909d4 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_lime.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_magenta.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_magenta.png new file mode 100644 index 000000000..7a5c69c05 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_magenta.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_orange.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_orange.png new file mode 100644 index 000000000..a91221e77 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_orange.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_pink.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_pink.png new file mode 100644 index 000000000..1c932a96f Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_pink.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_purple.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_purple.png new file mode 100644 index 000000000..5d98f00d8 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_purple.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_red.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_red.png new file mode 100644 index 000000000..cac9a7bfd Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_red.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_white.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_white.png new file mode 100644 index 000000000..364eeea84 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_white.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_yellow.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_yellow.png new file mode 100644 index 000000000..0358c241b Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_borderless_yellow.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_brown.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_brown.png new file mode 100644 index 000000000..4ba784355 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_brown.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_colorless_borderless.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_colorless_borderless.png new file mode 100644 index 000000000..e165e2147 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_colorless_borderless.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_colorless_borderless.xcf b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_colorless_borderless.xcf new file mode 100644 index 000000000..87c154367 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_colorless_borderless.xcf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f058aedb184ebb0e18cfd25c6ec90e002514ed0c97f989aab9a4c847c702aa48 +size 2863 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_cyan.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_cyan.png new file mode 100644 index 000000000..952f3b027 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_cyan.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_frame.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_frame.png new file mode 100644 index 000000000..026b13b4b Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_frame.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_frame.xcf b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_frame.xcf new file mode 100644 index 000000000..3abf5a870 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_frame.xcf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:798049e43df9ad0fcd88a83e752d0c6d9b3cc2b688c0a6825a0b5c3c8a3d1eb3 +size 1529 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_gray.png new file mode 100644 index 000000000..f24dd79e4 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_green.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_green.png new file mode 100644 index 000000000..c1ff504b0 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_green.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_light_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_light_blue.png new file mode 100644 index 000000000..8c45ae364 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_light_blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_light_gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_light_gray.png new file mode 100644 index 000000000..35f39aead Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_light_gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_lime.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_lime.png new file mode 100644 index 000000000..01e9317e3 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_lime.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_magenta.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_magenta.png new file mode 100644 index 000000000..951a111e9 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_magenta.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_orange.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_orange.png new file mode 100644 index 000000000..b07c81375 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_orange.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_pink.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_pink.png new file mode 100644 index 000000000..a326ec77b Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_pink.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_purple.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_purple.png new file mode 100644 index 000000000..59c63550b Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_purple.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_red.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_red.png new file mode 100644 index 000000000..9bd128553 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_red.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_white.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_white.png new file mode 100644 index 000000000..62cf3a668 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_white.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_white_borderless.xcf b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_white_borderless.xcf new file mode 100644 index 000000000..3c1bab58c --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_white_borderless.xcf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a2dc9eed5149a19320ea6d148f40370b29674cf725f2545dde1c33735f40544 +size 3990 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_yellow.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_yellow.png new file mode 100644 index 000000000..cfe77c1b9 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crates/crate_yellow.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_black.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_black.png deleted file mode 100644 index 0af07297f..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_black.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_blue.png deleted file mode 100644 index 23b5c6e09..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_blue.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_green.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_green.png deleted file mode 100644 index 5738ed63a..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_green.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_pink.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_pink.png deleted file mode 100644 index 36df523da..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_pink.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_purple.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_purple.png deleted file mode 100644 index 67b27384e..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_purple.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_red.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_red.png deleted file mode 100644 index b6fda06ac..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_red.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_red_borderless.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_red_borderless.png deleted file mode 100644 index 477e2c3a2..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_red_borderless.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_yellow.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_yellow.png deleted file mode 100644 index c1b563857..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/framed crates/crate_yellow.png and /dev/null differ