Skip to content

Commit

Permalink
Merge pull request #76 from macuguita/1.20
Browse files Browse the repository at this point in the history
Make tags more consistent and update some recipes to work as intended
  • Loading branch information
ianm1647 authored Jul 11, 2024
2 parents a0ede11 + 3906cc5 commit adc0b5d
Show file tree
Hide file tree
Showing 18 changed files with 53 additions and 46 deletions.
7 changes: 7 additions & 0 deletions src/main/resources/data/c/tags/items/foods/vegetables.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"values": [
"#c:foods/vegetables/asparagus",
"#c:foods/vegetables/sweet_potato",
"#c:foods/vegetables/chili_pepper"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"expandeddelight:asparagus"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"expandeddelight:chili_pepper"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"expandeddelight:sweet_potato"
]
}
8 changes: 0 additions & 8 deletions src/main/resources/data/c/tags/items/vegetables.json

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
}
],
{
"tag": "c:crops/asparagus"
"tag": "c:foods/vegetables/asparagus"
},
{
"tag": "c:crops/onion"
Expand All @@ -22,5 +22,6 @@
"container": {
"item": "minecraft:bowl"
},
"cookingtime": 200
"cookingtime": 200,
"experience": 1.0
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"item": "minecraft:water_bucket"
},
{
"tag": "c:crops/asparagus"
"tag": "c:foods/vegetables/asparagus"
},
{
"tag": "c:salad_ingredients"
Expand All @@ -17,5 +17,6 @@
"container": {
"item": "minecraft:bowl"
},
"cookingtime": 200
"cookingtime": 200,
"experience": 1.0
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"tag": "c:milk"
},
{
"tag": "c:crops/asparagus"
"tag": "c:foods/vegetables/asparagus"
},
{
"tag": "c:salad_ingredients"
Expand All @@ -17,5 +17,6 @@
"container": {
"item": "minecraft:bowl"
},
"cookingtime": 200
"cookingtime": 200,
"experience": 1.0
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@
"container": {
"item": "minecraft:bowl"
},
"cookingtime": 200
"cookingtime": 200,
"experience": 1.0
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@
"container": {
"item": "minecraft:bowl"
},
"cookingtime": 200
"cookingtime": 200,
"experience": 1.0
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@
"container": {
"item": "expandeddelight:glass_jar"
},
"cookingtime": 200
"cookingtime": 200,
"experience": 1.0
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"tag": "c:cheese"
},
{
"tag": "c:pasta"
"tag": "c:foods/pastas"
},
{
"tag": "c:salt_dusts"
Expand All @@ -20,5 +20,6 @@
"container": {
"item": "minecraft:bowl"
},
"cookingtime": 200
"cookingtime": 200,
"experience": 1.0
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@
"container": {
"item": "minecraft:bowl"
},
"cookingtime": 200
"cookingtime": 200,
"experience": 1.0
}
16 changes: 9 additions & 7 deletions src/main/resources/data/expandeddelight/recipes/farmersdelight/cooking/peperonata.json
100644 → 100755
Original file line number Diff line number Diff line change
@@ -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
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@
"container": {
"item": "expandeddelight:glass_jar"
},
"cookingtime": 200
"cookingtime": 200,
"experience": 1.0
}

0 comments on commit adc0b5d

Please sign in to comment.