diff --git a/CHANGELOG.md b/CHANGELOG.md index 6cd50c09c..5b5f75376 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). - Updated the Flay Mind recipe display in EMI and JEI to cycle through all valid entities if the input is an entity tag ([#1023](https://github.com/FallingColors/HexMod/pull/1023)) @YukkuriC - Re-implemented the ability to extract stored media from items in trinket/curio slots ([#996](https://github.com/FallingColors/HexMod/pull/996)) @YukkuriC - Patterns involving entity look direction now compensate for the vanilla bug that causes projectiles and phantoms to report the wrong direction ([#1025](https://github.com/FallingColors/HexMod/pull/1025)) @Robotgiggle +- Edified Panels are now crafted with 9 planks rather than 8 to avoid conflicting with the vanilla chest recipe ([#1080](https://github.com/FallingColors/HexMod/pull/1080)) @Robotgiggle - Updated Inline dependency from 1.0.1 to 1.2.2 ([#1043](https://github.com/FallingColors/HexMod/pull/1043)) @Robotgiggle - Updated Fabric Language Kotlin dependency from 1.9.4 to 1.13.7 ([#1043](https://github.com/FallingColors/HexMod/pull/1043)) @Robotgiggle - Updated Kotlin for Forge dependency from 4.3.0 to 4.12.0 ([#1043](https://github.com/FallingColors/HexMod/pull/1043)) @Robotgiggle diff --git a/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java b/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java index 2ba8629a3..c1e7f925b 100644 --- a/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java +++ b/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java @@ -323,8 +323,11 @@ public void buildRecipes(Consumer recipes) { .unlockedBy("has_item", hasItem(log)).save(recipes); } - ring(RecipeCategory.BUILDING_BLOCKS, HexBlocks.EDIFIED_PANEL, 8, - HexTags.Items.EDIFIED_PLANKS, null) + ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, HexBlocks.EDIFIED_PANEL, 9) + .define('W', HexTags.Items.EDIFIED_PLANKS) + .pattern("WWW") + .pattern("WWW") + .pattern("WWW") .unlockedBy("has_item", hasItem(HexTags.Items.EDIFIED_PLANKS)).save(recipes); ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, HexBlocks.EDIFIED_TILE, 6) diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/edified_panel.json b/Fabric/src/generated/resources/data/hexcasting/recipes/edified_panel.json index af912d562..3141960ae 100644 --- a/Fabric/src/generated/resources/data/hexcasting/recipes/edified_panel.json +++ b/Fabric/src/generated/resources/data/hexcasting/recipes/edified_panel.json @@ -2,20 +2,17 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { - "C": { - "tag": "hexcasting:edified_planks" - }, - "D": { + "W": { "tag": "hexcasting:edified_planks" } }, "pattern": [ - "DCD", - "C C", - "DCD" + "WWW", + "WWW", + "WWW" ], "result": { - "count": 8, + "count": 9, "item": "hexcasting:edified_panel" }, "show_notification": true diff --git a/Fabric/src/generated/resources/data/hexcasting/tags/action/cannot_modify_cost.json b/Fabric/src/main/resources/data/hexcasting/tags/action/cannot_modify_cost.json similarity index 100% rename from Fabric/src/generated/resources/data/hexcasting/tags/action/cannot_modify_cost.json rename to Fabric/src/main/resources/data/hexcasting/tags/action/cannot_modify_cost.json diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/edified_panel.json b/Forge/src/generated/resources/data/hexcasting/recipes/edified_panel.json index af912d562..3141960ae 100644 --- a/Forge/src/generated/resources/data/hexcasting/recipes/edified_panel.json +++ b/Forge/src/generated/resources/data/hexcasting/recipes/edified_panel.json @@ -2,20 +2,17 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { - "C": { - "tag": "hexcasting:edified_planks" - }, - "D": { + "W": { "tag": "hexcasting:edified_planks" } }, "pattern": [ - "DCD", - "C C", - "DCD" + "WWW", + "WWW", + "WWW" ], "result": { - "count": 8, + "count": 9, "item": "hexcasting:edified_panel" }, "show_notification": true diff --git a/Forge/src/generated/resources/data/hexcasting/tags/hexcasting/action/cannot_modify_cost.json b/Forge/src/main/resources/data/hexcasting/tags/hexcasting/action/cannot_modify_cost.json similarity index 100% rename from Forge/src/generated/resources/data/hexcasting/tags/hexcasting/action/cannot_modify_cost.json rename to Forge/src/main/resources/data/hexcasting/tags/hexcasting/action/cannot_modify_cost.json