From eb5316aea538698026367d1e38900fb32a003a41 Mon Sep 17 00:00:00 2001 From: Andrew-71 Date: Wed, 30 Aug 2023 12:26:00 +0300 Subject: [PATCH] Add dirty block recipes --- .../building_blocks/cracked_red_bricks.json | 35 +++++++++++ .../dirty_aquamarine_tiles.json | 61 +++++++++++++++++++ .../dirty_aquamarine_tiles_slab.json | 32 +++++++++- .../dirty_aquamarine_tiles_stairs.json | 32 +++++++++- .../building_blocks/dirty_brick_tiles.json | 61 +++++++++++++++++++ .../dirty_brick_tiles_slab.json | 32 +++++++++- .../dirty_brick_tiles_stairs.json | 32 +++++++++- .../dirty_dark_brick_tiles.json | 61 +++++++++++++++++++ .../dirty_dark_brick_tiles_slab.json | 32 +++++++++- .../dirty_dark_brick_tiles_stairs.json | 32 +++++++++- .../recipes/cracked_red_bricks.json | 10 +++ .../recipes/dirty_aquamarine_tiles.json | 15 +++++ .../recipes/dirty_aquamarine_tiles_slab.json | 18 +++--- .../dirty_aquamarine_tiles_stairs.json | 20 +++--- .../new_soviet/recipes/dirty_brick_tiles.json | 15 +++++ .../recipes/dirty_brick_tiles_slab.json | 18 +++--- .../recipes/dirty_brick_tiles_stairs.json | 20 +++--- .../recipes/dirty_dark_brick_tiles.json | 15 +++++ .../recipes/dirty_dark_brick_tiles_slab.json | 18 +++--- .../dirty_dark_brick_tiles_stairs.json | 20 +++--- .../su/a71/new_soviet/DataGeneration.java | 20 ++++++ 21 files changed, 515 insertions(+), 84 deletions(-) create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_red_bricks.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_aquamarine_tiles.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_brick_tiles.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_dark_brick_tiles.json create mode 100644 src/main/generated/data/new_soviet/recipes/cracked_red_bricks.json create mode 100644 src/main/generated/data/new_soviet/recipes/dirty_aquamarine_tiles.json create mode 100644 src/main/generated/data/new_soviet/recipes/dirty_brick_tiles.json create mode 100644 src/main/generated/data/new_soviet/recipes/dirty_dark_brick_tiles.json diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_red_bricks.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_red_bricks.json new file mode 100644 index 0000000..5510254 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_red_bricks.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_red_bricks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:red_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:cracked_red_bricks" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_red_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:cracked_red_bricks" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_aquamarine_tiles.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_aquamarine_tiles.json new file mode 100644 index 0000000..ba363ff --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_aquamarine_tiles.json @@ -0,0 +1,61 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_aquamarine_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:dirty_aquamarine_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_dirt": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:dirty_aquamarine_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_dirty_aquamarine_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:dirty_aquamarine_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:dirty_aquamarine_tiles" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_dirty_aquamarine_tiles", + "has_aquamarine_tiles", + "has_dirt", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:dirty_aquamarine_tiles" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_aquamarine_tiles_slab.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_aquamarine_tiles_slab.json index fe85f02..4e74716 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_aquamarine_tiles_slab.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_aquamarine_tiles_slab.json @@ -1,12 +1,36 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_dirty_aquamarine_tiles": { + "has_aquamarine_tiles_slab": { "conditions": { "items": [ { "items": [ - "new_soviet:dirty_aquamarine_tiles" + "new_soviet:dirty_aquamarine_tiles_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_dirt": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:dirty_aquamarine_tiles_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_dirty_aquamarine_tiles_slab": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:dirty_aquamarine_tiles_slab" ] } ] @@ -22,7 +46,9 @@ }, "requirements": [ [ - "has_dirty_aquamarine_tiles", + "has_dirty_aquamarine_tiles_slab", + "has_aquamarine_tiles_slab", + "has_dirt", "has_the_recipe" ] ], diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_aquamarine_tiles_stairs.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_aquamarine_tiles_stairs.json index 66fe9bd..6775c07 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_aquamarine_tiles_stairs.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_aquamarine_tiles_stairs.json @@ -1,12 +1,36 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_dirty_aquamarine_tiles": { + "has_aquamarine_tiles_stairs": { "conditions": { "items": [ { "items": [ - "new_soviet:dirty_aquamarine_tiles" + "new_soviet:dirty_aquamarine_tiles_stairs" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_dirt": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:dirty_aquamarine_tiles_stairs" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_dirty_aquamarine_tiles_stairs": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:dirty_aquamarine_tiles_stairs" ] } ] @@ -22,7 +46,9 @@ }, "requirements": [ [ - "has_dirty_aquamarine_tiles", + "has_dirty_aquamarine_tiles_stairs", + "has_aquamarine_tiles_stairs", + "has_dirt", "has_the_recipe" ] ], diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_brick_tiles.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_brick_tiles.json new file mode 100644 index 0000000..4e0da67 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_brick_tiles.json @@ -0,0 +1,61 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_brick_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:dirty_brick_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_dirt": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:dirty_brick_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_dirty_brick_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:dirty_brick_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:dirty_brick_tiles" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_dirty_brick_tiles", + "has_brick_tiles", + "has_dirt", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:dirty_brick_tiles" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_brick_tiles_slab.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_brick_tiles_slab.json index 2d89894..1607c81 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_brick_tiles_slab.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_brick_tiles_slab.json @@ -1,12 +1,36 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_dirty_brick_tiles": { + "has_brick_tiles_slab": { "conditions": { "items": [ { "items": [ - "new_soviet:dirty_brick_tiles" + "new_soviet:dirty_brick_tiles_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_dirt": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:dirty_brick_tiles_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_dirty_brick_tiles_slab": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:dirty_brick_tiles_slab" ] } ] @@ -22,7 +46,9 @@ }, "requirements": [ [ - "has_dirty_brick_tiles", + "has_dirty_brick_tiles_slab", + "has_brick_tiles_slab", + "has_dirt", "has_the_recipe" ] ], diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_brick_tiles_stairs.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_brick_tiles_stairs.json index fc5923b..7b1206c 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_brick_tiles_stairs.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_brick_tiles_stairs.json @@ -1,12 +1,36 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_dirty_brick_tiles": { + "has_brick_tiles_stairs": { "conditions": { "items": [ { "items": [ - "new_soviet:dirty_brick_tiles" + "new_soviet:dirty_brick_tiles_stairs" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_dirt": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:dirty_brick_tiles_stairs" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_dirty_brick_tiles_stairs": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:dirty_brick_tiles_stairs" ] } ] @@ -22,7 +46,9 @@ }, "requirements": [ [ - "has_dirty_brick_tiles", + "has_dirty_brick_tiles_stairs", + "has_brick_tiles_stairs", + "has_dirt", "has_the_recipe" ] ], diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_dark_brick_tiles.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_dark_brick_tiles.json new file mode 100644 index 0000000..fa5ac97 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_dark_brick_tiles.json @@ -0,0 +1,61 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dark_brick_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:dirty_dark_brick_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_dirt": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:dirty_dark_brick_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_dirty_dark_brick_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:dirty_dark_brick_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:dirty_dark_brick_tiles" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_dirty_dark_brick_tiles", + "has_dark_brick_tiles", + "has_dirt", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:dirty_dark_brick_tiles" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_dark_brick_tiles_slab.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_dark_brick_tiles_slab.json index 75e557e..b67825d 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_dark_brick_tiles_slab.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_dark_brick_tiles_slab.json @@ -1,12 +1,36 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_dirty_dark_brick_tiles": { + "has_dark_brick_tiles_slab": { "conditions": { "items": [ { "items": [ - "new_soviet:dirty_dark_brick_tiles" + "new_soviet:dirty_dark_brick_tiles_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_dirt": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:dirty_dark_brick_tiles_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_dirty_dark_brick_tiles_slab": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:dirty_dark_brick_tiles_slab" ] } ] @@ -22,7 +46,9 @@ }, "requirements": [ [ - "has_dirty_dark_brick_tiles", + "has_dirty_dark_brick_tiles_slab", + "has_dark_brick_tiles_slab", + "has_dirt", "has_the_recipe" ] ], diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_dark_brick_tiles_stairs.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_dark_brick_tiles_stairs.json index 8c1c0c4..8aecffd 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_dark_brick_tiles_stairs.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dirty_dark_brick_tiles_stairs.json @@ -1,12 +1,36 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_dirty_dark_brick_tiles": { + "has_dark_brick_tiles_stairs": { "conditions": { "items": [ { "items": [ - "new_soviet:dirty_dark_brick_tiles" + "new_soviet:dirty_dark_brick_tiles_stairs" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_dirt": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:dirty_dark_brick_tiles_stairs" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_dirty_dark_brick_tiles_stairs": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:dirty_dark_brick_tiles_stairs" ] } ] @@ -22,7 +46,9 @@ }, "requirements": [ [ - "has_dirty_dark_brick_tiles", + "has_dirty_dark_brick_tiles_stairs", + "has_dark_brick_tiles_stairs", + "has_dirt", "has_the_recipe" ] ], diff --git a/src/main/generated/data/new_soviet/recipes/cracked_red_bricks.json b/src/main/generated/data/new_soviet/recipes/cracked_red_bricks.json new file mode 100644 index 0000000..4dd9949 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cracked_red_bricks.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, + "ingredient": { + "item": "new_soviet:red_bricks" + }, + "result": "new_soviet:cracked_red_bricks" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/dirty_aquamarine_tiles.json b/src/main/generated/data/new_soviet/recipes/dirty_aquamarine_tiles.json new file mode 100644 index 0000000..2f18e63 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/dirty_aquamarine_tiles.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "new_soviet:aquamarine_tiles" + }, + { + "item": "minecraft:dirt" + } + ], + "result": { + "item": "new_soviet:dirty_aquamarine_tiles" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/dirty_aquamarine_tiles_slab.json b/src/main/generated/data/new_soviet/recipes/dirty_aquamarine_tiles_slab.json index af6168a..219d7b9 100644 --- a/src/main/generated/data/new_soviet/recipes/dirty_aquamarine_tiles_slab.json +++ b/src/main/generated/data/new_soviet/recipes/dirty_aquamarine_tiles_slab.json @@ -1,17 +1,15 @@ { - "type": "minecraft:crafting_shaped", + "type": "minecraft:crafting_shapeless", "category": "building", - "key": { - "#": { - "item": "new_soviet:dirty_aquamarine_tiles" + "ingredients": [ + { + "item": "new_soviet:aquamarine_tiles_slab" + }, + { + "item": "minecraft:dirt" } - }, - "pattern": [ - "###" ], "result": { - "count": 6, "item": "new_soviet:dirty_aquamarine_tiles_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/dirty_aquamarine_tiles_stairs.json b/src/main/generated/data/new_soviet/recipes/dirty_aquamarine_tiles_stairs.json index cdc5fd0..1977013 100644 --- a/src/main/generated/data/new_soviet/recipes/dirty_aquamarine_tiles_stairs.json +++ b/src/main/generated/data/new_soviet/recipes/dirty_aquamarine_tiles_stairs.json @@ -1,19 +1,15 @@ { - "type": "minecraft:crafting_shaped", + "type": "minecraft:crafting_shapeless", "category": "building", - "key": { - "#": { - "item": "new_soviet:dirty_aquamarine_tiles" + "ingredients": [ + { + "item": "new_soviet:aquamarine_tiles_stairs" + }, + { + "item": "minecraft:dirt" } - }, - "pattern": [ - "# ", - "## ", - "###" ], "result": { - "count": 4, "item": "new_soviet:dirty_aquamarine_tiles_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/dirty_brick_tiles.json b/src/main/generated/data/new_soviet/recipes/dirty_brick_tiles.json new file mode 100644 index 0000000..5fdf4e9 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/dirty_brick_tiles.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "new_soviet:brick_tiles" + }, + { + "item": "minecraft:dirt" + } + ], + "result": { + "item": "new_soviet:dirty_brick_tiles" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/dirty_brick_tiles_slab.json b/src/main/generated/data/new_soviet/recipes/dirty_brick_tiles_slab.json index 46146f8..6ef861e 100644 --- a/src/main/generated/data/new_soviet/recipes/dirty_brick_tiles_slab.json +++ b/src/main/generated/data/new_soviet/recipes/dirty_brick_tiles_slab.json @@ -1,17 +1,15 @@ { - "type": "minecraft:crafting_shaped", + "type": "minecraft:crafting_shapeless", "category": "building", - "key": { - "#": { - "item": "new_soviet:dirty_brick_tiles" + "ingredients": [ + { + "item": "new_soviet:brick_tiles_slab" + }, + { + "item": "minecraft:dirt" } - }, - "pattern": [ - "###" ], "result": { - "count": 6, "item": "new_soviet:dirty_brick_tiles_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/dirty_brick_tiles_stairs.json b/src/main/generated/data/new_soviet/recipes/dirty_brick_tiles_stairs.json index e2af01b..c4809f5 100644 --- a/src/main/generated/data/new_soviet/recipes/dirty_brick_tiles_stairs.json +++ b/src/main/generated/data/new_soviet/recipes/dirty_brick_tiles_stairs.json @@ -1,19 +1,15 @@ { - "type": "minecraft:crafting_shaped", + "type": "minecraft:crafting_shapeless", "category": "building", - "key": { - "#": { - "item": "new_soviet:dirty_brick_tiles" + "ingredients": [ + { + "item": "new_soviet:brick_tiles_stairs" + }, + { + "item": "minecraft:dirt" } - }, - "pattern": [ - "# ", - "## ", - "###" ], "result": { - "count": 4, "item": "new_soviet:dirty_brick_tiles_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/dirty_dark_brick_tiles.json b/src/main/generated/data/new_soviet/recipes/dirty_dark_brick_tiles.json new file mode 100644 index 0000000..5ed3736 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/dirty_dark_brick_tiles.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "new_soviet:dark_brick_tiles" + }, + { + "item": "minecraft:dirt" + } + ], + "result": { + "item": "new_soviet:dirty_dark_brick_tiles" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/dirty_dark_brick_tiles_slab.json b/src/main/generated/data/new_soviet/recipes/dirty_dark_brick_tiles_slab.json index 416e990..a05bde5 100644 --- a/src/main/generated/data/new_soviet/recipes/dirty_dark_brick_tiles_slab.json +++ b/src/main/generated/data/new_soviet/recipes/dirty_dark_brick_tiles_slab.json @@ -1,17 +1,15 @@ { - "type": "minecraft:crafting_shaped", + "type": "minecraft:crafting_shapeless", "category": "building", - "key": { - "#": { - "item": "new_soviet:dirty_dark_brick_tiles" + "ingredients": [ + { + "item": "new_soviet:dark_brick_tiles_slab" + }, + { + "item": "minecraft:dirt" } - }, - "pattern": [ - "###" ], "result": { - "count": 6, "item": "new_soviet:dirty_dark_brick_tiles_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/dirty_dark_brick_tiles_stairs.json b/src/main/generated/data/new_soviet/recipes/dirty_dark_brick_tiles_stairs.json index adfd100..217eeee 100644 --- a/src/main/generated/data/new_soviet/recipes/dirty_dark_brick_tiles_stairs.json +++ b/src/main/generated/data/new_soviet/recipes/dirty_dark_brick_tiles_stairs.json @@ -1,19 +1,15 @@ { - "type": "minecraft:crafting_shaped", + "type": "minecraft:crafting_shapeless", "category": "building", - "key": { - "#": { - "item": "new_soviet:dirty_dark_brick_tiles" + "ingredients": [ + { + "item": "new_soviet:dark_brick_tiles_stairs" + }, + { + "item": "minecraft:dirt" } - }, - "pattern": [ - "# ", - "## ", - "###" ], "result": { - "count": 4, "item": "new_soviet:dirty_dark_brick_tiles_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/DataGeneration.java b/src/main/java/su/a71/new_soviet/DataGeneration.java index 842999e..1532cfc 100644 --- a/src/main/java/su/a71/new_soviet/DataGeneration.java +++ b/src/main/java/su/a71/new_soviet/DataGeneration.java @@ -842,6 +842,13 @@ public class DataGeneration implements DataGeneratorEntrypoint { FabricRecipeProvider.conditionsFromItem(output)).offerTo(exporter); } + private void dirtyRecipe(Consumer exporter, ItemConvertible output, ItemConvertible input) { + ShapelessRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output).input(input).input(Items.DIRT).criterion(FabricRecipeProvider.hasItem(output), + FabricRecipeProvider.conditionsFromItem(output)).criterion(FabricRecipeProvider.hasItem(input), + FabricRecipeProvider.conditionsFromItem(output)).criterion(FabricRecipeProvider.hasItem(Items.DIRT), + FabricRecipeProvider.conditionsFromItem(output)).offerTo(exporter); + } + private void stoneCuttingCategory(Consumer exporter, List category, RecipeCategory recipe_category) { for (int i = 0; i < category.size(); i++) { for (int j = 0; j < category.size(); j++) { @@ -1079,6 +1086,18 @@ public class DataGeneration implements DataGeneratorEntrypoint { mossRecipe(exporter, NSE_Blocks.MOSSY_BRICK_TILES, NSE_Blocks.BRICK_TILES); mossRecipe(exporter, NSE_Blocks.MOSSY_DARK_BRICK_TILES, NSE_Blocks.DARK_BRICK_TILES); + // Dirty blocks recipe + dirtyRecipe(exporter, NSE_Blocks.DIRTY_AQUAMARINE_TILES, NSE_Blocks.AQUAMARINE_TILES); + dirtyRecipe(exporter, NSE_Blocks.DIRTY_AQUAMARINE_TILES_SLAB, NSE_Blocks.AQUAMARINE_TILES_SLAB); + dirtyRecipe(exporter, NSE_Blocks.DIRTY_AQUAMARINE_TILES_STAIRS, NSE_Blocks.AQUAMARINE_TILES_STAIRS); + dirtyRecipe(exporter, NSE_Blocks.DIRTY_BRICK_TILES, NSE_Blocks.BRICK_TILES); + dirtyRecipe(exporter, NSE_Blocks.DIRTY_BRICK_TILES_SLAB, NSE_Blocks.BRICK_TILES_SLAB); + dirtyRecipe(exporter, NSE_Blocks.DIRTY_BRICK_TILES_STAIRS, NSE_Blocks.BRICK_TILES_STAIRS); + dirtyRecipe(exporter, NSE_Blocks.DIRTY_DARK_BRICK_TILES, NSE_Blocks.DARK_BRICK_TILES); + dirtyRecipe(exporter, NSE_Blocks.DIRTY_DARK_BRICK_TILES_SLAB, NSE_Blocks.DARK_BRICK_TILES_SLAB); + dirtyRecipe(exporter, NSE_Blocks.DIRTY_DARK_BRICK_TILES_STAIRS, NSE_Blocks.DARK_BRICK_TILES_STAIRS); + + // Warning stripes warningStripeRecipe(exporter, NSE_Blocks.INDUSTRIAL_WARNING, Items.BLACK_DYE); warningStripeRecipe(exporter, NSE_Blocks.RED_WARNING, Items.RED_DYE); warningStripeRecipe(exporter, NSE_Blocks.BLUE_WARNING, Items.BLUE_DYE); @@ -1722,6 +1741,7 @@ public class DataGeneration implements DataGeneratorEntrypoint { @Override public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGenerator) { + // BlockStateModelGenerator.createStairsBlockState(NSE_Blocks.SAND_TILES_STAIRS, new Identifier(NewSoviet.MOD_ID, "sand_tiles_stairs")); }