-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* 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
- Loading branch information
Showing
115 changed files
with
4,507 additions
and
92 deletions.
There are no files selected for viewing
137 changes: 129 additions & 8 deletions
137
src/generated/resources/assets/occultism/lang/en_us.json
Large diffs are not rendered by default.
Oops, something went wrong.
3 changes: 3 additions & 0 deletions
3
src/generated/resources/assets/occultism/models/item/ritual_dummy/craft_wild_trim.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"parent": "occultism:item/ritual_dummy" | ||
} |
3 changes: 3 additions & 0 deletions
3
src/generated/resources/assets/occultism/models/item/ritual_dummy/possess_breeze.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"parent": "occultism:item/ritual_dummy" | ||
} |
3 changes: 3 additions & 0 deletions
3
src/generated/resources/assets/occultism/models/item/ritual_dummy/possess_strong_breeze.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"parent": "occultism:item/ritual_dummy" | ||
} |
3 changes: 3 additions & 0 deletions
3
src/generated/resources/assets/occultism/models/item/ritual_dummy/possess_weak_breeze.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"parent": "occultism:item/ritual_dummy" | ||
} |
3 changes: 3 additions & 0 deletions
3
src/generated/resources/assets/occultism/models/item/ritual_dummy/summon_allay.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"parent": "occultism:item/ritual_dummy" | ||
} |
3 changes: 3 additions & 0 deletions
3
src/generated/resources/assets/occultism/models/item/ritual_dummy/summon_horde_illager.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"parent": "occultism:item/ritual_dummy" | ||
} |
3 changes: 3 additions & 0 deletions
3
src/generated/resources/assets/occultism/models/item/ritual_dummy/summon_wild_creeper.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"parent": "occultism:item/ritual_dummy" | ||
} |
3 changes: 3 additions & 0 deletions
3
src/generated/resources/assets/occultism/models/item/ritual_dummy/summon_wild_drowned.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"parent": "occultism:item/ritual_dummy" | ||
} |
3 changes: 3 additions & 0 deletions
3
src/generated/resources/assets/occultism/models/item/ritual_dummy/summon_wild_husk.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"parent": "occultism:item/ritual_dummy" | ||
} |
3 changes: 3 additions & 0 deletions
3
...generated/resources/assets/occultism/models/item/ritual_dummy/summon_wild_silverfish.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"parent": "occultism:item/ritual_dummy" | ||
} |
5 changes: 5 additions & 0 deletions
5
src/generated/resources/data/c/tags/entity_type/golems/iron.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
{ | ||
"values": [ | ||
"minecraft:iron_golem" | ||
] | ||
} |
32 changes: 32 additions & 0 deletions
32
...generated/resources/data/occultism/advancement/recipes/ritual/ritual/craft_wild_trim.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
{ | ||
"parent": "minecraft:recipes/root", | ||
"criteria": { | ||
"has_bound_marid": { | ||
"conditions": { | ||
"items": [ | ||
{ | ||
"items": "occultism:book_of_binding_bound_marid" | ||
} | ||
] | ||
}, | ||
"trigger": "minecraft:inventory_changed" | ||
}, | ||
"has_the_recipe": { | ||
"conditions": { | ||
"recipe": "occultism:ritual/craft_wild_trim" | ||
}, | ||
"trigger": "minecraft:recipe_unlocked" | ||
} | ||
}, | ||
"requirements": [ | ||
[ | ||
"has_the_recipe", | ||
"has_bound_marid" | ||
] | ||
], | ||
"rewards": { | ||
"recipes": [ | ||
"occultism:ritual/craft_wild_trim" | ||
] | ||
} | ||
} |
32 changes: 32 additions & 0 deletions
32
src/generated/resources/data/occultism/advancement/recipes/ritual/ritual/possess_breeze.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
{ | ||
"parent": "minecraft:recipes/root", | ||
"criteria": { | ||
"has_bound_afrit": { | ||
"conditions": { | ||
"items": [ | ||
{ | ||
"items": "occultism:book_of_binding_bound_afrit" | ||
} | ||
] | ||
}, | ||
"trigger": "minecraft:inventory_changed" | ||
}, | ||
"has_the_recipe": { | ||
"conditions": { | ||
"recipe": "occultism:ritual/possess_breeze" | ||
}, | ||
"trigger": "minecraft:recipe_unlocked" | ||
} | ||
}, | ||
"requirements": [ | ||
[ | ||
"has_the_recipe", | ||
"has_bound_afrit" | ||
] | ||
], | ||
"rewards": { | ||
"recipes": [ | ||
"occultism:ritual/possess_breeze" | ||
] | ||
} | ||
} |
32 changes: 32 additions & 0 deletions
32
...ted/resources/data/occultism/advancement/recipes/ritual/ritual/possess_strong_breeze.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
{ | ||
"parent": "minecraft:recipes/root", | ||
"criteria": { | ||
"has_bound_afrit": { | ||
"conditions": { | ||
"items": [ | ||
{ | ||
"items": "occultism:book_of_binding_bound_afrit" | ||
} | ||
] | ||
}, | ||
"trigger": "minecraft:inventory_changed" | ||
}, | ||
"has_the_recipe": { | ||
"conditions": { | ||
"recipe": "occultism:ritual/possess_strong_breeze" | ||
}, | ||
"trigger": "minecraft:recipe_unlocked" | ||
} | ||
}, | ||
"requirements": [ | ||
[ | ||
"has_the_recipe", | ||
"has_bound_afrit" | ||
] | ||
], | ||
"rewards": { | ||
"recipes": [ | ||
"occultism:ritual/possess_strong_breeze" | ||
] | ||
} | ||
} |
32 changes: 32 additions & 0 deletions
32
...rated/resources/data/occultism/advancement/recipes/ritual/ritual/possess_weak_breeze.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
{ | ||
"parent": "minecraft:recipes/root", | ||
"criteria": { | ||
"has_bound_afrit": { | ||
"conditions": { | ||
"items": [ | ||
{ | ||
"items": "occultism:book_of_binding_bound_afrit" | ||
} | ||
] | ||
}, | ||
"trigger": "minecraft:inventory_changed" | ||
}, | ||
"has_the_recipe": { | ||
"conditions": { | ||
"recipe": "occultism:ritual/possess_weak_breeze" | ||
}, | ||
"trigger": "minecraft:recipe_unlocked" | ||
} | ||
}, | ||
"requirements": [ | ||
[ | ||
"has_the_recipe", | ||
"has_bound_afrit" | ||
] | ||
], | ||
"rewards": { | ||
"recipes": [ | ||
"occultism:ritual/possess_weak_breeze" | ||
] | ||
} | ||
} |
32 changes: 32 additions & 0 deletions
32
src/generated/resources/data/occultism/advancement/recipes/ritual/ritual/summon_allay.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
{ | ||
"parent": "minecraft:recipes/root", | ||
"criteria": { | ||
"has_bound_foliot": { | ||
"conditions": { | ||
"items": [ | ||
{ | ||
"items": "occultism:book_of_binding_bound_foliot" | ||
} | ||
] | ||
}, | ||
"trigger": "minecraft:inventory_changed" | ||
}, | ||
"has_the_recipe": { | ||
"conditions": { | ||
"recipe": "occultism:ritual/summon_allay" | ||
}, | ||
"trigger": "minecraft:recipe_unlocked" | ||
} | ||
}, | ||
"requirements": [ | ||
[ | ||
"has_the_recipe", | ||
"has_bound_foliot" | ||
] | ||
], | ||
"rewards": { | ||
"recipes": [ | ||
"occultism:ritual/summon_allay" | ||
] | ||
} | ||
} |
32 changes: 32 additions & 0 deletions
32
...ated/resources/data/occultism/advancement/recipes/ritual/ritual/summon_horde_illager.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
{ | ||
"parent": "minecraft:recipes/root", | ||
"criteria": { | ||
"has_bound_afrit": { | ||
"conditions": { | ||
"items": [ | ||
{ | ||
"items": "occultism:book_of_binding_bound_afrit" | ||
} | ||
] | ||
}, | ||
"trigger": "minecraft:inventory_changed" | ||
}, | ||
"has_the_recipe": { | ||
"conditions": { | ||
"recipe": "occultism:ritual/summon_horde_illager" | ||
}, | ||
"trigger": "minecraft:recipe_unlocked" | ||
} | ||
}, | ||
"requirements": [ | ||
[ | ||
"has_the_recipe", | ||
"has_bound_afrit" | ||
] | ||
], | ||
"rewards": { | ||
"recipes": [ | ||
"occultism:ritual/summon_horde_illager" | ||
] | ||
} | ||
} |
32 changes: 32 additions & 0 deletions
32
...rated/resources/data/occultism/advancement/recipes/ritual/ritual/summon_wild_creeper.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
{ | ||
"parent": "minecraft:recipes/root", | ||
"criteria": { | ||
"has_bound_afrit": { | ||
"conditions": { | ||
"items": [ | ||
{ | ||
"items": "occultism:book_of_binding_bound_afrit" | ||
} | ||
] | ||
}, | ||
"trigger": "minecraft:inventory_changed" | ||
}, | ||
"has_the_recipe": { | ||
"conditions": { | ||
"recipe": "occultism:ritual/summon_wild_creeper" | ||
}, | ||
"trigger": "minecraft:recipe_unlocked" | ||
} | ||
}, | ||
"requirements": [ | ||
[ | ||
"has_the_recipe", | ||
"has_bound_afrit" | ||
] | ||
], | ||
"rewards": { | ||
"recipes": [ | ||
"occultism:ritual/summon_wild_creeper" | ||
] | ||
} | ||
} |
32 changes: 32 additions & 0 deletions
32
...rated/resources/data/occultism/advancement/recipes/ritual/ritual/summon_wild_drowned.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
{ | ||
"parent": "minecraft:recipes/root", | ||
"criteria": { | ||
"has_bound_afrit": { | ||
"conditions": { | ||
"items": [ | ||
{ | ||
"items": "occultism:book_of_binding_bound_afrit" | ||
} | ||
] | ||
}, | ||
"trigger": "minecraft:inventory_changed" | ||
}, | ||
"has_the_recipe": { | ||
"conditions": { | ||
"recipe": "occultism:ritual/summon_wild_drowned" | ||
}, | ||
"trigger": "minecraft:recipe_unlocked" | ||
} | ||
}, | ||
"requirements": [ | ||
[ | ||
"has_the_recipe", | ||
"has_bound_afrit" | ||
] | ||
], | ||
"rewards": { | ||
"recipes": [ | ||
"occultism:ritual/summon_wild_drowned" | ||
] | ||
} | ||
} |
32 changes: 32 additions & 0 deletions
32
...enerated/resources/data/occultism/advancement/recipes/ritual/ritual/summon_wild_husk.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
{ | ||
"parent": "minecraft:recipes/root", | ||
"criteria": { | ||
"has_bound_afrit": { | ||
"conditions": { | ||
"items": [ | ||
{ | ||
"items": "occultism:book_of_binding_bound_afrit" | ||
} | ||
] | ||
}, | ||
"trigger": "minecraft:inventory_changed" | ||
}, | ||
"has_the_recipe": { | ||
"conditions": { | ||
"recipe": "occultism:ritual/summon_wild_husk" | ||
}, | ||
"trigger": "minecraft:recipe_unlocked" | ||
} | ||
}, | ||
"requirements": [ | ||
[ | ||
"has_the_recipe", | ||
"has_bound_afrit" | ||
] | ||
], | ||
"rewards": { | ||
"recipes": [ | ||
"occultism:ritual/summon_wild_husk" | ||
] | ||
} | ||
} |
32 changes: 32 additions & 0 deletions
32
...ed/resources/data/occultism/advancement/recipes/ritual/ritual/summon_wild_silverfish.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
{ | ||
"parent": "minecraft:recipes/root", | ||
"criteria": { | ||
"has_bound_afrit": { | ||
"conditions": { | ||
"items": [ | ||
{ | ||
"items": "occultism:book_of_binding_bound_afrit" | ||
} | ||
] | ||
}, | ||
"trigger": "minecraft:inventory_changed" | ||
}, | ||
"has_the_recipe": { | ||
"conditions": { | ||
"recipe": "occultism:ritual/summon_wild_silverfish" | ||
}, | ||
"trigger": "minecraft:recipe_unlocked" | ||
} | ||
}, | ||
"requirements": [ | ||
[ | ||
"has_the_recipe", | ||
"has_bound_afrit" | ||
] | ||
], | ||
"rewards": { | ||
"recipes": [ | ||
"occultism:ritual/summon_wild_silverfish" | ||
] | ||
} | ||
} |
Oops, something went wrong.