Skip to content

Commit

Permalink
feat: add demonic partner
Browse files Browse the repository at this point in the history
  • Loading branch information
klikli-dev committed Jan 20, 2024
1 parent f3ed14b commit 5c37e0f
Show file tree
Hide file tree
Showing 34 changed files with 3,197 additions and 701 deletions.
20 changes: 20 additions & 0 deletions src/generated/resources/assets/occultism/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,18 @@
"book.occultism.dictionary_of_spirits.crafting_rituals.overview.intro.title": "Binding Rituals",
"book.occultism.dictionary_of_spirits.crafting_rituals.overview.name": "Binding Rituals",
"book.occultism.dictionary_of_spirits.crafting_rituals.return_to_rituals.name": "Return to Rituals Category",
"book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.about.text": "The Demonic Partner - a Husband or Wife - can fight for you and help with household chores.\n\\\n\\\nRight-Click with any cookable food and they will use their magic to cook it.\n\\\n\\\nRight-Click with a potion to get the effect for a significantly longer time.\n",
"book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.about.title": "Demonic Partner",
"book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.description": "A demonic Household?",
"book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.description.text": "Magicians practicing the occult are a diverse crowd, coming from all creeds and all corners of the world. However one thing unites them all - they are as lonely as any human without a partner.\n\\\n\\\nOf course being a magician, there is a way to solve this problem once and for all.\n",
"book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.description.title": "Demonic Partner",
"book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.description2.text": "As beings of immense powers Demons can have it all ... except love.\\\nNo demon will freely admit this, but at times they are impressed by the power and strength that some mortal occultists acquire. And in such cases, the impossible can happen - the demon can fall in love with a mortal.\n",
"book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.description2.title": "Demonic Partner",
"book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.description3.text": "Demons, of course, deal in contracts, and what better contract than a marriage contract?\n",
"book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.description3.title": "Demonic Partner",
"book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.husband.title": "Demonic Husband",
"book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.name": "Demonic Partner",
"book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.wife.title": "Demonic Wife",
"book.occultism.dictionary_of_spirits.familiar_rituals.familiar_bat.description.text": "**Upgrade Behaviour**\\\nWhen upgraded by a blacksmith familiar, the bat familiar will give a life steal effect to it's master.\n",
"book.occultism.dictionary_of_spirits.familiar_rituals.familiar_bat.description.title": "Description",
"book.occultism.dictionary_of_spirits.familiar_rituals.familiar_bat.entity.text": "**Provides**: [#](ad03fc)Night Vision[#]()\n",
Expand Down Expand Up @@ -774,6 +786,8 @@
"entity.occultism.chimera_familiar": "Chimera Familiar",
"entity.occultism.cthulhu_familiar": "Cthulhu Familiar",
"entity.occultism.deer_familiar": "Deer Familiar",
"entity.occultism.demonic_husband": "Demonic Husband",
"entity.occultism.demonic_wife": "Demonic Wife",
"entity.occultism.devil_familiar": "Devil Familiar",
"entity.occultism.djinni": "Djinni",
"entity.occultism.dragon_familiar": "Dragon Familiar",
Expand Down Expand Up @@ -1055,6 +1069,10 @@
"item.occultism.ritual_dummy.summon_afrit_rain_weather.tooltip": "Summons an bound Afrit that creates rain.",
"item.occultism.ritual_dummy.summon_afrit_thunder_weather": "Ritual: Thunderstorm",
"item.occultism.ritual_dummy.summon_afrit_thunder_weather.tooltip": "Summons an bound Afrit that creates a thunderstorm.",
"item.occultism.ritual_dummy.summon_demonic_husband": "Ritual: Summon Demonic Husband",
"item.occultism.ritual_dummy.summon_demonic_husband.tooltip": "Summons a Demonic Husband to support you: He will fight for you, help with cooking, and extend potion durations.",
"item.occultism.ritual_dummy.summon_demonic_wife": "Ritual: Summon Demonic Wife",
"item.occultism.ritual_dummy.summon_demonic_wife.tooltip": "Summons a Demonic Wife to support you: She will fight for you, help with cooking, and extend potion durations.",
"item.occultism.ritual_dummy.summon_djinni_clear_weather": "Ritual: Clear Weather",
"item.occultism.ritual_dummy.summon_djinni_clear_weather.tooltip": "Summons a Djinni that clears the weather.",
"item.occultism.ritual_dummy.summon_djinni_crusher": "Ritual: Summon Djinni Crusher",
Expand Down Expand Up @@ -1099,6 +1117,8 @@
"item.occultism.soul_gem_empty": "Empty Soul Gem",
"item.occultism.spawn_egg.afrit": "Afrit Spawn Egg",
"item.occultism.spawn_egg.afrit_wild": "Unbound Afrit Spawn Egg",
"item.occultism.spawn_egg.demonic_husband": "Demonic Husband Spawn Egg",
"item.occultism.spawn_egg.demonic_wife": "Demonic Wife Spawn Egg",
"item.occultism.spawn_egg.djinni": "Djinni Spawn Egg",
"item.occultism.spawn_egg.familiar_bat": "Bat Familiar Spawn Egg",
"item.occultism.spawn_egg.familiar_beaver": "Beaver Familiar Spawn Egg",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "occultism:item/ritual_dummy"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "occultism:item/ritual_dummy"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "minecraft:item/template_spawn_egg"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "minecraft:item/template_spawn_egg"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
{
"background_u_index": 0,
"background_v_index": 0,
"category": "occultism:familiar_rituals",
"condition": {
"type": "modonomicon:true"
},
"description": "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.description",
"hide_while_locked": false,
"icon": {
"height": 16,
"texture": "occultism:textures/gui/book/demonic_partner.png",
"width": 16
},
"name": "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.name",
"pages": [
{
"type": "modonomicon:text",
"anchor": "",
"show_title_separator": true,
"text": "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.description.text",
"title": "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.description.title",
"use_markdown_in_title": false
},
{
"type": "modonomicon:text",
"anchor": "",
"show_title_separator": true,
"text": "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.description2.text",
"title": "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.description2.title",
"use_markdown_in_title": false
},
{
"type": "modonomicon:text",
"anchor": "",
"show_title_separator": true,
"text": "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.description3.text",
"title": "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.description3.title",
"use_markdown_in_title": false
},
{
"type": "modonomicon:text",
"anchor": "",
"show_title_separator": true,
"text": "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.about.text",
"title": "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.about.title",
"use_markdown_in_title": false
},
{
"type": "modonomicon:entity",
"anchor": "",
"default_rotation": -45.0,
"entity_id": "occultism:demonic_wife",
"name": "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.wife.title",
"offset": 0.0,
"rotate": true,
"scale": 1.0,
"text": ""
},
{
"type": "occultism:ritual_recipe",
"anchor": "",
"recipe_id_1": "occultism:ritual/summon_demonic_wife",
"text": "",
"title1": "",
"title2": ""
},
{
"type": "modonomicon:entity",
"anchor": "",
"default_rotation": -45.0,
"entity_id": "occultism:demonic_husband",
"name": "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.husband.title",
"offset": 0.0,
"rotate": true,
"scale": 1.0,
"text": ""
},
{
"type": "occultism:ritual_recipe",
"anchor": "",
"recipe_id_1": "occultism:ritual/summon_demonic_husband",
"text": "",
"title1": "",
"title2": ""
}
],
"parents": [
{
"draw_arrow": true,
"entry": "occultism:familiar_rituals/overview",
"line_enabled": true,
"line_reversed": false
}
],
"show_when_any_parent_unlocked": false,
"x": 2,
"y": -2
}
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,5 @@
],
"show_when_any_parent_unlocked": false,
"x": 2,
"y": 0
"y": 2
}
5 changes: 5 additions & 0 deletions src/main/java/com/klikli_dev/occultism/Occultism.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
import com.klikli_dev.occultism.common.entity.familiar.*;
import com.klikli_dev.occultism.common.entity.possessed.*;
import com.klikli_dev.occultism.common.entity.spirit.*;
import com.klikli_dev.occultism.common.entity.spirit.demonicpartner.husband.DemonicHusband;
import com.klikli_dev.occultism.common.entity.spirit.demonicpartner.wife.DemonicWife;
import com.klikli_dev.occultism.config.OccultismClientConfig;
import com.klikli_dev.occultism.config.OccultismCommonConfig;
import com.klikli_dev.occultism.config.OccultismServerConfig;
Expand Down Expand Up @@ -154,6 +156,9 @@ private void onEntityAttributeCreation(final EntityAttributeCreationEvent event)
event.put(OccultismEntities.MUMMY_FAMILIAR_TYPE.get(), MummyFamiliarEntity.createAttributes().build());
event.put(OccultismEntities.BEAVER_FAMILIAR_TYPE.get(), BeaverFamiliarEntity.createAttributes().build());
event.put(OccultismEntities.SHUB_NIGGURATH_SPAWN_TYPE.get(), ShubNiggurathSpawnEntity.createAttributes().build());

event.put(OccultismEntities.DEMONIC_WIFE.get(), DemonicWife.createAttributes().build());
event.put(OccultismEntities.DEMONIC_HUSBAND.get(), DemonicHusband.createAttributes().build());
}

private void serverSetup(final FMLDedicatedServerSetupEvent event) {
Expand Down
Loading

0 comments on commit 5c37e0f

Please sign in to comment.