Skip to content

Commit 7a08a68

Browse files
wrincewindwrincewind
authored
Merge pull request #2047 from stellanera98/1.20-filteruuid
fix filters saving on wrong itemStack
2 parents a1b445b + 593247b commit 7a08a68

14 files changed

Lines changed: 254 additions & 6 deletions

‎src/generated/resources/data/bloodmagic/advancements/recipes/misc/clear_composite_filter.json‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_filter": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": [
9+
"bloodmagic:itemrouterfiltercomposite"
10+
]
11+
}
12+
]
13+
},
14+
"trigger": "minecraft:inventory_changed"
15+
},
16+
"has_the_recipe": {
17+
"conditions": {
18+
"recipe": "bloodmagic:clear_composite_filter"
19+
},
20+
"trigger": "minecraft:recipe_unlocked"
21+
}
22+
},
23+
"requirements": [
24+
[
25+
"has_filter",
26+
"has_the_recipe"
27+
]
28+
],
29+
"rewards": {
30+
"recipes": [
31+
"bloodmagic:clear_composite_filter"
32+
]
33+
},
34+
"sends_telemetry_event": false
35+
}

‎src/generated/resources/data/bloodmagic/advancements/recipes/misc/clear_enchant_filter.json‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_filter": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": [
9+
"bloodmagic:itemrouterfilterenchant"
10+
]
11+
}
12+
]
13+
},
14+
"trigger": "minecraft:inventory_changed"
15+
},
16+
"has_the_recipe": {
17+
"conditions": {
18+
"recipe": "bloodmagic:clear_enchant_filter"
19+
},
20+
"trigger": "minecraft:recipe_unlocked"
21+
}
22+
},
23+
"requirements": [
24+
[
25+
"has_filter",
26+
"has_the_recipe"
27+
]
28+
],
29+
"rewards": {
30+
"recipes": [
31+
"bloodmagic:clear_enchant_filter"
32+
]
33+
},
34+
"sends_telemetry_event": false
35+
}

‎src/generated/resources/data/bloodmagic/advancements/recipes/misc/clear_mod_filter.json‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_filter": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": [
9+
"bloodmagic:itemrouterfiltermoditems"
10+
]
11+
}
12+
]
13+
},
14+
"trigger": "minecraft:inventory_changed"
15+
},
16+
"has_the_recipe": {
17+
"conditions": {
18+
"recipe": "bloodmagic:clear_mod_filter"
19+
},
20+
"trigger": "minecraft:recipe_unlocked"
21+
}
22+
},
23+
"requirements": [
24+
[
25+
"has_filter",
26+
"has_the_recipe"
27+
]
28+
],
29+
"rewards": {
30+
"recipes": [
31+
"bloodmagic:clear_mod_filter"
32+
]
33+
},
34+
"sends_telemetry_event": false
35+
}

‎src/generated/resources/data/bloodmagic/advancements/recipes/misc/clear_router_filter.json‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_filter": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": [
9+
"bloodmagic:itemrouterfilterexact"
10+
]
11+
}
12+
]
13+
},
14+
"trigger": "minecraft:inventory_changed"
15+
},
16+
"has_the_recipe": {
17+
"conditions": {
18+
"recipe": "bloodmagic:clear_router_filter"
19+
},
20+
"trigger": "minecraft:recipe_unlocked"
21+
}
22+
},
23+
"requirements": [
24+
[
25+
"has_filter",
26+
"has_the_recipe"
27+
]
28+
],
29+
"rewards": {
30+
"recipes": [
31+
"bloodmagic:clear_router_filter"
32+
]
33+
},
34+
"sends_telemetry_event": false
35+
}

‎src/generated/resources/data/bloodmagic/advancements/recipes/misc/clear_tag_filter.json‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_filter": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": [
9+
"bloodmagic:itemrouterfilteroredict"
10+
]
11+
}
12+
]
13+
},
14+
"trigger": "minecraft:inventory_changed"
15+
},
16+
"has_the_recipe": {
17+
"conditions": {
18+
"recipe": "bloodmagic:clear_tag_filter"
19+
},
20+
"trigger": "minecraft:recipe_unlocked"
21+
}
22+
},
23+
"requirements": [
24+
[
25+
"has_filter",
26+
"has_the_recipe"
27+
]
28+
],
29+
"rewards": {
30+
"recipes": [
31+
"bloodmagic:clear_tag_filter"
32+
]
33+
},
34+
"sends_telemetry_event": false
35+
}

‎src/generated/resources/data/bloodmagic/recipes/clear_composite_filter.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"type": "minecraft:crafting_shapeless",
3+
"category": "misc",
4+
"ingredients": [
5+
{
6+
"item": "bloodmagic:itemrouterfiltercomposite"
7+
}
8+
],
9+
"result": {
10+
"item": "bloodmagic:itemrouterfiltercomposite"
11+
}
12+
}

‎src/generated/resources/data/bloodmagic/recipes/clear_enchant_filter.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"type": "minecraft:crafting_shapeless",
3+
"category": "misc",
4+
"ingredients": [
5+
{
6+
"item": "bloodmagic:itemrouterfilterenchant"
7+
}
8+
],
9+
"result": {
10+
"item": "bloodmagic:itemrouterfilterenchant"
11+
}
12+
}

‎src/generated/resources/data/bloodmagic/recipes/clear_mod_filter.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"type": "minecraft:crafting_shapeless",
3+
"category": "misc",
4+
"ingredients": [
5+
{
6+
"item": "bloodmagic:itemrouterfiltermoditems"
7+
}
8+
],
9+
"result": {
10+
"item": "bloodmagic:itemrouterfiltermoditems"
11+
}
12+
}

‎src/generated/resources/data/bloodmagic/recipes/clear_router_filter.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"type": "minecraft:crafting_shapeless",
3+
"category": "misc",
4+
"ingredients": [
5+
{
6+
"item": "bloodmagic:itemrouterfilterexact"
7+
}
8+
],
9+
"result": {
10+
"item": "bloodmagic:itemrouterfilterexact"
11+
}
12+
}

‎src/generated/resources/data/bloodmagic/recipes/clear_tag_filter.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"type": "minecraft:crafting_shapeless",
3+
"category": "misc",
4+
"ingredients": [
5+
{
6+
"item": "bloodmagic:itemrouterfilteroredict"
7+
}
8+
],
9+
"result": {
10+
"item": "bloodmagic:itemrouterfilteroredict"
11+
}
12+
}

0 commit comments

Comments
 (0)