diff --git a/TODO.md b/TODO.md index 42f5d0f..d6c2a35 100644 --- a/TODO.md +++ b/TODO.md @@ -3,11 +3,7 @@ * Ensure ru_ru and ru_rpr translations are up-to-date ### Missing recipes * Aquamarine, teal - reliance on prismarine -* Long blue tiles - missing * Concrete plate - missing -* Spruce and jungle carved - missing -* Yellow-red linoleum - missingŠ» -* Beige linoleum - missing * Po-2 wall and crate...? - missing * Rusty blue iron bars - missing * Most wallpaper - missing diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_linoleum.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_linoleum.json new file mode 100644 index 0000000..b5474a8 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_linoleum.json @@ -0,0 +1,87 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_iron_nugget": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_nugget" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_leather": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:leather" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_oak_planks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:beige_linoleum" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_white_dye_1": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:white_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_white_dye_2": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:white_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_white_dye_1", + "has_white_dye_2", + "has_leather", + "has_oak_planks", + "has_iron_nugget", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:beige_linoleum" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_linoleum_slab.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_linoleum_slab.json new file mode 100644 index 0000000..db065c2 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_linoleum_slab.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_beige_linoleum": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:beige_linoleum" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:beige_linoleum_slab" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_beige_linoleum", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:beige_linoleum_slab" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_linoleum_slab_from_beige_linoleum_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_linoleum_slab_from_beige_linoleum_stonecutting.json new file mode 100644 index 0000000..3032000 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_linoleum_slab_from_beige_linoleum_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_beige_linoleum": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:beige_linoleum" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:beige_linoleum_slab_from_beige_linoleum_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_beige_linoleum", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:beige_linoleum_slab_from_beige_linoleum_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_linoleum_stairs.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_linoleum_stairs.json new file mode 100644 index 0000000..426aba7 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_linoleum_stairs.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_beige_linoleum": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:beige_linoleum" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:beige_linoleum_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_beige_linoleum", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:beige_linoleum_stairs" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_linoleum_stairs_from_beige_linoleum_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_linoleum_stairs_from_beige_linoleum_stonecutting.json new file mode 100644 index 0000000..c8bd06b --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_linoleum_stairs_from_beige_linoleum_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_beige_linoleum": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:beige_linoleum" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:beige_linoleum_stairs_from_beige_linoleum_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_beige_linoleum", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:beige_linoleum_stairs_from_beige_linoleum_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_linoleum.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_linoleum.json index b8979e5..22bd5c0 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_linoleum.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_linoleum.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_blue_dye": { + "has_blue_dye_1": { "conditions": { "items": [ { @@ -13,36 +13,48 @@ }, "trigger": "minecraft:inventory_changed" }, - "has_clay": { + "has_blue_dye_2": { "conditions": { "items": [ { "items": [ - "minecraft:clay" + "minecraft:blue_dye" ] } ] }, "trigger": "minecraft:inventory_changed" }, - "has_paper": { + "has_iron_nugget": { "conditions": { "items": [ { "items": [ - "minecraft:paper" + "minecraft:iron_nugget" ] } ] }, "trigger": "minecraft:inventory_changed" }, - "has_slime_ball": { + "has_leather": { "conditions": { "items": [ { "items": [ - "minecraft:slime_ball" + "minecraft:leather" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_oak_planks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_planks" ] } ] @@ -58,10 +70,11 @@ }, "requirements": [ [ - "has_blue_dye", - "has_paper", - "has_slime_ball", - "has_clay", + "has_blue_dye_1", + "has_blue_dye_2", + "has_leather", + "has_oak_planks", + "has_iron_nugget", "has_the_recipe" ] ], 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 3205bfc..797e1d5 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,19 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_clay": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:clay" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_gray_dye": { + "has_gray_dye_1": { "conditions": { "items": [ { @@ -25,24 +13,48 @@ }, "trigger": "minecraft:inventory_changed" }, - "has_paper": { + "has_gray_dye_2": { "conditions": { "items": [ { "items": [ - "minecraft:paper" + "minecraft:gray_dye" ] } ] }, "trigger": "minecraft:inventory_changed" }, - "has_slime_ball": { + "has_iron_nugget": { "conditions": { "items": [ { "items": [ - "minecraft:slime_ball" + "minecraft:iron_nugget" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_leather": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:leather" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_oak_planks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_planks" ] } ] @@ -58,10 +70,11 @@ }, "requirements": [ [ - "has_gray_dye", - "has_paper", - "has_slime_ball", - "has_clay", + "has_gray_dye_1", + "has_gray_dye_2", + "has_leather", + "has_oak_planks", + "has_iron_nugget", "has_the_recipe" ] ], 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 1e5aa74..9020e9a 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,19 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_clay": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:clay" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_gray_dye": { + "has_gray_dye_1": { "conditions": { "items": [ { @@ -25,24 +13,48 @@ }, "trigger": "minecraft:inventory_changed" }, - "has_paper": { + "has_gray_dye_2": { "conditions": { "items": [ { "items": [ - "minecraft:paper" + "minecraft:gray_dye" ] } ] }, "trigger": "minecraft:inventory_changed" }, - "has_slime_ball": { + "has_iron_nugget": { "conditions": { "items": [ { "items": [ - "minecraft:slime_ball" + "minecraft:iron_nugget" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_leather": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:leather" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_oak_planks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_planks" ] } ] @@ -58,10 +70,11 @@ }, "requirements": [ [ - "has_gray_dye", - "has_paper", - "has_slime_ball", - "has_clay", + "has_gray_dye_1", + "has_gray_dye_2", + "has_leather", + "has_oak_planks", + "has_iron_nugget", "has_the_recipe" ] ], diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_beige_linoleum.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_beige_linoleum.json new file mode 100644 index 0000000..199d6b2 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_beige_linoleum.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:white_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_beige_linoleum" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_needed_dye", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_beige_linoleum" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/gray_linoleum.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/gray_linoleum.json index 31698c7..f9fffa9 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/gray_linoleum.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/gray_linoleum.json @@ -1,19 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_clay": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:clay" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_gray_dye": { + "has_gray_dye_1": { "conditions": { "items": [ { @@ -25,24 +13,48 @@ }, "trigger": "minecraft:inventory_changed" }, - "has_paper": { + "has_gray_dye_2": { "conditions": { "items": [ { "items": [ - "minecraft:paper" + "minecraft:gray_dye" ] } ] }, "trigger": "minecraft:inventory_changed" }, - "has_slime_ball": { + "has_iron_nugget": { "conditions": { "items": [ { "items": [ - "minecraft:slime_ball" + "minecraft:iron_nugget" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_leather": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:leather" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_oak_planks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_planks" ] } ] @@ -58,10 +70,11 @@ }, "requirements": [ [ - "has_gray_dye", - "has_paper", - "has_slime_ball", - "has_clay", + "has_gray_dye_1", + "has_gray_dye_2", + "has_leather", + "has_oak_planks", + "has_iron_nugget", "has_the_recipe" ] ], diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/green_linoleum.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/green_linoleum.json index 2284d52..4aec33f 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/green_linoleum.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/green_linoleum.json @@ -1,19 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_clay": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:clay" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_green_dye": { + "has_green_dye_1": { "conditions": { "items": [ { @@ -25,24 +13,48 @@ }, "trigger": "minecraft:inventory_changed" }, - "has_paper": { + "has_green_dye_2": { "conditions": { "items": [ { "items": [ - "minecraft:paper" + "minecraft:green_dye" ] } ] }, "trigger": "minecraft:inventory_changed" }, - "has_slime_ball": { + "has_iron_nugget": { "conditions": { "items": [ { "items": [ - "minecraft:slime_ball" + "minecraft:iron_nugget" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_leather": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:leather" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_oak_planks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_planks" ] } ] @@ -58,10 +70,11 @@ }, "requirements": [ [ - "has_green_dye", - "has_paper", - "has_slime_ball", - "has_clay", + "has_green_dye_1", + "has_green_dye_2", + "has_leather", + "has_oak_planks", + "has_iron_nugget", "has_the_recipe" ] ], 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 16ce07f..a98336b 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,19 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_clay": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:clay" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_gray_dye": { + "has_gray_dye_1": { "conditions": { "items": [ { @@ -25,24 +13,48 @@ }, "trigger": "minecraft:inventory_changed" }, - "has_paper": { + "has_gray_dye_2": { "conditions": { "items": [ { "items": [ - "minecraft:paper" + "minecraft:gray_dye" ] } ] }, "trigger": "minecraft:inventory_changed" }, - "has_slime_ball": { + "has_iron_nugget": { "conditions": { "items": [ { "items": [ - "minecraft:slime_ball" + "minecraft:iron_nugget" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_leather": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:leather" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_oak_planks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_planks" ] } ] @@ -58,10 +70,11 @@ }, "requirements": [ [ - "has_gray_dye", - "has_paper", - "has_slime_ball", - "has_clay", + "has_gray_dye_1", + "has_gray_dye_2", + "has_leather", + "has_oak_planks", + "has_iron_nugget", "has_the_recipe" ] ], diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/red_linoleum.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/red_linoleum.json index c7b4321..f25b5a2 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/red_linoleum.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/red_linoleum.json @@ -1,31 +1,43 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_clay": { + "has_iron_nugget": { "conditions": { "items": [ { "items": [ - "minecraft:clay" + "minecraft:iron_nugget" ] } ] }, "trigger": "minecraft:inventory_changed" }, - "has_paper": { + "has_leather": { "conditions": { "items": [ { "items": [ - "minecraft:paper" + "minecraft:leather" ] } ] }, "trigger": "minecraft:inventory_changed" }, - "has_red_dye": { + "has_oak_planks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_red_dye_1": { "conditions": { "items": [ { @@ -37,12 +49,12 @@ }, "trigger": "minecraft:inventory_changed" }, - "has_slime_ball": { + "has_red_dye_2": { "conditions": { "items": [ { "items": [ - "minecraft:slime_ball" + "minecraft:red_dye" ] } ] @@ -58,10 +70,11 @@ }, "requirements": [ [ - "has_red_dye", - "has_paper", - "has_slime_ball", - "has_clay", + "has_red_dye_1", + "has_red_dye_2", + "has_leather", + "has_oak_planks", + "has_iron_nugget", "has_the_recipe" ] ], diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_red_linoleum.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_red_linoleum.json new file mode 100644 index 0000000..6c99cdd --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_red_linoleum.json @@ -0,0 +1,87 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_iron_nugget": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_nugget" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_leather": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:leather" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_oak_planks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_red_dye_2": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:yellow_red_linoleum" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_yellow_dye_1": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:yellow_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_yellow_dye_1", + "has_red_dye_2", + "has_leather", + "has_oak_planks", + "has_iron_nugget", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:yellow_red_linoleum" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_red_linoleum_slab.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_red_linoleum_slab.json new file mode 100644 index 0000000..c1f097e --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_red_linoleum_slab.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:yellow_red_linoleum_slab" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_yellow_red_linoleum": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:yellow_red_linoleum" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_yellow_red_linoleum", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:yellow_red_linoleum_slab" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_red_linoleum_slab_from_yellow_red_linoleum_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_red_linoleum_slab_from_yellow_red_linoleum_stonecutting.json new file mode 100644 index 0000000..d3f685d --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_red_linoleum_slab_from_yellow_red_linoleum_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:yellow_red_linoleum_slab_from_yellow_red_linoleum_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_yellow_red_linoleum": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:yellow_red_linoleum" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_yellow_red_linoleum", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:yellow_red_linoleum_slab_from_yellow_red_linoleum_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_red_linoleum_stairs.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_red_linoleum_stairs.json new file mode 100644 index 0000000..87d3e19 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_red_linoleum_stairs.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:yellow_red_linoleum_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_yellow_red_linoleum": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:yellow_red_linoleum" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_yellow_red_linoleum", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:yellow_red_linoleum_stairs" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_red_linoleum_stairs_from_yellow_red_linoleum_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_red_linoleum_stairs_from_yellow_red_linoleum_stonecutting.json new file mode 100644 index 0000000..fccf5cc --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_red_linoleum_stairs_from_yellow_red_linoleum_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:yellow_red_linoleum_stairs_from_yellow_red_linoleum_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_yellow_red_linoleum": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:yellow_red_linoleum" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_yellow_red_linoleum", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:yellow_red_linoleum_stairs_from_yellow_red_linoleum_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/beige_linoleum.json b/src/main/generated/data/new_soviet/recipes/beige_linoleum.json new file mode 100644 index 0000000..99d81d6 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/beige_linoleum.json @@ -0,0 +1,31 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "F": { + "item": "minecraft:white_dye" + }, + "I": { + "item": "minecraft:iron_nugget" + }, + "L": { + "item": "minecraft:leather" + }, + "P": { + "item": "minecraft:oak_planks" + }, + "S": { + "item": "minecraft:white_dye" + } + }, + "pattern": [ + "LLL", + "PPP", + "FIS" + ], + "result": { + "count": 3, + "item": "new_soviet:beige_linoleum" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/beige_linoleum_slab.json b/src/main/generated/data/new_soviet/recipes/beige_linoleum_slab.json new file mode 100644 index 0000000..3b90d5a --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/beige_linoleum_slab.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "new_soviet:beige_linoleum" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 6, + "item": "new_soviet:beige_linoleum_slab" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/beige_linoleum_slab_from_beige_linoleum_stonecutting.json b/src/main/generated/data/new_soviet/recipes/beige_linoleum_slab_from_beige_linoleum_stonecutting.json new file mode 100644 index 0000000..6176d5a --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/beige_linoleum_slab_from_beige_linoleum_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "new_soviet:beige_linoleum" + }, + "result": "new_soviet:beige_linoleum_slab" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/beige_linoleum_stairs.json b/src/main/generated/data/new_soviet/recipes/beige_linoleum_stairs.json new file mode 100644 index 0000000..a7292b8 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/beige_linoleum_stairs.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "new_soviet:beige_linoleum" + } + }, + "pattern": [ + "# ", + "## ", + "###" + ], + "result": { + "count": 4, + "item": "new_soviet:beige_linoleum_stairs" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/beige_linoleum_stairs_from_beige_linoleum_stonecutting.json b/src/main/generated/data/new_soviet/recipes/beige_linoleum_stairs_from_beige_linoleum_stonecutting.json new file mode 100644 index 0000000..34f56e9 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/beige_linoleum_stairs_from_beige_linoleum_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:beige_linoleum" + }, + "result": "new_soviet:beige_linoleum_stairs" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/blue_linoleum.json b/src/main/generated/data/new_soviet/recipes/blue_linoleum.json index adec858..6201556 100644 --- a/src/main/generated/data/new_soviet/recipes/blue_linoleum.json +++ b/src/main/generated/data/new_soviet/recipes/blue_linoleum.json @@ -2,26 +2,29 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { - "C": { - "item": "minecraft:clay" - }, - "D": { + "F": { "item": "minecraft:blue_dye" }, + "I": { + "item": "minecraft:iron_nugget" + }, + "L": { + "item": "minecraft:leather" + }, "P": { - "item": "minecraft:paper" + "item": "minecraft:oak_planks" }, "S": { - "item": "minecraft:slime_ball" + "item": "minecraft:blue_dye" } }, "pattern": [ - " D ", - "CPC", - "SPS" + "LLL", + "PPP", + "FIS" ], "result": { - "count": 2, + "count": 3, "item": "new_soviet:blue_linoleum" }, "show_notification": true 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 d7c34f9..d727404 100644 --- a/src/main/generated/data/new_soviet/recipes/brown_linoleum.json +++ b/src/main/generated/data/new_soviet/recipes/brown_linoleum.json @@ -2,26 +2,29 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { - "C": { - "item": "minecraft:clay" - }, - "D": { + "F": { "item": "minecraft:gray_dye" }, + "I": { + "item": "minecraft:iron_nugget" + }, + "L": { + "item": "minecraft:leather" + }, "P": { - "item": "minecraft:paper" + "item": "minecraft:oak_planks" }, "S": { - "item": "minecraft:slime_ball" + "item": "minecraft:gray_dye" } }, "pattern": [ - " D ", - "CPC", - "SPS" + "LLL", + "PPP", + "FIS" ], "result": { - "count": 2, + "count": 3, "item": "new_soviet:brown_linoleum" }, "show_notification": true 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 771762d..8fa22e2 100644 --- a/src/main/generated/data/new_soviet/recipes/cyan_linoleum.json +++ b/src/main/generated/data/new_soviet/recipes/cyan_linoleum.json @@ -2,26 +2,29 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { - "C": { - "item": "minecraft:clay" - }, - "D": { + "F": { "item": "minecraft:gray_dye" }, + "I": { + "item": "minecraft:iron_nugget" + }, + "L": { + "item": "minecraft:leather" + }, "P": { - "item": "minecraft:paper" + "item": "minecraft:oak_planks" }, "S": { - "item": "minecraft:slime_ball" + "item": "minecraft:gray_dye" } }, "pattern": [ - " D ", - "CPC", - "SPS" + "LLL", + "PPP", + "FIS" ], "result": { - "count": 2, + "count": 3, "item": "new_soviet:cyan_linoleum" }, "show_notification": true diff --git a/src/main/generated/data/new_soviet/recipes/dye_beige_linoleum.json b/src/main/generated/data/new_soviet/recipes/dye_beige_linoleum.json new file mode 100644 index 0000000..1156bd0 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/dye_beige_linoleum.json @@ -0,0 +1,36 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "linoleum", + "ingredients": [ + { + "item": "minecraft:white_dye" + }, + [ + { + "item": "new_soviet:green_linoleum" + }, + { + "item": "new_soviet:orange_linoleum" + }, + { + "item": "new_soviet:blue_linoleum" + }, + { + "item": "new_soviet:red_linoleum" + }, + { + "item": "new_soviet:gray_linoleum" + }, + { + "item": "new_soviet:brown_linoleum" + }, + { + "item": "new_soviet:cyan_linoleum" + } + ] + ], + "result": { + "item": "new_soviet:beige_linoleum" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/dye_blue_linoleum.json b/src/main/generated/data/new_soviet/recipes/dye_blue_linoleum.json index 70ad0b3..d58fdc4 100644 --- a/src/main/generated/data/new_soviet/recipes/dye_blue_linoleum.json +++ b/src/main/generated/data/new_soviet/recipes/dye_blue_linoleum.json @@ -7,6 +7,9 @@ "item": "minecraft:blue_dye" }, [ + { + "item": "new_soviet:beige_linoleum" + }, { "item": "new_soviet:green_linoleum" }, diff --git a/src/main/generated/data/new_soviet/recipes/dye_brown_linoleum.json b/src/main/generated/data/new_soviet/recipes/dye_brown_linoleum.json index be752e7..ad6d674 100644 --- a/src/main/generated/data/new_soviet/recipes/dye_brown_linoleum.json +++ b/src/main/generated/data/new_soviet/recipes/dye_brown_linoleum.json @@ -7,6 +7,9 @@ "item": "minecraft:brown_dye" }, [ + { + "item": "new_soviet:beige_linoleum" + }, { "item": "new_soviet:green_linoleum" }, diff --git a/src/main/generated/data/new_soviet/recipes/dye_cyan_linoleum.json b/src/main/generated/data/new_soviet/recipes/dye_cyan_linoleum.json index 5a44df5..f67d74b 100644 --- a/src/main/generated/data/new_soviet/recipes/dye_cyan_linoleum.json +++ b/src/main/generated/data/new_soviet/recipes/dye_cyan_linoleum.json @@ -7,6 +7,9 @@ "item": "minecraft:cyan_dye" }, [ + { + "item": "new_soviet:beige_linoleum" + }, { "item": "new_soviet:green_linoleum" }, diff --git a/src/main/generated/data/new_soviet/recipes/dye_gray_linoleum.json b/src/main/generated/data/new_soviet/recipes/dye_gray_linoleum.json index dbc0c83..d359566 100644 --- a/src/main/generated/data/new_soviet/recipes/dye_gray_linoleum.json +++ b/src/main/generated/data/new_soviet/recipes/dye_gray_linoleum.json @@ -7,6 +7,9 @@ "item": "minecraft:gray_dye" }, [ + { + "item": "new_soviet:beige_linoleum" + }, { "item": "new_soviet:green_linoleum" }, diff --git a/src/main/generated/data/new_soviet/recipes/dye_green_linoleum.json b/src/main/generated/data/new_soviet/recipes/dye_green_linoleum.json index b698101..bd27d4a 100644 --- a/src/main/generated/data/new_soviet/recipes/dye_green_linoleum.json +++ b/src/main/generated/data/new_soviet/recipes/dye_green_linoleum.json @@ -7,6 +7,9 @@ "item": "minecraft:green_dye" }, [ + { + "item": "new_soviet:beige_linoleum" + }, { "item": "new_soviet:orange_linoleum" }, diff --git a/src/main/generated/data/new_soviet/recipes/dye_orange_linoleum.json b/src/main/generated/data/new_soviet/recipes/dye_orange_linoleum.json index 859084d..939cf3a 100644 --- a/src/main/generated/data/new_soviet/recipes/dye_orange_linoleum.json +++ b/src/main/generated/data/new_soviet/recipes/dye_orange_linoleum.json @@ -7,6 +7,9 @@ "item": "minecraft:orange_dye" }, [ + { + "item": "new_soviet:beige_linoleum" + }, { "item": "new_soviet:green_linoleum" }, diff --git a/src/main/generated/data/new_soviet/recipes/dye_red_linoleum.json b/src/main/generated/data/new_soviet/recipes/dye_red_linoleum.json index 784472d..dc6ec6b 100644 --- a/src/main/generated/data/new_soviet/recipes/dye_red_linoleum.json +++ b/src/main/generated/data/new_soviet/recipes/dye_red_linoleum.json @@ -7,6 +7,9 @@ "item": "minecraft:red_dye" }, [ + { + "item": "new_soviet:beige_linoleum" + }, { "item": "new_soviet:green_linoleum" }, diff --git a/src/main/generated/data/new_soviet/recipes/gray_linoleum.json b/src/main/generated/data/new_soviet/recipes/gray_linoleum.json index b2aeac6..c7e7d05 100644 --- a/src/main/generated/data/new_soviet/recipes/gray_linoleum.json +++ b/src/main/generated/data/new_soviet/recipes/gray_linoleum.json @@ -2,26 +2,29 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { - "C": { - "item": "minecraft:clay" - }, - "D": { + "F": { "item": "minecraft:gray_dye" }, + "I": { + "item": "minecraft:iron_nugget" + }, + "L": { + "item": "minecraft:leather" + }, "P": { - "item": "minecraft:paper" + "item": "minecraft:oak_planks" }, "S": { - "item": "minecraft:slime_ball" + "item": "minecraft:gray_dye" } }, "pattern": [ - " D ", - "CPC", - "SPS" + "LLL", + "PPP", + "FIS" ], "result": { - "count": 2, + "count": 3, "item": "new_soviet:gray_linoleum" }, "show_notification": true diff --git a/src/main/generated/data/new_soviet/recipes/green_linoleum.json b/src/main/generated/data/new_soviet/recipes/green_linoleum.json index 533e4c5..8a5b893 100644 --- a/src/main/generated/data/new_soviet/recipes/green_linoleum.json +++ b/src/main/generated/data/new_soviet/recipes/green_linoleum.json @@ -2,26 +2,29 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { - "C": { - "item": "minecraft:clay" - }, - "D": { + "F": { "item": "minecraft:green_dye" }, + "I": { + "item": "minecraft:iron_nugget" + }, + "L": { + "item": "minecraft:leather" + }, "P": { - "item": "minecraft:paper" + "item": "minecraft:oak_planks" }, "S": { - "item": "minecraft:slime_ball" + "item": "minecraft:green_dye" } }, "pattern": [ - " D ", - "CPC", - "SPS" + "LLL", + "PPP", + "FIS" ], "result": { - "count": 2, + "count": 3, "item": "new_soviet:green_linoleum" }, "show_notification": true 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 8d59547..06e0006 100644 --- a/src/main/generated/data/new_soviet/recipes/orange_linoleum.json +++ b/src/main/generated/data/new_soviet/recipes/orange_linoleum.json @@ -2,26 +2,29 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { - "C": { - "item": "minecraft:clay" - }, - "D": { + "F": { "item": "minecraft:gray_dye" }, + "I": { + "item": "minecraft:iron_nugget" + }, + "L": { + "item": "minecraft:leather" + }, "P": { - "item": "minecraft:paper" + "item": "minecraft:oak_planks" }, "S": { - "item": "minecraft:slime_ball" + "item": "minecraft:gray_dye" } }, "pattern": [ - " D ", - "CPC", - "SPS" + "LLL", + "PPP", + "FIS" ], "result": { - "count": 2, + "count": 3, "item": "new_soviet:orange_linoleum" }, "show_notification": true diff --git a/src/main/generated/data/new_soviet/recipes/red_linoleum.json b/src/main/generated/data/new_soviet/recipes/red_linoleum.json index 007a5d2..ef20ab8 100644 --- a/src/main/generated/data/new_soviet/recipes/red_linoleum.json +++ b/src/main/generated/data/new_soviet/recipes/red_linoleum.json @@ -2,26 +2,29 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { - "C": { - "item": "minecraft:clay" - }, - "D": { + "F": { "item": "minecraft:red_dye" }, + "I": { + "item": "minecraft:iron_nugget" + }, + "L": { + "item": "minecraft:leather" + }, "P": { - "item": "minecraft:paper" + "item": "minecraft:oak_planks" }, "S": { - "item": "minecraft:slime_ball" + "item": "minecraft:red_dye" } }, "pattern": [ - " D ", - "CPC", - "SPS" + "LLL", + "PPP", + "FIS" ], "result": { - "count": 2, + "count": 3, "item": "new_soviet:red_linoleum" }, "show_notification": true diff --git a/src/main/generated/data/new_soviet/recipes/yellow_red_linoleum.json b/src/main/generated/data/new_soviet/recipes/yellow_red_linoleum.json new file mode 100644 index 0000000..7b05e41 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/yellow_red_linoleum.json @@ -0,0 +1,31 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "F": { + "item": "minecraft:yellow_dye" + }, + "I": { + "item": "minecraft:iron_nugget" + }, + "L": { + "item": "minecraft:leather" + }, + "P": { + "item": "minecraft:oak_planks" + }, + "S": { + "item": "minecraft:red_dye" + } + }, + "pattern": [ + "LLL", + "PPP", + "FIS" + ], + "result": { + "count": 3, + "item": "new_soviet:yellow_red_linoleum" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/yellow_red_linoleum_slab.json b/src/main/generated/data/new_soviet/recipes/yellow_red_linoleum_slab.json new file mode 100644 index 0000000..f70c548 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/yellow_red_linoleum_slab.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "new_soviet:yellow_red_linoleum" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 6, + "item": "new_soviet:yellow_red_linoleum_slab" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/yellow_red_linoleum_slab_from_yellow_red_linoleum_stonecutting.json b/src/main/generated/data/new_soviet/recipes/yellow_red_linoleum_slab_from_yellow_red_linoleum_stonecutting.json new file mode 100644 index 0000000..bbb4cc1 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/yellow_red_linoleum_slab_from_yellow_red_linoleum_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "new_soviet:yellow_red_linoleum" + }, + "result": "new_soviet:yellow_red_linoleum_slab" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/yellow_red_linoleum_stairs.json b/src/main/generated/data/new_soviet/recipes/yellow_red_linoleum_stairs.json new file mode 100644 index 0000000..957f032 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/yellow_red_linoleum_stairs.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "new_soviet:yellow_red_linoleum" + } + }, + "pattern": [ + "# ", + "## ", + "###" + ], + "result": { + "count": 4, + "item": "new_soviet:yellow_red_linoleum_stairs" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/yellow_red_linoleum_stairs_from_yellow_red_linoleum_stonecutting.json b/src/main/generated/data/new_soviet/recipes/yellow_red_linoleum_stairs_from_yellow_red_linoleum_stonecutting.json new file mode 100644 index 0000000..b3d6dfe --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/yellow_red_linoleum_stairs_from_yellow_red_linoleum_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:yellow_red_linoleum" + }, + "result": "new_soviet:yellow_red_linoleum_stairs" +} \ No newline at end of file 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 d07196d..57e8445 100644 --- a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java @@ -11,6 +11,7 @@ import net.minecraft.item.Items; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.book.RecipeCategory; import net.minecraft.registry.Registries; +import net.minecraft.registry.tag.BlockTags; import net.minecraft.registry.tag.ItemTags; import net.minecraft.util.Util; import su.a71.new_soviet.registration.NSE_Blocks; @@ -162,15 +163,20 @@ public class RecipeGenerator extends FabricRecipeProvider { } private void linoleumRecipe(Consumer exporter, ItemConvertible output, ItemConvertible dye) { - ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output, 2) - .input('D', dye).input('P', Items.PAPER).input('C', Items.CLAY).input('S', Items.SLIME_BALL) - .pattern(" D ") - .pattern("CPC") - .pattern("SPS") - .criterion(hasItem(dye), conditionsFromItem(dye)) - .criterion(hasItem(Items.PAPER), conditionsFromItem(Items.PAPER)) - .criterion(hasItem(Items.SLIME_BALL), conditionsFromItem(Items.SLIME_BALL)) - .criterion(hasItem(Items.CLAY), conditionsFromItem(Items.CLAY)) + linoleumRecipe(exporter, output, dye, dye); + } + + private void linoleumRecipe(Consumer exporter, ItemConvertible output, ItemConvertible dye1, ItemConvertible dye2) { + ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output, 3) + .input('F', dye1).input('S', dye2).input('L', Items.LEATHER).input('P', Items.OAK_PLANKS).input('I', Items.IRON_NUGGET) + .pattern("LLL") + .pattern("PPP") + .pattern("FIS") + .criterion(hasItem(dye1) + "_1", conditionsFromItem(dye1)) + .criterion(hasItem(dye2) + "_2", conditionsFromItem(dye2)) + .criterion(hasItem(Items.LEATHER), conditionsFromItem(Items.LEATHER)) + .criterion(hasItem(Items.OAK_PLANKS), conditionsFromItem(Items.OAK_PLANKS)) + .criterion(hasItem(Items.IRON_NUGGET), conditionsFromItem(Items.IRON_NUGGET)) .offerTo(exporter); } @@ -997,6 +1003,8 @@ public class RecipeGenerator extends FabricRecipeProvider { offerStairsAndSlab(exporter, NSE_Blocks.ORANGE_LINOLEUM_STAIRS, NSE_Blocks.ORANGE_LINOLEUM_SLAB, NSE_Blocks.ORANGE_LINOLEUM); offerStairsAndSlab(exporter, NSE_Blocks.BROWN_LINOLEUM_STAIRS, NSE_Blocks.BROWN_LINOLEUM_SLAB, NSE_Blocks.BROWN_LINOLEUM); offerStairsAndSlab(exporter, NSE_Blocks.CYAN_LINOLEUM_STAIRS, NSE_Blocks.CYAN_LINOLEUM_SLAB, NSE_Blocks.CYAN_LINOLEUM); + offerStairsAndSlab(exporter, NSE_Blocks.BEIGE_LINOLEUM_STAIRS, NSE_Blocks.BEIGE_LINOLEUM_SLAB, NSE_Blocks.BEIGE_LINOLEUM); + offerStairsAndSlab(exporter, NSE_Blocks.YELLOW_RED_LINOLEUM_STAIRS, NSE_Blocks.YELLOW_RED_LINOLEUM_SLAB, NSE_Blocks.YELLOW_RED_LINOLEUM); offerStairsAndSlab(exporter, NSE_Blocks.METAL_PLATING_STAIRS, NSE_Blocks.METAL_PLATING_SLAB, NSE_Blocks.METAL_PLATING); offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_CHERRY_PLANKS); offerStairsAndSlab(exporter, NSE_Blocks.CROSS_CHERRY_PLANKS_STAIRS, NSE_Blocks.CROSS_CHERRY_PLANKS_SLAB, NSE_Blocks.CROSS_CHERRY_PLANKS); @@ -1088,11 +1096,13 @@ public class RecipeGenerator extends FabricRecipeProvider { 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.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); offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.CROSS_BROWN_LINOLEUM, NSE_Blocks.ORANGE_LINOLEUM); offerDyeableRecipes(exporter, - List.of(Items.GREEN_DYE, Items.ORANGE_DYE, Items.BLUE_DYE, Items.RED_DYE, Items.GRAY_DYE, Items.BROWN_DYE, Items.CYAN_DYE), - List.of(NSE_Blocks.GREEN_LINOLEUM.asItem(), NSE_Blocks.ORANGE_LINOLEUM.asItem(), NSE_Blocks.BLUE_LINOLEUM.asItem(), + List.of(Items.WHITE_DYE, Items.GREEN_DYE, Items.ORANGE_DYE, Items.BLUE_DYE, Items.RED_DYE, Items.GRAY_DYE, Items.BROWN_DYE, Items.CYAN_DYE), + List.of(NSE_Blocks.BEIGE_LINOLEUM.asItem(), NSE_Blocks.GREEN_LINOLEUM.asItem(), NSE_Blocks.ORANGE_LINOLEUM.asItem(), NSE_Blocks.BLUE_LINOLEUM.asItem(), NSE_Blocks.RED_LINOLEUM.asItem(), NSE_Blocks.GRAY_LINOLEUM.asItem(), NSE_Blocks.BROWN_LINOLEUM.asItem(), NSE_Blocks.CYAN_LINOLEUM.asItem()), "linoleum"); diff --git a/src/main/resources/assets/new_soviet/textures/block/blue/cracked_tile_rest_blue.png b/src/main/resources/assets/new_soviet/textures/block/blue/cracked_long_blue_tiles.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/blue/cracked_tile_rest_blue.png rename to src/main/resources/assets/new_soviet/textures/block/blue/cracked_long_blue_tiles.png