I wanna sleep on their chest I miss them lots

SammySemicolon · Mar 12, 2024 · 49a8ca3 · 49a8ca3
1 parent e6255bb
commit 49a8ca3
Show file tree

Hide file tree

Showing 110 changed files with 1,283 additions and 928 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -37,4 +37,4 @@ modDescription=A dark magic mod focused on soul and spirit magic.
 # Mod Dependency Versions
 lodestoneVersion=1.4.2.79
 jeiVersion=15.2.0.22
-curiosVersion=5.7.0+1.20.1
+curiosVersion=5.7.1+1.20.1
diff --git a/src/generated/resources/assets/malum/lang/en_us.json b/src/generated/resources/assets/malum/lang/en_us.json
@@ -241,8 +241,6 @@
   "curios.identifier.rune": "Rune",
   "curios.modifiers.brooch": "When worn:",
   "curios.modifiers.rune": "When equipped:",
-  "curios.slot.brooch": "Brooch",
-  "curios.slot.rune": "Rune",
   "death.attack.scythe_sweep": "%s was sliced in half",
   "death.attack.scythe_sweep.player": "%s was sliced in half by %s",
   "death.attack.voodoo": "%s had their soul shattered",
@@ -417,6 +415,7 @@
   "item.malum.pride_prideweave": "Pride Prideweave",
   "item.malum.prismatic_focus_lens": "Prismatic Focus Lens",
   "item.malum.processed_soulstone": "Processed Soulstone",
+  "item.malum.ravenous_brooch": "Ravenous Brooch",
   "item.malum.raw_soulstone": "Raw Soulstone",
   "item.malum.ring_of_alchemical_mastery": "Ring of Alchemical Mastery",
   "item.malum.ring_of_arcane_prowess": "Ring of Arcane Prowess",
@@ -1015,7 +1014,24 @@
   "malum.gui.crucible.attribute.shielding_chance": "Shielding Chance",
   "malum.gui.crucible.attribute.tuning_potency": "Tuning Potency",
   "malum.gui.crucible.attribute.weakest_boost": "Weakest Boost",
-  "malum.gui.effect": "Effect: ",
+  "malum.gui.curio.effect.belt_of_the_limitless": "+Soul Ward Absorbs Physical Damage Equally to Magic Damage",
+  "malum.gui.curio.effect.belt_of_the_magebane": "+Magic Damage no Longer Impedes Soul Ward Recovery",
+  "malum.gui.curio.effect.belt_of_the_prospector": "+Explosions are Enchanted with Fortune III\n+Protects Valuable Items from Explosions",
+  "malum.gui.curio.effect.belt_of_the_starved": "+Spirit Collection Generates Gluttony\n -Gluttony Exchanges Hunger for Magic Proficiency",
+  "malum.gui.curio.effect.necklace_of_blissful_harmony": "+Reduces Enemy Aggression",
+  "malum.gui.curio.effect.necklace_of_the_hidden_blade": "+Enables a Powerful Scythe Counter Attack When Struck",
+  "malum.gui.curio.effect.necklace_of_the_narrow_edge": "-Disables Scythe Sweeping",
+  "malum.gui.curio.effect.necklace_of_the_watcher": "+Striking Full Health Targets Triggers Spirit Collection Effects",
+  "malum.gui.curio.effect.necklace_of_tidal_affinity": "+Conduit Power Provides Numerous Benefits",
+  "malum.gui.curio.effect.ravenous_brooch": "-Actively Drains Hunger",
+  "malum.gui.curio.effect.ring_of_alchemical_mastery": "+Spirit Collection Aids Potion Durations",
+  "malum.gui.curio.effect.ring_of_arcane_prowess": "+Spirit Collection Generates Experience Points",
+  "malum.gui.curio.effect.ring_of_curative_talent": "+Spirit Collection Replenishes Health",
+  "malum.gui.curio.effect.ring_of_desperate_voracity": "+Rotten Foods are Tastier\n+Eating Rotten Foods Extends Gluttony",
+  "malum.gui.curio.effect.ring_of_growing_flesh": "+Spirit Collection Grants Extra Hearts",
+  "malum.gui.curio.effect.ring_of_gruesome_satiation": "+Eating Rotten Foods Generates Gluttony",
+  "malum.gui.curio.effect.ring_of_the_demolitionist": "+Improves Explosions",
+  "malum.gui.curio.effect.ring_of_the_hoarder": "+Blown Up Blocks Are Teleported To Your Location",
   "malum.gui.rite.aerial_rite": "Rite of Motion",
   "malum.gui.rite.aqueous_rite": "Rite of Loyalty",
   "malum.gui.rite.arcane_rite": "Undirected Rite",
