Skip to content

Commit 8a3eb05

Browse files
committed
Data-driven fluid freezing, fix freeze recipe datagen
1 parent d7d43bc commit 8a3eb05

50 files changed

Lines changed: 756 additions & 155 deletions

Some content is hidden

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

Common/src/generated/resources/data/hexcasting/advancement/recipes/freeze/freeze/blue_ice.json renamed to Common/src/generated/resources/data/hexcasting/advancement/recipes/freeze/blue_ice.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": "hexcasting:freeze/blue_ice"
16+
"recipe": "hexcasting:blue_ice"
1717
},
1818
"trigger": "minecraft:recipe_unlocked"
1919
}
@@ -26,7 +26,7 @@
2626
],
2727
"rewards": {
2828
"recipes": [
29-
"hexcasting:freeze/blue_ice"
29+
"hexcasting:blue_ice"
3030
]
3131
}
3232
}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_item": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": "#hexcasting:staves"
9+
}
10+
]
11+
},
12+
"trigger": "minecraft:inventory_changed"
13+
},
14+
"has_the_recipe": {
15+
"conditions": {
16+
"recipe": "hexcasting:cobblestone"
17+
},
18+
"trigger": "minecraft:recipe_unlocked"
19+
}
20+
},
21+
"requirements": [
22+
[
23+
"has_the_recipe",
24+
"has_item"
25+
]
26+
],
27+
"rewards": {
28+
"recipes": [
29+
"hexcasting:cobblestone"
30+
]
31+
}
32+
}

Common/src/generated/resources/data/hexcasting/advancement/recipes/freeze/freeze/powder_snow_cauldron.json

Lines changed: 0 additions & 32 deletions
This file was deleted.
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_item": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": "#hexcasting:staves"
9+
}
10+
]
11+
},
12+
"trigger": "minecraft:inventory_changed"
13+
},
14+
"has_the_recipe": {
15+
"conditions": {
16+
"recipe": "hexcasting:ice"
17+
},
18+
"trigger": "minecraft:recipe_unlocked"
19+
}
20+
},
21+
"requirements": [
22+
[
23+
"has_the_recipe",
24+
"has_item"
25+
]
26+
],
27+
"rewards": {
28+
"recipes": [
29+
"hexcasting:ice"
30+
]
31+
}
32+
}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_item": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": "#hexcasting:staves"
9+
}
10+
]
11+
},
12+
"trigger": "minecraft:inventory_changed"
13+
},
14+
"has_the_recipe": {
15+
"conditions": {
16+
"recipe": "hexcasting:obsidian"
17+
},
18+
"trigger": "minecraft:recipe_unlocked"
19+
}
20+
},
21+
"requirements": [
22+
[
23+
"has_the_recipe",
24+
"has_item"
25+
]
26+
],
27+
"rewards": {
28+
"recipes": [
29+
"hexcasting:obsidian"
30+
]
31+
}
32+
}

Fabric/src/generated/resources/data/hexcasting/advancement/recipes/freeze/freeze/packed_ice.json renamed to Common/src/generated/resources/data/hexcasting/advancement/recipes/freeze/packed_ice.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": "hexcasting:freeze/packed_ice"
16+
"recipe": "hexcasting:packed_ice"
1717
},
1818
"trigger": "minecraft:recipe_unlocked"
1919
}
@@ -26,7 +26,7 @@
2626
],
2727
"rewards": {
2828
"recipes": [
29-
"hexcasting:freeze/packed_ice"
29+
"hexcasting:packed_ice"
3030
]
3131
}
3232
}

Common/src/generated/resources/data/hexcasting/advancement/recipes/freeze/freeze/packed_ice.json renamed to Common/src/generated/resources/data/hexcasting/advancement/recipes/freeze/powder_snow_cauldron.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": "hexcasting:freeze/packed_ice"
16+
"recipe": "hexcasting:powder_snow_cauldron"
1717
},
1818
"trigger": "minecraft:recipe_unlocked"
1919
}
@@ -26,7 +26,7 @@
2626
],
2727
"rewards": {
2828
"recipes": [
29-
"hexcasting:freeze/packed_ice"
29+
"hexcasting:powder_snow_cauldron"
3030
]
3131
}
3232
}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_item": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": "#hexcasting:staves"
9+
}
10+
]
11+
},
12+
"trigger": "minecraft:inventory_changed"
13+
},
14+
"has_the_recipe": {
15+
"conditions": {
16+
"recipe": "hexcasting:snow_block"
17+
},
18+
"trigger": "minecraft:recipe_unlocked"
19+
}
20+
},
21+
"requirements": [
22+
[
23+
"has_the_recipe",
24+
"has_item"
25+
]
26+
],
27+
"rewards": {
28+
"recipes": [
29+
"hexcasting:snow_block"
30+
]
31+
}
32+
}

Common/src/generated/resources/data/hexcasting/recipe/freeze/freeze/blue_ice.json renamed to Common/src/generated/resources/data/hexcasting/recipe/freeze/blue_ice.json

File renamed without changes.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"type": "hexcasting:freeze",
3+
"blockIn": {
4+
"type": "hexcasting:fluid",
5+
"fluid": "minecraft:flowing_lava"
6+
},
7+
"result": {
8+
"Name": "minecraft:cobblestone"
9+
}
10+
}

0 commit comments

Comments
 (0)