From 9d81772d48b460963828cbdaebddb406e3a3638d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 22 Oct 2019 19:07:05 -0500 Subject: [PATCH] More stonecutting recipes --- ...black_pavement_to_black_pavement_slab.json | 8 +++ ...ack_pavement_to_black_pavement_stairs.json | 8 +++ .../blaze_quartz_to_blaze_quartz_pillar.json | 8 +++ .../blaze_quartz_to_blaze_quartz_slab.json | 8 +++ .../blaze_quartz_to_blaze_quartz_stairs.json | 8 +++ ...blaze_quartz_to_chiseled_blaze_quartz.json | 8 +++ .../blue_pavement_to_blue_pavement_slab.json | 8 +++ ...blue_pavement_to_blue_pavement_stairs.json | 8 +++ .../dark_quartz_to_chiseled_dark_quartz.json | 8 +++ .../dark_quartz_to_dark_quartz_pillar.json | 8 +++ .../dark_quartz_to_dark_quartz_slab.json | 8 +++ .../dark_quartz_to_dark_quartz_stairs.json | 8 +++ .../elf_quartz_to_chiseled_elf_quartz.json | 8 +++ .../elf_quartz_to_elf_quartz_pillar.json | 8 +++ .../elf_quartz_to_elf_quartz_slab.json | 8 +++ .../elf_quartz_to_elf_quartz_stairs.json | 8 +++ ...green_pavement_to_green_pavement_slab.json | 8 +++ ...een_pavement_to_green_pavement_stairs.json | 8 +++ ...er_quartz_to_chiseled_lavender_quartz.json | 8 +++ ...nder_quartz_to_lavender_quartz_pillar.json | 8 +++ ...vender_quartz_to_lavender_quartz_slab.json | 8 +++ ...nder_quartz_to_lavender_quartz_stairs.json | 8 +++ ...ingrock_to_chiseled_livingrock_bricks.json | 8 +++ .../livingrock_to_livingrock_bricks.json | 8 +++ .../livingrock_to_livingrock_bricks_slab.json | 8 +++ ...ivingrock_to_livingrock_bricks_stairs.json | 8 +++ .../livingrock_to_livingrock_slab.json | 8 +++ .../livingrock_to_livingrock_stairs.json | 8 +++ .../livingrock_to_livingrock_wall.json | 8 +++ .../mana_quartz_to_chiseled_mana_quartz.json | 8 +++ .../mana_quartz_to_mana_quartz_pillar.json | 8 +++ .../mana_quartz_to_mana_quartz_slab.json | 8 +++ .../mana_quartz_to_mana_quartz_stairs.json | 8 +++ .../red_pavement_to_red_pavement_slab.json | 8 +++ .../red_pavement_to_red_pavement_stairs.json | 8 +++ .../red_quartz_to_chiseled_red_quartz.json | 8 +++ .../red_quartz_to_red_quartz_pillar.json | 8 +++ .../red_quartz_to_red_quartz_slab.json | 8 +++ .../red_quartz_to_red_quartz_stairs.json | 8 +++ .../shimmerrock_to_shimmerrock_slab.json | 8 +++ .../shimmerrock_to_shimmerrock_stairs.json | 8 +++ ...sunny_quartz_to_chiseled_sunny_quartz.json | 8 +++ .../sunny_quartz_to_sunny_quartz_pillar.json | 8 +++ .../sunny_quartz_to_sunny_quartz_slab.json | 8 +++ .../sunny_quartz_to_sunny_quartz_stairs.json | 8 +++ ...white_pavement_to_white_pavement_slab.json | 8 +++ ...ite_pavement_to_white_pavement_stairs.json | 8 +++ ...llow_pavement_to_yellow_pavement_slab.json | 8 +++ ...ow_pavement_to_yellow_pavement_stairs.json | 8 +++ .../botania/common/block/ModFluffBlocks.java | 52 +++---------------- .../common/data/StonecuttingProvider.java | 52 ++++++++++++++++++- .../botania/common/lib/LibBlockNames.java | 8 +++ .../slabs/metamorphic_taiga_cobblestone.json | 6 +-- 53 files changed, 460 insertions(+), 50 deletions(-) create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/black_pavement_to_black_pavement_slab.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/black_pavement_to_black_pavement_stairs.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/blaze_quartz_to_blaze_quartz_pillar.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/blaze_quartz_to_blaze_quartz_slab.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/blaze_quartz_to_blaze_quartz_stairs.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/blaze_quartz_to_chiseled_blaze_quartz.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/blue_pavement_to_blue_pavement_slab.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/blue_pavement_to_blue_pavement_stairs.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/dark_quartz_to_chiseled_dark_quartz.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/dark_quartz_to_dark_quartz_pillar.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/dark_quartz_to_dark_quartz_slab.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/dark_quartz_to_dark_quartz_stairs.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/elf_quartz_to_chiseled_elf_quartz.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/elf_quartz_to_elf_quartz_pillar.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/elf_quartz_to_elf_quartz_slab.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/elf_quartz_to_elf_quartz_stairs.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/green_pavement_to_green_pavement_slab.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/green_pavement_to_green_pavement_stairs.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/lavender_quartz_to_chiseled_lavender_quartz.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/lavender_quartz_to_lavender_quartz_pillar.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/lavender_quartz_to_lavender_quartz_slab.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/lavender_quartz_to_lavender_quartz_stairs.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_chiseled_livingrock_bricks.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_livingrock_bricks.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_livingrock_bricks_slab.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_livingrock_bricks_stairs.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_livingrock_slab.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_livingrock_stairs.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_livingrock_wall.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/mana_quartz_to_chiseled_mana_quartz.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/mana_quartz_to_mana_quartz_pillar.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/mana_quartz_to_mana_quartz_slab.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/mana_quartz_to_mana_quartz_stairs.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/red_pavement_to_red_pavement_slab.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/red_pavement_to_red_pavement_stairs.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/red_quartz_to_chiseled_red_quartz.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/red_quartz_to_red_quartz_pillar.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/red_quartz_to_red_quartz_slab.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/red_quartz_to_red_quartz_stairs.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/shimmerrock_to_shimmerrock_slab.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/shimmerrock_to_shimmerrock_stairs.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/sunny_quartz_to_chiseled_sunny_quartz.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/sunny_quartz_to_sunny_quartz_pillar.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/sunny_quartz_to_sunny_quartz_slab.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/sunny_quartz_to_sunny_quartz_stairs.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/white_pavement_to_white_pavement_slab.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/white_pavement_to_white_pavement_stairs.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/yellow_pavement_to_yellow_pavement_slab.json create mode 100644 src/generated/resources/data/botania/recipes/stonecutting/yellow_pavement_to_yellow_pavement_stairs.json diff --git a/src/generated/resources/data/botania/recipes/stonecutting/black_pavement_to_black_pavement_slab.json b/src/generated/resources/data/botania/recipes/stonecutting/black_pavement_to_black_pavement_slab.json new file mode 100644 index 000000000..03482a44f --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/black_pavement_to_black_pavement_slab.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:black_pavement" + }, + "result": "botania:black_pavement_slab", + "count": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/black_pavement_to_black_pavement_stairs.json b/src/generated/resources/data/botania/recipes/stonecutting/black_pavement_to_black_pavement_stairs.json new file mode 100644 index 000000000..6cb005642 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/black_pavement_to_black_pavement_stairs.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:black_pavement" + }, + "result": "botania:black_pavement_stairs", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/blaze_quartz_to_blaze_quartz_pillar.json b/src/generated/resources/data/botania/recipes/stonecutting/blaze_quartz_to_blaze_quartz_pillar.json new file mode 100644 index 000000000..dff935896 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/blaze_quartz_to_blaze_quartz_pillar.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:blaze_quartz" + }, + "result": "botania:blaze_quartz_pillar", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/blaze_quartz_to_blaze_quartz_slab.json b/src/generated/resources/data/botania/recipes/stonecutting/blaze_quartz_to_blaze_quartz_slab.json new file mode 100644 index 000000000..0d8bfcf38 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/blaze_quartz_to_blaze_quartz_slab.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:blaze_quartz" + }, + "result": "botania:blaze_quartz_slab", + "count": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/blaze_quartz_to_blaze_quartz_stairs.json b/src/generated/resources/data/botania/recipes/stonecutting/blaze_quartz_to_blaze_quartz_stairs.json new file mode 100644 index 000000000..f3f7fa827 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/blaze_quartz_to_blaze_quartz_stairs.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:blaze_quartz" + }, + "result": "botania:blaze_quartz_stairs", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/blaze_quartz_to_chiseled_blaze_quartz.json b/src/generated/resources/data/botania/recipes/stonecutting/blaze_quartz_to_chiseled_blaze_quartz.json new file mode 100644 index 000000000..f2cdee87f --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/blaze_quartz_to_chiseled_blaze_quartz.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:blaze_quartz" + }, + "result": "botania:chiseled_blaze_quartz", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/blue_pavement_to_blue_pavement_slab.json b/src/generated/resources/data/botania/recipes/stonecutting/blue_pavement_to_blue_pavement_slab.json new file mode 100644 index 000000000..8799087ea --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/blue_pavement_to_blue_pavement_slab.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:blue_pavement" + }, + "result": "botania:blue_pavement_slab", + "count": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/blue_pavement_to_blue_pavement_stairs.json b/src/generated/resources/data/botania/recipes/stonecutting/blue_pavement_to_blue_pavement_stairs.json new file mode 100644 index 000000000..d5db96dc9 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/blue_pavement_to_blue_pavement_stairs.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:blue_pavement" + }, + "result": "botania:blue_pavement_stairs", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/dark_quartz_to_chiseled_dark_quartz.json b/src/generated/resources/data/botania/recipes/stonecutting/dark_quartz_to_chiseled_dark_quartz.json new file mode 100644 index 000000000..465fb121b --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/dark_quartz_to_chiseled_dark_quartz.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:dark_quartz" + }, + "result": "botania:chiseled_dark_quartz", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/dark_quartz_to_dark_quartz_pillar.json b/src/generated/resources/data/botania/recipes/stonecutting/dark_quartz_to_dark_quartz_pillar.json new file mode 100644 index 000000000..e84d6272c --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/dark_quartz_to_dark_quartz_pillar.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:dark_quartz" + }, + "result": "botania:dark_quartz_pillar", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/dark_quartz_to_dark_quartz_slab.json b/src/generated/resources/data/botania/recipes/stonecutting/dark_quartz_to_dark_quartz_slab.json new file mode 100644 index 000000000..79615993e --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/dark_quartz_to_dark_quartz_slab.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:dark_quartz" + }, + "result": "botania:dark_quartz_slab", + "count": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/dark_quartz_to_dark_quartz_stairs.json b/src/generated/resources/data/botania/recipes/stonecutting/dark_quartz_to_dark_quartz_stairs.json new file mode 100644 index 000000000..175aae833 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/dark_quartz_to_dark_quartz_stairs.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:dark_quartz" + }, + "result": "botania:dark_quartz_stairs", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/elf_quartz_to_chiseled_elf_quartz.json b/src/generated/resources/data/botania/recipes/stonecutting/elf_quartz_to_chiseled_elf_quartz.json new file mode 100644 index 000000000..52fc71d2b --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/elf_quartz_to_chiseled_elf_quartz.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:elf_quartz" + }, + "result": "botania:chiseled_elf_quartz", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/elf_quartz_to_elf_quartz_pillar.json b/src/generated/resources/data/botania/recipes/stonecutting/elf_quartz_to_elf_quartz_pillar.json new file mode 100644 index 000000000..800cd1012 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/elf_quartz_to_elf_quartz_pillar.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:elf_quartz" + }, + "result": "botania:elf_quartz_pillar", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/elf_quartz_to_elf_quartz_slab.json b/src/generated/resources/data/botania/recipes/stonecutting/elf_quartz_to_elf_quartz_slab.json new file mode 100644 index 000000000..2c70e391c --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/elf_quartz_to_elf_quartz_slab.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:elf_quartz" + }, + "result": "botania:elf_quartz_slab", + "count": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/elf_quartz_to_elf_quartz_stairs.json b/src/generated/resources/data/botania/recipes/stonecutting/elf_quartz_to_elf_quartz_stairs.json new file mode 100644 index 000000000..72e1f28e0 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/elf_quartz_to_elf_quartz_stairs.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:elf_quartz" + }, + "result": "botania:elf_quartz_stairs", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/green_pavement_to_green_pavement_slab.json b/src/generated/resources/data/botania/recipes/stonecutting/green_pavement_to_green_pavement_slab.json new file mode 100644 index 000000000..43cb6edef --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/green_pavement_to_green_pavement_slab.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:green_pavement" + }, + "result": "botania:green_pavement_slab", + "count": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/green_pavement_to_green_pavement_stairs.json b/src/generated/resources/data/botania/recipes/stonecutting/green_pavement_to_green_pavement_stairs.json new file mode 100644 index 000000000..d85b8b81c --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/green_pavement_to_green_pavement_stairs.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:green_pavement" + }, + "result": "botania:green_pavement_stairs", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/lavender_quartz_to_chiseled_lavender_quartz.json b/src/generated/resources/data/botania/recipes/stonecutting/lavender_quartz_to_chiseled_lavender_quartz.json new file mode 100644 index 000000000..872498526 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/lavender_quartz_to_chiseled_lavender_quartz.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:lavender_quartz" + }, + "result": "botania:chiseled_lavender_quartz", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/lavender_quartz_to_lavender_quartz_pillar.json b/src/generated/resources/data/botania/recipes/stonecutting/lavender_quartz_to_lavender_quartz_pillar.json new file mode 100644 index 000000000..231112a54 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/lavender_quartz_to_lavender_quartz_pillar.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:lavender_quartz" + }, + "result": "botania:lavender_quartz_pillar", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/lavender_quartz_to_lavender_quartz_slab.json b/src/generated/resources/data/botania/recipes/stonecutting/lavender_quartz_to_lavender_quartz_slab.json new file mode 100644 index 000000000..6579fc420 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/lavender_quartz_to_lavender_quartz_slab.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:lavender_quartz" + }, + "result": "botania:lavender_quartz_slab", + "count": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/lavender_quartz_to_lavender_quartz_stairs.json b/src/generated/resources/data/botania/recipes/stonecutting/lavender_quartz_to_lavender_quartz_stairs.json new file mode 100644 index 000000000..cf8218500 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/lavender_quartz_to_lavender_quartz_stairs.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:lavender_quartz" + }, + "result": "botania:lavender_quartz_stairs", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_chiseled_livingrock_bricks.json b/src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_chiseled_livingrock_bricks.json new file mode 100644 index 000000000..826405bae --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_chiseled_livingrock_bricks.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:livingrock" + }, + "result": "botania:chiseled_livingrock_bricks", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_livingrock_bricks.json b/src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_livingrock_bricks.json new file mode 100644 index 000000000..6dcb01229 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_livingrock_bricks.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:livingrock" + }, + "result": "botania:livingrock_bricks", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_livingrock_bricks_slab.json b/src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_livingrock_bricks_slab.json new file mode 100644 index 000000000..10563c384 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_livingrock_bricks_slab.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:livingrock" + }, + "result": "botania:livingrock_bricks_slab", + "count": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_livingrock_bricks_stairs.json b/src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_livingrock_bricks_stairs.json new file mode 100644 index 000000000..19843a996 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_livingrock_bricks_stairs.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:livingrock" + }, + "result": "botania:livingrock_bricks_stairs", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_livingrock_slab.json b/src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_livingrock_slab.json new file mode 100644 index 000000000..c938c9650 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_livingrock_slab.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:livingrock" + }, + "result": "botania:livingrock_slab", + "count": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_livingrock_stairs.json b/src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_livingrock_stairs.json new file mode 100644 index 000000000..5360d2880 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_livingrock_stairs.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:livingrock" + }, + "result": "botania:livingrock_stairs", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_livingrock_wall.json b/src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_livingrock_wall.json new file mode 100644 index 000000000..44882737a --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/livingrock_to_livingrock_wall.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:livingrock" + }, + "result": "botania:livingrock_wall", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/mana_quartz_to_chiseled_mana_quartz.json b/src/generated/resources/data/botania/recipes/stonecutting/mana_quartz_to_chiseled_mana_quartz.json new file mode 100644 index 000000000..46878c7b9 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/mana_quartz_to_chiseled_mana_quartz.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:mana_quartz" + }, + "result": "botania:chiseled_mana_quartz", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/mana_quartz_to_mana_quartz_pillar.json b/src/generated/resources/data/botania/recipes/stonecutting/mana_quartz_to_mana_quartz_pillar.json new file mode 100644 index 000000000..18616511c --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/mana_quartz_to_mana_quartz_pillar.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:mana_quartz" + }, + "result": "botania:mana_quartz_pillar", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/mana_quartz_to_mana_quartz_slab.json b/src/generated/resources/data/botania/recipes/stonecutting/mana_quartz_to_mana_quartz_slab.json new file mode 100644 index 000000000..e38963200 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/mana_quartz_to_mana_quartz_slab.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:mana_quartz" + }, + "result": "botania:mana_quartz_slab", + "count": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/mana_quartz_to_mana_quartz_stairs.json b/src/generated/resources/data/botania/recipes/stonecutting/mana_quartz_to_mana_quartz_stairs.json new file mode 100644 index 000000000..ef04f849e --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/mana_quartz_to_mana_quartz_stairs.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:mana_quartz" + }, + "result": "botania:mana_quartz_stairs", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/red_pavement_to_red_pavement_slab.json b/src/generated/resources/data/botania/recipes/stonecutting/red_pavement_to_red_pavement_slab.json new file mode 100644 index 000000000..a6bb64c72 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/red_pavement_to_red_pavement_slab.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:red_pavement" + }, + "result": "botania:red_pavement_slab", + "count": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/red_pavement_to_red_pavement_stairs.json b/src/generated/resources/data/botania/recipes/stonecutting/red_pavement_to_red_pavement_stairs.json new file mode 100644 index 000000000..88fa39f2f --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/red_pavement_to_red_pavement_stairs.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:red_pavement" + }, + "result": "botania:red_pavement_stairs", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/red_quartz_to_chiseled_red_quartz.json b/src/generated/resources/data/botania/recipes/stonecutting/red_quartz_to_chiseled_red_quartz.json new file mode 100644 index 000000000..698f693fc --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/red_quartz_to_chiseled_red_quartz.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:red_quartz" + }, + "result": "botania:chiseled_red_quartz", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/red_quartz_to_red_quartz_pillar.json b/src/generated/resources/data/botania/recipes/stonecutting/red_quartz_to_red_quartz_pillar.json new file mode 100644 index 000000000..50f7c0b65 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/red_quartz_to_red_quartz_pillar.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:red_quartz" + }, + "result": "botania:red_quartz_pillar", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/red_quartz_to_red_quartz_slab.json b/src/generated/resources/data/botania/recipes/stonecutting/red_quartz_to_red_quartz_slab.json new file mode 100644 index 000000000..2fd42151e --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/red_quartz_to_red_quartz_slab.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:red_quartz" + }, + "result": "botania:red_quartz_slab", + "count": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/red_quartz_to_red_quartz_stairs.json b/src/generated/resources/data/botania/recipes/stonecutting/red_quartz_to_red_quartz_stairs.json new file mode 100644 index 000000000..94f87d41c --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/red_quartz_to_red_quartz_stairs.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:red_quartz" + }, + "result": "botania:red_quartz_stairs", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/shimmerrock_to_shimmerrock_slab.json b/src/generated/resources/data/botania/recipes/stonecutting/shimmerrock_to_shimmerrock_slab.json new file mode 100644 index 000000000..03ff2bd6a --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/shimmerrock_to_shimmerrock_slab.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:shimmerrock" + }, + "result": "botania:shimmerrock_slab", + "count": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/shimmerrock_to_shimmerrock_stairs.json b/src/generated/resources/data/botania/recipes/stonecutting/shimmerrock_to_shimmerrock_stairs.json new file mode 100644 index 000000000..019bcb6c1 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/shimmerrock_to_shimmerrock_stairs.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:shimmerrock" + }, + "result": "botania:shimmerrock_stairs", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/sunny_quartz_to_chiseled_sunny_quartz.json b/src/generated/resources/data/botania/recipes/stonecutting/sunny_quartz_to_chiseled_sunny_quartz.json new file mode 100644 index 000000000..809d6ac5c --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/sunny_quartz_to_chiseled_sunny_quartz.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:sunny_quartz" + }, + "result": "botania:chiseled_sunny_quartz", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/sunny_quartz_to_sunny_quartz_pillar.json b/src/generated/resources/data/botania/recipes/stonecutting/sunny_quartz_to_sunny_quartz_pillar.json new file mode 100644 index 000000000..4970fa520 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/sunny_quartz_to_sunny_quartz_pillar.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:sunny_quartz" + }, + "result": "botania:sunny_quartz_pillar", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/sunny_quartz_to_sunny_quartz_slab.json b/src/generated/resources/data/botania/recipes/stonecutting/sunny_quartz_to_sunny_quartz_slab.json new file mode 100644 index 000000000..8d3ce80aa --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/sunny_quartz_to_sunny_quartz_slab.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:sunny_quartz" + }, + "result": "botania:sunny_quartz_slab", + "count": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/sunny_quartz_to_sunny_quartz_stairs.json b/src/generated/resources/data/botania/recipes/stonecutting/sunny_quartz_to_sunny_quartz_stairs.json new file mode 100644 index 000000000..2fc4bd1e7 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/sunny_quartz_to_sunny_quartz_stairs.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:sunny_quartz" + }, + "result": "botania:sunny_quartz_stairs", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/white_pavement_to_white_pavement_slab.json b/src/generated/resources/data/botania/recipes/stonecutting/white_pavement_to_white_pavement_slab.json new file mode 100644 index 000000000..687992cfb --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/white_pavement_to_white_pavement_slab.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:white_pavement" + }, + "result": "botania:white_pavement_slab", + "count": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/white_pavement_to_white_pavement_stairs.json b/src/generated/resources/data/botania/recipes/stonecutting/white_pavement_to_white_pavement_stairs.json new file mode 100644 index 000000000..9d035b13a --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/white_pavement_to_white_pavement_stairs.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:white_pavement" + }, + "result": "botania:white_pavement_stairs", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/yellow_pavement_to_yellow_pavement_slab.json b/src/generated/resources/data/botania/recipes/stonecutting/yellow_pavement_to_yellow_pavement_slab.json new file mode 100644 index 000000000..207d93dd6 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/yellow_pavement_to_yellow_pavement_slab.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:yellow_pavement" + }, + "result": "botania:yellow_pavement_slab", + "count": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/stonecutting/yellow_pavement_to_yellow_pavement_stairs.json b/src/generated/resources/data/botania/recipes/stonecutting/yellow_pavement_to_yellow_pavement_stairs.json new file mode 100644 index 000000000..b925e001d --- /dev/null +++ b/src/generated/resources/data/botania/recipes/stonecutting/yellow_pavement_to_yellow_pavement_stairs.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "botania:yellow_pavement" + }, + "result": "botania:yellow_pavement_stairs", + "count": 1 +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 9883c49c5..6f53ee1f3 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -265,12 +265,7 @@ public final class ModFluffBlocks { register(r, new BlockModSlab(Block.Properties.from(base)), LibBlockNames.DREAM_WOOD_PLANKS + SLAB_SUFFIX); Block.Properties props = Block.Properties.from(Blocks.QUARTZ_BLOCK); - String[] variants = { - LibBlockNames.QUARTZ_BLAZE, LibBlockNames.QUARTZ_DARK, - LibBlockNames.QUARTZ_LAVENDER, LibBlockNames.QUARTZ_MANA, - LibBlockNames.QUARTZ_RED, LibBlockNames.QUARTZ_SUNNY - }; - for (String variant : variants) { + for (String variant : LibBlockNames.QUARTZ_VARIANTS) { ILexiconable lexicon = (world, pos, player, lex) -> LexiconData.decorativeBlocks; base = new BlockModLexiconable(props, lexicon); @@ -281,46 +276,13 @@ public final class ModFluffBlocks { register(r, new BlockModStairs(base.getDefaultState(), props), variant + STAIR_SUFFIX); } - // elf quartz special - ILexiconable elven = (world, pos, player, lex) -> LexiconData.elvenResources; - base = new BlockModLexiconable(props, elven); - register(r, base, LibBlockNames.QUARTZ_ELF); - register(r, new BlockModLexiconable(props, elven), "chiseled_" + LibBlockNames.QUARTZ_ELF); - register(r, new BlockSpecialQuartzPillar(props), LibBlockNames.QUARTZ_ELF + "_pillar"); - register(r, new BlockElfQuartzSlab(props), LibBlockNames.QUARTZ_ELF + SLAB_SUFFIX); - register(r, new BlockElfQuartzStairs(base.getDefaultState(), props), LibBlockNames.QUARTZ_ELF + STAIR_SUFFIX); - props = Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE); - - Block block = new BlockMod(props); - register(r, block, "white" + LibBlockNames.PAVEMENT_SUFFIX); - register(r, new BlockPavementStairs(block.getDefaultState(), props), "white" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX); - register(r, new BlockPavementSlab(props), "white" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX); - - block = new BlockMod(props); - register(r, block, "black" + LibBlockNames.PAVEMENT_SUFFIX); - register(r, new BlockPavementStairs(block.getDefaultState(), props), "black" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX); - register(r, new BlockPavementSlab(props), "black" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX); - - block = new BlockMod(props); - register(r, block, "blue" + LibBlockNames.PAVEMENT_SUFFIX); - register(r, new BlockPavementStairs(block.getDefaultState(), props), "blue" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX); - register(r, new BlockPavementSlab(props), "blue" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX); - - block = new BlockMod(props); - register(r, block, "red" + LibBlockNames.PAVEMENT_SUFFIX); - register(r, new BlockPavementStairs(block.getDefaultState(), props), "red" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX); - register(r, new BlockPavementSlab(props), "red" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX); - - block = new BlockMod(props); - register(r, block, "yellow" + LibBlockNames.PAVEMENT_SUFFIX); - register(r, new BlockPavementStairs(block.getDefaultState(), props), "yellow" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX); - register(r, new BlockPavementSlab(props), "yellow" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX); - - block = new BlockMod(props); - register(r, block, "green" + LibBlockNames.PAVEMENT_SUFFIX); - register(r, new BlockPavementStairs(block.getDefaultState(), props), "green" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX); - register(r, new BlockPavementSlab(props), "green" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX); + for (String color : LibBlockNames.PAVEMENT_VARIANTS) { + Block block = new BlockMod(props); + register(r, block, color + LibBlockNames.PAVEMENT_SUFFIX); + register(r, new BlockPavementStairs(block.getDefaultState(), props), color + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX); + register(r, new BlockPavementSlab(props), color + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX); + } props = Block.Properties.create(Material.ROCK).hardnessAndResistance(1.5F, 10).sound(SoundType.STONE); ILexiconable marimorph = (world, pos, player, lex) -> LexiconData.marimorphosis; diff --git a/src/main/java/vazkii/botania/common/data/StonecuttingProvider.java b/src/main/java/vazkii/botania/common/data/StonecuttingProvider.java index 44385ee3e..af7bb2fbf 100644 --- a/src/main/java/vazkii/botania/common/data/StonecuttingProvider.java +++ b/src/main/java/vazkii/botania/common/data/StonecuttingProvider.java @@ -13,10 +13,11 @@ import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.IItemProvider; import net.minecraft.util.ResourceLocation; import net.minecraftforge.registries.ForgeRegistries; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; -import vazkii.botania.common.lib.ResourceLocationHelper; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.function.Consumer; @@ -32,6 +33,47 @@ public class StonecuttingProvider extends RecipeProvider { for(String variant : LibBlockNames.METAMORPHIC_VARIANTS) { registerForMetamorphic(variant, consumer); } + + for(String color : LibBlockNames.PAVEMENT_VARIANTS) { + registerForPavement(color, consumer); + } + + for(String variant : LibBlockNames.QUARTZ_VARIANTS) { + registerForQuartz(variant, consumer); + } + + consumer.accept(stonecutting(ModBlocks.shimmerrock, ModFluffBlocks.shimmerrockSlab, 2)); + consumer.accept(stonecutting(ModBlocks.shimmerrock, ModFluffBlocks.shimmerrockStairs)); + consumer.accept(stonecutting(ModBlocks.livingrock, ModFluffBlocks.livingrockSlab, 2)); + consumer.accept(stonecutting(ModBlocks.livingrock, ModFluffBlocks.livingrockStairs)); + consumer.accept(stonecutting(ModBlocks.livingrock, ModFluffBlocks.livingrockWall)); + consumer.accept(stonecutting(ModBlocks.livingrock, ModBlocks.livingrockBrick)); + consumer.accept(stonecutting(ModBlocks.livingrock, ModFluffBlocks.livingrockBrickSlab, 2)); + consumer.accept(stonecutting(ModBlocks.livingrock, ModFluffBlocks.livingrockBrickStairs)); + consumer.accept(stonecutting(ModBlocks.livingrock, ModBlocks.livingrockBrickChiseled)); + consumer.accept(stonecutting(ModBlocks.livingrockBrick, ModFluffBlocks.livingrockBrickSlab, 2)); + consumer.accept(stonecutting(ModBlocks.livingrockBrick, ModFluffBlocks.livingrockBrickStairs)); + consumer.accept(stonecutting(ModBlocks.livingrockBrick, ModBlocks.livingrockBrickChiseled)); + } + + private static void registerForQuartz(String variant, Consumer consumer) { + Block base = ForgeRegistries.BLOCKS.getValue(prefix(variant)); + Block slab = ForgeRegistries.BLOCKS.getValue(prefix(variant + LibBlockNames.SLAB_SUFFIX)); + Block stairs = ForgeRegistries.BLOCKS.getValue(prefix(variant + LibBlockNames.STAIR_SUFFIX)); + Block chiseled = ForgeRegistries.BLOCKS.getValue(prefix("chiseled_" + variant)); + Block pillar = ForgeRegistries.BLOCKS.getValue(prefix(variant + "_pillar")); + consumer.accept(stonecutting(base, slab, 2)); + consumer.accept(stonecutting(base, stairs)); + consumer.accept(stonecutting(base, chiseled)); + consumer.accept(stonecutting(base, pillar)); + } + + private static void registerForPavement(String color, Consumer consumer) { + Block base = ForgeRegistries.BLOCKS.getValue(prefix(color + LibBlockNames.PAVEMENT_SUFFIX)); + Block slab = ForgeRegistries.BLOCKS.getValue(prefix(color + LibBlockNames.PAVEMENT_SUFFIX + LibBlockNames.SLAB_SUFFIX)); + Block stair = ForgeRegistries.BLOCKS.getValue(prefix(color + LibBlockNames.PAVEMENT_SUFFIX + LibBlockNames.STAIR_SUFFIX)); + consumer.accept(stonecutting(base, slab, 2)); + consumer.accept(stonecutting(base, stair)); } private static void registerForMetamorphic(String variant, Consumer consumer) { @@ -63,6 +105,12 @@ public class StonecuttingProvider extends RecipeProvider { consumer.accept(stonecutting(cobble, cobbleWall)); } + @Nonnull + @Override + public String getName() { + return "Botania stonecutting recipes"; + } + private static ResourceLocation idFor(IItemProvider a, IItemProvider b) { return prefix("stonecutting/" + a.asItem().getRegistryName().getPath() + "_to_" + b.asItem().getRegistryName().getPath()); } diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index 4bd4e5434..e8d3a0902 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -127,6 +127,10 @@ public final class LibBlockNames { public static final String BELLOWS = "bellows"; public static final String BIFROST_PERM = "bifrost_perm"; public static final String PAVEMENT_SUFFIX = "_pavement"; + public static final String[] PAVEMENT_VARIANTS = { + "white", "black", "blue", + "red", "yellow", "green" + }; public static final String CELL_BLOCK = "cell_block"; public static final String GAIA_HEAD = "gaia_head"; public static final String GAIA_WALL_HEAD = "gaia_wall_head"; @@ -197,5 +201,9 @@ public final class LibBlockNames { public static final String QUARTZ_RED = "red_quartz"; public static final String QUARTZ_ELF = "elf_quartz"; public static final String QUARTZ_SUNNY = "sunny_quartz"; + public static final String[] QUARTZ_VARIANTS = { + QUARTZ_DARK, QUARTZ_MANA, QUARTZ_BLAZE, QUARTZ_LAVENDER, + QUARTZ_RED, QUARTZ_ELF, QUARTZ_SUNNY + }; } diff --git a/src/main/resources/assets/botania/models/block/slabs/metamorphic_taiga_cobblestone.json b/src/main/resources/assets/botania/models/block/slabs/metamorphic_taiga_cobblestone.json index a7e5a4eea..f350910a5 100644 --- a/src/main/resources/assets/botania/models/block/slabs/metamorphic_taiga_cobblestone.json +++ b/src/main/resources/assets/botania/models/block/slabs/metamorphic_taiga_cobblestone.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "top": "botania:blocks/biomestone22", - "bottom": "botania:blocks/biomestone22", - "side": "botania:blocks/biomestone22" + "top": "botania:blocks/biomestone14", + "bottom": "botania:blocks/biomestone14", + "side": "botania:blocks/biomestone14" } } \ No newline at end of file