@@ -1049,6 +1065,7 @@
   "malum.gui.rite.sacred_rite": "Rite of Healing",
   "malum.gui.rite.type": "Type: ",
   "malum.gui.rite.wicked_rite": "Rite of Decay",
+  "malum.gui.rite_effect": "Effect: ",
   "malum.gui.ritual.cthonic_conversion": "Cthonic Conversion",
   "malum.gui.ritual.grotesque_expulsion": "Grotesque Expulsion",
   "malum.gui.ritual.hexing_transmission": "Hexing Transmission",
@@ -1063,18 +1080,17 @@
   "malum.gui.ritual.tier.vivid": "Vivid",
   "malum.gui.ritual.type": "Ritual Type: ",
   "malum.gui.ritual.warped_time": "Warped Time",
-  "malum.gui.rune.effect.aliment_cleansing": "Cleanses Negative Effects; Heals when Cleansed",
-  "malum.gui.rune.effect.dexterity": "Higher Speed at Low Health",
-  "malum.gui.rune.effect.haste": "Increased mining speed",
-  "malum.gui.rune.effect.heretic": "Silences Attackers",
-  "malum.gui.rune.effect.idle_restoration": "Passive Healing",
-  "malum.gui.rune.effect.igneous_solace": "Damage Resistance while Burning",
-  "malum.gui.rune.effect.reactive_shielding": "Damage Resistance when Struck",
-  "malum.gui.rune.effect.sacrificial_empowerment": "Scythe Damage on Kill",
-  "malum.gui.rune.effect.twinned_duration": "Doubled Positive Effect Durations",
-  "malum.gui.rune.effect.unnatural_stamina": "Sprinting Always Available",
-  "malum.gui.rune.effect.volatile_distortion": "Vorpal Damage Output",
-  "malum.gui.rune.plus": "+",
+  "malum.gui.rune.effect.aliment_cleansing": "+Cleanses Negative Effects; Heals when Cleansed",
+  "malum.gui.rune.effect.dexterity": "+Provides Higher Speed at Low Health",
+  "malum.gui.rune.effect.haste": "+Increases mining speed",
+  "malum.gui.rune.effect.heretic": "+Silences Attackers",
+  "malum.gui.rune.effect.idle_restoration": "+Provides Passive Healing",
+  "malum.gui.rune.effect.igneous_solace": "+Provides Damage Resistance while Burning",
+  "malum.gui.rune.effect.reactive_shielding": "+Grants Damage Resistance when Struck",
+  "malum.gui.rune.effect.sacrificial_empowerment": "+Grants Scythe Damage on Kill",
+  "malum.gui.rune.effect.twinned_duration": "+Doubles Positive Effect Durations",
+  "malum.gui.rune.effect.unnatural_stamina": "+Sprinting Always Available",
+  "malum.gui.rune.effect.volatile_distortion": "+Enables Vorpal Damage Output",
   "malum.jei.spirit_focusing": "Spirit Focusing",
   "malum.jei.spirit_infusion": "Spirit Infusion",
   "malum.jei.spirit_repair": "Spirit Repair",

diff --git a/src/generated/resources/assets/malum/models/item/ravenous_brooch.json b/src/generated/resources/assets/malum/models/item/ravenous_brooch.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "malum:item/ravenous_brooch"
+  }
+}
diff --git a/src/generated/resources/data/curios/tags/items/brooch.json b/src/generated/resources/data/curios/tags/items/brooch.json
@@ -2,6 +2,7 @@
   "values": [
     "malum:runic_brooch",
     "malum:sacrificial_brooch",
-    "malum:glass_brooch"
+    "malum:glass_brooch",
+    "malum:ravenous_brooch"
   ]
 }
diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/belt_of_the_starved.json b/src/generated/resources/data/malum/recipes/spirit_infusion/belt_of_the_starved.json
@@ -2,15 +2,15 @@
   "type": "malum:spirit_infusion",
   "extra_items": [
     {
-      "count": 2,
+      "count": 4,
       "item": "minecraft:bone"
     },
     {
-      "count": 4,
+      "count": 8,
       "item": "malum:grim_talc"
     },
     {
-      "count": 2,
+      "count": 4,
       "item": "malum:rotting_essence"
     },
     {
@@ -36,7 +36,7 @@
     },
     {
       "type": "arcane",
-      "count": 8
+      "count": 16
     }
   ]
 }
diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/ravenous_brooch.json b/src/generated/resources/data/malum/recipes/spirit_infusion/ravenous_brooch.json
@@ -0,0 +1,26 @@
+{
+  "type": "malum:spirit_infusion",
+  "extra_items": [
+    {
+      "count": 8,
+      "item": "malum:rotting_essence"
+    },
+    {
+      "count": 4,
+      "item": "malum:grim_talc"
+    }
+  ],
+  "input": {
+    "count": 1,
+    "item": "malum:sacrificial_brooch"
+  },
+  "output": {
+    "item": "malum:ravenous_brooch"
+  },
+  "spirits": [
+    {
+      "type": "wicked",
+      "count": 32
+    }
+  ]
+}
diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_desperate_voracity.json b/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_desperate_voracity.json
@@ -2,19 +2,19 @@
   "type": "malum:spirit_infusion",
   "extra_items": [
     {
-      "count": 2,
+      "count": 4,
       "item": "minecraft:bone"
     },
     {
-      "count": 2,
+      "count": 4,
       "item": "malum:grim_talc"
     },
     {
-      "count": 8,
+      "count": 16,
       "item": "minecraft:rotten_flesh"
     },
     {
-      "count": 2,
+      "count": 4,
       "item": "malum:hex_ash"
     }
   ],
@@ -28,15 +28,15 @@
   "spirits": [
     {
       "type": "wicked",
-      "count": 16
+      "count": 32
     },
     {
       "type": "sacred",
-      "count": 8
+      "count": 16
     },
     {
       "type": "arcane",
-      "count": 8
+      "count": 16
     }
   ]
 }
diff --git a/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_the_hoarder.json b/src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_the_hoarder.json
@@ -28,15 +28,15 @@
   "spirits": [
     {
       "type": "earthen",
-      "count": 16
+      "count": 32
     },
     {
       "type": "sacred",
-      "count": 8
+      "count": 16
     },
     {
       "type": "arcane",
-      "count": 8
+      "count": 16
     }
   ]
 }
diff --git a/...client/model/MalignantLeadArmorModel.java → .../model/MalignantStrongholdArmorModel.java b/...client/model/MalignantLeadArmorModel.java → .../model/MalignantStrongholdArmorModel.java
@@ -7,7 +7,7 @@
 import com.google.common.collect.*;
 import com.mojang.blaze3d.vertex.*;
 import com.sammy.malum.*;
-import com.sammy.malum.common.item.curiosities.runes.*;
+import com.sammy.malum.common.item.curiosities.curios.runes.*;
 import com.sammy.malum.core.systems.spirit.*;
 import com.sammy.malum.registry.client.*;
 import net.minecraft.client.*;
@@ -25,11 +25,11 @@
 import team.lodestar.lodestone.systems.model.*;
 
 import java.awt.*;
-import java.util.*;
 import java.util.List;
+import java.util.*;
 import java.util.stream.*;
 
