Keywords

Author: SammySemicolon

gradle.properties

@@ -27,7 +27,7 @@ lodestone_version_range=[1.8.2,)
 curios_version=9.3.1+1.21.1
 
 # Wayward Attributes
-wayward_attributes_version=1.0.27
+wayward_attributes_version=1.1.30
 
 # Iron's Spellbooks
 gecko_lib_version=4.7

src/generated/resources/assets/malum/lang/en_us.json

@@ -843,8 +843,7 @@
   "malum.effect.geas.more_saturation": "Meals Provide Extra Saturation",
   "malum.effect.geas.movement_acceleration": "Sprinting Builds Up Extra Momentum",
   "malum.effect.geas.no_armor": "Equipped Armour Shackles You",
-  "malum.effect.geas.no_armor_armor": "The Absence of Equipped Armour Becomes Armor",
-  "malum.effect.geas.no_armor_healing": "The Absence of Equipped Armour Enhances Healing",
+  "malum.effect.geas.no_armor_druid_armor": "The Absence of Equipped Armour Grants Armor And Enhances Healing",
   "malum.effect.geas.no_normal_foods": "You Must Only Eat Rot",
   "malum.effect.geas.no_passive_healing": "Saturation And Hunger No Longer Restore Health",
   "malum.effect.geas.only_scythe": "Regular Weapons Crumble In Your Hands",
@@ -856,7 +855,7 @@
   "malum.effect.geas.poison_slash_consumes_desperate_need": "Desperate Need Fades When Attacking",
   "malum.effect.geas.presence_breaker": "Refusal, Detachment, Exile is Forced onto Targets",
   "malum.effect.geas.presence_breaker_arcane_resonance": "Arcane Resonance Favors Exile Duration",
-  "malum.effect.geas.rocket_jumping": "Wind Gusts Provide Greater Propulsion",
+  "malum.effect.geas.rocket_jumping": "Wind Gusts Are Enhanced And Grant Ascension",
   "malum.effect.geas.rotten_healing": "Eating Rotten Foods Heals You",
   "malum.effect.geas.rune_vulnerability": "Each Equipped Rune Dampens Healing, Armor and Magic Resistance",
   "malum.effect.geas.scythe_combo": "Scythe Cuts Create Combo-Attacks",
@@ -877,10 +876,10 @@
   "malum.effect.geas.wyrd_reconstruction_cooldown": "Arcane Resonance is Dampened Until Recharged",
   "malum.effect.geas.wyrd_reconstruction_spirits": "Resurrection Repeatedly Activates Spirit-Collection Effects",
   "malum.effect.hex_bolts": "Charges a Burst of Mnemonic Blades",
-  "malum.effect.keyword.arcane_resonance": "Arcane Resonance: An Affinity Towards Spirit-Collection Effects",
-  "malum.effect.keyword.avarice": "Avarice: Gradually Increases Fortune",
-  "malum.effect.keyword.gluttony": "Gluttony: Increases Magic Damage, But Drains Hunger",
-  "malum.effect.keyword.soul_ward": "Soul Ward: A Recharging Barrier, Excels Against Magic Attacks",
+  "malum.effect.keyword.arcane_resonance": "Arcane Resonance; Improves Spirit-Collection Effects",
+  "malum.effect.keyword.avarice": "Avarice; Gradually Increases Fortune",
+  "malum.effect.keyword.gluttony": "Gluttony; Increases Magic Damage, But Drains Hunger",
+  "malum.effect.keyword.soul_ward": "Soul Ward; Absorbs Damage, Recharges Over Time",
   "malum.effect.negative": "-%s",
   "malum.effect.positive": "+%s",
   "malum.effect.ravenous_pouch_collection": "Snatches Items Already In Storage",
