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 6d44c23a6..99c55a285 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 @@ -43,32 +43,6 @@ fun addCraftingTableRecipes(consumer: Consumer) { .unlockedBy(MItemTags.TRITANIUM_INGOTS_STORAGE) .save(consumer, modLocation("tritanium_ingot_from_storage")) - MatteryRecipe(MBlocks.TRITANIUM_DOOR, 3) - .rowAB(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES) - .rowAB(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES) - .rowAB(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES) - .unlockedBy(MItemTags.TRITANIUM_PLATES) - .build(consumer) - - MatteryRecipe(MBlocks.TRITANIUM_TRAPDOOR) - .rowAB(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES) - .rowAB(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES) - .unlockedBy(MItemTags.TRITANIUM_PLATES) - .build(consumer) - - MatteryRecipe(MRegistry.TRITANIUM_PRESSURE_PLATE.item) - .row(MItemTags.TRITANIUM_PLATES, MItemTags.BASIC_CIRCUIT, MItemTags.TRITANIUM_PLATES) - .unlockedBy(MItemTags.TRITANIUM_PLATES) - .build(consumer) - - for (dye in DyeColor.values()) { - ShapelessRecipeBuilder(MRegistry.TRITANIUM_PRESSURE_PLATE.getItem(dye), 1) - .requires(Ingredient.of(MRegistry.TRITANIUM_PRESSURE_PLATE.allItems.entries.stream().filter { it.key != dye }.map { ItemStack(it.value) })) - .requires(dye.tag) - .unlockedBy(MItemTags.TRITANIUM_PLATES) - .save(consumer) - } - MatteryRecipe(MBlocks.PLATE_PRESS) .row(MItems.ELECTRIC_PARTS, MItems.ENERGY_BUS, MItems.ELECTRIC_PARTS) .row(MItemTags.TRITANIUM_INGOTS, Items.BLAST_FURNACE, MItemTags.TRITANIUM_INGOTS) @@ -85,21 +59,6 @@ fun addCraftingTableRecipes(consumer: Consumer) { .unlockedBy(MItems.ELECTRIC_PARTS) .build(consumer, "advanced") - MatteryRecipe(MBlocks.TRITANIUM_STRIPED_BLOCK, 24) - .rowB(MItemTags.TRITANIUM_PLATES) - .row(MItemTags.TRITANIUM_PLATES, COBBLESTONE, MItemTags.TRITANIUM_PLATES) - .rowAB(Tags.Items.DYES_YELLOW, MItemTags.TRITANIUM_PLATES) - .unlockedBy(MItemTags.TRITANIUM_PLATES) - .unlockedBy(Tags.Items.DYES_YELLOW) - .build(consumer) - - MatteryRecipe(MRegistry.TRITANIUM_BLOCK.item, 24) - .rowB(MItemTags.TRITANIUM_PLATES) - .row(MItemTags.TRITANIUM_PLATES, COBBLESTONE, MItemTags.TRITANIUM_PLATES) - .rowB(MItemTags.TRITANIUM_PLATES) - .unlockedBy(MItemTags.TRITANIUM_PLATES) - .build(consumer) - MatteryRecipe(MItems.PATTERN_DRIVE_NORMAL) .rowAC(MItemTags.ADVANCED_CIRCUIT, MItemTags.ADVANCED_CIRCUIT) .row(MItemTags.ADVANCED_CIRCUIT, MItemTags.TRITANIUM_PLATES, MItemTags.ADVANCED_CIRCUIT) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt index 327fb4682..36db6f3e8 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt @@ -4,6 +4,7 @@ import net.minecraft.data.recipes.* import net.minecraft.resources.ResourceLocation import net.minecraft.tags.ItemTags import net.minecraft.world.item.DyeColor +import net.minecraft.world.item.ItemStack import net.minecraft.world.item.Items import net.minecraft.world.item.crafting.Ingredient import net.minecraft.world.level.ItemLike @@ -11,6 +12,7 @@ import net.minecraftforge.common.Tags import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.core.registryName import ru.dbotthepony.mc.otm.datagen.DataGen +import ru.dbotthepony.mc.otm.registry.MBlocks import ru.dbotthepony.mc.otm.registry.MItemTags import ru.dbotthepony.mc.otm.registry.MItems import ru.dbotthepony.mc.otm.registry.MRegistry @@ -255,4 +257,45 @@ fun addDecorativesRecipes(provider: MatteryRecipeProvider, consumer: Consumer