From ba98469ae6e79f5d1f45db9f6a571341f3e3fa6f Mon Sep 17 00:00:00 2001 From: LimePotato Date: Thu, 2 Nov 2023 00:44:17 -0600 Subject: [PATCH] Fix dye recipes --- CHANGELOG.md | 5 +++-- gradle.properties | 2 +- .../data/roses_mod/recipes/cyan_dye.json | 22 +++++++++---------- .../data/roses_mod/recipes/cyan_rose.json | 8 ------- .../data/roses_mod/recipes/red_dye.json | 17 ++++++-------- .../data/roses_mod/recipes/rose_flower.json | 8 ------- 6 files changed, 22 insertions(+), 40 deletions(-) delete mode 100644 src/main/resources/data/roses_mod/recipes/cyan_rose.json delete mode 100644 src/main/resources/data/roses_mod/recipes/rose_flower.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b30185..f91c34b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,8 +25,9 @@ - New mod-icon (old one had a poppy? lol?) - Cyan Rose bushes now use the random_patch type as (Also serves as hotfix to the crash on world load.) -## [3.1.0] +## [3.0.7] I believe the mod is now *actually* in a nice finished state, generation values might still need to be tweaked, however. ### Changes: - Fixed the icon (it was named improperly.) -- Add recipe for cyan rose and rose (put a bush in the crafting table to yield 4 flowers.) +- Fix cyan dye recipe +- Fix red dye recipe diff --git a/gradle.properties b/gradle.properties index 3fe26d6..02ee59e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs = -Xmx1G org.gradle.parallel = true # Mod Properties -version = 3.0.6 +version = 3.0.7 maven_group = xyz.limepot archives_base_name = roses_mod diff --git a/src/main/resources/data/roses_mod/recipes/cyan_dye.json b/src/main/resources/data/roses_mod/recipes/cyan_dye.json index fc641d0..6994a61 100644 --- a/src/main/resources/data/roses_mod/recipes/cyan_dye.json +++ b/src/main/resources/data/roses_mod/recipes/cyan_dye.json @@ -1,17 +1,17 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " ", - " ", - " W" + "type": "minecraft:crafting_shapeless", + "ingredients": [ + [ + { + "item": "roses_mod:cyan_rose_bush" + }, + { + "item": "roses_mod:cyan_rose" + } + ] ], - "key": { - "W": { - "item": "roses_mod:cyan_rose" - } - }, "result": { "item": "minecraft:cyan_dye", - "count": 1 + "count": 2 } } diff --git a/src/main/resources/data/roses_mod/recipes/cyan_rose.json b/src/main/resources/data/roses_mod/recipes/cyan_rose.json deleted file mode 100644 index 59b1f47..0000000 --- a/src/main/resources/data/roses_mod/recipes/cyan_rose.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [], - "result": { - "item": "roses_mod:cyan_rose", - "count": 4 - } -} diff --git a/src/main/resources/data/roses_mod/recipes/red_dye.json b/src/main/resources/data/roses_mod/recipes/red_dye.json index 7b345a3..38111c3 100644 --- a/src/main/resources/data/roses_mod/recipes/red_dye.json +++ b/src/main/resources/data/roses_mod/recipes/red_dye.json @@ -1,15 +1,12 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " ", - " ", - " W" + "type": "minecraft:crafting_shapeless", + "ingredients": [ + [ + { + "item": "roses_mod:rose_flower" + } + ] ], - "key": { - "W": { - "item": "roses_mod:rose_flower" - } - }, "result": { "item": "minecraft:red_dye", "count": 1 diff --git a/src/main/resources/data/roses_mod/recipes/rose_flower.json b/src/main/resources/data/roses_mod/recipes/rose_flower.json deleted file mode 100644 index df0504c..0000000 --- a/src/main/resources/data/roses_mod/recipes/rose_flower.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [], - "result": { - "item": "roses_mod:rose_flower", - "count": 4 - } -}