diff options
Diffstat (limited to 'EssentialsChat/src/net/ess3')
6 files changed, 37 insertions, 44 deletions
diff --git a/EssentialsChat/src/net/ess3/chat/EssentialsChat.java b/EssentialsChat/src/net/ess3/chat/EssentialsChat.java index b80d38f6d..bfd26152e 100644 --- a/EssentialsChat/src/net/ess3/chat/EssentialsChat.java +++ b/EssentialsChat/src/net/ess3/chat/EssentialsChat.java @@ -1,19 +1,19 @@ package net.ess3.chat; +import static net.ess3.I18n._; import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import static net.ess3.I18n._; +import org.bukkit.event.player.AsyncPlayerChatEvent; +import org.bukkit.plugin.PluginManager; +import org.bukkit.plugin.java.JavaPlugin; import net.ess3.api.IEssentials; import net.ess3.api.IPlugin; import net.ess3.chat.listenerlevel.EssentialsChatPlayerListenerHighest; import net.ess3.chat.listenerlevel.EssentialsChatPlayerListenerLowest; import net.ess3.chat.listenerlevel.EssentialsChatPlayerListenerNormal; -import org.bukkit.event.player.AsyncPlayerChatEvent; -import org.bukkit.plugin.PluginManager; -import org.bukkit.plugin.java.JavaPlugin; public class EssentialsChat extends JavaPlugin diff --git a/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java b/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java index 02c9cda74..4c76e2185 100644 --- a/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java +++ b/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java @@ -1,23 +1,19 @@ package net.ess3.chat; +import static net.ess3.I18n._; import java.text.MessageFormat; import java.util.Locale; import java.util.Map; import java.util.logging.Logger; -import static net.ess3.I18n._; -import net.ess3.api.ChargeException; -import net.ess3.api.IEssentials; -import net.ess3.api.IRanks; -import net.ess3.api.ISettings; -import net.ess3.api.IUser; -import net.ess3.economy.Trade; -import net.ess3.permissions.Permissions; -import net.ess3.utils.FormatUtil; import org.bukkit.Server; import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; import org.bukkit.event.Listener; import org.bukkit.event.player.AsyncPlayerChatEvent; +import net.ess3.api.*; +import net.ess3.economy.Trade; +import net.ess3.permissions.Permissions; +import net.ess3.utils.FormatUtil; + public abstract class EssentialsChatPlayer implements Listener { @@ -26,9 +22,8 @@ public abstract class EssentialsChatPlayer implements Listener protected final transient Server server; protected final transient Map<AsyncPlayerChatEvent, ChatStore> chatStorage; - public EssentialsChatPlayer(final Server server, - final IEssentials ess, - final Map<AsyncPlayerChatEvent, ChatStore> chatStorage) + public EssentialsChatPlayer( + final Server server, final IEssentials ess, final Map<AsyncPlayerChatEvent, ChatStore> chatStorage) { this.ess = ess; this.server = server; @@ -84,12 +79,13 @@ public abstract class EssentialsChatPlayer implements Listener IRanks groupSettings = ess.getRanks(); MessageFormat format = groupSettings.getChatFormat(user); - synchronized(format) + synchronized (format) { - event.setFormat(format.format(new Object[] - { - group, world, world.substring(0, 1).toUpperCase(Locale.ENGLISH) - })); + event.setFormat( + format.format( + new Object[]{ + group, world, world.substring(0, 1).toUpperCase(Locale.ENGLISH) + })); } } diff --git a/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java b/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java index b6b93c0bf..c335d2300 100644 --- a/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java +++ b/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java @@ -1,8 +1,6 @@ package net.ess3.chat; import static net.ess3.I18n._; -import net.ess3.api.IEssentials; -import net.ess3.api.IUser; import org.bukkit.Location; import org.bukkit.Server; import org.bukkit.World; @@ -10,6 +8,8 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; public class EssentialsLocalChatEventListener implements Listener diff --git a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java index 3ecb1f733..628b5f056 100644 --- a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java +++ b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java @@ -1,20 +1,19 @@ package net.ess3.chat.listenerlevel; import java.util.Map; -import net.ess3.api.IEssentials; -import net.ess3.chat.ChatStore; -import net.ess3.chat.EssentialsChatPlayer; import org.bukkit.Server; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.AsyncPlayerChatEvent; +import net.ess3.api.IEssentials; +import net.ess3.chat.ChatStore; +import net.ess3.chat.EssentialsChatPlayer; public class EssentialsChatPlayerListenerHighest extends EssentialsChatPlayer { - public EssentialsChatPlayerListenerHighest(final Server server, - final IEssentials ess, - final Map<AsyncPlayerChatEvent, ChatStore> chatStorage) + public EssentialsChatPlayerListenerHighest( + final Server server, final IEssentials ess, final Map<AsyncPlayerChatEvent, ChatStore> chatStorage) { super(server, ess, chatStorage); } diff --git a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java index 836d6af86..df823461e 100644 --- a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java +++ b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java @@ -1,21 +1,20 @@ package net.ess3.chat.listenerlevel; import java.util.Map; -import net.ess3.api.IEssentials; -import net.ess3.api.IUser; -import net.ess3.chat.ChatStore; -import net.ess3.chat.EssentialsChatPlayer; import org.bukkit.Server; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.AsyncPlayerChatEvent; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.chat.ChatStore; +import net.ess3.chat.EssentialsChatPlayer; public class EssentialsChatPlayerListenerLowest extends EssentialsChatPlayer { - public EssentialsChatPlayerListenerLowest(final Server server, - final IEssentials ess, - final Map<AsyncPlayerChatEvent, ChatStore> chatStorage) + public EssentialsChatPlayerListenerLowest( + final Server server, final IEssentials ess, final Map<AsyncPlayerChatEvent, ChatStore> chatStorage) { super(server, ess, chatStorage); } @@ -29,7 +28,7 @@ public class EssentialsChatPlayerListenerLowest extends EssentialsChatPlayer return; } final IUser user = ess.getUserMap().getUser(event.getPlayer()); - if(user == null) + if (user == null) { event.setCancelled(true); return; diff --git a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java index bef4322d6..bc2572ad1 100644 --- a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java +++ b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java @@ -1,20 +1,19 @@ package net.ess3.chat.listenerlevel; import java.util.Map; -import net.ess3.api.IEssentials; -import net.ess3.chat.ChatStore; -import net.ess3.chat.EssentialsChatPlayer; import org.bukkit.Server; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.AsyncPlayerChatEvent; +import net.ess3.api.IEssentials; +import net.ess3.chat.ChatStore; +import net.ess3.chat.EssentialsChatPlayer; public class EssentialsChatPlayerListenerNormal extends EssentialsChatPlayer { - public EssentialsChatPlayerListenerNormal(final Server server, - final IEssentials ess, - final Map<AsyncPlayerChatEvent, ChatStore> chatStorage) + public EssentialsChatPlayerListenerNormal( + final Server server, final IEssentials ess, final Map<AsyncPlayerChatEvent, ChatStore> chatStorage) { super(server, ess, chatStorage); } |