From 7204a7bfd876fab2b56823d46e5dd35636cfef6c Mon Sep 17 00:00:00 2001 From: Andrew-71 Date: Thu, 26 Oct 2023 00:00:57 +0300 Subject: [PATCH] Add more of the missing recipes --- recipeTODO.txt | 2 - .../beige_concrete_with_bars.json | 6 +- .../blue_concrete_with_bars.json | 6 +- .../green_concrete_with_bars.json | 4 +- ..._plating_from_iron_block_stonecutting.json | 35 +++++++++++ .../red_concrete_with_bars.json | 6 +- .../white_concrete_with_bars.json | 26 ++++---- .../yellow_concrete_with_bars.json | 26 ++++---- .../recipes/decorations/dark_switch.json | 61 +++++++++++++++++++ .../recipes/decorations/switch.json | 61 +++++++++++++++++++ .../recipes/{decorations => tools}/rake.json | 0 .../{decorations => tools}/sickle.json | 0 .../recipes/beige_concrete_with_bars.json | 2 +- .../recipes/blue_concrete_with_bars.json | 2 +- .../data/new_soviet/recipes/dark_switch.json | 24 ++++++++ .../recipes/green_concrete_with_bars.json | 2 +- ..._plating_from_iron_block_stonecutting.json | 8 +++ .../data/new_soviet/recipes/rake.json | 2 +- .../recipes/red_concrete_with_bars.json | 2 +- .../data/new_soviet/recipes/sickle.json | 2 +- .../data/new_soviet/recipes/switch.json | 24 ++++++++ .../recipes/white_concrete_with_bars.json | 2 +- .../recipes/yellow_concrete_with_bars.json | 2 +- .../new_soviet/datagen/RecipeGenerator.java | 48 ++++++++++++--- 24 files changed, 298 insertions(+), 55 deletions(-) create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/metal_plating_from_iron_block_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/decorations/dark_switch.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/decorations/switch.json rename src/main/generated/data/new_soviet/advancements/recipes/{decorations => tools}/rake.json (100%) rename src/main/generated/data/new_soviet/advancements/recipes/{decorations => tools}/sickle.json (100%) create mode 100644 src/main/generated/data/new_soviet/recipes/dark_switch.json create mode 100644 src/main/generated/data/new_soviet/recipes/metal_plating_from_iron_block_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/recipes/switch.json diff --git a/recipeTODO.txt b/recipeTODO.txt index 4175ee1..0746dfb 100644 --- a/recipeTODO.txt +++ b/recipeTODO.txt @@ -1,12 +1,10 @@ === Add * whitewash recipe * linoleum recipe -* metal plating recipe * crate recipe * po-2 recipe * wallpaper recipes * cigarette recipe -* switch recipe * checkers and chess recipe * post lamps recipes * various lamps recipes diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_concrete_with_bars.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_concrete_with_bars.json index 62fc476..2b033f7 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_concrete_with_bars.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_concrete_with_bars.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_beige_concrete": { + "has_beige_concrete_with_bars": { "conditions": { "items": [ { @@ -13,7 +13,7 @@ }, "trigger": "minecraft:inventory_changed" }, - "has_beige_concrete_with_bars": { + "has_cracked_beige_concrete": { "conditions": { "items": [ { @@ -47,7 +47,7 @@ "requirements": [ [ "has_beige_concrete_with_bars", - "has_beige_concrete", + "has_cracked_beige_concrete", "has_iron_bars", "has_the_recipe" ] diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_concrete_with_bars.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_concrete_with_bars.json index 03277b6..2a11b94 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_concrete_with_bars.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_concrete_with_bars.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_blue_concrete": { + "has_blue_concrete_with_bars": { "conditions": { "items": [ { @@ -13,7 +13,7 @@ }, "trigger": "minecraft:inventory_changed" }, - "has_blue_concrete_with_bars": { + "has_cracked_blue_concrete": { "conditions": { "items": [ { @@ -47,7 +47,7 @@ "requirements": [ [ "has_blue_concrete_with_bars", - "has_blue_concrete", + "has_cracked_blue_concrete", "has_iron_bars", "has_the_recipe" ] diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/green_concrete_with_bars.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/green_concrete_with_bars.json index b99790f..3285a34 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/green_concrete_with_bars.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/green_concrete_with_bars.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_green_concrete": { + "has_cracked_green_concrete": { "conditions": { "items": [ { @@ -47,7 +47,7 @@ "requirements": [ [ "has_green_concrete_with_bars", - "has_green_concrete", + "has_cracked_green_concrete", "has_iron_bars", "has_the_recipe" ] diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/metal_plating_from_iron_block_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/metal_plating_from_iron_block_stonecutting.json new file mode 100644 index 0000000..157db4c --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/metal_plating_from_iron_block_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_iron_block": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_block" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:metal_plating_from_iron_block_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_iron_block", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:metal_plating_from_iron_block_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/red_concrete_with_bars.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/red_concrete_with_bars.json index 0b5e57a..66a5779 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/red_concrete_with_bars.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/red_concrete_with_bars.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_iron_bars": { + "has_cracked_red_concrete": { "conditions": { "items": [ { @@ -13,7 +13,7 @@ }, "trigger": "minecraft:inventory_changed" }, - "has_red_concrete": { + "has_iron_bars": { "conditions": { "items": [ { @@ -47,7 +47,7 @@ "requirements": [ [ "has_red_concrete_with_bars", - "has_red_concrete", + "has_cracked_red_concrete", "has_iron_bars", "has_the_recipe" ] diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/white_concrete_with_bars.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/white_concrete_with_bars.json index 6271cb6..18b9add 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/white_concrete_with_bars.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/white_concrete_with_bars.json @@ -1,6 +1,18 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_cracked_white_concrete": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:white_concrete_with_bars" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, "has_iron_bars": { "conditions": { "items": [ @@ -19,18 +31,6 @@ }, "trigger": "minecraft:recipe_unlocked" }, - "has_white_concrete": { - "conditions": { - "items": [ - { - "items": [ - "new_soviet:white_concrete_with_bars" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, "has_white_concrete_with_bars": { "conditions": { "items": [ @@ -47,7 +47,7 @@ "requirements": [ [ "has_white_concrete_with_bars", - "has_white_concrete", + "has_cracked_white_concrete", "has_iron_bars", "has_the_recipe" ] diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_concrete_with_bars.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_concrete_with_bars.json index bbad17c..95aba54 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_concrete_with_bars.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_concrete_with_bars.json @@ -1,6 +1,18 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_cracked_yellow_concrete": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:yellow_concrete_with_bars" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, "has_iron_bars": { "conditions": { "items": [ @@ -19,18 +31,6 @@ }, "trigger": "minecraft:recipe_unlocked" }, - "has_yellow_concrete": { - "conditions": { - "items": [ - { - "items": [ - "new_soviet:yellow_concrete_with_bars" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, "has_yellow_concrete_with_bars": { "conditions": { "items": [ @@ -47,7 +47,7 @@ "requirements": [ [ "has_yellow_concrete_with_bars", - "has_yellow_concrete", + "has_cracked_yellow_concrete", "has_iron_bars", "has_the_recipe" ] diff --git a/src/main/generated/data/new_soviet/advancements/recipes/decorations/dark_switch.json b/src/main/generated/data/new_soviet/advancements/recipes/decorations/dark_switch.json new file mode 100644 index 0000000..300d6b6 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/decorations/dark_switch.json @@ -0,0 +1,61 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dark_oak_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:dark_oak_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_redstone": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:redstone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_stone_button": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:stone_button" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:dark_switch" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_dark_oak_slab", + "has_redstone", + "has_stone_button", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:dark_switch" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/decorations/switch.json b/src/main/generated/data/new_soviet/advancements/recipes/decorations/switch.json new file mode 100644 index 0000000..96d473c --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/decorations/switch.json @@ -0,0 +1,61 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_oak_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_redstone": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:redstone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_stone_button": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:stone_button" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:switch" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_oak_slab", + "has_redstone", + "has_stone_button", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:switch" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/decorations/rake.json b/src/main/generated/data/new_soviet/advancements/recipes/tools/rake.json similarity index 100% rename from src/main/generated/data/new_soviet/advancements/recipes/decorations/rake.json rename to src/main/generated/data/new_soviet/advancements/recipes/tools/rake.json diff --git a/src/main/generated/data/new_soviet/advancements/recipes/decorations/sickle.json b/src/main/generated/data/new_soviet/advancements/recipes/tools/sickle.json similarity index 100% rename from src/main/generated/data/new_soviet/advancements/recipes/decorations/sickle.json rename to src/main/generated/data/new_soviet/advancements/recipes/tools/sickle.json diff --git a/src/main/generated/data/new_soviet/recipes/beige_concrete_with_bars.json b/src/main/generated/data/new_soviet/recipes/beige_concrete_with_bars.json index d00f0e1..7a48a22 100644 --- a/src/main/generated/data/new_soviet/recipes/beige_concrete_with_bars.json +++ b/src/main/generated/data/new_soviet/recipes/beige_concrete_with_bars.json @@ -3,7 +3,7 @@ "category": "building", "ingredients": [ { - "item": "new_soviet:beige_concrete" + "item": "new_soviet:cracked_beige_concrete" }, { "item": "minecraft:iron_bars" diff --git a/src/main/generated/data/new_soviet/recipes/blue_concrete_with_bars.json b/src/main/generated/data/new_soviet/recipes/blue_concrete_with_bars.json index b3a0812..37477e6 100644 --- a/src/main/generated/data/new_soviet/recipes/blue_concrete_with_bars.json +++ b/src/main/generated/data/new_soviet/recipes/blue_concrete_with_bars.json @@ -3,7 +3,7 @@ "category": "building", "ingredients": [ { - "item": "new_soviet:blue_concrete" + "item": "new_soviet:cracked_blue_concrete" }, { "item": "minecraft:iron_bars" diff --git a/src/main/generated/data/new_soviet/recipes/dark_switch.json b/src/main/generated/data/new_soviet/recipes/dark_switch.json new file mode 100644 index 0000000..b2882eb --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/dark_switch.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": { + "item": "minecraft:stone_button" + }, + "R": { + "item": "minecraft:redstone" + }, + "S": { + "item": "minecraft:dark_oak_slab" + } + }, + "pattern": [ + " B ", + " R ", + " S " + ], + "result": { + "item": "new_soviet:dark_switch" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/green_concrete_with_bars.json b/src/main/generated/data/new_soviet/recipes/green_concrete_with_bars.json index 38bace7..0145fa3 100644 --- a/src/main/generated/data/new_soviet/recipes/green_concrete_with_bars.json +++ b/src/main/generated/data/new_soviet/recipes/green_concrete_with_bars.json @@ -3,7 +3,7 @@ "category": "building", "ingredients": [ { - "item": "new_soviet:green_concrete" + "item": "new_soviet:cracked_green_concrete" }, { "item": "minecraft:iron_bars" diff --git a/src/main/generated/data/new_soviet/recipes/metal_plating_from_iron_block_stonecutting.json b/src/main/generated/data/new_soviet/recipes/metal_plating_from_iron_block_stonecutting.json new file mode 100644 index 0000000..d1cf645 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/metal_plating_from_iron_block_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:iron_block" + }, + "result": "new_soviet:metal_plating" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/rake.json b/src/main/generated/data/new_soviet/recipes/rake.json index 4a1b8d0..97ac4ac 100644 --- a/src/main/generated/data/new_soviet/recipes/rake.json +++ b/src/main/generated/data/new_soviet/recipes/rake.json @@ -1,6 +1,6 @@ { "type": "minecraft:crafting_shaped", - "category": "misc", + "category": "equipment", "key": { "I": { "item": "minecraft:iron_ingot" diff --git a/src/main/generated/data/new_soviet/recipes/red_concrete_with_bars.json b/src/main/generated/data/new_soviet/recipes/red_concrete_with_bars.json index e237dec..c8f0255 100644 --- a/src/main/generated/data/new_soviet/recipes/red_concrete_with_bars.json +++ b/src/main/generated/data/new_soviet/recipes/red_concrete_with_bars.json @@ -3,7 +3,7 @@ "category": "building", "ingredients": [ { - "item": "new_soviet:red_concrete" + "item": "new_soviet:cracked_red_concrete" }, { "item": "minecraft:iron_bars" diff --git a/src/main/generated/data/new_soviet/recipes/sickle.json b/src/main/generated/data/new_soviet/recipes/sickle.json index 5f8fb00..f353688 100644 --- a/src/main/generated/data/new_soviet/recipes/sickle.json +++ b/src/main/generated/data/new_soviet/recipes/sickle.json @@ -1,6 +1,6 @@ { "type": "minecraft:crafting_shaped", - "category": "misc", + "category": "equipment", "key": { "I": { "item": "minecraft:iron_ingot" diff --git a/src/main/generated/data/new_soviet/recipes/switch.json b/src/main/generated/data/new_soviet/recipes/switch.json new file mode 100644 index 0000000..998cd63 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/switch.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": { + "item": "minecraft:stone_button" + }, + "R": { + "item": "minecraft:redstone" + }, + "S": { + "item": "minecraft:oak_slab" + } + }, + "pattern": [ + " B ", + " R ", + " S " + ], + "result": { + "item": "new_soviet:switch" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/white_concrete_with_bars.json b/src/main/generated/data/new_soviet/recipes/white_concrete_with_bars.json index 26066c6..0ad013b 100644 --- a/src/main/generated/data/new_soviet/recipes/white_concrete_with_bars.json +++ b/src/main/generated/data/new_soviet/recipes/white_concrete_with_bars.json @@ -3,7 +3,7 @@ "category": "building", "ingredients": [ { - "item": "new_soviet:white_concrete" + "item": "new_soviet:cracked_white_concrete" }, { "item": "minecraft:iron_bars" diff --git a/src/main/generated/data/new_soviet/recipes/yellow_concrete_with_bars.json b/src/main/generated/data/new_soviet/recipes/yellow_concrete_with_bars.json index 1334db9..a013ac4 100644 --- a/src/main/generated/data/new_soviet/recipes/yellow_concrete_with_bars.json +++ b/src/main/generated/data/new_soviet/recipes/yellow_concrete_with_bars.json @@ -3,7 +3,7 @@ "category": "building", "ingredients": [ { - "item": "new_soviet:yellow_concrete" + "item": "new_soviet:cracked_yellow_concrete" }, { "item": "minecraft:iron_bars" 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 5f937d8..2591eed 100644 --- a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java @@ -13,6 +13,7 @@ import net.minecraft.item.ItemConvertible; import net.minecraft.item.Items; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.book.RecipeCategory; +import net.minecraft.registry.tag.BlockTags; import net.minecraft.registry.tag.ItemTags; import net.minecraft.util.Util; import su.a71.new_soviet.registration.NSE_Blocks; @@ -411,6 +412,7 @@ public class RecipeGenerator extends FabricRecipeProvider { offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.NII_WALL_3, Blocks.STONE_BRICKS); offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.NII_WALL_2, Blocks.SMOOTH_STONE); offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.VINTAGE_IRON_BARS, Blocks.IRON_BARS); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.METAL_PLATING, Blocks.IRON_BLOCK); diceRecipe(exporter, NSE_Items.DICE_D4); diceRecipe(exporter, NSE_Items.DICE_D6); @@ -478,7 +480,7 @@ public class RecipeGenerator extends FabricRecipeProvider { RecipeProvider.conditionsFromItem(Items.GREEN_STAINED_GLASS)) .offerTo(exporter); - ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, NSE_Items.SICKLE, 1) + ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, NSE_Items.SICKLE, 1) .pattern(" I ") .pattern(" I") .pattern(" S ") @@ -490,7 +492,7 @@ public class RecipeGenerator extends FabricRecipeProvider { RecipeProvider.conditionsFromItem(Items.IRON_INGOT)) .offerTo(exporter); - ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, NSE_Items.RAKE, 1) + ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, NSE_Items.RAKE, 1) .pattern("III") .pattern(" N ") .pattern(" S ") @@ -574,6 +576,36 @@ public class RecipeGenerator extends FabricRecipeProvider { .criterion(hasItem(Blocks.TNT), conditionsFromItem(Blocks.TNT)) .offerTo(exporter); + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, NSE_Custom.SWITCH, 1) + .pattern(" B ") + .pattern(" R ") + .pattern(" S ") + .input('S', Blocks.OAK_SLAB) + .input('R', Items.REDSTONE) + .input('B', Blocks.STONE_BUTTON) + .criterion(RecipeProvider.hasItem(Blocks.OAK_SLAB), + RecipeProvider.conditionsFromItem(Blocks.OAK_SLAB)) + .criterion(RecipeProvider.hasItem(Items.REDSTONE), + RecipeProvider.conditionsFromItem(Items.REDSTONE)) + .criterion(RecipeProvider.hasItem(Blocks.STONE_BUTTON), + RecipeProvider.conditionsFromItem(Blocks.STONE_BUTTON)) + .offerTo(exporter); + + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, NSE_Custom.DARK_SWITCH, 1) + .pattern(" B ") + .pattern(" R ") + .pattern(" S ") + .input('S', Blocks.DARK_OAK_SLAB) + .input('R', Items.REDSTONE) + .input('B', Blocks.STONE_BUTTON) + .criterion(RecipeProvider.hasItem(Blocks.DARK_OAK_SLAB), + RecipeProvider.conditionsFromItem(Blocks.DARK_OAK_SLAB)) + .criterion(RecipeProvider.hasItem(Items.REDSTONE), + RecipeProvider.conditionsFromItem(Items.REDSTONE)) + .criterion(RecipeProvider.hasItem(Blocks.STONE_BUTTON), + RecipeProvider.conditionsFromItem(Blocks.STONE_BUTTON)) + .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), @@ -741,11 +773,11 @@ public class RecipeGenerator extends FabricRecipeProvider { concreteRecipe(exporter, NSE_Blocks.RED_CONCRETE, Items.RED_DYE); concreteRecipe(exporter, NSE_Blocks.WHITE_CONCRETE, Items.WHITE_DYE); concreteRecipe(exporter, NSE_Blocks.BEIGE_CONCRETE, Items.LIGHT_GRAY_DYE); - concreteWithBarsRecipe(exporter, NSE_Blocks.GREEN_CONCRETE_WITH_BARS, NSE_Blocks.GREEN_CONCRETE); - concreteWithBarsRecipe(exporter, NSE_Blocks.YELLOW_CONCRETE_WITH_BARS, NSE_Blocks.YELLOW_CONCRETE); - concreteWithBarsRecipe(exporter, NSE_Blocks.BLUE_CONCRETE_WITH_BARS, NSE_Blocks.BLUE_CONCRETE); - concreteWithBarsRecipe(exporter, NSE_Blocks.RED_CONCRETE_WITH_BARS, NSE_Blocks.RED_CONCRETE); - concreteWithBarsRecipe(exporter, NSE_Blocks.WHITE_CONCRETE_WITH_BARS, NSE_Blocks.WHITE_CONCRETE); - concreteWithBarsRecipe(exporter, NSE_Blocks.BEIGE_CONCRETE_WITH_BARS, NSE_Blocks.BEIGE_CONCRETE); + concreteWithBarsRecipe(exporter, NSE_Blocks.GREEN_CONCRETE_WITH_BARS, NSE_Blocks.CRACKED_GREEN_CONCRETE); + concreteWithBarsRecipe(exporter, NSE_Blocks.YELLOW_CONCRETE_WITH_BARS, NSE_Blocks.CRACKED_YELLOW_CONCRETE); + concreteWithBarsRecipe(exporter, NSE_Blocks.BLUE_CONCRETE_WITH_BARS, NSE_Blocks.CRACKED_BLUE_CONCRETE); + concreteWithBarsRecipe(exporter, NSE_Blocks.RED_CONCRETE_WITH_BARS, NSE_Blocks.CRACKED_RED_CONCRETE); + concreteWithBarsRecipe(exporter, NSE_Blocks.WHITE_CONCRETE_WITH_BARS, NSE_Blocks.CRACKED_WHITE_CONCRETE); + concreteWithBarsRecipe(exporter, NSE_Blocks.BEIGE_CONCRETE_WITH_BARS, NSE_Blocks.CRACKED_BEIGE_CONCRETE); } } \ No newline at end of file