Skip to content

Commit 0b78449

Browse files
Eqis-EduEqis-Edu
authored
feat: Trials & Possessions (#1170) - thanks @Eqis-Edu
* Possessed Hoglin no more despawn in peaceful * Vanilla Hoglin dont despawn in peaceful, past commit is useless * SummonWildHuntRitual -> SummonWildRitual SummonWild can set number of summoned entities Summon Wild Hunt return to use Skeleton Skull instead afrit book of binding * Removed empty pool from Possessed Hoglin loot table * Horde Mobs * Horde Rituals (not yet in the dictionary) * Horde Rituals in the dictionary, possession page remap (include four next possessions) * Way to obtain Heavy Core using possessions (need enemy balance) * Craft: Wild Trim Summon: Allay * Increase Difficulty Breezes possessions * Ritual Summon Evoker * (RunData) Commit generated * Possessed Evoker instead Vanilla version * Possessed Evoker instead Vanilla version
1 parent cc7ce28 commit 0b78449

File tree

115 files changed

+4507
-92
lines changed

Some content is hidden

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

115 files changed

+4507
-92
lines changed

‎src/generated/resources/assets/occultism/lang/en_us.json

+129-8
Large diffs are not rendered by default.

‎src/generated/resources/assets/occultism/models/item/ritual_dummy/craft_wild_trim.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "occultism:item/ritual_dummy"
3+
}

‎src/generated/resources/assets/occultism/models/item/ritual_dummy/possess_breeze.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "occultism:item/ritual_dummy"
3+
}

‎src/generated/resources/assets/occultism/models/item/ritual_dummy/possess_strong_breeze.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "occultism:item/ritual_dummy"
3+
}

‎src/generated/resources/assets/occultism/models/item/ritual_dummy/possess_weak_breeze.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "occultism:item/ritual_dummy"
3+
}

‎src/generated/resources/assets/occultism/models/item/ritual_dummy/summon_allay.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "occultism:item/ritual_dummy"
3+
}

‎src/generated/resources/assets/occultism/models/item/ritual_dummy/summon_horde_illager.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "occultism:item/ritual_dummy"
3+
}

‎src/generated/resources/assets/occultism/models/item/ritual_dummy/summon_wild_creeper.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "occultism:item/ritual_dummy"
3+
}

‎src/generated/resources/assets/occultism/models/item/ritual_dummy/summon_wild_drowned.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "occultism:item/ritual_dummy"
3+
}

‎src/generated/resources/assets/occultism/models/item/ritual_dummy/summon_wild_husk.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "occultism:item/ritual_dummy"
3+
}

‎src/generated/resources/assets/occultism/models/item/ritual_dummy/summon_wild_silverfish.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "occultism:item/ritual_dummy"
3+
}

‎src/generated/resources/data/c/tags/entity_type/golems/iron.json

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"minecraft:iron_golem"
4+
]
5+
}

‎src/generated/resources/data/occultism/advancement/recipes/ritual/ritual/craft_wild_trim.json

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_bound_marid": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": "occultism:book_of_binding_bound_marid"
9+
}
10+
]
11+
},
12+
"trigger": "minecraft:inventory_changed"
13+
},
14+
"has_the_recipe": {
15+
"conditions": {
16+
"recipe": "occultism:ritual/craft_wild_trim"
17+
},
18+
"trigger": "minecraft:recipe_unlocked"
19+
}
20+
},
21+
"requirements": [
22+
[
23+
"has_the_recipe",
24+
"has_bound_marid"
25+
]
26+
],
27+
"rewards": {
28+
"recipes": [
29+
"occultism:ritual/craft_wild_trim"
30+
]
31+
}
32+
}

‎src/generated/resources/data/occultism/advancement/recipes/ritual/ritual/possess_breeze.json

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_bound_afrit": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": "occultism:book_of_binding_bound_afrit"
9+
}
10+
]
11+
},
12+
"trigger": "minecraft:inventory_changed"
13+
},
14+
"has_the_recipe": {
15+
"conditions": {
16+
"recipe": "occultism:ritual/possess_breeze"
17+
},
18+
"trigger": "minecraft:recipe_unlocked"
19+
}
20+
},
21+
"requirements": [
22+
[
23+
"has_the_recipe",
24+
"has_bound_afrit"
25+
]
26+
],
27+
"rewards": {
28+
"recipes": [
29+
"occultism:ritual/possess_breeze"
30+
]
31+
}
32+
}

‎src/generated/resources/data/occultism/advancement/recipes/ritual/ritual/possess_strong_breeze.json

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_bound_afrit": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": "occultism:book_of_binding_bound_afrit"
9+
}
10+
]
11+
},
12+
"trigger": "minecraft:inventory_changed"
13+
},
14+
"has_the_recipe": {
15+
"conditions": {
16+
"recipe": "occultism:ritual/possess_strong_breeze"
17+
},
18+
"trigger": "minecraft:recipe_unlocked"
19+
}
20+
},
21+
"requirements": [
22+
[
23+
"has_the_recipe",
24+
"has_bound_afrit"
25+
]
26+
],
27+
"rewards": {
28+
"recipes": [
29+
"occultism:ritual/possess_strong_breeze"
30+
]
31+
}
32+
}

