diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java index e686c9c3f..eb98bb75e 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java @@ -28,44 +28,44 @@ import com.github.intellectualsites.plotsquared.bukkit.uuid.LowerOfflineUUIDWrap import com.github.intellectualsites.plotsquared.bukkit.uuid.OfflineUUIDWrapper; import com.github.intellectualsites.plotsquared.bukkit.uuid.SQLUUIDHandler; import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; -import com.github.intellectualsites.plotsquared.plot.IPlotMain; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.IPlotMain; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.ChatFormatter; import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; -import com.github.intellectualsites.plotsquared.plot.generator.HybridGen; -import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; -import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator; -import com.github.intellectualsites.plotsquared.plot.listener.PlotListener; +import com.github.intellectualsites.plotsquared.generator.GeneratorWrapper; +import com.github.intellectualsites.plotsquared.generator.HybridGen; +import com.github.intellectualsites.plotsquared.generator.HybridUtils; +import com.github.intellectualsites.plotsquared.generator.IndependentPlotGenerator; +import com.github.intellectualsites.plotsquared.listener.PlotListener; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.SetupObject; -import com.github.intellectualsites.plotsquared.plot.object.chat.PlainChatManager; +import com.github.intellectualsites.plotsquared.plot.object.message.PlainChatManager; import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea; import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; import com.github.intellectualsites.plotsquared.plot.object.worlds.SingleWorldGenerator; -import com.github.intellectualsites.plotsquared.plot.util.ChatManager; -import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; -import com.github.intellectualsites.plotsquared.plot.util.ConsoleColors; -import com.github.intellectualsites.plotsquared.plot.util.EconHandler; -import com.github.intellectualsites.plotsquared.plot.util.InventoryUtil; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.PremiumVerification; -import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils; -import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler; -import com.github.intellectualsites.plotsquared.plot.util.SetupUtils; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandlerImplementation; -import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; -import com.github.intellectualsites.plotsquared.plot.util.block.QueueProvider; -import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; +import com.github.intellectualsites.plotsquared.util.ChatManager; +import com.github.intellectualsites.plotsquared.util.ChunkManager; +import com.github.intellectualsites.plotsquared.util.ConsoleColors; +import com.github.intellectualsites.plotsquared.util.EconHandler; +import com.github.intellectualsites.plotsquared.util.InventoryUtil; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.PremiumVerification; +import com.github.intellectualsites.plotsquared.util.ReflectionUtils; +import com.github.intellectualsites.plotsquared.util.SchematicHandler; +import com.github.intellectualsites.plotsquared.util.SetupUtils; +import com.github.intellectualsites.plotsquared.util.StringMan; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandlerImplementation; +import com.github.intellectualsites.plotsquared.util.WorldUtil; +import com.github.intellectualsites.plotsquared.queue.QueueProvider; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDWrapper; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.bukkit.WorldEditPlugin; import com.sk89q.worldedit.extension.platform.Actor; @@ -101,8 +101,8 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import static com.github.intellectualsites.plotsquared.plot.util.PremiumVerification.getUserID; -import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass; +import static com.github.intellectualsites.plotsquared.util.PremiumVerification.getUserID; +import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.getRefClass; public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain { diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/commands/DebugUUID.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/commands/DebugUUID.java index 49d399da1..3f43f5d42 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/commands/DebugUUID.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/commands/DebugUUID.java @@ -6,22 +6,22 @@ import com.github.intellectualsites.plotsquared.bukkit.uuid.LowerOfflineUUIDWrap import com.github.intellectualsites.plotsquared.bukkit.uuid.OfflineUUIDWrapper; import com.github.intellectualsites.plotsquared.commands.Argument; import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory; -import com.github.intellectualsites.plotsquared.plot.commands.RequiredType; -import com.github.intellectualsites.plotsquared.plot.commands.SubCommand; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.commands.CommandCategory; +import com.github.intellectualsites.plotsquared.commands.RequiredType; +import com.github.intellectualsites.plotsquared.commands.SubCommand; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; +import com.github.intellectualsites.plotsquared.database.DBFunc; +import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; -import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; -import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.StringMan; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.github.intellectualsites.plotsquared.util.WorldUtil; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDWrapper; import com.google.common.collect.Sets; import java.io.File; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java index 63f0a5054..549fcf96e 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java @@ -1,6 +1,6 @@ package com.github.intellectualsites.plotsquared.bukkit.generator; -import com.github.intellectualsites.plotsquared.plot.generator.AugmentedUtils; +import com.github.intellectualsites.plotsquared.generator.AugmentedUtils; import org.bukkit.Chunk; import org.bukkit.World; import org.bukkit.generator.BlockPopulator; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java index 2c921c01f..a738c9b7c 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java @@ -2,15 +2,15 @@ package com.github.intellectualsites.plotsquared.bukkit.generator; import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; import com.github.intellectualsites.plotsquared.bukkit.util.block.GenChunk; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; -import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.generator.GeneratorWrapper; +import com.github.intellectualsites.plotsquared.generator.IndependentPlotGenerator; import com.github.intellectualsites.plotsquared.plot.object.ChunkWrapper; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.worlds.SingleWorldGenerator; -import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue; +import com.github.intellectualsites.plotsquared.util.ChunkManager; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.queue.ScopedLocalBlockQueue; import com.sk89q.worldedit.math.BlockVector2; import lombok.Getter; import org.bukkit.World; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java index 30166218c..e53907d3d 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java @@ -1,13 +1,13 @@ package com.github.intellectualsites.plotsquared.bukkit.generator; import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.generator.IndependentPlotGenerator; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; -import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue; +import com.github.intellectualsites.plotsquared.util.MathMan; +import com.github.intellectualsites.plotsquared.queue.ScopedLocalBlockQueue; import com.sk89q.worldedit.bukkit.BukkitAdapter; import java.util.Random; import org.bukkit.World; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/PlotBlockPopulator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/PlotBlockPopulator.java index 2a0455edc..43ad75b3d 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/PlotBlockPopulator.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/PlotBlockPopulator.java @@ -1,12 +1,12 @@ package com.github.intellectualsites.plotsquared.bukkit.generator; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.generator.IndependentPlotGenerator; import com.github.intellectualsites.plotsquared.plot.object.ChunkWrapper; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue; +import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.queue.ScopedLocalBlockQueue; import java.util.Random; import org.bukkit.Chunk; import org.bukkit.World; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java index 046c0de8f..57b907bb1 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java @@ -1,13 +1,13 @@ package com.github.intellectualsites.plotsquared.bukkit.listeners; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefClass; -import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefField; -import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefMethod; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.util.ReflectionUtils.RefClass; +import com.github.intellectualsites.plotsquared.util.ReflectionUtils.RefField; +import com.github.intellectualsites.plotsquared.util.ReflectionUtils.RefMethod; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import io.papermc.lib.PaperLib; import org.bukkit.Bukkit; import org.bukkit.Chunk; @@ -30,7 +30,7 @@ import org.bukkit.event.world.ChunkUnloadEvent; import java.lang.reflect.Method; import java.util.HashSet; -import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass; +import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.getRefClass; @SuppressWarnings("unused") public class ChunkListener implements Listener { diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java index 8aa7a16a9..0508a9545 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java @@ -1,7 +1,7 @@ package com.github.intellectualsites.plotsquared.bukkit.listeners; import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; import com.github.intellectualsites.plotsquared.plot.object.Location; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ForceFieldListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ForceFieldListener.java index d16723db0..a0ab2d0b7 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ForceFieldListener.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ForceFieldListener.java @@ -6,8 +6,8 @@ import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.flags.implementations.ForcefieldFlag; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.Permissions; import com.google.common.collect.Iterables; import org.bukkit.entity.Player; import org.bukkit.util.Vector; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java index af85bf506..631360bb7 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java @@ -4,30 +4,30 @@ import com.destroystokyo.paper.MaterialTags; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; import com.github.intellectualsites.plotsquared.bukkit.util.UpdateUtility; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.database.DBFunc; import com.github.intellectualsites.plotsquared.plot.flags.implementations.*; import com.github.intellectualsites.plotsquared.plot.flags.types.BlockTypeWrapper; -import com.github.intellectualsites.plotsquared.plot.listener.PlayerBlockEventType; -import com.github.intellectualsites.plotsquared.plot.listener.PlotListener; +import com.github.intellectualsites.plotsquared.listener.PlayerBlockEventType; +import com.github.intellectualsites.plotsquared.listener.PlotListener; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotHandler; import com.github.intellectualsites.plotsquared.plot.object.PlotId; import com.github.intellectualsites.plotsquared.plot.object.PlotInventory; -import com.github.intellectualsites.plotsquared.plot.object.PlotMessage; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.message.PlotMessage; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; -import com.github.intellectualsites.plotsquared.plot.util.EntityUtil; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.RegExUtil; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.util.EntityUtil; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.MathMan; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.RegExUtil; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.world.block.BlockType; import io.papermc.lib.PaperLib; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java index a53527fc9..deb6d5a16 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java @@ -1,9 +1,9 @@ package com.github.intellectualsites.plotsquared.bukkit.listeners; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; -import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils; +import com.github.intellectualsites.plotsquared.util.ReflectionUtils; import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.World; @@ -17,7 +17,7 @@ import org.bukkit.plugin.Plugin; import java.lang.reflect.Field; import java.lang.reflect.Method; -import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass; +import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.getRefClass; @SuppressWarnings("unused") public class SingleWorldListener implements Listener { diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/WorldEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/WorldEvents.java index afa821975..cfb9442b6 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/WorldEvents.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/WorldEvents.java @@ -1,8 +1,8 @@ package com.github.intellectualsites.plotsquared.bukkit.listeners; import com.github.intellectualsites.plotsquared.bukkit.generator.BukkitPlotGenerator; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.generator.GeneratorWrapper; import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; import org.bukkit.World; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitOfflinePlayer.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitOfflinePlayer.java index 7c52a25de..a2137301d 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitOfflinePlayer.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitOfflinePlayer.java @@ -1,6 +1,6 @@ package com.github.intellectualsites.plotsquared.bukkit.object; -import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; +import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; import org.bukkit.OfflinePlayer; import org.jetbrains.annotations.NotNull; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java index ba5f26cdd..399e77e3c 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java @@ -1,16 +1,16 @@ package com.github.intellectualsites.plotsquared.bukkit.object; import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; -import com.github.intellectualsites.plotsquared.plot.util.EconHandler; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; -import com.github.intellectualsites.plotsquared.plot.util.PlotWeather; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.util.EconHandler; +import com.github.intellectualsites.plotsquared.util.MathMan; +import com.github.intellectualsites.plotsquared.plot.PlotWeather; +import com.github.intellectualsites.plotsquared.util.StringMan; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.world.item.ItemType; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java index a237bf96a..006afe693 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java @@ -1,6 +1,6 @@ package com.github.intellectualsites.plotsquared.bukkit.object.entity; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import org.bukkit.Art; import org.bukkit.DyeColor; import org.bukkit.Location; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java index 1d2d80198..03700c051 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java @@ -1,7 +1,7 @@ package com.github.intellectualsites.plotsquared.bukkit.object.schematic; import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.sk89q.jnbt.ByteTag; import com.sk89q.jnbt.CompoundTag; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/placeholders/PlaceholderFormatter.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/placeholders/PlaceholderFormatter.java index f4844aecb..2de08c916 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/placeholders/PlaceholderFormatter.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/placeholders/PlaceholderFormatter.java @@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.bukkit.placeholders; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; import com.github.intellectualsites.plotsquared.plot.config.ChatFormatter; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import me.clip.placeholderapi.PlaceholderAPI; import org.bukkit.entity.Player; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/placeholders/Placeholders.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/placeholders/Placeholders.java index d8608463f..66a5b241c 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/placeholders/Placeholders.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/placeholders/Placeholders.java @@ -2,8 +2,8 @@ package com.github.intellectualsites.plotsquared.bukkit.placeholders; import com.github.intellectualsites.plotsquared.bukkit.BukkitMain; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import me.clip.placeholderapi.PlaceholderAPIPlugin; import me.clip.placeholderapi.expansion.PlaceholderExpansion; import org.bukkit.Bukkit; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChatManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChatManager.java index ef3af32d9..a6547c20b 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChatManager.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChatManager.java @@ -4,10 +4,10 @@ import com.github.intellectualsites.plotsquared.bukkit.chat.FancyMessage; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.object.ConsolePlayer; -import com.github.intellectualsites.plotsquared.plot.object.PlotMessage; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.ChatManager; +import com.github.intellectualsites.plotsquared.player.ConsolePlayer; +import com.github.intellectualsites.plotsquared.plot.object.message.PlotMessage; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.ChatManager; import org.bukkit.ChatColor; import java.util.Arrays; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java index 83ee0aaf3..3046a9fd1 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java @@ -3,20 +3,20 @@ package com.github.intellectualsites.plotsquared.bukkit.util; import com.github.intellectualsites.plotsquared.bukkit.BukkitMain; import com.github.intellectualsites.plotsquared.bukkit.object.entity.EntityWrapper; import com.github.intellectualsites.plotsquared.bukkit.object.entity.ReplicatingEntityWrapper; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.generator.AugmentedUtils; -import com.github.intellectualsites.plotsquared.plot.listener.WEExtent; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.generator.AugmentedUtils; +import com.github.intellectualsites.plotsquared.listener.WEExtent; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotLoc; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; -import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.world.RegionUtil; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.util.ChunkManager; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.queue.ScopedLocalBlockQueue; +import com.github.intellectualsites.plotsquared.util.RegionUtil; import com.sk89q.worldedit.bukkit.BukkitWorld; import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector3; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitCommand.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitCommand.java index cb927f190..5d1a26f9f 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitCommand.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitCommand.java @@ -1,9 +1,9 @@ package com.github.intellectualsites.plotsquared.bukkit.util; import com.github.intellectualsites.plotsquared.bukkit.commands.DebugUUID; -import com.github.intellectualsites.plotsquared.plot.commands.MainCommand; -import com.github.intellectualsites.plotsquared.plot.object.ConsolePlayer; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.commands.MainCommand; +import com.github.intellectualsites.plotsquared.player.ConsolePlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEconHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEconHandler.java index a9978b76c..9aced7019 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEconHandler.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEconHandler.java @@ -2,9 +2,9 @@ package com.github.intellectualsites.plotsquared.bukkit.util; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitOfflinePlayer; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; -import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.EconHandler; +import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.EconHandler; import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.permission.Permission; import org.bukkit.Bukkit; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java index c13a656f8..7e00051af 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java @@ -1,6 +1,6 @@ package com.github.intellectualsites.plotsquared.bukkit.util; -import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; +import com.github.intellectualsites.plotsquared.generator.HybridUtils; public class BukkitHybridUtils extends HybridUtils { diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java index 7f0a3119f..e6feeaeff 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java @@ -3,8 +3,8 @@ package com.github.intellectualsites.plotsquared.bukkit.util; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; import com.github.intellectualsites.plotsquared.plot.object.PlotInventory; import com.github.intellectualsites.plotsquared.plot.object.PlotItemStack; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.InventoryUtil; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.InventoryUtil; import com.sk89q.worldedit.bukkit.BukkitAdapter; import org.bukkit.Bukkit; import org.bukkit.ChatColor; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSchematicHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSchematicHandler.java index e8fce64b4..bfee46fb2 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSchematicHandler.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSchematicHandler.java @@ -2,11 +2,11 @@ package com.github.intellectualsites.plotsquared.bukkit.util; import com.github.intellectualsites.plotsquared.bukkit.object.schematic.StateWrapper; import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; -import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.SchematicHandler; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; import com.sk89q.jnbt.*; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.extension.platform.Capability; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java index bd8b287ad..e7b447747 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java @@ -3,13 +3,13 @@ package com.github.intellectualsites.plotsquared.bukkit.util; import com.github.intellectualsites.plotsquared.bukkit.generator.BukkitPlotGenerator; import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; -import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; +import com.github.intellectualsites.plotsquared.generator.GeneratorWrapper; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; import com.github.intellectualsites.plotsquared.plot.object.SetupObject; -import com.github.intellectualsites.plotsquared.plot.util.SetupUtils; +import com.github.intellectualsites.plotsquared.util.SetupUtils; import io.papermc.lib.PaperLib; import org.bukkit.Bukkit; import org.bukkit.Chunk; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitTaskManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitTaskManager.java index 0989ccf1a..5e3a74154 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitTaskManager.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitTaskManager.java @@ -1,7 +1,7 @@ package com.github.intellectualsites.plotsquared.bukkit.util; import com.github.intellectualsites.plotsquared.bukkit.BukkitMain; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import org.bukkit.Bukkit; public class BukkitTaskManager extends TaskManager { diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java index 87fc5c92b..db6788a30 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java @@ -2,19 +2,19 @@ package com.github.intellectualsites.plotsquared.bukkit.util; import com.github.intellectualsites.plotsquared.bukkit.BukkitMain; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; -import com.github.intellectualsites.plotsquared.plot.util.StringComparison; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; -import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; -import com.github.intellectualsites.plotsquared.plot.util.world.BlockUtil; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.MathMan; +import com.github.intellectualsites.plotsquared.util.StringComparison; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.github.intellectualsites.plotsquared.util.WorldUtil; +import com.github.intellectualsites.plotsquared.util.BlockUtil; import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitWorld; import com.sk89q.worldedit.regions.CuboidRegion; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/OfflinePlayerUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/OfflinePlayerUtil.java index dd7edf83f..0fbabfe7d 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/OfflinePlayerUtil.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/OfflinePlayerUtil.java @@ -9,15 +9,15 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.util.UUID; -import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.callConstructor; -import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.callMethod; -import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getCbClass; -import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getField; -import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getNmsClass; -import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getUtilClass; -import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.makeConstructor; -import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.makeField; -import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.makeMethod; +import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.callConstructor; +import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.callMethod; +import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.getCbClass; +import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.getField; +import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.getNmsClass; +import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.getUtilClass; +import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.makeConstructor; +import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.makeField; +import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.makeMethod; public class OfflinePlayerUtil { diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java index 8b5e89b27..10aaa5994 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java @@ -1,16 +1,16 @@ package com.github.intellectualsites.plotsquared.bukkit.util; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefClass; -import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefConstructor; -import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefField; -import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefMethod; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.ReflectionUtils.RefClass; +import com.github.intellectualsites.plotsquared.util.ReflectionUtils.RefConstructor; +import com.github.intellectualsites.plotsquared.util.ReflectionUtils.RefField; +import com.github.intellectualsites.plotsquared.util.ReflectionUtils.RefMethod; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import com.sk89q.worldedit.math.BlockVector2; import io.papermc.lib.PaperLib; import org.bukkit.Bukkit; @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map.Entry; -import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass; +import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.getRefClass; /** * An utility that can be used to send chunks, rather than using bukkit code diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SetGenCB.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SetGenCB.java index 45814d639..d549b494f 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SetGenCB.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SetGenCB.java @@ -1,9 +1,9 @@ package com.github.intellectualsites.plotsquared.bukkit.util; import com.github.intellectualsites.plotsquared.bukkit.generator.BukkitAugmentedGenerator; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; -import com.github.intellectualsites.plotsquared.plot.util.SetupUtils; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.generator.GeneratorWrapper; +import com.github.intellectualsites.plotsquared.util.SetupUtils; import org.bukkit.World; import org.bukkit.generator.ChunkGenerator; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/UpdateUtility.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/UpdateUtility.java index 7206fb249..64bff6c1f 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/UpdateUtility.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/UpdateUtility.java @@ -1,6 +1,6 @@ package com.github.intellectualsites.plotsquared.bukkit.util; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; import org.bukkit.Bukkit; @@ -53,4 +53,4 @@ public class UpdateUtility implements Listener { } }.runTaskTimer(this.javaPlugin, 0L, 12000L); } -} \ No newline at end of file +} diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java index d27dce58d..4e74b187b 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java @@ -2,10 +2,10 @@ package com.github.intellectualsites.plotsquared.bukkit.util.block; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitBlockUtil; import com.github.intellectualsites.plotsquared.bukkit.object.schematic.StateWrapper; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.block.BasicLocalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.world.BlockUtil; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.queue.BasicLocalBlockQueue; +import com.github.intellectualsites.plotsquared.util.BlockUtil; import com.sk89q.jnbt.CompoundTag; import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.WorldEdit; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java index ec656d2ba..ad3651bb8 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java @@ -4,9 +4,9 @@ import com.github.intellectualsites.plotsquared.bukkit.object.BukkitBlockUtil; import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; import com.github.intellectualsites.plotsquared.plot.object.ChunkWrapper; import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.world.PatternUtil; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.queue.ScopedLocalBlockQueue; +import com.github.intellectualsites.plotsquared.util.PatternUtil; import com.google.common.base.Preconditions; import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.function.pattern.Pattern; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java index 40d902f8e..aab41402f 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java @@ -2,9 +2,9 @@ package com.github.intellectualsites.plotsquared.bukkit.uuid; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitOfflinePlayer; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; -import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; +import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDWrapper; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.jetbrains.annotations.NotNull; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java index df19ed711..ad9dd4655 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java @@ -1,24 +1,23 @@ package com.github.intellectualsites.plotsquared.bukkit.uuid; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandlerImplementation; -import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager; -import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; +import com.github.intellectualsites.plotsquared.util.StringMan; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandlerImplementation; +import com.github.intellectualsites.plotsquared.plot.expiration.ExpireManager; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDWrapper; import com.google.common.collect.HashBiMap; import com.google.common.collect.Sets; import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.NBTInputStream; import com.sk89q.jnbt.Tag; import java.io.BufferedInputStream; -import java.io.FileNotFoundException; import java.util.Map; import java.util.zip.GZIPInputStream; import org.bukkit.Bukkit; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/LowerOfflineUUIDWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/LowerOfflineUUIDWrapper.java index a152445a8..f0031aa4d 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/LowerOfflineUUIDWrapper.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/LowerOfflineUUIDWrapper.java @@ -1,7 +1,7 @@ package com.github.intellectualsites.plotsquared.bukkit.uuid; -import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.google.common.base.Charsets; import org.bukkit.OfflinePlayer; import org.jetbrains.annotations.NotNull; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java index 306f67e4e..ac54ce972 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java @@ -1,12 +1,12 @@ package com.github.intellectualsites.plotsquared.bukkit.uuid; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitOfflinePlayer; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; -import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDWrapper; import com.google.common.base.Charsets; import com.google.common.collect.BiMap; import org.bukkit.Bukkit; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java index ca682366e..d6881102c 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java @@ -1,16 +1,16 @@ package com.github.intellectualsites.plotsquared.bukkit.uuid; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.database.SQLite; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.database.SQLite; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandlerImplementation; -import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandlerImplementation; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDWrapper; import com.google.common.collect.HashBiMap; import org.json.simple.JSONArray; import org.json.simple.JSONObject; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/IPlotMain.java similarity index 81% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/IPlotMain.java index c2c0a5a83..218acbb90 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/IPlotMain.java @@ -1,20 +1,20 @@ -package com.github.intellectualsites.plotsquared.plot; +package com.github.intellectualsites.plotsquared; -import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; -import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; -import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator; -import com.github.intellectualsites.plotsquared.plot.logger.ILogger; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.ChatManager; -import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; -import com.github.intellectualsites.plotsquared.plot.util.EconHandler; -import com.github.intellectualsites.plotsquared.plot.util.InventoryUtil; -import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler; -import com.github.intellectualsites.plotsquared.plot.util.SetupUtils; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandlerImplementation; -import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; -import com.github.intellectualsites.plotsquared.plot.util.block.QueueProvider; +import com.github.intellectualsites.plotsquared.generator.GeneratorWrapper; +import com.github.intellectualsites.plotsquared.generator.HybridUtils; +import com.github.intellectualsites.plotsquared.generator.IndependentPlotGenerator; +import com.github.intellectualsites.plotsquared.util.logger.ILogger; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.ChatManager; +import com.github.intellectualsites.plotsquared.util.ChunkManager; +import com.github.intellectualsites.plotsquared.util.EconHandler; +import com.github.intellectualsites.plotsquared.util.InventoryUtil; +import com.github.intellectualsites.plotsquared.util.SchematicHandler; +import com.github.intellectualsites.plotsquared.util.SetupUtils; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandlerImplementation; +import com.github.intellectualsites.plotsquared.util.WorldUtil; +import com.github.intellectualsites.plotsquared.queue.QueueProvider; import com.sk89q.worldedit.extension.platform.Actor; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/Platform.java similarity index 52% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/Platform.java index 1736edf6f..6265d40cc 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/Platform.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot; +package com.github.intellectualsites.plotsquared; public enum Platform { Bukkit, Sponge, Spigot, Paper diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/PlotSquared.java similarity index 97% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/PlotSquared.java index c909ccc1a..4af8d149e 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/PlotSquared.java @@ -1,36 +1,53 @@ -package com.github.intellectualsites.plotsquared.plot; +package com.github.intellectualsites.plotsquared; import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; import com.github.intellectualsites.plotsquared.configuration.MemorySection; import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerialization; -import com.github.intellectualsites.plotsquared.plot.commands.WE_Anywhere; +import com.github.intellectualsites.plotsquared.player.ConsolePlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.commands.WE_Anywhere; import com.github.intellectualsites.plotsquared.plot.config.Caption; import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Configuration; import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.github.intellectualsites.plotsquared.plot.config.Storage; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.database.Database; -import com.github.intellectualsites.plotsquared.plot.database.MySQL; -import com.github.intellectualsites.plotsquared.plot.database.SQLManager; -import com.github.intellectualsites.plotsquared.plot.database.SQLite; -import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; -import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld; -import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; -import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator; -import com.github.intellectualsites.plotsquared.plot.listener.WESubscriber; -import com.github.intellectualsites.plotsquared.plot.logger.ILogger; +import com.github.intellectualsites.plotsquared.database.DBFunc; +import com.github.intellectualsites.plotsquared.database.Database; +import com.github.intellectualsites.plotsquared.database.MySQL; +import com.github.intellectualsites.plotsquared.database.SQLManager; +import com.github.intellectualsites.plotsquared.database.SQLite; +import com.github.intellectualsites.plotsquared.generator.GeneratorWrapper; +import com.github.intellectualsites.plotsquared.generator.HybridPlotWorld; +import com.github.intellectualsites.plotsquared.generator.HybridUtils; +import com.github.intellectualsites.plotsquared.generator.IndependentPlotGenerator; +import com.github.intellectualsites.plotsquared.listener.WESubscriber; +import com.github.intellectualsites.plotsquared.plot.comment.CommentManager; +import com.github.intellectualsites.plotsquared.util.ChatManager; +import com.github.intellectualsites.plotsquared.util.ChunkManager; +import com.github.intellectualsites.plotsquared.util.EconHandler; +import com.github.intellectualsites.plotsquared.util.EventDispatcher; +import com.github.intellectualsites.plotsquared.util.LegacyConverter; +import com.github.intellectualsites.plotsquared.util.MathMan; +import com.github.intellectualsites.plotsquared.util.SchematicHandler; +import com.github.intellectualsites.plotsquared.util.StringMan; +import com.github.intellectualsites.plotsquared.util.logger.ILogger; import com.github.intellectualsites.plotsquared.plot.object.*; import com.github.intellectualsites.plotsquared.plot.object.worlds.DefaultPlotAreaManager; import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea; import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; -import com.github.intellectualsites.plotsquared.plot.util.*; -import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager; -import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpiryTask; +import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.expiration.ExpireManager; +import com.github.intellectualsites.plotsquared.plot.expiration.ExpiryTask; +import com.github.intellectualsites.plotsquared.util.InventoryUtil; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.ReflectionUtils; +import com.github.intellectualsites.plotsquared.util.SetupUtils; +import com.github.intellectualsites.plotsquared.util.WorldUtil; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.regions.CuboidRegion; @@ -1695,7 +1712,8 @@ import java.util.zip.ZipInputStream; if (this.worlds.contains("worlds")) { if (!this.worlds.contains("configuration_version") || - (!this.worlds.getString("configuration_version").equalsIgnoreCase(LegacyConverter.CONFIGURATION_VERSION) && + (!this.worlds.getString("configuration_version").equalsIgnoreCase( + LegacyConverter.CONFIGURATION_VERSION) && !this.worlds.getString("configuration_version").equalsIgnoreCase("v5"))) { // Conversion needed log(Captions.LEGACY_CONFIG_FOUND.getTranslated()); diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotVersion.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/PlotVersion.java similarity index 96% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotVersion.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/PlotVersion.java index ea533e598..b32d3fac3 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotVersion.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/PlotVersion.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot; +package com.github.intellectualsites.plotsquared; public class PlotVersion { public final int year, month, day, hash, build; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java index 222677e86..533842816 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java @@ -1,15 +1,19 @@ package com.github.intellectualsites.plotsquared.api; import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Caption; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.*; -import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.util.ChunkManager; +import com.github.intellectualsites.plotsquared.util.EventDispatcher; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.SchematicHandler; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDWrapper; import lombok.NoArgsConstructor; import java.util.Collections; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/stream/AbstractDelegateOutputStream.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/collection/AbstractDelegateOutputStream.java similarity index 91% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/stream/AbstractDelegateOutputStream.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/collection/AbstractDelegateOutputStream.java index 994f6a465..a447132af 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/stream/AbstractDelegateOutputStream.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/collection/AbstractDelegateOutputStream.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.object.stream; +package com.github.intellectualsites.plotsquared.collection; import java.io.IOException; import java.io.OutputStream; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ArrayUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/collection/ArrayUtil.java similarity index 89% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ArrayUtil.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/collection/ArrayUtil.java index 6052c2a93..35a5bacab 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ArrayUtil.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/collection/ArrayUtil.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.collection; import java.util.Arrays; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/FlatRandomCollection.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/collection/FlatRandomCollection.java similarity index 90% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/FlatRandomCollection.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/collection/FlatRandomCollection.java index 341fbb4f3..b65612f46 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/FlatRandomCollection.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/collection/FlatRandomCollection.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.plot.object.collection; +package com.github.intellectualsites.plotsquared.collection; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; +import com.github.intellectualsites.plotsquared.util.MathMan; import java.util.ArrayList; import java.util.Map; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/RandomCollection.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/collection/RandomCollection.java similarity index 91% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/RandomCollection.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/collection/RandomCollection.java index b8dfa0a12..01cdf71a2 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/RandomCollection.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/collection/RandomCollection.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.object.collection; +package com.github.intellectualsites.plotsquared.collection; import java.util.Map; import java.util.Random; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/SimpleRandomCollection.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/collection/SimpleRandomCollection.java similarity index 91% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/SimpleRandomCollection.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/collection/SimpleRandomCollection.java index e75b64cb4..6963b47e0 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/SimpleRandomCollection.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/collection/SimpleRandomCollection.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.object.collection; +package com.github.intellectualsites.plotsquared.collection; import java.util.Map; import java.util.NavigableMap; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Add.java similarity index 83% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Add.java index f7d204134..60b408e75 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Add.java @@ -1,16 +1,14 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.Command; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.database.DBFunc; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.Permissions; import java.util.Iterator; import java.util.Set; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Alias.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Alias.java similarity index 88% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Alias.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Alias.java index e2bbde0c3..66f048afe 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Alias.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Alias.java @@ -1,16 +1,15 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.MathMan; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; @CommandDeclaration(command = "setalias", permission = "plots.alias", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Area.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Area.java index e00faa4b6..920ae2dc5 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Area.java @@ -1,32 +1,30 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Configuration; -import com.github.intellectualsites.plotsquared.plot.generator.AugmentedUtils; -import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld; +import com.github.intellectualsites.plotsquared.generator.AugmentedUtils; +import com.github.intellectualsites.plotsquared.generator.HybridPlotWorld; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotAreaTerrainType; import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.PlotMessage; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; +import com.github.intellectualsites.plotsquared.plot.object.message.PlotMessage; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; import com.github.intellectualsites.plotsquared.plot.object.SetupObject; import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; -import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; -import com.github.intellectualsites.plotsquared.plot.util.CmdConfirm; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.SetupUtils; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; -import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; -import com.github.intellectualsites.plotsquared.plot.util.world.RegionUtil; +import com.github.intellectualsites.plotsquared.util.ChunkManager; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.MathMan; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.SetupUtils; +import com.github.intellectualsites.plotsquared.util.StringMan; +import com.github.intellectualsites.plotsquared.util.WorldUtil; +import com.github.intellectualsites.plotsquared.util.RegionUtil; import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.regions.CuboidRegion; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Auto.java similarity index 92% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Auto.java index a04540168..b207483e9 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Auto.java @@ -1,27 +1,26 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.events.PlayerAutoPlotEvent; -import com.github.intellectualsites.plotsquared.plot.events.PlotAutoMergeEvent; -import com.github.intellectualsites.plotsquared.plot.events.Result; +import com.github.intellectualsites.plotsquared.database.DBFunc; +import com.github.intellectualsites.plotsquared.events.PlayerAutoPlotEvent; +import com.github.intellectualsites.plotsquared.events.PlotAutoMergeEvent; +import com.github.intellectualsites.plotsquared.events.Result; import com.github.intellectualsites.plotsquared.plot.object.Expression; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; -import com.github.intellectualsites.plotsquared.plot.util.AutoClaimFinishTask; -import com.github.intellectualsites.plotsquared.plot.util.EconHandler; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.util.tasks.AutoClaimFinishTask; +import com.github.intellectualsites.plotsquared.util.EconHandler; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.google.common.primitives.Ints; import org.jetbrains.annotations.Nullable; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Biome.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Biome.java similarity index 81% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Biome.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Biome.java index b0bb41bef..309850047 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Biome.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Biome.java @@ -1,11 +1,10 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.StringMan; import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.biome.BiomeTypes; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Buy.java similarity index 78% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Buy.java index 1768ae7f3..31af85eb6 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Buy.java @@ -1,20 +1,18 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.Command; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.events.PlotFlagRemoveEvent; -import com.github.intellectualsites.plotsquared.plot.events.Result; +import com.github.intellectualsites.plotsquared.events.PlotFlagRemoveEvent; +import com.github.intellectualsites.plotsquared.events.Result; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.github.intellectualsites.plotsquared.plot.flags.implementations.PriceFlag; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; -import com.github.intellectualsites.plotsquared.plot.util.EconHandler; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; +import com.github.intellectualsites.plotsquared.util.EconHandler; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import java.util.Set; import java.util.concurrent.CompletableFuture; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Chat.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Chat.java similarity index 68% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Chat.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Chat.java index c5aee38de..a2774a81d 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Chat.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Chat.java @@ -1,7 +1,6 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; @CommandDeclaration(command = "chat", description = "Toggle plot chat on or off", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Claim.java similarity index 88% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Claim.java index 559df28ef..acc135bc3 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Claim.java @@ -1,18 +1,19 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.events.PlayerClaimPlotEvent; -import com.github.intellectualsites.plotsquared.plot.events.PlotMergeEvent; -import com.github.intellectualsites.plotsquared.plot.events.Result; +import com.github.intellectualsites.plotsquared.database.DBFunc; +import com.github.intellectualsites.plotsquared.events.PlayerClaimPlotEvent; +import com.github.intellectualsites.plotsquared.events.PlotMergeEvent; +import com.github.intellectualsites.plotsquared.events.Result; import com.github.intellectualsites.plotsquared.plot.object.*; -import com.github.intellectualsites.plotsquared.plot.util.EconHandler; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.util.EconHandler; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; import com.google.common.primitives.Ints; @CommandDeclaration(command = "claim", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Clear.java similarity index 80% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Clear.java index e8cd8ece5..172bfe783 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Clear.java @@ -1,26 +1,24 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.Command; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.events.PlotFlagRemoveEvent; -import com.github.intellectualsites.plotsquared.plot.events.Result; +import com.github.intellectualsites.plotsquared.events.PlotFlagRemoveEvent; +import com.github.intellectualsites.plotsquared.events.Result; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.github.intellectualsites.plotsquared.plot.flags.implementations.AnalysisFlag; import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; import java.util.concurrent.CompletableFuture; -import static com.github.intellectualsites.plotsquared.plot.commands.SubCommand.sendMessage; +import static com.github.intellectualsites.plotsquared.commands.SubCommand.sendMessage; @CommandDeclaration(command = "clear", description = "Clear the plot you stand on", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Cluster.java similarity index 98% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Cluster.java index 8c79e3515..e4d7a508b 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Cluster.java @@ -1,21 +1,20 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.database.DBFunc; import com.github.intellectualsites.plotsquared.plot.object.BlockLoc; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotCluster; import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import java.util.ArrayList; import java.util.HashSet; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CmdConfirm.java similarity index 71% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CmdConfirm.java index e6cdc4134..9b88d4db2 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CmdConfirm.java @@ -1,8 +1,10 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.commands; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.CmdInstance; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.commands.CmdInstance; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; public class CmdConfirm { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/CmdInstance.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CmdInstance.java similarity index 79% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/CmdInstance.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CmdInstance.java index 27cb55216..83120c749 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/CmdInstance.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CmdInstance.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.github.intellectualsites.plotsquared.commands; public class CmdInstance { public final Runnable command; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java index 8758a5fe0..acbfcf6c7 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java @@ -1,20 +1,17 @@ package com.github.intellectualsites.plotsquared.commands; import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory; -import com.github.intellectualsites.plotsquared.plot.commands.MainCommand; -import com.github.intellectualsites.plotsquared.plot.commands.RequiredType; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.PlotMessage; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.StringComparison; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.plot.object.message.PlotMessage; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.MathMan; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.StringComparison; +import com.github.intellectualsites.plotsquared.util.StringMan; import java.io.IOException; import java.lang.reflect.InvocationTargetException; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandCaller.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandCaller.java index 3b5ee295e..21af7e52c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandCaller.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandCaller.java @@ -1,7 +1,5 @@ package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.plot.commands.RequiredType; - public interface CommandCaller { /** diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CommandCategory.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandCategory.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CommandCategory.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandCategory.java index 4b8ae5101..62194c83c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CommandCategory.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandCategory.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; import com.github.intellectualsites.plotsquared.plot.config.Captions; import lombok.RequiredArgsConstructor; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandDeclaration.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandDeclaration.java index 851a03174..b517c2b35 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandDeclaration.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandDeclaration.java @@ -1,8 +1,5 @@ package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory; -import com.github.intellectualsites.plotsquared.plot.commands.RequiredType; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Comment.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Comment.java similarity index 81% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Comment.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Comment.java index f4b1c4b66..654c67b70 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Comment.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Comment.java @@ -1,15 +1,14 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.comment.CommentInbox; -import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment; -import com.github.intellectualsites.plotsquared.plot.util.CommentManager; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.comment.CommentInbox; +import com.github.intellectualsites.plotsquared.plot.comment.PlotComment; +import com.github.intellectualsites.plotsquared.plot.comment.CommentManager; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.StringMan; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import java.util.Arrays; import java.util.Locale; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Condense.java similarity index 94% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Condense.java index f73e907f9..296c1e895 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Condense.java @@ -1,15 +1,14 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; -import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.MathMan; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.github.intellectualsites.plotsquared.util.WorldUtil; import java.util.ArrayList; import java.util.Collection; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Confirm.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Confirm.java similarity index 65% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Confirm.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Confirm.java index 477abfcc4..475cbb7ba 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Confirm.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Confirm.java @@ -1,13 +1,10 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.object.CmdInstance; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.CmdConfirm; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; @CommandDeclaration(command = "confirm", permission = "plots.use", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Continue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Continue.java similarity index 79% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Continue.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Continue.java index 1a11cc567..584c972e2 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Continue.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Continue.java @@ -1,17 +1,16 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.events.PlotFlagRemoveEvent; -import com.github.intellectualsites.plotsquared.plot.events.Result; +import com.github.intellectualsites.plotsquared.events.PlotFlagRemoveEvent; +import com.github.intellectualsites.plotsquared.events.Result; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.Permissions; @CommandDeclaration(command = "continue", description = "Continue a plot that was previously marked as done", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Copy.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Copy.java similarity index 84% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Copy.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Copy.java index 7ffce21e4..9119ca20e 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Copy.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Copy.java @@ -1,12 +1,11 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.Permissions; @CommandDeclaration(command = "copy", permission = "plots.copy", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CreateRoadSchematic.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CreateRoadSchematic.java similarity index 72% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CreateRoadSchematic.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CreateRoadSchematic.java index f0b430b52..dffdd7ccc 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CreateRoadSchematic.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CreateRoadSchematic.java @@ -1,13 +1,12 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld; -import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; +import com.github.intellectualsites.plotsquared.generator.HybridPlotWorld; +import com.github.intellectualsites.plotsquared.generator.HybridUtils; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.MainUtil; @CommandDeclaration(command = "createroadschematic", aliases = {"crs"}, diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DatabaseCommand.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DatabaseCommand.java similarity index 91% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DatabaseCommand.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DatabaseCommand.java index ec089ba29..58835316a 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DatabaseCommand.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DatabaseCommand.java @@ -1,18 +1,17 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.database.MySQL; -import com.github.intellectualsites.plotsquared.plot.database.SQLManager; -import com.github.intellectualsites.plotsquared.plot.database.SQLite; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.database.DBFunc; +import com.github.intellectualsites.plotsquared.database.MySQL; +import com.github.intellectualsites.plotsquared.database.SQLManager; +import com.github.intellectualsites.plotsquared.database.SQLite; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import java.io.File; import java.sql.SQLException; @@ -68,7 +67,7 @@ public class DatabaseCommand extends SubCommand { return false; } try { - com.github.intellectualsites.plotsquared.plot.database.Database implementation; + com.github.intellectualsites.plotsquared.database.Database implementation; String prefix = ""; switch (args[0].toLowerCase()) { case "import": diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Debug.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Debug.java similarity index 83% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Debug.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Debug.java index 339d33c5c..d3eacff9f 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Debug.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Debug.java @@ -1,13 +1,12 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.ChunkManager; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.StringMan; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import java.util.Map; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugAllowUnsafe.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugAllowUnsafe.java similarity index 81% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugAllowUnsafe.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugAllowUnsafe.java index 621593873..fd65b258d 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugAllowUnsafe.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugAllowUnsafe.java @@ -1,8 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import java.util.ArrayList; import java.util.List; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugClaimTest.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugClaimTest.java similarity index 90% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugClaimTest.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugClaimTest.java index 1331255f7..2ba91cdca 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugClaimTest.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugClaimTest.java @@ -1,19 +1,18 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotId; import com.github.intellectualsites.plotsquared.plot.object.PlotManager; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; -import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; -import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; +import com.github.intellectualsites.plotsquared.util.ChunkManager; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.github.intellectualsites.plotsquared.util.WorldUtil; import com.google.common.collect.BiMap; import com.sk89q.worldedit.math.BlockVector2; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugExec.java similarity index 91% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugExec.java index 37a8b16e7..afa9b45c2 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugExec.java @@ -1,41 +1,39 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.Command; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.events.PlotFlagRemoveEvent; -import com.github.intellectualsites.plotsquared.plot.events.Result; +import com.github.intellectualsites.plotsquared.database.DBFunc; +import com.github.intellectualsites.plotsquared.events.PlotFlagRemoveEvent; +import com.github.intellectualsites.plotsquared.events.Result; import com.github.intellectualsites.plotsquared.plot.flags.GlobalFlagContainer; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; -import com.github.intellectualsites.plotsquared.plot.listener.WEManager; -import com.github.intellectualsites.plotsquared.plot.object.ConsolePlayer; +import com.github.intellectualsites.plotsquared.generator.HybridUtils; +import com.github.intellectualsites.plotsquared.listener.WEManager; +import com.github.intellectualsites.plotsquared.player.ConsolePlayer; import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; +import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.PlotMessage; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; -import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; -import com.github.intellectualsites.plotsquared.plot.util.EconHandler; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; -import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler; -import com.github.intellectualsites.plotsquared.plot.util.SetupUtils; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; -import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; -import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager; -import com.github.intellectualsites.plotsquared.plot.util.expiry.PlotAnalysis; +import com.github.intellectualsites.plotsquared.plot.object.message.PlotMessage; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; +import com.github.intellectualsites.plotsquared.util.ChunkManager; +import com.github.intellectualsites.plotsquared.util.EconHandler; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.MathMan; +import com.github.intellectualsites.plotsquared.util.SchematicHandler; +import com.github.intellectualsites.plotsquared.util.SetupUtils; +import com.github.intellectualsites.plotsquared.util.StringMan; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.github.intellectualsites.plotsquared.util.WorldUtil; +import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.expiration.ExpireManager; +import com.github.intellectualsites.plotsquared.plot.expiration.PlotAnalysis; import com.google.common.io.Files; import com.sk89q.worldedit.world.block.BlockState; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugImportWorlds.java similarity index 82% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugImportWorlds.java index 7d1f1ca6f..4621b41bc 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugImportWorlds.java @@ -1,17 +1,15 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.Command; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea; import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; -import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.github.intellectualsites.plotsquared.util.WorldUtil; import com.google.common.base.Charsets; import java.io.File; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugLoadTest.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugLoadTest.java similarity index 58% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugLoadTest.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugLoadTest.java index d66315966..f7577adcc 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugLoadTest.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugLoadTest.java @@ -1,9 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.database.DBFunc; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; @CommandDeclaration(command = "debugloadtest", permission = "plots.debugloadtest", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugPaste.java similarity index 91% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugPaste.java index 65fa10652..521ecfc34 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugPaste.java @@ -1,14 +1,13 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.IncendoPaster; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.net.IncendoPaster; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import lombok.NonNull; @@ -25,8 +24,8 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.github.intellectualsites.plotsquared.plot.util.PremiumVerification.getDownloadID; -import static com.github.intellectualsites.plotsquared.plot.util.PremiumVerification.getUserID; +import static com.github.intellectualsites.plotsquared.util.PremiumVerification.getDownloadID; +import static com.github.intellectualsites.plotsquared.util.PremiumVerification.getUserID; @CommandDeclaration(command = "debugpaste", aliases = "dp", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugRoadRegen.java similarity index 90% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugRoadRegen.java index 0c902f7b2..a1c9e0597 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugRoadRegen.java @@ -1,15 +1,14 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotManager; -import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; +import com.github.intellectualsites.plotsquared.generator.HybridPlotManager; +import com.github.intellectualsites.plotsquared.generator.HybridUtils; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotManager; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.MainUtil; import java.util.Arrays; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugSaveTest.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugSaveTest.java similarity index 65% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugSaveTest.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugSaveTest.java index 06b939abd..272079bd6 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugSaveTest.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugSaveTest.java @@ -1,11 +1,10 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.database.DBFunc; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.MainUtil; import java.util.ArrayList; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Delete.java similarity index 81% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Delete.java index cff5e00fb..05face8a8 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Delete.java @@ -1,21 +1,18 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.events.Result; +import com.github.intellectualsites.plotsquared.events.Result; import com.github.intellectualsites.plotsquared.plot.object.Expression; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.CmdConfirm; -import com.github.intellectualsites.plotsquared.plot.util.EconHandler; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.EconHandler; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; @CommandDeclaration(command = "delete", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Deny.java similarity index 86% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Deny.java index b1d738cb1..55b607f01 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Deny.java @@ -1,17 +1,15 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.Argument; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.database.DBFunc; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; -import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.github.intellectualsites.plotsquared.util.WorldUtil; import com.sk89q.worldedit.world.gamemode.GameModes; import java.util.Set; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Desc.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Desc.java similarity index 75% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Desc.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Desc.java index b97d2b2c8..7f032060c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Desc.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Desc.java @@ -1,15 +1,14 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.events.PlotFlagAddEvent; -import com.github.intellectualsites.plotsquared.plot.events.PlotFlagRemoveEvent; -import com.github.intellectualsites.plotsquared.plot.events.Result; +import com.github.intellectualsites.plotsquared.events.PlotFlagAddEvent; +import com.github.intellectualsites.plotsquared.events.PlotFlagRemoveEvent; +import com.github.intellectualsites.plotsquared.events.Result; import com.github.intellectualsites.plotsquared.plot.flags.implementations.DescriptionFlag; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.MainUtil; @CommandDeclaration(command = "setdescription", permission = "plots.set.desc", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Dislike.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Dislike.java similarity index 66% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Dislike.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Dislike.java index 2ff639336..c21057398 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Dislike.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Dislike.java @@ -1,7 +1,6 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; @CommandDeclaration(command = "dislike", permission = "plots.dislike", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Done.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Done.java similarity index 77% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Done.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Done.java index 9722f3366..d6770aac8 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Done.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Done.java @@ -1,23 +1,22 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.events.PlotDoneEvent; -import com.github.intellectualsites.plotsquared.plot.events.PlotFlagAddEvent; -import com.github.intellectualsites.plotsquared.plot.events.Result; +import com.github.intellectualsites.plotsquared.events.PlotDoneEvent; +import com.github.intellectualsites.plotsquared.events.PlotFlagAddEvent; +import com.github.intellectualsites.plotsquared.events.Result; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; -import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; +import com.github.intellectualsites.plotsquared.generator.HybridUtils; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager; -import com.github.intellectualsites.plotsquared.plot.util.expiry.PlotAnalysis; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.plot.expiration.ExpireManager; +import com.github.intellectualsites.plotsquared.plot.expiration.PlotAnalysis; @CommandDeclaration(command = "done", aliases = {"submit"}, diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Download.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Download.java similarity index 85% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Download.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Download.java index 2ab9bfa43..de2a47b9c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Download.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Download.java @@ -1,18 +1,17 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; -import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.SchematicHandler; +import com.github.intellectualsites.plotsquared.util.StringMan; +import com.github.intellectualsites.plotsquared.util.WorldUtil; import com.sk89q.jnbt.CompoundTag; import java.net.URL; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCommand.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/FlagCommand.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCommand.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/FlagCommand.java index e0cc4f878..38d122271 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCommand.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/FlagCommand.java @@ -1,14 +1,12 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.Command; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.events.PlotFlagAddEvent; -import com.github.intellectualsites.plotsquared.plot.events.PlotFlagRemoveEvent; -import com.github.intellectualsites.plotsquared.plot.events.Result; +import com.github.intellectualsites.plotsquared.events.PlotFlagAddEvent; +import com.github.intellectualsites.plotsquared.events.PlotFlagRemoveEvent; +import com.github.intellectualsites.plotsquared.events.Result; import com.github.intellectualsites.plotsquared.plot.flags.FlagParseException; import com.github.intellectualsites.plotsquared.plot.flags.GlobalFlagContainer; import com.github.intellectualsites.plotsquared.plot.flags.InternalFlag; @@ -17,16 +15,16 @@ import com.github.intellectualsites.plotsquared.plot.flags.types.IntegerFlag; import com.github.intellectualsites.plotsquared.plot.flags.types.ListFlag; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotMessage; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.StringComparison; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; -import com.github.intellectualsites.plotsquared.plot.util.helpmenu.HelpMenu; +import com.github.intellectualsites.plotsquared.plot.object.message.PlotMessage; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.MathMan; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.StringComparison; +import com.github.intellectualsites.plotsquared.util.StringMan; +import com.github.intellectualsites.plotsquared.util.helpmenu.HelpMenu; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Grant.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Grant.java similarity index 82% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Grant.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Grant.java index 6225e7902..361801552 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Grant.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Grant.java @@ -1,17 +1,15 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.Command; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.database.DBFunc; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import com.google.common.primitives.Ints; import java.util.UUID; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Help.java similarity index 84% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Help.java index 04031a01a..a0e098ab6 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Help.java @@ -1,15 +1,13 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.Command; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; -import com.github.intellectualsites.plotsquared.plot.util.helpmenu.HelpMenu; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.MathMan; +import com.github.intellectualsites.plotsquared.util.StringMan; +import com.github.intellectualsites.plotsquared.util.helpmenu.HelpMenu; import java.util.concurrent.CompletableFuture; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Inbox.java similarity index 92% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Inbox.java index ca13056e3..9b9f59958 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Inbox.java @@ -1,15 +1,14 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.object.comment.CommentInbox; -import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment; -import com.github.intellectualsites.plotsquared.plot.util.CommentManager; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.comment.CommentInbox; +import com.github.intellectualsites.plotsquared.plot.comment.PlotComment; +import com.github.intellectualsites.plotsquared.plot.comment.CommentManager; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.StringMan; import java.util.List; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Info.java similarity index 93% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Info.java index 1156fd1cf..87d4e46f2 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Info.java @@ -1,14 +1,13 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.database.DBFunc; import com.github.intellectualsites.plotsquared.plot.flags.implementations.HideInfoFlag; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.util.MainUtil; @CommandDeclaration(command = "info", aliases = "i", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Kick.java similarity index 83% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Kick.java index 653dfe697..a1e1bb7f9 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Kick.java @@ -1,17 +1,15 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.Argument; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.database.DBFunc; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; -import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.github.intellectualsites.plotsquared.util.WorldUtil; import java.util.HashSet; import java.util.Set; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Leave.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Leave.java similarity index 77% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Leave.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Leave.java index 46853c67e..7ab523de6 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Leave.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Leave.java @@ -1,14 +1,12 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.Command; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; +import com.github.intellectualsites.plotsquared.util.MainUtil; import java.util.UUID; import java.util.concurrent.CompletableFuture; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Like.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Like.java similarity index 90% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Like.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Like.java index b3af59f13..d276d4c78 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Like.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Like.java @@ -1,19 +1,18 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.events.PlotRateEvent; +import com.github.intellectualsites.plotsquared.database.DBFunc; +import com.github.intellectualsites.plotsquared.events.PlotRateEvent; import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.Rating; import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import java.util.ArrayList; import java.util.Collection; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/ListCmd.java similarity index 94% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/ListCmd.java index 8ea0f369c..b04a44d8d 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/ListCmd.java @@ -1,26 +1,25 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.PlotSquared.SortType; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared.SortType; import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; import com.github.intellectualsites.plotsquared.plot.flags.implementations.PriceFlag; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotMessage; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.message.PlotMessage; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.Rating; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; -import com.github.intellectualsites.plotsquared.plot.util.EconHandler; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.StringComparison; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; -import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; +import com.github.intellectualsites.plotsquared.util.EconHandler; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.MathMan; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.StringComparison; +import com.github.intellectualsites.plotsquared.util.StringMan; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.github.intellectualsites.plotsquared.plot.expiration.ExpireManager; import java.util.ArrayList; import java.util.Arrays; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Load.java similarity index 92% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Load.java index 5e0ebd8ed..0f2db9da4 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Load.java @@ -1,19 +1,18 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; import com.github.intellectualsites.plotsquared.plot.object.schematic.Schematic; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.SchematicHandler; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import java.net.MalformedURLException; import java.net.URL; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/MainCommand.java similarity index 93% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/MainCommand.java index 9727303ef..3dcd7759b 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/MainCommand.java @@ -1,20 +1,17 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.Command; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.object.ConsolePlayer; +import com.github.intellectualsites.plotsquared.player.ConsolePlayer; import com.github.intellectualsites.plotsquared.plot.object.Expression; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; -import com.github.intellectualsites.plotsquared.plot.util.CmdConfirm; -import com.github.intellectualsites.plotsquared.plot.util.EconHandler; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; +import com.github.intellectualsites.plotsquared.util.EconHandler; +import com.github.intellectualsites.plotsquared.util.Permissions; import java.util.Arrays; import java.util.concurrent.CompletableFuture; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Merge.java similarity index 91% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Merge.java index 27315885c..bbe78943e 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Merge.java @@ -1,23 +1,21 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.events.PlotMergeEvent; -import com.github.intellectualsites.plotsquared.plot.events.Result; +import com.github.intellectualsites.plotsquared.events.PlotMergeEvent; +import com.github.intellectualsites.plotsquared.events.Result; import com.github.intellectualsites.plotsquared.plot.object.Direction; import com.github.intellectualsites.plotsquared.plot.object.Expression; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.CmdConfirm; -import com.github.intellectualsites.plotsquared.plot.util.EconHandler; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.EconHandler; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.StringMan; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import java.util.UUID; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Middle.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Middle.java similarity index 82% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Middle.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Middle.java index 83b8236ed..120d34dba 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Middle.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Middle.java @@ -1,10 +1,9 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; /** diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Move.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Move.java similarity index 83% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Move.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Move.java index a2d4f7735..fbba1f2d4 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Move.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Move.java @@ -1,17 +1,15 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.Command; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.Permissions; import java.util.concurrent.CompletableFuture; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Music.java similarity index 91% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Music.java index 42e12edb9..9123874cf 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Music.java @@ -1,10 +1,10 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.events.PlotFlagAddEvent; -import com.github.intellectualsites.plotsquared.plot.events.PlotFlagRemoveEvent; -import com.github.intellectualsites.plotsquared.plot.events.Result; +import com.github.intellectualsites.plotsquared.events.PlotFlagAddEvent; +import com.github.intellectualsites.plotsquared.events.PlotFlagRemoveEvent; +import com.github.intellectualsites.plotsquared.events.Result; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.github.intellectualsites.plotsquared.plot.flags.implementations.MusicFlag; import com.github.intellectualsites.plotsquared.plot.object.*; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Near.java similarity index 66% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Near.java index 3119e216a..a805cdd1d 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Near.java @@ -1,13 +1,11 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.Command; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; +import com.github.intellectualsites.plotsquared.util.StringMan; import java.util.concurrent.CompletableFuture; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Owner.java similarity index 87% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Owner.java index e0baa49ef..4ac3532c6 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Owner.java @@ -1,15 +1,17 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.events.PlotChangeOwnerEvent; -import com.github.intellectualsites.plotsquared.plot.events.PlotUnlinkEvent; -import com.github.intellectualsites.plotsquared.plot.events.Result; +import com.github.intellectualsites.plotsquared.events.PlotChangeOwnerEvent; +import com.github.intellectualsites.plotsquared.events.PlotUnlinkEvent; +import com.github.intellectualsites.plotsquared.events.Result; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.*; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import java.util.Set; import java.util.UUID; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/PluginCmd.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/PluginCmd.java similarity index 65% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/PluginCmd.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/PluginCmd.java index c731c1b11..a7c258cdf 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/PluginCmd.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/PluginCmd.java @@ -1,12 +1,11 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; -import static com.github.intellectualsites.plotsquared.plot.util.PremiumVerification.isPremium; +import static com.github.intellectualsites.plotsquared.util.PremiumVerification.isPremium; @CommandDeclaration(command = "plugin", permission = "plots.use", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Purge.java similarity index 91% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Purge.java index c61074f27..45c114730 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Purge.java @@ -1,18 +1,16 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.listener.PlotListener; +import com.github.intellectualsites.plotsquared.database.DBFunc; +import com.github.intellectualsites.plotsquared.listener.PlotListener; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.CmdConfirm; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.StringMan; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import java.util.HashMap; import java.util.HashSet; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Rate.java similarity index 92% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Rate.java index 43c89f8ab..e03ca3670 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Rate.java @@ -1,23 +1,21 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.Command; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.events.PlotRateEvent; +import com.github.intellectualsites.plotsquared.database.DBFunc; +import com.github.intellectualsites.plotsquared.events.PlotRateEvent; import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotInventory; import com.github.intellectualsites.plotsquared.plot.object.PlotItemStack; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.Rating; import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.MathMan; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import java.util.ArrayList; import java.util.HashMap; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RegenAllRoads.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/RegenAllRoads.java similarity index 83% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RegenAllRoads.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/RegenAllRoads.java index 224dc128e..c5cdbd4d9 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RegenAllRoads.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/RegenAllRoads.java @@ -1,14 +1,13 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotManager; -import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; +import com.github.intellectualsites.plotsquared.generator.HybridPlotManager; +import com.github.intellectualsites.plotsquared.generator.HybridUtils; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotManager; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.MainUtil; @CommandDeclaration(command = "regenallroads", description = "Regenerate all roads in the map using the set road schematic", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Relight.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Relight.java similarity index 67% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Relight.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Relight.java index abb56f493..17920a2d4 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Relight.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Relight.java @@ -1,15 +1,13 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.Command; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; -import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; -import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; +import com.github.intellectualsites.plotsquared.util.ChunkManager; +import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; import java.util.concurrent.CompletableFuture; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Reload.java similarity index 91% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Reload.java index 4b4cfb8df..090a12aec 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Reload.java @@ -1,14 +1,13 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; import com.github.intellectualsites.plotsquared.configuration.MemorySection; import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.MainUtil; import java.io.IOException; import java.util.Objects; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Remove.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Remove.java similarity index 87% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Remove.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Remove.java index 28e0789d7..2ac7d34da 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Remove.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Remove.java @@ -1,16 +1,14 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.Argument; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.database.DBFunc; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import java.util.ArrayList; import java.util.HashSet; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RequiredType.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/RequiredType.java similarity index 63% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RequiredType.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/RequiredType.java index 2dc75f919..e8181a066 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RequiredType.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/RequiredType.java @@ -1,6 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.commands; - -import com.github.intellectualsites.plotsquared.commands.CommandCaller; +package com.github.intellectualsites.plotsquared.commands; public enum RequiredType { CONSOLE, PLAYER, NONE; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Save.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Save.java similarity index 83% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Save.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Save.java index e9272c1b7..d42dac8aa 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Save.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Save.java @@ -1,17 +1,16 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.SchematicHandler; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.sk89q.jnbt.CompoundTag; import java.net.URL; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/SchematicCmd.java similarity index 92% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/SchematicCmd.java index 5364a24f9..7358f599a 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/SchematicCmd.java @@ -1,21 +1,20 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.object.ConsolePlayer; +import com.github.intellectualsites.plotsquared.player.ConsolePlayer; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; import com.github.intellectualsites.plotsquared.plot.object.schematic.Schematic; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.SchematicHandler; +import com.github.intellectualsites.plotsquared.util.StringMan; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.google.common.collect.Lists; import java.net.URL; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Set.java similarity index 88% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Set.java index c55c399eb..88847028a 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Set.java @@ -1,17 +1,15 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.Command; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotManager; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; -import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.world.PatternUtil; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.StringMan; +import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.util.PatternUtil; import com.sk89q.worldedit.function.pattern.Pattern; import java.util.ArrayList; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetCommand.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/SetCommand.java similarity index 85% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetCommand.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/SetCommand.java index da9c11719..c5e88351c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetCommand.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/SetCommand.java @@ -1,13 +1,13 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.StringMan; public abstract class SetCommand extends SubCommand { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetHome.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/SetHome.java similarity index 85% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetHome.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/SetHome.java index 7754644f3..63e757412 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetHome.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/SetHome.java @@ -1,12 +1,11 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.object.BlockLoc; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.MainUtil; @CommandDeclaration(command = "sethome", permission = "plots.set.home", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Setup.java similarity index 96% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Setup.java index 5d2e1b8c9..8091e1863 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Setup.java @@ -1,23 +1,22 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Configuration; import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; -import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; +import com.github.intellectualsites.plotsquared.generator.GeneratorWrapper; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotAreaTerrainType; import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.PlotMessage; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.message.PlotMessage; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.SetupObject; import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.SetupUtils; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; -import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.SetupUtils; +import com.github.intellectualsites.plotsquared.util.StringMan; +import com.github.intellectualsites.plotsquared.util.WorldUtil; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/SubCommand.java similarity index 70% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/SubCommand.java index 458442ff2..e48ab2f69 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/SubCommand.java @@ -1,11 +1,9 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.Argument; -import com.github.intellectualsites.plotsquared.commands.Command; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; import java.util.concurrent.CompletableFuture; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Swap.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Swap.java similarity index 82% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Swap.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Swap.java index 0aaea13dc..868f3a5a9 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Swap.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Swap.java @@ -1,15 +1,13 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.Command; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.Permissions; import java.util.concurrent.CompletableFuture; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Target.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Target.java similarity index 78% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Target.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Target.java index 7a449f7f1..472c48f88 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Target.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Target.java @@ -1,14 +1,12 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.Argument; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.StringMan; @CommandDeclaration(command = "target", usage = "/plot target <|nearest>", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Template.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Template.java similarity index 90% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Template.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Template.java index c6ee62950..ea6ff3977 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Template.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Template.java @@ -1,27 +1,23 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; import com.github.intellectualsites.plotsquared.configuration.InvalidConfigurationException; import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.object.FileBytes; +import com.github.intellectualsites.plotsquared.util.FileBytes; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotAreaTerrainType; -import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; import com.github.intellectualsites.plotsquared.plot.object.PlotManager; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.SetupObject; import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; -import com.github.intellectualsites.plotsquared.plot.util.SetupUtils; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; -import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; -import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.SetupUtils; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.github.intellectualsites.plotsquared.util.WorldUtil; +import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; import java.io.File; import java.io.FileInputStream; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Toggle.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Toggle.java similarity index 89% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Toggle.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Toggle.java index 4aa023ce4..e2c65f052 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Toggle.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Toggle.java @@ -1,12 +1,10 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.Command; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; +import com.github.intellectualsites.plotsquared.util.MainUtil; @CommandDeclaration(command = "toggle", aliases = {"attribute"}, diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Trim.java similarity index 90% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Trim.java index 378929e4c..6a73a8d03 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Trim.java @@ -1,21 +1,20 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; -import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; -import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; -import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager; -import com.github.intellectualsites.plotsquared.plot.util.world.RegionUtil; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; +import com.github.intellectualsites.plotsquared.util.ChunkManager; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.github.intellectualsites.plotsquared.util.WorldUtil; +import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.expiration.ExpireManager; +import com.github.intellectualsites.plotsquared.util.RegionUtil; import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.regions.CuboidRegion; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Trust.java similarity index 83% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Trust.java index 6f4c42601..8abea79f2 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Trust.java @@ -1,16 +1,14 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.Command; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.database.DBFunc; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.Permissions; import java.util.Iterator; import java.util.Set; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Unlink.java similarity index 76% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Unlink.java index 1f2fde14b..7453acdf4 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Unlink.java @@ -1,18 +1,16 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.events.PlotUnlinkEvent; -import com.github.intellectualsites.plotsquared.plot.events.Result; +import com.github.intellectualsites.plotsquared.events.PlotUnlinkEvent; +import com.github.intellectualsites.plotsquared.events.Result; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.CmdConfirm; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.StringMan; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; @CommandDeclaration(command = "unlink", aliases = {"u", "unmerge"}, diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Visit.java similarity index 90% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Visit.java index 8916bf9b1..0b3cd83d1 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Visit.java @@ -1,21 +1,19 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.Command; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.github.intellectualsites.plotsquared.plot.flags.implementations.UntrustedVisitFlag; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.MathMan; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import java.util.ArrayList; import java.util.Collection; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/WE_Anywhere.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/WE_Anywhere.java similarity index 72% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/WE_Anywhere.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/WE_Anywhere.java index 1dfb82fdf..6714905ab 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/WE_Anywhere.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/WE_Anywhere.java @@ -1,7 +1,6 @@ -package com.github.intellectualsites.plotsquared.plot.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; @CommandDeclaration(command = "weanywhere", permission = "plots.worldedit.bypass", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfiguration.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfiguration.java index d8c41c3da..9acc01233 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfiguration.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfiguration.java @@ -3,7 +3,7 @@ package com.github.intellectualsites.plotsquared.configuration.file; import com.github.intellectualsites.plotsquared.configuration.Configuration; import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; import com.github.intellectualsites.plotsquared.configuration.InvalidConfigurationException; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.error.YAMLException; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/database/AbstractDB.java similarity index 97% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/database/AbstractDB.java index 7205eee62..84dcf9053 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/database/AbstractDB.java @@ -1,12 +1,12 @@ -package com.github.intellectualsites.plotsquared.plot.database; +package com.github.intellectualsites.plotsquared.database; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotCluster; import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.comment.PlotComment; import org.jetbrains.annotations.NotNull; import java.util.HashMap; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/database/DBFunc.java similarity index 98% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/database/DBFunc.java index ef8af6d8e..93052b63c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/database/DBFunc.java @@ -1,12 +1,12 @@ -package com.github.intellectualsites.plotsquared.plot.database; +package com.github.intellectualsites.plotsquared.database; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotCluster; import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.comment.PlotComment; import java.sql.ResultSet; import java.sql.ResultSetMetaData; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/Database.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/database/Database.java similarity index 97% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/Database.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/database/Database.java index 4acecc01f..e2d2a2978 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/Database.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/database/Database.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.database; +package com.github.intellectualsites.plotsquared.database; import java.sql.Connection; import java.sql.ResultSet; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/MySQL.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/database/MySQL.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/MySQL.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/database/MySQL.java index f8b2cedb0..f5e91134e 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/MySQL.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/database/MySQL.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.database; +package com.github.intellectualsites.plotsquared.database; import com.github.intellectualsites.plotsquared.plot.config.Storage; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.util.StringMan; import java.sql.Connection; import java.sql.DriverManager; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/database/SQLManager.java similarity index 99% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/database/SQLManager.java index b3d52a114..c87382565 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/database/SQLManager.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.database; +package com.github.intellectualsites.plotsquared.database; import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.github.intellectualsites.plotsquared.plot.config.Storage; @@ -15,11 +15,11 @@ import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotCluster; import com.github.intellectualsites.plotsquared.plot.object.PlotId; import com.github.intellectualsites.plotsquared.plot.object.PlotSettings; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.comment.PlotComment; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.StringMan; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.google.common.base.Charsets; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLite.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/database/SQLite.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLite.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/database/SQLite.java index 10ceb8784..90c8884f7 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLite.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/database/SQLite.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.plot.database; +package com.github.intellectualsites.plotsquared.database; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import java.io.File; import java.io.IOException; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/StmtMod.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/database/StmtMod.java similarity index 90% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/StmtMod.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/database/StmtMod.java index 837d3a66a..3888c9d61 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/StmtMod.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/database/StmtMod.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.plot.database; +package com.github.intellectualsites.plotsquared.database; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.util.StringMan; import java.sql.PreparedStatement; import java.sql.SQLException; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/CancellablePlotEvent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/CancellablePlotEvent.java similarity index 82% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/CancellablePlotEvent.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/events/CancellablePlotEvent.java index 15616edaa..a1c1e0bc2 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/CancellablePlotEvent.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/CancellablePlotEvent.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.events; +package com.github.intellectualsites.plotsquared.events; /** * PlotSquared event with {@link Result} to cancel, force, or allow. diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlayerAutoPlotEvent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerAutoPlotEvent.java similarity index 85% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlayerAutoPlotEvent.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerAutoPlotEvent.java index a82647408..ca498884a 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlayerAutoPlotEvent.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerAutoPlotEvent.java @@ -1,7 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.events; +package com.github.intellectualsites.plotsquared.events; +import com.github.intellectualsites.plotsquared.commands.Claim; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import lombok.Getter; import lombok.Setter; @@ -36,7 +37,7 @@ public class PlayerAutoPlotEvent extends PlotEvent implements CancellablePlotEve } /** - * Obtain the schematic string as used by the {@link com.github.intellectualsites.plotsquared.plot.commands.Claim} command or null. + * Obtain the schematic string as used by the {@link Claim} command or null. * * @return schematic string */ diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlayerClaimPlotEvent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerClaimPlotEvent.java similarity index 80% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlayerClaimPlotEvent.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerClaimPlotEvent.java index 9a2f409ef..fb5bcff01 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlayerClaimPlotEvent.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerClaimPlotEvent.java @@ -1,7 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.events; +package com.github.intellectualsites.plotsquared.events; +import com.github.intellectualsites.plotsquared.commands.Claim; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import javax.annotation.Nullable; @@ -23,7 +24,7 @@ public class PlayerClaimPlotEvent extends PlotPlayerEvent implements Cancellable } /** - * Obtain the schematic string as used by the {@link com.github.intellectualsites.plotsquared.plot.commands.Claim} command or null. + * Obtain the schematic string as used by the {@link Claim} command or null. * * @return schematic string */ diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlayerEnterPlotEvent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerEnterPlotEvent.java similarity index 74% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlayerEnterPlotEvent.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerEnterPlotEvent.java index 3f90cd9ee..6cb7c3072 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlayerEnterPlotEvent.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerEnterPlotEvent.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.events; +package com.github.intellectualsites.plotsquared.events; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; public class PlayerEnterPlotEvent extends PlotPlayerEvent { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlayerLeavePlotEvent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerLeavePlotEvent.java similarity index 75% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlayerLeavePlotEvent.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerLeavePlotEvent.java index f2ff8185a..e4566a8eb 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlayerLeavePlotEvent.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerLeavePlotEvent.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.events; +package com.github.intellectualsites.plotsquared.events; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; /** * diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlayerPlotDeniedEvent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerPlotDeniedEvent.java similarity index 90% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlayerPlotDeniedEvent.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerPlotDeniedEvent.java index 1f497dabc..b0d80e3c5 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlayerPlotDeniedEvent.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerPlotDeniedEvent.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.events; +package com.github.intellectualsites.plotsquared.events; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import java.util.UUID; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlayerPlotHelperEvent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerPlotHelperEvent.java similarity index 90% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlayerPlotHelperEvent.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerPlotHelperEvent.java index 319d350ff..50aa76f75 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlayerPlotHelperEvent.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerPlotHelperEvent.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.events; +package com.github.intellectualsites.plotsquared.events; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import java.util.UUID; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlayerPlotTrustedEvent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerPlotTrustedEvent.java similarity index 90% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlayerPlotTrustedEvent.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerPlotTrustedEvent.java index bce50a6e1..26ad73849 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlayerPlotTrustedEvent.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerPlotTrustedEvent.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.events; +package com.github.intellectualsites.plotsquared.events; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import java.util.UUID; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlayerTeleportToPlotEvent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerTeleportToPlotEvent.java similarity index 88% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlayerTeleportToPlotEvent.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerTeleportToPlotEvent.java index c5dbf5798..ac46553d0 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlayerTeleportToPlotEvent.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerTeleportToPlotEvent.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.events; +package com.github.intellectualsites.plotsquared.events; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; /** * Called when a player teleports to a plot diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotAutoMergeEvent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotAutoMergeEvent.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotAutoMergeEvent.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotAutoMergeEvent.java index 009e7bcff..79b8df894 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotAutoMergeEvent.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotAutoMergeEvent.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.events; +package com.github.intellectualsites.plotsquared.events; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotId; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotChangeOwnerEvent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotChangeOwnerEvent.java similarity index 94% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotChangeOwnerEvent.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotChangeOwnerEvent.java index 73fe1fd35..599dcdd3a 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotChangeOwnerEvent.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotChangeOwnerEvent.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.events; +package com.github.intellectualsites.plotsquared.events; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import org.jetbrains.annotations.Nullable; import java.util.UUID; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotClearEvent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotClearEvent.java similarity index 93% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotClearEvent.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotClearEvent.java index 0b2ecab1c..f528ed0c1 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotClearEvent.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotClearEvent.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.events; +package com.github.intellectualsites.plotsquared.events; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotId; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotComponentSetEvent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotComponentSetEvent.java similarity index 96% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotComponentSetEvent.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotComponentSetEvent.java index a87595ad6..0a7ac757e 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotComponentSetEvent.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotComponentSetEvent.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.events; +package com.github.intellectualsites.plotsquared.events; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotId; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotDeleteEvent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotDeleteEvent.java similarity index 93% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotDeleteEvent.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotDeleteEvent.java index 084bdc34c..ed40a1822 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotDeleteEvent.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotDeleteEvent.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.events; +package com.github.intellectualsites.plotsquared.events; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotId; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotDoneEvent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotDoneEvent.java similarity index 93% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotDoneEvent.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotDoneEvent.java index 1a1155ab2..0aa3a3ec1 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotDoneEvent.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotDoneEvent.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.events; +package com.github.intellectualsites.plotsquared.events; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotId; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotEvent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotEvent.java similarity index 85% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotEvent.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotEvent.java index ea37cd010..7ab8ad7b0 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotEvent.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotEvent.java @@ -1,11 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.events; +package com.github.intellectualsites.plotsquared.events; import com.github.intellectualsites.plotsquared.plot.object.Plot; import org.jetbrains.annotations.NotNull; -import java.util.HashMap; -import java.util.Map; - public abstract class PlotEvent { private final Plot plot; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotFlagAddEvent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotFlagAddEvent.java similarity index 92% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotFlagAddEvent.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotFlagAddEvent.java index 180d28ff7..563616c66 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotFlagAddEvent.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotFlagAddEvent.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.events; +package com.github.intellectualsites.plotsquared.events; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.github.intellectualsites.plotsquared.plot.object.Plot; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotFlagEvent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotFlagEvent.java similarity index 89% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotFlagEvent.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotFlagEvent.java index 63eee217b..10df3f06b 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotFlagEvent.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotFlagEvent.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.events; +package com.github.intellectualsites.plotsquared.events; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.github.intellectualsites.plotsquared.plot.object.Plot; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotFlagRemoveEvent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotFlagRemoveEvent.java similarity index 92% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotFlagRemoveEvent.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotFlagRemoveEvent.java index d5f62b980..5022dbf9f 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotFlagRemoveEvent.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotFlagRemoveEvent.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.events; +package com.github.intellectualsites.plotsquared.events; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.github.intellectualsites.plotsquared.plot.object.Plot; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotMergeEvent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotMergeEvent.java similarity index 91% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotMergeEvent.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotMergeEvent.java index 4fe04ec6e..6a3604b7f 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotMergeEvent.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotMergeEvent.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.events; +package com.github.intellectualsites.plotsquared.events; import com.github.intellectualsites.plotsquared.plot.object.Direction; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import lombok.Getter; import lombok.Setter; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotPlayerEvent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotPlayerEvent.java similarity index 73% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotPlayerEvent.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotPlayerEvent.java index 50938d58d..9b372b1f9 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotPlayerEvent.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotPlayerEvent.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.events; +package com.github.intellectualsites.plotsquared.events; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; public abstract class PlotPlayerEvent extends PlotEvent { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotRateEvent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotRateEvent.java similarity index 89% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotRateEvent.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotRateEvent.java index 6626220f2..d5ea31d48 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotRateEvent.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotRateEvent.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.events; +package com.github.intellectualsites.plotsquared.events; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.Rating; import org.jetbrains.annotations.Nullable; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotUnlinkEvent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotUnlinkEvent.java similarity index 96% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotUnlinkEvent.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotUnlinkEvent.java index 03e5efeff..1bea0d608 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/PlotUnlinkEvent.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotUnlinkEvent.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.events; +package com.github.intellectualsites.plotsquared.events; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/Result.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/Result.java similarity index 94% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/Result.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/events/Result.java index 78ae8d964..745f36db7 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/events/Result.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/events/Result.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.events; +package com.github.intellectualsites.plotsquared.events; import java.util.HashMap; import java.util.Map; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/AugmentedUtils.java similarity index 92% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/generator/AugmentedUtils.java index 97d5af43d..2d80f0033 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/AugmentedUtils.java @@ -1,16 +1,16 @@ -package com.github.intellectualsites.plotsquared.plot.generator; +package com.github.intellectualsites.plotsquared.generator; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotAreaTerrainType; import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; import com.github.intellectualsites.plotsquared.plot.object.PlotManager; -import com.github.intellectualsites.plotsquared.plot.util.block.DelegateLocalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.world.RegionUtil; +import com.github.intellectualsites.plotsquared.queue.DelegateLocalBlockQueue; +import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.queue.ScopedLocalBlockQueue; +import com.github.intellectualsites.plotsquared.util.RegionUtil; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.CuboidRegion; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/ClassicPlotManager.java similarity index 98% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/generator/ClassicPlotManager.java index 780ae14ae..2e150205c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/ClassicPlotManager.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.generator; +package com.github.intellectualsites.plotsquared.generator; import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.github.intellectualsites.plotsquared.plot.object.BlockBucket; @@ -7,10 +7,10 @@ import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotAreaTerrainType; import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; -import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.world.BlockUtil; +import com.github.intellectualsites.plotsquared.util.MathMan; +import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.util.BlockUtil; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.world.block.BlockTypes; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/ClassicPlotWorld.java similarity index 97% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/generator/ClassicPlotWorld.java index bf3f99bd4..1de9f6440 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/ClassicPlotWorld.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.generator; +package com.github.intellectualsites.plotsquared.generator; import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Configuration; import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; import com.github.intellectualsites.plotsquared.plot.config.Settings; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GeneratorWrapper.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/GeneratorWrapper.java similarity index 83% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GeneratorWrapper.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/generator/GeneratorWrapper.java index ec5f971fc..b3258bc51 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GeneratorWrapper.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/GeneratorWrapper.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.generator; +package com.github.intellectualsites.plotsquared.generator; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/GridPlotManager.java similarity index 85% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/generator/GridPlotManager.java index a0ed41226..e40d94aa9 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/GridPlotManager.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.generator; +package com.github.intellectualsites.plotsquared.generator; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotManager; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/GridPlotWorld.java similarity index 87% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotWorld.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/generator/GridPlotWorld.java index b0cc10323..37c4c1665 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotWorld.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/GridPlotWorld.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.generator; +package com.github.intellectualsites.plotsquared.generator; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotId; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/HybridGen.java similarity index 97% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/generator/HybridGen.java index 365f82273..462cf6e89 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/HybridGen.java @@ -1,12 +1,12 @@ -package com.github.intellectualsites.plotsquared.plot.generator; +package com.github.intellectualsites.plotsquared.generator; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; -import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue; +import com.github.intellectualsites.plotsquared.util.MathMan; +import com.github.intellectualsites.plotsquared.queue.ScopedLocalBlockQueue; import com.google.common.base.Preconditions; import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.block.BaseBlock; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/HybridPlotManager.java similarity index 93% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/generator/HybridPlotManager.java index bf7e84062..463f0dbf4 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/HybridPlotManager.java @@ -1,21 +1,21 @@ -package com.github.intellectualsites.plotsquared.plot.generator; +package com.github.intellectualsites.plotsquared.generator; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.commands.Template; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.commands.Template; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.object.FileBytes; +import com.github.intellectualsites.plotsquared.util.FileBytes; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotAreaTerrainType; import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; -import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.world.BlockUtil; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.util.ChunkManager; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.MathMan; +import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.util.BlockUtil; import com.google.common.collect.Sets; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.world.biome.BiomeType; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/HybridPlotWorld.java similarity index 97% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/generator/HybridPlotWorld.java index 362813166..4889774e8 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/HybridPlotWorld.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.generator; +package com.github.intellectualsites.plotsquared.generator; import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; @@ -9,9 +9,9 @@ import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotId; import com.github.intellectualsites.plotsquared.plot.object.PlotManager; import com.github.intellectualsites.plotsquared.plot.object.schematic.Schematic; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; -import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.MathMan; +import com.github.intellectualsites.plotsquared.util.SchematicHandler; import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.CompoundTagBuilder; import com.sk89q.worldedit.extent.clipboard.Clipboard; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/HybridUtils.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/generator/HybridUtils.java index 128913f45..568cc26f8 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/HybridUtils.java @@ -1,31 +1,31 @@ -package com.github.intellectualsites.plotsquared.plot.generator; +package com.github.intellectualsites.plotsquared.generator; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.events.PlotFlagAddEvent; -import com.github.intellectualsites.plotsquared.plot.events.Result; +import com.github.intellectualsites.plotsquared.events.PlotFlagAddEvent; +import com.github.intellectualsites.plotsquared.events.Result; import com.github.intellectualsites.plotsquared.plot.flags.GlobalFlagContainer; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.github.intellectualsites.plotsquared.plot.flags.implementations.AnalysisFlag; -import com.github.intellectualsites.plotsquared.plot.listener.WEExtent; +import com.github.intellectualsites.plotsquared.listener.WEExtent; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; import com.github.intellectualsites.plotsquared.plot.object.PlotId; import com.github.intellectualsites.plotsquared.plot.object.PlotManager; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; -import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; -import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; -import com.github.intellectualsites.plotsquared.plot.util.block.ChunkBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.expiry.PlotAnalysis; -import com.github.intellectualsites.plotsquared.plot.util.world.RegionUtil; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.util.ChunkManager; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.MathMan; +import com.github.intellectualsites.plotsquared.util.SchematicHandler; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.github.intellectualsites.plotsquared.util.WorldUtil; +import com.github.intellectualsites.plotsquared.queue.ChunkBlockQueue; +import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.expiration.PlotAnalysis; +import com.github.intellectualsites.plotsquared.util.RegionUtil; import com.sk89q.jnbt.CompoundTag; import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector3; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/IndependentPlotGenerator.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/IndependentPlotGenerator.java similarity index 91% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/IndependentPlotGenerator.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/generator/IndependentPlotGenerator.java index 1467dc1dd..ff3fdb3dd 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/IndependentPlotGenerator.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/IndependentPlotGenerator.java @@ -1,10 +1,10 @@ -package com.github.intellectualsites.plotsquared.plot.generator; +package com.github.intellectualsites.plotsquared.generator; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotId; import com.github.intellectualsites.plotsquared.plot.object.SetupObject; -import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue; +import com.github.intellectualsites.plotsquared.queue.ScopedLocalBlockQueue; /** * This class allows for implementation independent world generation. diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/SquarePlotManager.java similarity index 96% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/generator/SquarePlotManager.java index 91442f134..df67826a5 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/SquarePlotManager.java @@ -1,13 +1,13 @@ -package com.github.intellectualsites.plotsquared.plot.generator; +package com.github.intellectualsites.plotsquared.generator; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.object.Direction; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.ChunkManager; +import com.github.intellectualsites.plotsquared.util.MainUtil; import com.sk89q.worldedit.regions.CuboidRegion; import java.util.Arrays; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/SquarePlotWorld.java similarity index 89% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotWorld.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/generator/SquarePlotWorld.java index c2d1ddb31..159982e8c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotWorld.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/SquarePlotWorld.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.generator; +package com.github.intellectualsites.plotsquared.generator; import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.object.PlotId; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ExtentWrapper.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/ExtentWrapper.java similarity index 79% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ExtentWrapper.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/listener/ExtentWrapper.java index 5d0c86858..9ad193110 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ExtentWrapper.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/ExtentWrapper.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.listener; +package com.github.intellectualsites.plotsquared.listener; import com.sk89q.worldedit.extent.AbstractDelegateExtent; import com.sk89q.worldedit.extent.Extent; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlayerBlockEventType.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/PlayerBlockEventType.java similarity index 83% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlayerBlockEventType.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/listener/PlayerBlockEventType.java index dacecdd79..3fccbfb83 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlayerBlockEventType.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/PlayerBlockEventType.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.listener; +package com.github.intellectualsites.plotsquared.listener; public enum PlayerBlockEventType { // Non interactive diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/PlotListener.java similarity index 93% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/listener/PlotListener.java index 942c5e101..dafb9b503 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/PlotListener.java @@ -1,10 +1,11 @@ -package com.github.intellectualsites.plotsquared.plot.listener; +package com.github.intellectualsites.plotsquared.listener; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.plot.PlotWeather; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.events.PlotFlagRemoveEvent; -import com.github.intellectualsites.plotsquared.plot.events.Result; +import com.github.intellectualsites.plotsquared.events.PlotFlagRemoveEvent; +import com.github.intellectualsites.plotsquared.events.Result; import com.github.intellectualsites.plotsquared.plot.flags.GlobalFlagContainer; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.github.intellectualsites.plotsquared.plot.flags.implementations.*; @@ -12,10 +13,17 @@ import com.github.intellectualsites.plotsquared.plot.flags.types.TimedFlag; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.util.*; -import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.comment.CommentManager; +import com.github.intellectualsites.plotsquared.util.ByteArrayUtilities; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.StringMan; +import com.github.intellectualsites.plotsquared.util.WorldUtil; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.expiration.ExpireManager; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.sk89q.worldedit.world.gamemode.GameMode; import com.sk89q.worldedit.world.gamemode.GameModes; import com.sk89q.worldedit.world.item.ItemType; @@ -321,7 +329,7 @@ public class PlotListener { } final PlotWeather plotWeather = plot.getFlag(WeatherFlag.class); - if (plotWeather != PlotWeather.RESET) { + if (plotWeather != PlotWeather.CLEAR) { player.setWeather(PlotWeather.RESET); } diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/ProcessedWEExtent.java similarity index 97% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/listener/ProcessedWEExtent.java index fc7f95d11..2031d6606 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/ProcessedWEExtent.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.plot.listener; +package com.github.intellectualsites.plotsquared.listener; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.sk89q.worldedit.WorldEditException; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/WEExtent.java similarity index 97% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/listener/WEExtent.java index c9a414ed0..18f2d4801 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/WEExtent.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.listener; +package com.github.intellectualsites.plotsquared.listener; import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.entity.BaseEntity; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/WEManager.java similarity index 93% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/listener/WEManager.java index 42a5eff88..69b08692c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/WEManager.java @@ -1,14 +1,14 @@ -package com.github.intellectualsites.plotsquared.plot.listener; +package com.github.intellectualsites.plotsquared.listener; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; import com.github.intellectualsites.plotsquared.plot.flags.implementations.NoWorldeditFlag; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.world.RegionUtil; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.RegionUtil; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.CuboidRegion; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WESubscriber.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/WESubscriber.java similarity index 90% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WESubscriber.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/listener/WESubscriber.java index 753ec2a20..0d7f21efb 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WESubscriber.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/WESubscriber.java @@ -1,12 +1,12 @@ -package com.github.intellectualsites.plotsquared.plot.listener; +package com.github.intellectualsites.plotsquared.listener; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.Permissions; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.entity.Player; import com.sk89q.worldedit.event.extent.EditSessionEvent; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ConsolePlayer.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/player/ConsolePlayer.java similarity index 86% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ConsolePlayer.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/player/ConsolePlayer.java index 020288d4e..f6d497506 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ConsolePlayer.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/player/ConsolePlayer.java @@ -1,9 +1,12 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.github.intellectualsites.plotsquared.player; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.commands.RequiredType; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.util.PlotWeather; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.commands.RequiredType; +import com.github.intellectualsites.plotsquared.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; +import com.github.intellectualsites.plotsquared.plot.PlotWeather; import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.world.gamemode.GameMode; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/OfflinePlotPlayer.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/player/OfflinePlotPlayer.java similarity index 92% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/OfflinePlotPlayer.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/player/OfflinePlotPlayer.java index 85e6e72d8..7776faa14 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/OfflinePlotPlayer.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/player/OfflinePlotPlayer.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.github.intellectualsites.plotsquared.player; import java.util.UUID; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/player/PlotPlayer.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/player/PlotPlayer.java index bf6d1816e..929d0788e 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/player/PlotPlayer.java @@ -1,22 +1,29 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.github.intellectualsites.plotsquared.player; import com.github.intellectualsites.plotsquared.commands.CommandCaller; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.commands.RequiredType; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.commands.RequiredType; import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.database.DBFunc; import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.PlotCluster; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; +import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea; import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; -import com.github.intellectualsites.plotsquared.plot.util.EconHandler; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.PlotWeather; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; -import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager; +import com.github.intellectualsites.plotsquared.util.EconHandler; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.plot.PlotWeather; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.github.intellectualsites.plotsquared.plot.expiration.ExpireManager; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; import com.google.common.base.Preconditions; import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.world.gamemode.GameMode; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotWeather.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotWeather.java new file mode 100644 index 000000000..49b9032ce --- /dev/null +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotWeather.java @@ -0,0 +1,5 @@ +package com.github.intellectualsites.plotsquared.plot; + +public enum PlotWeather { + RAIN, CLEAR, RESET +} diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/CommentInbox.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/CommentInbox.java similarity index 84% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/CommentInbox.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/CommentInbox.java index 999eb0a49..5243dfb67 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/CommentInbox.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/CommentInbox.java @@ -1,10 +1,10 @@ -package com.github.intellectualsites.plotsquared.plot.object.comment; +package com.github.intellectualsites.plotsquared.plot.comment; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.database.DBFunc; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.util.Permissions; import java.util.List; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/CommentManager.java similarity index 80% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/CommentManager.java index 4eff629d6..fd2d2ebe6 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/CommentManager.java @@ -1,21 +1,19 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.plot.comment; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.object.comment.CommentInbox; -import com.github.intellectualsites.plotsquared.plot.object.comment.InboxOwner; -import com.github.intellectualsites.plotsquared.plot.object.comment.InboxPublic; -import com.github.intellectualsites.plotsquared.plot.object.comment.InboxReport; -import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.google.common.annotations.Beta; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; +@Beta public class CommentManager { public static final HashMap inboxes = new HashMap<>(); diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxOwner.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/InboxOwner.java similarity index 82% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxOwner.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/InboxOwner.java index 29cf003cf..375c3a9a6 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxOwner.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/InboxOwner.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.plot.object.comment; +package com.github.intellectualsites.plotsquared.plot.comment; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.database.DBFunc; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import java.util.ArrayList; import java.util.List; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxPublic.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/InboxPublic.java similarity index 80% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxPublic.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/InboxPublic.java index 598904b0f..41e72bc66 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxPublic.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/InboxPublic.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.plot.object.comment; +package com.github.intellectualsites.plotsquared.plot.comment; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.database.DBFunc; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import java.util.List; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxReport.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/InboxReport.java similarity index 74% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxReport.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/InboxReport.java index fa44db6c2..8e73900b6 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxReport.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/InboxReport.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.plot.object.comment; +package com.github.intellectualsites.plotsquared.plot.comment; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.database.DBFunc; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import java.util.List; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/PlotComment.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/PlotComment.java similarity index 89% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/PlotComment.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/PlotComment.java index ada90457f..7815d496e 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/PlotComment.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/PlotComment.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.object.comment; +package com.github.intellectualsites.plotsquared.plot.comment; import com.github.intellectualsites.plotsquared.plot.object.PlotId; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Caption.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Caption.java index 748c57ecc..c5a2f5014 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Caption.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Caption.java @@ -1,8 +1,8 @@ package com.github.intellectualsites.plotsquared.plot.config; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.StringMan; public interface Caption { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/CaptionUtility.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/CaptionUtility.java index 1c2d3e497..55888073c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/CaptionUtility.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/CaptionUtility.java @@ -1,6 +1,6 @@ package com.github.intellectualsites.plotsquared.plot.config; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; public class CaptionUtility { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java index a8bc65c15..e64a0d65c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java @@ -2,8 +2,8 @@ package com.github.intellectualsites.plotsquared.plot.config; import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.util.StringMan; import java.io.File; import java.io.IOException; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/ChatFormatter.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/ChatFormatter.java index e275e8a17..a3789f6f6 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/ChatFormatter.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/ChatFormatter.java @@ -1,6 +1,6 @@ package com.github.intellectualsites.plotsquared.plot.config; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Config.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Config.java index ccbe210cc..a9e8a8335 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Config.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Config.java @@ -2,9 +2,9 @@ package com.github.intellectualsites.plotsquared.plot.config; import com.github.intellectualsites.plotsquared.configuration.MemorySection; import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Settings.Enabled_Components; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.util.StringMan; import java.io.File; import java.io.PrintWriter; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/ConfigurationNode.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/ConfigurationNode.java index 2b6167e97..79c8a113d 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/ConfigurationNode.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/ConfigurationNode.java @@ -1,7 +1,7 @@ package com.github.intellectualsites.plotsquared.plot.config; import com.github.intellectualsites.plotsquared.plot.object.BlockBucket; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.util.StringMan; import com.sk89q.worldedit.world.block.BlockState; import java.util.ArrayList; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/PlotSquaredChatFormatter.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/PlotSquaredChatFormatter.java index 714418f9c..8a1aa9dc9 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/PlotSquaredChatFormatter.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/PlotSquaredChatFormatter.java @@ -1,6 +1,6 @@ package com.github.intellectualsites.plotsquared.plot.config; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.util.StringMan; import java.util.LinkedHashMap; import java.util.Map; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/expiration/ExpireManager.java similarity index 94% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/expiration/ExpireManager.java index b595804b3..5a2ec5e29 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/expiration/ExpireManager.java @@ -1,29 +1,29 @@ -package com.github.intellectualsites.plotsquared.plot.util.expiry; +package com.github.intellectualsites.plotsquared.plot.expiration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.events.PlotFlagAddEvent; -import com.github.intellectualsites.plotsquared.plot.events.PlotUnlinkEvent; -import com.github.intellectualsites.plotsquared.plot.events.Result; +import com.github.intellectualsites.plotsquared.database.DBFunc; +import com.github.intellectualsites.plotsquared.events.PlotFlagAddEvent; +import com.github.intellectualsites.plotsquared.events.PlotUnlinkEvent; +import com.github.intellectualsites.plotsquared.events.Result; import com.github.intellectualsites.plotsquared.plot.flags.GlobalFlagContainer; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.github.intellectualsites.plotsquared.plot.flags.implementations.AnalysisFlag; import com.github.intellectualsites.plotsquared.plot.flags.implementations.KeepFlag; -import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; -import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; +import com.github.intellectualsites.plotsquared.generator.HybridUtils; +import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; -import com.github.intellectualsites.plotsquared.plot.object.PlotMessage; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.plot.object.message.PlotMessage; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.StringMan; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import java.util.ArrayDeque; import java.util.ArrayList; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/expiration/ExpiryTask.java similarity index 97% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/expiration/ExpiryTask.java index a4e1e4c82..e65f5e33a 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/expiration/ExpiryTask.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.plot.util.expiry; +package com.github.intellectualsites.plotsquared.plot.expiration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/expiration/PlotAnalysis.java similarity index 97% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/expiration/PlotAnalysis.java index c426d7fee..969622bcd 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/expiration/PlotAnalysis.java @@ -1,13 +1,13 @@ -package com.github.intellectualsites.plotsquared.plot.util.expiry; +package com.github.intellectualsites.plotsquared.plot.expiration; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.github.intellectualsites.plotsquared.plot.flags.implementations.AnalysisFlag; -import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; +import com.github.intellectualsites.plotsquared.generator.HybridUtils; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.util.MathMan; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import java.lang.reflect.Array; import java.util.ArrayDeque; @@ -411,10 +411,7 @@ public class PlotAnalysis { } /** - * Sum of an array - * - * @param array - * @return + * Calls {@code Arrays.stream(array).sum()} */ public static int sum(int[] array) { return Arrays.stream(array).sum(); diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/DenyTeleportFlag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/DenyTeleportFlag.java index c89dbb73a..96b91a2c8 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/DenyTeleportFlag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/DenyTeleportFlag.java @@ -4,7 +4,7 @@ import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.flags.FlagParseException; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/KeepFlag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/KeepFlag.java index f4b9810c4..c8f8d2fa9 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/KeepFlag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/KeepFlag.java @@ -3,8 +3,8 @@ package com.github.intellectualsites.plotsquared.plot.flags.implementations; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.flags.FlagParseException; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.MathMan; import org.jetbrains.annotations.NotNull; public class KeepFlag extends PlotFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MusicFlag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MusicFlag.java index 0a3910b52..d5fc94dd3 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MusicFlag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MusicFlag.java @@ -3,7 +3,7 @@ package com.github.intellectualsites.plotsquared.plot.flags.implementations; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.flags.FlagParseException; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.util.world.ItemUtil; +import com.github.intellectualsites.plotsquared.util.ItemUtil; import com.sk89q.worldedit.world.item.ItemType; import com.sk89q.worldedit.world.item.ItemTypes; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/WeatherFlag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/WeatherFlag.java index 05176d5c1..94522e4e7 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/WeatherFlag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/WeatherFlag.java @@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.flags.implementations; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.util.PlotWeather; +import com.github.intellectualsites.plotsquared.plot.PlotWeather; import org.jetbrains.annotations.NotNull; import java.util.Arrays; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/BlockTypeListFlag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/BlockTypeListFlag.java index 9e100db67..2b943d206 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/BlockTypeListFlag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/BlockTypeListFlag.java @@ -3,7 +3,7 @@ package com.github.intellectualsites.plotsquared.plot.flags.types; import com.github.intellectualsites.plotsquared.plot.config.Caption; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.flags.FlagParseException; -import com.github.intellectualsites.plotsquared.plot.util.world.BlockUtil; +import com.github.intellectualsites.plotsquared.util.BlockUtil; import com.sk89q.worldedit.world.block.BlockCategory; import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.block.BlockType; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/ListFlag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/ListFlag.java index 1a048fefb..0c2f66068 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/ListFlag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/ListFlag.java @@ -3,7 +3,7 @@ package com.github.intellectualsites.plotsquared.plot.flags.types; import com.github.intellectualsites.plotsquared.plot.config.Caption; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.util.StringMan; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/ILogger.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/ILogger.java deleted file mode 100644 index 16fb343bf..000000000 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/ILogger.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.intellectualsites.plotsquared.plot.logger; - -public interface ILogger { - void log(String message); -} diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java index e188cfc6a..16f6b4283 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java @@ -2,10 +2,10 @@ package com.github.intellectualsites.plotsquared.plot.object; import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerializable; import com.github.intellectualsites.plotsquared.plot.config.Configuration; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; -import com.github.intellectualsites.plotsquared.plot.util.world.BlockUtil; -import com.github.intellectualsites.plotsquared.plot.util.world.PatternUtil; +import com.github.intellectualsites.plotsquared.util.MathMan; +import com.github.intellectualsites.plotsquared.util.StringMan; +import com.github.intellectualsites.plotsquared.util.BlockUtil; +import com.github.intellectualsites.plotsquared.util.PatternUtil; import com.google.common.collect.ImmutableMap; import com.sk89q.worldedit.function.pattern.BlockPattern; import com.sk89q.worldedit.function.pattern.Pattern; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkWrapper.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkWrapper.java index e665ea752..3229ef841 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkWrapper.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkWrapper.java @@ -1,7 +1,7 @@ package com.github.intellectualsites.plotsquared.plot.object; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.util.MathMan; +import com.github.intellectualsites.plotsquared.util.StringMan; public class ChunkWrapper { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java index bb466c082..efd7771f8 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java @@ -1,8 +1,8 @@ package com.github.intellectualsites.plotsquared.plot.object; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.commands.DebugExec; -import com.github.intellectualsites.plotsquared.plot.commands.MainCommand; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.commands.DebugExec; +import com.github.intellectualsites.plotsquared.commands.MainCommand; import javax.script.ScriptException; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Location.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Location.java index d1fdbf97f..d34496799 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Location.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Location.java @@ -1,7 +1,7 @@ package com.github.intellectualsites.plotsquared.plot.object; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.util.MathMan; import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector3; import lombok.Getter; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java index ef21ef332..3c5c43ab2 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java @@ -1,35 +1,37 @@ package com.github.intellectualsites.plotsquared.plot.object; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Configuration; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.events.PlotComponentSetEvent; -import com.github.intellectualsites.plotsquared.plot.events.PlotMergeEvent; -import com.github.intellectualsites.plotsquared.plot.events.PlotUnlinkEvent; -import com.github.intellectualsites.plotsquared.plot.events.Result; +import com.github.intellectualsites.plotsquared.database.DBFunc; +import com.github.intellectualsites.plotsquared.events.PlotComponentSetEvent; +import com.github.intellectualsites.plotsquared.events.PlotMergeEvent; +import com.github.intellectualsites.plotsquared.events.PlotUnlinkEvent; +import com.github.intellectualsites.plotsquared.events.Result; import com.github.intellectualsites.plotsquared.plot.flags.FlagContainer; import com.github.intellectualsites.plotsquared.plot.flags.GlobalFlagContainer; import com.github.intellectualsites.plotsquared.plot.flags.InternalFlag; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.github.intellectualsites.plotsquared.plot.flags.implementations.KeepFlag; -import com.github.intellectualsites.plotsquared.plot.generator.SquarePlotWorld; -import com.github.intellectualsites.plotsquared.plot.listener.PlotListener; -import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment; +import com.github.intellectualsites.plotsquared.generator.SquarePlotWorld; +import com.github.intellectualsites.plotsquared.listener.PlotListener; +import com.github.intellectualsites.plotsquared.plot.comment.PlotComment; import com.github.intellectualsites.plotsquared.plot.object.schematic.Schematic; -import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; -import com.github.intellectualsites.plotsquared.plot.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; -import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; -import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager; -import com.github.intellectualsites.plotsquared.plot.util.expiry.PlotAnalysis; +import com.github.intellectualsites.plotsquared.util.ChunkManager; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.MathMan; +import com.github.intellectualsites.plotsquared.util.Permissions; +import com.github.intellectualsites.plotsquared.util.SchematicHandler; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.github.intellectualsites.plotsquared.util.WorldUtil; +import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.expiration.ExpireManager; +import com.github.intellectualsites.plotsquared.plot.expiration.PlotAnalysis; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; @@ -69,7 +71,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; import java.util.stream.Collectors; -import static com.github.intellectualsites.plotsquared.plot.commands.SubCommand.sendMessage; +import static com.github.intellectualsites.plotsquared.commands.SubCommand.sendMessage; /** * The plot class
@@ -83,10 +85,7 @@ public class Plot { public static final int MAX_HEIGHT = 256; - /** - * @deprecated raw access is deprecated - */ - @Deprecated private static Set connected_cache; + private static Set connected_cache; private static Set regions_cache; @NotNull private final PlotId id; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java index 6fe608188..6c9191620 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java @@ -1,7 +1,8 @@ package com.github.intellectualsites.plotsquared.plot.object; import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.config.Configuration; import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; import com.github.intellectualsites.plotsquared.plot.config.Settings; @@ -10,16 +11,16 @@ import com.github.intellectualsites.plotsquared.plot.flags.FlagParseException; import com.github.intellectualsites.plotsquared.plot.flags.GlobalFlagContainer; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; -import com.github.intellectualsites.plotsquared.plot.generator.GridPlotWorld; -import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator; -import com.github.intellectualsites.plotsquared.plot.util.EconHandler; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; -import com.github.intellectualsites.plotsquared.plot.util.area.QuadMap; -import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.world.RegionUtil; +import com.github.intellectualsites.plotsquared.generator.GridPlotWorld; +import com.github.intellectualsites.plotsquared.generator.IndependentPlotGenerator; +import com.github.intellectualsites.plotsquared.util.EconHandler; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.MathMan; +import com.github.intellectualsites.plotsquared.util.StringMan; +import com.github.intellectualsites.plotsquared.util.area.QuadMap; +import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.util.RegionUtil; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.sk89q.worldedit.math.BlockVector2; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java index ba877017c..2bc591999 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java @@ -1,8 +1,8 @@ package com.github.intellectualsites.plotsquared.plot.object; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.world.RegionUtil; +import com.github.intellectualsites.plotsquared.database.DBFunc; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.RegionUtil; import com.sk89q.worldedit.regions.CuboidRegion; import java.util.HashSet; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotInventory.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotInventory.java index 4598a2fff..d2f3cd390 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotInventory.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotInventory.java @@ -1,7 +1,8 @@ package com.github.intellectualsites.plotsquared.plot.object; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.util.InventoryUtil; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.InventoryUtil; import lombok.NonNull; public class PlotInventory { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java index 33e57f753..09b3cbe3e 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java @@ -1,6 +1,6 @@ package com.github.intellectualsites.plotsquared.plot.object; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.util.StringMan; import lombok.AllArgsConstructor; import org.jetbrains.annotations.Nullable; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java index 50678caa7..ff61e8006 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java @@ -1,7 +1,8 @@ package com.github.intellectualsites.plotsquared.plot.object; -import com.github.intellectualsites.plotsquared.plot.commands.Template; +import com.github.intellectualsites.plotsquared.commands.Template; import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.util.FileBytes; import com.sk89q.worldedit.function.pattern.Pattern; import java.io.IOException; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java index a89f7ddbd..31bc58c1b 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java @@ -1,6 +1,6 @@ package com.github.intellectualsites.plotsquared.plot.object; -import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment; +import com.github.intellectualsites.plotsquared.plot.comment.PlotComment; import com.google.common.collect.ImmutableList; import lombok.Getter; import lombok.Setter; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/SetupObject.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/SetupObject.java index 2a75539f2..167bb8e31 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/SetupObject.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/SetupObject.java @@ -1,7 +1,7 @@ package com.github.intellectualsites.plotsquared.plot.object; import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; -import com.github.intellectualsites.plotsquared.plot.util.SetupUtils; +import com.github.intellectualsites.plotsquared.util.SetupUtils; public class SetupObject { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/chat/PlainChatManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/message/PlainChatManager.java similarity index 80% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/chat/PlainChatManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/message/PlainChatManager.java index 0353eb313..4678c8be5 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/chat/PlainChatManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/message/PlainChatManager.java @@ -1,9 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.object.chat; +package com.github.intellectualsites.plotsquared.plot.object.message; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.PlotMessage; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.ChatManager; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.ChatManager; import java.util.ArrayList; import java.util.List; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotMessage.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/message/PlotMessage.java similarity index 85% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotMessage.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/message/PlotMessage.java index e11471dcf..36b6a4bd3 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotMessage.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/message/PlotMessage.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.github.intellectualsites.plotsquared.plot.object.message; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.chat.PlainChatManager; -import com.github.intellectualsites.plotsquared.plot.util.ChatManager; +import com.github.intellectualsites.plotsquared.util.ChatManager; public class PlotMessage { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java index 177fe5c25..2030a6c07 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java @@ -2,8 +2,8 @@ package com.github.intellectualsites.plotsquared.plot.object.worlds; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; -import com.github.intellectualsites.plotsquared.plot.util.area.QuadMap; +import com.github.intellectualsites.plotsquared.util.StringMan; +import com.github.intellectualsites.plotsquared.util.area.QuadMap; import com.sk89q.worldedit.regions.CuboidRegion; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java index 4fe3b69b4..5f9325761 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java @@ -1,11 +1,11 @@ package com.github.intellectualsites.plotsquared.plot.object.worlds; import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Configuration; import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; import com.github.intellectualsites.plotsquared.plot.flags.FlagContainer; -import com.github.intellectualsites.plotsquared.plot.generator.GridPlotWorld; +import com.github.intellectualsites.plotsquared.generator.GridPlotWorld; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; @@ -13,11 +13,11 @@ import com.github.intellectualsites.plotsquared.plot.object.PlotId; import com.github.intellectualsites.plotsquared.plot.object.PlotLoc; import com.github.intellectualsites.plotsquared.plot.object.PlotManager; import com.github.intellectualsites.plotsquared.plot.object.PlotSettings; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; import com.github.intellectualsites.plotsquared.plot.object.SetupObject; -import com.github.intellectualsites.plotsquared.plot.util.SetupUtils; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; -import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; +import com.github.intellectualsites.plotsquared.util.SetupUtils; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.github.intellectualsites.plotsquared.util.WorldUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java index 73acdaa0c..6ef9356a4 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java @@ -2,8 +2,8 @@ package com.github.intellectualsites.plotsquared.plot.object.worlds; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.util.ArrayUtil; -import com.github.intellectualsites.plotsquared.plot.util.SetupUtils; +import com.github.intellectualsites.plotsquared.collection.ArrayUtil; +import com.github.intellectualsites.plotsquared.util.SetupUtils; import com.sk89q.worldedit.regions.CuboidRegion; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java index e1d97d1e3..85eff470e 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java @@ -1,14 +1,14 @@ package com.github.intellectualsites.plotsquared.plot.object.worlds; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotId; import com.github.intellectualsites.plotsquared.plot.object.PlotManager; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.SetupUtils; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.SetupUtils; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.sk89q.worldedit.function.pattern.Pattern; import java.io.File; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SingleWorldGenerator.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SingleWorldGenerator.java index 89069173f..fb7580a8b 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SingleWorldGenerator.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SingleWorldGenerator.java @@ -1,11 +1,11 @@ package com.github.intellectualsites.plotsquared.plot.object.worlds; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.generator.IndependentPlotGenerator; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue; +import com.github.intellectualsites.plotsquared.queue.ScopedLocalBlockQueue; import com.sk89q.worldedit.world.biome.BiomeTypes; import com.sk89q.worldedit.world.block.BlockTypes; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PlotWeather.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PlotWeather.java deleted file mode 100644 index 62ea9cc33..000000000 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PlotWeather.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.intellectualsites.plotsquared.plot.util; - -public enum PlotWeather { - RAIN, CLEAR, RESET -} diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpirySettings.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpirySettings.java deleted file mode 100644 index ab95068da..000000000 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpirySettings.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.github.intellectualsites.plotsquared.plot.util.expiry; - -public class ExpirySettings { -} diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/BasicLocalBlockQueue.java similarity index 94% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/queue/BasicLocalBlockQueue.java index 6c12466b7..c3f7fc7f0 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/BasicLocalBlockQueue.java @@ -1,10 +1,10 @@ -package com.github.intellectualsites.plotsquared.plot.util.block; +package com.github.intellectualsites.plotsquared.queue; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; -import com.github.intellectualsites.plotsquared.plot.util.world.PatternUtil; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.MathMan; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.github.intellectualsites.plotsquared.util.PatternUtil; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.block.BaseBlock; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/ChunkBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/ChunkBlockQueue.java similarity index 97% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/ChunkBlockQueue.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/queue/ChunkBlockQueue.java index 57134373c..d556c0186 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/ChunkBlockQueue.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/ChunkBlockQueue.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.util.block; +package com.github.intellectualsites.plotsquared.queue; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.sk89q.worldedit.math.BlockVector3; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/DelegateLocalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/DelegateLocalBlockQueue.java similarity index 97% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/DelegateLocalBlockQueue.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/queue/DelegateLocalBlockQueue.java index b0b4e03ea..45d1e7c7c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/DelegateLocalBlockQueue.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/DelegateLocalBlockQueue.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.util.block; +package com.github.intellectualsites.plotsquared.queue; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.world.biome.BiomeType; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/GlobalBlockQueue.java similarity index 97% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/queue/GlobalBlockQueue.java index 049b13d32..41806696b 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/GlobalBlockQueue.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.util.block; +package com.github.intellectualsites.plotsquared.queue; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; -import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import java.util.ArrayList; import java.util.ConcurrentModificationException; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/LocalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/LocalBlockQueue.java similarity index 90% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/LocalBlockQueue.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/queue/LocalBlockQueue.java index fe1de0660..468fda102 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/LocalBlockQueue.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/LocalBlockQueue.java @@ -1,12 +1,12 @@ -package com.github.intellectualsites.plotsquared.plot.util.block; +package com.github.intellectualsites.plotsquared.queue; import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; -import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; -import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; -import com.github.intellectualsites.plotsquared.plot.util.world.PatternUtil; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.SchematicHandler; +import com.github.intellectualsites.plotsquared.util.StringMan; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.github.intellectualsites.plotsquared.util.WorldUtil; +import com.github.intellectualsites.plotsquared.util.PatternUtil; import com.sk89q.jnbt.CompoundTag; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.math.BlockVector2; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/OffsetLocalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/OffsetLocalBlockQueue.java similarity index 91% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/OffsetLocalBlockQueue.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/queue/OffsetLocalBlockQueue.java index 37ac7fe5c..9e8341fbd 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/OffsetLocalBlockQueue.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/OffsetLocalBlockQueue.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.util.block; +package com.github.intellectualsites.plotsquared.queue; import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.block.BaseBlock; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/QueueProvider.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/QueueProvider.java similarity index 93% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/QueueProvider.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/queue/QueueProvider.java index 3c96e0d5f..732e8258a 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/QueueProvider.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/QueueProvider.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.util.block; +package com.github.intellectualsites.plotsquared.queue; public abstract class QueueProvider { public static QueueProvider of(final Class primary, diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/ScopedLocalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/ScopedLocalBlockQueue.java similarity index 94% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/ScopedLocalBlockQueue.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/queue/ScopedLocalBlockQueue.java index ef7dd2e21..a21855a29 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/ScopedLocalBlockQueue.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/ScopedLocalBlockQueue.java @@ -1,11 +1,11 @@ -package com.github.intellectualsites.plotsquared.plot.util.block; +package com.github.intellectualsites.plotsquared.queue; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotManager; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.block.BaseBlock; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/world/BlockUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/BlockUtil.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/world/BlockUtil.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/BlockUtil.java index 856ddc758..acbe241f6 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/world/BlockUtil.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/BlockUtil.java @@ -1,6 +1,5 @@ -package com.github.intellectualsites.plotsquared.plot.util.world; +package com.github.intellectualsites.plotsquared.util; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.extension.input.InputParseException; import com.sk89q.worldedit.extension.input.ParserContext; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ByteArrayUtilities.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/ByteArrayUtilities.java similarity index 79% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ByteArrayUtilities.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/ByteArrayUtilities.java index ce4ef46c8..27d2f9e21 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ByteArrayUtilities.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/ByteArrayUtilities.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util; public class ByteArrayUtilities { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChatManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/ChatManager.java similarity index 73% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChatManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/ChatManager.java index 1177206e6..d8ce03410 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChatManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/ChatManager.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util; -import com.github.intellectualsites.plotsquared.plot.object.PlotMessage; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.message.PlotMessage; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; public abstract class ChatManager { public static ChatManager manager; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/ChunkManager.java similarity index 96% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/ChunkManager.java index 99f90b8e6..ed4de3a75 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/ChunkManager.java @@ -1,12 +1,13 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.queue.ScopedLocalBlockQueue; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.regions.CuboidRegion; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ConsoleColors.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/ConsoleColors.java similarity index 98% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ConsoleColors.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/ConsoleColors.java index f8860887f..1bd893bb4 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ConsoleColors.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/ConsoleColors.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util; public class ConsoleColors { public static String fromString(String input) { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EconHandler.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/EconHandler.java similarity index 74% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EconHandler.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/EconHandler.java index 4912b6e83..b1c383efc 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EconHandler.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/EconHandler.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.object.ConsolePlayer; -import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.player.ConsolePlayer; +import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; public abstract class EconHandler { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EntityUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/EntityUtil.java similarity index 97% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EntityUtil.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/EntityUtil.java index 87f818f3e..17bc405f7 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EntityUtil.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/EntityUtil.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util; import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventDispatcher.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/EventDispatcher.java similarity index 96% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventDispatcher.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/EventDispatcher.java index b8de72882..daeff7ccb 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventDispatcher.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/EventDispatcher.java @@ -1,17 +1,19 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.events.*; +import com.github.intellectualsites.plotsquared.events.*; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.github.intellectualsites.plotsquared.plot.flags.implementations.*; import com.github.intellectualsites.plotsquared.plot.flags.types.BlockTypeWrapper; -import com.github.intellectualsites.plotsquared.plot.listener.PlayerBlockEventType; +import com.github.intellectualsites.plotsquared.listener.PlayerBlockEventType; import com.github.intellectualsites.plotsquared.plot.object.*; import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea; -import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager; +import com.github.intellectualsites.plotsquared.plot.expiration.ExpireManager; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.google.common.eventbus.EventBus; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.world.block.BlockType; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/FileBytes.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/FileBytes.java similarity index 76% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/FileBytes.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/FileBytes.java index d34521ee9..e32f6ead2 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/FileBytes.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/FileBytes.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.github.intellectualsites.plotsquared.util; public class FileBytes { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/InventoryUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/InventoryUtil.java similarity index 86% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/InventoryUtil.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/InventoryUtil.java index 03b87fc2b..1b30ef1b2 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/InventoryUtil.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/InventoryUtil.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util; import com.github.intellectualsites.plotsquared.plot.object.PlotInventory; import com.github.intellectualsites.plotsquared.plot.object.PlotItemStack; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; /** * This class is only used by internal functions, for most cases use the PlotInventory class diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/world/ItemUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/ItemUtil.java similarity index 91% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/world/ItemUtil.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/ItemUtil.java index 2b574193b..9d562a924 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/world/ItemUtil.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/ItemUtil.java @@ -1,6 +1,5 @@ -package com.github.intellectualsites.plotsquared.plot.util.world; +package com.github.intellectualsites.plotsquared.util; -import com.github.intellectualsites.plotsquared.plot.util.MathMan; import com.sk89q.worldedit.world.item.ItemType; import com.sk89q.worldedit.world.item.ItemTypes; import com.sk89q.worldedit.world.registry.LegacyMapper; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/LegacyConverter.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/LegacyConverter.java index b4cfaa243..22e0845e3 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/LegacyConverter.java @@ -1,11 +1,12 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util; import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.object.BlockBucket; -import com.github.intellectualsites.plotsquared.plot.object.ConsolePlayer; +import com.github.intellectualsites.plotsquared.player.ConsolePlayer; +import com.github.intellectualsites.plotsquared.util.WorldUtil; import com.sk89q.worldedit.world.block.BlockState; import lombok.NonNull; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/MainUtil.java similarity index 98% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/MainUtil.java index 26281d7a8..36d10ae1d 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/MainUtil.java @@ -1,28 +1,30 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.commands.Like; +import com.github.intellectualsites.plotsquared.player.ConsolePlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.commands.Like; import com.github.intellectualsites.plotsquared.plot.config.Caption; import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.expiration.ExpireManager; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.github.intellectualsites.plotsquared.plot.flags.implementations.DescriptionFlag; import com.github.intellectualsites.plotsquared.plot.flags.implementations.ServerPlotFlag; import com.github.intellectualsites.plotsquared.plot.flags.types.DoubleFlag; -import com.github.intellectualsites.plotsquared.plot.object.ConsolePlayer; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotAreaTerrainType; import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; import com.github.intellectualsites.plotsquared.plot.object.stream.AbstractDelegateOutputStream; -import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.CuboidRegion; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MathMan.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/MathMan.java similarity index 99% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MathMan.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/MathMan.java index 00ea391ba..b2cb2b428 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MathMan.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/MathMan.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util; public class MathMan { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/world/OperationUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/OperationUtil.java similarity index 96% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/world/OperationUtil.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/OperationUtil.java index 64432d555..60107930b 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/world/OperationUtil.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/OperationUtil.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.util.world; +package com.github.intellectualsites.plotsquared.util; import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListeningExecutorService; import com.sk89q.worldedit.EditSession; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/world/PatternUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/PatternUtil.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/world/PatternUtil.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/PatternUtil.java index ea3079bb6..5944f295b 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/world/PatternUtil.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/PatternUtil.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.util.world; +package com.github.intellectualsites.plotsquared.util; import com.github.intellectualsites.plotsquared.commands.Command; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.google.common.base.Preconditions; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.entity.Player; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/Permissions.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/Permissions.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/Permissions.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/Permissions.java index f11639813..10d08569e 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/Permissions.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/Permissions.java @@ -1,9 +1,10 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util; import com.github.intellectualsites.plotsquared.commands.CommandCaller; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.MainUtil; import java.util.HashMap; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PremiumVerification.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/PremiumVerification.java similarity index 93% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PremiumVerification.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/PremiumVerification.java index 7886248a2..c29643a5d 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PremiumVerification.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/PremiumVerification.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util; public class PremiumVerification { private static Boolean usingPremium; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ReflectionUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/ReflectionUtils.java similarity index 99% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ReflectionUtils.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/ReflectionUtils.java index 621766c17..751815344 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ReflectionUtils.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/ReflectionUtils.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/RegExUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/RegExUtil.java similarity index 79% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/RegExUtil.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/RegExUtil.java index b9fc6ff09..c59fdcdd7 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/RegExUtil.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/RegExUtil.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util; import java.util.HashMap; import java.util.Map; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/world/RegionUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/RegionUtil.java similarity index 96% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/world/RegionUtil.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/RegionUtil.java index 1b1d04e08..04629d1ac 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/world/RegionUtil.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/RegionUtil.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.util.world; +package com.github.intellectualsites.plotsquared.util; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.sk89q.worldedit.math.BlockVector3; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/RuntimeExceptionRunnableVal.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/RuntimeExceptionRunnableVal.java similarity index 83% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/RuntimeExceptionRunnableVal.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/RuntimeExceptionRunnableVal.java index 81acddc9f..92ace2550 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/RuntimeExceptionRunnableVal.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/RuntimeExceptionRunnableVal.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; import lombok.RequiredArgsConstructor; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/SchematicHandler.java similarity index 97% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/SchematicHandler.java index 4e553083c..c3ca3cc20 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/SchematicHandler.java @@ -1,14 +1,16 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.generator.ClassicPlotWorld; +import com.github.intellectualsites.plotsquared.generator.ClassicPlotWorld; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; import com.github.intellectualsites.plotsquared.plot.object.schematic.Schematic; -import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.NBTInputStream; import com.sk89q.jnbt.NBTOutputStream; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SetupUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/SetupUtils.java similarity index 80% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SetupUtils.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/SetupUtils.java index b77d991fe..4163b0ed8 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SetupUtils.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/SetupUtils.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util; -import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; +import com.github.intellectualsites.plotsquared.generator.GeneratorWrapper; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.SetupObject; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringComparison.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/StringComparison.java similarity index 98% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringComparison.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/StringComparison.java index dd6a1f960..c5056520e 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringComparison.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/StringComparison.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util; import java.util.ArrayList; import java.util.Collection; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringMan.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/StringMan.java similarity index 99% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringMan.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/StringMan.java index d32bd0cda..e29b761be 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringMan.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/StringMan.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util; import com.github.intellectualsites.plotsquared.plot.config.Caption; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/WorldUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/WorldUtil.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/WorldUtil.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/WorldUtil.java index 63cc5c44d..b27d9cb6f 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/WorldUtil.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/WorldUtil.java @@ -1,10 +1,10 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.IntTag; import com.sk89q.jnbt.NBTInputStream; @@ -57,7 +57,7 @@ public abstract class WorldUtil { public abstract boolean isBlockSolid(BlockState block); - public abstract StringComparison.ComparisonResult getClosestBlock(String name); + public abstract StringComparison.ComparisonResult getClosestBlock(String name); public abstract void getBiome(String world, int x, int z, Consumer result); diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/area/QuadMap.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/area/QuadMap.java similarity index 98% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/area/QuadMap.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/area/QuadMap.java index 443a3c0d9..d02c1b519 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/area/QuadMap.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/area/QuadMap.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.plot.util.area; +package com.github.intellectualsites.plotsquared.util.area; -import com.github.intellectualsites.plotsquared.plot.util.world.RegionUtil; +import com.github.intellectualsites.plotsquared.util.RegionUtil; import com.sk89q.worldedit.regions.CuboidRegion; import java.util.HashSet; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpMenu.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/helpmenu/HelpMenu.java similarity index 85% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpMenu.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/helpmenu/HelpMenu.java index 2b785ca5c..12fd72986 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpMenu.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/helpmenu/HelpMenu.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.plot.util.helpmenu; +package com.github.intellectualsites.plotsquared.util.helpmenu; import com.github.intellectualsites.plotsquared.commands.Command; -import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory; -import com.github.intellectualsites.plotsquared.plot.commands.MainCommand; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.commands.CommandCategory; +import com.github.intellectualsites.plotsquared.commands.MainCommand; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import java.util.List; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpObject.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/helpmenu/HelpObject.java similarity index 90% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpObject.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/helpmenu/HelpObject.java index 9981dd0f1..20a50efda 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpObject.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/helpmenu/HelpObject.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.plot.util.helpmenu; +package com.github.intellectualsites.plotsquared.util.helpmenu; import com.github.intellectualsites.plotsquared.commands.Argument; import com.github.intellectualsites.plotsquared.commands.Command; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.util.StringMan; public class HelpObject { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpPage.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/helpmenu/HelpPage.java similarity index 76% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpPage.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/helpmenu/HelpPage.java index 8a13afa8e..d3fbcb664 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpPage.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/helpmenu/HelpPage.java @@ -1,10 +1,10 @@ -package com.github.intellectualsites.plotsquared.plot.util.helpmenu; +package com.github.intellectualsites.plotsquared.util.helpmenu; -import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory; +import com.github.intellectualsites.plotsquared.commands.CommandCategory; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.util.MainUtil; -import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.github.intellectualsites.plotsquared.util.StringMan; import java.util.ArrayList; import java.util.List; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/DelegateLogger.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/logger/DelegateLogger.java similarity index 83% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/DelegateLogger.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/logger/DelegateLogger.java index ed925a135..307e651f9 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/DelegateLogger.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/logger/DelegateLogger.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.logger; +package com.github.intellectualsites.plotsquared.util.logger; public class DelegateLogger implements ILogger { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/logger/ILogger.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/logger/ILogger.java new file mode 100644 index 000000000..2f4d55e7f --- /dev/null +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/logger/ILogger.java @@ -0,0 +1,5 @@ +package com.github.intellectualsites.plotsquared.util.logger; + +public interface ILogger { + void log(String message); +} diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HttpUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/net/HttpUtil.java similarity index 93% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HttpUtil.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/net/HttpUtil.java index 761c5aa0a..e0207a0a4 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HttpUtil.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/net/HttpUtil.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util.net; import com.github.intellectualsites.plotsquared.plot.config.Settings; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/IncendoPaster.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/net/IncendoPaster.java similarity index 98% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/IncendoPaster.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/net/IncendoPaster.java index 48cb395c5..f746aecda 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/IncendoPaster.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/net/IncendoPaster.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util.net; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.google.common.base.Charsets; import java.io.BufferedReader; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/AutoClaimFinishTask.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/AutoClaimFinishTask.java similarity index 70% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/AutoClaimFinishTask.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/AutoClaimFinishTask.java index c0fc30302..0a7e914c2 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/AutoClaimFinishTask.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/AutoClaimFinishTask.java @@ -1,19 +1,18 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util.tasks; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.commands.Auto; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.commands.Auto; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.events.PlotMergeEvent; -import com.github.intellectualsites.plotsquared.plot.events.Result; +import com.github.intellectualsites.plotsquared.database.DBFunc; +import com.github.intellectualsites.plotsquared.events.PlotMergeEvent; +import com.github.intellectualsites.plotsquared.events.Result; import com.github.intellectualsites.plotsquared.plot.object.Direction; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import lombok.RequiredArgsConstructor; -import static com.github.intellectualsites.plotsquared.plot.util.MainUtil.sendMessage; +import static com.github.intellectualsites.plotsquared.util.MainUtil.sendMessage; @RequiredArgsConstructor public final class AutoClaimFinishTask extends RunnableVal { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ObjectTaskRunnable.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/ObjectTaskRunnable.java similarity index 84% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ObjectTaskRunnable.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/ObjectTaskRunnable.java index ba404d1cb..05a3237f9 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ObjectTaskRunnable.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/ObjectTaskRunnable.java @@ -1,6 +1,5 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util.tasks; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; import lombok.RequiredArgsConstructor; import java.util.Iterator; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/RunnableVal.java similarity index 82% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/RunnableVal.java index 90074a63a..255994e12 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/RunnableVal.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.github.intellectualsites.plotsquared.util.tasks; public abstract class RunnableVal implements Runnable { public T value; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal2.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/RunnableVal2.java similarity index 86% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal2.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/RunnableVal2.java index ee46a417f..c57c06459 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal2.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/RunnableVal2.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.github.intellectualsites.plotsquared.util.tasks; public abstract class RunnableVal2 implements Runnable { public T value1; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal3.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/RunnableVal3.java similarity index 88% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal3.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/RunnableVal3.java index cb6b2a8be..3ed053161 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal3.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/RunnableVal3.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.github.intellectualsites.plotsquared.util.tasks; public abstract class RunnableVal3 implements Runnable { public T value1; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/TaskManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/TaskManager.java similarity index 92% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/TaskManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/TaskManager.java index a20e80f6e..9978b8073 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/TaskManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/TaskManager.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util.tasks; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.PlotSquared; +import com.github.intellectualsites.plotsquared.util.RuntimeExceptionRunnableVal; import java.util.Collection; import java.util.HashMap; @@ -106,7 +106,8 @@ public abstract class TaskManager { return function.value; } final AtomicBoolean running = new AtomicBoolean(true); - final RuntimeExceptionRunnableVal run = new RuntimeExceptionRunnableVal<>(function, running); + final RuntimeExceptionRunnableVal + run = new RuntimeExceptionRunnableVal<>(function, running); TaskManager.IMP.task(run); try { synchronized (function) { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/uuid/UUIDHandler.java similarity index 90% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/uuid/UUIDHandler.java index 9967e88eb..818e46cbb 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/uuid/UUIDHandler.java @@ -1,13 +1,12 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util.uuid; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.database.DBFunc; +import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; -import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; import com.google.common.collect.BiMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/uuid/UUIDHandlerImplementation.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/uuid/UUIDHandlerImplementation.java index 57b70d263..c8e822e33 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/uuid/UUIDHandlerImplementation.java @@ -1,15 +1,16 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.github.intellectualsites.plotsquared.util.uuid; -import com.github.intellectualsites.plotsquared.plot.PlotSquared; +import com.github.intellectualsites.plotsquared.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.Captions; import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; +import com.github.intellectualsites.plotsquared.database.DBFunc; +import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.github.intellectualsites.plotsquared.util.StringMan; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; -import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; +import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; import com.google.common.base.Charsets; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/uuid/UUIDWrapper.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/uuid/UUIDWrapper.java similarity index 69% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/uuid/UUIDWrapper.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/util/uuid/UUIDWrapper.java index c2a0af542..9642dc77e 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/uuid/UUIDWrapper.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/uuid/UUIDWrapper.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.uuid; +package com.github.intellectualsites.plotsquared.util.uuid; -import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import org.jetbrains.annotations.NotNull; import java.util.UUID; diff --git a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java b/Core/src/test/java/com/github/intellectualsites/plotsquared/database/AbstractDBTest.java similarity index 95% rename from Core/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java rename to Core/src/test/java/com/github/intellectualsites/plotsquared/database/AbstractDBTest.java index 878aefd1f..9b4194a87 100644 --- a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java +++ b/Core/src/test/java/com/github/intellectualsites/plotsquared/database/AbstractDBTest.java @@ -1,12 +1,12 @@ -package com.github.intellectualsites.plotsquared.plot.database; +package com.github.intellectualsites.plotsquared.database; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotCluster; import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.comment.PlotComment; import org.jetbrains.annotations.NotNull; import java.util.HashMap; diff --git a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/FlagTest.java b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/FlagTest.java index f4e262a3c..6f61cffc0 100644 --- a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/FlagTest.java +++ b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/FlagTest.java @@ -1,7 +1,7 @@ package com.github.intellectualsites.plotsquared.plot; -import com.github.intellectualsites.plotsquared.plot.database.AbstractDBTest; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.database.AbstractDBTest; +import com.github.intellectualsites.plotsquared.database.DBFunc; import com.sk89q.worldedit.world.item.ItemType; import org.junit.Before; diff --git a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/PlotVersionTest.java b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/PlotVersionTest.java index 069c886da..5b7646750 100644 --- a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/PlotVersionTest.java +++ b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/PlotVersionTest.java @@ -1,5 +1,6 @@ package com.github.intellectualsites.plotsquared.plot; +import com.github.intellectualsites.plotsquared.PlotVersion; import org.junit.Test; public class PlotVersionTest { diff --git a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventDispatcherTest.java b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventDispatcherTest.java index 1e789a4da..36e902c5d 100644 --- a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventDispatcherTest.java +++ b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventDispatcherTest.java @@ -1,8 +1,10 @@ package com.github.intellectualsites.plotsquared.plot.util; -import com.github.intellectualsites.plotsquared.plot.events.*; +import com.github.intellectualsites.plotsquared.events.*; +import com.github.intellectualsites.plotsquared.player.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.util.EventDispatcher; import com.sk89q.worldedit.function.pattern.Pattern; import java.util.List; diff --git a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementationTest.java b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementationTest.java index 1d4244510..89963ee56 100644 --- a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementationTest.java +++ b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementationTest.java @@ -1,9 +1,10 @@ package com.github.intellectualsites.plotsquared.plot.util; -import com.github.intellectualsites.plotsquared.plot.database.AbstractDBTest; -import com.github.intellectualsites.plotsquared.plot.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; +import com.github.intellectualsites.plotsquared.database.AbstractDBTest; +import com.github.intellectualsites.plotsquared.database.DBFunc; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandlerImplementation; +import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.github.intellectualsites.plotsquared.util.uuid.UUIDWrapper; import org.junit.Before; import java.util.UUID;