From a5a613e200c649c1fcc5b8730d150616aba2fb02 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Fri, 15 Feb 2019 19:40:59 -0800 Subject: [PATCH] Killing Dead Imports --- .../main/java/com/gmail/nossr50/mcMMO.java | 2 +- .../src/main/java/com/gmail/nossr50/core/TODO | 18 ++++++- .../{skills/child => config}/ChildConfig.java | 7 ++- .../com/gmail/nossr50/core/config/Config.java | 2 + .../core/config/mods/CustomBlockConfig.java | 6 +-- .../core/config/mods/CustomEntityConfig.java | 7 +-- .../core/config/mods/CustomToolConfig.java | 17 +++---- .../core/config/mods/EntityConfigManager.java | 4 +- .../core/config/mods/ToolConfigManager.java | 4 +- .../config/skills/alchemy/PotionConfig.java | 1 - .../skills/repair/RepairConfigManager.java | 6 +-- .../config/skills/salvage/SalvageConfig.java | 18 +++---- .../core/data/blockmeta/ChunkletManager.java | 5 +- .../data/blockmeta/HashChunkletManager.java | 5 +- .../conversion/BlockStoreConversionMain.java | 2 - .../database/FlatfileDatabaseManager.java | 28 +++++----- .../data/database/SQLDatabaseManager.java | 26 +++++----- .../nossr50/core/datatypes/chat/ChatMode.java | 2 +- .../datatypes/experience/SkillXpGain.java | 2 +- .../datatypes/json/CustomBaseComponent.java | 1 - .../core/datatypes/json/McMMOWebLinks.java | 4 +- .../nossr50/core/datatypes/meta/OldName.java | 2 - .../core/datatypes/mods/CustomEntity.java | 3 +- .../core/datatypes/party/ItemShareType.java | 8 +-- .../nossr50/core/datatypes/party/Party.java | 19 ++++--- .../core/datatypes/party/PartyFeature.java | 9 ++-- .../datatypes/party/PartyTeleportRecord.java | 4 +- .../core/datatypes/party/ShareMode.java | 3 +- .../core/datatypes/player/PlayerProfile.java | 7 ++- .../core/events/chat/McMMOPartyChatEvent.java | 3 +- .../McMMOPlayerExperienceEvent.java | 5 +- .../McMMOPlayerLevelChangeEvent.java | 2 +- .../experience/McMMOPlayerLevelDownEvent.java | 3 +- .../experience/McMMOPlayerLevelUpEvent.java | 3 +- .../experience/McMMOPlayerXpGainEvent.java | 3 +- .../core/events/fake/FakeBlockBreakEvent.java | 4 +- .../events/fake/FakeBlockDamageEvent.java | 6 +-- .../core/events/fake/FakeBrewEvent.java | 3 -- .../fake/FakeEntityDamageByEntityEvent.java | 5 -- .../events/fake/FakeEntityDamageEvent.java | 4 -- .../core/events/fake/FakeEntityTameEvent.java | 3 -- .../events/fake/FakePlayerAnimationEvent.java | 4 +- .../core/events/fake/FakePlayerFishEvent.java | 6 +-- .../McMMOPlayerDeathPenaltyEvent.java | 5 +- .../McMMOPlayerPreDeathPenaltyEvent.java | 5 +- .../hardcore/McMMOPlayerStatLossEvent.java | 3 +- .../hardcore/McMMOPlayerVampirismEvent.java | 3 +- .../events/items/McMMOItemSpawnEvent.java | 6 +-- .../party/McMMOPartyAllianceChangeEvent.java | 5 +- .../events/party/McMMOPartyChangeEvent.java | 5 +- .../events/party/McMMOPartyLevelUpEvent.java | 3 -- .../events/party/McMMOPartyTeleportEvent.java | 4 +- .../events/party/McMMOPartyXpGainEvent.java | 3 -- .../scoreboard/McMMOScoreboardEvent.java | 5 +- .../McMMOScoreboardMakeboardEvent.java | 3 +- .../McMMOScoreboardObjectiveEvent.java | 5 +- .../McMMOScoreboardRevertEvent.java | 3 +- .../skills/McMMOPlayerNotificationEvent.java | 9 ++-- .../events/skills/McMMOPlayerSkillEvent.java | 4 +- .../McMMOPlayerAbilityActivateEvent.java | 3 +- .../McMMOPlayerAbilityDeactivateEvent.java | 2 +- .../abilities/McMMOPlayerAbilityEvent.java | 2 +- .../skills/alchemy/McMMOPlayerBrewEvent.java | 7 +-- .../alchemy/McMMOPlayerCatalysisEvent.java | 3 +- .../fishing/McMMOPlayerFishingEvent.java | 3 +- .../McMMOPlayerFishingTreasureEvent.java | 4 +- .../fishing/McMMOPlayerMagicHunterEvent.java | 6 +-- .../skills/fishing/McMMOPlayerShakeEvent.java | 5 +- .../repair/McMMOPlayerRepairCheckEvent.java | 5 +- .../salvage/McMMOPlayerSalvageCheckEvent.java | 5 +- .../secondaryabilities/SubSkillEvent.java | 3 +- .../SubSkillRandomCheckEvent.java | 2 +- .../unarmed/McMMOPlayerDisarmEvent.java | 3 +- .../nossr50/core/locale/LocaleLoader.java | 3 +- .../nossr50/core/party/PartyManager.java | 9 ++-- .../nossr50/core/party/ShareHandler.java | 7 ++- .../nossr50/core/runnables/CheckDateTask.java | 4 +- .../MobHealthDisplayUpdaterTask.java | 3 -- .../core/runnables/PistonTrackerTask.java | 8 +-- .../nossr50/core/runnables/SaveTimerTask.java | 4 +- .../runnables/StickyPistonTrackerTask.java | 6 +-- .../runnables/backups/CleanBackupsTask.java | 2 - .../commands/McScoreboardKeepTask.java | 5 +- .../commands/McrankCommandAsyncTask.java | 7 +-- .../commands/McrankCommandDisplayTask.java | 8 ++- .../commands/MctopCommandAsyncTask.java | 7 +-- .../commands/MctopCommandDisplayTask.java | 10 ++-- .../database/DatabaseConversionTask.java | 4 +- .../runnables/items/ChimaeraWingWarmup.java | 15 +++--- .../runnables/items/TeleportationWarmup.java | 13 +++-- .../runnables/party/PartyAutoKickTask.java | 7 +-- .../core/runnables/party/PartyChatTask.java | 6 +-- .../player/ClearRegisteredXPGainTask.java | 1 - .../player/PlayerProfileLoadingTask.java | 9 ++-- .../player/PlayerProfileSaveTask.java | 1 - .../player/PlayerUpdateInventoryTask.java | 4 +- .../player/PowerLevelUpdatingTask.java | 4 +- .../runnables/skills/AbilityCooldownTask.java | 3 +- .../runnables/skills/AbilityDisableTask.java | 19 +++---- .../skills/AlchemyBrewCheckTask.java | 7 +-- .../runnables/skills/AlchemyBrewTask.java | 17 +++---- .../core/runnables/skills/AprilTask.java | 15 +++--- .../runnables/skills/AwardCombatXpTask.java | 2 - .../skills/ExperienceBarHideTask.java | 3 +- .../skills/HerbalismBlockUpdaterTask.java | 4 +- .../skills/SkillUnlockNotificationTask.java | 3 +- .../core/runnables/skills/ToolLowerTask.java | 3 +- .../nossr50/core/skills/MaterialType.java | 1 - .../nossr50/core/skills/SubSkillFlags.java | 19 ------- .../gmail/nossr50/core/skills/ToolType.java | 5 +- .../core/skills/child/salvage/Salvage.java | 1 - .../skills/child/salvage/SalvageManager.java | 34 +++++-------- .../salvage/salvageables/Salvageable.java | 1 - .../salvageables/SalvageableFactory.java | 1 - .../salvageables/SalvageableManager.java | 4 +- .../salvageables/SimpleSalvageable.java | 1 - .../SimpleSalvageableManager.java | 5 +- .../core/skills/child/smelting/Smelting.java | 9 ++-- .../child/smelting/SmeltingManager.java | 31 +++++------ .../core/skills/interfaces/Progression.java | 1 - .../core/skills/interfaces/Toolable.java | 3 +- .../skills/primary/acrobatics/Acrobatics.java | 2 +- .../primary/acrobatics/AcrobaticsManager.java | 20 ++++---- .../core/skills/primary/alchemy/Alchemy.java | 9 +--- .../primary/alchemy/AlchemyManager.java | 10 ++-- .../skills/primary/alchemy/AlchemyPotion.java | 10 +--- .../primary/alchemy/AlchemyPotionBrewer.java | 25 ++++----- .../core/skills/primary/archery/Archery.java | 12 ++--- .../primary/archery/ArcheryManager.java | 21 +++----- .../skills/primary/archery/TrackedEntity.java | 3 -- .../core/skills/primary/axes/Axes.java | 9 ++-- .../core/skills/primary/axes/AxesManager.java | 17 +++---- .../skills/primary/excavation/Excavation.java | 7 ++- .../primary/excavation/ExcavationManager.java | 13 +++-- .../core/skills/primary/fishing/Fishing.java | 12 ++--- .../primary/fishing/FishingManager.java | 36 +++++-------- .../skills/primary/herbalism/Herbalism.java | 10 ++-- .../primary/herbalism/HerbalismManager.java | 30 +++++------ .../skills/primary/mining/BlastMining.java | 9 +--- .../core/skills/primary/mining/Mining.java | 10 ++-- .../core/skills/primary/repair/Repair.java | 1 - .../skills/primary/repair/RepairManager.java | 37 ++++++-------- .../repair/repairables/Repairable.java | 1 - .../repair/repairables/RepairableFactory.java | 1 - .../repair/repairables/RepairableManager.java | 4 +- .../repair/repairables/SimpleRepairable.java | 1 - .../repairables/SimpleRepairableManager.java | 5 +- .../skills/primary/swords/SwordsManager.java | 21 +++----- .../core/skills/primary/taming/Taming.java | 4 +- .../skills/primary/taming/TamingManager.java | 33 ++++++------ .../primary/taming/TrackedTamingEntity.java | 12 ++--- .../core/skills/primary/unarmed/Unarmed.java | 9 ++-- .../primary/unarmed/UnarmedManager.java | 27 ++++------ .../primary/woodcutting/Woodcutting.java | 15 +++--- .../woodcutting/WoodcuttingManager.java | 22 ++++---- .../skills/subskills/AbstractSubSkill.java | 4 +- .../acrobatics/AcrobaticsSubSkill.java | 7 +-- .../skills/subskills/acrobatics/Roll.java | 39 ++++++-------- .../subskills/interfaces/Interaction.java | 3 -- .../skills/subskills/interfaces/SubSkill.java | 3 +- .../skills/treasure/EnchantmentTreasure.java | 1 - .../skills/treasure/ExcavationTreasure.java | 3 +- .../core/skills/treasure/FishingTreasure.java | 3 +- .../core/skills/treasure/HylianTreasure.java | 3 +- .../core/skills/treasure/ShakeTreasure.java | 3 +- .../core/skills/treasure/Treasure.java | 2 +- .../gmail/nossr50/core/util/BlockUtils.java | 10 +--- .../gmail/nossr50/core/util/ChimaeraWing.java | 14 ++--- .../nossr50/core/util/EnchantmentUtils.java | 3 -- .../gmail/nossr50/core/util/EventUtils.java | 51 ++++++++----------- .../nossr50/core/util/HardcoreManager.java | 2 +- .../nossr50/core/util/HolidayManager.java | 14 ++--- .../gmail/nossr50/core/util/LogFilter.java | 1 - .../nossr50/core/util/MaterialUtils.java | 2 - .../com/gmail/nossr50/core/util/Misc.java | 14 ++--- .../nossr50/core/util/MobHealthbarUtils.java | 10 ++-- .../gmail/nossr50/core/util/ModManager.java | 16 +++--- .../com/gmail/nossr50/core/util/Motd.java | 4 +- .../core/util/TextComponentFactory.java | 7 ++- .../core/util/adapter/BiomeAdapter.java | 1 - .../commands/CommandRegistrationManager.java | 16 ------ .../core/util/commands/CommandUtils.java | 6 +-- .../util/experience/ExperienceBarManager.java | 3 +- .../util/experience/ExperienceBarWrapper.java | 12 ++--- .../core/util/experience/FormulaManager.java | 4 +- .../core/util/player/NotificationManager.java | 13 ++--- .../random/InvalidActivationException.java | 5 +- .../core/util/random/InvalidStaticChance.java | 5 +- .../util/random/RandomChanceSkillStatic.java | 2 +- .../core/util/random/RandomChanceUtil.java | 6 +-- .../util/scoreboards/ScoreboardManager.java | 7 +-- .../util/scoreboards/ScoreboardWrapper.java | 13 ++--- .../nossr50/core/util/skills/CombatUtils.java | 27 +++------- .../core/util/skills/ParticleEffectUtils.java | 14 ++--- .../nossr50/core/util/skills/PerksUtils.java | 4 +- .../nossr50/core/util/skills/SkillUtils.java | 15 ++---- .../core/util/sounds/SoundManager.java | 7 +-- .../core/util/upgrade/UpgradeManager.java | 1 - .../nossr50/core/util/uuid/UUIDFetcher.java | 4 +- .../core/worldguard/WorldGuardFlags.java | 1 - .../core/worldguard/WorldGuardManager.java | 12 +---- .../core/worldguard/WorldGuardUtils.java | 5 -- .../shatt/backup/ZipLibrary.java | 1 - 203 files changed, 583 insertions(+), 1017 deletions(-) rename core/src/main/java/com/gmail/nossr50/core/{skills/child => config}/ChildConfig.java (92%) delete mode 100644 core/src/main/java/com/gmail/nossr50/core/skills/SubSkillFlags.java diff --git a/bukkit/src/main/java/com/gmail/nossr50/mcMMO.java b/bukkit/src/main/java/com/gmail/nossr50/mcMMO.java index 256fad2b8..04a5298b9 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/bukkit/src/main/java/com/gmail/nossr50/mcMMO.java @@ -26,7 +26,7 @@ import com.gmail.nossr50.core.runnables.player.PlayerProfileLoadingTask; import com.gmail.nossr50.core.runnables.player.PowerLevelUpdatingTask; import com.gmail.nossr50.core.runnables.skills.BleedTimerTask; import com.gmail.nossr50.core.skills.PrimarySkillType; -import com.gmail.nossr50.core.skills.child.ChildConfig; +import com.gmail.nossr50.core.config.ChildConfig; import com.gmail.nossr50.core.skills.child.salvage.salvageables.Salvageable; import com.gmail.nossr50.core.skills.child.salvage.salvageables.SalvageableManager; import com.gmail.nossr50.core.skills.child.salvage.salvageables.SimpleSalvageableManager; diff --git a/core/src/main/java/com/gmail/nossr50/core/TODO b/core/src/main/java/com/gmail/nossr50/core/TODO index 449d0c8d1..4030a7354 100644 --- a/core/src/main/java/com/gmail/nossr50/core/TODO +++ b/core/src/main/java/com/gmail/nossr50/core/TODO @@ -15,4 +15,20 @@ This file is just going to take note of all the caveats of mcMMO code as I abstr 7) Weird stuff going on with ageables and strings in general in StringUtils -8) Reduce the amount of string operations in mcMMO as much as possible \ No newline at end of file +8) Reduce the amount of string operations in mcMMO as much as possible + + + +//////////// + +CONFIG NOTES + +/////////// + +1) All Config files need their validation redone and checked + +2) All Config files need unload programmed in + +3) All Config files need string operations reduced and to be double checked for errors in paths + +4) Need to setup removing old keys on configs \ No newline at end of file diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/child/ChildConfig.java b/core/src/main/java/com/gmail/nossr50/core/config/ChildConfig.java similarity index 92% rename from core/src/main/java/com/gmail/nossr50/core/skills/child/ChildConfig.java rename to core/src/main/java/com/gmail/nossr50/core/config/ChildConfig.java index f32e698b9..c434c0a97 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/child/ChildConfig.java +++ b/core/src/main/java/com/gmail/nossr50/core/config/ChildConfig.java @@ -1,9 +1,8 @@ -package com.gmail.nossr50.core.skills.child; +package com.gmail.nossr50.core.config; -import com.gmail.nossr50.core.config.AutoUpdateConfigLoader; import com.gmail.nossr50.core.skills.PrimarySkillType; -import com.gmail.nossr50.util.StringUtils; -import org.bukkit.configuration.file.YamlConfiguration; +import com.gmail.nossr50.core.skills.child.FamilyTree; +import com.gmail.nossr50.core.util.StringUtils; import java.util.EnumSet; diff --git a/core/src/main/java/com/gmail/nossr50/core/config/Config.java b/core/src/main/java/com/gmail/nossr50/core/config/Config.java index d66a36e61..2fcbaa16c 100644 --- a/core/src/main/java/com/gmail/nossr50/core/config/Config.java +++ b/core/src/main/java/com/gmail/nossr50/core/config/Config.java @@ -247,6 +247,8 @@ public abstract class Config implements VersionedConfig, Unload { if(mergeNewKeys) userRootNode = userRootNode.mergeValuesFrom(defaultRootNode); + removeOldKeys(); + // Update config version updateConfigVersion(); diff --git a/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomBlockConfig.java b/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomBlockConfig.java index 4b983ec9d..4ab5dcddd 100644 --- a/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomBlockConfig.java +++ b/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomBlockConfig.java @@ -1,15 +1,11 @@ package com.gmail.nossr50.core.config.mods; import com.gmail.nossr50.core.McmmoCore; -import com.gmail.nossr50.core.config.ConfigLoader; import com.gmail.nossr50.core.config.ConfigKeyRegister; -import com.gmail.nossr50.core.mcmmo.mods.CustomBlock; -import org.bukkit.Material; -import org.bukkit.configuration.ConfigurationSection; +import com.gmail.nossr50.core.datatypes.mods.CustomBlock; import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Set; public class CustomBlockConfig extends ConfigKeyRegister { diff --git a/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomEntityConfig.java b/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomEntityConfig.java index 24dd9914d..27f2c8f95 100644 --- a/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomEntityConfig.java +++ b/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomEntityConfig.java @@ -1,12 +1,9 @@ package com.gmail.nossr50.core.config.mods; import com.gmail.nossr50.core.McmmoCore; -import com.gmail.nossr50.core.config.ConfigLoader; import com.gmail.nossr50.core.config.Config; -import com.gmail.nossr50.core.mcmmo.mods.CustomEntity; -import org.apache.commons.lang.ClassUtils; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; +import com.gmail.nossr50.core.datatypes.mods.CustomEntity; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import java.util.HashMap; diff --git a/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomToolConfig.java b/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomToolConfig.java index 5897ec3e7..c60489d56 100644 --- a/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomToolConfig.java +++ b/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomToolConfig.java @@ -1,20 +1,15 @@ package com.gmail.nossr50.core.config.mods; import com.gmail.nossr50.core.McmmoCore; -import com.gmail.nossr50.core.config.ConfigLoader; import com.gmail.nossr50.core.config.Config; -import com.gmail.nossr50.core.mcmmo.mods.CustomTool; -import com.gmail.nossr50.core.mcmmo.skills.ItemType; -import com.gmail.nossr50.core.mcmmo.skills.MaterialType; -import com.gmail.nossr50.skills.repair.repairables.Repairable; -import com.gmail.nossr50.skills.repair.repairables.RepairableFactory; -import com.gmail.nossr50.util.skills.SkillUtils; -import org.bukkit.Material; -import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.inventory.ItemStack; +import com.gmail.nossr50.core.datatypes.mods.CustomTool; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; +import com.gmail.nossr50.core.skills.MaterialType; +import com.gmail.nossr50.core.skills.primary.repair.repairables.Repairable; +import com.gmail.nossr50.core.skills.primary.repair.repairables.RepairableFactory; +import com.gmail.nossr50.core.util.skills.SkillUtils; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Set; diff --git a/core/src/main/java/com/gmail/nossr50/core/config/mods/EntityConfigManager.java b/core/src/main/java/com/gmail/nossr50/core/config/mods/EntityConfigManager.java index 05d6e2968..a4217f5e7 100644 --- a/core/src/main/java/com/gmail/nossr50/core/config/mods/EntityConfigManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/config/mods/EntityConfigManager.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.core.config.mods; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.ModManager; + +import com.gmail.nossr50.core.util.ModManager; import java.io.File; import java.util.regex.Pattern; diff --git a/core/src/main/java/com/gmail/nossr50/core/config/mods/ToolConfigManager.java b/core/src/main/java/com/gmail/nossr50/core/config/mods/ToolConfigManager.java index e7cc09e18..c2a14337c 100644 --- a/core/src/main/java/com/gmail/nossr50/core/config/mods/ToolConfigManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/config/mods/ToolConfigManager.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.core.config.mods; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.ModManager; + +import com.gmail.nossr50.core.util.ModManager; import java.io.File; import java.util.regex.Pattern; diff --git a/core/src/main/java/com/gmail/nossr50/core/config/skills/alchemy/PotionConfig.java b/core/src/main/java/com/gmail/nossr50/core/config/skills/alchemy/PotionConfig.java index ada2e96b5..b04ff0f38 100644 --- a/core/src/main/java/com/gmail/nossr50/core/config/skills/alchemy/PotionConfig.java +++ b/core/src/main/java/com/gmail/nossr50/core/config/skills/alchemy/PotionConfig.java @@ -5,7 +5,6 @@ import com.gmail.nossr50.core.config.Config; import com.gmail.nossr50.core.mcmmo.colors.ChatColor; import com.gmail.nossr50.core.mcmmo.item.ItemStack; import com.gmail.nossr50.core.skills.primary.alchemy.AlchemyPotion; -import org.bukkit.configuration.ConfigurationSection; import java.util.ArrayList; import java.util.HashMap; diff --git a/core/src/main/java/com/gmail/nossr50/core/config/skills/repair/RepairConfigManager.java b/core/src/main/java/com/gmail/nossr50/core/config/skills/repair/RepairConfigManager.java index fec3cb859..eb0b0f098 100644 --- a/core/src/main/java/com/gmail/nossr50/core/config/skills/repair/RepairConfigManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/config/skills/repair/RepairConfigManager.java @@ -1,7 +1,7 @@ -package com.gmail.nossr50.config.skills.repair; +package com.gmail.nossr50.core.config.skills.repair; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.skills.repair.repairables.Repairable; +import com.gmail.nossr50.core.config.skills.repair.RepairConfig; +import com.gmail.nossr50.core.skills.primary.repair.repairables.Repairable; import java.io.File; import java.util.ArrayList; diff --git a/core/src/main/java/com/gmail/nossr50/core/config/skills/salvage/SalvageConfig.java b/core/src/main/java/com/gmail/nossr50/core/config/skills/salvage/SalvageConfig.java index e9dffc0f7..7a431fbd6 100644 --- a/core/src/main/java/com/gmail/nossr50/core/config/skills/salvage/SalvageConfig.java +++ b/core/src/main/java/com/gmail/nossr50/core/config/skills/salvage/SalvageConfig.java @@ -1,17 +1,13 @@ -package com.gmail.nossr50.config.skills.salvage; +package com.gmail.nossr50.core.config.skills.salvage; -import com.gmail.nossr50.config.ConfigLoader; import com.gmail.nossr50.core.McmmoCore; import com.gmail.nossr50.core.config.Config; -import com.gmail.nossr50.core.mcmmo.skills.ItemType; -import com.gmail.nossr50.core.mcmmo.skills.MaterialType; -import com.gmail.nossr50.skills.salvage.salvageables.Salvageable; -import com.gmail.nossr50.skills.salvage.salvageables.SalvageableFactory; -import com.gmail.nossr50.util.ItemUtils; -import com.gmail.nossr50.util.skills.SkillUtils; -import org.bukkit.Material; -import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.inventory.ItemStack; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; +import com.gmail.nossr50.core.skills.MaterialType; +import com.gmail.nossr50.core.skills.child.salvage.salvageables.Salvageable; +import com.gmail.nossr50.core.skills.child.salvage.salvageables.SalvageableFactory; +import com.gmail.nossr50.core.util.ItemUtils; +import com.gmail.nossr50.core.util.skills.SkillUtils; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/ChunkletManager.java b/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/ChunkletManager.java index 5b6fab200..f013b968f 100644 --- a/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/ChunkletManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/ChunkletManager.java @@ -1,7 +1,8 @@ package com.gmail.nossr50.core.data.blockmeta; -import org.bukkit.World; -import org.bukkit.block.Block; + +import com.gmail.nossr50.core.mcmmo.block.Block; +import com.gmail.nossr50.core.mcmmo.world.World; public interface ChunkletManager { /** diff --git a/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/HashChunkletManager.java b/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/HashChunkletManager.java index e80edc8d0..e0699219b 100644 --- a/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/HashChunkletManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/HashChunkletManager.java @@ -1,8 +1,7 @@ package com.gmail.nossr50.core.data.blockmeta; -import com.gmail.nossr50.mcMMO; -import org.bukkit.World; -import org.bukkit.block.Block; +import com.gmail.nossr50.core.mcmmo.block.Block; +import com.gmail.nossr50.core.mcmmo.world.World; import java.io.*; import java.util.HashMap; diff --git a/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/conversion/BlockStoreConversionMain.java b/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/conversion/BlockStoreConversionMain.java index 6938eb767..9131798d2 100644 --- a/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/conversion/BlockStoreConversionMain.java +++ b/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/conversion/BlockStoreConversionMain.java @@ -1,8 +1,6 @@ package com.gmail.nossr50.core.data.blockmeta.conversion; import com.gmail.nossr50.core.config.ChunkConversionOptions; -import com.gmail.nossr50.mcMMO; -import org.bukkit.scheduler.BukkitScheduler; import java.io.File; diff --git a/core/src/main/java/com/gmail/nossr50/core/data/database/FlatfileDatabaseManager.java b/core/src/main/java/com/gmail/nossr50/core/data/database/FlatfileDatabaseManager.java index 6409f7ad9..264c679df 100644 --- a/core/src/main/java/com/gmail/nossr50/core/data/database/FlatfileDatabaseManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/data/database/FlatfileDatabaseManager.java @@ -1,20 +1,18 @@ package com.gmail.nossr50.core.data.database; -import com.gmail.nossr50.config.AdvancedConfig; -import com.gmail.nossr50.config.Config; -import com.gmail.nossr50.core.mcmmo.MobHealthbarType; -import com.gmail.nossr50.core.mcmmo.database.DatabaseType; -import com.gmail.nossr50.core.mcmmo.database.PlayerStat; -import com.gmail.nossr50.core.mcmmo.database.UpgradeType; -import com.gmail.nossr50.core.mcmmo.player.PlayerProfile; -import com.gmail.nossr50.core.mcmmo.player.UniqueDataType; -import com.gmail.nossr50.core.mcmmo.skills.PrimarySkillType; -import com.gmail.nossr50.core.mcmmo.skills.SuperAbilityType; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.runnables.database.UUIDUpdateAsyncTask; -import com.gmail.nossr50.util.Misc; -import com.gmail.nossr50.util.StringUtils; -import org.bukkit.OfflinePlayer; +import com.gmail.nossr50.core.config.AdvancedConfig; +import com.gmail.nossr50.core.datatypes.database.DatabaseType; +import com.gmail.nossr50.core.datatypes.database.PlayerStat; +import com.gmail.nossr50.core.datatypes.database.UpgradeType; +import com.gmail.nossr50.core.datatypes.player.PlayerProfile; +import com.gmail.nossr50.core.datatypes.player.UniqueDataType; +import com.gmail.nossr50.core.runnables.database.UUIDUpdateAsyncTask; +import com.gmail.nossr50.core.skills.MobHealthbarType; +import com.gmail.nossr50.core.skills.PrimarySkillType; +import com.gmail.nossr50.core.skills.SuperAbilityType; +import com.gmail.nossr50.core.util.Misc; +import com.gmail.nossr50.core.util.StringUtils; +import sun.security.krb5.Config; import java.io.*; import java.util.*; diff --git a/core/src/main/java/com/gmail/nossr50/core/data/database/SQLDatabaseManager.java b/core/src/main/java/com/gmail/nossr50/core/data/database/SQLDatabaseManager.java index 48a3a73ad..b1d43d55a 100644 --- a/core/src/main/java/com/gmail/nossr50/core/data/database/SQLDatabaseManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/data/database/SQLDatabaseManager.java @@ -1,21 +1,19 @@ package com.gmail.nossr50.core.data.database; -import com.gmail.nossr50.config.AdvancedConfig; -import com.gmail.nossr50.config.Config; -import com.gmail.nossr50.core.mcmmo.MobHealthbarType; -import com.gmail.nossr50.core.mcmmo.database.DatabaseType; -import com.gmail.nossr50.core.mcmmo.database.PlayerStat; -import com.gmail.nossr50.core.mcmmo.database.UpgradeType; -import com.gmail.nossr50.core.mcmmo.player.PlayerProfile; -import com.gmail.nossr50.core.mcmmo.player.UniqueDataType; -import com.gmail.nossr50.core.mcmmo.skills.PrimarySkillType; -import com.gmail.nossr50.core.mcmmo.skills.SuperAbilityType; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.runnables.database.UUIDUpdateAsyncTask; -import com.gmail.nossr50.util.Misc; +import com.gmail.nossr50.core.config.AdvancedConfig; +import com.gmail.nossr50.core.datatypes.database.DatabaseType; +import com.gmail.nossr50.core.datatypes.database.PlayerStat; +import com.gmail.nossr50.core.datatypes.database.UpgradeType; +import com.gmail.nossr50.core.datatypes.player.PlayerProfile; +import com.gmail.nossr50.core.datatypes.player.UniqueDataType; +import com.gmail.nossr50.core.runnables.database.UUIDUpdateAsyncTask; +import com.gmail.nossr50.core.skills.MobHealthbarType; +import com.gmail.nossr50.core.skills.PrimarySkillType; +import com.gmail.nossr50.core.skills.SuperAbilityType; +import com.gmail.nossr50.core.util.Misc; import org.apache.tomcat.jdbc.pool.DataSource; import org.apache.tomcat.jdbc.pool.PoolProperties; -import org.bukkit.scheduler.BukkitRunnable; +import sun.security.krb5.Config; import java.sql.*; import java.util.*; diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/chat/ChatMode.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/chat/ChatMode.java index 4a6c3c267..b6d12729d 100644 --- a/core/src/main/java/com/gmail/nossr50/core/datatypes/chat/ChatMode.java +++ b/core/src/main/java/com/gmail/nossr50/core/datatypes/chat/ChatMode.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.core.datatypes.chat; -import com.gmail.nossr50.locale.LocaleLoader; +import com.gmail.nossr50.core.locale.LocaleLoader; public enum ChatMode { ADMIN(LocaleLoader.getString("Commands.AdminChat.On"), LocaleLoader.getString("Commands.AdminChat.Off")), diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/experience/SkillXpGain.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/experience/SkillXpGain.java index 8bbb7c55d..e9781523c 100644 --- a/core/src/main/java/com/gmail/nossr50/core/datatypes/experience/SkillXpGain.java +++ b/core/src/main/java/com/gmail/nossr50/core/datatypes/experience/SkillXpGain.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.core.datatypes.experience; -import com.gmail.nossr50.config.experience.ExperienceConfig; +import com.gmail.nossr50.core.config.experience.ExperienceConfig; import com.gmail.nossr50.core.skills.PrimarySkillType; import java.util.concurrent.Delayed; diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/json/CustomBaseComponent.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/json/CustomBaseComponent.java index 70193bfb1..72115c965 100644 --- a/core/src/main/java/com/gmail/nossr50/core/datatypes/json/CustomBaseComponent.java +++ b/core/src/main/java/com/gmail/nossr50/core/datatypes/json/CustomBaseComponent.java @@ -1,6 +1,5 @@ package com.gmail.nossr50.core.datatypes.json; -import net.md_5.bungee.api.chat.BaseComponent; public class CustomBaseComponent extends BaseComponent { @Override diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/json/McMMOWebLinks.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/json/McMMOWebLinks.java index 749fc920c..e59e315c3 100644 --- a/core/src/main/java/com/gmail/nossr50/core/datatypes/json/McMMOWebLinks.java +++ b/core/src/main/java/com/gmail/nossr50/core/datatypes/json/McMMOWebLinks.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.core.datatypes.json; -import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.util.StringUtils; +import com.gmail.nossr50.core.locale.LocaleLoader; +import com.gmail.nossr50.core.util.StringUtils; public enum McMMOWebLinks { WEBSITE, diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/meta/OldName.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/meta/OldName.java index df89f3eeb..8c7372f5c 100644 --- a/core/src/main/java/com/gmail/nossr50/core/datatypes/meta/OldName.java +++ b/core/src/main/java/com/gmail/nossr50/core/datatypes/meta/OldName.java @@ -1,7 +1,5 @@ package com.gmail.nossr50.core.datatypes.meta; -import com.gmail.nossr50.mcMMO; -import org.bukkit.metadata.FixedMetadataValue; /** * This class is for storing mob names since we switch them to heart values diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/mods/CustomEntity.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/mods/CustomEntity.java index d99c279aa..c01f31396 100644 --- a/core/src/main/java/com/gmail/nossr50/core/datatypes/mods/CustomEntity.java +++ b/core/src/main/java/com/gmail/nossr50/core/datatypes/mods/CustomEntity.java @@ -1,6 +1,7 @@ package com.gmail.nossr50.core.datatypes.mods; -import org.bukkit.inventory.ItemStack; + +import com.gmail.nossr50.core.mcmmo.item.ItemStack; public class CustomEntity { private double xpMultiplier; diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/party/ItemShareType.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/party/ItemShareType.java index 54f1995c3..a294a2229 100644 --- a/core/src/main/java/com/gmail/nossr50/core/datatypes/party/ItemShareType.java +++ b/core/src/main/java/com/gmail/nossr50/core/datatypes/party/ItemShareType.java @@ -1,9 +1,9 @@ package com.gmail.nossr50.core.datatypes.party; -import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.util.ItemUtils; -import com.gmail.nossr50.util.StringUtils; -import org.bukkit.inventory.ItemStack; +import com.gmail.nossr50.core.locale.LocaleLoader; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; +import com.gmail.nossr50.core.util.ItemUtils; +import com.gmail.nossr50.core.util.StringUtils; public enum ItemShareType { LOOT, diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/party/Party.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/party/Party.java index 98c9251a6..07ace3010 100644 --- a/core/src/main/java/com/gmail/nossr50/core/datatypes/party/Party.java +++ b/core/src/main/java/com/gmail/nossr50/core/datatypes/party/Party.java @@ -1,17 +1,16 @@ package com.gmail.nossr50.core.datatypes.party; -import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.core.config.MainConfig; +import com.gmail.nossr50.core.config.experience.ExperienceConfig; import com.gmail.nossr50.core.datatypes.experience.FormulaType; -import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.party.PartyManager; -import com.gmail.nossr50.util.EventUtils; -import com.gmail.nossr50.util.sounds.SoundManager; -import com.gmail.nossr50.util.sounds.SoundType; -import org.bukkit.ChatColor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; +import com.gmail.nossr50.core.locale.LocaleLoader; +import com.gmail.nossr50.core.mcmmo.colors.ChatColor; +import com.gmail.nossr50.core.mcmmo.commands.CommandSender; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.party.PartyManager; +import com.gmail.nossr50.core.util.EventUtils; +import com.gmail.nossr50.core.util.sounds.SoundManager; +import com.gmail.nossr50.core.util.sounds.SoundType; import java.text.DecimalFormat; import java.util.ArrayList; diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyFeature.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyFeature.java index a107c8ae7..8d471d7e4 100644 --- a/core/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyFeature.java +++ b/core/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyFeature.java @@ -1,11 +1,10 @@ package com.gmail.nossr50.core.datatypes.party; -import com.gmail.nossr50.commands.party.PartySubcommandType; import com.gmail.nossr50.core.config.MainConfig; -import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.util.Permissions; -import com.gmail.nossr50.util.StringUtils; -import org.bukkit.entity.Player; +import com.gmail.nossr50.core.locale.LocaleLoader; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.util.Permissions; +import com.gmail.nossr50.core.util.StringUtils; public enum PartyFeature { CHAT, diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyTeleportRecord.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyTeleportRecord.java index 74b1014e1..771e1af39 100644 --- a/core/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyTeleportRecord.java +++ b/core/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyTeleportRecord.java @@ -1,8 +1,8 @@ package com.gmail.nossr50.core.datatypes.party; import com.gmail.nossr50.core.config.MainConfig; -import com.gmail.nossr50.util.Misc; -import org.bukkit.entity.Player; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.util.Misc; public class PartyTeleportRecord { private Player requestor; diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/party/ShareMode.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/party/ShareMode.java index bda169d6c..440ea18dc 100644 --- a/core/src/main/java/com/gmail/nossr50/core/datatypes/party/ShareMode.java +++ b/core/src/main/java/com/gmail/nossr50/core/datatypes/party/ShareMode.java @@ -1,6 +1,7 @@ package com.gmail.nossr50.core.datatypes.party; -import com.gmail.nossr50.util.commands.CommandUtils; + +import com.gmail.nossr50.core.util.commands.CommandUtils; public enum ShareMode { NONE, diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/player/PlayerProfile.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/player/PlayerProfile.java index 6eeda2cb1..a6a7b7415 100644 --- a/core/src/main/java/com/gmail/nossr50/core/datatypes/player/PlayerProfile.java +++ b/core/src/main/java/com/gmail/nossr50/core/datatypes/player/PlayerProfile.java @@ -1,17 +1,16 @@ package com.gmail.nossr50.core.datatypes.player; -import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.core.config.AdvancedConfig; import com.gmail.nossr50.core.config.MainConfig; +import com.gmail.nossr50.core.config.experience.ExperienceConfig; import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.datatypes.experience.FormulaType; import com.gmail.nossr50.core.datatypes.experience.SkillXpGain; +import com.gmail.nossr50.core.runnables.player.PlayerProfileSaveTask; import com.gmail.nossr50.core.skills.MobHealthbarType; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.SuperAbilityType; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.runnables.player.PlayerProfileSaveTask; -import com.gmail.nossr50.skills.child.FamilyTree; +import com.gmail.nossr50.core.skills.child.FamilyTree; import com.google.common.collect.ImmutableMap; import java.util.HashMap; diff --git a/core/src/main/java/com/gmail/nossr50/core/events/chat/McMMOPartyChatEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/chat/McMMOPartyChatEvent.java index 970ce811e..76f001222 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/chat/McMMOPartyChatEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/chat/McMMOPartyChatEvent.java @@ -1,6 +1,7 @@ package com.gmail.nossr50.core.events.chat; -import org.bukkit.plugin.Plugin; + +import com.gmail.nossr50.core.mcmmo.plugin.Plugin; /** * Called when a chat is sent to a party channel diff --git a/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerExperienceEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerExperienceEvent.java index 247f8d3c4..9a7b194ac 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerExperienceEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerExperienceEvent.java @@ -2,11 +2,8 @@ package com.gmail.nossr50.core.events.experience; import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.datatypes.experience.XPGainReason; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; -import org.bukkit.entity.Player; -import org.bukkit.event.Cancellable; -import org.bukkit.event.HandlerList; -import org.bukkit.event.player.PlayerEvent; /** * Generic event for mcMMO experience events. diff --git a/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerLevelChangeEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerLevelChangeEvent.java index 3c769a19c..3e79947b2 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerLevelChangeEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerLevelChangeEvent.java @@ -1,8 +1,8 @@ package com.gmail.nossr50.core.events.experience; import com.gmail.nossr50.core.datatypes.experience.XPGainReason; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; -import org.bukkit.entity.Player; /** * Called when a user levels change diff --git a/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerLevelDownEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerLevelDownEvent.java index b153d2c1f..1646c887d 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerLevelDownEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerLevelDownEvent.java @@ -1,9 +1,8 @@ package com.gmail.nossr50.core.events.experience; import com.gmail.nossr50.core.datatypes.experience.XPGainReason; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; -import org.bukkit.entity.Player; -import org.bukkit.event.HandlerList; /** * Called when a user loses levels in a skill diff --git a/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerLevelUpEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerLevelUpEvent.java index 342c5479a..320667152 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerLevelUpEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerLevelUpEvent.java @@ -1,9 +1,8 @@ package com.gmail.nossr50.core.events.experience; import com.gmail.nossr50.core.datatypes.experience.XPGainReason; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; -import org.bukkit.entity.Player; -import org.bukkit.event.HandlerList; /** * Called when a user levels up in a skill diff --git a/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerXpGainEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerXpGainEvent.java index 3c5febfb2..b80535b6d 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerXpGainEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerXpGainEvent.java @@ -1,9 +1,8 @@ package com.gmail.nossr50.core.events.experience; import com.gmail.nossr50.core.datatypes.experience.XPGainReason; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; -import org.bukkit.entity.Player; -import org.bukkit.event.HandlerList; /** * Called when a player gains XP in a skill diff --git a/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeBlockBreakEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeBlockBreakEvent.java index 11892986c..c09ec60e7 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeBlockBreakEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeBlockBreakEvent.java @@ -1,8 +1,6 @@ package com.gmail.nossr50.core.events.fake; -import org.bukkit.block.Block; -import org.bukkit.entity.Player; -import org.bukkit.event.block.BlockBreakEvent; +import com.gmail.nossr50.core.mcmmo.entity.Player; /** * Called when mcMMO breaks a block due to a special ability. diff --git a/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeBlockDamageEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeBlockDamageEvent.java index 06442f1c8..76f3e1294 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeBlockDamageEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeBlockDamageEvent.java @@ -1,9 +1,7 @@ package com.gmail.nossr50.core.events.fake; -import org.bukkit.block.Block; -import org.bukkit.entity.Player; -import org.bukkit.event.block.BlockDamageEvent; -import org.bukkit.inventory.ItemStack; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; /** * Called when mcMMO damages a block due to a special ability. diff --git a/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeBrewEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeBrewEvent.java index f50ef5574..3f160a8e8 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeBrewEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeBrewEvent.java @@ -1,8 +1,5 @@ package com.gmail.nossr50.core.events.fake; -import org.bukkit.block.Block; -import org.bukkit.event.inventory.BrewEvent; -import org.bukkit.inventory.BrewerInventory; public class FakeBrewEvent extends BrewEvent { public FakeBrewEvent(Block brewer, BrewerInventory contents, int fuelLevel) { diff --git a/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeEntityDamageByEntityEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeEntityDamageByEntityEvent.java index 5776eee32..aa47b5e40 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeEntityDamageByEntityEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeEntityDamageByEntityEvent.java @@ -2,11 +2,6 @@ package com.gmail.nossr50.core.events.fake; import com.google.common.base.Function; import com.google.common.base.Functions; -import org.bukkit.entity.Entity; -import org.bukkit.event.entity.EntityDamageByEntityEvent; - -import java.util.EnumMap; -import java.util.Map; /** * Called when mcMMO applies damage from an entity due to special abilities. diff --git a/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeEntityDamageEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeEntityDamageEvent.java index ff0b2fd58..c7f2737b9 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeEntityDamageEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeEntityDamageEvent.java @@ -2,11 +2,7 @@ package com.gmail.nossr50.core.events.fake; import com.google.common.base.Function; import com.google.common.base.Functions; -import org.bukkit.entity.Entity; -import org.bukkit.event.entity.EntityDamageEvent; -import java.util.EnumMap; -import java.util.Map; /** * Called when mcMMO applies damage due to special abilities. diff --git a/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeEntityTameEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeEntityTameEvent.java index 078a866fc..2a74dbbec 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeEntityTameEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeEntityTameEvent.java @@ -1,8 +1,5 @@ package com.gmail.nossr50.core.events.fake; -import org.bukkit.entity.AnimalTamer; -import org.bukkit.entity.LivingEntity; -import org.bukkit.event.entity.EntityTameEvent; /** * Called when mcMMO tames an animal via Call of the Wild diff --git a/core/src/main/java/com/gmail/nossr50/core/events/fake/FakePlayerAnimationEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakePlayerAnimationEvent.java index 61263c64f..0aac2f2b4 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/fake/FakePlayerAnimationEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakePlayerAnimationEvent.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.core.events.fake; -import org.bukkit.entity.Player; -import org.bukkit.event.player.PlayerAnimationEvent; + +import com.gmail.nossr50.core.mcmmo.entity.Player; /** * Called when handling extra drops to avoid issues with NoCheat. diff --git a/core/src/main/java/com/gmail/nossr50/core/events/fake/FakePlayerFishEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakePlayerFishEvent.java index 746c03abc..4e7e57a5d 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/fake/FakePlayerFishEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakePlayerFishEvent.java @@ -1,9 +1,7 @@ package com.gmail.nossr50.core.events.fake; -import org.bukkit.entity.Entity; -import org.bukkit.entity.FishHook; -import org.bukkit.entity.Player; -import org.bukkit.event.player.PlayerFishEvent; + +import com.gmail.nossr50.core.mcmmo.entity.Player; public class FakePlayerFishEvent extends PlayerFishEvent { public FakePlayerFishEvent(Player player, Entity entity, FishHook hookEntity, State state) { diff --git a/core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerDeathPenaltyEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerDeathPenaltyEvent.java index 212b21b63..9c1df24e3 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerDeathPenaltyEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerDeathPenaltyEvent.java @@ -1,9 +1,6 @@ package com.gmail.nossr50.core.events.hardcore; -import org.bukkit.entity.Player; -import org.bukkit.event.Cancellable; -import org.bukkit.event.HandlerList; -import org.bukkit.event.player.PlayerEvent; +import com.gmail.nossr50.core.mcmmo.entity.Player; import java.util.HashMap; diff --git a/core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerPreDeathPenaltyEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerPreDeathPenaltyEvent.java index 6093ecf3f..1beaf9957 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerPreDeathPenaltyEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerPreDeathPenaltyEvent.java @@ -1,9 +1,6 @@ package com.gmail.nossr50.core.events.hardcore; -import org.bukkit.entity.Player; -import org.bukkit.event.Cancellable; -import org.bukkit.event.HandlerList; -import org.bukkit.event.player.PlayerEvent; +import com.gmail.nossr50.core.mcmmo.entity.Player; public class McMMOPlayerPreDeathPenaltyEvent extends PlayerEvent implements Cancellable { /** diff --git a/core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerStatLossEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerStatLossEvent.java index 158390b13..5cc685d23 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerStatLossEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerStatLossEvent.java @@ -1,6 +1,7 @@ package com.gmail.nossr50.core.events.hardcore; -import org.bukkit.entity.Player; + +import com.gmail.nossr50.core.mcmmo.entity.Player; import java.util.HashMap; diff --git a/core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerVampirismEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerVampirismEvent.java index f7162b8fb..3ba1e70cc 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerVampirismEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerVampirismEvent.java @@ -1,6 +1,7 @@ package com.gmail.nossr50.core.events.hardcore; -import org.bukkit.entity.Player; + +import com.gmail.nossr50.core.mcmmo.entity.Player; import java.util.HashMap; diff --git a/core/src/main/java/com/gmail/nossr50/core/events/items/McMMOItemSpawnEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/items/McMMOItemSpawnEvent.java index d4790bb89..3ef20445b 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/items/McMMOItemSpawnEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/items/McMMOItemSpawnEvent.java @@ -1,10 +1,6 @@ package com.gmail.nossr50.core.events.items; -import org.bukkit.Location; -import org.bukkit.event.Cancellable; -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; -import org.bukkit.inventory.ItemStack; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; /** * Called when mcMMO is preparing to drop an item. diff --git a/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyAllianceChangeEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyAllianceChangeEvent.java index 6d3f7a419..0ba2e08b0 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyAllianceChangeEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyAllianceChangeEvent.java @@ -1,9 +1,6 @@ package com.gmail.nossr50.core.events.party; -import org.bukkit.entity.Player; -import org.bukkit.event.Cancellable; -import org.bukkit.event.HandlerList; -import org.bukkit.event.player.PlayerEvent; +import com.gmail.nossr50.core.mcmmo.entity.Player; public class McMMOPartyAllianceChangeEvent extends PlayerEvent implements Cancellable { /** diff --git a/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyChangeEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyChangeEvent.java index 24b200218..9e7d15bad 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyChangeEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyChangeEvent.java @@ -1,9 +1,6 @@ package com.gmail.nossr50.core.events.party; -import org.bukkit.entity.Player; -import org.bukkit.event.Cancellable; -import org.bukkit.event.HandlerList; -import org.bukkit.event.player.PlayerEvent; +import com.gmail.nossr50.core.mcmmo.entity.Player; /** * Called when a player attempts to join, leave, or change parties. diff --git a/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyLevelUpEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyLevelUpEvent.java index 4e70108fa..36df6fb88 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyLevelUpEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyLevelUpEvent.java @@ -1,9 +1,6 @@ package com.gmail.nossr50.core.events.party; import com.gmail.nossr50.core.datatypes.party.Party; -import org.bukkit.event.Cancellable; -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; public class McMMOPartyLevelUpEvent extends Event implements Cancellable { /** diff --git a/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyTeleportEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyTeleportEvent.java index 9be1111ad..2ea7f9c26 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyTeleportEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyTeleportEvent.java @@ -1,8 +1,6 @@ package com.gmail.nossr50.core.events.party; -import org.bukkit.entity.Player; -import org.bukkit.event.HandlerList; -import org.bukkit.event.player.PlayerTeleportEvent; +import com.gmail.nossr50.core.mcmmo.entity.Player; /** * Called just before a player teleports using the /ptp command. diff --git a/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyXpGainEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyXpGainEvent.java index 234721ffe..3e567ccbe 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyXpGainEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyXpGainEvent.java @@ -1,9 +1,6 @@ package com.gmail.nossr50.core.events.party; import com.gmail.nossr50.core.datatypes.party.Party; -import org.bukkit.event.Cancellable; -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; public class McMMOPartyXpGainEvent extends Event implements Cancellable { /** diff --git a/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardEvent.java index 2246c8b2e..513ce2f21 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardEvent.java @@ -1,9 +1,6 @@ package com.gmail.nossr50.core.events.scoreboard; -import org.bukkit.entity.Player; -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; -import org.bukkit.scoreboard.Scoreboard; +import com.gmail.nossr50.core.mcmmo.entity.Player; /** * The parent class of all mcMMO scoreboard events diff --git a/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardMakeboardEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardMakeboardEvent.java index 4d8ffec8d..160555e1a 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardMakeboardEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardMakeboardEvent.java @@ -1,7 +1,6 @@ package com.gmail.nossr50.core.events.scoreboard; -import org.bukkit.entity.Player; -import org.bukkit.scoreboard.Scoreboard; +import com.gmail.nossr50.core.mcmmo.entity.Player; /** * This event is called when mcMMO creates its custom boards diff --git a/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardObjectiveEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardObjectiveEvent.java index fe471604a..5d7cbfc71 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardObjectiveEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardObjectiveEvent.java @@ -1,9 +1,6 @@ package com.gmail.nossr50.core.events.scoreboard; -import org.bukkit.entity.Player; -import org.bukkit.event.Cancellable; -import org.bukkit.scoreboard.Objective; -import org.bukkit.scoreboard.Scoreboard; +import com.gmail.nossr50.core.mcmmo.entity.Player; public class McMMOScoreboardObjectiveEvent extends McMMOScoreboardEvent implements Cancellable { protected final ScoreboardObjectiveEventReason objectiveEventReason; diff --git a/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardRevertEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardRevertEvent.java index dbe261e91..cdcfd9299 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardRevertEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardRevertEvent.java @@ -1,7 +1,6 @@ package com.gmail.nossr50.core.events.scoreboard; -import org.bukkit.entity.Player; -import org.bukkit.scoreboard.Scoreboard; +import com.gmail.nossr50.core.mcmmo.entity.Player; /** * This event is called when mcMMO is attempting to change a players targetBoard back to their previous board diff --git a/core/src/main/java/com/gmail/nossr50/core/events/skills/McMMOPlayerNotificationEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/McMMOPlayerNotificationEvent.java index 02564d84a..075a1276c 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/skills/McMMOPlayerNotificationEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/McMMOPlayerNotificationEvent.java @@ -1,12 +1,9 @@ package com.gmail.nossr50.core.events.skills; import com.gmail.nossr50.core.datatypes.interactions.NotificationType; -import net.md_5.bungee.api.ChatMessageType; -import net.md_5.bungee.api.chat.TextComponent; -import org.bukkit.entity.Player; -import org.bukkit.event.Cancellable; -import org.bukkit.event.HandlerList; -import org.bukkit.event.player.PlayerEvent; +import com.gmail.nossr50.core.mcmmo.entity.Player; + +import java.awt.*; /** * This event is sent for when mcMMO informs a player about various important information diff --git a/core/src/main/java/com/gmail/nossr50/core/events/skills/McMMOPlayerSkillEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/McMMOPlayerSkillEvent.java index 4ddc9ffb1..a679d4c64 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/skills/McMMOPlayerSkillEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/McMMOPlayerSkillEvent.java @@ -1,10 +1,8 @@ package com.gmail.nossr50.core.events.skills; import com.gmail.nossr50.core.data.UserManager; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; -import org.bukkit.entity.Player; -import org.bukkit.event.HandlerList; -import org.bukkit.event.player.PlayerEvent; /** * Generic event for mcMMO skill handling. diff --git a/core/src/main/java/com/gmail/nossr50/core/events/skills/abilities/McMMOPlayerAbilityActivateEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/abilities/McMMOPlayerAbilityActivateEvent.java index 241b669ee..45e5e85e3 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/skills/abilities/McMMOPlayerAbilityActivateEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/abilities/McMMOPlayerAbilityActivateEvent.java @@ -1,8 +1,7 @@ package com.gmail.nossr50.core.events.skills.abilities; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; -import org.bukkit.entity.Player; -import org.bukkit.event.Cancellable; public class McMMOPlayerAbilityActivateEvent extends McMMOPlayerAbilityEvent implements Cancellable { private boolean cancelled; diff --git a/core/src/main/java/com/gmail/nossr50/core/events/skills/abilities/McMMOPlayerAbilityDeactivateEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/abilities/McMMOPlayerAbilityDeactivateEvent.java index e1c6a2d64..befdd55bf 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/skills/abilities/McMMOPlayerAbilityDeactivateEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/abilities/McMMOPlayerAbilityDeactivateEvent.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.core.events.skills.abilities; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; -import org.bukkit.entity.Player; public class McMMOPlayerAbilityDeactivateEvent extends McMMOPlayerAbilityEvent { public McMMOPlayerAbilityDeactivateEvent(Player player, PrimarySkillType skill) { diff --git a/core/src/main/java/com/gmail/nossr50/core/events/skills/abilities/McMMOPlayerAbilityEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/abilities/McMMOPlayerAbilityEvent.java index 1ff35b90a..f772757fe 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/skills/abilities/McMMOPlayerAbilityEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/abilities/McMMOPlayerAbilityEvent.java @@ -1,9 +1,9 @@ package com.gmail.nossr50.core.events.skills.abilities; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.SuperAbilityType; import com.gmail.nossr50.core.events.skills.McMMOPlayerSkillEvent; -import org.bukkit.entity.Player; public class McMMOPlayerAbilityEvent extends McMMOPlayerSkillEvent { private SuperAbilityType ability; diff --git a/core/src/main/java/com/gmail/nossr50/core/events/skills/alchemy/McMMOPlayerBrewEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/alchemy/McMMOPlayerBrewEvent.java index 1a1ec0d19..b6dfdac66 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/skills/alchemy/McMMOPlayerBrewEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/alchemy/McMMOPlayerBrewEvent.java @@ -1,12 +1,9 @@ package com.gmail.nossr50.core.events.skills.alchemy; +import com.gmail.nossr50.core.mcmmo.block.BlockState; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.events.skills.McMMOPlayerSkillEvent; -import org.bukkit.block.Block; -import org.bukkit.block.BlockState; -import org.bukkit.block.BrewingStand; -import org.bukkit.entity.Player; -import org.bukkit.event.Cancellable; public class McMMOPlayerBrewEvent extends McMMOPlayerSkillEvent implements Cancellable { private BlockState brewingStand; diff --git a/core/src/main/java/com/gmail/nossr50/core/events/skills/alchemy/McMMOPlayerCatalysisEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/alchemy/McMMOPlayerCatalysisEvent.java index 499b9fc7f..cc11d7af1 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/skills/alchemy/McMMOPlayerCatalysisEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/alchemy/McMMOPlayerCatalysisEvent.java @@ -1,9 +1,8 @@ package com.gmail.nossr50.core.events.skills.alchemy; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.events.skills.McMMOPlayerSkillEvent; -import org.bukkit.entity.Player; -import org.bukkit.event.Cancellable; public class McMMOPlayerCatalysisEvent extends McMMOPlayerSkillEvent implements Cancellable { private double speed; diff --git a/core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerFishingEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerFishingEvent.java index 981573842..b1456c086 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerFishingEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerFishingEvent.java @@ -1,9 +1,8 @@ package com.gmail.nossr50.core.events.skills.fishing; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.events.skills.McMMOPlayerSkillEvent; -import org.bukkit.entity.Player; -import org.bukkit.event.Cancellable; public class McMMOPlayerFishingEvent extends McMMOPlayerSkillEvent implements Cancellable { private boolean cancelled; diff --git a/core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerFishingTreasureEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerFishingTreasureEvent.java index a5c0d5dd3..890e70bc2 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerFishingTreasureEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerFishingTreasureEvent.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.core.events.skills.fishing; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; public class McMMOPlayerFishingTreasureEvent extends McMMOPlayerFishingEvent { private ItemStack treasure; diff --git a/core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerMagicHunterEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerMagicHunterEvent.java index 017fc0d41..aacc831f9 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerMagicHunterEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerMagicHunterEvent.java @@ -1,10 +1,8 @@ package com.gmail.nossr50.core.events.skills.fishing; -import org.bukkit.enchantments.Enchantment; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; -import java.util.Map; public class McMMOPlayerMagicHunterEvent extends McMMOPlayerFishingTreasureEvent { private Map enchants; diff --git a/core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerShakeEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerShakeEvent.java index 74ba47e16..5e5cb2d01 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerShakeEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerShakeEvent.java @@ -1,7 +1,8 @@ package com.gmail.nossr50.core.events.skills.fishing; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; + +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; public class McMMOPlayerShakeEvent extends McMMOPlayerFishingEvent { private ItemStack drop; diff --git a/core/src/main/java/com/gmail/nossr50/core/events/skills/repair/McMMOPlayerRepairCheckEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/repair/McMMOPlayerRepairCheckEvent.java index 651a1b18b..48fb7047b 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/skills/repair/McMMOPlayerRepairCheckEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/repair/McMMOPlayerRepairCheckEvent.java @@ -1,10 +1,9 @@ package com.gmail.nossr50.core.events.skills.repair; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.events.skills.McMMOPlayerSkillEvent; -import org.bukkit.entity.Player; -import org.bukkit.event.Cancellable; -import org.bukkit.inventory.ItemStack; /** * Called just before a player repairs an object with mcMMO. diff --git a/core/src/main/java/com/gmail/nossr50/core/events/skills/salvage/McMMOPlayerSalvageCheckEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/salvage/McMMOPlayerSalvageCheckEvent.java index c988212ad..3cdfff660 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/skills/salvage/McMMOPlayerSalvageCheckEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/salvage/McMMOPlayerSalvageCheckEvent.java @@ -1,10 +1,9 @@ package com.gmail.nossr50.core.events.skills.salvage; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.events.skills.McMMOPlayerSkillEvent; -import org.bukkit.entity.Player; -import org.bukkit.event.Cancellable; -import org.bukkit.inventory.ItemStack; /** * Called just before a player salvages an item with mcMMO. diff --git a/core/src/main/java/com/gmail/nossr50/core/events/skills/secondaryabilities/SubSkillEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/secondaryabilities/SubSkillEvent.java index 507b9cefd..40a978771 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/skills/secondaryabilities/SubSkillEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/secondaryabilities/SubSkillEvent.java @@ -1,11 +1,10 @@ package com.gmail.nossr50.core.events.skills.secondaryabilities; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.SubSkillType; import com.gmail.nossr50.core.skills.subskills.AbstractSubSkill; import com.gmail.nossr50.core.events.skills.McMMOPlayerSkillEvent; -import org.bukkit.entity.Player; -import org.bukkit.event.Cancellable; public class SubSkillEvent extends McMMOPlayerSkillEvent implements Cancellable { private SubSkillType subSkillType; diff --git a/core/src/main/java/com/gmail/nossr50/core/events/skills/secondaryabilities/SubSkillRandomCheckEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/secondaryabilities/SubSkillRandomCheckEvent.java index 6e463eafc..4276eec3e 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/skills/secondaryabilities/SubSkillRandomCheckEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/secondaryabilities/SubSkillRandomCheckEvent.java @@ -1,8 +1,8 @@ package com.gmail.nossr50.core.events.skills.secondaryabilities; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.SubSkillType; import com.gmail.nossr50.core.skills.subskills.AbstractSubSkill; -import org.bukkit.entity.Player; public class SubSkillRandomCheckEvent extends SubSkillEvent { private double chance; diff --git a/core/src/main/java/com/gmail/nossr50/core/events/skills/unarmed/McMMOPlayerDisarmEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/unarmed/McMMOPlayerDisarmEvent.java index 0c492684d..27a620947 100644 --- a/core/src/main/java/com/gmail/nossr50/core/events/skills/unarmed/McMMOPlayerDisarmEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/unarmed/McMMOPlayerDisarmEvent.java @@ -1,9 +1,8 @@ package com.gmail.nossr50.core.events.skills.unarmed; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.events.skills.McMMOPlayerSkillEvent; -import org.bukkit.entity.Player; -import org.bukkit.event.Cancellable; public class McMMOPlayerDisarmEvent extends McMMOPlayerSkillEvent implements Cancellable { private boolean cancelled; diff --git a/core/src/main/java/com/gmail/nossr50/core/locale/LocaleLoader.java b/core/src/main/java/com/gmail/nossr50/core/locale/LocaleLoader.java index 63582f4f2..20bc6a83e 100644 --- a/core/src/main/java/com/gmail/nossr50/core/locale/LocaleLoader.java +++ b/core/src/main/java/com/gmail/nossr50/core/locale/LocaleLoader.java @@ -1,8 +1,7 @@ package com.gmail.nossr50.core.locale; import com.gmail.nossr50.core.config.MainConfig; -import com.gmail.nossr50.mcMMO; -import org.bukkit.ChatColor; +import com.gmail.nossr50.core.mcmmo.colors.ChatColor; import java.text.MessageFormat; import java.util.Locale; diff --git a/core/src/main/java/com/gmail/nossr50/core/party/PartyManager.java b/core/src/main/java/com/gmail/nossr50/core/party/PartyManager.java index 4ed88df41..3b8cc6f29 100644 --- a/core/src/main/java/com/gmail/nossr50/core/party/PartyManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/party/PartyManager.java @@ -11,18 +11,15 @@ import com.gmail.nossr50.core.datatypes.party.PartyLeader; import com.gmail.nossr50.core.datatypes.party.ShareMode; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.PlayerProfile; +import com.gmail.nossr50.core.events.party.McMMOPartyAllianceChangeEvent; +import com.gmail.nossr50.core.events.party.McMMOPartyChangeEvent; import com.gmail.nossr50.core.locale.LocaleLoader; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.util.Misc; import com.gmail.nossr50.core.util.Permissions; import com.gmail.nossr50.core.util.player.NotificationManager; import com.gmail.nossr50.core.util.sounds.SoundManager; import com.gmail.nossr50.core.util.sounds.SoundType; -import com.gmail.nossr50.events.party.McMMOPartyAllianceChangeEvent; -import com.gmail.nossr50.events.party.McMMOPartyChangeEvent; -import com.gmail.nossr50.mcMMO; -import org.bukkit.OfflinePlayer; -import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.entity.Player; import java.io.File; import java.util.ArrayList; diff --git a/core/src/main/java/com/gmail/nossr50/core/party/ShareHandler.java b/core/src/main/java/com/gmail/nossr50/core/party/ShareHandler.java index 0f786512d..df02837c9 100644 --- a/core/src/main/java/com/gmail/nossr50/core/party/ShareHandler.java +++ b/core/src/main/java/com/gmail/nossr50/core/party/ShareHandler.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.core.party; -import com.gmail.nossr50.config.party.ItemWeightConfig; import com.gmail.nossr50.core.config.MainConfig; +import com.gmail.nossr50.core.config.party.ItemWeightConfig; import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.datatypes.experience.XPGainReason; import com.gmail.nossr50.core.datatypes.experience.XPGainSource; @@ -9,11 +9,10 @@ import com.gmail.nossr50.core.datatypes.party.ItemShareType; import com.gmail.nossr50.core.datatypes.party.Party; import com.gmail.nossr50.core.datatypes.party.ShareMode; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.util.Misc; -import org.bukkit.entity.Item; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; import java.util.List; diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/CheckDateTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/CheckDateTask.java index 2a796ed7d..91f57a653 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/CheckDateTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/CheckDateTask.java @@ -1,9 +1,7 @@ package com.gmail.nossr50.core.runnables; import com.gmail.nossr50.core.runnables.skills.AprilTask; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.Misc; -import org.bukkit.scheduler.BukkitRunnable; +import com.gmail.nossr50.core.util.Misc; public class CheckDateTask extends BukkitRunnable { diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/MobHealthDisplayUpdaterTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/MobHealthDisplayUpdaterTask.java index 4ea6db325..bc2cae4ac 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/MobHealthDisplayUpdaterTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/MobHealthDisplayUpdaterTask.java @@ -1,8 +1,5 @@ package com.gmail.nossr50.core.runnables; -import com.gmail.nossr50.mcMMO; -import org.bukkit.entity.LivingEntity; -import org.bukkit.scheduler.BukkitRunnable; public class MobHealthDisplayUpdaterTask extends BukkitRunnable { private LivingEntity target; diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/PistonTrackerTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/PistonTrackerTask.java index b137ebd96..7b5db70cd 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/PistonTrackerTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/PistonTrackerTask.java @@ -1,12 +1,6 @@ package com.gmail.nossr50.core.runnables; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.BlockUtils; -import org.bukkit.block.Block; -import org.bukkit.block.BlockFace; -import org.bukkit.scheduler.BukkitRunnable; - -import java.util.List; +import com.gmail.nossr50.core.util.BlockUtils; public class PistonTrackerTask extends BukkitRunnable { private List blocks; diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/SaveTimerTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/SaveTimerTask.java index 8620f2520..ee58d4637 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/SaveTimerTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/SaveTimerTask.java @@ -2,10 +2,8 @@ package com.gmail.nossr50.core.runnables; import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; +import com.gmail.nossr50.core.party.PartyManager; import com.gmail.nossr50.core.runnables.player.PlayerProfileSaveTask; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.party.PartyManager; -import org.bukkit.scheduler.BukkitRunnable; public class SaveTimerTask extends BukkitRunnable { @Override diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/StickyPistonTrackerTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/StickyPistonTrackerTask.java index d3f8d5e48..a8f2b8aa7 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/StickyPistonTrackerTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/StickyPistonTrackerTask.java @@ -1,10 +1,6 @@ package com.gmail.nossr50.core.runnables; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.BlockUtils; -import org.bukkit.block.Block; -import org.bukkit.block.BlockFace; -import org.bukkit.scheduler.BukkitRunnable; +import com.gmail.nossr50.core.util.BlockUtils; public class StickyPistonTrackerTask extends BukkitRunnable { private BlockFace direction; diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/backups/CleanBackupsTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/backups/CleanBackupsTask.java index e53ba3571..b1c055035 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/backups/CleanBackupsTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/backups/CleanBackupsTask.java @@ -1,8 +1,6 @@ package com.gmail.nossr50.core.runnables.backups; import com.gmail.nossr50.core.config.MainConfig; -import com.gmail.nossr50.mcMMO; -import org.bukkit.scheduler.BukkitRunnable; import java.io.File; import java.text.ParseException; diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/commands/McScoreboardKeepTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/commands/McScoreboardKeepTask.java index 7f42b6505..f2372dfb1 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/commands/McScoreboardKeepTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/commands/McScoreboardKeepTask.java @@ -1,8 +1,7 @@ package com.gmail.nossr50.core.runnables.commands; -import com.gmail.nossr50.util.scoreboards.ScoreboardManager; -import org.bukkit.entity.Player; -import org.bukkit.scheduler.BukkitRunnable; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.util.scoreboards.ScoreboardManager; public class McScoreboardKeepTask extends BukkitRunnable { private Player player; diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/commands/McrankCommandAsyncTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/commands/McrankCommandAsyncTask.java index 50e3c074f..2d783ec0b 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/commands/McrankCommandAsyncTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/commands/McrankCommandAsyncTask.java @@ -1,11 +1,8 @@ package com.gmail.nossr50.core.runnables.commands; +import com.gmail.nossr50.core.mcmmo.commands.CommandSender; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; -import com.gmail.nossr50.mcMMO; -import org.apache.commons.lang.Validate; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.scheduler.BukkitRunnable; import java.util.Map; diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/commands/McrankCommandDisplayTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/commands/McrankCommandDisplayTask.java index 2dae89bdc..c14dc56d4 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/commands/McrankCommandDisplayTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/commands/McrankCommandDisplayTask.java @@ -2,12 +2,10 @@ package com.gmail.nossr50.core.runnables.commands; import com.gmail.nossr50.core.config.MainConfig; import com.gmail.nossr50.core.locale.LocaleLoader; +import com.gmail.nossr50.core.mcmmo.commands.CommandSender; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.scoreboards.ScoreboardManager; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.scheduler.BukkitRunnable; +import com.gmail.nossr50.core.util.scoreboards.ScoreboardManager; import java.util.Map; diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/commands/MctopCommandAsyncTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/commands/MctopCommandAsyncTask.java index 214bb4e04..36d67429d 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/commands/MctopCommandAsyncTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/commands/MctopCommandAsyncTask.java @@ -1,12 +1,9 @@ package com.gmail.nossr50.core.runnables.commands; import com.gmail.nossr50.core.datatypes.database.PlayerStat; +import com.gmail.nossr50.core.mcmmo.commands.CommandSender; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; -import com.gmail.nossr50.mcMMO; -import org.apache.commons.lang.Validate; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.scheduler.BukkitRunnable; import java.util.List; diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/commands/MctopCommandDisplayTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/commands/MctopCommandDisplayTask.java index cd335ddb0..4d464035d 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/commands/MctopCommandDisplayTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/commands/MctopCommandDisplayTask.java @@ -3,13 +3,11 @@ package com.gmail.nossr50.core.runnables.commands; import com.gmail.nossr50.core.config.MainConfig; import com.gmail.nossr50.core.datatypes.database.PlayerStat; import com.gmail.nossr50.core.locale.LocaleLoader; +import com.gmail.nossr50.core.mcmmo.colors.ChatColor; +import com.gmail.nossr50.core.mcmmo.commands.CommandSender; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.scoreboards.ScoreboardManager; -import org.bukkit.ChatColor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.scheduler.BukkitRunnable; +import com.gmail.nossr50.core.util.scoreboards.ScoreboardManager; import java.util.List; diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/database/DatabaseConversionTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/database/DatabaseConversionTask.java index 2b0a30f71..18f63f879 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/database/DatabaseConversionTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/database/DatabaseConversionTask.java @@ -2,9 +2,7 @@ package com.gmail.nossr50.core.runnables.database; import com.gmail.nossr50.core.data.database.DatabaseManager; import com.gmail.nossr50.core.locale.LocaleLoader; -import com.gmail.nossr50.mcMMO; -import org.bukkit.command.CommandSender; -import org.bukkit.scheduler.BukkitRunnable; +import com.gmail.nossr50.core.mcmmo.commands.CommandSender; public class DatabaseConversionTask extends BukkitRunnable { private final DatabaseManager sourceDatabase; diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/items/ChimaeraWingWarmup.java b/core/src/main/java/com/gmail/nossr50/core/runnables/items/ChimaeraWingWarmup.java index b7f3695d5..838b40680 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/items/ChimaeraWingWarmup.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/items/ChimaeraWingWarmup.java @@ -3,14 +3,13 @@ package com.gmail.nossr50.core.runnables.items; import com.gmail.nossr50.core.config.MainConfig; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.locale.LocaleLoader; -import com.gmail.nossr50.util.ChimaeraWing; -import com.gmail.nossr50.util.ItemUtils; -import com.gmail.nossr50.util.Misc; -import com.gmail.nossr50.util.skills.SkillUtils; -import org.bukkit.Location; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; -import org.bukkit.scheduler.BukkitRunnable; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; +import com.gmail.nossr50.core.mcmmo.world.Location; +import com.gmail.nossr50.core.util.ChimaeraWing; +import com.gmail.nossr50.core.util.ItemUtils; +import com.gmail.nossr50.core.util.Misc; +import com.gmail.nossr50.core.util.skills.SkillUtils; public class ChimaeraWingWarmup extends BukkitRunnable { private McMMOPlayer mcMMOPlayer; diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/items/TeleportationWarmup.java b/core/src/main/java/com/gmail/nossr50/core/runnables/items/TeleportationWarmup.java index 5092d6aaa..8f6aef7b3 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/items/TeleportationWarmup.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/items/TeleportationWarmup.java @@ -3,13 +3,12 @@ package com.gmail.nossr50.core.runnables.items; import com.gmail.nossr50.core.config.MainConfig; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.locale.LocaleLoader; -import com.gmail.nossr50.party.PartyManager; -import com.gmail.nossr50.util.EventUtils; -import com.gmail.nossr50.util.Misc; -import com.gmail.nossr50.util.skills.SkillUtils; -import org.bukkit.Location; -import org.bukkit.entity.Player; -import org.bukkit.scheduler.BukkitRunnable; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.world.Location; +import com.gmail.nossr50.core.party.PartyManager; +import com.gmail.nossr50.core.util.EventUtils; +import com.gmail.nossr50.core.util.Misc; +import com.gmail.nossr50.core.util.skills.SkillUtils; public class TeleportationWarmup extends BukkitRunnable { private McMMOPlayer mcMMOPlayer; diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/party/PartyAutoKickTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/party/PartyAutoKickTask.java index bbb041acc..688ec4d4b 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/party/PartyAutoKickTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/party/PartyAutoKickTask.java @@ -2,15 +2,10 @@ package com.gmail.nossr50.core.runnables.party; import com.gmail.nossr50.core.config.MainConfig; import com.gmail.nossr50.core.datatypes.party.Party; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.party.PartyManager; -import org.bukkit.OfflinePlayer; -import org.bukkit.scheduler.BukkitRunnable; +import com.gmail.nossr50.core.party.PartyManager; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map.Entry; import java.util.UUID; public class PartyAutoKickTask extends BukkitRunnable { diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/party/PartyChatTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/party/PartyChatTask.java index 95665042a..6e4e5fc4d 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/party/PartyChatTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/party/PartyChatTask.java @@ -3,10 +3,8 @@ package com.gmail.nossr50.core.runnables.party; import com.gmail.nossr50.core.config.MainConfig; import com.gmail.nossr50.core.datatypes.party.Party; import com.gmail.nossr50.core.locale.LocaleLoader; -import org.bukkit.ChatColor; -import org.bukkit.entity.Player; -import org.bukkit.plugin.Plugin; -import org.bukkit.scheduler.BukkitRunnable; +import com.gmail.nossr50.core.mcmmo.colors.ChatColor; +import com.gmail.nossr50.core.mcmmo.entity.Player; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/player/ClearRegisteredXPGainTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/player/ClearRegisteredXPGainTask.java index 4e775e865..d939b2e07 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/player/ClearRegisteredXPGainTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/player/ClearRegisteredXPGainTask.java @@ -2,7 +2,6 @@ package com.gmail.nossr50.core.runnables.player; import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; -import org.bukkit.scheduler.BukkitRunnable; public class ClearRegisteredXPGainTask extends BukkitRunnable { @Override diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/player/PlayerProfileLoadingTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/player/PlayerProfileLoadingTask.java index 0734d2ba1..c0586808a 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/player/PlayerProfileLoadingTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/player/PlayerProfileLoadingTask.java @@ -5,13 +5,10 @@ import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.PlayerProfile; import com.gmail.nossr50.core.locale.LocaleLoader; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.runnables.commands.McScoreboardKeepTask; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.Misc; -import com.gmail.nossr50.util.scoreboards.ScoreboardManager; -import org.bukkit.Server; -import org.bukkit.entity.Player; -import org.bukkit.scheduler.BukkitRunnable; +import com.gmail.nossr50.core.util.Misc; +import com.gmail.nossr50.core.util.scoreboards.ScoreboardManager; public class PlayerProfileLoadingTask extends BukkitRunnable { private static final int MAX_TRIES = 5; diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/player/PlayerProfileSaveTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/player/PlayerProfileSaveTask.java index 65f01837e..76ec711ca 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/player/PlayerProfileSaveTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/player/PlayerProfileSaveTask.java @@ -1,7 +1,6 @@ package com.gmail.nossr50.core.runnables.player; import com.gmail.nossr50.core.datatypes.player.PlayerProfile; -import org.bukkit.scheduler.BukkitRunnable; public class PlayerProfileSaveTask extends BukkitRunnable { private PlayerProfile playerProfile; diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/player/PlayerUpdateInventoryTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/player/PlayerUpdateInventoryTask.java index 85835d946..e735a2be7 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/player/PlayerUpdateInventoryTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/player/PlayerUpdateInventoryTask.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.core.runnables.player; -import org.bukkit.entity.Player; -import org.bukkit.scheduler.BukkitRunnable; + +import com.gmail.nossr50.core.mcmmo.entity.Player; @SuppressWarnings("deprecation") public class PlayerUpdateInventoryTask extends BukkitRunnable { diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/player/PowerLevelUpdatingTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/player/PowerLevelUpdatingTask.java index dfe98f8cd..2cb6eb5e5 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/player/PowerLevelUpdatingTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/player/PowerLevelUpdatingTask.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.core.runnables.player; -import com.gmail.nossr50.util.scoreboards.ScoreboardManager; -import org.bukkit.scheduler.BukkitRunnable; + +import com.gmail.nossr50.core.util.scoreboards.ScoreboardManager; public class PowerLevelUpdatingTask extends BukkitRunnable { @Override diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AbilityCooldownTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AbilityCooldownTask.java index 773bd3c8e..caec39c4c 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AbilityCooldownTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AbilityCooldownTask.java @@ -3,8 +3,7 @@ package com.gmail.nossr50.core.runnables.skills; import com.gmail.nossr50.core.datatypes.interactions.NotificationType; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.skills.SuperAbilityType; -import com.gmail.nossr50.util.player.NotificationManager; -import org.bukkit.scheduler.BukkitRunnable; +import com.gmail.nossr50.core.util.player.NotificationManager; public class AbilityCooldownTask extends BukkitRunnable { private McMMOPlayer mcMMOPlayer; diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AbilityDisableTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AbilityDisableTask.java index 5537c4e47..e7c91840a 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AbilityDisableTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AbilityDisableTask.java @@ -3,18 +3,15 @@ package com.gmail.nossr50.core.runnables.skills; import com.gmail.nossr50.core.config.MainConfig; import com.gmail.nossr50.core.datatypes.interactions.NotificationType; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.world.World; import com.gmail.nossr50.core.skills.SuperAbilityType; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.EventUtils; -import com.gmail.nossr50.util.Misc; -import com.gmail.nossr50.util.player.NotificationManager; -import com.gmail.nossr50.util.skills.ParticleEffectUtils; -import com.gmail.nossr50.util.skills.PerksUtils; -import com.gmail.nossr50.util.skills.SkillUtils; -import org.bukkit.Chunk; -import org.bukkit.World; -import org.bukkit.entity.Player; -import org.bukkit.scheduler.BukkitRunnable; +import com.gmail.nossr50.core.util.EventUtils; +import com.gmail.nossr50.core.util.Misc; +import com.gmail.nossr50.core.util.player.NotificationManager; +import com.gmail.nossr50.core.util.skills.ParticleEffectUtils; +import com.gmail.nossr50.core.util.skills.PerksUtils; +import com.gmail.nossr50.core.util.skills.SkillUtils; public class AbilityDisableTask extends BukkitRunnable { private McMMOPlayer mcMMOPlayer; diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AlchemyBrewCheckTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AlchemyBrewCheckTask.java index 34fe29488..751d27221 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AlchemyBrewCheckTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AlchemyBrewCheckTask.java @@ -1,12 +1,9 @@ package com.gmail.nossr50.core.runnables.skills; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import com.gmail.nossr50.core.skills.primary.alchemy.Alchemy; import com.gmail.nossr50.core.skills.primary.alchemy.AlchemyPotionBrewer; -import org.bukkit.Location; -import org.bukkit.block.BrewingStand; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; -import org.bukkit.scheduler.BukkitRunnable; import java.util.Arrays; diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AlchemyBrewTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AlchemyBrewTask.java index a378f4b7d..42b7aac7d 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AlchemyBrewTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AlchemyBrewTask.java @@ -1,21 +1,16 @@ package com.gmail.nossr50.core.runnables.skills; import com.gmail.nossr50.core.data.UserManager; +import com.gmail.nossr50.core.events.skills.alchemy.McMMOPlayerBrewEvent; +import com.gmail.nossr50.core.events.skills.alchemy.McMMOPlayerCatalysisEvent; +import com.gmail.nossr50.core.mcmmo.block.BlockState; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.SubSkillType; import com.gmail.nossr50.core.skills.primary.alchemy.Alchemy; import com.gmail.nossr50.core.skills.primary.alchemy.AlchemyPotionBrewer; -import com.gmail.nossr50.events.skills.alchemy.McMMOPlayerBrewEvent; -import com.gmail.nossr50.events.skills.alchemy.McMMOPlayerCatalysisEvent; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.Misc; -import com.gmail.nossr50.util.Permissions; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.block.BlockState; -import org.bukkit.block.BrewingStand; -import org.bukkit.entity.Player; -import org.bukkit.scheduler.BukkitRunnable; +import com.gmail.nossr50.core.util.Misc; +import com.gmail.nossr50.core.util.Permissions; public class AlchemyBrewTask extends BukkitRunnable { private static double DEFAULT_BREW_SPEED = 1.0; diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AprilTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AprilTask.java index 65149ba3a..3f9fcdd78 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AprilTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AprilTask.java @@ -1,14 +1,11 @@ package com.gmail.nossr50.core.runnables.skills; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.HolidayManager; -import com.gmail.nossr50.util.Misc; -import com.gmail.nossr50.util.sounds.SoundManager; -import com.gmail.nossr50.util.sounds.SoundType; -import org.bukkit.ChatColor; -import org.bukkit.Statistic; -import org.bukkit.entity.Player; -import org.bukkit.scheduler.BukkitRunnable; +import com.gmail.nossr50.core.mcmmo.colors.ChatColor; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.util.HolidayManager; +import com.gmail.nossr50.core.util.Misc; +import com.gmail.nossr50.core.util.sounds.SoundManager; +import com.gmail.nossr50.core.util.sounds.SoundType; public class AprilTask extends BukkitRunnable { diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AwardCombatXpTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AwardCombatXpTask.java index 006d6c7b5..c57be36e7 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AwardCombatXpTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AwardCombatXpTask.java @@ -4,8 +4,6 @@ import com.gmail.nossr50.core.datatypes.experience.XPGainReason; import com.gmail.nossr50.core.datatypes.experience.XPGainSource; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.skills.PrimarySkillType; -import org.bukkit.entity.LivingEntity; -import org.bukkit.scheduler.BukkitRunnable; public class AwardCombatXpTask extends BukkitRunnable { private McMMOPlayer mcMMOPlayer; diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/ExperienceBarHideTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/ExperienceBarHideTask.java index d6ca141e2..a1b58dcfa 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/ExperienceBarHideTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/ExperienceBarHideTask.java @@ -2,8 +2,7 @@ package com.gmail.nossr50.core.runnables.skills; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.skills.PrimarySkillType; -import com.gmail.nossr50.util.experience.ExperienceBarManager; -import org.bukkit.scheduler.BukkitRunnable; +import com.gmail.nossr50.core.util.experience.ExperienceBarManager; public class ExperienceBarHideTask extends BukkitRunnable { public final McMMOPlayer mcMMOPlayer; diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/HerbalismBlockUpdaterTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/HerbalismBlockUpdaterTask.java index 1430e3f6e..ec5a5b661 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/HerbalismBlockUpdaterTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/HerbalismBlockUpdaterTask.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.core.runnables.skills; -import org.bukkit.block.BlockState; -import org.bukkit.scheduler.BukkitRunnable; + +import com.gmail.nossr50.core.mcmmo.block.BlockState; public class HerbalismBlockUpdaterTask extends BukkitRunnable { private BlockState blockState; diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/SkillUnlockNotificationTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/SkillUnlockNotificationTask.java index e597ce833..393454321 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/SkillUnlockNotificationTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/SkillUnlockNotificationTask.java @@ -2,8 +2,7 @@ package com.gmail.nossr50.core.runnables.skills; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.skills.SubSkillType; -import com.gmail.nossr50.util.player.NotificationManager; -import org.bukkit.scheduler.BukkitRunnable; +import com.gmail.nossr50.core.util.player.NotificationManager; public class SkillUnlockNotificationTask extends BukkitRunnable { diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/ToolLowerTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/ToolLowerTask.java index be96b1506..12e6197a4 100644 --- a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/ToolLowerTask.java +++ b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/ToolLowerTask.java @@ -4,8 +4,7 @@ import com.gmail.nossr50.core.config.MainConfig; import com.gmail.nossr50.core.datatypes.interactions.NotificationType; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.skills.ToolType; -import com.gmail.nossr50.util.player.NotificationManager; -import org.bukkit.scheduler.BukkitRunnable; +import com.gmail.nossr50.core.util.player.NotificationManager; public class ToolLowerTask extends BukkitRunnable { private McMMOPlayer mcMMOPlayer; diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/MaterialType.java b/core/src/main/java/com/gmail/nossr50/core/skills/MaterialType.java index 920017345..25956f535 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/MaterialType.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/MaterialType.java @@ -1,6 +1,5 @@ package com.gmail.nossr50.core.skills; -import org.bukkit.Material; public enum MaterialType { STRING, diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/SubSkillFlags.java b/core/src/main/java/com/gmail/nossr50/core/skills/SubSkillFlags.java deleted file mode 100644 index 453d288e7..000000000 --- a/core/src/main/java/com/gmail/nossr50/core/skills/SubSkillFlags.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.gmail.nossr50.core.skills; - -public class SubSkillFlags { - /* - * Bitwise Flags - * These are so I can flag properties for subskills - * Flags are in the power of 2 because binary is a base-2 system - */ - public static final int ACTIVE = 1; //Active subskills are ones that aren't passive - public static final int SUPERABILITY = 2; // Super abilities are redundantly active - public static final int RNG = 4; //If the subskill makes use of RNG - public static final int PVP = 8; //If the subskill has properties that change in PVP conditions - public static final int TIMED = 16; //If the subskill has a duration or time component - public static final int TARGET_COLLECTION = 32; //If the subskill has multiple target types - public static final int REWARD_COLLECTION = 64; //If the subskill has multiple reward types - public static final int CHARGES = 128; - public static final int LIMITED = 256; - //public static final int RANDOM_ACTIVATION = 128; //If the subskill has random activation -} diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/ToolType.java b/core/src/main/java/com/gmail/nossr50/core/skills/ToolType.java index 4b513b58b..86027387e 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/ToolType.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/ToolType.java @@ -1,8 +1,7 @@ package com.gmail.nossr50.core.skills; -import com.gmail.nossr50.util.ItemUtils; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; +import com.gmail.nossr50.core.util.ItemUtils; public enum ToolType { AXE("Axes.Ability.Lower", "Axes.Ability.Ready"), diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/Salvage.java b/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/Salvage.java index abffc7fac..1a383fadc 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/Salvage.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/Salvage.java @@ -2,7 +2,6 @@ package com.gmail.nossr50.core.skills.child.salvage; import com.gmail.nossr50.core.config.AdvancedConfig; import com.gmail.nossr50.core.config.MainConfig; -import org.bukkit.Material; public class Salvage { public static Material anvilMaterial = MainConfig.getInstance().getSalvageAnvilMaterial(); diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/SalvageManager.java b/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/SalvageManager.java index 9e27e5be2..4ce8f7df8 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/SalvageManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/SalvageManager.java @@ -5,31 +5,23 @@ import com.gmail.nossr50.core.config.MainConfig; import com.gmail.nossr50.core.datatypes.interactions.NotificationType; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.locale.LocaleLoader; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.SkillManager; import com.gmail.nossr50.core.skills.SubSkillType; import com.gmail.nossr50.core.skills.child.salvage.salvageables.Salvageable; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.EventUtils; -import com.gmail.nossr50.util.Misc; -import com.gmail.nossr50.util.Permissions; -import com.gmail.nossr50.util.StringUtils; -import com.gmail.nossr50.util.player.NotificationManager; -import com.gmail.nossr50.util.random.RandomChanceSkillStatic; -import com.gmail.nossr50.util.random.RandomChanceUtil; -import com.gmail.nossr50.util.skills.RankUtils; -import com.gmail.nossr50.util.skills.SkillUtils; -import com.gmail.nossr50.util.sounds.SoundManager; -import com.gmail.nossr50.util.sounds.SoundType; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.enchantments.Enchantment; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.meta.EnchantmentStorageMeta; - -import java.util.Map; -import java.util.Map.Entry; +import com.gmail.nossr50.core.util.EventUtils; +import com.gmail.nossr50.core.util.Misc; +import com.gmail.nossr50.core.util.Permissions; +import com.gmail.nossr50.core.util.StringUtils; +import com.gmail.nossr50.core.util.player.NotificationManager; +import com.gmail.nossr50.core.util.random.RandomChanceSkillStatic; +import com.gmail.nossr50.core.util.random.RandomChanceUtil; +import com.gmail.nossr50.core.util.skills.RankUtils; +import com.gmail.nossr50.core.util.skills.SkillUtils; +import com.gmail.nossr50.core.util.sounds.SoundManager; +import com.gmail.nossr50.core.util.sounds.SoundType; public class SalvageManager extends SkillManager { private boolean placedAnvil; diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/salvageables/Salvageable.java b/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/salvageables/Salvageable.java index ea75c98c4..de73cd1a0 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/salvageables/Salvageable.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/salvageables/Salvageable.java @@ -2,7 +2,6 @@ package com.gmail.nossr50.core.skills.child.salvage.salvageables; import com.gmail.nossr50.core.skills.ConfigItemCategory; import com.gmail.nossr50.core.skills.MaterialType; -import org.bukkit.Material; public interface Salvageable { /** diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/salvageables/SalvageableFactory.java b/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/salvageables/SalvageableFactory.java index c894386d2..fd780e95d 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/salvageables/SalvageableFactory.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/salvageables/SalvageableFactory.java @@ -2,7 +2,6 @@ package com.gmail.nossr50.core.skills.child.salvage.salvageables; import com.gmail.nossr50.core.skills.ConfigItemCategory; import com.gmail.nossr50.core.skills.MaterialType; -import org.bukkit.Material; public class SalvageableFactory { public static Salvageable getSalvageable(Material itemMaterial, Material repairMaterial, byte repairMetadata, int maximumQuantity, short maximumDurability) { diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/salvageables/SalvageableManager.java b/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/salvageables/SalvageableManager.java index 53d93e7d5..aa45dfc99 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/salvageables/SalvageableManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/salvageables/SalvageableManager.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.core.skills.child.salvage.salvageables; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; + +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import java.util.List; diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/salvageables/SimpleSalvageable.java b/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/salvageables/SimpleSalvageable.java index 99ba64274..44d4fa390 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/salvageables/SimpleSalvageable.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/salvageables/SimpleSalvageable.java @@ -2,7 +2,6 @@ package com.gmail.nossr50.core.skills.child.salvage.salvageables; import com.gmail.nossr50.core.skills.ConfigItemCategory; import com.gmail.nossr50.core.skills.MaterialType; -import org.bukkit.Material; public class SimpleSalvageable implements Salvageable { diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/salvageables/SimpleSalvageableManager.java b/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/salvageables/SimpleSalvageableManager.java index b1608879a..ff06da104 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/salvageables/SimpleSalvageableManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/salvageables/SimpleSalvageableManager.java @@ -1,9 +1,8 @@ package com.gmail.nossr50.core.skills.child.salvage.salvageables; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; -import java.util.HashMap; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; + import java.util.List; diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/child/smelting/Smelting.java b/core/src/main/java/com/gmail/nossr50/core/skills/child/smelting/Smelting.java index f844cff47..324660f88 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/child/smelting/Smelting.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/child/smelting/Smelting.java @@ -1,13 +1,12 @@ package com.gmail.nossr50.core.skills.child.smelting; -import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.core.config.AdvancedConfig; +import com.gmail.nossr50.core.config.experience.ExperienceConfig; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.SubSkillType; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.skills.RankUtils; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; +import com.gmail.nossr50.core.util.skills.RankUtils; public class Smelting { diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/child/smelting/SmeltingManager.java b/core/src/main/java/com/gmail/nossr50/core/skills/child/smelting/SmeltingManager.java index fa5f76660..a76d5605b 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/child/smelting/SmeltingManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/child/smelting/SmeltingManager.java @@ -4,27 +4,24 @@ import com.gmail.nossr50.core.config.MainConfig; import com.gmail.nossr50.core.datatypes.experience.XPGainReason; import com.gmail.nossr50.core.datatypes.experience.XPGainSource; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; +import com.gmail.nossr50.core.mcmmo.block.BlockState; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.SkillManager; import com.gmail.nossr50.core.skills.SubSkillType; import com.gmail.nossr50.core.skills.primary.mining.Mining; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.BlockUtils; -import com.gmail.nossr50.util.EventUtils; -import com.gmail.nossr50.util.Misc; -import com.gmail.nossr50.util.Permissions; -import com.gmail.nossr50.util.random.RandomChanceUtil; -import com.gmail.nossr50.util.skills.ParticleEffectUtils; -import com.gmail.nossr50.util.skills.RankUtils; -import com.gmail.nossr50.util.skills.SkillActivationType; -import com.gmail.nossr50.util.skills.SkillUtils; -import com.gmail.nossr50.util.sounds.SoundManager; -import com.gmail.nossr50.util.sounds.SoundType; -import org.bukkit.Material; -import org.bukkit.block.BlockState; -import org.bukkit.entity.Player; -import org.bukkit.event.inventory.FurnaceBurnEvent; -import org.bukkit.inventory.ItemStack; +import com.gmail.nossr50.core.util.BlockUtils; +import com.gmail.nossr50.core.util.EventUtils; +import com.gmail.nossr50.core.util.Misc; +import com.gmail.nossr50.core.util.Permissions; +import com.gmail.nossr50.core.util.random.RandomChanceUtil; +import com.gmail.nossr50.core.util.skills.ParticleEffectUtils; +import com.gmail.nossr50.core.util.skills.RankUtils; +import com.gmail.nossr50.core.util.skills.SkillActivationType; +import com.gmail.nossr50.core.util.skills.SkillUtils; +import com.gmail.nossr50.core.util.sounds.SoundManager; +import com.gmail.nossr50.core.util.sounds.SoundType; public class SmeltingManager extends SkillManager { public SmeltingManager(McMMOPlayer mcMMOPlayer) { diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/interfaces/Progression.java b/core/src/main/java/com/gmail/nossr50/core/skills/interfaces/Progression.java index 92cd66109..3e8df5a67 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/interfaces/Progression.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/interfaces/Progression.java @@ -1,7 +1,6 @@ package com.gmail.nossr50.core.skills.interfaces; import com.gmail.nossr50.core.skills.subskills.interfaces.InteractType; -import org.bukkit.event.Event; public interface Progression { /** diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/interfaces/Toolable.java b/core/src/main/java/com/gmail/nossr50/core/skills/interfaces/Toolable.java index 8997fbce6..a5c065032 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/interfaces/Toolable.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/interfaces/Toolable.java @@ -1,6 +1,7 @@ package com.gmail.nossr50.core.skills.interfaces; -import org.bukkit.inventory.ItemStack; + +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import java.util.Collection; diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/acrobatics/Acrobatics.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/acrobatics/Acrobatics.java index 0b6707494..37f051dd3 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/acrobatics/Acrobatics.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/acrobatics/Acrobatics.java @@ -1,8 +1,8 @@ package com.gmail.nossr50.core.skills.primary.acrobatics; -import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.core.config.AdvancedConfig; import com.gmail.nossr50.core.config.MainConfig; +import com.gmail.nossr50.core.config.experience.ExperienceConfig; public final class Acrobatics { public static double dodgeDamageModifier = AdvancedConfig.getInstance().getDodgeDamageModifier(); diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/acrobatics/AcrobaticsManager.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/acrobatics/AcrobaticsManager.java index 2c7d8df3a..219a0f615 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/acrobatics/AcrobaticsManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/acrobatics/AcrobaticsManager.java @@ -3,20 +3,18 @@ package com.gmail.nossr50.core.skills.primary.acrobatics; import com.gmail.nossr50.core.datatypes.experience.XPGainReason; import com.gmail.nossr50.core.datatypes.interactions.NotificationType; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.SkillManager; import com.gmail.nossr50.core.skills.SubSkillType; -import com.gmail.nossr50.util.Misc; -import com.gmail.nossr50.util.Permissions; -import com.gmail.nossr50.util.player.NotificationManager; -import com.gmail.nossr50.util.random.RandomChanceUtil; -import com.gmail.nossr50.util.skills.ParticleEffectUtils; -import com.gmail.nossr50.util.skills.RankUtils; -import com.gmail.nossr50.util.skills.SkillActivationType; -import com.gmail.nossr50.util.skills.SkillUtils; -import org.bukkit.entity.Entity; -import org.bukkit.entity.LightningStrike; -import org.bukkit.entity.Player; +import com.gmail.nossr50.core.util.Misc; +import com.gmail.nossr50.core.util.Permissions; +import com.gmail.nossr50.core.util.player.NotificationManager; +import com.gmail.nossr50.core.util.random.RandomChanceUtil; +import com.gmail.nossr50.core.util.skills.ParticleEffectUtils; +import com.gmail.nossr50.core.util.skills.RankUtils; +import com.gmail.nossr50.core.util.skills.SkillActivationType; +import com.gmail.nossr50.core.util.skills.SkillUtils; public class AcrobaticsManager extends SkillManager { diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/alchemy/Alchemy.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/alchemy/Alchemy.java index 1a36d4434..b6f4ecbc8 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/alchemy/Alchemy.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/alchemy/Alchemy.java @@ -1,16 +1,11 @@ package com.gmail.nossr50.core.skills.primary.alchemy; import com.gmail.nossr50.core.config.AdvancedConfig; +import com.gmail.nossr50.core.runnables.skills.AlchemyBrewTask; import com.gmail.nossr50.core.skills.SubSkillType; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.runnables.skills.AlchemyBrewTask; -import com.gmail.nossr50.util.skills.RankUtils; -import org.bukkit.Location; - +import com.gmail.nossr50.core.util.skills.RankUtils; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; public final class Alchemy { /*public enum Tier { diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/alchemy/AlchemyManager.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/alchemy/AlchemyManager.java index e7235ad70..93914a1dd 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/alchemy/AlchemyManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/alchemy/AlchemyManager.java @@ -1,17 +1,17 @@ package com.gmail.nossr50.core.skills.primary.alchemy; -import com.gmail.nossr50.config.experience.ExperienceConfig; -import com.gmail.nossr50.config.skills.alchemy.PotionConfig; +import com.gmail.nossr50.core.config.experience.ExperienceConfig; +import com.gmail.nossr50.core.config.skills.alchemy.PotionConfig; import com.gmail.nossr50.core.datatypes.experience.XPGainReason; import com.gmail.nossr50.core.datatypes.experience.XPGainSource; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import com.gmail.nossr50.core.skills.PotionStage; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.SkillManager; import com.gmail.nossr50.core.skills.SubSkillType; -import com.gmail.nossr50.util.StringUtils; -import com.gmail.nossr50.util.skills.RankUtils; -import org.bukkit.inventory.ItemStack; +import com.gmail.nossr50.core.util.StringUtils; +import com.gmail.nossr50.core.util.skills.RankUtils; import java.util.List; diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/alchemy/AlchemyPotion.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/alchemy/AlchemyPotion.java index 1030a0c47..310cb9ef0 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/alchemy/AlchemyPotion.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/alchemy/AlchemyPotion.java @@ -1,13 +1,7 @@ package com.gmail.nossr50.core.skills.primary.alchemy; -import com.gmail.nossr50.config.skills.alchemy.PotionConfig; -import org.bukkit.Color; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.meta.PotionMeta; -import org.bukkit.potion.Potion; -import org.bukkit.potion.PotionData; -import org.bukkit.potion.PotionEffect; +import com.gmail.nossr50.core.config.skills.alchemy.PotionConfig; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/alchemy/AlchemyPotionBrewer.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/alchemy/AlchemyPotionBrewer.java index 89c617a0a..ccce4e9a2 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/alchemy/AlchemyPotionBrewer.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/alchemy/AlchemyPotionBrewer.java @@ -1,24 +1,17 @@ package com.gmail.nossr50.core.skills.primary.alchemy; -import com.gmail.nossr50.config.skills.alchemy.PotionConfig; +import com.gmail.nossr50.core.config.skills.alchemy.PotionConfig; import com.gmail.nossr50.core.data.UserManager; +import com.gmail.nossr50.core.events.fake.FakeBrewEvent; +import com.gmail.nossr50.core.mcmmo.block.BlockState; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.inventory.Inventory; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; +import com.gmail.nossr50.core.runnables.player.PlayerUpdateInventoryTask; +import com.gmail.nossr50.core.runnables.skills.AlchemyBrewCheckTask; import com.gmail.nossr50.core.skills.PotionStage; import com.gmail.nossr50.core.skills.SubSkillType; -import com.gmail.nossr50.events.fake.FakeBrewEvent; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.runnables.player.PlayerUpdateInventoryTask; -import com.gmail.nossr50.runnables.skills.AlchemyBrewCheckTask; -import com.gmail.nossr50.util.Permissions; -import org.bukkit.Material; -import org.bukkit.block.BlockState; -import org.bukkit.block.BrewingStand; -import org.bukkit.entity.HumanEntity; -import org.bukkit.entity.Player; -import org.bukkit.event.inventory.ClickType; -import org.bukkit.inventory.BrewerInventory; -import org.bukkit.inventory.Inventory; -import org.bukkit.inventory.InventoryView; -import org.bukkit.inventory.ItemStack; +import com.gmail.nossr50.core.util.Permissions; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/archery/Archery.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/archery/Archery.java index 870405a80..d1b7bab11 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/archery/Archery.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/archery/Archery.java @@ -1,14 +1,12 @@ package com.gmail.nossr50.core.skills.primary.archery; -import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.core.config.AdvancedConfig; +import com.gmail.nossr50.core.config.experience.ExperienceConfig; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import com.gmail.nossr50.core.skills.SubSkillType; -import com.gmail.nossr50.util.Misc; -import com.gmail.nossr50.util.skills.RankUtils; -import org.bukkit.Material; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; +import com.gmail.nossr50.core.util.Misc; +import com.gmail.nossr50.core.util.skills.RankUtils; import java.util.ArrayList; import java.util.Iterator; diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/archery/ArcheryManager.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/archery/ArcheryManager.java index 53772546b..1bf0ddcfe 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/archery/ArcheryManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/archery/ArcheryManager.java @@ -3,22 +3,17 @@ package com.gmail.nossr50.core.skills.primary.archery; import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.datatypes.interactions.NotificationType; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.world.Location; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.SkillManager; import com.gmail.nossr50.core.skills.SubSkillType; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.Misc; -import com.gmail.nossr50.util.Permissions; -import com.gmail.nossr50.util.player.NotificationManager; -import com.gmail.nossr50.util.random.RandomChanceUtil; -import com.gmail.nossr50.util.skills.RankUtils; -import com.gmail.nossr50.util.skills.SkillActivationType; -import org.bukkit.Location; -import org.bukkit.entity.Entity; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Player; -import org.bukkit.potion.PotionEffect; -import org.bukkit.potion.PotionEffectType; +import com.gmail.nossr50.core.util.Misc; +import com.gmail.nossr50.core.util.Permissions; +import com.gmail.nossr50.core.util.player.NotificationManager; +import com.gmail.nossr50.core.util.random.RandomChanceUtil; +import com.gmail.nossr50.core.util.skills.RankUtils; +import com.gmail.nossr50.core.util.skills.SkillActivationType; public class ArcheryManager extends SkillManager { public ArcheryManager(McMMOPlayer mcMMOPlayer) { diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/archery/TrackedEntity.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/archery/TrackedEntity.java index f7170bb6e..560c1e24b 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/archery/TrackedEntity.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/archery/TrackedEntity.java @@ -1,8 +1,5 @@ package com.gmail.nossr50.core.skills.primary.archery; -import com.gmail.nossr50.mcMMO; -import org.bukkit.entity.LivingEntity; -import org.bukkit.scheduler.BukkitRunnable; import java.util.UUID; diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/axes/Axes.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/axes/Axes.java index f26de6ed8..684aa4e7e 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/axes/Axes.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/axes/Axes.java @@ -1,12 +1,11 @@ package com.gmail.nossr50.core.skills.primary.axes; import com.gmail.nossr50.core.config.AdvancedConfig; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import com.gmail.nossr50.core.skills.SubSkillType; -import com.gmail.nossr50.util.ItemUtils; -import com.gmail.nossr50.util.skills.RankUtils; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; +import com.gmail.nossr50.core.util.ItemUtils; +import com.gmail.nossr50.core.util.skills.RankUtils; public class Axes { public static double axeMasteryRankDamageMultiplier = AdvancedConfig.getInstance().getAxeMasteryRankDamageMultiplier(); diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/axes/AxesManager.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/axes/AxesManager.java index 10b168e70..a3e5232e1 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/axes/AxesManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/axes/AxesManager.java @@ -3,17 +3,14 @@ package com.gmail.nossr50.core.skills.primary.axes; import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.datatypes.interactions.NotificationType; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import com.gmail.nossr50.core.skills.*; -import com.gmail.nossr50.util.ItemUtils; -import com.gmail.nossr50.util.Permissions; -import com.gmail.nossr50.util.player.NotificationManager; -import com.gmail.nossr50.util.random.RandomChanceUtil; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Player; -import org.bukkit.event.entity.EntityDamageEvent.DamageModifier; -import org.bukkit.inventory.ItemStack; - -import java.util.Map; +import com.gmail.nossr50.core.util.ItemUtils; +import com.gmail.nossr50.core.util.Permissions; +import com.gmail.nossr50.core.util.player.NotificationManager; +import com.gmail.nossr50.core.util.random.RandomChanceUtil; +import com.gmail.nossr50.core.util.skills.*; public class AxesManager extends SkillManager { public AxesManager(McMMOPlayer mcMMOPlayer) { diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/excavation/Excavation.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/excavation/Excavation.java index bb772370b..a884daf02 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/excavation/Excavation.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/excavation/Excavation.java @@ -1,12 +1,11 @@ package com.gmail.nossr50.core.skills.primary.excavation; -import com.gmail.nossr50.config.experience.ExperienceConfig; +import com.gmail.nossr50.core.config.experience.ExperienceConfig; import com.gmail.nossr50.core.config.treasure.TreasureConfig; +import com.gmail.nossr50.core.mcmmo.block.BlockState; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.treasure.ExcavationTreasure; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.StringUtils; -import org.bukkit.block.BlockState; +import com.gmail.nossr50.core.util.StringUtils; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/excavation/ExcavationManager.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/excavation/ExcavationManager.java index 1941478a4..2b4c31beb 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/excavation/ExcavationManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/excavation/ExcavationManager.java @@ -3,17 +3,16 @@ package com.gmail.nossr50.core.skills.primary.excavation; import com.gmail.nossr50.core.config.MainConfig; import com.gmail.nossr50.core.datatypes.experience.XPGainReason; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; +import com.gmail.nossr50.core.mcmmo.block.BlockState; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.SkillManager; import com.gmail.nossr50.core.skills.SubSkillType; import com.gmail.nossr50.core.skills.treasure.ExcavationTreasure; -import com.gmail.nossr50.util.Misc; -import com.gmail.nossr50.util.Permissions; -import com.gmail.nossr50.util.random.RandomChanceUtil; -import com.gmail.nossr50.util.skills.SkillUtils; -import org.bukkit.Location; -import org.bukkit.block.BlockState; -import org.bukkit.entity.Player; +import com.gmail.nossr50.core.util.Misc; +import com.gmail.nossr50.core.util.Permissions; +import com.gmail.nossr50.core.util.random.RandomChanceUtil; +import com.gmail.nossr50.core.util.skills.SkillUtils; import java.util.List; diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/fishing/Fishing.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/fishing/Fishing.java index 31ba7f82c..87d6f5585 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/fishing/Fishing.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/fishing/Fishing.java @@ -2,18 +2,12 @@ package com.gmail.nossr50.core.skills.primary.fishing; import com.gmail.nossr50.core.config.AdvancedConfig; import com.gmail.nossr50.core.config.treasure.TreasureConfig; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import com.gmail.nossr50.core.skills.treasure.ShakeTreasure; -import com.gmail.nossr50.util.Misc; -import com.gmail.nossr50.util.adapter.BiomeAdapter; -import org.bukkit.Material; -import org.bukkit.block.Biome; -import org.bukkit.enchantments.Enchantment; -import org.bukkit.entity.LivingEntity; -import org.bukkit.inventory.ItemStack; +import com.gmail.nossr50.core.util.Misc; +import com.gmail.nossr50.core.util.adapter.BiomeAdapter; -import java.util.HashMap; import java.util.List; -import java.util.Set; public final class Fishing { diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/fishing/FishingManager.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/fishing/FishingManager.java index b32fed307..10ae3cbc2 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/fishing/FishingManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/fishing/FishingManager.java @@ -1,12 +1,17 @@ package com.gmail.nossr50.core.skills.primary.fishing; -import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.core.config.AdvancedConfig; import com.gmail.nossr50.core.config.MainConfig; +import com.gmail.nossr50.core.config.experience.ExperienceConfig; import com.gmail.nossr50.core.config.treasure.TreasureConfig; import com.gmail.nossr50.core.datatypes.experience.XPGainReason; import com.gmail.nossr50.core.datatypes.interactions.NotificationType; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; +import com.gmail.nossr50.core.events.skills.fishing.McMMOPlayerFishingTreasureEvent; +import com.gmail.nossr50.core.events.skills.fishing.McMMOPlayerShakeEvent; +import com.gmail.nossr50.core.mcmmo.entity.EntityType; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.SkillManager; import com.gmail.nossr50.core.skills.SubSkillType; @@ -14,28 +19,13 @@ import com.gmail.nossr50.core.skills.treasure.EnchantmentTreasure; import com.gmail.nossr50.core.skills.treasure.FishingTreasure; import com.gmail.nossr50.core.skills.treasure.Rarity; import com.gmail.nossr50.core.skills.treasure.ShakeTreasure; -import com.gmail.nossr50.events.skills.fishing.McMMOPlayerFishingTreasureEvent; -import com.gmail.nossr50.events.skills.fishing.McMMOPlayerShakeEvent; -import com.gmail.nossr50.util.*; -import com.gmail.nossr50.util.player.NotificationManager; -import com.gmail.nossr50.util.random.RandomChanceSkillStatic; -import com.gmail.nossr50.util.random.RandomChanceUtil; -import com.gmail.nossr50.util.skills.CombatUtils; -import com.gmail.nossr50.util.skills.RankUtils; -import com.gmail.nossr50.util.skills.SkillUtils; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.block.Block; -import org.bukkit.block.BlockFace; -import org.bukkit.enchantments.Enchantment; -import org.bukkit.entity.Item; -import org.bukkit.entity.LivingEntity; -import org.bukkit.event.entity.EntityDamageEvent; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.PlayerInventory; -import org.bukkit.inventory.meta.SkullMeta; -import org.bukkit.util.BoundingBox; - +import com.gmail.nossr50.core.util.*; +import com.gmail.nossr50.core.util.player.NotificationManager; +import com.gmail.nossr50.core.util.random.RandomChanceSkillStatic; +import com.gmail.nossr50.core.util.random.RandomChanceUtil; +import com.gmail.nossr50.core.util.skills.CombatUtils; +import com.gmail.nossr50.core.util.skills.RankUtils; +import com.gmail.nossr50.core.util.skills.SkillUtils; import java.util.*; public class FishingManager extends SkillManager { diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/herbalism/Herbalism.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/herbalism/Herbalism.java index 3f1f62352..e8109f91b 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/herbalism/Herbalism.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/herbalism/Herbalism.java @@ -1,11 +1,9 @@ package com.gmail.nossr50.core.skills.primary.herbalism; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.skills.SkillUtils; -import org.bukkit.Material; -import org.bukkit.block.Block; -import org.bukkit.block.BlockFace; -import org.bukkit.block.BlockState; + +import com.gmail.nossr50.core.mcmmo.block.Block; +import com.gmail.nossr50.core.mcmmo.block.BlockState; +import com.gmail.nossr50.core.util.skills.SkillUtils; import java.util.HashSet; diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/herbalism/HerbalismManager.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/herbalism/HerbalismManager.java index 531980a3e..83709ec51 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/herbalism/HerbalismManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/herbalism/HerbalismManager.java @@ -1,31 +1,25 @@ package com.gmail.nossr50.core.skills.primary.herbalism; -import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.core.config.MainConfig; +import com.gmail.nossr50.core.config.experience.ExperienceConfig; import com.gmail.nossr50.core.config.treasure.TreasureConfig; import com.gmail.nossr50.core.datatypes.experience.XPGainReason; import com.gmail.nossr50.core.datatypes.interactions.NotificationType; import com.gmail.nossr50.core.datatypes.mods.CustomBlock; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; +import com.gmail.nossr50.core.mcmmo.block.BlockState; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; +import com.gmail.nossr50.core.runnables.skills.HerbalismBlockUpdaterTask; import com.gmail.nossr50.core.skills.*; import com.gmail.nossr50.core.skills.treasure.HylianTreasure; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.runnables.skills.HerbalismBlockUpdaterTask; -import com.gmail.nossr50.util.*; -import com.gmail.nossr50.util.player.NotificationManager; -import com.gmail.nossr50.util.random.RandomChanceSkillStatic; -import com.gmail.nossr50.util.random.RandomChanceUtil; -import com.gmail.nossr50.util.skills.RankUtils; -import com.gmail.nossr50.util.skills.SkillActivationType; -import com.gmail.nossr50.util.skills.SkillUtils; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.block.BlockState; -import org.bukkit.block.data.Ageable; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.PlayerInventory; -import org.bukkit.metadata.FixedMetadataValue; +import com.gmail.nossr50.core.util.*; +import com.gmail.nossr50.core.util.player.NotificationManager; +import com.gmail.nossr50.core.util.random.RandomChanceSkillStatic; +import com.gmail.nossr50.core.util.random.RandomChanceUtil; +import com.gmail.nossr50.core.util.skills.RankUtils; +import com.gmail.nossr50.core.util.skills.SkillActivationType; +import com.gmail.nossr50.core.util.skills.SkillUtils; import java.util.Collection; import java.util.List; diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/mining/BlastMining.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/mining/BlastMining.java index 640c99755..3fce937b0 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/mining/BlastMining.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/mining/BlastMining.java @@ -3,14 +3,9 @@ package com.gmail.nossr50.core.skills.primary.mining; import com.gmail.nossr50.core.config.AdvancedConfig; import com.gmail.nossr50.core.config.MainConfig; import com.gmail.nossr50.core.data.UserManager; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.SubSkillType; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.skills.RankUtils; -import org.bukkit.Material; -import org.bukkit.entity.Player; -import org.bukkit.entity.TNTPrimed; -import org.bukkit.event.entity.EntityDamageByEntityEvent; -import org.bukkit.event.entity.EntityDamageEvent.DamageModifier; +import com.gmail.nossr50.core.util.skills.RankUtils; public class BlastMining { // The order of the values is extremely important, a few methods depend on it to work properly diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/mining/Mining.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/mining/Mining.java index a75595fac..25cfc002f 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/mining/Mining.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/mining/Mining.java @@ -1,12 +1,10 @@ package com.gmail.nossr50.core.skills.primary.mining; -import com.gmail.nossr50.config.experience.ExperienceConfig; +import com.gmail.nossr50.core.config.experience.ExperienceConfig; +import com.gmail.nossr50.core.mcmmo.block.BlockState; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import com.gmail.nossr50.core.skills.PrimarySkillType; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.Misc; -import org.bukkit.Material; -import org.bukkit.block.BlockState; -import org.bukkit.inventory.ItemStack; +import com.gmail.nossr50.core.util.Misc; public class Mining { diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/Repair.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/Repair.java index 581231212..0f90a4c91 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/Repair.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/Repair.java @@ -2,7 +2,6 @@ package com.gmail.nossr50.core.skills.primary.repair; import com.gmail.nossr50.core.config.AdvancedConfig; import com.gmail.nossr50.core.config.MainConfig; -import org.bukkit.Material; public class Repair { public static int repairMasteryMaxBonusLevel = AdvancedConfig.getInstance().getRepairMasteryMaxLevel(); diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/RepairManager.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/RepairManager.java index 32250d8bd..da01b7cb5 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/RepairManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/RepairManager.java @@ -1,37 +1,30 @@ package com.gmail.nossr50.core.skills.primary.repair; -import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.core.config.AdvancedConfig; import com.gmail.nossr50.core.config.MainConfig; +import com.gmail.nossr50.core.config.experience.ExperienceConfig; import com.gmail.nossr50.core.datatypes.experience.XPGainReason; import com.gmail.nossr50.core.datatypes.interactions.NotificationType; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.locale.LocaleLoader; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.SkillManager; import com.gmail.nossr50.core.skills.SubSkillType; import com.gmail.nossr50.core.skills.primary.repair.repairables.Repairable; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.EventUtils; -import com.gmail.nossr50.util.Misc; -import com.gmail.nossr50.util.Permissions; -import com.gmail.nossr50.util.StringUtils; -import com.gmail.nossr50.util.player.NotificationManager; -import com.gmail.nossr50.util.random.RandomChanceSkillStatic; -import com.gmail.nossr50.util.random.RandomChanceUtil; -import com.gmail.nossr50.util.skills.RankUtils; -import com.gmail.nossr50.util.skills.SkillActivationType; -import com.gmail.nossr50.util.skills.SkillUtils; -import com.gmail.nossr50.util.sounds.SoundManager; -import com.gmail.nossr50.util.sounds.SoundType; -import org.bukkit.Material; -import org.bukkit.enchantments.Enchantment; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.PlayerInventory; - -import java.util.Map; -import java.util.Map.Entry; +import com.gmail.nossr50.core.util.EventUtils; +import com.gmail.nossr50.core.util.Misc; +import com.gmail.nossr50.core.util.Permissions; +import com.gmail.nossr50.core.util.StringUtils; +import com.gmail.nossr50.core.util.player.NotificationManager; +import com.gmail.nossr50.core.util.random.RandomChanceSkillStatic; +import com.gmail.nossr50.core.util.random.RandomChanceUtil; +import com.gmail.nossr50.core.util.skills.RankUtils; +import com.gmail.nossr50.core.util.skills.SkillActivationType; +import com.gmail.nossr50.core.util.skills.SkillUtils; +import com.gmail.nossr50.core.util.sounds.SoundManager; +import com.gmail.nossr50.core.util.sounds.SoundType; public class RepairManager extends SkillManager { private boolean placedAnvil; diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/repairables/Repairable.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/repairables/Repairable.java index 6131d282f..0b361bd8f 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/repairables/Repairable.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/repairables/Repairable.java @@ -2,7 +2,6 @@ package com.gmail.nossr50.core.skills.primary.repair.repairables; import com.gmail.nossr50.core.skills.ConfigItemCategory; import com.gmail.nossr50.core.skills.MaterialType; -import org.bukkit.Material; public interface Repairable { diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/repairables/RepairableFactory.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/repairables/RepairableFactory.java index bfb5c13f1..e44d1d9c8 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/repairables/RepairableFactory.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/repairables/RepairableFactory.java @@ -2,7 +2,6 @@ package com.gmail.nossr50.core.skills.primary.repair.repairables; import com.gmail.nossr50.core.skills.ConfigItemCategory; import com.gmail.nossr50.core.skills.MaterialType; -import org.bukkit.Material; public class RepairableFactory { diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/repairables/RepairableManager.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/repairables/RepairableManager.java index 96bbc537e..e7973eaab 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/repairables/RepairableManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/repairables/RepairableManager.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.core.skills.primary.repair.repairables; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; + +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import java.util.List; diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/repairables/SimpleRepairable.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/repairables/SimpleRepairable.java index 1f37848c7..d44661016 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/repairables/SimpleRepairable.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/repairables/SimpleRepairable.java @@ -2,7 +2,6 @@ package com.gmail.nossr50.core.skills.primary.repair.repairables; import com.gmail.nossr50.core.skills.ConfigItemCategory; import com.gmail.nossr50.core.skills.MaterialType; -import org.bukkit.Material; public class SimpleRepairable implements Repairable { diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/repairables/SimpleRepairableManager.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/repairables/SimpleRepairableManager.java index 9577cb297..6a93624da 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/repairables/SimpleRepairableManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/repairables/SimpleRepairableManager.java @@ -1,9 +1,8 @@ package com.gmail.nossr50.core.skills.primary.repair.repairables; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; -import java.util.HashMap; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; + import java.util.List; public class SimpleRepairableManager implements RepairableManager { diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/swords/SwordsManager.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/swords/SwordsManager.java index 6953dd462..7da92127e 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/swords/SwordsManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/swords/SwordsManager.java @@ -3,20 +3,15 @@ package com.gmail.nossr50.core.skills.primary.swords; import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.datatypes.interactions.NotificationType; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.runnables.skills.BleedTimerTask; import com.gmail.nossr50.core.skills.*; -import com.gmail.nossr50.runnables.skills.BleedTimerTask; -import com.gmail.nossr50.util.Permissions; -import com.gmail.nossr50.util.player.NotificationManager; -import com.gmail.nossr50.util.random.RandomChanceUtil; -import com.gmail.nossr50.util.skills.CombatUtils; -import com.gmail.nossr50.util.skills.RankUtils; -import com.gmail.nossr50.util.skills.SkillActivationType; -import org.bukkit.entity.Entity; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Player; -import org.bukkit.event.entity.EntityDamageEvent.DamageModifier; - -import java.util.Map; +import com.gmail.nossr50.core.util.Permissions; +import com.gmail.nossr50.core.util.player.NotificationManager; +import com.gmail.nossr50.core.util.random.RandomChanceUtil; +import com.gmail.nossr50.core.util.skills.CombatUtils; +import com.gmail.nossr50.core.util.skills.RankUtils; +import com.gmail.nossr50.core.util.skills.SkillActivationType; public class SwordsManager extends SkillManager { public SwordsManager(McMMOPlayer mcMMOPlayer) { diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/taming/Taming.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/taming/Taming.java index a2824734c..ce426e90f 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/taming/Taming.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/taming/Taming.java @@ -1,7 +1,9 @@ package com.gmail.nossr50.core.skills.primary.taming; import com.gmail.nossr50.core.config.AdvancedConfig; -import org.bukkit.EntityEffect; +import com.gmail.nossr50.core.mcmmo.entity.EntityType; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.entity.Tameable; public class Taming { public static double fastFoodServiceActivationChance = AdvancedConfig.getInstance().getFastFoodChance(); diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/taming/TamingManager.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/taming/TamingManager.java index ab51e45cd..074b50169 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/taming/TamingManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/taming/TamingManager.java @@ -1,31 +1,32 @@ package com.gmail.nossr50.core.skills.primary.taming; -import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.core.config.AdvancedConfig; import com.gmail.nossr50.core.config.MainConfig; +import com.gmail.nossr50.core.config.experience.ExperienceConfig; import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.datatypes.experience.XPGainReason; import com.gmail.nossr50.core.datatypes.interactions.NotificationType; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; +import com.gmail.nossr50.core.events.fake.FakeEntityTameEvent; import com.gmail.nossr50.core.locale.LocaleLoader; +import com.gmail.nossr50.core.mcmmo.entity.EntityType; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.entity.Tameable; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; +import com.gmail.nossr50.core.mcmmo.world.Location; +import com.gmail.nossr50.core.runnables.skills.BleedTimerTask; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.SkillManager; import com.gmail.nossr50.core.skills.SubSkillType; -import com.gmail.nossr50.events.fake.FakeEntityTameEvent; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.runnables.skills.BleedTimerTask; -import com.gmail.nossr50.util.Misc; -import com.gmail.nossr50.util.Permissions; -import com.gmail.nossr50.util.StringUtils; -import com.gmail.nossr50.util.player.NotificationManager; -import com.gmail.nossr50.util.random.RandomChanceSkillStatic; -import com.gmail.nossr50.util.random.RandomChanceUtil; -import com.gmail.nossr50.util.skills.ParticleEffectUtils; -import com.gmail.nossr50.util.skills.RankUtils; -import com.gmail.nossr50.util.skills.SkillActivationType; -import org.bukkit.Location; -import org.bukkit.Sound; -import org.bukkit.inventory.ItemStack; +import com.gmail.nossr50.core.util.Misc; +import com.gmail.nossr50.core.util.Permissions; +import com.gmail.nossr50.core.util.StringUtils; +import com.gmail.nossr50.core.util.player.NotificationManager; +import com.gmail.nossr50.core.util.random.RandomChanceSkillStatic; +import com.gmail.nossr50.core.util.random.RandomChanceUtil; +import com.gmail.nossr50.core.util.skills.ParticleEffectUtils; +import com.gmail.nossr50.core.util.skills.RankUtils; +import com.gmail.nossr50.core.util.skills.SkillActivationType; import java.util.ArrayList; import java.util.HashMap; diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/taming/TrackedTamingEntity.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/taming/TrackedTamingEntity.java index 55149187c..f93c0efa6 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/taming/TrackedTamingEntity.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/taming/TrackedTamingEntity.java @@ -1,15 +1,9 @@ package com.gmail.nossr50.core.skills.primary.taming; import com.gmail.nossr50.core.config.MainConfig; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.Misc; -import com.gmail.nossr50.util.skills.CombatUtils; -import com.gmail.nossr50.util.skills.ParticleEffectUtils; -import org.bukkit.Location; -import org.bukkit.Sound; -import org.bukkit.entity.LivingEntity; -import org.bukkit.event.entity.EntityDamageEvent.DamageCause; -import org.bukkit.scheduler.BukkitRunnable; +import com.gmail.nossr50.core.util.Misc; +import com.gmail.nossr50.core.util.skills.CombatUtils; +import com.gmail.nossr50.core.util.skills.ParticleEffectUtils; import java.util.UUID; diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/unarmed/Unarmed.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/unarmed/Unarmed.java index 743de2c72..dd539a7e5 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/unarmed/Unarmed.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/unarmed/Unarmed.java @@ -1,11 +1,10 @@ package com.gmail.nossr50.core.skills.primary.unarmed; import com.gmail.nossr50.core.config.MainConfig; -import com.gmail.nossr50.util.sounds.SoundManager; -import com.gmail.nossr50.util.sounds.SoundType; -import org.bukkit.entity.Player; -import org.bukkit.event.entity.EntityPickupItemEvent; -import org.bukkit.inventory.ItemStack; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; +import com.gmail.nossr50.core.util.sounds.SoundManager; +import com.gmail.nossr50.core.util.sounds.SoundType; public class Unarmed { public static boolean blockCrackerSmoothBrick = MainConfig.getInstance().getUnarmedBlockCrackerSmoothbrickToCracked(); diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/unarmed/UnarmedManager.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/unarmed/UnarmedManager.java index 57936d574..77b314187 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/unarmed/UnarmedManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/unarmed/UnarmedManager.java @@ -4,23 +4,18 @@ import com.gmail.nossr50.core.config.AdvancedConfig; import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.datatypes.interactions.NotificationType; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; +import com.gmail.nossr50.core.mcmmo.block.BlockState; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import com.gmail.nossr50.core.skills.*; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.EventUtils; -import com.gmail.nossr50.util.ItemUtils; -import com.gmail.nossr50.util.Misc; -import com.gmail.nossr50.util.Permissions; -import com.gmail.nossr50.util.player.NotificationManager; -import com.gmail.nossr50.util.random.RandomChanceUtil; -import com.gmail.nossr50.util.skills.RankUtils; -import com.gmail.nossr50.util.skills.SkillActivationType; -import org.bukkit.Material; -import org.bukkit.block.BlockState; -import org.bukkit.block.data.BlockData; -import org.bukkit.entity.Item; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; +import com.gmail.nossr50.core.util.EventUtils; +import com.gmail.nossr50.core.util.ItemUtils; +import com.gmail.nossr50.core.util.Misc; +import com.gmail.nossr50.core.util.Permissions; +import com.gmail.nossr50.core.util.player.NotificationManager; +import com.gmail.nossr50.core.util.random.RandomChanceUtil; +import com.gmail.nossr50.core.util.skills.RankUtils; +import com.gmail.nossr50.core.util.skills.SkillActivationType; public class UnarmedManager extends SkillManager { public UnarmedManager(McMMOPlayer mcMMOPlayer) { diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/woodcutting/Woodcutting.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/woodcutting/Woodcutting.java index 36a37bf7f..cc5c358ab 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/woodcutting/Woodcutting.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/woodcutting/Woodcutting.java @@ -1,16 +1,13 @@ package com.gmail.nossr50.core.skills.primary.woodcutting; -import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.core.config.MainConfig; +import com.gmail.nossr50.core.config.experience.ExperienceConfig; +import com.gmail.nossr50.core.mcmmo.block.BlockState; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import com.gmail.nossr50.core.skills.PrimarySkillType; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.BlockUtils; -import com.gmail.nossr50.util.Misc; -import com.gmail.nossr50.util.skills.SkillUtils; -import org.bukkit.Material; -import org.bukkit.block.BlockFace; -import org.bukkit.block.BlockState; -import org.bukkit.inventory.ItemStack; +import com.gmail.nossr50.core.util.BlockUtils; +import com.gmail.nossr50.core.util.Misc; +import com.gmail.nossr50.core.util.skills.SkillUtils; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/woodcutting/WoodcuttingManager.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/woodcutting/WoodcuttingManager.java index fe6359e3d..fe5381ee7 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/woodcutting/WoodcuttingManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/woodcutting/WoodcuttingManager.java @@ -4,23 +4,21 @@ import com.gmail.nossr50.core.datatypes.experience.XPGainReason; import com.gmail.nossr50.core.datatypes.interactions.NotificationType; import com.gmail.nossr50.core.datatypes.mods.CustomBlock; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; +import com.gmail.nossr50.core.mcmmo.block.Block; +import com.gmail.nossr50.core.mcmmo.block.BlockState; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.SkillManager; import com.gmail.nossr50.core.skills.SubSkillType; import com.gmail.nossr50.core.skills.SuperAbilityType; import com.gmail.nossr50.core.skills.primary.woodcutting.Woodcutting.ExperienceGainMethod; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.*; -import com.gmail.nossr50.util.player.NotificationManager; -import com.gmail.nossr50.util.random.RandomChanceUtil; -import com.gmail.nossr50.util.skills.CombatUtils; -import com.gmail.nossr50.util.skills.RankUtils; -import com.gmail.nossr50.util.skills.SkillActivationType; -import org.bukkit.Material; -import org.bukkit.block.Block; -import org.bukkit.block.BlockState; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; +import com.gmail.nossr50.core.util.*; +import com.gmail.nossr50.core.util.player.NotificationManager; +import com.gmail.nossr50.core.util.random.RandomChanceUtil; +import com.gmail.nossr50.core.util.skills.CombatUtils; +import com.gmail.nossr50.core.util.skills.RankUtils; +import com.gmail.nossr50.core.util.skills.SkillActivationType; import java.util.HashSet; import java.util.Set; diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/subskills/AbstractSubSkill.java b/core/src/main/java/com/gmail/nossr50/core/skills/subskills/AbstractSubSkill.java index bfb0e7d60..e36cbecd8 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/subskills/AbstractSubSkill.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/subskills/AbstractSubSkill.java @@ -1,13 +1,13 @@ package com.gmail.nossr50.core.skills.subskills; import com.gmail.nossr50.core.config.CoreSkillsConfig; +import com.gmail.nossr50.core.locale.LocaleLoader; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.SubSkillType; import com.gmail.nossr50.core.skills.subskills.interfaces.Interaction; import com.gmail.nossr50.core.skills.subskills.interfaces.Rank; import com.gmail.nossr50.core.skills.subskills.interfaces.SubSkill; import com.gmail.nossr50.core.skills.subskills.interfaces.SubSkillProperties; -import com.gmail.nossr50.locale.LocaleLoader; -import org.bukkit.entity.Player; public abstract class AbstractSubSkill implements SubSkill, Interaction, Rank, SubSkillProperties { /* diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/subskills/acrobatics/AcrobaticsSubSkill.java b/core/src/main/java/com/gmail/nossr50/core/skills/subskills/acrobatics/AcrobaticsSubSkill.java index 569f24f41..33f3feb6c 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/subskills/acrobatics/AcrobaticsSubSkill.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/subskills/acrobatics/AcrobaticsSubSkill.java @@ -1,14 +1,11 @@ package com.gmail.nossr50.core.skills.subskills.acrobatics; +import com.gmail.nossr50.core.locale.LocaleLoader; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.SubSkillType; import com.gmail.nossr50.core.skills.subskills.AbstractSubSkill; import com.gmail.nossr50.core.skills.subskills.interfaces.InteractType; -import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.StringUtils; -import org.bukkit.event.Event; -import org.bukkit.event.EventPriority; +import com.gmail.nossr50.core.util.StringUtils; public abstract class AcrobaticsSubSkill extends AbstractSubSkill { diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/subskills/acrobatics/Roll.java b/core/src/main/java/com/gmail/nossr50/core/skills/subskills/acrobatics/Roll.java index fba9bba41..f4675e310 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/subskills/acrobatics/Roll.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/subskills/acrobatics/Roll.java @@ -1,38 +1,29 @@ package com.gmail.nossr50.core.skills.subskills.acrobatics; -import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.core.config.AdvancedConfig; import com.gmail.nossr50.core.config.MainConfig; +import com.gmail.nossr50.core.config.experience.ExperienceConfig; import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.datatypes.LimitedSizeList; import com.gmail.nossr50.core.datatypes.experience.XPGainReason; import com.gmail.nossr50.core.datatypes.interactions.NotificationType; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.PlayerProfile; +import com.gmail.nossr50.core.locale.LocaleLoader; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import com.gmail.nossr50.core.skills.SubSkillType; -import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.EventUtils; -import com.gmail.nossr50.util.Permissions; -import com.gmail.nossr50.util.player.NotificationManager; -import com.gmail.nossr50.util.random.RandomChanceSkill; -import com.gmail.nossr50.util.random.RandomChanceUtil; -import com.gmail.nossr50.util.skills.PerksUtils; -import com.gmail.nossr50.util.skills.RankUtils; -import com.gmail.nossr50.util.skills.SkillActivationType; -import com.gmail.nossr50.util.skills.SkillUtils; -import com.gmail.nossr50.util.sounds.SoundManager; -import com.gmail.nossr50.util.sounds.SoundType; -import net.md_5.bungee.api.chat.ComponentBuilder; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.SoundCategory; -import org.bukkit.enchantments.Enchantment; -import org.bukkit.entity.Player; -import org.bukkit.event.Event; -import org.bukkit.event.EventPriority; -import org.bukkit.event.entity.EntityDamageEvent; -import org.bukkit.inventory.ItemStack; +import com.gmail.nossr50.core.util.EventUtils; +import com.gmail.nossr50.core.util.Permissions; +import com.gmail.nossr50.core.util.player.NotificationManager; +import com.gmail.nossr50.core.util.random.RandomChanceSkill; +import com.gmail.nossr50.core.util.random.RandomChanceUtil; +import com.gmail.nossr50.core.util.skills.PerksUtils; +import com.gmail.nossr50.core.util.skills.RankUtils; +import com.gmail.nossr50.core.util.skills.SkillActivationType; +import com.gmail.nossr50.core.util.skills.SkillUtils; +import com.gmail.nossr50.core.util.sounds.SoundManager; +import com.gmail.nossr50.core.util.sounds.SoundType; import java.util.HashMap; diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/subskills/interfaces/Interaction.java b/core/src/main/java/com/gmail/nossr50/core/skills/subskills/interfaces/Interaction.java index 94723591c..b7d4616a4 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/subskills/interfaces/Interaction.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/subskills/interfaces/Interaction.java @@ -1,8 +1,5 @@ package com.gmail.nossr50.core.skills.subskills.interfaces; -import com.gmail.nossr50.mcMMO; -import org.bukkit.event.Event; -import org.bukkit.event.EventPriority; public interface Interaction { /** diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/subskills/interfaces/SubSkill.java b/core/src/main/java/com/gmail/nossr50/core/skills/subskills/interfaces/SubSkill.java index 712012194..9cf815f89 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/subskills/interfaces/SubSkill.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/subskills/interfaces/SubSkill.java @@ -1,8 +1,7 @@ package com.gmail.nossr50.core.skills.subskills.interfaces; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.interfaces.Skill; -import net.md_5.bungee.api.chat.ComponentBuilder; -import org.bukkit.entity.Player; public interface SubSkill extends Skill { /** diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/treasure/EnchantmentTreasure.java b/core/src/main/java/com/gmail/nossr50/core/skills/treasure/EnchantmentTreasure.java index 50ccb6980..ad718e913 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/treasure/EnchantmentTreasure.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/treasure/EnchantmentTreasure.java @@ -1,6 +1,5 @@ package com.gmail.nossr50.core.skills.treasure; -import org.bukkit.enchantments.Enchantment; public class EnchantmentTreasure { private Enchantment enchantment; diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/treasure/ExcavationTreasure.java b/core/src/main/java/com/gmail/nossr50/core/skills/treasure/ExcavationTreasure.java index 92ba9c7c9..113532459 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/treasure/ExcavationTreasure.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/treasure/ExcavationTreasure.java @@ -1,6 +1,7 @@ package com.gmail.nossr50.core.skills.treasure; -import org.bukkit.inventory.ItemStack; + +import com.gmail.nossr50.core.mcmmo.item.ItemStack; public class ExcavationTreasure extends Treasure { public ExcavationTreasure(ItemStack drop, int xp, double dropChance, int dropLevel) { diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/treasure/FishingTreasure.java b/core/src/main/java/com/gmail/nossr50/core/skills/treasure/FishingTreasure.java index bce93839e..b3ee51786 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/treasure/FishingTreasure.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/treasure/FishingTreasure.java @@ -1,6 +1,7 @@ package com.gmail.nossr50.core.skills.treasure; -import org.bukkit.inventory.ItemStack; + +import com.gmail.nossr50.core.mcmmo.item.ItemStack; public class FishingTreasure extends Treasure { diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/treasure/HylianTreasure.java b/core/src/main/java/com/gmail/nossr50/core/skills/treasure/HylianTreasure.java index e5595f58f..cbd3b1e8f 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/treasure/HylianTreasure.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/treasure/HylianTreasure.java @@ -1,6 +1,7 @@ package com.gmail.nossr50.core.skills.treasure; -import org.bukkit.inventory.ItemStack; + +import com.gmail.nossr50.core.mcmmo.item.ItemStack; public class HylianTreasure extends Treasure { public HylianTreasure(ItemStack drop, int xp, double dropChance, int dropLevel) { diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/treasure/ShakeTreasure.java b/core/src/main/java/com/gmail/nossr50/core/skills/treasure/ShakeTreasure.java index 41bd533fe..d669f6dda 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/treasure/ShakeTreasure.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/treasure/ShakeTreasure.java @@ -1,6 +1,7 @@ package com.gmail.nossr50.core.skills.treasure; -import org.bukkit.inventory.ItemStack; + +import com.gmail.nossr50.core.mcmmo.item.ItemStack; public class ShakeTreasure extends Treasure { public ShakeTreasure(ItemStack drop, int xp, double dropChance, int dropLevel) { diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/treasure/Treasure.java b/core/src/main/java/com/gmail/nossr50/core/skills/treasure/Treasure.java index 2b1edd24a..c909d4072 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/treasure/Treasure.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/treasure/Treasure.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.core.skills.treasure; import com.gmail.nossr50.core.config.MainConfig; -import org.bukkit.inventory.ItemStack; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; public abstract class Treasure { private int xp; diff --git a/core/src/main/java/com/gmail/nossr50/core/util/BlockUtils.java b/core/src/main/java/com/gmail/nossr50/core/util/BlockUtils.java index 0db94f6d5..dfc912b9d 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/BlockUtils.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/BlockUtils.java @@ -1,16 +1,10 @@ package com.gmail.nossr50.core.util; -import com.gmail.nossr50.config.experience.ExperienceConfig; +import com.gmail.nossr50.core.config.experience.ExperienceConfig; +import com.gmail.nossr50.core.mcmmo.block.BlockState; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.child.salvage.Salvage; import com.gmail.nossr50.core.skills.primary.repair.Repair; -import com.gmail.nossr50.mcMMO; -import org.bukkit.Material; -import org.bukkit.block.BlockState; -import org.bukkit.block.data.Ageable; -import org.bukkit.block.data.BlockData; - -import java.util.HashSet; public final class BlockUtils { diff --git a/core/src/main/java/com/gmail/nossr50/core/util/ChimaeraWing.java b/core/src/main/java/com/gmail/nossr50/core/util/ChimaeraWing.java index dbe4b9124..54146011a 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/ChimaeraWing.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/ChimaeraWing.java @@ -5,25 +5,19 @@ import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.datatypes.interactions.NotificationType; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.locale.LocaleLoader; +import com.gmail.nossr50.core.mcmmo.colors.ChatColor; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import com.gmail.nossr50.core.runnables.items.ChimaeraWingWarmup; import com.gmail.nossr50.core.util.player.NotificationManager; import com.gmail.nossr50.core.util.skills.CombatUtils; import com.gmail.nossr50.core.util.skills.SkillUtils; import com.gmail.nossr50.core.util.sounds.SoundManager; import com.gmail.nossr50.core.util.sounds.SoundType; -import com.gmail.nossr50.mcMMO; -import org.bukkit.ChatColor; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.NamespacedKey; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.ShapelessRecipe; -import org.bukkit.inventory.meta.ItemMeta; -import org.bukkit.util.Vector; import java.util.ArrayList; import java.util.List; +import java.util.Vector; public final class ChimaeraWing { private static McMMOPlayer mcMMOPlayer; diff --git a/core/src/main/java/com/gmail/nossr50/core/util/EnchantmentUtils.java b/core/src/main/java/com/gmail/nossr50/core/util/EnchantmentUtils.java index 1a65377d7..15aa170d7 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/EnchantmentUtils.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/EnchantmentUtils.java @@ -1,8 +1,5 @@ package com.gmail.nossr50.core.util; -import org.bukkit.enchantments.Enchantment; - -import java.util.HashMap; public class EnchantmentUtils { diff --git a/core/src/main/java/com/gmail/nossr50/core/util/EventUtils.java b/core/src/main/java/com/gmail/nossr50/core/util/EventUtils.java index 84b3a6837..1408dd7ad 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/EventUtils.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/EventUtils.java @@ -6,42 +6,33 @@ import com.gmail.nossr50.core.datatypes.experience.XPGainSource; import com.gmail.nossr50.core.datatypes.party.Party; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.PlayerProfile; +import com.gmail.nossr50.core.events.experience.McMMOPlayerLevelChangeEvent; +import com.gmail.nossr50.core.events.experience.McMMOPlayerLevelDownEvent; +import com.gmail.nossr50.core.events.experience.McMMOPlayerLevelUpEvent; +import com.gmail.nossr50.core.events.experience.McMMOPlayerXpGainEvent; +import com.gmail.nossr50.core.events.fake.*; +import com.gmail.nossr50.core.events.hardcore.McMMOPlayerPreDeathPenaltyEvent; +import com.gmail.nossr50.core.events.hardcore.McMMOPlayerStatLossEvent; +import com.gmail.nossr50.core.events.hardcore.McMMOPlayerVampirismEvent; +import com.gmail.nossr50.core.events.party.McMMOPartyLevelUpEvent; +import com.gmail.nossr50.core.events.party.McMMOPartyTeleportEvent; +import com.gmail.nossr50.core.events.party.McMMOPartyXpGainEvent; +import com.gmail.nossr50.core.events.skills.abilities.McMMOPlayerAbilityActivateEvent; +import com.gmail.nossr50.core.events.skills.abilities.McMMOPlayerAbilityDeactivateEvent; +import com.gmail.nossr50.core.events.skills.fishing.McMMOPlayerFishingTreasureEvent; +import com.gmail.nossr50.core.events.skills.fishing.McMMOPlayerMagicHunterEvent; +import com.gmail.nossr50.core.events.skills.repair.McMMOPlayerRepairCheckEvent; +import com.gmail.nossr50.core.events.skills.salvage.McMMOPlayerSalvageCheckEvent; +import com.gmail.nossr50.core.events.skills.secondaryabilities.SubSkillEvent; +import com.gmail.nossr50.core.events.skills.unarmed.McMMOPlayerDisarmEvent; import com.gmail.nossr50.core.locale.LocaleLoader; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.SubSkillType; import com.gmail.nossr50.core.skills.SuperAbilityType; import com.gmail.nossr50.core.skills.subskills.AbstractSubSkill; import com.gmail.nossr50.core.util.skills.CombatUtils; -import com.gmail.nossr50.events.experience.McMMOPlayerLevelChangeEvent; -import com.gmail.nossr50.events.experience.McMMOPlayerLevelDownEvent; -import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent; -import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent; -import com.gmail.nossr50.events.hardcore.McMMOPlayerPreDeathPenaltyEvent; -import com.gmail.nossr50.events.hardcore.McMMOPlayerStatLossEvent; -import com.gmail.nossr50.events.hardcore.McMMOPlayerVampirismEvent; -import com.gmail.nossr50.events.party.McMMOPartyLevelUpEvent; -import com.gmail.nossr50.events.party.McMMOPartyTeleportEvent; -import com.gmail.nossr50.events.party.McMMOPartyXpGainEvent; -import com.gmail.nossr50.events.skills.abilities.McMMOPlayerAbilityActivateEvent; -import com.gmail.nossr50.events.skills.abilities.McMMOPlayerAbilityDeactivateEvent; -import com.gmail.nossr50.events.skills.fishing.McMMOPlayerFishingTreasureEvent; -import com.gmail.nossr50.events.skills.fishing.McMMOPlayerMagicHunterEvent; -import com.gmail.nossr50.events.skills.repair.McMMOPlayerRepairCheckEvent; -import com.gmail.nossr50.events.skills.salvage.McMMOPlayerSalvageCheckEvent; -import com.gmail.nossr50.events.skills.secondaryabilities.SubSkillEvent; -import com.gmail.nossr50.events.skills.unarmed.McMMOPlayerDisarmEvent; -import com.gmail.nossr50.mcMMO; -import org.bukkit.block.Block; -import org.bukkit.enchantments.Enchantment; -import org.bukkit.entity.Entity; -import org.bukkit.entity.FishHook; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Player; -import org.bukkit.event.Event; -import org.bukkit.event.entity.EntityDamageEvent; -import org.bukkit.event.player.PlayerFishEvent; -import org.bukkit.inventory.ItemStack; -import org.bukkit.plugin.PluginManager; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/com/gmail/nossr50/core/util/HardcoreManager.java b/core/src/main/java/com/gmail/nossr50/core/util/HardcoreManager.java index 91b4a6148..09746e731 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/HardcoreManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/HardcoreManager.java @@ -4,9 +4,9 @@ import com.gmail.nossr50.core.config.MainConfig; import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.datatypes.interactions.NotificationType; import com.gmail.nossr50.core.datatypes.player.PlayerProfile; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.util.player.NotificationManager; -import org.bukkit.entity.Player; import java.util.HashMap; diff --git a/core/src/main/java/com/gmail/nossr50/core/util/HolidayManager.java b/core/src/main/java/com/gmail/nossr50/core/util/HolidayManager.java index 3eb4c341c..09e264271 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/HolidayManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/HolidayManager.java @@ -1,24 +1,18 @@ package com.gmail.nossr50.core.util; -import com.gmail.nossr50.commands.skills.AprilCommand; import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.datatypes.interactions.NotificationType; import com.gmail.nossr50.core.locale.LocaleLoader; +import com.gmail.nossr50.core.mcmmo.colors.ChatColor; +import com.gmail.nossr50.core.mcmmo.commands.CommandSender; +import com.gmail.nossr50.core.mcmmo.entity.EntityType; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.util.player.NotificationManager; import com.gmail.nossr50.core.util.skills.ParticleEffectUtils; import com.gmail.nossr50.core.util.sounds.SoundManager; import com.gmail.nossr50.core.util.sounds.SoundType; -import com.gmail.nossr50.mcMMO; import com.google.common.collect.ImmutableList; -import org.bukkit.FireworkEffect.Type; -import org.bukkit.command.CommandSender; -import org.bukkit.command.PluginCommand; -import org.bukkit.entity.EntityType; -import org.bukkit.entity.Firework; -import org.bukkit.entity.Player; -import org.bukkit.event.player.PlayerStatisticIncrementEvent; -import org.bukkit.inventory.meta.FireworkMeta; import java.io.*; import java.util.*; diff --git a/core/src/main/java/com/gmail/nossr50/core/util/LogFilter.java b/core/src/main/java/com/gmail/nossr50/core/util/LogFilter.java index 6c19f22d5..02c703b84 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/LogFilter.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/LogFilter.java @@ -1,6 +1,5 @@ package com.gmail.nossr50.core.util; -import com.gmail.nossr50.mcMMO; import java.util.logging.Filter; import java.util.logging.LogRecord; diff --git a/core/src/main/java/com/gmail/nossr50/core/util/MaterialUtils.java b/core/src/main/java/com/gmail/nossr50/core/util/MaterialUtils.java index 65b79d9b7..aa26018f2 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/MaterialUtils.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/MaterialUtils.java @@ -1,7 +1,5 @@ package com.gmail.nossr50.core.util; -import com.gmail.nossr50.mcMMO; -import org.bukkit.Material; public final class MaterialUtils { private MaterialUtils() { diff --git a/core/src/main/java/com/gmail/nossr50/core/util/Misc.java b/core/src/main/java/com/gmail/nossr50/core/util/Misc.java index cb3ddd796..40802dc31 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/Misc.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/Misc.java @@ -1,18 +1,12 @@ package com.gmail.nossr50.core.util; import com.gmail.nossr50.core.data.UserManager; +import com.gmail.nossr50.core.events.items.McMMOItemSpawnEvent; +import com.gmail.nossr50.core.mcmmo.block.BlockState; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import com.gmail.nossr50.core.runnables.player.PlayerProfileLoadingTask; -import com.gmail.nossr50.events.items.McMMOItemSpawnEvent; -import com.gmail.nossr50.mcMMO; import com.google.common.collect.ImmutableSet; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.block.BlockState; -import org.bukkit.entity.Entity; -import org.bukkit.entity.Item; -import org.bukkit.entity.NPC; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; import java.util.Collection; import java.util.Random; diff --git a/core/src/main/java/com/gmail/nossr50/core/util/MobHealthbarUtils.java b/core/src/main/java/com/gmail/nossr50/core/util/MobHealthbarUtils.java index 981724b59..01e13384b 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/MobHealthbarUtils.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/MobHealthbarUtils.java @@ -3,15 +3,11 @@ package com.gmail.nossr50.core.util; import com.gmail.nossr50.core.config.AdvancedConfig; import com.gmail.nossr50.core.config.MainConfig; import com.gmail.nossr50.core.datatypes.meta.OldName; +import com.gmail.nossr50.core.mcmmo.colors.ChatColor; +import com.gmail.nossr50.core.mcmmo.entity.EntityType; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.runnables.MobHealthDisplayUpdaterTask; import com.gmail.nossr50.core.skills.MobHealthbarType; -import com.gmail.nossr50.mcMMO; -import org.bukkit.ChatColor; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Player; -import org.bukkit.event.entity.EntityDamageByEntityEvent; -import org.bukkit.event.entity.EntityDamageEvent; -import org.bukkit.metadata.FixedMetadataValue; public final class MobHealthbarUtils { private MobHealthbarUtils() { diff --git a/core/src/main/java/com/gmail/nossr50/core/util/ModManager.java b/core/src/main/java/com/gmail/nossr50/core/util/ModManager.java index c45717efa..5afe70465 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/ModManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/ModManager.java @@ -1,20 +1,16 @@ package com.gmail.nossr50.core.util; -import com.gmail.nossr50.config.mods.CustomArmorConfig; -import com.gmail.nossr50.config.mods.CustomBlockConfig; -import com.gmail.nossr50.config.mods.CustomEntityConfig; -import com.gmail.nossr50.config.mods.CustomToolConfig; import com.gmail.nossr50.core.config.MainConfig; +import com.gmail.nossr50.core.config.mods.CustomArmorConfig; +import com.gmail.nossr50.core.config.mods.CustomBlockConfig; +import com.gmail.nossr50.core.config.mods.CustomEntityConfig; +import com.gmail.nossr50.core.config.mods.CustomToolConfig; import com.gmail.nossr50.core.datatypes.mods.CustomBlock; import com.gmail.nossr50.core.datatypes.mods.CustomEntity; import com.gmail.nossr50.core.datatypes.mods.CustomTool; +import com.gmail.nossr50.core.mcmmo.block.BlockState; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; import com.gmail.nossr50.core.skills.primary.repair.repairables.Repairable; -import com.gmail.nossr50.mcMMO; -import org.bukkit.Material; -import org.bukkit.block.BlockState; -import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.entity.Entity; -import org.bukkit.inventory.ItemStack; import java.io.File; import java.util.ArrayList; diff --git a/core/src/main/java/com/gmail/nossr50/core/util/Motd.java b/core/src/main/java/com/gmail/nossr50/core/util/Motd.java index 8163ae045..b6f34acd6 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/Motd.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/Motd.java @@ -2,11 +2,9 @@ package com.gmail.nossr50.core.util; import com.gmail.nossr50.core.config.MainConfig; import com.gmail.nossr50.core.locale.LocaleLoader; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.util.skills.PerksUtils; -import com.gmail.nossr50.mcMMO; -import org.bukkit.entity.Player; -import org.bukkit.plugin.PluginDescriptionFile; import java.text.DecimalFormat; diff --git a/core/src/main/java/com/gmail/nossr50/core/util/TextComponentFactory.java b/core/src/main/java/com/gmail/nossr50/core/util/TextComponentFactory.java index 892f072c0..1aafebb36 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/TextComponentFactory.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/TextComponentFactory.java @@ -6,15 +6,14 @@ import com.gmail.nossr50.core.datatypes.interactions.NotificationType; import com.gmail.nossr50.core.datatypes.json.McMMOUrl; import com.gmail.nossr50.core.datatypes.json.McMMOWebLinks; import com.gmail.nossr50.core.locale.LocaleLoader; +import com.gmail.nossr50.core.mcmmo.colors.ChatColor; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.SubSkillType; import com.gmail.nossr50.core.skills.subskills.AbstractSubSkill; import com.gmail.nossr50.core.util.skills.RankUtils; -import com.gmail.nossr50.listeners.InteractionManager; -import net.md_5.bungee.api.ChatColor; -import net.md_5.bungee.api.ChatMessageType; -import org.bukkit.entity.Player; +import java.awt.*; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/gmail/nossr50/core/util/adapter/BiomeAdapter.java b/core/src/main/java/com/gmail/nossr50/core/util/adapter/BiomeAdapter.java index f36fb1a69..5dea6bac2 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/adapter/BiomeAdapter.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/adapter/BiomeAdapter.java @@ -1,6 +1,5 @@ package com.gmail.nossr50.core.util.adapter; -import org.bukkit.block.Biome; import java.util.*; diff --git a/core/src/main/java/com/gmail/nossr50/core/util/commands/CommandRegistrationManager.java b/core/src/main/java/com/gmail/nossr50/core/util/commands/CommandRegistrationManager.java index 34955a960..ed49c4963 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/commands/CommandRegistrationManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/commands/CommandRegistrationManager.java @@ -1,25 +1,9 @@ package com.gmail.nossr50.core.util.commands; -import com.gmail.nossr50.commands.chat.AdminChatCommand; -import com.gmail.nossr50.commands.chat.McChatSpy; -import com.gmail.nossr50.commands.chat.PartyChatCommand; -import com.gmail.nossr50.commands.database.McpurgeCommand; -import com.gmail.nossr50.commands.database.McremoveCommand; -import com.gmail.nossr50.commands.database.MmoshowdbCommand; -import com.gmail.nossr50.commands.experience.AddlevelsCommand; -import com.gmail.nossr50.commands.experience.AddxpCommand; -import com.gmail.nossr50.commands.experience.MmoeditCommand; -import com.gmail.nossr50.commands.experience.SkillresetCommand; -import com.gmail.nossr50.commands.hardcore.HardcoreCommand; -import com.gmail.nossr50.commands.hardcore.VampirismCommand; -import com.gmail.nossr50.commands.party.PartyCommand; -import com.gmail.nossr50.commands.party.teleport.PtpCommand; import com.gmail.nossr50.core.config.MainConfig; import com.gmail.nossr50.core.locale.LocaleLoader; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.util.StringUtils; -import com.gmail.nossr50.mcMMO; -import org.bukkit.command.PluginCommand; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/gmail/nossr50/core/util/commands/CommandUtils.java b/core/src/main/java/com/gmail/nossr50/core/util/commands/CommandUtils.java index ebfe4c7d3..0c57a6b09 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/commands/CommandUtils.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/commands/CommandUtils.java @@ -5,15 +5,13 @@ import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.PlayerProfile; import com.gmail.nossr50.core.locale.LocaleLoader; +import com.gmail.nossr50.core.mcmmo.commands.CommandSender; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.util.Misc; import com.gmail.nossr50.core.util.StringUtils; import com.gmail.nossr50.core.util.skills.SkillUtils; -import com.gmail.nossr50.mcMMO; import com.google.common.collect.ImmutableList; -import org.bukkit.OfflinePlayer; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/gmail/nossr50/core/util/experience/ExperienceBarManager.java b/core/src/main/java/com/gmail/nossr50/core/util/experience/ExperienceBarManager.java index 240bf7251..7c53d0bfe 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/experience/ExperienceBarManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/experience/ExperienceBarManager.java @@ -1,10 +1,9 @@ package com.gmail.nossr50.core.util.experience; -import com.gmail.nossr50.config.experience.ExperienceConfig; +import com.gmail.nossr50.core.config.experience.ExperienceConfig; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.runnables.skills.ExperienceBarHideTask; import com.gmail.nossr50.core.skills.PrimarySkillType; -import org.bukkit.plugin.Plugin; import java.util.HashMap; diff --git a/core/src/main/java/com/gmail/nossr50/core/util/experience/ExperienceBarWrapper.java b/core/src/main/java/com/gmail/nossr50/core/util/experience/ExperienceBarWrapper.java index f3acec350..0235f1229 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/experience/ExperienceBarWrapper.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/experience/ExperienceBarWrapper.java @@ -1,17 +1,13 @@ package com.gmail.nossr50.core.util.experience; -import com.gmail.nossr50.config.experience.ExperienceConfig; +import com.gmail.nossr50.core.config.experience.ExperienceConfig; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.locale.LocaleLoader; +import com.gmail.nossr50.core.mcmmo.bossbars.BarColor; +import com.gmail.nossr50.core.mcmmo.bossbars.BarStyle; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.util.StringUtils; -import org.bukkit.Server; -import org.bukkit.boss.BarColor; -import org.bukkit.boss.BarStyle; -import org.bukkit.boss.BossBar; -import org.bukkit.entity.Player; - -import java.util.List; /** * A visual representation of a players skill level progress for a PrimarySkillType diff --git a/core/src/main/java/com/gmail/nossr50/core/util/experience/FormulaManager.java b/core/src/main/java/com/gmail/nossr50/core/util/experience/FormulaManager.java index cb973462d..18a0062a1 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/experience/FormulaManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/experience/FormulaManager.java @@ -1,11 +1,9 @@ package com.gmail.nossr50.core.util.experience; -import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.core.config.MainConfig; +import com.gmail.nossr50.core.config.experience.ExperienceConfig; import com.gmail.nossr50.core.datatypes.experience.FormulaType; import com.gmail.nossr50.core.skills.PrimarySkillType; -import com.gmail.nossr50.mcMMO; -import org.bukkit.configuration.file.YamlConfiguration; import java.io.File; import java.util.HashMap; diff --git a/core/src/main/java/com/gmail/nossr50/core/util/player/NotificationManager.java b/core/src/main/java/com/gmail/nossr50/core/util/player/NotificationManager.java index c8bea6c92..a4d50c9d1 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/player/NotificationManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/player/NotificationManager.java @@ -3,20 +3,17 @@ package com.gmail.nossr50.core.util.player; import com.gmail.nossr50.core.config.AdvancedConfig; import com.gmail.nossr50.core.datatypes.interactions.NotificationType; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; +import com.gmail.nossr50.core.events.skills.McMMOPlayerNotificationEvent; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.world.Location; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.SubSkillType; import com.gmail.nossr50.core.util.Misc; import com.gmail.nossr50.core.util.TextComponentFactory; import com.gmail.nossr50.core.util.sounds.SoundManager; import com.gmail.nossr50.core.util.sounds.SoundType; -import com.gmail.nossr50.events.skills.McMMOPlayerNotificationEvent; -import net.md_5.bungee.api.ChatMessageType; -import net.md_5.bungee.api.chat.TextComponent; -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.Server; -import org.bukkit.SoundCategory; -import org.bukkit.entity.Player; + +import java.awt.*; public class NotificationManager { /** diff --git a/core/src/main/java/com/gmail/nossr50/core/util/random/InvalidActivationException.java b/core/src/main/java/com/gmail/nossr50/core/util/random/InvalidActivationException.java index 176db6236..cb0f25b2c 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/random/InvalidActivationException.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/random/InvalidActivationException.java @@ -1,5 +1,8 @@ package com.gmail.nossr50.core.util.random; public class InvalidActivationException extends Exception { - //Weee + public InvalidActivationException(String msg) + { + super(msg); + } } diff --git a/core/src/main/java/com/gmail/nossr50/core/util/random/InvalidStaticChance.java b/core/src/main/java/com/gmail/nossr50/core/util/random/InvalidStaticChance.java index b339eb79a..b383dbed2 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/random/InvalidStaticChance.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/random/InvalidStaticChance.java @@ -1,5 +1,8 @@ package com.gmail.nossr50.core.util.random; public class InvalidStaticChance extends Exception { - //Weeee + public InvalidStaticChance(String msg) + { + super(msg); + } } diff --git a/core/src/main/java/com/gmail/nossr50/core/util/random/RandomChanceSkillStatic.java b/core/src/main/java/com/gmail/nossr50/core/util/random/RandomChanceSkillStatic.java index 8618cc0d1..a01cc2b53 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/random/RandomChanceSkillStatic.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/random/RandomChanceSkillStatic.java @@ -1,7 +1,7 @@ package com.gmail.nossr50.core.util.random; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.SubSkillType; -import org.bukkit.entity.Player; public class RandomChanceSkillStatic extends RandomChanceSkill { private final double xPos; diff --git a/core/src/main/java/com/gmail/nossr50/core/util/random/RandomChanceUtil.java b/core/src/main/java/com/gmail/nossr50/core/util/random/RandomChanceUtil.java index c5b988c7c..1d3227851 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/random/RandomChanceUtil.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/random/RandomChanceUtil.java @@ -1,15 +1,15 @@ package com.gmail.nossr50.core.util.random; import com.gmail.nossr50.core.config.AdvancedConfig; +import com.gmail.nossr50.core.events.skills.secondaryabilities.SubSkillEvent; +import com.gmail.nossr50.core.events.skills.secondaryabilities.SubSkillRandomCheckEvent; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.SubSkillType; import com.gmail.nossr50.core.skills.subskills.AbstractSubSkill; import com.gmail.nossr50.core.util.EventUtils; import com.gmail.nossr50.core.util.Permissions; import com.gmail.nossr50.core.util.skills.SkillActivationType; -import com.gmail.nossr50.events.skills.secondaryabilities.SubSkillEvent; -import com.gmail.nossr50.events.skills.secondaryabilities.SubSkillRandomCheckEvent; -import org.bukkit.entity.Player; import java.text.DecimalFormat; import java.util.Random; diff --git a/core/src/main/java/com/gmail/nossr50/core/util/scoreboards/ScoreboardManager.java b/core/src/main/java/com/gmail/nossr50/core/util/scoreboards/ScoreboardManager.java index 87977ba1c..67ad54bb4 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/scoreboards/ScoreboardManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/scoreboards/ScoreboardManager.java @@ -6,17 +6,14 @@ import com.gmail.nossr50.core.datatypes.database.PlayerStat; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.PlayerProfile; import com.gmail.nossr50.core.locale.LocaleLoader; +import com.gmail.nossr50.core.mcmmo.colors.ChatColor; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.SuperAbilityType; import com.gmail.nossr50.core.util.Misc; -import com.gmail.nossr50.mcMMO; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import org.bukkit.ChatColor; -import org.bukkit.entity.Player; -import org.bukkit.scoreboard.DisplaySlot; -import org.bukkit.scoreboard.Objective; import java.util.*; diff --git a/core/src/main/java/com/gmail/nossr50/core/util/scoreboards/ScoreboardWrapper.java b/core/src/main/java/com/gmail/nossr50/core/util/scoreboards/ScoreboardWrapper.java index 90bccb79b..fadb48b56 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/scoreboards/ScoreboardWrapper.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/scoreboards/ScoreboardWrapper.java @@ -5,22 +5,15 @@ import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.datatypes.database.PlayerStat; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.datatypes.player.PlayerProfile; +import com.gmail.nossr50.core.events.scoreboard.*; import com.gmail.nossr50.core.locale.LocaleLoader; +import com.gmail.nossr50.core.mcmmo.colors.ChatColor; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.SuperAbilityType; import com.gmail.nossr50.core.skills.child.FamilyTree; import com.gmail.nossr50.core.util.Misc; import com.gmail.nossr50.core.util.scoreboards.ScoreboardManager.SidebarType; -import com.gmail.nossr50.mcMMO; -import org.apache.commons.lang.Validate; -import org.bukkit.ChatColor; -import org.bukkit.entity.Player; -import org.bukkit.scheduler.BukkitRunnable; -import org.bukkit.scheduler.BukkitTask; -import org.bukkit.scoreboard.DisplaySlot; -import org.bukkit.scoreboard.Objective; -import org.bukkit.scoreboard.Score; -import org.bukkit.scoreboard.Scoreboard; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/com/gmail/nossr50/core/util/skills/CombatUtils.java b/core/src/main/java/com/gmail/nossr50/core/util/skills/CombatUtils.java index 2aa3ed355..686c94ead 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/skills/CombatUtils.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/skills/CombatUtils.java @@ -1,10 +1,17 @@ package com.gmail.nossr50.core.util.skills; -import com.gmail.nossr50.config.experience.ExperienceConfig; +import com.gmail.nossr50.core.config.experience.ExperienceConfig; import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.datatypes.experience.XPGainReason; import com.gmail.nossr50.core.datatypes.interactions.NotificationType; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; +import com.gmail.nossr50.core.events.fake.FakeEntityDamageByEntityEvent; +import com.gmail.nossr50.core.events.fake.FakeEntityDamageEvent; +import com.gmail.nossr50.core.mcmmo.entity.EntityType; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.entity.Tameable; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; +import com.gmail.nossr50.core.party.PartyManager; import com.gmail.nossr50.core.runnables.skills.AwardCombatXpTask; import com.gmail.nossr50.core.runnables.skills.BleedTimerTask; import com.gmail.nossr50.core.skills.PrimarySkillType; @@ -18,25 +25,7 @@ import com.gmail.nossr50.core.skills.primary.unarmed.Unarmed; import com.gmail.nossr50.core.skills.primary.unarmed.UnarmedManager; import com.gmail.nossr50.core.util.*; import com.gmail.nossr50.core.util.player.NotificationManager; -import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent; -import com.gmail.nossr50.events.fake.FakeEntityDamageEvent; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.party.PartyManager; -import com.gmail.nossr50.util.*; import com.google.common.collect.ImmutableMap; -import org.bukkit.GameMode; -import org.bukkit.Material; -import org.bukkit.entity.LivingEntity; -import org.bukkit.event.entity.EntityDamageByEntityEvent; -import org.bukkit.event.entity.EntityDamageEvent; -import org.bukkit.event.entity.EntityDamageEvent.DamageCause; -import org.bukkit.event.entity.EntityDamageEvent.DamageModifier; -import org.bukkit.inventory.ItemStack; -import org.bukkit.projectiles.ProjectileSource; - -import java.util.EnumMap; -import java.util.HashMap; -import java.util.Map; public final class CombatUtils { private CombatUtils() { diff --git a/core/src/main/java/com/gmail/nossr50/core/util/skills/ParticleEffectUtils.java b/core/src/main/java/com/gmail/nossr50/core/util/skills/ParticleEffectUtils.java index b11cbdfeb..b876c0b02 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/skills/ParticleEffectUtils.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/skills/ParticleEffectUtils.java @@ -1,16 +1,10 @@ package com.gmail.nossr50.core.util.skills; import com.gmail.nossr50.core.config.MainConfig; -import com.gmail.nossr50.mcMMO; -import org.bukkit.FireworkEffect.Type; -import org.bukkit.block.Block; -import org.bukkit.block.BlockFace; -import org.bukkit.entity.EntityType; -import org.bukkit.entity.Firework; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Player; -import org.bukkit.inventory.meta.FireworkMeta; -import org.bukkit.metadata.FixedMetadataValue; +import com.gmail.nossr50.core.mcmmo.entity.EntityType; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.world.Location; +import com.gmail.nossr50.core.mcmmo.world.World; public final class ParticleEffectUtils { diff --git a/core/src/main/java/com/gmail/nossr50/core/util/skills/PerksUtils.java b/core/src/main/java/com/gmail/nossr50/core/util/skills/PerksUtils.java index 9c8f068b1..8e8eef864 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/skills/PerksUtils.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/skills/PerksUtils.java @@ -1,9 +1,9 @@ package com.gmail.nossr50.core.util.skills; -import com.gmail.nossr50.config.experience.ExperienceConfig; +import com.gmail.nossr50.core.config.experience.ExperienceConfig; +import com.gmail.nossr50.core.mcmmo.entity.Player; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.util.Permissions; -import org.bukkit.entity.Player; public final class PerksUtils { private static final int LUCKY_SKILL_ACTIVATION_CHANCE = 75; diff --git a/core/src/main/java/com/gmail/nossr50/core/util/skills/SkillUtils.java b/core/src/main/java/com/gmail/nossr50/core/util/skills/SkillUtils.java index 0004feec9..e0996d508 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/skills/SkillUtils.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/skills/SkillUtils.java @@ -9,6 +9,9 @@ import com.gmail.nossr50.core.datatypes.experience.XPGainSource; import com.gmail.nossr50.core.datatypes.interactions.NotificationType; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.locale.LocaleLoader; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.item.ItemStack; +import com.gmail.nossr50.core.mcmmo.world.Location; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.SubSkillType; import com.gmail.nossr50.core.skills.SuperAbilityType; @@ -16,18 +19,6 @@ import com.gmail.nossr50.core.util.ItemUtils; import com.gmail.nossr50.core.util.Misc; import com.gmail.nossr50.core.util.StringUtils; import com.gmail.nossr50.core.util.player.NotificationManager; -import com.gmail.nossr50.mcMMO; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.enchantments.Enchantment; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.Recipe; -import org.bukkit.inventory.ShapedRecipe; -import org.bukkit.inventory.ShapelessRecipe; -import org.bukkit.inventory.meta.ItemMeta; -import org.bukkit.potion.PotionEffect; -import org.bukkit.potion.PotionEffectType; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/gmail/nossr50/core/util/sounds/SoundManager.java b/core/src/main/java/com/gmail/nossr50/core/util/sounds/SoundManager.java index 3ffeab4b1..e5fd19155 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/sounds/SoundManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/sounds/SoundManager.java @@ -1,12 +1,9 @@ package com.gmail.nossr50.core.util.sounds; import com.gmail.nossr50.core.config.SoundConfig; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.world.World; import com.gmail.nossr50.core.util.Misc; -import org.bukkit.Location; -import org.bukkit.Sound; -import org.bukkit.SoundCategory; -import org.bukkit.World; -import org.bukkit.entity.Player; public class SoundManager { /** diff --git a/core/src/main/java/com/gmail/nossr50/core/util/upgrade/UpgradeManager.java b/core/src/main/java/com/gmail/nossr50/core/util/upgrade/UpgradeManager.java index d3c05ca12..03d69ba49 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/upgrade/UpgradeManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/upgrade/UpgradeManager.java @@ -1,6 +1,5 @@ package com.gmail.nossr50.core.util.upgrade; -import com.gmail.nossr50.core.config.ConfigLoader; import com.gmail.nossr50.core.datatypes.database.UpgradeType; import java.util.Arrays; diff --git a/core/src/main/java/com/gmail/nossr50/core/util/uuid/UUIDFetcher.java b/core/src/main/java/com/gmail/nossr50/core/util/uuid/UUIDFetcher.java index 5fa9e7452..40cabbb0f 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/uuid/UUIDFetcher.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/uuid/UUIDFetcher.java @@ -1,9 +1,7 @@ package com.gmail.nossr50.core.util.uuid; import com.google.common.collect.ImmutableList; -import org.json.simple.JSONArray; -import org.json.simple.JSONObject; -import org.json.simple.parser.JSONParser; +import jdk.nashorn.internal.parser.JSONParser; import java.io.InputStreamReader; import java.io.OutputStream; diff --git a/core/src/main/java/com/gmail/nossr50/core/worldguard/WorldGuardFlags.java b/core/src/main/java/com/gmail/nossr50/core/worldguard/WorldGuardFlags.java index f632a76f9..e51d2d87c 100644 --- a/core/src/main/java/com/gmail/nossr50/core/worldguard/WorldGuardFlags.java +++ b/core/src/main/java/com/gmail/nossr50/core/worldguard/WorldGuardFlags.java @@ -1,6 +1,5 @@ package com.gmail.nossr50.core.worldguard; -import com.sk89q.worldguard.protection.flags.StateFlag; public class WorldGuardFlags { // StateFlag with the name "my-custom-flag", which defaults to "allow" diff --git a/core/src/main/java/com/gmail/nossr50/core/worldguard/WorldGuardManager.java b/core/src/main/java/com/gmail/nossr50/core/worldguard/WorldGuardManager.java index 41d0de8ea..368a4bd97 100644 --- a/core/src/main/java/com/gmail/nossr50/core/worldguard/WorldGuardManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/worldguard/WorldGuardManager.java @@ -1,16 +1,6 @@ package com.gmail.nossr50.core.worldguard; -import com.sk89q.worldedit.bukkit.BukkitAdapter; -import com.sk89q.worldedit.bukkit.BukkitPlayer; -import com.sk89q.worldguard.WorldGuard; -import com.sk89q.worldguard.bukkit.WorldGuardPlugin; -import com.sk89q.worldguard.protection.flags.registry.FlagConflictException; -import com.sk89q.worldguard.protection.flags.registry.FlagRegistry; -import com.sk89q.worldguard.protection.regions.RegionContainer; -import com.sk89q.worldguard.protection.regions.RegionQuery; -import org.bukkit.Bukkit; -import org.bukkit.entity.Player; -import org.bukkit.plugin.Plugin; +import com.gmail.nossr50.core.mcmmo.entity.Player; public class WorldGuardManager { private static WorldGuardManager instance; diff --git a/core/src/main/java/com/gmail/nossr50/core/worldguard/WorldGuardUtils.java b/core/src/main/java/com/gmail/nossr50/core/worldguard/WorldGuardUtils.java index 6aae57a0f..64eaa88e6 100644 --- a/core/src/main/java/com/gmail/nossr50/core/worldguard/WorldGuardUtils.java +++ b/core/src/main/java/com/gmail/nossr50/core/worldguard/WorldGuardUtils.java @@ -1,10 +1,5 @@ package com.gmail.nossr50.core.worldguard; -import com.gmail.nossr50.mcMMO; -import com.sk89q.worldguard.bukkit.WorldGuardPlugin; -import org.bukkit.Bukkit; -import org.bukkit.plugin.Plugin; - public class WorldGuardUtils { private static WorldGuardPlugin worldGuardPluginRef; private static boolean isLoaded = false; diff --git a/core/src/main/java/net/shatteredlands/shatt/backup/ZipLibrary.java b/core/src/main/java/net/shatteredlands/shatt/backup/ZipLibrary.java index 89176332a..627e17bab 100644 --- a/core/src/main/java/net/shatteredlands/shatt/backup/ZipLibrary.java +++ b/core/src/main/java/net/shatteredlands/shatt/backup/ZipLibrary.java @@ -1,7 +1,6 @@ package net.shatteredlands.shatt.backup; import com.gmail.nossr50.core.config.MainConfig; -import com.gmail.nossr50.mcMMO; import java.io.File; import java.io.FileInputStream;