‎src/generated/resources/data/occultism/advancement/recipes/ritual/ritual/possess_weak_breeze.json

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_bound_afrit": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": "occultism:book_of_binding_bound_afrit"
9+
}
10+
]
11+
},
12+
"trigger": "minecraft:inventory_changed"
13+
},
14+
"has_the_recipe": {
15+
"conditions": {
16+
"recipe": "occultism:ritual/possess_weak_breeze"
17+
},
18+
"trigger": "minecraft:recipe_unlocked"
19+
}
20+
},
21+
"requirements": [
22+
[
23+
"has_the_recipe",
24+
"has_bound_afrit"
25+
]
26+
],
27+
"rewards": {
28+
"recipes": [
29+
"occultism:ritual/possess_weak_breeze"
30+
]
31+
}
32+
}

‎src/generated/resources/data/occultism/advancement/recipes/ritual/ritual/summon_allay.json

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_bound_foliot": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": "occultism:book_of_binding_bound_foliot"
9+
}
10+
]
11+
},
12+
"trigger": "minecraft:inventory_changed"
13+
},
14+
"has_the_recipe": {
15+
"conditions": {
16+
"recipe": "occultism:ritual/summon_allay"
17+
},
18+
"trigger": "minecraft:recipe_unlocked"
19+
}
20+
},
21+
"requirements": [
22+
[
23+
"has_the_recipe",
24+
"has_bound_foliot"
25+
]
26+
],
27+
"rewards": {
28+
"recipes": [
29+
"occultism:ritual/summon_allay"
30+
]
31+
}
32+
}

‎src/generated/resources/data/occultism/advancement/recipes/ritual/ritual/summon_horde_illager.json

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_bound_afrit": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": "occultism:book_of_binding_bound_afrit"
9+
}
10+
]
11+
},
12+
"trigger": "minecraft:inventory_changed"
13+
},
14+
"has_the_recipe": {
15+
"conditions": {
16+
"recipe": "occultism:ritual/summon_horde_illager"
17+
},
18+
"trigger": "minecraft:recipe_unlocked"
19+
}
20+
},
21+
"requirements": [
22+
[
23+
"has_the_recipe",
24+
"has_bound_afrit"
25+
]
26+
],
27+
"rewards": {
28+
"recipes": [
29+
"occultism:ritual/summon_horde_illager"
30+
]
31+
}
32+
}

‎src/generated/resources/data/occultism/advancement/recipes/ritual/ritual/summon_wild_creeper.json

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_bound_afrit": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": "occultism:book_of_binding_bound_afrit"
9+
}
10+
]
11+
},
12+
"trigger": "minecraft:inventory_changed"
13+
},
14+
"has_the_recipe": {
15+
"conditions": {
16+
"recipe": "occultism:ritual/summon_wild_creeper"
17+
},
18+
"trigger": "minecraft:recipe_unlocked"
19+
}
20+
},
21+
"requirements": [
22+
[
23+
"has_the_recipe",
24+
"has_bound_afrit"
25+
]
26+
],
27+
"rewards": {
28+
"recipes": [
29+
"occultism:ritual/summon_wild_creeper"
30+
]
31+
}
32+
}

‎src/generated/resources/data/occultism/advancement/recipes/ritual/ritual/summon_wild_drowned.json

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_bound_afrit": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": "occultism:book_of_binding_bound_afrit"
9+
}
10+
]
11+
},
12+
"trigger": "minecraft:inventory_changed"
13+
},
14+
"has_the_recipe": {
15+
"conditions": {
16+
"recipe": "occultism:ritual/summon_wild_drowned"
17+
},
18+
"trigger": "minecraft:recipe_unlocked"
19+
}
20+
},
21+
"requirements": [
22+
[
23+
"has_the_recipe",
24+
"has_bound_afrit"
25+
]
26+
],
27+
"rewards": {
28+
"recipes": [
29+
"occultism:ritual/summon_wild_drowned"
30+
]
31+
}
32+
}

‎src/generated/resources/data/occultism/advancement/recipes/ritual/ritual/summon_wild_husk.json

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_bound_afrit": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": "occultism:book_of_binding_bound_afrit"
9+
}
10+
]
11+
},
12+
"trigger": "minecraft:inventory_changed"
13+
},
14+
"has_the_recipe": {
15+
"conditions": {
16+
"recipe": "occultism:ritual/summon_wild_husk"
17+
},
18+
"trigger": "minecraft:recipe_unlocked"
19+
}
20+
},
21+
"requirements": [
22+
[
23+
"has_the_recipe",
24+
"has_bound_afrit"
25+
]
26+
],
27+
"rewards": {
28+
"recipes": [
29+
"occultism:ritual/summon_wild_husk"
30+
]
31+
}
32+
}

‎src/generated/resources/data/occultism/advancement/recipes/ritual/ritual/summon_wild_silverfish.json

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_bound_afrit": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": "occultism:book_of_binding_bound_afrit"
9+
}
10+
]
11+
},
12+
"trigger": "minecraft:inventory_changed"
13+
},
14+
"has_the_recipe": {
15+
"conditions": {
16+
"recipe": "occultism:ritual/summon_wild_silverfish"
17+
},
18+
"trigger": "minecraft:recipe_unlocked"
19+
}
20+
},
21+
"requirements": [
22+
[
23+
"has_the_recipe",
24+
"has_bound_afrit"
25+
]
26+
],
27+
"rewards": {
28+
"recipes": [
29+
"occultism:ritual/summon_wild_silverfish"
30+
]
31+
}
32+
}

0 commit comments

Comments
 (0)