Skip to content

Commit e5819c2

Browse files
Eqis-EduEqis-Edu
authored
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
1 parent ee47db2 commit e5819c2

File tree

226 files changed

+4637
-984
lines changed

Some content is hidden

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

226 files changed

+4637
-984
lines changed

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

+235-110
Large diffs are not rendered by default.

‎src/generated/resources/assets/occultism/models/item/mysterious_egg_icon.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "occultism:item/mysterious_egg_icon"
5+
}
6+
}

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

-3
This file was deleted.

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

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

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

File renamed without changes.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

‎src/generated/resources/data/c/tags/block/mushroom_blocks.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"values": [
3+
"minecraft:mushroom_stem",
4+
"minecraft:red_mushroom_block",
5+
"minecraft:brown_mushroom_block"
6+
]
7+
}

‎src/generated/resources/data/c/tags/entity_type/goats.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"values": [
33
"minecraft:goat",
4-
"occultism:mercy_goat"
4+
"occultism:mercy_goat",
5+
"occultism:goat_familiar"
56
]
67
}

‎src/generated/resources/data/c/tags/entity_type/hoglins.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"values": [
3-
"minecraft:hoglin"
3+
"minecraft:hoglin",
4+
"occultism:possessed_hoglin"
45
]
56
}

‎src/generated/resources/data/c/tags/entity_type/zombies.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
"minecraft:zombie",
44
"minecraft:zombie_villager",
55
"minecraft:husk",
6-
"minecraft:drowned"
6+
"minecraft:drowned",
7+
"occultism:wild_zombie",
8+
"occultism:wild_husk",
9+
"occultism:wild_horde_drowned",
10+
"occultism:possessed_zombie_piglin"
711
]
812
}

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

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

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

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

‎src/generated/resources/data/c/tags/item/gems/black_quartz.json

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

‎src/generated/resources/data/c/tags/item/gems/fluix.json

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

‎src/generated/resources/data/c/tags/item/mushroom_blocks.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"values": [
3+
"minecraft:mushroom_stem",
4+
"minecraft:red_mushroom_block",
5+
"minecraft:brown_mushroom_block"
6+
]
7+
}

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

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

‎src/generated/resources/data/occultism/advancement/occultism/craft_gray_paste.json

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "occultism:occultism/root",
3+
"criteria": {
4+
"craft_gray_paste": {
5+
"conditions": {
6+
"ritual_id": "occultism:ritual/craft_gray_paste"
7+
},
8+
"trigger": "occultism:ritual"
9+
}
10+
},
11+
"display": {
12+
"announce_to_chat": false,
13+
"description": {
14+
"translate": "advancements.occultism.craft_gray_paste.description"
15+
},
16+
"hidden": true,
17+
"icon": {
18+
"count": 1,
19+
"id": "occultism:jei_dummy/none"
20+
},
21+
"show_toast": false,
22+
"title": {
23+
"translate": "advancements.occultism.craft_gray_paste.title"
24+
}
25+
},
26+
"requirements": [
27+
[
28+
"craft_gray_paste"
29+
]
30+
],
31+
"sends_telemetry_event": true
32+
}

‎src/generated/resources/data/occultism/advancement/occultism/misc_miner_ancient_eldritch.json

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "occultism:occultism/root",
3+
"criteria": {
4+
"misc_miner_ancient_eldritch": {
5+
"conditions": {
6+
"ritual_id": "occultism:ritual/misc_miner_ancient_eldritch"
7+
},
8+
"trigger": "occultism:ritual"
9+
}
10+
},
11+
"display": {
12+
"announce_to_chat": false,
13+
"description": {
14+
"translate": "advancements.occultism.misc_miner_ancient_eldritch.description"
15+
},
16+
"hidden": true,
17+
"icon": {
18+
"count": 1,
19+
"id": "occultism:jei_dummy/none"
20+
},
21+
"show_toast": false,
22+
"title": {
23+
"translate": "advancements.occultism.misc_miner_ancient_eldritch.title"
24+
}
25+
},
26+
"requirements": [
27+
[
28+
"misc_miner_ancient_eldritch"
29+
]
30+
],
31+
"sends_telemetry_event": true
32+
}

