From 82c9384087b33890e54d59f0a4fe07346be00eb5 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Wed, 5 Oct 2022 18:47:19 +0700 Subject: [PATCH] Remove direct coloring of cargo crates --- .../datagen/recipes/CraftingTableRecipes.kt | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) 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 be5dd1ef5..c0a54ea99 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 @@ -19,17 +19,13 @@ import ru.dbotthepony.mc.otm.datagen.modLocation import java.util.function.Consumer fun addCraftingTableRecipes(consumer: Consumer) { - for ((dye, crate) in MRegistry.CARGO_CRATES.blocks) { - ShapedRecipeBuilder(crate, 1) - .define('P', MItemTags.TRITANIUM_PLATES) - .define('C', Tags.Items.CHESTS) - .define('D', dye.tag) - .pattern(" D ").pattern("PCP") - // .unlockedBy("has_dye", has(dye.tag)) - .unlockedBy("has_tritanium_plate", has(MItemTags.TRITANIUM_PLATES)) - .unlockedBy("has_chest", has(Tags.Items.CHESTS)) - .save(consumer) + MatteryRecipe(MRegistry.CARGO_CRATES.item) + .row(MItemTags.TRITANIUM_PLATES, Tags.Items.CHESTS, MItemTags.TRITANIUM_PLATES) + .unlockedBy(MItemTags.TRITANIUM_PLATES) + .unlockedBy(Tags.Items.CHESTS) + .build(consumer) + for ((dye, crate) in MRegistry.CARGO_CRATES.blocks) { ShapelessRecipeBuilder(crate, 1) .requires(Ingredient.of(MRegistry.CARGO_CRATES.allItems.entries.stream().filter { it.key != dye }.map { ItemStack(it.value) })) .requires(dye.tag) @@ -47,14 +43,6 @@ fun addCraftingTableRecipes(consumer: Consumer) { .unlockedBy(MItemTags.TRITANIUM_INGOTS_STORAGE) .save(consumer, modLocation("tritanium_ingot_from_storage")) - ShapedRecipeBuilder(MRegistry.CARGO_CRATES.item, 1) - .define('P', MItemTags.TRITANIUM_PLATES) - .define('C', Tags.Items.CHESTS) - .pattern("PCP") - .unlockedBy("has_tritanium_plate", has(MItemTags.TRITANIUM_PLATES)) - .unlockedBy("has_chest", has(Tags.Items.CHESTS)) - .save(consumer) - MatteryRecipe(MBlocks.TRITANIUM_DOOR, 3) .rowAB(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES) .rowAB(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES)