From 588f7c0e2a2ea7fd968bbd68328726daef9073f3 Mon Sep 17 00:00:00 2001 From: Andrew-71 Date: Wed, 4 Oct 2023 14:58:34 +0300 Subject: [PATCH] Change some recipes --- .../blue_iron_bars_from_iron_bars_blue.json | 61 +++++++++++++++++++ .../blue_iron_bars_from_iron_bars_cyan.json | 61 +++++++++++++++++++ ...e_iron_bars_from_iron_bars_light_blue.json | 61 +++++++++++++++++++ ...s_from_vintage_iron_bars_stonecutting.json | 35 ----------- ...om_white_boundary_marker_stonecutting.json | 35 ----------- ...om_white_boundary_marker_stonecutting.json | 35 ----------- ...bars_from_blue_iron_bars_stonecutting.json | 35 ----------- ..._marker_from_bone_block_stonecutting.json} | 10 +-- ...arker_from_diorite_wall_stonecutting.json} | 10 +-- .../new_soviet/recipes/beige_concrete.json | 5 +- .../new_soviet/recipes/blue_concrete.json | 5 +- .../blue_iron_bars_from_iron_bars_blue.json | 15 +++++ .../blue_iron_bars_from_iron_bars_cyan.json | 15 +++++ ...e_iron_bars_from_iron_bars_light_blue.json | 15 +++++ ...iron_bars_from_iron_bars_stonecutting.json | 8 --- ...s_from_vintage_iron_bars_stonecutting.json | 8 --- ...om_white_boundary_marker_stonecutting.json | 8 --- ...om_white_boundary_marker_stonecutting.json | 8 --- .../new_soviet/recipes/green_concrete.json | 5 +- ...bars_from_blue_iron_bars_stonecutting.json | 8 --- .../data/new_soviet/recipes/red_concrete.json | 5 +- ...bars_from_blue_iron_bars_stonecutting.json | 8 --- ...y_marker_from_bone_block_stonecutting.json | 8 +++ ...marker_from_diorite_wall_stonecutting.json | 8 +++ .../new_soviet/recipes/white_concrete.json | 5 +- .../new_soviet/recipes/yellow_concrete.json | 5 +- .../new_soviet/datagen/RecipeGenerator.java | 16 ++++- 27 files changed, 275 insertions(+), 223 deletions(-) create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_iron_bars_from_iron_bars_blue.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_iron_bars_from_iron_bars_cyan.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_iron_bars_from_iron_bars_light_blue.json delete mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_iron_bars_from_vintage_iron_bars_stonecutting.json delete mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/bone_block_from_white_boundary_marker_stonecutting.json delete mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/diorite_wall_from_white_boundary_marker_stonecutting.json delete mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/vintage_iron_bars_from_blue_iron_bars_stonecutting.json rename src/main/generated/data/new_soviet/advancements/recipes/building_blocks/{blue_iron_bars_from_iron_bars_stonecutting.json => white_boundary_marker_from_bone_block_stonecutting.json} (67%) rename src/main/generated/data/new_soviet/advancements/recipes/building_blocks/{iron_bars_from_blue_iron_bars_stonecutting.json => white_boundary_marker_from_diorite_wall_stonecutting.json} (66%) create mode 100644 src/main/generated/data/new_soviet/recipes/blue_iron_bars_from_iron_bars_blue.json create mode 100644 src/main/generated/data/new_soviet/recipes/blue_iron_bars_from_iron_bars_cyan.json create mode 100644 src/main/generated/data/new_soviet/recipes/blue_iron_bars_from_iron_bars_light_blue.json delete mode 100644 src/main/generated/data/new_soviet/recipes/blue_iron_bars_from_iron_bars_stonecutting.json delete mode 100644 src/main/generated/data/new_soviet/recipes/blue_iron_bars_from_vintage_iron_bars_stonecutting.json delete mode 100644 src/main/generated/data/new_soviet/recipes/bone_block_from_white_boundary_marker_stonecutting.json delete mode 100644 src/main/generated/data/new_soviet/recipes/diorite_wall_from_white_boundary_marker_stonecutting.json delete mode 100644 src/main/generated/data/new_soviet/recipes/iron_bars_from_blue_iron_bars_stonecutting.json delete mode 100644 src/main/generated/data/new_soviet/recipes/vintage_iron_bars_from_blue_iron_bars_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/recipes/white_boundary_marker_from_bone_block_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/recipes/white_boundary_marker_from_diorite_wall_stonecutting.json diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_iron_bars_from_iron_bars_blue.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_iron_bars_from_iron_bars_blue.json new file mode 100644 index 0000000..de86252 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_iron_bars_from_iron_bars_blue.json @@ -0,0 +1,61 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_blue_dye": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:blue_iron_bars" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_blue_iron_bars": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:blue_iron_bars" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_iron_bars": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:blue_iron_bars" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:blue_iron_bars_from_iron_bars_blue" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_blue_iron_bars", + "has_iron_bars", + "has_blue_dye", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:blue_iron_bars_from_iron_bars_blue" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_iron_bars_from_iron_bars_cyan.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_iron_bars_from_iron_bars_cyan.json new file mode 100644 index 0000000..975fe4d --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_iron_bars_from_iron_bars_cyan.json @@ -0,0 +1,61 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_blue_iron_bars": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:blue_iron_bars" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_cyan_dye": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:blue_iron_bars" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_iron_bars": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:blue_iron_bars" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:blue_iron_bars_from_iron_bars_cyan" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_blue_iron_bars", + "has_iron_bars", + "has_cyan_dye", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:blue_iron_bars_from_iron_bars_cyan" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_iron_bars_from_iron_bars_light_blue.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_iron_bars_from_iron_bars_light_blue.json new file mode 100644 index 0000000..8c69b29 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_iron_bars_from_iron_bars_light_blue.json @@ -0,0 +1,61 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_blue_iron_bars": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:blue_iron_bars" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_iron_bars": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:blue_iron_bars" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_light_blue_dye": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:blue_iron_bars" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:blue_iron_bars_from_iron_bars_light_blue" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_blue_iron_bars", + "has_iron_bars", + "has_light_blue_dye", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:blue_iron_bars_from_iron_bars_light_blue" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_iron_bars_from_vintage_iron_bars_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_iron_bars_from_vintage_iron_bars_stonecutting.json deleted file mode 100644 index 3f91f25..0000000 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_iron_bars_from_vintage_iron_bars_stonecutting.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:blue_iron_bars_from_vintage_iron_bars_stonecutting" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_vintage_iron_bars": { - "conditions": { - "items": [ - { - "items": [ - "new_soviet:vintage_iron_bars" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_vintage_iron_bars", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:blue_iron_bars_from_vintage_iron_bars_stonecutting" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/bone_block_from_white_boundary_marker_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/bone_block_from_white_boundary_marker_stonecutting.json deleted file mode 100644 index b18da9b..0000000 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/bone_block_from_white_boundary_marker_stonecutting.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:bone_block_from_white_boundary_marker_stonecutting" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_white_boundary_marker": { - "conditions": { - "items": [ - { - "items": [ - "new_soviet:white_boundary_marker" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_white_boundary_marker", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:bone_block_from_white_boundary_marker_stonecutting" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/diorite_wall_from_white_boundary_marker_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/diorite_wall_from_white_boundary_marker_stonecutting.json deleted file mode 100644 index 758226b..0000000 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/diorite_wall_from_white_boundary_marker_stonecutting.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:diorite_wall_from_white_boundary_marker_stonecutting" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_white_boundary_marker": { - "conditions": { - "items": [ - { - "items": [ - "new_soviet:white_boundary_marker" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_white_boundary_marker", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:diorite_wall_from_white_boundary_marker_stonecutting" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/vintage_iron_bars_from_blue_iron_bars_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/vintage_iron_bars_from_blue_iron_bars_stonecutting.json deleted file mode 100644 index 21ff59c..0000000 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/vintage_iron_bars_from_blue_iron_bars_stonecutting.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_blue_iron_bars": { - "conditions": { - "items": [ - { - "items": [ - "new_soviet:blue_iron_bars" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:vintage_iron_bars_from_blue_iron_bars_stonecutting" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_blue_iron_bars", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:vintage_iron_bars_from_blue_iron_bars_stonecutting" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_iron_bars_from_iron_bars_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/white_boundary_marker_from_bone_block_stonecutting.json similarity index 67% rename from src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_iron_bars_from_iron_bars_stonecutting.json rename to src/main/generated/data/new_soviet/advancements/recipes/building_blocks/white_boundary_marker_from_bone_block_stonecutting.json index 4d250c2..47caac7 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_iron_bars_from_iron_bars_stonecutting.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/white_boundary_marker_from_bone_block_stonecutting.json @@ -1,12 +1,12 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_iron_bars": { + "has_bone_block": { "conditions": { "items": [ { "items": [ - "minecraft:iron_bars" + "minecraft:bone_block" ] } ] @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "minecraft:blue_iron_bars_from_iron_bars_stonecutting" + "recipe": "minecraft:white_boundary_marker_from_bone_block_stonecutting" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_iron_bars", + "has_bone_block", "has_the_recipe" ] ], "rewards": { "recipes": [ - "minecraft:blue_iron_bars_from_iron_bars_stonecutting" + "minecraft:white_boundary_marker_from_bone_block_stonecutting" ] }, "sends_telemetry_event": false diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/iron_bars_from_blue_iron_bars_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/white_boundary_marker_from_diorite_wall_stonecutting.json similarity index 66% rename from src/main/generated/data/new_soviet/advancements/recipes/building_blocks/iron_bars_from_blue_iron_bars_stonecutting.json rename to src/main/generated/data/new_soviet/advancements/recipes/building_blocks/white_boundary_marker_from_diorite_wall_stonecutting.json index 80d92bc..14deee4 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/iron_bars_from_blue_iron_bars_stonecutting.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/white_boundary_marker_from_diorite_wall_stonecutting.json @@ -1,12 +1,12 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_blue_iron_bars": { + "has_diorite_wall": { "conditions": { "items": [ { "items": [ - "new_soviet:blue_iron_bars" + "minecraft:diorite_wall" ] } ] @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "minecraft:iron_bars_from_blue_iron_bars_stonecutting" + "recipe": "minecraft:white_boundary_marker_from_diorite_wall_stonecutting" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_blue_iron_bars", + "has_diorite_wall", "has_the_recipe" ] ], "rewards": { "recipes": [ - "minecraft:iron_bars_from_blue_iron_bars_stonecutting" + "minecraft:white_boundary_marker_from_diorite_wall_stonecutting" ] }, "sends_telemetry_event": false diff --git a/src/main/generated/data/new_soviet/recipes/beige_concrete.json b/src/main/generated/data/new_soviet/recipes/beige_concrete.json index ed6e291..1d5e378 100644 --- a/src/main/generated/data/new_soviet/recipes/beige_concrete.json +++ b/src/main/generated/data/new_soviet/recipes/beige_concrete.json @@ -5,9 +5,6 @@ "B": { "item": "minecraft:iron_bars" }, - "C": { - "item": "new_soviet:beige_concrete" - }, "D": { "item": "minecraft:light_gray_dye" }, @@ -17,7 +14,7 @@ }, "pattern": [ "SBS", - "DC ", + " D ", "SBS" ], "result": { diff --git a/src/main/generated/data/new_soviet/recipes/blue_concrete.json b/src/main/generated/data/new_soviet/recipes/blue_concrete.json index e579dcb..44284c8 100644 --- a/src/main/generated/data/new_soviet/recipes/blue_concrete.json +++ b/src/main/generated/data/new_soviet/recipes/blue_concrete.json @@ -5,9 +5,6 @@ "B": { "item": "minecraft:iron_bars" }, - "C": { - "item": "new_soviet:blue_concrete" - }, "D": { "item": "minecraft:blue_dye" }, @@ -17,7 +14,7 @@ }, "pattern": [ "SBS", - "DC ", + " D ", "SBS" ], "result": { diff --git a/src/main/generated/data/new_soviet/recipes/blue_iron_bars_from_iron_bars_blue.json b/src/main/generated/data/new_soviet/recipes/blue_iron_bars_from_iron_bars_blue.json new file mode 100644 index 0000000..45fa098 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/blue_iron_bars_from_iron_bars_blue.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "minecraft:iron_bars" + }, + { + "item": "minecraft:blue_dye" + } + ], + "result": { + "item": "new_soviet:blue_iron_bars" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/blue_iron_bars_from_iron_bars_cyan.json b/src/main/generated/data/new_soviet/recipes/blue_iron_bars_from_iron_bars_cyan.json new file mode 100644 index 0000000..81d93a9 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/blue_iron_bars_from_iron_bars_cyan.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "minecraft:iron_bars" + }, + { + "item": "minecraft:cyan_dye" + } + ], + "result": { + "item": "new_soviet:blue_iron_bars" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/blue_iron_bars_from_iron_bars_light_blue.json b/src/main/generated/data/new_soviet/recipes/blue_iron_bars_from_iron_bars_light_blue.json new file mode 100644 index 0000000..a20d060 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/blue_iron_bars_from_iron_bars_light_blue.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "minecraft:iron_bars" + }, + { + "item": "minecraft:light_blue_dye" + } + ], + "result": { + "item": "new_soviet:blue_iron_bars" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/blue_iron_bars_from_iron_bars_stonecutting.json b/src/main/generated/data/new_soviet/recipes/blue_iron_bars_from_iron_bars_stonecutting.json deleted file mode 100644 index 96bfffe..0000000 --- a/src/main/generated/data/new_soviet/recipes/blue_iron_bars_from_iron_bars_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 1, - "ingredient": { - "item": "minecraft:iron_bars" - }, - "result": "new_soviet:blue_iron_bars" -} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/blue_iron_bars_from_vintage_iron_bars_stonecutting.json b/src/main/generated/data/new_soviet/recipes/blue_iron_bars_from_vintage_iron_bars_stonecutting.json deleted file mode 100644 index bc7a3d6..0000000 --- a/src/main/generated/data/new_soviet/recipes/blue_iron_bars_from_vintage_iron_bars_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 1, - "ingredient": { - "item": "new_soviet:vintage_iron_bars" - }, - "result": "new_soviet:blue_iron_bars" -} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/bone_block_from_white_boundary_marker_stonecutting.json b/src/main/generated/data/new_soviet/recipes/bone_block_from_white_boundary_marker_stonecutting.json deleted file mode 100644 index 982533a..0000000 --- a/src/main/generated/data/new_soviet/recipes/bone_block_from_white_boundary_marker_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 2, - "ingredient": { - "item": "new_soviet:white_boundary_marker" - }, - "result": "minecraft:bone_block" -} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/diorite_wall_from_white_boundary_marker_stonecutting.json b/src/main/generated/data/new_soviet/recipes/diorite_wall_from_white_boundary_marker_stonecutting.json deleted file mode 100644 index 445c9ac..0000000 --- a/src/main/generated/data/new_soviet/recipes/diorite_wall_from_white_boundary_marker_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 1, - "ingredient": { - "item": "new_soviet:white_boundary_marker" - }, - "result": "minecraft:diorite_wall" -} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/green_concrete.json b/src/main/generated/data/new_soviet/recipes/green_concrete.json index 626d73e..90a2471 100644 --- a/src/main/generated/data/new_soviet/recipes/green_concrete.json +++ b/src/main/generated/data/new_soviet/recipes/green_concrete.json @@ -5,9 +5,6 @@ "B": { "item": "minecraft:iron_bars" }, - "C": { - "item": "new_soviet:green_concrete" - }, "D": { "item": "minecraft:green_dye" }, @@ -17,7 +14,7 @@ }, "pattern": [ "SBS", - "DC ", + " D ", "SBS" ], "result": { diff --git a/src/main/generated/data/new_soviet/recipes/iron_bars_from_blue_iron_bars_stonecutting.json b/src/main/generated/data/new_soviet/recipes/iron_bars_from_blue_iron_bars_stonecutting.json deleted file mode 100644 index 6a928b4..0000000 --- a/src/main/generated/data/new_soviet/recipes/iron_bars_from_blue_iron_bars_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 1, - "ingredient": { - "item": "new_soviet:blue_iron_bars" - }, - "result": "minecraft:iron_bars" -} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/red_concrete.json b/src/main/generated/data/new_soviet/recipes/red_concrete.json index 7dbe375..eec6ca6 100644 --- a/src/main/generated/data/new_soviet/recipes/red_concrete.json +++ b/src/main/generated/data/new_soviet/recipes/red_concrete.json @@ -5,9 +5,6 @@ "B": { "item": "minecraft:iron_bars" }, - "C": { - "item": "new_soviet:red_concrete" - }, "D": { "item": "minecraft:red_dye" }, @@ -17,7 +14,7 @@ }, "pattern": [ "SBS", - "DC ", + " D ", "SBS" ], "result": { diff --git a/src/main/generated/data/new_soviet/recipes/vintage_iron_bars_from_blue_iron_bars_stonecutting.json b/src/main/generated/data/new_soviet/recipes/vintage_iron_bars_from_blue_iron_bars_stonecutting.json deleted file mode 100644 index 308b842..0000000 --- a/src/main/generated/data/new_soviet/recipes/vintage_iron_bars_from_blue_iron_bars_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 1, - "ingredient": { - "item": "new_soviet:blue_iron_bars" - }, - "result": "new_soviet:vintage_iron_bars" -} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/white_boundary_marker_from_bone_block_stonecutting.json b/src/main/generated/data/new_soviet/recipes/white_boundary_marker_from_bone_block_stonecutting.json new file mode 100644 index 0000000..0133b4a --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/white_boundary_marker_from_bone_block_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "minecraft:bone_block" + }, + "result": "new_soviet:white_boundary_marker" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/white_boundary_marker_from_diorite_wall_stonecutting.json b/src/main/generated/data/new_soviet/recipes/white_boundary_marker_from_diorite_wall_stonecutting.json new file mode 100644 index 0000000..85e7f68 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/white_boundary_marker_from_diorite_wall_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:diorite_wall" + }, + "result": "new_soviet:white_boundary_marker" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/white_concrete.json b/src/main/generated/data/new_soviet/recipes/white_concrete.json index c0cda0d..bafd59e 100644 --- a/src/main/generated/data/new_soviet/recipes/white_concrete.json +++ b/src/main/generated/data/new_soviet/recipes/white_concrete.json @@ -5,9 +5,6 @@ "B": { "item": "minecraft:iron_bars" }, - "C": { - "item": "new_soviet:white_concrete" - }, "D": { "item": "minecraft:white_dye" }, @@ -17,7 +14,7 @@ }, "pattern": [ "SBS", - "DC ", + " D ", "SBS" ], "result": { diff --git a/src/main/generated/data/new_soviet/recipes/yellow_concrete.json b/src/main/generated/data/new_soviet/recipes/yellow_concrete.json index 7ff8b66..e0e6666 100644 --- a/src/main/generated/data/new_soviet/recipes/yellow_concrete.json +++ b/src/main/generated/data/new_soviet/recipes/yellow_concrete.json @@ -5,9 +5,6 @@ "B": { "item": "minecraft:iron_bars" }, - "C": { - "item": "new_soviet:yellow_concrete" - }, "D": { "item": "minecraft:yellow_dye" }, @@ -17,7 +14,7 @@ }, "pattern": [ "SBS", - "DC ", + " D ", "SBS" ], "result": { 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 f0e1244..2a805cb 100644 --- a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java @@ -529,7 +529,6 @@ public class RecipeGenerator extends FabricRecipeProvider { list.add(Blocks.SMOOTH_STONE); }), RecipeCategory.BUILDING_BLOCKS); stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { - list.add(NSE_Blocks.BLUE_IRON_BARS); list.add(NSE_Blocks.VINTAGE_IRON_BARS); list.add(Blocks.IRON_BARS); }), RecipeCategory.BUILDING_BLOCKS); @@ -556,6 +555,21 @@ public class RecipeGenerator extends FabricRecipeProvider { .criterion(hasItem(Items.COBBLESTONE), conditionsFromItem(Items.COBBLESTONE)) .offerTo(exporter); + + var path_blue_bars = convertBetween(NSE_Blocks.BLUE_IRON_BARS, Blocks.IRON_BARS); + ShapelessRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, (NSE_Blocks.BLUE_IRON_BARS)).input(Blocks.IRON_BARS).input(Items.BLUE_DYE).criterion(FabricRecipeProvider.hasItem(NSE_Blocks.BLUE_IRON_BARS), + FabricRecipeProvider.conditionsFromItem(NSE_Blocks.BLUE_IRON_BARS)).criterion(FabricRecipeProvider.hasItem(Blocks.IRON_BARS), + FabricRecipeProvider.conditionsFromItem(NSE_Blocks.BLUE_IRON_BARS)).criterion(FabricRecipeProvider.hasItem(Items.BLUE_DYE), + FabricRecipeProvider.conditionsFromItem(NSE_Blocks.BLUE_IRON_BARS)).offerTo(exporter, path_blue_bars + "_blue"); + ShapelessRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, (NSE_Blocks.BLUE_IRON_BARS)).input(Blocks.IRON_BARS).input(Items.LIGHT_BLUE_DYE).criterion(FabricRecipeProvider.hasItem(NSE_Blocks.BLUE_IRON_BARS), + FabricRecipeProvider.conditionsFromItem(NSE_Blocks.BLUE_IRON_BARS)).criterion(FabricRecipeProvider.hasItem(Blocks.IRON_BARS), + FabricRecipeProvider.conditionsFromItem(NSE_Blocks.BLUE_IRON_BARS)).criterion(FabricRecipeProvider.hasItem(Items.LIGHT_BLUE_DYE), + FabricRecipeProvider.conditionsFromItem(NSE_Blocks.BLUE_IRON_BARS)).offerTo(exporter, path_blue_bars + "_light_blue"); + ShapelessRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, (NSE_Blocks.BLUE_IRON_BARS)).input(Blocks.IRON_BARS).input(Items.CYAN_DYE).criterion(FabricRecipeProvider.hasItem(NSE_Blocks.BLUE_IRON_BARS), + FabricRecipeProvider.conditionsFromItem(NSE_Blocks.BLUE_IRON_BARS)).criterion(FabricRecipeProvider.hasItem(Blocks.IRON_BARS), + FabricRecipeProvider.conditionsFromItem(NSE_Blocks.BLUE_IRON_BARS)).criterion(FabricRecipeProvider.hasItem(Items.CYAN_DYE), + FabricRecipeProvider.conditionsFromItem(NSE_Blocks.BLUE_IRON_BARS)).offerTo(exporter, path_blue_bars + "_cyan"); + centerRecipe(exporter, NSE_Blocks.BIG_GREEN_TILES, NSE_Blocks.BIG_DIORITE_TILES, Items.GREEN_DYE); centerRecipe(exporter, NSE_Blocks.GREEN_BRICKS, Items.BRICKS, Items.GREEN_DYE); centerRecipe(exporter, NSE_Blocks.SMALL_YELLOW_TILES, NSE_Blocks.SMALL_WHITE_TILES, Items.YELLOW_DYE);