‎src/generated/resources/data/occultism/advancement/occultism/craft_miner_ancient_eldritch.json ‎src/generated/resources/data/occultism/advancement/occultism/possess_random_animal_common.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"parent": "occultism:occultism/root",
33
"criteria": {
4-
"craft_miner_ancient_eldritch": {
4+
"possess_random_animal_common": {
55
"conditions": {
6-
"ritual_id": "occultism:ritual/craft_miner_ancient_eldritch"
6+
"ritual_id": "occultism:ritual/possess_random_animal_common"
77
},
88
"trigger": "occultism:ritual"
99
}
1010
},
1111
"display": {
1212
"announce_to_chat": false,
1313
"description": {
14-
"translate": "advancements.occultism.craft_miner_ancient_eldritch.description"
14+
"translate": "advancements.occultism.possess_random_animal_common.description"
1515
},
1616
"hidden": true,
1717
"icon": {
@@ -20,12 +20,12 @@
2020
},
2121
"show_toast": false,
2222
"title": {
23-
"translate": "advancements.occultism.craft_miner_ancient_eldritch.title"
23+
"translate": "advancements.occultism.possess_random_animal_common.title"
2424
}
2525
},
2626
"requirements": [
2727
[
28-
"craft_miner_ancient_eldritch"
28+
"possess_random_animal_common"
2929
]
3030
],
3131
"sends_telemetry_event": true

‎src/generated/resources/data/occultism/advancement/occultism/possess_random_animal_rideable.json

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "occultism:occultism/root",
3+
"criteria": {
4+
"possess_random_animal_rideable": {
5+
"conditions": {
6+
"ritual_id": "occultism:ritual/possess_random_animal_rideable"
7+
},
8+
"trigger": "occultism:ritual"
9+
}
10+
},
11+
"display": {
12+
"announce_to_chat": false,
13+
"description": {
14+
"translate": "advancements.occultism.possess_random_animal_rideable.description"
15+
},
16+
"hidden": true,
17+
"icon": {
18+
"count": 1,
19+
"id": "occultism:jei_dummy/none"
20+
},
21+
"show_toast": false,
22+
"title": {
23+
"translate": "advancements.occultism.possess_random_animal_rideable.title"
24+
}
25+
},
26+
"requirements": [
27+
[
28+
"possess_random_animal_rideable"
29+
]
30+
],
31+
"sends_telemetry_event": true
32+
}

‎src/generated/resources/data/occultism/advancement/occultism/possess_random_animal.json ‎src/generated/resources/data/occultism/advancement/occultism/possess_random_animal_small.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"parent": "occultism:occultism/root",
33
"criteria": {
4-
"possess_random_animal": {
4+
"possess_random_animal_small": {
55
"conditions": {
6-
"ritual_id": "occultism:ritual/possess_random_animal"
6+
"ritual_id": "occultism:ritual/possess_random_animal_small"
77
},
88
"trigger": "occultism:ritual"
99
}
1010
},
1111
"display": {
1212
"announce_to_chat": false,
1313
"description": {
14-
"translate": "advancements.occultism.possess_random_animal.description"
14+
"translate": "advancements.occultism.possess_random_animal_small.description"
1515
},
1616
"hidden": true,
1717
"icon": {
@@ -20,12 +20,12 @@
2020
},
2121
"show_toast": false,
2222
"title": {
23-
"translate": "advancements.occultism.possess_random_animal.title"
23+
"translate": "advancements.occultism.possess_random_animal_small.title"
2424
}
2525
},
2626
"requirements": [
2727
[
28-
"possess_random_animal"
28+
"possess_random_animal_small"
2929
]
3030
],
3131
"sends_telemetry_event": true

0 commit comments

Comments
 (0)