1
0
mirror of https://github.com/essentials/Essentials.git synced 2025-09-25 13:49:12 +02:00

round 2 of import fixing

This commit is contained in:
Iaccidentally
2012-07-17 14:25:40 -04:00
parent 3575428d6b
commit 3c28300b03
19 changed files with 29 additions and 25 deletions

View File

@@ -2,8 +2,9 @@ package net.ess3.commands;
import static net.ess3.I18n._; import static net.ess3.I18n._;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import net.ess3.api.server.Player;
import net.ess3.permissions.Permissions; import net.ess3.permissions.Permissions;
import org.bukkit.entity.Player; //TODO: remove bukkit
import org.bukkit.permissions.PermissionDefault; import org.bukkit.permissions.PermissionDefault;

View File

@@ -1,8 +1,9 @@
package net.ess3.commands; package net.ess3.commands;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import net.ess3.api.server.Location;
import net.ess3.utils.LocationUtil; import net.ess3.utils.LocationUtil;
import org.bukkit.Location;
import org.bukkit.entity.TNTPrimed; import org.bukkit.entity.TNTPrimed;

View File

@@ -4,6 +4,7 @@ import static net.ess3.I18n._;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import net.ess3.api.server.Location; import net.ess3.api.server.Location;
import net.ess3.utils.LocationUtil; import net.ess3.utils.LocationUtil;
//TODO: remove bukkit
import org.bukkit.TreeType; import org.bukkit.TreeType;

View File

@@ -3,7 +3,8 @@ package net.ess3.commands;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import net.ess3.permissions.Permissions; import net.ess3.permissions.Permissions;
import static net.ess3.I18n._; import static net.ess3.I18n._;
import org.bukkit.Material; import net.ess3.api.server.Material;
//TODO: remove bukkit
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockBreakEvent;

View File

@@ -2,7 +2,7 @@ package net.ess3.commands;
import static net.ess3.I18n._; import static net.ess3.I18n._;
import net.ess3.api.server.CommandSender; import net.ess3.api.server.CommandSender;
import org.bukkit.entity.Player; import net.ess3.api.server.Player;
public class Commandburn extends EssentialsCommand public class Commandburn extends EssentialsCommand

View File

@@ -5,7 +5,7 @@ import net.ess3.api.IUser;
import net.ess3.api.server.CommandSender; import net.ess3.api.server.CommandSender;
import net.ess3.permissions.Permissions; import net.ess3.permissions.Permissions;
import java.util.List; import java.util.List;
import org.bukkit.entity.Player; import net.ess3.api.server.Player;
public class Commandclearinventory extends EssentialsCommand public class Commandclearinventory extends EssentialsCommand

View File

@@ -6,7 +6,7 @@ import net.ess3.permissions.Permissions;
import java.util.Locale; import java.util.Locale;
import lombok.Cleanup; import lombok.Cleanup;
import net.ess3.api.server.CommandSender; import net.ess3.api.server.CommandSender;
import org.bukkit.entity.Player; import net.ess3.api.server.Player;
public class Commanddelhome extends EssentialsCommand public class Commanddelhome extends EssentialsCommand

View File

@@ -11,11 +11,11 @@ import java.util.Set;
import java.util.TreeSet; import java.util.TreeSet;
import static net.ess3.I18n._; import static net.ess3.I18n._;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import net.ess3.api.server.ItemStack;
import net.ess3.bukkit.Enchantments; import net.ess3.bukkit.Enchantments;
import net.ess3.permissions.EnchantPermissions; import net.ess3.permissions.EnchantPermissions;
import net.ess3.utils.Util; import net.ess3.utils.Util;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemStack;
public class Commandenchant extends EssentialsCommand public class Commandenchant extends EssentialsCommand

View File

@@ -6,8 +6,9 @@ import net.ess3.api.server.Player;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import net.ess3.api.server.CommandSender; import net.ess3.api.server.CommandSender;
import org.bukkit.Location; import net.ess3.api.server.Location;
import org.bukkit.Material; import net.ess3.api.server.Material;
//TODO: remove bukkit
import org.bukkit.block.Block; import org.bukkit.block.Block;

View File

