-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Random Animals, Smelter Spirit, Familiars checkup, Achievements…
… Optimizer compatibility and other things (#1246) * Achievements Optimizer compatibility * gem crush ignore multiplier, ae2 and act-add quartz compability * possessed witch drops * unhidden ronaza's contact * reverted lamp cost * natural items foil effect (enchantment glow) * easier sacrifice to possess bee, removed unused imports * easier gray paste * public misc and custom ritual dummies * more entities in tags * fix * moved dim mineshaft entry (config text not load before) * more tips about divination rod troubleshooting * specialized possess random animals * dictionary random entry icon * add missing random animals * new hidden advancements * recipe change random special and villager * blacksmith text and increase default chance of repair * configurable greedy block search range and increase default value * deer and ratman text fix * slight change in deer step assist * removed beaver particle effect (like others familiar) * add new entry links in pentacles uses * smelter spirits * familiar still sitting when owner change dimension * allow summon wild ritual type use tags * group random animal * update links * auto gen ritual hidden advancement * more dummies to public * smelter dictionary entries * return sniffer to random special * add missing links to smelter entries * stop ritual foil if an item inside as less than 40% of durability * text about ritual satchel foil * refinements * miner show weight in emi * ritual satchel flying blocks * grove changes * natural log item texture
- Loading branch information
Showing
226 changed files
with
4,637 additions
and
984 deletions.
There are no files selected for viewing
345 changes: 235 additions & 110 deletions
345
src/generated/resources/assets/occultism/lang/en_us.json
Large diffs are not rendered by default.
Oops, something went wrong.
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/occultism/models/item/mysterious_egg_icon.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,6 @@ | ||
{ | ||
"parent": "minecraft:item/generated", | ||
"textures": { | ||
"layer0": "occultism:item/mysterious_egg_icon" | ||
} | ||
} |
3 changes: 0 additions & 3 deletions
3
...ted/resources/assets/occultism/models/item/ritual_dummy/craft_miner_ancient_eldritch.json
This file was deleted.
Oops, something went wrong.
3 changes: 3 additions & 0 deletions
3
...ated/resources/assets/occultism/models/item/ritual_dummy/misc_miner_ancient_eldritch.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/pentacle_misc" | ||
} |
File renamed without changes.
3 changes: 3 additions & 0 deletions
3
...d/resources/assets/occultism/models/item/ritual_dummy/possess_random_animal_rideable.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/pentacle_possess" | ||
} |
3 changes: 3 additions & 0 deletions
3
...ated/resources/assets/occultism/models/item/ritual_dummy/possess_random_animal_small.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/pentacle_possess" | ||
} |
3 changes: 3 additions & 0 deletions
3
...ed/resources/assets/occultism/models/item/ritual_dummy/possess_random_animal_special.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/pentacle_possess" | ||
} |
3 changes: 3 additions & 0 deletions
3
...ated/resources/assets/occultism/models/item/ritual_dummy/possess_random_animal_water.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/pentacle_possess" | ||
} |
3 changes: 3 additions & 0 deletions
3
src/generated/resources/assets/occultism/models/item/ritual_dummy/possess_villager.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/pentacle_possess" | ||
} |
3 changes: 3 additions & 0 deletions
3
src/generated/resources/assets/occultism/models/item/ritual_dummy/summon_afrit_smelter.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/pentacle_summon" | ||
} |
3 changes: 3 additions & 0 deletions
3
src/generated/resources/assets/occultism/models/item/ritual_dummy/summon_djinni_smelter.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/pentacle_summon" | ||
} |
3 changes: 3 additions & 0 deletions
3
src/generated/resources/assets/occultism/models/item/ritual_dummy/summon_foliot_smelter.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/pentacle_summon" | ||
} |
3 changes: 3 additions & 0 deletions
3
src/generated/resources/assets/occultism/models/item/ritual_dummy/summon_marid_smelter.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/pentacle_summon" | ||
} |
3 changes: 3 additions & 0 deletions
3
...erated/resources/assets/occultism/models/item/ritual_dummy/wild_random_animal_common.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/pentacle_misc" | ||
} |
3 changes: 3 additions & 0 deletions
3
...ated/resources/assets/occultism/models/item/ritual_dummy/wild_random_animal_rideable.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/pentacle_misc" | ||
} |
3 changes: 3 additions & 0 deletions
3
...nerated/resources/assets/occultism/models/item/ritual_dummy/wild_random_animal_small.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/pentacle_misc" | ||
} |
3 changes: 3 additions & 0 deletions
3
...rated/resources/assets/occultism/models/item/ritual_dummy/wild_random_animal_special.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/pentacle_misc" | ||
} |
3 changes: 3 additions & 0 deletions
3
...nerated/resources/assets/occultism/models/item/ritual_dummy/wild_random_animal_water.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/pentacle_misc" | ||
} |
3 changes: 3 additions & 0 deletions
3
src/generated/resources/assets/occultism/models/item/ritual_dummy/wild_villager.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/pentacle_misc" | ||
} |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/data/c/tags/block/mushroom_blocks.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,7 @@ | ||
{ | ||
"values": [ | ||
"minecraft:mushroom_stem", | ||
"minecraft:red_mushroom_block", | ||
"minecraft:brown_mushroom_block" | ||
] | ||
} |
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 |
---|---|---|
@@ -1,6 +1,7 @@ | ||
{ | ||
"values": [ | ||
"minecraft:goat", | ||
"occultism:mercy_goat" | ||
"occultism:mercy_goat", | ||
"occultism:goat_familiar" | ||
] | ||
} |
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 |
---|---|---|
@@ -1,5 +1,6 @@ | ||
{ | ||
"values": [ | ||
"minecraft:hoglin" | ||
"minecraft:hoglin", | ||
"occultism:possessed_hoglin" | ||
] | ||
} |
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
8 changes: 8 additions & 0 deletions
8
src/generated/resources/data/c/tags/item/dusts/certus_quartz.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,8 @@ | ||
{ | ||
"values": [ | ||
{ | ||
"id": "ae2:certus_quartz_dust", | ||
"required": false | ||
} | ||
] | ||
} |
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,8 @@ | ||
{ | ||
"values": [ | ||
{ | ||
"id": "ae2:fluix_dust", | ||
"required": false | ||
} | ||
] | ||
} |
8 changes: 8 additions & 0 deletions
8
src/generated/resources/data/c/tags/item/gems/black_quartz.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,8 @@ | ||
{ | ||
"values": [ | ||
{ | ||
"id": "actuallyadditions:black_quartz", | ||
"required": false | ||
} | ||
] | ||
} |
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,8 @@ | ||
{ | ||
"values": [ | ||
{ | ||
"id": "ae2:fluix_crystal", | ||
"required": false | ||
} | ||
] | ||
} |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/data/c/tags/item/mushroom_blocks.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,7 @@ | ||
{ | ||
"values": [ | ||
"minecraft:mushroom_stem", | ||
"minecraft:red_mushroom_block", | ||
"minecraft:brown_mushroom_block" | ||
] | ||
} |
8 changes: 8 additions & 0 deletions
8
src/generated/resources/data/c/tags/item/ores/black_quartz.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,8 @@ | ||
{ | ||
"values": [ | ||
{ | ||
"id": "actuallyadditions:black_quartz_ore", | ||
"required": false | ||
} | ||
] | ||
} |
32 changes: 32 additions & 0 deletions
32
src/generated/resources/data/occultism/advancement/occultism/craft_gray_paste.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": "occultism:occultism/root", | ||
"criteria": { | ||
"craft_gray_paste": { | ||
"conditions": { | ||
"ritual_id": "occultism:ritual/craft_gray_paste" | ||
}, | ||
"trigger": "occultism:ritual" | ||
} | ||
}, | ||
"display": { | ||
"announce_to_chat": false, | ||
"description": { | ||
"translate": "advancements.occultism.craft_gray_paste.description" | ||
}, | ||
"hidden": true, | ||
"icon": { | ||
"count": 1, | ||
"id": "occultism:jei_dummy/none" | ||
}, | ||
"show_toast": false, | ||
"title": { | ||
"translate": "advancements.occultism.craft_gray_paste.title" | ||
} | ||
}, | ||
"requirements": [ | ||
[ | ||
"craft_gray_paste" | ||
] | ||
], | ||
"sends_telemetry_event": true | ||
} |
32 changes: 32 additions & 0 deletions
32
...generated/resources/data/occultism/advancement/occultism/misc_miner_ancient_eldritch.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": "occultism:occultism/root", | ||
"criteria": { | ||
"misc_miner_ancient_eldritch": { | ||
"conditions": { | ||
"ritual_id": "occultism:ritual/misc_miner_ancient_eldritch" | ||
}, | ||
"trigger": "occultism:ritual" | ||
} | ||
}, | ||
"display": { | ||
"announce_to_chat": false, | ||
"description": { | ||
"translate": "advancements.occultism.misc_miner_ancient_eldritch.description" | ||
}, | ||
"hidden": true, | ||
"icon": { | ||
"count": 1, | ||
"id": "occultism:jei_dummy/none" | ||
}, | ||
"show_toast": false, | ||
"title": { | ||
"translate": "advancements.occultism.misc_miner_ancient_eldritch.title" | ||
} | ||
}, | ||
"requirements": [ | ||
[ | ||
"misc_miner_ancient_eldritch" | ||
] | ||
], | ||
"sends_telemetry_event": true | ||
} |
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
32 changes: 32 additions & 0 deletions
32
...erated/resources/data/occultism/advancement/occultism/possess_random_animal_rideable.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": "occultism:occultism/root", | ||
"criteria": { | ||
"possess_random_animal_rideable": { | ||
"conditions": { | ||
"ritual_id": "occultism:ritual/possess_random_animal_rideable" | ||
}, | ||
"trigger": "occultism:ritual" | ||
} | ||
}, | ||
"display": { | ||
"announce_to_chat": false, | ||
"description": { | ||
"translate": "advancements.occultism.possess_random_animal_rideable.description" | ||
}, | ||
"hidden": true, | ||
"icon": { | ||
"count": 1, | ||
"id": "occultism:jei_dummy/none" | ||
}, | ||
"show_toast": false, | ||
"title": { | ||
"translate": "advancements.occultism.possess_random_animal_rideable.title" | ||
} | ||
}, | ||
"requirements": [ | ||
[ | ||
"possess_random_animal_rideable" | ||
] | ||
], | ||
"sends_telemetry_event": true | ||
} |
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
Oops, something went wrong.