Fixed magic

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/EcoSkillsPlugin.kt

@@ -21,8 +21,9 @@ import com.willfp.ecoskills.libreforge.FilterSkill
 import com.willfp.ecoskills.libreforge.FilterSkillCrit
 import com.willfp.ecoskills.libreforge.TriggerGainSkillXp
 import com.willfp.ecoskills.libreforge.TriggerLevelUpSkill
-import com.willfp.ecoskills.mana.MagicHandler
-import com.willfp.ecoskills.mana.MagicTypes
+import com.willfp.ecoskills.magic.MagicHandler
+import com.willfp.ecoskills.magic.MagicListener
+import com.willfp.ecoskills.magic.MagicTypes
 import com.willfp.ecoskills.skills.EcoSkillsSkillTopPlaceholder
 import com.willfp.ecoskills.skills.EcoSkillsTopPlaceholder
 import com.willfp.ecoskills.skills.SkillCritListener
@@ -104,6 +105,7 @@ class EcoSkillsPlugin : LibreforgePlugin() {
             LevelUpDisplay(this),
             GainXPDisplay(this),
             DamageIndicatorListener(this),
+            MagicListener(this),
             ActionBarGamemodeListener,
             SkillCritListener
         )

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/api/EcoSkillsAPI.kt

@@ -6,8 +6,8 @@ import com.willfp.ecoskills.api.modifiers.StatModifier
 import com.willfp.ecoskills.effects.Effect
 import com.willfp.ecoskills.effects.Effects
 import com.willfp.ecoskills.effects.effects
-import com.willfp.ecoskills.mana.MagicType
-import com.willfp.ecoskills.mana.magic
+import com.willfp.ecoskills.magic.MagicType
+import com.willfp.ecoskills.magic.magic
 import com.willfp.ecoskills.skills.Skill
 import com.willfp.ecoskills.skills.Skills
 import com.willfp.ecoskills.skills.skills

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/libreforge/EffectArgumentMagicCost.kt

@@ -1,7 +1,7 @@
 package com.willfp.ecoskills.libreforge
 
-import com.willfp.ecoskills.mana.MagicType
-import com.willfp.ecoskills.mana.magic
+import com.willfp.ecoskills.magic.MagicType
+import com.willfp.ecoskills.magic.magic
 import com.willfp.libreforge.ConfigurableElement
 import com.willfp.libreforge.NoCompileData
 import com.willfp.libreforge.effects.arguments.EffectArgument

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/magic/MagicHandler.kt

@@ -1,8 +1,11 @@
-package com.willfp.ecoskills.mana
+package com.willfp.ecoskills.magic
 
 import com.willfp.eco.core.EcoPlugin
 import org.bukkit.Bukkit
 import org.bukkit.entity.Player
+import org.bukkit.event.EventHandler
+import org.bukkit.event.Listener
+import org.bukkit.event.player.PlayerJoinEvent
 
 class MagicHandler(private val plugin: EcoPlugin) {
     internal fun startTicking() {
@@ -17,5 +20,20 @@ class MagicHandler(private val plugin: EcoPlugin) {
     }
 }
 
+class MagicListener(
+    private val plugin: EcoPlugin
+) : Listener {
+    @EventHandler
+    fun onJoin(event: PlayerJoinEvent) {
+        plugin.scheduler.runLater(2) {
+            for (type in MagicTypes.values()) {
+                if (type.joinOnFull) {
+                    event.player.magic[type] = type.getLimit(event.player)
+                }
+            }
+        }
+    }
+}
+
 internal val Player.magic: MagicMap
     get() = MagicMap(this)

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/magic/MagicMap.kt

@@ -1,4 +1,4 @@
-package com.willfp.ecoskills.mana
+package com.willfp.ecoskills.magic
 
 import com.willfp.eco.core.map.nestedMap
 import org.bukkit.entity.Player

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/magic/MagicType.kt

@@ -1,4 +1,4 @@
-package com.willfp.ecoskills.mana
+package com.willfp.ecoskills.magic
 
 import com.willfp.eco.core.config.interfaces.Config
 import com.willfp.eco.core.placeholder.PlayerPlaceholder
@@ -23,6 +23,8 @@ class MagicType(
 
     private val limitExpr = config.getString("limit")
 
+    val joinOnFull = config.getBool("join-on-full")
+
     init {
         PlayerlessPlaceholder(plugin, "${id}_name") {
             config.getFormattedString("name")

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/magic/MagicTypes.kt

@@ -1,4 +1,4 @@
-package com.willfp.ecoskills.mana
+package com.willfp.ecoskills.magic
 
 import com.willfp.eco.core.config.interfaces.Config
 import com.willfp.ecoskills.CategoryWithRegistry

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/magic/PriceFactoryMagic.kt

@@ -1,4 +1,4 @@
-package com.willfp.ecoskills.mana
+package com.willfp.ecoskills.magic
 
 import com.willfp.eco.core.placeholder.context.PlaceholderContext
 import com.willfp.eco.core.placeholder.context.PlaceholderContextSupplier

eco-core/core-plugin/src/main/resources/magic_types/_example.yml

@@ -12,3 +12,6 @@ regen-rate: "0.02 * %ecoskills_mana_limit%"
 
 # The maximum amount of this type a player can have
 limit: "100 + %ecoskills_wisdom%"
+
+# If players should join with full magic (true) or empty magic (false)
+join-on-full: true

eco-core/core-plugin/src/main/resources/magic_types/mana.yml

@@ -1,5 +1,6 @@
 name: "&#40ffe6🌊 Mana"
 
 regen-rate: "0.02 * %ecoskills_mana_limit%"
-
 limit: "100 + %ecoskills_wisdom%"
+
+join-on-full: true