-public class MalignantLeadArmorModel extends LodestoneArmorModel {
+public class MalignantStrongholdArmorModel extends LodestoneArmorModel {
     public static final ModelLayerLocation LAYER = new ModelLayerLocation(MalumMod.malumPath("malignant_lead_armor"), "main");
     public static final ResourceLocation GLOW_TEXTURE = MalumMod.malumPath("textures/armor/malignant_stronghold_glow.png");
     private final ModelPart right_arm_glow;
@@ -41,7 +41,7 @@ public class MalignantLeadArmorModel extends LodestoneArmorModel {
 
     private final List<MalumSpiritType> activeGlows = new ArrayList<>();
 
-    public MalignantLeadArmorModel(ModelPart root) {
+    public MalignantStrongholdArmorModel(ModelPart root) {
         super(root);
         this.right_arm_glow = root.getChild("right_arm_glow");
         this.left_arm_glow = root.getChild("left_arm_glow");

diff --git a/src/main/java/com/sammy/malum/client/screen/codex/entries/AugmentationEntries.java b/src/main/java/com/sammy/malum/client/screen/codex/entries/AugmentationEntries.java
@@ -14,65 +14,65 @@ public static void setupEntries(List<BookEntry> entries) {
         Item EMPTY = ItemStack.EMPTY.getItem();
 
         entries.add(new BookEntry<>(
-                "crucible_augmentation", 10, 8)
-                .setWidgetConfig(w -> w.setIcon(TUNING_FORK))
+                "crucible_augmentation", 11, 8)
+                .setWidgetConfig(w -> w.setIcon(TUNING_FORK).setStyle(BookWidgetStyle.GILDED_RUNEWOOD))
                 .addPage(new HeadlineTextPage("crucible_augmentation", "crucible_augmentation.1"))
                 .addPage(new TextPage("crucible_augmentation.2"))
                 .addPage(new TextPage("crucible_augmentation.3"))
                 .addPage(SpiritInfusionPage.fromOutput(TUNING_FORK.get()))
         );
 
         entries.add(new BookEntry<>(
-                "mending_diffuser", 11, 7)
+                "mending_diffuser", 12, 7)
                 .setWidgetConfig(w -> w.setIcon(MENDING_DIFFUSER))
                 .addPage(new HeadlineTextPage("mending_diffuser", "mending_diffuser.1"))
                 .addPage(SpiritInfusionPage.fromOutput(MENDING_DIFFUSER.get()))
         );
 
         entries.add(new BookEntry<>(
-                "impurity_stabilizer", 12, 7)
+                "impurity_stabilizer", 13, 7)
                 .setWidgetConfig(w -> w.setIcon(IMPURITY_STABILIZER))
                 .addPage(new HeadlineTextPage("impurity_stabilizer", "impurity_stabilizer.1"))
                 .addPage(SpiritInfusionPage.fromOutput(IMPURITY_STABILIZER.get()))
         );
 
         entries.add(new BookEntry<>(
-                "accelerating_inlay", 13, 8)
+                "accelerating_inlay", 14, 8)
                 .setWidgetConfig(w -> w.setIcon(ACCELERATING_INLAY))
                 .addPage(new HeadlineTextPage("accelerating_inlay", "accelerating_inlay.1"))
                 .addPage(SpiritInfusionPage.fromOutput(ACCELERATING_INLAY.get()))
         );
 
         entries.add(new BookEntry<>(
-                "blazing_diode", 12, 8)
+                "blazing_diode", 13, 8)
                 .setWidgetConfig(w -> w.setIcon(BLAZING_DIODE))
                 .addPage(new HeadlineTextPage("blazing_diode", "blazing_diode.1"))
                 .addPage(SpiritInfusionPage.fromOutput(BLAZING_DIODE.get()))
         );
 
         entries.add(new BookEntry<>(
-                "prismatic_focus_lens", 12, 9)
+                "prismatic_focus_lens", 13, 9)
                 .setWidgetConfig(w -> w.setIcon(PRISMATIC_FOCUS_LENS))
                 .addPage(new HeadlineTextPage("prismatic_focus_lens", "prismatic_focus_lens.1"))
                 .addPage(SpiritInfusionPage.fromOutput(PRISMATIC_FOCUS_LENS.get()))
         );
 
         entries.add(new BookEntry<>(
-                "intricate_assembly", 13, 9)
+                "intricate_assembly", 14, 9)
                 .setWidgetConfig(w -> w.setIcon(INTRICATE_ASSEMBLY))
                 .addPage(new HeadlineTextPage("intricate_assembly", "intricate_assembly.1"))
                 .addPage(SpiritInfusionPage.fromOutput(INTRICATE_ASSEMBLY.get()))
         );
 
         entries.add(new BookEntry<>(
-                "shielding_apparatus", 13, 10)
+                "shielding_apparatus", 14, 10)
                 .setWidgetConfig(w -> w.setIcon(SHIELDING_APPARATUS))
                 .addPage(new HeadlineTextPage("shielding_apparatus", "shielding_apparatus.1"))
                 .addPage(SpiritInfusionPage.fromOutput(SHIELDING_APPARATUS.get()))
         );
 
         entries.add(new BookEntry<>(
-                "warping_engine", 14, 10)
+                "warping_engine", 15, 10)
                 .setWidgetConfig(w -> w.setIcon(WARPING_ENGINE))
                 .addPage(new HeadlineTextPage("warping_engine", "warping_engine.1"))
                 .addPage(new TextPage("warping_engine.2"))