From ecd2484cb93ebb5677583e772e289ce4c314b468 Mon Sep 17 00:00:00 2001 From: Iaccidentally Date: Sat, 13 Jul 2013 12:40:50 -0400 Subject: [API] fix other modules to use new packages --- .../src/com/earth2me/essentials/chat/ChatStore.java | 2 +- .../src/com/earth2me/essentials/chat/EssentialsChat.java | 4 ++-- .../com/earth2me/essentials/chat/EssentialsChatPlayer.java | 11 +++-------- .../essentials/chat/EssentialsChatPlayerListenerHighest.java | 2 +- .../essentials/chat/EssentialsChatPlayerListenerLowest.java | 2 +- .../essentials/chat/EssentialsChatPlayerListenerNormal.java | 4 ++-- 6 files changed, 10 insertions(+), 15 deletions(-) (limited to 'EssentialsChat') diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java b/EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java index d353d5d6c..4c5f8dd90 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.chat; -import com.earth2me.essentials.IEssentials; import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; +import net.ess3.api.IEssentials; public class ChatStore diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java index bd975ebab..8a8cf41ee 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.chat; import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.IEssentials; +import net.ess3.api.IEssentials; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -43,5 +43,5 @@ public class EssentialsChat extends JavaPlugin pluginManager.registerEvents(playerListenerHighest, this); } - + } diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java index d47ba6a5c..7fff85ff8 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java @@ -1,17 +1,12 @@ package com.earth2me.essentials.chat; import com.earth2me.essentials.ChargeException; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.IEssentials; import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; +import net.ess3.api.IEssentials; import java.util.Map; -import java.util.logging.Level; import java.util.logging.Logger; -import org.bukkit.Location; import org.bukkit.Server; -import org.bukkit.World; -import org.bukkit.entity.Player; import org.bukkit.event.Listener; import org.bukkit.event.player.AsyncPlayerChatEvent; @@ -23,7 +18,7 @@ public abstract class EssentialsChatPlayer implements Listener protected final transient Map chatStorage; public EssentialsChatPlayer(final Server server, - final IEssentials ess, + final IEssentials ess, final Map chatStorage) { this.ess = ess; @@ -40,7 +35,7 @@ public abstract class EssentialsChatPlayer implements Listener if (event.isCancelled()) { return true; - } + } return false; } diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerHighest.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerHighest.java index 2e65c8959..2a0d621a4 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerHighest.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerHighest.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.chat; -import com.earth2me.essentials.IEssentials; +import net.ess3.api.IEssentials; import java.util.Map; import org.bukkit.Server; import org.bukkit.event.EventHandler; diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java index f2912db22..7789dbeac 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.chat; -import com.earth2me.essentials.IEssentials; import com.earth2me.essentials.User; import com.earth2me.essentials.utils.FormatUtil; +import net.ess3.api.IEssentials; import java.util.Locale; import java.util.Map; import org.bukkit.Server; diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java index 0b58b0bfb..2b15a6771 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java @@ -1,9 +1,9 @@ package com.earth2me.essentials.chat; import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.IEssentials; import com.earth2me.essentials.User; import static com.earth2me.essentials.chat.EssentialsChatPlayer.logger; +import net.ess3.api.IEssentials; import java.util.HashSet; import java.util.Iterator; import java.util.Locale; @@ -134,7 +134,7 @@ public class EssentialsChatPlayerListenerNormal extends EssentialsChatPlayer } } } - + if (outList.size() < 2) { event.getPlayer().sendMessage(_("localNoOne")); } -- cgit v1.2.3