From 919688f44f65aff6c7c2e0e5a3f6aa3320bca8c9 Mon Sep 17 00:00:00 2001 From: Andrew-71 Date: Sat, 27 Apr 2024 16:39:39 +0300 Subject: [PATCH] Fix linoleum crafting recipes --- .../building_blocks/brown_linoleum.json | 12 ++--- .../building_blocks/cyan_linoleum.json | 12 ++--- .../building_blocks/orange_linoleum.json | 52 +++++++++---------- .../new_soviet/recipes/brown_linoleum.json | 4 +- .../new_soviet/recipes/cyan_linoleum.json | 4 +- .../new_soviet/recipes/orange_linoleum.json | 4 +- .../new_soviet/datagen/RecipeGenerator.java | 6 +-- 7 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/brown_linoleum.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/brown_linoleum.json index 797e1d5..4bb0ac9 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/brown_linoleum.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/brown_linoleum.json @@ -1,24 +1,24 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_gray_dye_1": { + "has_brown_dye_1": { "conditions": { "items": [ { "items": [ - "minecraft:gray_dye" + "minecraft:brown_dye" ] } ] }, "trigger": "minecraft:inventory_changed" }, - "has_gray_dye_2": { + "has_brown_dye_2": { "conditions": { "items": [ { "items": [ - "minecraft:gray_dye" + "minecraft:brown_dye" ] } ] @@ -70,8 +70,8 @@ }, "requirements": [ [ - "has_gray_dye_1", - "has_gray_dye_2", + "has_brown_dye_1", + "has_brown_dye_2", "has_leather", "has_oak_planks", "has_iron_nugget", diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cyan_linoleum.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cyan_linoleum.json index 9020e9a..49bdfca 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cyan_linoleum.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cyan_linoleum.json @@ -1,24 +1,24 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_gray_dye_1": { + "has_cyan_dye_1": { "conditions": { "items": [ { "items": [ - "minecraft:gray_dye" + "minecraft:cyan_dye" ] } ] }, "trigger": "minecraft:inventory_changed" }, - "has_gray_dye_2": { + "has_cyan_dye_2": { "conditions": { "items": [ { "items": [ - "minecraft:gray_dye" + "minecraft:cyan_dye" ] } ] @@ -70,8 +70,8 @@ }, "requirements": [ [ - "has_gray_dye_1", - "has_gray_dye_2", + "has_cyan_dye_1", + "has_cyan_dye_2", "has_leather", "has_oak_planks", "has_iron_nugget", diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/orange_linoleum.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/orange_linoleum.json index a98336b..2c5ac9e 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/orange_linoleum.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/orange_linoleum.json @@ -1,30 +1,6 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_gray_dye_1": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:gray_dye" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_gray_dye_2": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:gray_dye" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, "has_iron_nugget": { "conditions": { "items": [ @@ -61,6 +37,30 @@ }, "trigger": "minecraft:inventory_changed" }, + "has_orange_dye_1": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:orange_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_orange_dye_2": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:orange_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, "has_the_recipe": { "conditions": { "recipe": "new_soviet:orange_linoleum" @@ -70,8 +70,8 @@ }, "requirements": [ [ - "has_gray_dye_1", - "has_gray_dye_2", + "has_orange_dye_1", + "has_orange_dye_2", "has_leather", "has_oak_planks", "has_iron_nugget", diff --git a/src/main/generated/data/new_soviet/recipes/brown_linoleum.json b/src/main/generated/data/new_soviet/recipes/brown_linoleum.json index d727404..db7ffac 100644 --- a/src/main/generated/data/new_soviet/recipes/brown_linoleum.json +++ b/src/main/generated/data/new_soviet/recipes/brown_linoleum.json @@ -3,7 +3,7 @@ "category": "building", "key": { "F": { - "item": "minecraft:gray_dye" + "item": "minecraft:brown_dye" }, "I": { "item": "minecraft:iron_nugget" @@ -15,7 +15,7 @@ "item": "minecraft:oak_planks" }, "S": { - "item": "minecraft:gray_dye" + "item": "minecraft:brown_dye" } }, "pattern": [ diff --git a/src/main/generated/data/new_soviet/recipes/cyan_linoleum.json b/src/main/generated/data/new_soviet/recipes/cyan_linoleum.json index 8fa22e2..42e42b2 100644 --- a/src/main/generated/data/new_soviet/recipes/cyan_linoleum.json +++ b/src/main/generated/data/new_soviet/recipes/cyan_linoleum.json @@ -3,7 +3,7 @@ "category": "building", "key": { "F": { - "item": "minecraft:gray_dye" + "item": "minecraft:cyan_dye" }, "I": { "item": "minecraft:iron_nugget" @@ -15,7 +15,7 @@ "item": "minecraft:oak_planks" }, "S": { - "item": "minecraft:gray_dye" + "item": "minecraft:cyan_dye" } }, "pattern": [ diff --git a/src/main/generated/data/new_soviet/recipes/orange_linoleum.json b/src/main/generated/data/new_soviet/recipes/orange_linoleum.json index 06e0006..ee04a81 100644 --- a/src/main/generated/data/new_soviet/recipes/orange_linoleum.json +++ b/src/main/generated/data/new_soviet/recipes/orange_linoleum.json @@ -3,7 +3,7 @@ "category": "building", "key": { "F": { - "item": "minecraft:gray_dye" + "item": "minecraft:orange_dye" }, "I": { "item": "minecraft:iron_nugget" @@ -15,7 +15,7 @@ "item": "minecraft:oak_planks" }, "S": { - "item": "minecraft:gray_dye" + "item": "minecraft:orange_dye" } }, "pattern": [ diff --git a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java b/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java index 6cb2d33..e4630fa 100644 --- a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java @@ -1112,9 +1112,9 @@ public class RecipeGenerator extends FabricRecipeProvider { linoleumRecipe(exporter, NSE_Blocks.BLUE_LINOLEUM, Items.BLUE_DYE); linoleumRecipe(exporter, NSE_Blocks.RED_LINOLEUM, Items.RED_DYE); linoleumRecipe(exporter, NSE_Blocks.GRAY_LINOLEUM, Items.GRAY_DYE); - linoleumRecipe(exporter, NSE_Blocks.ORANGE_LINOLEUM, Items.GRAY_DYE); - linoleumRecipe(exporter, NSE_Blocks.BROWN_LINOLEUM, Items.GRAY_DYE); - linoleumRecipe(exporter, NSE_Blocks.CYAN_LINOLEUM, Items.GRAY_DYE); + linoleumRecipe(exporter, NSE_Blocks.ORANGE_LINOLEUM, Items.ORANGE_DYE); + linoleumRecipe(exporter, NSE_Blocks.BROWN_LINOLEUM, Items.BROWN_DYE); + linoleumRecipe(exporter, NSE_Blocks.CYAN_LINOLEUM, Items.CYAN_DYE); linoleumRecipe(exporter, NSE_Blocks.YELLOW_RED_LINOLEUM, Items.YELLOW_DYE, Items.RED_DYE); linoleumRecipe(exporter, NSE_Blocks.BEIGE_LINOLEUM, Items.WHITE_DYE); offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.CROSS_ORANGE_LINOLEUM, NSE_Blocks.ORANGE_LINOLEUM);