@@ -1459,7 +1458,7 @@
   "malum.gui.book.entry.page.text.basic_artifice.wavemaker.1": "Earthen seeks to stand, to stay. Given a signal or lack thereof, this acts like a clock, emitting the inverse of the input every so often on a steady rhythm, and emitting the input the rest of the time.",
   "malum.gui.book.entry.page.text.belt_of_the_magebane.1": "The Belt of the Magebane is a simple innovation, but a dangerously effective one. Normally, after being struck by any attack, soul ward will not recover until a long moment after. That moment of downtime has proven itself detrimental far too frequently. But that ends now.",
   "malum.gui.book.entry.page.text.belt_of_the_magebane.2": "While worn, the belt provides a substantial bonus to soul ward recovery rate, while also improving capacity slightly. Furthermore, the belt will absorb the arcane essence of any instance of magical damage that strikes its bearer, converting that repurposed energy into immediate recovery of soul ward.",
-  "malum.gui.book.entry.page.text.belt_of_the_prospector.1": "To fuel my various magics and other goals I more often than not find myself needing various earthen treasures. This belt prevents explosions $idirectly/$ caused by me from harming valuable items on the ground, and causes those explosions to break blocks as though I were using a Fortune III tool.",
+  "malum.gui.book.entry.page.text.belt_of_the_prospector.1": "To fuel my various magics and other goals I more often than not find myself needing various earthen treasures. By unearthing said treasures, this belt will temporarily enable a benefit similar to Fortune. Additionally, explosions $idirectly/$ caused by me will break blocks as if using Fortune III, plus the bonus.",
   "malum.gui.book.entry.page.text.belt_of_the_prospector.ring_of_the_demolitionist.1": "If raw explosive power is not sufficient, you simply aren't using enough of it. This ring amplifies explosions, mitigating that issue.",
   "malum.gui.book.entry.page.text.belt_of_the_prospector.ring_of_the_hoarder.1": "Explosions are chaotic, and messy, inherently. This is hardly a problem, when I want to cause such rampant destruction to collect resources, but collecting the items is a burden. This ring entangles the explosion with my soul, causing the debris and loot to appear at my location.",
   "malum.gui.book.entry.page.text.belt_of_the_starved.1": "The arcana I collect occasionally have scraps of wishes and desires woven in. Often, given the base nature of what I reap, this comes in the form of hunger, lust, or petty grudges. All of these impurities can be catalyzed into Gluttony, an stacking amplifier towards magic damage.",
@@ -2172,7 +2171,7 @@
   "malum.gui.geas.pact_of_combustion": "Pact Of Combustion",
   "malum.gui.geas.pact_of_combustion.cons": "You cannot deny the flame it's nature\n -Being Forcibly Extinguished Blasts you with Infernal Arcana",
   "malum.gui.geas.pact_of_combustion.pros": "No force more powerful.\n -Fire Effects you Inflict onto Enemies are Amplified",
-  "malum.gui.geas.pact_of_combustion.tooltip": "Set yourself ablaze, figuratively",
+  "malum.gui.geas.pact_of_combustion.tooltip": "To ignite and watch",
   "malum.gui.geas.pact_of_contentedness": "Pact Of Contentedness",
   "malum.gui.geas.pact_of_contentedness.cons": "To be satisfied is to live in prosperity\n -Armor and Armor Toughness is Decreased by Half when near Starvation",
   "malum.gui.geas.pact_of_contentedness.pros": "To be complete is to be satisfied.\n -Armor and Armor Toughness is Increased by One Fifth when near Satiation",
@@ -2231,7 +2230,7 @@
   "malum.gui.geas.pact_of_the_lifeweaver.tooltip": "Weave your life into miracles",
   "malum.gui.geas.pact_of_the_lone_druid": "Pact Of The Lone Druid",
   "malum.gui.geas.pact_of_the_lone_druid.cons": "To be unburdened is to cull all shackles\n -Wearing any armour shackles you, damaging your soul",
