From 46d10fd503316de2425b994538b1aa50699f38bc Mon Sep 17 00:00:00 2001 From: IronCrystal Date: Sat, 2 Aug 2014 08:44:38 -0400 Subject: [PATCH 1/2] Added some events for API --- .gitignore | 1 + .../thezorro266/bukkit/srm/EventListener.java | 29 ++-- .../bukkit/srm/SimpleRegionMarket.java | 4 +- .../customevent/PlayerRentRegionEvent.java | 46 ++++++ .../customevent/PrePlayerClickSignEvent.java | 46 ++++++ .../srm/customevent/RegionExpireEvent.java | 49 +++++++ .../bukkit/srm/scheduler/ClickSignTask.java | 21 +++ .../bukkit/srm/templates/TemplateRent.java | 135 ++++++++++-------- 8 files changed, 260 insertions(+), 71 deletions(-) create mode 100644 src/main/java/com/thezorro266/bukkit/srm/customevent/PlayerRentRegionEvent.java create mode 100644 src/main/java/com/thezorro266/bukkit/srm/customevent/PrePlayerClickSignEvent.java create mode 100644 src/main/java/com/thezorro266/bukkit/srm/customevent/RegionExpireEvent.java create mode 100644 src/main/java/com/thezorro266/bukkit/srm/scheduler/ClickSignTask.java diff --git a/.gitignore b/.gitignore index 0e0d622..8065721 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /.project .idea /*.iml +/bin diff --git a/src/main/java/com/thezorro266/bukkit/srm/EventListener.java b/src/main/java/com/thezorro266/bukkit/srm/EventListener.java index a10d52c..91312af 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/EventListener.java +++ b/src/main/java/com/thezorro266/bukkit/srm/EventListener.java @@ -19,6 +19,8 @@ package com.thezorro266.bukkit.srm; import java.text.MessageFormat; + +import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -27,16 +29,19 @@ import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.SignChangeEvent; import org.bukkit.event.player.PlayerInteractEvent; + +import com.thezorro266.bukkit.srm.customevent.PrePlayerClickSignEvent; import com.thezorro266.bukkit.srm.exceptions.ContentSaveException; import com.thezorro266.bukkit.srm.factories.SignFactory; import com.thezorro266.bukkit.srm.factories.SignFactory.Sign; import com.thezorro266.bukkit.srm.helpers.Location; +import com.thezorro266.bukkit.srm.scheduler.ClickSignTask; import com.thezorro266.bukkit.srm.templates.Template; public class EventListener implements Listener { public EventListener() { SimpleRegionMarket.getInstance().getServer().getPluginManager() - .registerEvents(this, SimpleRegionMarket.getInstance()); + .registerEvents(this, SimpleRegionMarket.getInstance()); } @EventHandler @@ -75,16 +80,16 @@ public void onBlockBreak(BlockBreakEvent event) { } catch (ContentSaveException e) { if (event.getPlayer() != null) event.getPlayer() - .sendMessage( - ChatColor.RED - + LanguageSupport.instance - .getString("region.save.problem.playermsg")); + .sendMessage( + ChatColor.RED + + LanguageSupport.instance + .getString("region.save.problem.playermsg")); SimpleRegionMarket - .getInstance() - .getLogger() - .severe(MessageFormat.format(LanguageSupport.instance - .getString("region.save.problem.console"), sign.getRegion().getName())); + .getInstance() + .getLogger() + .severe(MessageFormat.format(LanguageSupport.instance + .getString("region.save.problem.console"), sign.getRegion().getName())); SimpleRegionMarket.getInstance().printError(e); } } else { @@ -101,7 +106,11 @@ public void onPlayerInteract(PlayerInteractEvent event) { if (event.getAction().equals(Action.RIGHT_CLICK_BLOCK)) { Sign sign = SignFactory.instance.getSignFromLocation(Location.fromBlock(event.getClickedBlock())); if (sign != null) { - sign.getRegion().getTemplate().clickSign(event.getPlayer(), sign); + PrePlayerClickSignEvent playerEvent = new PrePlayerClickSignEvent(event.getPlayer(), sign); // Create the event here + Bukkit.getServer().getPluginManager().callEvent(playerEvent); // Call the event + if (!playerEvent.isCancelled()) { + Bukkit.getScheduler().runTaskLater(SimpleRegionMarket.getInstance(), new ClickSignTask(event.getPlayer(), sign), 1L); + } } } } diff --git a/src/main/java/com/thezorro266/bukkit/srm/SimpleRegionMarket.java b/src/main/java/com/thezorro266/bukkit/srm/SimpleRegionMarket.java index d7b1888..30d3f82 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/SimpleRegionMarket.java +++ b/src/main/java/com/thezorro266/bukkit/srm/SimpleRegionMarket.java @@ -23,8 +23,11 @@ import java.util.logging.Level; import com.thezorro266.bukkit.srm.hooks.*; + import lombok.Getter; + import org.bukkit.plugin.java.JavaPlugin; + import com.thezorro266.bukkit.srm.exceptions.ContentLoadException; import com.thezorro266.bukkit.srm.exceptions.TemplateFormatException; import com.thezorro266.bukkit.srm.factories.RegionFactory; @@ -153,7 +156,6 @@ public void onEnable() { // Register events playerManager.registerEvents(); new EventListener(); - // Set command executor getCommand(SRM_COMMAND).setExecutor(new CommandHandler()); diff --git a/src/main/java/com/thezorro266/bukkit/srm/customevent/PlayerRentRegionEvent.java b/src/main/java/com/thezorro266/bukkit/srm/customevent/PlayerRentRegionEvent.java new file mode 100644 index 0000000..d7593e4 --- /dev/null +++ b/src/main/java/com/thezorro266/bukkit/srm/customevent/PlayerRentRegionEvent.java @@ -0,0 +1,46 @@ +package com.thezorro266.bukkit.srm.customevent; + +import org.bukkit.entity.Player; +import org.bukkit.event.Cancellable; +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; + +import com.thezorro266.bukkit.srm.factories.SignFactory; + +public final class PlayerRentRegionEvent extends Event implements Cancellable { + private static final HandlerList handlers = new HandlerList(); + private Player player; + private SignFactory.Sign sign; + private boolean cancelled; + + public PlayerRentRegionEvent(Player player, SignFactory.Sign sign) { + this.player = player; + this.sign = sign; + } + + public Player getPlayer() { + return player; + } + + public SignFactory.Sign getSign() { + return sign; + } + + public HandlerList getHandlers() { + return handlers; + } + + public static HandlerList getHandlerList() { + return handlers; + } + + @Override + public boolean isCancelled() { + return cancelled; + } + + @Override + public void setCancelled(boolean arg0) { + this.cancelled = arg0; + } +} \ No newline at end of file diff --git a/src/main/java/com/thezorro266/bukkit/srm/customevent/PrePlayerClickSignEvent.java b/src/main/java/com/thezorro266/bukkit/srm/customevent/PrePlayerClickSignEvent.java new file mode 100644 index 0000000..c21568a --- /dev/null +++ b/src/main/java/com/thezorro266/bukkit/srm/customevent/PrePlayerClickSignEvent.java @@ -0,0 +1,46 @@ +package com.thezorro266.bukkit.srm.customevent; + +import org.bukkit.entity.Player; +import org.bukkit.event.Cancellable; +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; + +import com.thezorro266.bukkit.srm.factories.SignFactory; + +public final class PrePlayerClickSignEvent extends Event implements Cancellable { + private static final HandlerList handlers = new HandlerList(); + private Player player; + private SignFactory.Sign sign; + private boolean cancelled; + + public PrePlayerClickSignEvent(Player player, SignFactory.Sign sign) { + this.player = player; + this.sign = sign; + } + + public Player getPlayer() { + return player; + } + + public SignFactory.Sign getSign() { + return sign; + } + + public HandlerList getHandlers() { + return handlers; + } + + public static HandlerList getHandlerList() { + return handlers; + } + + @Override + public boolean isCancelled() { + return cancelled; + } + + @Override + public void setCancelled(boolean arg0) { + this.cancelled = arg0; + } +} \ No newline at end of file diff --git a/src/main/java/com/thezorro266/bukkit/srm/customevent/RegionExpireEvent.java b/src/main/java/com/thezorro266/bukkit/srm/customevent/RegionExpireEvent.java new file mode 100644 index 0000000..52b7c13 --- /dev/null +++ b/src/main/java/com/thezorro266/bukkit/srm/customevent/RegionExpireEvent.java @@ -0,0 +1,49 @@ +package com.thezorro266.bukkit.srm.customevent; + +import org.bukkit.OfflinePlayer; +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; + +import com.thezorro266.bukkit.srm.factories.RegionFactory; +import com.thezorro266.bukkit.srm.templates.TemplateRent; + +public class RegionExpireEvent extends Event { + private static final HandlerList handlers = new HandlerList(); + private RegionFactory.Region region; + private OfflinePlayer customer; + private OfflinePlayer owner; + private TemplateRent template; + + public RegionExpireEvent(RegionFactory.Region region, OfflinePlayer customer, OfflinePlayer owner, TemplateRent template) { + this.region = region; + this.customer = customer; + this.owner = owner; + this.template = template; + } + + + public HandlerList getHandlers() { + return handlers; + } + + public static HandlerList getHandlerList() { + return handlers; + } + + public RegionFactory.Region getRegion() { + return region; + } + + public OfflinePlayer getCustomer() { + return customer; + } + + public OfflinePlayer getOwner() { + return owner; + } + + + public TemplateRent getTemplate() { + return template; + } +} diff --git a/src/main/java/com/thezorro266/bukkit/srm/scheduler/ClickSignTask.java b/src/main/java/com/thezorro266/bukkit/srm/scheduler/ClickSignTask.java new file mode 100644 index 0000000..9266a77 --- /dev/null +++ b/src/main/java/com/thezorro266/bukkit/srm/scheduler/ClickSignTask.java @@ -0,0 +1,21 @@ +package com.thezorro266.bukkit.srm.scheduler; + +import org.bukkit.entity.Player; + +import com.thezorro266.bukkit.srm.factories.SignFactory; + +public class ClickSignTask implements Runnable { + private Player p; + private SignFactory.Sign sign; + + public ClickSignTask(Player p, SignFactory.Sign sign) { + this.p = p; + this.sign = sign; + } + + @Override + public void run() { + sign.getRegion().getTemplate().clickSign(p, sign); + } + +} diff --git a/src/main/java/com/thezorro266/bukkit/srm/templates/TemplateRent.java b/src/main/java/com/thezorro266/bukkit/srm/templates/TemplateRent.java index b4cf732..0a16ac3 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/templates/TemplateRent.java +++ b/src/main/java/com/thezorro266/bukkit/srm/templates/TemplateRent.java @@ -21,10 +21,13 @@ import com.thezorro266.bukkit.srm.LanguageSupport; import com.thezorro266.bukkit.srm.SimpleRegionMarket; import com.thezorro266.bukkit.srm.Utils; +import com.thezorro266.bukkit.srm.customevent.PlayerRentRegionEvent; +import com.thezorro266.bukkit.srm.customevent.RegionExpireEvent; import com.thezorro266.bukkit.srm.exceptions.ContentSaveException; import com.thezorro266.bukkit.srm.factories.RegionFactory; import com.thezorro266.bukkit.srm.factories.SignFactory; import com.thezorro266.bukkit.srm.hooks.Economy; + import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.OfflinePlayer; @@ -41,9 +44,50 @@ public TemplateRent(ConfigurationSection templateConfigSection) { @Override public void clickSign(Player player, SignFactory.Sign sign) { - RegionFactory.Region region = sign.getRegion(); - if (isRegionOccupied(region)) { - if (isRegionOwner(player, region)) { + /** + * Calling Custom Event + */ + PlayerRentRegionEvent event = new PlayerRentRegionEvent(player, sign); // Create the event here + Bukkit.getServer().getPluginManager().callEvent(event); // Call the event + + if (!event.isCancelled()) { // Check if the event is not cancelled + RegionFactory.Region region = sign.getRegion(); + if (isRegionOccupied(region)) { + if (isRegionOwner(player, region)) { + // TODO: Player permissions + Economy ec = SimpleRegionMarket.getInstance().getEconomy(); + double price = (Double) region.getOptions().get("price"); + String playerAccount = player.getName(); + String regionAccount = (String) region.getOptions().get("account"); + if (ec.isEnabled() && price > 0) { + if (!ec.isValidAccount(playerAccount)) { + player.sendMessage(LanguageSupport.instance.getString("economy.player.no.account")); + return; + } + if (!ec.hasEnough(playerAccount, price)) { + player.sendMessage(LanguageSupport.instance.getString("economy.player.no.money")); + return; + } + } + ec.subtractMoney(playerAccount, price); + if (!regionAccount.isEmpty() && ec.isValidAccount(regionAccount)) { + ec.addMoney(regionAccount, price); + } + + int time = (Integer) region.getOptions().get("time"); + int newtime = (Integer) region.getOptions().get("renttime") + time; + if (newtime - (int) (System.currentTimeMillis() / 1000) <= maxTime) { + region.getOptions().set("renttime", newtime); + + player.sendMessage(MessageFormat.format(LanguageSupport.instance.getString("region.expanded"), + Utils.getTimeString(time))); + } else { + player.sendMessage(LanguageSupport.instance.getString("region.expand.maxtime.reached")); + } + } else { + player.sendMessage(LanguageSupport.instance.getString("region.already.rented")); + } + } else { // TODO: Player permissions Economy ec = SimpleRegionMarket.getInstance().getEconomy(); double price = (Double) region.getOptions().get("price"); @@ -64,71 +108,39 @@ public void clickSign(Player player, SignFactory.Sign sign) { ec.addMoney(regionAccount, price); } - int time = (Integer) region.getOptions().get("time"); - int newtime = (Integer) region.getOptions().get("renttime") + time; - if (newtime - (int) (System.currentTimeMillis() / 1000) <= maxTime) { - region.getOptions().set("renttime", newtime); - - player.sendMessage(MessageFormat.format(LanguageSupport.instance.getString("region.expanded"), - Utils.getTimeString(time))); + clearRegion(region); + if (buyerIsOwner) { + setRegionOwners(region, new OfflinePlayer[] { player }); } else { - player.sendMessage(LanguageSupport.instance.getString("region.expand.maxtime.reached")); - } - } else { - player.sendMessage(LanguageSupport.instance.getString("region.already.rented")); - } - } else { - // TODO: Player permissions - Economy ec = SimpleRegionMarket.getInstance().getEconomy(); - double price = (Double) region.getOptions().get("price"); - String playerAccount = player.getName(); - String regionAccount = (String) region.getOptions().get("account"); - if (ec.isEnabled() && price > 0) { - if (!ec.isValidAccount(playerAccount)) { - player.sendMessage(LanguageSupport.instance.getString("economy.player.no.account")); - return; - } - if (!ec.hasEnough(playerAccount, price)) { - player.sendMessage(LanguageSupport.instance.getString("economy.player.no.money")); - return; + setRegionMembers(region, new OfflinePlayer[] { player }); } - } - ec.subtractMoney(playerAccount, price); - if (!regionAccount.isEmpty() && ec.isValidAccount(regionAccount)) { - ec.addMoney(regionAccount, price); - } - clearRegion(region); - if (buyerIsOwner) { - setRegionOwners(region, new OfflinePlayer[] { player }); - } else { - setRegionMembers(region, new OfflinePlayer[] { player }); - } + int currentSecs = (int) (System.currentTimeMillis() / 1000); + int time = (Integer) region.getOptions().get("time"); + region.getOptions().set("renttime", currentSecs + time); + + region.getOptions().set("owner", player.getName()); + setRegionOccupied(region, true); + + try { + SimpleRegionMarket.getInstance().getTemplateManager().saveRegion(region); + } catch (ContentSaveException e) { + player.sendMessage(ChatColor.RED + LanguageSupport.instance.getString("region.save.problem.player")); + SimpleRegionMarket + .getInstance() + .getLogger() + .severe(MessageFormat.format(LanguageSupport.instance.getString("region.save.problem.console"), + region.getName())); + SimpleRegionMarket.getInstance().printError(e); + } - int currentSecs = (int) (System.currentTimeMillis() / 1000); - int time = (Integer) region.getOptions().get("time"); - region.getOptions().set("renttime", currentSecs + time); - - region.getOptions().set("owner", player.getName()); - setRegionOccupied(region, true); - - try { - SimpleRegionMarket.getInstance().getTemplateManager().saveRegion(region); - } catch (ContentSaveException e) { - player.sendMessage(ChatColor.RED + LanguageSupport.instance.getString("region.save.problem.player")); - SimpleRegionMarket - .getInstance() - .getLogger() - .severe(MessageFormat.format(LanguageSupport.instance.getString("region.save.problem.console"), - region.getName())); - SimpleRegionMarket.getInstance().printError(e); + player.sendMessage(LanguageSupport.instance.getString("region.new.owner")); } - - player.sendMessage(LanguageSupport.instance.getString("region.new.owner")); + region.updateSigns(); } - region.updateSigns(); } + @SuppressWarnings("deprecation") @Override public void schedule() { synchronized (regionList) { @@ -137,7 +149,10 @@ public void schedule() { int currentSecs = (int) (System.currentTimeMillis() / 1000); if (currentSecs > (Integer) region.getOptions().get("renttime")) { + OfflinePlayer op = Bukkit.getOfflinePlayer((String) region.getOptions().get("owner")); + RegionExpireEvent event = new RegionExpireEvent(region, op, Bukkit.getOfflinePlayer((String) region.getOptions().get("account")), this); // Create the event here + Bukkit.getServer().getPluginManager().callEvent(event); // Call the event clearRegion(region); From b0a366da2b0f81717c401f23294e73869bd06dd6 Mon Sep 17 00:00:00 2001 From: IronCrystal Date: Sat, 16 Aug 2014 10:53:27 -0400 Subject: [PATCH 2/2] Update for college --- .../thezorro266/bukkit/srm/CommandHandler.java | 13 +++++++------ .../thezorro266/bukkit/srm/LanguageSupport.java | 1 + .../thezorro266/bukkit/srm/PlayerManager.java | 13 +++++++------ .../bukkit/srm/SimpleRegionMarket.java | 9 +++++++-- .../thezorro266/bukkit/srm/TemplateManager.java | 5 ++++- .../java/com/thezorro266/bukkit/srm/Utils.java | 1 - .../bukkit/srm/WorldEditManager.java | 4 ++++ .../bukkit/srm/WorldGuardManager.java | 2 ++ .../srm/customevent/PlayerRentRegionEvent.java | 3 ++- .../customevent/PrePlayerClickSignEvent.java | 3 ++- .../srm/customevent/RegionExpireEvent.java | 1 + .../bukkit/srm/factories/RegionFactory.java | 4 +++- .../bukkit/srm/factories/SignFactory.java | 4 +++- .../bukkit/srm/helpers/Location.java | 3 ++- .../bukkit/srm/helpers/LocationSignHelper.java | 1 + .../bukkit/srm/helpers/RegionOwner.java | 5 +++-- .../bukkit/srm/helpers/WorldHelper.java | 2 ++ .../bukkit/srm/hooks/BasicPermissions.java | 4 ++-- .../thezorro266/bukkit/srm/hooks/Economy.java | 1 - .../bukkit/srm/hooks/Permissions.java | 8 ++------ .../bukkit/srm/hooks/VaultEconomy.java | 8 +++++--- .../thezorro266/bukkit/srm/hooks/VaultHook.java | 6 ++++-- .../bukkit/srm/hooks/VaultPermissions.java | 10 ++++++---- .../srm/templates/OwnableRegionTemplate.java | 1 + .../bukkit/srm/templates/SignTemplate.java | 3 +++ .../bukkit/srm/templates/Template.java | 3 ++- .../bukkit/srm/templates/TemplateAuction.java | 1 + .../bukkit/srm/templates/TemplateLease.java | 3 ++- .../bukkit/srm/templates/TemplateRent.java | 17 ++++++++--------- .../bukkit/srm/templates/TemplateSell.java | 3 ++- .../templates/interfaces/OwnableTemplate.java | 1 + .../srm/templates/interfaces/TimedTemplate.java | 1 + 32 files changed, 91 insertions(+), 53 deletions(-) diff --git a/src/main/java/com/thezorro266/bukkit/srm/CommandHandler.java b/src/main/java/com/thezorro266/bukkit/srm/CommandHandler.java index ed28869..31e1b3e 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/CommandHandler.java +++ b/src/main/java/com/thezorro266/bukkit/srm/CommandHandler.java @@ -18,10 +18,9 @@ package com.thezorro266.bukkit.srm; -import com.thezorro266.bukkit.srm.exceptions.ContentSaveException; -import com.thezorro266.bukkit.srm.factories.RegionFactory; -import com.thezorro266.bukkit.srm.factories.RegionFactory.Region; -import com.thezorro266.bukkit.srm.templates.interfaces.OwnableTemplate; +import java.text.MessageFormat; +import java.util.ArrayList; + import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.World; @@ -30,8 +29,10 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import java.text.MessageFormat; -import java.util.ArrayList; +import com.thezorro266.bukkit.srm.exceptions.ContentSaveException; +import com.thezorro266.bukkit.srm.factories.RegionFactory; +import com.thezorro266.bukkit.srm.factories.RegionFactory.Region; +import com.thezorro266.bukkit.srm.templates.interfaces.OwnableTemplate; public class CommandHandler implements CommandExecutor { diff --git a/src/main/java/com/thezorro266/bukkit/srm/LanguageSupport.java b/src/main/java/com/thezorro266/bukkit/srm/LanguageSupport.java index 219d1a7..36f19b7 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/LanguageSupport.java +++ b/src/main/java/com/thezorro266/bukkit/srm/LanguageSupport.java @@ -21,6 +21,7 @@ import java.util.Locale; import java.util.MissingResourceException; import java.util.ResourceBundle; + import lombok.Getter; public final class LanguageSupport { diff --git a/src/main/java/com/thezorro266/bukkit/srm/PlayerManager.java b/src/main/java/com/thezorro266/bukkit/srm/PlayerManager.java index 272b253..9db1e15 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/PlayerManager.java +++ b/src/main/java/com/thezorro266/bukkit/srm/PlayerManager.java @@ -18,18 +18,19 @@ package com.thezorro266.bukkit.srm; -import com.thezorro266.bukkit.srm.factories.RegionFactory; -import com.thezorro266.bukkit.srm.helpers.RegionOwner; -import com.thezorro266.bukkit.srm.templates.Template; -import com.thezorro266.bukkit.srm.templates.interfaces.OwnableTemplate; +import java.util.ArrayList; +import java.util.Iterator; + import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; -import java.util.ArrayList; -import java.util.Iterator; +import com.thezorro266.bukkit.srm.factories.RegionFactory; +import com.thezorro266.bukkit.srm.helpers.RegionOwner; +import com.thezorro266.bukkit.srm.templates.Template; +import com.thezorro266.bukkit.srm.templates.interfaces.OwnableTemplate; public class PlayerManager implements Listener { private final ArrayList ownerList = new ArrayList(); diff --git a/src/main/java/com/thezorro266/bukkit/srm/SimpleRegionMarket.java b/src/main/java/com/thezorro266/bukkit/srm/SimpleRegionMarket.java index 30d3f82..2aaefd5 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/SimpleRegionMarket.java +++ b/src/main/java/com/thezorro266/bukkit/srm/SimpleRegionMarket.java @@ -22,8 +22,6 @@ import java.text.MessageFormat; import java.util.logging.Level; -import com.thezorro266.bukkit.srm.hooks.*; - import lombok.Getter; import org.bukkit.plugin.java.JavaPlugin; @@ -33,6 +31,13 @@ import com.thezorro266.bukkit.srm.factories.RegionFactory; import com.thezorro266.bukkit.srm.helpers.LocationSignHelper; import com.thezorro266.bukkit.srm.helpers.WorldHelper; +import com.thezorro266.bukkit.srm.hooks.BasicPermissions; +import com.thezorro266.bukkit.srm.hooks.Economy; +import com.thezorro266.bukkit.srm.hooks.NoEconomy; +import com.thezorro266.bukkit.srm.hooks.Permissions; +import com.thezorro266.bukkit.srm.hooks.VaultEconomy; +import com.thezorro266.bukkit.srm.hooks.VaultHook; +import com.thezorro266.bukkit.srm.hooks.VaultPermissions; import com.thezorro266.bukkit.srm.templates.Template; import com.thezorro266.bukkit.srm.templates.interfaces.TimedTemplate; diff --git a/src/main/java/com/thezorro266/bukkit/srm/TemplateManager.java b/src/main/java/com/thezorro266/bukkit/srm/TemplateManager.java index ee86e24..a746d10 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/TemplateManager.java +++ b/src/main/java/com/thezorro266/bukkit/srm/TemplateManager.java @@ -19,6 +19,7 @@ package com.thezorro266.bukkit.srm; import static com.thezorro266.bukkit.srm.factories.SignFactory.Sign.SIGN_LINE_COUNT; + import java.io.File; import java.io.FileNotFoundException; import java.io.FilenameFilter; @@ -26,12 +27,15 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; + import lombok.Getter; + import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; + import com.sk89q.worldguard.protection.regions.ProtectedRegion; import com.thezorro266.bukkit.srm.exceptions.ContentLoadException; import com.thezorro266.bukkit.srm.exceptions.ContentSaveException; @@ -194,7 +198,6 @@ private void updateAgents(YamlConfiguration agentsYaml) throws TemplateFormatExc load(); } - @SuppressWarnings("HardCodedStringLiteral") private void update(File templateFile, YamlConfiguration templateYaml) throws TemplateFormatException, IOException { // Old diff --git a/src/main/java/com/thezorro266/bukkit/srm/Utils.java b/src/main/java/com/thezorro266/bukkit/srm/Utils.java index 9d0b114..dbcf921 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/Utils.java +++ b/src/main/java/com/thezorro266/bukkit/srm/Utils.java @@ -21,7 +21,6 @@ /** * Class with several util functions. */ -@SuppressWarnings("HardCodedStringLiteral") public class Utils { /** * Generates a string, which represents the time left until the given time. diff --git a/src/main/java/com/thezorro266/bukkit/srm/WorldEditManager.java b/src/main/java/com/thezorro266/bukkit/srm/WorldEditManager.java index 96d87ac..209ab95 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/WorldEditManager.java +++ b/src/main/java/com/thezorro266/bukkit/srm/WorldEditManager.java @@ -21,12 +21,15 @@ import java.io.File; import java.io.IOException; import java.text.MessageFormat; + import lombok.Getter; + import org.bukkit.Bukkit; import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.UnknownDependencyException; + import com.sk89q.worldedit.BlockVector; import com.sk89q.worldedit.CuboidClipboard; import com.sk89q.worldedit.EditSession; @@ -157,6 +160,7 @@ public void saveRegionToSchematic(RegionFactory.Region region) throws IOExceptio } } + @SuppressWarnings("deprecation") public CuboidClipboard getClipboardFromRegion(RegionFactory.Region region) { if (region.getWorldguardRegion() instanceof ProtectedCuboidRegion) { ProtectedCuboidRegion cuboid = (ProtectedCuboidRegion) region.getWorldguardRegion(); diff --git a/src/main/java/com/thezorro266/bukkit/srm/WorldGuardManager.java b/src/main/java/com/thezorro266/bukkit/srm/WorldGuardManager.java index 1bc8813..cf79e95 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/WorldGuardManager.java +++ b/src/main/java/com/thezorro266/bukkit/srm/WorldGuardManager.java @@ -21,12 +21,14 @@ import java.lang.ref.WeakReference; import java.util.Set; import java.util.WeakHashMap; + import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.UnknownDependencyException; + import com.sk89q.wepif.PermissionsResolverManager; import com.sk89q.worldedit.Vector; import com.sk89q.worldguard.LocalPlayer; diff --git a/src/main/java/com/thezorro266/bukkit/srm/customevent/PlayerRentRegionEvent.java b/src/main/java/com/thezorro266/bukkit/srm/customevent/PlayerRentRegionEvent.java index d7593e4..4676064 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/customevent/PlayerRentRegionEvent.java +++ b/src/main/java/com/thezorro266/bukkit/srm/customevent/PlayerRentRegionEvent.java @@ -26,7 +26,8 @@ public SignFactory.Sign getSign() { return sign; } - public HandlerList getHandlers() { + @Override + public HandlerList getHandlers() { return handlers; } diff --git a/src/main/java/com/thezorro266/bukkit/srm/customevent/PrePlayerClickSignEvent.java b/src/main/java/com/thezorro266/bukkit/srm/customevent/PrePlayerClickSignEvent.java index c21568a..45df7e1 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/customevent/PrePlayerClickSignEvent.java +++ b/src/main/java/com/thezorro266/bukkit/srm/customevent/PrePlayerClickSignEvent.java @@ -26,7 +26,8 @@ public SignFactory.Sign getSign() { return sign; } - public HandlerList getHandlers() { + @Override + public HandlerList getHandlers() { return handlers; } diff --git a/src/main/java/com/thezorro266/bukkit/srm/customevent/RegionExpireEvent.java b/src/main/java/com/thezorro266/bukkit/srm/customevent/RegionExpireEvent.java index 52b7c13..b9c2e3f 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/customevent/RegionExpireEvent.java +++ b/src/main/java/com/thezorro266/bukkit/srm/customevent/RegionExpireEvent.java @@ -22,6 +22,7 @@ public RegionExpireEvent(RegionFactory.Region region, OfflinePlayer customer, Of } + @Override public HandlerList getHandlers() { return handlers; } diff --git a/src/main/java/com/thezorro266/bukkit/srm/factories/RegionFactory.java b/src/main/java/com/thezorro266/bukkit/srm/factories/RegionFactory.java index c05e7bd..18b1076 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/factories/RegionFactory.java +++ b/src/main/java/com/thezorro266/bukkit/srm/factories/RegionFactory.java @@ -22,13 +22,16 @@ import java.util.HashMap; import java.util.Map.Entry; import java.util.Set; + import lombok.Getter; + import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.configuration.Configuration; import org.bukkit.configuration.ConfigurationSection; + import com.sk89q.worldguard.protection.ApplicableRegionSet; import com.sk89q.worldguard.protection.managers.RegionManager; import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion; @@ -235,7 +238,6 @@ private void saveOptions(Configuration config, String path) { } } - @SuppressWarnings("HardCodedStringLiteral") @Override public String toString() { return String.format("Region[%s,w:%s,t:%s]", getName(), world.getName(), template.toString()); diff --git a/src/main/java/com/thezorro266/bukkit/srm/factories/SignFactory.java b/src/main/java/com/thezorro266/bukkit/srm/factories/SignFactory.java index 742df21..2cb4aad 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/factories/SignFactory.java +++ b/src/main/java/com/thezorro266/bukkit/srm/factories/SignFactory.java @@ -20,13 +20,16 @@ import java.util.Map; import java.util.Set; + import lombok.Data; import lombok.Getter; + import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.configuration.Configuration; import org.bukkit.configuration.ConfigurationSection; + import com.thezorro266.bukkit.srm.SimpleRegionMarket; import com.thezorro266.bukkit.srm.exceptions.ContentLoadException; import com.thezorro266.bukkit.srm.factories.RegionFactory.Region; @@ -183,7 +186,6 @@ private void saveOptions(Configuration config, String path) { } } - @SuppressWarnings("HardCodedStringLiteral") @Override public String toString() { return String.format("Sign[r:%s,l:%s]", region.getName(), location); diff --git a/src/main/java/com/thezorro266/bukkit/srm/helpers/Location.java b/src/main/java/com/thezorro266/bukkit/srm/helpers/Location.java index 3c44ad8..c49971c 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/helpers/Location.java +++ b/src/main/java/com/thezorro266/bukkit/srm/helpers/Location.java @@ -19,10 +19,12 @@ package com.thezorro266.bukkit.srm.helpers; import lombok.Data; + import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.configuration.Configuration; + import com.thezorro266.bukkit.srm.exceptions.ContentLoadException; public @Data @@ -86,7 +88,6 @@ public void saveToConfiguration(Configuration config, String path) { config.set(path + "z", z); } - @SuppressWarnings("HardCodedStringLiteral") @Override public String toString() { return String.format("Location[w:%s,c:(%d,%d,%d)]", world.getName(), x, y, z); diff --git a/src/main/java/com/thezorro266/bukkit/srm/helpers/LocationSignHelper.java b/src/main/java/com/thezorro266/bukkit/srm/helpers/LocationSignHelper.java index f21a11d..151074a 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/helpers/LocationSignHelper.java +++ b/src/main/java/com/thezorro266/bukkit/srm/helpers/LocationSignHelper.java @@ -19,6 +19,7 @@ package com.thezorro266.bukkit.srm.helpers; import java.util.ArrayList; + import com.thezorro266.bukkit.srm.factories.SignFactory.Sign; public class LocationSignHelper { diff --git a/src/main/java/com/thezorro266/bukkit/srm/helpers/RegionOwner.java b/src/main/java/com/thezorro266/bukkit/srm/helpers/RegionOwner.java index 92ff8b1..849b33f 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/helpers/RegionOwner.java +++ b/src/main/java/com/thezorro266/bukkit/srm/helpers/RegionOwner.java @@ -18,10 +18,11 @@ package com.thezorro266.bukkit.srm.helpers; -import com.thezorro266.bukkit.srm.factories.RegionFactory; +import java.lang.ref.WeakReference; + import org.bukkit.entity.Player; -import java.lang.ref.WeakReference; +import com.thezorro266.bukkit.srm.factories.RegionFactory; public class RegionOwner { private WeakReference player; diff --git a/src/main/java/com/thezorro266/bukkit/srm/helpers/WorldHelper.java b/src/main/java/com/thezorro266/bukkit/srm/helpers/WorldHelper.java index 8a429fb..86da9c3 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/helpers/WorldHelper.java +++ b/src/main/java/com/thezorro266/bukkit/srm/helpers/WorldHelper.java @@ -22,7 +22,9 @@ import java.util.Iterator; import java.util.Map.Entry; import java.util.WeakHashMap; + import org.bukkit.World; + import com.thezorro266.bukkit.srm.factories.RegionFactory.Region; public class WorldHelper { diff --git a/src/main/java/com/thezorro266/bukkit/srm/hooks/BasicPermissions.java b/src/main/java/com/thezorro266/bukkit/srm/hooks/BasicPermissions.java index f799f92..d4a8163 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/hooks/BasicPermissions.java +++ b/src/main/java/com/thezorro266/bukkit/srm/hooks/BasicPermissions.java @@ -18,11 +18,11 @@ package com.thezorro266.bukkit.srm.hooks; +import java.util.ArrayList; + import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import java.util.ArrayList; - public class BasicPermissions extends Permissions { public BasicPermissions() { enabled = true; diff --git a/src/main/java/com/thezorro266/bukkit/srm/hooks/Economy.java b/src/main/java/com/thezorro266/bukkit/srm/hooks/Economy.java index d76ff5b..78bbe07 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/hooks/Economy.java +++ b/src/main/java/com/thezorro266/bukkit/srm/hooks/Economy.java @@ -18,7 +18,6 @@ package com.thezorro266.bukkit.srm.hooks; -import com.thezorro266.bukkit.srm.SimpleRegionMarket; public abstract class Economy { protected boolean enabled = false; diff --git a/src/main/java/com/thezorro266/bukkit/srm/hooks/Permissions.java b/src/main/java/com/thezorro266/bukkit/srm/hooks/Permissions.java index 42b3f03..9d449cb 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/hooks/Permissions.java +++ b/src/main/java/com/thezorro266/bukkit/srm/hooks/Permissions.java @@ -18,15 +18,11 @@ package com.thezorro266.bukkit.srm.hooks; -import com.thezorro266.bukkit.srm.LanguageSupport; -import com.thezorro266.bukkit.srm.SimpleRegionMarket; +import java.util.ArrayList; + import org.bukkit.command.CommandSender; -import org.bukkit.command.ConsoleCommandSender; import org.bukkit.entity.Player; -import java.text.MessageFormat; -import java.util.ArrayList; - public abstract class Permissions { protected boolean enabled = false; diff --git a/src/main/java/com/thezorro266/bukkit/srm/hooks/VaultEconomy.java b/src/main/java/com/thezorro266/bukkit/srm/hooks/VaultEconomy.java index 06fb11c..6328c48 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/hooks/VaultEconomy.java +++ b/src/main/java/com/thezorro266/bukkit/srm/hooks/VaultEconomy.java @@ -18,13 +18,15 @@ package com.thezorro266.bukkit.srm.hooks; -import com.thezorro266.bukkit.srm.LanguageSupport; -import com.thezorro266.bukkit.srm.SimpleRegionMarket; +import java.text.MessageFormat; + import net.milkbowl.vault.economy.EconomyResponse; + import org.bukkit.Bukkit; import org.bukkit.plugin.RegisteredServiceProvider; -import java.text.MessageFormat; +import com.thezorro266.bukkit.srm.LanguageSupport; +import com.thezorro266.bukkit.srm.SimpleRegionMarket; public class VaultEconomy extends Economy { private net.milkbowl.vault.economy.Economy economy = null; diff --git a/src/main/java/com/thezorro266/bukkit/srm/hooks/VaultHook.java b/src/main/java/com/thezorro266/bukkit/srm/hooks/VaultHook.java index 73bfe66..f55e881 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/hooks/VaultHook.java +++ b/src/main/java/com/thezorro266/bukkit/srm/hooks/VaultHook.java @@ -18,12 +18,14 @@ package com.thezorro266.bukkit.srm.hooks; -import com.thezorro266.bukkit.srm.LanguageSupport; -import com.thezorro266.bukkit.srm.SimpleRegionMarket; import net.milkbowl.vault.Vault; + import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; +import com.thezorro266.bukkit.srm.LanguageSupport; +import com.thezorro266.bukkit.srm.SimpleRegionMarket; + public class VaultHook { private static final String VAULT_PLGUIN_NAME = "Vault"; //NON-NLS diff --git a/src/main/java/com/thezorro266/bukkit/srm/hooks/VaultPermissions.java b/src/main/java/com/thezorro266/bukkit/srm/hooks/VaultPermissions.java index 17e0d8e..238e47b 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/hooks/VaultPermissions.java +++ b/src/main/java/com/thezorro266/bukkit/srm/hooks/VaultPermissions.java @@ -18,16 +18,18 @@ package com.thezorro266.bukkit.srm.hooks; -import com.thezorro266.bukkit.srm.LanguageSupport; -import com.thezorro266.bukkit.srm.SimpleRegionMarket; +import java.text.MessageFormat; +import java.util.ArrayList; + import net.milkbowl.vault.permission.Permission; + import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.plugin.RegisteredServiceProvider; -import java.text.MessageFormat; -import java.util.ArrayList; +import com.thezorro266.bukkit.srm.LanguageSupport; +import com.thezorro266.bukkit.srm.SimpleRegionMarket; public class VaultPermissions extends Permissions { private Permission permission = null; diff --git a/src/main/java/com/thezorro266/bukkit/srm/templates/OwnableRegionTemplate.java b/src/main/java/com/thezorro266/bukkit/srm/templates/OwnableRegionTemplate.java index faf172f..b7ede03 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/templates/OwnableRegionTemplate.java +++ b/src/main/java/com/thezorro266/bukkit/srm/templates/OwnableRegionTemplate.java @@ -20,6 +20,7 @@ import org.bukkit.OfflinePlayer; import org.bukkit.configuration.ConfigurationSection; + import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException; import com.thezorro266.bukkit.srm.SimpleRegionMarket; import com.thezorro266.bukkit.srm.WorldGuardManager; diff --git a/src/main/java/com/thezorro266/bukkit/srm/templates/SignTemplate.java b/src/main/java/com/thezorro266/bukkit/srm/templates/SignTemplate.java index 1da13b4..5f814e2 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/templates/SignTemplate.java +++ b/src/main/java/com/thezorro266/bukkit/srm/templates/SignTemplate.java @@ -19,15 +19,18 @@ package com.thezorro266.bukkit.srm.templates; import static com.thezorro266.bukkit.srm.factories.SignFactory.Sign.SIGN_LINE_COUNT; + import java.util.AbstractMap.SimpleEntry; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; + import org.bukkit.block.Block; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.Player; + import com.thezorro266.bukkit.srm.factories.RegionFactory.Region; import com.thezorro266.bukkit.srm.factories.SignFactory.Sign; import com.thezorro266.bukkit.srm.helpers.Location; diff --git a/src/main/java/com/thezorro266/bukkit/srm/templates/Template.java b/src/main/java/com/thezorro266/bukkit/srm/templates/Template.java index 1ec74ad..c26ad2e 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/templates/Template.java +++ b/src/main/java/com/thezorro266/bukkit/srm/templates/Template.java @@ -22,12 +22,13 @@ import java.util.ArrayList; import java.util.List; -import com.thezorro266.bukkit.srm.factories.RegionFactory; import lombok.Getter; + import org.bukkit.block.Block; import org.bukkit.command.CommandSender; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.Player; + import com.thezorro266.bukkit.srm.SimpleRegionMarket; import com.thezorro266.bukkit.srm.exceptions.TemplateFormatException; import com.thezorro266.bukkit.srm.factories.RegionFactory.Region; diff --git a/src/main/java/com/thezorro266/bukkit/srm/templates/TemplateAuction.java b/src/main/java/com/thezorro266/bukkit/srm/templates/TemplateAuction.java index 9905a4a..3a3345f 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/templates/TemplateAuction.java +++ b/src/main/java/com/thezorro266/bukkit/srm/templates/TemplateAuction.java @@ -20,6 +20,7 @@ import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.Player; + import com.thezorro266.bukkit.srm.factories.RegionFactory; import com.thezorro266.bukkit.srm.templates.interfaces.TimedTemplate; diff --git a/src/main/java/com/thezorro266/bukkit/srm/templates/TemplateLease.java b/src/main/java/com/thezorro266/bukkit/srm/templates/TemplateLease.java index 797322f..d33331e 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/templates/TemplateLease.java +++ b/src/main/java/com/thezorro266/bukkit/srm/templates/TemplateLease.java @@ -22,13 +22,13 @@ import java.text.MessageFormat; import java.util.HashMap; -import com.thezorro266.bukkit.srm.hooks.Economy; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.OfflinePlayer; import org.bukkit.block.Block; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.Player; + import com.sk89q.worldguard.protection.regions.ProtectedRegion; import com.thezorro266.bukkit.srm.LanguageSupport; import com.thezorro266.bukkit.srm.SimpleRegionMarket; @@ -37,6 +37,7 @@ import com.thezorro266.bukkit.srm.factories.RegionFactory; import com.thezorro266.bukkit.srm.factories.SignFactory; import com.thezorro266.bukkit.srm.helpers.Location; +import com.thezorro266.bukkit.srm.hooks.Economy; import com.thezorro266.bukkit.srm.templates.interfaces.TimedTemplate; public class TemplateLease extends TemplateSell implements TimedTemplate { diff --git a/src/main/java/com/thezorro266/bukkit/srm/templates/TemplateRent.java b/src/main/java/com/thezorro266/bukkit/srm/templates/TemplateRent.java index 0a16ac3..f5eb600 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/templates/TemplateRent.java +++ b/src/main/java/com/thezorro266/bukkit/srm/templates/TemplateRent.java @@ -18,6 +18,14 @@ package com.thezorro266.bukkit.srm.templates; +import java.text.MessageFormat; + +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.OfflinePlayer; +import org.bukkit.configuration.ConfigurationSection; +import org.bukkit.entity.Player; + import com.thezorro266.bukkit.srm.LanguageSupport; import com.thezorro266.bukkit.srm.SimpleRegionMarket; import com.thezorro266.bukkit.srm.Utils; @@ -28,14 +36,6 @@ import com.thezorro266.bukkit.srm.factories.SignFactory; import com.thezorro266.bukkit.srm.hooks.Economy; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.OfflinePlayer; -import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.entity.Player; - -import java.text.MessageFormat; - public class TemplateRent extends TemplateLease { public TemplateRent(ConfigurationSection templateConfigSection) { super(templateConfigSection); @@ -140,7 +140,6 @@ public void clickSign(Player player, SignFactory.Sign sign) { } } - @SuppressWarnings("deprecation") @Override public void schedule() { synchronized (regionList) { diff --git a/src/main/java/com/thezorro266/bukkit/srm/templates/TemplateSell.java b/src/main/java/com/thezorro266/bukkit/srm/templates/TemplateSell.java index 6549268..98e469c 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/templates/TemplateSell.java +++ b/src/main/java/com/thezorro266/bukkit/srm/templates/TemplateSell.java @@ -22,13 +22,13 @@ import java.text.MessageFormat; import java.util.HashMap; -import com.thezorro266.bukkit.srm.hooks.Economy; import org.bukkit.ChatColor; import org.bukkit.OfflinePlayer; import org.bukkit.block.Block; import org.bukkit.command.CommandSender; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.Player; + import com.sk89q.worldguard.protection.regions.ProtectedRegion; import com.thezorro266.bukkit.srm.LanguageSupport; import com.thezorro266.bukkit.srm.SimpleRegionMarket; @@ -38,6 +38,7 @@ import com.thezorro266.bukkit.srm.factories.SignFactory; import com.thezorro266.bukkit.srm.factories.SignFactory.Sign; import com.thezorro266.bukkit.srm.helpers.Location; +import com.thezorro266.bukkit.srm.hooks.Economy; public class TemplateSell extends OwnableRegionTemplate { protected double priceMin = 0; diff --git a/src/main/java/com/thezorro266/bukkit/srm/templates/interfaces/OwnableTemplate.java b/src/main/java/com/thezorro266/bukkit/srm/templates/interfaces/OwnableTemplate.java index 9cac65e..055ce26 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/templates/interfaces/OwnableTemplate.java +++ b/src/main/java/com/thezorro266/bukkit/srm/templates/interfaces/OwnableTemplate.java @@ -19,6 +19,7 @@ package com.thezorro266.bukkit.srm.templates.interfaces; import org.bukkit.OfflinePlayer; + import com.thezorro266.bukkit.srm.factories.RegionFactory.Region; /** diff --git a/src/main/java/com/thezorro266/bukkit/srm/templates/interfaces/TimedTemplate.java b/src/main/java/com/thezorro266/bukkit/srm/templates/interfaces/TimedTemplate.java index b5bb1a4..de59b86 100644 --- a/src/main/java/com/thezorro266/bukkit/srm/templates/interfaces/TimedTemplate.java +++ b/src/main/java/com/thezorro266/bukkit/srm/templates/interfaces/TimedTemplate.java @@ -19,6 +19,7 @@ package com.thezorro266.bukkit.srm.templates.interfaces; import org.bukkit.entity.Player; + import com.thezorro266.bukkit.srm.factories.RegionFactory; public interface TimedTemplate {