diff --git a/src/main/generated/assets/arcanuscontinuum/lang/en_us.json b/src/main/generated/assets/arcanuscontinuum/lang/en_us.json index 47f734f5..25652e37 100644 --- a/src/main/generated/assets/arcanuscontinuum/lang/en_us.json +++ b/src/main/generated/assets/arcanuscontinuum/lang/en_us.json @@ -163,6 +163,7 @@ "config.arcanuscontinuum.manaShieldEffectProperties": "Mana Shield Effect", "config.arcanuscontinuum.manaSplitEffectProperties": "Mana Split Effect", "config.arcanuscontinuum.manaWingsEffectProperties": "Mana Wings Effect", + "config.arcanuscontinuum.mana_modifier_operation": "Mana Modifier Operation", "config.arcanuscontinuum.mana_per_level": "Extra Mana Per Level", "config.arcanuscontinuum.mana_pool": "Mana Pool", "config.arcanuscontinuum.max_enchantment_level": "Max Enchantment Level", diff --git a/src/main/java/dev/cammiescorner/arcanuscontinuum/Arcanus.java b/src/main/java/dev/cammiescorner/arcanuscontinuum/Arcanus.java index 9ebe72c6..541c77e8 100644 --- a/src/main/java/dev/cammiescorner/arcanuscontinuum/Arcanus.java +++ b/src/main/java/dev/cammiescorner/arcanuscontinuum/Arcanus.java @@ -107,7 +107,7 @@ public void onInitialize() { if(stack.getItem() instanceof ArmorItem armorItem && armorItem.getEquipmentSlot() != slot) return; - AttributeModifier maxManaModifier = new AttributeModifier(ManaPoolEnchantment.getUuidForSlot(slot), "Mana Pool Max Mana Modifier", ArcanusConfig.Enchantments.ManaPool.manaPerLevel * manaPoolLevel, AttributeModifier.Operation.ADDITION); + AttributeModifier maxManaModifier = new AttributeModifier(ManaPoolEnchantment.getUuidForSlot(slot), "Mana Pool Max Mana Modifier", ArcanusConfig.Enchantments.ManaPool.manaPerLevel * manaPoolLevel, ArcanusConfig.Enchantments.ManaPool.manaModifierOperation); attributeModifiers.put(ArcanusEntityAttributes.MAX_MANA.get(), maxManaModifier); } diff --git a/src/main/java/dev/cammiescorner/arcanuscontinuum/ArcanusConfig.java b/src/main/java/dev/cammiescorner/arcanuscontinuum/ArcanusConfig.java index 5d8bc1e6..7b5ceb36 100644 --- a/src/main/java/dev/cammiescorner/arcanuscontinuum/ArcanusConfig.java +++ b/src/main/java/dev/cammiescorner/arcanuscontinuum/ArcanusConfig.java @@ -3,6 +3,7 @@ import com.teamresourceful.resourcefulconfig.common.annotations.*; import com.teamresourceful.resourcefulconfig.common.config.EntryType; import dev.cammiescorner.arcanuscontinuum.api.spells.Weight; +import net.minecraft.world.entity.ai.attributes.AttributeModifier; @Config(Arcanus.MOD_ID) public final class ArcanusConfig { @@ -20,7 +21,10 @@ public static final class ManaPool { public static int maxLevel = 5; @ConfigEntry(id = "manaPerLevel", type = EntryType.DOUBLE, translation = "config.arcanuscontinuum.mana_per_level") - public static double manaPerLevel = 5; + public static double manaPerLevel = 0.05; + + @ConfigEntry(id = "manaModifierOperation", type = EntryType.ENUM, translation = "config.arcanuscontinuum.mana_modifier_operation") + public static AttributeModifier.Operation manaModifierOperation = AttributeModifier.Operation.MULTIPLY_BASE; } } diff --git a/src/main/java/dev/cammiescorner/arcanuscontinuum/datagen/client/ArcanusEnglishLanguageProvider.java b/src/main/java/dev/cammiescorner/arcanuscontinuum/datagen/client/ArcanusEnglishLanguageProvider.java index 5c7026cb..f2cedcb9 100644 --- a/src/main/java/dev/cammiescorner/arcanuscontinuum/datagen/client/ArcanusEnglishLanguageProvider.java +++ b/src/main/java/dev/cammiescorner/arcanuscontinuum/datagen/client/ArcanusEnglishLanguageProvider.java @@ -323,6 +323,7 @@ public void generateTranslations(TranslationBuilder builder) { builder.add("config.arcanuscontinuum.sizeChangingIsPermanent", "Size Changing Effects are Permanent for Players and Tamed Animals (Requires Pehkui)"); builder.add("config.arcanuscontinuum.max_enchantment_level", "Max Enchantment Level"); builder.add("config.arcanuscontinuum.mana_per_level", "Extra Mana Per Level"); + builder.add("config.arcanuscontinuum.mana_modifier_operation", "Mana Modifier Operation"); builder.add("config.arcanuscontinuum.enabled", "Enabled (Requires Restart)"); builder.add("config.arcanuscontinuum.weight", "Weight (Requires Restart)"); builder.add("config.arcanuscontinuum.manaCost", "Mana Cost (Requires Restart)");