@@ -2,11 +2,11 @@ package net.ess3.commands;
import static net.ess3.I18n._; import static net.ess3.I18n._;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import net.ess3.api.server.CommandSender;
import net.ess3.api.server.Player;
import net.ess3.craftbukkit.SetExpFix; import net.ess3.craftbukkit.SetExpFix;
import net.ess3.permissions.Permissions; import net.ess3.permissions.Permissions;
import net.ess3.utils.Util; import net.ess3.utils.Util;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class Commandexp extends EssentialsCommand public class Commandexp extends EssentialsCommand
@@ -59,7 +59,7 @@ public class Commandexp extends EssentialsCommand
} }
} }
@Override
public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
{ {
if (args.length < 1) if (args.length < 1)

View File

@@ -3,7 +3,7 @@ package net.ess3.commands;
import static net.ess3.I18n._; import static net.ess3.I18n._;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import net.ess3.api.server.CommandSender; import net.ess3.api.server.CommandSender;
import org.bukkit.entity.Player; import net.ess3.api.server.Player;
public class Commandext extends EssentialsCommand public class Commandext extends EssentialsCommand

View File

@@ -4,7 +4,7 @@ import static net.ess3.I18n._;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import net.ess3.permissions.Permissions; import net.ess3.permissions.Permissions;
import java.util.List; import java.util.List;
import org.bukkit.entity.Player; import net.ess3.api.server.Player;
public class Commandfeed extends EssentialsCommand public class Commandfeed extends EssentialsCommand

View File

@@ -1,6 +1,7 @@
package net.ess3.commands; package net.ess3.commands;
import net.ess3.api.IUser; import net.ess3.api.IUser;
//TODO: remove bukkit
import org.bukkit.entity.Fireball; import org.bukkit.entity.Fireball;
import org.bukkit.entity.SmallFireball; import org.bukkit.entity.SmallFireball;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;

View File

@@ -4,14 +4,14 @@ import java.util.Locale;
import static net.ess3.I18n._; import static net.ess3.I18n._;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import net.ess3.api.server.CommandSender; import net.ess3.api.server.CommandSender;
import net.ess3.api.server.ItemStack;
import net.ess3.api.server.Material;
import net.ess3.api.server.Player; import net.ess3.api.server.Player;
import net.ess3.permissions.GivePermissions; import net.ess3.permissions.GivePermissions;
import net.ess3.utils.Util; import net.ess3.utils.Util;
//TODO: remove bukkit imports //TODO: remove bukkit imports
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemStack;
public class Commandgive extends EssentialsCommand public class Commandgive extends EssentialsCommand

View File

@@ -2,11 +2,11 @@ package net.ess3.commands;
import static net.ess3.I18n._; import static net.ess3.I18n._;
import net.ess3.api.IUser; 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.craftbukkit.InventoryWorkaround;
//TODO: remove bukkit imports //TODO: not sure if this is correct
import org.bukkit.Material; import net.ess3.api.server.IInventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;

View File

@@ -1,8 +1,6 @@
package net.ess3.commands; package net.ess3.commands;
//TODO - replace alll the bukkit imports
import static net.ess3.I18n._; import static net.ess3.I18n._;
import net.ess3.api.server.CommandSender; import net.ess3.api.server.CommandSender;
import net.ess3.api.server.ItemStack; import net.ess3.api.server.ItemStack;
import net.ess3.api.server.Material; import net.ess3.api.server.Material;

View File

@@ -4,8 +4,8 @@ import static net.ess3.I18n._;
import net.ess3.economy.Trade; import net.ess3.economy.Trade;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import net.ess3.api.server.ILocation; //shouldn't this be location? import net.ess3.api.server.ILocation; //shouldn't this be location?
import net.ess3.api.server.Location;
import net.ess3.utils.LocationUtil; import net.ess3.utils.LocationUtil;
import org.bukkit.Location;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;

View File

@@ -1,10 +1,10 @@
package net.ess3.commands; package net.ess3.commands;
import net.ess3.api.server.CommandSender;
import net.ess3.utils.textreader.IText; import net.ess3.utils.textreader.IText;
import net.ess3.utils.textreader.KeywordReplacer; import net.ess3.utils.textreader.KeywordReplacer;
import net.ess3.utils.textreader.TextInput; import net.ess3.utils.textreader.TextInput;
import net.ess3.utils.textreader.TextPager; import net.ess3.utils.textreader.TextPager;
import org.bukkit.command.CommandSender;
public class Commandmotd extends EssentialsCommand public class Commandmotd extends EssentialsCommand

View File

@@ -5,10 +5,10 @@ import java.util.logging.Level;
import static net.ess3.I18n._; import static net.ess3.I18n._;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import net.ess3.api.server.ItemStack; import net.ess3.api.server.ItemStack;
import net.ess3.api.server.Material;
import net.ess3.craftbukkit.InventoryWorkaround; import net.ess3.craftbukkit.InventoryWorkaround;
import net.ess3.economy.Trade; import net.ess3.economy.Trade;
import net.ess3.utils.Util; import net.ess3.utils.Util;
import org.bukkit.Material;