diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/util/PotionUtils.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/util/PotionUtils.java index 27178ac..6661149 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/util/PotionUtils.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/util/PotionUtils.java @@ -1,7 +1,6 @@ package com.willfp.ecoskills.util; import org.bukkit.potion.PotionData; -import org.bukkit.potion.PotionType; import org.jetbrains.annotations.NotNull; public class PotionUtils { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/commands/CommandReset.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/commands/CommandReset.kt index 5901fdb..97d0aff 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/commands/CommandReset.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/commands/CommandReset.kt @@ -13,9 +13,7 @@ import com.willfp.ecoskills.skills.Skills import com.willfp.ecoskills.stats.Stats import org.bukkit.Bukkit import org.bukkit.command.CommandSender -import org.bukkit.entity.Player import org.bukkit.util.StringUtil -import java.util.stream.Collectors class CommandReset(plugin: EcoPlugin) : diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/Effect.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/Effect.kt index cdc4bd6..e3b0fa1 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/Effect.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/Effect.kt @@ -7,7 +7,6 @@ import com.willfp.eco.util.NumberUtils import com.willfp.ecoskills.EcoSkillsPlugin import com.willfp.ecoskills.SkillObject import com.willfp.ecoskills.getEffectLevel -import com.willfp.ecoskills.getStatLevel import org.bukkit.NamespacedKey import org.bukkit.event.Listener import java.util.* diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectBountifulHarvest.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectBountifulHarvest.kt index ad66874..1361df3 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectBountifulHarvest.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectBountifulHarvest.kt @@ -4,12 +4,10 @@ import com.willfp.eco.core.drops.DropQueue import com.willfp.eco.util.NumberUtils import com.willfp.ecoskills.effects.Effect import com.willfp.ecoskills.getEffectLevel -import com.willfp.ecoskills.getStatLevel import org.bukkit.Material import org.bukkit.block.data.Ageable import org.bukkit.event.EventHandler import org.bukkit.event.EventPriority -import org.bukkit.event.block.BlockBreakEvent import org.bukkit.event.block.BlockDropItemEvent class EffectBountifulHarvest: Effect( diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectCraftsmanship.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectCraftsmanship.kt index 8e583cd..c14ccd0 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectCraftsmanship.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectCraftsmanship.kt @@ -3,10 +3,8 @@ package com.willfp.ecoskills.effects.effects import com.willfp.eco.util.NumberUtils import com.willfp.ecoskills.effects.Effect import com.willfp.ecoskills.getEffectLevel -import org.bukkit.entity.Player import org.bukkit.event.EventHandler import org.bukkit.event.EventPriority -import org.bukkit.event.entity.EntityDamageByEntityEvent import org.bukkit.event.player.PlayerItemDamageEvent class EffectCraftsmanship : Effect( diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectEfficientBrewing.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectEfficientBrewing.kt index 7d9ed6d..5f19867 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectEfficientBrewing.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectEfficientBrewing.kt @@ -2,7 +2,6 @@ package com.willfp.ecoskills.effects.effects import com.willfp.ecoskills.effects.Effect import com.willfp.ecoskills.getEffectLevel -import org.bukkit.Bukkit import org.bukkit.block.BrewingStand import org.bukkit.entity.Player import org.bukkit.event.EventHandler diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectEyeOfTheDepths.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectEyeOfTheDepths.kt index 1ecc6e1..f86eeb0 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectEyeOfTheDepths.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectEyeOfTheDepths.kt @@ -8,7 +8,6 @@ import com.willfp.ecoskills.getEffectLevel import org.bukkit.event.EventHandler import org.bukkit.event.EventPriority import org.bukkit.event.player.PlayerFishEvent -import org.bukkit.event.player.PlayerItemDamageEvent class EffectEyeOfTheDepths: Effect( "eye_of_the_depths" diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectGoldenYield.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectGoldenYield.kt index d5dd503..dc18360 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectGoldenYield.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectGoldenYield.kt @@ -4,12 +4,10 @@ import com.willfp.eco.core.drops.DropQueue import com.willfp.eco.util.NumberUtils import com.willfp.ecoskills.effects.Effect import com.willfp.ecoskills.getEffectLevel -import com.willfp.ecoskills.getStatLevel import org.bukkit.Material import org.bukkit.block.data.Ageable import org.bukkit.event.EventHandler import org.bukkit.event.EventPriority -import org.bukkit.event.block.BlockBreakEvent import org.bukkit.event.block.BlockDropItemEvent class EffectGoldenYield: Effect( diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectMysticResilience.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectMysticResilience.kt index 52a2dc3..c71c957 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectMysticResilience.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectMysticResilience.kt @@ -3,15 +3,10 @@ package com.willfp.ecoskills.effects.effects import com.willfp.eco.util.NumberUtils import com.willfp.ecoskills.effects.Effect import com.willfp.ecoskills.getEffectLevel -import org.bukkit.Bukkit -import org.bukkit.block.BrewingStand import org.bukkit.entity.Player import org.bukkit.event.EventHandler import org.bukkit.event.EventPriority import org.bukkit.event.entity.EntityPotionEffectEvent -import org.bukkit.event.inventory.InventoryClickEvent -import org.bukkit.event.player.PlayerRecipeDiscoverEvent -import org.bukkit.potion.PotionType class EffectMysticResilience : Effect( diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectPotionmaster.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectPotionmaster.kt index 088d627..f95033c 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectPotionmaster.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectPotionmaster.kt @@ -13,7 +13,6 @@ import org.bukkit.event.inventory.BrewEvent import org.bukkit.event.player.PlayerItemConsumeEvent import org.bukkit.inventory.meta.PotionMeta import org.bukkit.persistence.PersistentDataType -import org.bukkit.potion.PotionData import org.bukkit.potion.PotionEffect import org.bukkit.potion.PotionEffectType import org.bukkit.potion.PotionType diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectSatiation.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectSatiation.kt index 3056e0c..99e15e2 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectSatiation.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectSatiation.kt @@ -6,9 +6,7 @@ import com.willfp.ecoskills.getEffectLevel import org.bukkit.entity.Player import org.bukkit.event.EventHandler import org.bukkit.event.EventPriority -import org.bukkit.event.entity.EntityRegainHealthEvent import org.bukkit.event.entity.FoodLevelChangeEvent -import org.jetbrains.annotations.NotNull class EffectSatiation: Effect( "satiation" diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectVersatileTools.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectVersatileTools.kt index b429d60..c84d036 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectVersatileTools.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectVersatileTools.kt @@ -1,15 +1,10 @@ package com.willfp.ecoskills.effects.effects -import com.willfp.eco.core.drops.DropQueue -import com.willfp.eco.util.NumberUtils import com.willfp.ecoskills.effects.Effect import com.willfp.ecoskills.getEffectLevel -import org.bukkit.Material -import org.bukkit.block.data.Ageable import org.bukkit.entity.Player import org.bukkit.event.EventHandler import org.bukkit.event.EventPriority -import org.bukkit.event.block.BlockDropItemEvent import org.bukkit.event.entity.EntityDamageByEntityEvent class EffectVersatileTools: Effect( diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt index 1dc8676..164b20d 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt @@ -5,16 +5,15 @@ import com.willfp.eco.core.config.interfaces.Config import com.willfp.eco.core.integrations.placeholder.PlaceholderEntry import com.willfp.eco.util.NumberUtils import com.willfp.eco.util.StringUtils -import com.willfp.ecoskills.* +import com.willfp.ecoskills.EcoSkillsPlugin +import com.willfp.ecoskills.SkillObject import com.willfp.ecoskills.config.SkillConfig import com.willfp.ecoskills.effects.Effects +import com.willfp.ecoskills.getSkillLevel import com.willfp.ecoskills.stats.Stats -import org.bukkit.Bukkit import org.bukkit.NamespacedKey import org.bukkit.entity.Player import org.bukkit.event.Listener -import java.util.* -import kotlin.collections.ArrayList abstract class Skill( val id: String diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/SkillGUI.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/SkillGUI.kt index c56e4f1..b8ee493 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/SkillGUI.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/SkillGUI.kt @@ -13,15 +13,11 @@ import com.willfp.ecoskills.getSkillProgress import com.willfp.ecoskills.getSkillProgressRequired import com.willfp.ecoskills.getSkillProgressToNextLevel import com.willfp.ecoskills.gui.SkillGUI -import org.bukkit.Bukkit import org.bukkit.Material import org.bukkit.entity.Player import org.bukkit.inventory.ItemStack -import org.bukkit.inventory.meta.ItemMeta import org.bukkit.persistence.PersistentDataType -import org.jetbrains.annotations.NotNull import java.util.* -import kotlin.collections.ArrayList import kotlin.math.ceil class SkillGUI( diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/SkillLevellingListener.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/SkillLevellingListener.kt index 6efaa8e..59bb93e 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/SkillLevellingListener.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/SkillLevellingListener.kt @@ -1,12 +1,13 @@ package com.willfp.ecoskills.skills import com.willfp.eco.core.EcoPlugin -import com.willfp.ecoskills.* -import com.willfp.ecoskills.api.PlayerSkillExpGainEvent import com.willfp.ecoskills.api.PlayerSkillLevelUpEvent import com.willfp.ecoskills.effects.Effect +import com.willfp.ecoskills.getEffectLevel +import com.willfp.ecoskills.getStatLevel +import com.willfp.ecoskills.setEffectLevel +import com.willfp.ecoskills.setStatLevel import com.willfp.ecoskills.stats.Stat -import org.bukkit.Bukkit import org.bukkit.event.EventHandler import org.bukkit.event.EventPriority import org.bukkit.event.Listener diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillAlchemy.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillAlchemy.kt index 5e407d6..c60421d 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillAlchemy.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillAlchemy.kt @@ -1,21 +1,11 @@ package com.willfp.ecoskills.skills.skills -import com.willfp.eco.core.events.EntityDeathByEntityEvent -import com.willfp.ecoskills.api.PlayerSkillExpGainEvent -import com.willfp.ecoskills.getStatLevel import com.willfp.ecoskills.giveSkillExperience import com.willfp.ecoskills.skills.Skill -import org.bukkit.Bukkit import org.bukkit.Material -import org.bukkit.attribute.Attribute -import org.bukkit.enchantments.Enchantment import org.bukkit.entity.Player -import org.bukkit.entity.Projectile import org.bukkit.event.EventHandler import org.bukkit.event.EventPriority -import org.bukkit.event.block.BlockBreakEvent -import org.bukkit.event.enchantment.EnchantItemEvent -import org.bukkit.event.entity.EntityDamageByEntityEvent import org.bukkit.event.inventory.BrewEvent import org.bukkit.inventory.meta.PotionMeta import java.util.* diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillArmory.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillArmory.kt index cba30e5..d09bd41 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillArmory.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillArmory.kt @@ -1,15 +1,11 @@ package com.willfp.ecoskills.skills.skills -import com.willfp.ecoskills.api.PlayerSkillExpGainEvent import com.willfp.ecoskills.giveSkillExperience import com.willfp.ecoskills.skills.Skill -import org.bukkit.Bukkit -import org.bukkit.attribute.Attribute import org.bukkit.entity.Player import org.bukkit.event.EventHandler import org.bukkit.event.EventPriority import org.bukkit.event.entity.EntityDamageByEntityEvent -import java.util.* class SkillArmory : Skill( "armory" diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillCombat.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillCombat.kt index e4131e8..47e8c91 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillCombat.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillCombat.kt @@ -1,21 +1,13 @@ package com.willfp.ecoskills.skills.skills import com.willfp.eco.core.events.EntityDeathByEntityEvent -import com.willfp.ecoskills.api.PlayerSkillExpGainEvent -import com.willfp.ecoskills.getStatLevel import com.willfp.ecoskills.giveSkillExperience import com.willfp.ecoskills.skills.Skill -import org.bukkit.Bukkit -import org.bukkit.Material import org.bukkit.attribute.Attribute -import org.bukkit.enchantments.Enchantment import org.bukkit.entity.Player import org.bukkit.entity.Projectile import org.bukkit.event.EventHandler import org.bukkit.event.EventPriority -import org.bukkit.event.block.BlockBreakEvent -import org.bukkit.event.entity.EntityDamageByEntityEvent -import java.util.* class SkillCombat : Skill( "combat" diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillEnchanting.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillEnchanting.kt index 660837e..dbae496 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillEnchanting.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillEnchanting.kt @@ -1,22 +1,10 @@ package com.willfp.ecoskills.skills.skills -import com.willfp.eco.core.events.EntityDeathByEntityEvent -import com.willfp.ecoskills.api.PlayerSkillExpGainEvent -import com.willfp.ecoskills.getStatLevel import com.willfp.ecoskills.giveSkillExperience import com.willfp.ecoskills.skills.Skill -import org.bukkit.Bukkit -import org.bukkit.Material -import org.bukkit.attribute.Attribute -import org.bukkit.enchantments.Enchantment -import org.bukkit.entity.Player -import org.bukkit.entity.Projectile import org.bukkit.event.EventHandler import org.bukkit.event.EventPriority -import org.bukkit.event.block.BlockBreakEvent import org.bukkit.event.enchantment.EnchantItemEvent -import org.bukkit.event.entity.EntityDamageByEntityEvent -import java.util.* class SkillEnchanting : Skill( "enchanting" diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillExploration.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillExploration.kt index 0cf3338..b821dad 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillExploration.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillExploration.kt @@ -1,25 +1,13 @@ package com.willfp.ecoskills.skills.skills -import com.willfp.eco.core.events.EntityDeathByEntityEvent import com.willfp.eco.util.NumberUtils -import com.willfp.ecoskills.api.PlayerSkillExpGainEvent -import com.willfp.ecoskills.getStatLevel import com.willfp.ecoskills.giveSkillExperience import com.willfp.ecoskills.skills.Skill -import org.bukkit.Bukkit -import org.bukkit.Material -import org.bukkit.attribute.Attribute -import org.bukkit.enchantments.Enchantment import org.bukkit.entity.Player -import org.bukkit.entity.Projectile import org.bukkit.event.EventHandler import org.bukkit.event.EventPriority -import org.bukkit.event.block.BlockBreakEvent -import org.bukkit.event.enchantment.EnchantItemEvent -import org.bukkit.event.entity.EntityDamageByEntityEvent import org.bukkit.event.entity.EntityDamageEvent import org.bukkit.event.player.PlayerMoveEvent -import java.util.* class SkillExploration : Skill( "exploration" diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillFarming.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillFarming.kt index 3123824..6d6afad 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillFarming.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillFarming.kt @@ -1,12 +1,9 @@ package com.willfp.ecoskills.skills.skills -import com.willfp.ecoskills.api.PlayerSkillExpGainEvent import com.willfp.ecoskills.giveSkillExperience import com.willfp.ecoskills.skills.Skill -import org.bukkit.Bukkit import org.bukkit.Material import org.bukkit.block.data.Ageable -import org.bukkit.enchantments.Enchantment import org.bukkit.event.EventHandler import org.bukkit.event.EventPriority import org.bukkit.event.block.BlockBreakEvent diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillFishing.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillFishing.kt index 0720f60..7b8ae59 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillFishing.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillFishing.kt @@ -1,16 +1,10 @@ package com.willfp.ecoskills.skills.skills -import com.willfp.ecoskills.api.PlayerSkillExpGainEvent import com.willfp.ecoskills.giveSkillExperience import com.willfp.ecoskills.skills.Skill -import org.bukkit.Bukkit -import org.bukkit.attribute.Attribute -import org.bukkit.entity.Player import org.bukkit.event.EventHandler import org.bukkit.event.EventPriority -import org.bukkit.event.entity.EntityDamageByEntityEvent import org.bukkit.event.player.PlayerFishEvent -import java.util.* class SkillFishing : Skill( "fishing" diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillMining.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillMining.kt index c7c5133..92b359b 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillMining.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillMining.kt @@ -1,9 +1,7 @@ package com.willfp.ecoskills.skills.skills -import com.willfp.ecoskills.api.PlayerSkillExpGainEvent import com.willfp.ecoskills.giveSkillExperience import com.willfp.ecoskills.skills.Skill -import org.bukkit.Bukkit import org.bukkit.Material import org.bukkit.enchantments.Enchantment import org.bukkit.event.EventHandler diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillWoodcutting.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillWoodcutting.kt index 109714a..8717a1d 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillWoodcutting.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/skills/SkillWoodcutting.kt @@ -1,11 +1,8 @@ package com.willfp.ecoskills.skills.skills -import com.willfp.ecoskills.api.PlayerSkillExpGainEvent import com.willfp.ecoskills.giveSkillExperience import com.willfp.ecoskills.skills.Skill -import org.bukkit.Bukkit import org.bukkit.Material -import org.bukkit.enchantments.Enchantment import org.bukkit.event.EventHandler import org.bukkit.event.EventPriority import org.bukkit.event.block.BlockBreakEvent diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/Stat.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/Stat.kt index 22c0284..0701a39 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/Stat.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/Stat.kt @@ -6,14 +6,11 @@ import com.willfp.eco.core.integrations.placeholder.PlaceholderEntry import com.willfp.eco.util.NumberUtils import com.willfp.ecoskills.EcoSkillsPlugin import com.willfp.ecoskills.SkillObject -import com.willfp.ecoskills.getEffectLevel import com.willfp.ecoskills.getStatLevel -import com.willfp.ecoskills.skills.Skills import org.bukkit.NamespacedKey import org.bukkit.entity.Player import org.bukkit.event.Listener import java.util.* -import java.util.function.Function abstract class Stat( id: String diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/stats/StatCritChance.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/stats/StatCritChance.kt index a123c0d..da6596b 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/stats/StatCritChance.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/stats/StatCritChance.kt @@ -1,11 +1,10 @@ package com.willfp.ecoskills.stats.stats import com.willfp.eco.util.NumberUtils -import com.willfp.ecoskills.isCrit import com.willfp.ecoskills.getStatLevel +import com.willfp.ecoskills.isCrit import com.willfp.ecoskills.stats.Stat import com.willfp.ecoskills.stats.Stats -import org.bukkit.Bukkit import org.bukkit.entity.Player import org.bukkit.entity.Projectile import org.bukkit.event.EventHandler diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/stats/StatCritDamage.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/stats/StatCritDamage.kt index 7913995..63013b3 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/stats/StatCritDamage.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/stats/StatCritDamage.kt @@ -1,13 +1,6 @@ package com.willfp.ecoskills.stats.stats -import com.willfp.eco.util.NumberUtils -import com.willfp.ecoskills.getStatLevel import com.willfp.ecoskills.stats.Stat -import org.bukkit.entity.Player -import org.bukkit.entity.Projectile -import org.bukkit.event.EventHandler -import org.bukkit.event.EventPriority -import org.bukkit.event.entity.EntityDamageByEntityEvent class StatCritDamage : Stat( "crit_damage" diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/stats/StatSpeed.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/stats/StatSpeed.kt index 8a5e7d5..3ebfee5 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/stats/StatSpeed.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/stats/StatSpeed.kt @@ -5,9 +5,6 @@ import com.willfp.ecoskills.stats.Stat import org.bukkit.attribute.Attribute import org.bukkit.attribute.AttributeModifier import org.bukkit.entity.Player -import org.bukkit.event.EventHandler -import org.bukkit.event.EventPriority -import org.bukkit.event.entity.EntityDamageEvent class StatSpeed : Stat( "speed" diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/stats/StatWisdom.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/stats/StatWisdom.kt index 1767fef..3ec9bec 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/stats/StatWisdom.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/stats/StatWisdom.kt @@ -3,10 +3,8 @@ package com.willfp.ecoskills.stats.stats import com.willfp.eco.core.events.NaturalExpGainEvent import com.willfp.ecoskills.getStatLevel import com.willfp.ecoskills.stats.Stat -import org.bukkit.entity.Player import org.bukkit.event.EventHandler import org.bukkit.event.EventPriority -import org.bukkit.event.entity.EntityDamageEvent import kotlin.math.ceil class StatWisdom : Stat(