From 209a67c4180cfa3359edae2e7d8732a90b16228b Mon Sep 17 00:00:00 2001 From: macuguita <104268469+macuguita@users.noreply.github.com> Date: Thu, 2 May 2024 19:11:00 +0200 Subject: [PATCH 1/3] make the vegetables tag consistent with farmer's delight mod --- src/main/resources/data/c/tags/items/foods/vegetables.json | 7 +++++++ .../data/c/tags/items/foods/vegetables/asparragus.json | 5 +++++ .../data/c/tags/items/foods/vegetables/chili_pepper.json | 5 +++++ .../data/c/tags/items/foods/vegetables/sweet_potato.json | 5 +++++ 4 files changed, 22 insertions(+) create mode 100644 src/main/resources/data/c/tags/items/foods/vegetables.json create mode 100644 src/main/resources/data/c/tags/items/foods/vegetables/asparragus.json create mode 100644 src/main/resources/data/c/tags/items/foods/vegetables/chili_pepper.json create mode 100644 src/main/resources/data/c/tags/items/foods/vegetables/sweet_potato.json diff --git a/src/main/resources/data/c/tags/items/foods/vegetables.json b/src/main/resources/data/c/tags/items/foods/vegetables.json new file mode 100644 index 0000000..e3191db --- /dev/null +++ b/src/main/resources/data/c/tags/items/foods/vegetables.json @@ -0,0 +1,7 @@ +{ + "values": [ + "#c:foods/vegetables/asparragus", + "#c:foods/vegetables/sweet_potato", + "#c:foods/vegetables/chili_pepper" + ] + } \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/foods/vegetables/asparragus.json b/src/main/resources/data/c/tags/items/foods/vegetables/asparragus.json new file mode 100644 index 0000000..d36816d --- /dev/null +++ b/src/main/resources/data/c/tags/items/foods/vegetables/asparragus.json @@ -0,0 +1,5 @@ +{ + "values": [ + "expandeddelight:asparagus" + ] + } \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/foods/vegetables/chili_pepper.json b/src/main/resources/data/c/tags/items/foods/vegetables/chili_pepper.json new file mode 100644 index 0000000..8f0e820 --- /dev/null +++ b/src/main/resources/data/c/tags/items/foods/vegetables/chili_pepper.json @@ -0,0 +1,5 @@ +{ + "values": [ + "expandeddelight:chili_pepper" + ] + } \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/foods/vegetables/sweet_potato.json b/src/main/resources/data/c/tags/items/foods/vegetables/sweet_potato.json new file mode 100644 index 0000000..4425588 --- /dev/null +++ b/src/main/resources/data/c/tags/items/foods/vegetables/sweet_potato.json @@ -0,0 +1,5 @@ +{ + "values": [ + "expandeddelight:sweet_potato" + ] + } \ No newline at end of file From f3dc292879fd07d9633584918d08010e7861239e Mon Sep 17 00:00:00 2001 From: macuguita Date: Thu, 2 May 2024 19:39:42 +0200 Subject: [PATCH 2/3] updated tags and recipes to be more consistent --- .../data/c/tags/items/foods/vegetables.json | 2 +- .../{asparragus.json => asparagus.json} | 0 .../resources/data/c/tags/items/vegetables.json | 8 -------- .../data/c/tags/items/vegetables/asparagus.json | 6 ------ .../c/tags/items/vegetables/chili_pepper.json | 6 ------ .../c/tags/items/vegetables/sweet_potato.json | 6 ------ .../cooking/asparagus_and_bacon_cheesy.json | 5 +++-- .../farmersdelight/cooking/asparagus_soup.json | 5 +++-- .../cooking/asparagus_soup_creamy.json | 5 +++-- .../farmersdelight/cooking/cinnamon_apples.json | 3 ++- .../farmersdelight/cooking/cinnamon_rice.json | 3 ++- .../farmersdelight/cooking/glow_berry_jelly.json | 3 ++- .../farmersdelight/cooking/mac_and_cheese.json | 3 ++- .../cooking/peanut_honey_soup.json | 3 ++- .../farmersdelight/cooking/peperonata.json | 16 +++++++++------- .../cooking/sweet_berry_jelly.json | 3 ++- 16 files changed, 31 insertions(+), 46 deletions(-) rename src/main/resources/data/c/tags/items/foods/vegetables/{asparragus.json => asparagus.json} (100%) delete mode 100644 src/main/resources/data/c/tags/items/vegetables.json delete mode 100644 src/main/resources/data/c/tags/items/vegetables/asparagus.json delete mode 100644 src/main/resources/data/c/tags/items/vegetables/chili_pepper.json delete mode 100644 src/main/resources/data/c/tags/items/vegetables/sweet_potato.json mode change 100644 => 100755 src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/peperonata.json diff --git a/src/main/resources/data/c/tags/items/foods/vegetables.json b/src/main/resources/data/c/tags/items/foods/vegetables.json index e3191db..2dd1e62 100644 --- a/src/main/resources/data/c/tags/items/foods/vegetables.json +++ b/src/main/resources/data/c/tags/items/foods/vegetables.json @@ -1,6 +1,6 @@ { "values": [ - "#c:foods/vegetables/asparragus", + "#c:foods/vegetables/asparagus", "#c:foods/vegetables/sweet_potato", "#c:foods/vegetables/chili_pepper" ] diff --git a/src/main/resources/data/c/tags/items/foods/vegetables/asparragus.json b/src/main/resources/data/c/tags/items/foods/vegetables/asparagus.json similarity index 100% rename from src/main/resources/data/c/tags/items/foods/vegetables/asparragus.json rename to src/main/resources/data/c/tags/items/foods/vegetables/asparagus.json diff --git a/src/main/resources/data/c/tags/items/vegetables.json b/src/main/resources/data/c/tags/items/vegetables.json deleted file mode 100644 index e8d7f2b..0000000 --- a/src/main/resources/data/c/tags/items/vegetables.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "#c:vegetables/asparagus", - "#c:vegetables/sweet_potato", - "#c:vegetables/chili_pepper" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/vegetables/asparagus.json b/src/main/resources/data/c/tags/items/vegetables/asparagus.json deleted file mode 100644 index 4c919b7..0000000 --- a/src/main/resources/data/c/tags/items/vegetables/asparagus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "expandeddelight:asparagus" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/vegetables/chili_pepper.json b/src/main/resources/data/c/tags/items/vegetables/chili_pepper.json deleted file mode 100644 index d9a8b19..0000000 --- a/src/main/resources/data/c/tags/items/vegetables/chili_pepper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "expandeddelight:chili_pepper" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/vegetables/sweet_potato.json b/src/main/resources/data/c/tags/items/vegetables/sweet_potato.json deleted file mode 100644 index 40ec9d3..0000000 --- a/src/main/resources/data/c/tags/items/vegetables/sweet_potato.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "expandeddelight:sweet_potato" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/asparagus_and_bacon_cheesy.json b/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/asparagus_and_bacon_cheesy.json index 216f53d..8f34e67 100644 --- a/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/asparagus_and_bacon_cheesy.json +++ b/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/asparagus_and_bacon_cheesy.json @@ -7,7 +7,7 @@ } ], { - "tag": "c:crops/asparagus" + "tag": "c:foods/vegetables/asparagus" }, { "tag": "c:crops/onion" @@ -22,5 +22,6 @@ "container": { "item": "minecraft:bowl" }, - "cookingtime": 200 + "cookingtime": 200, + "experience": 1.0 } diff --git a/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/asparagus_soup.json b/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/asparagus_soup.json index 065895d..a45da7e 100644 --- a/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/asparagus_soup.json +++ b/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/asparagus_soup.json @@ -5,7 +5,7 @@ "item": "minecraft:water_bucket" }, { - "tag": "c:crops/asparagus" + "tag": "c:foods/vegetables/asparagus" }, { "tag": "c:salad_ingredients" @@ -17,5 +17,6 @@ "container": { "item": "minecraft:bowl" }, - "cookingtime": 200 + "cookingtime": 200, + "experience": 1.0 } \ No newline at end of file diff --git a/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/asparagus_soup_creamy.json b/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/asparagus_soup_creamy.json index b62cb6e..b381a2e 100644 --- a/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/asparagus_soup_creamy.json +++ b/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/asparagus_soup_creamy.json @@ -5,7 +5,7 @@ "tag": "c:milk" }, { - "tag": "c:crops/asparagus" + "tag": "c:foods/vegetables/asparagus" }, { "tag": "c:salad_ingredients" @@ -17,5 +17,6 @@ "container": { "item": "minecraft:bowl" }, - "cookingtime": 200 + "cookingtime": 200, + "experience": 1.0 } \ No newline at end of file diff --git a/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/cinnamon_apples.json b/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/cinnamon_apples.json index 24e6467..38bc94b 100644 --- a/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/cinnamon_apples.json +++ b/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/cinnamon_apples.json @@ -20,5 +20,6 @@ "container": { "item": "minecraft:bowl" }, - "cookingtime": 200 + "cookingtime": 200, + "experience": 1.0 } \ No newline at end of file diff --git a/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/cinnamon_rice.json b/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/cinnamon_rice.json index 4987b4f..efd929e 100644 --- a/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/cinnamon_rice.json +++ b/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/cinnamon_rice.json @@ -17,5 +17,6 @@ "container": { "item": "minecraft:bowl" }, - "cookingtime": 200 + "cookingtime": 200, + "experience": 1.0 } \ No newline at end of file diff --git a/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/glow_berry_jelly.json b/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/glow_berry_jelly.json index 168fba1..27a881e 100644 --- a/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/glow_berry_jelly.json +++ b/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/glow_berry_jelly.json @@ -14,5 +14,6 @@ "container": { "item": "expandeddelight:glass_jar" }, - "cookingtime": 200 + "cookingtime": 200, + "experience": 1.0 } \ No newline at end of file diff --git a/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/mac_and_cheese.json b/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/mac_and_cheese.json index b6ac9e5..6d33c7b 100644 --- a/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/mac_and_cheese.json +++ b/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/mac_and_cheese.json @@ -20,5 +20,6 @@ "container": { "item": "minecraft:bowl" }, - "cookingtime": 200 + "cookingtime": 200, + "experience": 1.0 } diff --git a/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/peanut_honey_soup.json b/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/peanut_honey_soup.json index 4a20bdb..b446313 100644 --- a/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/peanut_honey_soup.json +++ b/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/peanut_honey_soup.json @@ -20,5 +20,6 @@ "container": { "item": "minecraft:bowl" }, - "cookingtime": 200 + "cookingtime": 200, + "experience": 1.0 } \ No newline at end of file diff --git a/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/peperonata.json b/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/peperonata.json old mode 100644 new mode 100755 index 51a0971..27c4515 --- a/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/peperonata.json +++ b/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/peperonata.json @@ -1,27 +1,29 @@ { "type": "farmersdelight:cooking", + "cookingtime": 200, + "experience": 1.0, "ingredients": [ { - "tag": "c:vegetables" + "tag": "c:foods/vegetables" }, { - "tag": "c:crops/chili_pepper" + "tag": "c:foods/pastas" }, { - "tag": "c:crops/onion" + "tag": "c:crops/tomato" }, { - "tag": "c:crops/tomato" + "tag": "c:crops/onion" }, { - "tag": "c:pasta" + "item": "c:foods/vegetables/chili_pepper" } ], + "recipe_book_tab": "meals", "result": { "item": "expandeddelight:peperonata" }, "container": { "item": "minecraft:bowl" - }, - "cookingtime": 200 + } } \ No newline at end of file diff --git a/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/sweet_berry_jelly.json b/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/sweet_berry_jelly.json index 7e66398..8e1953a 100644 --- a/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/sweet_berry_jelly.json +++ b/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/sweet_berry_jelly.json @@ -14,5 +14,6 @@ "container": { "item": "expandeddelight:glass_jar" }, - "cookingtime": 200 + "cookingtime": 200, + "experience": 1.0 } \ No newline at end of file From 3906cc52c8371d4228ea921bef3f0c16e10296d2 Mon Sep 17 00:00:00 2001 From: macuguita <104268469+macuguita@users.noreply.github.com> Date: Thu, 2 May 2024 20:30:43 +0200 Subject: [PATCH 3/3] Update mac_and_cheese.json --- .../recipes/farmersdelight/cooking/mac_and_cheese.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/mac_and_cheese.json b/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/mac_and_cheese.json index 6d33c7b..0273fb3 100644 --- a/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/mac_and_cheese.json +++ b/src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/mac_and_cheese.json @@ -8,7 +8,7 @@ "tag": "c:cheese" }, { - "tag": "c:pasta" + "tag": "c:foods/pastas" }, { "tag": "c:salt_dusts"