Skip to content

Commit 1d41cd5

Browse files
TunefulTurnipTunefulTurnip
authored
Merge pull request #321 from AriaElidove/Update-Recipes
A bunch of Recipe/Tag Updates
2 parents 12dcb30 + 2f82ab5 commit 1d41cd5

151 files changed

Lines changed: 2470 additions & 1243 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/generated/resources/data/deep_aether/advancement/recipes/decorations/mossy_holystone_from_aether_moss.json renamed to src/generated/resources/data/aether/advancement/recipes/decorations/mossy_holystone.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"has_the_recipe": {
1515
"conditions": {
16-
"recipe": "deep_aether:mossy_holystone_from_aether_moss"
16+
"recipe": "aether:mossy_holystone"
1717
},
1818
"trigger": "minecraft:recipe_unlocked"
1919
}
@@ -26,7 +26,7 @@
2626
],
2727
"rewards": {
2828
"recipes": [
29-
"deep_aether:mossy_holystone_from_aether_moss"
29+
"aether:mossy_holystone"
3030
]
3131
}
3232
}

src/generated/resources/data/deep_aether/recipe/mossy_holystone_from_aether_moss.json renamed to src/generated/resources/data/aether/recipe/mossy_holystone.json

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
{
2-
"type": "minecraft:crafting_shaped",
2+
"type": "minecraft:crafting_shapeless",
33
"category": "misc",
44
"group": "mossy_holystone",
5-
"key": {
6-
"A": {
5+
"ingredients": [
6+
{
77
"item": "aether:holystone"
88
},
9-
"B": {
10-
"item": "deep_aether:aether_moss_block"
9+
{
10+
"tag": "deep_aether:crafts_mossy_blocks"
1111
}
12-
},
13-
"pattern": [
14-
"AB"
1512
],
1613
"result": {
1714
"count": 1,

‎src/generated/resources/data/aether/recipe/poison_dart.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"category": "equipment",
44
"key": {
55
"B": {
6-
"item": "deep_aether:poison_bucket"
6+
"tag": "deep_aether:poison_bucket"
77
},
88
"D": {
99
"item": "aether:golden_dart"

‎src/generated/resources/data/aether/tags/block/boss_doorway_dungeon_blocks.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"values": [
3+
"deep_aether:boss_doorway_nimbus_stone",
4+
"deep_aether:boss_doorway_light_nimbus_stone",
5+
"deep_aether:boss_doorway_nimbus_pillar",
6+
"deep_aether:boss_doorway_light_nimbus_pillar"
7+
]
8+
}

‎src/generated/resources/data/aether/tags/block/ores_in_ground/holystone.json‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/generated/resources/data/aether/tags/block/treasure_doorway_dungeon_blocks.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"values": [
3+
"deep_aether:treasure_doorway_nimbus_stone",
4+
"deep_aether:treasure_doorway_light_nimbus_stone",
5+
"deep_aether:treasure_doorway_nimbus_pillar",
6+
"deep_aether:treasure_doorway_light_nimbus_pillar"
7+
]
8+
}

‎src/generated/resources/data/aether/tags/item/aerclouds.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"values": [
33
"deep_aether:chromatic_aercloud",
44
"deep_aether:sterling_aercloud",
5-
"deep_aether:aersmog",
65
"deep_aether:aercloud_grass_block",
6+
"deep_aether:aersmog",
77
"deep_aether:rain_aercloud"
88
]
99
}

‎src/generated/resources/data/c/tags/block/fence_gates.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"values": [
3+
"deep_aether:roseroot_fence_gate",
4+
"deep_aether:yagroot_fence_gate",
5+
"deep_aether:cruderoot_fence_gate",
6+
"deep_aether:conberry_fence_gate",
7+
"deep_aether:sunroot_fence_gate"
8+
]
9+
}

‎src/generated/resources/data/c/tags/block/fence_gates/wooden.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"values": [
3+
"deep_aether:roseroot_fence_gate",
4+
"deep_aether:yagroot_fence_gate",
5+
"deep_aether:cruderoot_fence_gate",
6+
"deep_aether:conberry_fence_gate",
7+
"deep_aether:sunroot_fence_gate"
8+
]
9+
}

‎src/generated/resources/data/c/tags/block/fences.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"values": [
3+
"deep_aether:roseroot_fence",
4+
"deep_aether:yagroot_fence",
5+
"deep_aether:cruderoot_fence",
6+
"deep_aether:conberry_fence",
7+
"deep_aether:sunroot_fence"
8+
]
9+
}

0 commit comments

Comments
 (0)