-  "malum.gui.geas.pact_of_the_lone_druid.pros": "To be complete is to be unburdened.\n -Each empty armour slot grants four Armor and two Armor Toughness\n -Each empty armour slot increases Healing Received by One Fifth",
+  "malum.gui.geas.pact_of_the_lone_druid.pros": "$m0.7/$To be complete is to be unburdened.\n -Each empty armour slot grants four Armor and two Armor Toughness\n -Each empty armour slot increases Healing Received by One Fourth",
   "malum.gui.geas.pact_of_the_lone_druid.tooltip": "Shed your second skin",
   "malum.gui.geas.pact_of_the_parasite": "Pact Of The Parasite",
   "malum.gui.geas.pact_of_the_parasite.cons": "Your fragility is still very much real.\n -Reduces Healing Received by Four Tenths",
@@ -2248,7 +2247,7 @@
   "malum.gui.geas.pact_of_the_prospector": "Pact Of The Prospector",
   "malum.gui.geas.pact_of_the_prospector.cons": "Burn with Greed\n -Being Struck when imbued with Avarice engulfs you in flames",
   "malum.gui.geas.pact_of_the_prospector.pros": "A favor born from flame.\n -Collecting Precious Minerals grants Avarice\n -Avarice gradually improves Fortune Chance\n -Avarice additionally recovers one heart of lost health when applied",
-  "malum.gui.geas.pact_of_the_prospector.tooltip": "Burn with greed",
+  "malum.gui.geas.pact_of_the_prospector.tooltip": "Engulf yourself with greed",
   "malum.gui.geas.pact_of_the_reaper": "Pact Of The Reaper",
   "malum.gui.geas.pact_of_the_reaper.cons": "To break the bond will be your undoing\n -Reduces Damage Dealt using Forsworn Weapons by Nine Tenths\n -Forsworn Weapons Deteriorate When Used",
   "malum.gui.geas.pact_of_the_reaper.pros": "A pact forged between your Soul and your Scythe, the Chains of Arcana bind you together.\n -Scythe Attacks occasionally trigger follow up cuts",

src/main/java/com/sammy/malum/common/geas/pact/arcane/FortressGeas.java

@@ -26,10 +26,4 @@ public Multimap<Holder<Attribute>, AttributeModifier> createAttributeModifiers(L
         addAttributeModifier(modifiers, MalumAttributes.SOUL_WARD_RECOVERY_RATE, -0.5f, AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL);
         return modifiers;
     }
-
-    @Override
-    public void addTooltipComponents(LivingEntity entity, Consumer<Component> tooltipAcceptor, TooltipFlag tooltipFlag) {
-        super.addTooltipComponents(entity, tooltipAcceptor, tooltipFlag);
-        tooltipAcceptor.accept(ComponentHelper.effectKeyword("soul_ward"));
-    }
 }

src/main/java/com/sammy/malum/common/geas/pact/arcane/ReciprocationGeas.java

@@ -37,7 +37,6 @@ public void outgoingDamageEvent(LivingDamageEvent.Pre event, LivingEntity attack
     public void addTooltipComponents(LivingEntity entity, Consumer<Component> tooltipAcceptor, TooltipFlag tooltipFlag) {
         tooltipAcceptor.accept(ComponentHelper.positiveGeasEffect("soul_ward_on_hit"));
         super.addTooltipComponents(entity, tooltipAcceptor, tooltipFlag);
-        tooltipAcceptor.accept(ComponentHelper.effectKeyword("soul_ward"));
     }
 
     @Override

src/main/java/com/sammy/malum/common/geas/pact/arcane/ShieldGeas.java

@@ -26,10 +26,4 @@ public Multimap<Holder<Attribute>, AttributeModifier> createAttributeModifiers(L
         addAttributeModifier(modifiers, MalumAttributes.SOUL_WARD_INTEGRITY, -0.5f, AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL);
         return modifiers;
     }
-
-    @Override
-    public void addTooltipComponents(LivingEntity entity, Consumer<Component> tooltipAcceptor, TooltipFlag tooltipFlag) {
-        super.addTooltipComponents(entity, tooltipAcceptor, tooltipFlag);
-        tooltipAcceptor.accept(ComponentHelper.effectKeyword("soul_ward"));
-    }
 }

