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 8d77d0db1..bd3a97cb0 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 @@ -8,6 +8,7 @@ private fun decoratives(provider: MatteryLanguageProvider) { provider.englishColors.add(MRegistry.TRITANIUM_BLOCK, "%s Tritanium Block") provider.englishColors.add(MRegistry.FLOOR_TILES, "%s Floor Tiles") + provider.englishColors.add(MRegistry.UNREFINED_FLOOR_TILES, "Unrefined %s Floor Tiles") provider.englishColors.add(MRegistry.INDUSTRIAL_GLASS, "%s Stained Industrial Glass") provider.englishColors.add(MRegistry.INDUSTRIAL_GLASS_PANE, "%s Stained Industrial Glass Pane") 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 f1b60c234..668335b3c 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 @@ -3,9 +3,12 @@ package ru.dbotthepony.mc.otm.datagen.recipes import net.minecraft.data.recipes.FinishedRecipe import net.minecraft.data.recipes.ShapedRecipeBuilder import net.minecraft.data.recipes.ShapelessRecipeBuilder +import net.minecraft.data.recipes.SimpleCookingRecipeBuilder import net.minecraft.resources.ResourceLocation +import net.minecraft.world.item.DyeColor import net.minecraft.world.item.Items import net.minecraft.world.item.crafting.Ingredient +import net.minecraft.world.level.block.Blocks import net.minecraftforge.common.Tags import net.minecraftforge.common.Tags.Items.COBBLESTONE import ru.dbotthepony.mc.otm.OverdriveThatMatters @@ -305,4 +308,23 @@ fun addCraftingTableRecipes(consumer: Consumer) { .row(MItemTags.PLATE_TRITANIUM, Tags.Items.ENDER_PEARLS, MItemTags.PLATE_TRITANIUM) .rowAC(Tags.Items.GEMS_DIAMOND, Tags.Items.GEMS_DIAMOND) .build(consumer) + + // Напольная плитка + for ((color, unrefinedItem) in MRegistry.UNREFINED_FLOOR_TILES.mappedColoredItems) { + MatteryRecipe(unrefinedItem, 24) + .row(Items.CLAY, Items.SAND, Items.CLAY) + .row(Items.SAND, color.tag, Items.SAND) + .row(Items.CLAY, Items.SAND, Items.CLAY) + .unlockedBy(Items.CLAY) + .build(consumer) + } + + for ((color, refinedItem) in MRegistry.FLOOR_TILES.mappedColoredItems) { + SimpleCookingRecipeBuilder.smelting( + Ingredient.of(MRegistry.UNREFINED_FLOOR_TILES.mappedColoredItems[color]!!), + refinedItem, + 0.15f, + 200 + ).unlockedBy("has_unrefined_block", has(MRegistry.UNREFINED_FLOOR_TILES.mappedColoredItems[color]!!)).save(consumer) + } } 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 09a9eb87a..dde7369f4 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt @@ -119,6 +119,7 @@ object MBlocks { 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) 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 90e089cc3..275d8e1f7 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt @@ -253,6 +253,7 @@ object MItems { init { MRegistry.INDUSTRIAL_GLASS.registerItems(registry) MRegistry.INDUSTRIAL_GLASS_PANE.registerItems(registry) + MRegistry.UNREFINED_FLOOR_TILES.registerItems(registry) MRegistry.FLOOR_TILES.registerItems(registry) MRegistry.VENT.registerItems(registry) MRegistry.VENT_ALTERNATIVE.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 9835bb743..faf3a4e0e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt @@ -50,6 +50,7 @@ object MNames { const val CARBON_FIBRE_BLOCK = "carbon_fibre_block" const val FLOOR_TILES = "floor_tiles" + const val UNREFINED_FLOOR_TILES = "unrefined_floor_tiles" const val VENT = "vent" const val VENT_ALTERNATIVE = "vent_alternative" 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 a8947a0ce..fd99c8b5a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt @@ -129,7 +129,13 @@ object MRegistry { BlockBehaviour.Properties.of(Material.STONE, it.materialColor) .sound(SoundType.STONE) .requiresCorrectToolForDrops() - .strength(3f) + .strength(2f, 1.5f) + }) + + val UNREFINED_FLOOR_TILES = ColoredDecorativeBlock.simple(MNames.UNREFINED_FLOOR_TILES, { + BlockBehaviour.Properties.of(Material.CLAY, it.materialColor) + .sound(SoundType.GRAVEL) + .strength(1f, 1f) }) val INDUSTRIAL_GLASS = DecorativeBlock(MNames.INDUSTRIAL_GLASS, { color ->