diff --git a/src/main/java/com/intellectualcrafters/plot/IPlotMain.java b/src/main/java/com/intellectualcrafters/plot/IPlotMain.java index 6ec7bc26e..56d61371d 100644 --- a/src/main/java/com/intellectualcrafters/plot/IPlotMain.java +++ b/src/main/java/com/intellectualcrafters/plot/IPlotMain.java @@ -7,7 +7,7 @@ import org.bukkit.generator.ChunkGenerator; import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.generator.HybridUtils; -import com.intellectualcrafters.plot.listeners.APlotListener; +import com.plotsquared.bukkit.listeners.APlotListener; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.util.BlockManager; import com.intellectualcrafters.plot.util.ChunkManager; @@ -15,7 +15,7 @@ import com.intellectualcrafters.plot.util.EconHandler; import com.intellectualcrafters.plot.util.EventUtil; import com.intellectualcrafters.plot.util.InventoryUtil; import com.intellectualcrafters.plot.util.PlayerManager; -import com.intellectualcrafters.plot.util.SetupUtils; +import com.plotsquared.bukkit.util.SetupUtils; import com.intellectualcrafters.plot.util.TaskManager; import com.intellectualcrafters.plot.uuid.UUIDWrapper; diff --git a/src/main/java/com/intellectualcrafters/plot/PS.java b/src/main/java/com/intellectualcrafters/plot/PS.java index d102e9ad4..9ac5cb400 100644 --- a/src/main/java/com/intellectualcrafters/plot/PS.java +++ b/src/main/java/com/intellectualcrafters/plot/PS.java @@ -43,26 +43,26 @@ import com.intellectualcrafters.plot.database.SQLite; import com.intellectualcrafters.plot.flag.AbstractFlag; import com.intellectualcrafters.plot.flag.FlagManager; import com.intellectualcrafters.plot.flag.FlagValue; -import com.intellectualcrafters.plot.generator.AugmentedPopulator; +import com.plotsquared.bukkit.generator.AugmentedPopulator; import com.intellectualcrafters.plot.generator.ClassicPlotWorld; -import com.intellectualcrafters.plot.generator.HybridGen; +import com.plotsquared.bukkit.generator.HybridGen; import com.intellectualcrafters.plot.generator.HybridPlotWorld; import com.intellectualcrafters.plot.generator.HybridUtils; import com.intellectualcrafters.plot.generator.SquarePlotManager; import com.intellectualcrafters.plot.generator.SquarePlotWorld; -import com.intellectualcrafters.plot.listeners.APlotListener; +import com.plotsquared.bukkit.listeners.APlotListener; import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotAnalysis; import com.intellectualcrafters.plot.object.PlotBlock; import com.intellectualcrafters.plot.object.PlotCluster; import com.intellectualcrafters.plot.object.PlotFilter; -import com.intellectualcrafters.plot.object.PlotGenerator; +import com.plotsquared.bukkit.object.PlotGenerator; import com.intellectualcrafters.plot.object.PlotHandler; import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.PlotManager; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotWorld; -import com.intellectualcrafters.plot.object.comment.CommentManager; +import com.plotsquared.bukkit.object.comment.CommentManager; import com.intellectualcrafters.plot.util.BlockManager; import com.intellectualcrafters.plot.util.ChunkManager; import com.intellectualcrafters.plot.util.ClusterManager; @@ -76,11 +76,11 @@ import com.intellectualcrafters.plot.util.StringMan; import com.intellectualcrafters.plot.util.Logger.LogLevel; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.PlayerManager; -import com.intellectualcrafters.plot.util.SetupUtils; +import com.plotsquared.bukkit.util.SetupUtils; import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; -import com.intellectualcrafters.plot.util.bukkit.uuid.FileUUIDHandler; -import com.intellectualcrafters.plot.util.bukkit.uuid.SQLUUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.uuid.FileUUIDHandler; +import com.plotsquared.bukkit.util.bukkit.uuid.SQLUUIDHandler; import com.sk89q.worldedit.bukkit.WorldEditPlugin; /** @@ -93,7 +93,7 @@ import com.sk89q.worldedit.bukkit.WorldEditPlugin; public class PS { // protected static: - protected static PS instance; + public static PS instance; // private final: private final HashMap plotworlds = new HashMap<>(); @@ -125,7 +125,7 @@ public class PS { * Initialize PlotSquared with the desired Implementation class * @param imp_class */ - protected PS(final IPlotMain imp_class) { + public PS(final IPlotMain imp_class) { instance = this; SetupUtils.generators = new HashMap<>(); IMP = imp_class; diff --git a/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java b/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java index 21a51e749..52a5b202c 100644 --- a/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java +++ b/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java @@ -48,9 +48,9 @@ import com.intellectualcrafters.plot.util.ClusterManager; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.Permissions; import com.intellectualcrafters.plot.util.SchematicHandler; -import com.intellectualcrafters.plot.util.bukkit.BukkitSetBlockManager; -import com.intellectualcrafters.plot.util.bukkit.BukkitUtil; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.BukkitSetBlockManager; +import com.plotsquared.bukkit.util.bukkit.BukkitUtil; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; import com.intellectualcrafters.plot.uuid.UUIDWrapper; /** @@ -185,7 +185,7 @@ import com.intellectualcrafters.plot.uuid.UUIDWrapper; * * @return BukkitSetBlockManager * - * @see com.intellectualcrafters.plot.util.bukkit.BukkitSetBlockManager + * @see com.plotsquared.bukkit.util.bukkit.BukkitSetBlockManager */ public BukkitSetBlockManager getBukkitBlockManager() { return BukkitSetBlockManager.setBlockManager; diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Add.java b/src/main/java/com/intellectualcrafters/plot/commands/Add.java index f758fac86..bf0699d7a 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Add.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Add.java @@ -31,8 +31,8 @@ import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.util.EventUtil; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; -import com.intellectualcrafters.plot.util.bukkit.uuid.SQLUUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.uuid.SQLUUIDHandler; public class Add extends SubCommand { public Add() { diff --git a/src/main/java/com/intellectualcrafters/plot/commands/BukkitCommand.java b/src/main/java/com/intellectualcrafters/plot/commands/BukkitCommand.java index b391de92c..7dcaa7003 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/BukkitCommand.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/BukkitCommand.java @@ -12,7 +12,7 @@ import org.bukkit.entity.Player; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.util.StringComparison; -import com.intellectualcrafters.plot.util.bukkit.BukkitUtil; +import com.plotsquared.bukkit.util.bukkit.BukkitUtil; /** * Created 2015-02-20 for PlotSquared diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Buy.java b/src/main/java/com/intellectualcrafters/plot/commands/Buy.java index caf66837f..6cb6e8664 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Buy.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Buy.java @@ -34,7 +34,7 @@ import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotWorld; import com.intellectualcrafters.plot.util.EconHandler; import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; /** * @author Citymonstret diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Clear.java b/src/main/java/com/intellectualcrafters/plot/commands/Clear.java index 93d34131e..ddc560b10 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Clear.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Clear.java @@ -33,7 +33,7 @@ import com.intellectualcrafters.plot.util.CmdConfirm; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.Permissions; import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; public class Clear extends SubCommand { public Clear() { diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java b/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java index 80f9f8114..b5c23e504 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java @@ -27,21 +27,21 @@ import java.util.UUID; import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.generator.AugmentedPopulator; -import com.intellectualcrafters.plot.generator.HybridGen; +import com.plotsquared.bukkit.generator.AugmentedPopulator; +import com.plotsquared.bukkit.generator.HybridGen; import com.intellectualcrafters.plot.object.BlockLoc; import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotCluster; import com.intellectualcrafters.plot.object.PlotClusterId; -import com.intellectualcrafters.plot.object.PlotGenerator; +import com.plotsquared.bukkit.object.PlotGenerator; import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotWorld; import com.intellectualcrafters.plot.util.ClusterManager; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; public class Cluster extends SubCommand { public Cluster() { diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Comment.java b/src/main/java/com/intellectualcrafters/plot/commands/Comment.java index 025351ce0..d055f22b8 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Comment.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Comment.java @@ -30,7 +30,7 @@ import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.comment.CommentInbox; -import com.intellectualcrafters.plot.object.comment.CommentManager; +import com.plotsquared.bukkit.object.comment.CommentManager; import com.intellectualcrafters.plot.object.comment.PlotComment; import com.intellectualcrafters.plot.util.MainUtil; diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Database.java b/src/main/java/com/intellectualcrafters/plot/commands/Database.java index 239aa0e6d..6144069d3 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Database.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Database.java @@ -13,7 +13,7 @@ import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.StringComparison; import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; /** * Created 2014-11-15 for PlotSquared diff --git a/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java b/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java index 452ce03cc..b3611f3f1 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java @@ -39,7 +39,7 @@ import com.intellectualcrafters.plot.util.BlockManager; import com.intellectualcrafters.plot.util.ChunkManager; import com.intellectualcrafters.plot.util.EventUtil; import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; /** * @author Citymonstret diff --git a/src/main/java/com/intellectualcrafters/plot/commands/DebugClear.java b/src/main/java/com/intellectualcrafters/plot/commands/DebugClear.java index 9adbc94da..4708f7b48 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/DebugClear.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/DebugClear.java @@ -30,7 +30,7 @@ import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.util.ChunkManager; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; public class DebugClear extends SubCommand { public DebugClear() { diff --git a/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java b/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java index d89ef65fd..7dc0458fb 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java @@ -32,9 +32,6 @@ import java.util.UUID; import org.apache.commons.lang.StringUtils; import org.bukkit.Bukkit; -import org.bukkit.Chunk; -import org.bukkit.World; -import org.bukkit.block.Biome; import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.config.C; @@ -42,7 +39,6 @@ import com.intellectualcrafters.plot.flag.FlagManager; import com.intellectualcrafters.plot.generator.BukkitHybridUtils; import com.intellectualcrafters.plot.generator.HybridUtils; import com.intellectualcrafters.plot.object.ChunkLoc; -import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.OfflinePlotPlayer; import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotAnalysis; @@ -52,7 +48,7 @@ import com.intellectualcrafters.plot.util.BlockManager; import com.intellectualcrafters.plot.util.ChunkManager; import com.intellectualcrafters.plot.util.ExpireManager; import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; public class DebugExec extends SubCommand { public DebugExec() { diff --git a/src/main/java/com/intellectualcrafters/plot/commands/DebugPaste.java b/src/main/java/com/intellectualcrafters/plot/commands/DebugPaste.java index 859ca7ebb..b7c371807 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/DebugPaste.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/DebugPaste.java @@ -1,6 +1,6 @@ package com.intellectualcrafters.plot.commands; -import com.intellectualcrafters.plot.BukkitMain; +import com.plotsquared.bukkit.BukkitMain; import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.object.PlotPlayer; diff --git a/src/main/java/com/intellectualcrafters/plot/commands/DebugSetup.java b/src/main/java/com/intellectualcrafters/plot/commands/DebugSetup.java index 65448a1bd..5584a0a64 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/DebugSetup.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/DebugSetup.java @@ -26,12 +26,12 @@ import org.bukkit.generator.ChunkGenerator; import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.ConfigurationNode; -import com.intellectualcrafters.plot.generator.HybridGen; -import com.intellectualcrafters.plot.object.PlotGenerator; +import com.plotsquared.bukkit.generator.HybridGen; +import com.plotsquared.bukkit.object.PlotGenerator; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.SetupObject; import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.SetupUtils; +import com.plotsquared.bukkit.util.SetupUtils; public class DebugSetup extends SubCommand { public DebugSetup() { diff --git a/src/main/java/com/intellectualcrafters/plot/commands/DebugUUID.java b/src/main/java/com/intellectualcrafters/plot/commands/DebugUUID.java index ee4e59d63..7e4509ab3 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/DebugUUID.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/DebugUUID.java @@ -42,7 +42,7 @@ import com.intellectualcrafters.plot.object.StringWrapper; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.PlayerManager; import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; import com.intellectualcrafters.plot.uuid.DefaultUUIDWrapper; import com.intellectualcrafters.plot.uuid.LowerOfflineUUIDWrapper; import com.intellectualcrafters.plot.uuid.OfflineUUIDWrapper; diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Delete.java b/src/main/java/com/intellectualcrafters/plot/commands/Delete.java index e6388b65b..a8a4296a7 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Delete.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Delete.java @@ -23,7 +23,6 @@ package com.intellectualcrafters.plot.commands; 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.object.Location; import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotPlayer; @@ -33,7 +32,7 @@ import com.intellectualcrafters.plot.util.EconHandler; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.Permissions; import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; public class Delete extends SubCommand { public Delete() { diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Deny.java b/src/main/java/com/intellectualcrafters/plot/commands/Deny.java index 78e3e789f..f8d9d6646 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Deny.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Deny.java @@ -22,7 +22,6 @@ package com.intellectualcrafters.plot.commands; import java.util.UUID; -import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.object.Location; @@ -32,12 +31,9 @@ import com.intellectualcrafters.plot.util.BlockManager; import com.intellectualcrafters.plot.util.EventUtil; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.bukkit.BukkitUtil; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; -import com.intellectualcrafters.plot.util.bukkit.uuid.SQLUUIDHandler; -import org.bukkit.Bukkit; -import org.bukkit.entity.Player; +import com.plotsquared.bukkit.util.bukkit.uuid.SQLUUIDHandler; public class Deny extends SubCommand { public Deny() { diff --git a/src/main/java/com/intellectualcrafters/plot/commands/FlagCmd.java b/src/main/java/com/intellectualcrafters/plot/commands/FlagCmd.java index 22750abb1..7c5f6be60 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/FlagCmd.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/FlagCmd.java @@ -32,7 +32,6 @@ import com.intellectualcrafters.plot.flag.AbstractFlag; import com.intellectualcrafters.plot.flag.Flag; import com.intellectualcrafters.plot.flag.FlagManager; import com.intellectualcrafters.plot.flag.FlagValue; -import com.intellectualcrafters.plot.listeners.APlotListener; import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotPlayer; diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Inbox.java b/src/main/java/com/intellectualcrafters/plot/commands/Inbox.java index dd9426e1b..e27d196c8 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Inbox.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Inbox.java @@ -30,7 +30,7 @@ import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.RunnableVal; import com.intellectualcrafters.plot.object.comment.CommentInbox; -import com.intellectualcrafters.plot.object.comment.CommentManager; +import com.plotsquared.bukkit.object.comment.CommentManager; import com.intellectualcrafters.plot.object.comment.PlotComment; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.StringMan; diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Info.java b/src/main/java/com/intellectualcrafters/plot/commands/Info.java index b2786e9d6..c7eb83650 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Info.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Info.java @@ -32,7 +32,7 @@ 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.InfoInventory; +import com.plotsquared.bukkit.object.InfoInventory; import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotId; @@ -41,7 +41,7 @@ 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 com.plotsquared.bukkit.util.bukkit.UUIDHandler; /** * @author Citymonstret diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Inventory.java b/src/main/java/com/intellectualcrafters/plot/commands/Inventory.java index 0e4dafe9d..61e102c68 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Inventory.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Inventory.java @@ -29,7 +29,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.BukkitPlayer; +import com.plotsquared.bukkit.object.BukkitPlayer; import com.intellectualcrafters.plot.object.PlotPlayer; public class Inventory extends SubCommand { diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Kick.java b/src/main/java/com/intellectualcrafters/plot/commands/Kick.java index 73bed1336..97a1953f3 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Kick.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Kick.java @@ -27,7 +27,7 @@ import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.util.BlockManager; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; @SuppressWarnings({ "unused", "deprecation", "javadoc" }) public class Kick extends SubCommand { diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Merge.java b/src/main/java/com/intellectualcrafters/plot/commands/Merge.java index e42dea3db..f8b824b3f 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Merge.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Merge.java @@ -38,7 +38,7 @@ import com.intellectualcrafters.plot.util.EconHandler; import com.intellectualcrafters.plot.util.EventUtil; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; /** * @author Citymonstret diff --git a/src/main/java/com/intellectualcrafters/plot/commands/MusicSubcommand.java b/src/main/java/com/intellectualcrafters/plot/commands/MusicSubcommand.java index 799000d19..5ce4e9fec 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/MusicSubcommand.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/MusicSubcommand.java @@ -23,7 +23,6 @@ package com.intellectualcrafters.plot.commands; import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.flag.Flag; import com.intellectualcrafters.plot.flag.FlagManager; -import com.intellectualcrafters.plot.listeners.PlotListener; import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotBlock; @@ -32,7 +31,6 @@ import com.intellectualcrafters.plot.object.PlotItemStack; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.util.BlockManager; import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.TaskManager; public class MusicSubcommand extends SubCommand { public MusicSubcommand() { diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Purge.java b/src/main/java/com/intellectualcrafters/plot/commands/Purge.java index 928b05ac7..85ddb1320 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Purge.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Purge.java @@ -32,7 +32,7 @@ import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; @SuppressWarnings({ "javadoc" }) public class Purge extends SubCommand { diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Rate.java b/src/main/java/com/intellectualcrafters/plot/commands/Rate.java index 2636b7ba8..8f7418b68 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Rate.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Rate.java @@ -34,7 +34,7 @@ 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.plotsquared.bukkit.events.PlotRateEvent; import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotInventory; diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Remove.java b/src/main/java/com/intellectualcrafters/plot/commands/Remove.java index ce014296e..38cbdd076 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Remove.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Remove.java @@ -30,8 +30,8 @@ import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; -import com.intellectualcrafters.plot.util.bukkit.uuid.SQLUUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.uuid.SQLUUIDHandler; public class Remove extends SubCommand { public Remove() { diff --git a/src/main/java/com/intellectualcrafters/plot/commands/SchematicCmd.java b/src/main/java/com/intellectualcrafters/plot/commands/SchematicCmd.java index f6a0a2c00..49bd1bf1d 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/SchematicCmd.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/SchematicCmd.java @@ -20,7 +20,6 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// package com.intellectualcrafters.plot.commands; -import java.io.File; import java.net.URL; import java.util.ArrayList; import java.util.Collection; @@ -35,15 +34,11 @@ import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.RunnableVal; -import com.intellectualcrafters.plot.util.BlockManager; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.Permissions; import com.intellectualcrafters.plot.util.SchematicHandler; -import com.intellectualcrafters.plot.util.SchematicHandler.DataCollection; -import com.intellectualcrafters.plot.util.SchematicHandler.Dimension; import com.intellectualcrafters.plot.util.SchematicHandler.Schematic; import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.bukkit.BukkitUtil; public class SchematicCmd extends SubCommand { private int counter = 0; diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Set.java b/src/main/java/com/intellectualcrafters/plot/commands/Set.java index 0f5209210..4a2bfa660 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Set.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Set.java @@ -32,7 +32,7 @@ import com.intellectualcrafters.plot.config.Configuration; 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.plotsquared.bukkit.listeners.APlotListener; import com.intellectualcrafters.plot.object.BlockLoc; import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Plot; @@ -47,7 +47,7 @@ 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 com.plotsquared.bukkit.util.bukkit.UUIDHandler; /** * @author Citymonstret diff --git a/src/main/java/com/intellectualcrafters/plot/commands/SetOwner.java b/src/main/java/com/intellectualcrafters/plot/commands/SetOwner.java index ecf9a97f7..43adc6908 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/SetOwner.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/SetOwner.java @@ -33,7 +33,7 @@ import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; public class SetOwner extends SubCommand { public SetOwner() { diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Setup.java b/src/main/java/com/intellectualcrafters/plot/commands/Setup.java index ab0faab32..e5322c33f 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Setup.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Setup.java @@ -31,13 +31,13 @@ import org.bukkit.generator.ChunkGenerator; import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.ConfigurationNode; import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.generator.HybridGen; -import com.intellectualcrafters.plot.object.PlotGenerator; +import com.plotsquared.bukkit.generator.HybridGen; +import com.plotsquared.bukkit.object.PlotGenerator; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.SetupObject; import com.intellectualcrafters.plot.util.BlockManager; import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.SetupUtils; +import com.plotsquared.bukkit.util.SetupUtils; public class Setup extends SubCommand { public Setup() { diff --git a/src/main/java/com/intellectualcrafters/plot/commands/TP.java b/src/main/java/com/intellectualcrafters/plot/commands/TP.java index 46bce5063..9eb5b19f8 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/TP.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/TP.java @@ -30,7 +30,7 @@ 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.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; /** * @author Citymonstret diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Template.java b/src/main/java/com/intellectualcrafters/plot/commands/Template.java index bc5941506..9d3341e97 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Template.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Template.java @@ -41,7 +41,7 @@ import com.intellectualcrafters.plot.object.PlotWorld; import com.intellectualcrafters.plot.object.SetupObject; import com.intellectualcrafters.plot.util.BlockManager; import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.SetupUtils; +import com.plotsquared.bukkit.util.SetupUtils; import com.intellectualcrafters.plot.util.TaskManager; public class Template extends SubCommand { diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Trust.java b/src/main/java/com/intellectualcrafters/plot/commands/Trust.java index 885d04ffa..0d3873081 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Trust.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Trust.java @@ -31,8 +31,8 @@ import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.util.EventUtil; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; -import com.intellectualcrafters.plot.util.bukkit.uuid.SQLUUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.uuid.SQLUUIDHandler; public class Trust extends SubCommand { public Trust() { diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Undeny.java b/src/main/java/com/intellectualcrafters/plot/commands/Undeny.java index fee72687b..f6261a795 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Undeny.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Undeny.java @@ -29,8 +29,8 @@ import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; -import com.intellectualcrafters.plot.util.bukkit.uuid.SQLUUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.uuid.SQLUUIDHandler; public class Undeny extends SubCommand { public Undeny() { diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Untrust.java b/src/main/java/com/intellectualcrafters/plot/commands/Untrust.java index 73659c4c5..91acee54f 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Untrust.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Untrust.java @@ -29,7 +29,7 @@ import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; public class Untrust extends SubCommand { public Untrust() { diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Visit.java b/src/main/java/com/intellectualcrafters/plot/commands/Visit.java index a6970d73b..005be5af1 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Visit.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Visit.java @@ -30,7 +30,7 @@ import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; public class Visit extends SubCommand { public Visit() { diff --git a/src/main/java/com/intellectualcrafters/plot/commands/WE_Anywhere.java b/src/main/java/com/intellectualcrafters/plot/commands/WE_Anywhere.java index f14bddb9b..673a9875e 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/WE_Anywhere.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/WE_Anywhere.java @@ -22,7 +22,7 @@ package com.intellectualcrafters.plot.commands; import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.listeners.worldedit.WEManager; +import com.plotsquared.bukkit.listeners.worldedit.WEManager; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.Permissions; diff --git a/src/main/java/com/intellectualcrafters/plot/commands/list.java b/src/main/java/com/intellectualcrafters/plot/commands/list.java index 05e26667a..9b3b2fb08 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/list.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/list.java @@ -37,7 +37,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.object.BukkitPlayer; +import com.plotsquared.bukkit.object.BukkitPlayer; import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.Rating; @@ -45,8 +45,8 @@ import com.intellectualcrafters.plot.util.EconHandler; import com.intellectualcrafters.plot.util.MainUtil; 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 com.plotsquared.bukkit.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.chat.FancyMessage; /** * @author Citymonstret diff --git a/src/main/java/com/intellectualcrafters/plot/generator/BukkitHybridUtils.java b/src/main/java/com/intellectualcrafters/plot/generator/BukkitHybridUtils.java index c851cd929..fe50ee55f 100644 --- a/src/main/java/com/intellectualcrafters/plot/generator/BukkitHybridUtils.java +++ b/src/main/java/com/intellectualcrafters/plot/generator/BukkitHybridUtils.java @@ -6,6 +6,7 @@ import java.util.Iterator; import java.util.List; import java.util.Random; +import com.plotsquared.bukkit.generator.AugmentedPopulator; import org.apache.commons.lang.mutable.MutableInt; import org.bukkit.Bukkit; import org.bukkit.Chunk; @@ -19,7 +20,7 @@ import org.bukkit.material.Directional; import org.bukkit.material.MaterialData; import org.bukkit.plugin.Plugin; -import com.intellectualcrafters.plot.BukkitMain; +import com.plotsquared.bukkit.BukkitMain; import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.flag.Flag; @@ -35,7 +36,7 @@ import com.intellectualcrafters.plot.util.ChunkManager; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.MathMan; import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.bukkit.BukkitUtil; +import com.plotsquared.bukkit.util.bukkit.BukkitUtil; public class BukkitHybridUtils extends HybridUtils { diff --git a/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotManager.java b/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotManager.java index 1b1bb807a..b112af03e 100644 --- a/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotManager.java +++ b/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotManager.java @@ -23,14 +23,12 @@ package com.intellectualcrafters.plot.generator; import java.io.File; import java.io.IOException; import java.nio.file.Files; -import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.commands.Template; -import com.intellectualcrafters.plot.object.ChunkLoc; import com.intellectualcrafters.plot.object.FileBytes; import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Plot; @@ -42,8 +40,7 @@ import com.intellectualcrafters.plot.object.RunnableVal; import com.intellectualcrafters.plot.util.ChunkManager; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.SetBlockQueue; -import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.bukkit.BukkitUtil; +import com.plotsquared.bukkit.util.bukkit.BukkitUtil; public class HybridPlotManager extends ClassicPlotManager { diff --git a/src/main/java/com/intellectualcrafters/plot/generator/HybridPop.java b/src/main/java/com/intellectualcrafters/plot/generator/HybridPop.java index 8f7d5cd0c..5f6fb7e16 100644 --- a/src/main/java/com/intellectualcrafters/plot/generator/HybridPop.java +++ b/src/main/java/com/intellectualcrafters/plot/generator/HybridPop.java @@ -8,7 +8,7 @@ import org.bukkit.block.Biome; import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.object.PlotLoc; -import com.intellectualcrafters.plot.object.PlotPopulator; +import com.plotsquared.bukkit.object.PlotPopulator; import com.intellectualcrafters.plot.object.PlotWorld; import com.intellectualcrafters.plot.object.PseudoRandom; import com.intellectualcrafters.plot.object.RegionWrapper; diff --git a/src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java b/src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java index bf4473420..42c4cf850 100644 --- a/src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java +++ b/src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java @@ -7,7 +7,7 @@ import java.util.UUID; import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; public class PlotHandler { public static HashSet getOwners(Plot plot) { diff --git a/src/main/java/com/intellectualcrafters/plot/object/SetupObject.java b/src/main/java/com/intellectualcrafters/plot/object/SetupObject.java index 6e8cdbacd..87a1cc6c0 100644 --- a/src/main/java/com/intellectualcrafters/plot/object/SetupObject.java +++ b/src/main/java/com/intellectualcrafters/plot/object/SetupObject.java @@ -1,7 +1,7 @@ package com.intellectualcrafters.plot.object; import com.intellectualcrafters.plot.config.ConfigurationNode; -import com.intellectualcrafters.plot.util.SetupUtils; +import com.plotsquared.bukkit.util.SetupUtils; public class SetupObject { diff --git a/src/main/java/com/intellectualcrafters/plot/object/entity/ArmorStandStats.java b/src/main/java/com/intellectualcrafters/plot/object/entity/ArmorStandStats.java index ad4a88b24..87cb4a971 100644 --- a/src/main/java/com/intellectualcrafters/plot/object/entity/ArmorStandStats.java +++ b/src/main/java/com/intellectualcrafters/plot/object/entity/ArmorStandStats.java @@ -1,12 +1,12 @@ package com.intellectualcrafters.plot.object.entity; public class ArmorStandStats { - float[] head = new float[3]; - float[] body = new float[3]; - float[] leftLeg = new float[3]; - float[] rightLeg = new float[3]; - float[] leftArm = new float[3]; - float[] rightArm = new float[3]; + public float[] head = new float[3]; + public float[] body = new float[3]; + public float[] leftLeg = new float[3]; + public float[] rightLeg = new float[3]; + public float[] leftArm = new float[3]; + public float[] rightArm = new float[3]; public boolean arms; public boolean noplate; public boolean nogravity; diff --git a/src/main/java/com/intellectualcrafters/plot/object/entity/EntityBaseStats.java b/src/main/java/com/intellectualcrafters/plot/object/entity/EntityBaseStats.java index 5ce545351..27ea6090e 100644 --- a/src/main/java/com/intellectualcrafters/plot/object/entity/EntityBaseStats.java +++ b/src/main/java/com/intellectualcrafters/plot/object/entity/EntityBaseStats.java @@ -1,5 +1,7 @@ package com.intellectualcrafters.plot.object.entity; +import com.plotsquared.bukkit.object.entity.EntityWrapper; + public class EntityBaseStats { public EntityWrapper passenger; public float fall; diff --git a/src/main/java/com/intellectualcrafters/plot/util/ChunkManager.java b/src/main/java/com/intellectualcrafters/plot/util/ChunkManager.java index 60f4605b3..fea983fe6 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/ChunkManager.java +++ b/src/main/java/com/intellectualcrafters/plot/util/ChunkManager.java @@ -13,7 +13,6 @@ import com.intellectualcrafters.plot.object.PlotLoc; import com.intellectualcrafters.plot.object.RegionWrapper; import com.intellectualcrafters.plot.object.RunnableVal; import com.intellectualcrafters.plot.util.SetBlockQueue.ChunkWrapper; -import com.intellectualcrafters.plot.util.bukkit.BukkitUtil; public abstract class ChunkManager { diff --git a/src/main/java/com/intellectualcrafters/plot/util/ClusterManager.java b/src/main/java/com/intellectualcrafters/plot/util/ClusterManager.java index a38f9894c..f9d030ba5 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/ClusterManager.java +++ b/src/main/java/com/intellectualcrafters/plot/util/ClusterManager.java @@ -12,7 +12,7 @@ import org.bukkit.generator.BlockPopulator; import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.generator.AugmentedPopulator; +import com.plotsquared.bukkit.generator.AugmentedPopulator; import com.intellectualcrafters.plot.object.BlockLoc; import com.intellectualcrafters.plot.object.ChunkLoc; import com.intellectualcrafters.plot.object.Location; @@ -23,8 +23,8 @@ import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.PlotManager; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotWorld; -import com.intellectualcrafters.plot.util.bukkit.BukkitUtil; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.BukkitUtil; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; public class ClusterManager { public static HashMap> clusters; diff --git a/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java b/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java index 9980aacdd..99535ff27 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java +++ b/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java @@ -7,7 +7,7 @@ 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.listeners.PlayerBlockEventType; +import com.plotsquared.bukkit.listeners.PlayerBlockEventType; import com.intellectualcrafters.plot.object.LazyBlock; import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Plot; @@ -15,6 +15,7 @@ import com.intellectualcrafters.plot.object.PlotBlock; import com.intellectualcrafters.plot.object.PlotCluster; import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.PlotPlayer; +import com.plotsquared.bukkit.util.SetupUtils; public abstract class EventUtil { diff --git a/src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java b/src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java index d8f7ba65c..8e4869cac 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java +++ b/src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java @@ -22,7 +22,7 @@ import com.intellectualcrafters.plot.object.PlotManager; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotWorld; import com.intellectualcrafters.plot.object.RunnableVal; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; public class ExpireManager { public static ConcurrentHashMap> expiredPlots = new ConcurrentHashMap<>(); diff --git a/src/main/java/com/intellectualcrafters/plot/util/LSetCube.java b/src/main/java/com/intellectualcrafters/plot/util/LSetCube.java deleted file mode 100644 index 559a6761f..000000000 --- a/src/main/java/com/intellectualcrafters/plot/util/LSetCube.java +++ /dev/null @@ -1,136 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////////////////////////// -// PlotSquared - A plot manager and world generator for the Bukkit API / -// Copyright (c) 2014 IntellectualSites/IntellectualCrafters / -// / -// This program is free software; you can redistribute it and/or modify / -// it under the terms of the GNU General Public License as published by / -// the Free Software Foundation; either version 3 of the License, or / -// (at your option) any later version. / -// / -// This program is distributed in the hope that it will be useful, / -// but WITHOUT ANY WARRANTY; without even the implied warranty of / -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the / -// GNU General Public License for more details. / -// / -// You should have received a copy of the GNU General Public License / -// along with this program; if not, write to the Free Software Foundation, / -// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA / -// / -// You can contact us via: support@intellectualsites.com / -//////////////////////////////////////////////////////////////////////////////////////////////////// -package com.intellectualcrafters.plot.util; - -import org.bukkit.Location; - -/** - * Cube utilities - * - * @author Citymonstret - */ -@SuppressWarnings({ "javadoc", "unused" }) -public class LSetCube { - /** - * Base locations - */ - private Location l1, l2; - - /** - * Constructor - * - * @param l1 - * @param l2 - */ - public LSetCube(final Location l1, final Location l2) { - this.l1 = l1; - this.l1 = l2; - } - - /** - * Secondary constructor - * - * @param l1 - * @param size - */ - public LSetCube(final Location l1, final int size) { - this.l1 = l1; - this.l2 = l1.clone().add(size, size, size); - } - - /** - * Returns the absolute min. of the cube - * - * @return abs. min - */ - public Location minLoc() { - final int x = Math.min(this.l1.getBlockX(), this.l2.getBlockX()); - final int y = Math.min(this.l1.getBlockY(), this.l2.getBlockY()); - final int z = Math.min(this.l1.getBlockZ(), this.l2.getBlockZ()); - return new Location(this.l1.getWorld(), x, y, z); - } - - /** - * Returns the absolute max. of the cube - * - * @return abs. max - */ - public Location maxLoc() { - final int x = Math.max(this.l1.getBlockX(), this.l2.getBlockX()); - final int y = Math.max(this.l1.getBlockY(), this.l2.getBlockY()); - final int z = Math.max(this.l1.getBlockZ(), this.l2.getBlockZ()); - return new Location(this.l1.getWorld(), x, y, z); - } - - /** - * Creates a LCycler for the cube. - * - * @return new lcycler - */ - public LCycler getCycler() { - return new LCycler(this); - } - - /** - * @author Citymonstret - */ - protected class LCycler { - /** - * - */ - private final Location min; - /** - * - */ - private final Location max; - /** - * - */ - private Location current; - - /** - * @param cube - */ - public LCycler(final LSetCube cube) { - this.min = cube.minLoc(); - this.max = cube.maxLoc(); - this.current = this.min; - } - - /** - * @return - */ - public boolean hasNext() { - return ((this.current.getBlockX() + 1) <= this.max.getBlockX()) && ((this.current.getBlockY() + 1) <= this.max.getBlockY()) && ((this.current.getBlockZ() + 1) <= this.max.getBlockZ()); - } - - /** - * @return - */ - public Location getNext() { - if (!hasNext()) { - return null; - } - this.current = this.current.add(1, 1, 1); - return this.current; - } - } -} diff --git a/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java b/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java index bd3d5e43e..c3d9baad1 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java +++ b/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java @@ -31,7 +31,7 @@ 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.listeners.PlotListener; +import com.plotsquared.bukkit.listeners.PlotListener; import com.intellectualcrafters.plot.object.BlockLoc; import com.intellectualcrafters.plot.object.ChunkLoc; import com.intellectualcrafters.plot.object.Location; @@ -41,12 +41,11 @@ import com.intellectualcrafters.plot.object.PlotCluster; import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.PlotManager; import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.PlotSettings; import com.intellectualcrafters.plot.object.PlotWorld; import com.intellectualcrafters.plot.object.PseudoRandom; import com.intellectualcrafters.plot.object.RunnableVal; -import com.intellectualcrafters.plot.util.bukkit.BukkitUtil; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.BukkitUtil; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; /** * plot functions diff --git a/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java b/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java index 0158fdd89..7a8565a8b 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java +++ b/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java @@ -10,13 +10,11 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; -import java.io.Reader; import java.net.HttpURLConnection; import java.net.URL; import java.net.URLConnection; import java.nio.channels.Channels; import java.nio.channels.ReadableByteChannel; -import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -39,7 +37,6 @@ import com.intellectualcrafters.jnbt.ShortTag; import com.intellectualcrafters.jnbt.StringTag; import com.intellectualcrafters.jnbt.Tag; import com.intellectualcrafters.json.JSONArray; -import com.intellectualcrafters.json.JSONObject; import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.object.ChunkLoc; @@ -49,9 +46,11 @@ import com.intellectualcrafters.plot.object.PlotBlock; import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.RunnableVal; import com.intellectualcrafters.plot.object.schematic.PlotItem; -import com.intellectualcrafters.plot.object.schematic.StateWrapper; -import com.intellectualcrafters.plot.util.bukkit.BukkitUtil; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.object.schematic.StateWrapper; +import com.plotsquared.bukkit.util.WorldEditSchematic; +import com.plotsquared.bukkit.util.bukkit.BukkitSchematicHandler; +import com.plotsquared.bukkit.util.bukkit.BukkitUtil; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; public abstract class SchematicHandler { public static SchematicHandler manager = new BukkitSchematicHandler(); diff --git a/src/main/java/com/intellectualcrafters/plot/util/SetBlockQueue.java b/src/main/java/com/intellectualcrafters/plot/util/SetBlockQueue.java index 9eaa86987..c42267598 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/SetBlockQueue.java +++ b/src/main/java/com/intellectualcrafters/plot/util/SetBlockQueue.java @@ -5,7 +5,7 @@ import java.util.HashSet; import java.util.Map.Entry; import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.generator.AugmentedPopulator; +import com.plotsquared.bukkit.generator.AugmentedPopulator; import com.intellectualcrafters.plot.object.ChunkLoc; import com.intellectualcrafters.plot.object.PlotBlock; diff --git a/src/main/java/com/intellectualcrafters/plot/uuid/DefaultUUIDWrapper.java b/src/main/java/com/intellectualcrafters/plot/uuid/DefaultUUIDWrapper.java index a04870794..392f033d8 100644 --- a/src/main/java/com/intellectualcrafters/plot/uuid/DefaultUUIDWrapper.java +++ b/src/main/java/com/intellectualcrafters/plot/uuid/DefaultUUIDWrapper.java @@ -5,8 +5,8 @@ import java.util.UUID; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; -import com.intellectualcrafters.plot.object.BukkitOfflinePlayer; -import com.intellectualcrafters.plot.object.BukkitPlayer; +import com.plotsquared.bukkit.object.BukkitOfflinePlayer; +import com.plotsquared.bukkit.object.BukkitPlayer; import com.intellectualcrafters.plot.object.OfflinePlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer; diff --git a/src/main/java/com/intellectualcrafters/plot/uuid/LowerOfflineUUIDWrapper.java b/src/main/java/com/intellectualcrafters/plot/uuid/LowerOfflineUUIDWrapper.java index 5101f517a..bc77cc5f6 100644 --- a/src/main/java/com/intellectualcrafters/plot/uuid/LowerOfflineUUIDWrapper.java +++ b/src/main/java/com/intellectualcrafters/plot/uuid/LowerOfflineUUIDWrapper.java @@ -12,11 +12,11 @@ import org.bukkit.entity.Player; import com.google.common.base.Charsets; import com.google.common.collect.BiMap; import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.BukkitOfflinePlayer; +import com.plotsquared.bukkit.object.BukkitOfflinePlayer; import com.intellectualcrafters.plot.object.OfflinePlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.StringWrapper; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; public class LowerOfflineUUIDWrapper extends OfflineUUIDWrapper { private Method getOnline = null; diff --git a/src/main/java/com/intellectualcrafters/plot/uuid/OfflineUUIDWrapper.java b/src/main/java/com/intellectualcrafters/plot/uuid/OfflineUUIDWrapper.java index 0188f8b2d..80337322b 100644 --- a/src/main/java/com/intellectualcrafters/plot/uuid/OfflineUUIDWrapper.java +++ b/src/main/java/com/intellectualcrafters/plot/uuid/OfflineUUIDWrapper.java @@ -12,11 +12,11 @@ import org.bukkit.entity.Player; import com.google.common.base.Charsets; import com.google.common.collect.BiMap; import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.BukkitOfflinePlayer; +import com.plotsquared.bukkit.object.BukkitOfflinePlayer; import com.intellectualcrafters.plot.object.OfflinePlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.StringWrapper; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; public class OfflineUUIDWrapper extends UUIDWrapper { private Method getOnline = null; diff --git a/src/main/java/com/intellectualcrafters/plot/BukkitMain.java b/src/main/java/com/plotsquared/bukkit/BukkitMain.java similarity index 88% rename from src/main/java/com/intellectualcrafters/plot/BukkitMain.java rename to src/main/java/com/plotsquared/bukkit/BukkitMain.java index 26ac434df..4744f4bce 100644 --- a/src/main/java/com/intellectualcrafters/plot/BukkitMain.java +++ b/src/main/java/com/plotsquared/bukkit/BukkitMain.java @@ -1,13 +1,34 @@ -package com.intellectualcrafters.plot; - -import java.io.File; -import java.util.ArrayDeque; -import java.util.Arrays; -import java.util.List; -import java.util.UUID; +package com.plotsquared.bukkit; +import com.intellectualcrafters.plot.IPlotMain; +import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.commands.*; - +import com.intellectualcrafters.plot.config.C; +import com.intellectualcrafters.plot.config.Settings; +import com.plotsquared.bukkit.database.plotme.ClassicPlotMeConnector; +import com.plotsquared.bukkit.database.plotme.LikePlotMeConverter; +import com.plotsquared.bukkit.database.plotme.PlotMeConnector_017; +import com.intellectualcrafters.plot.flag.FlagManager; +import com.intellectualcrafters.plot.generator.BukkitHybridUtils; +import com.plotsquared.bukkit.generator.HybridGen; +import com.intellectualcrafters.plot.generator.HybridUtils; +import com.plotsquared.bukkit.listeners.*; +import com.plotsquared.bukkit.listeners.worldedit.WEListener; +import com.plotsquared.bukkit.listeners.worldedit.WESubscriber; +import com.intellectualcrafters.plot.object.PlotManager; +import com.intellectualcrafters.plot.object.PlotPlayer; +import com.intellectualcrafters.plot.object.PlotWorld; +import com.plotsquared.bukkit.titles.AbstractTitle; +import com.plotsquared.bukkit.titles.DefaultTitle; +import com.intellectualcrafters.plot.util.*; +import com.intellectualcrafters.plot.uuid.DefaultUUIDWrapper; +import com.intellectualcrafters.plot.uuid.LowerOfflineUUIDWrapper; +import com.intellectualcrafters.plot.uuid.OfflineUUIDWrapper; +import com.intellectualcrafters.plot.uuid.UUIDWrapper; +import com.plotsquared.bukkit.util.SetupUtils; +import com.plotsquared.bukkit.util.bukkit.*; +import com.sk89q.worldedit.WorldEdit; +import com.sk89q.worldedit.bukkit.WorldEditPlugin; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Location; @@ -20,66 +41,11 @@ import org.bukkit.generator.ChunkGenerator; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.java.JavaPlugin; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.database.plotme.ClassicPlotMeConnector; -import com.intellectualcrafters.plot.database.plotme.LikePlotMeConverter; -import com.intellectualcrafters.plot.database.plotme.PlotMeConnector_017; -import com.intellectualcrafters.plot.flag.FlagManager; -import com.intellectualcrafters.plot.generator.BukkitHybridUtils; -import com.intellectualcrafters.plot.generator.HybridGen; -import com.intellectualcrafters.plot.generator.HybridUtils; -import com.intellectualcrafters.plot.listeners.APlotListener; -import com.intellectualcrafters.plot.listeners.ChunkListener; -import com.intellectualcrafters.plot.listeners.ForceFieldListener; -import com.intellectualcrafters.plot.listeners.InventoryListener; -import com.intellectualcrafters.plot.listeners.PlayerEvents; -import com.intellectualcrafters.plot.listeners.PlayerEvents_1_8; -import com.intellectualcrafters.plot.listeners.PlayerEvents_1_8_3; -import com.intellectualcrafters.plot.listeners.PlotListener; -import com.intellectualcrafters.plot.listeners.PlotPlusListener; -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.PlotManager; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.PlotWorld; -import com.intellectualcrafters.plot.titles.AbstractTitle; -import com.intellectualcrafters.plot.titles.DefaultTitle; -import com.intellectualcrafters.plot.util.BlockManager; -import com.intellectualcrafters.plot.util.BlockUpdateUtil; -import com.intellectualcrafters.plot.util.ChunkManager; -import com.intellectualcrafters.plot.util.ConsoleColors; -import com.intellectualcrafters.plot.util.EconHandler; -import com.intellectualcrafters.plot.util.EventUtil; -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.TaskManager; -import com.intellectualcrafters.plot.util.bukkit.BukkitChunkManager; -import com.intellectualcrafters.plot.util.bukkit.BukkitEconHandler; -import com.intellectualcrafters.plot.util.bukkit.BukkitEventUtil; -import com.intellectualcrafters.plot.util.bukkit.BukkitInventoryUtil; -import com.intellectualcrafters.plot.util.bukkit.BukkitPlayerManager; -import com.intellectualcrafters.plot.util.bukkit.BukkitSetBlockManager; -import com.intellectualcrafters.plot.util.bukkit.BukkitSetupUtils; -import com.intellectualcrafters.plot.util.bukkit.BukkitTaskManager; -import com.intellectualcrafters.plot.util.bukkit.BukkitUtil; -import com.intellectualcrafters.plot.util.bukkit.Metrics; -import com.intellectualcrafters.plot.util.bukkit.SendChunk; -import com.intellectualcrafters.plot.util.bukkit.SetBlockFast; -import com.intellectualcrafters.plot.util.bukkit.SetBlockFast_1_8; -import com.intellectualcrafters.plot.util.bukkit.SetBlockSlow; -import com.intellectualcrafters.plot.util.bukkit.SetGenCB; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; -import com.intellectualcrafters.plot.uuid.DefaultUUIDWrapper; -import com.intellectualcrafters.plot.uuid.LowerOfflineUUIDWrapper; -import com.intellectualcrafters.plot.uuid.OfflineUUIDWrapper; -import com.intellectualcrafters.plot.uuid.UUIDWrapper; -import com.sk89q.worldedit.WorldEdit; -import com.sk89q.worldedit.bukkit.WorldEditPlugin; +import java.io.File; +import java.util.ArrayDeque; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; public class BukkitMain extends JavaPlugin implements Listener, IPlotMain { diff --git a/src/main/java/com/intellectualcrafters/plot/database/plotme/APlotMeConnector.java b/src/main/java/com/plotsquared/bukkit/database/plotme/APlotMeConnector.java similarity index 98% rename from src/main/java/com/intellectualcrafters/plot/database/plotme/APlotMeConnector.java rename to src/main/java/com/plotsquared/bukkit/database/plotme/APlotMeConnector.java index 9b9920b5d..dce18505e 100644 --- a/src/main/java/com/intellectualcrafters/plot/database/plotme/APlotMeConnector.java +++ b/src/main/java/com/plotsquared/bukkit/database/plotme/APlotMeConnector.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.database.plotme; +package com.plotsquared.bukkit.database.plotme; import java.sql.Connection; import java.sql.SQLException; diff --git a/src/main/java/com/intellectualcrafters/plot/database/plotme/ClassicPlotMeConnector.java b/src/main/java/com/plotsquared/bukkit/database/plotme/ClassicPlotMeConnector.java similarity index 98% rename from src/main/java/com/intellectualcrafters/plot/database/plotme/ClassicPlotMeConnector.java rename to src/main/java/com/plotsquared/bukkit/database/plotme/ClassicPlotMeConnector.java index e28a9493b..f1d5b92f6 100644 --- a/src/main/java/com/intellectualcrafters/plot/database/plotme/ClassicPlotMeConnector.java +++ b/src/main/java/com/plotsquared/bukkit/database/plotme/ClassicPlotMeConnector.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.database.plotme; +package com.plotsquared.bukkit.database.plotme; import java.io.File; import java.sql.Connection; @@ -20,7 +20,7 @@ import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.StringWrapper; import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; public class ClassicPlotMeConnector extends APlotMeConnector { diff --git a/src/main/java/com/intellectualcrafters/plot/database/plotme/LikePlotMeConverter.java b/src/main/java/com/plotsquared/bukkit/database/plotme/LikePlotMeConverter.java similarity index 99% rename from src/main/java/com/intellectualcrafters/plot/database/plotme/LikePlotMeConverter.java rename to src/main/java/com/plotsquared/bukkit/database/plotme/LikePlotMeConverter.java index 12fd2428c..21e16c090 100644 --- a/src/main/java/com/intellectualcrafters/plot/database/plotme/LikePlotMeConverter.java +++ b/src/main/java/com/plotsquared/bukkit/database/plotme/LikePlotMeConverter.java @@ -18,7 +18,7 @@ // / // You can contact us via: support@intellectualsites.com / //////////////////////////////////////////////////////////////////////////////////////////////////// -package com.intellectualcrafters.plot.database.plotme; +package com.plotsquared.bukkit.database.plotme; import java.io.File; import java.io.IOException; @@ -43,7 +43,7 @@ import com.intellectualcrafters.configuration.file.YamlConfiguration; import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.generator.HybridGen; +import com.plotsquared.bukkit.generator.HybridGen; import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.util.TaskManager; diff --git a/src/main/java/com/intellectualcrafters/plot/database/plotme/PlotMeConnector_017.java b/src/main/java/com/plotsquared/bukkit/database/plotme/PlotMeConnector_017.java similarity index 98% rename from src/main/java/com/intellectualcrafters/plot/database/plotme/PlotMeConnector_017.java rename to src/main/java/com/plotsquared/bukkit/database/plotme/PlotMeConnector_017.java index cc131d254..b2e3f9b8b 100644 --- a/src/main/java/com/intellectualcrafters/plot/database/plotme/PlotMeConnector_017.java +++ b/src/main/java/com/plotsquared/bukkit/database/plotme/PlotMeConnector_017.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.database.plotme; +package com.plotsquared.bukkit.database.plotme; import java.io.File; import java.sql.Connection; @@ -20,7 +20,7 @@ import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.StringWrapper; import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; public class PlotMeConnector_017 extends APlotMeConnector { private String plugin; diff --git a/src/main/java/com/intellectualcrafters/plot/events/ClusterFlagRemoveEvent.java b/src/main/java/com/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java similarity index 98% rename from src/main/java/com/intellectualcrafters/plot/events/ClusterFlagRemoveEvent.java rename to src/main/java/com/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java index 85f1878f6..ee71aaf0b 100644 --- a/src/main/java/com/intellectualcrafters/plot/events/ClusterFlagRemoveEvent.java +++ b/src/main/java/com/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java @@ -18,7 +18,7 @@ // / // You can contact us via: support@intellectualsites.com / //////////////////////////////////////////////////////////////////////////////////////////////////// -package com.intellectualcrafters.plot.events; +package com.plotsquared.bukkit.events; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; diff --git a/src/main/java/com/intellectualcrafters/plot/events/PlayerClaimPlotEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlayerClaimPlotEvent.java similarity index 98% rename from src/main/java/com/intellectualcrafters/plot/events/PlayerClaimPlotEvent.java rename to src/main/java/com/plotsquared/bukkit/events/PlayerClaimPlotEvent.java index 89a0b39ed..b9616c300 100644 --- a/src/main/java/com/intellectualcrafters/plot/events/PlayerClaimPlotEvent.java +++ b/src/main/java/com/plotsquared/bukkit/events/PlayerClaimPlotEvent.java @@ -18,7 +18,7 @@ // / // You can contact us via: support@intellectualsites.com / //////////////////////////////////////////////////////////////////////////////////////////////////// -package com.intellectualcrafters.plot.events; +package com.plotsquared.bukkit.events; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; diff --git a/src/main/java/com/intellectualcrafters/plot/events/PlayerEnterPlotEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlayerEnterPlotEvent.java similarity index 98% rename from src/main/java/com/intellectualcrafters/plot/events/PlayerEnterPlotEvent.java rename to src/main/java/com/plotsquared/bukkit/events/PlayerEnterPlotEvent.java index d7b37386a..ba203cebe 100644 --- a/src/main/java/com/intellectualcrafters/plot/events/PlayerEnterPlotEvent.java +++ b/src/main/java/com/plotsquared/bukkit/events/PlayerEnterPlotEvent.java @@ -18,7 +18,7 @@ // / // You can contact us via: support@intellectualsites.com / //////////////////////////////////////////////////////////////////////////////////////////////////// -package com.intellectualcrafters.plot.events; +package com.plotsquared.bukkit.events; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/intellectualcrafters/plot/events/PlayerLeavePlotEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlayerLeavePlotEvent.java similarity index 98% rename from src/main/java/com/intellectualcrafters/plot/events/PlayerLeavePlotEvent.java rename to src/main/java/com/plotsquared/bukkit/events/PlayerLeavePlotEvent.java index 725c22d43..c493388ea 100644 --- a/src/main/java/com/intellectualcrafters/plot/events/PlayerLeavePlotEvent.java +++ b/src/main/java/com/plotsquared/bukkit/events/PlayerLeavePlotEvent.java @@ -18,7 +18,7 @@ // / // You can contact us via: support@intellectualsites.com / //////////////////////////////////////////////////////////////////////////////////////////////////// -package com.intellectualcrafters.plot.events; +package com.plotsquared.bukkit.events; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotDeniedEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlayerPlotDeniedEvent.java similarity index 98% rename from src/main/java/com/intellectualcrafters/plot/events/PlayerPlotDeniedEvent.java rename to src/main/java/com/plotsquared/bukkit/events/PlayerPlotDeniedEvent.java index a68b1bddd..2fd73d28d 100644 --- a/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotDeniedEvent.java +++ b/src/main/java/com/plotsquared/bukkit/events/PlayerPlotDeniedEvent.java @@ -18,7 +18,7 @@ // / // You can contact us via: support@intellectualsites.com / //////////////////////////////////////////////////////////////////////////////////////////////////// -package com.intellectualcrafters.plot.events; +package com.plotsquared.bukkit.events; import java.util.UUID; diff --git a/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotHelperEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlayerPlotHelperEvent.java similarity index 98% rename from src/main/java/com/intellectualcrafters/plot/events/PlayerPlotHelperEvent.java rename to src/main/java/com/plotsquared/bukkit/events/PlayerPlotHelperEvent.java index 50dabcf2f..c44156f51 100644 --- a/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotHelperEvent.java +++ b/src/main/java/com/plotsquared/bukkit/events/PlayerPlotHelperEvent.java @@ -18,7 +18,7 @@ // / // You can contact us via: support@intellectualsites.com / //////////////////////////////////////////////////////////////////////////////////////////////////// -package com.intellectualcrafters.plot.events; +package com.plotsquared.bukkit.events; import java.util.UUID; diff --git a/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotTrustedEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlayerPlotTrustedEvent.java similarity index 98% rename from src/main/java/com/intellectualcrafters/plot/events/PlayerPlotTrustedEvent.java rename to src/main/java/com/plotsquared/bukkit/events/PlayerPlotTrustedEvent.java index d2d5ddada..189cd575c 100644 --- a/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotTrustedEvent.java +++ b/src/main/java/com/plotsquared/bukkit/events/PlayerPlotTrustedEvent.java @@ -18,7 +18,7 @@ // / // You can contact us via: support@intellectualsites.com / //////////////////////////////////////////////////////////////////////////////////////////////////// -package com.intellectualcrafters.plot.events; +package com.plotsquared.bukkit.events; import java.util.UUID; diff --git a/src/main/java/com/intellectualcrafters/plot/events/PlayerTeleportToPlotEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlayerTeleportToPlotEvent.java similarity index 98% rename from src/main/java/com/intellectualcrafters/plot/events/PlayerTeleportToPlotEvent.java rename to src/main/java/com/plotsquared/bukkit/events/PlayerTeleportToPlotEvent.java index 0ee562ab5..d8af3de51 100644 --- a/src/main/java/com/intellectualcrafters/plot/events/PlayerTeleportToPlotEvent.java +++ b/src/main/java/com/plotsquared/bukkit/events/PlayerTeleportToPlotEvent.java @@ -18,7 +18,7 @@ // / // You can contact us via: support@intellectualsites.com / //////////////////////////////////////////////////////////////////////////////////////////////////// -package com.intellectualcrafters.plot.events; +package com.plotsquared.bukkit.events; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; diff --git a/src/main/java/com/intellectualcrafters/plot/events/PlotClearEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlotClearEvent.java similarity index 98% rename from src/main/java/com/intellectualcrafters/plot/events/PlotClearEvent.java rename to src/main/java/com/plotsquared/bukkit/events/PlotClearEvent.java index dcffe98c2..4f66073fa 100644 --- a/src/main/java/com/intellectualcrafters/plot/events/PlotClearEvent.java +++ b/src/main/java/com/plotsquared/bukkit/events/PlotClearEvent.java @@ -18,7 +18,7 @@ // / // You can contact us via: support@intellectualsites.com / //////////////////////////////////////////////////////////////////////////////////////////////////// -package com.intellectualcrafters.plot.events; +package com.plotsquared.bukkit.events; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; diff --git a/src/main/java/com/intellectualcrafters/plot/events/PlotDeleteEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlotDeleteEvent.java similarity index 98% rename from src/main/java/com/intellectualcrafters/plot/events/PlotDeleteEvent.java rename to src/main/java/com/plotsquared/bukkit/events/PlotDeleteEvent.java index d61826508..5f5b0aa38 100644 --- a/src/main/java/com/intellectualcrafters/plot/events/PlotDeleteEvent.java +++ b/src/main/java/com/plotsquared/bukkit/events/PlotDeleteEvent.java @@ -18,7 +18,7 @@ // / // You can contact us via: support@intellectualsites.com / //////////////////////////////////////////////////////////////////////////////////////////////////// -package com.intellectualcrafters.plot.events; +package com.plotsquared.bukkit.events; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/intellectualcrafters/plot/events/PlotEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlotEvent.java similarity index 86% rename from src/main/java/com/intellectualcrafters/plot/events/PlotEvent.java rename to src/main/java/com/plotsquared/bukkit/events/PlotEvent.java index 26e803738..1e45b9fbf 100644 --- a/src/main/java/com/intellectualcrafters/plot/events/PlotEvent.java +++ b/src/main/java/com/plotsquared/bukkit/events/PlotEvent.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.events; +package com.plotsquared.bukkit.events; import org.bukkit.event.Event; diff --git a/src/main/java/com/intellectualcrafters/plot/events/PlotFlagAddEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlotFlagAddEvent.java similarity index 98% rename from src/main/java/com/intellectualcrafters/plot/events/PlotFlagAddEvent.java rename to src/main/java/com/plotsquared/bukkit/events/PlotFlagAddEvent.java index 698a17871..eefd61555 100644 --- a/src/main/java/com/intellectualcrafters/plot/events/PlotFlagAddEvent.java +++ b/src/main/java/com/plotsquared/bukkit/events/PlotFlagAddEvent.java @@ -18,7 +18,7 @@ // / // You can contact us via: support@intellectualsites.com / //////////////////////////////////////////////////////////////////////////////////////////////////// -package com.intellectualcrafters.plot.events; +package com.plotsquared.bukkit.events; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/intellectualcrafters/plot/events/PlotFlagRemoveEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlotFlagRemoveEvent.java similarity index 98% rename from src/main/java/com/intellectualcrafters/plot/events/PlotFlagRemoveEvent.java rename to src/main/java/com/plotsquared/bukkit/events/PlotFlagRemoveEvent.java index e081156e3..cce59834f 100644 --- a/src/main/java/com/intellectualcrafters/plot/events/PlotFlagRemoveEvent.java +++ b/src/main/java/com/plotsquared/bukkit/events/PlotFlagRemoveEvent.java @@ -18,7 +18,7 @@ // / // You can contact us via: support@intellectualsites.com / //////////////////////////////////////////////////////////////////////////////////////////////////// -package com.intellectualcrafters.plot.events; +package com.plotsquared.bukkit.events; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/intellectualcrafters/plot/events/PlotMergeEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlotMergeEvent.java similarity index 98% rename from src/main/java/com/intellectualcrafters/plot/events/PlotMergeEvent.java rename to src/main/java/com/plotsquared/bukkit/events/PlotMergeEvent.java index 04ec0edbe..99ca03ddb 100644 --- a/src/main/java/com/intellectualcrafters/plot/events/PlotMergeEvent.java +++ b/src/main/java/com/plotsquared/bukkit/events/PlotMergeEvent.java @@ -18,7 +18,7 @@ // / // You can contact us via: support@intellectualsites.com / //////////////////////////////////////////////////////////////////////////////////////////////////// -package com.intellectualcrafters.plot.events; +package com.plotsquared.bukkit.events; import java.util.ArrayList; diff --git a/src/main/java/com/intellectualcrafters/plot/events/PlotRateEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlotRateEvent.java similarity index 95% rename from src/main/java/com/intellectualcrafters/plot/events/PlotRateEvent.java rename to src/main/java/com/plotsquared/bukkit/events/PlotRateEvent.java index abeeb67e3..bf87381ef 100644 --- a/src/main/java/com/intellectualcrafters/plot/events/PlotRateEvent.java +++ b/src/main/java/com/plotsquared/bukkit/events/PlotRateEvent.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.events; +package com.plotsquared.bukkit.events; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/intellectualcrafters/plot/events/PlotUnlinkEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlotUnlinkEvent.java similarity index 98% rename from src/main/java/com/intellectualcrafters/plot/events/PlotUnlinkEvent.java rename to src/main/java/com/plotsquared/bukkit/events/PlotUnlinkEvent.java index 7013ced7f..a8d4e8854 100644 --- a/src/main/java/com/intellectualcrafters/plot/events/PlotUnlinkEvent.java +++ b/src/main/java/com/plotsquared/bukkit/events/PlotUnlinkEvent.java @@ -18,7 +18,7 @@ // / // You can contact us via: support@intellectualsites.com / //////////////////////////////////////////////////////////////////////////////////////////////////// -package com.intellectualcrafters.plot.events; +package com.plotsquared.bukkit.events; import java.util.ArrayList; diff --git a/src/main/java/com/intellectualcrafters/plot/generator/AugmentedPopulator.java b/src/main/java/com/plotsquared/bukkit/generator/AugmentedPopulator.java similarity index 97% rename from src/main/java/com/intellectualcrafters/plot/generator/AugmentedPopulator.java rename to src/main/java/com/plotsquared/bukkit/generator/AugmentedPopulator.java index d0f737648..8a8efba8e 100644 --- a/src/main/java/com/intellectualcrafters/plot/generator/AugmentedPopulator.java +++ b/src/main/java/com/plotsquared/bukkit/generator/AugmentedPopulator.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.generator; +package com.plotsquared.bukkit.generator; import java.util.HashMap; import java.util.Iterator; @@ -12,10 +12,10 @@ import org.bukkit.block.Biome; import org.bukkit.generator.BlockPopulator; import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.BlockWrapper; +import com.plotsquared.bukkit.object.BlockWrapper; import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.PlotCluster; -import com.intellectualcrafters.plot.object.PlotGenerator; +import com.plotsquared.bukkit.object.PlotGenerator; import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.PlotLoc; import com.intellectualcrafters.plot.object.PlotManager; @@ -23,8 +23,8 @@ import com.intellectualcrafters.plot.object.PlotWorld; import com.intellectualcrafters.plot.object.RegionWrapper; import com.intellectualcrafters.plot.util.ChunkManager; import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.bukkit.BukkitChunkManager; -import com.intellectualcrafters.plot.util.bukkit.BukkitSetBlockManager; +import com.plotsquared.bukkit.util.bukkit.BukkitChunkManager; +import com.plotsquared.bukkit.util.bukkit.BukkitSetBlockManager; public class AugmentedPopulator extends BlockPopulator { public static short[][] x_loc; diff --git a/src/main/java/com/intellectualcrafters/plot/generator/HybridGen.java b/src/main/java/com/plotsquared/bukkit/generator/HybridGen.java similarity index 97% rename from src/main/java/com/intellectualcrafters/plot/generator/HybridGen.java rename to src/main/java/com/plotsquared/bukkit/generator/HybridGen.java index 47bd20da6..fef7d57fa 100644 --- a/src/main/java/com/intellectualcrafters/plot/generator/HybridGen.java +++ b/src/main/java/com/plotsquared/bukkit/generator/HybridGen.java @@ -18,21 +18,24 @@ // / // You can contact us via: support@intellectualsites.com / //////////////////////////////////////////////////////////////////////////////////////////////////// -package com.intellectualcrafters.plot.generator; +package com.plotsquared.bukkit.generator; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map.Entry; +import com.intellectualcrafters.plot.generator.HybridPlotManager; +import com.intellectualcrafters.plot.generator.HybridPlotWorld; +import com.intellectualcrafters.plot.generator.HybridPop; import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.block.Biome; -import com.intellectualcrafters.plot.object.PlotGenerator; +import com.plotsquared.bukkit.object.PlotGenerator; import com.intellectualcrafters.plot.object.PlotLoc; import com.intellectualcrafters.plot.object.PlotManager; -import com.intellectualcrafters.plot.object.PlotPopulator; +import com.plotsquared.bukkit.object.PlotPopulator; import com.intellectualcrafters.plot.object.PlotWorld; import com.intellectualcrafters.plot.object.PseudoRandom; import com.intellectualcrafters.plot.object.RegionWrapper; diff --git a/src/main/java/com/intellectualcrafters/plot/listeners/APlotListener.java b/src/main/java/com/plotsquared/bukkit/listeners/APlotListener.java similarity index 88% rename from src/main/java/com/intellectualcrafters/plot/listeners/APlotListener.java rename to src/main/java/com/plotsquared/bukkit/listeners/APlotListener.java index baa07c6ea..f43a30e51 100644 --- a/src/main/java/com/intellectualcrafters/plot/listeners/APlotListener.java +++ b/src/main/java/com/plotsquared/bukkit/listeners/APlotListener.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.listeners; +package com.plotsquared.bukkit.listeners; import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotPlayer; diff --git a/src/main/java/com/intellectualcrafters/plot/listeners/ChatListener.java b/src/main/java/com/plotsquared/bukkit/listeners/ChatListener.java similarity index 95% rename from src/main/java/com/intellectualcrafters/plot/listeners/ChatListener.java rename to src/main/java/com/plotsquared/bukkit/listeners/ChatListener.java index 466132852..e6b8dcaba 100644 --- a/src/main/java/com/intellectualcrafters/plot/listeners/ChatListener.java +++ b/src/main/java/com/plotsquared/bukkit/listeners/ChatListener.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.listeners; +package com.plotsquared.bukkit.listeners; import java.util.Set; @@ -18,7 +18,7 @@ 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; +import com.plotsquared.bukkit.util.bukkit.BukkitUtil; /** * Created 2015-07-13 for PlotSquaredGit diff --git a/src/main/java/com/intellectualcrafters/plot/listeners/ChunkListener.java b/src/main/java/com/plotsquared/bukkit/listeners/ChunkListener.java similarity index 99% rename from src/main/java/com/intellectualcrafters/plot/listeners/ChunkListener.java rename to src/main/java/com/plotsquared/bukkit/listeners/ChunkListener.java index 756b2502f..82204868d 100644 --- a/src/main/java/com/intellectualcrafters/plot/listeners/ChunkListener.java +++ b/src/main/java/com/plotsquared/bukkit/listeners/ChunkListener.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.listeners; +package com.plotsquared.bukkit.listeners; import org.bukkit.Bukkit; import org.bukkit.Chunk; diff --git a/src/main/java/com/intellectualcrafters/plot/listeners/ForceFieldListener.java b/src/main/java/com/plotsquared/bukkit/listeners/ForceFieldListener.java similarity index 95% rename from src/main/java/com/intellectualcrafters/plot/listeners/ForceFieldListener.java rename to src/main/java/com/plotsquared/bukkit/listeners/ForceFieldListener.java index 184269231..4313b614c 100644 --- a/src/main/java/com/intellectualcrafters/plot/listeners/ForceFieldListener.java +++ b/src/main/java/com/plotsquared/bukkit/listeners/ForceFieldListener.java @@ -18,7 +18,7 @@ // / // You can contact us via: support@intellectualsites.com / //////////////////////////////////////////////////////////////////////////////////////////////////// -package com.intellectualcrafters.plot.listeners; +package com.plotsquared.bukkit.listeners; import java.util.HashSet; import java.util.Set; @@ -30,14 +30,14 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.util.Vector; -import com.intellectualcrafters.plot.events.PlayerEnterPlotEvent; +import com.plotsquared.bukkit.events.PlayerEnterPlotEvent; import com.intellectualcrafters.plot.flag.FlagManager; import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.bukkit.BukkitPlayerFunctions; -import com.intellectualcrafters.plot.util.bukkit.BukkitUtil; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.BukkitPlayerFunctions; +import com.plotsquared.bukkit.util.bukkit.BukkitUtil; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; /** * @author Citymonstret diff --git a/src/main/java/com/intellectualcrafters/plot/listeners/InventoryListener.java b/src/main/java/com/plotsquared/bukkit/listeners/InventoryListener.java similarity index 88% rename from src/main/java/com/intellectualcrafters/plot/listeners/InventoryListener.java rename to src/main/java/com/plotsquared/bukkit/listeners/InventoryListener.java index 8fb54c1dc..415131598 100644 --- a/src/main/java/com/intellectualcrafters/plot/listeners/InventoryListener.java +++ b/src/main/java/com/plotsquared/bukkit/listeners/InventoryListener.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.listeners; +package com.plotsquared.bukkit.listeners; import org.bukkit.entity.Player; import org.bukkit.event.Event; @@ -8,9 +8,9 @@ import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryInteractEvent; import org.bukkit.inventory.Inventory; -import com.intellectualcrafters.plot.object.InfoInventory; +import com.plotsquared.bukkit.object.InfoInventory; import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.bukkit.BukkitUtil; +import com.plotsquared.bukkit.util.bukkit.BukkitUtil; /** * Created 2014-11-18 for PlotSquared diff --git a/src/main/java/com/intellectualcrafters/plot/listeners/PlayerBlockEventType.java b/src/main/java/com/plotsquared/bukkit/listeners/PlayerBlockEventType.java similarity index 93% rename from src/main/java/com/intellectualcrafters/plot/listeners/PlayerBlockEventType.java rename to src/main/java/com/plotsquared/bukkit/listeners/PlayerBlockEventType.java index 324de6a4e..f728a9025 100644 --- a/src/main/java/com/intellectualcrafters/plot/listeners/PlayerBlockEventType.java +++ b/src/main/java/com/plotsquared/bukkit/listeners/PlayerBlockEventType.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.listeners; +package com.plotsquared.bukkit.listeners; public enum PlayerBlockEventType { // Non interactive diff --git a/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java b/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java similarity index 99% rename from src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java rename to src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java index a9f034356..969cd2e85 100644 --- a/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java +++ b/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.listeners; +package com.plotsquared.bukkit.listeners; import java.util.ArrayList; import java.util.Arrays; @@ -28,10 +28,8 @@ import org.bukkit.entity.EnderDragon; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.FallingBlock; -import org.bukkit.entity.FishHook; import org.bukkit.entity.Hanging; import org.bukkit.entity.HumanEntity; -import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Monster; import org.bukkit.entity.Player; import org.bukkit.entity.Projectile; @@ -95,9 +93,9 @@ import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.flag.Flag; import com.intellectualcrafters.plot.flag.FlagManager; -import com.intellectualcrafters.plot.listeners.worldedit.WEManager; -import com.intellectualcrafters.plot.object.BukkitLazyBlock; -import com.intellectualcrafters.plot.object.BukkitPlayer; +import com.plotsquared.bukkit.listeners.worldedit.WEManager; +import com.plotsquared.bukkit.object.BukkitLazyBlock; +import com.plotsquared.bukkit.object.BukkitPlayer; import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotBlock; @@ -115,8 +113,8 @@ 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 com.plotsquared.bukkit.util.bukkit.BukkitUtil; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; /** * Player Events involving plots @@ -124,7 +122,7 @@ import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; * @author Citymonstret * @author Empire92 */ -public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotListener implements Listener { +public class PlayerEvents extends com.plotsquared.bukkit.listeners.PlotListener implements Listener { private boolean pistonBlocks = true; diff --git a/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents_1_8.java b/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents_1_8.java similarity index 98% rename from src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents_1_8.java rename to src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents_1_8.java index c0cfe0066..adc9e5dd3 100644 --- a/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents_1_8.java +++ b/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents_1_8.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.listeners; +package com.plotsquared.bukkit.listeners; import java.util.HashSet; import java.util.List; @@ -27,7 +27,7 @@ import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.bukkit.BukkitUtil; +import com.plotsquared.bukkit.util.bukkit.BukkitUtil; public class PlayerEvents_1_8 extends PlotListener implements Listener { diff --git a/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents_1_8_3.java b/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents_1_8_3.java similarity index 94% rename from src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents_1_8_3.java rename to src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents_1_8_3.java index 4561c6974..486f54af1 100644 --- a/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents_1_8_3.java +++ b/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents_1_8_3.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.listeners; +package com.plotsquared.bukkit.listeners; import java.util.Iterator; @@ -13,7 +13,7 @@ import com.intellectualcrafters.plot.flag.FlagManager; import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.bukkit.BukkitUtil; +import com.plotsquared.bukkit.util.bukkit.BukkitUtil; public class PlayerEvents_1_8_3 implements Listener { @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) diff --git a/src/main/java/com/intellectualcrafters/plot/listeners/PlotListener.java b/src/main/java/com/plotsquared/bukkit/listeners/PlotListener.java similarity index 96% rename from src/main/java/com/intellectualcrafters/plot/listeners/PlotListener.java rename to src/main/java/com/plotsquared/bukkit/listeners/PlotListener.java index 549c05808..0e0d540a0 100644 --- a/src/main/java/com/intellectualcrafters/plot/listeners/PlotListener.java +++ b/src/main/java/com/plotsquared/bukkit/listeners/PlotListener.java @@ -18,7 +18,7 @@ // / // You can contact us via: support@intellectualsites.com / //////////////////////////////////////////////////////////////////////////////////////////////////// -package com.intellectualcrafters.plot.listeners; +package com.plotsquared.bukkit.listeners; import java.util.Arrays; import java.util.HashMap; @@ -36,21 +36,20 @@ import org.bukkit.entity.Player; import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.events.PlayerEnterPlotEvent; -import com.intellectualcrafters.plot.events.PlayerLeavePlotEvent; +import com.plotsquared.bukkit.events.PlayerEnterPlotEvent; +import com.plotsquared.bukkit.events.PlayerLeavePlotEvent; import com.intellectualcrafters.plot.flag.Flag; import com.intellectualcrafters.plot.flag.FlagManager; -import com.intellectualcrafters.plot.object.BukkitPlayer; +import com.plotsquared.bukkit.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.comment.CommentManager; -import com.intellectualcrafters.plot.titles.AbstractTitle; +import com.plotsquared.bukkit.object.comment.CommentManager; +import com.plotsquared.bukkit.titles.AbstractTitle; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.Permissions; import com.intellectualcrafters.plot.util.StringMan; import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; /** * @author Citymonstret diff --git a/src/main/java/com/intellectualcrafters/plot/listeners/PlotPlusListener.java b/src/main/java/com/plotsquared/bukkit/listeners/PlotPlusListener.java similarity index 97% rename from src/main/java/com/intellectualcrafters/plot/listeners/PlotPlusListener.java rename to src/main/java/com/plotsquared/bukkit/listeners/PlotPlusListener.java index 495aaec3e..f8b87c365 100644 --- a/src/main/java/com/intellectualcrafters/plot/listeners/PlotPlusListener.java +++ b/src/main/java/com/plotsquared/bukkit/listeners/PlotPlusListener.java @@ -18,13 +18,12 @@ // / // You can contact us via: support@intellectualsites.com / //////////////////////////////////////////////////////////////////////////////////////////////////// -package com.intellectualcrafters.plot.listeners; +package com.plotsquared.bukkit.listeners; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Map.Entry; import java.util.UUID; @@ -45,8 +44,8 @@ import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.plugin.java.JavaPlugin; import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.events.PlayerEnterPlotEvent; -import com.intellectualcrafters.plot.events.PlayerLeavePlotEvent; +import com.plotsquared.bukkit.events.PlayerEnterPlotEvent; +import com.plotsquared.bukkit.events.PlayerLeavePlotEvent; import com.intellectualcrafters.plot.flag.Flag; import com.intellectualcrafters.plot.flag.FlagManager; import com.intellectualcrafters.plot.object.Plot; @@ -54,8 +53,8 @@ import com.intellectualcrafters.plot.object.PlotHandler; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.bukkit.BukkitUtil; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.BukkitUtil; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; /** * Created 2014-10-30 for PlotSquared diff --git a/src/main/java/com/intellectualcrafters/plot/listeners/TNTListener.java b/src/main/java/com/plotsquared/bukkit/listeners/TNTListener.java similarity index 97% rename from src/main/java/com/intellectualcrafters/plot/listeners/TNTListener.java rename to src/main/java/com/plotsquared/bukkit/listeners/TNTListener.java index 20628bbab..f7940a7f5 100644 --- a/src/main/java/com/intellectualcrafters/plot/listeners/TNTListener.java +++ b/src/main/java/com/plotsquared/bukkit/listeners/TNTListener.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.listeners; +package com.plotsquared.bukkit.listeners; import java.util.List; @@ -17,7 +17,7 @@ import com.intellectualcrafters.plot.flag.FlagManager; import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.bukkit.BukkitUtil; +import com.plotsquared.bukkit.util.bukkit.BukkitUtil; public class TNTListener implements Listener { private double lastRadius; diff --git a/src/main/java/com/intellectualcrafters/plot/listeners/WorldEvents.java b/src/main/java/com/plotsquared/bukkit/listeners/WorldEvents.java similarity index 89% rename from src/main/java/com/intellectualcrafters/plot/listeners/WorldEvents.java rename to src/main/java/com/plotsquared/bukkit/listeners/WorldEvents.java index 42a30994d..fa6ee0f38 100644 --- a/src/main/java/com/intellectualcrafters/plot/listeners/WorldEvents.java +++ b/src/main/java/com/plotsquared/bukkit/listeners/WorldEvents.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.listeners; +package com.plotsquared.bukkit.listeners; import org.bukkit.World; import org.bukkit.event.EventHandler; @@ -9,8 +9,8 @@ import org.bukkit.event.world.WorldLoadEvent; import org.bukkit.generator.ChunkGenerator; import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.PlotGenerator; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.object.PlotGenerator; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; public class WorldEvents implements Listener { diff --git a/src/main/java/com/intellectualcrafters/plot/listeners/worldedit/NullExtent.java b/src/main/java/com/plotsquared/bukkit/listeners/worldedit/NullExtent.java similarity index 96% rename from src/main/java/com/intellectualcrafters/plot/listeners/worldedit/NullExtent.java rename to src/main/java/com/plotsquared/bukkit/listeners/worldedit/NullExtent.java index 2da67a910..2d196ac1d 100644 --- a/src/main/java/com/intellectualcrafters/plot/listeners/worldedit/NullExtent.java +++ b/src/main/java/com/plotsquared/bukkit/listeners/worldedit/NullExtent.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.listeners.worldedit; +package com.plotsquared.bukkit.listeners.worldedit; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/intellectualcrafters/plot/listeners/worldedit/ProcessedWEExtent.java b/src/main/java/com/plotsquared/bukkit/listeners/worldedit/ProcessedWEExtent.java similarity index 98% rename from src/main/java/com/intellectualcrafters/plot/listeners/worldedit/ProcessedWEExtent.java rename to src/main/java/com/plotsquared/bukkit/listeners/worldedit/ProcessedWEExtent.java index 9b09f301c..25d93335c 100644 --- a/src/main/java/com/intellectualcrafters/plot/listeners/worldedit/ProcessedWEExtent.java +++ b/src/main/java/com/plotsquared/bukkit/listeners/worldedit/ProcessedWEExtent.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.listeners.worldedit; +package com.plotsquared.bukkit.listeners.worldedit; import java.util.HashSet; diff --git a/src/main/java/com/intellectualcrafters/plot/listeners/worldedit/WEExtent.java b/src/main/java/com/plotsquared/bukkit/listeners/worldedit/WEExtent.java similarity index 96% rename from src/main/java/com/intellectualcrafters/plot/listeners/worldedit/WEExtent.java rename to src/main/java/com/plotsquared/bukkit/listeners/worldedit/WEExtent.java index 1f3eb35c6..4656409fe 100644 --- a/src/main/java/com/intellectualcrafters/plot/listeners/worldedit/WEExtent.java +++ b/src/main/java/com/plotsquared/bukkit/listeners/worldedit/WEExtent.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.listeners.worldedit; +package com.plotsquared.bukkit.listeners.worldedit; import java.util.HashSet; diff --git a/src/main/java/com/intellectualcrafters/plot/listeners/worldedit/WEListener.java b/src/main/java/com/plotsquared/bukkit/listeners/worldedit/WEListener.java similarity index 99% rename from src/main/java/com/intellectualcrafters/plot/listeners/worldedit/WEListener.java rename to src/main/java/com/plotsquared/bukkit/listeners/worldedit/WEListener.java index 8458c7553..273b323c6 100644 --- a/src/main/java/com/intellectualcrafters/plot/listeners/worldedit/WEListener.java +++ b/src/main/java/com/plotsquared/bukkit/listeners/worldedit/WEListener.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.listeners.worldedit; +package com.plotsquared.bukkit.listeners.worldedit; import java.util.Arrays; import java.util.HashSet; @@ -19,7 +19,7 @@ import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.RegionWrapper; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.bukkit.BukkitUtil; +import com.plotsquared.bukkit.util.bukkit.BukkitUtil; import com.sk89q.worldedit.BlockVector; import com.sk89q.worldedit.bukkit.selections.Selection; diff --git a/src/main/java/com/intellectualcrafters/plot/listeners/worldedit/WEManager.java b/src/main/java/com/plotsquared/bukkit/listeners/worldedit/WEManager.java similarity index 97% rename from src/main/java/com/intellectualcrafters/plot/listeners/worldedit/WEManager.java rename to src/main/java/com/plotsquared/bukkit/listeners/worldedit/WEManager.java index dc166fe2e..eecaf6142 100644 --- a/src/main/java/com/intellectualcrafters/plot/listeners/worldedit/WEManager.java +++ b/src/main/java/com/plotsquared/bukkit/listeners/worldedit/WEManager.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.listeners.worldedit; +package com.plotsquared.bukkit.listeners.worldedit; import java.util.HashSet; import java.util.UUID; diff --git a/src/main/java/com/intellectualcrafters/plot/listeners/worldedit/WESubscriber.java b/src/main/java/com/plotsquared/bukkit/listeners/worldedit/WESubscriber.java similarity index 93% rename from src/main/java/com/intellectualcrafters/plot/listeners/worldedit/WESubscriber.java rename to src/main/java/com/plotsquared/bukkit/listeners/worldedit/WESubscriber.java index e1819905e..121910b71 100644 --- a/src/main/java/com/intellectualcrafters/plot/listeners/worldedit/WESubscriber.java +++ b/src/main/java/com/plotsquared/bukkit/listeners/worldedit/WESubscriber.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.listeners.worldedit; +package com.plotsquared.bukkit.listeners.worldedit; import java.util.HashSet; @@ -9,7 +9,7 @@ import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.RegionWrapper; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; import com.sk89q.worldedit.event.extent.EditSessionEvent; import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.util.eventbus.EventHandler.Priority; diff --git a/src/main/java/com/intellectualcrafters/plot/object/BlockWrapper.java b/src/main/java/com/plotsquared/bukkit/object/BlockWrapper.java similarity index 98% rename from src/main/java/com/intellectualcrafters/plot/object/BlockWrapper.java rename to src/main/java/com/plotsquared/bukkit/object/BlockWrapper.java index 7f30e4c30..8eeaf0ac1 100644 --- a/src/main/java/com/intellectualcrafters/plot/object/BlockWrapper.java +++ b/src/main/java/com/plotsquared/bukkit/object/BlockWrapper.java @@ -18,7 +18,7 @@ // / // You can contact us via: support@intellectualsites.com / //////////////////////////////////////////////////////////////////////////////////////////////////// -package com.intellectualcrafters.plot.object; +package com.plotsquared.bukkit.object; import org.bukkit.World; import org.bukkit.block.Block; diff --git a/src/main/java/com/intellectualcrafters/plot/object/BukkitLazyBlock.java b/src/main/java/com/plotsquared/bukkit/object/BukkitLazyBlock.java similarity index 94% rename from src/main/java/com/intellectualcrafters/plot/object/BukkitLazyBlock.java rename to src/main/java/com/plotsquared/bukkit/object/BukkitLazyBlock.java index 8e285abec..df92a5b9a 100644 --- a/src/main/java/com/intellectualcrafters/plot/object/BukkitLazyBlock.java +++ b/src/main/java/com/plotsquared/bukkit/object/BukkitLazyBlock.java @@ -1,5 +1,7 @@ -package com.intellectualcrafters.plot.object; +package com.plotsquared.bukkit.object; +import com.intellectualcrafters.plot.object.LazyBlock; +import com.intellectualcrafters.plot.object.PlotBlock; import org.bukkit.block.Block; public class BukkitLazyBlock extends LazyBlock { diff --git a/src/main/java/com/intellectualcrafters/plot/object/BukkitOfflinePlayer.java b/src/main/java/com/plotsquared/bukkit/object/BukkitOfflinePlayer.java similarity index 88% rename from src/main/java/com/intellectualcrafters/plot/object/BukkitOfflinePlayer.java rename to src/main/java/com/plotsquared/bukkit/object/BukkitOfflinePlayer.java index 7c7db2eea..ed0d2214c 100644 --- a/src/main/java/com/intellectualcrafters/plot/object/BukkitOfflinePlayer.java +++ b/src/main/java/com/plotsquared/bukkit/object/BukkitOfflinePlayer.java @@ -1,7 +1,8 @@ -package com.intellectualcrafters.plot.object; +package com.plotsquared.bukkit.object; import java.util.UUID; +import com.intellectualcrafters.plot.object.OfflinePlotPlayer; import org.bukkit.OfflinePlayer; public class BukkitOfflinePlayer implements OfflinePlotPlayer { diff --git a/src/main/java/com/intellectualcrafters/plot/object/BukkitPlayer.java b/src/main/java/com/plotsquared/bukkit/object/BukkitPlayer.java similarity index 95% rename from src/main/java/com/intellectualcrafters/plot/object/BukkitPlayer.java rename to src/main/java/com/plotsquared/bukkit/object/BukkitPlayer.java index 297beb47b..aaabed6fc 100644 --- a/src/main/java/com/intellectualcrafters/plot/object/BukkitPlayer.java +++ b/src/main/java/com/plotsquared/bukkit/object/BukkitPlayer.java @@ -1,9 +1,11 @@ -package com.intellectualcrafters.plot.object; +package com.plotsquared.bukkit.object; import java.util.HashMap; import java.util.HashSet; import java.util.UUID; +import com.intellectualcrafters.plot.object.Location; +import com.intellectualcrafters.plot.object.PlotPlayer; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.permissions.Permission; @@ -11,8 +13,8 @@ import org.bukkit.permissions.PermissionDefault; import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.util.EconHandler; -import com.intellectualcrafters.plot.util.bukkit.BukkitUtil; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.BukkitUtil; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; public class BukkitPlayer implements PlotPlayer { diff --git a/src/main/java/com/intellectualcrafters/plot/object/InfoInventory.java b/src/main/java/com/plotsquared/bukkit/object/InfoInventory.java similarity index 92% rename from src/main/java/com/intellectualcrafters/plot/object/InfoInventory.java rename to src/main/java/com/plotsquared/bukkit/object/InfoInventory.java index 3e3677ba1..ed39310b3 100644 --- a/src/main/java/com/intellectualcrafters/plot/object/InfoInventory.java +++ b/src/main/java/com/plotsquared/bukkit/object/InfoInventory.java @@ -1,9 +1,11 @@ -package com.intellectualcrafters.plot.object; +package com.plotsquared.bukkit.object; import java.util.ArrayList; import java.util.List; import java.util.UUID; +import com.intellectualcrafters.plot.object.Plot; +import com.intellectualcrafters.plot.object.PlotPlayer; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; @@ -13,8 +15,8 @@ import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import com.intellectualcrafters.plot.util.bukkit.BukkitUtil; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.BukkitUtil; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; /** * Created 2014-11-18 for PlotSquared diff --git a/src/main/java/com/intellectualcrafters/plot/object/PlotGenerator.java b/src/main/java/com/plotsquared/bukkit/object/PlotGenerator.java similarity index 98% rename from src/main/java/com/intellectualcrafters/plot/object/PlotGenerator.java rename to src/main/java/com/plotsquared/bukkit/object/PlotGenerator.java index 55904c552..25992fc46 100644 --- a/src/main/java/com/intellectualcrafters/plot/object/PlotGenerator.java +++ b/src/main/java/com/plotsquared/bukkit/object/PlotGenerator.java @@ -18,7 +18,7 @@ // / // You can contact us via: support@intellectualsites.com / //////////////////////////////////////////////////////////////////////////////////////////////////// -package com.intellectualcrafters.plot.object; +package com.plotsquared.bukkit.object; import java.util.ArrayList; import java.util.HashMap; @@ -26,13 +26,14 @@ import java.util.List; import java.util.Map.Entry; import java.util.Random; +import com.intellectualcrafters.plot.object.*; import org.bukkit.World; import org.bukkit.block.Biome; import org.bukkit.generator.BlockPopulator; import org.bukkit.generator.ChunkGenerator; import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.listeners.WorldEvents; +import com.plotsquared.bukkit.listeners.WorldEvents; import com.intellectualcrafters.plot.util.ChunkManager; public abstract class PlotGenerator extends ChunkGenerator { diff --git a/src/main/java/com/intellectualcrafters/plot/object/PlotPopulator.java b/src/main/java/com/plotsquared/bukkit/object/PlotPopulator.java similarity index 92% rename from src/main/java/com/intellectualcrafters/plot/object/PlotPopulator.java rename to src/main/java/com/plotsquared/bukkit/object/PlotPopulator.java index dfe7f917a..cddb69cb9 100644 --- a/src/main/java/com/intellectualcrafters/plot/object/PlotPopulator.java +++ b/src/main/java/com/plotsquared/bukkit/object/PlotPopulator.java @@ -1,15 +1,18 @@ -package com.intellectualcrafters.plot.object; +package com.plotsquared.bukkit.object; import java.util.HashMap; import java.util.Map.Entry; import java.util.Random; +import com.intellectualcrafters.plot.object.PlotLoc; +import com.intellectualcrafters.plot.object.PseudoRandom; +import com.intellectualcrafters.plot.object.RegionWrapper; import org.bukkit.Chunk; import org.bukkit.World; import org.bukkit.generator.BlockPopulator; import com.intellectualcrafters.plot.util.ChunkManager; -import com.intellectualcrafters.plot.util.bukkit.BukkitUtil; +import com.plotsquared.bukkit.util.bukkit.BukkitUtil; public abstract class PlotPopulator extends BlockPopulator { diff --git a/src/main/java/com/intellectualcrafters/plot/object/comment/CommentManager.java b/src/main/java/com/plotsquared/bukkit/object/comment/CommentManager.java similarity index 95% rename from src/main/java/com/intellectualcrafters/plot/object/comment/CommentManager.java rename to src/main/java/com/plotsquared/bukkit/object/comment/CommentManager.java index 65f81d551..3a41bd7b3 100644 --- a/src/main/java/com/intellectualcrafters/plot/object/comment/CommentManager.java +++ b/src/main/java/com/plotsquared/bukkit/object/comment/CommentManager.java @@ -1,10 +1,11 @@ -package com.intellectualcrafters.plot.object.comment; +package com.plotsquared.bukkit.object.comment; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.concurrent.atomic.AtomicInteger; +import com.intellectualcrafters.plot.object.comment.*; import org.bukkit.ChatColor; import com.intellectualcrafters.plot.config.C; @@ -12,7 +13,7 @@ import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.RunnableVal; -import com.intellectualcrafters.plot.titles.AbstractTitle; +import com.plotsquared.bukkit.titles.AbstractTitle; import com.intellectualcrafters.plot.util.TaskManager; diff --git a/src/main/java/com/intellectualcrafters/plot/object/entity/EntityWrapper.java b/src/main/java/com/plotsquared/bukkit/object/entity/EntityWrapper.java similarity index 98% rename from src/main/java/com/intellectualcrafters/plot/object/entity/EntityWrapper.java rename to src/main/java/com/plotsquared/bukkit/object/entity/EntityWrapper.java index 89e2c219d..dee6b2938 100644 --- a/src/main/java/com/intellectualcrafters/plot/object/entity/EntityWrapper.java +++ b/src/main/java/com/plotsquared/bukkit/object/entity/EntityWrapper.java @@ -1,5 +1,9 @@ -package com.intellectualcrafters.plot.object.entity; +package com.plotsquared.bukkit.object.entity; +import com.intellectualcrafters.plot.object.entity.AgeableStats; +import com.intellectualcrafters.plot.object.entity.ArmorStandStats; +import com.intellectualcrafters.plot.object.entity.EntityBaseStats; +import com.intellectualcrafters.plot.object.entity.HorseStats; import org.bukkit.Art; import org.bukkit.DyeColor; import org.bukkit.Location; diff --git a/src/main/java/com/intellectualcrafters/plot/object/entity/LivingEntityStats.java b/src/main/java/com/plotsquared/bukkit/object/entity/LivingEntityStats.java similarity index 92% rename from src/main/java/com/intellectualcrafters/plot/object/entity/LivingEntityStats.java rename to src/main/java/com/plotsquared/bukkit/object/entity/LivingEntityStats.java index c70028eb1..42ceea6ee 100644 --- a/src/main/java/com/intellectualcrafters/plot/object/entity/LivingEntityStats.java +++ b/src/main/java/com/plotsquared/bukkit/object/entity/LivingEntityStats.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.object.entity; +package com.plotsquared.bukkit.object.entity; import java.util.Collection; diff --git a/src/main/java/com/intellectualcrafters/plot/object/entity/TameableStats.java b/src/main/java/com/plotsquared/bukkit/object/entity/TameableStats.java similarity index 70% rename from src/main/java/com/intellectualcrafters/plot/object/entity/TameableStats.java rename to src/main/java/com/plotsquared/bukkit/object/entity/TameableStats.java index e3d347cf0..dae91b121 100644 --- a/src/main/java/com/intellectualcrafters/plot/object/entity/TameableStats.java +++ b/src/main/java/com/plotsquared/bukkit/object/entity/TameableStats.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.object.entity; +package com.plotsquared.bukkit.object.entity; import org.bukkit.entity.AnimalTamer; diff --git a/src/main/java/com/intellectualcrafters/plot/object/schematic/StateWrapper.java b/src/main/java/com/plotsquared/bukkit/object/schematic/StateWrapper.java similarity index 95% rename from src/main/java/com/intellectualcrafters/plot/object/schematic/StateWrapper.java rename to src/main/java/com/plotsquared/bukkit/object/schematic/StateWrapper.java index 6568f2df3..0e94ff941 100644 --- a/src/main/java/com/intellectualcrafters/plot/object/schematic/StateWrapper.java +++ b/src/main/java/com/plotsquared/bukkit/object/schematic/StateWrapper.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.object.schematic; +package com.plotsquared.bukkit.object.schematic; import java.util.ArrayList; import java.util.HashMap; @@ -6,6 +6,8 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import com.intellectualcrafters.plot.object.schematic.ItemType; +import com.intellectualcrafters.plot.object.schematic.PlotItem; import org.apache.commons.lang.StringUtils; import org.bukkit.block.BlockState; import org.bukkit.enchantments.Enchantment; diff --git a/src/main/java/com/intellectualcrafters/plot/titles/AbstractTitle.java b/src/main/java/com/plotsquared/bukkit/titles/AbstractTitle.java similarity index 93% rename from src/main/java/com/intellectualcrafters/plot/titles/AbstractTitle.java rename to src/main/java/com/plotsquared/bukkit/titles/AbstractTitle.java index 0020083f7..dd0fd88c7 100644 --- a/src/main/java/com/intellectualcrafters/plot/titles/AbstractTitle.java +++ b/src/main/java/com/plotsquared/bukkit/titles/AbstractTitle.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.titles; +package com.plotsquared.bukkit.titles; import org.bukkit.ChatColor; diff --git a/src/main/java/com/intellectualcrafters/plot/titles/DefaultTitle.java b/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle.java similarity index 88% rename from src/main/java/com/intellectualcrafters/plot/titles/DefaultTitle.java rename to src/main/java/com/plotsquared/bukkit/titles/DefaultTitle.java index 7a277f7f3..e364ba41a 100644 --- a/src/main/java/com/intellectualcrafters/plot/titles/DefaultTitle.java +++ b/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle.java @@ -1,8 +1,8 @@ -package com.intellectualcrafters.plot.titles; +package com.plotsquared.bukkit.titles; import org.bukkit.ChatColor; -import com.intellectualcrafters.plot.object.BukkitPlayer; +import com.plotsquared.bukkit.object.BukkitPlayer; import com.intellectualcrafters.plot.object.PlotPlayer; public class DefaultTitle extends AbstractTitle { diff --git a/src/main/java/com/intellectualcrafters/plot/titles/DefaultTitleManager.java b/src/main/java/com/plotsquared/bukkit/titles/DefaultTitleManager.java similarity index 99% rename from src/main/java/com/intellectualcrafters/plot/titles/DefaultTitleManager.java rename to src/main/java/com/plotsquared/bukkit/titles/DefaultTitleManager.java index 789d03d74..4ccd2e29d 100644 --- a/src/main/java/com/intellectualcrafters/plot/titles/DefaultTitleManager.java +++ b/src/main/java/com/plotsquared/bukkit/titles/DefaultTitleManager.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.titles; +package com.plotsquared.bukkit.titles; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; diff --git a/src/main/java/com/intellectualcrafters/plot/titles/DefaultTitleManager_183.java b/src/main/java/com/plotsquared/bukkit/titles/DefaultTitleManager_183.java similarity index 99% rename from src/main/java/com/intellectualcrafters/plot/titles/DefaultTitleManager_183.java rename to src/main/java/com/plotsquared/bukkit/titles/DefaultTitleManager_183.java index 4e8ff569c..ee8847551 100644 --- a/src/main/java/com/intellectualcrafters/plot/titles/DefaultTitleManager_183.java +++ b/src/main/java/com/plotsquared/bukkit/titles/DefaultTitleManager_183.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.titles; +package com.plotsquared.bukkit.titles; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; diff --git a/src/main/java/com/intellectualcrafters/plot/titles/DefaultTitle_183.java b/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle_183.java similarity index 88% rename from src/main/java/com/intellectualcrafters/plot/titles/DefaultTitle_183.java rename to src/main/java/com/plotsquared/bukkit/titles/DefaultTitle_183.java index d8c9ea49b..2ccc1bd69 100644 --- a/src/main/java/com/intellectualcrafters/plot/titles/DefaultTitle_183.java +++ b/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle_183.java @@ -1,8 +1,8 @@ -package com.intellectualcrafters.plot.titles; +package com.plotsquared.bukkit.titles; import org.bukkit.ChatColor; -import com.intellectualcrafters.plot.object.BukkitPlayer; +import com.plotsquared.bukkit.object.BukkitPlayer; import com.intellectualcrafters.plot.object.PlotPlayer; public class DefaultTitle_183 extends AbstractTitle { diff --git a/src/main/java/com/intellectualcrafters/plot/titles/HackTitle.java b/src/main/java/com/plotsquared/bukkit/titles/HackTitle.java similarity index 89% rename from src/main/java/com/intellectualcrafters/plot/titles/HackTitle.java rename to src/main/java/com/plotsquared/bukkit/titles/HackTitle.java index c1f68670d..da222666d 100644 --- a/src/main/java/com/intellectualcrafters/plot/titles/HackTitle.java +++ b/src/main/java/com/plotsquared/bukkit/titles/HackTitle.java @@ -1,10 +1,10 @@ -package com.intellectualcrafters.plot.titles; +package com.plotsquared.bukkit.titles; import org.bukkit.ChatColor; import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.object.BukkitPlayer; +import com.plotsquared.bukkit.object.BukkitPlayer; import com.intellectualcrafters.plot.object.PlotPlayer; public class HackTitle extends AbstractTitle { diff --git a/src/main/java/com/intellectualcrafters/plot/titles/HackTitleManager.java b/src/main/java/com/plotsquared/bukkit/titles/HackTitleManager.java similarity index 99% rename from src/main/java/com/intellectualcrafters/plot/titles/HackTitleManager.java rename to src/main/java/com/plotsquared/bukkit/titles/HackTitleManager.java index 53ef4af64..b218280de 100644 --- a/src/main/java/com/intellectualcrafters/plot/titles/HackTitleManager.java +++ b/src/main/java/com/plotsquared/bukkit/titles/HackTitleManager.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.titles; +package com.plotsquared.bukkit.titles; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/src/main/java/com/intellectualcrafters/plot/util/ReflectionUtil.java b/src/main/java/com/plotsquared/bukkit/util/ReflectionUtil.java similarity index 99% rename from src/main/java/com/intellectualcrafters/plot/util/ReflectionUtil.java rename to src/main/java/com/plotsquared/bukkit/util/ReflectionUtil.java index 27376e0b1..370e5ce59 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/ReflectionUtil.java +++ b/src/main/java/com/plotsquared/bukkit/util/ReflectionUtil.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util; +package com.plotsquared.bukkit.util; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/src/main/java/com/intellectualcrafters/plot/util/SetupUtils.java b/src/main/java/com/plotsquared/bukkit/util/SetupUtils.java similarity index 93% rename from src/main/java/com/intellectualcrafters/plot/util/SetupUtils.java rename to src/main/java/com/plotsquared/bukkit/util/SetupUtils.java index 560e8a6c6..d163cfc37 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/SetupUtils.java +++ b/src/main/java/com/plotsquared/bukkit/util/SetupUtils.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util; +package com.plotsquared.bukkit.util; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/intellectualcrafters/plot/util/WorldEditSchematic.java b/src/main/java/com/plotsquared/bukkit/util/WorldEditSchematic.java similarity index 94% rename from src/main/java/com/intellectualcrafters/plot/util/WorldEditSchematic.java rename to src/main/java/com/plotsquared/bukkit/util/WorldEditSchematic.java index 52d030952..212373365 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/WorldEditSchematic.java +++ b/src/main/java/com/plotsquared/bukkit/util/WorldEditSchematic.java @@ -1,7 +1,8 @@ -package com.intellectualcrafters.plot.util; +package com.plotsquared.bukkit.util; import java.io.File; +import com.intellectualcrafters.plot.util.MainUtil; import org.bukkit.Bukkit; import com.intellectualcrafters.plot.PS; diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitChunkManager.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitChunkManager.java similarity index 99% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitChunkManager.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitChunkManager.java index 25f07b65b..e55185f4b 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitChunkManager.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitChunkManager.java @@ -1,9 +1,8 @@ -package com.intellectualcrafters.plot.util.bukkit; +package com.plotsquared.bukkit.util.bukkit; -import com.intellectualcrafters.plot.BukkitMain; +import com.plotsquared.bukkit.BukkitMain; import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.generator.AugmentedPopulator; -import com.intellectualcrafters.plot.generator.HybridPlotWorld; +import com.plotsquared.bukkit.generator.AugmentedPopulator; import com.intellectualcrafters.plot.object.BlockLoc; import com.intellectualcrafters.plot.object.ChunkLoc; import com.intellectualcrafters.plot.object.Location; @@ -14,11 +13,10 @@ import com.intellectualcrafters.plot.object.PlotLoc; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotWorld; import com.intellectualcrafters.plot.object.RegionWrapper; -import com.intellectualcrafters.plot.object.entity.EntityWrapper; +import com.plotsquared.bukkit.object.entity.EntityWrapper; import com.intellectualcrafters.plot.util.ChunkManager; import com.intellectualcrafters.plot.util.ClusterManager; import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.SetBlockQueue; import com.intellectualcrafters.plot.util.SetBlockQueue.ChunkWrapper; import com.intellectualcrafters.plot.util.TaskManager; @@ -66,7 +64,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.List; -import java.util.Random; public class BukkitChunkManager extends ChunkManager { @Override diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitEconHandler.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitEconHandler.java similarity index 92% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitEconHandler.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitEconHandler.java index 9384b7696..1d9c461dc 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitEconHandler.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitEconHandler.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util.bukkit; +package com.plotsquared.bukkit.util.bukkit; import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.permission.Permission; @@ -6,8 +6,8 @@ import net.milkbowl.vault.permission.Permission; import org.bukkit.Bukkit; import org.bukkit.plugin.RegisteredServiceProvider; -import com.intellectualcrafters.plot.object.BukkitOfflinePlayer; -import com.intellectualcrafters.plot.object.BukkitPlayer; +import com.plotsquared.bukkit.object.BukkitOfflinePlayer; +import com.plotsquared.bukkit.object.BukkitPlayer; import com.intellectualcrafters.plot.object.OfflinePlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.util.EconHandler; diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitEventUtil.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitEventUtil.java similarity index 76% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitEventUtil.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitEventUtil.java index e3faed302..05c807757 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitEventUtil.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitEventUtil.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util.bukkit; +package com.plotsquared.bukkit.util.bukkit; import java.util.ArrayList; import java.util.UUID; @@ -8,22 +8,22 @@ import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; -import com.intellectualcrafters.plot.events.ClusterFlagRemoveEvent; -import com.intellectualcrafters.plot.events.PlayerClaimPlotEvent; -import com.intellectualcrafters.plot.events.PlayerEnterPlotEvent; -import com.intellectualcrafters.plot.events.PlayerLeavePlotEvent; -import com.intellectualcrafters.plot.events.PlayerPlotDeniedEvent; -import com.intellectualcrafters.plot.events.PlayerPlotHelperEvent; -import com.intellectualcrafters.plot.events.PlayerPlotTrustedEvent; -import com.intellectualcrafters.plot.events.PlayerTeleportToPlotEvent; -import com.intellectualcrafters.plot.events.PlotClearEvent; -import com.intellectualcrafters.plot.events.PlotDeleteEvent; -import com.intellectualcrafters.plot.events.PlotFlagAddEvent; -import com.intellectualcrafters.plot.events.PlotFlagRemoveEvent; -import com.intellectualcrafters.plot.events.PlotMergeEvent; -import com.intellectualcrafters.plot.events.PlotUnlinkEvent; +import com.plotsquared.bukkit.events.ClusterFlagRemoveEvent; +import com.plotsquared.bukkit.events.PlayerClaimPlotEvent; +import com.plotsquared.bukkit.events.PlayerEnterPlotEvent; +import com.plotsquared.bukkit.events.PlayerLeavePlotEvent; +import com.plotsquared.bukkit.events.PlayerPlotDeniedEvent; +import com.plotsquared.bukkit.events.PlayerPlotHelperEvent; +import com.plotsquared.bukkit.events.PlayerPlotTrustedEvent; +import com.plotsquared.bukkit.events.PlayerTeleportToPlotEvent; +import com.plotsquared.bukkit.events.PlotClearEvent; +import com.plotsquared.bukkit.events.PlotDeleteEvent; +import com.plotsquared.bukkit.events.PlotFlagAddEvent; +import com.plotsquared.bukkit.events.PlotFlagRemoveEvent; +import com.plotsquared.bukkit.events.PlotMergeEvent; +import com.plotsquared.bukkit.events.PlotUnlinkEvent; import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.object.BukkitPlayer; +import com.plotsquared.bukkit.object.BukkitPlayer; import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotCluster; diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitInventoryUtil.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitInventoryUtil.java similarity index 97% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitInventoryUtil.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitInventoryUtil.java index 9d9a16f8e..183bae0e4 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitInventoryUtil.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitInventoryUtil.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util.bukkit; +package com.plotsquared.bukkit.util.bukkit; import java.util.ArrayList; import java.util.List; @@ -12,7 +12,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; import org.bukkit.inventory.meta.ItemMeta; -import com.intellectualcrafters.plot.object.BukkitPlayer; +import com.plotsquared.bukkit.object.BukkitPlayer; import com.intellectualcrafters.plot.object.PlotInventory; import com.intellectualcrafters.plot.object.PlotItemStack; import com.intellectualcrafters.plot.object.PlotPlayer; diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitPlayerFunctions.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitPlayerFunctions.java similarity index 99% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitPlayerFunctions.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitPlayerFunctions.java index f284d7117..d67e075a9 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitPlayerFunctions.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitPlayerFunctions.java @@ -18,7 +18,7 @@ // / // You can contact us via: support@intellectualsites.com / //////////////////////////////////////////////////////////////////////////////////////////////////// -package com.intellectualcrafters.plot.util.bukkit; +package com.plotsquared.bukkit.util.bukkit; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitPlayerManager.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitPlayerManager.java similarity index 74% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitPlayerManager.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitPlayerManager.java index b654f22dc..265476136 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitPlayerManager.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitPlayerManager.java @@ -1,6 +1,6 @@ -package com.intellectualcrafters.plot.util.bukkit; +package com.plotsquared.bukkit.util.bukkit; -import com.intellectualcrafters.plot.object.BukkitPlayer; +import com.plotsquared.bukkit.object.BukkitPlayer; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.util.PlayerManager; diff --git a/src/main/java/com/intellectualcrafters/plot/util/BukkitSchematicHandler.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitSchematicHandler.java similarity index 97% rename from src/main/java/com/intellectualcrafters/plot/util/BukkitSchematicHandler.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitSchematicHandler.java index 395d3efef..78d0a99e9 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/BukkitSchematicHandler.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitSchematicHandler.java @@ -18,7 +18,7 @@ // / // You can contact us via: support@intellectualsites.com / //////////////////////////////////////////////////////////////////////////////////////////////////// -package com.intellectualcrafters.plot.util; +package com.plotsquared.bukkit.util.bukkit; import java.util.ArrayList; import java.util.HashMap; @@ -26,6 +26,8 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import com.intellectualcrafters.plot.util.SchematicHandler; +import com.intellectualcrafters.plot.util.TaskManager; import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.World; @@ -42,7 +44,7 @@ import com.intellectualcrafters.jnbt.Tag; import com.intellectualcrafters.plot.object.ChunkLoc; import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.RunnableVal; -import com.intellectualcrafters.plot.object.schematic.StateWrapper; +import com.plotsquared.bukkit.object.schematic.StateWrapper; /** * Schematic Handler @@ -57,7 +59,7 @@ public class BukkitSchematicHandler extends SchematicHandler { // async TaskManager.runTaskAsync(new Runnable() { - + @Override public void run() { // Main positions @@ -71,14 +73,14 @@ public class BukkitSchematicHandler extends SchematicHandler { final int tcz = p2z >> 4; final int sy = pos1.getY(); final int ey = pos2.getY(); - + final int width = (pos2.getX() - pos1.getX()) + 1; final int height = (pos2.getY() - pos1.getY()) + 1; final int length = (pos2.getZ() - pos1.getZ()) + 1; - + // Main Schematic tag final HashMap schematic = new HashMap<>(); - + schematic.put("Width", new ShortTag("Width", (short) width)); schematic.put("Length", new ShortTag("Length", (short) length)); schematic.put("Height", new ShortTag("Height", (short) height)); @@ -89,12 +91,12 @@ public class BukkitSchematicHandler extends SchematicHandler { schematic.put("WEOffsetX", new IntTag("WEOffsetX", 0)); schematic.put("WEOffsetY", new IntTag("WEOffsetY", 0)); schematic.put("WEOffsetZ", new IntTag("WEOffsetZ", 0)); - + // Arrays of data types final List tileEntities = new ArrayList(); final byte[] blocks = new byte[width * height * length]; final byte[] blockData = new byte[width * height * length]; - + // Generate list of chunks final ArrayList chunks = new ArrayList(); for (int x = bcx; x <= tcx; x++) { @@ -102,7 +104,7 @@ public class BukkitSchematicHandler extends SchematicHandler { chunks.add(new ChunkLoc(x, z)); } } - + final World worldObj = Bukkit.getWorld(world); // Main thread TaskManager.runTask(new Runnable() { @@ -112,21 +114,21 @@ public class BukkitSchematicHandler extends SchematicHandler { while (chunks.size() > 0 && System.currentTimeMillis() - start < 20) { // save schematics ChunkLoc chunk = chunks.remove(0); - + Chunk bc = worldObj.getChunkAt(chunk.x, chunk.z); if (!bc.load(false)) { continue; } - + int X = chunk.x; int Z = chunk.z; int xxb = X << 4; int zzb = Z << 4; int xxt = xxb + 15; int zzt = zzb + 15; - + if (X == bcx) { - xxb = p1x; + xxb = p1x; } if (X == tcx) { xxt = p2x; @@ -148,7 +150,7 @@ public class BukkitSchematicHandler extends SchematicHandler { final int index = i2 + rx; Block block = worldObj.getBlockAt(x, y, z); int id = block.getTypeId(); - switch(id) { + switch (id) { case 0: case 2: case 4: @@ -292,12 +294,11 @@ public class BukkitSchematicHandler extends SchematicHandler { } } } - + } if (chunks.size() != 0) { TaskManager.runTaskLater(this, 1); - } - else { + } else { TaskManager.runTaskAsync(new Runnable() { @Override public void run() { diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitSetBlockManager.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitSetBlockManager.java similarity index 94% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitSetBlockManager.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitSetBlockManager.java index e6e68c79e..7bf6eb32c 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitSetBlockManager.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitSetBlockManager.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util.bukkit; +package com.plotsquared.bukkit.util.bukkit; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitSetupUtils.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitSetupUtils.java similarity index 96% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitSetupUtils.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitSetupUtils.java index af5ff6405..641fd4fb0 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitSetupUtils.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitSetupUtils.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util.bukkit; +package com.plotsquared.bukkit.util.bukkit; import java.io.IOException; import java.util.Map.Entry; @@ -12,10 +12,10 @@ import org.bukkit.plugin.Plugin; import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.config.ConfigurationNode; -import com.intellectualcrafters.plot.object.PlotGenerator; +import com.plotsquared.bukkit.object.PlotGenerator; import com.intellectualcrafters.plot.object.PlotWorld; import com.intellectualcrafters.plot.object.SetupObject; -import com.intellectualcrafters.plot.util.SetupUtils; +import com.plotsquared.bukkit.util.SetupUtils; public class BukkitSetupUtils extends SetupUtils { diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitTaskManager.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitTaskManager.java similarity index 92% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitTaskManager.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitTaskManager.java index 856e92179..72f5d8256 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitTaskManager.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitTaskManager.java @@ -1,8 +1,8 @@ -package com.intellectualcrafters.plot.util.bukkit; +package com.plotsquared.bukkit.util.bukkit; import org.bukkit.Bukkit; -import com.intellectualcrafters.plot.BukkitMain; +import com.plotsquared.bukkit.BukkitMain; import com.intellectualcrafters.plot.util.TaskManager; public class BukkitTaskManager extends TaskManager { diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitUtil.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitUtil.java similarity index 99% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitUtil.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitUtil.java index 75ca22623..fdb8823c0 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitUtil.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitUtil.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util.bukkit; +package com.plotsquared.bukkit.util.bukkit; import java.util.Arrays; import java.util.HashMap; @@ -26,7 +26,7 @@ import org.bukkit.material.Tree; import org.bukkit.material.WoodenStep; import org.bukkit.material.Wool; -import com.intellectualcrafters.plot.object.BukkitPlayer; +import com.plotsquared.bukkit.object.BukkitPlayer; import com.intellectualcrafters.plot.object.ChunkLoc; import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.PlotBlock; diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/Metrics.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/Metrics.java similarity index 99% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/Metrics.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/Metrics.java index 4384bb113..2f38e435f 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/Metrics.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/Metrics.java @@ -18,7 +18,7 @@ // / // You can contact us via: support@intellectualsites.com / //////////////////////////////////////////////////////////////////////////////////////////////////// -package com.intellectualcrafters.plot.util.bukkit; +package com.plotsquared.bukkit.util.bukkit; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/OfflinePlayerUtil.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/OfflinePlayerUtil.java similarity index 98% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/OfflinePlayerUtil.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/OfflinePlayerUtil.java index 27c32f8b3..e44498d50 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/OfflinePlayerUtil.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/OfflinePlayerUtil.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util.bukkit; +package com.plotsquared.bukkit.util.bukkit; import static com.intellectualcrafters.plot.util.ReflectionUtils.callConstructor; import static com.intellectualcrafters.plot.util.ReflectionUtils.callMethod; diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/SendChunk.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/SendChunk.java similarity index 98% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/SendChunk.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/SendChunk.java index e5d8c64ce..fb89fd6d4 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/SendChunk.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/SendChunk.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util.bukkit; +package com.plotsquared.bukkit.util.bukkit; import static com.intellectualcrafters.plot.util.ReflectionUtils.getRefClass; diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/SetBlockFast.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/SetBlockFast.java similarity index 99% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/SetBlockFast.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/SetBlockFast.java index adf383fdf..95b1378eb 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/SetBlockFast.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/SetBlockFast.java @@ -18,7 +18,7 @@ // / // You can contact us via: support@intellectualsites.com / //////////////////////////////////////////////////////////////////////////////////////////////////// -package com.intellectualcrafters.plot.util.bukkit; +package com.plotsquared.bukkit.util.bukkit; import static com.intellectualcrafters.plot.util.ReflectionUtils.getRefClass; diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/SetBlockFast_1_8.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/SetBlockFast_1_8.java similarity index 99% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/SetBlockFast_1_8.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/SetBlockFast_1_8.java index 56f6a9247..989c6137a 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/SetBlockFast_1_8.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/SetBlockFast_1_8.java @@ -18,7 +18,7 @@ // / // You can contact us via: support@intellectualsites.com / //////////////////////////////////////////////////////////////////////////////////////////////////// -package com.intellectualcrafters.plot.util.bukkit; +package com.plotsquared.bukkit.util.bukkit; import static com.intellectualcrafters.plot.util.ReflectionUtils.getRefClass; diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/SetBlockSlow.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/SetBlockSlow.java similarity index 96% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/SetBlockSlow.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/SetBlockSlow.java index fdf7d6572..c892dedcd 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/SetBlockSlow.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/SetBlockSlow.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util.bukkit; +package com.plotsquared.bukkit.util.bukkit; import java.util.Collection; diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/SetGenCB.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/SetGenCB.java similarity index 92% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/SetGenCB.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/SetGenCB.java index 926df2117..2c3d75253 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/SetGenCB.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/SetGenCB.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util.bukkit; +package com.plotsquared.bukkit.util.bukkit; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -10,8 +10,8 @@ import org.bukkit.generator.BlockPopulator; import org.bukkit.generator.ChunkGenerator; import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.generator.AugmentedPopulator; -import com.intellectualcrafters.plot.util.SetupUtils; +import com.plotsquared.bukkit.generator.AugmentedPopulator; +import com.plotsquared.bukkit.util.SetupUtils; public class SetGenCB { public static void setGenerator(World world) throws Exception { diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/UUIDHandler.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/UUIDHandler.java similarity index 73% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/UUIDHandler.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/UUIDHandler.java index bb2dd5e8a..482440982 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/UUIDHandler.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/UUIDHandler.java @@ -1,38 +1,17 @@ -package com.intellectualcrafters.plot.util.bukkit; +package com.plotsquared.bukkit.util.bukkit; -import java.io.File; -import java.io.FileInputStream; -import java.io.FilenameFilter; -import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import java.util.Map.Entry; import java.util.UUID; -import com.intellectualcrafters.plot.util.bukkit.uuid.FileUUIDHandler; -import com.intellectualcrafters.plot.util.bukkit.uuid.SQLUUIDHandler; -import com.intellectualcrafters.plot.util.bukkit.uuid.UUIDHandlerImplementation; -import org.bukkit.Bukkit; +import com.plotsquared.bukkit.util.bukkit.uuid.UUIDHandlerImplementation; import com.google.common.collect.BiMap; -import com.google.common.collect.HashBiMap; -import com.google.common.io.Files; -import com.google.common.io.InputSupplier; 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.object.BukkitOfflinePlayer; -import com.intellectualcrafters.plot.object.OfflinePlotPlayer; +import com.plotsquared.bukkit.object.BukkitOfflinePlayer; import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.StringWrapper; -import com.intellectualcrafters.plot.util.ExpireManager; -import com.intellectualcrafters.plot.util.NbtFactory; -import com.intellectualcrafters.plot.util.NbtFactory.NbtCompound; -import com.intellectualcrafters.plot.util.NbtFactory.StreamOptions; -import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.uuid.OfflineUUIDWrapper; import com.intellectualcrafters.plot.uuid.UUIDWrapper; public class UUIDHandler { diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/chat/ArrayWrapper.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/chat/ArrayWrapper.java similarity index 98% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/chat/ArrayWrapper.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/chat/ArrayWrapper.java index bac0473f7..d9d38ea15 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/chat/ArrayWrapper.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/chat/ArrayWrapper.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util.bukkit.chat; +package com.plotsquared.bukkit.util.bukkit.chat; import java.lang.reflect.Array; import java.util.Arrays; diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/chat/FancyMessage.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/chat/FancyMessage.java similarity index 99% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/chat/FancyMessage.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/chat/FancyMessage.java index 418eed32c..d2857d4af 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/chat/FancyMessage.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/chat/FancyMessage.java @@ -1,6 +1,6 @@ -package com.intellectualcrafters.plot.util.bukkit.chat; +package com.plotsquared.bukkit.util.bukkit.chat; -import static com.intellectualcrafters.plot.util.bukkit.chat.TextualComponent.rawText; +import static com.plotsquared.bukkit.util.bukkit.chat.TextualComponent.rawText; import java.io.IOException; import java.io.StringWriter; diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/chat/JsonRepresentedObject.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/chat/JsonRepresentedObject.java similarity index 89% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/chat/JsonRepresentedObject.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/chat/JsonRepresentedObject.java index b26d2294f..ef5562a2c 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/chat/JsonRepresentedObject.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/chat/JsonRepresentedObject.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util.bukkit.chat; +package com.plotsquared.bukkit.util.bukkit.chat; import java.io.IOException; diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/chat/JsonString.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/chat/JsonString.java similarity index 95% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/chat/JsonString.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/chat/JsonString.java index 31986dd0e..071536ad9 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/chat/JsonString.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/chat/JsonString.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util.bukkit.chat; +package com.plotsquared.bukkit.util.bukkit.chat; import java.io.IOException; import java.util.HashMap; diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/chat/MessagePart.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/chat/MessagePart.java similarity index 98% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/chat/MessagePart.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/chat/MessagePart.java index b87987248..c5105b5fd 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/chat/MessagePart.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/chat/MessagePart.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util.bukkit.chat; +package com.plotsquared.bukkit.util.bukkit.chat; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/chat/Reflection.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/chat/Reflection.java similarity index 99% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/chat/Reflection.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/chat/Reflection.java index 652c3e93c..2a8523a12 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/chat/Reflection.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/chat/Reflection.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util.bukkit.chat; +package com.plotsquared.bukkit.util.bukkit.chat; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/chat/TextualComponent.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/chat/TextualComponent.java similarity index 99% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/chat/TextualComponent.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/chat/TextualComponent.java index 76ac5bd2d..d46305fa5 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/chat/TextualComponent.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/chat/TextualComponent.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util.bukkit.chat; +package com.plotsquared.bukkit.util.bukkit.chat; import java.io.IOException; import java.util.HashMap; diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/uuid/FileUUIDHandler.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/uuid/FileUUIDHandler.java similarity index 98% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/uuid/FileUUIDHandler.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/uuid/FileUUIDHandler.java index 3284cb19f..be0db74fa 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/uuid/FileUUIDHandler.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/uuid/FileUUIDHandler.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util.bukkit.uuid; +package com.plotsquared.bukkit.util.bukkit.uuid; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; @@ -12,7 +12,8 @@ import com.intellectualcrafters.plot.object.*; import com.intellectualcrafters.plot.util.ExpireManager; import com.intellectualcrafters.plot.util.NbtFactory; import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.object.BukkitOfflinePlayer; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; import com.intellectualcrafters.plot.uuid.OfflineUUIDWrapper; import com.intellectualcrafters.plot.uuid.UUIDWrapper; import org.bukkit.Bukkit; diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/uuid/SQLUUIDHandler.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/uuid/SQLUUIDHandler.java similarity index 99% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/uuid/SQLUUIDHandler.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/uuid/SQLUUIDHandler.java index 45f99ab99..5d6dc0054 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/uuid/SQLUUIDHandler.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/uuid/SQLUUIDHandler.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util.bukkit.uuid; +package com.plotsquared.bukkit.util.bukkit.uuid; import java.io.*; import java.net.HttpURLConnection; @@ -13,10 +13,10 @@ import java.util.concurrent.ConcurrentHashMap; import com.google.common.collect.Maps; import com.intellectualcrafters.json.JSONObject; -import com.intellectualcrafters.plot.BukkitMain; +import com.plotsquared.bukkit.BukkitMain; import com.intellectualcrafters.plot.database.SQLite; -import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; +import com.plotsquared.bukkit.util.bukkit.UUIDHandler; import com.intellectualcrafters.plot.uuid.LowerOfflineUUIDWrapper; import org.bukkit.Bukkit; @@ -28,7 +28,7 @@ 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.object.BukkitOfflinePlayer; +import com.plotsquared.bukkit.object.BukkitOfflinePlayer; import com.intellectualcrafters.plot.object.OfflinePlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer; diff --git a/src/main/java/com/intellectualcrafters/plot/util/bukkit/uuid/UUIDHandlerImplementation.java b/src/main/java/com/plotsquared/bukkit/util/bukkit/uuid/UUIDHandlerImplementation.java similarity index 89% rename from src/main/java/com/intellectualcrafters/plot/util/bukkit/uuid/UUIDHandlerImplementation.java rename to src/main/java/com/plotsquared/bukkit/util/bukkit/uuid/UUIDHandlerImplementation.java index 529060fd5..6e8118a3b 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/bukkit/uuid/UUIDHandlerImplementation.java +++ b/src/main/java/com/plotsquared/bukkit/util/bukkit/uuid/UUIDHandlerImplementation.java @@ -1,7 +1,7 @@ -package com.intellectualcrafters.plot.util.bukkit.uuid; +package com.plotsquared.bukkit.util.bukkit.uuid; import com.google.common.collect.BiMap; -import com.intellectualcrafters.plot.object.BukkitOfflinePlayer; +import com.plotsquared.bukkit.object.BukkitOfflinePlayer; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.StringWrapper; import com.intellectualcrafters.plot.uuid.UUIDWrapper; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index dafe6edc9..0840e7d21 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: ${project.name} -main: com.intellectualcrafters.plot.BukkitMain +main: com.plotsquared.bukkit.BukkitMain version: ${project.version} load: STARTUP description: >