Skip to content

Commit cf295b5

Browse files
klikli-devklikli-dev
committed
feat: add additional mod ore compat
Closes #1186
1 parent 6966fa0 commit cf295b5

22 files changed

+640
-1
lines changed

‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ group=com.klikli_dev
3232
mod_id=occultism
3333
mod_name=Occultism
3434
mod_license=MIT
35-
mod_version=1.144.0
35+
mod_version=1.147.2
3636
mod_authors=Kli Kli
3737
mod_description=A magic mod inspired by the world of Jonathan Stroud's Bartimaeus. With the help of occult rituals players can summon entities from the "Other Side" to perform magic.
3838

‎src/generated/resources/data/c/tags/item/dusts/dark_gem.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"values": [
3+
{
4+
"id": "evilcraft:dark_gem_crushed",
5+
"required": false
6+
}
7+
]
8+
}

‎src/generated/resources/data/c/tags/item/ores/dark_gem.json

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"values": [
3+
{
4+
"id": "evilcraft:dark_ores",
5+
"required": false
6+
},
7+
{
8+
"id": "#evilcraft:ores/dark_gem",
9+
"required": false
10+
}
11+
]
12+
}

‎src/generated/resources/data/occultism/advancement/recipes/crushing/crushing/dark_gem_dust.json

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"neoforge:conditions": [
3+
{
4+
"type": "neoforge:not",
5+
"value": {
6+
"type": "neoforge:tag_empty",
7+
"tag": "c:ores/dark_gem"
8+
}
9+
},
10+
{
11+
"type": "neoforge:not",
12+
"value": {
13+
"type": "neoforge:tag_empty",
14+
"tag": "c:dusts/dark_gem"
15+
}
16+
}
17+
],
18+
"parent": "minecraft:recipes/root",
19+
"criteria": {
20+
"has_dark_gem": {
21+
"conditions": {
22+
"items": [
23+
{
24+
"items": "#c:ores/dark_gem"
25+
}
26+
]
27+
},
28+
"trigger": "minecraft:inventory_changed"
29+
},
30+
"has_the_recipe": {
31+
"conditions": {
32+
"recipe": "occultism:crushing/dark_gem_dust"
33+
},
34+
"trigger": "minecraft:recipe_unlocked"
35+
}
36+
},
37+
"requirements": [
38+
[
39+
"has_the_recipe",
40+
"has_dark_gem"
41+
]
42+
],
43+
"rewards": {
44+
"recipes": [
45+
"occultism:crushing/dark_gem_dust"
46+
]
47+
}
48+
}

‎src/generated/resources/data/occultism/advancement/recipes/crushing/crushing/dark_gem_dust_from_gem.json

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"neoforge:conditions": [
3+
{
4+
"type": "neoforge:not",
5+
"value": {
6+
"type": "neoforge:tag_empty",
7+
"tag": "c:gems/dark_gem"
8+
}
9+
},
10+
{
11+
"type": "neoforge:not",
12+
"value": {
13+
"type": "neoforge:tag_empty",
14+
"tag": "c:dusts/dark_gem"
15+
}
16+
}
17+
],
18+
"parent": "minecraft:recipes/root",
19+
"criteria": {
20+
"has_dark_gem_gem": {
21+
"conditions": {
22+
"items": [
23+
{
24+
"items": "#c:gems/dark_gem"
25+
}
26+
]
27+
},
28+
"trigger": "minecraft:inventory_changed"
29+
},
30+
"has_the_recipe": {
31+
"conditions": {
32+
"recipe": "occultism:crushing/dark_gem_dust_from_gem"
33+
},
34+
"trigger": "minecraft:recipe_unlocked"
35+
}
36+
},
37+
"requirements": [
38+
[
39+
"has_the_recipe",
40+
"has_dark_gem_gem"
41+
]
42+
],
43+
"rewards": {
44+
"recipes": [
45+
"occultism:crushing/dark_gem_dust_from_gem"
46+
]
47+
}
48+
}

‎src/generated/resources/data/occultism/advancement/recipes/miner/miner/ores/dark_ore.json

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"neoforge:conditions": [
3+
{
4+
"type": "neoforge:not",
5+
"value": {
6+
"type": "neoforge:tag_empty",
7+
"tag": "occultism:miners/ores"
8+
}
9+
},
10+
{
11+
"type": "neoforge:not",
12+
"value": {
13+
"type": "neoforge:tag_empty",
14+
"tag": "c:ores/dark"
15+
}
16+
}
17+
],
18+
"parent": "minecraft:recipes/root",
19+
"criteria": {
20+
"has_miner": {
21+
"conditions": {
22+
"items": [
23+
{
24+
"items": "occultism:magic_lamp_empty"
25+
}
26+
]
27+
},
28+
"trigger": "minecraft:inventory_changed"
29+
},
30+
"has_the_recipe": {
31+
"conditions": {
32+
"recipe": "occultism:miner/ores/dark_ore"
33+
},
34+
"trigger": "minecraft:recipe_unlocked"
35+
}
36+
},
37+
"requirements": [
38+
[
39+
"has_the_recipe",
40+
"has_miner"
41+
]
42+
],
43+
"rewards": {
44+
"recipes": [
45+
"occultism:miner/ores/dark_ore"
46+
]
47+
}
48+
}

