diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitChunkManager.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitChunkManager.java index 797f4a2c8..6e26250a5 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitChunkManager.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitChunkManager.java @@ -2,21 +2,21 @@ package com.plotsquared.bukkit; import com.plotsquared.bukkit.entity.EntityWrapper; import com.plotsquared.bukkit.entity.ReplicatingEntityWrapper; -import com.plotsquared.PlotSquared; +import com.plotsquared.core.PlotSquared; import com.plotsquared.bukkit.util.BukkitUtil; -import com.plotsquared.generator.AugmentedUtils; -import com.plotsquared.listener.WEExtent; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.location.PlotLoc; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.ChunkManager; -import com.plotsquared.util.tasks.TaskManager; -import com.plotsquared.queue.GlobalBlockQueue; -import com.plotsquared.queue.LocalBlockQueue; -import com.plotsquared.queue.ScopedLocalBlockQueue; -import com.plotsquared.util.RegionUtil; +import com.plotsquared.core.generator.AugmentedUtils; +import com.plotsquared.core.listener.WEExtent; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.location.PlotLoc; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.ChunkManager; +import com.plotsquared.core.util.task.TaskManager; +import com.plotsquared.core.queue.GlobalBlockQueue; +import com.plotsquared.core.queue.LocalBlockQueue; +import com.plotsquared.core.queue.ScopedLocalBlockQueue; +import com.plotsquared.core.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/plotsquared/bukkit/BukkitCommand.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitCommand.java index b8cf6502f..8a385082a 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitCommand.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitCommand.java @@ -1,10 +1,10 @@ package com.plotsquared.bukkit; -import com.plotsquared.bukkit.commands.DebugUUID; +import com.plotsquared.bukkit.command.DebugUUID; import com.plotsquared.bukkit.util.BukkitUtil; -import com.plotsquared.commands.MainCommand; -import com.plotsquared.player.ConsolePlayer; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.command.MainCommand; +import com.plotsquared.core.player.ConsolePlayer; +import com.plotsquared.core.player.PlotPlayer; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; @@ -49,12 +49,12 @@ public class BukkitCommand implements CommandExecutor, TabCompleter { if (args.length == 0) { return Collections.singletonList("plots"); } - Collection objects = MainCommand.getInstance().tab(player, args, s.endsWith(" ")); + Collection objects = MainCommand.getInstance().tab(player, args, s.endsWith(" ")); if (objects == null) { return null; } List result = new ArrayList<>(); - for (com.plotsquared.commands.Command o : objects) { + for (com.plotsquared.core.command.Command o : objects) { result.add(o.toString()); } return result.isEmpty() ? null : result; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java index d15246a17..353ca96d1 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java @@ -1,13 +1,13 @@ package com.plotsquared.bukkit; import com.plotsquared.bukkit.generator.BukkitPlotGenerator; -import com.plotsquared.bukkit.listeners.ChunkListener; -import com.plotsquared.bukkit.listeners.EntitySpawnListener; -import com.plotsquared.bukkit.listeners.PlayerEvents; -import com.plotsquared.bukkit.listeners.SingleWorldListener; -import com.plotsquared.bukkit.listeners.WorldEvents; -import com.plotsquared.bukkit.placeholders.PlaceholderFormatter; -import com.plotsquared.bukkit.placeholders.Placeholders; +import com.plotsquared.bukkit.listener.ChunkListener; +import com.plotsquared.bukkit.listener.EntitySpawnListener; +import com.plotsquared.bukkit.listener.PlayerEvents; +import com.plotsquared.bukkit.listener.SingleWorldListener; +import com.plotsquared.bukkit.listener.WorldEvents; +import com.plotsquared.bukkit.placeholder.PlaceholderFormatter; +import com.plotsquared.bukkit.placeholder.Placeholders; import com.plotsquared.bukkit.util.BukkitChatManager; import com.plotsquared.bukkit.util.BukkitEconHandler; import com.plotsquared.bukkit.generator.BukkitHybridUtils; @@ -19,51 +19,51 @@ import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.Metrics; import com.plotsquared.bukkit.util.SetGenCB; import com.plotsquared.bukkit.util.UpdateUtility; -import com.plotsquared.bukkit.util.block.BukkitLocalQueue; +import com.plotsquared.bukkit.queue.BukkitLocalQueue; import com.plotsquared.bukkit.util.uuid.DefaultUUIDWrapper; import com.plotsquared.bukkit.util.uuid.FileUUIDHandler; import com.plotsquared.bukkit.util.uuid.LowerOfflineUUIDWrapper; import com.plotsquared.bukkit.util.uuid.OfflineUUIDWrapper; import com.plotsquared.bukkit.util.uuid.SQLUUIDHandler; -import com.plotsquared.configuration.ConfigurationSection; -import com.plotsquared.IPlotMain; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.ChatFormatter; -import com.plotsquared.config.ConfigurationNode; -import com.plotsquared.config.Settings; -import com.plotsquared.generator.GeneratorWrapper; -import com.plotsquared.generator.HybridGen; -import com.plotsquared.generator.HybridUtils; -import com.plotsquared.generator.IndependentPlotGenerator; -import com.plotsquared.listener.PlotListener; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotId; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.plot.SetupObject; -import com.plotsquared.plot.message.PlainChatManager; -import com.plotsquared.plot.worlds.PlotAreaManager; -import com.plotsquared.plot.worlds.SinglePlotArea; -import com.plotsquared.plot.worlds.SinglePlotAreaManager; -import com.plotsquared.plot.worlds.SingleWorldGenerator; -import com.plotsquared.util.ChatManager; -import com.plotsquared.util.ChunkManager; -import com.plotsquared.util.ConsoleColors; -import com.plotsquared.util.EconHandler; -import com.plotsquared.util.InventoryUtil; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.PremiumVerification; -import com.plotsquared.util.ReflectionUtils; -import com.plotsquared.util.SchematicHandler; -import com.plotsquared.util.SetupUtils; -import com.plotsquared.util.StringMan; -import com.plotsquared.util.tasks.TaskManager; -import com.plotsquared.util.uuid.UUIDHandler; -import com.plotsquared.util.uuid.UUIDHandlerImplementation; -import com.plotsquared.util.WorldUtil; -import com.plotsquared.queue.QueueProvider; -import com.plotsquared.util.uuid.UUIDWrapper; +import com.plotsquared.core.configuration.ConfigurationSection; +import com.plotsquared.core.IPlotMain; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.ChatFormatter; +import com.plotsquared.core.config.ConfigurationNode; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.generator.GeneratorWrapper; +import com.plotsquared.core.generator.HybridGen; +import com.plotsquared.core.generator.HybridUtils; +import com.plotsquared.core.generator.IndependentPlotGenerator; +import com.plotsquared.core.listener.PlotListener; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.SetupObject; +import com.plotsquared.core.plot.message.PlainChatManager; +import com.plotsquared.core.plot.world.PlotAreaManager; +import com.plotsquared.core.plot.world.SinglePlotArea; +import com.plotsquared.core.plot.world.SinglePlotAreaManager; +import com.plotsquared.core.generator.SingleWorldGenerator; +import com.plotsquared.core.util.ChatManager; +import com.plotsquared.core.util.ChunkManager; +import com.plotsquared.core.util.ConsoleColors; +import com.plotsquared.core.util.EconHandler; +import com.plotsquared.core.util.InventoryUtil; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.PremiumVerification; +import com.plotsquared.core.util.ReflectionUtils; +import com.plotsquared.core.util.SchematicHandler; +import com.plotsquared.core.util.SetupUtils; +import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.util.task.TaskManager; +import com.plotsquared.core.util.uuid.UUIDHandler; +import com.plotsquared.core.util.uuid.UUIDHandlerImplementation; +import com.plotsquared.core.util.WorldUtil; +import com.plotsquared.core.queue.QueueProvider; +import com.plotsquared.core.util.uuid.UUIDWrapper; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.bukkit.WorldEditPlugin; import com.sk89q.worldedit.extension.platform.Actor; @@ -99,8 +99,8 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import static com.plotsquared.util.PremiumVerification.getUserID; -import static com.plotsquared.util.ReflectionUtils.getRefClass; +import static com.plotsquared.core.util.PremiumVerification.getUserID; +import static com.plotsquared.core.util.ReflectionUtils.getRefClass; public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain { @@ -381,7 +381,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain case MINECART_TNT: case BOAT: if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) { - com.plotsquared.location.Location + com.plotsquared.core.location.Location location = BukkitUtil.getLocation(entity.getLocation()); Plot plot = location.getPlot(); if (plot == null) { @@ -438,7 +438,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain PlotId originalPlotId = (PlotId) meta.get(0).value(); if (originalPlotId != null) { - com.plotsquared.location.Location + com.plotsquared.core.location.Location pLoc = BukkitUtil.getLocation(entity.getLocation()); PlotArea area = pLoc.getPlotArea(); if (area != null) { @@ -457,7 +457,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain } } else { //This is to apply the metadata to already spawned shulkers (see EntitySpawnListener.java) - com.plotsquared.location.Location + com.plotsquared.core.location.Location pLoc = BukkitUtil.getLocation(entity.getLocation()); PlotArea area = pLoc.getPlotArea(); if (area != null) { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/commands/DebugUUID.java b/Bukkit/src/main/java/com/plotsquared/bukkit/command/DebugUUID.java similarity index 93% rename from Bukkit/src/main/java/com/plotsquared/bukkit/commands/DebugUUID.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/command/DebugUUID.java index 4952936be..8e9ea98c9 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/commands/DebugUUID.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/command/DebugUUID.java @@ -1,27 +1,27 @@ -package com.plotsquared.bukkit.commands; +package com.plotsquared.bukkit.command; import com.plotsquared.bukkit.util.uuid.DatFileFilter; import com.plotsquared.bukkit.util.uuid.DefaultUUIDWrapper; import com.plotsquared.bukkit.util.uuid.LowerOfflineUUIDWrapper; import com.plotsquared.bukkit.util.uuid.OfflineUUIDWrapper; -import com.plotsquared.commands.Argument; -import com.plotsquared.commands.CommandDeclaration; -import com.plotsquared.PlotSquared; -import com.plotsquared.commands.CommandCategory; -import com.plotsquared.commands.RequiredType; -import com.plotsquared.commands.SubCommand; -import com.plotsquared.config.Captions; -import com.plotsquared.database.DBFunc; -import com.plotsquared.player.OfflinePlotPlayer; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.StringWrapper; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.StringMan; -import com.plotsquared.util.tasks.TaskManager; -import com.plotsquared.util.uuid.UUIDHandler; -import com.plotsquared.util.WorldUtil; -import com.plotsquared.util.uuid.UUIDWrapper; +import com.plotsquared.core.command.Argument; +import com.plotsquared.core.command.CommandDeclaration; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.command.CommandCategory; +import com.plotsquared.core.command.RequiredType; +import com.plotsquared.core.command.SubCommand; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.player.OfflinePlotPlayer; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.StringWrapper; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.util.task.TaskManager; +import com.plotsquared.core.util.uuid.UUIDHandler; +import com.plotsquared.core.util.WorldUtil; +import com.plotsquared.core.util.uuid.UUIDWrapper; import com.google.common.collect.Sets; import java.io.File; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java index f605ad39d..ffc38ad35 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java @@ -1,6 +1,6 @@ package com.plotsquared.bukkit.entity; -import com.plotsquared.PlotSquared; +import com.plotsquared.core.PlotSquared; import org.bukkit.Art; import org.bukkit.DyeColor; import org.bukkit.Location; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/PlotBlockPopulator.java b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BlockStatePopulator.java similarity index 75% rename from Bukkit/src/main/java/com/plotsquared/bukkit/generator/PlotBlockPopulator.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/generator/BlockStatePopulator.java index 2f24c3d39..e3e2efffd 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/PlotBlockPopulator.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BlockStatePopulator.java @@ -1,12 +1,12 @@ package com.plotsquared.bukkit.generator; -import com.plotsquared.PlotSquared; -import com.plotsquared.generator.IndependentPlotGenerator; -import com.plotsquared.location.ChunkWrapper; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.queue.GlobalBlockQueue; -import com.plotsquared.queue.LocalBlockQueue; -import com.plotsquared.queue.ScopedLocalBlockQueue; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.generator.IndependentPlotGenerator; +import com.plotsquared.core.location.ChunkWrapper; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.queue.GlobalBlockQueue; +import com.plotsquared.core.queue.LocalBlockQueue; +import com.plotsquared.core.queue.ScopedLocalBlockQueue; import java.util.Random; import org.bukkit.Chunk; import org.bukkit.World; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java index 1f6c539f9..868dac747 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java @@ -1,6 +1,6 @@ package com.plotsquared.bukkit.generator; -import com.plotsquared.generator.AugmentedUtils; +import com.plotsquared.core.generator.AugmentedUtils; import org.bukkit.Chunk; import org.bukkit.World; import org.bukkit.generator.BlockPopulator; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitHybridUtils.java b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitHybridUtils.java index 38eadfd74..f7a31ed7c 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitHybridUtils.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitHybridUtils.java @@ -1,6 +1,6 @@ package com.plotsquared.bukkit.generator; -import com.plotsquared.generator.HybridUtils; +import com.plotsquared.core.generator.HybridUtils; public class BukkitHybridUtils extends HybridUtils { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java index f68bb7b06..c87c9807c 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java @@ -1,16 +1,16 @@ package com.plotsquared.bukkit.generator; import com.plotsquared.bukkit.util.BukkitUtil; -import com.plotsquared.bukkit.util.block.GenChunk; -import com.plotsquared.PlotSquared; -import com.plotsquared.generator.GeneratorWrapper; -import com.plotsquared.generator.IndependentPlotGenerator; -import com.plotsquared.location.ChunkWrapper; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.worlds.SingleWorldGenerator; -import com.plotsquared.util.ChunkManager; -import com.plotsquared.util.MainUtil; -import com.plotsquared.queue.ScopedLocalBlockQueue; +import com.plotsquared.bukkit.queue.GenChunk; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.generator.GeneratorWrapper; +import com.plotsquared.core.generator.IndependentPlotGenerator; +import com.plotsquared.core.location.ChunkWrapper; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.generator.SingleWorldGenerator; +import com.plotsquared.core.util.ChunkManager; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.queue.ScopedLocalBlockQueue; import com.sk89q.worldedit.math.BlockVector2; import lombok.Getter; import org.bukkit.World; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java index 7d4820f8f..d79df79ed 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java @@ -1,13 +1,13 @@ package com.plotsquared.bukkit.generator; import com.plotsquared.bukkit.util.BukkitUtil; -import com.plotsquared.PlotSquared; -import com.plotsquared.generator.IndependentPlotGenerator; -import com.plotsquared.location.Location; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotId; -import com.plotsquared.util.MathMan; -import com.plotsquared.queue.ScopedLocalBlockQueue; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.generator.IndependentPlotGenerator; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.queue.ScopedLocalBlockQueue; import com.sk89q.worldedit.bukkit.BukkitAdapter; import java.util.Random; import org.bukkit.World; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/ChunkListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java similarity index 95% rename from Bukkit/src/main/java/com/plotsquared/bukkit/listeners/ChunkListener.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java index e8fb3c6b3..546a36955 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/ChunkListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java @@ -1,13 +1,13 @@ -package com.plotsquared.bukkit.listeners; +package com.plotsquared.bukkit.listener; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Settings; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.util.ReflectionUtils.RefClass; -import com.plotsquared.util.ReflectionUtils.RefField; -import com.plotsquared.util.ReflectionUtils.RefMethod; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.util.ReflectionUtils.RefClass; +import com.plotsquared.core.util.ReflectionUtils.RefField; +import com.plotsquared.core.util.ReflectionUtils.RefMethod; +import com.plotsquared.core.util.task.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.plotsquared.util.ReflectionUtils.getRefClass; +import static com.plotsquared.core.util.ReflectionUtils.getRefClass; @SuppressWarnings("unused") public class ChunkListener implements Listener { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/EntitySpawnListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java similarity index 95% rename from Bukkit/src/main/java/com/plotsquared/bukkit/listeners/EntitySpawnListener.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java index 059278ac8..e936b71c5 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/EntitySpawnListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java @@ -1,12 +1,12 @@ -package com.plotsquared.bukkit.listeners; +package com.plotsquared.bukkit.listener; import com.plotsquared.bukkit.util.BukkitUtil; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Settings; -import com.plotsquared.plot.flags.implementations.DoneFlag; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.plot.flag.implementations.DoneFlag; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; import io.papermc.lib.PaperLib; import org.bukkit.Chunk; import org.bukkit.World; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/ForceFieldListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ForceFieldListener.java similarity index 91% rename from Bukkit/src/main/java/com/plotsquared/bukkit/listeners/ForceFieldListener.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/listener/ForceFieldListener.java index a2637ea7a..6d9ddf221 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/ForceFieldListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ForceFieldListener.java @@ -1,13 +1,13 @@ -package com.plotsquared.bukkit.listeners; +package com.plotsquared.bukkit.listener; import com.plotsquared.bukkit.player.BukkitPlayer; import com.plotsquared.bukkit.util.BukkitUtil; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.implementations.ForcefieldFlag; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.Permissions; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.implementations.ForcefieldFlag; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.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/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java similarity index 96% rename from Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java index cc576d64c..361ce3f94 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java @@ -1,82 +1,82 @@ -package com.plotsquared.bukkit.listeners; +package com.plotsquared.bukkit.listener; import com.destroystokyo.paper.MaterialTags; import com.plotsquared.bukkit.player.BukkitPlayer; import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.UpdateUtility; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.database.DBFunc; -import com.plotsquared.plot.flags.implementations.AnimalAttackFlag; -import com.plotsquared.plot.flags.implementations.AnimalCapFlag; -import com.plotsquared.plot.flags.implementations.AnimalInteractFlag; -import com.plotsquared.plot.flags.implementations.BlockBurnFlag; -import com.plotsquared.plot.flags.implementations.BlockIgnitionFlag; -import com.plotsquared.plot.flags.implementations.BlockedCmdsFlag; -import com.plotsquared.plot.flags.implementations.BreakFlag; -import com.plotsquared.plot.flags.implementations.CoralDryFlag; -import com.plotsquared.plot.flags.implementations.DenyTeleportFlag; -import com.plotsquared.plot.flags.implementations.DisablePhysicsFlag; -import com.plotsquared.plot.flags.implementations.DoneFlag; -import com.plotsquared.plot.flags.implementations.DropProtectionFlag; -import com.plotsquared.plot.flags.implementations.EntityCapFlag; -import com.plotsquared.plot.flags.implementations.ExplosionFlag; -import com.plotsquared.plot.flags.implementations.GrassGrowFlag; -import com.plotsquared.plot.flags.implementations.HangingBreakFlag; -import com.plotsquared.plot.flags.implementations.HangingPlaceFlag; -import com.plotsquared.plot.flags.implementations.HostileAttackFlag; -import com.plotsquared.plot.flags.implementations.HostileCapFlag; -import com.plotsquared.plot.flags.implementations.HostileInteractFlag; -import com.plotsquared.plot.flags.implementations.IceFormFlag; -import com.plotsquared.plot.flags.implementations.IceMeltFlag; -import com.plotsquared.plot.flags.implementations.InstabreakFlag; -import com.plotsquared.plot.flags.implementations.InvincibleFlag; -import com.plotsquared.plot.flags.implementations.ItemDropFlag; -import com.plotsquared.plot.flags.implementations.KelpGrowFlag; -import com.plotsquared.plot.flags.implementations.LiquidFlowFlag; -import com.plotsquared.plot.flags.implementations.MiscBreakFlag; -import com.plotsquared.plot.flags.implementations.MiscCapFlag; -import com.plotsquared.plot.flags.implementations.MiscInteractFlag; -import com.plotsquared.plot.flags.implementations.MobCapFlag; -import com.plotsquared.plot.flags.implementations.MobPlaceFlag; -import com.plotsquared.plot.flags.implementations.MycelGrowFlag; -import com.plotsquared.plot.flags.implementations.PlaceFlag; -import com.plotsquared.plot.flags.implementations.PlayerInteractFlag; -import com.plotsquared.plot.flags.implementations.PveFlag; -import com.plotsquared.plot.flags.implementations.PvpFlag; -import com.plotsquared.plot.flags.implementations.RedstoneFlag; -import com.plotsquared.plot.flags.implementations.SnowFormFlag; -import com.plotsquared.plot.flags.implementations.SnowMeltFlag; -import com.plotsquared.plot.flags.implementations.SoilDryFlag; -import com.plotsquared.plot.flags.implementations.TamedAttackFlag; -import com.plotsquared.plot.flags.implementations.TamedInteractFlag; -import com.plotsquared.plot.flags.implementations.UntrustedVisitFlag; -import com.plotsquared.plot.flags.implementations.UseFlag; -import com.plotsquared.plot.flags.implementations.VehicleBreakFlag; -import com.plotsquared.plot.flags.implementations.VehicleCapFlag; -import com.plotsquared.plot.flags.implementations.VehicleUseFlag; -import com.plotsquared.plot.flags.implementations.VillagerInteractFlag; -import com.plotsquared.plot.flags.implementations.VineGrowFlag; -import com.plotsquared.plot.flags.types.BlockTypeWrapper; -import com.plotsquared.listener.PlayerBlockEventType; -import com.plotsquared.listener.PlotListener; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotHandler; -import com.plotsquared.plot.PlotId; -import com.plotsquared.plot.PlotInventory; -import com.plotsquared.plot.message.PlotMessage; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.StringWrapper; -import com.plotsquared.util.EntityUtil; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.MathMan; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.RegExUtil; -import com.plotsquared.util.tasks.TaskManager; -import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.plot.flag.implementations.AnimalAttackFlag; +import com.plotsquared.core.plot.flag.implementations.AnimalCapFlag; +import com.plotsquared.core.plot.flag.implementations.AnimalInteractFlag; +import com.plotsquared.core.plot.flag.implementations.BlockBurnFlag; +import com.plotsquared.core.plot.flag.implementations.BlockIgnitionFlag; +import com.plotsquared.core.plot.flag.implementations.BlockedCmdsFlag; +import com.plotsquared.core.plot.flag.implementations.BreakFlag; +import com.plotsquared.core.plot.flag.implementations.CoralDryFlag; +import com.plotsquared.core.plot.flag.implementations.DenyTeleportFlag; +import com.plotsquared.core.plot.flag.implementations.DisablePhysicsFlag; +import com.plotsquared.core.plot.flag.implementations.DoneFlag; +import com.plotsquared.core.plot.flag.implementations.DropProtectionFlag; +import com.plotsquared.core.plot.flag.implementations.EntityCapFlag; +import com.plotsquared.core.plot.flag.implementations.ExplosionFlag; +import com.plotsquared.core.plot.flag.implementations.GrassGrowFlag; +import com.plotsquared.core.plot.flag.implementations.HangingBreakFlag; +import com.plotsquared.core.plot.flag.implementations.HangingPlaceFlag; +import com.plotsquared.core.plot.flag.implementations.HostileAttackFlag; +import com.plotsquared.core.plot.flag.implementations.HostileCapFlag; +import com.plotsquared.core.plot.flag.implementations.HostileInteractFlag; +import com.plotsquared.core.plot.flag.implementations.IceFormFlag; +import com.plotsquared.core.plot.flag.implementations.IceMeltFlag; +import com.plotsquared.core.plot.flag.implementations.InstabreakFlag; +import com.plotsquared.core.plot.flag.implementations.InvincibleFlag; +import com.plotsquared.core.plot.flag.implementations.ItemDropFlag; +import com.plotsquared.core.plot.flag.implementations.KelpGrowFlag; +import com.plotsquared.core.plot.flag.implementations.LiquidFlowFlag; +import com.plotsquared.core.plot.flag.implementations.MiscBreakFlag; +import com.plotsquared.core.plot.flag.implementations.MiscCapFlag; +import com.plotsquared.core.plot.flag.implementations.MiscInteractFlag; +import com.plotsquared.core.plot.flag.implementations.MobCapFlag; +import com.plotsquared.core.plot.flag.implementations.MobPlaceFlag; +import com.plotsquared.core.plot.flag.implementations.MycelGrowFlag; +import com.plotsquared.core.plot.flag.implementations.PlaceFlag; +import com.plotsquared.core.plot.flag.implementations.PlayerInteractFlag; +import com.plotsquared.core.plot.flag.implementations.PveFlag; +import com.plotsquared.core.plot.flag.implementations.PvpFlag; +import com.plotsquared.core.plot.flag.implementations.RedstoneFlag; +import com.plotsquared.core.plot.flag.implementations.SnowFormFlag; +import com.plotsquared.core.plot.flag.implementations.SnowMeltFlag; +import com.plotsquared.core.plot.flag.implementations.SoilDryFlag; +import com.plotsquared.core.plot.flag.implementations.TamedAttackFlag; +import com.plotsquared.core.plot.flag.implementations.TamedInteractFlag; +import com.plotsquared.core.plot.flag.implementations.UntrustedVisitFlag; +import com.plotsquared.core.plot.flag.implementations.UseFlag; +import com.plotsquared.core.plot.flag.implementations.VehicleBreakFlag; +import com.plotsquared.core.plot.flag.implementations.VehicleCapFlag; +import com.plotsquared.core.plot.flag.implementations.VehicleUseFlag; +import com.plotsquared.core.plot.flag.implementations.VillagerInteractFlag; +import com.plotsquared.core.plot.flag.implementations.VineGrowFlag; +import com.plotsquared.core.plot.flag.types.BlockTypeWrapper; +import com.plotsquared.core.listener.PlayerBlockEventType; +import com.plotsquared.core.listener.PlotListener; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotHandler; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.plot.PlotInventory; +import com.plotsquared.core.plot.message.PlotMessage; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.StringWrapper; +import com.plotsquared.core.util.EntityUtil; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.RegExUtil; +import com.plotsquared.core.util.task.TaskManager; +import com.plotsquared.core.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/plotsquared/bukkit/listeners/SingleWorldListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/SingleWorldListener.java similarity index 89% rename from Bukkit/src/main/java/com/plotsquared/bukkit/listeners/SingleWorldListener.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/listener/SingleWorldListener.java index 365a04174..97e0cbdd5 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/SingleWorldListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/SingleWorldListener.java @@ -1,9 +1,9 @@ -package com.plotsquared.bukkit.listeners; +package com.plotsquared.bukkit.listener; -import com.plotsquared.PlotSquared; -import com.plotsquared.plot.worlds.PlotAreaManager; -import com.plotsquared.plot.worlds.SinglePlotAreaManager; -import com.plotsquared.util.ReflectionUtils; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.plot.world.PlotAreaManager; +import com.plotsquared.core.plot.world.SinglePlotAreaManager; +import com.plotsquared.core.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.plotsquared.util.ReflectionUtils.getRefClass; +import static com.plotsquared.core.util.ReflectionUtils.getRefClass; @SuppressWarnings("unused") public class SingleWorldListener implements Listener { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/WorldEvents.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/WorldEvents.java similarity index 81% rename from Bukkit/src/main/java/com/plotsquared/bukkit/listeners/WorldEvents.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/listener/WorldEvents.java index 2b03f9c65..41d86cf26 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/WorldEvents.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/WorldEvents.java @@ -1,10 +1,10 @@ -package com.plotsquared.bukkit.listeners; +package com.plotsquared.bukkit.listener; import com.plotsquared.bukkit.generator.BukkitPlotGenerator; -import com.plotsquared.PlotSquared; -import com.plotsquared.generator.GeneratorWrapper; -import com.plotsquared.plot.worlds.PlotAreaManager; -import com.plotsquared.plot.worlds.SinglePlotAreaManager; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.generator.GeneratorWrapper; +import com.plotsquared.core.plot.world.PlotAreaManager; +import com.plotsquared.core.plot.world.SinglePlotAreaManager; import org.bukkit.World; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/placeholders/PlaceholderFormatter.java b/Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/PlaceholderFormatter.java similarity index 83% rename from Bukkit/src/main/java/com/plotsquared/bukkit/placeholders/PlaceholderFormatter.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/PlaceholderFormatter.java index 0213b3eda..42ef11246 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/placeholders/PlaceholderFormatter.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/PlaceholderFormatter.java @@ -1,8 +1,8 @@ -package com.plotsquared.bukkit.placeholders; +package com.plotsquared.bukkit.placeholder; import com.plotsquared.bukkit.player.BukkitPlayer; -import com.plotsquared.config.ChatFormatter; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.config.ChatFormatter; +import com.plotsquared.core.player.PlotPlayer; import me.clip.placeholderapi.PlaceholderAPI; import org.bukkit.entity.Player; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/placeholders/Placeholders.java b/Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/Placeholders.java similarity index 96% rename from Bukkit/src/main/java/com/plotsquared/bukkit/placeholders/Placeholders.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/Placeholders.java index 6bab8277a..2051adfcb 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/placeholders/Placeholders.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/Placeholders.java @@ -1,9 +1,9 @@ -package com.plotsquared.bukkit.placeholders; +package com.plotsquared.bukkit.placeholder; import com.plotsquared.bukkit.BukkitMain; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.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/plotsquared/bukkit/player/BukkitOfflinePlayer.java b/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java index 47c200e99..6743ba437 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java @@ -1,6 +1,6 @@ package com.plotsquared.bukkit.player; -import com.plotsquared.player.OfflinePlotPlayer; +import com.plotsquared.core.player.OfflinePlotPlayer; import org.bukkit.OfflinePlayer; import org.jetbrains.annotations.NotNull; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java b/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java index 3b082bbcb..cfdb90da5 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java @@ -1,16 +1,16 @@ package com.plotsquared.bukkit.player; import com.plotsquared.bukkit.util.BukkitUtil; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.location.Location; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.events.TeleportCause; -import com.plotsquared.util.EconHandler; -import com.plotsquared.util.MathMan; -import com.plotsquared.plot.PlotWeather; -import com.plotsquared.util.StringMan; -import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.events.TeleportCause; +import com.plotsquared.core.util.EconHandler; +import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.plot.PlotWeather; +import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.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/plotsquared/bukkit/util/block/BukkitLocalQueue.java b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitLocalQueue.java similarity index 95% rename from Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitLocalQueue.java index 14f7b81f8..d37f7daf2 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitLocalQueue.java @@ -1,9 +1,11 @@ -package com.plotsquared.bukkit.util.block; +package com.plotsquared.bukkit.queue; -import com.plotsquared.PlotSquared; -import com.plotsquared.util.MainUtil; -import com.plotsquared.queue.BasicLocalBlockQueue; -import com.plotsquared.util.BlockUtil; +import com.plotsquared.bukkit.schematic.StateWrapper; +import com.plotsquared.bukkit.util.BukkitBlockUtil; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.queue.BasicLocalBlockQueue; +import com.plotsquared.core.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/plotsquared/bukkit/util/block/GenChunk.java b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java similarity index 94% rename from Bukkit/src/main/java/com/plotsquared/bukkit/util/block/GenChunk.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java index 7bee3a93f..1c6cfe745 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/GenChunk.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java @@ -1,11 +1,12 @@ -package com.plotsquared.bukkit.util.block; +package com.plotsquared.bukkit.queue; +import com.plotsquared.bukkit.util.BukkitBlockUtil; import com.plotsquared.bukkit.util.BukkitUtil; -import com.plotsquared.location.ChunkWrapper; -import com.plotsquared.location.Location; -import com.plotsquared.util.MainUtil; -import com.plotsquared.queue.ScopedLocalBlockQueue; -import com.plotsquared.util.PatternUtil; +import com.plotsquared.core.location.ChunkWrapper; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.queue.ScopedLocalBlockQueue; +import com.plotsquared.core.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/plotsquared/bukkit/schematic/BukkitSchematicHandler.java b/Bukkit/src/main/java/com/plotsquared/bukkit/schematic/BukkitSchematicHandler.java index f88b159b5..63f6517e8 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/schematic/BukkitSchematicHandler.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/schematic/BukkitSchematicHandler.java @@ -1,13 +1,12 @@ package com.plotsquared.bukkit.schematic; import com.plotsquared.bukkit.util.BukkitUtil; -import com.plotsquared.location.Location; -import com.plotsquared.bukkit.util.block.StateWrapper; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.SchematicHandler; -import com.plotsquared.util.tasks.TaskManager; -import com.plotsquared.queue.LocalBlockQueue; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.SchematicHandler; +import com.plotsquared.core.util.task.TaskManager; +import com.plotsquared.core.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/plotsquared/bukkit/util/block/StateWrapper.java b/Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java similarity index 99% rename from Bukkit/src/main/java/com/plotsquared/bukkit/util/block/StateWrapper.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java index 6070539f5..73a1868c4 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/StateWrapper.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java @@ -1,8 +1,8 @@ -package com.plotsquared.bukkit.util.block; +package com.plotsquared.bukkit.schematic; import com.plotsquared.bukkit.util.BukkitUtil; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; import com.sk89q.jnbt.ByteTag; import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.ListTag; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitBlockUtil.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitBlockUtil.java similarity index 95% rename from Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitBlockUtil.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitBlockUtil.java index b6ac07e56..cd3df60f7 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitBlockUtil.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitBlockUtil.java @@ -1,4 +1,4 @@ -package com.plotsquared.bukkit.util.block; +package com.plotsquared.bukkit.util; import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.world.block.BlockState; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChatManager.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChatManager.java index 2219d10e5..73e4c85d1 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChatManager.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChatManager.java @@ -2,12 +2,12 @@ package com.plotsquared.bukkit.util; import com.plotsquared.bukkit.chat.FancyMessage; import com.plotsquared.bukkit.player.BukkitPlayer; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.player.ConsolePlayer; -import com.plotsquared.plot.message.PlotMessage; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.ChatManager; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.player.ConsolePlayer; +import com.plotsquared.core.plot.message.PlotMessage; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.ChatManager; import org.bukkit.ChatColor; import java.util.Arrays; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEconHandler.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEconHandler.java index f0f0c4c77..1ba4b1cc6 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEconHandler.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEconHandler.java @@ -2,9 +2,9 @@ package com.plotsquared.bukkit.util; import com.plotsquared.bukkit.player.BukkitOfflinePlayer; import com.plotsquared.bukkit.player.BukkitPlayer; -import com.plotsquared.player.OfflinePlotPlayer; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.EconHandler; +import com.plotsquared.core.player.OfflinePlotPlayer; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.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/plotsquared/bukkit/util/BukkitInventoryUtil.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitInventoryUtil.java index 707386059..474a843e1 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitInventoryUtil.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitInventoryUtil.java @@ -1,10 +1,10 @@ package com.plotsquared.bukkit.util; import com.plotsquared.bukkit.player.BukkitPlayer; -import com.plotsquared.plot.PlotInventory; -import com.plotsquared.plot.PlotItemStack; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.InventoryUtil; +import com.plotsquared.core.plot.PlotInventory; +import com.plotsquared.core.plot.PlotItemStack; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.InventoryUtil; import com.sk89q.worldedit.bukkit.BukkitAdapter; import org.bukkit.Bukkit; import org.bukkit.ChatColor; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java index 155c68c1f..024bfa7f2 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java @@ -1,15 +1,15 @@ package com.plotsquared.bukkit.util; import com.plotsquared.bukkit.generator.BukkitPlotGenerator; -import com.plotsquared.configuration.ConfigurationSection; -import com.plotsquared.configuration.file.YamlConfiguration; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.ConfigurationNode; -import com.plotsquared.generator.GeneratorWrapper; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotAreaType; -import com.plotsquared.plot.SetupObject; -import com.plotsquared.util.SetupUtils; +import com.plotsquared.core.configuration.ConfigurationSection; +import com.plotsquared.core.configuration.file.YamlConfiguration; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.ConfigurationNode; +import com.plotsquared.core.generator.GeneratorWrapper; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotAreaType; +import com.plotsquared.core.plot.SetupObject; +import com.plotsquared.core.util.SetupUtils; import io.papermc.lib.PaperLib; import org.bukkit.Bukkit; import org.bukkit.Chunk; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitTaskManager.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitTaskManager.java index 8238e3ce2..e44476d3d 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitTaskManager.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitTaskManager.java @@ -1,7 +1,7 @@ package com.plotsquared.bukkit.util; import com.plotsquared.bukkit.BukkitMain; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.util.task.TaskManager; import org.bukkit.Bukkit; public class BukkitTaskManager extends TaskManager { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java index c59e84338..b6b3cf359 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java @@ -2,19 +2,19 @@ package com.plotsquared.bukkit.util; import com.plotsquared.bukkit.BukkitMain; import com.plotsquared.bukkit.player.BukkitPlayer; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.MathMan; -import com.plotsquared.util.StringComparison; -import com.plotsquared.util.tasks.TaskManager; -import com.plotsquared.util.uuid.UUIDHandler; -import com.plotsquared.util.WorldUtil; -import com.plotsquared.util.BlockUtil; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.util.StringComparison; +import com.plotsquared.core.util.task.TaskManager; +import com.plotsquared.core.util.uuid.UUIDHandler; +import com.plotsquared.core.util.WorldUtil; +import com.plotsquared.core.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/plotsquared/bukkit/util/OfflinePlayerUtil.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/OfflinePlayerUtil.java index cab1675dd..3e6c2bfa3 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/OfflinePlayerUtil.java +++ b/Bukkit/src/main/java/com/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.plotsquared.util.ReflectionUtils.callConstructor; -import static com.plotsquared.util.ReflectionUtils.callMethod; -import static com.plotsquared.util.ReflectionUtils.getCbClass; -import static com.plotsquared.util.ReflectionUtils.getField; -import static com.plotsquared.util.ReflectionUtils.getNmsClass; -import static com.plotsquared.util.ReflectionUtils.getUtilClass; -import static com.plotsquared.util.ReflectionUtils.makeConstructor; -import static com.plotsquared.util.ReflectionUtils.makeField; -import static com.plotsquared.util.ReflectionUtils.makeMethod; +import static com.plotsquared.core.util.ReflectionUtils.callConstructor; +import static com.plotsquared.core.util.ReflectionUtils.callMethod; +import static com.plotsquared.core.util.ReflectionUtils.getCbClass; +import static com.plotsquared.core.util.ReflectionUtils.getField; +import static com.plotsquared.core.util.ReflectionUtils.getNmsClass; +import static com.plotsquared.core.util.ReflectionUtils.getUtilClass; +import static com.plotsquared.core.util.ReflectionUtils.makeConstructor; +import static com.plotsquared.core.util.ReflectionUtils.makeField; +import static com.plotsquared.core.util.ReflectionUtils.makeMethod; public class OfflinePlayerUtil { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/SendChunk.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/SendChunk.java index 8bcf06ff8..4120114be 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/SendChunk.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/SendChunk.java @@ -1,16 +1,16 @@ package com.plotsquared.bukkit.util; import com.plotsquared.bukkit.player.BukkitPlayer; -import com.plotsquared.PlotSquared; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.ReflectionUtils.RefClass; -import com.plotsquared.util.ReflectionUtils.RefConstructor; -import com.plotsquared.util.ReflectionUtils.RefField; -import com.plotsquared.util.ReflectionUtils.RefMethod; -import com.plotsquared.util.tasks.TaskManager; -import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.ReflectionUtils.RefClass; +import com.plotsquared.core.util.ReflectionUtils.RefConstructor; +import com.plotsquared.core.util.ReflectionUtils.RefField; +import com.plotsquared.core.util.ReflectionUtils.RefMethod; +import com.plotsquared.core.util.task.TaskManager; +import com.plotsquared.core.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.plotsquared.util.ReflectionUtils.getRefClass; +import static com.plotsquared.core.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/plotsquared/bukkit/util/SetGenCB.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/SetGenCB.java index 3985c0e20..2de8071d4 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/SetGenCB.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/SetGenCB.java @@ -1,9 +1,9 @@ package com.plotsquared.bukkit.util; import com.plotsquared.bukkit.generator.BukkitAugmentedGenerator; -import com.plotsquared.PlotSquared; -import com.plotsquared.generator.GeneratorWrapper; -import com.plotsquared.util.SetupUtils; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.generator.GeneratorWrapper; +import com.plotsquared.core.util.SetupUtils; import org.bukkit.World; import org.bukkit.generator.ChunkGenerator; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java index 17565e392..afc23727f 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java @@ -1,8 +1,8 @@ package com.plotsquared.bukkit.util; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; import org.bukkit.Bukkit; import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/DefaultUUIDWrapper.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/DefaultUUIDWrapper.java index 0952d6dd9..c8a2f2d16 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/DefaultUUIDWrapper.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/DefaultUUIDWrapper.java @@ -2,9 +2,9 @@ package com.plotsquared.bukkit.util.uuid; import com.plotsquared.bukkit.player.BukkitOfflinePlayer; import com.plotsquared.bukkit.player.BukkitPlayer; -import com.plotsquared.player.OfflinePlotPlayer; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.uuid.UUIDWrapper; +import com.plotsquared.core.player.OfflinePlotPlayer; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.uuid.UUIDWrapper; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.jetbrains.annotations.NotNull; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/FileUUIDHandler.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/FileUUIDHandler.java index 5daee4e44..951411a71 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/FileUUIDHandler.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/FileUUIDHandler.java @@ -1,17 +1,17 @@ package com.plotsquared.bukkit.util.uuid; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.player.OfflinePlotPlayer; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.StringWrapper; -import com.plotsquared.util.StringMan; -import com.plotsquared.util.tasks.TaskManager; -import com.plotsquared.util.uuid.UUIDHandler; -import com.plotsquared.util.uuid.UUIDHandlerImplementation; -import com.plotsquared.plot.expiration.ExpireManager; -import com.plotsquared.util.uuid.UUIDWrapper; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.player.OfflinePlotPlayer; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.StringWrapper; +import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.util.task.TaskManager; +import com.plotsquared.core.util.uuid.UUIDHandler; +import com.plotsquared.core.util.uuid.UUIDHandlerImplementation; +import com.plotsquared.core.plot.expiration.ExpireManager; +import com.plotsquared.core.util.uuid.UUIDWrapper; import com.google.common.collect.HashBiMap; import com.google.common.collect.Sets; import com.sk89q.jnbt.CompoundTag; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/LowerOfflineUUIDWrapper.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/LowerOfflineUUIDWrapper.java index 38006f123..cabb97a4c 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/LowerOfflineUUIDWrapper.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/LowerOfflineUUIDWrapper.java @@ -1,7 +1,7 @@ package com.plotsquared.bukkit.util.uuid; -import com.plotsquared.player.OfflinePlotPlayer; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.player.OfflinePlotPlayer; +import com.plotsquared.core.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/plotsquared/bukkit/util/uuid/OfflineUUIDWrapper.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/OfflineUUIDWrapper.java index 0c9351c24..5a95429de 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/OfflineUUIDWrapper.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/OfflineUUIDWrapper.java @@ -1,12 +1,12 @@ package com.plotsquared.bukkit.util.uuid; import com.plotsquared.bukkit.player.BukkitOfflinePlayer; -import com.plotsquared.PlotSquared; -import com.plotsquared.player.OfflinePlotPlayer; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.StringWrapper; -import com.plotsquared.util.uuid.UUIDHandler; -import com.plotsquared.util.uuid.UUIDWrapper; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.player.OfflinePlotPlayer; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.StringWrapper; +import com.plotsquared.core.util.uuid.UUIDHandler; +import com.plotsquared.core.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/plotsquared/bukkit/util/uuid/SQLUUIDHandler.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/SQLUUIDHandler.java index 27124023b..126606b5a 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/SQLUUIDHandler.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/SQLUUIDHandler.java @@ -1,16 +1,16 @@ package com.plotsquared.bukkit.util.uuid; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.database.SQLite; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.StringWrapper; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.tasks.TaskManager; -import com.plotsquared.util.uuid.UUIDHandler; -import com.plotsquared.util.uuid.UUIDHandlerImplementation; -import com.plotsquared.util.uuid.UUIDWrapper; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.database.SQLite; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.StringWrapper; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.task.TaskManager; +import com.plotsquared.core.util.uuid.UUIDHandler; +import com.plotsquared.core.util.uuid.UUIDHandlerImplementation; +import com.plotsquared.core.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/plotsquared/IPlotMain.java b/Core/src/main/java/com/plotsquared/core/IPlotMain.java similarity index 86% rename from Core/src/main/java/com/plotsquared/IPlotMain.java rename to Core/src/main/java/com/plotsquared/core/IPlotMain.java index 72cd470c8..3beb51cd4 100644 --- a/Core/src/main/java/com/plotsquared/IPlotMain.java +++ b/Core/src/main/java/com/plotsquared/core/IPlotMain.java @@ -1,20 +1,20 @@ -package com.plotsquared; +package com.plotsquared.core; -import com.plotsquared.generator.GeneratorWrapper; -import com.plotsquared.generator.HybridUtils; -import com.plotsquared.generator.IndependentPlotGenerator; -import com.plotsquared.util.logger.ILogger; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.ChatManager; -import com.plotsquared.util.ChunkManager; -import com.plotsquared.util.EconHandler; -import com.plotsquared.util.InventoryUtil; -import com.plotsquared.util.SchematicHandler; -import com.plotsquared.util.SetupUtils; -import com.plotsquared.util.tasks.TaskManager; -import com.plotsquared.util.uuid.UUIDHandlerImplementation; -import com.plotsquared.util.WorldUtil; -import com.plotsquared.queue.QueueProvider; +import com.plotsquared.core.generator.GeneratorWrapper; +import com.plotsquared.core.generator.HybridUtils; +import com.plotsquared.core.generator.IndependentPlotGenerator; +import com.plotsquared.core.util.logger.ILogger; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.ChatManager; +import com.plotsquared.core.util.ChunkManager; +import com.plotsquared.core.util.EconHandler; +import com.plotsquared.core.util.InventoryUtil; +import com.plotsquared.core.util.SchematicHandler; +import com.plotsquared.core.util.SetupUtils; +import com.plotsquared.core.util.task.TaskManager; +import com.plotsquared.core.util.uuid.UUIDHandlerImplementation; +import com.plotsquared.core.util.WorldUtil; +import com.plotsquared.core.queue.QueueProvider; import com.sk89q.worldedit.extension.platform.Actor; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/Platform.java b/Core/src/main/java/com/plotsquared/core/Platform.java similarity index 67% rename from Core/src/main/java/com/plotsquared/Platform.java rename to Core/src/main/java/com/plotsquared/core/Platform.java index 56e765872..c3b7353e9 100644 --- a/Core/src/main/java/com/plotsquared/Platform.java +++ b/Core/src/main/java/com/plotsquared/core/Platform.java @@ -1,4 +1,4 @@ -package com.plotsquared; +package com.plotsquared.core; public enum Platform { Bukkit, Sponge, Spigot, Paper diff --git a/Core/src/main/java/com/plotsquared/PlotSquared.java b/Core/src/main/java/com/plotsquared/core/PlotSquared.java similarity index 96% rename from Core/src/main/java/com/plotsquared/PlotSquared.java rename to Core/src/main/java/com/plotsquared/core/PlotSquared.java index 9a6b63559..5ba902984 100644 --- a/Core/src/main/java/com/plotsquared/PlotSquared.java +++ b/Core/src/main/java/com/plotsquared/core/PlotSquared.java @@ -1,62 +1,62 @@ -package com.plotsquared; +package com.plotsquared.core; -import com.plotsquared.configuration.ConfigurationSection; -import com.plotsquared.configuration.MemorySection; -import com.plotsquared.configuration.file.YamlConfiguration; -import com.plotsquared.configuration.serialization.ConfigurationSerialization; -import com.plotsquared.location.Location; -import com.plotsquared.player.ConsolePlayer; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.commands.WE_Anywhere; -import com.plotsquared.config.Caption; -import com.plotsquared.config.CaptionUtility; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Configuration; -import com.plotsquared.config.Settings; -import com.plotsquared.config.Storage; -import com.plotsquared.database.DBFunc; -import com.plotsquared.database.Database; -import com.plotsquared.database.MySQL; -import com.plotsquared.database.SQLManager; -import com.plotsquared.database.SQLite; -import com.plotsquared.generator.GeneratorWrapper; -import com.plotsquared.generator.HybridPlotWorld; -import com.plotsquared.generator.HybridUtils; -import com.plotsquared.generator.IndependentPlotGenerator; -import com.plotsquared.listener.WESubscriber; -import com.plotsquared.plot.comment.CommentManager; -import com.plotsquared.util.ChatManager; -import com.plotsquared.plot.BlockBucket; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotAreaType; -import com.plotsquared.plot.PlotCluster; -import com.plotsquared.plot.PlotFilter; -import com.plotsquared.plot.PlotId; -import com.plotsquared.plot.PlotManager; -import com.plotsquared.util.StringWrapper; -import com.plotsquared.util.ChunkManager; -import com.plotsquared.util.EconHandler; -import com.plotsquared.util.EventDispatcher; -import com.plotsquared.util.LegacyConverter; -import com.plotsquared.util.MathMan; -import com.plotsquared.util.SchematicHandler; -import com.plotsquared.util.StringMan; -import com.plotsquared.util.logger.ILogger; -import com.plotsquared.plot.worlds.DefaultPlotAreaManager; -import com.plotsquared.plot.worlds.PlotAreaManager; -import com.plotsquared.plot.worlds.SinglePlotArea; -import com.plotsquared.plot.worlds.SinglePlotAreaManager; -import com.plotsquared.queue.GlobalBlockQueue; -import com.plotsquared.plot.expiration.ExpireManager; -import com.plotsquared.plot.expiration.ExpiryTask; -import com.plotsquared.util.InventoryUtil; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.ReflectionUtils; -import com.plotsquared.util.SetupUtils; -import com.plotsquared.util.WorldUtil; -import com.plotsquared.util.uuid.UUIDHandler; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.configuration.ConfigurationSection; +import com.plotsquared.core.configuration.MemorySection; +import com.plotsquared.core.configuration.file.YamlConfiguration; +import com.plotsquared.core.configuration.serialization.ConfigurationSerialization; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.player.ConsolePlayer; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.command.WE_Anywhere; +import com.plotsquared.core.config.Caption; +import com.plotsquared.core.config.CaptionUtility; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Configuration; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.config.Storage; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.database.Database; +import com.plotsquared.core.database.MySQL; +import com.plotsquared.core.database.SQLManager; +import com.plotsquared.core.database.SQLite; +import com.plotsquared.core.generator.GeneratorWrapper; +import com.plotsquared.core.generator.HybridPlotWorld; +import com.plotsquared.core.generator.HybridUtils; +import com.plotsquared.core.generator.IndependentPlotGenerator; +import com.plotsquared.core.listener.WESubscriber; +import com.plotsquared.core.plot.comment.CommentManager; +import com.plotsquared.core.util.ChatManager; +import com.plotsquared.core.plot.BlockBucket; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotAreaType; +import com.plotsquared.core.plot.PlotCluster; +import com.plotsquared.core.plot.PlotFilter; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.plot.PlotManager; +import com.plotsquared.core.util.StringWrapper; +import com.plotsquared.core.util.ChunkManager; +import com.plotsquared.core.util.EconHandler; +import com.plotsquared.core.util.EventDispatcher; +import com.plotsquared.core.util.LegacyConverter; +import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.util.SchematicHandler; +import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.util.logger.ILogger; +import com.plotsquared.core.plot.world.DefaultPlotAreaManager; +import com.plotsquared.core.plot.world.PlotAreaManager; +import com.plotsquared.core.plot.world.SinglePlotArea; +import com.plotsquared.core.plot.world.SinglePlotAreaManager; +import com.plotsquared.core.queue.GlobalBlockQueue; +import com.plotsquared.core.plot.expiration.ExpireManager; +import com.plotsquared.core.plot.expiration.ExpiryTask; +import com.plotsquared.core.util.InventoryUtil; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.ReflectionUtils; +import com.plotsquared.core.util.SetupUtils; +import com.plotsquared.core.util.WorldUtil; +import com.plotsquared.core.util.uuid.UUIDHandler; +import com.plotsquared.core.util.task.TaskManager; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.regions.CuboidRegion; @@ -75,6 +75,7 @@ import java.sql.SQLException; import java.util.*; import java.util.Map.Entry; import java.util.function.Consumer; +import java.util.function.Predicate; import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.zip.ZipEntry; diff --git a/Core/src/main/java/com/plotsquared/PlotVersion.java b/Core/src/main/java/com/plotsquared/core/PlotVersion.java similarity index 98% rename from Core/src/main/java/com/plotsquared/PlotVersion.java rename to Core/src/main/java/com/plotsquared/core/PlotVersion.java index ef76d6b2b..1d469a3d5 100644 --- a/Core/src/main/java/com/plotsquared/PlotVersion.java +++ b/Core/src/main/java/com/plotsquared/core/PlotVersion.java @@ -1,4 +1,4 @@ -package com.plotsquared; +package com.plotsquared.core; public class PlotVersion { public final int year, month, day, hash, build; diff --git a/Core/src/main/java/com/plotsquared/api/PlotAPI.java b/Core/src/main/java/com/plotsquared/core/api/PlotAPI.java similarity index 86% rename from Core/src/main/java/com/plotsquared/api/PlotAPI.java rename to Core/src/main/java/com/plotsquared/core/api/PlotAPI.java index 040a865e5..548196898 100644 --- a/Core/src/main/java/com/plotsquared/api/PlotAPI.java +++ b/Core/src/main/java/com/plotsquared/core/api/PlotAPI.java @@ -1,20 +1,20 @@ -package com.plotsquared.api; +package com.plotsquared.core.api; -import com.plotsquared.configuration.file.YamlConfiguration; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Caption; -import com.plotsquared.config.Captions; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.queue.GlobalBlockQueue; -import com.plotsquared.util.ChunkManager; -import com.plotsquared.util.EventDispatcher; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.SchematicHandler; -import com.plotsquared.util.uuid.UUIDHandler; -import com.plotsquared.util.uuid.UUIDWrapper; +import com.plotsquared.core.configuration.file.YamlConfiguration; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Caption; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.queue.GlobalBlockQueue; +import com.plotsquared.core.util.ChunkManager; +import com.plotsquared.core.util.EventDispatcher; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.SchematicHandler; +import com.plotsquared.core.util.uuid.UUIDHandler; +import com.plotsquared.core.util.uuid.UUIDWrapper; import lombok.NoArgsConstructor; import java.util.Collections; @@ -33,7 +33,7 @@ import java.util.UUID; *
  • {@link PlotSquared}
    • * * - * @version 3.3.3 + * @version 5 */ @SuppressWarnings({"unused", "WeakerAccess"}) @NoArgsConstructor public class PlotAPI { diff --git a/Core/src/main/java/com/plotsquared/collection/ArrayUtil.java b/Core/src/main/java/com/plotsquared/core/collection/ArrayUtil.java similarity index 92% rename from Core/src/main/java/com/plotsquared/collection/ArrayUtil.java rename to Core/src/main/java/com/plotsquared/core/collection/ArrayUtil.java index 0088574c4..9fda71ea2 100644 --- a/Core/src/main/java/com/plotsquared/collection/ArrayUtil.java +++ b/Core/src/main/java/com/plotsquared/core/collection/ArrayUtil.java @@ -1,4 +1,4 @@ -package com.plotsquared.collection; +package com.plotsquared.core.collection; import java.util.Arrays; diff --git a/Core/src/main/java/com/plotsquared/util/ByteArrayUtilities.java b/Core/src/main/java/com/plotsquared/core/collection/ByteArrayUtilities.java similarity index 85% rename from Core/src/main/java/com/plotsquared/util/ByteArrayUtilities.java rename to Core/src/main/java/com/plotsquared/core/collection/ByteArrayUtilities.java index 758f76a6e..4afb28807 100644 --- a/Core/src/main/java/com/plotsquared/util/ByteArrayUtilities.java +++ b/Core/src/main/java/com/plotsquared/core/collection/ByteArrayUtilities.java @@ -1,4 +1,4 @@ -package com.plotsquared.util; +package com.plotsquared.core.collection; public class ByteArrayUtilities { diff --git a/Core/src/main/java/com/plotsquared/collection/FlatRandomCollection.java b/Core/src/main/java/com/plotsquared/core/collection/FlatRandomCollection.java similarity index 94% rename from Core/src/main/java/com/plotsquared/collection/FlatRandomCollection.java rename to Core/src/main/java/com/plotsquared/core/collection/FlatRandomCollection.java index 1abc3ad11..95f861bae 100644 --- a/Core/src/main/java/com/plotsquared/collection/FlatRandomCollection.java +++ b/Core/src/main/java/com/plotsquared/core/collection/FlatRandomCollection.java @@ -1,6 +1,6 @@ -package com.plotsquared.collection; +package com.plotsquared.core.collection; -import com.plotsquared.util.MathMan; +import com.plotsquared.core.util.MathMan; import java.util.ArrayList; import java.util.Map; diff --git a/Core/src/main/java/com/plotsquared/util/area/QuadMap.java b/Core/src/main/java/com/plotsquared/core/collection/QuadMap.java similarity index 99% rename from Core/src/main/java/com/plotsquared/util/area/QuadMap.java rename to Core/src/main/java/com/plotsquared/core/collection/QuadMap.java index 0a87c5732..6719e4af6 100644 --- a/Core/src/main/java/com/plotsquared/util/area/QuadMap.java +++ b/Core/src/main/java/com/plotsquared/core/collection/QuadMap.java @@ -1,6 +1,6 @@ -package com.plotsquared.util.area; +package com.plotsquared.core.collection; -import com.plotsquared.util.RegionUtil; +import com.plotsquared.core.util.RegionUtil; import com.sk89q.worldedit.regions.CuboidRegion; import java.util.HashSet; diff --git a/Core/src/main/java/com/plotsquared/collection/RandomCollection.java b/Core/src/main/java/com/plotsquared/core/collection/RandomCollection.java similarity index 95% rename from Core/src/main/java/com/plotsquared/collection/RandomCollection.java rename to Core/src/main/java/com/plotsquared/core/collection/RandomCollection.java index 205ff6f12..ec27b8536 100644 --- a/Core/src/main/java/com/plotsquared/collection/RandomCollection.java +++ b/Core/src/main/java/com/plotsquared/core/collection/RandomCollection.java @@ -1,4 +1,4 @@ -package com.plotsquared.collection; +package com.plotsquared.core.collection; import java.util.Map; import java.util.Random; diff --git a/Core/src/main/java/com/plotsquared/collection/SimpleRandomCollection.java b/Core/src/main/java/com/plotsquared/core/collection/SimpleRandomCollection.java similarity index 94% rename from Core/src/main/java/com/plotsquared/collection/SimpleRandomCollection.java rename to Core/src/main/java/com/plotsquared/core/collection/SimpleRandomCollection.java index b611f0f3d..0e6b79d70 100644 --- a/Core/src/main/java/com/plotsquared/collection/SimpleRandomCollection.java +++ b/Core/src/main/java/com/plotsquared/core/collection/SimpleRandomCollection.java @@ -1,4 +1,4 @@ -package com.plotsquared.collection; +package com.plotsquared.core.collection; import java.util.Map; import java.util.NavigableMap; diff --git a/Core/src/main/java/com/plotsquared/commands/Add.java b/Core/src/main/java/com/plotsquared/core/command/Add.java similarity index 88% rename from Core/src/main/java/com/plotsquared/commands/Add.java rename to Core/src/main/java/com/plotsquared/core/command/Add.java index 7a0050e32..3b3464780 100644 --- a/Core/src/main/java/com/plotsquared/commands/Add.java +++ b/Core/src/main/java/com/plotsquared/core/command/Add.java @@ -1,14 +1,14 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.database.DBFunc; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal2; -import com.plotsquared.util.tasks.RunnableVal3; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.Permissions; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal2; +import com.plotsquared.core.util.task.RunnableVal3; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.Permissions; import java.util.Iterator; import java.util.Set; diff --git a/Core/src/main/java/com/plotsquared/commands/Alias.java b/Core/src/main/java/com/plotsquared/core/command/Alias.java similarity index 88% rename from Core/src/main/java/com/plotsquared/commands/Alias.java rename to Core/src/main/java/com/plotsquared/core/command/Alias.java index 1b3afe172..befcc2134 100644 --- a/Core/src/main/java/com/plotsquared/commands/Alias.java +++ b/Core/src/main/java/com/plotsquared/core/command/Alias.java @@ -1,15 +1,15 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.StringWrapper; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.MathMan; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.StringWrapper; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.uuid.UUIDHandler; @CommandDeclaration(command = "setalias", permission = "plots.alias", diff --git a/Core/src/main/java/com/plotsquared/commands/Area.java b/Core/src/main/java/com/plotsquared/core/command/Area.java similarity index 95% rename from Core/src/main/java/com/plotsquared/commands/Area.java rename to Core/src/main/java/com/plotsquared/core/command/Area.java index 769e3f6f6..694f36ae9 100644 --- a/Core/src/main/java/com/plotsquared/commands/Area.java +++ b/Core/src/main/java/com/plotsquared/core/command/Area.java @@ -1,30 +1,30 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.configuration.ConfigurationSection; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Configuration; -import com.plotsquared.generator.AugmentedUtils; -import com.plotsquared.generator.HybridPlotWorld; -import com.plotsquared.location.Location; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotAreaTerrainType; -import com.plotsquared.plot.PlotAreaType; -import com.plotsquared.plot.PlotId; -import com.plotsquared.plot.message.PlotMessage; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.tasks.RunnableVal3; -import com.plotsquared.plot.SetupObject; -import com.plotsquared.events.TeleportCause; -import com.plotsquared.util.ChunkManager; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.MathMan; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.SetupUtils; -import com.plotsquared.util.StringMan; -import com.plotsquared.util.WorldUtil; -import com.plotsquared.util.RegionUtil; +import com.plotsquared.core.configuration.ConfigurationSection; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Configuration; +import com.plotsquared.core.generator.AugmentedUtils; +import com.plotsquared.core.generator.HybridPlotWorld; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotAreaTerrainType; +import com.plotsquared.core.plot.PlotAreaType; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.plot.message.PlotMessage; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.task.RunnableVal3; +import com.plotsquared.core.plot.SetupObject; +import com.plotsquared.core.events.TeleportCause; +import com.plotsquared.core.util.ChunkManager; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.SetupUtils; +import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.util.WorldUtil; +import com.plotsquared.core.util.RegionUtil; import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.regions.CuboidRegion; diff --git a/Core/src/main/java/com/plotsquared/commands/Argument.java b/Core/src/main/java/com/plotsquared/core/command/Argument.java similarity index 96% rename from Core/src/main/java/com/plotsquared/commands/Argument.java rename to Core/src/main/java/com/plotsquared/core/command/Argument.java index 4de4f3de9..97e265132 100644 --- a/Core/src/main/java/com/plotsquared/commands/Argument.java +++ b/Core/src/main/java/com/plotsquared/core/command/Argument.java @@ -1,6 +1,6 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.plot.PlotId; +import com.plotsquared.core.plot.PlotId; public abstract class Argument { diff --git a/Core/src/main/java/com/plotsquared/commands/Auto.java b/Core/src/main/java/com/plotsquared/core/command/Auto.java similarity index 91% rename from Core/src/main/java/com/plotsquared/commands/Auto.java rename to Core/src/main/java/com/plotsquared/core/command/Auto.java index 9ee02c411..f8b79f818 100644 --- a/Core/src/main/java/com/plotsquared/commands/Auto.java +++ b/Core/src/main/java/com/plotsquared/core/command/Auto.java @@ -1,26 +1,26 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.CaptionUtility; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.database.DBFunc; -import com.plotsquared.events.PlayerAutoPlotEvent; -import com.plotsquared.events.PlotAutoMergeEvent; -import com.plotsquared.events.Result; -import com.plotsquared.util.Expression; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotAreaType; -import com.plotsquared.plot.PlotId; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.events.TeleportCause; -import com.plotsquared.util.tasks.AutoClaimFinishTask; -import com.plotsquared.util.EconHandler; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.CaptionUtility; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.events.PlayerAutoPlotEvent; +import com.plotsquared.core.events.PlotAutoMergeEvent; +import com.plotsquared.core.events.Result; +import com.plotsquared.core.util.Expression; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotAreaType; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.events.TeleportCause; +import com.plotsquared.core.util.task.AutoClaimFinishTask; +import com.plotsquared.core.util.EconHandler; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.task.TaskManager; import com.google.common.primitives.Ints; import org.jetbrains.annotations.Nullable; diff --git a/Core/src/main/java/com/plotsquared/commands/Biome.java b/Core/src/main/java/com/plotsquared/core/command/Biome.java similarity index 84% rename from Core/src/main/java/com/plotsquared/commands/Biome.java rename to Core/src/main/java/com/plotsquared/core/command/Biome.java index bfdae31b6..5fc7210a0 100644 --- a/Core/src/main/java/com/plotsquared/commands/Biome.java +++ b/Core/src/main/java/com/plotsquared/core/command/Biome.java @@ -1,10 +1,10 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.StringMan; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.StringMan; import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.biome.BiomeTypes; diff --git a/Core/src/main/java/com/plotsquared/commands/Buy.java b/Core/src/main/java/com/plotsquared/core/command/Buy.java similarity index 80% rename from Core/src/main/java/com/plotsquared/commands/Buy.java rename to Core/src/main/java/com/plotsquared/core/command/Buy.java index 33ba10e6d..38aaa4649 100644 --- a/Core/src/main/java/com/plotsquared/commands/Buy.java +++ b/Core/src/main/java/com/plotsquared/core/command/Buy.java @@ -1,18 +1,18 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.events.PlotFlagRemoveEvent; -import com.plotsquared.events.Result; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.plot.flags.implementations.PriceFlag; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal2; -import com.plotsquared.util.tasks.RunnableVal3; -import com.plotsquared.util.EconHandler; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.events.PlotFlagRemoveEvent; +import com.plotsquared.core.events.Result; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.plot.flag.implementations.PriceFlag; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal2; +import com.plotsquared.core.util.task.RunnableVal3; +import com.plotsquared.core.util.EconHandler; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.uuid.UUIDHandler; import java.util.Set; import java.util.concurrent.CompletableFuture; diff --git a/Core/src/main/java/com/plotsquared/commands/Chat.java b/Core/src/main/java/com/plotsquared/core/command/Chat.java similarity index 84% rename from Core/src/main/java/com/plotsquared/commands/Chat.java rename to Core/src/main/java/com/plotsquared/core/command/Chat.java index cb1cac449..0256b6a53 100644 --- a/Core/src/main/java/com/plotsquared/commands/Chat.java +++ b/Core/src/main/java/com/plotsquared/core/command/Chat.java @@ -1,6 +1,6 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.player.PlotPlayer; @CommandDeclaration(command = "chat", description = "Toggle plot chat on or off", diff --git a/Core/src/main/java/com/plotsquared/commands/Claim.java b/Core/src/main/java/com/plotsquared/core/command/Claim.java similarity index 85% rename from Core/src/main/java/com/plotsquared/commands/Claim.java rename to Core/src/main/java/com/plotsquared/core/command/Claim.java index 5bc5a1261..486850e47 100644 --- a/Core/src/main/java/com/plotsquared/commands/Claim.java +++ b/Core/src/main/java/com/plotsquared/core/command/Claim.java @@ -1,24 +1,24 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.config.CaptionUtility; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.database.DBFunc; -import com.plotsquared.events.PlayerClaimPlotEvent; -import com.plotsquared.events.PlotMergeEvent; -import com.plotsquared.events.Result; -import com.plotsquared.util.EconHandler; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.tasks.TaskManager; -import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.config.CaptionUtility; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.events.PlayerClaimPlotEvent; +import com.plotsquared.core.events.PlotMergeEvent; +import com.plotsquared.core.events.Result; +import com.plotsquared.core.util.EconHandler; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.task.TaskManager; +import com.plotsquared.core.util.task.RunnableVal; import com.google.common.primitives.Ints; -import com.plotsquared.location.Direction; -import com.plotsquared.util.Expression; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; +import com.plotsquared.core.location.Direction; +import com.plotsquared.core.util.Expression; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; @CommandDeclaration(command = "claim", aliases = "c", diff --git a/Core/src/main/java/com/plotsquared/commands/Clear.java b/Core/src/main/java/com/plotsquared/core/command/Clear.java similarity index 80% rename from Core/src/main/java/com/plotsquared/commands/Clear.java rename to Core/src/main/java/com/plotsquared/core/command/Clear.java index 836c7a012..3ea7784d3 100644 --- a/Core/src/main/java/com/plotsquared/commands/Clear.java +++ b/Core/src/main/java/com/plotsquared/core/command/Clear.java @@ -1,24 +1,24 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.events.PlotFlagRemoveEvent; -import com.plotsquared.events.Result; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.plot.flags.implementations.AnalysisFlag; -import com.plotsquared.plot.flags.implementations.DoneFlag; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal2; -import com.plotsquared.util.tasks.RunnableVal3; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.Permissions; -import com.plotsquared.queue.GlobalBlockQueue; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.events.PlotFlagRemoveEvent; +import com.plotsquared.core.events.Result; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.plot.flag.implementations.AnalysisFlag; +import com.plotsquared.core.plot.flag.implementations.DoneFlag; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal2; +import com.plotsquared.core.util.task.RunnableVal3; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.queue.GlobalBlockQueue; import java.util.concurrent.CompletableFuture; -import static com.plotsquared.commands.SubCommand.sendMessage; +import static com.plotsquared.core.command.SubCommand.sendMessage; @CommandDeclaration(command = "clear", description = "Clear the plot you stand on", diff --git a/Core/src/main/java/com/plotsquared/commands/Cluster.java b/Core/src/main/java/com/plotsquared/core/command/Cluster.java similarity index 97% rename from Core/src/main/java/com/plotsquared/commands/Cluster.java rename to Core/src/main/java/com/plotsquared/core/command/Cluster.java index 5c9cbe220..806a2ddee 100644 --- a/Core/src/main/java/com/plotsquared/commands/Cluster.java +++ b/Core/src/main/java/com/plotsquared/core/command/Cluster.java @@ -1,20 +1,20 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.database.DBFunc; -import com.plotsquared.location.BlockLoc; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotCluster; -import com.plotsquared.plot.PlotId; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.events.TeleportCause; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.location.BlockLoc; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotCluster; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.events.TeleportCause; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.uuid.UUIDHandler; import java.util.ArrayList; import java.util.HashSet; diff --git a/Core/src/main/java/com/plotsquared/commands/CmdConfirm.java b/Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java similarity index 77% rename from Core/src/main/java/com/plotsquared/commands/CmdConfirm.java rename to Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java index 37e314231..1edd2bc99 100644 --- a/Core/src/main/java/com/plotsquared/commands/CmdConfirm.java +++ b/Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java @@ -1,9 +1,9 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.config.Captions; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.task.TaskManager; public class CmdConfirm { diff --git a/Core/src/main/java/com/plotsquared/commands/CmdInstance.java b/Core/src/main/java/com/plotsquared/core/command/CmdInstance.java similarity index 86% rename from Core/src/main/java/com/plotsquared/commands/CmdInstance.java rename to Core/src/main/java/com/plotsquared/core/command/CmdInstance.java index 545c3e3a1..1905d4c5b 100644 --- a/Core/src/main/java/com/plotsquared/commands/CmdInstance.java +++ b/Core/src/main/java/com/plotsquared/core/command/CmdInstance.java @@ -1,4 +1,4 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; public class CmdInstance { public final Runnable command; diff --git a/Core/src/main/java/com/plotsquared/commands/Command.java b/Core/src/main/java/com/plotsquared/core/command/Command.java similarity index 97% rename from Core/src/main/java/com/plotsquared/commands/Command.java rename to Core/src/main/java/com/plotsquared/core/command/Command.java index f7aa077ed..1bc9db9be 100644 --- a/Core/src/main/java/com/plotsquared/commands/Command.java +++ b/Core/src/main/java/com/plotsquared/core/command/Command.java @@ -1,17 +1,17 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.configuration.file.YamlConfiguration; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.message.PlotMessage; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal2; -import com.plotsquared.util.tasks.RunnableVal3; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.MathMan; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.StringComparison; -import com.plotsquared.util.StringMan; +import com.plotsquared.core.configuration.file.YamlConfiguration; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.message.PlotMessage; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal2; +import com.plotsquared.core.util.task.RunnableVal3; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.StringComparison; +import com.plotsquared.core.util.StringMan; import java.io.IOException; import java.lang.reflect.InvocationTargetException; diff --git a/Core/src/main/java/com/plotsquared/commands/CommandCaller.java b/Core/src/main/java/com/plotsquared/core/command/CommandCaller.java similarity index 92% rename from Core/src/main/java/com/plotsquared/commands/CommandCaller.java rename to Core/src/main/java/com/plotsquared/core/command/CommandCaller.java index 0cecb9b05..8e4840260 100644 --- a/Core/src/main/java/com/plotsquared/commands/CommandCaller.java +++ b/Core/src/main/java/com/plotsquared/core/command/CommandCaller.java @@ -1,4 +1,4 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; public interface CommandCaller { diff --git a/Core/src/main/java/com/plotsquared/commands/CommandCategory.java b/Core/src/main/java/com/plotsquared/core/command/CommandCategory.java similarity index 93% rename from Core/src/main/java/com/plotsquared/commands/CommandCategory.java rename to Core/src/main/java/com/plotsquared/core/command/CommandCategory.java index 889d7781c..b7563cb08 100644 --- a/Core/src/main/java/com/plotsquared/commands/CommandCategory.java +++ b/Core/src/main/java/com/plotsquared/core/command/CommandCategory.java @@ -1,6 +1,6 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.config.Captions; +import com.plotsquared.core.config.Captions; import lombok.RequiredArgsConstructor; /** diff --git a/Core/src/main/java/com/plotsquared/commands/CommandDeclaration.java b/Core/src/main/java/com/plotsquared/core/command/CommandDeclaration.java similarity index 94% rename from Core/src/main/java/com/plotsquared/commands/CommandDeclaration.java rename to Core/src/main/java/com/plotsquared/core/command/CommandDeclaration.java index aaf0831bc..22a8336f4 100644 --- a/Core/src/main/java/com/plotsquared/commands/CommandDeclaration.java +++ b/Core/src/main/java/com/plotsquared/core/command/CommandDeclaration.java @@ -1,4 +1,4 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Core/src/main/java/com/plotsquared/commands/Comment.java b/Core/src/main/java/com/plotsquared/core/command/Comment.java similarity index 84% rename from Core/src/main/java/com/plotsquared/commands/Comment.java rename to Core/src/main/java/com/plotsquared/core/command/Comment.java index 9488cbeb3..58e64c684 100644 --- a/Core/src/main/java/com/plotsquared/commands/Comment.java +++ b/Core/src/main/java/com/plotsquared/core/command/Comment.java @@ -1,14 +1,14 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.plot.comment.CommentInbox; -import com.plotsquared.plot.comment.PlotComment; -import com.plotsquared.plot.comment.CommentManager; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.StringMan; -import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.comment.CommentInbox; +import com.plotsquared.core.plot.comment.PlotComment; +import com.plotsquared.core.plot.comment.CommentManager; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.util.uuid.UUIDHandler; import java.util.Arrays; import java.util.Locale; diff --git a/Core/src/main/java/com/plotsquared/commands/Condense.java b/Core/src/main/java/com/plotsquared/core/command/Condense.java similarity index 95% rename from Core/src/main/java/com/plotsquared/commands/Condense.java rename to Core/src/main/java/com/plotsquared/core/command/Condense.java index 8162f82d9..9fc2fa6ee 100644 --- a/Core/src/main/java/com/plotsquared/commands/Condense.java +++ b/Core/src/main/java/com/plotsquared/core/command/Condense.java @@ -1,14 +1,14 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotId; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.MathMan; -import com.plotsquared.util.tasks.TaskManager; -import com.plotsquared.util.WorldUtil; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.util.task.TaskManager; +import com.plotsquared.core.util.WorldUtil; import java.util.ArrayList; import java.util.Collection; diff --git a/Core/src/main/java/com/plotsquared/commands/Confirm.java b/Core/src/main/java/com/plotsquared/core/command/Confirm.java similarity index 75% rename from Core/src/main/java/com/plotsquared/commands/Confirm.java rename to Core/src/main/java/com/plotsquared/core/command/Confirm.java index 1f1cccadd..558985899 100644 --- a/Core/src/main/java/com/plotsquared/commands/Confirm.java +++ b/Core/src/main/java/com/plotsquared/core/command/Confirm.java @@ -1,10 +1,10 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.task.TaskManager; @CommandDeclaration(command = "confirm", permission = "plots.use", diff --git a/Core/src/main/java/com/plotsquared/commands/Continue.java b/Core/src/main/java/com/plotsquared/core/command/Continue.java similarity index 77% rename from Core/src/main/java/com/plotsquared/commands/Continue.java rename to Core/src/main/java/com/plotsquared/core/command/Continue.java index 5bf60149e..a94d34f9c 100644 --- a/Core/src/main/java/com/plotsquared/commands/Continue.java +++ b/Core/src/main/java/com/plotsquared/core/command/Continue.java @@ -1,16 +1,16 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.events.PlotFlagRemoveEvent; -import com.plotsquared.events.Result; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.plot.flags.implementations.DoneFlag; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.Permissions; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.events.PlotFlagRemoveEvent; +import com.plotsquared.core.events.Result; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.plot.flag.implementations.DoneFlag; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.Permissions; @CommandDeclaration(command = "continue", description = "Continue a plot that was previously marked as done", diff --git a/Core/src/main/java/com/plotsquared/commands/Copy.java b/Core/src/main/java/com/plotsquared/core/command/Copy.java similarity index 84% rename from Core/src/main/java/com/plotsquared/commands/Copy.java rename to Core/src/main/java/com/plotsquared/core/command/Copy.java index 158d04de2..91e2a5441 100644 --- a/Core/src/main/java/com/plotsquared/commands/Copy.java +++ b/Core/src/main/java/com/plotsquared/core/command/Copy.java @@ -1,11 +1,11 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.config.Captions; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.Permissions; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.Permissions; @CommandDeclaration(command = "copy", permission = "plots.copy", diff --git a/Core/src/main/java/com/plotsquared/commands/CreateRoadSchematic.java b/Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java similarity index 72% rename from Core/src/main/java/com/plotsquared/commands/CreateRoadSchematic.java rename to Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java index b3b2a1b6d..363213acc 100644 --- a/Core/src/main/java/com/plotsquared/commands/CreateRoadSchematic.java +++ b/Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java @@ -1,12 +1,12 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.config.Captions; -import com.plotsquared.generator.HybridPlotWorld; -import com.plotsquared.generator.HybridUtils; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.MainUtil; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.generator.HybridPlotWorld; +import com.plotsquared.core.generator.HybridUtils; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.MainUtil; @CommandDeclaration(command = "createroadschematic", aliases = {"crs"}, diff --git a/Core/src/main/java/com/plotsquared/commands/DatabaseCommand.java b/Core/src/main/java/com/plotsquared/core/command/DatabaseCommand.java similarity index 93% rename from Core/src/main/java/com/plotsquared/commands/DatabaseCommand.java rename to Core/src/main/java/com/plotsquared/core/command/DatabaseCommand.java index 11ecbf17b..b6f82ce5d 100644 --- a/Core/src/main/java/com/plotsquared/commands/DatabaseCommand.java +++ b/Core/src/main/java/com/plotsquared/core/command/DatabaseCommand.java @@ -1,18 +1,18 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.database.DBFunc; -import com.plotsquared.database.MySQL; -import com.plotsquared.database.SQLManager; -import com.plotsquared.database.SQLite; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotId; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.plot.worlds.SinglePlotArea; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.tasks.TaskManager; -import com.plotsquared.database.Database; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.database.MySQL; +import com.plotsquared.core.database.SQLManager; +import com.plotsquared.core.database.SQLite; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.world.SinglePlotArea; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.task.TaskManager; +import com.plotsquared.core.database.Database; import java.io.File; import java.sql.SQLException; diff --git a/Core/src/main/java/com/plotsquared/commands/Debug.java b/Core/src/main/java/com/plotsquared/core/command/Debug.java similarity index 88% rename from Core/src/main/java/com/plotsquared/commands/Debug.java rename to Core/src/main/java/com/plotsquared/core/command/Debug.java index 5cbcc407f..3a48a0241 100644 --- a/Core/src/main/java/com/plotsquared/commands/Debug.java +++ b/Core/src/main/java/com/plotsquared/core/command/Debug.java @@ -1,12 +1,12 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.ChunkManager; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.StringMan; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.ChunkManager; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.util.task.TaskManager; import java.util.Map; diff --git a/Core/src/main/java/com/plotsquared/commands/DebugAllowUnsafe.java b/Core/src/main/java/com/plotsquared/core/command/DebugAllowUnsafe.java similarity index 87% rename from Core/src/main/java/com/plotsquared/commands/DebugAllowUnsafe.java rename to Core/src/main/java/com/plotsquared/core/command/DebugAllowUnsafe.java index 064e2adec..2f2854aa0 100644 --- a/Core/src/main/java/com/plotsquared/commands/DebugAllowUnsafe.java +++ b/Core/src/main/java/com/plotsquared/core/command/DebugAllowUnsafe.java @@ -1,7 +1,7 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.config.Captions; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.player.PlotPlayer; import java.util.ArrayList; import java.util.List; diff --git a/Core/src/main/java/com/plotsquared/commands/DebugClaimTest.java b/Core/src/main/java/com/plotsquared/core/command/DebugClaimTest.java similarity index 88% rename from Core/src/main/java/com/plotsquared/commands/DebugClaimTest.java rename to Core/src/main/java/com/plotsquared/core/command/DebugClaimTest.java index 59a1a2ef8..0cf3f8732 100644 --- a/Core/src/main/java/com/plotsquared/commands/DebugClaimTest.java +++ b/Core/src/main/java/com/plotsquared/core/command/DebugClaimTest.java @@ -1,18 +1,18 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotId; -import com.plotsquared.plot.PlotManager; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.StringWrapper; -import com.plotsquared.util.ChunkManager; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.uuid.UUIDHandler; -import com.plotsquared.util.WorldUtil; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.plot.PlotManager; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.StringWrapper; +import com.plotsquared.core.util.ChunkManager; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.uuid.UUIDHandler; +import com.plotsquared.core.util.WorldUtil; import com.google.common.collect.BiMap; import com.sk89q.worldedit.math.BlockVector2; diff --git a/Core/src/main/java/com/plotsquared/commands/DebugExec.java b/Core/src/main/java/com/plotsquared/core/command/DebugExec.java similarity index 92% rename from Core/src/main/java/com/plotsquared/commands/DebugExec.java rename to Core/src/main/java/com/plotsquared/core/command/DebugExec.java index 6d67d5b57..b9491b432 100644 --- a/Core/src/main/java/com/plotsquared/commands/DebugExec.java +++ b/Core/src/main/java/com/plotsquared/core/command/DebugExec.java @@ -1,39 +1,39 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.database.DBFunc; -import com.plotsquared.events.PlotFlagRemoveEvent; -import com.plotsquared.events.Result; -import com.plotsquared.plot.flags.GlobalFlagContainer; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.generator.HybridUtils; -import com.plotsquared.listener.WEManager; -import com.plotsquared.player.ConsolePlayer; -import com.plotsquared.location.Location; -import com.plotsquared.player.OfflinePlotPlayer; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotId; -import com.plotsquared.plot.message.PlotMessage; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.tasks.RunnableVal2; -import com.plotsquared.util.tasks.RunnableVal3; -import com.plotsquared.util.ChunkManager; -import com.plotsquared.util.EconHandler; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.MathMan; -import com.plotsquared.util.SchematicHandler; -import com.plotsquared.util.SetupUtils; -import com.plotsquared.util.StringMan; -import com.plotsquared.util.tasks.TaskManager; -import com.plotsquared.util.uuid.UUIDHandler; -import com.plotsquared.util.WorldUtil; -import com.plotsquared.queue.GlobalBlockQueue; -import com.plotsquared.plot.expiration.ExpireManager; -import com.plotsquared.plot.expiration.PlotAnalysis; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.events.PlotFlagRemoveEvent; +import com.plotsquared.core.events.Result; +import com.plotsquared.core.plot.flag.GlobalFlagContainer; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.generator.HybridUtils; +import com.plotsquared.core.util.WEManager; +import com.plotsquared.core.player.ConsolePlayer; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.player.OfflinePlotPlayer; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.plot.message.PlotMessage; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.task.RunnableVal2; +import com.plotsquared.core.util.task.RunnableVal3; +import com.plotsquared.core.util.ChunkManager; +import com.plotsquared.core.util.EconHandler; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.util.SchematicHandler; +import com.plotsquared.core.util.SetupUtils; +import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.util.task.TaskManager; +import com.plotsquared.core.util.uuid.UUIDHandler; +import com.plotsquared.core.util.WorldUtil; +import com.plotsquared.core.queue.GlobalBlockQueue; +import com.plotsquared.core.plot.expiration.ExpireManager; +import com.plotsquared.core.plot.expiration.PlotAnalysis; import com.google.common.io.Files; import com.sk89q.worldedit.world.block.BlockState; diff --git a/Core/src/main/java/com/plotsquared/commands/DebugImportWorlds.java b/Core/src/main/java/com/plotsquared/core/command/DebugImportWorlds.java similarity index 82% rename from Core/src/main/java/com/plotsquared/commands/DebugImportWorlds.java rename to Core/src/main/java/com/plotsquared/core/command/DebugImportWorlds.java index 27ee77a53..873b03309 100644 --- a/Core/src/main/java/com/plotsquared/commands/DebugImportWorlds.java +++ b/Core/src/main/java/com/plotsquared/core/command/DebugImportWorlds.java @@ -1,15 +1,15 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.plot.PlotId; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal2; -import com.plotsquared.util.tasks.RunnableVal3; -import com.plotsquared.plot.worlds.PlotAreaManager; -import com.plotsquared.plot.worlds.SinglePlotArea; -import com.plotsquared.plot.worlds.SinglePlotAreaManager; -import com.plotsquared.util.uuid.UUIDHandler; -import com.plotsquared.util.WorldUtil; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal2; +import com.plotsquared.core.util.task.RunnableVal3; +import com.plotsquared.core.plot.world.PlotAreaManager; +import com.plotsquared.core.plot.world.SinglePlotArea; +import com.plotsquared.core.plot.world.SinglePlotAreaManager; +import com.plotsquared.core.util.uuid.UUIDHandler; +import com.plotsquared.core.util.WorldUtil; import com.google.common.base.Charsets; import java.io.File; diff --git a/Core/src/main/java/com/plotsquared/commands/DebugLoadTest.java b/Core/src/main/java/com/plotsquared/core/command/DebugLoadTest.java similarity index 74% rename from Core/src/main/java/com/plotsquared/commands/DebugLoadTest.java rename to Core/src/main/java/com/plotsquared/core/command/DebugLoadTest.java index 6e9465845..a90bea54a 100644 --- a/Core/src/main/java/com/plotsquared/commands/DebugLoadTest.java +++ b/Core/src/main/java/com/plotsquared/core/command/DebugLoadTest.java @@ -1,8 +1,8 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.database.DBFunc; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.player.PlotPlayer; @CommandDeclaration(command = "debugloadtest", permission = "plots.debugloadtest", diff --git a/Core/src/main/java/com/plotsquared/commands/DebugPaste.java b/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java similarity index 94% rename from Core/src/main/java/com/plotsquared/commands/DebugPaste.java rename to Core/src/main/java/com/plotsquared/core/command/DebugPaste.java index 17038308d..3d416ac8a 100644 --- a/Core/src/main/java/com/plotsquared/commands/DebugPaste.java +++ b/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java @@ -1,16 +1,16 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.net.IncendoPaster; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.tasks.TaskManager; -import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.net.IncendoPaster; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.task.TaskManager; +import com.plotsquared.core.util.uuid.UUIDHandler; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.plotsquared.util.PremiumVerification; +import com.plotsquared.core.util.PremiumVerification; import lombok.NonNull; import java.io.BufferedReader; diff --git a/Core/src/main/java/com/plotsquared/commands/DebugRoadRegen.java b/Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java similarity index 89% rename from Core/src/main/java/com/plotsquared/commands/DebugRoadRegen.java rename to Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java index 7077c4dd4..5e37824ce 100644 --- a/Core/src/main/java/com/plotsquared/commands/DebugRoadRegen.java +++ b/Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java @@ -1,14 +1,14 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.config.Captions; -import com.plotsquared.generator.HybridPlotManager; -import com.plotsquared.generator.HybridUtils; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotManager; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.MainUtil; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.generator.HybridPlotManager; +import com.plotsquared.core.generator.HybridUtils; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotManager; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.MainUtil; import java.util.Arrays; diff --git a/Core/src/main/java/com/plotsquared/commands/DebugSaveTest.java b/Core/src/main/java/com/plotsquared/core/command/DebugSaveTest.java similarity index 74% rename from Core/src/main/java/com/plotsquared/commands/DebugSaveTest.java rename to Core/src/main/java/com/plotsquared/core/command/DebugSaveTest.java index b82de8132..cb98bd741 100644 --- a/Core/src/main/java/com/plotsquared/commands/DebugSaveTest.java +++ b/Core/src/main/java/com/plotsquared/core/command/DebugSaveTest.java @@ -1,10 +1,10 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.database.DBFunc; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.MainUtil; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.MainUtil; import java.util.ArrayList; diff --git a/Core/src/main/java/com/plotsquared/commands/Delete.java b/Core/src/main/java/com/plotsquared/core/command/Delete.java similarity index 83% rename from Core/src/main/java/com/plotsquared/commands/Delete.java rename to Core/src/main/java/com/plotsquared/core/command/Delete.java index 91b15d523..a0f1caadb 100644 --- a/Core/src/main/java/com/plotsquared/commands/Delete.java +++ b/Core/src/main/java/com/plotsquared/core/command/Delete.java @@ -1,18 +1,18 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.events.Result; -import com.plotsquared.util.Expression; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.EconHandler; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.events.Result; +import com.plotsquared.core.util.Expression; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.EconHandler; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.task.TaskManager; @CommandDeclaration(command = "delete", diff --git a/Core/src/main/java/com/plotsquared/commands/Deny.java b/Core/src/main/java/com/plotsquared/core/command/Deny.java similarity index 89% rename from Core/src/main/java/com/plotsquared/commands/Deny.java rename to Core/src/main/java/com/plotsquared/core/command/Deny.java index e46765873..23809050a 100644 --- a/Core/src/main/java/com/plotsquared/commands/Deny.java +++ b/Core/src/main/java/com/plotsquared/core/command/Deny.java @@ -1,15 +1,15 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.database.DBFunc; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.uuid.UUIDHandler; -import com.plotsquared.util.WorldUtil; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.uuid.UUIDHandler; +import com.plotsquared.core.util.WorldUtil; import com.sk89q.worldedit.world.gamemode.GameModes; import java.util.Set; diff --git a/Core/src/main/java/com/plotsquared/commands/Desc.java b/Core/src/main/java/com/plotsquared/core/command/Desc.java similarity index 76% rename from Core/src/main/java/com/plotsquared/commands/Desc.java rename to Core/src/main/java/com/plotsquared/core/command/Desc.java index 84db895ae..ec0224130 100644 --- a/Core/src/main/java/com/plotsquared/commands/Desc.java +++ b/Core/src/main/java/com/plotsquared/core/command/Desc.java @@ -1,14 +1,14 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.events.PlotFlagAddEvent; -import com.plotsquared.events.PlotFlagRemoveEvent; -import com.plotsquared.events.Result; -import com.plotsquared.plot.flags.implementations.DescriptionFlag; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.MainUtil; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.events.PlotFlagAddEvent; +import com.plotsquared.core.events.PlotFlagRemoveEvent; +import com.plotsquared.core.events.Result; +import com.plotsquared.core.plot.flag.implementations.DescriptionFlag; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.MainUtil; @CommandDeclaration(command = "setdescription", permission = "plots.set.desc", diff --git a/Core/src/main/java/com/plotsquared/commands/Dislike.java b/Core/src/main/java/com/plotsquared/core/command/Dislike.java similarity index 82% rename from Core/src/main/java/com/plotsquared/commands/Dislike.java rename to Core/src/main/java/com/plotsquared/core/command/Dislike.java index e6bd95b70..162276928 100644 --- a/Core/src/main/java/com/plotsquared/commands/Dislike.java +++ b/Core/src/main/java/com/plotsquared/core/command/Dislike.java @@ -1,6 +1,6 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.player.PlotPlayer; @CommandDeclaration(command = "dislike", permission = "plots.dislike", diff --git a/Core/src/main/java/com/plotsquared/commands/Done.java b/Core/src/main/java/com/plotsquared/core/command/Done.java similarity index 76% rename from Core/src/main/java/com/plotsquared/commands/Done.java rename to Core/src/main/java/com/plotsquared/core/command/Done.java index 2e60b3369..dcd5364f5 100644 --- a/Core/src/main/java/com/plotsquared/commands/Done.java +++ b/Core/src/main/java/com/plotsquared/core/command/Done.java @@ -1,22 +1,22 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.events.PlotDoneEvent; -import com.plotsquared.events.PlotFlagAddEvent; -import com.plotsquared.events.Result; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.plot.flags.implementations.DoneFlag; -import com.plotsquared.generator.HybridUtils; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.Permissions; -import com.plotsquared.plot.expiration.ExpireManager; -import com.plotsquared.plot.expiration.PlotAnalysis; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.events.PlotDoneEvent; +import com.plotsquared.core.events.PlotFlagAddEvent; +import com.plotsquared.core.events.Result; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.plot.flag.implementations.DoneFlag; +import com.plotsquared.core.generator.HybridUtils; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.plot.expiration.ExpireManager; +import com.plotsquared.core.plot.expiration.PlotAnalysis; @CommandDeclaration(command = "done", aliases = {"submit"}, diff --git a/Core/src/main/java/com/plotsquared/commands/Download.java b/Core/src/main/java/com/plotsquared/core/command/Download.java similarity index 86% rename from Core/src/main/java/com/plotsquared/commands/Download.java rename to Core/src/main/java/com/plotsquared/core/command/Download.java index e5508d654..4330f884f 100644 --- a/Core/src/main/java/com/plotsquared/commands/Download.java +++ b/Core/src/main/java/com/plotsquared/core/command/Download.java @@ -1,17 +1,17 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.plot.flags.implementations.DoneFlag; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.SchematicHandler; -import com.plotsquared.util.StringMan; -import com.plotsquared.util.WorldUtil; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.plot.flag.implementations.DoneFlag; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.SchematicHandler; +import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.util.WorldUtil; import com.sk89q.jnbt.CompoundTag; import java.net.URL; diff --git a/Core/src/main/java/com/plotsquared/commands/FlagCommand.java b/Core/src/main/java/com/plotsquared/core/command/FlagCommand.java similarity index 95% rename from Core/src/main/java/com/plotsquared/commands/FlagCommand.java rename to Core/src/main/java/com/plotsquared/core/command/FlagCommand.java index 36c609adb..2682f1761 100644 --- a/Core/src/main/java/com/plotsquared/commands/FlagCommand.java +++ b/Core/src/main/java/com/plotsquared/core/command/FlagCommand.java @@ -1,30 +1,30 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.CaptionUtility; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.events.PlotFlagAddEvent; -import com.plotsquared.events.PlotFlagRemoveEvent; -import com.plotsquared.events.Result; -import com.plotsquared.plot.flags.FlagParseException; -import com.plotsquared.plot.flags.GlobalFlagContainer; -import com.plotsquared.plot.flags.InternalFlag; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.plot.flags.types.IntegerFlag; -import com.plotsquared.plot.flags.types.ListFlag; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.message.PlotMessage; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal2; -import com.plotsquared.util.tasks.RunnableVal3; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.MathMan; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.StringComparison; -import com.plotsquared.util.StringMan; -import com.plotsquared.util.helpmenu.HelpMenu; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.CaptionUtility; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.events.PlotFlagAddEvent; +import com.plotsquared.core.events.PlotFlagRemoveEvent; +import com.plotsquared.core.events.Result; +import com.plotsquared.core.plot.flag.FlagParseException; +import com.plotsquared.core.plot.flag.GlobalFlagContainer; +import com.plotsquared.core.plot.flag.InternalFlag; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.plot.flag.types.IntegerFlag; +import com.plotsquared.core.plot.flag.types.ListFlag; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.message.PlotMessage; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal2; +import com.plotsquared.core.util.task.RunnableVal3; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.StringComparison; +import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.util.helpmenu.HelpMenu; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/Core/src/main/java/com/plotsquared/commands/Grant.java b/Core/src/main/java/com/plotsquared/core/command/Grant.java similarity index 86% rename from Core/src/main/java/com/plotsquared/commands/Grant.java rename to Core/src/main/java/com/plotsquared/core/command/Grant.java index 310a5e7e0..bf129685b 100644 --- a/Core/src/main/java/com/plotsquared/commands/Grant.java +++ b/Core/src/main/java/com/plotsquared/core/command/Grant.java @@ -1,15 +1,15 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.config.CaptionUtility; -import com.plotsquared.config.Captions; -import com.plotsquared.database.DBFunc; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.tasks.RunnableVal2; -import com.plotsquared.util.tasks.RunnableVal3; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.core.config.CaptionUtility; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.task.RunnableVal2; +import com.plotsquared.core.util.task.RunnableVal3; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.uuid.UUIDHandler; import com.google.common.primitives.Ints; import java.util.UUID; diff --git a/Core/src/main/java/com/plotsquared/commands/Help.java b/Core/src/main/java/com/plotsquared/core/command/Help.java similarity index 89% rename from Core/src/main/java/com/plotsquared/commands/Help.java rename to Core/src/main/java/com/plotsquared/core/command/Help.java index e1dc76168..c5a5436ee 100644 --- a/Core/src/main/java/com/plotsquared/commands/Help.java +++ b/Core/src/main/java/com/plotsquared/core/command/Help.java @@ -1,13 +1,13 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.config.Captions; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal2; -import com.plotsquared.util.tasks.RunnableVal3; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.MathMan; -import com.plotsquared.util.StringMan; -import com.plotsquared.util.helpmenu.HelpMenu; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal2; +import com.plotsquared.core.util.task.RunnableVal3; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.util.helpmenu.HelpMenu; import java.util.concurrent.CompletableFuture; diff --git a/Core/src/main/java/com/plotsquared/commands/Inbox.java b/Core/src/main/java/com/plotsquared/core/command/Inbox.java similarity index 94% rename from Core/src/main/java/com/plotsquared/commands/Inbox.java rename to Core/src/main/java/com/plotsquared/core/command/Inbox.java index 12fd0ddf7..e8a3a2d55 100644 --- a/Core/src/main/java/com/plotsquared/commands/Inbox.java +++ b/Core/src/main/java/com/plotsquared/core/command/Inbox.java @@ -1,14 +1,14 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.plot.comment.CommentInbox; -import com.plotsquared.plot.comment.PlotComment; -import com.plotsquared.plot.comment.CommentManager; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.StringMan; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.plot.comment.CommentInbox; +import com.plotsquared.core.plot.comment.PlotComment; +import com.plotsquared.core.plot.comment.CommentManager; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.StringMan; import java.util.List; diff --git a/Core/src/main/java/com/plotsquared/commands/Info.java b/Core/src/main/java/com/plotsquared/core/command/Info.java similarity index 92% rename from Core/src/main/java/com/plotsquared/commands/Info.java rename to Core/src/main/java/com/plotsquared/core/command/Info.java index 42d4f9223..2a4945e1f 100644 --- a/Core/src/main/java/com/plotsquared/commands/Info.java +++ b/Core/src/main/java/com/plotsquared/core/command/Info.java @@ -1,13 +1,13 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.database.DBFunc; -import com.plotsquared.plot.flags.implementations.HideInfoFlag; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.MainUtil; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.plot.flag.implementations.HideInfoFlag; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.MainUtil; @CommandDeclaration(command = "info", aliases = "i", diff --git a/Core/src/main/java/com/plotsquared/commands/Kick.java b/Core/src/main/java/com/plotsquared/core/command/Kick.java similarity index 86% rename from Core/src/main/java/com/plotsquared/commands/Kick.java rename to Core/src/main/java/com/plotsquared/core/command/Kick.java index 49682aeb9..ea09da617 100644 --- a/Core/src/main/java/com/plotsquared/commands/Kick.java +++ b/Core/src/main/java/com/plotsquared/core/command/Kick.java @@ -1,15 +1,15 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.database.DBFunc; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.uuid.UUIDHandler; -import com.plotsquared.util.WorldUtil; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.uuid.UUIDHandler; +import com.plotsquared.core.util.WorldUtil; import java.util.HashSet; import java.util.Set; diff --git a/Core/src/main/java/com/plotsquared/commands/Leave.java b/Core/src/main/java/com/plotsquared/core/command/Leave.java similarity index 83% rename from Core/src/main/java/com/plotsquared/commands/Leave.java rename to Core/src/main/java/com/plotsquared/core/command/Leave.java index 93bea9587..da484197d 100644 --- a/Core/src/main/java/com/plotsquared/commands/Leave.java +++ b/Core/src/main/java/com/plotsquared/core/command/Leave.java @@ -1,12 +1,12 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal2; -import com.plotsquared.util.tasks.RunnableVal3; -import com.plotsquared.util.MainUtil; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal2; +import com.plotsquared.core.util.task.RunnableVal3; +import com.plotsquared.core.util.MainUtil; import java.util.UUID; import java.util.concurrent.CompletableFuture; diff --git a/Core/src/main/java/com/plotsquared/commands/Like.java b/Core/src/main/java/com/plotsquared/core/command/Like.java similarity index 89% rename from Core/src/main/java/com/plotsquared/commands/Like.java rename to Core/src/main/java/com/plotsquared/core/command/Like.java index 19b8b2e57..c424a4f53 100644 --- a/Core/src/main/java/com/plotsquared/commands/Like.java +++ b/Core/src/main/java/com/plotsquared/core/command/Like.java @@ -1,18 +1,18 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.database.DBFunc; -import com.plotsquared.events.PlotRateEvent; -import com.plotsquared.plot.flags.implementations.DoneFlag; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.plot.Rating; -import com.plotsquared.events.TeleportCause; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.events.PlotRateEvent; +import com.plotsquared.core.plot.flag.implementations.DoneFlag; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.Rating; +import com.plotsquared.core.events.TeleportCause; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.task.TaskManager; import java.util.ArrayList; import java.util.Collection; diff --git a/Core/src/main/java/com/plotsquared/commands/ListCmd.java b/Core/src/main/java/com/plotsquared/core/command/ListCmd.java similarity index 94% rename from Core/src/main/java/com/plotsquared/commands/ListCmd.java rename to Core/src/main/java/com/plotsquared/core/command/ListCmd.java index 1f2d92d14..b453594cd 100644 --- a/Core/src/main/java/com/plotsquared/commands/ListCmd.java +++ b/Core/src/main/java/com/plotsquared/core/command/ListCmd.java @@ -1,25 +1,25 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.PlotSquared.SortType; -import com.plotsquared.config.CaptionUtility; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.implementations.DoneFlag; -import com.plotsquared.plot.flags.implementations.PriceFlag; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.message.PlotMessage; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.plot.Rating; -import com.plotsquared.util.tasks.RunnableVal3; -import com.plotsquared.util.EconHandler; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.MathMan; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.StringComparison; -import com.plotsquared.util.StringMan; -import com.plotsquared.util.uuid.UUIDHandler; -import com.plotsquared.plot.expiration.ExpireManager; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.PlotSquared.SortType; +import com.plotsquared.core.config.CaptionUtility; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.implementations.DoneFlag; +import com.plotsquared.core.plot.flag.implementations.PriceFlag; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.message.PlotMessage; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.Rating; +import com.plotsquared.core.util.task.RunnableVal3; +import com.plotsquared.core.util.EconHandler; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.StringComparison; +import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.util.uuid.UUIDHandler; +import com.plotsquared.core.plot.expiration.ExpireManager; import java.util.ArrayList; import java.util.Arrays; diff --git a/Core/src/main/java/com/plotsquared/commands/Load.java b/Core/src/main/java/com/plotsquared/core/command/Load.java similarity index 91% rename from Core/src/main/java/com/plotsquared/commands/Load.java rename to Core/src/main/java/com/plotsquared/core/command/Load.java index b9f126394..bbb08e6d8 100644 --- a/Core/src/main/java/com/plotsquared/commands/Load.java +++ b/Core/src/main/java/com/plotsquared/core/command/Load.java @@ -1,18 +1,18 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotId; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.plot.schematic.Schematic; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.SchematicHandler; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.plot.schematic.Schematic; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.SchematicHandler; +import com.plotsquared.core.util.task.TaskManager; import java.net.MalformedURLException; import java.net.URL; diff --git a/Core/src/main/java/com/plotsquared/commands/MainCommand.java b/Core/src/main/java/com/plotsquared/core/command/MainCommand.java similarity index 94% rename from Core/src/main/java/com/plotsquared/commands/MainCommand.java rename to Core/src/main/java/com/plotsquared/core/command/MainCommand.java index 49cb77a92..d1ace546c 100644 --- a/Core/src/main/java/com/plotsquared/commands/MainCommand.java +++ b/Core/src/main/java/com/plotsquared/core/command/MainCommand.java @@ -1,17 +1,17 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.player.ConsolePlayer; -import com.plotsquared.util.Expression; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal2; -import com.plotsquared.util.tasks.RunnableVal3; -import com.plotsquared.util.EconHandler; -import com.plotsquared.util.Permissions; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.player.ConsolePlayer; +import com.plotsquared.core.util.Expression; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal2; +import com.plotsquared.core.util.task.RunnableVal3; +import com.plotsquared.core.util.EconHandler; +import com.plotsquared.core.util.Permissions; import java.util.Arrays; import java.util.concurrent.CompletableFuture; diff --git a/Core/src/main/java/com/plotsquared/commands/Merge.java b/Core/src/main/java/com/plotsquared/core/command/Merge.java similarity index 91% rename from Core/src/main/java/com/plotsquared/commands/Merge.java rename to Core/src/main/java/com/plotsquared/core/command/Merge.java index 3b4f1ce0e..5d26f001d 100644 --- a/Core/src/main/java/com/plotsquared/commands/Merge.java +++ b/Core/src/main/java/com/plotsquared/core/command/Merge.java @@ -1,21 +1,21 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.events.PlotMergeEvent; -import com.plotsquared.events.Result; -import com.plotsquared.location.Direction; -import com.plotsquared.util.Expression; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.EconHandler; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.StringMan; -import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.events.PlotMergeEvent; +import com.plotsquared.core.events.Result; +import com.plotsquared.core.location.Direction; +import com.plotsquared.core.util.Expression; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.EconHandler; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.util.uuid.UUIDHandler; import java.util.UUID; diff --git a/Core/src/main/java/com/plotsquared/commands/Middle.java b/Core/src/main/java/com/plotsquared/core/command/Middle.java similarity index 73% rename from Core/src/main/java/com/plotsquared/commands/Middle.java rename to Core/src/main/java/com/plotsquared/core/command/Middle.java index 4f1bce01c..89a45972e 100644 --- a/Core/src/main/java/com/plotsquared/commands/Middle.java +++ b/Core/src/main/java/com/plotsquared/core/command/Middle.java @@ -1,10 +1,10 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.config.Captions; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.events.TeleportCause; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.events.TeleportCause; /** * @author manuelgu, altered by Citymonstret diff --git a/Core/src/main/java/com/plotsquared/commands/Move.java b/Core/src/main/java/com/plotsquared/core/command/Move.java similarity index 85% rename from Core/src/main/java/com/plotsquared/commands/Move.java rename to Core/src/main/java/com/plotsquared/core/command/Move.java index 5e62c7e03..4a2dc9804 100644 --- a/Core/src/main/java/com/plotsquared/commands/Move.java +++ b/Core/src/main/java/com/plotsquared/core/command/Move.java @@ -1,15 +1,15 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal2; -import com.plotsquared.util.tasks.RunnableVal3; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.Permissions; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal2; +import com.plotsquared.core.util.task.RunnableVal3; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.Permissions; import java.util.concurrent.CompletableFuture; diff --git a/Core/src/main/java/com/plotsquared/commands/Music.java b/Core/src/main/java/com/plotsquared/core/command/Music.java similarity index 85% rename from Core/src/main/java/com/plotsquared/commands/Music.java rename to Core/src/main/java/com/plotsquared/core/command/Music.java index 1e957714e..82a3e0d2b 100644 --- a/Core/src/main/java/com/plotsquared/commands/Music.java +++ b/Core/src/main/java/com/plotsquared/core/command/Music.java @@ -1,16 +1,16 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.config.Captions; -import com.plotsquared.events.PlotFlagAddEvent; -import com.plotsquared.events.PlotFlagRemoveEvent; -import com.plotsquared.events.Result; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.plot.flags.implementations.MusicFlag; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotInventory; -import com.plotsquared.plot.PlotItemStack; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.events.PlotFlagAddEvent; +import com.plotsquared.core.events.PlotFlagRemoveEvent; +import com.plotsquared.core.events.Result; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.plot.flag.implementations.MusicFlag; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotInventory; +import com.plotsquared.core.plot.PlotItemStack; import com.sk89q.worldedit.world.item.ItemTypes; import java.util.Arrays; diff --git a/Core/src/main/java/com/plotsquared/commands/Near.java b/Core/src/main/java/com/plotsquared/core/command/Near.java similarity index 72% rename from Core/src/main/java/com/plotsquared/commands/Near.java rename to Core/src/main/java/com/plotsquared/core/command/Near.java index d25433496..c83d915b5 100644 --- a/Core/src/main/java/com/plotsquared/commands/Near.java +++ b/Core/src/main/java/com/plotsquared/core/command/Near.java @@ -1,11 +1,11 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal2; -import com.plotsquared.util.tasks.RunnableVal3; -import com.plotsquared.util.StringMan; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal2; +import com.plotsquared.core.util.task.RunnableVal3; +import com.plotsquared.core.util.StringMan; import java.util.concurrent.CompletableFuture; diff --git a/Core/src/main/java/com/plotsquared/commands/Owner.java b/Core/src/main/java/com/plotsquared/core/command/Owner.java similarity index 88% rename from Core/src/main/java/com/plotsquared/commands/Owner.java rename to Core/src/main/java/com/plotsquared/core/command/Owner.java index e3bd9196a..a373a6ad4 100644 --- a/Core/src/main/java/com/plotsquared/commands/Owner.java +++ b/Core/src/main/java/com/plotsquared/core/command/Owner.java @@ -1,17 +1,17 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.events.PlotChangeOwnerEvent; -import com.plotsquared.events.PlotUnlinkEvent; -import com.plotsquared.events.Result; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.uuid.UUIDHandler; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.events.PlotChangeOwnerEvent; +import com.plotsquared.core.events.PlotUnlinkEvent; +import com.plotsquared.core.events.Result; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.uuid.UUIDHandler; +import com.plotsquared.core.util.task.TaskManager; import java.util.Set; import java.util.UUID; diff --git a/Core/src/main/java/com/plotsquared/commands/PluginCmd.java b/Core/src/main/java/com/plotsquared/core/command/PluginCmd.java similarity index 78% rename from Core/src/main/java/com/plotsquared/commands/PluginCmd.java rename to Core/src/main/java/com/plotsquared/core/command/PluginCmd.java index bc76598f3..af4dcf4e3 100644 --- a/Core/src/main/java/com/plotsquared/commands/PluginCmd.java +++ b/Core/src/main/java/com/plotsquared/core/command/PluginCmd.java @@ -1,10 +1,10 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.tasks.TaskManager; -import com.plotsquared.util.PremiumVerification; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.task.TaskManager; +import com.plotsquared.core.util.PremiumVerification; @CommandDeclaration(command = "plugin", permission = "plots.use", diff --git a/Core/src/main/java/com/plotsquared/commands/Purge.java b/Core/src/main/java/com/plotsquared/core/command/Purge.java similarity index 93% rename from Core/src/main/java/com/plotsquared/commands/Purge.java rename to Core/src/main/java/com/plotsquared/core/command/Purge.java index bce21cd7d..fd6bb0a0d 100644 --- a/Core/src/main/java/com/plotsquared/commands/Purge.java +++ b/Core/src/main/java/com/plotsquared/core/command/Purge.java @@ -1,16 +1,16 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.database.DBFunc; -import com.plotsquared.listener.PlotListener; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotId; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.StringMan; -import com.plotsquared.util.tasks.TaskManager; -import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.listener.PlotListener; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.util.task.TaskManager; +import com.plotsquared.core.util.uuid.UUIDHandler; import java.util.HashMap; import java.util.HashSet; diff --git a/Core/src/main/java/com/plotsquared/commands/Rate.java b/Core/src/main/java/com/plotsquared/core/command/Rate.java similarity index 92% rename from Core/src/main/java/com/plotsquared/commands/Rate.java rename to Core/src/main/java/com/plotsquared/core/command/Rate.java index 5402411b8..9dfc118b2 100644 --- a/Core/src/main/java/com/plotsquared/commands/Rate.java +++ b/Core/src/main/java/com/plotsquared/core/command/Rate.java @@ -1,21 +1,21 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.database.DBFunc; -import com.plotsquared.events.PlotRateEvent; -import com.plotsquared.plot.flags.implementations.DoneFlag; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotInventory; -import com.plotsquared.plot.PlotItemStack; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.plot.Rating; -import com.plotsquared.events.TeleportCause; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.MathMan; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.events.PlotRateEvent; +import com.plotsquared.core.plot.flag.implementations.DoneFlag; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotInventory; +import com.plotsquared.core.plot.PlotItemStack; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.Rating; +import com.plotsquared.core.events.TeleportCause; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.task.TaskManager; import java.util.ArrayList; import java.util.HashMap; diff --git a/Core/src/main/java/com/plotsquared/commands/RegenAllRoads.java b/Core/src/main/java/com/plotsquared/core/command/RegenAllRoads.java similarity index 85% rename from Core/src/main/java/com/plotsquared/commands/RegenAllRoads.java rename to Core/src/main/java/com/plotsquared/core/command/RegenAllRoads.java index b84cab1ff..ad260cdcc 100644 --- a/Core/src/main/java/com/plotsquared/commands/RegenAllRoads.java +++ b/Core/src/main/java/com/plotsquared/core/command/RegenAllRoads.java @@ -1,13 +1,13 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.generator.HybridPlotManager; -import com.plotsquared.generator.HybridUtils; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotManager; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.MainUtil; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.generator.HybridPlotManager; +import com.plotsquared.core.generator.HybridUtils; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotManager; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.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/plotsquared/commands/Relight.java b/Core/src/main/java/com/plotsquared/core/command/Relight.java similarity index 74% rename from Core/src/main/java/com/plotsquared/commands/Relight.java rename to Core/src/main/java/com/plotsquared/core/command/Relight.java index c82aa7ab0..f22c94433 100644 --- a/Core/src/main/java/com/plotsquared/commands/Relight.java +++ b/Core/src/main/java/com/plotsquared/core/command/Relight.java @@ -1,13 +1,13 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.tasks.RunnableVal2; -import com.plotsquared.util.tasks.RunnableVal3; -import com.plotsquared.util.ChunkManager; -import com.plotsquared.queue.LocalBlockQueue; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.task.RunnableVal2; +import com.plotsquared.core.util.task.RunnableVal3; +import com.plotsquared.core.util.ChunkManager; +import com.plotsquared.core.queue.LocalBlockQueue; import java.util.concurrent.CompletableFuture; diff --git a/Core/src/main/java/com/plotsquared/commands/Reload.java b/Core/src/main/java/com/plotsquared/core/command/Reload.java similarity index 88% rename from Core/src/main/java/com/plotsquared/commands/Reload.java rename to Core/src/main/java/com/plotsquared/core/command/Reload.java index 68b8a0d22..808f5b489 100644 --- a/Core/src/main/java/com/plotsquared/commands/Reload.java +++ b/Core/src/main/java/com/plotsquared/core/command/Reload.java @@ -1,13 +1,13 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.configuration.ConfigurationSection; -import com.plotsquared.configuration.MemorySection; -import com.plotsquared.configuration.file.YamlConfiguration; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.PlotAreaType; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.MainUtil; +import com.plotsquared.core.configuration.ConfigurationSection; +import com.plotsquared.core.configuration.MemorySection; +import com.plotsquared.core.configuration.file.YamlConfiguration; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.PlotAreaType; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.MainUtil; import java.io.IOException; import java.util.Objects; diff --git a/Core/src/main/java/com/plotsquared/commands/Remove.java b/Core/src/main/java/com/plotsquared/core/command/Remove.java similarity index 90% rename from Core/src/main/java/com/plotsquared/commands/Remove.java rename to Core/src/main/java/com/plotsquared/core/command/Remove.java index f3aceaee9..8d9030f1c 100644 --- a/Core/src/main/java/com/plotsquared/commands/Remove.java +++ b/Core/src/main/java/com/plotsquared/core/command/Remove.java @@ -1,14 +1,14 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.database.DBFunc; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.uuid.UUIDHandler; import java.util.ArrayList; import java.util.HashSet; diff --git a/Core/src/main/java/com/plotsquared/commands/RequiredType.java b/Core/src/main/java/com/plotsquared/core/command/RequiredType.java similarity index 86% rename from Core/src/main/java/com/plotsquared/commands/RequiredType.java rename to Core/src/main/java/com/plotsquared/core/command/RequiredType.java index ce7bd841a..0cb3f8aa9 100644 --- a/Core/src/main/java/com/plotsquared/commands/RequiredType.java +++ b/Core/src/main/java/com/plotsquared/core/command/RequiredType.java @@ -1,4 +1,4 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; public enum RequiredType { CONSOLE, PLAYER, NONE; diff --git a/Core/src/main/java/com/plotsquared/commands/Save.java b/Core/src/main/java/com/plotsquared/core/command/Save.java similarity index 84% rename from Core/src/main/java/com/plotsquared/commands/Save.java rename to Core/src/main/java/com/plotsquared/core/command/Save.java index 61e92cd1d..00b46ce7f 100644 --- a/Core/src/main/java/com/plotsquared/commands/Save.java +++ b/Core/src/main/java/com/plotsquared/core/command/Save.java @@ -1,16 +1,16 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotId; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.SchematicHandler; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.SchematicHandler; +import com.plotsquared.core.util.task.TaskManager; import com.sk89q.jnbt.CompoundTag; import java.net.URL; diff --git a/Core/src/main/java/com/plotsquared/commands/SchematicCmd.java b/Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java similarity index 92% rename from Core/src/main/java/com/plotsquared/commands/SchematicCmd.java rename to Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java index 7a314bb00..efeed8d35 100644 --- a/Core/src/main/java/com/plotsquared/commands/SchematicCmd.java +++ b/Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java @@ -1,20 +1,20 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.player.ConsolePlayer; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.plot.schematic.Schematic; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.SchematicHandler; -import com.plotsquared.util.StringMan; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.player.ConsolePlayer; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.plot.schematic.Schematic; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.SchematicHandler; +import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.util.task.TaskManager; import com.google.common.collect.Lists; import java.net.URL; diff --git a/Core/src/main/java/com/plotsquared/commands/Set.java b/Core/src/main/java/com/plotsquared/core/command/Set.java similarity index 90% rename from Core/src/main/java/com/plotsquared/commands/Set.java rename to Core/src/main/java/com/plotsquared/core/command/Set.java index 6d7e7a2a2..3b298bfc5 100644 --- a/Core/src/main/java/com/plotsquared/commands/Set.java +++ b/Core/src/main/java/com/plotsquared/core/command/Set.java @@ -1,15 +1,15 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.config.CaptionUtility; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotManager; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.StringMan; -import com.plotsquared.queue.GlobalBlockQueue; -import com.plotsquared.util.PatternUtil; +import com.plotsquared.core.config.CaptionUtility; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotManager; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.queue.GlobalBlockQueue; +import com.plotsquared.core.util.PatternUtil; import com.sk89q.worldedit.function.pattern.Pattern; import java.util.ArrayList; diff --git a/Core/src/main/java/com/plotsquared/commands/SetCommand.java b/Core/src/main/java/com/plotsquared/core/command/SetCommand.java similarity index 80% rename from Core/src/main/java/com/plotsquared/commands/SetCommand.java rename to Core/src/main/java/com/plotsquared/core/command/SetCommand.java index b9688d592..86ad69ff4 100644 --- a/Core/src/main/java/com/plotsquared/commands/SetCommand.java +++ b/Core/src/main/java/com/plotsquared/core/command/SetCommand.java @@ -1,13 +1,13 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.config.CaptionUtility; -import com.plotsquared.config.Captions; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.StringMan; +import com.plotsquared.core.config.CaptionUtility; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.StringMan; public abstract class SetCommand extends SubCommand { diff --git a/Core/src/main/java/com/plotsquared/commands/SetHome.java b/Core/src/main/java/com/plotsquared/core/command/SetHome.java similarity index 81% rename from Core/src/main/java/com/plotsquared/commands/SetHome.java rename to Core/src/main/java/com/plotsquared/core/command/SetHome.java index 0a35af561..5a5d74d41 100644 --- a/Core/src/main/java/com/plotsquared/commands/SetHome.java +++ b/Core/src/main/java/com/plotsquared/core/command/SetHome.java @@ -1,11 +1,11 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.config.Captions; -import com.plotsquared.location.BlockLoc; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.MainUtil; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.location.BlockLoc; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.MainUtil; @CommandDeclaration(command = "sethome", permission = "plots.set.home", diff --git a/Core/src/main/java/com/plotsquared/commands/Setup.java b/Core/src/main/java/com/plotsquared/core/command/Setup.java similarity index 96% rename from Core/src/main/java/com/plotsquared/commands/Setup.java rename to Core/src/main/java/com/plotsquared/core/command/Setup.java index 593b0dd5c..c31afb7d8 100644 --- a/Core/src/main/java/com/plotsquared/commands/Setup.java +++ b/Core/src/main/java/com/plotsquared/core/command/Setup.java @@ -1,22 +1,22 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Configuration; -import com.plotsquared.config.ConfigurationNode; -import com.plotsquared.generator.GeneratorWrapper; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotAreaTerrainType; -import com.plotsquared.plot.PlotAreaType; -import com.plotsquared.plot.PlotId; -import com.plotsquared.plot.message.PlotMessage; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.plot.SetupObject; -import com.plotsquared.events.TeleportCause; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.SetupUtils; -import com.plotsquared.util.StringMan; -import com.plotsquared.util.WorldUtil; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Configuration; +import com.plotsquared.core.config.ConfigurationNode; +import com.plotsquared.core.generator.GeneratorWrapper; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotAreaTerrainType; +import com.plotsquared.core.plot.PlotAreaType; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.plot.message.PlotMessage; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.SetupObject; +import com.plotsquared.core.events.TeleportCause; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.SetupUtils; +import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.util.WorldUtil; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/Core/src/main/java/com/plotsquared/commands/SubCommand.java b/Core/src/main/java/com/plotsquared/core/command/SubCommand.java similarity index 79% rename from Core/src/main/java/com/plotsquared/commands/SubCommand.java rename to Core/src/main/java/com/plotsquared/core/command/SubCommand.java index 8c6edef27..c089e06a6 100644 --- a/Core/src/main/java/com/plotsquared/commands/SubCommand.java +++ b/Core/src/main/java/com/plotsquared/core/command/SubCommand.java @@ -1,9 +1,9 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.config.Captions; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal2; -import com.plotsquared.util.tasks.RunnableVal3; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal2; +import com.plotsquared.core.util.task.RunnableVal3; import java.util.concurrent.CompletableFuture; diff --git a/Core/src/main/java/com/plotsquared/commands/Swap.java b/Core/src/main/java/com/plotsquared/core/command/Swap.java similarity index 85% rename from Core/src/main/java/com/plotsquared/commands/Swap.java rename to Core/src/main/java/com/plotsquared/core/command/Swap.java index 5b81e56e6..3dbe98416 100644 --- a/Core/src/main/java/com/plotsquared/commands/Swap.java +++ b/Core/src/main/java/com/plotsquared/core/command/Swap.java @@ -1,13 +1,13 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.config.Captions; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal2; -import com.plotsquared.util.tasks.RunnableVal3; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.Permissions; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal2; +import com.plotsquared.core.util.task.RunnableVal3; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.Permissions; import java.util.concurrent.CompletableFuture; diff --git a/Core/src/main/java/com/plotsquared/commands/Target.java b/Core/src/main/java/com/plotsquared/core/command/Target.java similarity index 81% rename from Core/src/main/java/com/plotsquared/commands/Target.java rename to Core/src/main/java/com/plotsquared/core/command/Target.java index 2643cede3..9e4cd830c 100644 --- a/Core/src/main/java/com/plotsquared/commands/Target.java +++ b/Core/src/main/java/com/plotsquared/core/command/Target.java @@ -1,12 +1,12 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.StringMan; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.StringMan; @CommandDeclaration(command = "target", usage = "/plot target <|nearest>", diff --git a/Core/src/main/java/com/plotsquared/commands/Template.java b/Core/src/main/java/com/plotsquared/core/command/Template.java similarity index 89% rename from Core/src/main/java/com/plotsquared/commands/Template.java rename to Core/src/main/java/com/plotsquared/core/command/Template.java index 226dbb1de..062edf244 100644 --- a/Core/src/main/java/com/plotsquared/commands/Template.java +++ b/Core/src/main/java/com/plotsquared/core/command/Template.java @@ -1,23 +1,23 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.configuration.ConfigurationSection; -import com.plotsquared.configuration.InvalidConfigurationException; -import com.plotsquared.configuration.file.YamlConfiguration; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.ConfigurationNode; -import com.plotsquared.config.Settings; -import com.plotsquared.util.FileBytes; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotManager; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.plot.SetupObject; -import com.plotsquared.events.TeleportCause; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.SetupUtils; -import com.plotsquared.util.tasks.TaskManager; -import com.plotsquared.util.WorldUtil; -import com.plotsquared.queue.GlobalBlockQueue; +import com.plotsquared.core.configuration.ConfigurationSection; +import com.plotsquared.core.configuration.InvalidConfigurationException; +import com.plotsquared.core.configuration.file.YamlConfiguration; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.ConfigurationNode; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.util.FileBytes; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotManager; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.SetupObject; +import com.plotsquared.core.events.TeleportCause; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.SetupUtils; +import com.plotsquared.core.util.task.TaskManager; +import com.plotsquared.core.util.WorldUtil; +import com.plotsquared.core.queue.GlobalBlockQueue; import java.io.File; import java.io.FileInputStream; diff --git a/Core/src/main/java/com/plotsquared/commands/Toggle.java b/Core/src/main/java/com/plotsquared/core/command/Toggle.java similarity index 93% rename from Core/src/main/java/com/plotsquared/commands/Toggle.java rename to Core/src/main/java/com/plotsquared/core/command/Toggle.java index 82ed24592..321b6e15c 100644 --- a/Core/src/main/java/com/plotsquared/commands/Toggle.java +++ b/Core/src/main/java/com/plotsquared/core/command/Toggle.java @@ -1,10 +1,10 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.config.Captions; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal2; -import com.plotsquared.util.tasks.RunnableVal3; -import com.plotsquared.util.MainUtil; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal2; +import com.plotsquared.core.util.task.RunnableVal3; +import com.plotsquared.core.util.MainUtil; @CommandDeclaration(command = "toggle", aliases = {"attribute"}, diff --git a/Core/src/main/java/com/plotsquared/commands/Trim.java b/Core/src/main/java/com/plotsquared/core/command/Trim.java similarity index 92% rename from Core/src/main/java/com/plotsquared/commands/Trim.java rename to Core/src/main/java/com/plotsquared/core/command/Trim.java index 72c64d67e..e359530ba 100644 --- a/Core/src/main/java/com/plotsquared/commands/Trim.java +++ b/Core/src/main/java/com/plotsquared/core/command/Trim.java @@ -1,20 +1,20 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.tasks.RunnableVal2; -import com.plotsquared.util.ChunkManager; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.tasks.TaskManager; -import com.plotsquared.util.WorldUtil; -import com.plotsquared.queue.GlobalBlockQueue; -import com.plotsquared.queue.LocalBlockQueue; -import com.plotsquared.plot.expiration.ExpireManager; -import com.plotsquared.util.RegionUtil; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.task.RunnableVal2; +import com.plotsquared.core.util.ChunkManager; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.task.TaskManager; +import com.plotsquared.core.util.WorldUtil; +import com.plotsquared.core.queue.GlobalBlockQueue; +import com.plotsquared.core.queue.LocalBlockQueue; +import com.plotsquared.core.plot.expiration.ExpireManager; +import com.plotsquared.core.util.RegionUtil; import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.regions.CuboidRegion; diff --git a/Core/src/main/java/com/plotsquared/commands/Trust.java b/Core/src/main/java/com/plotsquared/core/command/Trust.java similarity index 88% rename from Core/src/main/java/com/plotsquared/commands/Trust.java rename to Core/src/main/java/com/plotsquared/core/command/Trust.java index 2a1c65882..2d01dad2c 100644 --- a/Core/src/main/java/com/plotsquared/commands/Trust.java +++ b/Core/src/main/java/com/plotsquared/core/command/Trust.java @@ -1,14 +1,14 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.database.DBFunc; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal2; -import com.plotsquared.util.tasks.RunnableVal3; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.Permissions; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal2; +import com.plotsquared.core.util.task.RunnableVal3; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.Permissions; import java.util.Iterator; import java.util.Set; diff --git a/Core/src/main/java/com/plotsquared/commands/Unlink.java b/Core/src/main/java/com/plotsquared/core/command/Unlink.java similarity index 81% rename from Core/src/main/java/com/plotsquared/commands/Unlink.java rename to Core/src/main/java/com/plotsquared/core/command/Unlink.java index 22746a91b..1cc795be1 100644 --- a/Core/src/main/java/com/plotsquared/commands/Unlink.java +++ b/Core/src/main/java/com/plotsquared/core/command/Unlink.java @@ -1,16 +1,16 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.events.PlotUnlinkEvent; -import com.plotsquared.events.Result; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.StringMan; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.events.PlotUnlinkEvent; +import com.plotsquared.core.events.Result; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.util.task.TaskManager; @CommandDeclaration(command = "unlink", aliases = {"u", "unmerge"}, diff --git a/Core/src/main/java/com/plotsquared/commands/Visit.java b/Core/src/main/java/com/plotsquared/core/command/Visit.java similarity index 90% rename from Core/src/main/java/com/plotsquared/commands/Visit.java rename to Core/src/main/java/com/plotsquared/core/command/Visit.java index 757b539dc..87b2b994e 100644 --- a/Core/src/main/java/com/plotsquared/commands/Visit.java +++ b/Core/src/main/java/com/plotsquared/core/command/Visit.java @@ -1,19 +1,19 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.plot.flags.implementations.UntrustedVisitFlag; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal2; -import com.plotsquared.util.tasks.RunnableVal3; -import com.plotsquared.events.TeleportCause; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.MathMan; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.plot.flag.implementations.UntrustedVisitFlag; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal2; +import com.plotsquared.core.util.task.RunnableVal3; +import com.plotsquared.core.events.TeleportCause; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.uuid.UUIDHandler; import java.util.ArrayList; import java.util.Collection; diff --git a/Core/src/main/java/com/plotsquared/commands/WE_Anywhere.java b/Core/src/main/java/com/plotsquared/core/command/WE_Anywhere.java similarity index 86% rename from Core/src/main/java/com/plotsquared/commands/WE_Anywhere.java rename to Core/src/main/java/com/plotsquared/core/command/WE_Anywhere.java index 39aa9e768..d1b011a19 100644 --- a/Core/src/main/java/com/plotsquared/commands/WE_Anywhere.java +++ b/Core/src/main/java/com/plotsquared/core/command/WE_Anywhere.java @@ -1,6 +1,6 @@ -package com.plotsquared.commands; +package com.plotsquared.core.command; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.player.PlotPlayer; @CommandDeclaration(command = "weanywhere", permission = "plots.worldedit.bypass", diff --git a/Core/src/main/java/com/plotsquared/config/Caption.java b/Core/src/main/java/com/plotsquared/core/config/Caption.java similarity index 77% rename from Core/src/main/java/com/plotsquared/config/Caption.java rename to Core/src/main/java/com/plotsquared/core/config/Caption.java index d938016f2..0ad3aba83 100644 --- a/Core/src/main/java/com/plotsquared/config/Caption.java +++ b/Core/src/main/java/com/plotsquared/core/config/Caption.java @@ -1,8 +1,8 @@ -package com.plotsquared.config; +package com.plotsquared.core.config; -import com.plotsquared.PlotSquared; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.StringMan; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.StringMan; public interface Caption { diff --git a/Core/src/main/java/com/plotsquared/config/CaptionUtility.java b/Core/src/main/java/com/plotsquared/core/config/CaptionUtility.java similarity index 93% rename from Core/src/main/java/com/plotsquared/config/CaptionUtility.java rename to Core/src/main/java/com/plotsquared/core/config/CaptionUtility.java index a3eed50e8..be1524a57 100644 --- a/Core/src/main/java/com/plotsquared/config/CaptionUtility.java +++ b/Core/src/main/java/com/plotsquared/core/config/CaptionUtility.java @@ -1,6 +1,6 @@ -package com.plotsquared.config; +package com.plotsquared.core.config; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.player.PlotPlayer; public class CaptionUtility { diff --git a/Core/src/main/java/com/plotsquared/config/Captions.java b/Core/src/main/java/com/plotsquared/core/config/Captions.java similarity index 99% rename from Core/src/main/java/com/plotsquared/config/Captions.java rename to Core/src/main/java/com/plotsquared/core/config/Captions.java index 35a8f0aa9..e01696261 100644 --- a/Core/src/main/java/com/plotsquared/config/Captions.java +++ b/Core/src/main/java/com/plotsquared/core/config/Captions.java @@ -1,9 +1,9 @@ -package com.plotsquared.config; +package com.plotsquared.core.config; -import com.plotsquared.configuration.ConfigurationSection; -import com.plotsquared.configuration.file.YamlConfiguration; -import com.plotsquared.PlotSquared; -import com.plotsquared.util.StringMan; +import com.plotsquared.core.configuration.ConfigurationSection; +import com.plotsquared.core.configuration.file.YamlConfiguration; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.util.StringMan; import java.io.File; import java.io.IOException; diff --git a/Core/src/main/java/com/plotsquared/config/ChatFormatter.java b/Core/src/main/java/com/plotsquared/core/config/ChatFormatter.java similarity index 88% rename from Core/src/main/java/com/plotsquared/config/ChatFormatter.java rename to Core/src/main/java/com/plotsquared/core/config/ChatFormatter.java index 518889b70..331e22456 100644 --- a/Core/src/main/java/com/plotsquared/config/ChatFormatter.java +++ b/Core/src/main/java/com/plotsquared/core/config/ChatFormatter.java @@ -1,6 +1,6 @@ -package com.plotsquared.config; +package com.plotsquared.core.config; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.player.PlotPlayer; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; diff --git a/Core/src/main/java/com/plotsquared/config/Config.java b/Core/src/main/java/com/plotsquared/core/config/Config.java similarity index 97% rename from Core/src/main/java/com/plotsquared/config/Config.java rename to Core/src/main/java/com/plotsquared/core/config/Config.java index eaf5eef78..fdc798c55 100644 --- a/Core/src/main/java/com/plotsquared/config/Config.java +++ b/Core/src/main/java/com/plotsquared/core/config/Config.java @@ -1,10 +1,10 @@ -package com.plotsquared.config; +package com.plotsquared.core.config; -import com.plotsquared.configuration.MemorySection; -import com.plotsquared.configuration.file.YamlConfiguration; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Settings.Enabled_Components; -import com.plotsquared.util.StringMan; +import com.plotsquared.core.configuration.MemorySection; +import com.plotsquared.core.configuration.file.YamlConfiguration; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Settings.Enabled_Components; +import com.plotsquared.core.util.StringMan; import java.io.File; import java.io.PrintWriter; diff --git a/Core/src/main/java/com/plotsquared/config/Configuration.java b/Core/src/main/java/com/plotsquared/core/config/Configuration.java similarity index 97% rename from Core/src/main/java/com/plotsquared/config/Configuration.java rename to Core/src/main/java/com/plotsquared/core/config/Configuration.java index 8508514fe..44e35f1b7 100644 --- a/Core/src/main/java/com/plotsquared/config/Configuration.java +++ b/Core/src/main/java/com/plotsquared/core/config/Configuration.java @@ -1,6 +1,6 @@ -package com.plotsquared.config; +package com.plotsquared.core.config; -import com.plotsquared.plot.BlockBucket; +import com.plotsquared.core.plot.BlockBucket; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.biome.BiomeTypes; diff --git a/Core/src/main/java/com/plotsquared/config/ConfigurationNode.java b/Core/src/main/java/com/plotsquared/core/config/ConfigurationNode.java similarity index 94% rename from Core/src/main/java/com/plotsquared/config/ConfigurationNode.java rename to Core/src/main/java/com/plotsquared/core/config/ConfigurationNode.java index bb7ed962f..3f44a53f3 100644 --- a/Core/src/main/java/com/plotsquared/config/ConfigurationNode.java +++ b/Core/src/main/java/com/plotsquared/core/config/ConfigurationNode.java @@ -1,7 +1,7 @@ -package com.plotsquared.config; +package com.plotsquared.core.config; -import com.plotsquared.plot.BlockBucket; -import com.plotsquared.util.StringMan; +import com.plotsquared.core.plot.BlockBucket; +import com.plotsquared.core.util.StringMan; import com.sk89q.worldedit.world.block.BlockState; import java.util.ArrayList; diff --git a/Core/src/main/java/com/plotsquared/config/PlotSquaredChatFormatter.java b/Core/src/main/java/com/plotsquared/core/config/PlotSquaredChatFormatter.java similarity index 92% rename from Core/src/main/java/com/plotsquared/config/PlotSquaredChatFormatter.java rename to Core/src/main/java/com/plotsquared/core/config/PlotSquaredChatFormatter.java index ea84034bd..860574f23 100644 --- a/Core/src/main/java/com/plotsquared/config/PlotSquaredChatFormatter.java +++ b/Core/src/main/java/com/plotsquared/core/config/PlotSquaredChatFormatter.java @@ -1,6 +1,6 @@ -package com.plotsquared.config; +package com.plotsquared.core.config; -import com.plotsquared.util.StringMan; +import com.plotsquared.core.util.StringMan; import java.util.LinkedHashMap; import java.util.Map; diff --git a/Core/src/main/java/com/plotsquared/config/Settings.java b/Core/src/main/java/com/plotsquared/core/config/Settings.java similarity index 99% rename from Core/src/main/java/com/plotsquared/config/Settings.java rename to Core/src/main/java/com/plotsquared/core/config/Settings.java index efe786ec6..b46ce12ab 100644 --- a/Core/src/main/java/com/plotsquared/config/Settings.java +++ b/Core/src/main/java/com/plotsquared/core/config/Settings.java @@ -1,6 +1,6 @@ -package com.plotsquared.config; +package com.plotsquared.core.config; -import com.plotsquared.configuration.file.YamlConfiguration; +import com.plotsquared.core.configuration.file.YamlConfiguration; import java.io.File; import java.util.ArrayList; diff --git a/Core/src/main/java/com/plotsquared/config/StaticCaption.java b/Core/src/main/java/com/plotsquared/core/config/StaticCaption.java similarity index 92% rename from Core/src/main/java/com/plotsquared/config/StaticCaption.java rename to Core/src/main/java/com/plotsquared/core/config/StaticCaption.java index 97e740e02..be4a39b43 100644 --- a/Core/src/main/java/com/plotsquared/config/StaticCaption.java +++ b/Core/src/main/java/com/plotsquared/core/config/StaticCaption.java @@ -1,4 +1,4 @@ -package com.plotsquared.config; +package com.plotsquared.core.config; import lombok.RequiredArgsConstructor; diff --git a/Core/src/main/java/com/plotsquared/config/Storage.java b/Core/src/main/java/com/plotsquared/core/config/Storage.java similarity index 96% rename from Core/src/main/java/com/plotsquared/config/Storage.java rename to Core/src/main/java/com/plotsquared/core/config/Storage.java index dfc9543c1..d5914a373 100644 --- a/Core/src/main/java/com/plotsquared/config/Storage.java +++ b/Core/src/main/java/com/plotsquared/core/config/Storage.java @@ -1,4 +1,4 @@ -package com.plotsquared.config; +package com.plotsquared.core.config; import java.io.File; import java.util.ArrayList; diff --git a/Core/src/main/java/com/plotsquared/configuration/Configuration.java b/Core/src/main/java/com/plotsquared/core/configuration/Configuration.java similarity index 98% rename from Core/src/main/java/com/plotsquared/configuration/Configuration.java rename to Core/src/main/java/com/plotsquared/core/configuration/Configuration.java index 74e4549eb..f44df0cb1 100644 --- a/Core/src/main/java/com/plotsquared/configuration/Configuration.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/Configuration.java @@ -1,4 +1,4 @@ -package com.plotsquared.configuration; +package com.plotsquared.core.configuration; import java.util.Map; diff --git a/Core/src/main/java/com/plotsquared/configuration/ConfigurationOptions.java b/Core/src/main/java/com/plotsquared/core/configuration/ConfigurationOptions.java similarity index 98% rename from Core/src/main/java/com/plotsquared/configuration/ConfigurationOptions.java rename to Core/src/main/java/com/plotsquared/core/configuration/ConfigurationOptions.java index 482f0ac00..360044997 100644 --- a/Core/src/main/java/com/plotsquared/configuration/ConfigurationOptions.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/ConfigurationOptions.java @@ -1,4 +1,4 @@ -package com.plotsquared.configuration; +package com.plotsquared.core.configuration; /** * Various settings for controlling the input and output of a {@link diff --git a/Core/src/main/java/com/plotsquared/configuration/ConfigurationSection.java b/Core/src/main/java/com/plotsquared/core/configuration/ConfigurationSection.java similarity index 99% rename from Core/src/main/java/com/plotsquared/configuration/ConfigurationSection.java rename to Core/src/main/java/com/plotsquared/core/configuration/ConfigurationSection.java index 834828ef3..65bc04603 100644 --- a/Core/src/main/java/com/plotsquared/configuration/ConfigurationSection.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/ConfigurationSection.java @@ -1,4 +1,4 @@ -package com.plotsquared.configuration; +package com.plotsquared.core.configuration; import java.util.List; import java.util.Map; diff --git a/Core/src/main/java/com/plotsquared/configuration/InvalidConfigurationException.java b/Core/src/main/java/com/plotsquared/core/configuration/InvalidConfigurationException.java similarity index 96% rename from Core/src/main/java/com/plotsquared/configuration/InvalidConfigurationException.java rename to Core/src/main/java/com/plotsquared/core/configuration/InvalidConfigurationException.java index 518f9d4f7..15fb6c708 100644 --- a/Core/src/main/java/com/plotsquared/configuration/InvalidConfigurationException.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/InvalidConfigurationException.java @@ -1,4 +1,4 @@ -package com.plotsquared.configuration; +package com.plotsquared.core.configuration; /** * Exception thrown when attempting to load an invalid {@link Configuration}. diff --git a/Core/src/main/java/com/plotsquared/configuration/MemoryConfiguration.java b/Core/src/main/java/com/plotsquared/core/configuration/MemoryConfiguration.java similarity index 97% rename from Core/src/main/java/com/plotsquared/configuration/MemoryConfiguration.java rename to Core/src/main/java/com/plotsquared/core/configuration/MemoryConfiguration.java index cc1527be8..28ed8875a 100644 --- a/Core/src/main/java/com/plotsquared/configuration/MemoryConfiguration.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/MemoryConfiguration.java @@ -1,4 +1,4 @@ -package com.plotsquared.configuration; +package com.plotsquared.core.configuration; import java.util.Map; diff --git a/Core/src/main/java/com/plotsquared/configuration/MemoryConfigurationOptions.java b/Core/src/main/java/com/plotsquared/core/configuration/MemoryConfigurationOptions.java similarity index 92% rename from Core/src/main/java/com/plotsquared/configuration/MemoryConfigurationOptions.java rename to Core/src/main/java/com/plotsquared/core/configuration/MemoryConfigurationOptions.java index 7bd1b5c5a..fe41bff8b 100644 --- a/Core/src/main/java/com/plotsquared/configuration/MemoryConfigurationOptions.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/MemoryConfigurationOptions.java @@ -1,4 +1,4 @@ -package com.plotsquared.configuration; +package com.plotsquared.core.configuration; /** * Various settings for controlling the input and output of a {@link diff --git a/Core/src/main/java/com/plotsquared/configuration/MemorySection.java b/Core/src/main/java/com/plotsquared/core/configuration/MemorySection.java similarity index 99% rename from Core/src/main/java/com/plotsquared/configuration/MemorySection.java rename to Core/src/main/java/com/plotsquared/core/configuration/MemorySection.java index 260a15b50..2517517b0 100644 --- a/Core/src/main/java/com/plotsquared/configuration/MemorySection.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/MemorySection.java @@ -1,4 +1,4 @@ -package com.plotsquared.configuration; +package com.plotsquared.core.configuration; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/Core/src/main/java/com/plotsquared/configuration/file/FileConfiguration.java b/Core/src/main/java/com/plotsquared/core/configuration/file/FileConfiguration.java similarity index 95% rename from Core/src/main/java/com/plotsquared/configuration/file/FileConfiguration.java rename to Core/src/main/java/com/plotsquared/core/configuration/file/FileConfiguration.java index bcfef26fa..b646df604 100644 --- a/Core/src/main/java/com/plotsquared/configuration/file/FileConfiguration.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/file/FileConfiguration.java @@ -1,8 +1,8 @@ -package com.plotsquared.configuration.file; +package com.plotsquared.core.configuration.file; -import com.plotsquared.configuration.Configuration; -import com.plotsquared.configuration.InvalidConfigurationException; -import com.plotsquared.configuration.MemoryConfiguration; +import com.plotsquared.core.configuration.Configuration; +import com.plotsquared.core.configuration.InvalidConfigurationException; +import com.plotsquared.core.configuration.MemoryConfiguration; import java.io.BufferedReader; import java.io.File; diff --git a/Core/src/main/java/com/plotsquared/configuration/file/FileConfigurationOptions.java b/Core/src/main/java/com/plotsquared/core/configuration/file/FileConfigurationOptions.java similarity index 93% rename from Core/src/main/java/com/plotsquared/configuration/file/FileConfigurationOptions.java rename to Core/src/main/java/com/plotsquared/core/configuration/file/FileConfigurationOptions.java index 23336ffa2..479cce5bb 100644 --- a/Core/src/main/java/com/plotsquared/configuration/file/FileConfigurationOptions.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/file/FileConfigurationOptions.java @@ -1,8 +1,8 @@ -package com.plotsquared.configuration.file; +package com.plotsquared.core.configuration.file; -import com.plotsquared.configuration.Configuration; -import com.plotsquared.configuration.MemoryConfiguration; -import com.plotsquared.configuration.MemoryConfigurationOptions; +import com.plotsquared.core.configuration.Configuration; +import com.plotsquared.core.configuration.MemoryConfiguration; +import com.plotsquared.core.configuration.MemoryConfigurationOptions; /** * Various settings for controlling the input and output of a {@link diff --git a/Core/src/main/java/com/plotsquared/configuration/file/YamlConfiguration.java b/Core/src/main/java/com/plotsquared/core/configuration/file/YamlConfiguration.java similarity index 95% rename from Core/src/main/java/com/plotsquared/configuration/file/YamlConfiguration.java rename to Core/src/main/java/com/plotsquared/core/configuration/file/YamlConfiguration.java index 145632a9c..870e7ea25 100644 --- a/Core/src/main/java/com/plotsquared/configuration/file/YamlConfiguration.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/file/YamlConfiguration.java @@ -1,9 +1,9 @@ -package com.plotsquared.configuration.file; +package com.plotsquared.core.configuration.file; -import com.plotsquared.configuration.Configuration; -import com.plotsquared.configuration.ConfigurationSection; -import com.plotsquared.configuration.InvalidConfigurationException; -import com.plotsquared.PlotSquared; +import com.plotsquared.core.configuration.Configuration; +import com.plotsquared.core.configuration.ConfigurationSection; +import com.plotsquared.core.configuration.InvalidConfigurationException; +import com.plotsquared.core.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/plotsquared/configuration/file/YamlConfigurationOptions.java b/Core/src/main/java/com/plotsquared/core/configuration/file/YamlConfigurationOptions.java similarity index 95% rename from Core/src/main/java/com/plotsquared/configuration/file/YamlConfigurationOptions.java rename to Core/src/main/java/com/plotsquared/core/configuration/file/YamlConfigurationOptions.java index 2a9674d52..9cd16f7c2 100644 --- a/Core/src/main/java/com/plotsquared/configuration/file/YamlConfigurationOptions.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/file/YamlConfigurationOptions.java @@ -1,4 +1,4 @@ -package com.plotsquared.configuration.file; +package com.plotsquared.core.configuration.file; /** * Various settings for controlling the input and output of a {@link diff --git a/Core/src/main/java/com/plotsquared/configuration/file/YamlConstructor.java b/Core/src/main/java/com/plotsquared/core/configuration/file/YamlConstructor.java similarity index 92% rename from Core/src/main/java/com/plotsquared/configuration/file/YamlConstructor.java rename to Core/src/main/java/com/plotsquared/core/configuration/file/YamlConstructor.java index 85c30bd20..8f34eeec4 100644 --- a/Core/src/main/java/com/plotsquared/configuration/file/YamlConstructor.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/file/YamlConstructor.java @@ -1,6 +1,6 @@ -package com.plotsquared.configuration.file; +package com.plotsquared.core.configuration.file; -import com.plotsquared.configuration.serialization.ConfigurationSerialization; +import com.plotsquared.core.configuration.serialization.ConfigurationSerialization; import org.yaml.snakeyaml.constructor.SafeConstructor; import org.yaml.snakeyaml.error.YAMLException; import org.yaml.snakeyaml.nodes.Node; diff --git a/Core/src/main/java/com/plotsquared/configuration/file/YamlRepresenter.java b/Core/src/main/java/com/plotsquared/core/configuration/file/YamlRepresenter.java similarity index 81% rename from Core/src/main/java/com/plotsquared/configuration/file/YamlRepresenter.java rename to Core/src/main/java/com/plotsquared/core/configuration/file/YamlRepresenter.java index 63c1cb5ee..d54e071ab 100644 --- a/Core/src/main/java/com/plotsquared/configuration/file/YamlRepresenter.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/file/YamlRepresenter.java @@ -1,8 +1,8 @@ -package com.plotsquared.configuration.file; +package com.plotsquared.core.configuration.file; -import com.plotsquared.configuration.ConfigurationSection; -import com.plotsquared.configuration.serialization.ConfigurationSerializable; -import com.plotsquared.configuration.serialization.ConfigurationSerialization; +import com.plotsquared.core.configuration.ConfigurationSection; +import com.plotsquared.core.configuration.serialization.ConfigurationSerializable; +import com.plotsquared.core.configuration.serialization.ConfigurationSerialization; import org.yaml.snakeyaml.nodes.Node; import org.yaml.snakeyaml.representer.Representer; diff --git a/Core/src/main/java/com/plotsquared/configuration/serialization/ConfigurationSerializable.java b/Core/src/main/java/com/plotsquared/core/configuration/serialization/ConfigurationSerializable.java similarity index 95% rename from Core/src/main/java/com/plotsquared/configuration/serialization/ConfigurationSerializable.java rename to Core/src/main/java/com/plotsquared/core/configuration/serialization/ConfigurationSerializable.java index bbafa8fd8..1b6877bce 100644 --- a/Core/src/main/java/com/plotsquared/configuration/serialization/ConfigurationSerializable.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/serialization/ConfigurationSerializable.java @@ -1,4 +1,4 @@ -package com.plotsquared.configuration.serialization; +package com.plotsquared.core.configuration.serialization; import java.util.Map; diff --git a/Core/src/main/java/com/plotsquared/configuration/serialization/ConfigurationSerialization.java b/Core/src/main/java/com/plotsquared/core/configuration/serialization/ConfigurationSerialization.java similarity index 98% rename from Core/src/main/java/com/plotsquared/configuration/serialization/ConfigurationSerialization.java rename to Core/src/main/java/com/plotsquared/core/configuration/serialization/ConfigurationSerialization.java index 0e124470e..e40274195 100644 --- a/Core/src/main/java/com/plotsquared/configuration/serialization/ConfigurationSerialization.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/serialization/ConfigurationSerialization.java @@ -1,6 +1,6 @@ -package com.plotsquared.configuration.serialization; +package com.plotsquared.core.configuration.serialization; -import com.plotsquared.configuration.Configuration; +import com.plotsquared.core.configuration.Configuration; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/Core/src/main/java/com/plotsquared/configuration/serialization/DelegateDeserialization.java b/Core/src/main/java/com/plotsquared/core/configuration/serialization/DelegateDeserialization.java similarity index 91% rename from Core/src/main/java/com/plotsquared/configuration/serialization/DelegateDeserialization.java rename to Core/src/main/java/com/plotsquared/core/configuration/serialization/DelegateDeserialization.java index b0b79d30d..7fd9ec6c4 100644 --- a/Core/src/main/java/com/plotsquared/configuration/serialization/DelegateDeserialization.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/serialization/DelegateDeserialization.java @@ -1,4 +1,4 @@ -package com.plotsquared.configuration.serialization; +package com.plotsquared.core.configuration.serialization; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Core/src/main/java/com/plotsquared/configuration/serialization/SerializableAs.java b/Core/src/main/java/com/plotsquared/core/configuration/serialization/SerializableAs.java similarity index 94% rename from Core/src/main/java/com/plotsquared/configuration/serialization/SerializableAs.java rename to Core/src/main/java/com/plotsquared/core/configuration/serialization/SerializableAs.java index dd60ff5ae..27f16466e 100644 --- a/Core/src/main/java/com/plotsquared/configuration/serialization/SerializableAs.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/serialization/SerializableAs.java @@ -1,4 +1,4 @@ -package com.plotsquared.configuration.serialization; +package com.plotsquared.core.configuration.serialization; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Core/src/main/java/com/plotsquared/database/AbstractDB.java b/Core/src/main/java/com/plotsquared/core/database/AbstractDB.java similarity index 95% rename from Core/src/main/java/com/plotsquared/database/AbstractDB.java rename to Core/src/main/java/com/plotsquared/core/database/AbstractDB.java index 7624be327..b470f17f4 100644 --- a/Core/src/main/java/com/plotsquared/database/AbstractDB.java +++ b/Core/src/main/java/com/plotsquared/core/database/AbstractDB.java @@ -1,12 +1,12 @@ -package com.plotsquared.database; +package com.plotsquared.core.database; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotCluster; -import com.plotsquared.plot.PlotId; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.plot.comment.PlotComment; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotCluster; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.plot.comment.PlotComment; import org.jetbrains.annotations.NotNull; import java.util.HashMap; diff --git a/Core/src/main/java/com/plotsquared/database/DBFunc.java b/Core/src/main/java/com/plotsquared/core/database/DBFunc.java similarity index 97% rename from Core/src/main/java/com/plotsquared/database/DBFunc.java rename to Core/src/main/java/com/plotsquared/core/database/DBFunc.java index 7b46c870a..d56f709f9 100644 --- a/Core/src/main/java/com/plotsquared/database/DBFunc.java +++ b/Core/src/main/java/com/plotsquared/core/database/DBFunc.java @@ -1,12 +1,12 @@ -package com.plotsquared.database; +package com.plotsquared.core.database; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotCluster; -import com.plotsquared.plot.PlotId; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.plot.comment.PlotComment; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotCluster; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.plot.comment.PlotComment; import java.sql.ResultSet; import java.sql.ResultSetMetaData; diff --git a/Core/src/main/java/com/plotsquared/database/Database.java b/Core/src/main/java/com/plotsquared/core/database/Database.java similarity index 98% rename from Core/src/main/java/com/plotsquared/database/Database.java rename to Core/src/main/java/com/plotsquared/core/database/Database.java index 7a3d57622..723330329 100644 --- a/Core/src/main/java/com/plotsquared/database/Database.java +++ b/Core/src/main/java/com/plotsquared/core/database/Database.java @@ -1,4 +1,4 @@ -package com.plotsquared.database; +package com.plotsquared.core.database; import java.sql.Connection; import java.sql.ResultSet; diff --git a/Core/src/main/java/com/plotsquared/database/MySQL.java b/Core/src/main/java/com/plotsquared/core/database/MySQL.java similarity index 95% rename from Core/src/main/java/com/plotsquared/database/MySQL.java rename to Core/src/main/java/com/plotsquared/core/database/MySQL.java index 811873b72..5e29c1f05 100644 --- a/Core/src/main/java/com/plotsquared/database/MySQL.java +++ b/Core/src/main/java/com/plotsquared/core/database/MySQL.java @@ -1,7 +1,7 @@ -package com.plotsquared.database; +package com.plotsquared.core.database; -import com.plotsquared.config.Storage; -import com.plotsquared.util.StringMan; +import com.plotsquared.core.config.Storage; +import com.plotsquared.core.util.StringMan; import java.sql.Connection; import java.sql.DriverManager; diff --git a/Core/src/main/java/com/plotsquared/database/SQLManager.java b/Core/src/main/java/com/plotsquared/core/database/SQLManager.java similarity index 99% rename from Core/src/main/java/com/plotsquared/database/SQLManager.java rename to Core/src/main/java/com/plotsquared/core/database/SQLManager.java index 3580736d7..a30c98b0a 100644 --- a/Core/src/main/java/com/plotsquared/database/SQLManager.java +++ b/Core/src/main/java/com/plotsquared/core/database/SQLManager.java @@ -1,25 +1,25 @@ -package com.plotsquared.database; +package com.plotsquared.core.database; -import com.plotsquared.configuration.ConfigurationSection; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.config.Storage; -import com.plotsquared.plot.flags.FlagContainer; -import com.plotsquared.plot.flags.FlagParseException; -import com.plotsquared.plot.flags.GlobalFlagContainer; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.location.BlockLoc; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotCluster; -import com.plotsquared.plot.PlotId; -import com.plotsquared.plot.PlotSettings; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.plot.comment.PlotComment; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.StringMan; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.configuration.ConfigurationSection; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.config.Storage; +import com.plotsquared.core.plot.flag.FlagContainer; +import com.plotsquared.core.plot.flag.FlagParseException; +import com.plotsquared.core.plot.flag.GlobalFlagContainer; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.location.BlockLoc; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotCluster; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.plot.PlotSettings; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.plot.comment.PlotComment; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.util.task.TaskManager; import com.google.common.base.Charsets; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/database/SQLite.java b/Core/src/main/java/com/plotsquared/core/database/SQLite.java similarity index 97% rename from Core/src/main/java/com/plotsquared/database/SQLite.java rename to Core/src/main/java/com/plotsquared/core/database/SQLite.java index 31bf46793..9ca46c5c8 100644 --- a/Core/src/main/java/com/plotsquared/database/SQLite.java +++ b/Core/src/main/java/com/plotsquared/core/database/SQLite.java @@ -1,6 +1,6 @@ -package com.plotsquared.database; +package com.plotsquared.core.database; -import com.plotsquared.PlotSquared; +import com.plotsquared.core.PlotSquared; import java.io.File; import java.io.IOException; diff --git a/Core/src/main/java/com/plotsquared/database/StmtMod.java b/Core/src/main/java/com/plotsquared/core/database/StmtMod.java similarity index 94% rename from Core/src/main/java/com/plotsquared/database/StmtMod.java rename to Core/src/main/java/com/plotsquared/core/database/StmtMod.java index 321bce397..3af0cba43 100644 --- a/Core/src/main/java/com/plotsquared/database/StmtMod.java +++ b/Core/src/main/java/com/plotsquared/core/database/StmtMod.java @@ -1,6 +1,6 @@ -package com.plotsquared.database; +package com.plotsquared.core.database; -import com.plotsquared.util.StringMan; +import com.plotsquared.core.util.StringMan; import java.sql.PreparedStatement; import java.sql.SQLException; diff --git a/Core/src/main/java/com/plotsquared/events/CancellablePlotEvent.java b/Core/src/main/java/com/plotsquared/core/events/CancellablePlotEvent.java similarity index 88% rename from Core/src/main/java/com/plotsquared/events/CancellablePlotEvent.java rename to Core/src/main/java/com/plotsquared/core/events/CancellablePlotEvent.java index 41660445c..48c248e09 100644 --- a/Core/src/main/java/com/plotsquared/events/CancellablePlotEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/CancellablePlotEvent.java @@ -1,4 +1,4 @@ -package com.plotsquared.events; +package com.plotsquared.core.events; /** * PlotSquared event with {@link Result} to cancel, force, or allow. diff --git a/Core/src/main/java/com/plotsquared/events/PlayerAutoPlotEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlayerAutoPlotEvent.java similarity index 90% rename from Core/src/main/java/com/plotsquared/events/PlayerAutoPlotEvent.java rename to Core/src/main/java/com/plotsquared/core/events/PlayerAutoPlotEvent.java index db173a474..b2d58155e 100644 --- a/Core/src/main/java/com/plotsquared/events/PlayerAutoPlotEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlayerAutoPlotEvent.java @@ -1,8 +1,8 @@ -package com.plotsquared.events; +package com.plotsquared.core.events; -import com.plotsquared.commands.Claim; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.command.Claim; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.player.PlotPlayer; import lombok.Getter; import lombok.Setter; diff --git a/Core/src/main/java/com/plotsquared/events/PlayerClaimPlotEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlayerClaimPlotEvent.java similarity index 87% rename from Core/src/main/java/com/plotsquared/events/PlayerClaimPlotEvent.java rename to Core/src/main/java/com/plotsquared/core/events/PlayerClaimPlotEvent.java index c33d1ecc2..7f30b46af 100644 --- a/Core/src/main/java/com/plotsquared/events/PlayerClaimPlotEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlayerClaimPlotEvent.java @@ -1,8 +1,8 @@ -package com.plotsquared.events; +package com.plotsquared.core.events; -import com.plotsquared.commands.Claim; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.command.Claim; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; import javax.annotation.Nullable; diff --git a/Core/src/main/java/com/plotsquared/events/PlayerEnterPlotEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlayerEnterPlotEvent.java similarity index 72% rename from Core/src/main/java/com/plotsquared/events/PlayerEnterPlotEvent.java rename to Core/src/main/java/com/plotsquared/core/events/PlayerEnterPlotEvent.java index cf39e6642..7e3df6602 100644 --- a/Core/src/main/java/com/plotsquared/events/PlayerEnterPlotEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlayerEnterPlotEvent.java @@ -1,7 +1,7 @@ -package com.plotsquared.events; +package com.plotsquared.core.events; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; public class PlayerEnterPlotEvent extends PlotPlayerEvent { diff --git a/Core/src/main/java/com/plotsquared/events/PlayerLeavePlotEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlayerLeavePlotEvent.java similarity index 73% rename from Core/src/main/java/com/plotsquared/events/PlayerLeavePlotEvent.java rename to Core/src/main/java/com/plotsquared/core/events/PlayerLeavePlotEvent.java index 85a205af3..c60ad4698 100644 --- a/Core/src/main/java/com/plotsquared/events/PlayerLeavePlotEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlayerLeavePlotEvent.java @@ -1,7 +1,7 @@ -package com.plotsquared.events; +package com.plotsquared.core.events; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; /** * diff --git a/Core/src/main/java/com/plotsquared/events/PlayerPlotDeniedEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlayerPlotDeniedEvent.java similarity index 90% rename from Core/src/main/java/com/plotsquared/events/PlayerPlotDeniedEvent.java rename to Core/src/main/java/com/plotsquared/core/events/PlayerPlotDeniedEvent.java index 31c800b82..72a69bb55 100644 --- a/Core/src/main/java/com/plotsquared/events/PlayerPlotDeniedEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlayerPlotDeniedEvent.java @@ -1,7 +1,7 @@ -package com.plotsquared.events; +package com.plotsquared.core.events; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; import java.util.UUID; diff --git a/Core/src/main/java/com/plotsquared/events/PlayerPlotHelperEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlayerPlotHelperEvent.java similarity index 90% rename from Core/src/main/java/com/plotsquared/events/PlayerPlotHelperEvent.java rename to Core/src/main/java/com/plotsquared/core/events/PlayerPlotHelperEvent.java index 68633cbd8..0073fdf5a 100644 --- a/Core/src/main/java/com/plotsquared/events/PlayerPlotHelperEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlayerPlotHelperEvent.java @@ -1,7 +1,7 @@ -package com.plotsquared.events; +package com.plotsquared.core.events; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; import java.util.UUID; diff --git a/Core/src/main/java/com/plotsquared/events/PlayerPlotTrustedEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlayerPlotTrustedEvent.java similarity index 90% rename from Core/src/main/java/com/plotsquared/events/PlayerPlotTrustedEvent.java rename to Core/src/main/java/com/plotsquared/core/events/PlayerPlotTrustedEvent.java index 253c92700..e1565cb27 100644 --- a/Core/src/main/java/com/plotsquared/events/PlayerPlotTrustedEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlayerPlotTrustedEvent.java @@ -1,7 +1,7 @@ -package com.plotsquared.events; +package com.plotsquared.core.events; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; import java.util.UUID; diff --git a/Core/src/main/java/com/plotsquared/events/PlayerTeleportToPlotEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlayerTeleportToPlotEvent.java similarity index 84% rename from Core/src/main/java/com/plotsquared/events/PlayerTeleportToPlotEvent.java rename to Core/src/main/java/com/plotsquared/core/events/PlayerTeleportToPlotEvent.java index 074b93f9b..47fa1c679 100644 --- a/Core/src/main/java/com/plotsquared/events/PlayerTeleportToPlotEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlayerTeleportToPlotEvent.java @@ -1,8 +1,8 @@ -package com.plotsquared.events; +package com.plotsquared.core.events; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; /** * Called when a player teleports to a plot diff --git a/Core/src/main/java/com/plotsquared/events/PlotAutoMergeEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotAutoMergeEvent.java similarity index 91% rename from Core/src/main/java/com/plotsquared/events/PlotAutoMergeEvent.java rename to Core/src/main/java/com/plotsquared/core/events/PlotAutoMergeEvent.java index 88fb212df..0836d2a8f 100644 --- a/Core/src/main/java/com/plotsquared/events/PlotAutoMergeEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlotAutoMergeEvent.java @@ -1,7 +1,7 @@ -package com.plotsquared.events; +package com.plotsquared.core.events; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotId; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotId; import lombok.Getter; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/events/PlotChangeOwnerEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotChangeOwnerEvent.java similarity index 93% rename from Core/src/main/java/com/plotsquared/events/PlotChangeOwnerEvent.java rename to Core/src/main/java/com/plotsquared/core/events/PlotChangeOwnerEvent.java index a47b2100b..ab1addbae 100644 --- a/Core/src/main/java/com/plotsquared/events/PlotChangeOwnerEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlotChangeOwnerEvent.java @@ -1,8 +1,8 @@ -package com.plotsquared.events; +package com.plotsquared.core.events; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotId; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.player.PlotPlayer; import org.jetbrains.annotations.Nullable; import java.util.UUID; diff --git a/Core/src/main/java/com/plotsquared/events/PlotClearEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotClearEvent.java similarity index 85% rename from Core/src/main/java/com/plotsquared/events/PlotClearEvent.java rename to Core/src/main/java/com/plotsquared/core/events/PlotClearEvent.java index db0285f40..2b85b81aa 100644 --- a/Core/src/main/java/com/plotsquared/events/PlotClearEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlotClearEvent.java @@ -1,7 +1,7 @@ -package com.plotsquared.events; +package com.plotsquared.core.events; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotId; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotId; /** * Called when a plot is cleared diff --git a/Core/src/main/java/com/plotsquared/events/PlotComponentSetEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotComponentSetEvent.java similarity index 93% rename from Core/src/main/java/com/plotsquared/events/PlotComponentSetEvent.java rename to Core/src/main/java/com/plotsquared/core/events/PlotComponentSetEvent.java index 02c90ce05..f9d9a8a5f 100644 --- a/Core/src/main/java/com/plotsquared/events/PlotComponentSetEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlotComponentSetEvent.java @@ -1,7 +1,7 @@ -package com.plotsquared.events; +package com.plotsquared.core.events; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotId; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotId; import com.sk89q.worldedit.function.pattern.Pattern; /** diff --git a/Core/src/main/java/com/plotsquared/events/PlotDeleteEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotDeleteEvent.java similarity index 85% rename from Core/src/main/java/com/plotsquared/events/PlotDeleteEvent.java rename to Core/src/main/java/com/plotsquared/core/events/PlotDeleteEvent.java index 55c7408d0..137f86aaa 100644 --- a/Core/src/main/java/com/plotsquared/events/PlotDeleteEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlotDeleteEvent.java @@ -1,7 +1,7 @@ -package com.plotsquared.events; +package com.plotsquared.core.events; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotId; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotId; /** * Called when a plot is deleted diff --git a/Core/src/main/java/com/plotsquared/events/PlotDoneEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotDoneEvent.java similarity index 87% rename from Core/src/main/java/com/plotsquared/events/PlotDoneEvent.java rename to Core/src/main/java/com/plotsquared/core/events/PlotDoneEvent.java index 2c5523c0c..3a40ad399 100644 --- a/Core/src/main/java/com/plotsquared/events/PlotDoneEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlotDoneEvent.java @@ -1,7 +1,7 @@ -package com.plotsquared.events; +package com.plotsquared.core.events; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotId; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotId; /** * Called when a plot is cleared diff --git a/Core/src/main/java/com/plotsquared/events/PlotEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotEvent.java similarity index 88% rename from Core/src/main/java/com/plotsquared/events/PlotEvent.java rename to Core/src/main/java/com/plotsquared/core/events/PlotEvent.java index 0a255f5a7..57fecad4b 100644 --- a/Core/src/main/java/com/plotsquared/events/PlotEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlotEvent.java @@ -1,6 +1,6 @@ -package com.plotsquared.events; +package com.plotsquared.core.events; -import com.plotsquared.plot.Plot; +import com.plotsquared.core.plot.Plot; import org.jetbrains.annotations.NotNull; public abstract class PlotEvent { diff --git a/Core/src/main/java/com/plotsquared/events/PlotFlagAddEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotFlagAddEvent.java similarity index 83% rename from Core/src/main/java/com/plotsquared/events/PlotFlagAddEvent.java rename to Core/src/main/java/com/plotsquared/core/events/PlotFlagAddEvent.java index c145e6fc6..fe944cd67 100644 --- a/Core/src/main/java/com/plotsquared/events/PlotFlagAddEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlotFlagAddEvent.java @@ -1,7 +1,7 @@ -package com.plotsquared.events; +package com.plotsquared.core.events; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.plot.Plot; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.plot.Plot; /** * Called when a Flag is added to a plot. diff --git a/Core/src/main/java/com/plotsquared/events/PlotFlagEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotFlagEvent.java similarity index 74% rename from Core/src/main/java/com/plotsquared/events/PlotFlagEvent.java rename to Core/src/main/java/com/plotsquared/core/events/PlotFlagEvent.java index c3572dc73..92949b059 100644 --- a/Core/src/main/java/com/plotsquared/events/PlotFlagEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlotFlagEvent.java @@ -1,7 +1,7 @@ -package com.plotsquared.events; +package com.plotsquared.core.events; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.plot.Plot; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.plot.Plot; public abstract class PlotFlagEvent extends PlotEvent { private final PlotFlag flag; diff --git a/Core/src/main/java/com/plotsquared/events/PlotFlagRemoveEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotFlagRemoveEvent.java similarity index 83% rename from Core/src/main/java/com/plotsquared/events/PlotFlagRemoveEvent.java rename to Core/src/main/java/com/plotsquared/core/events/PlotFlagRemoveEvent.java index ec4c60d16..375dbbb0d 100644 --- a/Core/src/main/java/com/plotsquared/events/PlotFlagRemoveEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlotFlagRemoveEvent.java @@ -1,7 +1,7 @@ -package com.plotsquared.events; +package com.plotsquared.core.events; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.plot.Plot; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.plot.Plot; /** * Called when a flag is removed from a plot diff --git a/Core/src/main/java/com/plotsquared/events/PlotMergeEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotMergeEvent.java similarity index 87% rename from Core/src/main/java/com/plotsquared/events/PlotMergeEvent.java rename to Core/src/main/java/com/plotsquared/core/events/PlotMergeEvent.java index 4906d8e78..afbaf36a5 100644 --- a/Core/src/main/java/com/plotsquared/events/PlotMergeEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlotMergeEvent.java @@ -1,8 +1,8 @@ -package com.plotsquared.events; +package com.plotsquared.core.events; -import com.plotsquared.location.Direction; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.location.Direction; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; import lombok.Getter; import lombok.Setter; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/events/PlotPlayerEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotPlayerEvent.java similarity index 71% rename from Core/src/main/java/com/plotsquared/events/PlotPlayerEvent.java rename to Core/src/main/java/com/plotsquared/core/events/PlotPlayerEvent.java index fc65ad771..142f72107 100644 --- a/Core/src/main/java/com/plotsquared/events/PlotPlayerEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlotPlayerEvent.java @@ -1,7 +1,7 @@ -package com.plotsquared.events; +package com.plotsquared.core.events; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; public abstract class PlotPlayerEvent extends PlotEvent { diff --git a/Core/src/main/java/com/plotsquared/events/PlotRateEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotRateEvent.java similarity index 86% rename from Core/src/main/java/com/plotsquared/events/PlotRateEvent.java rename to Core/src/main/java/com/plotsquared/core/events/PlotRateEvent.java index 2b8ac5d12..a4a539f57 100644 --- a/Core/src/main/java/com/plotsquared/events/PlotRateEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlotRateEvent.java @@ -1,8 +1,8 @@ -package com.plotsquared.events; +package com.plotsquared.core.events; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.plot.Rating; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.Rating; import org.jetbrains.annotations.Nullable; public class PlotRateEvent extends PlotEvent implements CancellablePlotEvent { diff --git a/Core/src/main/java/com/plotsquared/events/PlotUnlinkEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotUnlinkEvent.java similarity index 92% rename from Core/src/main/java/com/plotsquared/events/PlotUnlinkEvent.java rename to Core/src/main/java/com/plotsquared/core/events/PlotUnlinkEvent.java index 66786d854..8636546a8 100644 --- a/Core/src/main/java/com/plotsquared/events/PlotUnlinkEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlotUnlinkEvent.java @@ -1,7 +1,7 @@ -package com.plotsquared.events; +package com.plotsquared.core.events; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; import lombok.Getter; import lombok.Setter; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/events/Result.java b/Core/src/main/java/com/plotsquared/core/events/Result.java similarity index 96% rename from Core/src/main/java/com/plotsquared/events/Result.java rename to Core/src/main/java/com/plotsquared/core/events/Result.java index a83f8f214..00696a4f5 100644 --- a/Core/src/main/java/com/plotsquared/events/Result.java +++ b/Core/src/main/java/com/plotsquared/core/events/Result.java @@ -1,4 +1,4 @@ -package com.plotsquared.events; +package com.plotsquared.core.events; import java.util.HashMap; import java.util.Map; diff --git a/Core/src/main/java/com/plotsquared/events/TeleportCause.java b/Core/src/main/java/com/plotsquared/core/events/TeleportCause.java similarity index 61% rename from Core/src/main/java/com/plotsquared/events/TeleportCause.java rename to Core/src/main/java/com/plotsquared/core/events/TeleportCause.java index 51fc9a1be..4ca347a8e 100644 --- a/Core/src/main/java/com/plotsquared/events/TeleportCause.java +++ b/Core/src/main/java/com/plotsquared/core/events/TeleportCause.java @@ -1,4 +1,4 @@ -package com.plotsquared.events; +package com.plotsquared.core.events; public enum TeleportCause { COMMAND, PLUGIN, UNKNOWN diff --git a/Core/src/main/java/com/plotsquared/generator/AugmentedUtils.java b/Core/src/main/java/com/plotsquared/core/generator/AugmentedUtils.java similarity index 92% rename from Core/src/main/java/com/plotsquared/generator/AugmentedUtils.java rename to Core/src/main/java/com/plotsquared/core/generator/AugmentedUtils.java index 35ed3cd65..3d68c1914 100644 --- a/Core/src/main/java/com/plotsquared/generator/AugmentedUtils.java +++ b/Core/src/main/java/com/plotsquared/core/generator/AugmentedUtils.java @@ -1,16 +1,16 @@ -package com.plotsquared.generator; +package com.plotsquared.core.generator; -import com.plotsquared.PlotSquared; -import com.plotsquared.location.Location; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotAreaTerrainType; -import com.plotsquared.plot.PlotAreaType; -import com.plotsquared.plot.PlotManager; -import com.plotsquared.queue.DelegateLocalBlockQueue; -import com.plotsquared.queue.GlobalBlockQueue; -import com.plotsquared.queue.LocalBlockQueue; -import com.plotsquared.queue.ScopedLocalBlockQueue; -import com.plotsquared.util.RegionUtil; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotAreaTerrainType; +import com.plotsquared.core.plot.PlotAreaType; +import com.plotsquared.core.plot.PlotManager; +import com.plotsquared.core.queue.DelegateLocalBlockQueue; +import com.plotsquared.core.queue.GlobalBlockQueue; +import com.plotsquared.core.queue.LocalBlockQueue; +import com.plotsquared.core.queue.ScopedLocalBlockQueue; +import com.plotsquared.core.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/plotsquared/generator/ClassicPlotManager.java b/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java similarity index 97% rename from Core/src/main/java/com/plotsquared/generator/ClassicPlotManager.java rename to Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java index 7f42e63b3..4381e14c2 100644 --- a/Core/src/main/java/com/plotsquared/generator/ClassicPlotManager.java +++ b/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java @@ -1,16 +1,16 @@ -package com.plotsquared.generator; +package com.plotsquared.core.generator; -import com.plotsquared.config.Settings; -import com.plotsquared.plot.BlockBucket; -import com.plotsquared.location.Direction; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotAreaTerrainType; -import com.plotsquared.plot.PlotId; -import com.plotsquared.util.MathMan; -import com.plotsquared.queue.GlobalBlockQueue; -import com.plotsquared.queue.LocalBlockQueue; -import com.plotsquared.util.BlockUtil; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.plot.BlockBucket; +import com.plotsquared.core.location.Direction; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotAreaTerrainType; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.queue.GlobalBlockQueue; +import com.plotsquared.core.queue.LocalBlockQueue; +import com.plotsquared.core.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/plotsquared/generator/ClassicPlotWorld.java b/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotWorld.java similarity index 93% rename from Core/src/main/java/com/plotsquared/generator/ClassicPlotWorld.java rename to Core/src/main/java/com/plotsquared/core/generator/ClassicPlotWorld.java index c81c09abb..21fb23eb3 100644 --- a/Core/src/main/java/com/plotsquared/generator/ClassicPlotWorld.java +++ b/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotWorld.java @@ -1,12 +1,12 @@ -package com.plotsquared.generator; +package com.plotsquared.core.generator; -import com.plotsquared.configuration.ConfigurationSection; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Configuration; -import com.plotsquared.config.ConfigurationNode; -import com.plotsquared.config.Settings; -import com.plotsquared.plot.BlockBucket; -import com.plotsquared.plot.PlotId; +import com.plotsquared.core.configuration.ConfigurationSection; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Configuration; +import com.plotsquared.core.config.ConfigurationNode; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.plot.BlockBucket; +import com.plotsquared.core.plot.PlotId; import com.sk89q.worldedit.world.block.BlockTypes; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/generator/GeneratorWrapper.java b/Core/src/main/java/com/plotsquared/core/generator/GeneratorWrapper.java similarity index 75% rename from Core/src/main/java/com/plotsquared/generator/GeneratorWrapper.java rename to Core/src/main/java/com/plotsquared/core/generator/GeneratorWrapper.java index 599860f8c..f579c27f2 100644 --- a/Core/src/main/java/com/plotsquared/generator/GeneratorWrapper.java +++ b/Core/src/main/java/com/plotsquared/core/generator/GeneratorWrapper.java @@ -1,6 +1,6 @@ -package com.plotsquared.generator; +package com.plotsquared.core.generator; -import com.plotsquared.plot.PlotArea; +import com.plotsquared.core.plot.PlotArea; public interface GeneratorWrapper { diff --git a/Core/src/main/java/com/plotsquared/generator/GridPlotManager.java b/Core/src/main/java/com/plotsquared/core/generator/GridPlotManager.java similarity index 64% rename from Core/src/main/java/com/plotsquared/generator/GridPlotManager.java rename to Core/src/main/java/com/plotsquared/core/generator/GridPlotManager.java index 682e7cdb2..8ac8ab629 100644 --- a/Core/src/main/java/com/plotsquared/generator/GridPlotManager.java +++ b/Core/src/main/java/com/plotsquared/core/generator/GridPlotManager.java @@ -1,7 +1,7 @@ -package com.plotsquared.generator; +package com.plotsquared.core.generator; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotManager; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotManager; /** * A plot manager where plots tessellate in a grid formation symmetrical about x=z. diff --git a/Core/src/main/java/com/plotsquared/generator/GridPlotWorld.java b/Core/src/main/java/com/plotsquared/core/generator/GridPlotWorld.java similarity index 71% rename from Core/src/main/java/com/plotsquared/generator/GridPlotWorld.java rename to Core/src/main/java/com/plotsquared/core/generator/GridPlotWorld.java index 7a0ac8416..925675fa6 100644 --- a/Core/src/main/java/com/plotsquared/generator/GridPlotWorld.java +++ b/Core/src/main/java/com/plotsquared/core/generator/GridPlotWorld.java @@ -1,7 +1,7 @@ -package com.plotsquared.generator; +package com.plotsquared.core.generator; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotId; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotId; import org.jetbrains.annotations.NotNull; public abstract class GridPlotWorld extends PlotArea { diff --git a/Core/src/main/java/com/plotsquared/generator/HybridGen.java b/Core/src/main/java/com/plotsquared/core/generator/HybridGen.java similarity index 96% rename from Core/src/main/java/com/plotsquared/generator/HybridGen.java rename to Core/src/main/java/com/plotsquared/core/generator/HybridGen.java index 6ac0e5b1f..13830ac49 100644 --- a/Core/src/main/java/com/plotsquared/generator/HybridGen.java +++ b/Core/src/main/java/com/plotsquared/core/generator/HybridGen.java @@ -1,12 +1,12 @@ -package com.plotsquared.generator; +package com.plotsquared.core.generator; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Settings; -import com.plotsquared.location.Location; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotId; -import com.plotsquared.util.MathMan; -import com.plotsquared.queue.ScopedLocalBlockQueue; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.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/plotsquared/generator/HybridPlotManager.java b/Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java similarity index 92% rename from Core/src/main/java/com/plotsquared/generator/HybridPlotManager.java rename to Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java index 796457385..21f445363 100644 --- a/Core/src/main/java/com/plotsquared/generator/HybridPlotManager.java +++ b/Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java @@ -1,21 +1,21 @@ -package com.plotsquared.generator; +package com.plotsquared.core.generator; -import com.plotsquared.PlotSquared; -import com.plotsquared.commands.Template; -import com.plotsquared.config.Settings; -import com.plotsquared.util.FileBytes; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotAreaTerrainType; -import com.plotsquared.plot.PlotAreaType; -import com.plotsquared.plot.PlotId; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.ChunkManager; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.MathMan; -import com.plotsquared.queue.GlobalBlockQueue; -import com.plotsquared.queue.LocalBlockQueue; -import com.plotsquared.util.BlockUtil; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.command.Template; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.util.FileBytes; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotAreaTerrainType; +import com.plotsquared.core.plot.PlotAreaType; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.ChunkManager; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.queue.GlobalBlockQueue; +import com.plotsquared.core.queue.LocalBlockQueue; +import com.plotsquared.core.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/plotsquared/generator/HybridPlotWorld.java b/Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java similarity index 95% rename from Core/src/main/java/com/plotsquared/generator/HybridPlotWorld.java rename to Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java index 6b9ca522b..0cf8c660d 100644 --- a/Core/src/main/java/com/plotsquared/generator/HybridPlotWorld.java +++ b/Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java @@ -1,17 +1,17 @@ -package com.plotsquared.generator; +package com.plotsquared.core.generator; -import com.plotsquared.configuration.ConfigurationSection; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotId; -import com.plotsquared.plot.PlotManager; -import com.plotsquared.plot.schematic.Schematic; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.MathMan; -import com.plotsquared.util.SchematicHandler; +import com.plotsquared.core.configuration.ConfigurationSection; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.plot.PlotManager; +import com.plotsquared.core.plot.schematic.Schematic; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.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/plotsquared/generator/HybridUtils.java b/Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java similarity index 95% rename from Core/src/main/java/com/plotsquared/generator/HybridUtils.java rename to Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java index 013c6d9e4..b66648bae 100644 --- a/Core/src/main/java/com/plotsquared/generator/HybridUtils.java +++ b/Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java @@ -1,31 +1,31 @@ -package com.plotsquared.generator; +package com.plotsquared.core.generator; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Settings; -import com.plotsquared.events.PlotFlagAddEvent; -import com.plotsquared.events.Result; -import com.plotsquared.plot.flags.GlobalFlagContainer; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.plot.flags.implementations.AnalysisFlag; -import com.plotsquared.listener.WEExtent; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotAreaType; -import com.plotsquared.plot.PlotId; -import com.plotsquared.plot.PlotManager; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.ChunkManager; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.MathMan; -import com.plotsquared.util.SchematicHandler; -import com.plotsquared.util.tasks.TaskManager; -import com.plotsquared.util.WorldUtil; -import com.plotsquared.queue.ChunkBlockQueue; -import com.plotsquared.queue.GlobalBlockQueue; -import com.plotsquared.queue.LocalBlockQueue; -import com.plotsquared.plot.expiration.PlotAnalysis; -import com.plotsquared.util.RegionUtil; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.events.PlotFlagAddEvent; +import com.plotsquared.core.events.Result; +import com.plotsquared.core.plot.flag.GlobalFlagContainer; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.plot.flag.implementations.AnalysisFlag; +import com.plotsquared.core.listener.WEExtent; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotAreaType; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.plot.PlotManager; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.ChunkManager; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.util.SchematicHandler; +import com.plotsquared.core.util.task.TaskManager; +import com.plotsquared.core.util.WorldUtil; +import com.plotsquared.core.queue.ChunkBlockQueue; +import com.plotsquared.core.queue.GlobalBlockQueue; +import com.plotsquared.core.queue.LocalBlockQueue; +import com.plotsquared.core.plot.expiration.PlotAnalysis; +import com.plotsquared.core.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/plotsquared/generator/IndependentPlotGenerator.java b/Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java similarity index 88% rename from Core/src/main/java/com/plotsquared/generator/IndependentPlotGenerator.java rename to Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java index 5cba454cb..9f90ff39a 100644 --- a/Core/src/main/java/com/plotsquared/generator/IndependentPlotGenerator.java +++ b/Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java @@ -1,10 +1,10 @@ -package com.plotsquared.generator; +package com.plotsquared.core.generator; -import com.plotsquared.PlotSquared; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotId; -import com.plotsquared.plot.SetupObject; -import com.plotsquared.queue.ScopedLocalBlockQueue; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.plot.SetupObject; +import com.plotsquared.core.queue.ScopedLocalBlockQueue; /** * This class allows for implementation independent world generation. diff --git a/Core/src/main/java/com/plotsquared/plot/worlds/SingleWorldGenerator.java b/Core/src/main/java/com/plotsquared/core/generator/SingleWorldGenerator.java similarity index 80% rename from Core/src/main/java/com/plotsquared/plot/worlds/SingleWorldGenerator.java rename to Core/src/main/java/com/plotsquared/core/generator/SingleWorldGenerator.java index 57838d14a..1b63f0e94 100644 --- a/Core/src/main/java/com/plotsquared/plot/worlds/SingleWorldGenerator.java +++ b/Core/src/main/java/com/plotsquared/core/generator/SingleWorldGenerator.java @@ -1,11 +1,12 @@ -package com.plotsquared.plot.worlds; +package com.plotsquared.core.generator; -import com.plotsquared.PlotSquared; -import com.plotsquared.generator.IndependentPlotGenerator; -import com.plotsquared.location.Location; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotId; -import com.plotsquared.queue.ScopedLocalBlockQueue; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.plot.world.SinglePlotArea; +import com.plotsquared.core.plot.world.SinglePlotAreaManager; +import com.plotsquared.core.queue.ScopedLocalBlockQueue; import com.sk89q.worldedit.world.biome.BiomeTypes; import com.sk89q.worldedit.world.block.BlockTypes; diff --git a/Core/src/main/java/com/plotsquared/generator/SquarePlotManager.java b/Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java similarity index 95% rename from Core/src/main/java/com/plotsquared/generator/SquarePlotManager.java rename to Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java index cc150e662..7c5acc337 100644 --- a/Core/src/main/java/com/plotsquared/generator/SquarePlotManager.java +++ b/Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java @@ -1,13 +1,13 @@ -package com.plotsquared.generator; +package com.plotsquared.core.generator; -import com.plotsquared.PlotSquared; -import com.plotsquared.location.Direction; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotId; -import com.plotsquared.util.ChunkManager; -import com.plotsquared.util.MainUtil; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.location.Direction; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.util.ChunkManager; +import com.plotsquared.core.util.MainUtil; import com.sk89q.worldedit.regions.CuboidRegion; import java.util.Arrays; diff --git a/Core/src/main/java/com/plotsquared/generator/SquarePlotWorld.java b/Core/src/main/java/com/plotsquared/core/generator/SquarePlotWorld.java similarity index 83% rename from Core/src/main/java/com/plotsquared/generator/SquarePlotWorld.java rename to Core/src/main/java/com/plotsquared/core/generator/SquarePlotWorld.java index 362fe15a8..f19f75819 100644 --- a/Core/src/main/java/com/plotsquared/generator/SquarePlotWorld.java +++ b/Core/src/main/java/com/plotsquared/core/generator/SquarePlotWorld.java @@ -1,8 +1,8 @@ -package com.plotsquared.generator; +package com.plotsquared.core.generator; -import com.plotsquared.configuration.ConfigurationSection; -import com.plotsquared.PlotSquared; -import com.plotsquared.plot.PlotId; +import com.plotsquared.core.configuration.ConfigurationSection; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.plot.PlotId; import org.jetbrains.annotations.NotNull; public abstract class SquarePlotWorld extends GridPlotWorld { diff --git a/Core/src/main/java/com/plotsquared/listener/ExtentWrapper.java b/Core/src/main/java/com/plotsquared/core/listener/ExtentWrapper.java similarity index 86% rename from Core/src/main/java/com/plotsquared/listener/ExtentWrapper.java rename to Core/src/main/java/com/plotsquared/core/listener/ExtentWrapper.java index 175f95237..f9c1306e0 100644 --- a/Core/src/main/java/com/plotsquared/listener/ExtentWrapper.java +++ b/Core/src/main/java/com/plotsquared/core/listener/ExtentWrapper.java @@ -1,4 +1,4 @@ -package com.plotsquared.listener; +package com.plotsquared.core.listener; import com.sk89q.worldedit.extent.AbstractDelegateExtent; import com.sk89q.worldedit.extent.Extent; diff --git a/Core/src/main/java/com/plotsquared/listener/PlayerBlockEventType.java b/Core/src/main/java/com/plotsquared/core/listener/PlayerBlockEventType.java similarity index 89% rename from Core/src/main/java/com/plotsquared/listener/PlayerBlockEventType.java rename to Core/src/main/java/com/plotsquared/core/listener/PlayerBlockEventType.java index 66a7ec42d..3b104d281 100644 --- a/Core/src/main/java/com/plotsquared/listener/PlayerBlockEventType.java +++ b/Core/src/main/java/com/plotsquared/core/listener/PlayerBlockEventType.java @@ -1,4 +1,4 @@ -package com.plotsquared.listener; +package com.plotsquared.core.listener; public enum PlayerBlockEventType { // Non interactive diff --git a/Core/src/main/java/com/plotsquared/listener/PlotListener.java b/Core/src/main/java/com/plotsquared/core/listener/PlotListener.java similarity index 88% rename from Core/src/main/java/com/plotsquared/listener/PlotListener.java rename to Core/src/main/java/com/plotsquared/core/listener/PlotListener.java index 437dbe9da..db52858b5 100644 --- a/Core/src/main/java/com/plotsquared/listener/PlotListener.java +++ b/Core/src/main/java/com/plotsquared/core/listener/PlotListener.java @@ -1,42 +1,42 @@ -package com.plotsquared.listener; +package com.plotsquared.core.listener; -import com.plotsquared.PlotSquared; -import com.plotsquared.plot.PlotWeather; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.events.PlotFlagRemoveEvent; -import com.plotsquared.events.Result; -import com.plotsquared.plot.flags.GlobalFlagContainer; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.plot.flags.implementations.DenyExitFlag; -import com.plotsquared.plot.flags.implementations.FarewellFlag; -import com.plotsquared.plot.flags.implementations.FeedFlag; -import com.plotsquared.plot.flags.implementations.FlyFlag; -import com.plotsquared.plot.flags.implementations.GamemodeFlag; -import com.plotsquared.plot.flags.implementations.GreetingFlag; -import com.plotsquared.plot.flags.implementations.GuestGamemodeFlag; -import com.plotsquared.plot.flags.implementations.HealFlag; -import com.plotsquared.plot.flags.implementations.MusicFlag; -import com.plotsquared.plot.flags.implementations.NotifyEnterFlag; -import com.plotsquared.plot.flags.implementations.NotifyLeaveFlag; -import com.plotsquared.plot.flags.implementations.TimeFlag; -import com.plotsquared.plot.flags.implementations.TitlesFlag; -import com.plotsquared.plot.flags.implementations.WeatherFlag; -import com.plotsquared.plot.flags.types.TimedFlag; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.plot.comment.CommentManager; -import com.plotsquared.util.ByteArrayUtilities; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.StringMan; -import com.plotsquared.util.WorldUtil; -import com.plotsquared.util.uuid.UUIDHandler; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.plot.expiration.ExpireManager; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.plot.PlotWeather; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.events.PlotFlagRemoveEvent; +import com.plotsquared.core.events.Result; +import com.plotsquared.core.plot.flag.GlobalFlagContainer; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.plot.flag.implementations.DenyExitFlag; +import com.plotsquared.core.plot.flag.implementations.FarewellFlag; +import com.plotsquared.core.plot.flag.implementations.FeedFlag; +import com.plotsquared.core.plot.flag.implementations.FlyFlag; +import com.plotsquared.core.plot.flag.implementations.GamemodeFlag; +import com.plotsquared.core.plot.flag.implementations.GreetingFlag; +import com.plotsquared.core.plot.flag.implementations.GuestGamemodeFlag; +import com.plotsquared.core.plot.flag.implementations.HealFlag; +import com.plotsquared.core.plot.flag.implementations.MusicFlag; +import com.plotsquared.core.plot.flag.implementations.NotifyEnterFlag; +import com.plotsquared.core.plot.flag.implementations.NotifyLeaveFlag; +import com.plotsquared.core.plot.flag.implementations.TimeFlag; +import com.plotsquared.core.plot.flag.implementations.TitlesFlag; +import com.plotsquared.core.plot.flag.implementations.WeatherFlag; +import com.plotsquared.core.plot.flag.types.TimedFlag; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.comment.CommentManager; +import com.plotsquared.core.collection.ByteArrayUtilities; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.util.WorldUtil; +import com.plotsquared.core.util.uuid.UUIDHandler; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.plot.expiration.ExpireManager; +import com.plotsquared.core.util.task.TaskManager; import com.sk89q.worldedit.world.gamemode.GameMode; import com.sk89q.worldedit.world.gamemode.GameModes; import com.sk89q.worldedit.world.item.ItemType; diff --git a/Core/src/main/java/com/plotsquared/listener/ProcessedWEExtent.java b/Core/src/main/java/com/plotsquared/core/listener/ProcessedWEExtent.java similarity index 96% rename from Core/src/main/java/com/plotsquared/listener/ProcessedWEExtent.java rename to Core/src/main/java/com/plotsquared/core/listener/ProcessedWEExtent.java index 2f626f139..1079dca41 100644 --- a/Core/src/main/java/com/plotsquared/listener/ProcessedWEExtent.java +++ b/Core/src/main/java/com/plotsquared/core/listener/ProcessedWEExtent.java @@ -1,8 +1,9 @@ -package com.plotsquared.listener; +package com.plotsquared.core.listener; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.util.WEManager; import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.entity.BaseEntity; import com.sk89q.worldedit.entity.Entity; diff --git a/Core/src/main/java/com/plotsquared/listener/WEExtent.java b/Core/src/main/java/com/plotsquared/core/listener/WEExtent.java similarity index 96% rename from Core/src/main/java/com/plotsquared/listener/WEExtent.java rename to Core/src/main/java/com/plotsquared/core/listener/WEExtent.java index 5d6e75030..7ac5e2826 100644 --- a/Core/src/main/java/com/plotsquared/listener/WEExtent.java +++ b/Core/src/main/java/com/plotsquared/core/listener/WEExtent.java @@ -1,5 +1,6 @@ -package com.plotsquared.listener; +package com.plotsquared.core.listener; +import com.plotsquared.core.util.WEManager; import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.entity.BaseEntity; import com.sk89q.worldedit.entity.Entity; diff --git a/Core/src/main/java/com/plotsquared/listener/WESubscriber.java b/Core/src/main/java/com/plotsquared/core/listener/WESubscriber.java similarity index 84% rename from Core/src/main/java/com/plotsquared/listener/WESubscriber.java rename to Core/src/main/java/com/plotsquared/core/listener/WESubscriber.java index 75c49fcb9..643768c79 100644 --- a/Core/src/main/java/com/plotsquared/listener/WESubscriber.java +++ b/Core/src/main/java/com/plotsquared/core/listener/WESubscriber.java @@ -1,12 +1,13 @@ -package com.plotsquared.listener; +package com.plotsquared.core.listener; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.Permissions; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.WEManager; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.entity.Player; import com.sk89q.worldedit.event.extent.EditSessionEvent; @@ -40,8 +41,8 @@ public class WESubscriber { if (plotPlayer == null) { Player player = (Player) actor; Location location = player.getLocation(); - com.plotsquared.location.Location pLoc = - new com.plotsquared.location.Location( + com.plotsquared.core.location.Location pLoc = + new com.plotsquared.core.location.Location( player.getWorld().getName(), location.getBlockX(), location.getBlockX(), location.getBlockZ()); Plot plot = pLoc.getPlot(); diff --git a/Core/src/main/java/com/plotsquared/location/BlockLoc.java b/Core/src/main/java/com/plotsquared/core/location/BlockLoc.java similarity index 98% rename from Core/src/main/java/com/plotsquared/location/BlockLoc.java rename to Core/src/main/java/com/plotsquared/core/location/BlockLoc.java index 91a45b9c9..929604d66 100644 --- a/Core/src/main/java/com/plotsquared/location/BlockLoc.java +++ b/Core/src/main/java/com/plotsquared/core/location/BlockLoc.java @@ -1,4 +1,4 @@ -package com.plotsquared.location; +package com.plotsquared.core.location; public class BlockLoc { diff --git a/Core/src/main/java/com/plotsquared/location/ChunkWrapper.java b/Core/src/main/java/com/plotsquared/core/location/ChunkWrapper.java similarity index 88% rename from Core/src/main/java/com/plotsquared/location/ChunkWrapper.java rename to Core/src/main/java/com/plotsquared/core/location/ChunkWrapper.java index 0a03a1563..2f8a475d1 100644 --- a/Core/src/main/java/com/plotsquared/location/ChunkWrapper.java +++ b/Core/src/main/java/com/plotsquared/core/location/ChunkWrapper.java @@ -1,7 +1,7 @@ -package com.plotsquared.location; +package com.plotsquared.core.location; -import com.plotsquared.util.MathMan; -import com.plotsquared.util.StringMan; +import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.util.StringMan; public class ChunkWrapper { diff --git a/Core/src/main/java/com/plotsquared/location/Direction.java b/Core/src/main/java/com/plotsquared/core/location/Direction.java similarity index 95% rename from Core/src/main/java/com/plotsquared/location/Direction.java rename to Core/src/main/java/com/plotsquared/core/location/Direction.java index 6feabf8ab..c9ef51ff4 100644 --- a/Core/src/main/java/com/plotsquared/location/Direction.java +++ b/Core/src/main/java/com/plotsquared/core/location/Direction.java @@ -1,4 +1,4 @@ -package com.plotsquared.location; +package com.plotsquared.core.location; public enum Direction { ALL(-1, "all"), NORTH(0, "north"), EAST(1, "east"), SOUTH(2, "south"), WEST(3, diff --git a/Core/src/main/java/com/plotsquared/location/Location.java b/Core/src/main/java/com/plotsquared/core/location/Location.java similarity index 95% rename from Core/src/main/java/com/plotsquared/location/Location.java rename to Core/src/main/java/com/plotsquared/core/location/Location.java index 905fbc36f..ed4b6f03c 100644 --- a/Core/src/main/java/com/plotsquared/location/Location.java +++ b/Core/src/main/java/com/plotsquared/core/location/Location.java @@ -1,10 +1,10 @@ -package com.plotsquared.location; +package com.plotsquared.core.location; -import com.plotsquared.PlotSquared; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotManager; -import com.plotsquared.util.MathMan; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotManager; +import com.plotsquared.core.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/plotsquared/location/PlotLoc.java b/Core/src/main/java/com/plotsquared/core/location/PlotLoc.java similarity index 96% rename from Core/src/main/java/com/plotsquared/location/PlotLoc.java rename to Core/src/main/java/com/plotsquared/core/location/PlotLoc.java index 72b8efcd9..f3b6470ae 100644 --- a/Core/src/main/java/com/plotsquared/location/PlotLoc.java +++ b/Core/src/main/java/com/plotsquared/core/location/PlotLoc.java @@ -1,6 +1,6 @@ -package com.plotsquared.location; +package com.plotsquared.core.location; -import com.plotsquared.util.StringMan; +import com.plotsquared.core.util.StringMan; import lombok.AllArgsConstructor; import org.jetbrains.annotations.Nullable; diff --git a/Core/src/main/java/com/plotsquared/player/ConsolePlayer.java b/Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java similarity index 90% rename from Core/src/main/java/com/plotsquared/player/ConsolePlayer.java rename to Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java index edc3c1b7a..7d902e2b5 100644 --- a/Core/src/main/java/com/plotsquared/player/ConsolePlayer.java +++ b/Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java @@ -1,12 +1,12 @@ -package com.plotsquared.player; +package com.plotsquared.core.player; -import com.plotsquared.PlotSquared; -import com.plotsquared.commands.RequiredType; -import com.plotsquared.database.DBFunc; -import com.plotsquared.location.Location; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.events.TeleportCause; -import com.plotsquared.plot.PlotWeather; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.command.RequiredType; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.events.TeleportCause; +import com.plotsquared.core.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/plotsquared/player/OfflinePlotPlayer.java b/Core/src/main/java/com/plotsquared/core/player/OfflinePlotPlayer.java similarity index 95% rename from Core/src/main/java/com/plotsquared/player/OfflinePlotPlayer.java rename to Core/src/main/java/com/plotsquared/core/player/OfflinePlotPlayer.java index d2d54710b..87a906867 100644 --- a/Core/src/main/java/com/plotsquared/player/OfflinePlotPlayer.java +++ b/Core/src/main/java/com/plotsquared/core/player/OfflinePlotPlayer.java @@ -1,4 +1,4 @@ -package com.plotsquared.player; +package com.plotsquared.core.player; import java.util.UUID; diff --git a/Core/src/main/java/com/plotsquared/player/PlotPlayer.java b/Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java similarity index 94% rename from Core/src/main/java/com/plotsquared/player/PlotPlayer.java rename to Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java index 726984b01..828ab35fb 100644 --- a/Core/src/main/java/com/plotsquared/player/PlotPlayer.java +++ b/Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java @@ -1,29 +1,29 @@ -package com.plotsquared.player; +package com.plotsquared.core.player; -import com.plotsquared.commands.CommandCaller; -import com.plotsquared.PlotSquared; -import com.plotsquared.commands.RequiredType; -import com.plotsquared.config.CaptionUtility; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.database.DBFunc; -import com.plotsquared.plot.flags.implementations.DoneFlag; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotCluster; -import com.plotsquared.plot.PlotId; -import com.plotsquared.events.TeleportCause; -import com.plotsquared.plot.worlds.PlotAreaManager; -import com.plotsquared.plot.worlds.SinglePlotArea; -import com.plotsquared.plot.worlds.SinglePlotAreaManager; -import com.plotsquared.util.EconHandler; -import com.plotsquared.util.Permissions; -import com.plotsquared.plot.PlotWeather; -import com.plotsquared.util.tasks.TaskManager; -import com.plotsquared.util.uuid.UUIDHandler; -import com.plotsquared.plot.expiration.ExpireManager; -import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.core.command.CommandCaller; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.command.RequiredType; +import com.plotsquared.core.config.CaptionUtility; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.plot.flag.implementations.DoneFlag; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotCluster; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.events.TeleportCause; +import com.plotsquared.core.plot.world.PlotAreaManager; +import com.plotsquared.core.plot.world.SinglePlotArea; +import com.plotsquared.core.plot.world.SinglePlotAreaManager; +import com.plotsquared.core.util.EconHandler; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.plot.PlotWeather; +import com.plotsquared.core.util.task.TaskManager; +import com.plotsquared.core.util.uuid.UUIDHandler; +import com.plotsquared.core.plot.expiration.ExpireManager; +import com.plotsquared.core.util.task.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/plotsquared/plot/BlockBucket.java b/Core/src/main/java/com/plotsquared/core/plot/BlockBucket.java similarity index 94% rename from Core/src/main/java/com/plotsquared/plot/BlockBucket.java rename to Core/src/main/java/com/plotsquared/core/plot/BlockBucket.java index a082a5670..65724a81d 100644 --- a/Core/src/main/java/com/plotsquared/plot/BlockBucket.java +++ b/Core/src/main/java/com/plotsquared/core/plot/BlockBucket.java @@ -1,11 +1,11 @@ -package com.plotsquared.plot; +package com.plotsquared.core.plot; -import com.plotsquared.configuration.serialization.ConfigurationSerializable; -import com.plotsquared.config.Configuration; -import com.plotsquared.util.MathMan; -import com.plotsquared.util.StringMan; -import com.plotsquared.util.BlockUtil; -import com.plotsquared.util.PatternUtil; +import com.plotsquared.core.configuration.serialization.ConfigurationSerializable; +import com.plotsquared.core.config.Configuration; +import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.util.BlockUtil; +import com.plotsquared.core.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/plotsquared/plot/Plot.java b/Core/src/main/java/com/plotsquared/core/plot/Plot.java similarity index 98% rename from Core/src/main/java/com/plotsquared/plot/Plot.java rename to Core/src/main/java/com/plotsquared/core/plot/Plot.java index 38c1c8c1d..79d12ca43 100644 --- a/Core/src/main/java/com/plotsquared/plot/Plot.java +++ b/Core/src/main/java/com/plotsquared/core/plot/Plot.java @@ -1,43 +1,43 @@ -package com.plotsquared.plot; +package com.plotsquared.core.plot; -import com.plotsquared.events.TeleportCause; -import com.plotsquared.location.BlockLoc; -import com.plotsquared.location.Direction; -import com.plotsquared.location.Location; -import com.plotsquared.PlotSquared; -import com.plotsquared.location.PlotLoc; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Configuration; -import com.plotsquared.config.Settings; -import com.plotsquared.database.DBFunc; -import com.plotsquared.events.PlotComponentSetEvent; -import com.plotsquared.events.PlotMergeEvent; -import com.plotsquared.events.PlotUnlinkEvent; -import com.plotsquared.events.Result; -import com.plotsquared.plot.flags.FlagContainer; -import com.plotsquared.plot.flags.GlobalFlagContainer; -import com.plotsquared.plot.flags.InternalFlag; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.plot.flags.implementations.KeepFlag; -import com.plotsquared.generator.SquarePlotWorld; -import com.plotsquared.listener.PlotListener; -import com.plotsquared.plot.comment.PlotComment; -import com.plotsquared.plot.schematic.Schematic; -import com.plotsquared.util.ChunkManager; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.MathMan; -import com.plotsquared.util.Permissions; -import com.plotsquared.util.SchematicHandler; -import com.plotsquared.util.StringWrapper; -import com.plotsquared.util.tasks.TaskManager; -import com.plotsquared.util.uuid.UUIDHandler; -import com.plotsquared.util.WorldUtil; -import com.plotsquared.queue.GlobalBlockQueue; -import com.plotsquared.queue.LocalBlockQueue; -import com.plotsquared.plot.expiration.ExpireManager; -import com.plotsquared.plot.expiration.PlotAnalysis; -import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.core.events.TeleportCause; +import com.plotsquared.core.location.BlockLoc; +import com.plotsquared.core.location.Direction; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.location.PlotLoc; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Configuration; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.events.PlotComponentSetEvent; +import com.plotsquared.core.events.PlotMergeEvent; +import com.plotsquared.core.events.PlotUnlinkEvent; +import com.plotsquared.core.events.Result; +import com.plotsquared.core.plot.flag.FlagContainer; +import com.plotsquared.core.plot.flag.GlobalFlagContainer; +import com.plotsquared.core.plot.flag.InternalFlag; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.plot.flag.implementations.KeepFlag; +import com.plotsquared.core.generator.SquarePlotWorld; +import com.plotsquared.core.listener.PlotListener; +import com.plotsquared.core.plot.comment.PlotComment; +import com.plotsquared.core.plot.schematic.Schematic; +import com.plotsquared.core.util.ChunkManager; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.SchematicHandler; +import com.plotsquared.core.util.StringWrapper; +import com.plotsquared.core.util.task.TaskManager; +import com.plotsquared.core.util.uuid.UUIDHandler; +import com.plotsquared.core.util.WorldUtil; +import com.plotsquared.core.queue.GlobalBlockQueue; +import com.plotsquared.core.queue.LocalBlockQueue; +import com.plotsquared.core.plot.expiration.ExpireManager; +import com.plotsquared.core.plot.expiration.PlotAnalysis; +import com.plotsquared.core.util.task.RunnableVal; import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; @@ -77,7 +77,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; import java.util.stream.Collectors; -import static com.plotsquared.commands.SubCommand.sendMessage; +import static com.plotsquared.core.command.SubCommand.sendMessage; /** * The plot class
    diff --git a/Core/src/main/java/com/plotsquared/plot/PlotArea.java b/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java similarity index 96% rename from Core/src/main/java/com/plotsquared/plot/PlotArea.java rename to Core/src/main/java/com/plotsquared/core/plot/PlotArea.java index 83b3cacb5..1fc300a18 100644 --- a/Core/src/main/java/com/plotsquared/plot/PlotArea.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java @@ -1,30 +1,30 @@ -package com.plotsquared.plot; +package com.plotsquared.core.plot; -import com.plotsquared.location.Direction; -import com.plotsquared.location.Location; -import com.plotsquared.configuration.ConfigurationSection; -import com.plotsquared.PlotSquared; -import com.plotsquared.location.PlotLoc; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.config.Configuration; -import com.plotsquared.config.ConfigurationNode; -import com.plotsquared.config.Settings; -import com.plotsquared.plot.flags.FlagContainer; -import com.plotsquared.plot.flags.FlagParseException; -import com.plotsquared.plot.flags.GlobalFlagContainer; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.plot.flags.implementations.DoneFlag; -import com.plotsquared.generator.GridPlotWorld; -import com.plotsquared.generator.IndependentPlotGenerator; -import com.plotsquared.util.EconHandler; -import com.plotsquared.util.Expression; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.MathMan; -import com.plotsquared.util.StringMan; -import com.plotsquared.util.area.QuadMap; -import com.plotsquared.queue.GlobalBlockQueue; -import com.plotsquared.queue.LocalBlockQueue; -import com.plotsquared.util.RegionUtil; +import com.plotsquared.core.location.Direction; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.configuration.ConfigurationSection; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.location.PlotLoc; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.config.Configuration; +import com.plotsquared.core.config.ConfigurationNode; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.plot.flag.FlagContainer; +import com.plotsquared.core.plot.flag.FlagParseException; +import com.plotsquared.core.plot.flag.GlobalFlagContainer; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.plot.flag.implementations.DoneFlag; +import com.plotsquared.core.generator.GridPlotWorld; +import com.plotsquared.core.generator.IndependentPlotGenerator; +import com.plotsquared.core.util.EconHandler; +import com.plotsquared.core.util.Expression; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.collection.QuadMap; +import com.plotsquared.core.queue.GlobalBlockQueue; +import com.plotsquared.core.queue.LocalBlockQueue; +import com.plotsquared.core.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/plotsquared/plot/PlotAreaTerrainType.java b/Core/src/main/java/com/plotsquared/core/plot/PlotAreaTerrainType.java similarity index 96% rename from Core/src/main/java/com/plotsquared/plot/PlotAreaTerrainType.java rename to Core/src/main/java/com/plotsquared/core/plot/PlotAreaTerrainType.java index 2834da83a..ec3570210 100644 --- a/Core/src/main/java/com/plotsquared/plot/PlotAreaTerrainType.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotAreaTerrainType.java @@ -1,4 +1,4 @@ -package com.plotsquared.plot; +package com.plotsquared.core.plot; import java.util.Map; import java.util.Optional; diff --git a/Core/src/main/java/com/plotsquared/plot/PlotAreaType.java b/Core/src/main/java/com/plotsquared/core/plot/PlotAreaType.java similarity index 95% rename from Core/src/main/java/com/plotsquared/plot/PlotAreaType.java rename to Core/src/main/java/com/plotsquared/core/plot/PlotAreaType.java index d37dcace6..6543ab75e 100644 --- a/Core/src/main/java/com/plotsquared/plot/PlotAreaType.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotAreaType.java @@ -1,4 +1,4 @@ -package com.plotsquared.plot; +package com.plotsquared.core.plot; import java.util.Map; import java.util.Optional; diff --git a/Core/src/main/java/com/plotsquared/plot/PlotCluster.java b/Core/src/main/java/com/plotsquared/core/plot/PlotCluster.java similarity index 95% rename from Core/src/main/java/com/plotsquared/plot/PlotCluster.java rename to Core/src/main/java/com/plotsquared/core/plot/PlotCluster.java index a393500ad..cc9117fce 100644 --- a/Core/src/main/java/com/plotsquared/plot/PlotCluster.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotCluster.java @@ -1,10 +1,10 @@ -package com.plotsquared.plot; +package com.plotsquared.core.plot; -import com.plotsquared.location.BlockLoc; -import com.plotsquared.location.Location; -import com.plotsquared.database.DBFunc; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.RegionUtil; +import com.plotsquared.core.location.BlockLoc; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.RegionUtil; import com.sk89q.worldedit.regions.CuboidRegion; import java.util.HashSet; diff --git a/Core/src/main/java/com/plotsquared/plot/PlotFilter.java b/Core/src/main/java/com/plotsquared/core/plot/PlotFilter.java similarity index 84% rename from Core/src/main/java/com/plotsquared/plot/PlotFilter.java rename to Core/src/main/java/com/plotsquared/core/plot/PlotFilter.java index 546651104..4739d2188 100644 --- a/Core/src/main/java/com/plotsquared/plot/PlotFilter.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotFilter.java @@ -1,4 +1,4 @@ -package com.plotsquared.plot; +package com.plotsquared.core.plot; public abstract class PlotFilter { public boolean allowsArea(final PlotArea area) { diff --git a/Core/src/main/java/com/plotsquared/plot/PlotHandler.java b/Core/src/main/java/com/plotsquared/core/plot/PlotHandler.java similarity index 92% rename from Core/src/main/java/com/plotsquared/plot/PlotHandler.java rename to Core/src/main/java/com/plotsquared/core/plot/PlotHandler.java index 579034c09..9887c3d71 100644 --- a/Core/src/main/java/com/plotsquared/plot/PlotHandler.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotHandler.java @@ -1,4 +1,4 @@ -package com.plotsquared.plot; +package com.plotsquared.core.plot; import java.util.Set; import java.util.UUID; diff --git a/Core/src/main/java/com/plotsquared/plot/PlotId.java b/Core/src/main/java/com/plotsquared/core/plot/PlotId.java similarity index 98% rename from Core/src/main/java/com/plotsquared/plot/PlotId.java rename to Core/src/main/java/com/plotsquared/core/plot/PlotId.java index 633eb01b3..02cf443a9 100644 --- a/Core/src/main/java/com/plotsquared/plot/PlotId.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotId.java @@ -1,6 +1,6 @@ -package com.plotsquared.plot; +package com.plotsquared.core.plot; -import com.plotsquared.location.Direction; +import com.plotsquared.core.location.Direction; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/Core/src/main/java/com/plotsquared/plot/PlotInventory.java b/Core/src/main/java/com/plotsquared/core/plot/PlotInventory.java similarity index 94% rename from Core/src/main/java/com/plotsquared/plot/PlotInventory.java rename to Core/src/main/java/com/plotsquared/core/plot/PlotInventory.java index 98cea2541..302ccb448 100644 --- a/Core/src/main/java/com/plotsquared/plot/PlotInventory.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotInventory.java @@ -1,8 +1,8 @@ -package com.plotsquared.plot; +package com.plotsquared.core.plot; -import com.plotsquared.PlotSquared; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.InventoryUtil; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.InventoryUtil; import lombok.NonNull; public class PlotInventory { diff --git a/Core/src/main/java/com/plotsquared/plot/PlotItemStack.java b/Core/src/main/java/com/plotsquared/core/plot/PlotItemStack.java similarity index 97% rename from Core/src/main/java/com/plotsquared/plot/PlotItemStack.java rename to Core/src/main/java/com/plotsquared/core/plot/PlotItemStack.java index 8136a1f2f..d232db852 100644 --- a/Core/src/main/java/com/plotsquared/plot/PlotItemStack.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotItemStack.java @@ -1,4 +1,4 @@ -package com.plotsquared.plot; +package com.plotsquared.core.plot; import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.item.ItemType; diff --git a/Core/src/main/java/com/plotsquared/plot/PlotManager.java b/Core/src/main/java/com/plotsquared/core/plot/PlotManager.java similarity index 93% rename from Core/src/main/java/com/plotsquared/plot/PlotManager.java rename to Core/src/main/java/com/plotsquared/core/plot/PlotManager.java index fa07b81bb..b9cc87041 100644 --- a/Core/src/main/java/com/plotsquared/plot/PlotManager.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotManager.java @@ -1,9 +1,9 @@ -package com.plotsquared.plot; +package com.plotsquared.core.plot; -import com.plotsquared.location.Location; -import com.plotsquared.commands.Template; -import com.plotsquared.config.Settings; -import com.plotsquared.util.FileBytes; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.command.Template; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.util.FileBytes; import com.sk89q.worldedit.function.pattern.Pattern; import java.io.IOException; diff --git a/Core/src/main/java/com/plotsquared/plot/PlotSettings.java b/Core/src/main/java/com/plotsquared/core/plot/PlotSettings.java similarity index 94% rename from Core/src/main/java/com/plotsquared/plot/PlotSettings.java rename to Core/src/main/java/com/plotsquared/core/plot/PlotSettings.java index 3eae77f8a..c13be5957 100644 --- a/Core/src/main/java/com/plotsquared/plot/PlotSettings.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotSettings.java @@ -1,8 +1,8 @@ -package com.plotsquared.plot; +package com.plotsquared.core.plot; -import com.plotsquared.location.BlockLoc; -import com.plotsquared.location.Direction; -import com.plotsquared.plot.comment.PlotComment; +import com.plotsquared.core.location.BlockLoc; +import com.plotsquared.core.location.Direction; +import com.plotsquared.core.plot.comment.PlotComment; import com.google.common.collect.ImmutableList; import lombok.Getter; import lombok.Setter; diff --git a/Core/src/main/java/com/plotsquared/plot/PlotWeather.java b/Core/src/main/java/com/plotsquared/core/plot/PlotWeather.java similarity index 59% rename from Core/src/main/java/com/plotsquared/plot/PlotWeather.java rename to Core/src/main/java/com/plotsquared/core/plot/PlotWeather.java index eef830ac8..4966d1876 100644 --- a/Core/src/main/java/com/plotsquared/plot/PlotWeather.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotWeather.java @@ -1,4 +1,4 @@ -package com.plotsquared.plot; +package com.plotsquared.core.plot; public enum PlotWeather { RAIN, CLEAR, RESET diff --git a/Core/src/main/java/com/plotsquared/plot/Rating.java b/Core/src/main/java/com/plotsquared/core/plot/Rating.java similarity index 97% rename from Core/src/main/java/com/plotsquared/plot/Rating.java rename to Core/src/main/java/com/plotsquared/core/plot/Rating.java index 1652eae98..d8ae941e0 100644 --- a/Core/src/main/java/com/plotsquared/plot/Rating.java +++ b/Core/src/main/java/com/plotsquared/core/plot/Rating.java @@ -1,6 +1,6 @@ -package com.plotsquared.plot; +package com.plotsquared.core.plot; -import com.plotsquared.config.Settings; +import com.plotsquared.core.config.Settings; import java.util.ArrayList; import java.util.HashMap; diff --git a/Core/src/main/java/com/plotsquared/plot/SetupObject.java b/Core/src/main/java/com/plotsquared/core/plot/SetupObject.java similarity index 89% rename from Core/src/main/java/com/plotsquared/plot/SetupObject.java rename to Core/src/main/java/com/plotsquared/core/plot/SetupObject.java index 0b562525b..34d453d88 100644 --- a/Core/src/main/java/com/plotsquared/plot/SetupObject.java +++ b/Core/src/main/java/com/plotsquared/core/plot/SetupObject.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot; +package com.plotsquared.core.plot; -import com.plotsquared.config.ConfigurationNode; -import com.plotsquared.util.SetupUtils; +import com.plotsquared.core.config.ConfigurationNode; +import com.plotsquared.core.util.SetupUtils; public class SetupObject { diff --git a/Core/src/main/java/com/plotsquared/plot/comment/CommentInbox.java b/Core/src/main/java/com/plotsquared/core/plot/comment/CommentInbox.java similarity index 87% rename from Core/src/main/java/com/plotsquared/plot/comment/CommentInbox.java rename to Core/src/main/java/com/plotsquared/core/plot/comment/CommentInbox.java index 2b0a70901..5c2bc0b89 100644 --- a/Core/src/main/java/com/plotsquared/plot/comment/CommentInbox.java +++ b/Core/src/main/java/com/plotsquared/core/plot/comment/CommentInbox.java @@ -1,10 +1,10 @@ -package com.plotsquared.plot.comment; +package com.plotsquared.core.plot.comment; -import com.plotsquared.database.DBFunc; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.Permissions; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.Permissions; import java.util.List; diff --git a/Core/src/main/java/com/plotsquared/plot/comment/CommentManager.java b/Core/src/main/java/com/plotsquared/core/plot/comment/CommentManager.java similarity index 87% rename from Core/src/main/java/com/plotsquared/plot/comment/CommentManager.java rename to Core/src/main/java/com/plotsquared/core/plot/comment/CommentManager.java index 93f559714..33ed8da43 100644 --- a/Core/src/main/java/com/plotsquared/plot/comment/CommentManager.java +++ b/Core/src/main/java/com/plotsquared/core/plot/comment/CommentManager.java @@ -1,11 +1,11 @@ -package com.plotsquared.plot.comment; +package com.plotsquared.core.plot.comment; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.task.TaskManager; import com.google.common.annotations.Beta; import java.util.Collection; diff --git a/Core/src/main/java/com/plotsquared/plot/comment/InboxOwner.java b/Core/src/main/java/com/plotsquared/core/plot/comment/InboxOwner.java similarity index 85% rename from Core/src/main/java/com/plotsquared/plot/comment/InboxOwner.java rename to Core/src/main/java/com/plotsquared/core/plot/comment/InboxOwner.java index 60906e6ac..9048b3eed 100644 --- a/Core/src/main/java/com/plotsquared/plot/comment/InboxOwner.java +++ b/Core/src/main/java/com/plotsquared/core/plot/comment/InboxOwner.java @@ -1,9 +1,9 @@ -package com.plotsquared.plot.comment; +package com.plotsquared.core.plot.comment; -import com.plotsquared.database.DBFunc; -import com.plotsquared.plot.Plot; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.task.TaskManager; import java.util.ArrayList; import java.util.List; diff --git a/Core/src/main/java/com/plotsquared/plot/comment/InboxPublic.java b/Core/src/main/java/com/plotsquared/core/plot/comment/InboxPublic.java similarity index 83% rename from Core/src/main/java/com/plotsquared/plot/comment/InboxPublic.java rename to Core/src/main/java/com/plotsquared/core/plot/comment/InboxPublic.java index 96fa0523e..58d92189a 100644 --- a/Core/src/main/java/com/plotsquared/plot/comment/InboxPublic.java +++ b/Core/src/main/java/com/plotsquared/core/plot/comment/InboxPublic.java @@ -1,9 +1,9 @@ -package com.plotsquared.plot.comment; +package com.plotsquared.core.plot.comment; -import com.plotsquared.database.DBFunc; -import com.plotsquared.plot.Plot; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.task.TaskManager; import java.util.List; diff --git a/Core/src/main/java/com/plotsquared/plot/comment/InboxReport.java b/Core/src/main/java/com/plotsquared/core/plot/comment/InboxReport.java similarity index 76% rename from Core/src/main/java/com/plotsquared/plot/comment/InboxReport.java rename to Core/src/main/java/com/plotsquared/core/plot/comment/InboxReport.java index 7ba8520ef..ab550c937 100644 --- a/Core/src/main/java/com/plotsquared/plot/comment/InboxReport.java +++ b/Core/src/main/java/com/plotsquared/core/plot/comment/InboxReport.java @@ -1,9 +1,9 @@ -package com.plotsquared.plot.comment; +package com.plotsquared.core.plot.comment; -import com.plotsquared.database.DBFunc; -import com.plotsquared.plot.Plot; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.task.TaskManager; import java.util.List; diff --git a/Core/src/main/java/com/plotsquared/plot/comment/PlotComment.java b/Core/src/main/java/com/plotsquared/core/plot/comment/PlotComment.java similarity index 86% rename from Core/src/main/java/com/plotsquared/plot/comment/PlotComment.java rename to Core/src/main/java/com/plotsquared/core/plot/comment/PlotComment.java index 0e52f0754..96031fdd5 100644 --- a/Core/src/main/java/com/plotsquared/plot/comment/PlotComment.java +++ b/Core/src/main/java/com/plotsquared/core/plot/comment/PlotComment.java @@ -1,6 +1,6 @@ -package com.plotsquared.plot.comment; +package com.plotsquared.core.plot.comment; -import com.plotsquared.plot.PlotId; +import com.plotsquared.core.plot.PlotId; public class PlotComment { public final String comment; diff --git a/Core/src/main/java/com/plotsquared/plot/expiration/ExpireManager.java b/Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java similarity index 93% rename from Core/src/main/java/com/plotsquared/plot/expiration/ExpireManager.java rename to Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java index 013e36e26..7b7d110ca 100644 --- a/Core/src/main/java/com/plotsquared/plot/expiration/ExpireManager.java +++ b/Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java @@ -1,29 +1,29 @@ -package com.plotsquared.plot.expiration; +package com.plotsquared.core.plot.expiration; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.database.DBFunc; -import com.plotsquared.events.PlotFlagAddEvent; -import com.plotsquared.events.PlotUnlinkEvent; -import com.plotsquared.events.Result; -import com.plotsquared.plot.flags.GlobalFlagContainer; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.plot.flags.implementations.AnalysisFlag; -import com.plotsquared.plot.flags.implementations.KeepFlag; -import com.plotsquared.generator.HybridUtils; -import com.plotsquared.player.OfflinePlotPlayer; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotAreaType; -import com.plotsquared.plot.message.PlotMessage; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.tasks.RunnableVal3; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.StringMan; -import com.plotsquared.util.tasks.TaskManager; -import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.events.PlotFlagAddEvent; +import com.plotsquared.core.events.PlotUnlinkEvent; +import com.plotsquared.core.events.Result; +import com.plotsquared.core.plot.flag.GlobalFlagContainer; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.plot.flag.implementations.AnalysisFlag; +import com.plotsquared.core.plot.flag.implementations.KeepFlag; +import com.plotsquared.core.generator.HybridUtils; +import com.plotsquared.core.player.OfflinePlotPlayer; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotAreaType; +import com.plotsquared.core.plot.message.PlotMessage; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.task.RunnableVal3; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.util.task.TaskManager; +import com.plotsquared.core.util.uuid.UUIDHandler; import java.util.ArrayDeque; import java.util.ArrayList; diff --git a/Core/src/main/java/com/plotsquared/plot/expiration/ExpiryTask.java b/Core/src/main/java/com/plotsquared/core/plot/expiration/ExpiryTask.java similarity index 93% rename from Core/src/main/java/com/plotsquared/plot/expiration/ExpiryTask.java rename to Core/src/main/java/com/plotsquared/core/plot/expiration/ExpiryTask.java index 2fdb2a241..a7e3a290f 100644 --- a/Core/src/main/java/com/plotsquared/plot/expiration/ExpiryTask.java +++ b/Core/src/main/java/com/plotsquared/core/plot/expiration/ExpiryTask.java @@ -1,16 +1,17 @@ -package com.plotsquared.plot.expiration; +package com.plotsquared.core.plot.expiration; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Settings; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotFilter; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotFilter; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; +import java.util.function.Predicate; import java.util.stream.Collectors; public class ExpiryTask { diff --git a/Core/src/main/java/com/plotsquared/plot/expiration/PlotAnalysis.java b/Core/src/main/java/com/plotsquared/core/plot/expiration/PlotAnalysis.java similarity index 98% rename from Core/src/main/java/com/plotsquared/plot/expiration/PlotAnalysis.java rename to Core/src/main/java/com/plotsquared/core/plot/expiration/PlotAnalysis.java index 9fdf61e8c..1af1f906a 100644 --- a/Core/src/main/java/com/plotsquared/plot/expiration/PlotAnalysis.java +++ b/Core/src/main/java/com/plotsquared/core/plot/expiration/PlotAnalysis.java @@ -1,13 +1,13 @@ -package com.plotsquared.plot.expiration; +package com.plotsquared.core.plot.expiration; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Settings; -import com.plotsquared.plot.flags.implementations.AnalysisFlag; -import com.plotsquared.generator.HybridUtils; -import com.plotsquared.plot.Plot; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.MathMan; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.plot.flag.implementations.AnalysisFlag; +import com.plotsquared.core.generator.HybridUtils; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.util.task.TaskManager; import java.lang.reflect.Array; import java.util.ArrayDeque; diff --git a/Core/src/main/java/com/plotsquared/plot/flags/FlagContainer.java b/Core/src/main/java/com/plotsquared/core/plot/flag/FlagContainer.java similarity index 99% rename from Core/src/main/java/com/plotsquared/plot/flags/FlagContainer.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/FlagContainer.java index aa2aa3640..8091f19cd 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/FlagContainer.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/FlagContainer.java @@ -1,4 +1,4 @@ -package com.plotsquared.plot.flags; +package com.plotsquared.core.plot.flag; import com.google.common.collect.ImmutableMap; import lombok.EqualsAndHashCode; diff --git a/Core/src/main/java/com/plotsquared/plot/flags/FlagParseException.java b/Core/src/main/java/com/plotsquared/core/plot/flag/FlagParseException.java similarity index 91% rename from Core/src/main/java/com/plotsquared/plot/flags/FlagParseException.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/FlagParseException.java index d43fe39e1..b5ad08bb6 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/FlagParseException.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/FlagParseException.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags; +package com.plotsquared.core.plot.flag; -import com.plotsquared.config.Caption; -import com.plotsquared.config.CaptionUtility; +import com.plotsquared.core.config.Caption; +import com.plotsquared.core.config.CaptionUtility; public class FlagParseException extends Exception { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/GlobalFlagContainer.java b/Core/src/main/java/com/plotsquared/core/plot/flag/GlobalFlagContainer.java similarity index 55% rename from Core/src/main/java/com/plotsquared/plot/flags/GlobalFlagContainer.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/GlobalFlagContainer.java index e0be70863..69945de9f 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/GlobalFlagContainer.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/GlobalFlagContainer.java @@ -1,79 +1,79 @@ -package com.plotsquared.plot.flags; +package com.plotsquared.core.plot.flag; -import com.plotsquared.plot.flags.implementations.AnalysisFlag; -import com.plotsquared.plot.flags.implementations.AnimalAttackFlag; -import com.plotsquared.plot.flags.implementations.AnimalCapFlag; -import com.plotsquared.plot.flags.implementations.AnimalInteractFlag; -import com.plotsquared.plot.flags.implementations.BlockBurnFlag; -import com.plotsquared.plot.flags.implementations.BlockIgnitionFlag; -import com.plotsquared.plot.flags.implementations.BlockedCmdsFlag; -import com.plotsquared.plot.flags.implementations.BreakFlag; -import com.plotsquared.plot.flags.implementations.CoralDryFlag; -import com.plotsquared.plot.flags.implementations.DenyExitFlag; -import com.plotsquared.plot.flags.implementations.DenyTeleportFlag; -import com.plotsquared.plot.flags.implementations.DescriptionFlag; -import com.plotsquared.plot.flags.implementations.DeviceInteractFlag; -import com.plotsquared.plot.flags.implementations.DisablePhysicsFlag; -import com.plotsquared.plot.flags.implementations.DoneFlag; -import com.plotsquared.plot.flags.implementations.DropProtectionFlag; -import com.plotsquared.plot.flags.implementations.EntityCapFlag; -import com.plotsquared.plot.flags.implementations.ExplosionFlag; -import com.plotsquared.plot.flags.implementations.FarewellFlag; -import com.plotsquared.plot.flags.implementations.FeedFlag; -import com.plotsquared.plot.flags.implementations.FlyFlag; -import com.plotsquared.plot.flags.implementations.ForcefieldFlag; -import com.plotsquared.plot.flags.implementations.GamemodeFlag; -import com.plotsquared.plot.flags.implementations.GrassGrowFlag; -import com.plotsquared.plot.flags.implementations.GreetingFlag; -import com.plotsquared.plot.flags.implementations.GuestGamemodeFlag; -import com.plotsquared.plot.flags.implementations.HangingBreakFlag; -import com.plotsquared.plot.flags.implementations.HangingPlaceFlag; -import com.plotsquared.plot.flags.implementations.HealFlag; -import com.plotsquared.plot.flags.implementations.HideInfoFlag; -import com.plotsquared.plot.flags.implementations.HostileAttackFlag; -import com.plotsquared.plot.flags.implementations.HostileCapFlag; -import com.plotsquared.plot.flags.implementations.HostileInteractFlag; -import com.plotsquared.plot.flags.implementations.IceFormFlag; -import com.plotsquared.plot.flags.implementations.IceMeltFlag; -import com.plotsquared.plot.flags.implementations.InstabreakFlag; -import com.plotsquared.plot.flags.implementations.InvincibleFlag; -import com.plotsquared.plot.flags.implementations.ItemDropFlag; -import com.plotsquared.plot.flags.implementations.KeepFlag; -import com.plotsquared.plot.flags.implementations.KelpGrowFlag; -import com.plotsquared.plot.flags.implementations.LiquidFlowFlag; -import com.plotsquared.plot.flags.implementations.MiscBreakFlag; -import com.plotsquared.plot.flags.implementations.MiscCapFlag; -import com.plotsquared.plot.flags.implementations.MobBreakFlag; -import com.plotsquared.plot.flags.implementations.MobCapFlag; -import com.plotsquared.plot.flags.implementations.MobPlaceFlag; -import com.plotsquared.plot.flags.implementations.MusicFlag; -import com.plotsquared.plot.flags.implementations.MycelGrowFlag; -import com.plotsquared.plot.flags.implementations.NoWorldeditFlag; -import com.plotsquared.plot.flags.implementations.NotifyEnterFlag; -import com.plotsquared.plot.flags.implementations.NotifyLeaveFlag; -import com.plotsquared.plot.flags.implementations.PlaceFlag; -import com.plotsquared.plot.flags.implementations.PlayerInteractFlag; -import com.plotsquared.plot.flags.implementations.PriceFlag; -import com.plotsquared.plot.flags.implementations.PveFlag; -import com.plotsquared.plot.flags.implementations.PvpFlag; -import com.plotsquared.plot.flags.implementations.RedstoneFlag; -import com.plotsquared.plot.flags.implementations.ServerPlotFlag; -import com.plotsquared.plot.flags.implementations.SnowFormFlag; -import com.plotsquared.plot.flags.implementations.SnowMeltFlag; -import com.plotsquared.plot.flags.implementations.SoilDryFlag; -import com.plotsquared.plot.flags.implementations.TamedAttackFlag; -import com.plotsquared.plot.flags.implementations.TamedInteractFlag; -import com.plotsquared.plot.flags.implementations.TimeFlag; -import com.plotsquared.plot.flags.implementations.TitlesFlag; -import com.plotsquared.plot.flags.implementations.UntrustedVisitFlag; -import com.plotsquared.plot.flags.implementations.UseFlag; -import com.plotsquared.plot.flags.implementations.VehicleBreakFlag; -import com.plotsquared.plot.flags.implementations.VehicleCapFlag; -import com.plotsquared.plot.flags.implementations.VehiclePlaceFlag; -import com.plotsquared.plot.flags.implementations.VehicleUseFlag; -import com.plotsquared.plot.flags.implementations.VillagerInteractFlag; -import com.plotsquared.plot.flags.implementations.VineGrowFlag; -import com.plotsquared.plot.flags.implementations.WeatherFlag; +import com.plotsquared.core.plot.flag.implementations.AnalysisFlag; +import com.plotsquared.core.plot.flag.implementations.AnimalAttackFlag; +import com.plotsquared.core.plot.flag.implementations.AnimalCapFlag; +import com.plotsquared.core.plot.flag.implementations.AnimalInteractFlag; +import com.plotsquared.core.plot.flag.implementations.BlockBurnFlag; +import com.plotsquared.core.plot.flag.implementations.BlockIgnitionFlag; +import com.plotsquared.core.plot.flag.implementations.BlockedCmdsFlag; +import com.plotsquared.core.plot.flag.implementations.BreakFlag; +import com.plotsquared.core.plot.flag.implementations.CoralDryFlag; +import com.plotsquared.core.plot.flag.implementations.DenyExitFlag; +import com.plotsquared.core.plot.flag.implementations.DenyTeleportFlag; +import com.plotsquared.core.plot.flag.implementations.DescriptionFlag; +import com.plotsquared.core.plot.flag.implementations.DeviceInteractFlag; +import com.plotsquared.core.plot.flag.implementations.DisablePhysicsFlag; +import com.plotsquared.core.plot.flag.implementations.DoneFlag; +import com.plotsquared.core.plot.flag.implementations.DropProtectionFlag; +import com.plotsquared.core.plot.flag.implementations.EntityCapFlag; +import com.plotsquared.core.plot.flag.implementations.ExplosionFlag; +import com.plotsquared.core.plot.flag.implementations.FarewellFlag; +import com.plotsquared.core.plot.flag.implementations.FeedFlag; +import com.plotsquared.core.plot.flag.implementations.FlyFlag; +import com.plotsquared.core.plot.flag.implementations.ForcefieldFlag; +import com.plotsquared.core.plot.flag.implementations.GamemodeFlag; +import com.plotsquared.core.plot.flag.implementations.GrassGrowFlag; +import com.plotsquared.core.plot.flag.implementations.GreetingFlag; +import com.plotsquared.core.plot.flag.implementations.GuestGamemodeFlag; +import com.plotsquared.core.plot.flag.implementations.HangingBreakFlag; +import com.plotsquared.core.plot.flag.implementations.HangingPlaceFlag; +import com.plotsquared.core.plot.flag.implementations.HealFlag; +import com.plotsquared.core.plot.flag.implementations.HideInfoFlag; +import com.plotsquared.core.plot.flag.implementations.HostileAttackFlag; +import com.plotsquared.core.plot.flag.implementations.HostileCapFlag; +import com.plotsquared.core.plot.flag.implementations.HostileInteractFlag; +import com.plotsquared.core.plot.flag.implementations.IceFormFlag; +import com.plotsquared.core.plot.flag.implementations.IceMeltFlag; +import com.plotsquared.core.plot.flag.implementations.InstabreakFlag; +import com.plotsquared.core.plot.flag.implementations.InvincibleFlag; +import com.plotsquared.core.plot.flag.implementations.ItemDropFlag; +import com.plotsquared.core.plot.flag.implementations.KeepFlag; +import com.plotsquared.core.plot.flag.implementations.KelpGrowFlag; +import com.plotsquared.core.plot.flag.implementations.LiquidFlowFlag; +import com.plotsquared.core.plot.flag.implementations.MiscBreakFlag; +import com.plotsquared.core.plot.flag.implementations.MiscCapFlag; +import com.plotsquared.core.plot.flag.implementations.MobBreakFlag; +import com.plotsquared.core.plot.flag.implementations.MobCapFlag; +import com.plotsquared.core.plot.flag.implementations.MobPlaceFlag; +import com.plotsquared.core.plot.flag.implementations.MusicFlag; +import com.plotsquared.core.plot.flag.implementations.MycelGrowFlag; +import com.plotsquared.core.plot.flag.implementations.NoWorldeditFlag; +import com.plotsquared.core.plot.flag.implementations.NotifyEnterFlag; +import com.plotsquared.core.plot.flag.implementations.NotifyLeaveFlag; +import com.plotsquared.core.plot.flag.implementations.PlaceFlag; +import com.plotsquared.core.plot.flag.implementations.PlayerInteractFlag; +import com.plotsquared.core.plot.flag.implementations.PriceFlag; +import com.plotsquared.core.plot.flag.implementations.PveFlag; +import com.plotsquared.core.plot.flag.implementations.PvpFlag; +import com.plotsquared.core.plot.flag.implementations.RedstoneFlag; +import com.plotsquared.core.plot.flag.implementations.ServerPlotFlag; +import com.plotsquared.core.plot.flag.implementations.SnowFormFlag; +import com.plotsquared.core.plot.flag.implementations.SnowMeltFlag; +import com.plotsquared.core.plot.flag.implementations.SoilDryFlag; +import com.plotsquared.core.plot.flag.implementations.TamedAttackFlag; +import com.plotsquared.core.plot.flag.implementations.TamedInteractFlag; +import com.plotsquared.core.plot.flag.implementations.TimeFlag; +import com.plotsquared.core.plot.flag.implementations.TitlesFlag; +import com.plotsquared.core.plot.flag.implementations.UntrustedVisitFlag; +import com.plotsquared.core.plot.flag.implementations.UseFlag; +import com.plotsquared.core.plot.flag.implementations.VehicleBreakFlag; +import com.plotsquared.core.plot.flag.implementations.VehicleCapFlag; +import com.plotsquared.core.plot.flag.implementations.VehiclePlaceFlag; +import com.plotsquared.core.plot.flag.implementations.VehicleUseFlag; +import com.plotsquared.core.plot.flag.implementations.VillagerInteractFlag; +import com.plotsquared.core.plot.flag.implementations.VineGrowFlag; +import com.plotsquared.core.plot.flag.implementations.WeatherFlag; import lombok.Getter; import javax.annotation.Nonnull; diff --git a/Core/src/main/java/com/plotsquared/plot/flags/InternalFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/InternalFlag.java similarity index 92% rename from Core/src/main/java/com/plotsquared/plot/flags/InternalFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/InternalFlag.java index 77940b8c9..09ee55735 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/InternalFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/InternalFlag.java @@ -1,4 +1,4 @@ -package com.plotsquared.plot.flags; +package com.plotsquared.core.plot.flag; /** * These are flags used in PlotSquared and PlotSquared diff --git a/Core/src/main/java/com/plotsquared/plot/flags/PlotFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/PlotFlag.java similarity index 97% rename from Core/src/main/java/com/plotsquared/plot/flags/PlotFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/PlotFlag.java index 1f800f5e3..242b8e8fc 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/PlotFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/PlotFlag.java @@ -1,8 +1,8 @@ -package com.plotsquared.plot.flags; +package com.plotsquared.core.plot.flag; -import com.plotsquared.config.Caption; +import com.plotsquared.core.config.Caption; import com.google.common.base.Preconditions; -import com.plotsquared.config.Captions; +import com.plotsquared.core.config.Captions; import lombok.EqualsAndHashCode; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/AnalysisFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnalysisFlag.java similarity index 76% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/AnalysisFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnalysisFlag.java index 6f7b367f2..df5f6159f 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/AnalysisFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnalysisFlag.java @@ -1,9 +1,9 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.FlagParseException; -import com.plotsquared.plot.flags.InternalFlag; -import com.plotsquared.plot.flags.types.ListFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.FlagParseException; +import com.plotsquared.core.plot.flag.InternalFlag; +import com.plotsquared.core.plot.flag.types.ListFlag; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/AnimalAttackFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnimalAttackFlag.java similarity index 78% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/AnimalAttackFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnimalAttackFlag.java index 808bccf47..6422c419e 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/AnimalAttackFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnimalAttackFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class AnimalAttackFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/AnimalCapFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnimalCapFlag.java similarity index 72% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/AnimalCapFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnimalCapFlag.java index 95fb67924..e20741db4 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/AnimalCapFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnimalCapFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.NonNegativeIntegerFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.NonNegativeIntegerFlag; import org.jetbrains.annotations.NotNull; public class AnimalCapFlag extends NonNegativeIntegerFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/AnimalInteractFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnimalInteractFlag.java similarity index 78% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/AnimalInteractFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnimalInteractFlag.java index 129501c85..f987b83cc 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/AnimalInteractFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnimalInteractFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class AnimalInteractFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/BlockBurnFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BlockBurnFlag.java similarity index 76% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/BlockBurnFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BlockBurnFlag.java index ef18a552b..af53b74fe 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/BlockBurnFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BlockBurnFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class BlockBurnFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/BlockIgnitionFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BlockIgnitionFlag.java similarity index 78% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/BlockIgnitionFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BlockIgnitionFlag.java index d0d127aae..7f34d5c2d 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/BlockIgnitionFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BlockIgnitionFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class BlockIgnitionFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/BlockedCmdsFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BlockedCmdsFlag.java similarity index 80% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/BlockedCmdsFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BlockedCmdsFlag.java index f2cbcffd2..f90ff0d29 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/BlockedCmdsFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BlockedCmdsFlag.java @@ -1,8 +1,8 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.FlagParseException; -import com.plotsquared.plot.flags.types.ListFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.FlagParseException; +import com.plotsquared.core.plot.flag.types.ListFlag; import org.jetbrains.annotations.NotNull; import java.util.Arrays; diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/BreakFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BreakFlag.java similarity index 69% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/BreakFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BreakFlag.java index 4f5cec1fa..eecb47096 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/BreakFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BreakFlag.java @@ -1,8 +1,8 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BlockTypeListFlag; -import com.plotsquared.plot.flags.types.BlockTypeWrapper; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BlockTypeListFlag; +import com.plotsquared.core.plot.flag.types.BlockTypeWrapper; import org.jetbrains.annotations.NotNull; import java.util.Collections; diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/CoralDryFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/CoralDryFlag.java similarity index 76% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/CoralDryFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/CoralDryFlag.java index 411fa6bc4..4a02450af 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/CoralDryFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/CoralDryFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class CoralDryFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/DenyExitFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DenyExitFlag.java similarity index 77% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/DenyExitFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DenyExitFlag.java index 4bd0223dc..cbdbf6a9c 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/DenyExitFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DenyExitFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class DenyExitFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/DenyTeleportFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DenyTeleportFlag.java similarity index 91% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/DenyTeleportFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DenyTeleportFlag.java index 02367ccb8..bde5ea5cf 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/DenyTeleportFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DenyTeleportFlag.java @@ -1,10 +1,10 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.FlagParseException; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.FlagParseException; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/DescriptionFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DescriptionFlag.java similarity index 85% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/DescriptionFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DescriptionFlag.java index 48e52a5a1..bf5001976 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/DescriptionFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DescriptionFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.PlotFlag; import org.jetbrains.annotations.NotNull; public class DescriptionFlag extends PlotFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/DeviceInteractFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DeviceInteractFlag.java similarity index 78% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/DeviceInteractFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DeviceInteractFlag.java index 5c44fbea8..f6bc7eb55 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/DeviceInteractFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DeviceInteractFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class DeviceInteractFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/DisablePhysicsFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DisablePhysicsFlag.java similarity index 78% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/DisablePhysicsFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DisablePhysicsFlag.java index c860fd65b..61a3d351c 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/DisablePhysicsFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DisablePhysicsFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class DisablePhysicsFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/DoneFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DoneFlag.java similarity index 78% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/DoneFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DoneFlag.java index d6f485637..7153dee8c 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/DoneFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DoneFlag.java @@ -1,9 +1,9 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.InternalFlag; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.plot.Plot; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.InternalFlag; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.plot.Plot; import org.jetbrains.annotations.NotNull; public class DoneFlag extends PlotFlag implements InternalFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/DropProtectionFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DropProtectionFlag.java similarity index 78% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/DropProtectionFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DropProtectionFlag.java index 97ba891a2..9794c25e0 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/DropProtectionFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DropProtectionFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class DropProtectionFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/EntityCapFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/EntityCapFlag.java similarity index 72% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/EntityCapFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/EntityCapFlag.java index 9349f6f11..b8fbf98c1 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/EntityCapFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/EntityCapFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.NonNegativeIntegerFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.NonNegativeIntegerFlag; import org.jetbrains.annotations.NotNull; public class EntityCapFlag extends NonNegativeIntegerFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/ExplosionFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ExplosionFlag.java similarity index 76% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/ExplosionFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ExplosionFlag.java index 96716d6b6..42d78af82 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/ExplosionFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ExplosionFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class ExplosionFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/FarewellFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FarewellFlag.java similarity index 85% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/FarewellFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FarewellFlag.java index bccd4d576..11d71218c 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/FarewellFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FarewellFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.PlotFlag; import org.jetbrains.annotations.NotNull; public class FarewellFlag extends PlotFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/FeedFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FeedFlag.java similarity index 83% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/FeedFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FeedFlag.java index 413918d84..25b07f50c 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/FeedFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FeedFlag.java @@ -1,8 +1,8 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.FlagParseException; -import com.plotsquared.plot.flags.types.TimedFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.FlagParseException; +import com.plotsquared.core.plot.flag.types.TimedFlag; import org.jetbrains.annotations.NotNull; public class FeedFlag extends TimedFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/FlyFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FlyFlag.java similarity index 92% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/FlyFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FlyFlag.java index 7f31f3dbe..5f31cf782 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/FlyFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FlyFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.PlotFlag; import org.jetbrains.annotations.NotNull; import java.util.Arrays; diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/ForcefieldFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ForcefieldFlag.java similarity index 77% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/ForcefieldFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ForcefieldFlag.java index a640258c8..92c4f9080 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/ForcefieldFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ForcefieldFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class ForcefieldFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/GamemodeFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GamemodeFlag.java similarity index 92% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/GamemodeFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GamemodeFlag.java index d800b1a0b..438bddd54 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/GamemodeFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GamemodeFlag.java @@ -1,8 +1,8 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.FlagParseException; -import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.FlagParseException; +import com.plotsquared.core.plot.flag.PlotFlag; import com.sk89q.worldedit.world.gamemode.GameMode; import com.sk89q.worldedit.world.gamemode.GameModes; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/GrassGrowFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GrassGrowFlag.java similarity index 76% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/GrassGrowFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GrassGrowFlag.java index acaf7216c..ffa2b7b95 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/GrassGrowFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GrassGrowFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class GrassGrowFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/GreetingFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GreetingFlag.java similarity index 85% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/GreetingFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GreetingFlag.java index 1fe18f0cf..91993b196 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/GreetingFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GreetingFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.PlotFlag; import org.jetbrains.annotations.NotNull; public class GreetingFlag extends PlotFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/GuestGamemodeFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GuestGamemodeFlag.java similarity index 92% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/GuestGamemodeFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GuestGamemodeFlag.java index 7cdc0dbd6..907926269 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/GuestGamemodeFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GuestGamemodeFlag.java @@ -1,8 +1,8 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.FlagParseException; -import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.FlagParseException; +import com.plotsquared.core.plot.flag.PlotFlag; import com.sk89q.worldedit.world.gamemode.GameMode; import com.sk89q.worldedit.world.gamemode.GameModes; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/HangingBreakFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HangingBreakFlag.java similarity index 78% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/HangingBreakFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HangingBreakFlag.java index cfc34c627..1c1b21f86 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/HangingBreakFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HangingBreakFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class HangingBreakFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/HangingPlaceFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HangingPlaceFlag.java similarity index 78% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/HangingPlaceFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HangingPlaceFlag.java index 0d134619e..32ed7e0d8 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/HangingPlaceFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HangingPlaceFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class HangingPlaceFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/HealFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HealFlag.java similarity index 83% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/HealFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HealFlag.java index 468d340d5..687d63906 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/HealFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HealFlag.java @@ -1,8 +1,8 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.FlagParseException; -import com.plotsquared.plot.flags.types.TimedFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.FlagParseException; +import com.plotsquared.core.plot.flag.types.TimedFlag; import org.jetbrains.annotations.NotNull; public class HealFlag extends TimedFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/HideInfoFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HideInfoFlag.java similarity index 76% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/HideInfoFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HideInfoFlag.java index 2bb53925b..a841feff2 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/HideInfoFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HideInfoFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class HideInfoFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/HostileAttackFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HostileAttackFlag.java similarity index 78% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/HostileAttackFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HostileAttackFlag.java index ac7ebad04..5c83dade9 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/HostileAttackFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HostileAttackFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class HostileAttackFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/HostileCapFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HostileCapFlag.java similarity index 73% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/HostileCapFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HostileCapFlag.java index bc3c364cf..5ecf2259e 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/HostileCapFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HostileCapFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.NonNegativeIntegerFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.NonNegativeIntegerFlag; import org.jetbrains.annotations.NotNull; public class HostileCapFlag extends NonNegativeIntegerFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/HostileInteractFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HostileInteractFlag.java similarity index 79% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/HostileInteractFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HostileInteractFlag.java index 3e6538cbb..e2ba6fa60 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/HostileInteractFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HostileInteractFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class HostileInteractFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/IceFormFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/IceFormFlag.java similarity index 75% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/IceFormFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/IceFormFlag.java index fa605d594..65685b3c4 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/IceFormFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/IceFormFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class IceFormFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/IceMeltFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/IceMeltFlag.java similarity index 75% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/IceMeltFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/IceMeltFlag.java index 7e15b2679..c0eee3806 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/IceMeltFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/IceMeltFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class IceMeltFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/InstabreakFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/InstabreakFlag.java similarity index 77% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/InstabreakFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/InstabreakFlag.java index d0ec50f6a..ad3176897 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/InstabreakFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/InstabreakFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class InstabreakFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/InvincibleFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/InvincibleFlag.java similarity index 77% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/InvincibleFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/InvincibleFlag.java index 093df7da4..47d90105d 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/InvincibleFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/InvincibleFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class InvincibleFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/ItemDropFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ItemDropFlag.java similarity index 76% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/ItemDropFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ItemDropFlag.java index 87f217c8a..6b0739bc4 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/ItemDropFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ItemDropFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class ItemDropFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/KeepFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/KeepFlag.java similarity index 87% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/KeepFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/KeepFlag.java index f818a3f3b..bfd9115cb 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/KeepFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/KeepFlag.java @@ -1,10 +1,10 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.FlagParseException; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.MathMan; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.FlagParseException; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.MathMan; import org.jetbrains.annotations.NotNull; public class KeepFlag extends PlotFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/KelpGrowFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/KelpGrowFlag.java similarity index 76% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/KelpGrowFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/KelpGrowFlag.java index 0e1c48af7..95e9e4c35 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/KelpGrowFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/KelpGrowFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class KelpGrowFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/LiquidFlowFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/LiquidFlowFlag.java similarity index 77% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/LiquidFlowFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/LiquidFlowFlag.java index 86243b0cc..48d5a6f12 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/LiquidFlowFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/LiquidFlowFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class LiquidFlowFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/MiscBreakFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscBreakFlag.java similarity index 76% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/MiscBreakFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscBreakFlag.java index 2403f9537..96117fe75 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/MiscBreakFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscBreakFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class MiscBreakFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/MiscCapFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscCapFlag.java similarity index 71% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/MiscCapFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscCapFlag.java index 21a392d15..284576800 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/MiscCapFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscCapFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.NonNegativeIntegerFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.NonNegativeIntegerFlag; import org.jetbrains.annotations.NotNull; public class MiscCapFlag extends NonNegativeIntegerFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/MiscInteractFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscInteractFlag.java similarity index 78% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/MiscInteractFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscInteractFlag.java index 694336170..f2f73bb04 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/MiscInteractFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscInteractFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class MiscInteractFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/MiscPlaceFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscPlaceFlag.java similarity index 76% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/MiscPlaceFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscPlaceFlag.java index e8983926f..fdf99456d 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/MiscPlaceFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscPlaceFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class MiscPlaceFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/MobBreakFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MobBreakFlag.java similarity index 76% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/MobBreakFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MobBreakFlag.java index fe8c5b797..392e05e38 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/MobBreakFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MobBreakFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class MobBreakFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/MobCapFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MobCapFlag.java similarity index 71% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/MobCapFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MobCapFlag.java index 92cb3b5c1..49794690e 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/MobCapFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MobCapFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.NonNegativeIntegerFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.NonNegativeIntegerFlag; import org.jetbrains.annotations.NotNull; public class MobCapFlag extends NonNegativeIntegerFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/MobPlaceFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MobPlaceFlag.java similarity index 76% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/MobPlaceFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MobPlaceFlag.java index 05469a15f..929d262ea 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/MobPlaceFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MobPlaceFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class MobPlaceFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/MusicFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MusicFlag.java similarity index 87% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/MusicFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MusicFlag.java index 332c10511..14340a108 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/MusicFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MusicFlag.java @@ -1,9 +1,9 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.FlagParseException; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.util.ItemUtil; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.FlagParseException; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.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/plotsquared/plot/flags/implementations/MycelGrowFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MycelGrowFlag.java similarity index 76% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/MycelGrowFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MycelGrowFlag.java index 5b627fdee..d4847e846 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/MycelGrowFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MycelGrowFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class MycelGrowFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/NoWorldeditFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/NoWorldeditFlag.java similarity index 77% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/NoWorldeditFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/NoWorldeditFlag.java index 0528b6270..bdab250c2 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/NoWorldeditFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/NoWorldeditFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class NoWorldeditFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/NotifyEnterFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/NotifyEnterFlag.java similarity index 77% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/NotifyEnterFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/NotifyEnterFlag.java index 1153c0b32..34bfcd060 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/NotifyEnterFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/NotifyEnterFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class NotifyEnterFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/NotifyLeaveFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/NotifyLeaveFlag.java similarity index 77% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/NotifyLeaveFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/NotifyLeaveFlag.java index 74c0e33c4..65b9c8b95 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/NotifyLeaveFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/NotifyLeaveFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class NotifyLeaveFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/PlaceFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PlaceFlag.java similarity index 69% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/PlaceFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PlaceFlag.java index 6ed11f5ed..e7575ccec 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/PlaceFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PlaceFlag.java @@ -1,8 +1,8 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BlockTypeListFlag; -import com.plotsquared.plot.flags.types.BlockTypeWrapper; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BlockTypeListFlag; +import com.plotsquared.core.plot.flag.types.BlockTypeWrapper; import org.jetbrains.annotations.NotNull; import java.util.Collections; diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/PlayerInteractFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PlayerInteractFlag.java similarity index 78% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/PlayerInteractFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PlayerInteractFlag.java index 462697fe9..0c05bfab2 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/PlayerInteractFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PlayerInteractFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class PlayerInteractFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/PriceFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PriceFlag.java similarity index 73% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/PriceFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PriceFlag.java index 3903e22fc..828b9c7ca 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/PriceFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PriceFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.DoubleFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.DoubleFlag; import org.jetbrains.annotations.NotNull; public class PriceFlag extends DoubleFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/PveFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PveFlag.java similarity index 73% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/PveFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PveFlag.java index 40b0b7f81..21865b0cb 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/PveFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PveFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class PveFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/PvpFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PvpFlag.java similarity index 73% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/PvpFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PvpFlag.java index 121a7a919..54e7f0123 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/PvpFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PvpFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class PvpFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/RedstoneFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/RedstoneFlag.java similarity index 76% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/RedstoneFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/RedstoneFlag.java index 1464b3d65..7d98b3c25 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/RedstoneFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/RedstoneFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class RedstoneFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/ServerPlotFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ServerPlotFlag.java similarity index 77% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/ServerPlotFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ServerPlotFlag.java index f9f5721d6..863498312 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/ServerPlotFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ServerPlotFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class ServerPlotFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/SnowFormFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/SnowFormFlag.java similarity index 76% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/SnowFormFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/SnowFormFlag.java index b2fe7476c..6cec2a742 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/SnowFormFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/SnowFormFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class SnowFormFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/SnowMeltFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/SnowMeltFlag.java similarity index 76% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/SnowMeltFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/SnowMeltFlag.java index 64f21226c..07405f374 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/SnowMeltFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/SnowMeltFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class SnowMeltFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/SoilDryFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/SoilDryFlag.java similarity index 75% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/SoilDryFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/SoilDryFlag.java index ccb6427c8..a94d2eb27 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/SoilDryFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/SoilDryFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class SoilDryFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/TamedAttackFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TamedAttackFlag.java similarity index 77% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/TamedAttackFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TamedAttackFlag.java index 8c223e9bf..c7f860e56 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/TamedAttackFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TamedAttackFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class TamedAttackFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/TamedInteractFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TamedInteractFlag.java similarity index 78% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/TamedInteractFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TamedInteractFlag.java index c00d59938..932486514 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/TamedInteractFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TamedInteractFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class TamedInteractFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/TimeFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TimeFlag.java similarity index 71% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/TimeFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TimeFlag.java index 2c9622d38..179e99a3b 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/TimeFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TimeFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.LongFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.LongFlag; import org.jetbrains.annotations.NotNull; public class TimeFlag extends LongFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/TitlesFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TitlesFlag.java similarity index 91% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/TitlesFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TitlesFlag.java index 9de603782..51c520ddc 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/TitlesFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TitlesFlag.java @@ -1,8 +1,8 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.FlagParseException; -import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.FlagParseException; +import com.plotsquared.core.plot.flag.PlotFlag; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/UntrustedVisitFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/UntrustedVisitFlag.java similarity index 74% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/UntrustedVisitFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/UntrustedVisitFlag.java index 722e9ef66..b80d87224 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/UntrustedVisitFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/UntrustedVisitFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class UntrustedVisitFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/UseFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/UseFlag.java similarity index 68% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/UseFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/UseFlag.java index 06151d8a6..61d94d7ea 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/UseFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/UseFlag.java @@ -1,8 +1,8 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BlockTypeListFlag; -import com.plotsquared.plot.flags.types.BlockTypeWrapper; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BlockTypeListFlag; +import com.plotsquared.core.plot.flag.types.BlockTypeWrapper; import org.jetbrains.annotations.NotNull; import java.util.Collections; diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/VehicleBreakFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehicleBreakFlag.java similarity index 78% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/VehicleBreakFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehicleBreakFlag.java index c31ac563b..e541b5a20 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/VehicleBreakFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehicleBreakFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class VehicleBreakFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/VehicleCapFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehicleCapFlag.java similarity index 73% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/VehicleCapFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehicleCapFlag.java index ed3d74211..95bf3b869 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/VehicleCapFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehicleCapFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.NonNegativeIntegerFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.NonNegativeIntegerFlag; import org.jetbrains.annotations.NotNull; public class VehicleCapFlag extends NonNegativeIntegerFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/VehiclePlaceFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehiclePlaceFlag.java similarity index 78% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/VehiclePlaceFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehiclePlaceFlag.java index f0b010258..d9380fbd8 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/VehiclePlaceFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehiclePlaceFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class VehiclePlaceFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/VehicleUseFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehicleUseFlag.java similarity index 77% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/VehicleUseFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehicleUseFlag.java index 6915d1c3c..c45cd6a1b 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/VehicleUseFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehicleUseFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class VehicleUseFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/VillagerInteractFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VillagerInteractFlag.java similarity index 79% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/VillagerInteractFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VillagerInteractFlag.java index 1607c90a7..5ed1c58b8 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/VillagerInteractFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VillagerInteractFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class VillagerInteractFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/VineGrowFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VineGrowFlag.java similarity index 76% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/VineGrowFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VineGrowFlag.java index c445583bb..a6ac9666e 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/VineGrowFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VineGrowFlag.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class VineGrowFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/implementations/WeatherFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/WeatherFlag.java similarity index 91% rename from Core/src/main/java/com/plotsquared/plot/flags/implementations/WeatherFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/implementations/WeatherFlag.java index ef404fa62..38b1f4422 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/implementations/WeatherFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/WeatherFlag.java @@ -1,8 +1,8 @@ -package com.plotsquared.plot.flags.implementations; +package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.plot.PlotWeather; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.plot.PlotWeather; import org.jetbrains.annotations.NotNull; import java.util.Arrays; diff --git a/Core/src/main/java/com/plotsquared/plot/flags/types/BlockTypeListFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeListFlag.java similarity index 91% rename from Core/src/main/java/com/plotsquared/plot/flags/types/BlockTypeListFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeListFlag.java index 41da887b8..6f5c5808d 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/types/BlockTypeListFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeListFlag.java @@ -1,9 +1,9 @@ -package com.plotsquared.plot.flags.types; +package com.plotsquared.core.plot.flag.types; -import com.plotsquared.config.Caption; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.FlagParseException; -import com.plotsquared.util.BlockUtil; +import com.plotsquared.core.config.Caption; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.FlagParseException; +import com.plotsquared.core.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/plotsquared/plot/flags/types/BlockTypeWrapper.java b/Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeWrapper.java similarity index 98% rename from Core/src/main/java/com/plotsquared/plot/flags/types/BlockTypeWrapper.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeWrapper.java index 85bc0addf..072eed777 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/types/BlockTypeWrapper.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeWrapper.java @@ -1,4 +1,4 @@ -package com.plotsquared.plot.flags.types; +package com.plotsquared.core.plot.flag.types; import com.google.common.base.Preconditions; import com.sk89q.worldedit.world.block.BlockCategory; diff --git a/Core/src/main/java/com/plotsquared/plot/flags/types/BooleanFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/types/BooleanFlag.java similarity index 88% rename from Core/src/main/java/com/plotsquared/plot/flags/types/BooleanFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/types/BooleanFlag.java index f722783dd..42ce56a2d 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/types/BooleanFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/types/BooleanFlag.java @@ -1,9 +1,9 @@ -package com.plotsquared.plot.flags.types; +package com.plotsquared.core.plot.flag.types; -import com.plotsquared.config.Caption; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.FlagParseException; -import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.core.config.Caption; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.FlagParseException; +import com.plotsquared.core.plot.flag.PlotFlag; import org.jetbrains.annotations.NotNull; import java.util.Arrays; diff --git a/Core/src/main/java/com/plotsquared/plot/flags/types/DoubleFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/types/DoubleFlag.java similarity index 85% rename from Core/src/main/java/com/plotsquared/plot/flags/types/DoubleFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/types/DoubleFlag.java index d00c12a91..dbb0627ab 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/types/DoubleFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/types/DoubleFlag.java @@ -1,8 +1,8 @@ -package com.plotsquared.plot.flags.types; +package com.plotsquared.core.plot.flag.types; -import com.plotsquared.config.Caption; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.FlagParseException; +import com.plotsquared.core.config.Caption; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.FlagParseException; import org.jetbrains.annotations.NotNull; public abstract class DoubleFlag> extends NumberFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/types/IntegerFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/types/IntegerFlag.java similarity index 84% rename from Core/src/main/java/com/plotsquared/plot/flags/types/IntegerFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/types/IntegerFlag.java index b8b23d6e9..f9243e7dc 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/types/IntegerFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/types/IntegerFlag.java @@ -1,8 +1,8 @@ -package com.plotsquared.plot.flags.types; +package com.plotsquared.core.plot.flag.types; -import com.plotsquared.config.Caption; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.FlagParseException; +import com.plotsquared.core.config.Caption; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.FlagParseException; import org.jetbrains.annotations.NotNull; public abstract class IntegerFlag> extends NumberFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/types/ListFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/types/ListFlag.java similarity index 76% rename from Core/src/main/java/com/plotsquared/plot/flags/types/ListFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/types/ListFlag.java index 65fc07d06..f7416b94c 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/types/ListFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/types/ListFlag.java @@ -1,9 +1,9 @@ -package com.plotsquared.plot.flags.types; +package com.plotsquared.core.plot.flag.types; -import com.plotsquared.config.Caption; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.util.StringMan; +import com.plotsquared.core.config.Caption; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.util.StringMan; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; diff --git a/Core/src/main/java/com/plotsquared/plot/flags/types/LongFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/types/LongFlag.java similarity index 84% rename from Core/src/main/java/com/plotsquared/plot/flags/types/LongFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/types/LongFlag.java index 3af953fb4..17cd75580 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/types/LongFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/types/LongFlag.java @@ -1,8 +1,8 @@ -package com.plotsquared.plot.flags.types; +package com.plotsquared.core.plot.flag.types; -import com.plotsquared.config.Caption; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.FlagParseException; +import com.plotsquared.core.config.Caption; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.FlagParseException; import org.jetbrains.annotations.NotNull; public abstract class LongFlag> extends NumberFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/types/NonNegativeIntegerFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/types/NonNegativeIntegerFlag.java similarity index 83% rename from Core/src/main/java/com/plotsquared/plot/flags/types/NonNegativeIntegerFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/types/NonNegativeIntegerFlag.java index efff986d8..9386dc7bb 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/types/NonNegativeIntegerFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/types/NonNegativeIntegerFlag.java @@ -1,6 +1,6 @@ -package com.plotsquared.plot.flags.types; +package com.plotsquared.core.plot.flag.types; -import com.plotsquared.config.Caption; +import com.plotsquared.core.config.Caption; import org.jetbrains.annotations.NotNull; public abstract class NonNegativeIntegerFlag> extends IntegerFlag { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/types/NumberFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/types/NumberFlag.java similarity index 85% rename from Core/src/main/java/com/plotsquared/plot/flags/types/NumberFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/types/NumberFlag.java index 935caa9c5..4bd9fc779 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/types/NumberFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/types/NumberFlag.java @@ -1,9 +1,9 @@ -package com.plotsquared.plot.flags.types; +package com.plotsquared.core.plot.flag.types; -import com.plotsquared.config.Caption; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.FlagParseException; -import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.core.config.Caption; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.FlagParseException; +import com.plotsquared.core.plot.flag.PlotFlag; import org.jetbrains.annotations.NotNull; public abstract class NumberFlag, F extends PlotFlag> diff --git a/Core/src/main/java/com/plotsquared/plot/flags/types/TimedFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/types/TimedFlag.java similarity index 89% rename from Core/src/main/java/com/plotsquared/plot/flags/types/TimedFlag.java rename to Core/src/main/java/com/plotsquared/core/plot/flag/types/TimedFlag.java index 16271d239..6779f6035 100644 --- a/Core/src/main/java/com/plotsquared/plot/flags/types/TimedFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/types/TimedFlag.java @@ -1,9 +1,9 @@ -package com.plotsquared.plot.flags.types; +package com.plotsquared.core.plot.flag.types; -import com.plotsquared.config.Caption; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.flags.FlagParseException; -import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.core.config.Caption; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.flag.FlagParseException; +import com.plotsquared.core.plot.flag.PlotFlag; import org.jetbrains.annotations.NotNull; public abstract class TimedFlag, F>> diff --git a/Core/src/main/java/com/plotsquared/plot/message/PlainChatManager.java b/Core/src/main/java/com/plotsquared/core/plot/message/PlainChatManager.java similarity index 85% rename from Core/src/main/java/com/plotsquared/plot/message/PlainChatManager.java rename to Core/src/main/java/com/plotsquared/core/plot/message/PlainChatManager.java index 72c312389..3a026221a 100644 --- a/Core/src/main/java/com/plotsquared/plot/message/PlainChatManager.java +++ b/Core/src/main/java/com/plotsquared/core/plot/message/PlainChatManager.java @@ -1,8 +1,8 @@ -package com.plotsquared.plot.message; +package com.plotsquared.core.plot.message; -import com.plotsquared.config.Captions; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.ChatManager; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.ChatManager; import java.util.ArrayList; import java.util.List; diff --git a/Core/src/main/java/com/plotsquared/plot/message/PlotMessage.java b/Core/src/main/java/com/plotsquared/core/plot/message/PlotMessage.java similarity index 87% rename from Core/src/main/java/com/plotsquared/plot/message/PlotMessage.java rename to Core/src/main/java/com/plotsquared/core/plot/message/PlotMessage.java index 8fe23da43..322c73253 100644 --- a/Core/src/main/java/com/plotsquared/plot/message/PlotMessage.java +++ b/Core/src/main/java/com/plotsquared/core/plot/message/PlotMessage.java @@ -1,9 +1,9 @@ -package com.plotsquared.plot.message; +package com.plotsquared.core.plot.message; -import com.plotsquared.PlotSquared; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.config.Captions; -import com.plotsquared.util.ChatManager; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.util.ChatManager; public class PlotMessage { diff --git a/Core/src/main/java/com/plotsquared/plot/schematic/PlotItem.java b/Core/src/main/java/com/plotsquared/core/plot/schematic/PlotItem.java similarity index 91% rename from Core/src/main/java/com/plotsquared/plot/schematic/PlotItem.java rename to Core/src/main/java/com/plotsquared/core/plot/schematic/PlotItem.java index abec4647d..3d67f43c9 100644 --- a/Core/src/main/java/com/plotsquared/plot/schematic/PlotItem.java +++ b/Core/src/main/java/com/plotsquared/core/plot/schematic/PlotItem.java @@ -1,4 +1,4 @@ -package com.plotsquared.plot.schematic; +package com.plotsquared.core.plot.schematic; import com.sk89q.worldedit.world.item.ItemType; diff --git a/Core/src/main/java/com/plotsquared/plot/schematic/Schematic.java b/Core/src/main/java/com/plotsquared/core/plot/schematic/Schematic.java similarity index 97% rename from Core/src/main/java/com/plotsquared/plot/schematic/Schematic.java rename to Core/src/main/java/com/plotsquared/core/plot/schematic/Schematic.java index a47ad95a2..f5d0c1b72 100644 --- a/Core/src/main/java/com/plotsquared/plot/schematic/Schematic.java +++ b/Core/src/main/java/com/plotsquared/core/plot/schematic/Schematic.java @@ -1,4 +1,4 @@ -package com.plotsquared.plot.schematic; +package com.plotsquared.core.plot.schematic; import com.sk89q.jnbt.NBTOutputStream; import com.sk89q.jnbt.Tag; diff --git a/Core/src/main/java/com/plotsquared/plot/schematic/StoredEntity.java b/Core/src/main/java/com/plotsquared/core/plot/schematic/StoredEntity.java similarity index 96% rename from Core/src/main/java/com/plotsquared/plot/schematic/StoredEntity.java rename to Core/src/main/java/com/plotsquared/core/plot/schematic/StoredEntity.java index 1df345797..424c0b93b 100644 --- a/Core/src/main/java/com/plotsquared/plot/schematic/StoredEntity.java +++ b/Core/src/main/java/com/plotsquared/core/plot/schematic/StoredEntity.java @@ -1,4 +1,4 @@ -package com.plotsquared.plot.schematic; +package com.plotsquared.core.plot.schematic; import com.sk89q.worldedit.entity.BaseEntity; import com.sk89q.worldedit.entity.Entity; diff --git a/Core/src/main/java/com/plotsquared/plot/worlds/DefaultPlotAreaManager.java b/Core/src/main/java/com/plotsquared/core/plot/world/DefaultPlotAreaManager.java similarity index 97% rename from Core/src/main/java/com/plotsquared/plot/worlds/DefaultPlotAreaManager.java rename to Core/src/main/java/com/plotsquared/core/plot/world/DefaultPlotAreaManager.java index 6f916550d..6b2e37211 100644 --- a/Core/src/main/java/com/plotsquared/plot/worlds/DefaultPlotAreaManager.java +++ b/Core/src/main/java/com/plotsquared/core/plot/world/DefaultPlotAreaManager.java @@ -1,9 +1,9 @@ -package com.plotsquared.plot.worlds; +package com.plotsquared.core.plot.world; -import com.plotsquared.location.Location; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.util.StringMan; -import com.plotsquared.util.area.QuadMap; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.collection.QuadMap; import com.sk89q.worldedit.regions.CuboidRegion; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/plot/worlds/PlotAreaManager.java b/Core/src/main/java/com/plotsquared/core/plot/world/PlotAreaManager.java similarity index 90% rename from Core/src/main/java/com/plotsquared/plot/worlds/PlotAreaManager.java rename to Core/src/main/java/com/plotsquared/core/plot/world/PlotAreaManager.java index 687677ca4..a5daf2649 100644 --- a/Core/src/main/java/com/plotsquared/plot/worlds/PlotAreaManager.java +++ b/Core/src/main/java/com/plotsquared/core/plot/world/PlotAreaManager.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot.worlds; +package com.plotsquared.core.plot.world; -import com.plotsquared.location.Location; -import com.plotsquared.plot.PlotArea; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.PlotArea; import com.sk89q.worldedit.regions.CuboidRegion; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/plot/worlds/SinglePlot.java b/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlot.java similarity index 85% rename from Core/src/main/java/com/plotsquared/plot/worlds/SinglePlot.java rename to Core/src/main/java/com/plotsquared/core/plot/world/SinglePlot.java index 0ed1f66f9..a637e2ad3 100644 --- a/Core/src/main/java/com/plotsquared/plot/worlds/SinglePlot.java +++ b/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlot.java @@ -1,11 +1,11 @@ -package com.plotsquared.plot.worlds; +package com.plotsquared.core.plot.world; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.location.BlockLoc; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotId; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.location.BlockLoc; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotId; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.CuboidRegion; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/plot/worlds/SinglePlotArea.java b/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotArea.java similarity index 86% rename from Core/src/main/java/com/plotsquared/plot/worlds/SinglePlotArea.java rename to Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotArea.java index 56138c325..cd60c6e15 100644 --- a/Core/src/main/java/com/plotsquared/plot/worlds/SinglePlotArea.java +++ b/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotArea.java @@ -1,23 +1,24 @@ -package com.plotsquared.plot.worlds; +package com.plotsquared.core.plot.world; -import com.plotsquared.configuration.ConfigurationSection; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Configuration; -import com.plotsquared.config.ConfigurationNode; -import com.plotsquared.plot.flags.FlagContainer; -import com.plotsquared.generator.GridPlotWorld; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotAreaType; -import com.plotsquared.plot.PlotId; -import com.plotsquared.location.PlotLoc; -import com.plotsquared.plot.PlotManager; -import com.plotsquared.plot.PlotSettings; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.plot.SetupObject; -import com.plotsquared.util.SetupUtils; -import com.plotsquared.util.tasks.TaskManager; -import com.plotsquared.util.WorldUtil; +import com.plotsquared.core.configuration.ConfigurationSection; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Configuration; +import com.plotsquared.core.config.ConfigurationNode; +import com.plotsquared.core.generator.SingleWorldGenerator; +import com.plotsquared.core.plot.flag.FlagContainer; +import com.plotsquared.core.generator.GridPlotWorld; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotAreaType; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.location.PlotLoc; +import com.plotsquared.core.plot.PlotManager; +import com.plotsquared.core.plot.PlotSettings; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.plot.SetupObject; +import com.plotsquared.core.util.SetupUtils; +import com.plotsquared.core.util.task.TaskManager; +import com.plotsquared.core.util.WorldUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/Core/src/main/java/com/plotsquared/plot/worlds/SinglePlotAreaManager.java b/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotAreaManager.java similarity index 93% rename from Core/src/main/java/com/plotsquared/plot/worlds/SinglePlotAreaManager.java rename to Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotAreaManager.java index d62d6fc41..ab8e8c44a 100644 --- a/Core/src/main/java/com/plotsquared/plot/worlds/SinglePlotAreaManager.java +++ b/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotAreaManager.java @@ -1,9 +1,10 @@ -package com.plotsquared.plot.worlds; +package com.plotsquared.core.plot.world; -import com.plotsquared.location.Location; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.collection.ArrayUtil; -import com.plotsquared.util.SetupUtils; +import com.plotsquared.core.generator.SingleWorldGenerator; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.collection.ArrayUtil; +import com.plotsquared.core.util.SetupUtils; import com.sk89q.worldedit.regions.CuboidRegion; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/plot/worlds/SinglePlotManager.java b/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotManager.java similarity index 86% rename from Core/src/main/java/com/plotsquared/plot/worlds/SinglePlotManager.java rename to Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotManager.java index 74536da66..e78cc46c2 100644 --- a/Core/src/main/java/com/plotsquared/plot/worlds/SinglePlotManager.java +++ b/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotManager.java @@ -1,14 +1,14 @@ -package com.plotsquared.plot.worlds; +package com.plotsquared.core.plot.world; -import com.plotsquared.PlotSquared; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotId; -import com.plotsquared.plot.PlotManager; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.SetupUtils; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.plot.PlotManager; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.SetupUtils; +import com.plotsquared.core.util.task.TaskManager; import com.sk89q.worldedit.function.pattern.Pattern; import java.io.File; diff --git a/Core/src/main/java/com/plotsquared/queue/BasicLocalBlockQueue.java b/Core/src/main/java/com/plotsquared/core/queue/BasicLocalBlockQueue.java similarity index 96% rename from Core/src/main/java/com/plotsquared/queue/BasicLocalBlockQueue.java rename to Core/src/main/java/com/plotsquared/core/queue/BasicLocalBlockQueue.java index 2d23afa6d..e89f3fa68 100644 --- a/Core/src/main/java/com/plotsquared/queue/BasicLocalBlockQueue.java +++ b/Core/src/main/java/com/plotsquared/core/queue/BasicLocalBlockQueue.java @@ -1,10 +1,10 @@ -package com.plotsquared.queue; +package com.plotsquared.core.queue; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.MathMan; -import com.plotsquared.util.tasks.TaskManager; -import com.plotsquared.util.PatternUtil; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.util.task.TaskManager; +import com.plotsquared.core.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/plotsquared/queue/ChunkBlockQueue.java b/Core/src/main/java/com/plotsquared/core/queue/ChunkBlockQueue.java similarity index 97% rename from Core/src/main/java/com/plotsquared/queue/ChunkBlockQueue.java rename to Core/src/main/java/com/plotsquared/core/queue/ChunkBlockQueue.java index 4438d2b6c..9416d6b46 100644 --- a/Core/src/main/java/com/plotsquared/queue/ChunkBlockQueue.java +++ b/Core/src/main/java/com/plotsquared/core/queue/ChunkBlockQueue.java @@ -1,6 +1,6 @@ -package com.plotsquared.queue; +package com.plotsquared.core.queue; -import com.plotsquared.location.Location; +import com.plotsquared.core.location.Location; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.block.BaseBlock; diff --git a/Core/src/main/java/com/plotsquared/queue/DelegateLocalBlockQueue.java b/Core/src/main/java/com/plotsquared/core/queue/DelegateLocalBlockQueue.java similarity index 98% rename from Core/src/main/java/com/plotsquared/queue/DelegateLocalBlockQueue.java rename to Core/src/main/java/com/plotsquared/core/queue/DelegateLocalBlockQueue.java index 8bef4eb2f..92d19d405 100644 --- a/Core/src/main/java/com/plotsquared/queue/DelegateLocalBlockQueue.java +++ b/Core/src/main/java/com/plotsquared/core/queue/DelegateLocalBlockQueue.java @@ -1,4 +1,4 @@ -package com.plotsquared.queue; +package com.plotsquared.core.queue; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.world.biome.BiomeType; diff --git a/Core/src/main/java/com/plotsquared/queue/GlobalBlockQueue.java b/Core/src/main/java/com/plotsquared/core/queue/GlobalBlockQueue.java similarity index 98% rename from Core/src/main/java/com/plotsquared/queue/GlobalBlockQueue.java rename to Core/src/main/java/com/plotsquared/core/queue/GlobalBlockQueue.java index c649f0ca4..48913d823 100644 --- a/Core/src/main/java/com/plotsquared/queue/GlobalBlockQueue.java +++ b/Core/src/main/java/com/plotsquared/core/queue/GlobalBlockQueue.java @@ -1,8 +1,8 @@ -package com.plotsquared.queue; +package com.plotsquared.core.queue; -import com.plotsquared.PlotSquared; -import com.plotsquared.util.tasks.RunnableVal2; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.util.task.RunnableVal2; +import com.plotsquared.core.util.task.TaskManager; import java.util.ArrayList; import java.util.ConcurrentModificationException; diff --git a/Core/src/main/java/com/plotsquared/queue/LocalBlockQueue.java b/Core/src/main/java/com/plotsquared/core/queue/LocalBlockQueue.java similarity index 92% rename from Core/src/main/java/com/plotsquared/queue/LocalBlockQueue.java rename to Core/src/main/java/com/plotsquared/core/queue/LocalBlockQueue.java index 981a85cd4..d3274ea2a 100644 --- a/Core/src/main/java/com/plotsquared/queue/LocalBlockQueue.java +++ b/Core/src/main/java/com/plotsquared/core/queue/LocalBlockQueue.java @@ -1,12 +1,12 @@ -package com.plotsquared.queue; +package com.plotsquared.core.queue; -import com.plotsquared.location.Location; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.SchematicHandler; -import com.plotsquared.util.StringMan; -import com.plotsquared.util.uuid.UUIDHandler; -import com.plotsquared.util.WorldUtil; -import com.plotsquared.util.PatternUtil; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.SchematicHandler; +import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.util.uuid.UUIDHandler; +import com.plotsquared.core.util.WorldUtil; +import com.plotsquared.core.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/plotsquared/queue/OffsetLocalBlockQueue.java b/Core/src/main/java/com/plotsquared/core/queue/OffsetLocalBlockQueue.java similarity index 95% rename from Core/src/main/java/com/plotsquared/queue/OffsetLocalBlockQueue.java rename to Core/src/main/java/com/plotsquared/core/queue/OffsetLocalBlockQueue.java index ffd28c381..d0b641256 100644 --- a/Core/src/main/java/com/plotsquared/queue/OffsetLocalBlockQueue.java +++ b/Core/src/main/java/com/plotsquared/core/queue/OffsetLocalBlockQueue.java @@ -1,4 +1,4 @@ -package com.plotsquared.queue; +package com.plotsquared.core.queue; import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.block.BaseBlock; diff --git a/Core/src/main/java/com/plotsquared/queue/QueueProvider.java b/Core/src/main/java/com/plotsquared/core/queue/QueueProvider.java similarity index 96% rename from Core/src/main/java/com/plotsquared/queue/QueueProvider.java rename to Core/src/main/java/com/plotsquared/core/queue/QueueProvider.java index dc770fde9..2bfcc6b73 100644 --- a/Core/src/main/java/com/plotsquared/queue/QueueProvider.java +++ b/Core/src/main/java/com/plotsquared/core/queue/QueueProvider.java @@ -1,4 +1,4 @@ -package com.plotsquared.queue; +package com.plotsquared.core.queue; public abstract class QueueProvider { public static QueueProvider of(final Class primary, diff --git a/Core/src/main/java/com/plotsquared/queue/ScopedLocalBlockQueue.java b/Core/src/main/java/com/plotsquared/core/queue/ScopedLocalBlockQueue.java similarity index 91% rename from Core/src/main/java/com/plotsquared/queue/ScopedLocalBlockQueue.java rename to Core/src/main/java/com/plotsquared/core/queue/ScopedLocalBlockQueue.java index 1ef352aa7..b66dfefd6 100644 --- a/Core/src/main/java/com/plotsquared/queue/ScopedLocalBlockQueue.java +++ b/Core/src/main/java/com/plotsquared/core/queue/ScopedLocalBlockQueue.java @@ -1,11 +1,11 @@ -package com.plotsquared.queue; +package com.plotsquared.core.queue; -import com.plotsquared.PlotSquared; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotManager; -import com.plotsquared.util.tasks.RunnableVal3; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotManager; +import com.plotsquared.core.util.task.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/plotsquared/util/BlockUtil.java b/Core/src/main/java/com/plotsquared/core/util/BlockUtil.java similarity index 98% rename from Core/src/main/java/com/plotsquared/util/BlockUtil.java rename to Core/src/main/java/com/plotsquared/core/util/BlockUtil.java index bba0579b2..fc04364c4 100644 --- a/Core/src/main/java/com/plotsquared/util/BlockUtil.java +++ b/Core/src/main/java/com/plotsquared/core/util/BlockUtil.java @@ -1,4 +1,4 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.extension.input.InputParseException; diff --git a/Core/src/main/java/com/plotsquared/util/ChatManager.java b/Core/src/main/java/com/plotsquared/core/util/ChatManager.java similarity index 80% rename from Core/src/main/java/com/plotsquared/util/ChatManager.java rename to Core/src/main/java/com/plotsquared/core/util/ChatManager.java index d48c021be..d36dec8dc 100644 --- a/Core/src/main/java/com/plotsquared/util/ChatManager.java +++ b/Core/src/main/java/com/plotsquared/core/util/ChatManager.java @@ -1,7 +1,7 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; -import com.plotsquared.plot.message.PlotMessage; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.plot.message.PlotMessage; +import com.plotsquared.core.player.PlotPlayer; public abstract class ChatManager { public static ChatManager manager; diff --git a/Core/src/main/java/com/plotsquared/util/ChunkManager.java b/Core/src/main/java/com/plotsquared/core/util/ChunkManager.java similarity index 96% rename from Core/src/main/java/com/plotsquared/util/ChunkManager.java rename to Core/src/main/java/com/plotsquared/core/util/ChunkManager.java index ef2df9de0..c32ca4a22 100644 --- a/Core/src/main/java/com/plotsquared/util/ChunkManager.java +++ b/Core/src/main/java/com/plotsquared/core/util/ChunkManager.java @@ -1,13 +1,13 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; -import com.plotsquared.PlotSquared; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.queue.GlobalBlockQueue; -import com.plotsquared.queue.LocalBlockQueue; -import com.plotsquared.queue.ScopedLocalBlockQueue; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.queue.GlobalBlockQueue; +import com.plotsquared.core.queue.LocalBlockQueue; +import com.plotsquared.core.queue.ScopedLocalBlockQueue; +import com.plotsquared.core.util.task.TaskManager; import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.regions.CuboidRegion; diff --git a/Core/src/main/java/com/plotsquared/util/ConsoleColors.java b/Core/src/main/java/com/plotsquared/core/util/ConsoleColors.java similarity index 99% rename from Core/src/main/java/com/plotsquared/util/ConsoleColors.java rename to Core/src/main/java/com/plotsquared/core/util/ConsoleColors.java index 3823c0637..b50960b3a 100644 --- a/Core/src/main/java/com/plotsquared/util/ConsoleColors.java +++ b/Core/src/main/java/com/plotsquared/core/util/ConsoleColors.java @@ -1,4 +1,4 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; public class ConsoleColors { public static String fromString(String input) { diff --git a/Core/src/main/java/com/plotsquared/util/EconHandler.java b/Core/src/main/java/com/plotsquared/core/util/EconHandler.java similarity index 81% rename from Core/src/main/java/com/plotsquared/util/EconHandler.java rename to Core/src/main/java/com/plotsquared/core/util/EconHandler.java index 08644241b..69bc01892 100644 --- a/Core/src/main/java/com/plotsquared/util/EconHandler.java +++ b/Core/src/main/java/com/plotsquared/core/util/EconHandler.java @@ -1,9 +1,9 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; -import com.plotsquared.PlotSquared; -import com.plotsquared.player.ConsolePlayer; -import com.plotsquared.player.OfflinePlotPlayer; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.player.ConsolePlayer; +import com.plotsquared.core.player.OfflinePlotPlayer; +import com.plotsquared.core.player.PlotPlayer; public abstract class EconHandler { diff --git a/Core/src/main/java/com/plotsquared/util/EntityUtil.java b/Core/src/main/java/com/plotsquared/core/util/EntityUtil.java similarity index 89% rename from Core/src/main/java/com/plotsquared/util/EntityUtil.java rename to Core/src/main/java/com/plotsquared/core/util/EntityUtil.java index 0e49acb91..544391478 100644 --- a/Core/src/main/java/com/plotsquared/util/EntityUtil.java +++ b/Core/src/main/java/com/plotsquared/core/util/EntityUtil.java @@ -1,9 +1,9 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; -import com.plotsquared.config.Settings; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.plot.flags.implementations.DoneFlag; -import com.plotsquared.plot.Plot; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.plot.flag.implementations.DoneFlag; +import com.plotsquared.core.plot.Plot; import lombok.NonNull; import lombok.experimental.UtilityClass; diff --git a/Core/src/main/java/com/plotsquared/util/EventDispatcher.java b/Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java similarity index 84% rename from Core/src/main/java/com/plotsquared/util/EventDispatcher.java rename to Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java index 3e6cd127f..97ccf2815 100644 --- a/Core/src/main/java/com/plotsquared/util/EventDispatcher.java +++ b/Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java @@ -1,48 +1,48 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; -import com.plotsquared.PlotSquared; -import com.plotsquared.events.PlayerAutoPlotEvent; -import com.plotsquared.events.PlayerClaimPlotEvent; -import com.plotsquared.events.PlayerEnterPlotEvent; -import com.plotsquared.events.PlayerLeavePlotEvent; -import com.plotsquared.events.PlayerPlotDeniedEvent; -import com.plotsquared.events.PlayerPlotHelperEvent; -import com.plotsquared.events.PlayerPlotTrustedEvent; -import com.plotsquared.events.PlayerTeleportToPlotEvent; -import com.plotsquared.events.PlotAutoMergeEvent; -import com.plotsquared.events.PlotChangeOwnerEvent; -import com.plotsquared.events.PlotClearEvent; -import com.plotsquared.events.PlotComponentSetEvent; -import com.plotsquared.events.PlotDeleteEvent; -import com.plotsquared.events.PlotDoneEvent; -import com.plotsquared.events.PlotEvent; -import com.plotsquared.events.PlotFlagAddEvent; -import com.plotsquared.events.PlotFlagRemoveEvent; -import com.plotsquared.events.PlotMergeEvent; -import com.plotsquared.events.PlotRateEvent; -import com.plotsquared.events.PlotUnlinkEvent; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.config.CaptionUtility; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.plot.flags.implementations.DeviceInteractFlag; -import com.plotsquared.plot.flags.implementations.MiscPlaceFlag; -import com.plotsquared.plot.flags.implementations.MobPlaceFlag; -import com.plotsquared.plot.flags.implementations.PlaceFlag; -import com.plotsquared.plot.flags.implementations.UseFlag; -import com.plotsquared.plot.flags.implementations.VehiclePlaceFlag; -import com.plotsquared.plot.flags.types.BlockTypeWrapper; -import com.plotsquared.listener.PlayerBlockEventType; -import com.plotsquared.location.Direction; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotId; -import com.plotsquared.plot.Rating; -import com.plotsquared.plot.worlds.SinglePlotArea; -import com.plotsquared.plot.expiration.ExpireManager; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.events.PlayerAutoPlotEvent; +import com.plotsquared.core.events.PlayerClaimPlotEvent; +import com.plotsquared.core.events.PlayerEnterPlotEvent; +import com.plotsquared.core.events.PlayerLeavePlotEvent; +import com.plotsquared.core.events.PlayerPlotDeniedEvent; +import com.plotsquared.core.events.PlayerPlotHelperEvent; +import com.plotsquared.core.events.PlayerPlotTrustedEvent; +import com.plotsquared.core.events.PlayerTeleportToPlotEvent; +import com.plotsquared.core.events.PlotAutoMergeEvent; +import com.plotsquared.core.events.PlotChangeOwnerEvent; +import com.plotsquared.core.events.PlotClearEvent; +import com.plotsquared.core.events.PlotComponentSetEvent; +import com.plotsquared.core.events.PlotDeleteEvent; +import com.plotsquared.core.events.PlotDoneEvent; +import com.plotsquared.core.events.PlotEvent; +import com.plotsquared.core.events.PlotFlagAddEvent; +import com.plotsquared.core.events.PlotFlagRemoveEvent; +import com.plotsquared.core.events.PlotMergeEvent; +import com.plotsquared.core.events.PlotRateEvent; +import com.plotsquared.core.events.PlotUnlinkEvent; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.config.CaptionUtility; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.plot.flag.implementations.DeviceInteractFlag; +import com.plotsquared.core.plot.flag.implementations.MiscPlaceFlag; +import com.plotsquared.core.plot.flag.implementations.MobPlaceFlag; +import com.plotsquared.core.plot.flag.implementations.PlaceFlag; +import com.plotsquared.core.plot.flag.implementations.UseFlag; +import com.plotsquared.core.plot.flag.implementations.VehiclePlaceFlag; +import com.plotsquared.core.plot.flag.types.BlockTypeWrapper; +import com.plotsquared.core.listener.PlayerBlockEventType; +import com.plotsquared.core.location.Direction; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.plot.Rating; +import com.plotsquared.core.plot.world.SinglePlotArea; +import com.plotsquared.core.plot.expiration.ExpireManager; +import com.plotsquared.core.util.task.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/plotsquared/util/Expression.java b/Core/src/main/java/com/plotsquared/core/util/Expression.java similarity index 90% rename from Core/src/main/java/com/plotsquared/util/Expression.java rename to Core/src/main/java/com/plotsquared/core/util/Expression.java index 35b4fab7b..387273cb7 100644 --- a/Core/src/main/java/com/plotsquared/util/Expression.java +++ b/Core/src/main/java/com/plotsquared/core/util/Expression.java @@ -1,8 +1,8 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; -import com.plotsquared.PlotSquared; -import com.plotsquared.commands.DebugExec; -import com.plotsquared.commands.MainCommand; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.command.DebugExec; +import com.plotsquared.core.command.MainCommand; import javax.script.ScriptException; diff --git a/Core/src/main/java/com/plotsquared/util/FileBytes.java b/Core/src/main/java/com/plotsquared/core/util/FileBytes.java similarity index 84% rename from Core/src/main/java/com/plotsquared/util/FileBytes.java rename to Core/src/main/java/com/plotsquared/core/util/FileBytes.java index 0e3750053..943128941 100644 --- a/Core/src/main/java/com/plotsquared/util/FileBytes.java +++ b/Core/src/main/java/com/plotsquared/core/util/FileBytes.java @@ -1,4 +1,4 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; public class FileBytes { diff --git a/Core/src/main/java/com/plotsquared/util/InventoryUtil.java b/Core/src/main/java/com/plotsquared/core/util/InventoryUtil.java similarity index 79% rename from Core/src/main/java/com/plotsquared/util/InventoryUtil.java rename to Core/src/main/java/com/plotsquared/core/util/InventoryUtil.java index d9650c995..9af554593 100644 --- a/Core/src/main/java/com/plotsquared/util/InventoryUtil.java +++ b/Core/src/main/java/com/plotsquared/core/util/InventoryUtil.java @@ -1,8 +1,8 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; -import com.plotsquared.plot.PlotInventory; -import com.plotsquared.plot.PlotItemStack; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.plot.PlotInventory; +import com.plotsquared.core.plot.PlotItemStack; +import com.plotsquared.core.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/plotsquared/util/ItemUtil.java b/Core/src/main/java/com/plotsquared/core/util/ItemUtil.java similarity index 97% rename from Core/src/main/java/com/plotsquared/util/ItemUtil.java rename to Core/src/main/java/com/plotsquared/core/util/ItemUtil.java index 7665a49fa..70ff3becc 100644 --- a/Core/src/main/java/com/plotsquared/util/ItemUtil.java +++ b/Core/src/main/java/com/plotsquared/core/util/ItemUtil.java @@ -1,4 +1,4 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; import com.sk89q.worldedit.world.item.ItemType; import com.sk89q.worldedit.world.item.ItemTypes; diff --git a/Core/src/main/java/com/plotsquared/util/LazyBlock.java b/Core/src/main/java/com/plotsquared/core/util/LazyBlock.java similarity index 86% rename from Core/src/main/java/com/plotsquared/util/LazyBlock.java rename to Core/src/main/java/com/plotsquared/core/util/LazyBlock.java index 90b1bd13c..ddc752f6a 100644 --- a/Core/src/main/java/com/plotsquared/util/LazyBlock.java +++ b/Core/src/main/java/com/plotsquared/core/util/LazyBlock.java @@ -1,4 +1,4 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; import com.sk89q.worldedit.world.block.BlockState; diff --git a/Core/src/main/java/com/plotsquared/util/LazyResult.java b/Core/src/main/java/com/plotsquared/core/util/LazyResult.java similarity index 89% rename from Core/src/main/java/com/plotsquared/util/LazyResult.java rename to Core/src/main/java/com/plotsquared/core/util/LazyResult.java index 5f156be5c..f7dde8e41 100644 --- a/Core/src/main/java/com/plotsquared/util/LazyResult.java +++ b/Core/src/main/java/com/plotsquared/core/util/LazyResult.java @@ -1,4 +1,4 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; public abstract class LazyResult { diff --git a/Core/src/main/java/com/plotsquared/util/LegacyConverter.java b/Core/src/main/java/com/plotsquared/core/util/LegacyConverter.java similarity index 93% rename from Core/src/main/java/com/plotsquared/util/LegacyConverter.java rename to Core/src/main/java/com/plotsquared/core/util/LegacyConverter.java index 2b65da11d..5fe4cfd51 100644 --- a/Core/src/main/java/com/plotsquared/util/LegacyConverter.java +++ b/Core/src/main/java/com/plotsquared/core/util/LegacyConverter.java @@ -1,11 +1,11 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; -import com.plotsquared.configuration.ConfigurationSection; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.CaptionUtility; -import com.plotsquared.config.Captions; -import com.plotsquared.plot.BlockBucket; -import com.plotsquared.player.ConsolePlayer; +import com.plotsquared.core.configuration.ConfigurationSection; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.CaptionUtility; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.plot.BlockBucket; +import com.plotsquared.core.player.ConsolePlayer; import com.sk89q.worldedit.world.block.BlockState; import lombok.NonNull; diff --git a/Core/src/main/java/com/plotsquared/util/MainUtil.java b/Core/src/main/java/com/plotsquared/core/util/MainUtil.java similarity index 96% rename from Core/src/main/java/com/plotsquared/util/MainUtil.java rename to Core/src/main/java/com/plotsquared/core/util/MainUtil.java index a4efd6760..39f188e6f 100644 --- a/Core/src/main/java/com/plotsquared/util/MainUtil.java +++ b/Core/src/main/java/com/plotsquared/core/util/MainUtil.java @@ -1,31 +1,31 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; -import com.plotsquared.PlotSquared; -import com.plotsquared.collection.AbstractDelegateOutputStream; -import com.plotsquared.configuration.ConfigurationSection; -import com.plotsquared.player.ConsolePlayer; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.commands.Like; -import com.plotsquared.config.Caption; -import com.plotsquared.config.CaptionUtility; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.database.DBFunc; -import com.plotsquared.plot.expiration.ExpireManager; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.plot.flags.implementations.DescriptionFlag; -import com.plotsquared.plot.flags.implementations.ServerPlotFlag; -import com.plotsquared.plot.flags.types.DoubleFlag; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotAreaTerrainType; -import com.plotsquared.plot.PlotAreaType; -import com.plotsquared.plot.PlotId; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.util.net.AbstractDelegateOutputStream; +import com.plotsquared.core.configuration.ConfigurationSection; +import com.plotsquared.core.player.ConsolePlayer; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.command.Like; +import com.plotsquared.core.config.Caption; +import com.plotsquared.core.config.CaptionUtility; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.plot.expiration.ExpireManager; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.plot.flag.implementations.DescriptionFlag; +import com.plotsquared.core.plot.flag.implementations.ServerPlotFlag; +import com.plotsquared.core.plot.flag.types.DoubleFlag; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotAreaTerrainType; +import com.plotsquared.core.plot.PlotAreaType; +import com.plotsquared.core.plot.PlotId; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.tasks.TaskManager; -import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.task.TaskManager; +import com.plotsquared.core.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/plotsquared/util/MathMan.java b/Core/src/main/java/com/plotsquared/core/util/MathMan.java similarity index 99% rename from Core/src/main/java/com/plotsquared/util/MathMan.java rename to Core/src/main/java/com/plotsquared/core/util/MathMan.java index 7730a590b..62f31e67a 100644 --- a/Core/src/main/java/com/plotsquared/util/MathMan.java +++ b/Core/src/main/java/com/plotsquared/core/util/MathMan.java @@ -1,4 +1,4 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; public class MathMan { diff --git a/Core/src/main/java/com/plotsquared/util/OperationUtil.java b/Core/src/main/java/com/plotsquared/core/util/OperationUtil.java similarity index 96% rename from Core/src/main/java/com/plotsquared/util/OperationUtil.java rename to Core/src/main/java/com/plotsquared/core/util/OperationUtil.java index 546f56937..ce6beb643 100644 --- a/Core/src/main/java/com/plotsquared/util/OperationUtil.java +++ b/Core/src/main/java/com/plotsquared/core/util/OperationUtil.java @@ -1,7 +1,7 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; -import com.plotsquared.location.Location; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.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/plotsquared/util/PatternUtil.java b/Core/src/main/java/com/plotsquared/core/util/PatternUtil.java similarity index 94% rename from Core/src/main/java/com/plotsquared/util/PatternUtil.java rename to Core/src/main/java/com/plotsquared/core/util/PatternUtil.java index 8985865be..fc8b96361 100644 --- a/Core/src/main/java/com/plotsquared/util/PatternUtil.java +++ b/Core/src/main/java/com/plotsquared/core/util/PatternUtil.java @@ -1,8 +1,8 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; -import com.plotsquared.commands.Command; -import com.plotsquared.config.Captions; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.command.Command; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.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/plotsquared/util/Permissions.java b/Core/src/main/java/com/plotsquared/core/util/Permissions.java similarity index 94% rename from Core/src/main/java/com/plotsquared/util/Permissions.java rename to Core/src/main/java/com/plotsquared/core/util/Permissions.java index e1da1bcdd..a65422b0e 100644 --- a/Core/src/main/java/com/plotsquared/util/Permissions.java +++ b/Core/src/main/java/com/plotsquared/core/util/Permissions.java @@ -1,9 +1,9 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; -import com.plotsquared.commands.CommandCaller; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.command.CommandCaller; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.player.PlotPlayer; import java.util.HashMap; diff --git a/Core/src/main/java/com/plotsquared/util/PremiumVerification.java b/Core/src/main/java/com/plotsquared/core/util/PremiumVerification.java similarity index 95% rename from Core/src/main/java/com/plotsquared/util/PremiumVerification.java rename to Core/src/main/java/com/plotsquared/core/util/PremiumVerification.java index 4081a5e45..3c7fcd6a6 100644 --- a/Core/src/main/java/com/plotsquared/util/PremiumVerification.java +++ b/Core/src/main/java/com/plotsquared/core/util/PremiumVerification.java @@ -1,4 +1,4 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; public class PremiumVerification { private static Boolean usingPremium; diff --git a/Core/src/main/java/com/plotsquared/util/PseudoRandom.java b/Core/src/main/java/com/plotsquared/core/util/PseudoRandom.java similarity index 94% rename from Core/src/main/java/com/plotsquared/util/PseudoRandom.java rename to Core/src/main/java/com/plotsquared/core/util/PseudoRandom.java index 84419aa34..7c201bf95 100644 --- a/Core/src/main/java/com/plotsquared/util/PseudoRandom.java +++ b/Core/src/main/java/com/plotsquared/core/util/PseudoRandom.java @@ -1,4 +1,4 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; public class PseudoRandom { diff --git a/Core/src/main/java/com/plotsquared/util/ReflectionUtils.java b/Core/src/main/java/com/plotsquared/core/util/ReflectionUtils.java similarity index 99% rename from Core/src/main/java/com/plotsquared/util/ReflectionUtils.java rename to Core/src/main/java/com/plotsquared/core/util/ReflectionUtils.java index 3c2ffb2f9..385f753c9 100644 --- a/Core/src/main/java/com/plotsquared/util/ReflectionUtils.java +++ b/Core/src/main/java/com/plotsquared/core/util/ReflectionUtils.java @@ -1,4 +1,4 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/Core/src/main/java/com/plotsquared/util/RegExUtil.java b/Core/src/main/java/com/plotsquared/core/util/RegExUtil.java similarity index 86% rename from Core/src/main/java/com/plotsquared/util/RegExUtil.java rename to Core/src/main/java/com/plotsquared/core/util/RegExUtil.java index 9947097c0..377344d97 100644 --- a/Core/src/main/java/com/plotsquared/util/RegExUtil.java +++ b/Core/src/main/java/com/plotsquared/core/util/RegExUtil.java @@ -1,4 +1,4 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; import java.util.HashMap; import java.util.Map; diff --git a/Core/src/main/java/com/plotsquared/util/RegionUtil.java b/Core/src/main/java/com/plotsquared/core/util/RegionUtil.java similarity index 95% rename from Core/src/main/java/com/plotsquared/util/RegionUtil.java rename to Core/src/main/java/com/plotsquared/core/util/RegionUtil.java index f3b57dae3..18a7ac9fc 100644 --- a/Core/src/main/java/com/plotsquared/util/RegionUtil.java +++ b/Core/src/main/java/com/plotsquared/core/util/RegionUtil.java @@ -1,6 +1,6 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; -import com.plotsquared.plot.Plot; +import com.plotsquared.core.plot.Plot; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.CuboidRegion; diff --git a/Core/src/main/java/com/plotsquared/util/RuntimeExceptionRunnableVal.java b/Core/src/main/java/com/plotsquared/core/util/RuntimeExceptionRunnableVal.java similarity index 88% rename from Core/src/main/java/com/plotsquared/util/RuntimeExceptionRunnableVal.java rename to Core/src/main/java/com/plotsquared/core/util/RuntimeExceptionRunnableVal.java index 3747ffb3e..1119cc5a5 100644 --- a/Core/src/main/java/com/plotsquared/util/RuntimeExceptionRunnableVal.java +++ b/Core/src/main/java/com/plotsquared/core/util/RuntimeExceptionRunnableVal.java @@ -1,6 +1,6 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; -import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.core.util.task.RunnableVal; import lombok.RequiredArgsConstructor; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/Core/src/main/java/com/plotsquared/util/SchematicHandler.java b/Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java similarity index 97% rename from Core/src/main/java/com/plotsquared/util/SchematicHandler.java rename to Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java index a431e4615..4c3e4261f 100644 --- a/Core/src/main/java/com/plotsquared/util/SchematicHandler.java +++ b/Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java @@ -1,16 +1,16 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Settings; -import com.plotsquared.generator.ClassicPlotWorld; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.util.uuid.UUIDHandler; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.plot.schematic.Schematic; -import com.plotsquared.queue.LocalBlockQueue; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.generator.ClassicPlotWorld; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.util.uuid.UUIDHandler; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.plot.schematic.Schematic; +import com.plotsquared.core.queue.LocalBlockQueue; +import com.plotsquared.core.util.task.TaskManager; import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.NBTInputStream; import com.sk89q.jnbt.NBTOutputStream; diff --git a/Core/src/main/java/com/plotsquared/util/SetupUtils.java b/Core/src/main/java/com/plotsquared/core/util/SetupUtils.java similarity index 70% rename from Core/src/main/java/com/plotsquared/util/SetupUtils.java rename to Core/src/main/java/com/plotsquared/core/util/SetupUtils.java index 922f58a63..3fd232fef 100644 --- a/Core/src/main/java/com/plotsquared/util/SetupUtils.java +++ b/Core/src/main/java/com/plotsquared/core/util/SetupUtils.java @@ -1,8 +1,8 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; -import com.plotsquared.generator.GeneratorWrapper; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.SetupObject; +import com.plotsquared.core.generator.GeneratorWrapper; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.SetupObject; import java.util.HashMap; diff --git a/Core/src/main/java/com/plotsquared/util/StringComparison.java b/Core/src/main/java/com/plotsquared/core/util/StringComparison.java similarity index 99% rename from Core/src/main/java/com/plotsquared/util/StringComparison.java rename to Core/src/main/java/com/plotsquared/core/util/StringComparison.java index 84a0daeb1..c370f5fc1 100644 --- a/Core/src/main/java/com/plotsquared/util/StringComparison.java +++ b/Core/src/main/java/com/plotsquared/core/util/StringComparison.java @@ -1,4 +1,4 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; import java.util.ArrayList; import java.util.Collection; diff --git a/Core/src/main/java/com/plotsquared/util/StringMan.java b/Core/src/main/java/com/plotsquared/core/util/StringMan.java similarity index 99% rename from Core/src/main/java/com/plotsquared/util/StringMan.java rename to Core/src/main/java/com/plotsquared/core/util/StringMan.java index 151769135..9357a1aef 100644 --- a/Core/src/main/java/com/plotsquared/util/StringMan.java +++ b/Core/src/main/java/com/plotsquared/core/util/StringMan.java @@ -1,6 +1,6 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; -import com.plotsquared.config.Caption; +import com.plotsquared.core.config.Caption; import org.jetbrains.annotations.NotNull; import java.lang.reflect.Array; diff --git a/Core/src/main/java/com/plotsquared/util/StringWrapper.java b/Core/src/main/java/com/plotsquared/core/util/StringWrapper.java similarity index 97% rename from Core/src/main/java/com/plotsquared/util/StringWrapper.java rename to Core/src/main/java/com/plotsquared/core/util/StringWrapper.java index 8c96802a6..79bd945bb 100644 --- a/Core/src/main/java/com/plotsquared/util/StringWrapper.java +++ b/Core/src/main/java/com/plotsquared/core/util/StringWrapper.java @@ -1,4 +1,4 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; /** * diff --git a/Core/src/main/java/com/plotsquared/listener/WEManager.java b/Core/src/main/java/com/plotsquared/core/util/WEManager.java similarity index 89% rename from Core/src/main/java/com/plotsquared/listener/WEManager.java rename to Core/src/main/java/com/plotsquared/core/util/WEManager.java index 5f1bc2c49..91494ba05 100644 --- a/Core/src/main/java/com/plotsquared/listener/WEManager.java +++ b/Core/src/main/java/com/plotsquared/core/util/WEManager.java @@ -1,14 +1,13 @@ -package com.plotsquared.listener; +package com.plotsquared.core.util; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Settings; -import com.plotsquared.plot.flags.implementations.DoneFlag; -import com.plotsquared.plot.flags.implementations.NoWorldeditFlag; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.RegionUtil; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.plot.flag.implementations.DoneFlag; +import com.plotsquared.core.plot.flag.implementations.NoWorldeditFlag; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.player.PlotPlayer; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.CuboidRegion; diff --git a/Core/src/main/java/com/plotsquared/util/WorldUtil.java b/Core/src/main/java/com/plotsquared/core/util/WorldUtil.java similarity index 96% rename from Core/src/main/java/com/plotsquared/util/WorldUtil.java rename to Core/src/main/java/com/plotsquared/core/util/WorldUtil.java index 905f920ad..0986e2dda 100644 --- a/Core/src/main/java/com/plotsquared/util/WorldUtil.java +++ b/Core/src/main/java/com/plotsquared/core/util/WorldUtil.java @@ -1,10 +1,10 @@ -package com.plotsquared.util; +package com.plotsquared.core.util; -import com.plotsquared.PlotSquared; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal; import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.IntTag; import com.sk89q.jnbt.NBTInputStream; diff --git a/Core/src/main/java/com/plotsquared/util/helpmenu/HelpMenu.java b/Core/src/main/java/com/plotsquared/core/util/helpmenu/HelpMenu.java similarity index 87% rename from Core/src/main/java/com/plotsquared/util/helpmenu/HelpMenu.java rename to Core/src/main/java/com/plotsquared/core/util/helpmenu/HelpMenu.java index 5ee2ed3f8..dd16bc6d4 100644 --- a/Core/src/main/java/com/plotsquared/util/helpmenu/HelpMenu.java +++ b/Core/src/main/java/com/plotsquared/core/util/helpmenu/HelpMenu.java @@ -1,9 +1,9 @@ -package com.plotsquared.util.helpmenu; +package com.plotsquared.core.util.helpmenu; -import com.plotsquared.commands.Command; -import com.plotsquared.commands.CommandCategory; -import com.plotsquared.commands.MainCommand; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.command.Command; +import com.plotsquared.core.command.CommandCategory; +import com.plotsquared.core.command.MainCommand; +import com.plotsquared.core.player.PlotPlayer; import java.util.List; diff --git a/Core/src/main/java/com/plotsquared/util/helpmenu/HelpObject.java b/Core/src/main/java/com/plotsquared/core/util/helpmenu/HelpObject.java similarity index 83% rename from Core/src/main/java/com/plotsquared/util/helpmenu/HelpObject.java rename to Core/src/main/java/com/plotsquared/core/util/helpmenu/HelpObject.java index 7b71c74c6..9e58b0108 100644 --- a/Core/src/main/java/com/plotsquared/util/helpmenu/HelpObject.java +++ b/Core/src/main/java/com/plotsquared/core/util/helpmenu/HelpObject.java @@ -1,9 +1,9 @@ -package com.plotsquared.util.helpmenu; +package com.plotsquared.core.util.helpmenu; -import com.plotsquared.commands.Argument; -import com.plotsquared.commands.Command; -import com.plotsquared.config.Captions; -import com.plotsquared.util.StringMan; +import com.plotsquared.core.command.Argument; +import com.plotsquared.core.command.Command; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.util.StringMan; public class HelpObject { diff --git a/Core/src/main/java/com/plotsquared/util/helpmenu/HelpPage.java b/Core/src/main/java/com/plotsquared/core/util/helpmenu/HelpPage.java similarity index 80% rename from Core/src/main/java/com/plotsquared/util/helpmenu/HelpPage.java rename to Core/src/main/java/com/plotsquared/core/util/helpmenu/HelpPage.java index e93f55844..0070fb3f9 100644 --- a/Core/src/main/java/com/plotsquared/util/helpmenu/HelpPage.java +++ b/Core/src/main/java/com/plotsquared/core/util/helpmenu/HelpPage.java @@ -1,10 +1,10 @@ -package com.plotsquared.util.helpmenu; +package com.plotsquared.core.util.helpmenu; -import com.plotsquared.commands.CommandCategory; -import com.plotsquared.config.Captions; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.MainUtil; -import com.plotsquared.util.StringMan; +import com.plotsquared.core.command.CommandCategory; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.StringMan; import java.util.ArrayList; import java.util.List; diff --git a/Core/src/main/java/com/plotsquared/util/logger/DelegateLogger.java b/Core/src/main/java/com/plotsquared/core/util/logger/DelegateLogger.java similarity index 88% rename from Core/src/main/java/com/plotsquared/util/logger/DelegateLogger.java rename to Core/src/main/java/com/plotsquared/core/util/logger/DelegateLogger.java index d081fe4e1..823768521 100644 --- a/Core/src/main/java/com/plotsquared/util/logger/DelegateLogger.java +++ b/Core/src/main/java/com/plotsquared/core/util/logger/DelegateLogger.java @@ -1,4 +1,4 @@ -package com.plotsquared.util.logger; +package com.plotsquared.core.util.logger; public class DelegateLogger implements ILogger { diff --git a/Core/src/main/java/com/plotsquared/util/logger/ILogger.java b/Core/src/main/java/com/plotsquared/core/util/logger/ILogger.java similarity index 58% rename from Core/src/main/java/com/plotsquared/util/logger/ILogger.java rename to Core/src/main/java/com/plotsquared/core/util/logger/ILogger.java index aa8ccf4f6..318cdec71 100644 --- a/Core/src/main/java/com/plotsquared/util/logger/ILogger.java +++ b/Core/src/main/java/com/plotsquared/core/util/logger/ILogger.java @@ -1,4 +1,4 @@ -package com.plotsquared.util.logger; +package com.plotsquared.core.util.logger; public interface ILogger { void log(String message); diff --git a/Core/src/main/java/com/plotsquared/collection/AbstractDelegateOutputStream.java b/Core/src/main/java/com/plotsquared/core/util/net/AbstractDelegateOutputStream.java similarity index 94% rename from Core/src/main/java/com/plotsquared/collection/AbstractDelegateOutputStream.java rename to Core/src/main/java/com/plotsquared/core/util/net/AbstractDelegateOutputStream.java index 08eadb018..a61cf595b 100644 --- a/Core/src/main/java/com/plotsquared/collection/AbstractDelegateOutputStream.java +++ b/Core/src/main/java/com/plotsquared/core/util/net/AbstractDelegateOutputStream.java @@ -1,4 +1,4 @@ -package com.plotsquared.collection; +package com.plotsquared.core.util.net; import java.io.IOException; import java.io.OutputStream; diff --git a/Core/src/main/java/com/plotsquared/util/net/HttpUtil.java b/Core/src/main/java/com/plotsquared/core/util/net/HttpUtil.java similarity index 90% rename from Core/src/main/java/com/plotsquared/util/net/HttpUtil.java rename to Core/src/main/java/com/plotsquared/core/util/net/HttpUtil.java index 578b76b70..02bc43dc0 100644 --- a/Core/src/main/java/com/plotsquared/util/net/HttpUtil.java +++ b/Core/src/main/java/com/plotsquared/core/util/net/HttpUtil.java @@ -1,6 +1,6 @@ -package com.plotsquared.util.net; +package com.plotsquared.core.util.net; -import com.plotsquared.config.Settings; +import com.plotsquared.core.config.Settings; import java.io.BufferedReader; import java.io.IOException; diff --git a/Core/src/main/java/com/plotsquared/util/net/IncendoPaster.java b/Core/src/main/java/com/plotsquared/core/util/net/IncendoPaster.java similarity index 98% rename from Core/src/main/java/com/plotsquared/util/net/IncendoPaster.java rename to Core/src/main/java/com/plotsquared/core/util/net/IncendoPaster.java index 8439a9404..ad6981671 100644 --- a/Core/src/main/java/com/plotsquared/util/net/IncendoPaster.java +++ b/Core/src/main/java/com/plotsquared/core/util/net/IncendoPaster.java @@ -1,6 +1,6 @@ -package com.plotsquared.util.net; +package com.plotsquared.core.util.net; -import com.plotsquared.PlotSquared; +import com.plotsquared.core.PlotSquared; import com.google.common.base.Charsets; import java.io.BufferedReader; diff --git a/Core/src/main/java/com/plotsquared/util/tasks/AutoClaimFinishTask.java b/Core/src/main/java/com/plotsquared/core/util/task/AutoClaimFinishTask.java similarity index 69% rename from Core/src/main/java/com/plotsquared/util/tasks/AutoClaimFinishTask.java rename to Core/src/main/java/com/plotsquared/core/util/task/AutoClaimFinishTask.java index 01e254522..b9545af32 100644 --- a/Core/src/main/java/com/plotsquared/util/tasks/AutoClaimFinishTask.java +++ b/Core/src/main/java/com/plotsquared/core/util/task/AutoClaimFinishTask.java @@ -1,18 +1,18 @@ -package com.plotsquared.util.tasks; +package com.plotsquared.core.util.task; -import com.plotsquared.PlotSquared; -import com.plotsquared.commands.Auto; -import com.plotsquared.config.Captions; -import com.plotsquared.database.DBFunc; -import com.plotsquared.events.PlotMergeEvent; -import com.plotsquared.events.Result; -import com.plotsquared.location.Direction; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.command.Auto; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.events.PlotMergeEvent; +import com.plotsquared.core.events.Result; +import com.plotsquared.core.location.Direction; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.player.PlotPlayer; import lombok.RequiredArgsConstructor; -import static com.plotsquared.util.MainUtil.sendMessage; +import static com.plotsquared.core.util.MainUtil.sendMessage; @RequiredArgsConstructor public final class AutoClaimFinishTask extends RunnableVal { diff --git a/Core/src/main/java/com/plotsquared/util/tasks/ObjectTaskRunnable.java b/Core/src/main/java/com/plotsquared/core/util/task/ObjectTaskRunnable.java similarity index 94% rename from Core/src/main/java/com/plotsquared/util/tasks/ObjectTaskRunnable.java rename to Core/src/main/java/com/plotsquared/core/util/task/ObjectTaskRunnable.java index ff1e5aaee..19144a642 100644 --- a/Core/src/main/java/com/plotsquared/util/tasks/ObjectTaskRunnable.java +++ b/Core/src/main/java/com/plotsquared/core/util/task/ObjectTaskRunnable.java @@ -1,4 +1,4 @@ -package com.plotsquared.util.tasks; +package com.plotsquared.core.util.task; import lombok.RequiredArgsConstructor; diff --git a/Core/src/main/java/com/plotsquared/util/tasks/RunnableVal.java b/Core/src/main/java/com/plotsquared/core/util/task/RunnableVal.java similarity index 87% rename from Core/src/main/java/com/plotsquared/util/tasks/RunnableVal.java rename to Core/src/main/java/com/plotsquared/core/util/task/RunnableVal.java index e039cd9f4..0e7f763e5 100644 --- a/Core/src/main/java/com/plotsquared/util/tasks/RunnableVal.java +++ b/Core/src/main/java/com/plotsquared/core/util/task/RunnableVal.java @@ -1,4 +1,4 @@ -package com.plotsquared.util.tasks; +package com.plotsquared.core.util.task; public abstract class RunnableVal implements Runnable { public T value; diff --git a/Core/src/main/java/com/plotsquared/util/tasks/RunnableVal2.java b/Core/src/main/java/com/plotsquared/core/util/task/RunnableVal2.java similarity index 90% rename from Core/src/main/java/com/plotsquared/util/tasks/RunnableVal2.java rename to Core/src/main/java/com/plotsquared/core/util/task/RunnableVal2.java index 3f351e675..556e07b37 100644 --- a/Core/src/main/java/com/plotsquared/util/tasks/RunnableVal2.java +++ b/Core/src/main/java/com/plotsquared/core/util/task/RunnableVal2.java @@ -1,4 +1,4 @@ -package com.plotsquared.util.tasks; +package com.plotsquared.core.util.task; public abstract class RunnableVal2 implements Runnable { public T value1; diff --git a/Core/src/main/java/com/plotsquared/util/tasks/RunnableVal3.java b/Core/src/main/java/com/plotsquared/core/util/task/RunnableVal3.java similarity index 91% rename from Core/src/main/java/com/plotsquared/util/tasks/RunnableVal3.java rename to Core/src/main/java/com/plotsquared/core/util/task/RunnableVal3.java index d65786380..e5452df22 100644 --- a/Core/src/main/java/com/plotsquared/util/tasks/RunnableVal3.java +++ b/Core/src/main/java/com/plotsquared/core/util/task/RunnableVal3.java @@ -1,4 +1,4 @@ -package com.plotsquared.util.tasks; +package com.plotsquared.core.util.task; public abstract class RunnableVal3 implements Runnable { public T value1; diff --git a/Core/src/main/java/com/plotsquared/util/tasks/TaskManager.java b/Core/src/main/java/com/plotsquared/core/util/task/TaskManager.java similarity index 96% rename from Core/src/main/java/com/plotsquared/util/tasks/TaskManager.java rename to Core/src/main/java/com/plotsquared/core/util/task/TaskManager.java index 4eeb60d15..a337c6822 100644 --- a/Core/src/main/java/com/plotsquared/util/tasks/TaskManager.java +++ b/Core/src/main/java/com/plotsquared/core/util/task/TaskManager.java @@ -1,7 +1,7 @@ -package com.plotsquared.util.tasks; +package com.plotsquared.core.util.task; -import com.plotsquared.PlotSquared; -import com.plotsquared.util.RuntimeExceptionRunnableVal; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.util.RuntimeExceptionRunnableVal; import java.util.Collection; import java.util.HashMap; diff --git a/Core/src/main/java/com/plotsquared/util/uuid/UUIDHandler.java b/Core/src/main/java/com/plotsquared/core/util/uuid/UUIDHandler.java similarity index 92% rename from Core/src/main/java/com/plotsquared/util/uuid/UUIDHandler.java rename to Core/src/main/java/com/plotsquared/core/util/uuid/UUIDHandler.java index 5dce90e5d..af95b9399 100644 --- a/Core/src/main/java/com/plotsquared/util/uuid/UUIDHandler.java +++ b/Core/src/main/java/com/plotsquared/core/util/uuid/UUIDHandler.java @@ -1,12 +1,12 @@ -package com.plotsquared.util.uuid; +package com.plotsquared.core.util.uuid; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.database.DBFunc; -import com.plotsquared.player.OfflinePlotPlayer; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.StringWrapper; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.player.OfflinePlotPlayer; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.StringWrapper; import com.google.common.collect.BiMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/Core/src/main/java/com/plotsquared/util/uuid/UUIDHandlerImplementation.java b/Core/src/main/java/com/plotsquared/core/util/uuid/UUIDHandlerImplementation.java similarity index 94% rename from Core/src/main/java/com/plotsquared/util/uuid/UUIDHandlerImplementation.java rename to Core/src/main/java/com/plotsquared/core/util/uuid/UUIDHandlerImplementation.java index f1e780578..bce3a682e 100644 --- a/Core/src/main/java/com/plotsquared/util/uuid/UUIDHandlerImplementation.java +++ b/Core/src/main/java/com/plotsquared/core/util/uuid/UUIDHandlerImplementation.java @@ -1,16 +1,16 @@ -package com.plotsquared.util.uuid; +package com.plotsquared.core.util.uuid; -import com.plotsquared.PlotSquared; -import com.plotsquared.config.Captions; -import com.plotsquared.config.Settings; -import com.plotsquared.database.DBFunc; -import com.plotsquared.player.OfflinePlotPlayer; -import com.plotsquared.plot.Plot; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.util.StringMan; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.StringWrapper; -import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.config.Captions; +import com.plotsquared.core.config.Settings; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.player.OfflinePlotPlayer; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.StringWrapper; +import com.plotsquared.core.util.task.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/plotsquared/util/uuid/UUIDWrapper.java b/Core/src/main/java/com/plotsquared/core/util/uuid/UUIDWrapper.java similarity index 77% rename from Core/src/main/java/com/plotsquared/util/uuid/UUIDWrapper.java rename to Core/src/main/java/com/plotsquared/core/util/uuid/UUIDWrapper.java index 0bb635e56..7160eaf15 100644 --- a/Core/src/main/java/com/plotsquared/util/uuid/UUIDWrapper.java +++ b/Core/src/main/java/com/plotsquared/core/util/uuid/UUIDWrapper.java @@ -1,7 +1,7 @@ -package com.plotsquared.util.uuid; +package com.plotsquared.core.util.uuid; -import com.plotsquared.player.OfflinePlotPlayer; -import com.plotsquared.player.PlotPlayer; +import com.plotsquared.core.player.OfflinePlotPlayer; +import com.plotsquared.core.player.PlotPlayer; import org.jetbrains.annotations.NotNull; import java.util.UUID; diff --git a/Core/src/test/java/com/plotsquared/database/AbstractDBTest.java b/Core/src/test/java/com/plotsquared/core/database/AbstractDBTest.java similarity index 92% rename from Core/src/test/java/com/plotsquared/database/AbstractDBTest.java rename to Core/src/test/java/com/plotsquared/core/database/AbstractDBTest.java index a9af554c6..62028cc3b 100644 --- a/Core/src/test/java/com/plotsquared/database/AbstractDBTest.java +++ b/Core/src/test/java/com/plotsquared/core/database/AbstractDBTest.java @@ -1,12 +1,12 @@ -package com.plotsquared.database; +package com.plotsquared.core.database; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotCluster; -import com.plotsquared.plot.PlotId; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.plot.comment.PlotComment; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotCluster; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.plot.comment.PlotComment; import org.jetbrains.annotations.NotNull; import java.util.HashMap; diff --git a/Core/src/test/java/com/plotsquared/plot/FlagTest.java b/Core/src/test/java/com/plotsquared/core/plot/FlagTest.java similarity index 91% rename from Core/src/test/java/com/plotsquared/plot/FlagTest.java rename to Core/src/test/java/com/plotsquared/core/plot/FlagTest.java index f6944953b..c5fece138 100644 --- a/Core/src/test/java/com/plotsquared/plot/FlagTest.java +++ b/Core/src/test/java/com/plotsquared/core/plot/FlagTest.java @@ -1,7 +1,7 @@ -package com.plotsquared.plot; +package com.plotsquared.core.plot; -import com.plotsquared.database.AbstractDBTest; -import com.plotsquared.database.DBFunc; +import com.plotsquared.core.database.AbstractDBTest; +import com.plotsquared.core.database.DBFunc; import com.sk89q.worldedit.world.item.ItemType; import org.junit.Before; diff --git a/Core/src/test/java/com/plotsquared/plot/PlotVersionTest.java b/Core/src/test/java/com/plotsquared/core/plot/PlotVersionTest.java similarity index 79% rename from Core/src/test/java/com/plotsquared/plot/PlotVersionTest.java rename to Core/src/test/java/com/plotsquared/core/plot/PlotVersionTest.java index b957aff85..fcc2c35e1 100644 --- a/Core/src/test/java/com/plotsquared/plot/PlotVersionTest.java +++ b/Core/src/test/java/com/plotsquared/core/plot/PlotVersionTest.java @@ -1,6 +1,6 @@ -package com.plotsquared.plot; +package com.plotsquared.core.plot; -import com.plotsquared.PlotVersion; +import com.plotsquared.core.PlotVersion; import org.junit.Test; public class PlotVersionTest { diff --git a/Core/src/test/java/com/plotsquared/plot/object/LocationTest.java b/Core/src/test/java/com/plotsquared/core/plot/object/LocationTest.java similarity index 85% rename from Core/src/test/java/com/plotsquared/plot/object/LocationTest.java rename to Core/src/test/java/com/plotsquared/core/plot/object/LocationTest.java index 68fe99093..158d48421 100644 --- a/Core/src/test/java/com/plotsquared/plot/object/LocationTest.java +++ b/Core/src/test/java/com/plotsquared/core/plot/object/LocationTest.java @@ -1,6 +1,6 @@ -package com.plotsquared.plot.object; +package com.plotsquared.core.plot.object; -import com.plotsquared.location.Location; +import com.plotsquared.core.location.Location; import org.junit.Test; import java.util.logging.Logger; diff --git a/Core/src/test/java/com/plotsquared/plot/util/EventDispatcherTest.java b/Core/src/test/java/com/plotsquared/core/plot/util/EventDispatcherTest.java similarity index 64% rename from Core/src/test/java/com/plotsquared/plot/util/EventDispatcherTest.java rename to Core/src/test/java/com/plotsquared/core/plot/util/EventDispatcherTest.java index 92efbdb7f..c44ae2422 100644 --- a/Core/src/test/java/com/plotsquared/plot/util/EventDispatcherTest.java +++ b/Core/src/test/java/com/plotsquared/core/plot/util/EventDispatcherTest.java @@ -1,33 +1,33 @@ -package com.plotsquared.plot.util; +package com.plotsquared.core.plot.util; -import com.plotsquared.events.PlayerAutoPlotEvent; -import com.plotsquared.events.PlayerClaimPlotEvent; -import com.plotsquared.events.PlayerEnterPlotEvent; -import com.plotsquared.events.PlayerLeavePlotEvent; -import com.plotsquared.events.PlayerPlotDeniedEvent; -import com.plotsquared.events.PlayerPlotHelperEvent; -import com.plotsquared.events.PlayerPlotTrustedEvent; -import com.plotsquared.events.PlayerTeleportToPlotEvent; -import com.plotsquared.events.PlotAutoMergeEvent; -import com.plotsquared.events.PlotChangeOwnerEvent; -import com.plotsquared.events.PlotClearEvent; -import com.plotsquared.events.PlotComponentSetEvent; -import com.plotsquared.events.PlotDeleteEvent; -import com.plotsquared.events.PlotDoneEvent; -import com.plotsquared.events.PlotFlagAddEvent; -import com.plotsquared.events.PlotFlagRemoveEvent; -import com.plotsquared.events.PlotMergeEvent; -import com.plotsquared.events.PlotRateEvent; -import com.plotsquared.events.PlotUnlinkEvent; -import com.plotsquared.player.PlotPlayer; -import com.plotsquared.plot.flags.PlotFlag; -import com.plotsquared.location.Direction; -import com.plotsquared.location.Location; -import com.plotsquared.plot.Plot; -import com.plotsquared.plot.PlotArea; -import com.plotsquared.plot.PlotId; -import com.plotsquared.plot.Rating; -import com.plotsquared.util.EventDispatcher; +import com.plotsquared.core.events.PlayerAutoPlotEvent; +import com.plotsquared.core.events.PlayerClaimPlotEvent; +import com.plotsquared.core.events.PlayerEnterPlotEvent; +import com.plotsquared.core.events.PlayerLeavePlotEvent; +import com.plotsquared.core.events.PlayerPlotDeniedEvent; +import com.plotsquared.core.events.PlayerPlotHelperEvent; +import com.plotsquared.core.events.PlayerPlotTrustedEvent; +import com.plotsquared.core.events.PlayerTeleportToPlotEvent; +import com.plotsquared.core.events.PlotAutoMergeEvent; +import com.plotsquared.core.events.PlotChangeOwnerEvent; +import com.plotsquared.core.events.PlotClearEvent; +import com.plotsquared.core.events.PlotComponentSetEvent; +import com.plotsquared.core.events.PlotDeleteEvent; +import com.plotsquared.core.events.PlotDoneEvent; +import com.plotsquared.core.events.PlotFlagAddEvent; +import com.plotsquared.core.events.PlotFlagRemoveEvent; +import com.plotsquared.core.events.PlotMergeEvent; +import com.plotsquared.core.events.PlotRateEvent; +import com.plotsquared.core.events.PlotUnlinkEvent; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.location.Direction; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.plot.Rating; +import com.plotsquared.core.util.EventDispatcher; import com.sk89q.worldedit.function.pattern.Pattern; import java.util.List; diff --git a/Core/src/test/java/com/plotsquared/plot/util/UUIDHandlerImplementationTest.java b/Core/src/test/java/com/plotsquared/core/plot/util/UUIDHandlerImplementationTest.java similarity index 57% rename from Core/src/test/java/com/plotsquared/plot/util/UUIDHandlerImplementationTest.java rename to Core/src/test/java/com/plotsquared/core/plot/util/UUIDHandlerImplementationTest.java index 4b5f483bd..6b20b50e9 100644 --- a/Core/src/test/java/com/plotsquared/plot/util/UUIDHandlerImplementationTest.java +++ b/Core/src/test/java/com/plotsquared/core/plot/util/UUIDHandlerImplementationTest.java @@ -1,10 +1,10 @@ -package com.plotsquared.plot.util; +package com.plotsquared.core.plot.util; -import com.plotsquared.database.AbstractDBTest; -import com.plotsquared.database.DBFunc; -import com.plotsquared.util.uuid.UUIDHandlerImplementation; -import com.plotsquared.util.tasks.RunnableVal; -import com.plotsquared.util.uuid.UUIDWrapper; +import com.plotsquared.core.database.AbstractDBTest; +import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.util.uuid.UUIDHandlerImplementation; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.uuid.UUIDWrapper; import org.junit.Before; import java.util.UUID; diff --git a/buildSrc/build/libs/buildSrc.jar b/buildSrc/build/libs/buildSrc.jar index 4c03455d9..6065f10d3 100644 Binary files a/buildSrc/build/libs/buildSrc.jar and b/buildSrc/build/libs/buildSrc.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4b442974..be8d8bb16 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,3 +1,11 @@ +# +# PlotSquared, a plot management system for Minecraft +# Copyright (c) 2020 IntellectualSites +# This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. +# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# You should have received a copy of the GNU General Public License along with this program. If not, see . +# + distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip