Skip to content

Commit

Permalink
feat: Pentacle Rework (#1215) - thanks @Eqis-Edu!
Browse files Browse the repository at this point in the history
* Repair Ritual type

* Change spirits spawn egg color

* No more ritual dummy as output (except resurrect)

* Update tag SLIMEBALLS -> SLIME_BALLS

* Wild drowned don't need silk touch and doubled sniffer egg drop

* Ritual Satchel dummy text

* Ritual Dummy Types

* Fix Summon Ritual give spawn egg

* More consistence in ritual type

* Update apotheosis integration

* Creative tab reorder, real gold -> yellow chalk

* Merged natural sapling block and item, book fix

* Registry new materials (texture, translation and tags)

* Possess Skeleton faster and Wild Evoker cheaper

* Add most recipes of chalk materials

* Smelting/Blasting Netherite Dust

* Repair recipes

* Pentacles Remap

* Dropout "invoke" return "possess"

* Miner to output before break

* Ritual Satchel T2 recipe in correct pentacle

* Magic lamp cost don't reduce with crusher

* Pentacles Remap

* (previous) Pentacles CATEGORY Remap.
[now removed unused imports]

* config miners to output

* Golden Bowl signal cloner

* Text to all entries in pentacle category

* Broken Sea Heart to Marid Essence

* Texture color chalks adjusts

* Remove extra fire particle from large candles

* Icons and images fix

* Chalks advancements

* Advancement Conditions in pentacles entries

* Entries to category locked until has respective chalk

* Changed the "More Chalks" entry

* Unbound Marid

* Warming Solving

* Marid Invulnerabilities

* small book changes

* Possessed Witch for experience bottle

* Goat of Mercy

* Possessed Zombified Piglin

* Possessed Bee

* Eldritch debug

* Dont show placeholder dummy

* Starting solve compatibility

* Real checking

* Updated

* Small adjustments

* Translatable Chalks Advancements

* Familiars Advancement Tab Background to Otherplanks

* Starting another conflict solving

* Starting another conflict solving p2

* Update generated data ritaul recipes

* Return "gold" in yellow chalk id

* Possess Enderman entry description fix

* Fixed some texts that said pentagram instead pentacle

* Wild slime hitbox

* Fix double "purpose" text

* Fix and conditions some book entries

* Possession entries conditions

* Add deepslate, basalt and blackstone to basic miner

* Add crying obsidian and gilded blackstone to ore miner

* Changes in some basic miner weight

* Familiar category progressive unlock (read based)

* Creative tab chalks after books

* Infusing category progressive unlock (read based)

* Summoning category progressive unlock (read based), and turn random animal to possession

* Possessed warden cost reduced

* Miners in enchanting table

* Ancient Miner (first late-game item)

* Craft budding amethyst and reinforced deepslate

* Some tags to "c" instead "occultism"

* fix: book links to moved possession rituals

Some possession rituals have been moved into their correct categories, but there were some dangling backlinks.

---------

Co-authored-by: Kli Kli <[email protected]>
  • Loading branch information
Eqis-Edu and klikli-dev committed Oct 24, 2024
1 parent 1c738b4 commit 51a3ad4
Show file tree
Hide file tree
Showing 807 changed files with 20,199 additions and 4,723 deletions.
750 changes: 548 additions & 202 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
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/chalk_gold_impure"
"layer0": "occultism:item/amethyst_dust"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/chalk_yellow_impure"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/cruelty_essence"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/crushed_blackstone"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/crushed_blue_ice"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/crushed_calcite"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/ritual_dummy"
"layer0": "occultism:item/crushed_ice"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/crushed_packed_ice"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/cursed_honey"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/demonic_meat"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/dragonyst_dust"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/echo_dust"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/emerald_dust"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/gray_paste"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/lapis_dust"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/marid_essence"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/magic_lamp"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/mining_dim_core"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/nature_paste"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/netherite_dust"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/netherite_scrap_dust"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/ritual_dummy_craft"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/ritual_dummy_misc"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/ritual_dummy_possess"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/ritual_dummy_summon"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/repair_icon"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/research_fragment_dust"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/resurrect_icon"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "occultism:item/pentacle_craft"
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"parent": "occultism:item/ritual_dummy"
"parent": "occultism:item/pentacle_craft"
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"parent": "occultism:item/ritual_dummy"
"parent": "occultism:item/pentacle_craft"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "occultism:item/pentacle_craft"
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"parent": "occultism:item/ritual_dummy"
"parent": "occultism:item/pentacle_craft"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "occultism:item/pentacle_craft"
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"parent": "occultism:item/ritual_dummy"
"parent": "occultism:item/pentacle_craft"
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"parent": "occultism:item/ritual_dummy"
"parent": "occultism:item/pentacle_craft"
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"parent": "occultism:item/ritual_dummy"
"parent": "occultism:item/pentacle_craft"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "occultism:item/pentacle_craft"
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"parent": "occultism:item/ritual_dummy"
"parent": "occultism:item/pentacle_craft"
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"parent": "occultism:item/ritual_dummy"
"parent": "occultism:item/pentacle_craft"
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"parent": "occultism:item/ritual_dummy"
"parent": "occultism:item/pentacle_craft"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "occultism:item/pentacle_craft"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "occultism:item/pentacle_craft"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "occultism:item/pentacle_craft"
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"parent": "occultism:item/ritual_dummy"
"parent": "occultism:item/pentacle_craft"
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"parent": "occultism:item/ritual_dummy"
"parent": "occultism:item/pentacle_craft"
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"parent": "occultism:item/ritual_dummy"
"parent": "occultism:item/pentacle_craft"
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"parent": "occultism:item/ritual_dummy"
"parent": "occultism:item/pentacle_craft"
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"parent": "occultism:item/ritual_dummy"
"parent": "occultism:item/pentacle_craft"
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"parent": "occultism:item/ritual_dummy"
"parent": "occultism:item/pentacle_craft"
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"parent": "occultism:item/ritual_dummy"
"parent": "occultism:item/pentacle_craft"
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"parent": "occultism:item/ritual_dummy"
"parent": "occultism:item/pentacle_craft"
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"parent": "occultism:item/ritual_dummy"
"parent": "occultism:item/pentacle_craft"
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"parent": "occultism:item/ritual_dummy"
"parent": "occultism:item/pentacle_craft"
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"parent": "occultism:item/ritual_dummy"
"parent": "occultism:item/pentacle_craft"
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"parent": "occultism:item/ritual_dummy"
"parent": "occultism:item/pentacle_misc"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "occultism:item/pentacle_craft"
}

This file was deleted.

Loading

0 comments on commit 51a3ad4

Please sign in to comment.