‎src/generated/resources/data/occultism/advancement/recipes/miner/miner/ores/sal_ammoniac_ore.json

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"neoforge:conditions": [
3+
{
4+
"type": "neoforge:not",
5+
"value": {
6+
"type": "neoforge:tag_empty",
7+
"tag": "occultism:miners/ores"
8+
}
9+
},
10+
{
11+
"type": "neoforge:not",
12+
"value": {
13+
"type": "neoforge:tag_empty",
14+
"tag": "c:ores/sal_ammoniac"
15+
}
16+
}
17+
],
18+
"parent": "minecraft:recipes/root",
19+
"criteria": {
20+
"has_miner": {
21+
"conditions": {
22+
"items": [
23+
{
24+
"items": "occultism:magic_lamp_empty"
25+
}
26+
]
27+
},
28+
"trigger": "minecraft:inventory_changed"
29+
},
30+
"has_the_recipe": {
31+
"conditions": {
32+
"recipe": "occultism:miner/ores/sal_ammoniac_ore"
33+
},
34+
"trigger": "minecraft:recipe_unlocked"
35+
}
36+
},
37+
"requirements": [
38+
[
39+
"has_the_recipe",
40+
"has_miner"
41+
]
42+
],
43+
"rewards": {
44+
"recipes": [
45+
"occultism:miner/ores/sal_ammoniac_ore"
46+
]
47+
}
48+
}

‎src/generated/resources/data/occultism/advancement/recipes/miner/miner/ores/uraninite_dense_ore.json

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"neoforge:conditions": [
3+
{
4+
"type": "neoforge:not",
5+
"value": {
6+
"type": "neoforge:tag_empty",
7+
"tag": "occultism:miners/ores"
8+
}
9+
},
10+
{
11+
"type": "neoforge:not",
12+
"value": {
13+
"type": "neoforge:tag_empty",
14+
"tag": "c:ores/uraninite_dense"
15+
}
16+
}
17+
],
18+
"parent": "minecraft:recipes/root",
19+
"criteria": {
20+
"has_miner": {
21+
"conditions": {
22+
"items": [
23+
{
24+
"items": "occultism:magic_lamp_empty"
25+
}
26+
]
27+
},
28+
"trigger": "minecraft:inventory_changed"
29+
},
30+
"has_the_recipe": {
31+
"conditions": {
32+
"recipe": "occultism:miner/ores/uraninite_dense_ore"
33+
},
34+
"trigger": "minecraft:recipe_unlocked"
35+
}
36+
},
37+
"requirements": [
38+
[
39+
"has_the_recipe",
40+
"has_miner"
41+
]
42+
],
43+
"rewards": {
44+
"recipes": [
45+
"occultism:miner/ores/uraninite_dense_ore"
46+
]
47+
}
48+
}

‎src/generated/resources/data/occultism/advancement/recipes/miner/miner/ores/uraninite_ore.json

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"neoforge:conditions": [
3+
{
4+
"type": "neoforge:not",
5+
"value": {
6+
"type": "neoforge:tag_empty",
7+
"tag": "occultism:miners/ores"
8+
}
9+
},
10+
{
11+
"type": "neoforge:not",
12+
"value": {
13+
"type": "neoforge:tag_empty",
14+
"tag": "c:ores/uraninite"
15+
}
16+
}
17+
],
18+
"parent": "minecraft:recipes/root",
19+
"criteria": {
20+
"has_miner": {
21+
"conditions": {
22+
"items": [
23+
{
24+
"items": "occultism:magic_lamp_empty"
25+
}
26+
]
27+
},
28+
"trigger": "minecraft:inventory_changed"
29+
},
30+
"has_the_recipe": {
31+
"conditions": {
32+
"recipe": "occultism:miner/ores/uraninite_ore"
33+
},
34+
"trigger": "minecraft:recipe_unlocked"
35+
}
36+
},
37+
"requirements": [
38+
[
39+
"has_the_recipe",
40+
"has_miner"
41+
]
42+
],
43+
"rewards": {
44+
"recipes": [
45+
"occultism:miner/ores/uraninite_ore"
46+
]
47+
}
48+
}

‎src/generated/resources/data/occultism/advancement/recipes/miner/miner/ores/uraninite_poor_ore.json

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"neoforge:conditions": [
3+
{
4+
"type": "neoforge:not",
5+
"value": {
6+
"type": "neoforge:tag_empty",
7+
"tag": "occultism:miners/ores"
8+
}
9+
},
10+
{
11+
"type": "neoforge:not",
12+
"value": {
13+
"type": "neoforge:tag_empty",
14+
"tag": "c:ores/uraninite_poor"
15+
}
16+
}
17+
],
18+
"parent": "minecraft:recipes/root",
19+
"criteria": {
20+
"has_miner": {
21+
"conditions": {
22+
"items": [
23+
{
24+
"items": "occultism:magic_lamp_empty"
25+
}
26+
]
27+
},
28+
"trigger": "minecraft:inventory_changed"
29+
},
30+
"has_the_recipe": {
31+
"conditions": {
32+
"recipe": "occultism:miner/ores/uraninite_poor_ore"
33+
},
34+
"trigger": "minecraft:recipe_unlocked"
35+
}
36+
},
37+
"requirements": [
38+
[
39+
"has_the_recipe",
40+
"has_miner"
41+
]
42+
],
43+
"rewards": {
44+
"recipes": [
45+
"occultism:miner/ores/uraninite_poor_ore"
46+
]
47+
}
48+
}

0 commit comments

Comments
 (0)