diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_green_wallpaper.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_green_wallpaper.json new file mode 100644 index 0000000..ff9e858 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_green_wallpaper.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_green_dye_2": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:green_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_oak_planks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_paper": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:paper" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:beige_green_wallpaper" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_white_dye_1": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:white_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_white_dye_1", + "has_green_dye_2", + "has_paper", + "has_oak_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:beige_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/beige_wallpaper.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_wallpaper.json index d51d38f..26ffbd1 100644 --- 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 @@ -1,6 +1,18 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_oak_planks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, "has_paper": { "conditions": { "items": [ @@ -13,25 +25,25 @@ }, "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": { + "has_white_dye_1": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:white_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_white_dye_2": { "conditions": { "items": [ { @@ -46,9 +58,10 @@ }, "requirements": [ [ - "has_white_dye", + "has_white_dye_1", + "has_white_dye_2", "has_paper", - "has_slime_ball", + "has_oak_planks", "has_the_recipe" ] ], diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/brown_green_wallpaper.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/brown_green_wallpaper.json new file mode 100644 index 0000000..c7c0fba --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/brown_green_wallpaper.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_brown_dye_1": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:brown_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_green_dye_2": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:green_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_oak_planks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_paper": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:paper" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:brown_green_wallpaper" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_brown_dye_1", + "has_green_dye_2", + "has_paper", + "has_oak_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:brown_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/brown_wallpaper.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/brown_wallpaper.json index 8747861..22c470b 100644 --- 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 @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_brown_dye": { + "has_brown_dye_1": { "conditions": { "items": [ { @@ -13,6 +13,30 @@ }, "trigger": "minecraft:inventory_changed" }, + "has_brown_dye_2": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:brown_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_oak_planks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, "has_paper": { "conditions": { "items": [ @@ -25,18 +49,6 @@ }, "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" @@ -46,9 +58,10 @@ }, "requirements": [ [ - "has_brown_dye", + "has_brown_dye_1", + "has_brown_dye_2", "has_paper", - "has_slime_ball", + "has_oak_planks", "has_the_recipe" ] ], diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dark_blue_wallpaper.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dark_blue_wallpaper.json new file mode 100644 index 0000000..69fd66c --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dark_blue_wallpaper.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_blue_dye_1": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:blue_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_blue_dye_2": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:blue_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_oak_planks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_paper": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:paper" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:dark_blue_wallpaper" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_blue_dye_1", + "has_blue_dye_2", + "has_paper", + "has_oak_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:dark_blue_wallpaper" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dark_brown_wallpaper.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dark_brown_wallpaper.json new file mode 100644 index 0000000..427d684 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dark_brown_wallpaper.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_black_dye_2": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:black_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_brown_dye_1": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:brown_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_oak_planks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_paper": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:paper" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:dark_brown_wallpaper" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_brown_dye_1", + "has_black_dye_2", + "has_paper", + "has_oak_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:dark_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/dark_green_wallpaper.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dark_green_wallpaper.json new file mode 100644 index 0000000..25ee7f6 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dark_green_wallpaper.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_green_dye_1": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:green_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_green_dye_2": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:green_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_oak_planks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_paper": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:paper" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:dark_green_wallpaper" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_green_dye_1", + "has_green_dye_2", + "has_paper", + "has_oak_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:dark_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_dark_blue_wallpaper.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_dark_blue_wallpaper.json new file mode 100644 index 0000000..65df9fe --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_dark_blue_wallpaper.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_dark_blue_wallpaper" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_needed_dye", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_dark_blue_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_dark_green_wallpaper.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_dark_green_wallpaper.json new file mode 100644 index 0000000..8263c93 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_dark_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_dark_green_wallpaper" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_needed_dye", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_dark_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_green_wallpaper.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_green_wallpaper.json index cfec3fd..b577327 100644 --- 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 @@ -6,7 +6,7 @@ "items": [ { "items": [ - "minecraft:green_dye" + "minecraft:lime_dye" ] } ] diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_light_blue_wallpaper.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_light_blue_wallpaper.json new file mode 100644 index 0000000..d44f0aa --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_light_blue_wallpaper.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:light_blue_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_light_blue_wallpaper" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_needed_dye", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_light_blue_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_wallpaper.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_orange_wallpaper.json new file mode 100644 index 0000000..02a4326 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_orange_wallpaper.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_wallpaper" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_needed_dye", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_orange_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_yellow_wallpaper.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_yellow_wallpaper.json new file mode 100644 index 0000000..50a668a --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_yellow_wallpaper.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_needed_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:yellow_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_yellow_wallpaper" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_needed_dye", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_yellow_wallpaper" + ] + }, + "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 index 7c47616..b75fbc0 100644 --- 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 @@ -1,12 +1,36 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_green_dye": { + "has_lime_dye_1": { "conditions": { "items": [ { "items": [ - "minecraft:green_dye" + "minecraft:lime_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_lime_dye_2": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:lime_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_oak_planks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_planks" ] } ] @@ -25,18 +49,6 @@ }, "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" @@ -46,9 +58,10 @@ }, "requirements": [ [ - "has_green_dye", + "has_lime_dye_1", + "has_lime_dye_2", "has_paper", - "has_slime_ball", + "has_oak_planks", "has_the_recipe" ] ], diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/light_beige_wallpaper.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/light_beige_wallpaper.json new file mode 100644 index 0000000..c09cd79 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/light_beige_wallpaper.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_bone_meal_2": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:bone_meal" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_oak_planks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_paper": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:paper" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:light_beige_wallpaper" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_white_dye_1": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:white_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_white_dye_1", + "has_bone_meal_2", + "has_paper", + "has_oak_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:light_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/light_blue_wallpaper.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/light_blue_wallpaper.json new file mode 100644 index 0000000..15a5185 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/light_blue_wallpaper.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_light_blue_dye_1": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:light_blue_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_light_blue_dye_2": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:light_blue_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_oak_planks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_paper": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:paper" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:light_blue_wallpaper" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_light_blue_dye_1", + "has_light_blue_dye_2", + "has_paper", + "has_oak_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:light_blue_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_wallpaper.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/orange_wallpaper.json new file mode 100644 index 0000000..02f8458 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/orange_wallpaper.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_oak_planks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_orange_dye_1": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:orange_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_orange_dye_2": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:orange_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_paper": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:paper" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:orange_wallpaper" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_orange_dye_1", + "has_orange_dye_2", + "has_paper", + "has_oak_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:orange_wallpaper" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/pink_green_wallpaper.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/pink_green_wallpaper.json new file mode 100644 index 0000000..37eff80 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/pink_green_wallpaper.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_green_dye_2": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:green_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_oak_planks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_paper": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:paper" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_pink_dye_1": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:pink_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:pink_green_wallpaper" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_pink_dye_1", + "has_green_dye_2", + "has_paper", + "has_oak_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:pink_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/red_green_wallpaper.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/red_green_wallpaper.json new file mode 100644 index 0000000..77b717b --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/red_green_wallpaper.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_green_dye_2": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:green_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_oak_planks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_paper": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:paper" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_red_dye_1": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:red_green_wallpaper" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_red_dye_1", + "has_green_dye_2", + "has_paper", + "has_oak_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:red_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/yellow_green_wallpaper.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_green_wallpaper.json new file mode 100644 index 0000000..e9705e7 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_green_wallpaper.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_green_dye_2": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:green_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_oak_planks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_paper": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:paper" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:yellow_green_wallpaper" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_yellow_dye_1": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:yellow_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_yellow_dye_1", + "has_green_dye_2", + "has_paper", + "has_oak_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:yellow_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/yellow_wallpaper.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_wallpaper.json new file mode 100644 index 0000000..0689886 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_wallpaper.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_oak_planks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_paper": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:paper" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:yellow_wallpaper" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_yellow_dye_1": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:yellow_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_yellow_dye_2": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:yellow_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_yellow_dye_1", + "has_yellow_dye_2", + "has_paper", + "has_oak_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:yellow_wallpaper" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/beige_green_wallpaper.json b/src/main/generated/data/new_soviet/recipes/beige_green_wallpaper.json new file mode 100644 index 0000000..ac4dc63 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/beige_green_wallpaper.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "F": { + "item": "minecraft:white_dye" + }, + "O": { + "item": "minecraft:oak_planks" + }, + "P": { + "item": "minecraft:paper" + }, + "S": { + "item": "minecraft:green_dye" + } + }, + "pattern": [ + "POP", + "FOS", + "POP" + ], + "result": { + "count": 3, + "item": "new_soviet:beige_green_wallpaper" + }, + "show_notification": true +} \ 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 index 5af29fa..b3cad5a 100644 --- a/src/main/generated/data/new_soviet/recipes/beige_wallpaper.json +++ b/src/main/generated/data/new_soviet/recipes/beige_wallpaper.json @@ -2,23 +2,26 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { - "D": { + "F": { "item": "minecraft:white_dye" }, + "O": { + "item": "minecraft:oak_planks" + }, "P": { "item": "minecraft:paper" }, "S": { - "item": "minecraft:slime_ball" + "item": "minecraft:white_dye" } }, "pattern": [ - " D ", - "PPP", - " S " + "POP", + "FOS", + "POP" ], "result": { - "count": 2, + "count": 3, "item": "new_soviet:beige_wallpaper" }, "show_notification": true diff --git a/src/main/generated/data/new_soviet/recipes/brown_green_wallpaper.json b/src/main/generated/data/new_soviet/recipes/brown_green_wallpaper.json new file mode 100644 index 0000000..8ada337 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/brown_green_wallpaper.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "F": { + "item": "minecraft:brown_dye" + }, + "O": { + "item": "minecraft:oak_planks" + }, + "P": { + "item": "minecraft:paper" + }, + "S": { + "item": "minecraft:green_dye" + } + }, + "pattern": [ + "POP", + "FOS", + "POP" + ], + "result": { + "count": 3, + "item": "new_soviet:brown_green_wallpaper" + }, + "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 index 2fcc896..157692e 100644 --- a/src/main/generated/data/new_soviet/recipes/brown_wallpaper.json +++ b/src/main/generated/data/new_soviet/recipes/brown_wallpaper.json @@ -2,23 +2,26 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { - "D": { + "F": { "item": "minecraft:brown_dye" }, + "O": { + "item": "minecraft:oak_planks" + }, "P": { "item": "minecraft:paper" }, "S": { - "item": "minecraft:slime_ball" + "item": "minecraft:brown_dye" } }, "pattern": [ - " D ", - "PPP", - " S " + "POP", + "FOS", + "POP" ], "result": { - "count": 2, + "count": 3, "item": "new_soviet:brown_wallpaper" }, "show_notification": true diff --git a/src/main/generated/data/new_soviet/recipes/dark_blue_wallpaper.json b/src/main/generated/data/new_soviet/recipes/dark_blue_wallpaper.json new file mode 100644 index 0000000..7384a3e --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/dark_blue_wallpaper.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "F": { + "item": "minecraft:blue_dye" + }, + "O": { + "item": "minecraft:oak_planks" + }, + "P": { + "item": "minecraft:paper" + }, + "S": { + "item": "minecraft:blue_dye" + } + }, + "pattern": [ + "POP", + "FOS", + "POP" + ], + "result": { + "count": 3, + "item": "new_soviet:dark_blue_wallpaper" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/dark_brown_wallpaper.json b/src/main/generated/data/new_soviet/recipes/dark_brown_wallpaper.json new file mode 100644 index 0000000..44c33c1 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/dark_brown_wallpaper.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "F": { + "item": "minecraft:brown_dye" + }, + "O": { + "item": "minecraft:oak_planks" + }, + "P": { + "item": "minecraft:paper" + }, + "S": { + "item": "minecraft:black_dye" + } + }, + "pattern": [ + "POP", + "FOS", + "POP" + ], + "result": { + "count": 3, + "item": "new_soviet:dark_brown_wallpaper" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/dark_green_wallpaper.json b/src/main/generated/data/new_soviet/recipes/dark_green_wallpaper.json new file mode 100644 index 0000000..b14b730 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/dark_green_wallpaper.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "F": { + "item": "minecraft:green_dye" + }, + "O": { + "item": "minecraft:oak_planks" + }, + "P": { + "item": "minecraft:paper" + }, + "S": { + "item": "minecraft:green_dye" + } + }, + "pattern": [ + "POP", + "FOS", + "POP" + ], + "result": { + "count": 3, + "item": "new_soviet:dark_green_wallpaper" + }, + "show_notification": true +} \ No newline at end of file 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 index 694e42f..2dadbaf 100644 --- a/src/main/generated/data/new_soviet/recipes/dye_beige_wallpaper.json +++ b/src/main/generated/data/new_soviet/recipes/dye_beige_wallpaper.json @@ -7,11 +7,26 @@ "item": "minecraft:white_dye" }, [ + { + "item": "new_soviet:dark_green_wallpaper" + }, { "item": "new_soviet:green_wallpaper" }, { "item": "new_soviet:brown_wallpaper" + }, + { + "item": "new_soviet:yellow_wallpaper" + }, + { + "item": "new_soviet:light_blue_wallpaper" + }, + { + "item": "new_soviet:dark_blue_wallpaper" + }, + { + "item": "new_soviet:orange_wallpaper" } ] ], 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 index 69dfb37..d7658db 100644 --- a/src/main/generated/data/new_soviet/recipes/dye_brown_wallpaper.json +++ b/src/main/generated/data/new_soviet/recipes/dye_brown_wallpaper.json @@ -7,11 +7,26 @@ "item": "minecraft:brown_dye" }, [ + { + "item": "new_soviet:dark_green_wallpaper" + }, { "item": "new_soviet:green_wallpaper" }, { "item": "new_soviet:beige_wallpaper" + }, + { + "item": "new_soviet:yellow_wallpaper" + }, + { + "item": "new_soviet:light_blue_wallpaper" + }, + { + "item": "new_soviet:dark_blue_wallpaper" + }, + { + "item": "new_soviet:orange_wallpaper" } ] ], diff --git a/src/main/generated/data/new_soviet/recipes/dye_dark_blue_wallpaper.json b/src/main/generated/data/new_soviet/recipes/dye_dark_blue_wallpaper.json new file mode 100644 index 0000000..2404cac --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/dye_dark_blue_wallpaper.json @@ -0,0 +1,36 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "wallpaper", + "ingredients": [ + { + "item": "minecraft:blue_dye" + }, + [ + { + "item": "new_soviet:dark_green_wallpaper" + }, + { + "item": "new_soviet:green_wallpaper" + }, + { + "item": "new_soviet:beige_wallpaper" + }, + { + "item": "new_soviet:brown_wallpaper" + }, + { + "item": "new_soviet:yellow_wallpaper" + }, + { + "item": "new_soviet:light_blue_wallpaper" + }, + { + "item": "new_soviet:orange_wallpaper" + } + ] + ], + "result": { + "item": "new_soviet:dark_blue_wallpaper" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/dye_dark_green_wallpaper.json b/src/main/generated/data/new_soviet/recipes/dye_dark_green_wallpaper.json new file mode 100644 index 0000000..4c06f21 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/dye_dark_green_wallpaper.json @@ -0,0 +1,36 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "wallpaper", + "ingredients": [ + { + "item": "minecraft:green_dye" + }, + [ + { + "item": "new_soviet:green_wallpaper" + }, + { + "item": "new_soviet:beige_wallpaper" + }, + { + "item": "new_soviet:brown_wallpaper" + }, + { + "item": "new_soviet:yellow_wallpaper" + }, + { + "item": "new_soviet:light_blue_wallpaper" + }, + { + "item": "new_soviet:dark_blue_wallpaper" + }, + { + "item": "new_soviet:orange_wallpaper" + } + ] + ], + "result": { + "item": "new_soviet:dark_green_wallpaper" + } +} \ 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 index b48e04e..3593dd4 100644 --- a/src/main/generated/data/new_soviet/recipes/dye_green_wallpaper.json +++ b/src/main/generated/data/new_soviet/recipes/dye_green_wallpaper.json @@ -4,14 +4,29 @@ "group": "wallpaper", "ingredients": [ { - "item": "minecraft:green_dye" + "item": "minecraft:lime_dye" }, [ + { + "item": "new_soviet:dark_green_wallpaper" + }, { "item": "new_soviet:beige_wallpaper" }, { "item": "new_soviet:brown_wallpaper" + }, + { + "item": "new_soviet:yellow_wallpaper" + }, + { + "item": "new_soviet:light_blue_wallpaper" + }, + { + "item": "new_soviet:dark_blue_wallpaper" + }, + { + "item": "new_soviet:orange_wallpaper" } ] ], diff --git a/src/main/generated/data/new_soviet/recipes/dye_light_blue_wallpaper.json b/src/main/generated/data/new_soviet/recipes/dye_light_blue_wallpaper.json new file mode 100644 index 0000000..a840fe7 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/dye_light_blue_wallpaper.json @@ -0,0 +1,36 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "wallpaper", + "ingredients": [ + { + "item": "minecraft:light_blue_dye" + }, + [ + { + "item": "new_soviet:dark_green_wallpaper" + }, + { + "item": "new_soviet:green_wallpaper" + }, + { + "item": "new_soviet:beige_wallpaper" + }, + { + "item": "new_soviet:brown_wallpaper" + }, + { + "item": "new_soviet:yellow_wallpaper" + }, + { + "item": "new_soviet:dark_blue_wallpaper" + }, + { + "item": "new_soviet:orange_wallpaper" + } + ] + ], + "result": { + "item": "new_soviet:light_blue_wallpaper" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/dye_orange_wallpaper.json b/src/main/generated/data/new_soviet/recipes/dye_orange_wallpaper.json new file mode 100644 index 0000000..95d2dfc --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/dye_orange_wallpaper.json @@ -0,0 +1,36 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "wallpaper", + "ingredients": [ + { + "item": "minecraft:orange_dye" + }, + [ + { + "item": "new_soviet:dark_green_wallpaper" + }, + { + "item": "new_soviet:green_wallpaper" + }, + { + "item": "new_soviet:beige_wallpaper" + }, + { + "item": "new_soviet:brown_wallpaper" + }, + { + "item": "new_soviet:yellow_wallpaper" + }, + { + "item": "new_soviet:light_blue_wallpaper" + }, + { + "item": "new_soviet:dark_blue_wallpaper" + } + ] + ], + "result": { + "item": "new_soviet:orange_wallpaper" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/dye_yellow_wallpaper.json b/src/main/generated/data/new_soviet/recipes/dye_yellow_wallpaper.json new file mode 100644 index 0000000..a731df1 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/dye_yellow_wallpaper.json @@ -0,0 +1,36 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "wallpaper", + "ingredients": [ + { + "item": "minecraft:yellow_dye" + }, + [ + { + "item": "new_soviet:dark_green_wallpaper" + }, + { + "item": "new_soviet:green_wallpaper" + }, + { + "item": "new_soviet:beige_wallpaper" + }, + { + "item": "new_soviet:brown_wallpaper" + }, + { + "item": "new_soviet:light_blue_wallpaper" + }, + { + "item": "new_soviet:dark_blue_wallpaper" + }, + { + "item": "new_soviet:orange_wallpaper" + } + ] + ], + "result": { + "item": "new_soviet:yellow_wallpaper" + } +} \ 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 index d478f67..99585f3 100644 --- a/src/main/generated/data/new_soviet/recipes/green_wallpaper.json +++ b/src/main/generated/data/new_soviet/recipes/green_wallpaper.json @@ -2,23 +2,26 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { - "D": { - "item": "minecraft:green_dye" + "F": { + "item": "minecraft:lime_dye" + }, + "O": { + "item": "minecraft:oak_planks" }, "P": { "item": "minecraft:paper" }, "S": { - "item": "minecraft:slime_ball" + "item": "minecraft:lime_dye" } }, "pattern": [ - " D ", - "PPP", - " S " + "POP", + "FOS", + "POP" ], "result": { - "count": 2, + "count": 3, "item": "new_soviet:green_wallpaper" }, "show_notification": true diff --git a/src/main/generated/data/new_soviet/recipes/light_beige_wallpaper.json b/src/main/generated/data/new_soviet/recipes/light_beige_wallpaper.json new file mode 100644 index 0000000..deeefca --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/light_beige_wallpaper.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "F": { + "item": "minecraft:white_dye" + }, + "O": { + "item": "minecraft:oak_planks" + }, + "P": { + "item": "minecraft:paper" + }, + "S": { + "item": "minecraft:bone_meal" + } + }, + "pattern": [ + "POP", + "FOS", + "POP" + ], + "result": { + "count": 3, + "item": "new_soviet:light_beige_wallpaper" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/light_blue_wallpaper.json b/src/main/generated/data/new_soviet/recipes/light_blue_wallpaper.json new file mode 100644 index 0000000..226ff54 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/light_blue_wallpaper.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "F": { + "item": "minecraft:light_blue_dye" + }, + "O": { + "item": "minecraft:oak_planks" + }, + "P": { + "item": "minecraft:paper" + }, + "S": { + "item": "minecraft:light_blue_dye" + } + }, + "pattern": [ + "POP", + "FOS", + "POP" + ], + "result": { + "count": 3, + "item": "new_soviet:light_blue_wallpaper" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/orange_wallpaper.json b/src/main/generated/data/new_soviet/recipes/orange_wallpaper.json new file mode 100644 index 0000000..249c096 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/orange_wallpaper.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "F": { + "item": "minecraft:orange_dye" + }, + "O": { + "item": "minecraft:oak_planks" + }, + "P": { + "item": "minecraft:paper" + }, + "S": { + "item": "minecraft:orange_dye" + } + }, + "pattern": [ + "POP", + "FOS", + "POP" + ], + "result": { + "count": 3, + "item": "new_soviet:orange_wallpaper" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/pink_green_wallpaper.json b/src/main/generated/data/new_soviet/recipes/pink_green_wallpaper.json new file mode 100644 index 0000000..cac9c42 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/pink_green_wallpaper.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "F": { + "item": "minecraft:pink_dye" + }, + "O": { + "item": "minecraft:oak_planks" + }, + "P": { + "item": "minecraft:paper" + }, + "S": { + "item": "minecraft:green_dye" + } + }, + "pattern": [ + "POP", + "FOS", + "POP" + ], + "result": { + "count": 3, + "item": "new_soviet:pink_green_wallpaper" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/red_green_wallpaper.json b/src/main/generated/data/new_soviet/recipes/red_green_wallpaper.json new file mode 100644 index 0000000..415d93b --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/red_green_wallpaper.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "F": { + "item": "minecraft:red_dye" + }, + "O": { + "item": "minecraft:oak_planks" + }, + "P": { + "item": "minecraft:paper" + }, + "S": { + "item": "minecraft:green_dye" + } + }, + "pattern": [ + "POP", + "FOS", + "POP" + ], + "result": { + "count": 3, + "item": "new_soviet:red_green_wallpaper" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/yellow_green_wallpaper.json b/src/main/generated/data/new_soviet/recipes/yellow_green_wallpaper.json new file mode 100644 index 0000000..d57e214 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/yellow_green_wallpaper.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "F": { + "item": "minecraft:yellow_dye" + }, + "O": { + "item": "minecraft:oak_planks" + }, + "P": { + "item": "minecraft:paper" + }, + "S": { + "item": "minecraft:green_dye" + } + }, + "pattern": [ + "POP", + "FOS", + "POP" + ], + "result": { + "count": 3, + "item": "new_soviet:yellow_green_wallpaper" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/yellow_wallpaper.json b/src/main/generated/data/new_soviet/recipes/yellow_wallpaper.json new file mode 100644 index 0000000..80ade4c --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/yellow_wallpaper.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "F": { + "item": "minecraft:yellow_dye" + }, + "O": { + "item": "minecraft:oak_planks" + }, + "P": { + "item": "minecraft:paper" + }, + "S": { + "item": "minecraft:yellow_dye" + } + }, + "pattern": [ + "POP", + "FOS", + "POP" + ], + "result": { + "count": 3, + "item": "new_soviet:yellow_wallpaper" + }, + "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 57e8445..7f907e0 100644 --- a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java @@ -149,16 +149,20 @@ public class RecipeGenerator extends FabricRecipeProvider { .criterion(hasItem(Blocks.STONE), conditionsFromItem(Blocks.STONE)) .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)) + wallpaperRecipe(exporter, output, dye, dye); + } + + private void wallpaperRecipe(Consumer exporter, ItemConvertible output, ItemConvertible dye1, ItemConvertible dye2) { + ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output, 3) + .input('F', dye1).input('S', dye2).input('P', Items.PAPER).input('O', Items.OAK_PLANKS) + .pattern("POP") + .pattern("FOS") + .pattern("POP") + .criterion(hasItem(dye1)+ "_1", conditionsFromItem(dye1)) + .criterion(hasItem(dye2)+ "_2", conditionsFromItem(dye2)) .criterion(hasItem(Items.PAPER), conditionsFromItem(Items.PAPER)) - .criterion(hasItem(Items.SLIME_BALL), conditionsFromItem(Items.SLIME_BALL)) + .criterion(hasItem(Items.OAK_PLANKS), conditionsFromItem(Items.OAK_PLANKS)) .offerTo(exporter); } @@ -1081,12 +1085,28 @@ public class RecipeGenerator extends FabricRecipeProvider { 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.GREEN_WALLPAPER, Items.LIME_DYE); wallpaperRecipe(exporter, NSE_Blocks.BROWN_WALLPAPER, Items.BROWN_DYE); + wallpaperRecipe(exporter, NSE_Blocks.BEIGE_WALLPAPER, Items.WHITE_DYE); + wallpaperRecipe(exporter, NSE_Blocks.YELLOW_GREEN_WALLPAPER, Items.YELLOW_DYE, Items.GREEN_DYE); + wallpaperRecipe(exporter, NSE_Blocks.RED_GREEN_WALLPAPER, Items.RED_DYE, Items.GREEN_DYE); + wallpaperRecipe(exporter, NSE_Blocks.BROWN_GREEN_WALLPAPER, Items.BROWN_DYE, Items.GREEN_DYE); + wallpaperRecipe(exporter, NSE_Blocks.YELLOW_WALLPAPER, Items.YELLOW_DYE); + wallpaperRecipe(exporter, NSE_Blocks.DARK_GREEN_WALLPAPER, Items.GREEN_DYE); + wallpaperRecipe(exporter, NSE_Blocks.LIGHT_BLUE_WALLPAPER, Items.LIGHT_BLUE_DYE); + wallpaperRecipe(exporter, NSE_Blocks.DARK_BROWN_WALLPAPER, Items.BROWN_DYE, Items.BLACK_DYE); + wallpaperRecipe(exporter, NSE_Blocks.PINK_GREEN_WALLPAPER, Items.PINK_DYE, Items.GREEN_DYE); + wallpaperRecipe(exporter, NSE_Blocks.DARK_BLUE_WALLPAPER, Items.BLUE_DYE); + wallpaperRecipe(exporter, NSE_Blocks.ORANGE_WALLPAPER, Items.ORANGE_DYE); + wallpaperRecipe(exporter, NSE_Blocks.BEIGE_GREEN_WALLPAPER, Items.WHITE_DYE, Items.GREEN_DYE); + wallpaperRecipe(exporter, NSE_Blocks.LIGHT_BEIGE_WALLPAPER, Items.WHITE_DYE, Items.BONE_MEAL); + 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()), + List.of(Items.GREEN_DYE, Items.LIME_DYE, Items.WHITE_DYE, Items.BROWN_DYE, Items.YELLOW_DYE, Items.LIGHT_BLUE_DYE, Items.BLUE_DYE, + Items.ORANGE_DYE), + List.of(NSE_Blocks.DARK_GREEN_WALLPAPER.asItem(), NSE_Blocks.GREEN_WALLPAPER.asItem(), NSE_Blocks.BEIGE_WALLPAPER.asItem(), NSE_Blocks.BROWN_WALLPAPER.asItem(), + NSE_Blocks.YELLOW_WALLPAPER.asItem(), NSE_Blocks.LIGHT_BLUE_WALLPAPER.asItem(), NSE_Blocks.DARK_BLUE_WALLPAPER.asItem(), + NSE_Blocks.ORANGE_WALLPAPER.asItem()), "wallpaper"); linoleumRecipe(exporter, NSE_Blocks.GREEN_LINOLEUM, Items.GREEN_DYE); diff --git a/src/main/java/su/a71/new_soviet/registration/NSE_Blocks.java b/src/main/java/su/a71/new_soviet/registration/NSE_Blocks.java index 616ee9f..3594bf3 100644 --- a/src/main/java/su/a71/new_soviet/registration/NSE_Blocks.java +++ b/src/main/java/su/a71/new_soviet/registration/NSE_Blocks.java @@ -826,8 +826,6 @@ public class NSE_Blocks extends NSE_BaseRegistration { registerBlock("mossy_light_blue_bricks_stairs", () -> MOSSY_LIGHT_BLUE_BRICKS_STAIRS, NSE_BUILDING_TAB); registerBlock("mossy_light_blue_bricks_slab", () -> MOSSY_LIGHT_BLUE_BRICKS_SLAB, NSE_BUILDING_TAB); - registerBlock("long_blue_tiles", () -> LONG_BLUE_TILES, NSE_BUILDING_TAB); - registerBlock("cracked_long_blue_tiles", () -> CRACKED_LONG_BLUE_TILES, NSE_BUILDING_TAB); registerBlock("blue_bricks", () -> BLUE_BRICKS, NSE_BUILDING_TAB); registerBlock("blue_bricks_stairs", () -> BLUE_BRICKS_STAIRS, NSE_BUILDING_TAB); registerBlock("blue_bricks_slab", () -> BLUE_BRICKS_SLAB, NSE_BUILDING_TAB); @@ -837,6 +835,8 @@ public class NSE_Blocks extends NSE_BaseRegistration { registerBlock("mossy_blue_bricks", () -> MOSSY_BLUE_BRICKS, NSE_BUILDING_TAB); registerBlock("mossy_blue_bricks_stairs", () -> MOSSY_BLUE_BRICKS_STAIRS, NSE_BUILDING_TAB); registerBlock("mossy_blue_bricks_slab", () -> MOSSY_BLUE_BRICKS_SLAB, NSE_BUILDING_TAB); + registerBlock("long_blue_tiles", () -> LONG_BLUE_TILES, NSE_BUILDING_TAB); + registerBlock("cracked_long_blue_tiles", () -> CRACKED_LONG_BLUE_TILES, NSE_BUILDING_TAB); registerBlock("big_granite_tiles", () -> BIG_GRANITE_TILES, NSE_BUILDING_TAB); registerBlock("small_granite_tiles", () -> SMALL_GRANITE_TILES, NSE_BUILDING_TAB);