From 60b4472735801653b7270cb342f9296aa0e6d846 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Fri, 24 Mar 2017 13:05:58 +0100 Subject: [PATCH] Optimize Imports --- .../factions/FactionEqualsPredicate.java | 9 +++-- .../factions/FactionListComparator.java | 9 +++-- src/com/massivecraft/factions/Factions.java | 3 +- src/com/massivecraft/factions/Perm.java | 3 +- .../factions/PlayerInactivityComparator.java | 4 +-- .../factions/PlayerPowerComparator.java | 4 +-- .../factions/PlayerRoleComparator.java | 4 +-- src/com/massivecraft/factions/Rel.java | 9 +++-- .../factions/TerritoryAccess.java | 8 ++--- .../factions/adapter/BoardAdapter.java | 10 +++--- .../factions/adapter/BoardMapAdapter.java | 12 +++---- .../adapter/FactionPreprocessAdapter.java | 4 +-- .../factions/adapter/RelAdapter.java | 4 +-- .../adapter/TerritoryAccessAdapter.java | 6 ++-- .../factions/chat/ChatFormatter.java | 4 +-- .../factions/chat/ChatModifier.java | 5 ++- .../massivecraft/factions/chat/ChatTag.java | 5 ++- .../chat/modifier/ChatModifierLc.java | 3 +- .../chat/modifier/ChatModifierLp.java | 3 +- .../chat/modifier/ChatModifierParse.java | 3 +- .../chat/modifier/ChatModifierRp.java | 3 +- .../chat/modifier/ChatModifierUc.java | 3 +- .../chat/modifier/ChatModifierUcf.java | 3 +- .../factions/chat/tag/ChatTagName.java | 3 +- .../factions/chat/tag/ChatTagNameforce.java | 3 +- .../factions/chat/tag/ChatTagRelcolor.java | 3 +- .../factions/chat/tag/ChatTagRole.java | 3 +- .../factions/chat/tag/ChatTagRoleprefix.java | 3 +- .../chat/tag/ChatTagRoleprefixforce.java | 3 +- .../factions/chat/tag/ChatTagTitle.java | 3 +- .../factions/cmd/CmdFactions.java | 4 +-- .../cmd/CmdFactionsAccessAbstract.java | 8 ++--- .../factions/cmd/CmdFactionsCreate.java | 7 ++-- .../factions/cmd/CmdFactionsExpansions.java | 4 +-- .../factions/cmd/CmdFactionsFaction.java | 9 +++-- .../factions/cmd/CmdFactionsFlagList.java | 7 ++-- .../factions/cmd/CmdFactionsFlagShow.java | 4 +-- .../factions/cmd/CmdFactionsHome.java | 7 ++-- .../factions/cmd/CmdFactionsInviteAdd.java | 7 ++-- .../factions/cmd/CmdFactionsInviteList.java | 4 +-- .../factions/cmd/CmdFactionsInviteRemove.java | 13 ++++---- .../factions/cmd/CmdFactionsJoin.java | 3 +- .../factions/cmd/CmdFactionsKick.java | 3 +- .../factions/cmd/CmdFactionsList.java | 9 +++-- .../factions/cmd/CmdFactionsMap.java | 7 ++-- .../factions/cmd/CmdFactionsMoneyDeposit.java | 3 +- .../cmd/CmdFactionsMoneyTransferFf.java | 3 +- .../cmd/CmdFactionsMoneyTransferFp.java | 3 +- .../cmd/CmdFactionsMoneyTransferPf.java | 3 +- .../cmd/CmdFactionsMoneyWithdraw.java | 3 +- .../factions/cmd/CmdFactionsName.java | 4 +-- .../factions/cmd/CmdFactionsPermList.java | 6 ++-- .../factions/cmd/CmdFactionsPermSet.java | 6 ++-- .../factions/cmd/CmdFactionsPermShow.java | 8 ++--- .../factions/cmd/CmdFactionsPlayer.java | 6 ++-- .../factions/cmd/CmdFactionsRank.java | 6 ++-- .../factions/cmd/CmdFactionsRelationList.java | 11 +++---- .../factions/cmd/CmdFactionsRelationSet.java | 3 +- .../cmd/CmdFactionsRelationWishes.java | 9 +++-- .../factions/cmd/CmdFactionsSeeChunkOld.java | 9 +++-- .../factions/cmd/CmdFactionsSetAll.java | 8 ++--- .../factions/cmd/CmdFactionsSetAuto.java | 6 ++-- .../factions/cmd/CmdFactionsSetCircle.java | 6 ++-- .../factions/cmd/CmdFactionsSetFill.java | 6 ++-- .../factions/cmd/CmdFactionsSetOne.java | 6 ++-- .../factions/cmd/CmdFactionsSetSquare.java | 6 ++-- .../factions/cmd/CmdFactionsSetX.java | 4 +-- .../factions/cmd/CmdFactionsStatus.java | 10 +++--- .../factions/cmd/CmdFactionsTitle.java | 3 +- .../factions/cmd/CmdFactionsUnstuck.java | 11 +++---- .../cmd/req/ReqBankCommandsEnabled.java | 3 +- .../cmd/req/ReqFactionHomesEnabled.java | 3 +- .../factions/cmd/req/ReqHasFaction.java | 3 +- .../factions/cmd/req/ReqHasntFaction.java | 3 +- .../factions/cmd/req/ReqRoleIsAtLeast.java | 3 +- .../factions/cmd/type/TypeFaction.java | 13 ++++---- .../factions/cmd/type/TypeMFlag.java | 4 +-- .../factions/cmd/type/TypeMPerm.java | 4 +-- .../factions/cmd/type/TypeRank.java | 12 +++---- .../factions/cmd/type/TypeRel.java | 4 +-- .../factions/cmd/type/TypeSortMPlayer.java | 4 +-- .../engine/EngineCanCombatHappen.java | 23 +++++++------ .../factions/engine/EngineChat.java | 13 ++++---- .../factions/engine/EngineChunkChange.java | 17 +++++----- .../factions/engine/EngineEcon.java | 19 +++++------ .../factions/engine/EngineFlagEndergrief.java | 11 +++---- .../factions/engine/EngineFlagExplosion.java | 21 ++++++------ .../factions/engine/EngineFlagFireSpread.java | 11 +++---- .../factions/engine/EngineFlagSpawn.java | 17 +++++----- .../engine/EngineFlagZombiegrief.java | 11 +++---- .../factions/engine/EngineLastActivity.java | 11 +++---- .../factions/engine/EngineMoveChunk.java | 15 ++++----- .../factions/engine/EnginePermBuild.java | 29 ++++++++-------- .../factions/engine/EnginePlayerData.java | 9 +++-- .../factions/engine/EnginePower.java | 9 +++-- .../factions/engine/EngineSeeChunk.java | 20 +++++------ .../engine/EngineTeleportHomeOnDeath.java | 11 +++---- .../engine/EngineTerritoryShield.java | 11 +++---- .../factions/engine/EngineVisualizations.java | 7 ++-- .../massivecraft/factions/entity/Board.java | 22 ++++++------- .../factions/entity/BoardColl.java | 16 ++++----- .../factions/entity/BoardInterface.java | 8 ++--- .../massivecraft/factions/entity/Faction.java | 33 +++++++++---------- .../factions/entity/FactionColl.java | 14 ++++---- .../massivecraft/factions/entity/MConf.java | 23 +++++++------ .../massivecraft/factions/entity/MFlag.java | 7 ++-- .../factions/entity/MFlagColl.java | 4 +-- .../massivecraft/factions/entity/MPerm.java | 13 ++++---- .../factions/entity/MPermColl.java | 4 +-- .../massivecraft/factions/entity/MPlayer.java | 19 +++++------ .../factions/entity/MPlayerColl.java | 9 +++-- .../event/EventFactionsAbstractSender.java | 3 +- .../event/EventFactionsChunkChangeType.java | 3 +- .../event/EventFactionsChunksChange.java | 17 +++++----- .../event/EventFactionsDescriptionChange.java | 3 +- .../factions/event/EventFactionsDisband.java | 3 +- .../event/EventFactionsExpansions.java | 9 +++-- .../event/EventFactionsFactionShowAsync.java | 11 +++---- .../event/EventFactionsFlagChange.java | 5 ++- .../event/EventFactionsHomeChange.java | 5 ++- .../event/EventFactionsInvitedChange.java | 5 ++- .../event/EventFactionsMembershipChange.java | 5 ++- .../event/EventFactionsMotdChange.java | 3 +- .../event/EventFactionsNameChange.java | 3 +- .../event/EventFactionsPermChange.java | 5 ++- .../event/EventFactionsPowerChange.java | 3 +- .../event/EventFactionsPvpDisallowed.java | 7 ++-- .../event/EventFactionsRankChange.java | 5 ++- .../event/EventFactionsRelationChange.java | 5 ++- .../EventFactionsRemovePlayerMillis.java | 11 +++---- .../event/EventFactionsTitleChange.java | 3 +- .../factions/integration/Econ.java | 8 ++--- .../factions/integration/V19/EngineV19.java | 15 ++++----- .../herochat/ChannelFactionsAbstract.java | 28 ++++++++-------- .../herochat/ChannelFactionsAllies.java | 9 +++-- .../herochat/ChannelFactionsFaction.java | 9 +++-- .../integration/herochat/EngineHerochat.java | 4 +-- .../factions/integration/lwc/EngineLwc.java | 19 +++++------ .../integration/spigot/PredicateSpigot.java | 3 +- .../factions/task/TaskPlayerPowerUpdate.java | 3 +- .../massivecraft/factions/update/OldConf.java | 9 +++-- .../factions/update/UpdateUtil.java | 12 +++---- .../factions/util/AsciiCompass.java | 14 ++++++-- .../massivecraft/factions/util/MiscUtil.java | 4 +-- .../factions/util/RelationUtil.java | 7 ++-- .../factions/util/VisualizeUtil.java | 8 ++--- 146 files changed, 527 insertions(+), 619 deletions(-) diff --git a/src/com/massivecraft/factions/FactionEqualsPredicate.java b/src/com/massivecraft/factions/FactionEqualsPredicate.java index 29c60d4d..36c71cfb 100644 --- a/src/com/massivecraft/factions/FactionEqualsPredicate.java +++ b/src/com/massivecraft/factions/FactionEqualsPredicate.java @@ -1,13 +1,12 @@ package com.massivecraft.factions; -import java.io.Serializable; - -import org.bukkit.command.CommandSender; - -import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.factions.entity.Faction; +import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.massivecore.predicate.Predicate; import com.massivecraft.massivecore.util.MUtil; +import org.bukkit.command.CommandSender; + +import java.io.Serializable; public class FactionEqualsPredicate implements Predicate, Serializable { diff --git a/src/com/massivecraft/factions/FactionListComparator.java b/src/com/massivecraft/factions/FactionListComparator.java index 096cbd13..0d903f59 100644 --- a/src/com/massivecraft/factions/FactionListComparator.java +++ b/src/com/massivecraft/factions/FactionListComparator.java @@ -1,13 +1,12 @@ package com.massivecraft.factions; -import java.lang.ref.WeakReference; -import java.util.Comparator; - -import org.bukkit.command.CommandSender; - import com.massivecraft.factions.entity.Faction; import com.massivecraft.massivecore.comparator.ComparatorComparable; import com.massivecraft.massivecore.util.IdUtil; +import org.bukkit.command.CommandSender; + +import java.lang.ref.WeakReference; +import java.util.Comparator; public class FactionListComparator implements Comparator { diff --git a/src/com/massivecraft/factions/Factions.java b/src/com/massivecraft/factions/Factions.java index f84c1581..e4ba5521 100644 --- a/src/com/massivecraft/factions/Factions.java +++ b/src/com/massivecraft/factions/Factions.java @@ -1,7 +1,5 @@ package com.massivecraft.factions; -import org.bukkit.ChatColor; - import com.massivecraft.factions.adapter.BoardAdapter; import com.massivecraft.factions.adapter.BoardMapAdapter; import com.massivecraft.factions.adapter.FactionPreprocessAdapter; @@ -73,6 +71,7 @@ import com.massivecraft.massivecore.command.type.RegistryType; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.xlib.gson.Gson; import com.massivecraft.massivecore.xlib.gson.GsonBuilder; +import org.bukkit.ChatColor; public class Factions extends MassivePlugin { diff --git a/src/com/massivecraft/factions/Perm.java b/src/com/massivecraft/factions/Perm.java index 372aca93..7bd45e67 100644 --- a/src/com/massivecraft/factions/Perm.java +++ b/src/com/massivecraft/factions/Perm.java @@ -1,9 +1,8 @@ package com.massivecraft.factions; -import org.bukkit.permissions.Permissible; - import com.massivecraft.massivecore.Identified; import com.massivecraft.massivecore.util.PermissionUtil; +import org.bukkit.permissions.Permissible; public enum Perm implements Identified { diff --git a/src/com/massivecraft/factions/PlayerInactivityComparator.java b/src/com/massivecraft/factions/PlayerInactivityComparator.java index f273c8c7..beace4ee 100644 --- a/src/com/massivecraft/factions/PlayerInactivityComparator.java +++ b/src/com/massivecraft/factions/PlayerInactivityComparator.java @@ -1,10 +1,10 @@ package com.massivecraft.factions; -import java.util.Comparator; - import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.massivecore.Named; +import java.util.Comparator; + public class PlayerInactivityComparator implements Comparator, Named { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/PlayerPowerComparator.java b/src/com/massivecraft/factions/PlayerPowerComparator.java index 1b512bd0..fd1e2242 100644 --- a/src/com/massivecraft/factions/PlayerPowerComparator.java +++ b/src/com/massivecraft/factions/PlayerPowerComparator.java @@ -1,10 +1,10 @@ package com.massivecraft.factions; -import java.util.Comparator; - import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.massivecore.Named; +import java.util.Comparator; + public class PlayerPowerComparator implements Comparator, Named { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/PlayerRoleComparator.java b/src/com/massivecraft/factions/PlayerRoleComparator.java index d04ef2bc..43a84073 100644 --- a/src/com/massivecraft/factions/PlayerRoleComparator.java +++ b/src/com/massivecraft/factions/PlayerRoleComparator.java @@ -1,10 +1,10 @@ package com.massivecraft.factions; -import java.util.Comparator; - import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.massivecore.Named; +import java.util.Comparator; + public class PlayerRoleComparator implements Comparator, Named { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/Rel.java b/src/com/massivecraft/factions/Rel.java index 6a16ade9..8572dc03 100644 --- a/src/com/massivecraft/factions/Rel.java +++ b/src/com/massivecraft/factions/Rel.java @@ -1,14 +1,13 @@ package com.massivecraft.factions; -import java.util.Collections; -import java.util.Set; - -import org.bukkit.ChatColor; - import com.massivecraft.factions.entity.MConf; import com.massivecraft.massivecore.Colorized; import com.massivecraft.massivecore.Named; import com.massivecraft.massivecore.collections.MassiveSet; +import org.bukkit.ChatColor; + +import java.util.Collections; +import java.util.Set; public enum Rel implements Colorized, Named { diff --git a/src/com/massivecraft/factions/TerritoryAccess.java b/src/com/massivecraft/factions/TerritoryAccess.java index fdb3a8a8..cdb35c33 100644 --- a/src/com/massivecraft/factions/TerritoryAccess.java +++ b/src/com/massivecraft/factions/TerritoryAccess.java @@ -1,5 +1,9 @@ package com.massivecraft.factions; +import com.massivecraft.factions.entity.Faction; +import com.massivecraft.factions.entity.FactionColl; +import com.massivecraft.factions.entity.MPlayer; + import java.util.Collection; import java.util.Collections; import java.util.HashSet; @@ -7,10 +11,6 @@ import java.util.LinkedHashSet; import java.util.Set; import java.util.TreeSet; -import com.massivecraft.factions.entity.FactionColl; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.entity.Faction; - public class TerritoryAccess { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/adapter/BoardAdapter.java b/src/com/massivecraft/factions/adapter/BoardAdapter.java index 63d5d611..f232384b 100644 --- a/src/com/massivecraft/factions/adapter/BoardAdapter.java +++ b/src/com/massivecraft/factions/adapter/BoardAdapter.java @@ -1,8 +1,7 @@ package com.massivecraft.factions.adapter; -import java.lang.reflect.Type; -import java.util.Map; - +import com.massivecraft.factions.TerritoryAccess; +import com.massivecraft.factions.entity.Board; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; @@ -10,8 +9,9 @@ import com.massivecraft.massivecore.xlib.gson.JsonElement; import com.massivecraft.massivecore.xlib.gson.JsonParseException; import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext; import com.massivecraft.massivecore.xlib.gson.JsonSerializer; -import com.massivecraft.factions.TerritoryAccess; -import com.massivecraft.factions.entity.Board; + +import java.lang.reflect.Type; +import java.util.Map; public class BoardAdapter implements JsonDeserializer, JsonSerializer { diff --git a/src/com/massivecraft/factions/adapter/BoardMapAdapter.java b/src/com/massivecraft/factions/adapter/BoardMapAdapter.java index cb003a17..e016d72a 100644 --- a/src/com/massivecraft/factions/adapter/BoardMapAdapter.java +++ b/src/com/massivecraft/factions/adapter/BoardMapAdapter.java @@ -1,10 +1,6 @@ package com.massivecraft.factions.adapter; -import java.lang.reflect.Type; -import java.util.Map; -import java.util.Map.Entry; -import java.util.concurrent.ConcurrentSkipListMap; - +import com.massivecraft.factions.TerritoryAccess; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; @@ -13,7 +9,11 @@ import com.massivecraft.massivecore.xlib.gson.JsonObject; import com.massivecraft.massivecore.xlib.gson.JsonParseException; import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext; import com.massivecraft.massivecore.xlib.gson.JsonSerializer; -import com.massivecraft.factions.TerritoryAccess; + +import java.lang.reflect.Type; +import java.util.Map; +import java.util.Map.Entry; +import java.util.concurrent.ConcurrentSkipListMap; public class BoardMapAdapter implements JsonDeserializer>, JsonSerializer> { diff --git a/src/com/massivecraft/factions/adapter/FactionPreprocessAdapter.java b/src/com/massivecraft/factions/adapter/FactionPreprocessAdapter.java index 82d613f8..e8db19e3 100644 --- a/src/com/massivecraft/factions/adapter/FactionPreprocessAdapter.java +++ b/src/com/massivecraft/factions/adapter/FactionPreprocessAdapter.java @@ -1,7 +1,5 @@ package com.massivecraft.factions.adapter; -import java.lang.reflect.Type; - import com.massivecraft.factions.Factions; import com.massivecraft.factions.entity.Faction; import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; @@ -10,6 +8,8 @@ import com.massivecraft.massivecore.xlib.gson.JsonElement; import com.massivecraft.massivecore.xlib.gson.JsonObject; import com.massivecraft.massivecore.xlib.gson.JsonParseException; +import java.lang.reflect.Type; + public class FactionPreprocessAdapter implements JsonDeserializer { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/adapter/RelAdapter.java b/src/com/massivecraft/factions/adapter/RelAdapter.java index 7c69edc2..c817ebad 100644 --- a/src/com/massivecraft/factions/adapter/RelAdapter.java +++ b/src/com/massivecraft/factions/adapter/RelAdapter.java @@ -1,7 +1,5 @@ package com.massivecraft.factions.adapter; -import java.lang.reflect.Type; - import com.massivecraft.factions.Rel; import com.massivecraft.factions.cmd.type.TypeRel; import com.massivecraft.massivecore.MassiveException; @@ -10,6 +8,8 @@ import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; import com.massivecraft.massivecore.xlib.gson.JsonElement; import com.massivecraft.massivecore.xlib.gson.JsonParseException; +import java.lang.reflect.Type; + public class RelAdapter implements JsonDeserializer { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java b/src/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java index 2326e307..ba4aca2c 100644 --- a/src/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java +++ b/src/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java @@ -1,8 +1,5 @@ package com.massivecraft.factions.adapter; -import java.lang.reflect.Type; -import java.util.Set; - import com.massivecraft.factions.TerritoryAccess; import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext; import com.massivecraft.massivecore.xlib.gson.JsonDeserializer; @@ -14,6 +11,9 @@ import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext; import com.massivecraft.massivecore.xlib.gson.JsonSerializer; import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; +import java.lang.reflect.Type; +import java.util.Set; + public class TerritoryAccessAdapter implements JsonDeserializer, JsonSerializer { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/chat/ChatFormatter.java b/src/com/massivecraft/factions/chat/ChatFormatter.java index c3869ba5..f033fa3c 100644 --- a/src/com/massivecraft/factions/chat/ChatFormatter.java +++ b/src/com/massivecraft/factions/chat/ChatFormatter.java @@ -1,13 +1,13 @@ package com.massivecraft.factions.chat; +import org.bukkit.command.CommandSender; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.bukkit.command.CommandSender; - /** * The ChatFormater is a system offered by factions for tag parsing. * diff --git a/src/com/massivecraft/factions/chat/ChatModifier.java b/src/com/massivecraft/factions/chat/ChatModifier.java index 9e10bad3..56eabd0e 100644 --- a/src/com/massivecraft/factions/chat/ChatModifier.java +++ b/src/com/massivecraft/factions/chat/ChatModifier.java @@ -1,10 +1,9 @@ package com.massivecraft.factions.chat; -import java.util.Map; - +import com.massivecraft.massivecore.collections.MassiveMap; import org.bukkit.command.CommandSender; -import com.massivecraft.massivecore.collections.MassiveMap; +import java.util.Map; public abstract class ChatModifier extends ChatActive { diff --git a/src/com/massivecraft/factions/chat/ChatTag.java b/src/com/massivecraft/factions/chat/ChatTag.java index 4bdfe873..273d09e2 100644 --- a/src/com/massivecraft/factions/chat/ChatTag.java +++ b/src/com/massivecraft/factions/chat/ChatTag.java @@ -1,10 +1,9 @@ package com.massivecraft.factions.chat; -import java.util.Map; - +import com.massivecraft.massivecore.collections.MassiveMap; import org.bukkit.command.CommandSender; -import com.massivecraft.massivecore.collections.MassiveMap; +import java.util.Map; public abstract class ChatTag extends ChatActive { diff --git a/src/com/massivecraft/factions/chat/modifier/ChatModifierLc.java b/src/com/massivecraft/factions/chat/modifier/ChatModifierLc.java index 74804e77..20585fc4 100644 --- a/src/com/massivecraft/factions/chat/modifier/ChatModifierLc.java +++ b/src/com/massivecraft/factions/chat/modifier/ChatModifierLc.java @@ -1,8 +1,7 @@ package com.massivecraft.factions.chat.modifier; -import org.bukkit.command.CommandSender; - import com.massivecraft.factions.chat.ChatModifier; +import org.bukkit.command.CommandSender; public class ChatModifierLc extends ChatModifier { diff --git a/src/com/massivecraft/factions/chat/modifier/ChatModifierLp.java b/src/com/massivecraft/factions/chat/modifier/ChatModifierLp.java index 6d105714..f02924a4 100644 --- a/src/com/massivecraft/factions/chat/modifier/ChatModifierLp.java +++ b/src/com/massivecraft/factions/chat/modifier/ChatModifierLp.java @@ -1,8 +1,7 @@ package com.massivecraft.factions.chat.modifier; -import org.bukkit.command.CommandSender; - import com.massivecraft.factions.chat.ChatModifier; +import org.bukkit.command.CommandSender; public class ChatModifierLp extends ChatModifier diff --git a/src/com/massivecraft/factions/chat/modifier/ChatModifierParse.java b/src/com/massivecraft/factions/chat/modifier/ChatModifierParse.java index 6c896bdc..b2e3e6c8 100644 --- a/src/com/massivecraft/factions/chat/modifier/ChatModifierParse.java +++ b/src/com/massivecraft/factions/chat/modifier/ChatModifierParse.java @@ -1,9 +1,8 @@ package com.massivecraft.factions.chat.modifier; -import org.bukkit.command.CommandSender; - import com.massivecraft.factions.chat.ChatModifier; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.command.CommandSender; public class ChatModifierParse extends ChatModifier { diff --git a/src/com/massivecraft/factions/chat/modifier/ChatModifierRp.java b/src/com/massivecraft/factions/chat/modifier/ChatModifierRp.java index 5038f3ca..8f7c0893 100644 --- a/src/com/massivecraft/factions/chat/modifier/ChatModifierRp.java +++ b/src/com/massivecraft/factions/chat/modifier/ChatModifierRp.java @@ -1,8 +1,7 @@ package com.massivecraft.factions.chat.modifier; -import org.bukkit.command.CommandSender; - import com.massivecraft.factions.chat.ChatModifier; +import org.bukkit.command.CommandSender; public class ChatModifierRp extends ChatModifier { diff --git a/src/com/massivecraft/factions/chat/modifier/ChatModifierUc.java b/src/com/massivecraft/factions/chat/modifier/ChatModifierUc.java index c482ea79..03271c7d 100644 --- a/src/com/massivecraft/factions/chat/modifier/ChatModifierUc.java +++ b/src/com/massivecraft/factions/chat/modifier/ChatModifierUc.java @@ -1,8 +1,7 @@ package com.massivecraft.factions.chat.modifier; -import org.bukkit.command.CommandSender; - import com.massivecraft.factions.chat.ChatModifier; +import org.bukkit.command.CommandSender; public class ChatModifierUc extends ChatModifier { diff --git a/src/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java b/src/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java index 82a0f001..fb8b73d3 100644 --- a/src/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java +++ b/src/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java @@ -1,9 +1,8 @@ package com.massivecraft.factions.chat.modifier; -import org.bukkit.command.CommandSender; - import com.massivecraft.factions.chat.ChatModifier; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.command.CommandSender; public class ChatModifierUcf extends ChatModifier { diff --git a/src/com/massivecraft/factions/chat/tag/ChatTagName.java b/src/com/massivecraft/factions/chat/tag/ChatTagName.java index 0adc2350..2ee6fc2e 100644 --- a/src/com/massivecraft/factions/chat/tag/ChatTagName.java +++ b/src/com/massivecraft/factions/chat/tag/ChatTagName.java @@ -1,10 +1,9 @@ package com.massivecraft.factions.chat.tag; -import org.bukkit.command.CommandSender; - import com.massivecraft.factions.chat.ChatTag; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MPlayer; +import org.bukkit.command.CommandSender; public class ChatTagName extends ChatTag { diff --git a/src/com/massivecraft/factions/chat/tag/ChatTagNameforce.java b/src/com/massivecraft/factions/chat/tag/ChatTagNameforce.java index 708c5370..7dc264f5 100644 --- a/src/com/massivecraft/factions/chat/tag/ChatTagNameforce.java +++ b/src/com/massivecraft/factions/chat/tag/ChatTagNameforce.java @@ -1,10 +1,9 @@ package com.massivecraft.factions.chat.tag; -import org.bukkit.command.CommandSender; - import com.massivecraft.factions.chat.ChatTag; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MPlayer; +import org.bukkit.command.CommandSender; public class ChatTagNameforce extends ChatTag { diff --git a/src/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java b/src/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java index 50b2024b..eb17367f 100644 --- a/src/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java +++ b/src/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java @@ -1,9 +1,8 @@ package com.massivecraft.factions.chat.tag; -import org.bukkit.command.CommandSender; - import com.massivecraft.factions.chat.ChatTag; import com.massivecraft.factions.entity.MPlayer; +import org.bukkit.command.CommandSender; public class ChatTagRelcolor extends ChatTag { diff --git a/src/com/massivecraft/factions/chat/tag/ChatTagRole.java b/src/com/massivecraft/factions/chat/tag/ChatTagRole.java index 290c5cf2..4b2f3df9 100644 --- a/src/com/massivecraft/factions/chat/tag/ChatTagRole.java +++ b/src/com/massivecraft/factions/chat/tag/ChatTagRole.java @@ -1,10 +1,9 @@ package com.massivecraft.factions.chat.tag; -import org.bukkit.command.CommandSender; - import com.massivecraft.factions.chat.ChatTag; import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.command.CommandSender; public class ChatTagRole extends ChatTag { diff --git a/src/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java b/src/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java index ae761997..da491d92 100644 --- a/src/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java +++ b/src/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java @@ -1,10 +1,9 @@ package com.massivecraft.factions.chat.tag; -import org.bukkit.command.CommandSender; - import com.massivecraft.factions.chat.ChatTag; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MPlayer; +import org.bukkit.command.CommandSender; public class ChatTagRoleprefix extends ChatTag { diff --git a/src/com/massivecraft/factions/chat/tag/ChatTagRoleprefixforce.java b/src/com/massivecraft/factions/chat/tag/ChatTagRoleprefixforce.java index 59c9cf0c..f54c407e 100644 --- a/src/com/massivecraft/factions/chat/tag/ChatTagRoleprefixforce.java +++ b/src/com/massivecraft/factions/chat/tag/ChatTagRoleprefixforce.java @@ -1,9 +1,8 @@ package com.massivecraft.factions.chat.tag; -import org.bukkit.command.CommandSender; - import com.massivecraft.factions.chat.ChatTag; import com.massivecraft.factions.entity.MPlayer; +import org.bukkit.command.CommandSender; public class ChatTagRoleprefixforce extends ChatTag { diff --git a/src/com/massivecraft/factions/chat/tag/ChatTagTitle.java b/src/com/massivecraft/factions/chat/tag/ChatTagTitle.java index b6eede37..32f8e15f 100644 --- a/src/com/massivecraft/factions/chat/tag/ChatTagTitle.java +++ b/src/com/massivecraft/factions/chat/tag/ChatTagTitle.java @@ -1,9 +1,8 @@ package com.massivecraft.factions.chat.tag; -import org.bukkit.command.CommandSender; - import com.massivecraft.factions.chat.ChatTag; import com.massivecraft.factions.entity.MPlayer; +import org.bukkit.command.CommandSender; public class ChatTagTitle extends ChatTag { diff --git a/src/com/massivecraft/factions/cmd/CmdFactions.java b/src/com/massivecraft/factions/cmd/CmdFactions.java index 4661244a..ce5d7c51 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactions.java +++ b/src/com/massivecraft/factions/cmd/CmdFactions.java @@ -1,7 +1,5 @@ package com.massivecraft.factions.cmd; -import java.util.List; - import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; import com.massivecraft.factions.entity.MConf; @@ -9,6 +7,8 @@ import com.massivecraft.massivecore.command.MassiveCommandDeprecated; import com.massivecraft.massivecore.command.MassiveCommandVersion; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; +import java.util.List; + public class CmdFactions extends FactionsCommand { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java b/src/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java index c2ad4559..9280dc28 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java @@ -1,9 +1,5 @@ package com.massivecraft.factions.cmd; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - import com.massivecraft.factions.RelationParticipator; import com.massivecraft.factions.TerritoryAccess; import com.massivecraft.factions.entity.BoardColl; @@ -14,6 +10,10 @@ import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.ps.PSFormatHumanSpace; import com.massivecraft.massivecore.util.Txt; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + public abstract class CmdFactionsAccessAbstract extends FactionsCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsCreate.java b/src/com/massivecraft/factions/cmd/CmdFactionsCreate.java index 7508a8c5..f31ff844 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsCreate.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsCreate.java @@ -1,9 +1,5 @@ package com.massivecraft.factions.cmd; -import java.util.ArrayList; - -import org.bukkit.ChatColor; - import com.massivecraft.factions.Factions; import com.massivecraft.factions.Rel; import com.massivecraft.factions.cmd.req.ReqHasntFaction; @@ -17,6 +13,9 @@ import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeString; import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.store.MStore; +import org.bukkit.ChatColor; + +import java.util.ArrayList; public class CmdFactionsCreate extends FactionsCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsExpansions.java b/src/com/massivecraft/factions/cmd/CmdFactionsExpansions.java index c38bb960..879264d8 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsExpansions.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsExpansions.java @@ -1,10 +1,10 @@ package com.massivecraft.factions.cmd; -import java.util.Map.Entry; - import com.massivecraft.factions.event.EventFactionsExpansions; import com.massivecraft.massivecore.util.Txt; +import java.util.Map.Entry; + public class CmdFactionsExpansions extends FactionsCommand { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsFaction.java b/src/com/massivecraft/factions/cmd/CmdFactionsFaction.java index 9680918f..83fd9879 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsFaction.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsFaction.java @@ -1,10 +1,5 @@ package com.massivecraft.factions.cmd; -import java.util.TreeSet; - -import org.bukkit.Bukkit; -import org.bukkit.command.CommandSender; - import com.massivecraft.factions.Factions; import com.massivecraft.factions.cmd.type.TypeFaction; import com.massivecraft.factions.entity.Faction; @@ -13,6 +8,10 @@ import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.PriorityLines; import com.massivecraft.massivecore.mixin.MixinMessage; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.Bukkit; +import org.bukkit.command.CommandSender; + +import java.util.TreeSet; public class CmdFactionsFaction extends FactionsCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsFlagList.java b/src/com/massivecraft/factions/cmd/CmdFactionsFlagList.java index ec8003e4..68a668e5 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsFlagList.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsFlagList.java @@ -1,9 +1,5 @@ package com.massivecraft.factions.cmd; -import java.util.List; - -import org.bukkit.Bukkit; - import com.massivecraft.factions.Factions; import com.massivecraft.factions.entity.MFlag; import com.massivecraft.factions.entity.MFlagColl; @@ -12,6 +8,9 @@ import com.massivecraft.massivecore.command.Parameter; import com.massivecraft.massivecore.pager.Pager; import com.massivecraft.massivecore.pager.Stringifier; import com.massivecraft.massivecore.predicate.Predicate; +import org.bukkit.Bukkit; + +import java.util.List; public class CmdFactionsFlagList extends FactionsCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsFlagShow.java b/src/com/massivecraft/factions/cmd/CmdFactionsFlagShow.java index 44490fd8..cd077b66 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsFlagShow.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsFlagShow.java @@ -1,7 +1,5 @@ package com.massivecraft.factions.cmd; -import java.util.List; - import com.massivecraft.factions.cmd.type.TypeFaction; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MFlag; @@ -11,6 +9,8 @@ import com.massivecraft.massivecore.command.Parameter; import com.massivecraft.massivecore.pager.Pager; import com.massivecraft.massivecore.pager.Stringifier; +import java.util.List; + public class CmdFactionsFlagShow extends FactionsCommand { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsHome.java b/src/com/massivecraft/factions/cmd/CmdFactionsHome.java index 71d78e8e..a3532490 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsHome.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsHome.java @@ -1,9 +1,5 @@ package com.massivecraft.factions.cmd; -import org.bukkit.Location; -import org.bukkit.World; -import org.bukkit.entity.Player; - import com.massivecraft.factions.Rel; import com.massivecraft.factions.cmd.type.TypeFaction; import com.massivecraft.factions.entity.BoardColl; @@ -21,6 +17,9 @@ import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.teleport.Destination; import com.massivecraft.massivecore.teleport.DestinationSimple; import com.massivecraft.massivecore.util.MUtil; +import org.bukkit.Location; +import org.bukkit.World; +import org.bukkit.entity.Player; public class CmdFactionsHome extends FactionsCommandHome { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsInviteAdd.java b/src/com/massivecraft/factions/cmd/CmdFactionsInviteAdd.java index 2666ff6c..f944785f 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsInviteAdd.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsInviteAdd.java @@ -1,9 +1,5 @@ package com.massivecraft.factions.cmd; -import java.util.Collection; - -import org.bukkit.ChatColor; - import com.massivecraft.factions.cmd.type.TypeMPlayer; import com.massivecraft.factions.entity.MPerm; import com.massivecraft.factions.entity.MPlayer; @@ -12,6 +8,9 @@ import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.container.TypeSet; import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.ChatColor; + +import java.util.Collection; public class CmdFactionsInviteAdd extends FactionsCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsInviteList.java b/src/com/massivecraft/factions/cmd/CmdFactionsInviteList.java index 03850ade..892ff008 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsInviteList.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsInviteList.java @@ -1,7 +1,5 @@ package com.massivecraft.factions.cmd; -import java.util.List; - import com.massivecraft.factions.Perm; import com.massivecraft.factions.Rel; import com.massivecraft.factions.cmd.type.TypeFaction; @@ -14,6 +12,8 @@ import com.massivecraft.massivecore.pager.Pager; import com.massivecraft.massivecore.pager.Stringifier; import com.massivecraft.massivecore.util.Txt; +import java.util.List; + public class CmdFactionsInviteList extends FactionsCommand { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java b/src/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java index ec1096c6..9eb743f3 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java @@ -1,12 +1,5 @@ package com.massivecraft.factions.cmd; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.bukkit.ChatColor; - import com.massivecraft.factions.cmd.type.TypeMPlayer; import com.massivecraft.factions.entity.MPerm; import com.massivecraft.factions.entity.MPlayer; @@ -15,6 +8,12 @@ import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.container.TypeSet; import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.ChatColor; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; public class CmdFactionsInviteRemove extends FactionsCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java b/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java index f7f5b8d2..6f8152ed 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java @@ -1,7 +1,5 @@ package com.massivecraft.factions.cmd; -import org.bukkit.ChatColor; - import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; import com.massivecraft.factions.cmd.type.TypeFaction; @@ -15,6 +13,7 @@ import com.massivecraft.factions.event.EventFactionsMembershipChange.MembershipC import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.ChatColor; public class CmdFactionsJoin extends FactionsCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsKick.java b/src/com/massivecraft/factions/cmd/CmdFactionsKick.java index 9b06b1c6..c1e22716 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsKick.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsKick.java @@ -1,7 +1,5 @@ package com.massivecraft.factions.cmd; -import org.bukkit.ChatColor; - import com.massivecraft.factions.Factions; import com.massivecraft.factions.Rel; import com.massivecraft.factions.cmd.type.TypeMPlayer; @@ -14,6 +12,7 @@ import com.massivecraft.factions.event.EventFactionsMembershipChange; import com.massivecraft.factions.event.EventFactionsMembershipChange.MembershipChangeReason; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.util.IdUtil; +import org.bukkit.ChatColor; public class CmdFactionsKick extends FactionsCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsList.java b/src/com/massivecraft/factions/cmd/CmdFactionsList.java index 9f571e36..5407e654 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsList.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsList.java @@ -1,10 +1,5 @@ package com.massivecraft.factions.cmd; -import java.util.List; - -import org.bukkit.Bukkit; -import org.bukkit.command.CommandSender; - import com.massivecraft.factions.FactionListComparator; import com.massivecraft.factions.Factions; import com.massivecraft.factions.entity.Faction; @@ -15,6 +10,10 @@ import com.massivecraft.massivecore.command.Parameter; import com.massivecraft.massivecore.pager.Pager; import com.massivecraft.massivecore.pager.Stringifier; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.Bukkit; +import org.bukkit.command.CommandSender; + +import java.util.List; public class CmdFactionsList extends FactionsCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMap.java b/src/com/massivecraft/factions/cmd/CmdFactionsMap.java index f0fbd456..928c4717 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMap.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMap.java @@ -1,15 +1,14 @@ package com.massivecraft.factions.cmd; -import java.util.List; - -import org.bukkit.Location; - import com.massivecraft.factions.Const; import com.massivecraft.factions.entity.BoardColl; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; import com.massivecraft.massivecore.command.type.primitive.TypeBooleanYes; import com.massivecraft.massivecore.ps.PS; +import org.bukkit.Location; + +import java.util.List; public class CmdFactionsMap extends FactionsCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java index 23507086..c6de3e6d 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java @@ -1,7 +1,5 @@ package com.massivecraft.factions.cmd; -import org.bukkit.ChatColor; - import com.massivecraft.factions.Factions; import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled; import com.massivecraft.factions.cmd.type.TypeFaction; @@ -12,6 +10,7 @@ import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeDouble; import com.massivecraft.massivecore.money.Money; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.ChatColor; public class CmdFactionsMoneyDeposit extends FactionsCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java index 6bd1fc85..bb233d19 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java @@ -1,7 +1,5 @@ package com.massivecraft.factions.cmd; -import org.bukkit.ChatColor; - import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled; @@ -14,6 +12,7 @@ import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.type.primitive.TypeDouble; import com.massivecraft.massivecore.money.Money; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.ChatColor; public class CmdFactionsMoneyTransferFf extends FactionsCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java index b38404fd..3d9866bc 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java @@ -1,7 +1,5 @@ package com.massivecraft.factions.cmd; -import org.bukkit.ChatColor; - import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled; @@ -16,6 +14,7 @@ import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.type.primitive.TypeDouble; import com.massivecraft.massivecore.money.Money; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.ChatColor; public class CmdFactionsMoneyTransferFp extends FactionsCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java index ab229e68..7c3a7fb2 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java @@ -1,7 +1,5 @@ package com.massivecraft.factions.cmd; -import org.bukkit.ChatColor; - import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled; @@ -16,6 +14,7 @@ import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.type.primitive.TypeDouble; import com.massivecraft.massivecore.money.Money; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.ChatColor; public class CmdFactionsMoneyTransferPf extends FactionsCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java index f9342177..8afb3941 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java @@ -1,7 +1,5 @@ package com.massivecraft.factions.cmd; -import org.bukkit.ChatColor; - import com.massivecraft.factions.Factions; import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled; import com.massivecraft.factions.cmd.type.TypeFaction; @@ -13,6 +11,7 @@ import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeDouble; import com.massivecraft.massivecore.money.Money; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.ChatColor; public class CmdFactionsMoneyWithdraw extends FactionsCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsName.java b/src/com/massivecraft/factions/cmd/CmdFactionsName.java index 5bcabf8c..5d0aff2a 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsName.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsName.java @@ -1,7 +1,5 @@ package com.massivecraft.factions.cmd; -import java.util.ArrayList; - import com.massivecraft.factions.cmd.type.TypeFaction; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.FactionColl; @@ -11,6 +9,8 @@ import com.massivecraft.factions.util.MiscUtil; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeString; +import java.util.ArrayList; + public class CmdFactionsName extends FactionsCommand { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPermList.java b/src/com/massivecraft/factions/cmd/CmdFactionsPermList.java index 34ab79bd..ba1d2d77 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsPermList.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsPermList.java @@ -1,13 +1,13 @@ package com.massivecraft.factions.cmd; -import java.util.ArrayList; -import java.util.List; - import com.massivecraft.factions.entity.MPerm; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.Parameter; import com.massivecraft.massivecore.util.Txt; +import java.util.ArrayList; +import java.util.List; + public class CmdFactionsPermList extends FactionsCommand { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPermSet.java b/src/com/massivecraft/factions/cmd/CmdFactionsPermSet.java index 6b8bc12b..d97feaf4 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsPermSet.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsPermSet.java @@ -1,8 +1,5 @@ package com.massivecraft.factions.cmd; -import java.util.ArrayList; -import java.util.List; - import com.massivecraft.factions.Rel; import com.massivecraft.factions.cmd.type.TypeFaction; import com.massivecraft.factions.cmd.type.TypeMPerm; @@ -15,6 +12,9 @@ import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeBooleanYes; import com.massivecraft.massivecore.util.Txt; +import java.util.ArrayList; +import java.util.List; + public class CmdFactionsPermSet extends FactionsCommand { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPermShow.java b/src/com/massivecraft/factions/cmd/CmdFactionsPermShow.java index 84d7a076..587ec9b9 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsPermShow.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsPermShow.java @@ -1,9 +1,5 @@ package com.massivecraft.factions.cmd; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - import com.massivecraft.factions.cmd.type.TypeFaction; import com.massivecraft.factions.cmd.type.TypeMPerm; import com.massivecraft.factions.entity.Faction; @@ -12,6 +8,10 @@ import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.container.TypeSet; import com.massivecraft.massivecore.util.Txt; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + public class CmdFactionsPermShow extends FactionsCommand { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPlayer.java b/src/com/massivecraft/factions/cmd/CmdFactionsPlayer.java index 2c2151dc..332efd15 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsPlayer.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsPlayer.java @@ -1,8 +1,5 @@ package com.massivecraft.factions.cmd; -import java.util.LinkedHashMap; -import java.util.Map.Entry; - import com.massivecraft.factions.cmd.type.TypeMPlayer; import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.entity.MPlayer; @@ -13,6 +10,9 @@ import com.massivecraft.massivecore.util.TimeDiffUtil; import com.massivecraft.massivecore.util.TimeUnit; import com.massivecraft.massivecore.util.Txt; +import java.util.LinkedHashMap; +import java.util.Map.Entry; + public class CmdFactionsPlayer extends FactionsCommand { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsRank.java b/src/com/massivecraft/factions/cmd/CmdFactionsRank.java index cbe6aedb..2c17dbf5 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsRank.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsRank.java @@ -1,8 +1,5 @@ package com.massivecraft.factions.cmd; -import java.util.HashSet; -import java.util.Set; - import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; import com.massivecraft.factions.Rel; @@ -20,6 +17,9 @@ import com.massivecraft.factions.event.EventFactionsRankChange; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.util.Txt; +import java.util.HashSet; +import java.util.Set; + public class CmdFactionsRank extends FactionsCommand { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsRelationList.java b/src/com/massivecraft/factions/cmd/CmdFactionsRelationList.java index e09920ad..8b9f6a6c 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsRelationList.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsRelationList.java @@ -1,11 +1,5 @@ package com.massivecraft.factions.cmd; -import java.util.List; -import java.util.Map.Entry; -import java.util.Set; - -import org.bukkit.Bukkit; - import com.massivecraft.factions.Factions; import com.massivecraft.factions.Rel; import com.massivecraft.factions.cmd.type.TypeFaction; @@ -20,6 +14,11 @@ import com.massivecraft.massivecore.command.type.container.TypeSet; import com.massivecraft.massivecore.pager.Pager; import com.massivecraft.massivecore.pager.Stringifier; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.Bukkit; + +import java.util.List; +import java.util.Map.Entry; +import java.util.Set; public class CmdFactionsRelationList extends FactionsCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsRelationSet.java b/src/com/massivecraft/factions/cmd/CmdFactionsRelationSet.java index 165da708..8ffa35a1 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsRelationSet.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsRelationSet.java @@ -1,7 +1,5 @@ package com.massivecraft.factions.cmd; -import org.bukkit.ChatColor; - import com.massivecraft.factions.Rel; import com.massivecraft.factions.cmd.type.TypeFaction; import com.massivecraft.factions.cmd.type.TypeRelation; @@ -12,6 +10,7 @@ import com.massivecraft.factions.event.EventFactionsRelationChange; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.MassiveCommand; import com.massivecraft.massivecore.mson.Mson; +import org.bukkit.ChatColor; public class CmdFactionsRelationSet extends FactionsCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsRelationWishes.java b/src/com/massivecraft/factions/cmd/CmdFactionsRelationWishes.java index 2c9236b8..d85f69cf 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsRelationWishes.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsRelationWishes.java @@ -1,10 +1,5 @@ package com.massivecraft.factions.cmd; -import java.util.Map; -import java.util.Map.Entry; - -import org.bukkit.Bukkit; - import com.massivecraft.factions.Factions; import com.massivecraft.factions.Rel; import com.massivecraft.factions.cmd.type.TypeFaction; @@ -17,6 +12,10 @@ import com.massivecraft.massivecore.pager.Pager; import com.massivecraft.massivecore.pager.Stringifier; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.Bukkit; + +import java.util.Map; +import java.util.Map.Entry; public class CmdFactionsRelationWishes extends FactionsCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsSeeChunkOld.java b/src/com/massivecraft/factions/cmd/CmdFactionsSeeChunkOld.java index acbde37c..a707383e 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsSeeChunkOld.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsSeeChunkOld.java @@ -1,14 +1,13 @@ package com.massivecraft.factions.cmd; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.World; -import org.bukkit.entity.Player; - import com.massivecraft.factions.util.VisualizeUtil; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.ps.PSFormatHumanSpace; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.World; +import org.bukkit.entity.Player; public class CmdFactionsSeeChunkOld extends FactionsCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsSetAll.java b/src/com/massivecraft/factions/cmd/CmdFactionsSetAll.java index 1e602431..aea872fb 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsSetAll.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsSetAll.java @@ -1,9 +1,5 @@ package com.massivecraft.factions.cmd; -import java.util.Collections; -import java.util.List; -import java.util.Set; - import com.massivecraft.factions.Perm; import com.massivecraft.factions.entity.Board; import com.massivecraft.factions.entity.BoardColl; @@ -14,6 +10,10 @@ import com.massivecraft.massivecore.mixin.MixinWorld; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.util.MUtil; +import java.util.Collections; +import java.util.List; +import java.util.Set; + public class CmdFactionsSetAll extends CmdFactionsSetXAll { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsSetAuto.java b/src/com/massivecraft/factions/cmd/CmdFactionsSetAuto.java index eecac782..43661998 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsSetAuto.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsSetAuto.java @@ -1,8 +1,5 @@ package com.massivecraft.factions.cmd; -import java.util.Collections; -import java.util.Set; - import com.massivecraft.factions.Perm; import com.massivecraft.factions.cmd.type.TypeFaction; import com.massivecraft.factions.entity.Faction; @@ -13,6 +10,9 @@ import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; import com.massivecraft.massivecore.ps.PS; +import java.util.Collections; +import java.util.Set; + public class CmdFactionsSetAuto extends FactionsCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsSetCircle.java b/src/com/massivecraft/factions/cmd/CmdFactionsSetCircle.java index 52c641da..850895d0 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsSetCircle.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsSetCircle.java @@ -1,14 +1,14 @@ package com.massivecraft.factions.cmd; -import java.util.LinkedHashSet; -import java.util.Set; - import com.massivecraft.factions.Perm; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; import com.massivecraft.massivecore.ps.PS; +import java.util.LinkedHashSet; +import java.util.Set; + public class CmdFactionsSetCircle extends CmdFactionsSetXRadius { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsSetFill.java b/src/com/massivecraft/factions/cmd/CmdFactionsSetFill.java index 79af97ff..8ccaa7db 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsSetFill.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsSetFill.java @@ -1,8 +1,5 @@ package com.massivecraft.factions.cmd; -import java.util.LinkedHashSet; -import java.util.Set; - import com.massivecraft.factions.Perm; import com.massivecraft.factions.entity.BoardColl; import com.massivecraft.factions.entity.Faction; @@ -12,6 +9,9 @@ import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.util.MUtil; +import java.util.LinkedHashSet; +import java.util.Set; + public class CmdFactionsSetFill extends CmdFactionsSetXSimple { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsSetOne.java b/src/com/massivecraft/factions/cmd/CmdFactionsSetOne.java index 81645ae6..fa871112 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsSetOne.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsSetOne.java @@ -1,13 +1,13 @@ package com.massivecraft.factions.cmd; -import java.util.Collections; -import java.util.Set; - import com.massivecraft.factions.Perm; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; import com.massivecraft.massivecore.ps.PS; +import java.util.Collections; +import java.util.Set; + public class CmdFactionsSetOne extends CmdFactionsSetXSimple { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsSetSquare.java b/src/com/massivecraft/factions/cmd/CmdFactionsSetSquare.java index f368fefe..89afe9d4 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsSetSquare.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsSetSquare.java @@ -1,14 +1,14 @@ package com.massivecraft.factions.cmd; -import java.util.LinkedHashSet; -import java.util.Set; - import com.massivecraft.factions.Perm; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; import com.massivecraft.massivecore.ps.PS; +import java.util.LinkedHashSet; +import java.util.Set; + public class CmdFactionsSetSquare extends CmdFactionsSetXRadius { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsSetX.java b/src/com/massivecraft/factions/cmd/CmdFactionsSetX.java index 64eaa7dd..6b235bd7 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsSetX.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsSetX.java @@ -1,12 +1,12 @@ package com.massivecraft.factions.cmd; -import java.util.Set; - import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.FactionColl; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.ps.PS; +import java.util.Set; + public abstract class CmdFactionsSetX extends FactionsCommand { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsStatus.java b/src/com/massivecraft/factions/cmd/CmdFactionsStatus.java index a058b3ba..cbfc109c 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsStatus.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsStatus.java @@ -1,10 +1,5 @@ package com.massivecraft.factions.cmd; -import java.util.Collections; -import java.util.Comparator; -import java.util.LinkedHashMap; -import java.util.List; - import com.massivecraft.factions.PlayerInactivityComparator; import com.massivecraft.factions.cmd.type.TypeFaction; import com.massivecraft.factions.cmd.type.TypeSortMPlayer; @@ -19,6 +14,11 @@ import com.massivecraft.massivecore.util.TimeDiffUtil; import com.massivecraft.massivecore.util.TimeUnit; import com.massivecraft.massivecore.util.Txt; +import java.util.Collections; +import java.util.Comparator; +import java.util.LinkedHashMap; +import java.util.List; + public class CmdFactionsStatus extends FactionsCommand { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsTitle.java b/src/com/massivecraft/factions/cmd/CmdFactionsTitle.java index 067a7b53..9e3eb0bc 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsTitle.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsTitle.java @@ -1,7 +1,5 @@ package com.massivecraft.factions.cmd; -import org.bukkit.ChatColor; - import com.massivecraft.factions.Perm; import com.massivecraft.factions.cmd.type.TypeMPlayer; import com.massivecraft.factions.entity.MPerm; @@ -10,6 +8,7 @@ import com.massivecraft.factions.event.EventFactionsTitleChange; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.primitive.TypeString; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.ChatColor; public class CmdFactionsTitle extends FactionsCommand { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsUnstuck.java b/src/com/massivecraft/factions/cmd/CmdFactionsUnstuck.java index 5510ef48..6e397a38 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsUnstuck.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsUnstuck.java @@ -1,11 +1,5 @@ package com.massivecraft.factions.cmd; -import java.util.ArrayList; -import java.util.List; - -import org.bukkit.Location; -import org.bukkit.World; - import com.massivecraft.factions.entity.BoardColl; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.FactionColl; @@ -19,6 +13,11 @@ import com.massivecraft.massivecore.mixin.TeleporterException; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.teleport.Destination; import com.massivecraft.massivecore.teleport.DestinationSimple; +import org.bukkit.Location; +import org.bukkit.World; + +import java.util.ArrayList; +import java.util.List; public class CmdFactionsUnstuck extends FactionsCommand { diff --git a/src/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java b/src/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java index 4dd95bcc..34a8b53e 100644 --- a/src/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java +++ b/src/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java @@ -1,12 +1,11 @@ package com.massivecraft.factions.cmd.req; -import org.bukkit.command.CommandSender; - import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.integration.Econ; import com.massivecraft.massivecore.command.MassiveCommand; import com.massivecraft.massivecore.command.requirement.RequirementAbstract; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.command.CommandSender; public class ReqBankCommandsEnabled extends RequirementAbstract { diff --git a/src/com/massivecraft/factions/cmd/req/ReqFactionHomesEnabled.java b/src/com/massivecraft/factions/cmd/req/ReqFactionHomesEnabled.java index ef6cc6f0..43ba4ca7 100644 --- a/src/com/massivecraft/factions/cmd/req/ReqFactionHomesEnabled.java +++ b/src/com/massivecraft/factions/cmd/req/ReqFactionHomesEnabled.java @@ -1,11 +1,10 @@ package com.massivecraft.factions.cmd.req; -import org.bukkit.command.CommandSender; - import com.massivecraft.factions.entity.MConf; import com.massivecraft.massivecore.command.MassiveCommand; import com.massivecraft.massivecore.command.requirement.RequirementAbstract; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.command.CommandSender; public class ReqFactionHomesEnabled extends RequirementAbstract { diff --git a/src/com/massivecraft/factions/cmd/req/ReqHasFaction.java b/src/com/massivecraft/factions/cmd/req/ReqHasFaction.java index 51fa153d..5fe0e528 100644 --- a/src/com/massivecraft/factions/cmd/req/ReqHasFaction.java +++ b/src/com/massivecraft/factions/cmd/req/ReqHasFaction.java @@ -1,12 +1,11 @@ package com.massivecraft.factions.cmd.req; -import org.bukkit.command.CommandSender; - import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.massivecore.command.MassiveCommand; import com.massivecraft.massivecore.command.requirement.RequirementAbstract; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.command.CommandSender; public class ReqHasFaction extends RequirementAbstract { diff --git a/src/com/massivecraft/factions/cmd/req/ReqHasntFaction.java b/src/com/massivecraft/factions/cmd/req/ReqHasntFaction.java index c5cb0984..a00d7980 100644 --- a/src/com/massivecraft/factions/cmd/req/ReqHasntFaction.java +++ b/src/com/massivecraft/factions/cmd/req/ReqHasntFaction.java @@ -1,12 +1,11 @@ package com.massivecraft.factions.cmd.req; -import org.bukkit.command.CommandSender; - import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.massivecore.command.MassiveCommand; import com.massivecraft.massivecore.command.requirement.RequirementAbstract; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.command.CommandSender; public class ReqHasntFaction extends RequirementAbstract { diff --git a/src/com/massivecraft/factions/cmd/req/ReqRoleIsAtLeast.java b/src/com/massivecraft/factions/cmd/req/ReqRoleIsAtLeast.java index 50abfc1d..e52eea71 100644 --- a/src/com/massivecraft/factions/cmd/req/ReqRoleIsAtLeast.java +++ b/src/com/massivecraft/factions/cmd/req/ReqRoleIsAtLeast.java @@ -1,13 +1,12 @@ package com.massivecraft.factions.cmd.req; -import org.bukkit.command.CommandSender; - import com.massivecraft.factions.Rel; import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.massivecore.command.MassiveCommand; import com.massivecraft.massivecore.command.requirement.RequirementAbstract; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.command.CommandSender; public class ReqRoleIsAtLeast extends RequirementAbstract { diff --git a/src/com/massivecraft/factions/cmd/type/TypeFaction.java b/src/com/massivecraft/factions/cmd/type/TypeFaction.java index 2aa3a786..1c2ba492 100644 --- a/src/com/massivecraft/factions/cmd/type/TypeFaction.java +++ b/src/com/massivecraft/factions/cmd/type/TypeFaction.java @@ -1,12 +1,5 @@ package com.massivecraft.factions.cmd.type; -import java.util.Collection; -import java.util.Set; -import java.util.TreeSet; - -import org.bukkit.ChatColor; -import org.bukkit.command.CommandSender; - import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.FactionColl; import com.massivecraft.factions.entity.MPlayer; @@ -16,6 +9,12 @@ import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.type.TypeAbstract; import com.massivecraft.massivecore.comparator.ComparatorCaseInsensitive; import com.massivecraft.massivecore.util.IdUtil; +import org.bukkit.ChatColor; +import org.bukkit.command.CommandSender; + +import java.util.Collection; +import java.util.Set; +import java.util.TreeSet; public class TypeFaction extends TypeAbstract { diff --git a/src/com/massivecraft/factions/cmd/type/TypeMFlag.java b/src/com/massivecraft/factions/cmd/type/TypeMFlag.java index 6549e39d..aa0793d3 100644 --- a/src/com/massivecraft/factions/cmd/type/TypeMFlag.java +++ b/src/com/massivecraft/factions/cmd/type/TypeMFlag.java @@ -1,11 +1,11 @@ package com.massivecraft.factions.cmd.type; -import java.util.Collection; - import com.massivecraft.factions.entity.MFlag; import com.massivecraft.factions.entity.MFlagColl; import com.massivecraft.massivecore.command.type.store.TypeEntity; +import java.util.Collection; + public class TypeMFlag extends TypeEntity { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/cmd/type/TypeMPerm.java b/src/com/massivecraft/factions/cmd/type/TypeMPerm.java index a8db73a3..f7c4f333 100644 --- a/src/com/massivecraft/factions/cmd/type/TypeMPerm.java +++ b/src/com/massivecraft/factions/cmd/type/TypeMPerm.java @@ -1,11 +1,11 @@ package com.massivecraft.factions.cmd.type; -import java.util.Collection; - import com.massivecraft.factions.entity.MPerm; import com.massivecraft.factions.entity.MPermColl; import com.massivecraft.massivecore.command.type.store.TypeEntity; +import java.util.Collection; + public class TypeMPerm extends TypeEntity { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/cmd/type/TypeRank.java b/src/com/massivecraft/factions/cmd/type/TypeRank.java index 535f3b5c..ed8bd5c1 100644 --- a/src/com/massivecraft/factions/cmd/type/TypeRank.java +++ b/src/com/massivecraft/factions/cmd/type/TypeRank.java @@ -1,17 +1,17 @@ package com.massivecraft.factions.cmd.type; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - import com.massivecraft.factions.Rel; import com.massivecraft.massivecore.collections.MassiveMap; import com.massivecraft.massivecore.collections.MassiveSet; import com.massivecraft.massivecore.command.type.enumeration.TypeEnum; import com.massivecraft.massivecore.util.MUtil; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + public class TypeRank extends TypeEnum { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/cmd/type/TypeRel.java b/src/com/massivecraft/factions/cmd/type/TypeRel.java index 9637accd..731b50f7 100644 --- a/src/com/massivecraft/factions/cmd/type/TypeRel.java +++ b/src/com/massivecraft/factions/cmd/type/TypeRel.java @@ -1,10 +1,10 @@ package com.massivecraft.factions.cmd.type; -import java.util.Set; - import com.massivecraft.factions.Rel; import com.massivecraft.massivecore.command.type.enumeration.TypeEnum; +import java.util.Set; + public class TypeRel extends TypeEnum { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/cmd/type/TypeSortMPlayer.java b/src/com/massivecraft/factions/cmd/type/TypeSortMPlayer.java index f5c736dd..7e608e91 100644 --- a/src/com/massivecraft/factions/cmd/type/TypeSortMPlayer.java +++ b/src/com/massivecraft/factions/cmd/type/TypeSortMPlayer.java @@ -1,13 +1,13 @@ package com.massivecraft.factions.cmd.type; -import java.util.Comparator; - import com.massivecraft.factions.PlayerInactivityComparator; import com.massivecraft.factions.PlayerPowerComparator; import com.massivecraft.factions.PlayerRoleComparator; import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.massivecore.command.type.TypeAbstractChoice; +import java.util.Comparator; + public class TypeSortMPlayer extends TypeAbstractChoice> { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/engine/EngineCanCombatHappen.java b/src/com/massivecraft/factions/engine/EngineCanCombatHappen.java index b3db6a91..390565c5 100644 --- a/src/com/massivecraft/factions/engine/EngineCanCombatHappen.java +++ b/src/com/massivecraft/factions/engine/EngineCanCombatHappen.java @@ -1,17 +1,5 @@ package com.massivecraft.factions.engine; -import org.bukkit.entity.Arrow; -import org.bukkit.entity.Entity; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.entity.EntityCombustByEntityEvent; -import org.bukkit.event.entity.EntityDamageByEntityEvent; -import org.bukkit.event.entity.EntityDamageEvent; -import org.bukkit.event.entity.PotionSplashEvent; -import org.bukkit.projectiles.ProjectileSource; - import com.massivecraft.factions.Rel; import com.massivecraft.factions.entity.BoardColl; import com.massivecraft.factions.entity.Faction; @@ -22,6 +10,17 @@ import com.massivecraft.factions.event.EventFactionsPvpDisallowed; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.util.MUtil; +import org.bukkit.entity.Arrow; +import org.bukkit.entity.Entity; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.entity.EntityCombustByEntityEvent; +import org.bukkit.event.entity.EntityDamageByEntityEvent; +import org.bukkit.event.entity.EntityDamageEvent; +import org.bukkit.event.entity.PotionSplashEvent; +import org.bukkit.projectiles.ProjectileSource; public class EngineCanCombatHappen extends Engine { diff --git a/src/com/massivecraft/factions/engine/EngineChat.java b/src/com/massivecraft/factions/engine/EngineChat.java index 9379b8c2..9af43b27 100644 --- a/src/com/massivecraft/factions/engine/EngineChat.java +++ b/src/com/massivecraft/factions/engine/EngineChat.java @@ -1,5 +1,11 @@ package com.massivecraft.factions.engine; +import com.massivecraft.factions.Factions; +import com.massivecraft.factions.chat.ChatFormatter; +import com.massivecraft.factions.entity.MConf; +import com.massivecraft.massivecore.Engine; +import com.massivecraft.massivecore.event.EventMassiveCorePlayerToRecipientChat; +import com.massivecraft.massivecore.util.MUtil; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.Event; @@ -9,13 +15,6 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.AsyncPlayerChatEvent; import org.bukkit.plugin.EventExecutor; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.chat.ChatFormatter; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.massivecore.Engine; -import com.massivecraft.massivecore.event.EventMassiveCorePlayerToRecipientChat; -import com.massivecraft.massivecore.util.MUtil; - public class EngineChat extends Engine { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/engine/EngineChunkChange.java b/src/com/massivecraft/factions/engine/EngineChunkChange.java index 63387608..05283a4e 100644 --- a/src/com/massivecraft/factions/engine/EngineChunkChange.java +++ b/src/com/massivecraft/factions/engine/EngineChunkChange.java @@ -1,14 +1,5 @@ package com.massivecraft.factions.engine; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - -import org.bukkit.ChatColor; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; - import com.massivecraft.factions.Rel; import com.massivecraft.factions.entity.BoardColl; import com.massivecraft.factions.entity.Faction; @@ -24,6 +15,14 @@ import com.massivecraft.massivecore.collections.MassiveSet; import com.massivecraft.massivecore.mixin.MixinWorld; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.ChatColor; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; + +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; public class EngineChunkChange extends Engine { diff --git a/src/com/massivecraft/factions/engine/EngineEcon.java b/src/com/massivecraft/factions/engine/EngineEcon.java index 25ac420f..0ce87d40 100644 --- a/src/com/massivecraft/factions/engine/EngineEcon.java +++ b/src/com/massivecraft/factions/engine/EngineEcon.java @@ -1,31 +1,23 @@ package com.massivecraft.factions.engine; -import java.util.ArrayList; -import java.util.List; -import java.util.Map.Entry; -import java.util.Set; - -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; - import com.massivecraft.factions.Factions; import com.massivecraft.factions.cmd.CmdFactions; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.factions.event.EventFactionsAbstractSender; -import com.massivecraft.factions.event.EventFactionsChunksChange; import com.massivecraft.factions.event.EventFactionsChunkChangeType; +import com.massivecraft.factions.event.EventFactionsChunksChange; import com.massivecraft.factions.event.EventFactionsCreate; import com.massivecraft.factions.event.EventFactionsDescriptionChange; import com.massivecraft.factions.event.EventFactionsDisband; +import com.massivecraft.factions.event.EventFactionsFlagChange; import com.massivecraft.factions.event.EventFactionsHomeChange; import com.massivecraft.factions.event.EventFactionsHomeTeleport; import com.massivecraft.factions.event.EventFactionsInvitedChange; import com.massivecraft.factions.event.EventFactionsMembershipChange; import com.massivecraft.factions.event.EventFactionsMembershipChange.MembershipChangeReason; import com.massivecraft.factions.event.EventFactionsNameChange; -import com.massivecraft.factions.event.EventFactionsFlagChange; import com.massivecraft.factions.event.EventFactionsRelationChange; import com.massivecraft.factions.event.EventFactionsTitleChange; import com.massivecraft.factions.integration.Econ; @@ -33,6 +25,13 @@ import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.money.Money; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map.Entry; +import java.util.Set; public class EngineEcon extends Engine { diff --git a/src/com/massivecraft/factions/engine/EngineFlagEndergrief.java b/src/com/massivecraft/factions/engine/EngineFlagEndergrief.java index a67503f1..7230531f 100644 --- a/src/com/massivecraft/factions/engine/EngineFlagEndergrief.java +++ b/src/com/massivecraft/factions/engine/EngineFlagEndergrief.java @@ -1,16 +1,15 @@ package com.massivecraft.factions.engine; -import org.bukkit.entity.Enderman; -import org.bukkit.entity.Entity; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.entity.EntityChangeBlockEvent; - import com.massivecraft.factions.entity.BoardColl; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MFlag; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.ps.PS; +import org.bukkit.entity.Enderman; +import org.bukkit.entity.Entity; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.entity.EntityChangeBlockEvent; public class EngineFlagEndergrief extends Engine { diff --git a/src/com/massivecraft/factions/engine/EngineFlagExplosion.java b/src/com/massivecraft/factions/engine/EngineFlagExplosion.java index 48389e2e..2072cb4e 100644 --- a/src/com/massivecraft/factions/engine/EngineFlagExplosion.java +++ b/src/com/massivecraft/factions/engine/EngineFlagExplosion.java @@ -1,11 +1,10 @@ package com.massivecraft.factions.engine; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; - +import com.massivecraft.factions.entity.BoardColl; +import com.massivecraft.factions.entity.Faction; +import com.massivecraft.factions.entity.MConf; +import com.massivecraft.massivecore.Engine; +import com.massivecraft.massivecore.ps.PS; import org.bukkit.Location; import org.bukkit.block.Block; import org.bukkit.entity.Entity; @@ -19,11 +18,11 @@ import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.event.hanging.HangingBreakEvent; import org.bukkit.event.hanging.HangingBreakEvent.RemoveCause; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.massivecore.Engine; -import com.massivecraft.massivecore.ps.PS; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; public class EngineFlagExplosion extends Engine { diff --git a/src/com/massivecraft/factions/engine/EngineFlagFireSpread.java b/src/com/massivecraft/factions/engine/EngineFlagFireSpread.java index 19459005..59474918 100644 --- a/src/com/massivecraft/factions/engine/EngineFlagFireSpread.java +++ b/src/com/massivecraft/factions/engine/EngineFlagFireSpread.java @@ -1,5 +1,10 @@ package com.massivecraft.factions.engine; +import com.massivecraft.factions.entity.BoardColl; +import com.massivecraft.factions.entity.Faction; +import com.massivecraft.factions.entity.MFlag; +import com.massivecraft.massivecore.Engine; +import com.massivecraft.massivecore.ps.PS; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.event.Cancellable; @@ -10,12 +15,6 @@ import org.bukkit.event.block.BlockIgniteEvent; import org.bukkit.event.block.BlockIgniteEvent.IgniteCause; import org.bukkit.event.block.BlockSpreadEvent; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.massivecore.Engine; -import com.massivecraft.massivecore.ps.PS; - public class EngineFlagFireSpread extends Engine { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/engine/EngineFlagSpawn.java b/src/com/massivecraft/factions/engine/EngineFlagSpawn.java index 67c6cba0..c6eae837 100644 --- a/src/com/massivecraft/factions/engine/EngineFlagSpawn.java +++ b/src/com/massivecraft/factions/engine/EngineFlagSpawn.java @@ -1,14 +1,5 @@ package com.massivecraft.factions.engine; -import java.util.Set; - -import org.bukkit.Location; -import org.bukkit.entity.EntityType; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.entity.CreatureSpawnEvent; -import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; - import com.massivecraft.factions.entity.BoardColl; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MConf; @@ -16,6 +7,14 @@ import com.massivecraft.factions.entity.MFlag; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.collections.BackstringSet; import com.massivecraft.massivecore.ps.PS; +import org.bukkit.Location; +import org.bukkit.entity.EntityType; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.entity.CreatureSpawnEvent; +import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; + +import java.util.Set; public class EngineFlagSpawn extends Engine { diff --git a/src/com/massivecraft/factions/engine/EngineFlagZombiegrief.java b/src/com/massivecraft/factions/engine/EngineFlagZombiegrief.java index 72678c16..327260d9 100644 --- a/src/com/massivecraft/factions/engine/EngineFlagZombiegrief.java +++ b/src/com/massivecraft/factions/engine/EngineFlagZombiegrief.java @@ -1,16 +1,15 @@ package com.massivecraft.factions.engine; -import org.bukkit.entity.Entity; -import org.bukkit.entity.Zombie; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.entity.EntityBreakDoorEvent; - import com.massivecraft.factions.entity.BoardColl; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MFlag; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.ps.PS; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Zombie; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.entity.EntityBreakDoorEvent; public class EngineFlagZombiegrief extends Engine { diff --git a/src/com/massivecraft/factions/engine/EngineLastActivity.java b/src/com/massivecraft/factions/engine/EngineLastActivity.java index b2861944..a98944ff 100644 --- a/src/com/massivecraft/factions/engine/EngineLastActivity.java +++ b/src/com/massivecraft/factions/engine/EngineLastActivity.java @@ -1,16 +1,15 @@ package com.massivecraft.factions.engine; -import org.bukkit.Bukkit; -import org.bukkit.command.CommandSender; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.player.PlayerJoinEvent; - import com.massivecraft.factions.Factions; import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.event.EventMassiveCorePlayerLeave; import com.massivecraft.massivecore.util.MUtil; +import org.bukkit.Bukkit; +import org.bukkit.command.CommandSender; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.player.PlayerJoinEvent; public class EngineLastActivity extends Engine { diff --git a/src/com/massivecraft/factions/engine/EngineMoveChunk.java b/src/com/massivecraft/factions/engine/EngineMoveChunk.java index cee8dccf..f34630a3 100644 --- a/src/com/massivecraft/factions/engine/EngineMoveChunk.java +++ b/src/com/massivecraft/factions/engine/EngineMoveChunk.java @@ -1,13 +1,5 @@ package com.massivecraft.factions.engine; -import java.util.Collections; -import java.util.List; - -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.player.PlayerMoveEvent; - import com.massivecraft.factions.Const; import com.massivecraft.factions.TerritoryAccess; import com.massivecraft.factions.entity.BoardColl; @@ -19,6 +11,13 @@ import com.massivecraft.massivecore.mixin.MixinTitle; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.player.PlayerMoveEvent; + +import java.util.Collections; +import java.util.List; public class EngineMoveChunk extends Engine { diff --git a/src/com/massivecraft/factions/engine/EnginePermBuild.java b/src/com/massivecraft/factions/engine/EnginePermBuild.java index 405d0686..96bf1093 100644 --- a/src/com/massivecraft/factions/engine/EnginePermBuild.java +++ b/src/com/massivecraft/factions/engine/EnginePermBuild.java @@ -1,7 +1,18 @@ package com.massivecraft.factions.engine; -import java.util.Map; - +import com.massivecraft.factions.Factions; +import com.massivecraft.factions.TerritoryAccess; +import com.massivecraft.factions.entity.Board; +import com.massivecraft.factions.entity.BoardColl; +import com.massivecraft.factions.entity.Faction; +import com.massivecraft.factions.entity.FactionColl; +import com.massivecraft.factions.entity.MConf; +import com.massivecraft.factions.entity.MPerm; +import com.massivecraft.factions.entity.MPlayer; +import com.massivecraft.factions.integration.spigot.IntegrationSpigot; +import com.massivecraft.massivecore.Engine; +import com.massivecraft.massivecore.ps.PS; +import com.massivecraft.massivecore.util.MUtil; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; @@ -27,19 +38,7 @@ import org.bukkit.event.player.PlayerBucketFillEvent; import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.event.player.PlayerInteractEvent; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.TerritoryAccess; -import com.massivecraft.factions.entity.Board; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.FactionColl; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.integration.spigot.IntegrationSpigot; -import com.massivecraft.massivecore.Engine; -import com.massivecraft.massivecore.ps.PS; -import com.massivecraft.massivecore.util.MUtil; +import java.util.Map; public class EnginePermBuild extends Engine { diff --git a/src/com/massivecraft/factions/engine/EnginePlayerData.java b/src/com/massivecraft/factions/engine/EnginePlayerData.java index 17bdf0fb..b225d057 100644 --- a/src/com/massivecraft/factions/engine/EnginePlayerData.java +++ b/src/com/massivecraft/factions/engine/EnginePlayerData.java @@ -1,15 +1,14 @@ package com.massivecraft.factions.engine; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.player.PlayerKickEvent; - import com.massivecraft.factions.Rel; import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.factions.entity.MPlayerColl; import com.massivecraft.massivecore.Engine; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.player.PlayerKickEvent; public class EnginePlayerData extends Engine { diff --git a/src/com/massivecraft/factions/engine/EnginePower.java b/src/com/massivecraft/factions/engine/EnginePower.java index 4ad067e2..2d884fc5 100644 --- a/src/com/massivecraft/factions/engine/EnginePower.java +++ b/src/com/massivecraft/factions/engine/EnginePower.java @@ -1,10 +1,5 @@ package com.massivecraft.factions.engine; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.entity.PlayerDeathEvent; - import com.massivecraft.factions.entity.BoardColl; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MConf; @@ -16,6 +11,10 @@ import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.PlayerUtil; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.entity.PlayerDeathEvent; public class EnginePower extends Engine { diff --git a/src/com/massivecraft/factions/engine/EngineSeeChunk.java b/src/com/massivecraft/factions/engine/EngineSeeChunk.java index 973ffc10..cfe107c3 100644 --- a/src/com/massivecraft/factions/engine/EngineSeeChunk.java +++ b/src/com/massivecraft/factions/engine/EngineSeeChunk.java @@ -1,15 +1,5 @@ package com.massivecraft.factions.engine; -import java.security.InvalidParameterException; -import java.util.ArrayList; -import java.util.List; - -import org.bukkit.Location; -import org.bukkit.World; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.player.PlayerChangedWorldEvent; import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.massivecore.Engine; @@ -18,6 +8,16 @@ import com.massivecraft.massivecore.particleeffect.ParticleEffect; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.PeriodUtil; +import org.bukkit.Location; +import org.bukkit.World; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.player.PlayerChangedWorldEvent; + +import java.security.InvalidParameterException; +import java.util.ArrayList; +import java.util.List; public class EngineSeeChunk extends Engine { diff --git a/src/com/massivecraft/factions/engine/EngineTeleportHomeOnDeath.java b/src/com/massivecraft/factions/engine/EngineTeleportHomeOnDeath.java index 9871327a..d3c7d7bb 100644 --- a/src/com/massivecraft/factions/engine/EngineTeleportHomeOnDeath.java +++ b/src/com/massivecraft/factions/engine/EngineTeleportHomeOnDeath.java @@ -1,17 +1,16 @@ package com.massivecraft.factions.engine; -import org.bukkit.Location; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.player.PlayerRespawnEvent; - import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.util.MUtil; +import org.bukkit.Location; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.player.PlayerRespawnEvent; public class EngineTeleportHomeOnDeath extends Engine { diff --git a/src/com/massivecraft/factions/engine/EngineTerritoryShield.java b/src/com/massivecraft/factions/engine/EngineTerritoryShield.java index c6e0ebd9..35603e04 100644 --- a/src/com/massivecraft/factions/engine/EngineTerritoryShield.java +++ b/src/com/massivecraft/factions/engine/EngineTerritoryShield.java @@ -1,17 +1,16 @@ package com.massivecraft.factions.engine; -import java.text.MessageFormat; - +import com.massivecraft.factions.entity.MConf; +import com.massivecraft.factions.entity.MPlayer; +import com.massivecraft.massivecore.Engine; +import com.massivecraft.massivecore.util.MUtil; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.entity.EntityDamageByEntityEvent; -import com.massivecraft.factions.entity.MConf; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.massivecore.Engine; -import com.massivecraft.massivecore.util.MUtil; +import java.text.MessageFormat; public class EngineTerritoryShield extends Engine { diff --git a/src/com/massivecraft/factions/engine/EngineVisualizations.java b/src/com/massivecraft/factions/engine/EngineVisualizations.java index 87566977..aacab13a 100644 --- a/src/com/massivecraft/factions/engine/EngineVisualizations.java +++ b/src/com/massivecraft/factions/engine/EngineVisualizations.java @@ -1,12 +1,11 @@ package com.massivecraft.factions.engine; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.player.PlayerMoveEvent; - import com.massivecraft.factions.util.VisualizeUtil; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.util.MUtil; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.player.PlayerMoveEvent; public class EngineVisualizations extends Engine { diff --git a/src/com/massivecraft/factions/entity/Board.java b/src/com/massivecraft/factions/entity/Board.java index 1640574b..144e8493 100644 --- a/src/com/massivecraft/factions/entity/Board.java +++ b/src/com/massivecraft/factions/entity/Board.java @@ -1,16 +1,5 @@ package com.massivecraft.factions.entity; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.concurrent.ConcurrentSkipListMap; - import com.massivecraft.factions.Const; import com.massivecraft.factions.Factions; import com.massivecraft.factions.RelationParticipator; @@ -23,6 +12,17 @@ import com.massivecraft.massivecore.store.Entity; import com.massivecraft.massivecore.util.Txt; import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.concurrent.ConcurrentSkipListMap; + public class Board extends Entity implements BoardInterface { public static final transient Type MAP_TYPE = new TypeToken>(){}.getType(); diff --git a/src/com/massivecraft/factions/entity/BoardColl.java b/src/com/massivecraft/factions/entity/BoardColl.java index 1193d526..350565c1 100644 --- a/src/com/massivecraft/factions/entity/BoardColl.java +++ b/src/com/massivecraft/factions/entity/BoardColl.java @@ -1,5 +1,13 @@ package com.massivecraft.factions.entity; +import com.massivecraft.factions.RelationParticipator; +import com.massivecraft.factions.TerritoryAccess; +import com.massivecraft.massivecore.collections.MassiveMap; +import com.massivecraft.massivecore.collections.MassiveSet; +import com.massivecraft.massivecore.ps.PS; +import com.massivecraft.massivecore.store.Coll; +import com.massivecraft.massivecore.util.MUtil; + import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashMap; @@ -9,14 +17,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import com.massivecraft.factions.RelationParticipator; -import com.massivecraft.factions.TerritoryAccess; -import com.massivecraft.massivecore.collections.MassiveMap; -import com.massivecraft.massivecore.collections.MassiveSet; -import com.massivecraft.massivecore.ps.PS; -import com.massivecraft.massivecore.store.Coll; -import com.massivecraft.massivecore.util.MUtil; - public class BoardColl extends Coll implements BoardInterface { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/entity/BoardInterface.java b/src/com/massivecraft/factions/entity/BoardInterface.java index 6be177cb..4d96a014 100644 --- a/src/com/massivecraft/factions/entity/BoardInterface.java +++ b/src/com/massivecraft/factions/entity/BoardInterface.java @@ -1,13 +1,13 @@ package com.massivecraft.factions.entity; -import java.util.List; -import java.util.Map; -import java.util.Set; - import com.massivecraft.factions.RelationParticipator; import com.massivecraft.factions.TerritoryAccess; import com.massivecraft.massivecore.ps.PS; +import java.util.List; +import java.util.Map; +import java.util.Set; + public interface BoardInterface { // GET diff --git a/src/com/massivecraft/factions/entity/Faction.java b/src/com/massivecraft/factions/entity/Faction.java index 8e7ba15d..b0241d5f 100644 --- a/src/com/massivecraft/factions/entity/Faction.java +++ b/src/com/massivecraft/factions/entity/Faction.java @@ -1,22 +1,5 @@ package com.massivecraft.factions.entity; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.TreeSet; - -import org.bukkit.ChatColor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - import com.massivecraft.factions.FactionEqualsPredicate; import com.massivecraft.factions.Factions; import com.massivecraft.factions.FactionsParticipator; @@ -42,6 +25,22 @@ import com.massivecraft.massivecore.store.SenderColl; import com.massivecraft.massivecore.util.IdUtil; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.ChatColor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.TreeSet; public class Faction extends Entity implements FactionsParticipator { diff --git a/src/com/massivecraft/factions/entity/FactionColl.java b/src/com/massivecraft/factions/entity/FactionColl.java index 66f4140d..ebd2ed94 100644 --- a/src/com/massivecraft/factions/entity/FactionColl.java +++ b/src/com/massivecraft/factions/entity/FactionColl.java @@ -1,12 +1,5 @@ package com.massivecraft.factions.entity; -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - import com.massivecraft.factions.Factions; import com.massivecraft.factions.Rel; import com.massivecraft.factions.integration.Econ; @@ -14,6 +7,13 @@ import com.massivecraft.factions.util.MiscUtil; import com.massivecraft.massivecore.store.Coll; import com.massivecraft.massivecore.util.Txt; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + public class FactionColl extends Coll { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/entity/MConf.java b/src/com/massivecraft/factions/entity/MConf.java index 8f6fc1e8..a2a7e2f2 100644 --- a/src/com/massivecraft/factions/entity/MConf.java +++ b/src/com/massivecraft/factions/entity/MConf.java @@ -1,17 +1,5 @@ package com.massivecraft.factions.entity; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.bukkit.ChatColor; -import org.bukkit.Material; -import org.bukkit.entity.EntityType; -import org.bukkit.event.EventPriority; - import com.massivecraft.factions.Factions; import com.massivecraft.factions.Rel; import com.massivecraft.factions.engine.EngineChat; @@ -25,6 +13,17 @@ import com.massivecraft.massivecore.command.type.TypeMillisDiff; import com.massivecraft.massivecore.store.Entity; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.TimeUnit; +import org.bukkit.ChatColor; +import org.bukkit.Material; +import org.bukkit.entity.EntityType; +import org.bukkit.event.EventPriority; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; @EditorName("config") public class MConf extends Entity diff --git a/src/com/massivecraft/factions/entity/MFlag.java b/src/com/massivecraft/factions/entity/MFlag.java index 8dd88b5b..59a6eda0 100644 --- a/src/com/massivecraft/factions/entity/MFlag.java +++ b/src/com/massivecraft/factions/entity/MFlag.java @@ -1,9 +1,5 @@ package com.massivecraft.factions.entity; -import java.util.List; - -import org.bukkit.ChatColor; - import com.massivecraft.factions.event.EventFactionsCreateFlags; import com.massivecraft.massivecore.Named; import com.massivecraft.massivecore.Prioritized; @@ -13,6 +9,9 @@ import com.massivecraft.massivecore.comparator.ComparatorSmart; import com.massivecraft.massivecore.predicate.PredicateIsRegistered; import com.massivecraft.massivecore.store.Entity; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.ChatColor; + +import java.util.List; public class MFlag extends Entity implements Prioritized, Registerable, Named { diff --git a/src/com/massivecraft/factions/entity/MFlagColl.java b/src/com/massivecraft/factions/entity/MFlagColl.java index 9f8e030b..136c5b61 100644 --- a/src/com/massivecraft/factions/entity/MFlagColl.java +++ b/src/com/massivecraft/factions/entity/MFlagColl.java @@ -1,10 +1,10 @@ package com.massivecraft.factions.entity; +import com.massivecraft.massivecore.store.Coll; + import java.util.ArrayList; import java.util.List; -import com.massivecraft.massivecore.store.Coll; - public class MFlagColl extends Coll { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/entity/MPerm.java b/src/com/massivecraft/factions/entity/MPerm.java index aec1b600..d606751a 100644 --- a/src/com/massivecraft/factions/entity/MPerm.java +++ b/src/com/massivecraft/factions/entity/MPerm.java @@ -1,12 +1,5 @@ package com.massivecraft.factions.entity; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; - -import org.bukkit.entity.Player; - import com.massivecraft.factions.Perm; import com.massivecraft.factions.Rel; import com.massivecraft.factions.TerritoryAccess; @@ -21,6 +14,12 @@ import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.store.Entity; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.entity.Player; + +import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; public class MPerm extends Entity implements Prioritized, Registerable, Named { diff --git a/src/com/massivecraft/factions/entity/MPermColl.java b/src/com/massivecraft/factions/entity/MPermColl.java index 5c2c2c73..f1534b21 100644 --- a/src/com/massivecraft/factions/entity/MPermColl.java +++ b/src/com/massivecraft/factions/entity/MPermColl.java @@ -1,10 +1,10 @@ package com.massivecraft.factions.entity; +import com.massivecraft.massivecore.store.Coll; + import java.util.ArrayList; import java.util.List; -import com.massivecraft.massivecore.store.Coll; - public class MPermColl extends Coll { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/entity/MPlayer.java b/src/com/massivecraft/factions/entity/MPlayer.java index d08c7467..138b7cd8 100644 --- a/src/com/massivecraft/factions/entity/MPlayer.java +++ b/src/com/massivecraft/factions/entity/MPlayer.java @@ -1,15 +1,5 @@ package com.massivecraft.factions.entity; -import java.util.Collection; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map.Entry; -import java.util.Set; - -import org.bukkit.ChatColor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - import com.massivecraft.factions.Factions; import com.massivecraft.factions.FactionsParticipator; import com.massivecraft.factions.Lang; @@ -33,6 +23,15 @@ import com.massivecraft.massivecore.util.IdUtil; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.Txt; import com.massivecraft.massivecore.xlib.gson.annotations.SerializedName; +import org.bukkit.ChatColor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map.Entry; +import java.util.Set; public class MPlayer extends SenderEntity implements FactionsParticipator { diff --git a/src/com/massivecraft/factions/entity/MPlayerColl.java b/src/com/massivecraft/factions/entity/MPlayerColl.java index 656a7051..effacea9 100644 --- a/src/com/massivecraft/factions/entity/MPlayerColl.java +++ b/src/com/massivecraft/factions/entity/MPlayerColl.java @@ -1,15 +1,14 @@ package com.massivecraft.factions.entity; -import java.util.Collection; -import java.util.Map.Entry; - -import org.bukkit.Bukkit; - import com.massivecraft.factions.Factions; import com.massivecraft.massivecore.store.SenderColl; import com.massivecraft.massivecore.util.IdUtil; import com.massivecraft.massivecore.util.Txt; import com.massivecraft.massivecore.xlib.gson.JsonObject; +import org.bukkit.Bukkit; + +import java.util.Collection; +import java.util.Map.Entry; public class MPlayerColl extends SenderColl { diff --git a/src/com/massivecraft/factions/event/EventFactionsAbstractSender.java b/src/com/massivecraft/factions/event/EventFactionsAbstractSender.java index a54cff71..3d74cf12 100644 --- a/src/com/massivecraft/factions/event/EventFactionsAbstractSender.java +++ b/src/com/massivecraft/factions/event/EventFactionsAbstractSender.java @@ -1,9 +1,8 @@ package com.massivecraft.factions.event; -import org.bukkit.command.CommandSender; - import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.massivecore.event.EventMassiveCore; +import org.bukkit.command.CommandSender; public abstract class EventFactionsAbstractSender extends EventMassiveCore { diff --git a/src/com/massivecraft/factions/event/EventFactionsChunkChangeType.java b/src/com/massivecraft/factions/event/EventFactionsChunkChangeType.java index 09bae0cc..0797ec92 100644 --- a/src/com/massivecraft/factions/event/EventFactionsChunkChangeType.java +++ b/src/com/massivecraft/factions/event/EventFactionsChunkChangeType.java @@ -1,9 +1,8 @@ package com.massivecraft.factions.event; -import org.bukkit.ChatColor; - import com.massivecraft.factions.entity.Faction; import com.massivecraft.massivecore.Colorized; +import org.bukkit.ChatColor; public enum EventFactionsChunkChangeType implements Colorized { diff --git a/src/com/massivecraft/factions/event/EventFactionsChunksChange.java b/src/com/massivecraft/factions/event/EventFactionsChunksChange.java index 2dcc1c78..9c790a95 100644 --- a/src/com/massivecraft/factions/event/EventFactionsChunksChange.java +++ b/src/com/massivecraft/factions/event/EventFactionsChunksChange.java @@ -1,19 +1,18 @@ package com.massivecraft.factions.event; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - -import org.bukkit.command.CommandSender; -import org.bukkit.event.HandlerList; - import com.massivecraft.factions.entity.BoardColl; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.util.MUtil; +import org.bukkit.command.CommandSender; +import org.bukkit.event.HandlerList; + +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; public class EventFactionsChunksChange extends EventFactionsAbstractSender { diff --git a/src/com/massivecraft/factions/event/EventFactionsDescriptionChange.java b/src/com/massivecraft/factions/event/EventFactionsDescriptionChange.java index dc9585b4..dc49700c 100644 --- a/src/com/massivecraft/factions/event/EventFactionsDescriptionChange.java +++ b/src/com/massivecraft/factions/event/EventFactionsDescriptionChange.java @@ -1,10 +1,9 @@ package com.massivecraft.factions.event; +import com.massivecraft.factions.entity.Faction; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; -import com.massivecraft.factions.entity.Faction; - public class EventFactionsDescriptionChange extends EventFactionsAbstractSender { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/event/EventFactionsDisband.java b/src/com/massivecraft/factions/event/EventFactionsDisband.java index 3ad112e9..ca49b347 100644 --- a/src/com/massivecraft/factions/event/EventFactionsDisband.java +++ b/src/com/massivecraft/factions/event/EventFactionsDisband.java @@ -1,10 +1,9 @@ package com.massivecraft.factions.event; +import com.massivecraft.factions.entity.Faction; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; -import com.massivecraft.factions.entity.Faction; - public class EventFactionsDisband extends EventFactionsAbstractSender { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/event/EventFactionsExpansions.java b/src/com/massivecraft/factions/event/EventFactionsExpansions.java index e0a98fb3..644a6e84 100644 --- a/src/com/massivecraft/factions/event/EventFactionsExpansions.java +++ b/src/com/massivecraft/factions/event/EventFactionsExpansions.java @@ -1,12 +1,11 @@ package com.massivecraft.factions.event; -import java.util.Map; - -import org.bukkit.command.CommandSender; -import org.bukkit.event.HandlerList; - import com.massivecraft.massivecore.collections.MassiveTreeMap; import com.massivecraft.massivecore.comparator.ComparatorCaseInsensitive; +import org.bukkit.command.CommandSender; +import org.bukkit.event.HandlerList; + +import java.util.Map; public class EventFactionsExpansions extends EventFactionsAbstractSender { diff --git a/src/com/massivecraft/factions/event/EventFactionsFactionShowAsync.java b/src/com/massivecraft/factions/event/EventFactionsFactionShowAsync.java index b73f1e6c..86336051 100644 --- a/src/com/massivecraft/factions/event/EventFactionsFactionShowAsync.java +++ b/src/com/massivecraft/factions/event/EventFactionsFactionShowAsync.java @@ -1,13 +1,12 @@ package com.massivecraft.factions.event; -import java.util.HashMap; -import java.util.Map; - -import org.bukkit.command.CommandSender; -import org.bukkit.event.HandlerList; - import com.massivecraft.factions.entity.Faction; import com.massivecraft.massivecore.PriorityLines; +import org.bukkit.command.CommandSender; +import org.bukkit.event.HandlerList; + +import java.util.HashMap; +import java.util.Map; public class EventFactionsFactionShowAsync extends EventFactionsAbstractSender { diff --git a/src/com/massivecraft/factions/event/EventFactionsFlagChange.java b/src/com/massivecraft/factions/event/EventFactionsFlagChange.java index de70309d..f9627dd6 100644 --- a/src/com/massivecraft/factions/event/EventFactionsFlagChange.java +++ b/src/com/massivecraft/factions/event/EventFactionsFlagChange.java @@ -1,10 +1,9 @@ package com.massivecraft.factions.event; -import org.bukkit.command.CommandSender; -import org.bukkit.event.HandlerList; - import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MFlag; +import org.bukkit.command.CommandSender; +import org.bukkit.event.HandlerList; public class EventFactionsFlagChange extends EventFactionsAbstractSender { diff --git a/src/com/massivecraft/factions/event/EventFactionsHomeChange.java b/src/com/massivecraft/factions/event/EventFactionsHomeChange.java index 3a6290fc..a78ae6cf 100644 --- a/src/com/massivecraft/factions/event/EventFactionsHomeChange.java +++ b/src/com/massivecraft/factions/event/EventFactionsHomeChange.java @@ -1,10 +1,9 @@ package com.massivecraft.factions.event; -import org.bukkit.command.CommandSender; -import org.bukkit.event.HandlerList; - import com.massivecraft.factions.entity.Faction; import com.massivecraft.massivecore.ps.PS; +import org.bukkit.command.CommandSender; +import org.bukkit.event.HandlerList; public class EventFactionsHomeChange extends EventFactionsAbstractSender { diff --git a/src/com/massivecraft/factions/event/EventFactionsInvitedChange.java b/src/com/massivecraft/factions/event/EventFactionsInvitedChange.java index ec96deb3..422b236b 100644 --- a/src/com/massivecraft/factions/event/EventFactionsInvitedChange.java +++ b/src/com/massivecraft/factions/event/EventFactionsInvitedChange.java @@ -1,11 +1,10 @@ package com.massivecraft.factions.event; +import com.massivecraft.factions.entity.Faction; +import com.massivecraft.factions.entity.MPlayer; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.entity.Faction; - public class EventFactionsInvitedChange extends EventFactionsAbstractSender { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/event/EventFactionsMembershipChange.java b/src/com/massivecraft/factions/event/EventFactionsMembershipChange.java index 2675d14b..4ab88f62 100644 --- a/src/com/massivecraft/factions/event/EventFactionsMembershipChange.java +++ b/src/com/massivecraft/factions/event/EventFactionsMembershipChange.java @@ -1,11 +1,10 @@ package com.massivecraft.factions.event; +import com.massivecraft.factions.entity.Faction; +import com.massivecraft.factions.entity.MPlayer; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.entity.Faction; - public class EventFactionsMembershipChange extends EventFactionsAbstractSender { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/event/EventFactionsMotdChange.java b/src/com/massivecraft/factions/event/EventFactionsMotdChange.java index e68858c0..a85be9da 100644 --- a/src/com/massivecraft/factions/event/EventFactionsMotdChange.java +++ b/src/com/massivecraft/factions/event/EventFactionsMotdChange.java @@ -1,10 +1,9 @@ package com.massivecraft.factions.event; +import com.massivecraft.factions.entity.Faction; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; -import com.massivecraft.factions.entity.Faction; - public class EventFactionsMotdChange extends EventFactionsAbstractSender { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/event/EventFactionsNameChange.java b/src/com/massivecraft/factions/event/EventFactionsNameChange.java index 4c5cadfb..20edb6eb 100644 --- a/src/com/massivecraft/factions/event/EventFactionsNameChange.java +++ b/src/com/massivecraft/factions/event/EventFactionsNameChange.java @@ -1,10 +1,9 @@ package com.massivecraft.factions.event; +import com.massivecraft.factions.entity.Faction; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; -import com.massivecraft.factions.entity.Faction; - public class EventFactionsNameChange extends EventFactionsAbstractSender { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/event/EventFactionsPermChange.java b/src/com/massivecraft/factions/event/EventFactionsPermChange.java index 1785b6ba..d03d60c8 100644 --- a/src/com/massivecraft/factions/event/EventFactionsPermChange.java +++ b/src/com/massivecraft/factions/event/EventFactionsPermChange.java @@ -1,11 +1,10 @@ package com.massivecraft.factions.event; -import org.bukkit.command.CommandSender; -import org.bukkit.event.HandlerList; - import com.massivecraft.factions.Rel; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MPerm; +import org.bukkit.command.CommandSender; +import org.bukkit.event.HandlerList; public class EventFactionsPermChange extends EventFactionsAbstractSender { diff --git a/src/com/massivecraft/factions/event/EventFactionsPowerChange.java b/src/com/massivecraft/factions/event/EventFactionsPowerChange.java index c790ede5..77a09514 100644 --- a/src/com/massivecraft/factions/event/EventFactionsPowerChange.java +++ b/src/com/massivecraft/factions/event/EventFactionsPowerChange.java @@ -1,10 +1,9 @@ package com.massivecraft.factions.event; +import com.massivecraft.factions.entity.MPlayer; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; -import com.massivecraft.factions.entity.MPlayer; - public class EventFactionsPowerChange extends EventFactionsAbstractSender { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/event/EventFactionsPvpDisallowed.java b/src/com/massivecraft/factions/event/EventFactionsPvpDisallowed.java index 794fc280..62864bae 100644 --- a/src/com/massivecraft/factions/event/EventFactionsPvpDisallowed.java +++ b/src/com/massivecraft/factions/event/EventFactionsPvpDisallowed.java @@ -1,11 +1,10 @@ package com.massivecraft.factions.event; -import org.bukkit.entity.Player; -import org.bukkit.event.HandlerList; -import org.bukkit.event.entity.EntityDamageByEntityEvent; - import com.massivecraft.factions.engine.DisallowCause; import com.massivecraft.factions.entity.MPlayer; +import org.bukkit.entity.Player; +import org.bukkit.event.HandlerList; +import org.bukkit.event.entity.EntityDamageByEntityEvent; /** * This event is fired when PVP is disallowed between players due to any rules in Factions. diff --git a/src/com/massivecraft/factions/event/EventFactionsRankChange.java b/src/com/massivecraft/factions/event/EventFactionsRankChange.java index 6a496b49..67802ce3 100644 --- a/src/com/massivecraft/factions/event/EventFactionsRankChange.java +++ b/src/com/massivecraft/factions/event/EventFactionsRankChange.java @@ -1,10 +1,9 @@ package com.massivecraft.factions.event; -import org.bukkit.command.CommandSender; -import org.bukkit.event.HandlerList; - import com.massivecraft.factions.Rel; import com.massivecraft.factions.entity.MPlayer; +import org.bukkit.command.CommandSender; +import org.bukkit.event.HandlerList; public class EventFactionsRankChange extends EventFactionsAbstractSender { diff --git a/src/com/massivecraft/factions/event/EventFactionsRelationChange.java b/src/com/massivecraft/factions/event/EventFactionsRelationChange.java index 96fcd5e0..9610ed2c 100644 --- a/src/com/massivecraft/factions/event/EventFactionsRelationChange.java +++ b/src/com/massivecraft/factions/event/EventFactionsRelationChange.java @@ -1,10 +1,9 @@ package com.massivecraft.factions.event; -import org.bukkit.command.CommandSender; -import org.bukkit.event.HandlerList; - import com.massivecraft.factions.Rel; import com.massivecraft.factions.entity.Faction; +import org.bukkit.command.CommandSender; +import org.bukkit.event.HandlerList; public class EventFactionsRelationChange extends EventFactionsAbstractSender diff --git a/src/com/massivecraft/factions/event/EventFactionsRemovePlayerMillis.java b/src/com/massivecraft/factions/event/EventFactionsRemovePlayerMillis.java index 37894970..765e386d 100644 --- a/src/com/massivecraft/factions/event/EventFactionsRemovePlayerMillis.java +++ b/src/com/massivecraft/factions/event/EventFactionsRemovePlayerMillis.java @@ -1,15 +1,14 @@ package com.massivecraft.factions.event; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Map.Entry; - -import org.bukkit.event.HandlerList; - import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.massivecore.event.EventMassiveCore; +import org.bukkit.event.HandlerList; + +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Map.Entry; public class EventFactionsRemovePlayerMillis extends EventMassiveCore { diff --git a/src/com/massivecraft/factions/event/EventFactionsTitleChange.java b/src/com/massivecraft/factions/event/EventFactionsTitleChange.java index 981ee4eb..7c6227e1 100644 --- a/src/com/massivecraft/factions/event/EventFactionsTitleChange.java +++ b/src/com/massivecraft/factions/event/EventFactionsTitleChange.java @@ -1,10 +1,9 @@ package com.massivecraft.factions.event; +import com.massivecraft.factions.entity.MPlayer; import org.bukkit.command.CommandSender; import org.bukkit.event.HandlerList; -import com.massivecraft.factions.entity.MPlayer; - public class EventFactionsTitleChange extends EventFactionsAbstractSender { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/integration/Econ.java b/src/com/massivecraft/factions/integration/Econ.java index cb3ba87b..680accdb 100644 --- a/src/com/massivecraft/factions/integration/Econ.java +++ b/src/com/massivecraft/factions/integration/Econ.java @@ -1,16 +1,16 @@ package com.massivecraft.factions.integration; -import java.util.HashSet; -import java.util.Set; - import com.massivecraft.factions.EconomyParticipator; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.entity.MPerm; import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.util.RelationUtil; import com.massivecraft.massivecore.money.Money; +import java.util.HashSet; +import java.util.Set; + public class Econ { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/integration/V19/EngineV19.java b/src/com/massivecraft/factions/integration/V19/EngineV19.java index 2d582bae..82019e18 100644 --- a/src/com/massivecraft/factions/integration/V19/EngineV19.java +++ b/src/com/massivecraft/factions/integration/V19/EngineV19.java @@ -1,8 +1,10 @@ package com.massivecraft.factions.integration.V19; -import java.util.ArrayList; -import java.util.List; - +import com.massivecraft.factions.Factions; +import com.massivecraft.factions.engine.EngineCanCombatHappen; +import com.massivecraft.massivecore.Engine; +import com.massivecraft.massivecore.MassivePlugin; +import com.massivecraft.massivecore.util.MUtil; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import org.bukkit.event.EventHandler; @@ -12,11 +14,8 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.projectiles.ProjectileSource; -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.engine.EngineCanCombatHappen; -import com.massivecraft.massivecore.Engine; -import com.massivecraft.massivecore.MassivePlugin; -import com.massivecraft.massivecore.util.MUtil; +import java.util.ArrayList; +import java.util.List; public class EngineV19 extends Engine { diff --git a/src/com/massivecraft/factions/integration/herochat/ChannelFactionsAbstract.java b/src/com/massivecraft/factions/integration/herochat/ChannelFactionsAbstract.java index 0db3f5d5..aac58709 100644 --- a/src/com/massivecraft/factions/integration/herochat/ChannelFactionsAbstract.java +++ b/src/com/massivecraft/factions/integration/herochat/ChannelFactionsAbstract.java @@ -1,19 +1,5 @@ package com.massivecraft.factions.integration.herochat; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import net.milkbowl.vault.chat.Chat; - -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.World; -import org.bukkit.entity.Player; - import com.dthielke.herochat.Channel; import com.dthielke.herochat.ChannelChatEvent; import com.dthielke.herochat.ChannelStorage; @@ -23,9 +9,21 @@ import com.dthielke.herochat.Herochat; import com.dthielke.herochat.MessageFormatSupplier; import com.dthielke.herochat.MessageNotFoundException; import com.massivecraft.factions.Rel; -import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.factions.entity.Faction; +import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.massivecore.util.MUtil; +import net.milkbowl.vault.chat.Chat; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.World; +import org.bukkit.entity.Player; + +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; public abstract class ChannelFactionsAbstract implements Channel { diff --git a/src/com/massivecraft/factions/integration/herochat/ChannelFactionsAllies.java b/src/com/massivecraft/factions/integration/herochat/ChannelFactionsAllies.java index eea95905..b93fc91b 100644 --- a/src/com/massivecraft/factions/integration/herochat/ChannelFactionsAllies.java +++ b/src/com/massivecraft/factions/integration/herochat/ChannelFactionsAllies.java @@ -1,12 +1,11 @@ package com.massivecraft.factions.integration.herochat; -import java.util.EnumSet; -import java.util.Set; - -import org.bukkit.ChatColor; - import com.massivecraft.factions.Rel; import com.massivecraft.factions.entity.MConf; +import org.bukkit.ChatColor; + +import java.util.EnumSet; +import java.util.Set; public class ChannelFactionsAllies extends ChannelFactionsAbstract { diff --git a/src/com/massivecraft/factions/integration/herochat/ChannelFactionsFaction.java b/src/com/massivecraft/factions/integration/herochat/ChannelFactionsFaction.java index 4d783dea..afcf613b 100644 --- a/src/com/massivecraft/factions/integration/herochat/ChannelFactionsFaction.java +++ b/src/com/massivecraft/factions/integration/herochat/ChannelFactionsFaction.java @@ -1,14 +1,13 @@ package com.massivecraft.factions.integration.herochat; +import com.massivecraft.factions.Rel; +import com.massivecraft.factions.entity.MConf; +import org.bukkit.ChatColor; + import java.util.EnumSet; import java.util.HashSet; import java.util.Set; -import org.bukkit.ChatColor; - -import com.massivecraft.factions.Rel; -import com.massivecraft.factions.entity.MConf; - public class ChannelFactionsFaction extends ChannelFactionsAbstract { public static final Set targetRelations = EnumSet.of(Rel.MEMBER, Rel.RECRUIT); diff --git a/src/com/massivecraft/factions/integration/herochat/EngineHerochat.java b/src/com/massivecraft/factions/integration/herochat/EngineHerochat.java index 242b06cd..8dcc49c9 100644 --- a/src/com/massivecraft/factions/integration/herochat/EngineHerochat.java +++ b/src/com/massivecraft/factions/integration/herochat/EngineHerochat.java @@ -1,12 +1,12 @@ package com.massivecraft.factions.integration.herochat; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; import com.dthielke.herochat.ChannelChatEvent; import com.dthielke.herochat.Herochat; import com.massivecraft.factions.chat.ChatFormatter; import com.massivecraft.factions.entity.MConf; import com.massivecraft.massivecore.Engine; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; public class EngineHerochat extends Engine { diff --git a/src/com/massivecraft/factions/integration/lwc/EngineLwc.java b/src/com/massivecraft/factions/integration/lwc/EngineLwc.java index 81490b00..4ed6c842 100644 --- a/src/com/massivecraft/factions/integration/lwc/EngineLwc.java +++ b/src/com/massivecraft/factions/integration/lwc/EngineLwc.java @@ -1,14 +1,5 @@ package com.massivecraft.factions.integration.lwc; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - -import org.bukkit.Bukkit; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; - import com.griefcraft.lwc.LWC; import com.griefcraft.model.Protection; import com.griefcraft.sql.PhysDB; @@ -16,11 +7,19 @@ import com.massivecraft.factions.Factions; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.factions.event.EventFactionsChunksChange; import com.massivecraft.factions.event.EventFactionsChunkChangeType; +import com.massivecraft.factions.event.EventFactionsChunksChange; import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.util.IdUtil; +import org.bukkit.Bukkit; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; + +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; public class EngineLwc extends Engine diff --git a/src/com/massivecraft/factions/integration/spigot/PredicateSpigot.java b/src/com/massivecraft/factions/integration/spigot/PredicateSpigot.java index 520ad50a..981a9c52 100644 --- a/src/com/massivecraft/factions/integration/spigot/PredicateSpigot.java +++ b/src/com/massivecraft/factions/integration/spigot/PredicateSpigot.java @@ -1,9 +1,8 @@ package com.massivecraft.factions.integration.spigot; -import org.bukkit.event.player.PlayerInteractAtEntityEvent; - import com.massivecraft.massivecore.Integration; import com.massivecraft.massivecore.predicate.Predicate; +import org.bukkit.event.player.PlayerInteractAtEntityEvent; public class PredicateSpigot implements Predicate { diff --git a/src/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java b/src/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java index bb5647cc..22787a69 100644 --- a/src/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java +++ b/src/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java @@ -1,7 +1,5 @@ package com.massivecraft.factions.task; -import org.bukkit.entity.Player; - import com.massivecraft.factions.entity.BoardColl; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MConf; @@ -13,6 +11,7 @@ import com.massivecraft.massivecore.ModuloRepeatTask; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.TimeUnit; +import org.bukkit.entity.Player; public class TaskPlayerPowerUpdate extends ModuloRepeatTask { diff --git a/src/com/massivecraft/factions/update/OldConf.java b/src/com/massivecraft/factions/update/OldConf.java index 5d890980..a8fd6a85 100644 --- a/src/com/massivecraft/factions/update/OldConf.java +++ b/src/com/massivecraft/factions/update/OldConf.java @@ -1,14 +1,13 @@ package com.massivecraft.factions.update; -import java.util.List; -import java.util.Map; - -import org.bukkit.event.EventPriority; - import com.massivecraft.factions.Rel; import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.event.EventFactionsChunkChangeType; import com.massivecraft.massivecore.store.Entity; +import org.bukkit.event.EventPriority; + +import java.util.List; +import java.util.Map; public class OldConf extends Entity { diff --git a/src/com/massivecraft/factions/update/UpdateUtil.java b/src/com/massivecraft/factions/update/UpdateUtil.java index 04bd27bc..34cbd4d9 100644 --- a/src/com/massivecraft/factions/update/UpdateUtil.java +++ b/src/com/massivecraft/factions/update/UpdateUtil.java @@ -1,11 +1,5 @@ package com.massivecraft.factions.update; -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; - import com.massivecraft.factions.Const; import com.massivecraft.factions.Factions; import com.massivecraft.factions.TerritoryAccess; @@ -21,6 +15,12 @@ import com.massivecraft.massivecore.store.Entity; import com.massivecraft.massivecore.store.MStore; import com.massivecraft.massivecore.util.MUtil; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; + public class UpdateUtil { // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/util/AsciiCompass.java b/src/com/massivecraft/factions/util/AsciiCompass.java index 04c9744c..58e5d128 100644 --- a/src/com/massivecraft/factions/util/AsciiCompass.java +++ b/src/com/massivecraft/factions/util/AsciiCompass.java @@ -1,10 +1,18 @@ package com.massivecraft.factions.util; -import java.util.List; - import com.massivecraft.massivecore.collections.MassiveList; -import static com.massivecraft.factions.util.AsciiCompassDirection.*; +import java.util.List; + +import static com.massivecraft.factions.util.AsciiCompassDirection.E; +import static com.massivecraft.factions.util.AsciiCompassDirection.N; +import static com.massivecraft.factions.util.AsciiCompassDirection.NE; +import static com.massivecraft.factions.util.AsciiCompassDirection.NONE; +import static com.massivecraft.factions.util.AsciiCompassDirection.NW; +import static com.massivecraft.factions.util.AsciiCompassDirection.S; +import static com.massivecraft.factions.util.AsciiCompassDirection.SE; +import static com.massivecraft.factions.util.AsciiCompassDirection.SW; +import static com.massivecraft.factions.util.AsciiCompassDirection.W; public class AsciiCompass { diff --git a/src/com/massivecraft/factions/util/MiscUtil.java b/src/com/massivecraft/factions/util/MiscUtil.java index 7963adf6..f26ed40d 100644 --- a/src/com/massivecraft/factions/util/MiscUtil.java +++ b/src/com/massivecraft/factions/util/MiscUtil.java @@ -1,10 +1,10 @@ package com.massivecraft.factions.util; +import org.bukkit.ChatColor; + import java.util.Arrays; import java.util.HashSet; -import org.bukkit.ChatColor; - public class MiscUtil { // Inclusive range diff --git a/src/com/massivecraft/factions/util/RelationUtil.java b/src/com/massivecraft/factions/util/RelationUtil.java index 98b851cd..379c9089 100644 --- a/src/com/massivecraft/factions/util/RelationUtil.java +++ b/src/com/massivecraft/factions/util/RelationUtil.java @@ -1,14 +1,13 @@ package com.massivecraft.factions.util; -import org.bukkit.ChatColor; - import com.massivecraft.factions.Rel; import com.massivecraft.factions.RelationParticipator; -import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MConf; +import com.massivecraft.factions.entity.MFlag; +import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.ChatColor; public class RelationUtil { diff --git a/src/com/massivecraft/factions/util/VisualizeUtil.java b/src/com/massivecraft/factions/util/VisualizeUtil.java index 60a019d9..befc5f1f 100644 --- a/src/com/massivecraft/factions/util/VisualizeUtil.java +++ b/src/com/massivecraft/factions/util/VisualizeUtil.java @@ -1,5 +1,9 @@ package com.massivecraft.factions.util; +import org.bukkit.Location; +import org.bukkit.block.Block; +import org.bukkit.entity.Player; + import java.util.Collection; import java.util.HashMap; import java.util.HashSet; @@ -8,10 +12,6 @@ import java.util.Map.Entry; import java.util.Set; import java.util.UUID; -import org.bukkit.Location; -import org.bukkit.block.Block; -import org.bukkit.entity.Player; - // TODO: Only send blocks in visual range // TODO: Only send blocks that where changed when clearing? // TODO: Create packed queue to avoid freezes.