From 4873b24911ad813e58997a021a5ded68445ca279 Mon Sep 17 00:00:00 2001 From: Andrew-71 Date: Tue, 31 Oct 2023 12:22:44 +0300 Subject: [PATCH] Add recipes for wallpaper and linoleum --- .../building_blocks/beige_wallpaper.json | 61 +++++++++++++++ .../building_blocks/blue_linoleum.json | 74 +++++++++++++++++++ .../building_blocks/brown_linoleum.json | 74 +++++++++++++++++++ .../building_blocks/brown_wallpaper.json | 61 +++++++++++++++ ...eum_from_orange_linoleum_stonecutting.json | 35 +++++++++ ...eum_from_orange_linoleum_stonecutting.json | 35 +++++++++ .../building_blocks/cyan_linoleum.json | 74 +++++++++++++++++++ .../building_blocks/dye_beige_wallpaper.json | 35 +++++++++ .../building_blocks/dye_blue_linoleum.json | 35 +++++++++ .../building_blocks/dye_brown_linoleum.json | 35 +++++++++ .../building_blocks/dye_brown_wallpaper.json | 35 +++++++++ .../building_blocks/dye_cyan_linoleum.json | 35 +++++++++ .../building_blocks/dye_gray_linoleum.json | 35 +++++++++ .../building_blocks/dye_green_linoleum.json | 35 +++++++++ .../building_blocks/dye_green_wallpaper.json | 35 +++++++++ .../building_blocks/dye_orange_linoleum.json | 35 +++++++++ .../building_blocks/dye_red_linoleum.json | 35 +++++++++ .../building_blocks/gray_linoleum.json | 74 +++++++++++++++++++ .../building_blocks/green_linoleum.json | 74 +++++++++++++++++++ .../building_blocks/green_wallpaper.json | 61 +++++++++++++++ .../building_blocks/orange_linoleum.json | 74 +++++++++++++++++++ .../recipes/building_blocks/red_linoleum.json | 74 +++++++++++++++++++ .../new_soviet/recipes/beige_wallpaper.json | 25 +++++++ .../new_soviet/recipes/blue_linoleum.json | 28 +++++++ .../new_soviet/recipes/brown_linoleum.json | 28 +++++++ .../new_soviet/recipes/brown_wallpaper.json | 25 +++++++ ...eum_from_orange_linoleum_stonecutting.json | 8 ++ ...eum_from_orange_linoleum_stonecutting.json | 8 ++ .../new_soviet/recipes/cyan_linoleum.json | 28 +++++++ .../recipes/dye_beige_concrete.json | 2 +- .../recipes/dye_beige_wallpaper.json | 21 ++++++ .../new_soviet/recipes/dye_blue_concrete.json | 2 +- .../new_soviet/recipes/dye_blue_linoleum.json | 33 +++++++++ .../recipes/dye_brown_linoleum.json | 33 +++++++++ .../recipes/dye_brown_wallpaper.json | 21 ++++++ .../new_soviet/recipes/dye_cyan_linoleum.json | 33 +++++++++ .../new_soviet/recipes/dye_gray_linoleum.json | 33 +++++++++ .../recipes/dye_green_concrete.json | 2 +- .../recipes/dye_green_linoleum.json | 33 +++++++++ .../recipes/dye_green_wallpaper.json | 21 ++++++ .../recipes/dye_orange_linoleum.json | 33 +++++++++ .../new_soviet/recipes/dye_red_concrete.json | 2 +- .../new_soviet/recipes/dye_red_linoleum.json | 33 +++++++++ .../recipes/dye_white_concrete.json | 2 +- .../recipes/dye_yellow_concrete.json | 2 +- .../new_soviet/recipes/gray_linoleum.json | 28 +++++++ .../new_soviet/recipes/green_linoleum.json | 28 +++++++ .../new_soviet/recipes/green_wallpaper.json | 25 +++++++ .../new_soviet/recipes/orange_linoleum.json | 28 +++++++ .../data/new_soviet/recipes/red_linoleum.json | 28 +++++++ .../new_soviet/datagen/RecipeGenerator.java | 54 +++++++++++++- 51 files changed, 1760 insertions(+), 8 deletions(-) create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_wallpaper.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_linoleum.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/brown_linoleum.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/brown_wallpaper.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_brown_linoleum_from_orange_linoleum_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_orange_linoleum_from_orange_linoleum_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cyan_linoleum.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_beige_wallpaper.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_blue_linoleum.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_brown_linoleum.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_brown_wallpaper.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_cyan_linoleum.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_gray_linoleum.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_green_linoleum.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_green_wallpaper.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_orange_linoleum.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_red_linoleum.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/gray_linoleum.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/green_linoleum.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/green_wallpaper.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/orange_linoleum.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/red_linoleum.json create mode 100644 src/main/generated/data/new_soviet/recipes/beige_wallpaper.json create mode 100644 src/main/generated/data/new_soviet/recipes/blue_linoleum.json create mode 100644 src/main/generated/data/new_soviet/recipes/brown_linoleum.json create mode 100644 src/main/generated/data/new_soviet/recipes/brown_wallpaper.json create mode 100644 src/main/generated/data/new_soviet/recipes/cross_brown_linoleum_from_orange_linoleum_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/recipes/cross_orange_linoleum_from_orange_linoleum_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/recipes/cyan_linoleum.json create mode 100644 src/main/generated/data/new_soviet/recipes/dye_beige_wallpaper.json create mode 100644 src/main/generated/data/new_soviet/recipes/dye_blue_linoleum.json create mode 100644 src/main/generated/data/new_soviet/recipes/dye_brown_linoleum.json create mode 100644 src/main/generated/data/new_soviet/recipes/dye_brown_wallpaper.json create mode 100644 src/main/generated/data/new_soviet/recipes/dye_cyan_linoleum.json create mode 100644 src/main/generated/data/new_soviet/recipes/dye_gray_linoleum.json create mode 100644 src/main/generated/data/new_soviet/recipes/dye_green_linoleum.json create mode 100644 src/main/generated/data/new_soviet/recipes/dye_green_wallpaper.json create mode 100644 src/main/generated/data/new_soviet/recipes/dye_orange_linoleum.json create mode 100644 src/main/generated/data/new_soviet/recipes/dye_red_linoleum.json create mode 100644 src/main/generated/data/new_soviet/recipes/gray_linoleum.json create mode 100644 src/main/generated/data/new_soviet/recipes/green_linoleum.json create mode 100644 src/main/generated/data/new_soviet/recipes/green_wallpaper.json create mode 100644 src/main/generated/data/new_soviet/recipes/orange_linoleum.json create mode 100644 src/main/generated/data/new_soviet/recipes/red_linoleum.json diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_wallpaper.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_wallpaper.json new file mode 100644 index 0000000..d51d38f --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_wallpaper.json @@ -0,0 +1,61 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_paper": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:paper" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_slime_ball": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:slime_ball" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:beige_wallpaper" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_white_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:white_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_white_dye", + "has_paper", + "has_slime_ball", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:beige_wallpaper" + ] + }, + "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 new file mode 100644 index 0000000..b8979e5 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_linoleum.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_blue_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:blue_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_clay": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:clay" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_paper": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:paper" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_slime_ball": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:slime_ball" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:blue_linoleum" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_blue_dye", + "has_paper", + "has_slime_ball", + "has_clay", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:blue_linoleum" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file 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 new file mode 100644 index 0000000..3205bfc --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/brown_linoleum.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_clay": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:clay" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_gray_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:gray_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_paper": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:paper" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_slime_ball": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:slime_ball" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:brown_linoleum" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_gray_dye", + "has_paper", + "has_slime_ball", + "has_clay", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:brown_linoleum" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/brown_wallpaper.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/brown_wallpaper.json new file mode 100644 index 0000000..8747861 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/brown_wallpaper.json @@ -0,0 +1,61 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_brown_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:brown_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_paper": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:paper" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_slime_ball": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:slime_ball" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:brown_wallpaper" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_brown_dye", + "has_paper", + "has_slime_ball", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:brown_wallpaper" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_brown_linoleum_from_orange_linoleum_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_brown_linoleum_from_orange_linoleum_stonecutting.json new file mode 100644 index 0000000..41a672a --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_brown_linoleum_from_orange_linoleum_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_orange_linoleum": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:orange_linoleum" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cross_brown_linoleum_from_orange_linoleum_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_orange_linoleum", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cross_brown_linoleum_from_orange_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/cross_orange_linoleum_from_orange_linoleum_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_orange_linoleum_from_orange_linoleum_stonecutting.json new file mode 100644 index 0000000..5e2f8b7 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_orange_linoleum_from_orange_linoleum_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_orange_linoleum": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:orange_linoleum" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cross_orange_linoleum_from_orange_linoleum_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_orange_linoleum", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cross_orange_linoleum_from_orange_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/cyan_linoleum.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cyan_linoleum.json new file mode 100644 index 0000000..1e5aa74 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cyan_linoleum.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_clay": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:clay" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_gray_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:gray_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_paper": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:paper" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_slime_ball": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:slime_ball" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:cyan_linoleum" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_gray_dye", + "has_paper", + "has_slime_ball", + "has_clay", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:cyan_linoleum" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_beige_wallpaper.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_beige_wallpaper.json new file mode 100644 index 0000000..5959c41 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_beige_wallpaper.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_wallpaper" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_needed_dye", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_beige_wallpaper" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_blue_linoleum.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_blue_linoleum.json new file mode 100644 index 0000000..dd8c872 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_blue_linoleum.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:blue_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_blue_linoleum" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_needed_dye", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_blue_linoleum" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_brown_linoleum.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_brown_linoleum.json new file mode 100644 index 0000000..f1f27cf --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_brown_linoleum.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:brown_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_brown_linoleum" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_needed_dye", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_brown_linoleum" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_brown_wallpaper.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_brown_wallpaper.json new file mode 100644 index 0000000..0708103 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_brown_wallpaper.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:brown_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_brown_wallpaper" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_needed_dye", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_brown_wallpaper" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_cyan_linoleum.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_cyan_linoleum.json new file mode 100644 index 0000000..cc51672 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_cyan_linoleum.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:cyan_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_cyan_linoleum" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_needed_dye", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_cyan_linoleum" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_gray_linoleum.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_gray_linoleum.json new file mode 100644 index 0000000..6bb5454 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_gray_linoleum.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:gray_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_gray_linoleum" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_needed_dye", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_gray_linoleum" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_green_linoleum.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_green_linoleum.json new file mode 100644 index 0000000..2901be0 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_green_linoleum.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:green_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_green_linoleum" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_needed_dye", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_green_linoleum" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_green_wallpaper.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_green_wallpaper.json new file mode 100644 index 0000000..cfec3fd --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_green_wallpaper.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:green_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_green_wallpaper" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_needed_dye", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_green_wallpaper" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_orange_linoleum.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_orange_linoleum.json new file mode 100644 index 0000000..7ba947d --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_orange_linoleum.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:orange_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_orange_linoleum" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_needed_dye", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_orange_linoleum" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_red_linoleum.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_red_linoleum.json new file mode 100644 index 0000000..f0b2e8b --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_red_linoleum.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_red_linoleum" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_needed_dye", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_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/gray_linoleum.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/gray_linoleum.json new file mode 100644 index 0000000..31698c7 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/gray_linoleum.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_clay": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:clay" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_gray_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:gray_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_paper": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:paper" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_slime_ball": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:slime_ball" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:gray_linoleum" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_gray_dye", + "has_paper", + "has_slime_ball", + "has_clay", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:gray_linoleum" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file 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 new file mode 100644 index 0000000..2284d52 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/green_linoleum.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_clay": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:clay" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_green_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:green_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_paper": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:paper" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_slime_ball": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:slime_ball" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:green_linoleum" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_green_dye", + "has_paper", + "has_slime_ball", + "has_clay", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:green_linoleum" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/green_wallpaper.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/green_wallpaper.json new file mode 100644 index 0000000..7c47616 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/green_wallpaper.json @@ -0,0 +1,61 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_green_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:green_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_paper": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:paper" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_slime_ball": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:slime_ball" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:green_wallpaper" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_green_dye", + "has_paper", + "has_slime_ball", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:green_wallpaper" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file 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 new file mode 100644 index 0000000..16ce07f --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/orange_linoleum.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_clay": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:clay" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_gray_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:gray_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_paper": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:paper" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_slime_ball": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:slime_ball" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:orange_linoleum" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_gray_dye", + "has_paper", + "has_slime_ball", + "has_clay", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:orange_linoleum" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file 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 new file mode 100644 index 0000000..c7b4321 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/red_linoleum.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_clay": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:clay" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_paper": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:paper" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_red_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_slime_ball": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:slime_ball" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:red_linoleum" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_red_dye", + "has_paper", + "has_slime_ball", + "has_clay", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:red_linoleum" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/beige_wallpaper.json b/src/main/generated/data/new_soviet/recipes/beige_wallpaper.json new file mode 100644 index 0000000..5af29fa --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/beige_wallpaper.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "D": { + "item": "minecraft:white_dye" + }, + "P": { + "item": "minecraft:paper" + }, + "S": { + "item": "minecraft:slime_ball" + } + }, + "pattern": [ + " D ", + "PPP", + " S " + ], + "result": { + "count": 2, + "item": "new_soviet:beige_wallpaper" + }, + "show_notification": true +} \ 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 new file mode 100644 index 0000000..adec858 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/blue_linoleum.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "C": { + "item": "minecraft:clay" + }, + "D": { + "item": "minecraft:blue_dye" + }, + "P": { + "item": "minecraft:paper" + }, + "S": { + "item": "minecraft:slime_ball" + } + }, + "pattern": [ + " D ", + "CPC", + "SPS" + ], + "result": { + "count": 2, + "item": "new_soviet:blue_linoleum" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/brown_linoleum.json b/src/main/generated/data/new_soviet/recipes/brown_linoleum.json new file mode 100644 index 0000000..d7c34f9 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/brown_linoleum.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "C": { + "item": "minecraft:clay" + }, + "D": { + "item": "minecraft:gray_dye" + }, + "P": { + "item": "minecraft:paper" + }, + "S": { + "item": "minecraft:slime_ball" + } + }, + "pattern": [ + " D ", + "CPC", + "SPS" + ], + "result": { + "count": 2, + "item": "new_soviet:brown_linoleum" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/brown_wallpaper.json b/src/main/generated/data/new_soviet/recipes/brown_wallpaper.json new file mode 100644 index 0000000..2fcc896 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/brown_wallpaper.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "D": { + "item": "minecraft:brown_dye" + }, + "P": { + "item": "minecraft:paper" + }, + "S": { + "item": "minecraft:slime_ball" + } + }, + "pattern": [ + " D ", + "PPP", + " S " + ], + "result": { + "count": 2, + "item": "new_soviet:brown_wallpaper" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cross_brown_linoleum_from_orange_linoleum_stonecutting.json b/src/main/generated/data/new_soviet/recipes/cross_brown_linoleum_from_orange_linoleum_stonecutting.json new file mode 100644 index 0000000..f20c774 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cross_brown_linoleum_from_orange_linoleum_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:orange_linoleum" + }, + "result": "new_soviet:cross_brown_linoleum" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cross_orange_linoleum_from_orange_linoleum_stonecutting.json b/src/main/generated/data/new_soviet/recipes/cross_orange_linoleum_from_orange_linoleum_stonecutting.json new file mode 100644 index 0000000..ec2fd6d --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cross_orange_linoleum_from_orange_linoleum_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:orange_linoleum" + }, + "result": "new_soviet:cross_orange_linoleum" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cyan_linoleum.json b/src/main/generated/data/new_soviet/recipes/cyan_linoleum.json new file mode 100644 index 0000000..771762d --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cyan_linoleum.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "C": { + "item": "minecraft:clay" + }, + "D": { + "item": "minecraft:gray_dye" + }, + "P": { + "item": "minecraft:paper" + }, + "S": { + "item": "minecraft:slime_ball" + } + }, + "pattern": [ + " D ", + "CPC", + "SPS" + ], + "result": { + "count": 2, + "item": "new_soviet:cyan_linoleum" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/dye_beige_concrete.json b/src/main/generated/data/new_soviet/recipes/dye_beige_concrete.json index 0aefe95..ebdbd91 100644 --- a/src/main/generated/data/new_soviet/recipes/dye_beige_concrete.json +++ b/src/main/generated/data/new_soviet/recipes/dye_beige_concrete.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", "category": "building", - "group": "boundary_markers", + "group": "concrete", "ingredients": [ { "item": "minecraft:light_gray_dye" diff --git a/src/main/generated/data/new_soviet/recipes/dye_beige_wallpaper.json b/src/main/generated/data/new_soviet/recipes/dye_beige_wallpaper.json new file mode 100644 index 0000000..694e42f --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/dye_beige_wallpaper.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "wallpaper", + "ingredients": [ + { + "item": "minecraft:white_dye" + }, + [ + { + "item": "new_soviet:green_wallpaper" + }, + { + "item": "new_soviet:brown_wallpaper" + } + ] + ], + "result": { + "item": "new_soviet:beige_wallpaper" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/dye_blue_concrete.json b/src/main/generated/data/new_soviet/recipes/dye_blue_concrete.json index adfaa50..c966bf8 100644 --- a/src/main/generated/data/new_soviet/recipes/dye_blue_concrete.json +++ b/src/main/generated/data/new_soviet/recipes/dye_blue_concrete.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", "category": "building", - "group": "boundary_markers", + "group": "concrete", "ingredients": [ { "item": "minecraft:blue_dye" 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 new file mode 100644 index 0000000..70ad0b3 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/dye_blue_linoleum.json @@ -0,0 +1,33 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "linoleum", + "ingredients": [ + { + "item": "minecraft:blue_dye" + }, + [ + { + "item": "new_soviet:green_linoleum" + }, + { + "item": "new_soviet:orange_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:blue_linoleum" + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..be752e7 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/dye_brown_linoleum.json @@ -0,0 +1,33 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "linoleum", + "ingredients": [ + { + "item": "minecraft:brown_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:cyan_linoleum" + } + ] + ], + "result": { + "item": "new_soviet:brown_linoleum" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/dye_brown_wallpaper.json b/src/main/generated/data/new_soviet/recipes/dye_brown_wallpaper.json new file mode 100644 index 0000000..69dfb37 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/dye_brown_wallpaper.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "wallpaper", + "ingredients": [ + { + "item": "minecraft:brown_dye" + }, + [ + { + "item": "new_soviet:green_wallpaper" + }, + { + "item": "new_soviet:beige_wallpaper" + } + ] + ], + "result": { + "item": "new_soviet:brown_wallpaper" + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..5a44df5 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/dye_cyan_linoleum.json @@ -0,0 +1,33 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "linoleum", + "ingredients": [ + { + "item": "minecraft:cyan_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" + } + ] + ], + "result": { + "item": "new_soviet:cyan_linoleum" + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..dbc0c83 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/dye_gray_linoleum.json @@ -0,0 +1,33 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "linoleum", + "ingredients": [ + { + "item": "minecraft:gray_dye" + }, + [ + { + "item": "new_soviet:green_linoleum" + }, + { + "item": "new_soviet:orange_linoleum" + }, + { + "item": "new_soviet:blue_linoleum" + }, + { + "item": "new_soviet:red_linoleum" + }, + { + "item": "new_soviet:brown_linoleum" + }, + { + "item": "new_soviet:cyan_linoleum" + } + ] + ], + "result": { + "item": "new_soviet:gray_linoleum" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/dye_green_concrete.json b/src/main/generated/data/new_soviet/recipes/dye_green_concrete.json index fd64827..f0a6db5 100644 --- a/src/main/generated/data/new_soviet/recipes/dye_green_concrete.json +++ b/src/main/generated/data/new_soviet/recipes/dye_green_concrete.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", "category": "building", - "group": "boundary_markers", + "group": "concrete", "ingredients": [ { "item": "minecraft:green_dye" 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 new file mode 100644 index 0000000..b698101 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/dye_green_linoleum.json @@ -0,0 +1,33 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "linoleum", + "ingredients": [ + { + "item": "minecraft:green_dye" + }, + [ + { + "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:green_linoleum" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/dye_green_wallpaper.json b/src/main/generated/data/new_soviet/recipes/dye_green_wallpaper.json new file mode 100644 index 0000000..b48e04e --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/dye_green_wallpaper.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "wallpaper", + "ingredients": [ + { + "item": "minecraft:green_dye" + }, + [ + { + "item": "new_soviet:beige_wallpaper" + }, + { + "item": "new_soviet:brown_wallpaper" + } + ] + ], + "result": { + "item": "new_soviet:green_wallpaper" + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..859084d --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/dye_orange_linoleum.json @@ -0,0 +1,33 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "linoleum", + "ingredients": [ + { + "item": "minecraft:orange_dye" + }, + [ + { + "item": "new_soviet:green_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:orange_linoleum" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/dye_red_concrete.json b/src/main/generated/data/new_soviet/recipes/dye_red_concrete.json index e994328..34dd9a4 100644 --- a/src/main/generated/data/new_soviet/recipes/dye_red_concrete.json +++ b/src/main/generated/data/new_soviet/recipes/dye_red_concrete.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", "category": "building", - "group": "boundary_markers", + "group": "concrete", "ingredients": [ { "item": "minecraft:red_dye" 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 new file mode 100644 index 0000000..784472d --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/dye_red_linoleum.json @@ -0,0 +1,33 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "linoleum", + "ingredients": [ + { + "item": "minecraft:red_dye" + }, + [ + { + "item": "new_soviet:green_linoleum" + }, + { + "item": "new_soviet:orange_linoleum" + }, + { + "item": "new_soviet:blue_linoleum" + }, + { + "item": "new_soviet:gray_linoleum" + }, + { + "item": "new_soviet:brown_linoleum" + }, + { + "item": "new_soviet:cyan_linoleum" + } + ] + ], + "result": { + "item": "new_soviet:red_linoleum" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/dye_white_concrete.json b/src/main/generated/data/new_soviet/recipes/dye_white_concrete.json index 9c8c181..dcda1d8 100644 --- a/src/main/generated/data/new_soviet/recipes/dye_white_concrete.json +++ b/src/main/generated/data/new_soviet/recipes/dye_white_concrete.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", "category": "building", - "group": "boundary_markers", + "group": "concrete", "ingredients": [ { "item": "minecraft:white_dye" diff --git a/src/main/generated/data/new_soviet/recipes/dye_yellow_concrete.json b/src/main/generated/data/new_soviet/recipes/dye_yellow_concrete.json index bf7e32a..31a0013 100644 --- a/src/main/generated/data/new_soviet/recipes/dye_yellow_concrete.json +++ b/src/main/generated/data/new_soviet/recipes/dye_yellow_concrete.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shapeless", "category": "building", - "group": "boundary_markers", + "group": "concrete", "ingredients": [ { "item": "minecraft:yellow_dye" diff --git a/src/main/generated/data/new_soviet/recipes/gray_linoleum.json b/src/main/generated/data/new_soviet/recipes/gray_linoleum.json new file mode 100644 index 0000000..b2aeac6 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/gray_linoleum.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "C": { + "item": "minecraft:clay" + }, + "D": { + "item": "minecraft:gray_dye" + }, + "P": { + "item": "minecraft:paper" + }, + "S": { + "item": "minecraft:slime_ball" + } + }, + "pattern": [ + " D ", + "CPC", + "SPS" + ], + "result": { + "count": 2, + "item": "new_soviet:gray_linoleum" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/green_linoleum.json b/src/main/generated/data/new_soviet/recipes/green_linoleum.json new file mode 100644 index 0000000..533e4c5 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/green_linoleum.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "C": { + "item": "minecraft:clay" + }, + "D": { + "item": "minecraft:green_dye" + }, + "P": { + "item": "minecraft:paper" + }, + "S": { + "item": "minecraft:slime_ball" + } + }, + "pattern": [ + " D ", + "CPC", + "SPS" + ], + "result": { + "count": 2, + "item": "new_soviet:green_linoleum" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/green_wallpaper.json b/src/main/generated/data/new_soviet/recipes/green_wallpaper.json new file mode 100644 index 0000000..d478f67 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/green_wallpaper.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "D": { + "item": "minecraft:green_dye" + }, + "P": { + "item": "minecraft:paper" + }, + "S": { + "item": "minecraft:slime_ball" + } + }, + "pattern": [ + " D ", + "PPP", + " S " + ], + "result": { + "count": 2, + "item": "new_soviet:green_wallpaper" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/orange_linoleum.json b/src/main/generated/data/new_soviet/recipes/orange_linoleum.json new file mode 100644 index 0000000..8d59547 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/orange_linoleum.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "C": { + "item": "minecraft:clay" + }, + "D": { + "item": "minecraft:gray_dye" + }, + "P": { + "item": "minecraft:paper" + }, + "S": { + "item": "minecraft:slime_ball" + } + }, + "pattern": [ + " D ", + "CPC", + "SPS" + ], + "result": { + "count": 2, + "item": "new_soviet:orange_linoleum" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/red_linoleum.json b/src/main/generated/data/new_soviet/recipes/red_linoleum.json new file mode 100644 index 0000000..007a5d2 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/red_linoleum.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "C": { + "item": "minecraft:clay" + }, + "D": { + "item": "minecraft:red_dye" + }, + "P": { + "item": "minecraft:paper" + }, + "S": { + "item": "minecraft:slime_ball" + } + }, + "pattern": [ + " D ", + "CPC", + "SPS" + ], + "result": { + "count": 2, + "item": "new_soviet:red_linoleum" + }, + "show_notification": true +} \ 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 2591eed..2bb3045 100644 --- a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java @@ -4,7 +4,8 @@ package su.a71.new_soviet.datagen; import com.google.common.collect.Lists; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; -import net.minecraft.block.Blocks; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.*; import net.minecraft.data.server.recipe.RecipeJsonProvider; import net.minecraft.data.server.recipe.RecipeProvider; import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder; @@ -15,6 +16,7 @@ import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.book.RecipeCategory; import net.minecraft.registry.tag.BlockTags; import net.minecraft.registry.tag.ItemTags; +import net.minecraft.sound.BlockSoundGroup; import net.minecraft.util.Util; import su.a71.new_soviet.registration.NSE_Blocks; import su.a71.new_soviet.registration.NSE_Custom; @@ -137,6 +139,31 @@ public class RecipeGenerator extends FabricRecipeProvider { .offerTo(exporter); } + private void wallpaperRecipe(Consumer exporter, ItemConvertible output, ItemConvertible dye) { + ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output, 2) + .input('D', dye).input('P', Items.PAPER).input('S', Items.SLIME_BALL) + .pattern(" D ") + .pattern("PPP") + .pattern(" S ") + .criterion(hasItem(dye), conditionsFromItem(dye)) + .criterion(hasItem(Items.PAPER), conditionsFromItem(Items.PAPER)) + .criterion(hasItem(Items.SLIME_BALL), conditionsFromItem(Items.SLIME_BALL)) + .offerTo(exporter); + } + + 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)) + .offerTo(exporter); + } + private void tvRecipe(Consumer exporter, ItemConvertible output, ItemConvertible dye) { ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, output, 1) .pattern("N N") @@ -765,7 +792,7 @@ public class RecipeGenerator extends FabricRecipeProvider { List.of(Items.GREEN_DYE, Items.YELLOW_DYE, Items.BLUE_DYE, Items.RED_DYE, Items.WHITE_DYE, Items.LIGHT_GRAY_DYE), List.of(NSE_Blocks.GREEN_CONCRETE.asItem(), NSE_Blocks.YELLOW_CONCRETE.asItem(), NSE_Blocks.BLUE_CONCRETE.asItem(), NSE_Blocks.RED_CONCRETE.asItem(), NSE_Blocks.WHITE_CONCRETE.asItem(), NSE_Blocks.BEIGE_CONCRETE.asItem()), - "boundary_markers"); + "concrete"); concreteRecipe(exporter, NSE_Blocks.GREEN_CONCRETE, Items.GREEN_DYE); concreteRecipe(exporter, NSE_Blocks.YELLOW_CONCRETE, Items.YELLOW_DYE); @@ -779,5 +806,28 @@ public class RecipeGenerator extends FabricRecipeProvider { concreteWithBarsRecipe(exporter, NSE_Blocks.RED_CONCRETE_WITH_BARS, NSE_Blocks.CRACKED_RED_CONCRETE); concreteWithBarsRecipe(exporter, NSE_Blocks.WHITE_CONCRETE_WITH_BARS, NSE_Blocks.CRACKED_WHITE_CONCRETE); concreteWithBarsRecipe(exporter, NSE_Blocks.BEIGE_CONCRETE_WITH_BARS, NSE_Blocks.CRACKED_BEIGE_CONCRETE); + + wallpaperRecipe(exporter, NSE_Blocks.BEIGE_WALLPAPER, Items.WHITE_DYE); + wallpaperRecipe(exporter, NSE_Blocks.GREEN_WALLPAPER, Items.GREEN_DYE); + wallpaperRecipe(exporter, NSE_Blocks.BROWN_WALLPAPER, Items.BROWN_DYE); + offerDyeableRecipes(exporter, + List.of(Items.GREEN_DYE, Items.WHITE_DYE, Items.BROWN_DYE ), + List.of(NSE_Blocks.GREEN_WALLPAPER.asItem(), NSE_Blocks.BEIGE_WALLPAPER.asItem(), NSE_Blocks.BROWN_WALLPAPER.asItem()), + "wallpaper"); + + linoleumRecipe(exporter, NSE_Blocks.GREEN_LINOLEUM, Items.GREEN_DYE); + 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); + 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(), + NSE_Blocks.RED_LINOLEUM.asItem(), NSE_Blocks.GRAY_LINOLEUM.asItem(), NSE_Blocks.BROWN_LINOLEUM.asItem(), NSE_Blocks.CYAN_LINOLEUM.asItem()), + "linoleum"); } } \ No newline at end of file