diff --git a/CHANGELOG.md b/CHANGELOG.md index 9441a9abba..f267a1d9d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). - Lotus Flowers no longer push entities inside of them away - Ogres and Basilisks no longer slide around when idling - Cruxite button now uses raw cruxite instead of cruxite block, which resolves a conflict with storage block breakdown +- Bookshelves for terrain woods can now be crafted, resolving a conflict with the vanilla bookshelf recipe - Fixed right-clicking on an Area Effect Block with a Potion not properly updating its settings - Fixed right-clicking on a Summoner Block with a Spawn Egg not properly updating its settings diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_bookshelf.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_bookshelf.json index db4ce04da8..e4c0a54ef6 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_bookshelf.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_planks": { + "has_cindered_planks": { "conditions": { "items": [ { @@ -23,7 +23,7 @@ "requirements": [ [ "has_the_recipe", - "has_planks" + "has_cindered_planks" ] ], "rewards": { diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_bookshelf.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_bookshelf.json index 3a58b10071..95ba19e130 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_bookshelf.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_planks": { + "has_dead_planks": { "conditions": { "items": [ { @@ -23,7 +23,7 @@ "requirements": [ [ "has_the_recipe", - "has_planks" + "has_dead_planks" ] ], "rewards": { diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_bookshelf.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_bookshelf.json index 865f96a372..219f7a7af9 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_bookshelf.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_planks": { + "has_end_planks": { "conditions": { "items": [ { @@ -23,7 +23,7 @@ "requirements": [ [ "has_the_recipe", - "has_planks" + "has_end_planks" ] ], "rewards": { diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_bookshelf.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_bookshelf.json index 7cfca3f11f..0ad0461682 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_bookshelf.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_planks": { + "has_frost_planks": { "conditions": { "items": [ { @@ -23,7 +23,7 @@ "requirements": [ [ "has_the_recipe", - "has_planks" + "has_frost_planks" ] ], "rewards": { diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_bookshelf.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_bookshelf.json index 48ecc01b0f..1d11e3b42b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_bookshelf.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_planks": { + "has_glowing_planks": { "conditions": { "items": [ { @@ -23,7 +23,7 @@ "requirements": [ [ "has_the_recipe", - "has_planks" + "has_glowing_planks" ] ], "rewards": { diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_bookshelf.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_bookshelf.json index 3837897748..f980440cdc 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_bookshelf.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_planks": { + "has_rainbow_planks": { "conditions": { "items": [ { @@ -23,7 +23,7 @@ "requirements": [ [ "has_the_recipe", - "has_planks" + "has_rainbow_planks" ] ], "rewards": { diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_bookshelf.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_bookshelf.json index 5b9af79bd9..f100678f5b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_bookshelf.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_planks": { + "has_shadewood_planks": { "conditions": { "items": [ { @@ -23,7 +23,7 @@ "requirements": [ [ "has_the_recipe", - "has_planks" + "has_shadewood_planks" ] ], "rewards": { diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_bookshelf.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_bookshelf.json index a23d3dc18d..6fdb1a144c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_bookshelf.json @@ -1,7 +1,13 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_planks": { + "has_the_recipe": { + "conditions": { + "recipe": "minestuck:treated_bookshelf" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_treated_planks": { "conditions": { "items": [ { @@ -12,18 +18,12 @@ ] }, "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minestuck:treated_bookshelf" - }, - "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ "has_the_recipe", - "has_planks" + "has_treated_planks" ] ], "rewards": { diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/cindered_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/cindered_ladder.json index 1ac27bce39..1760e6f06f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/cindered_ladder.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/cindered_ladder.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_planks": { + "has_cindered_planks": { "conditions": { "items": [ { @@ -23,7 +23,7 @@ "requirements": [ [ "has_the_recipe", - "has_planks" + "has_cindered_planks" ] ], "rewards": { diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/dead_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/dead_ladder.json index 055644c9cc..0b873fe731 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/dead_ladder.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/dead_ladder.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_planks": { + "has_dead_planks": { "conditions": { "items": [ { @@ -23,7 +23,7 @@ "requirements": [ [ "has_the_recipe", - "has_planks" + "has_dead_planks" ] ], "rewards": { diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/end_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/end_ladder.json index 0077fcd716..1a663f765f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/end_ladder.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/end_ladder.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_planks": { + "has_end_planks": { "conditions": { "items": [ { @@ -23,7 +23,7 @@ "requirements": [ [ "has_the_recipe", - "has_planks" + "has_end_planks" ] ], "rewards": { diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/frost_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/frost_ladder.json index 7289f00c2b..8c7be246eb 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/frost_ladder.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/frost_ladder.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_planks": { + "has_frost_planks": { "conditions": { "items": [ { @@ -23,7 +23,7 @@ "requirements": [ [ "has_the_recipe", - "has_planks" + "has_frost_planks" ] ], "rewards": { diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/glowing_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/glowing_ladder.json index 673e494cdc..84a5cc0fd2 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/glowing_ladder.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/glowing_ladder.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_planks": { + "has_glowing_planks": { "conditions": { "items": [ { @@ -23,7 +23,7 @@ "requirements": [ [ "has_the_recipe", - "has_planks" + "has_glowing_planks" ] ], "rewards": { diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rainbow_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rainbow_ladder.json index f477eb8320..d455ea7617 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rainbow_ladder.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rainbow_ladder.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_planks": { + "has_rainbow_planks": { "conditions": { "items": [ { @@ -23,7 +23,7 @@ "requirements": [ [ "has_the_recipe", - "has_planks" + "has_rainbow_planks" ] ], "rewards": { diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/shadewood_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/shadewood_ladder.json index 12ba80e546..ab0c4d25cf 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/shadewood_ladder.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/shadewood_ladder.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_planks": { + "has_shadewood_planks": { "conditions": { "items": [ { @@ -23,7 +23,7 @@ "requirements": [ [ "has_the_recipe", - "has_planks" + "has_shadewood_planks" ] ], "rewards": { diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/treated_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/treated_ladder.json index 89f25226f5..4b96e36559 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/treated_ladder.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/treated_ladder.json @@ -1,7 +1,13 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_planks": { + "has_the_recipe": { + "conditions": { + "recipe": "minestuck:treated_ladder" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_treated_planks": { "conditions": { "items": [ { @@ -12,18 +18,12 @@ ] }, "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minestuck:treated_ladder" - }, - "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ "has_the_recipe", - "has_planks" + "has_treated_planks" ] ], "rewards": { diff --git a/src/main/generated/resources/data/minestuck/recipes/cindered_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/cindered_bookshelf.json index 1b3bedc24d..ad141a19c1 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cindered_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/recipes/cindered_bookshelf.json @@ -1,19 +1,21 @@ { "type": "minecraft:crafting_shaped", "category": "building", - "group": "bookshelf", "key": { "b": { "item": "minecraft:book" }, "p": { "item": "minestuck:cindered_planks" + }, + "s": { + "item": "minestuck:cindered_slab" } }, "pattern": [ - "ppp", - "bpb", - "ppp" + "psp", + "bbb", + "psp" ], "result": { "item": "minestuck:cindered_bookshelf" diff --git a/src/main/generated/resources/data/minestuck/recipes/cindered_ladder.json b/src/main/generated/resources/data/minestuck/recipes/cindered_ladder.json index 0e81745219..0006805710 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cindered_ladder.json +++ b/src/main/generated/resources/data/minestuck/recipes/cindered_ladder.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shaped", "category": "misc", - "group": "ladder", + "group": "terrain_ladder", "key": { "p": { "item": "minestuck:cindered_planks" diff --git a/src/main/generated/resources/data/minestuck/recipes/dead_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/dead_bookshelf.json index 3c033c2410..7a63e9d2ab 100644 --- a/src/main/generated/resources/data/minestuck/recipes/dead_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/recipes/dead_bookshelf.json @@ -1,19 +1,21 @@ { "type": "minecraft:crafting_shaped", "category": "building", - "group": "bookshelf", "key": { "b": { "item": "minecraft:book" }, "p": { "item": "minestuck:dead_planks" + }, + "s": { + "item": "minestuck:dead_planks_slab" } }, "pattern": [ - "ppp", - "bpb", - "ppp" + "psp", + "bbb", + "psp" ], "result": { "item": "minestuck:dead_bookshelf" diff --git a/src/main/generated/resources/data/minestuck/recipes/dead_ladder.json b/src/main/generated/resources/data/minestuck/recipes/dead_ladder.json index b70fb5de04..7b2d8a06e6 100644 --- a/src/main/generated/resources/data/minestuck/recipes/dead_ladder.json +++ b/src/main/generated/resources/data/minestuck/recipes/dead_ladder.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shaped", "category": "misc", - "group": "ladder", + "group": "terrain_ladder", "key": { "p": { "item": "minestuck:dead_planks" diff --git a/src/main/generated/resources/data/minestuck/recipes/end_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/end_bookshelf.json index 431c2e4f83..5000c68882 100644 --- a/src/main/generated/resources/data/minestuck/recipes/end_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/recipes/end_bookshelf.json @@ -1,19 +1,21 @@ { "type": "minecraft:crafting_shaped", "category": "building", - "group": "bookshelf", "key": { "b": { "item": "minecraft:book" }, "p": { "item": "minestuck:end_planks" + }, + "s": { + "item": "minestuck:end_planks_slab" } }, "pattern": [ - "ppp", - "bpb", - "ppp" + "psp", + "bbb", + "psp" ], "result": { "item": "minestuck:end_bookshelf" diff --git a/src/main/generated/resources/data/minestuck/recipes/end_ladder.json b/src/main/generated/resources/data/minestuck/recipes/end_ladder.json index 9301141b53..6e7c3dca82 100644 --- a/src/main/generated/resources/data/minestuck/recipes/end_ladder.json +++ b/src/main/generated/resources/data/minestuck/recipes/end_ladder.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shaped", "category": "misc", - "group": "ladder", + "group": "terrain_ladder", "key": { "p": { "item": "minestuck:end_planks" diff --git a/src/main/generated/resources/data/minestuck/recipes/frost_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/frost_bookshelf.json index ecd291cdf9..c33fe7d5c0 100644 --- a/src/main/generated/resources/data/minestuck/recipes/frost_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/recipes/frost_bookshelf.json @@ -1,19 +1,21 @@ { "type": "minecraft:crafting_shaped", "category": "building", - "group": "bookshelf", "key": { "b": { "item": "minecraft:book" }, "p": { "item": "minestuck:frost_planks" + }, + "s": { + "item": "minestuck:frost_slab" } }, "pattern": [ - "ppp", - "bpb", - "ppp" + "psp", + "bbb", + "psp" ], "result": { "item": "minestuck:frost_bookshelf" diff --git a/src/main/generated/resources/data/minestuck/recipes/frost_ladder.json b/src/main/generated/resources/data/minestuck/recipes/frost_ladder.json index aa6380e07e..f40d47cb50 100644 --- a/src/main/generated/resources/data/minestuck/recipes/frost_ladder.json +++ b/src/main/generated/resources/data/minestuck/recipes/frost_ladder.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shaped", "category": "misc", - "group": "ladder", + "group": "terrain_ladder", "key": { "p": { "item": "minestuck:frost_planks" diff --git a/src/main/generated/resources/data/minestuck/recipes/glowing_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/glowing_bookshelf.json index d9805ffa31..577a8a84a3 100644 --- a/src/main/generated/resources/data/minestuck/recipes/glowing_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/recipes/glowing_bookshelf.json @@ -1,19 +1,21 @@ { "type": "minecraft:crafting_shaped", "category": "building", - "group": "bookshelf", "key": { "b": { "item": "minecraft:book" }, "p": { "item": "minestuck:glowing_planks" + }, + "s": { + "item": "minestuck:glowing_slab" } }, "pattern": [ - "ppp", - "bpb", - "ppp" + "psp", + "bbb", + "psp" ], "result": { "item": "minestuck:glowing_bookshelf" diff --git a/src/main/generated/resources/data/minestuck/recipes/glowing_ladder.json b/src/main/generated/resources/data/minestuck/recipes/glowing_ladder.json index 2edaf78057..ae14ba862f 100644 --- a/src/main/generated/resources/data/minestuck/recipes/glowing_ladder.json +++ b/src/main/generated/resources/data/minestuck/recipes/glowing_ladder.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shaped", "category": "misc", - "group": "ladder", + "group": "terrain_ladder", "key": { "p": { "item": "minestuck:glowing_planks" diff --git a/src/main/generated/resources/data/minestuck/recipes/rainbow_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/rainbow_bookshelf.json index eaa3757ef9..ced8665e4c 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rainbow_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/recipes/rainbow_bookshelf.json @@ -1,19 +1,21 @@ { "type": "minecraft:crafting_shaped", "category": "building", - "group": "bookshelf", "key": { "b": { "item": "minecraft:book" }, "p": { "item": "minestuck:rainbow_planks" + }, + "s": { + "item": "minestuck:rainbow_planks_slab" } }, "pattern": [ - "ppp", - "bpb", - "ppp" + "psp", + "bbb", + "psp" ], "result": { "item": "minestuck:rainbow_bookshelf" diff --git a/src/main/generated/resources/data/minestuck/recipes/rainbow_ladder.json b/src/main/generated/resources/data/minestuck/recipes/rainbow_ladder.json index 9e06ca41ef..c9dbf95699 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rainbow_ladder.json +++ b/src/main/generated/resources/data/minestuck/recipes/rainbow_ladder.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shaped", "category": "misc", - "group": "ladder", + "group": "terrain_ladder", "key": { "p": { "item": "minestuck:rainbow_planks" diff --git a/src/main/generated/resources/data/minestuck/recipes/shadewood_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/shadewood_bookshelf.json index 758563b57c..d0a3413b69 100644 --- a/src/main/generated/resources/data/minestuck/recipes/shadewood_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/recipes/shadewood_bookshelf.json @@ -1,19 +1,21 @@ { "type": "minecraft:crafting_shaped", "category": "building", - "group": "bookshelf", "key": { "b": { "item": "minecraft:book" }, "p": { "item": "minestuck:shadewood_planks" + }, + "s": { + "item": "minestuck:shadewood_slab" } }, "pattern": [ - "ppp", - "bpb", - "ppp" + "psp", + "bbb", + "psp" ], "result": { "item": "minestuck:shadewood_bookshelf" diff --git a/src/main/generated/resources/data/minestuck/recipes/shadewood_ladder.json b/src/main/generated/resources/data/minestuck/recipes/shadewood_ladder.json index 4917b25e0c..0edb8bbec5 100644 --- a/src/main/generated/resources/data/minestuck/recipes/shadewood_ladder.json +++ b/src/main/generated/resources/data/minestuck/recipes/shadewood_ladder.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shaped", "category": "misc", - "group": "ladder", + "group": "terrain_ladder", "key": { "p": { "item": "minestuck:shadewood_planks" diff --git a/src/main/generated/resources/data/minestuck/recipes/treated_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/treated_bookshelf.json index 3389936b95..aab6884a41 100644 --- a/src/main/generated/resources/data/minestuck/recipes/treated_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/recipes/treated_bookshelf.json @@ -1,19 +1,21 @@ { "type": "minecraft:crafting_shaped", "category": "building", - "group": "bookshelf", "key": { "b": { "item": "minecraft:book" }, "p": { "item": "minestuck:treated_planks" + }, + "s": { + "item": "minestuck:treated_planks_slab" } }, "pattern": [ - "ppp", - "bpb", - "ppp" + "psp", + "bbb", + "psp" ], "result": { "item": "minestuck:treated_bookshelf" diff --git a/src/main/generated/resources/data/minestuck/recipes/treated_ladder.json b/src/main/generated/resources/data/minestuck/recipes/treated_ladder.json index 5d8bc367f6..29253ce77b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/treated_ladder.json +++ b/src/main/generated/resources/data/minestuck/recipes/treated_ladder.json @@ -1,7 +1,7 @@ { "type": "minecraft:crafting_shaped", "category": "misc", - "group": "ladder", + "group": "terrain_ladder", "key": { "p": { "item": "minestuck:treated_planks" diff --git a/src/main/java/com/mraof/minestuck/data/recipe/MinestuckRecipeProvider.java b/src/main/java/com/mraof/minestuck/data/recipe/MinestuckRecipeProvider.java index 5b01ae6abb..72a29a62d7 100644 --- a/src/main/java/com/mraof/minestuck/data/recipe/MinestuckRecipeProvider.java +++ b/src/main/java/com/mraof/minestuck/data/recipe/MinestuckRecipeProvider.java @@ -161,22 +161,22 @@ protected void buildRecipes(RecipeOutput recipeBuilder) CommonRecipes.slabRecipe(MSBlocks.RAINBOW_SLAB, MSBlocks.RAINBOW_PLANKS, "has_planks").group("wooden_slab").save(recipeBuilder); CommonRecipes.slabRecipe(MSBlocks.END_SLAB, MSBlocks.END_PLANKS, "has_planks").group("wooden_slab").save(recipeBuilder); CommonRecipes.slabRecipe(MSBlocks.DEAD_SLAB, MSBlocks.DEAD_PLANKS, "has_planks").group("wooden_slab").save(recipeBuilder); - ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, MSBlocks.GLOWING_BOOKSHELF.get()).define('b', Items.BOOK).define('p', MSBlocks.GLOWING_PLANKS.get()).pattern("ppp").pattern("bpb").pattern("ppp").group("bookshelf").unlockedBy("has_planks", has(MSBlocks.GLOWING_PLANKS.get())).save(recipeBuilder); - ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, MSBlocks.FROST_BOOKSHELF.get()).define('b', Items.BOOK).define('p', MSBlocks.FROST_PLANKS.get()).pattern("ppp").pattern("bpb").pattern("ppp").group("bookshelf").unlockedBy("has_planks", has(MSBlocks.FROST_PLANKS.get())).save(recipeBuilder); - ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, MSBlocks.RAINBOW_BOOKSHELF.get()).define('b', Items.BOOK).define('p', MSBlocks.RAINBOW_PLANKS.get()).pattern("ppp").pattern("bpb").pattern("ppp").group("bookshelf").unlockedBy("has_planks", has(MSBlocks.RAINBOW_PLANKS.get())).save(recipeBuilder); - ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, MSBlocks.END_BOOKSHELF.get()).define('b', Items.BOOK).define('p', MSBlocks.END_PLANKS.get()).pattern("ppp").pattern("bpb").pattern("ppp").group("bookshelf").unlockedBy("has_planks", has(MSBlocks.END_PLANKS.get())).save(recipeBuilder); - ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, MSBlocks.DEAD_BOOKSHELF.get()).define('b', Items.BOOK).define('p', MSBlocks.DEAD_PLANKS.get()).pattern("ppp").pattern("bpb").pattern("ppp").group("bookshelf").unlockedBy("has_planks", has(MSBlocks.DEAD_PLANKS.get())).save(recipeBuilder); - ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, MSBlocks.TREATED_BOOKSHELF.get()).define('b', Items.BOOK).define('p', MSBlocks.TREATED_PLANKS.get()).pattern("ppp").pattern("bpb").pattern("ppp").group("bookshelf").unlockedBy("has_planks", has(MSBlocks.TREATED_PLANKS.get())).save(recipeBuilder); - ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, MSBlocks.SHADEWOOD_BOOKSHELF.get()).define('b', Items.BOOK).define('p', MSBlocks.SHADEWOOD_PLANKS.get()).pattern("ppp").pattern("bpb").pattern("ppp").group("bookshelf").unlockedBy("has_planks", has(MSBlocks.SHADEWOOD_PLANKS.get())).save(recipeBuilder); - ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, MSBlocks.CINDERED_BOOKSHELF.get()).define('b', Items.BOOK).define('p', MSBlocks.CINDERED_PLANKS.get()).pattern("ppp").pattern("bpb").pattern("ppp").group("bookshelf").unlockedBy("has_planks", has(MSBlocks.CINDERED_PLANKS.get())).save(recipeBuilder); - ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, MSBlocks.GLOWING_LADDER.get(), 4).define('s', Items.STICK).define('p', MSBlocks.GLOWING_PLANKS.get()).pattern("s s").pattern("sps").pattern("s s").group("ladder").unlockedBy("has_planks", has(MSBlocks.GLOWING_PLANKS.get())).save(recipeBuilder); - ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, MSBlocks.FROST_LADDER.get(), 4).define('s', Items.STICK).define('p', MSBlocks.FROST_PLANKS.get()).pattern("s s").pattern("sps").pattern("s s").group("ladder").unlockedBy("has_planks", has(MSBlocks.FROST_PLANKS.get())).save(recipeBuilder); - ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, MSBlocks.RAINBOW_LADDER.get(), 4).define('s', Items.STICK).define('p', MSBlocks.RAINBOW_PLANKS.get()).pattern("s s").pattern("sps").pattern("s s").group("ladder").unlockedBy("has_planks", has(MSBlocks.RAINBOW_PLANKS.get())).save(recipeBuilder); - ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, MSBlocks.END_LADDER.get(), 4).define('s', Items.STICK).define('p', MSBlocks.END_PLANKS.get()).pattern("s s").pattern("sps").pattern("s s").group("ladder").unlockedBy("has_planks", has(MSBlocks.END_PLANKS.get())).save(recipeBuilder); - ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, MSBlocks.DEAD_LADDER.get(), 4).define('s', Items.STICK).define('p', MSBlocks.DEAD_PLANKS.get()).pattern("s s").pattern("sps").pattern("s s").group("ladder").unlockedBy("has_planks", has(MSBlocks.DEAD_PLANKS.get())).save(recipeBuilder); - ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, MSBlocks.TREATED_LADDER.get(), 4).define('s', Items.STICK).define('p', MSBlocks.TREATED_PLANKS.get()).pattern("s s").pattern("sps").pattern("s s").group("ladder").unlockedBy("has_planks", has(MSBlocks.TREATED_PLANKS.get())).save(recipeBuilder); - ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, MSBlocks.SHADEWOOD_LADDER.get(), 4).define('s', Items.STICK).define('p', MSBlocks.SHADEWOOD_PLANKS.get()).pattern("s s").pattern("sps").pattern("s s").group("ladder").unlockedBy("has_planks", has(MSBlocks.SHADEWOOD_PLANKS.get())).save(recipeBuilder); - ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, MSBlocks.CINDERED_LADDER.get(), 4).define('s', Items.STICK).define('p', MSBlocks.CINDERED_PLANKS.get()).pattern("s s").pattern("sps").pattern("s s").group("ladder").unlockedBy("has_planks", has(MSBlocks.CINDERED_PLANKS.get())).save(recipeBuilder); + CommonRecipes.bookshelfRecipe(MSBlocks.GLOWING_BOOKSHELF, MSBlocks.GLOWING_PLANKS, MSBlocks.GLOWING_SLAB).save(recipeBuilder); + CommonRecipes.bookshelfRecipe(MSBlocks.FROST_BOOKSHELF, MSBlocks.FROST_PLANKS, MSBlocks.FROST_SLAB).save(recipeBuilder); + CommonRecipes.bookshelfRecipe(MSBlocks.RAINBOW_BOOKSHELF, MSBlocks.RAINBOW_PLANKS, MSBlocks.RAINBOW_SLAB).save(recipeBuilder); + CommonRecipes.bookshelfRecipe(MSBlocks.END_BOOKSHELF, MSBlocks.END_PLANKS, MSBlocks.END_SLAB).save(recipeBuilder); + CommonRecipes.bookshelfRecipe(MSBlocks.DEAD_BOOKSHELF, MSBlocks.DEAD_PLANKS, MSBlocks.DEAD_SLAB).save(recipeBuilder); + CommonRecipes.bookshelfRecipe(MSBlocks.TREATED_BOOKSHELF, MSBlocks.TREATED_PLANKS, MSBlocks.TREATED_PLANKS_SLAB).save(recipeBuilder); + CommonRecipes.bookshelfRecipe(MSBlocks.SHADEWOOD_BOOKSHELF, MSBlocks.SHADEWOOD_PLANKS, MSBlocks.SHADEWOOD_SLAB).save(recipeBuilder); + CommonRecipes.bookshelfRecipe(MSBlocks.CINDERED_BOOKSHELF, MSBlocks.CINDERED_PLANKS, MSBlocks.CINDERED_SLAB).save(recipeBuilder); + CommonRecipes.ladderRecipe(MSBlocks.GLOWING_LADDER, MSBlocks.GLOWING_PLANKS).group("terrain_ladder").save(recipeBuilder); + CommonRecipes.ladderRecipe(MSBlocks.FROST_LADDER, MSBlocks.FROST_PLANKS).group("terrain_ladder").save(recipeBuilder); + CommonRecipes.ladderRecipe(MSBlocks.RAINBOW_LADDER, MSBlocks.RAINBOW_PLANKS).group("terrain_ladder").save(recipeBuilder); + CommonRecipes.ladderRecipe(MSBlocks.END_LADDER, MSBlocks.END_PLANKS).group("terrain_ladder").save(recipeBuilder); + CommonRecipes.ladderRecipe(MSBlocks.DEAD_LADDER, MSBlocks.DEAD_PLANKS).group("terrain_ladder").save(recipeBuilder); + CommonRecipes.ladderRecipe(MSBlocks.TREATED_LADDER, MSBlocks.TREATED_PLANKS).group("terrain_ladder").save(recipeBuilder); + CommonRecipes.ladderRecipe(MSBlocks.SHADEWOOD_LADDER, MSBlocks.SHADEWOOD_PLANKS).group("terrain_ladder").save(recipeBuilder); + CommonRecipes.ladderRecipe(MSBlocks.CINDERED_LADDER, MSBlocks.CINDERED_PLANKS).group("terrain_ladder").save(recipeBuilder); ShapelessRecipeBuilder.shapeless(RecipeCategory.DECORATIONS, MSBlocks.COMPUTER.get()).requires(MSItems.ENERGY_CORE.get()).requires(MSItems.COMPUTER_PARTS.get()).unlockedBy("has_computer_parts", has(MSItems.COMPUTER_PARTS.get())).requires(Items.QUARTZ).requires(Items.REDSTONE).requires(MSItems.RAW_CRUXITE.get()).save(recipeBuilder); ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, MSBlocks.URANIUM_COOKER.get()).define('e', MSItems.ENERGY_CORE.get()).define('i', Tags.Items.INGOTS_IRON).define('F', Items.FURNACE).pattern("iii").pattern("iFi").pattern("iei").unlockedBy("has_energy_core", has(MSItems.ENERGY_CORE.get())).save(recipeBuilder);