-
Notifications
You must be signed in to change notification settings - Fork 53
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Ritual Satchels - speed up drawing pentacles! (#1209)
* feat: poc for auto-chalk * feat: PoC for full pentacle auto chalk * chore: generify satchel code to allow different sizes * feat: set up container functionality and icon for ritual satchels * feat: implement basic real functionality of the t1 satchel * feat: implement basic real functionaliity of the t2 satchel * feat: add basic implementation for "collect pentacle" * feat: add ritual materials tag * fix: satchel item can be moved while container is open * feat: add tag filtering to satchel * fix: shorten error message to fit into screen * chore: cleanup fulfilled todos * feat: move binding rituals category into a category provider * feat: add initial book entries * feat: add crafting recipes * feat: spirit name tooltip * feat: add crafting recipes to book entries * feat: move getting started content into a category provider * chore: refactor namespaces * feat: add getting started entry linking to the satchel entries
- Loading branch information
1 parent
132f43a
commit 2f5be97
Showing
126 changed files
with
5,769 additions
and
4,070 deletions.
There are no files selected for viewing
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
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
3 changes: 3 additions & 0 deletions
3
...enerated/resources/assets/occultism/models/item/ritual_dummy/craft_ritual_satchel_t1.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
...enerated/resources/assets/occultism/models/item/ritual_dummy/craft_ritual_satchel_t2.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" | ||
} |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/occultism/models/item/ritual_satchel_t1.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/ritual_satchel_t1" | ||
} | ||
} |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/occultism/models/item/ritual_satchel_t2.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/ritual_satchel_t2" | ||
} | ||
} |
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 @@ | ||
{ | ||
"values": [ | ||
"minecraft:skeleton_skull", | ||
"minecraft:wither_skeleton_skull" | ||
] | ||
} |
2 changes: 1 addition & 1 deletion
2
src/generated/resources/data/minecraft/tags/item/enchantable/durability.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 |
---|---|---|
@@ -1,7 +1,7 @@ | ||
{ | ||
"values": [ | ||
"#occultism:miners", | ||
"#occultism:tools/chalks", | ||
"#occultism:tools/chalk", | ||
"#occultism:tools/knife" | ||
] | ||
} |
32 changes: 32 additions & 0 deletions
32
...d/resources/data/occultism/advancement/recipes/ritual/ritual/craft_ritual_satchel_t1.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_djinni": { | ||
"conditions": { | ||
"items": [ | ||
{ | ||
"items": "occultism:book_of_binding_bound_djinni" | ||
} | ||
] | ||
}, | ||
"trigger": "minecraft:inventory_changed" | ||
}, | ||
"has_the_recipe": { | ||
"conditions": { | ||
"recipe": "occultism:ritual/craft_ritual_satchel_t1" | ||
}, | ||
"trigger": "minecraft:recipe_unlocked" | ||
} | ||
}, | ||
"requirements": [ | ||
[ | ||
"has_the_recipe", | ||
"has_bound_djinni" | ||
] | ||
], | ||
"rewards": { | ||
"recipes": [ | ||
"occultism:ritual/craft_ritual_satchel_t1" | ||
] | ||
} | ||
} |
32 changes: 32 additions & 0 deletions
32
...d/resources/data/occultism/advancement/recipes/ritual/ritual/craft_ritual_satchel_t2.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/craft_ritual_satchel_t2" | ||
}, | ||
"trigger": "minecraft:recipe_unlocked" | ||
} | ||
}, | ||
"requirements": [ | ||
[ | ||
"has_the_recipe", | ||
"has_bound_afrit" | ||
] | ||
], | ||
"rewards": { | ||
"recipes": [ | ||
"occultism:ritual/craft_ritual_satchel_t2" | ||
] | ||
} | ||
} |
73 changes: 73 additions & 0 deletions
73
...micon/books/dictionary_of_spirits/entries/crafting_rituals/apprentice_ritual_satchel.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,73 @@ | ||
{ | ||
"background_u_index": 0, | ||
"background_v_index": 0, | ||
"category": "crafting_rituals", | ||
"condition": { | ||
"type": "modonomicon:true" | ||
}, | ||
"description": "book.occultism.dictionary_of_spirits.crafting_rituals.apprentice_ritual_satchel.description", | ||
"hide_while_locked": false, | ||
"icon": { | ||
"item": "occultism:ritual_satchel_t1" | ||
}, | ||
"name": "book.occultism.dictionary_of_spirits.crafting_rituals.apprentice_ritual_satchel.name", | ||
"pages": [ | ||
{ | ||
"type": "modonomicon:spotlight", | ||
"anchor": "", | ||
"condition": { | ||
"type": "modonomicon:none" | ||
}, | ||
"item": { | ||
"item": "occultism:ritual_satchel_t1" | ||
}, | ||
"text": "book.occultism.dictionary_of_spirits.crafting_rituals.apprentice_ritual_satchel.spotlight.text", | ||
"title": "" | ||
}, | ||
{ | ||
"type": "modonomicon:text", | ||
"anchor": "", | ||
"condition": { | ||
"type": "modonomicon:none" | ||
}, | ||
"show_title_separator": true, | ||
"text": "book.occultism.dictionary_of_spirits.crafting_rituals.apprentice_ritual_satchel.about.text", | ||
"title": "book.occultism.dictionary_of_spirits.crafting_rituals.apprentice_ritual_satchel.about.title", | ||
"use_markdown_in_title": false | ||
}, | ||
{ | ||
"type": "occultism:ritual_recipe", | ||
"anchor": "", | ||
"condition": { | ||
"type": "modonomicon:none" | ||
}, | ||
"recipe_id_1": "occultism:ritual/craft_ritual_satchel_t1", | ||
"text": "", | ||
"title1": "", | ||
"title2": "" | ||
}, | ||
{ | ||
"type": "modonomicon:text", | ||
"anchor": "", | ||
"condition": { | ||
"type": "modonomicon:none" | ||
}, | ||
"show_title_separator": true, | ||
"text": "book.occultism.dictionary_of_spirits.crafting_rituals.apprentice_ritual_satchel.usage.text", | ||
"title": "book.occultism.dictionary_of_spirits.crafting_rituals.apprentice_ritual_satchel.usage.title", | ||
"use_markdown_in_title": false | ||
} | ||
], | ||
"parents": [ | ||
{ | ||
"draw_arrow": true, | ||
"entry": "crafting_rituals/craft_satchel", | ||
"line_enabled": true, | ||
"line_reversed": false | ||
} | ||
], | ||
"show_when_any_parent_unlocked": false, | ||
"sort_number": 19, | ||
"x": 3, | ||
"y": 1 | ||
} |
84 changes: 84 additions & 0 deletions
84
...omicon/books/dictionary_of_spirits/entries/crafting_rituals/artisanal_ritual_satchel.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,84 @@ | ||
{ | ||
"background_u_index": 0, | ||
"background_v_index": 0, | ||
"category": "crafting_rituals", | ||
"condition": { | ||
"type": "modonomicon:true" | ||
}, | ||
"description": "book.occultism.dictionary_of_spirits.crafting_rituals.artisanal_ritual_satchel.description", | ||
"hide_while_locked": false, | ||
"icon": { | ||
"item": "occultism:ritual_satchel_t2" | ||
}, | ||
"name": "book.occultism.dictionary_of_spirits.crafting_rituals.artisanal_ritual_satchel.name", | ||
"pages": [ | ||
{ | ||
"type": "modonomicon:spotlight", | ||
"anchor": "", | ||
"condition": { | ||
"type": "modonomicon:none" | ||
}, | ||
"item": { | ||
"item": "occultism:ritual_satchel_t2" | ||
}, | ||
"text": "book.occultism.dictionary_of_spirits.crafting_rituals.artisanal_ritual_satchel.spotlight.text", | ||
"title": "" | ||
}, | ||
{ | ||
"type": "modonomicon:text", | ||
"anchor": "", | ||
"condition": { | ||
"type": "modonomicon:none" | ||
}, | ||
"show_title_separator": true, | ||
"text": "book.occultism.dictionary_of_spirits.crafting_rituals.artisanal_ritual_satchel.about.text", | ||
"title": "book.occultism.dictionary_of_spirits.crafting_rituals.artisanal_ritual_satchel.about.title", | ||
"use_markdown_in_title": false | ||
}, | ||
{ | ||
"type": "occultism:ritual_recipe", | ||
"anchor": "", | ||
"condition": { | ||
"type": "modonomicon:none" | ||
}, | ||
"recipe_id_1": "occultism:ritual/craft_ritual_satchel_t2", | ||
"text": "", | ||
"title1": "", | ||
"title2": "" | ||
}, | ||
{ | ||
"type": "modonomicon:text", | ||
"anchor": "", | ||
"condition": { | ||
"type": "modonomicon:none" | ||
}, | ||
"show_title_separator": true, | ||
"text": "book.occultism.dictionary_of_spirits.crafting_rituals.artisanal_ritual_satchel.usage_drawing.text", | ||
"title": "book.occultism.dictionary_of_spirits.crafting_rituals.artisanal_ritual_satchel.usage_drawing.title", | ||
"use_markdown_in_title": false | ||
}, | ||
{ | ||
"type": "modonomicon:text", | ||
"anchor": "", | ||
"condition": { | ||
"type": "modonomicon:none" | ||
}, | ||
"show_title_separator": true, | ||
"text": "book.occultism.dictionary_of_spirits.crafting_rituals.artisanal_ritual_satchel.usage_cleaning.text", | ||
"title": "book.occultism.dictionary_of_spirits.crafting_rituals.artisanal_ritual_satchel.usage_cleaning.title", | ||
"use_markdown_in_title": false | ||
} | ||
], | ||
"parents": [ | ||
{ | ||
"draw_arrow": true, | ||
"entry": "crafting_rituals/apprentice_ritual_satchel", | ||
"line_enabled": true, | ||
"line_reversed": false | ||
} | ||
], | ||
"show_when_any_parent_unlocked": false, | ||
"sort_number": 20, | ||
"x": 5, | ||
"y": 1 | ||
} |
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 |
---|---|---|
|
@@ -45,7 +45,7 @@ | |
} | ||
], | ||
"show_when_any_parent_unlocked": false, | ||
"sort_number": -1, | ||
"sort_number": 6, | ||
"x": 0, | ||
"y": -5 | ||
} |
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 |
---|---|---|
|
@@ -45,7 +45,7 @@ | |
} | ||
], | ||
"show_when_any_parent_unlocked": false, | ||
"sort_number": -1, | ||
"sort_number": 9, | ||
"x": -2, | ||
"y": 1 | ||
} |
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 |
---|---|---|
|
@@ -56,7 +56,7 @@ | |
} | ||
], | ||
"show_when_any_parent_unlocked": false, | ||
"sort_number": -1, | ||
"sort_number": 3, | ||
"x": -6, | ||
"y": -5 | ||
} |
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 |
---|---|---|
|
@@ -45,7 +45,7 @@ | |
} | ||
], | ||
"show_when_any_parent_unlocked": false, | ||
"sort_number": -1, | ||
"sort_number": 5, | ||
"x": -2, | ||
"y": -5 | ||
} |
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 |
---|---|---|
|
@@ -56,7 +56,7 @@ | |
} | ||
], | ||
"show_when_any_parent_unlocked": false, | ||
"sort_number": -1, | ||
"sort_number": 22, | ||
"x": -2, | ||
"y": -3 | ||
} |
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 |
---|---|---|
|
@@ -78,7 +78,7 @@ | |
} | ||
], | ||
"show_when_any_parent_unlocked": false, | ||
"sort_number": -1, | ||
"sort_number": 4, | ||
"x": -4, | ||
"y": -5 | ||
} |
Oops, something went wrong.