From 36a16ac9d2af65f3f3287e9aec5519f4e2c007a0 Mon Sep 17 00:00:00 2001 From: YuRaNnNzZZ Date: Sat, 1 Mar 2025 21:59:10 +0300 Subject: [PATCH] Trollium --- .../dbotthepony/mc/otm/datagen/blocks/BlockStates.kt | 12 ++++++++++++ .../dbotthepony/mc/otm/datagen/items/ItemModels.kt | 2 ++ .../ru/dbotthepony/mc/otm/datagen/lang/English.kt | 2 ++ .../ru/dbotthepony/mc/otm/datagen/lang/Russian.kt | 2 ++ .../mc/otm/datagen/recipes/ShapelessRecipes.kt | 10 ++++++++++ .../dbotthepony/mc/otm/datagen/tags/MineableTags.kt | 1 + .../dbotthepony/mc/otm/datagen/tags/ResourceTags.kt | 6 ++++++ .../kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt | 3 +++ .../ru/dbotthepony/mc/otm/registry/game/MBlocks.kt | 4 ++++ .../mc/otm/registry/game/MCreativeTabs.kt | 3 +++ .../ru/dbotthepony/mc/otm/registry/game/MItems.kt | 3 +++ 11 files changed, 48 insertions(+) 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 fd3419f6b..13b574356 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 @@ -33,6 +33,18 @@ fun addBlockStates(provider: MatteryBlockStateProvider) { provider.block(MBlocks.TRITANIUM_INGOT_BLOCK) provider.block(MBlocks.WITHERED_STEEL_BLOCK) + provider.exec { + provider.getVariantBuilder(MBlocks.ROFLITE_ALLOY_BLOCK).forAllStates { + val side1 = modLocation("block/resource/roflite_alloy_1") + val side2 = modLocation("block/resource/roflite_alloy_2") + val top = modLocation("block/resource/roflite_alloy_top") + + val a = provider.models().cube(MBlocks.ROFLITE_ALLOY_BLOCK.registryName!!.path, top, top, side1, side1, side2, side2).texture("particle", side1) + val b = provider.models().cube("${MBlocks.ROFLITE_ALLOY_BLOCK.registryName!!.path}_b", top, top, side2, side2, side1, side1).texture("particle", side2) + + return@forAllStates arrayOf(ConfiguredModel.builder().modelFile(a).buildLast(), ConfiguredModel.builder().modelFile(b).buildLast()) + } + } provider.ore(MBlocks.DILITHIUM_ORE) provider.ore(MBlocks.DEEPSLATE_DILITHIUM_ORE) 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 fc78990a2..192b0a0e3 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 @@ -36,6 +36,7 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.block(MItems.TRITANIUM_INGOT_BLOCK) provider.block(MItems.WITHERED_STEEL_BLOCK) + provider.block(MItems.ROFLITE_ALLOY_BLOCK) provider.block(MItems.DILITHIUM_ORE) provider.block(MItems.DEEPSLATE_DILITHIUM_ORE) @@ -103,6 +104,7 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.resource(MItems.DILITHIUM_CRYSTAL) provider.resource(MItems.WITHERED_STEEL) + provider.resource(MItems.ROFLITE_ALLOY_INGOT) provider.generated(MItems.EXOPACK_PROBE) 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 e9fef487e..432b6faa9 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 @@ -613,6 +613,7 @@ private fun blocks(provider: MatteryLanguageProvider) { add(MBlocks.TRITANIUM_INGOT_BLOCK, "Tritanium Plating Block") add(MBlocks.WITHERED_STEEL_BLOCK, "Withered Steel Block") + add(MBlocks.ROFLITE_ALLOY_BLOCK, "Roflite Alloy Block") addBlock(MBlocks.ENERGY_COUNTER.values, "Energy Counter") addBlock(MBlocks.ENERGY_COUNTER.values, "desc", "Restricts energy flow direction;") @@ -790,6 +791,7 @@ private fun items(provider: MatteryLanguageProvider) { add(MItems.TRITANIUM_INGOT, "Tritanium Ingot") add(MItems.DILITHIUM_CRYSTAL, "Dilithium Crystal") add(MItems.WITHERED_STEEL, "Withered Steel Ingot") + add(MItems.ROFLITE_ALLOY_INGOT, "Roflite Alloy Ingot") add(MItems.TRITANIUM_NUGGET, "Tritanium Nugget") add(MItems.MATTER_IO_PORT, "Matter IO Port") add(MItems.MATTER_TRANSFORM_MATRIX, "Matter Transformation Matrix") 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 08b3e8289..10232222a 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 @@ -617,6 +617,7 @@ private fun blocks(provider: MatteryLanguageProvider) { add(MBlocks.TRITANIUM_INGOT_BLOCK, "Блок слитков тритана") add(MBlocks.WITHERED_STEEL_BLOCK, "Блок иссушенной стали") + add(MBlocks.ROFLITE_ALLOY_BLOCK, "Блок рофлитового сплава") addBlock(MBlocks.ENERGY_COUNTER.values, "Счётчик энергии") addBlock(MBlocks.ENERGY_COUNTER.values, "desc", "Ограничивает направление передачи энергии;") @@ -783,6 +784,7 @@ private fun items(provider: MatteryLanguageProvider) { add(MItems.TRITANIUM_INGOT, "Тритановый слиток") add(MItems.DILITHIUM_CRYSTAL, "Дилитевый кристалл") add(MItems.WITHERED_STEEL, "Слиток иссушенной стали") + add(MItems.ROFLITE_ALLOY_INGOT, "Слиток рофлитового сплава") add(MItems.TRITANIUM_NUGGET, "Тритановый самородок") add(MItems.MATTER_IO_PORT, "Порт ввода/вывода материи") add(MItems.MATTER_TRANSFORM_MATRIX, "Матрица преобразования материи") 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 4c307d83e..cfbda0e05 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 @@ -103,4 +103,14 @@ fun addShapelessRecipes(consumer: RecipeOutput) { .requires(Ingredient.of(MItems.WITHERED_STEEL_BLOCK)) .unlockedBy(MItems.WITHERED_STEEL_BLOCK) .save(consumer) + + ShapelessRecipeBuilder(RecipeCategory.BUILDING_BLOCKS, MItems.ROFLITE_ALLOY_BLOCK, 1) + .requires(Ingredient.of(MItems.ROFLITE_ALLOY_INGOT), 9) + .unlockedBy(MItems.ROFLITE_ALLOY_INGOT) + .save(consumer) + + ShapelessRecipeBuilder(RecipeCategory.MISC, MItems.ROFLITE_ALLOY_INGOT, 9) + .requires(Ingredient.of(MItems.ROFLITE_ALLOY_BLOCK)) + .unlockedBy(MItems.ROFLITE_ALLOY_BLOCK) + .save(consumer) } 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 65b528c7e..1997e1145 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 @@ -98,6 +98,7 @@ fun addMineableTags(tagsProvider: TagsProvider) { MBlocks.DILITHIUM_ORE, MBlocks.DEEPSLATE_DILITHIUM_ORE, MBlocks.DILITHIUM_CRYSTAL_BLOCK, + MBlocks.ROFLITE_ALLOY_BLOCK, MBlocks.GRAVITATION_STABILIZER, MBlocks.GRAVITATION_STABILIZER_LENS, diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/ResourceTags.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/ResourceTags.kt index e4412cc17..af890afef 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/ResourceTags.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/ResourceTags.kt @@ -21,6 +21,8 @@ fun addResourceTags(tagsProvider: TagsProvider) { tagsProvider.dusts.add("tritanium", MItems.TRITANIUM_DUST) tagsProvider.ingots.add("tritanium", MItems.TRITANIUM_INGOT) + tagsProvider.ingots.add("withered_steel", MItems.WITHERED_STEEL) + tagsProvider.ingots.add("roflite_alloy", MItems.ROFLITE_ALLOY_INGOT) tagsProvider.wires.add("copper", MItems.COPPER_WIRING) tagsProvider.wires.add("gold", MItems.GOLD_WIRING) @@ -32,6 +34,10 @@ fun addResourceTags(tagsProvider: TagsProvider) { tagsProvider.storageBlocksAsItem.add("tritanium", MItems.TRITANIUM_INGOT_BLOCK) tagsProvider.storageBlocksAsBlock.add("tritanium", MBlocks.TRITANIUM_INGOT_BLOCK) + tagsProvider.storageBlocksAsItem.add("withered_steel", MItems.WITHERED_STEEL_BLOCK) + tagsProvider.storageBlocksAsBlock.add("withered_steel", MBlocks.WITHERED_STEEL_BLOCK) + tagsProvider.storageBlocksAsItem.add("roflite_alloy", MItems.ROFLITE_ALLOY_BLOCK) + tagsProvider.storageBlocksAsBlock.add("roflite_alloy", MBlocks.ROFLITE_ALLOY_BLOCK) tagsProvider.singleDropOre( MBlocks.TRITANIUM_ORE, 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 22275788e..645448316 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt @@ -212,6 +212,9 @@ object MNames { const val WITHERED_STEEL_BLOCK = "withered_steel_block" const val WITHERED_STEEL = "withered_steel" + const val ROFLITE_ALLOY_INGOT = "roflite_alloy_ingot" + const val ROFLITE_ALLOY_BLOCK = "roflite_alloy_block" + const val MATTER_IO_PORT = "matter_io_port" const val CARBON_MESH = "carbon_mesh" 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 4ded2667c..fee5dc637 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 @@ -256,6 +256,10 @@ object MBlocks { Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GREEN).sound(SoundType.NETHERITE_BLOCK).explosionResistance(400f).destroyTime(3f).requiresCorrectToolForDrops()) } + val ROFLITE_ALLOY_BLOCK: Block by registry.register(MNames.ROFLITE_ALLOY_BLOCK) { + Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BROWN).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/MCreativeTabs.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MCreativeTabs.kt index e4f0bfda6..af34056c0 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MCreativeTabs.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MCreativeTabs.kt @@ -239,6 +239,9 @@ private fun addMainCreativeTabItems(consumer: CreativeModeTab.Output) { accept(MItems.WITHERED_STEEL) accept(MItems.WITHERED_STEEL_BLOCK) + accept(MItems.ROFLITE_ALLOY_INGOT) + accept(MItems.ROFLITE_ALLOY_BLOCK) + accept(MItems.TRITANIUM_TOOLS) accept(MItems.TRITANIUM_SHIELD) accept(MItems.SIMPLE_TRITANIUM_ARMOR) 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 69520f486..1421df044 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 @@ -666,6 +666,9 @@ object MItems { val BREAD_MONSTER_SPAWN_EGG: Item by registry.register(MNames.BREAD_MONSTER_SPAWN_EGG){ SpawnEggItem(MEntityTypes.BREAD_MONSTER, 0xFFFFFF, 0xFFFFFF, Item.Properties())} + val ROFLITE_ALLOY_INGOT: Item by registry.register(MNames.ROFLITE_ALLOY_INGOT) { Item(DEFAULT_PROPERTIES) } + val ROFLITE_ALLOY_BLOCK: BlockItem by registry.register(MNames.ROFLITE_ALLOY_BLOCK) { BlockItem(MBlocks.ROFLITE_ALLOY_BLOCK, DEFAULT_PROPERTIES) } + init { MRegistry.registerItems(registry) }