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 --- .../essentials/antibuild/EssentialsAntiBuildListener.java | 6 +++--- .../com/earth2me/essentials/antibuild/EssentialsConnect.java | 2 +- .../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 ++-- .../src/com/earth2me/essentials/geoip/EssentialsGeoIP.java | 2 +- .../essentials/geoip/EssentialsGeoIPPlayerListener.java | 2 +- .../com/earth2me/essentials/protect/EssentialsConnect.java | 2 +- .../essentials/protect/EssentialsProtectBlockListener.java | 9 ++++----- .../essentials/protect/EssentialsProtectEntityListener.java | 2 +- .../src/com/earth2me/essentials/spawn/EssentialsSpawn.java | 2 +- .../essentials/spawn/EssentialsSpawnPlayerListener.java | 4 ++-- .../src/com/earth2me/essentials/spawn/SpawnStorage.java | 6 +++--- 16 files changed, 28 insertions(+), 34 deletions(-) diff --git a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java b/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java index e457f72f2..7f5acd56f 100644 --- a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java +++ b/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.antibuild; import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.IEssentials; import com.earth2me.essentials.User; +import net.ess3.api.IEssentials; import java.util.logging.Level; import org.bukkit.Material; import org.bukkit.block.Block; @@ -313,14 +313,14 @@ public class EssentialsAntiBuildListener implements Listener } } } - + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onBlockDispense(final BlockDispenseEvent event) { final ItemStack item = event.getItem(); if (prot.checkProtectionItems(AntiBuildConfig.blacklist_dispenser, item.getTypeId())) { - event.setCancelled(true); + event.setCancelled(true); } } } diff --git a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsConnect.java b/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsConnect.java index c25898f78..6f568a109 100644 --- a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsConnect.java +++ b/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsConnect.java @@ -1,9 +1,9 @@ package com.earth2me.essentials.antibuild; import com.earth2me.essentials.IConf; -import com.earth2me.essentials.IEssentials; import com.earth2me.essentials.User; import static com.earth2me.essentials.I18n._; +import net.ess3.api.IEssentials; import java.util.logging.Level; import java.util.logging.Logger; import org.bukkit.Location; 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")); } diff --git a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java index eb401c6db..02e901b5b 100644 --- a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java +++ b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.geoip; import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.IEssentials; +import net.ess3.api.IEssentials; import java.util.logging.Level; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; diff --git a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java index 1d37f585d..89debe9fe 100644 --- a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java +++ b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java @@ -3,8 +3,8 @@ package com.earth2me.essentials.geoip; import com.earth2me.essentials.EssentialsConf; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.IConf; -import com.earth2me.essentials.IEssentials; import com.earth2me.essentials.User; +import net.ess3.api.IEssentials; import com.maxmind.geoip.Location; import com.maxmind.geoip.LookupService; import com.maxmind.geoip.regionName; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java index f19362ee2..09f84efe2 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java @@ -2,7 +2,7 @@ package com.earth2me.essentials.protect; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.IConf; -import com.earth2me.essentials.IEssentials; +import net.ess3.api.IEssentials; import java.util.logging.Level; import java.util.logging.Logger; import org.bukkit.plugin.Plugin; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java index 246d9a583..0edbffcde 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.protect; -import com.earth2me.essentials.IEssentials; +import net.ess3.api.IEssentials; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; @@ -20,7 +20,7 @@ public class EssentialsProtectBlockListener implements Listener this.prot = parent; this.ess = prot.getEssentialsConnect().getEssentials(); } - + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onBlockIgnite(BlockIgniteEvent event) { @@ -58,7 +58,7 @@ public class EssentialsProtectBlockListener implements Listener public void onBlockFromTo(final BlockFromToEvent event) { final Block block = event.getBlock(); - + if (block.getType() == Material.WATER || block.getType() == Material.STATIONARY_WATER) { event.setCancelled(prot.getSettingBool(ProtectConfig.prevent_water_flow)); @@ -79,11 +79,10 @@ public class EssentialsProtectBlockListener implements Listener @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onBlockBurn(final BlockBurnEvent event) - { + { if (prot.getSettingBool(ProtectConfig.prevent_fire_spread)) { event.setCancelled(true); } } } - \ No newline at end of file diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java index faa2dd5c7..d8657fef5 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.protect; -import com.earth2me.essentials.IEssentials; import com.earth2me.essentials.User; +import net.ess3.api.IEssentials; import java.util.Locale; import org.bukkit.entity.*; import org.bukkit.entity.minecart.ExplosiveMinecart; diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java index 88be7169e..4e61bdac9 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.spawn; import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.IEssentials; +import net.ess3.api.IEssentials; import java.util.logging.Level; import java.util.logging.Logger; import org.bukkit.Bukkit; diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java index b98084a08..8b645fa58 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java @@ -1,13 +1,13 @@ package com.earth2me.essentials.spawn; import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.IEssentials; import com.earth2me.essentials.Kit; import com.earth2me.essentials.OfflinePlayer; import com.earth2me.essentials.User; import com.earth2me.essentials.textreader.IText; import com.earth2me.essentials.textreader.KeywordReplacer; import com.earth2me.essentials.textreader.SimpleTextPager; +import net.ess3.api.IEssentials; import java.util.List; import java.util.Locale; import java.util.Map; @@ -104,7 +104,7 @@ public class EssentialsSpawnPlayerListener implements Listener if (!user.isOnline()) { return; } - + //This method allows for multiple line player announce messages using multiline yaml syntax #EasterEgg if (ess.getSettings().getAnnounceNewPlayers()) { diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/SpawnStorage.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/SpawnStorage.java index 9075d0b69..36b6f9662 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/SpawnStorage.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/SpawnStorage.java @@ -1,9 +1,9 @@ package com.earth2me.essentials.spawn; -import com.earth2me.essentials.IEssentials; import com.earth2me.essentials.IEssentialsModule; import com.earth2me.essentials.settings.Spawns; import com.earth2me.essentials.storage.AsyncStorageObjectHolder; +import net.ess3.api.IEssentials; import java.io.File; import java.util.HashMap; import java.util.Locale; @@ -25,12 +25,12 @@ public class SpawnStorage extends AsyncStorageObjectHolder implements IE { return new File(ess.getDataFolder(), "spawn.yml"); } - + @Override public void finishRead() { } - + @Override public void finishWrite() { -- cgit v1.2.3