diff --git a/src/main/java/com/intellectualcrafters/plot/BukkitMain.java b/src/main/java/com/intellectualcrafters/plot/BukkitMain.java index e5e07faab..bd566ff40 100644 --- a/src/main/java/com/intellectualcrafters/plot/BukkitMain.java +++ b/src/main/java/com/intellectualcrafters/plot/BukkitMain.java @@ -1,27 +1,13 @@ package com.intellectualcrafters.plot; import java.io.File; -import java.io.IOException; -import java.io.PrintWriter; -import java.lang.reflect.Field; -import java.net.URLClassLoader; -import java.nio.file.Files; import java.util.ArrayDeque; -import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; import java.util.List; -import java.util.Map; -import java.util.Stack; import java.util.UUID; -import com.intellectualcrafters.plot.commands.*; - -import org.apache.commons.lang.StringUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; -import org.bukkit.Chunk; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.command.PluginCommand; @@ -30,10 +16,72 @@ import org.bukkit.entity.Player; import org.bukkit.event.Listener; import org.bukkit.generator.ChunkGenerator; import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; -import org.bukkit.plugin.java.JavaPluginLoader; +import com.intellectualcrafters.plot.commands.Add; +import com.intellectualcrafters.plot.commands.Auto; +import com.intellectualcrafters.plot.commands.BukkitCommand; +import com.intellectualcrafters.plot.commands.Chat; +import com.intellectualcrafters.plot.commands.Claim; +import com.intellectualcrafters.plot.commands.Clear; +import com.intellectualcrafters.plot.commands.Cluster; +import com.intellectualcrafters.plot.commands.Comment; +import com.intellectualcrafters.plot.commands.Condense; +import com.intellectualcrafters.plot.commands.Confirm; +import com.intellectualcrafters.plot.commands.Copy; +import com.intellectualcrafters.plot.commands.CreateRoadSchematic; +import com.intellectualcrafters.plot.commands.Database; +import com.intellectualcrafters.plot.commands.Debug; +import com.intellectualcrafters.plot.commands.DebugAllowUnsafe; +import com.intellectualcrafters.plot.commands.DebugClaimTest; +import com.intellectualcrafters.plot.commands.DebugClear; +import com.intellectualcrafters.plot.commands.DebugExec; +import com.intellectualcrafters.plot.commands.DebugFill; +import com.intellectualcrafters.plot.commands.DebugFixFlags; +import com.intellectualcrafters.plot.commands.DebugLoadTest; +import com.intellectualcrafters.plot.commands.DebugRoadRegen; +import com.intellectualcrafters.plot.commands.DebugSaveTest; +import com.intellectualcrafters.plot.commands.DebugUUID; +import com.intellectualcrafters.plot.commands.Delete; +import com.intellectualcrafters.plot.commands.Deny; +import com.intellectualcrafters.plot.commands.Disable; +import com.intellectualcrafters.plot.commands.Download; +import com.intellectualcrafters.plot.commands.FlagCmd; +import com.intellectualcrafters.plot.commands.Help; +import com.intellectualcrafters.plot.commands.Home; +import com.intellectualcrafters.plot.commands.Inbox; +import com.intellectualcrafters.plot.commands.Info; +import com.intellectualcrafters.plot.commands.Inventory; +import com.intellectualcrafters.plot.commands.Kick; +import com.intellectualcrafters.plot.commands.MainCommand; +import com.intellectualcrafters.plot.commands.Merge; +import com.intellectualcrafters.plot.commands.Move; +import com.intellectualcrafters.plot.commands.MusicSubcommand; +import com.intellectualcrafters.plot.commands.Purge; +import com.intellectualcrafters.plot.commands.Rate; +import com.intellectualcrafters.plot.commands.RegenAllRoads; +import com.intellectualcrafters.plot.commands.Reload; +import com.intellectualcrafters.plot.commands.Remove; +import com.intellectualcrafters.plot.commands.SchematicCmd; +import com.intellectualcrafters.plot.commands.Set; +import com.intellectualcrafters.plot.commands.SetOwner; +import com.intellectualcrafters.plot.commands.Setup; +import com.intellectualcrafters.plot.commands.Swap; +import com.intellectualcrafters.plot.commands.TP; +import com.intellectualcrafters.plot.commands.Target; +import com.intellectualcrafters.plot.commands.Template; +import com.intellectualcrafters.plot.commands.Toggle; +import com.intellectualcrafters.plot.commands.Trim; +import com.intellectualcrafters.plot.commands.Trust; +import com.intellectualcrafters.plot.commands.Unclaim; +import com.intellectualcrafters.plot.commands.Undeny; +import com.intellectualcrafters.plot.commands.Unlink; +import com.intellectualcrafters.plot.commands.Untrust; +import com.intellectualcrafters.plot.commands.Update; +import com.intellectualcrafters.plot.commands.Visit; +import com.intellectualcrafters.plot.commands.WE_Anywhere; +import com.intellectualcrafters.plot.commands.list; +import com.intellectualcrafters.plot.commands.plugin; import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.database.plotme.ClassicPlotMeConnector; @@ -56,7 +104,6 @@ import com.intellectualcrafters.plot.listeners.TNTListener; import com.intellectualcrafters.plot.listeners.WorldEvents; import com.intellectualcrafters.plot.listeners.worldedit.WEListener; import com.intellectualcrafters.plot.listeners.worldedit.WESubscriber; -import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.PlotManager; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotWorld; @@ -72,7 +119,6 @@ import com.intellectualcrafters.plot.util.InventoryUtil; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.PlayerManager; import com.intellectualcrafters.plot.util.SetupUtils; -import com.intellectualcrafters.plot.util.StringMan; import com.intellectualcrafters.plot.util.TaskManager; import com.intellectualcrafters.plot.util.bukkit.BukkitChunkManager; import com.intellectualcrafters.plot.util.bukkit.BukkitEconHandler; diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Database.java b/src/main/java/com/intellectualcrafters/plot/commands/Database.java index bf7644bfc..239aa0e6d 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Database.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Database.java @@ -6,7 +6,6 @@ import java.util.ArrayList; import java.util.UUID; import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.database.MySQL; import com.intellectualcrafters.plot.database.SQLManager; import com.intellectualcrafters.plot.object.Plot; diff --git a/src/main/java/com/intellectualcrafters/plot/commands/DebugAllowUnsafe.java b/src/main/java/com/intellectualcrafters/plot/commands/DebugAllowUnsafe.java index 1ca1dce15..80ab59ab3 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/DebugAllowUnsafe.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/DebugAllowUnsafe.java @@ -1,16 +1,12 @@ package com.intellectualcrafters.plot.commands; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.flag.FlagManager; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.BlockManager; -import com.intellectualcrafters.plot.util.MainUtil; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; -import java.util.*; +import com.intellectualcrafters.plot.config.C; +import com.intellectualcrafters.plot.object.PlotPlayer; +import com.intellectualcrafters.plot.util.MainUtil; public class DebugAllowUnsafe extends SubCommand { diff --git a/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java b/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java index 4dc47e404..438a2759b 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java @@ -35,7 +35,6 @@ import org.bukkit.Bukkit; import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.flag.Flag; import com.intellectualcrafters.plot.flag.FlagManager; import com.intellectualcrafters.plot.generator.BukkitHybridUtils; import com.intellectualcrafters.plot.generator.HybridUtils; diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Disable.java b/src/main/java/com/intellectualcrafters/plot/commands/Disable.java index 9880a6766..e6414df76 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Disable.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Disable.java @@ -20,16 +20,8 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// package com.intellectualcrafters.plot.commands; -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.net.URL; -import java.net.URLConnection; -import java.util.ArrayList; - import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.TaskManager; public class Disable extends SubCommand { public static String downloads, version; diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Download.java b/src/main/java/com/intellectualcrafters/plot/commands/Download.java index 7d81d6948..6d213e58d 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Download.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Download.java @@ -8,7 +8,6 @@ import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.PlotWorld; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.SchematicHandler; import com.intellectualcrafters.plot.util.TaskManager; diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Info.java b/src/main/java/com/intellectualcrafters/plot/commands/Info.java index 7d5dbfd41..78596cd44 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Info.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Info.java @@ -20,22 +20,27 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// package com.intellectualcrafters.plot.commands; +import java.util.ArrayList; +import java.util.Collection; +import java.util.UUID; +import java.util.regex.Matcher; + +import org.apache.commons.lang.StringUtils; + import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.flag.FlagManager; -import com.intellectualcrafters.plot.object.*; +import com.intellectualcrafters.plot.object.InfoInventory; +import com.intellectualcrafters.plot.object.Location; +import com.intellectualcrafters.plot.object.Plot; +import com.intellectualcrafters.plot.object.PlotId; +import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.util.BlockManager; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.StringMan; import com.intellectualcrafters.plot.util.TaskManager; import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; -import org.apache.commons.lang.StringUtils; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.UUID; -import java.util.regex.Matcher; /** * @author Citymonstret diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Rate.java b/src/main/java/com/intellectualcrafters/plot/commands/Rate.java index ac30675bf..5926ec8af 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Rate.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Rate.java @@ -26,14 +26,15 @@ import java.util.Comparator; import java.util.Map.Entry; import java.util.UUID; -import com.intellectualcrafters.plot.events.PlotRateEvent; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.mutable.MutableInt; +import org.bukkit.Bukkit; import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.database.DBFunc; +import com.intellectualcrafters.plot.events.PlotRateEvent; import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotInventory; @@ -42,7 +43,6 @@ import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.Rating; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.TaskManager; -import org.bukkit.Bukkit; public class Rate extends SubCommand { /* diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Set.java b/src/main/java/com/intellectualcrafters/plot/commands/Set.java index 28f147336..d1827f3ad 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Set.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Set.java @@ -20,6 +20,12 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// package com.intellectualcrafters.plot.commands; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.apache.commons.lang.StringUtils; + import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.Configuration; @@ -27,14 +33,21 @@ import com.intellectualcrafters.plot.flag.AbstractFlag; import com.intellectualcrafters.plot.flag.Flag; import com.intellectualcrafters.plot.flag.FlagManager; import com.intellectualcrafters.plot.listeners.APlotListener; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.*; +import com.intellectualcrafters.plot.object.BlockLoc; +import com.intellectualcrafters.plot.object.Location; +import com.intellectualcrafters.plot.object.Plot; +import com.intellectualcrafters.plot.object.PlotBlock; +import com.intellectualcrafters.plot.object.PlotManager; +import com.intellectualcrafters.plot.object.PlotPlayer; +import com.intellectualcrafters.plot.object.PlotWorld; +import com.intellectualcrafters.plot.object.StringWrapper; +import com.intellectualcrafters.plot.util.BlockManager; +import com.intellectualcrafters.plot.util.MainUtil; +import com.intellectualcrafters.plot.util.Permissions; +import com.intellectualcrafters.plot.util.SetBlockQueue; +import com.intellectualcrafters.plot.util.StringComparison; +import com.intellectualcrafters.plot.util.StringMan; import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; -import org.apache.commons.lang.StringUtils; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; /** * @author Citymonstret diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Update.java b/src/main/java/com/intellectualcrafters/plot/commands/Update.java index ab90cefa2..f45ff2693 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Update.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Update.java @@ -20,27 +20,13 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// package com.intellectualcrafters.plot.commands; -import java.io.BufferedReader; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; import java.net.MalformedURLException; import java.net.URL; -import java.net.URLConnection; -import java.nio.file.Files; -import java.nio.file.StandardCopyOption; -import java.util.ArrayList; - -import javax.net.ssl.HttpsURLConnection; - -import org.bukkit.Bukkit; import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.TaskManager; public class Update extends SubCommand { public static String downloads, version; diff --git a/src/main/java/com/intellectualcrafters/plot/commands/list.java b/src/main/java/com/intellectualcrafters/plot/commands/list.java index c3131e224..27ac28503 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/list.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/list.java @@ -20,6 +20,18 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// package com.intellectualcrafters.plot.commands; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.Map.Entry; +import java.util.Set; +import java.util.UUID; + +import org.apache.commons.lang.StringUtils; +import org.bukkit.ChatColor; + import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.Settings; @@ -35,12 +47,6 @@ import com.intellectualcrafters.plot.util.Permissions; import com.intellectualcrafters.plot.util.StringComparison; import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; import com.intellectualcrafters.plot.util.bukkit.chat.FancyMessage; -import org.apache.commons.lang.StringUtils; -import org.bukkit.ChatColor; - -import java.util.*; -import java.util.Map.Entry; -import java.util.Set; /** * @author Citymonstret diff --git a/src/main/java/com/intellectualcrafters/plot/commands/plugin.java b/src/main/java/com/intellectualcrafters/plot/commands/plugin.java index 627acef1f..2135416ac 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/plugin.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/plugin.java @@ -20,6 +20,12 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// package com.intellectualcrafters.plot.commands; +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.net.URL; +import java.net.URLConnection; +import java.util.ArrayList; + import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.object.PlotPlayer; @@ -27,12 +33,6 @@ import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.StringMan; import com.intellectualcrafters.plot.util.TaskManager; -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.net.URL; -import java.net.URLConnection; -import java.util.ArrayList; - public class plugin extends SubCommand { public plugin() { diff --git a/src/main/java/com/intellectualcrafters/plot/config/C.java b/src/main/java/com/intellectualcrafters/plot/config/C.java index 096fd1670..4cccced2d 100644 --- a/src/main/java/com/intellectualcrafters/plot/config/C.java +++ b/src/main/java/com/intellectualcrafters/plot/config/C.java @@ -20,14 +20,6 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// package com.intellectualcrafters.plot.config; -import com.intellectualcrafters.configuration.ConfigurationSection; -import com.intellectualcrafters.configuration.file.YamlConfiguration; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.util.StringMan; - -import org.apache.commons.lang.StringEscapeUtils; -import org.bukkit.ChatColor; - import java.io.File; import java.util.EnumSet; import java.util.HashMap; @@ -35,6 +27,13 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import org.bukkit.ChatColor; + +import com.intellectualcrafters.configuration.ConfigurationSection; +import com.intellectualcrafters.configuration.file.YamlConfiguration; +import com.intellectualcrafters.plot.PS; +import com.intellectualcrafters.plot.util.StringMan; + /** * Captions class. * diff --git a/src/main/java/com/intellectualcrafters/plot/database/plotme/ClassicPlotMeConnector.java b/src/main/java/com/intellectualcrafters/plot/database/plotme/ClassicPlotMeConnector.java index 63e162f19..33d646c7d 100644 --- a/src/main/java/com/intellectualcrafters/plot/database/plotme/ClassicPlotMeConnector.java +++ b/src/main/java/com/intellectualcrafters/plot/database/plotme/ClassicPlotMeConnector.java @@ -6,14 +6,10 @@ import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.Arrays; import java.util.HashMap; import java.util.Map.Entry; import java.util.UUID; -import org.bukkit.Bukkit; -import org.bukkit.World; - import com.intellectualcrafters.configuration.file.FileConfiguration; import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.config.Settings; diff --git a/src/main/java/com/intellectualcrafters/plot/database/plotme/PlotMeConnector_017.java b/src/main/java/com/intellectualcrafters/plot/database/plotme/PlotMeConnector_017.java index d3ec39106..3f66f07a7 100644 --- a/src/main/java/com/intellectualcrafters/plot/database/plotme/PlotMeConnector_017.java +++ b/src/main/java/com/intellectualcrafters/plot/database/plotme/PlotMeConnector_017.java @@ -6,10 +6,9 @@ import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.Arrays; import java.util.HashMap; -import java.util.UUID; import java.util.Map.Entry; +import java.util.UUID; import com.intellectualcrafters.configuration.file.FileConfiguration; import com.intellectualcrafters.plot.PS; diff --git a/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotDeniedEvent.java b/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotDeniedEvent.java index df438348e..a68b1bddd 100644 --- a/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotDeniedEvent.java +++ b/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotDeniedEvent.java @@ -23,7 +23,6 @@ package com.intellectualcrafters.plot.events; import java.util.UUID; import org.bukkit.entity.Player; -import org.bukkit.event.Event; import org.bukkit.event.HandlerList; import com.intellectualcrafters.plot.object.Plot; diff --git a/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotHelperEvent.java b/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotHelperEvent.java index a81d3f0c3..50dabcf2f 100644 --- a/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotHelperEvent.java +++ b/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotHelperEvent.java @@ -23,7 +23,6 @@ package com.intellectualcrafters.plot.events; import java.util.UUID; import org.bukkit.entity.Player; -import org.bukkit.event.Event; import org.bukkit.event.HandlerList; import com.intellectualcrafters.plot.object.Plot; diff --git a/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotTrustedEvent.java b/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotTrustedEvent.java index 847afa619..d2d5ddada 100644 --- a/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotTrustedEvent.java +++ b/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotTrustedEvent.java @@ -23,7 +23,6 @@ package com.intellectualcrafters.plot.events; import java.util.UUID; import org.bukkit.entity.Player; -import org.bukkit.event.Event; import org.bukkit.event.HandlerList; import com.intellectualcrafters.plot.object.Plot; diff --git a/src/main/java/com/intellectualcrafters/plot/events/PlotEvent.java b/src/main/java/com/intellectualcrafters/plot/events/PlotEvent.java index 395263c23..26e803738 100644 --- a/src/main/java/com/intellectualcrafters/plot/events/PlotEvent.java +++ b/src/main/java/com/intellectualcrafters/plot/events/PlotEvent.java @@ -1,9 +1,8 @@ package com.intellectualcrafters.plot.events; -import com.intellectualcrafters.plot.object.Plot; -import com.sk89q.worldedit.event.Cancellable; import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; + +import com.intellectualcrafters.plot.object.Plot; public abstract class PlotEvent extends Event { diff --git a/src/main/java/com/intellectualcrafters/plot/events/PlotFlagAddEvent.java b/src/main/java/com/intellectualcrafters/plot/events/PlotFlagAddEvent.java index 98e74ea45..698a17871 100644 --- a/src/main/java/com/intellectualcrafters/plot/events/PlotFlagAddEvent.java +++ b/src/main/java/com/intellectualcrafters/plot/events/PlotFlagAddEvent.java @@ -21,7 +21,6 @@ package com.intellectualcrafters.plot.events; import org.bukkit.event.Cancellable; -import org.bukkit.event.Event; import org.bukkit.event.HandlerList; import com.intellectualcrafters.plot.flag.Flag; diff --git a/src/main/java/com/intellectualcrafters/plot/events/PlotFlagRemoveEvent.java b/src/main/java/com/intellectualcrafters/plot/events/PlotFlagRemoveEvent.java index be003fdcc..e081156e3 100644 --- a/src/main/java/com/intellectualcrafters/plot/events/PlotFlagRemoveEvent.java +++ b/src/main/java/com/intellectualcrafters/plot/events/PlotFlagRemoveEvent.java @@ -21,7 +21,6 @@ package com.intellectualcrafters.plot.events; import org.bukkit.event.Cancellable; -import org.bukkit.event.Event; import org.bukkit.event.HandlerList; import com.intellectualcrafters.plot.flag.Flag; diff --git a/src/main/java/com/intellectualcrafters/plot/events/PlotRateEvent.java b/src/main/java/com/intellectualcrafters/plot/events/PlotRateEvent.java index e81715575..abeeb67e3 100644 --- a/src/main/java/com/intellectualcrafters/plot/events/PlotRateEvent.java +++ b/src/main/java/com/intellectualcrafters/plot/events/PlotRateEvent.java @@ -1,10 +1,10 @@ package com.intellectualcrafters.plot.events; +import org.bukkit.event.HandlerList; + import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotPlayer; -import org.bukkit.event.HandlerList; - /** * Created 2015-07-13 for PlotSquaredGit * diff --git a/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java b/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java index 092bfbba7..9a847ebea 100644 --- a/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java +++ b/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java @@ -21,7 +21,6 @@ package com.intellectualcrafters.plot.flag; import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotWorld.java b/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotWorld.java index a87a24f68..072695eaa 100644 --- a/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotWorld.java +++ b/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotWorld.java @@ -3,7 +3,6 @@ package com.intellectualcrafters.plot.generator; import org.apache.commons.lang.StringUtils; import com.intellectualcrafters.configuration.ConfigurationSection; -import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.config.Configuration; import com.intellectualcrafters.plot.config.ConfigurationNode; import com.intellectualcrafters.plot.object.PlotBlock; diff --git a/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotWorld.java b/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotWorld.java index 5a0c13d24..5fec082c4 100644 --- a/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotWorld.java +++ b/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotWorld.java @@ -23,12 +23,9 @@ package com.intellectualcrafters.plot.generator; import java.util.HashMap; import java.util.HashSet; -import org.apache.commons.lang.StringUtils; - import com.intellectualcrafters.configuration.ConfigurationSection; import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Configuration; import com.intellectualcrafters.plot.object.PlotBlock; import com.intellectualcrafters.plot.object.PlotLoc; import com.intellectualcrafters.plot.object.schematic.PlotItem; diff --git a/src/main/java/com/intellectualcrafters/plot/listeners/ChatListener.java b/src/main/java/com/intellectualcrafters/plot/listeners/ChatListener.java index 7936590f9..a550ef556 100644 --- a/src/main/java/com/intellectualcrafters/plot/listeners/ChatListener.java +++ b/src/main/java/com/intellectualcrafters/plot/listeners/ChatListener.java @@ -1,10 +1,7 @@ package com.intellectualcrafters.plot.listeners; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.bukkit.BukkitUtil; +import java.util.Set; + import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.entity.Player; @@ -13,7 +10,15 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.player.AsyncPlayerChatEvent; -import java.util.Set; +import com.intellectualcrafters.plot.PS; +import com.intellectualcrafters.plot.config.C; +import com.intellectualcrafters.plot.object.Location; +import com.intellectualcrafters.plot.object.Plot; +import com.intellectualcrafters.plot.object.PlotId; +import com.intellectualcrafters.plot.object.PlotPlayer; +import com.intellectualcrafters.plot.object.PlotWorld; +import com.intellectualcrafters.plot.util.MainUtil; +import com.intellectualcrafters.plot.util.bukkit.BukkitUtil; /** * Created 2015-07-13 for PlotSquaredGit diff --git a/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java b/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java index f208b4da4..91a62c926 100644 --- a/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java +++ b/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java @@ -1,9 +1,15 @@ package com.intellectualcrafters.plot.listeners; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.UUID; import java.util.regex.Pattern; -import com.intellectualcrafters.plot.util.*; import org.apache.commons.lang.StringUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -96,11 +102,16 @@ import com.intellectualcrafters.plot.object.PlotManager; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotWorld; import com.intellectualcrafters.plot.object.StringWrapper; +import com.intellectualcrafters.plot.util.ChunkManager; +import com.intellectualcrafters.plot.util.EventUtil; +import com.intellectualcrafters.plot.util.ExpireManager; +import com.intellectualcrafters.plot.util.MainUtil; +import com.intellectualcrafters.plot.util.Permissions; +import com.intellectualcrafters.plot.util.RegExUtil; +import com.intellectualcrafters.plot.util.TaskManager; import com.intellectualcrafters.plot.util.bukkit.BukkitUtil; import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; -import javax.annotation.RegEx; - /** * Player Events involving plots * diff --git a/src/main/java/com/intellectualcrafters/plot/listeners/PlotListener.java b/src/main/java/com/intellectualcrafters/plot/listeners/PlotListener.java index e419dba38..63995f27f 100644 --- a/src/main/java/com/intellectualcrafters/plot/listeners/PlotListener.java +++ b/src/main/java/com/intellectualcrafters/plot/listeners/PlotListener.java @@ -21,7 +21,6 @@ package com.intellectualcrafters.plot.listeners; import java.util.Arrays; -import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.UUID; @@ -41,12 +40,10 @@ import com.intellectualcrafters.plot.events.PlayerEnterPlotEvent; import com.intellectualcrafters.plot.events.PlayerLeavePlotEvent; import com.intellectualcrafters.plot.flag.Flag; import com.intellectualcrafters.plot.flag.FlagManager; -import com.intellectualcrafters.plot.flag.FlagValue; import com.intellectualcrafters.plot.object.BukkitPlayer; import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.PlotWorld; import com.intellectualcrafters.plot.object.comment.CommentManager; import com.intellectualcrafters.plot.titles.AbstractTitle; import com.intellectualcrafters.plot.util.MainUtil; diff --git a/src/main/java/com/intellectualcrafters/plot/object/Plot.java b/src/main/java/com/intellectualcrafters/plot/object/Plot.java index 83d32697e..d3bd831bc 100644 --- a/src/main/java/com/intellectualcrafters/plot/object/Plot.java +++ b/src/main/java/com/intellectualcrafters/plot/object/Plot.java @@ -20,20 +20,15 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// package com.intellectualcrafters.plot.object; -import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Map.Entry; import java.util.UUID; -import sun.awt.SunHints.Value; - import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.flag.FlagManager; import com.intellectualcrafters.plot.util.ChunkManager; import com.intellectualcrafters.plot.util.MainUtil; diff --git a/src/main/java/com/intellectualcrafters/plot/object/PlotAnalysis.java b/src/main/java/com/intellectualcrafters/plot/object/PlotAnalysis.java index 5df1bd032..47b37de9d 100644 --- a/src/main/java/com/intellectualcrafters/plot/object/PlotAnalysis.java +++ b/src/main/java/com/intellectualcrafters/plot/object/PlotAnalysis.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.lang.reflect.Array; import java.util.ArrayDeque; import java.util.ArrayList; -import java.util.Arrays; import java.util.Iterator; import java.util.List; diff --git a/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java b/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java index 9709779eb..9980aacdd 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java +++ b/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java @@ -7,7 +7,6 @@ import java.util.UUID; import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.flag.Flag; import com.intellectualcrafters.plot.flag.FlagManager; -import com.intellectualcrafters.plot.flag.FlagValue.PlotBlockListValue; import com.intellectualcrafters.plot.listeners.PlayerBlockEventType; import com.intellectualcrafters.plot.object.LazyBlock; import com.intellectualcrafters.plot.object.Location; diff --git a/src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java b/src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java index 00a4b8d36..ecd8e7ce9 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java +++ b/src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java @@ -1,9 +1,6 @@ package com.intellectualcrafters.plot.util; -import java.io.File; -import java.util.ArrayDeque; import java.util.ArrayList; -import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.UUID; @@ -17,9 +14,7 @@ import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.flag.Flag; import com.intellectualcrafters.plot.flag.FlagManager; -import com.intellectualcrafters.plot.generator.ClassicPlotManager; import com.intellectualcrafters.plot.generator.HybridUtils; -import com.intellectualcrafters.plot.object.OfflinePlotPlayer; import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotAnalysis; import com.intellectualcrafters.plot.object.PlotHandler; diff --git a/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java b/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java index 2663382d2..de09f95ed 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java +++ b/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java @@ -1,19 +1,16 @@ package com.intellectualcrafters.plot.util; -import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.net.HttpURLConnection; import java.net.URL; import java.net.URLConnection; -import java.nio.file.Files; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitChunkManager.java b/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitChunkManager.java index 88d5f52f9..46d31b45f 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitChunkManager.java +++ b/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitChunkManager.java @@ -46,7 +46,6 @@ import org.bukkit.plugin.Plugin; import com.intellectualcrafters.plot.BukkitMain; import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.listeners.APlotListener; import com.intellectualcrafters.plot.object.BlockLoc; import com.intellectualcrafters.plot.object.ChunkLoc; import com.intellectualcrafters.plot.object.Location;