From 8dc42dd39b2ee004aea3ca937122269e87d1415d Mon Sep 17 00:00:00 2001 From: Iaccidentally Date: Sun, 26 Aug 2012 14:41:07 -0400 Subject: fix imports --- Essentials/src/net/ess3/commands/Commandpay.java | 2 +- Essentials/src/net/ess3/commands/Commandpowertool.java | 4 ++-- Essentials/src/net/ess3/commands/Commandptime.java | 6 +++--- Essentials/src/net/ess3/commands/Commandr.java | 4 ++-- Essentials/src/net/ess3/commands/Commandrealname.java | 4 ++-- Essentials/src/net/ess3/commands/Commandremove.java | 4 ++-- Essentials/src/net/ess3/commands/Commandrepair.java | 4 ++-- Essentials/src/net/ess3/commands/Commandrules.java | 2 +- Essentials/src/net/ess3/commands/Commandseen.java | 2 +- Essentials/src/net/ess3/commands/Commandsell.java | 4 ++-- Essentials/src/net/ess3/commands/Commandsetwarp.java | 2 +- Essentials/src/net/ess3/commands/Commandsetworth.java | 4 ++-- Essentials/src/net/ess3/commands/Commandspawn.java | 4 ++-- Essentials/src/net/ess3/commands/Commandspawner.java | 4 ++-- Essentials/src/net/ess3/commands/Commandspawnmob.java | 2 +- Essentials/src/net/ess3/commands/Commandsudo.java | 2 +- Essentials/src/net/ess3/commands/Commandtempban.java | 4 ++-- Essentials/src/net/ess3/commands/Commandthunder.java | 2 +- Essentials/src/net/ess3/commands/Commandtime.java | 6 +++--- Essentials/src/net/ess3/commands/Commandtogglejail.java | 2 +- Essentials/src/net/ess3/commands/Commandtop.java | 2 +- Essentials/src/net/ess3/commands/Commandtp.java | 2 +- Essentials/src/net/ess3/commands/Commandtpaall.java | 4 ++-- Essentials/src/net/ess3/commands/Commandtpall.java | 4 ++-- 24 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Essentials/src/net/ess3/commands/Commandpay.java b/Essentials/src/net/ess3/commands/Commandpay.java index e54d28568..47b6017fe 100644 --- a/Essentials/src/net/ess3/commands/Commandpay.java +++ b/Essentials/src/net/ess3/commands/Commandpay.java @@ -2,8 +2,8 @@ package net.ess3.commands; import static net.ess3.I18n._; import net.ess3.api.IUser; -import net.ess3.api.server.Player; import net.ess3.economy.Trade; +import org.bukkit.entity.Player; diff --git a/Essentials/src/net/ess3/commands/Commandpowertool.java b/Essentials/src/net/ess3/commands/Commandpowertool.java index a95ca6797..461e335cc 100644 --- a/Essentials/src/net/ess3/commands/Commandpowertool.java +++ b/Essentials/src/net/ess3/commands/Commandpowertool.java @@ -5,10 +5,10 @@ import java.util.List; import java.util.Locale; import static net.ess3.I18n._; import net.ess3.api.IUser; -import net.ess3.api.server.ItemStack; -import net.ess3.api.server.Material; import net.ess3.permissions.Permissions; import net.ess3.utils.Util; +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; public class Commandpowertool extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandptime.java b/Essentials/src/net/ess3/commands/Commandptime.java index 396497618..b1889ff15 100644 --- a/Essentials/src/net/ess3/commands/Commandptime.java +++ b/Essentials/src/net/ess3/commands/Commandptime.java @@ -3,11 +3,11 @@ package net.ess3.commands; import java.util.*; import static net.ess3.I18n._; import net.ess3.api.IUser; -import net.ess3.api.server.CommandSender; -import net.ess3.api.server.Player; -import net.ess3.api.server.World; import net.ess3.permissions.Permissions; import net.ess3.utils.DescParseTickFormat; +import org.bukkit.World; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; diff --git a/Essentials/src/net/ess3/commands/Commandr.java b/Essentials/src/net/ess3/commands/Commandr.java index d7fab0592..6c8e920ce 100644 --- a/Essentials/src/net/ess3/commands/Commandr.java +++ b/Essentials/src/net/ess3/commands/Commandr.java @@ -4,10 +4,10 @@ import net.ess3.Console; import static net.ess3.I18n._; import net.ess3.api.IReplyTo; import net.ess3.api.IUser; -import net.ess3.api.server.CommandSender; -import net.ess3.api.server.Player; import net.ess3.permissions.Permissions; import net.ess3.utils.Util; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandr extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandrealname.java b/Essentials/src/net/ess3/commands/Commandrealname.java index f21c7e2c5..be07e437f 100644 --- a/Essentials/src/net/ess3/commands/Commandrealname.java +++ b/Essentials/src/net/ess3/commands/Commandrealname.java @@ -5,9 +5,9 @@ import lombok.Cleanup; import static net.ess3.I18n._; import net.ess3.api.ISettings; import net.ess3.api.IUser; -import net.ess3.api.server.CommandSender; -import net.ess3.api.server.Player; import net.ess3.utils.Util; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandrealname extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandremove.java b/Essentials/src/net/ess3/commands/Commandremove.java index 50f02c4f4..f8b171259 100644 --- a/Essentials/src/net/ess3/commands/Commandremove.java +++ b/Essentials/src/net/ess3/commands/Commandremove.java @@ -3,9 +3,9 @@ package net.ess3.commands; import java.util.Locale; import static net.ess3.I18n._; import net.ess3.api.IUser; -import net.ess3.api.server.CommandSender; -import net.ess3.api.server.World; import org.bukkit.Chunk; +import org.bukkit.World; +import org.bukkit.command.CommandSender; import org.bukkit.entity.*; //Todo: Fix this up diff --git a/Essentials/src/net/ess3/commands/Commandrepair.java b/Essentials/src/net/ess3/commands/Commandrepair.java index 8b9df4a06..9762fc767 100644 --- a/Essentials/src/net/ess3/commands/Commandrepair.java +++ b/Essentials/src/net/ess3/commands/Commandrepair.java @@ -6,11 +6,11 @@ import java.util.Locale; import static net.ess3.I18n._; import net.ess3.api.ChargeException; import net.ess3.api.IUser; -import net.ess3.api.server.ItemStack; -import net.ess3.api.server.Material; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; import net.ess3.utils.Util; +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; public class Commandrepair extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandrules.java b/Essentials/src/net/ess3/commands/Commandrules.java index d9993d641..1e15a6097 100644 --- a/Essentials/src/net/ess3/commands/Commandrules.java +++ b/Essentials/src/net/ess3/commands/Commandrules.java @@ -1,10 +1,10 @@ package net.ess3.commands; -import net.ess3.api.server.CommandSender; import net.ess3.utils.textreader.IText; import net.ess3.utils.textreader.KeywordReplacer; import net.ess3.utils.textreader.TextInput; import net.ess3.utils.textreader.TextPager; +import org.bukkit.command.CommandSender; public class Commandrules extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandseen.java b/Essentials/src/net/ess3/commands/Commandseen.java index 092afe9ed..3394782b5 100644 --- a/Essentials/src/net/ess3/commands/Commandseen.java +++ b/Essentials/src/net/ess3/commands/Commandseen.java @@ -3,10 +3,10 @@ package net.ess3.commands; import lombok.Cleanup; import static net.ess3.I18n._; import net.ess3.api.IUser; -import net.ess3.api.server.CommandSender; import net.ess3.permissions.Permissions; import net.ess3.user.UserData.TimestampType; import net.ess3.utils.DateUtil; +import org.bukkit.command.CommandSender; public class Commandseen extends EssentialsCommand { diff --git a/Essentials/src/net/ess3/commands/Commandsell.java b/Essentials/src/net/ess3/commands/Commandsell.java index 5826d10b4..5fe7fadc5 100644 --- a/Essentials/src/net/ess3/commands/Commandsell.java +++ b/Essentials/src/net/ess3/commands/Commandsell.java @@ -4,11 +4,11 @@ import java.util.Locale; import java.util.logging.Level; import static net.ess3.I18n._; import net.ess3.api.IUser; -import net.ess3.api.server.ItemStack; -import net.ess3.api.server.Material; import net.ess3.craftbukkit.InventoryWorkaround; import net.ess3.economy.Trade; import net.ess3.utils.Util; +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/net/ess3/commands/Commandsetwarp.java b/Essentials/src/net/ess3/commands/Commandsetwarp.java index d44dbc746..28c11940f 100644 --- a/Essentials/src/net/ess3/commands/Commandsetwarp.java +++ b/Essentials/src/net/ess3/commands/Commandsetwarp.java @@ -3,8 +3,8 @@ package net.ess3.commands; import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.api.IWarps; -import net.ess3.api.server.Location; import net.ess3.permissions.WarpPermissions; +import org.bukkit.Location; diff --git a/Essentials/src/net/ess3/commands/Commandsetworth.java b/Essentials/src/net/ess3/commands/Commandsetworth.java index dab455ad2..c7dc18303 100644 --- a/Essentials/src/net/ess3/commands/Commandsetworth.java +++ b/Essentials/src/net/ess3/commands/Commandsetworth.java @@ -2,8 +2,8 @@ package net.ess3.commands; import static net.ess3.I18n._; import net.ess3.api.IUser; -import net.ess3.api.server.CommandSender; -import net.ess3.api.server.ItemStack; +import org.bukkit.command.CommandSender; +import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/net/ess3/commands/Commandspawn.java b/Essentials/src/net/ess3/commands/Commandspawn.java index 88b6af2c1..fb669d907 100644 --- a/Essentials/src/net/ess3/commands/Commandspawn.java +++ b/Essentials/src/net/ess3/commands/Commandspawn.java @@ -2,11 +2,11 @@ package net.ess3.commands; import static net.ess3.I18n._; import net.ess3.api.IUser; -import net.ess3.api.server.CommandSender; -import net.ess3.api.server.Location; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; import net.ess3.settings.SpawnsHolder; +import org.bukkit.Location; +import org.bukkit.command.CommandSender; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/net/ess3/commands/Commandspawner.java b/Essentials/src/net/ess3/commands/Commandspawner.java index 52b37adb7..6a1ddab30 100644 --- a/Essentials/src/net/ess3/commands/Commandspawner.java +++ b/Essentials/src/net/ess3/commands/Commandspawner.java @@ -3,13 +3,13 @@ package net.ess3.commands; import java.util.Locale; import static net.ess3.I18n._; import net.ess3.api.IUser; -import net.ess3.api.server.Location; -import net.ess3.api.server.Material; import net.ess3.bukkit.LivingEntities; import net.ess3.economy.Trade; import net.ess3.permissions.SpawnerPermissions; import net.ess3.utils.LocationUtil; import net.ess3.utils.Util; +import org.bukkit.Location; +import org.bukkit.Material; import org.bukkit.block.CreatureSpawner; diff --git a/Essentials/src/net/ess3/commands/Commandspawnmob.java b/Essentials/src/net/ess3/commands/Commandspawnmob.java index ea908f0b9..0e4243586 100644 --- a/Essentials/src/net/ess3/commands/Commandspawnmob.java +++ b/Essentials/src/net/ess3/commands/Commandspawnmob.java @@ -7,13 +7,13 @@ import java.util.Set; import static net.ess3.I18n._; import net.ess3.api.ISettings; import net.ess3.api.IUser; -import net.ess3.api.server.Location; import net.ess3.bukkit.LivingEntities; import net.ess3.bukkit.LivingEntities.MobException; import net.ess3.permissions.SpawnmobPermissions; import net.ess3.utils.LocationUtil; import net.ess3.utils.Util; import org.bukkit.DyeColor; +import org.bukkit.Location; import org.bukkit.block.Block; import org.bukkit.entity.*; import org.bukkit.entity.Villager.Profession; diff --git a/Essentials/src/net/ess3/commands/Commandsudo.java b/Essentials/src/net/ess3/commands/Commandsudo.java index 84d5d9b36..7d2d8af37 100644 --- a/Essentials/src/net/ess3/commands/Commandsudo.java +++ b/Essentials/src/net/ess3/commands/Commandsudo.java @@ -2,8 +2,8 @@ package net.ess3.commands; import static net.ess3.I18n._; import net.ess3.api.IUser; -import net.ess3.api.server.CommandSender; import net.ess3.permissions.Permissions; +import org.bukkit.command.CommandSender; public class Commandsudo extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandtempban.java b/Essentials/src/net/ess3/commands/Commandtempban.java index a3e648d28..783939c68 100644 --- a/Essentials/src/net/ess3/commands/Commandtempban.java +++ b/Essentials/src/net/ess3/commands/Commandtempban.java @@ -3,11 +3,11 @@ package net.ess3.commands; import net.ess3.Console; import static net.ess3.I18n._; import net.ess3.api.IUser; -import net.ess3.api.server.CommandSender; -import net.ess3.api.server.Player; import net.ess3.permissions.Permissions; import net.ess3.user.Ban; import net.ess3.utils.DateUtil; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandtempban extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandthunder.java b/Essentials/src/net/ess3/commands/Commandthunder.java index 0b96ccc55..eb7d9e1e2 100644 --- a/Essentials/src/net/ess3/commands/Commandthunder.java +++ b/Essentials/src/net/ess3/commands/Commandthunder.java @@ -2,7 +2,7 @@ package net.ess3.commands; import static net.ess3.I18n._; import net.ess3.api.IUser; -import net.ess3.api.server.World; +import org.bukkit.World; public class Commandthunder extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandtime.java b/Essentials/src/net/ess3/commands/Commandtime.java index c0ea66898..d24b1b6d7 100644 --- a/Essentials/src/net/ess3/commands/Commandtime.java +++ b/Essentials/src/net/ess3/commands/Commandtime.java @@ -3,12 +3,12 @@ package net.ess3.commands; import java.util.*; import static net.ess3.I18n._; import net.ess3.api.IUser; -import net.ess3.api.server.CommandSender; -import net.ess3.api.server.Player; -import net.ess3.api.server.World; import net.ess3.permissions.Permissions; import net.ess3.utils.DescParseTickFormat; import net.ess3.utils.Util; +import org.bukkit.World; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandtime extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandtogglejail.java b/Essentials/src/net/ess3/commands/Commandtogglejail.java index aa4eb0b22..059197e93 100644 --- a/Essentials/src/net/ess3/commands/Commandtogglejail.java +++ b/Essentials/src/net/ess3/commands/Commandtogglejail.java @@ -3,10 +3,10 @@ package net.ess3.commands; import lombok.Cleanup; import static net.ess3.I18n._; import net.ess3.api.IUser; -import net.ess3.api.server.CommandSender; import net.ess3.permissions.Permissions; import net.ess3.user.UserData.TimestampType; import net.ess3.utils.DateUtil; +import org.bukkit.command.CommandSender; public class Commandtogglejail extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandtop.java b/Essentials/src/net/ess3/commands/Commandtop.java index 13775f7cc..c45ca0864 100644 --- a/Essentials/src/net/ess3/commands/Commandtop.java +++ b/Essentials/src/net/ess3/commands/Commandtop.java @@ -2,8 +2,8 @@ package net.ess3.commands; import static net.ess3.I18n._; import net.ess3.api.IUser; -import net.ess3.api.server.Location; import net.ess3.economy.Trade; +import org.bukkit.Location; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/net/ess3/commands/Commandtp.java b/Essentials/src/net/ess3/commands/Commandtp.java index eeeffa2e6..b23695270 100644 --- a/Essentials/src/net/ess3/commands/Commandtp.java +++ b/Essentials/src/net/ess3/commands/Commandtp.java @@ -5,10 +5,10 @@ import net.ess3.Console; import static net.ess3.I18n._; import net.ess3.api.ISettings; import net.ess3.api.IUser; -import net.ess3.api.server.CommandSender; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; import net.ess3.permissions.WorldPermissions; +import org.bukkit.command.CommandSender; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/net/ess3/commands/Commandtpaall.java b/Essentials/src/net/ess3/commands/Commandtpaall.java index 79bc2a5fd..02306d64d 100644 --- a/Essentials/src/net/ess3/commands/Commandtpaall.java +++ b/Essentials/src/net/ess3/commands/Commandtpaall.java @@ -4,9 +4,9 @@ import lombok.Cleanup; import static net.ess3.I18n._; import net.ess3.api.ISettings; import net.ess3.api.IUser; -import net.ess3.api.server.CommandSender; -import net.ess3.api.server.Player; import net.ess3.permissions.WorldPermissions; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class Commandtpaall extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandtpall.java b/Essentials/src/net/ess3/commands/Commandtpall.java index 95d3c0d07..4c21f9cf8 100644 --- a/Essentials/src/net/ess3/commands/Commandtpall.java +++ b/Essentials/src/net/ess3/commands/Commandtpall.java @@ -4,9 +4,9 @@ import lombok.Cleanup; import static net.ess3.I18n._; import net.ess3.api.ISettings; import net.ess3.api.IUser; -import net.ess3.api.server.CommandSender; -import net.ess3.api.server.Player; import net.ess3.permissions.WorldPermissions; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; -- cgit v1.2.3