Skip to content

Commit

Permalink
feat: Random Animals, Smelter Spirit, Familiars checkup, Achievements…
Browse files Browse the repository at this point in the history
… 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
Eqis-Edu authored Nov 19, 2024
1 parent ee47db2 commit e5819c2
Show file tree
Hide file tree
Showing 226 changed files with 4,637 additions and 984 deletions.
345 changes: 235 additions & 110 deletions src/generated/resources/assets/occultism/lang/en_us.json

Large diffs are not rendered by default.

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"
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "occultism:item/pentacle_misc"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "occultism:item/pentacle_possess"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "occultism:item/pentacle_possess"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "occultism:item/pentacle_possess"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "occultism:item/pentacle_possess"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "occultism:item/pentacle_possess"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "occultism:item/pentacle_summon"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "occultism:item/pentacle_summon"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "occultism:item/pentacle_summon"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "occultism:item/pentacle_summon"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "occultism:item/pentacle_misc"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "occultism:item/pentacle_misc"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "occultism:item/pentacle_misc"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "occultism:item/pentacle_misc"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "occultism:item/pentacle_misc"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "occultism:item/pentacle_misc"
}
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"
]
}
3 changes: 2 additions & 1 deletion src/generated/resources/data/c/tags/entity_type/goats.json
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"
]
}
3 changes: 2 additions & 1 deletion src/generated/resources/data/c/tags/entity_type/hoglins.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"values": [
"minecraft:hoglin"
"minecraft:hoglin",
"occultism:possessed_hoglin"
]
}
6 changes: 5 additions & 1 deletion src/generated/resources/data/c/tags/entity_type/zombies.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
"minecraft:zombie",
"minecraft:zombie_villager",
"minecraft:husk",
"minecraft:drowned"
"minecraft:drowned",
"occultism:wild_zombie",
"occultism:wild_husk",
"occultism:wild_horde_drowned",
"occultism:possessed_zombie_piglin"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "ae2:certus_quartz_dust",
"required": false
}
]
}
8 changes: 8 additions & 0 deletions src/generated/resources/data/c/tags/item/dusts/fluix.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "ae2:fluix_dust",
"required": false
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "actuallyadditions:black_quartz",
"required": false
}
]
}
8 changes: 8 additions & 0 deletions src/generated/resources/data/c/tags/item/gems/fluix.json
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 src/generated/resources/data/c/tags/item/mushroom_blocks.json
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"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "actuallyadditions:black_quartz_ore",
"required": false
}
]
}
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
}
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
}
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"parent": "occultism:occultism/root",
"criteria": {
"craft_miner_ancient_eldritch": {
"possess_random_animal_common": {
"conditions": {
"ritual_id": "occultism:ritual/craft_miner_ancient_eldritch"
"ritual_id": "occultism:ritual/possess_random_animal_common"
},
"trigger": "occultism:ritual"
}
},
"display": {
"announce_to_chat": false,
"description": {
"translate": "advancements.occultism.craft_miner_ancient_eldritch.description"
"translate": "advancements.occultism.possess_random_animal_common.description"
},
"hidden": true,
"icon": {
Expand All @@ -20,12 +20,12 @@
},
"show_toast": false,
"title": {
"translate": "advancements.occultism.craft_miner_ancient_eldritch.title"
"translate": "advancements.occultism.possess_random_animal_common.title"
}
},
"requirements": [
[
"craft_miner_ancient_eldritch"
"possess_random_animal_common"
]
],
"sends_telemetry_event": true
Expand Down
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
}
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"parent": "occultism:occultism/root",
"criteria": {
"possess_random_animal": {
"possess_random_animal_small": {
"conditions": {
"ritual_id": "occultism:ritual/possess_random_animal"
"ritual_id": "occultism:ritual/possess_random_animal_small"
},
"trigger": "occultism:ritual"
}
},
"display": {
"announce_to_chat": false,
"description": {
"translate": "advancements.occultism.possess_random_animal.description"
"translate": "advancements.occultism.possess_random_animal_small.description"
},
"hidden": true,
"icon": {
Expand All @@ -20,12 +20,12 @@
},
"show_toast": false,
"title": {
"translate": "advancements.occultism.possess_random_animal.title"
"translate": "advancements.occultism.possess_random_animal_small.title"
}
},
"requirements": [
[
"possess_random_animal"
"possess_random_animal_small"
]
],
"sends_telemetry_event": true
Expand Down
Loading

0 comments on commit e5819c2

Please sign in to comment.