From 6a01f50dcf41c4f31b2abf056c8d765cf266ed60 Mon Sep 17 00:00:00 2001 From: Andrew-71 Date: Fri, 26 Apr 2024 11:32:16 +0300 Subject: [PATCH] Fix white tiles recipes --- TODO.md | 13 ++-- .../cracked_glazed_white_tiles.json | 35 +++++++++++ .../building_blocks/cracked_white_tiles.json | 35 +++++++++++ ...e_tiles_from_white_tiles_stonecutting.json | 35 +++++++++++ ...rquet_from_spruce_planks_stonecutting.json | 35 +++++++++++ ...ssy_white_tiles_from_white_tiles_moss.json | 61 +++++++++++++++++++ ...ssy_white_tiles_from_white_tiles_vine.json | 61 +++++++++++++++++++ .../small_cracked_white_tiles.json | 35 +++++++++++ ...e_tiles_from_white_tiles_stonecutting.json | 35 +++++++++++ ...e_tiles_from_white_tiles_stonecutting.json | 35 +++++++++++ .../recipes/building_blocks/white_tiles.json | 48 +++++++++++++++ .../recipes/cracked_glazed_white_tiles.json | 10 +++ .../recipes/cracked_white_tiles.json | 10 +++ ...e_tiles_from_white_tiles_stonecutting.json | 8 +++ ...rquet_from_spruce_planks_stonecutting.json | 8 +++ ...ssy_white_tiles_from_white_tiles_moss.json | 15 +++++ ...ssy_white_tiles_from_white_tiles_vine.json | 15 +++++ .../recipes/small_cracked_white_tiles.json | 10 +++ ...e_tiles_from_white_tiles_stonecutting.json | 8 +++ ...e_tiles_from_white_tiles_stonecutting.json | 8 +++ .../data/new_soviet/recipes/white_tiles.json | 21 +++++++ .../new_soviet/datagen/RecipeGenerator.java | 25 ++++++-- 22 files changed, 555 insertions(+), 11 deletions(-) create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_glazed_white_tiles.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_white_tiles.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/glazed_white_tiles_from_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_spruce_parquet_from_spruce_planks_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_white_tiles_from_white_tiles_moss.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_white_tiles_from_white_tiles_vine.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_cracked_white_tiles.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_white_tiles_from_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/variated_white_tiles_from_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/white_tiles.json create mode 100644 src/main/generated/data/new_soviet/recipes/cracked_glazed_white_tiles.json create mode 100644 src/main/generated/data/new_soviet/recipes/cracked_white_tiles.json create mode 100644 src/main/generated/data/new_soviet/recipes/glazed_white_tiles_from_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/recipes/herringbone_spruce_parquet_from_spruce_planks_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/recipes/mossy_white_tiles_from_white_tiles_moss.json create mode 100644 src/main/generated/data/new_soviet/recipes/mossy_white_tiles_from_white_tiles_vine.json create mode 100644 src/main/generated/data/new_soviet/recipes/small_cracked_white_tiles.json create mode 100644 src/main/generated/data/new_soviet/recipes/small_white_tiles_from_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/recipes/variated_white_tiles_from_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/recipes/white_tiles.json diff --git a/TODO.md b/TODO.md index a34cfd8..eec8466 100644 --- a/TODO.md +++ b/TODO.md @@ -12,18 +12,19 @@ ### Missing recipes * Aquamarine, teal - reliance on prismarine * Long blue tiles - missing -* White tiles - some missing, small used as main * Yellow bricks - missing -* Whitewash - no base recipe * Concrete plate - missing * Spruce and jungle carved - missing -* Herringbone spruce parquet - missing * Yellow-red linoleum - missing * Beige linoleum - missing -* Whitewash birch door - missing * Po-2 wall and crate...? - missing * Rusty blue iron bars - missing * Most wallpaper - missing -* Whitewash window - missing * Nutrient block - missing -* Chess & Checkers figurines - missing \ No newline at end of file +* Chess & Checkers figurines - missing +#### Whitewash +Works like rake +* Concrete block -> Whitewash/slightly cracked +* Whitewash fixed by layer +* Birch door into whitewash birch door +* Any window into whitewash window \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_glazed_white_tiles.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_glazed_white_tiles.json new file mode 100644 index 0000000..22ef73b --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_glazed_white_tiles.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_glazed_white_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:glazed_white_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:cracked_glazed_white_tiles" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_glazed_white_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:cracked_glazed_white_tiles" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_white_tiles.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_white_tiles.json new file mode 100644 index 0000000..f466445 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_white_tiles.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:cracked_white_tiles" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_white_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:white_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_white_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:cracked_white_tiles" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/glazed_white_tiles_from_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/glazed_white_tiles_from_white_tiles_stonecutting.json new file mode 100644 index 0000000..d9e01da --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/glazed_white_tiles_from_white_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:glazed_white_tiles_from_white_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_white_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:white_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_white_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:glazed_white_tiles_from_white_tiles_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_spruce_parquet_from_spruce_planks_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_spruce_parquet_from_spruce_planks_stonecutting.json new file mode 100644 index 0000000..dce4055 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_spruce_parquet_from_spruce_planks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_spruce_planks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:spruce_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:herringbone_spruce_parquet_from_spruce_planks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_spruce_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:herringbone_spruce_parquet_from_spruce_planks_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_white_tiles_from_white_tiles_moss.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_white_tiles_from_white_tiles_moss.json new file mode 100644 index 0000000..dfd4571 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_white_tiles_from_white_tiles_moss.json @@ -0,0 +1,61 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_moss_block": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:mossy_white_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_mossy_white_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:mossy_white_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:mossy_white_tiles_from_white_tiles_moss" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_white_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:mossy_white_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_mossy_white_tiles", + "has_white_tiles", + "has_moss_block", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:mossy_white_tiles_from_white_tiles_moss" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_white_tiles_from_white_tiles_vine.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_white_tiles_from_white_tiles_vine.json new file mode 100644 index 0000000..4c6effa --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_white_tiles_from_white_tiles_vine.json @@ -0,0 +1,61 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_mossy_white_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:mossy_white_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:mossy_white_tiles_from_white_tiles_vine" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_vine": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:mossy_white_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_white_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:mossy_white_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_mossy_white_tiles", + "has_white_tiles", + "has_vine", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:mossy_white_tiles_from_white_tiles_vine" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_cracked_white_tiles.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_cracked_white_tiles.json new file mode 100644 index 0000000..f871adb --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_cracked_white_tiles.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_small_white_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:small_white_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:small_cracked_white_tiles" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_small_white_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:small_cracked_white_tiles" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_white_tiles_from_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_white_tiles_from_white_tiles_stonecutting.json new file mode 100644 index 0000000..e894eae --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_white_tiles_from_white_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:small_white_tiles_from_white_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_white_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:white_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_white_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:small_white_tiles_from_white_tiles_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/variated_white_tiles_from_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/variated_white_tiles_from_white_tiles_stonecutting.json new file mode 100644 index 0000000..246f8bf --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/variated_white_tiles_from_white_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:variated_white_tiles_from_white_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_white_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:white_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_white_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:variated_white_tiles_from_white_tiles_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/white_tiles.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/white_tiles.json new file mode 100644 index 0000000..81bb096 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/white_tiles.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stone": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:white_tiles" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_white_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:white_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_stone", + "has_white_dye", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:white_tiles" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cracked_glazed_white_tiles.json b/src/main/generated/data/new_soviet/recipes/cracked_glazed_white_tiles.json new file mode 100644 index 0000000..22c6947 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cracked_glazed_white_tiles.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, + "ingredient": { + "item": "new_soviet:glazed_white_tiles" + }, + "result": "new_soviet:cracked_glazed_white_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cracked_white_tiles.json b/src/main/generated/data/new_soviet/recipes/cracked_white_tiles.json new file mode 100644 index 0000000..f7bf94d --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cracked_white_tiles.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, + "ingredient": { + "item": "new_soviet:white_tiles" + }, + "result": "new_soviet:cracked_white_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/glazed_white_tiles_from_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/glazed_white_tiles_from_white_tiles_stonecutting.json new file mode 100644 index 0000000..38960d1 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/glazed_white_tiles_from_white_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:white_tiles" + }, + "result": "new_soviet:glazed_white_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/herringbone_spruce_parquet_from_spruce_planks_stonecutting.json b/src/main/generated/data/new_soviet/recipes/herringbone_spruce_parquet_from_spruce_planks_stonecutting.json new file mode 100644 index 0000000..ad674fd --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/herringbone_spruce_parquet_from_spruce_planks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:spruce_planks" + }, + "result": "new_soviet:herringbone_spruce_parquet" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/mossy_white_tiles_from_white_tiles_moss.json b/src/main/generated/data/new_soviet/recipes/mossy_white_tiles_from_white_tiles_moss.json new file mode 100644 index 0000000..b7d0356 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/mossy_white_tiles_from_white_tiles_moss.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "new_soviet:white_tiles" + }, + { + "item": "minecraft:moss_block" + } + ], + "result": { + "item": "new_soviet:mossy_white_tiles" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/mossy_white_tiles_from_white_tiles_vine.json b/src/main/generated/data/new_soviet/recipes/mossy_white_tiles_from_white_tiles_vine.json new file mode 100644 index 0000000..8988cb0 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/mossy_white_tiles_from_white_tiles_vine.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "new_soviet:white_tiles" + }, + { + "item": "minecraft:vine" + } + ], + "result": { + "item": "new_soviet:mossy_white_tiles" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/small_cracked_white_tiles.json b/src/main/generated/data/new_soviet/recipes/small_cracked_white_tiles.json new file mode 100644 index 0000000..a9a0be7 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/small_cracked_white_tiles.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, + "ingredient": { + "item": "new_soviet:small_white_tiles" + }, + "result": "new_soviet:small_cracked_white_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/small_white_tiles_from_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/small_white_tiles_from_white_tiles_stonecutting.json new file mode 100644 index 0000000..011adfc --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/small_white_tiles_from_white_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:white_tiles" + }, + "result": "new_soviet:small_white_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/variated_white_tiles_from_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/variated_white_tiles_from_white_tiles_stonecutting.json new file mode 100644 index 0000000..69292e0 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/variated_white_tiles_from_white_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:white_tiles" + }, + "result": "new_soviet:variated_white_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/white_tiles.json b/src/main/generated/data/new_soviet/recipes/white_tiles.json new file mode 100644 index 0000000..6b9ed25 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/white_tiles.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "X": { + "item": "minecraft:stone" + }, + "Y": { + "item": "minecraft:white_dye" + } + }, + "pattern": [ + "XY", + "YX" + ], + "result": { + "count": 4, + "item": "new_soviet:white_tiles" + }, + "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 4006d36..214984b 100644 --- a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java @@ -100,7 +100,11 @@ public class RecipeGenerator extends FabricRecipeProvider { } private void crissCrossRecipe(Consumer exporter, ItemConvertible output, ItemConvertible input1, ItemConvertible input2) { - ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output, 4) + crissCrossRecipe(exporter, output, input1, input2, 4); + } + + private void crissCrossRecipe(Consumer exporter, ItemConvertible output, ItemConvertible input1, ItemConvertible input2, int amount) { + ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output, amount) .pattern("XY") .pattern("YX") .input('X', input1) @@ -234,7 +238,7 @@ public class RecipeGenerator extends FabricRecipeProvider { public void generate(Consumer exporter) { crissCrossRecipe(exporter, NSE_Blocks.SAND_TILES, Blocks.SMOOTH_SANDSTONE, Blocks.SMOOTH_RED_SANDSTONE); crissCrossRecipe(exporter, NSE_Blocks.LIGHT_BLUE_TILES, Blocks.STONE, Items.LIGHT_BLUE_DYE); - crissCrossRecipe(exporter, NSE_Blocks.SMALL_WHITE_TILES, Blocks.STONE, Items.WHITE_DYE); + crissCrossRecipe(exporter, NSE_Blocks.WHITE_TILES, Blocks.STONE, Items.WHITE_DYE); crissCrossRecipe(exporter, NSE_Blocks.GREEN_WHITE_TILES, Blocks.POLISHED_DIORITE, Items.GREEN_DYE); tvRecipe(exporter, NSE_Custom.TV, Items.ORANGE_DYE); @@ -294,6 +298,9 @@ public class RecipeGenerator extends FabricRecipeProvider { offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_GREEN_BRICKS_MIXED, NSE_Blocks.GREEN_BRICKS_MIXED); offerCrackingRecipe(exporter, NSE_Blocks.BIG_GREEN_TILES_CRACKED, NSE_Blocks.BIG_GREEN_TILES); offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_RED_BRICKS, NSE_Blocks.RED_BRICKS); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_WHITE_TILES, NSE_Blocks.WHITE_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.SMALL_CRACKED_WHITE_TILES, NSE_Blocks.SMALL_WHITE_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_GLAZED_WHITE_TILES, NSE_Blocks.GLAZED_WHITE_TILES); // Mossy variants mossRecipe(exporter, NSE_Blocks.MOSSY_SAND_TILES, NSE_Blocks.SAND_TILES); @@ -350,6 +357,7 @@ public class RecipeGenerator extends FabricRecipeProvider { mossRecipe(exporter, NSE_Blocks.MOSSY_TUFF_TILES_SLAB, NSE_Blocks.TUFF_TILES_SLAB); mossRecipe(exporter, NSE_Blocks.MOSSY_TUFF_BRICKS_STAIRS, NSE_Blocks.TUFF_BRICKS_STAIRS); mossRecipe(exporter, NSE_Blocks.MOSSY_TUFF_BRICKS_SLAB, NSE_Blocks.TUFF_BRICKS_SLAB); + mossRecipe(exporter, NSE_Blocks.MOSSY_WHITE_TILES, NSE_Blocks.WHITE_TILES); // Dirty blocks recipe dirtyRecipe(exporter, NSE_Blocks.DIRTY_AQUAMARINE_TILES, NSE_Blocks.AQUAMARINE_TILES); @@ -430,10 +438,10 @@ public class RecipeGenerator extends FabricRecipeProvider { list.add(NSE_Blocks.TUFF_BRICKS); list.add(NSE_Blocks.BIG_TUFF_TILES); }), RecipeCategory.BUILDING_BLOCKS); - stoneCuttingCategory(exporter, NSE_Blocks.SMALL_WHITE_TILES, Util.make(Lists.newArrayList(), list -> { - list.add(NSE_Blocks.SMALL_CRACKED_WHITE_TILES); + stoneCuttingCategory(exporter, NSE_Blocks.WHITE_TILES, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.SMALL_WHITE_TILES); list.add(NSE_Blocks.GLAZED_WHITE_TILES); - list.add(NSE_Blocks.CRACKED_GLAZED_WHITE_TILES); + list.add(NSE_Blocks.VARIATED_WHITE_TILES); }), RecipeCategory.BUILDING_BLOCKS); stoneCuttingCategory(exporter, Blocks.ACACIA_PLANKS, Util.make(Lists.newArrayList(), list -> { list.add(NSE_Blocks.CROSS_ACACIA_PLANKS); @@ -473,6 +481,7 @@ public class RecipeGenerator extends FabricRecipeProvider { stoneCuttingCategory(exporter, Blocks.SPRUCE_PLANKS, Util.make(Lists.newArrayList(), list -> { list.add(NSE_Blocks.CROSS_SPRUCE_PLANKS); list.add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS); + list.add(NSE_Blocks.HERRINGBONE_SPRUCE_PARQUET); }), RecipeCategory.BUILDING_BLOCKS); stoneCuttingCategory(exporter, Blocks.CHERRY_PLANKS, Util.make(Lists.newArrayList(), list -> { list.add(NSE_Blocks.CROSS_CHERRY_PLANKS); @@ -961,6 +970,10 @@ public class RecipeGenerator extends FabricRecipeProvider { offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_CHERRY_PLANKS); offerStairsAndSlab(exporter, NSE_Blocks.CROSS_CHERRY_PLANKS_STAIRS, NSE_Blocks.CROSS_CHERRY_PLANKS_SLAB, NSE_Blocks.CROSS_CHERRY_PLANKS); offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS); + offerStairsAndSlab(exporter, NSE_Blocks.WHITE_TILES, NSE_Blocks.WHITE_TILES_SLAB, NSE_Blocks.WHITE_TILES_STAIRS); + offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_WHITE_TILES, NSE_Blocks.CRACKED_WHITE_TILES_SLAB, NSE_Blocks.CRACKED_WHITE_TILES_STAIRS); + offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_WHITE_TILES, NSE_Blocks.MOSSY_WHITE_TILES_SLAB, NSE_Blocks.MOSSY_WHITE_TILES_STAIRS); + offerStairsAndSlab(exporter, NSE_Blocks.VARIATED_WHITE_TILES, NSE_Blocks.VARIATED_WHITE_TILES_SLAB, NSE_Blocks.VARIATED_WHITE_TILES_STAIRS); offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.WHITE_BOUNDARY_MARKER, Blocks.DIORITE_WALL, 1); offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.WHITE_BOUNDARY_MARKER, Blocks.BONE_BLOCK, 2); @@ -1058,5 +1071,7 @@ public class RecipeGenerator extends FabricRecipeProvider { .criterion(FabricRecipeProvider.hasItem(Items.PAPER), FabricRecipeProvider.conditionsFromItem(NSE_Items.GRAIN_PATTERN)) .criterion(FabricRecipeProvider.hasItem(Items.WHEAT), FabricRecipeProvider.conditionsFromItem(NSE_Items.GRAIN_PATTERN)) .offerTo(exporter); + + crissCrossRecipe(exporter, NSE_Items.WHITEWASH_ITEM, Items.QUARTZ, Items.WHITE_DYE, 6); } } \ No newline at end of file