src/main/java/com/sammy/malum/common/geas/pact/infernal/BlastweaverGeas.java

@@ -39,7 +39,6 @@ public void addTooltipComponents(LivingEntity entity, Consumer<Component> toolti
         tooltipAcceptor.accept(ComponentHelper.positiveGeasEffect("explosion_lover"));
         tooltipAcceptor.accept(ComponentHelper.positiveGeasEffect("avarice_explosions"));
         tooltipAcceptor.accept(ComponentHelper.negativeGeasEffect("avarice_vulnerability"));
-        tooltipAcceptor.accept(ComponentHelper.effectKeyword("avarice"));
     }
 
     @Override

src/main/java/com/sammy/malum/common/geas/pact/infernal/ProspectorGeas.java

@@ -26,7 +26,6 @@ public void addTooltipComponents(LivingEntity entity, Consumer<Component> toolti
         tooltipAcceptor.accept(ComponentHelper.positiveGeasEffect("ore_prospecting"));
         tooltipAcceptor.accept(ComponentHelper.positiveGeasEffect("avarice_healing"));
         tooltipAcceptor.accept(ComponentHelper.negativeGeasEffect("avarice_combustion"));
-        tooltipAcceptor.accept(ComponentHelper.effectKeyword("avarice"));
     }
 
     @Override

src/main/java/com/sammy/malum/common/item/curiosities/armor/SoulStainedSteelArmorItem.java

@@ -36,11 +36,6 @@ public List<ItemAttributeModifiers.Entry> createExtraAttributes() {
         );
     }
 
-    @Override
-    public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
-        tooltipComponents.add(ComponentHelper.effectKeyword("soul_ward"));
-    }
-
     @Override
     public ResourceLocation getArmorTexture() {
         return MalumMod.malumPath("textures/armor/soul_stained_steel.png");

src/main/java/com/sammy/malum/common/item/curiosities/curios/runes/miracle/RuneReinforcementItem.java

@@ -2,13 +2,18 @@
 
 import com.google.common.collect.*;
 import com.sammy.malum.MalumMod;
+import com.sammy.malum.compat.irons_spellbooks.IronsSpellsCompat;
+import com.sammy.malum.core.helpers.ComponentHelper;
 import com.sammy.malum.registry.common.*;
 import com.sammy.malum.registry.common.magic.*;
 import net.minecraft.core.Holder;
+import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.ai.attributes.*;
 import net.minecraft.world.item.*;
 import top.theillusivec4.curios.api.*;
 
+import java.util.function.Consumer;
+
 public class RuneReinforcementItem extends MiracleRuneCurioItem {
 
     public RuneReinforcementItem(Properties builder) {
@@ -23,4 +28,5 @@ public void addAttributeModifiers(Multimap<Holder<Attribute>, AttributeModifier>
         addAttributeModifier(map, MalumAttributes.SOUL_WARD_INTEGRITY,
                 new AttributeModifier(id, 0.25, AttributeModifier.Operation.ADD_MULTIPLIED_BASE));
     }
+
 }

src/main/java/com/sammy/malum/common/item/curiosities/curios/sets/alchemical/CurioManaweavingRing.java

@@ -23,7 +23,6 @@ public void addExtraTooltipLines(Consumer<Component> consumer) {
         if (IronsSpellsCompat.LOADED) {
             consumer.accept(ComponentHelper.positiveCurioEffect("spirits_weave_mana_irons_spellbooks"));
         }
-        consumer.accept(ComponentHelper.effectKeyword("soul_ward"));
     }
 
     @Override