From 9ce2fbf4975b7b5cd98d4f2e240c0fb12806ba51 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Sat, 1 Mar 2025 17:53:53 +0500 Subject: [PATCH] withered steel block --- .../mc/otm/datagen/blocks/BlockModels.kt | 2 ++ .../mc/otm/datagen/loot/DecorativeLoot.kt | 2 ++ .../mc/otm/datagen/recipes/ShapelessRecipes.kt | 5 +++++ .../mc/otm/datagen/tags/MineableTags.kt | 2 ++ .../ru/dbotthepony/mc/otm/registry/MNames.kt | 3 +++ .../dbotthepony/mc/otm/registry/game/MBlocks.kt | 4 ++++ .../ru/dbotthepony/mc/otm/registry/game/MItems.kt | 3 +++ .../block/resource/withered_steel_block.png | Bin 0 -> 489 bytes 8 files changed, 21 insertions(+) create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/resource/withered_steel_block.png 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 bbf8da1e4..31d960642 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 @@ -11,6 +11,8 @@ fun addBlockModels(provider: MatteryBlockModelProvider) { resourceCubeAll(MBlocks.DEEPSLATE_TRITANIUM_ORE) resourceCubeAll(MBlocks.TRITANIUM_INGOT_BLOCK) + resourceCubeAll(MBlocks.WITHERED_STEEL_BLOCK) + resourceCubeAll(MBlocks.DILITHIUM_ORE) resourceCubeAll(MBlocks.DEEPSLATE_DILITHIUM_ORE) resourceCubeAll(MBlocks.DILITHIUM_CRYSTAL_BLOCK) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/DecorativeLoot.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/DecorativeLoot.kt index 4fe3eb50b..2eda654e7 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/DecorativeLoot.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/DecorativeLoot.kt @@ -50,6 +50,8 @@ fun addDecorativeLoot(lootTables: LootTables) { lootTables.dropsSelf(MBlocks.TRITANIUM_INGOT_BLOCK) { condition(ExplosionCondition.survivesExplosion()) } lootTables.dropsSelf(MBlocks.TRITANIUM_BARS) { condition(ExplosionCondition.survivesExplosion()) } + lootTables.dropsSelf(MBlocks.WITHERED_STEEL_BLOCK) { condition(ExplosionCondition.survivesExplosion()) } + lootTables.dropsSelf(MBlocks.TRITANIUM_HULL) { condition(ExplosionCondition.survivesExplosion()) } lootTables.dropsSelf(MBlocks.GENERATOR_BLOCK) { condition(ExplosionCondition.survivesExplosion()) } diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ShapelessRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ShapelessRecipes.kt index 294a57307..c13d9c321 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ShapelessRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ShapelessRecipes.kt @@ -63,6 +63,11 @@ fun addShapelessRecipes(consumer: RecipeOutput) { .unlockedBy(MItemTags.TRITANIUM_INGOTS) .save(consumer) + ShapelessRecipeBuilder(RecipeCategory.BUILDING_BLOCKS, MItems.WITHERED_STEEL_BLOCK, 1) + .requires(Ingredient.of(MItems.WITHERED_STEEL), 9) + .unlockedBy(MItems.WITHERED_STEEL) + .save(consumer) + ShapelessRecipeBuilder(RecipeCategory.BUILDING_BLOCKS, MItems.TRITANIUM_RAW_BLOCK, 1) .requires(Ingredient.of(MItemTags.TRITANIUM_ORE_CLUMPS), 9) .unlockedBy(MItemTags.TRITANIUM_ORE_CLUMPS) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/MineableTags.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/MineableTags.kt index f89bde310..65b528c7e 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/MineableTags.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/MineableTags.kt @@ -51,6 +51,8 @@ fun addMineableTags(tagsProvider: TagsProvider) { *MBlocks.ENERGY_SERVO.values.toTypedArray(), MBlocks.TRITANIUM_INGOT_BLOCK, + MBlocks.WITHERED_STEEL_BLOCK, + MBlocks.METAL_JUNK, MBlocks.METAL_MESH, MBlocks.TRITANIUM_BARS, 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 c803ef655..68fe63f41 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt @@ -93,10 +93,12 @@ object MNames { // building blocks const val TRITANIUM_BLOCK = "tritanium_block" + const val TRITANIUM_BLOCK_YELLOW_CLASSIC = "tritanium_block_yellow_classic" const val TRITANIUM_STAIRS = "tritanium_stairs" const val TRITANIUM_SLAB = "tritanium_slab" const val TRITANIUM_WALL = "tritanium_wall" const val TRITANIUM_STRIPED_BLOCK = "tritanium_striped_block" + const val TRITANIUM_CLASSIC_STRIPED_BLOCK = "tritanium_classic_striped_block" const val TRITANIUM_STRIPED_STAIRS = "tritanium_striped_stairs" const val TRITANIUM_STRIPED_SLAB = "tritanium_striped_slab" const val TRITANIUM_STRIPED_WALL = "tritanium_striped_wall" @@ -205,6 +207,7 @@ object MNames { const val TRITANIUM_INGOT = "tritanium_ingot" const val TRITANIUM_INGOT_BLOCK = "tritanium_ingot_block" + const val WITHERED_STEEL_BLOCK = "withered_steel_block" const val WITHERED_STEEL = "withered_steel" const val MATTER_IO_PORT = "matter_io_port" 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 5df204d9a..4ded2667c 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 @@ -252,6 +252,10 @@ object MBlocks { Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLUE).sound(SoundType.METAL).explosionResistance(400f).destroyTime(3f).requiresCorrectToolForDrops()) } + val WITHERED_STEEL_BLOCK: Block by registry.register(MNames.WITHERED_STEEL_BLOCK) { + Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GREEN).sound(SoundType.NETHERITE_BLOCK).explosionResistance(400f).destroyTime(3f).requiresCorrectToolForDrops()) + } + val METAL_JUNK: MatteryBlock by registry.register(MNames.METAL_JUNK) { MatteryBlock(BlockBehaviour.Properties.of().sound(SoundType.NETHERITE_BLOCK).mapColor(MapColor.COLOR_GRAY).explosionResistance(45f).destroyTime(3f).requiresCorrectToolForDrops()) .addSimpleDescription() 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 89194c834..685e5c1d5 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 @@ -301,6 +301,9 @@ object MItems { val TRITANIUM_NUGGET: Item by registry.register(MNames.TRITANIUM_NUGGET) { Item(DEFAULT_PROPERTIES) } 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 WITHERED_STEEL_BLOCK: BlockItem by registry.register(MNames.WITHERED_STEEL_BLOCK) { BlockItem(MBlocks.WITHERED_STEEL_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) } diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/resource/withered_steel_block.png b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/withered_steel_block.png new file mode 100644 index 0000000000000000000000000000000000000000..54b0a6f2441e1d64ba087658f0aa070264ba8262 GIT binary patch literal 489 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFp(-RP?iLx4P?c+FZ*Ae}BBuR(2~YuNfk$L90|Pf72s1kD zdkECcAW`BPQ4*Y=R#Ki=l*$m0n3-3i=jR%tV5(=RXY_jy^ERNGZK)BSX`Y^13>-iX zD}xjxD+42t5Q)pOy&Jg>8wfZ*JtqI))&*_ literal 0 HcmV?d00001