EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-24 14:16:44 +01:00
Code Issues Projects Releases Wiki Activity

Addressed some comments

Browse Source
This commit is contained in:
MattBDev 2020-04-15 15:26:54 -04:00
parent 9c3c42c3e6
commit 780be3776a
411 changed files with 2683 additions and 2666 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Bukkit/src/main/java/com/plotsquared/bukkit/BukkitChunkManager.java
View File

@ -2,21 +2,21 @@ package com.plotsquared.bukkit;
import com.plotsquared.bukkit.entity.EntityWrapper; import com.plotsquared.bukkit.entity.EntityWrapper;
import com.plotsquared.bukkit.entity.ReplicatingEntityWrapper; import com.plotsquared.bukkit.entity.ReplicatingEntityWrapper;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.BukkitUtil;
import com.plotsquared.generator.AugmentedUtils; import com.plotsquared.core.generator.AugmentedUtils;
import com.plotsquared.listener.WEExtent; import com.plotsquared.core.listener.WEExtent;
import com.plotsquared.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.plot.PlotArea; import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.location.PlotLoc; import com.plotsquared.core.location.PlotLoc;
import com.plotsquared.util.tasks.RunnableVal; import com.plotsquared.core.util.task.RunnableVal;
import com.plotsquared.util.ChunkManager; import com.plotsquared.core.util.ChunkManager;
import com.plotsquared.util.tasks.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import com.plotsquared.queue.GlobalBlockQueue; import com.plotsquared.core.queue.GlobalBlockQueue;
import com.plotsquared.queue.LocalBlockQueue; import com.plotsquared.core.queue.LocalBlockQueue;
import com.plotsquared.queue.ScopedLocalBlockQueue; import com.plotsquared.core.queue.ScopedLocalBlockQueue;
import com.plotsquared.util.RegionUtil; import com.plotsquared.core.util.RegionUtil;
import com.sk89q.worldedit.bukkit.BukkitWorld; import com.sk89q.worldedit.bukkit.BukkitWorld;
import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector2;
import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.math.BlockVector3;

12
Bukkit/src/main/java/com/plotsquared/bukkit/BukkitCommand.java
View File

@ -1,10 +1,10 @@
package com.plotsquared.bukkit; 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.bukkit.util.BukkitUtil;
import com.plotsquared.commands.MainCommand; import com.plotsquared.core.command.MainCommand;
import com.plotsquared.player.ConsolePlayer; import com.plotsquared.core.player.ConsolePlayer;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@ -49,12 +49,12 @@ public class BukkitCommand implements CommandExecutor, TabCompleter {
if (args.length == 0) { if (args.length == 0) {
return Collections.singletonList("plots"); return Collections.singletonList("plots");
} }
Collection<com.plotsquared.commands.Command> objects = MainCommand.getInstance().tab(player, args, s.endsWith(" ")); Collection<com.plotsquared.core.command.Command> objects = MainCommand.getInstance().tab(player, args, s.endsWith(" "));
if (objects == null) { if (objects == null) {
return null; return null;
} }
List<String> result = new ArrayList<>(); List<String> result = new ArrayList<>();
for (com.plotsquared.commands.Command o : objects) { for (com.plotsquared.core.command.Command o : objects) {
result.add(o.toString()); result.add(o.toString());
} }
return result.isEmpty() ? null : result; return result.isEmpty() ? null : result;

104
Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
View File

@ -1,13 +1,13 @@
package com.plotsquared.bukkit; package com.plotsquared.bukkit;
import com.plotsquared.bukkit.generator.BukkitPlotGenerator; import com.plotsquared.bukkit.generator.BukkitPlotGenerator;
import com.plotsquared.bukkit.listeners.ChunkListener; import com.plotsquared.bukkit.listener.ChunkListener;
import com.plotsquared.bukkit.listeners.EntitySpawnListener; import com.plotsquared.bukkit.listener.EntitySpawnListener;
import com.plotsquared.bukkit.listeners.PlayerEvents; import com.plotsquared.bukkit.listener.PlayerEvents;
import com.plotsquared.bukkit.listeners.SingleWorldListener; import com.plotsquared.bukkit.listener.SingleWorldListener;
import com.plotsquared.bukkit.listeners.WorldEvents; import com.plotsquared.bukkit.listener.WorldEvents;
import com.plotsquared.bukkit.placeholders.PlaceholderFormatter; import com.plotsquared.bukkit.placeholder.PlaceholderFormatter;
import com.plotsquared.bukkit.placeholders.Placeholders; import com.plotsquared.bukkit.placeholder.Placeholders;
import com.plotsquared.bukkit.util.BukkitChatManager; import com.plotsquared.bukkit.util.BukkitChatManager;
import com.plotsquared.bukkit.util.BukkitEconHandler; import com.plotsquared.bukkit.util.BukkitEconHandler;
import com.plotsquared.bukkit.generator.BukkitHybridUtils; 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.Metrics;
import com.plotsquared.bukkit.util.SetGenCB; import com.plotsquared.bukkit.util.SetGenCB;
import com.plotsquared.bukkit.util.UpdateUtility; 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.DefaultUUIDWrapper;
import com.plotsquared.bukkit.util.uuid.FileUUIDHandler; import com.plotsquared.bukkit.util.uuid.FileUUIDHandler;
import com.plotsquared.bukkit.util.uuid.LowerOfflineUUIDWrapper; import com.plotsquared.bukkit.util.uuid.LowerOfflineUUIDWrapper;
import com.plotsquared.bukkit.util.uuid.OfflineUUIDWrapper; import com.plotsquared.bukkit.util.uuid.OfflineUUIDWrapper;
import com.plotsquared.bukkit.util.uuid.SQLUUIDHandler; import com.plotsquared.bukkit.util.uuid.SQLUUIDHandler;
import com.plotsquared.configuration.ConfigurationSection; import com.plotsquared.core.configuration.ConfigurationSection;
import com.plotsquared.IPlotMain; import com.plotsquared.core.IPlotMain;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.config.ChatFormatter; import com.plotsquared.core.config.ChatFormatter;
import com.plotsquared.config.ConfigurationNode; import com.plotsquared.core.config.ConfigurationNode;
import com.plotsquared.config.Settings; import com.plotsquared.core.config.Settings;
import com.plotsquared.generator.GeneratorWrapper; import com.plotsquared.core.generator.GeneratorWrapper;
import com.plotsquared.generator.HybridGen; import com.plotsquared.core.generator.HybridGen;
import com.plotsquared.generator.HybridUtils; import com.plotsquared.core.generator.HybridUtils;
import com.plotsquared.generator.IndependentPlotGenerator; import com.plotsquared.core.generator.IndependentPlotGenerator;
import com.plotsquared.listener.PlotListener; import com.plotsquared.core.listener.PlotListener;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.plot.PlotArea; import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.plot.PlotId; import com.plotsquared.core.plot.PlotId;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.plot.SetupObject; import com.plotsquared.core.plot.SetupObject;
import com.plotsquared.plot.message.PlainChatManager; import com.plotsquared.core.plot.message.PlainChatManager;
import com.plotsquared.plot.worlds.PlotAreaManager; import com.plotsquared.core.plot.world.PlotAreaManager;
import com.plotsquared.plot.worlds.SinglePlotArea; import com.plotsquared.core.plot.world.SinglePlotArea;
import com.plotsquared.plot.worlds.SinglePlotAreaManager; import com.plotsquared.core.plot.world.SinglePlotAreaManager;
import com.plotsquared.plot.worlds.SingleWorldGenerator; import com.plotsquared.core.generator.SingleWorldGenerator;
import com.plotsquared.util.ChatManager; import com.plotsquared.core.util.ChatManager;
import com.plotsquared.util.ChunkManager; import com.plotsquared.core.util.ChunkManager;
import com.plotsquared.util.ConsoleColors; import com.plotsquared.core.util.ConsoleColors;
import com.plotsquared.util.EconHandler; import com.plotsquared.core.util.EconHandler;
import com.plotsquared.util.InventoryUtil; import com.plotsquared.core.util.InventoryUtil;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.PremiumVerification; import com.plotsquared.core.util.PremiumVerification;
import com.plotsquared.util.ReflectionUtils; import com.plotsquared.core.util.ReflectionUtils;
import com.plotsquared.util.SchematicHandler; import com.plotsquared.core.util.SchematicHandler;
import com.plotsquared.util.SetupUtils; import com.plotsquared.core.util.SetupUtils;
import com.plotsquared.util.StringMan; import com.plotsquared.core.util.StringMan;
import com.plotsquared.util.tasks.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import com.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.plotsquared.util.uuid.UUIDHandlerImplementation; import com.plotsquared.core.util.uuid.UUIDHandlerImplementation;
import com.plotsquared.util.WorldUtil; import com.plotsquared.core.util.WorldUtil;
import com.plotsquared.queue.QueueProvider; import com.plotsquared.core.queue.QueueProvider;
import com.plotsquared.util.uuid.UUIDWrapper; import com.plotsquared.core.util.uuid.UUIDWrapper;
import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.bukkit.WorldEditPlugin; import com.sk89q.worldedit.bukkit.WorldEditPlugin;
import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.extension.platform.Actor;
@ -99,8 +99,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import static com.plotsquared.util.PremiumVerification.getUserID; import static com.plotsquared.core.util.PremiumVerification.getUserID;
import static com.plotsquared.util.ReflectionUtils.getRefClass; import static com.plotsquared.core.util.ReflectionUtils.getRefClass;
public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain { 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 MINECART_TNT:
case BOAT: case BOAT:
if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) { if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
com.plotsquared.location.Location com.plotsquared.core.location.Location
location = BukkitUtil.getLocation(entity.getLocation()); location = BukkitUtil.getLocation(entity.getLocation());
Plot plot = location.getPlot(); Plot plot = location.getPlot();
if (plot == null) { if (plot == null) {
@ -438,7 +438,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
PlotId originalPlotId = (PlotId) meta.get(0).value(); PlotId originalPlotId = (PlotId) meta.get(0).value();
if (originalPlotId != null) { if (originalPlotId != null) {
com.plotsquared.location.Location com.plotsquared.core.location.Location
pLoc = BukkitUtil.getLocation(entity.getLocation()); pLoc = BukkitUtil.getLocation(entity.getLocation());
PlotArea area = pLoc.getPlotArea(); PlotArea area = pLoc.getPlotArea();
if (area != null) { if (area != null) {
@ -457,7 +457,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
} }
} else { } else {
//This is to apply the metadata to already spawned shulkers (see EntitySpawnListener.java) //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()); pLoc = BukkitUtil.getLocation(entity.getLocation());
PlotArea area = pLoc.getPlotArea(); PlotArea area = pLoc.getPlotArea();
if (area != null) { if (area != null) {

38
Bukkit/src/main/java/com/plotsquared/bukkit/commands/DebugUUID.java → Bukkit/src/main/java/com/plotsquared/bukkit/command/DebugUUID.java
View File

@ -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.DatFileFilter;
import com.plotsquared.bukkit.util.uuid.DefaultUUIDWrapper; import com.plotsquared.bukkit.util.uuid.DefaultUUIDWrapper;
import com.plotsquared.bukkit.util.uuid.LowerOfflineUUIDWrapper; import com.plotsquared.bukkit.util.uuid.LowerOfflineUUIDWrapper;
import com.plotsquared.bukkit.util.uuid.OfflineUUIDWrapper; import com.plotsquared.bukkit.util.uuid.OfflineUUIDWrapper;
import com.plotsquared.commands.Argument; import com.plotsquared.core.command.Argument;
import com.plotsquared.commands.CommandDeclaration; import com.plotsquared.core.command.CommandDeclaration;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.commands.CommandCategory; import com.plotsquared.core.command.CommandCategory;
import com.plotsquared.commands.RequiredType; import com.plotsquared.core.command.RequiredType;
import com.plotsquared.commands.SubCommand; import com.plotsquared.core.command.SubCommand;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.database.DBFunc; import com.plotsquared.core.database.DBFunc;
import com.plotsquared.player.OfflinePlotPlayer; import com.plotsquared.core.player.OfflinePlotPlayer;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.StringWrapper; import com.plotsquared.core.util.StringWrapper;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.StringMan; import com.plotsquared.core.util.StringMan;
import com.plotsquared.util.tasks.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import com.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.plotsquared.util.WorldUtil; import com.plotsquared.core.util.WorldUtil;
import com.plotsquared.util.uuid.UUIDWrapper; import com.plotsquared.core.util.uuid.UUIDWrapper;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import java.io.File; import java.io.File;

2
Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java
View File

@ -1,6 +1,6 @@
package com.plotsquared.bukkit.entity; package com.plotsquared.bukkit.entity;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import org.bukkit.Art; import org.bukkit.Art;
import org.bukkit.DyeColor; import org.bukkit.DyeColor;
import org.bukkit.Location; import org.bukkit.Location;

14
Bukkit/src/main/java/com/plotsquared/bukkit/generator/PlotBlockPopulator.java → Bukkit/src/main/java/com/plotsquared/bukkit/generator/BlockStatePopulator.java
View File

@ -1,12 +1,12 @@
package com.plotsquared.bukkit.generator; package com.plotsquared.bukkit.generator;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.generator.IndependentPlotGenerator; import com.plotsquared.core.generator.IndependentPlotGenerator;
import com.plotsquared.location.ChunkWrapper; import com.plotsquared.core.location.ChunkWrapper;
import com.plotsquared.plot.PlotArea; import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.queue.GlobalBlockQueue; import com.plotsquared.core.queue.GlobalBlockQueue;
import com.plotsquared.queue.LocalBlockQueue; import com.plotsquared.core.queue.LocalBlockQueue;
import com.plotsquared.queue.ScopedLocalBlockQueue; import com.plotsquared.core.queue.ScopedLocalBlockQueue;
import java.util.Random; import java.util.Random;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.World; import org.bukkit.World;

2
Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java
View File

@ -1,6 +1,6 @@
package com.plotsquared.bukkit.generator; package com.plotsquared.bukkit.generator;
import com.plotsquared.generator.AugmentedUtils; import com.plotsquared.core.generator.AugmentedUtils;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.generator.BlockPopulator; import org.bukkit.generator.BlockPopulator;

2
Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitHybridUtils.java
View File

@ -1,6 +1,6 @@
package com.plotsquared.bukkit.generator; package com.plotsquared.bukkit.generator;
import com.plotsquared.generator.HybridUtils; import com.plotsquared.core.generator.HybridUtils;
public class BukkitHybridUtils extends HybridUtils { public class BukkitHybridUtils extends HybridUtils {

20
Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java
View File

@ -1,16 +1,16 @@
package com.plotsquared.bukkit.generator; package com.plotsquared.bukkit.generator;
import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.BukkitUtil;
import com.plotsquared.bukkit.util.block.GenChunk; import com.plotsquared.bukkit.queue.GenChunk;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.generator.GeneratorWrapper; import com.plotsquared.core.generator.GeneratorWrapper;
import com.plotsquared.generator.IndependentPlotGenerator; import com.plotsquared.core.generator.IndependentPlotGenerator;
import com.plotsquared.location.ChunkWrapper; import com.plotsquared.core.location.ChunkWrapper;
import com.plotsquared.plot.PlotArea; import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.plot.worlds.SingleWorldGenerator; import com.plotsquared.core.generator.SingleWorldGenerator;
import com.plotsquared.util.ChunkManager; import com.plotsquared.core.util.ChunkManager;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.queue.ScopedLocalBlockQueue; import com.plotsquared.core.queue.ScopedLocalBlockQueue;
import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector2;
import lombok.Getter; import lombok.Getter;
import org.bukkit.World; import org.bukkit.World;

14
Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java
View File

@ -1,13 +1,13 @@
package com.plotsquared.bukkit.generator; package com.plotsquared.bukkit.generator;
import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.BukkitUtil;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.generator.IndependentPlotGenerator; import com.plotsquared.core.generator.IndependentPlotGenerator;
import com.plotsquared.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.plot.PlotArea; import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.plot.PlotId; import com.plotsquared.core.plot.PlotId;
import com.plotsquared.util.MathMan; import com.plotsquared.core.util.MathMan;
import com.plotsquared.queue.ScopedLocalBlockQueue; import com.plotsquared.core.queue.ScopedLocalBlockQueue;
import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitAdapter;
import java.util.Random; import java.util.Random;
import org.bukkit.World; import org.bukkit.World;

20
Bukkit/src/main/java/com/plotsquared/bukkit/listeners/ChunkListener.java → Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java
View File

@ -1,13 +1,13 @@
package com.plotsquared.bukkit.listeners; package com.plotsquared.bukkit.listener;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Settings; import com.plotsquared.core.config.Settings;
import com.plotsquared.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.util.ReflectionUtils.RefClass; import com.plotsquared.core.util.ReflectionUtils.RefClass;
import com.plotsquared.util.ReflectionUtils.RefField; import com.plotsquared.core.util.ReflectionUtils.RefField;
import com.plotsquared.util.ReflectionUtils.RefMethod; import com.plotsquared.core.util.ReflectionUtils.RefMethod;
import com.plotsquared.util.tasks.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import io.papermc.lib.PaperLib; import io.papermc.lib.PaperLib;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Chunk; import org.bukkit.Chunk;
@ -30,7 +30,7 @@ import org.bukkit.event.world.ChunkUnloadEvent;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.HashSet; 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 { @SuppressWarnings("unused") public class ChunkListener implements Listener {

14
Bukkit/src/main/java/com/plotsquared/bukkit/listeners/EntitySpawnListener.java → Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java
View File

@ -1,12 +1,12 @@
package com.plotsquared.bukkit.listeners; package com.plotsquared.bukkit.listener;
import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.BukkitUtil;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Settings; import com.plotsquared.core.config.Settings;
import com.plotsquared.plot.flags.implementations.DoneFlag; import com.plotsquared.core.plot.flag.implementations.DoneFlag;
import com.plotsquared.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.plot.PlotArea; import com.plotsquared.core.plot.PlotArea;
import io.papermc.lib.PaperLib; import io.papermc.lib.PaperLib;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.World; import org.bukkit.World;

14
Bukkit/src/main/java/com/plotsquared/bukkit/listeners/ForceFieldListener.java → Bukkit/src/main/java/com/plotsquared/bukkit/listener/ForceFieldListener.java
View File

@ -1,13 +1,13 @@
package com.plotsquared.bukkit.listeners; package com.plotsquared.bukkit.listener;
import com.plotsquared.bukkit.player.BukkitPlayer; import com.plotsquared.bukkit.player.BukkitPlayer;
import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.BukkitUtil;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.plot.flags.implementations.ForcefieldFlag; import com.plotsquared.core.plot.flag.implementations.ForcefieldFlag;
import com.plotsquared.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.Permissions; import com.plotsquared.core.util.Permissions;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;

148
Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java → Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
View File

@ -1,82 +1,82 @@
package com.plotsquared.bukkit.listeners; package com.plotsquared.bukkit.listener;
import com.destroystokyo.paper.MaterialTags; import com.destroystokyo.paper.MaterialTags;
import com.plotsquared.bukkit.player.BukkitPlayer; import com.plotsquared.bukkit.player.BukkitPlayer;
import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.BukkitUtil;
import com.plotsquared.bukkit.util.UpdateUtility; import com.plotsquared.bukkit.util.UpdateUtility;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.config.Settings; import com.plotsquared.core.config.Settings;
import com.plotsquared.database.DBFunc; import com.plotsquared.core.database.DBFunc;
import com.plotsquared.plot.flags.implementations.AnimalAttackFlag; import com.plotsquared.core.plot.flag.implementations.AnimalAttackFlag;
import com.plotsquared.plot.flags.implementations.AnimalCapFlag; import com.plotsquared.core.plot.flag.implementations.AnimalCapFlag;
import com.plotsquared.plot.flags.implementations.AnimalInteractFlag; import com.plotsquared.core.plot.flag.implementations.AnimalInteractFlag;
import com.plotsquared.plot.flags.implementations.BlockBurnFlag; import com.plotsquared.core.plot.flag.implementations.BlockBurnFlag;
import com.plotsquared.plot.flags.implementations.BlockIgnitionFlag; import com.plotsquared.core.plot.flag.implementations.BlockIgnitionFlag;
import com.plotsquared.plot.flags.implementations.BlockedCmdsFlag; import com.plotsquared.core.plot.flag.implementations.BlockedCmdsFlag;
import com.plotsquared.plot.flags.implementations.BreakFlag; import com.plotsquared.core.plot.flag.implementations.BreakFlag;
import com.plotsquared.plot.flags.implementations.CoralDryFlag; import com.plotsquared.core.plot.flag.implementations.CoralDryFlag;
import com.plotsquared.plot.flags.implementations.DenyTeleportFlag; import com.plotsquared.core.plot.flag.implementations.DenyTeleportFlag;
import com.plotsquared.plot.flags.implementations.DisablePhysicsFlag; import com.plotsquared.core.plot.flag.implementations.DisablePhysicsFlag;
import com.plotsquared.plot.flags.implementations.DoneFlag; import com.plotsquared.core.plot.flag.implementations.DoneFlag;
import com.plotsquared.plot.flags.implementations.DropProtectionFlag; import com.plotsquared.core.plot.flag.implementations.DropProtectionFlag;
import com.plotsquared.plot.flags.implementations.EntityCapFlag; import com.plotsquared.core.plot.flag.implementations.EntityCapFlag;
import com.plotsquared.plot.flags.implementations.ExplosionFlag; import com.plotsquared.core.plot.flag.implementations.ExplosionFlag;
import com.plotsquared.plot.flags.implementations.GrassGrowFlag; import com.plotsquared.core.plot.flag.implementations.GrassGrowFlag;
import com.plotsquared.plot.flags.implementations.HangingBreakFlag; import com.plotsquared.core.plot.flag.implementations.HangingBreakFlag;
import com.plotsquared.plot.flags.implementations.HangingPlaceFlag; import com.plotsquared.core.plot.flag.implementations.HangingPlaceFlag;
import com.plotsquared.plot.flags.implementations.HostileAttackFlag; import com.plotsquared.core.plot.flag.implementations.HostileAttackFlag;
import com.plotsquared.plot.flags.implementations.HostileCapFlag; import com.plotsquared.core.plot.flag.implementations.HostileCapFlag;
import com.plotsquared.plot.flags.implementations.HostileInteractFlag; import com.plotsquared.core.plot.flag.implementations.HostileInteractFlag;
import com.plotsquared.plot.flags.implementations.IceFormFlag; import com.plotsquared.core.plot.flag.implementations.IceFormFlag;
import com.plotsquared.plot.flags.implementations.IceMeltFlag; import com.plotsquared.core.plot.flag.implementations.IceMeltFlag;
import com.plotsquared.plot.flags.implementations.InstabreakFlag; import com.plotsquared.core.plot.flag.implementations.InstabreakFlag;
import com.plotsquared.plot.flags.implementations.InvincibleFlag; import com.plotsquared.core.plot.flag.implementations.InvincibleFlag;
import com.plotsquared.plot.flags.implementations.ItemDropFlag; import com.plotsquared.core.plot.flag.implementations.ItemDropFlag;
import com.plotsquared.plot.flags.implementations.KelpGrowFlag; import com.plotsquared.core.plot.flag.implementations.KelpGrowFlag;
import com.plotsquared.plot.flags.implementations.LiquidFlowFlag; import com.plotsquared.core.plot.flag.implementations.LiquidFlowFlag;
import com.plotsquared.plot.flags.implementations.MiscBreakFlag; import com.plotsquared.core.plot.flag.implementations.MiscBreakFlag;
import com.plotsquared.plot.flags.implementations.MiscCapFlag; import com.plotsquared.core.plot.flag.implementations.MiscCapFlag;
import com.plotsquared.plot.flags.implementations.MiscInteractFlag; import com.plotsquared.core.plot.flag.implementations.MiscInteractFlag;
import com.plotsquared.plot.flags.implementations.MobCapFlag; import com.plotsquared.core.plot.flag.implementations.MobCapFlag;
import com.plotsquared.plot.flags.implementations.MobPlaceFlag; import com.plotsquared.core.plot.flag.implementations.MobPlaceFlag;
import com.plotsquared.plot.flags.implementations.MycelGrowFlag; import com.plotsquared.core.plot.flag.implementations.MycelGrowFlag;
import com.plotsquared.plot.flags.implementations.PlaceFlag; import com.plotsquared.core.plot.flag.implementations.PlaceFlag;
import com.plotsquared.plot.flags.implementations.PlayerInteractFlag; import com.plotsquared.core.plot.flag.implementations.PlayerInteractFlag;
import com.plotsquared.plot.flags.implementations.PveFlag; import com.plotsquared.core.plot.flag.implementations.PveFlag;
import com.plotsquared.plot.flags.implementations.PvpFlag; import com.plotsquared.core.plot.flag.implementations.PvpFlag;
import com.plotsquared.plot.flags.implementations.RedstoneFlag; import com.plotsquared.core.plot.flag.implementations.RedstoneFlag;
import com.plotsquared.plot.flags.implementations.SnowFormFlag; import com.plotsquared.core.plot.flag.implementations.SnowFormFlag;
import com.plotsquared.plot.flags.implementations.SnowMeltFlag; import com.plotsquared.core.plot.flag.implementations.SnowMeltFlag;
import com.plotsquared.plot.flags.implementations.SoilDryFlag; import com.plotsquared.core.plot.flag.implementations.SoilDryFlag;
import com.plotsquared.plot.flags.implementations.TamedAttackFlag; import com.plotsquared.core.plot.flag.implementations.TamedAttackFlag;
import com.plotsquared.plot.flags.implementations.TamedInteractFlag; import com.plotsquared.core.plot.flag.implementations.TamedInteractFlag;
import com.plotsquared.plot.flags.implementations.UntrustedVisitFlag; import com.plotsquared.core.plot.flag.implementations.UntrustedVisitFlag;
import com.plotsquared.plot.flags.implementations.UseFlag; import com.plotsquared.core.plot.flag.implementations.UseFlag;
import com.plotsquared.plot.flags.implementations.VehicleBreakFlag; import com.plotsquared.core.plot.flag.implementations.VehicleBreakFlag;
import com.plotsquared.plot.flags.implementations.VehicleCapFlag; import com.plotsquared.core.plot.flag.implementations.VehicleCapFlag;
import com.plotsquared.plot.flags.implementations.VehicleUseFlag; import com.plotsquared.core.plot.flag.implementations.VehicleUseFlag;
import com.plotsquared.plot.flags.implementations.VillagerInteractFlag; import com.plotsquared.core.plot.flag.implementations.VillagerInteractFlag;
import com.plotsquared.plot.flags.implementations.VineGrowFlag; import com.plotsquared.core.plot.flag.implementations.VineGrowFlag;
import com.plotsquared.plot.flags.types.BlockTypeWrapper; import com.plotsquared.core.plot.flag.types.BlockTypeWrapper;
import com.plotsquared.listener.PlayerBlockEventType; import com.plotsquared.core.listener.PlayerBlockEventType;
import com.plotsquared.listener.PlotListener; import com.plotsquared.core.listener.PlotListener;
import com.plotsquared.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.plot.PlotArea; import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.plot.PlotHandler; import com.plotsquared.core.plot.PlotHandler;
import com.plotsquared.plot.PlotId; import com.plotsquared.core.plot.PlotId;
import com.plotsquared.plot.PlotInventory; import com.plotsquared.core.plot.PlotInventory;
import com.plotsquared.plot.message.PlotMessage; import com.plotsquared.core.plot.message.PlotMessage;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.StringWrapper; import com.plotsquared.core.util.StringWrapper;
import com.plotsquared.util.EntityUtil; import com.plotsquared.core.util.EntityUtil;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.MathMan; import com.plotsquared.core.util.MathMan;
import com.plotsquared.util.Permissions; import com.plotsquared.core.util.Permissions;
import com.plotsquared.util.RegExUtil; import com.plotsquared.core.util.RegExUtil;
import com.plotsquared.util.tasks.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import com.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.world.block.BlockType; import com.sk89q.worldedit.world.block.BlockType;
import io.papermc.lib.PaperLib; import io.papermc.lib.PaperLib;

12
Bukkit/src/main/java/com/plotsquared/bukkit/listeners/SingleWorldListener.java → Bukkit/src/main/java/com/plotsquared/bukkit/listener/SingleWorldListener.java
View File

@ -1,9 +1,9 @@
package com.plotsquared.bukkit.listeners; package com.plotsquared.bukkit.listener;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.plot.worlds.PlotAreaManager; import com.plotsquared.core.plot.world.PlotAreaManager;
import com.plotsquared.plot.worlds.SinglePlotAreaManager; import com.plotsquared.core.plot.world.SinglePlotAreaManager;
import com.plotsquared.util.ReflectionUtils; import com.plotsquared.core.util.ReflectionUtils;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.World; import org.bukkit.World;
@ -17,7 +17,7 @@ import org.bukkit.plugin.Plugin;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method; 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 { @SuppressWarnings("unused") public class SingleWorldListener implements Listener {

10
Bukkit/src/main/java/com/plotsquared/bukkit/listeners/WorldEvents.java → Bukkit/src/main/java/com/plotsquared/bukkit/listener/WorldEvents.java
View File

@ -1,10 +1,10 @@
package com.plotsquared.bukkit.listeners; package com.plotsquared.bukkit.listener;
import com.plotsquared.bukkit.generator.BukkitPlotGenerator; import com.plotsquared.bukkit.generator.BukkitPlotGenerator;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.generator.GeneratorWrapper; import com.plotsquared.core.generator.GeneratorWrapper;
import com.plotsquared.plot.worlds.PlotAreaManager; import com.plotsquared.core.plot.world.PlotAreaManager;
import com.plotsquared.plot.worlds.SinglePlotAreaManager; import com.plotsquared.core.plot.world.SinglePlotAreaManager;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;

6
Bukkit/src/main/java/com/plotsquared/bukkit/placeholders/PlaceholderFormatter.java → Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/PlaceholderFormatter.java
View File

@ -1,8 +1,8 @@
package com.plotsquared.bukkit.placeholders; package com.plotsquared.bukkit.placeholder;
import com.plotsquared.bukkit.player.BukkitPlayer; import com.plotsquared.bukkit.player.BukkitPlayer;
import com.plotsquared.config.ChatFormatter; import com.plotsquared.core.config.ChatFormatter;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import me.clip.placeholderapi.PlaceholderAPI; import me.clip.placeholderapi.PlaceholderAPI;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

8
Bukkit/src/main/java/com/plotsquared/bukkit/placeholders/Placeholders.java → Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/Placeholders.java
View File

@ -1,9 +1,9 @@
package com.plotsquared.bukkit.placeholders; package com.plotsquared.bukkit.placeholder;
import com.plotsquared.bukkit.BukkitMain; import com.plotsquared.bukkit.BukkitMain;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import me.clip.placeholderapi.PlaceholderAPIPlugin; import me.clip.placeholderapi.PlaceholderAPIPlugin;
import me.clip.placeholderapi.expansion.PlaceholderExpansion; import me.clip.placeholderapi.expansion.PlaceholderExpansion;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;

2
Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java
View File

@ -1,6 +1,6 @@
package com.plotsquared.bukkit.player; package com.plotsquared.bukkit.player;
import com.plotsquared.player.OfflinePlotPlayer; import com.plotsquared.core.player.OfflinePlotPlayer;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

20
Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
View File

@ -1,16 +1,16 @@
package com.plotsquared.bukkit.player; package com.plotsquared.bukkit.player;
import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.BukkitUtil;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.events.TeleportCause; import com.plotsquared.core.events.TeleportCause;
import com.plotsquared.util.EconHandler; import com.plotsquared.core.util.EconHandler;
import com.plotsquared.util.MathMan; import com.plotsquared.core.util.MathMan;
import com.plotsquared.plot.PlotWeather; import com.plotsquared.core.plot.PlotWeather;
import com.plotsquared.util.StringMan; import com.plotsquared.core.util.StringMan;
import com.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.world.item.ItemType; import com.sk89q.worldedit.world.item.ItemType;

12
Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue.java → Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitLocalQueue.java
View File

@ -1,9 +1,11 @@
package com.plotsquared.bukkit.util.block; package com.plotsquared.bukkit.queue;
import com.plotsquared.PlotSquared; import com.plotsquared.bukkit.schematic.StateWrapper;
import com.plotsquared.util.MainUtil; import com.plotsquared.bukkit.util.BukkitBlockUtil;
import com.plotsquared.queue.BasicLocalBlockQueue; import com.plotsquared.core.PlotSquared;
import com.plotsquared.util.BlockUtil; 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.jnbt.CompoundTag;
import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEdit;

13
Bukkit/src/main/java/com/plotsquared/bukkit/util/block/GenChunk.java → Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java
View File

@ -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.bukkit.util.BukkitUtil;
import com.plotsquared.location.ChunkWrapper; import com.plotsquared.core.location.ChunkWrapper;
import com.plotsquared.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.queue.ScopedLocalBlockQueue; import com.plotsquared.core.queue.ScopedLocalBlockQueue;
import com.plotsquared.util.PatternUtil; import com.plotsquared.core.util.PatternUtil;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.function.pattern.Pattern;

13
Bukkit/src/main/java/com/plotsquared/bukkit/schematic/BukkitSchematicHandler.java
View File

@ -1,13 +1,12 @@
package com.plotsquared.bukkit.schematic; package com.plotsquared.bukkit.schematic;
import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.BukkitUtil;
import com.plotsquared.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.bukkit.util.block.StateWrapper; import com.plotsquared.core.util.task.RunnableVal;
import com.plotsquared.util.tasks.RunnableVal; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.SchematicHandler;
import com.plotsquared.util.SchematicHandler; import com.plotsquared.core.util.task.TaskManager;
import com.plotsquared.util.tasks.TaskManager; import com.plotsquared.core.queue.LocalBlockQueue;
import com.plotsquared.queue.LocalBlockQueue;
import com.sk89q.jnbt.*; import com.sk89q.jnbt.*;
import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.extension.platform.Capability; import com.sk89q.worldedit.extension.platform.Capability;

6
Bukkit/src/main/java/com/plotsquared/bukkit/util/block/StateWrapper.java → Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java
View File

@ -1,8 +1,8 @@
package com.plotsquared.bukkit.util.block; package com.plotsquared.bukkit.schematic;
import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.BukkitUtil;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.sk89q.jnbt.ByteTag; import com.sk89q.jnbt.ByteTag;
import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.CompoundTag;
import com.sk89q.jnbt.ListTag; import com.sk89q.jnbt.ListTag;

2
Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitBlockUtil.java → Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitBlockUtil.java
View File

@ -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.bukkit.BukkitAdapter;
import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.block.BlockState;

12
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChatManager.java
View File

@ -2,12 +2,12 @@ package com.plotsquared.bukkit.util;
import com.plotsquared.bukkit.chat.FancyMessage; import com.plotsquared.bukkit.chat.FancyMessage;
import com.plotsquared.bukkit.player.BukkitPlayer; import com.plotsquared.bukkit.player.BukkitPlayer;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.config.Settings; import com.plotsquared.core.config.Settings;
import com.plotsquared.player.ConsolePlayer; import com.plotsquared.core.player.ConsolePlayer;
import com.plotsquared.plot.message.PlotMessage; import com.plotsquared.core.plot.message.PlotMessage;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.ChatManager; import com.plotsquared.core.util.ChatManager;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import java.util.Arrays; import java.util.Arrays;

6
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEconHandler.java
View File

@ -2,9 +2,9 @@ package com.plotsquared.bukkit.util;
import com.plotsquared.bukkit.player.BukkitOfflinePlayer; import com.plotsquared.bukkit.player.BukkitOfflinePlayer;
import com.plotsquared.bukkit.player.BukkitPlayer; import com.plotsquared.bukkit.player.BukkitPlayer;
import com.plotsquared.player.OfflinePlotPlayer; import com.plotsquared.core.player.OfflinePlotPlayer;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.EconHandler; import com.plotsquared.core.util.EconHandler;
import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.economy.Economy;
import net.milkbowl.vault.permission.Permission; import net.milkbowl.vault.permission.Permission;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;

8
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitInventoryUtil.java
View File

@ -1,10 +1,10 @@
package com.plotsquared.bukkit.util; package com.plotsquared.bukkit.util;
import com.plotsquared.bukkit.player.BukkitPlayer; import com.plotsquared.bukkit.player.BukkitPlayer;
import com.plotsquared.plot.PlotInventory; import com.plotsquared.core.plot.PlotInventory;
import com.plotsquared.plot.PlotItemStack; import com.plotsquared.core.plot.PlotItemStack;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.InventoryUtil; import com.plotsquared.core.util.InventoryUtil;
import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitAdapter;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;

18
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java
View File

@ -1,15 +1,15 @@
package com.plotsquared.bukkit.util; package com.plotsquared.bukkit.util;
import com.plotsquared.bukkit.generator.BukkitPlotGenerator; import com.plotsquared.bukkit.generator.BukkitPlotGenerator;
import com.plotsquared.configuration.ConfigurationSection; import com.plotsquared.core.configuration.ConfigurationSection;
import com.plotsquared.configuration.file.YamlConfiguration; import com.plotsquared.core.configuration.file.YamlConfiguration;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.ConfigurationNode; import com.plotsquared.core.config.ConfigurationNode;
import com.plotsquared.generator.GeneratorWrapper; import com.plotsquared.core.generator.GeneratorWrapper;
import com.plotsquared.plot.PlotArea; import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.plot.PlotAreaType; import com.plotsquared.core.plot.PlotAreaType;
import com.plotsquared.plot.SetupObject; import com.plotsquared.core.plot.SetupObject;
import com.plotsquared.util.SetupUtils; import com.plotsquared.core.util.SetupUtils;
import io.papermc.lib.PaperLib; import io.papermc.lib.PaperLib;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Chunk; import org.bukkit.Chunk;

2
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitTaskManager.java
View File

@ -1,7 +1,7 @@
package com.plotsquared.bukkit.util; package com.plotsquared.bukkit.util;
import com.plotsquared.bukkit.BukkitMain; import com.plotsquared.bukkit.BukkitMain;
import com.plotsquared.util.tasks.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
public class BukkitTaskManager extends TaskManager { public class BukkitTaskManager extends TaskManager {

26
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
View File

@ -2,19 +2,19 @@ package com.plotsquared.bukkit.util;
import com.plotsquared.bukkit.BukkitMain; import com.plotsquared.bukkit.BukkitMain;
import com.plotsquared.bukkit.player.BukkitPlayer; import com.plotsquared.bukkit.player.BukkitPlayer;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.tasks.RunnableVal; import com.plotsquared.core.util.task.RunnableVal;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.MathMan; import com.plotsquared.core.util.MathMan;
import com.plotsquared.util.StringComparison; import com.plotsquared.core.util.StringComparison;
import com.plotsquared.util.tasks.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import com.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.plotsquared.util.WorldUtil; import com.plotsquared.core.util.WorldUtil;
import com.plotsquared.util.BlockUtil; import com.plotsquared.core.util.BlockUtil;
import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.bukkit.BukkitWorld; import com.sk89q.worldedit.bukkit.BukkitWorld;
import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.regions.CuboidRegion;

18
Bukkit/src/main/java/com/plotsquared/bukkit/util/OfflinePlayerUtil.java
View File

@ -9,15 +9,15 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.UUID; import java.util.UUID;
import static com.plotsquared.util.ReflectionUtils.callConstructor; import static com.plotsquared.core.util.ReflectionUtils.callConstructor;
import static com.plotsquared.util.ReflectionUtils.callMethod; import static com.plotsquared.core.util.ReflectionUtils.callMethod;
import static com.plotsquared.util.ReflectionUtils.getCbClass; import static com.plotsquared.core.util.ReflectionUtils.getCbClass;
import static com.plotsquared.util.ReflectionUtils.getField; import static com.plotsquared.core.util.ReflectionUtils.getField;
import static com.plotsquared.util.ReflectionUtils.getNmsClass; import static com.plotsquared.core.util.ReflectionUtils.getNmsClass;
import static com.plotsquared.util.ReflectionUtils.getUtilClass; import static com.plotsquared.core.util.ReflectionUtils.getUtilClass;
import static com.plotsquared.util.ReflectionUtils.makeConstructor; import static com.plotsquared.core.util.ReflectionUtils.makeConstructor;
import static com.plotsquared.util.ReflectionUtils.makeField; import static com.plotsquared.core.util.ReflectionUtils.makeField;
import static com.plotsquared.util.ReflectionUtils.makeMethod; import static com.plotsquared.core.util.ReflectionUtils.makeMethod;
public class OfflinePlayerUtil { public class OfflinePlayerUtil {

22
Bukkit/src/main/java/com/plotsquared/bukkit/util/SendChunk.java
View File

@ -1,16 +1,16 @@
package com.plotsquared.bukkit.util; package com.plotsquared.bukkit.util;
import com.plotsquared.bukkit.player.BukkitPlayer; import com.plotsquared.bukkit.player.BukkitPlayer;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.ReflectionUtils.RefClass; import com.plotsquared.core.util.ReflectionUtils.RefClass;
import com.plotsquared.util.ReflectionUtils.RefConstructor; import com.plotsquared.core.util.ReflectionUtils.RefConstructor;
import com.plotsquared.util.ReflectionUtils.RefField; import com.plotsquared.core.util.ReflectionUtils.RefField;
import com.plotsquared.util.ReflectionUtils.RefMethod; import com.plotsquared.core.util.ReflectionUtils.RefMethod;
import com.plotsquared.util.tasks.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import com.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector2;
import io.papermc.lib.PaperLib; import io.papermc.lib.PaperLib;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -24,7 +24,7 @@ import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map.Entry; 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 * An utility that can be used to send chunks, rather than using bukkit code

6
Bukkit/src/main/java/com/plotsquared/bukkit/util/SetGenCB.java
View File

@ -1,9 +1,9 @@
package com.plotsquared.bukkit.util; package com.plotsquared.bukkit.util;
import com.plotsquared.bukkit.generator.BukkitAugmentedGenerator; import com.plotsquared.bukkit.generator.BukkitAugmentedGenerator;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.generator.GeneratorWrapper; import com.plotsquared.core.generator.GeneratorWrapper;
import com.plotsquared.util.SetupUtils; import com.plotsquared.core.util.SetupUtils;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.generator.ChunkGenerator; import org.bukkit.generator.ChunkGenerator;

6
Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java
View File

@ -1,8 +1,8 @@
package com.plotsquared.bukkit.util; package com.plotsquared.bukkit.util;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.config.Settings; import com.plotsquared.core.config.Settings;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;

6
Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/DefaultUUIDWrapper.java
View File

@ -2,9 +2,9 @@ package com.plotsquared.bukkit.util.uuid;
import com.plotsquared.bukkit.player.BukkitOfflinePlayer; import com.plotsquared.bukkit.player.BukkitOfflinePlayer;
import com.plotsquared.bukkit.player.BukkitPlayer; import com.plotsquared.bukkit.player.BukkitPlayer;
import com.plotsquared.player.OfflinePlotPlayer; import com.plotsquared.core.player.OfflinePlotPlayer;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.uuid.UUIDWrapper; import com.plotsquared.core.util.uuid.UUIDWrapper;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

24
Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/FileUUIDHandler.java
View File

@ -1,17 +1,17 @@
package com.plotsquared.bukkit.util.uuid; package com.plotsquared.bukkit.util.uuid;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.config.Settings; import com.plotsquared.core.config.Settings;
import com.plotsquared.player.OfflinePlotPlayer; import com.plotsquared.core.player.OfflinePlotPlayer;
import com.plotsquared.util.tasks.RunnableVal; import com.plotsquared.core.util.task.RunnableVal;
import com.plotsquared.util.StringWrapper; import com.plotsquared.core.util.StringWrapper;
import com.plotsquared.util.StringMan; import com.plotsquared.core.util.StringMan;
import com.plotsquared.util.tasks.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import com.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.plotsquared.util.uuid.UUIDHandlerImplementation; import com.plotsquared.core.util.uuid.UUIDHandlerImplementation;
import com.plotsquared.plot.expiration.ExpireManager; import com.plotsquared.core.plot.expiration.ExpireManager;
import com.plotsquared.util.uuid.UUIDWrapper; import com.plotsquared.core.util.uuid.UUIDWrapper;
import com.google.common.collect.HashBiMap; import com.google.common.collect.HashBiMap;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.CompoundTag;

4
Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/LowerOfflineUUIDWrapper.java
View File

@ -1,7 +1,7 @@
package com.plotsquared.bukkit.util.uuid; package com.plotsquared.bukkit.util.uuid;
import com.plotsquared.player.OfflinePlotPlayer; import com.plotsquared.core.player.OfflinePlotPlayer;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.google.common.base.Charsets; import com.google.common.base.Charsets;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

12
Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/OfflineUUIDWrapper.java
View File

@ -1,12 +1,12 @@
package com.plotsquared.bukkit.util.uuid; package com.plotsquared.bukkit.util.uuid;
import com.plotsquared.bukkit.player.BukkitOfflinePlayer; import com.plotsquared.bukkit.player.BukkitOfflinePlayer;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.player.OfflinePlotPlayer; import com.plotsquared.core.player.OfflinePlotPlayer;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.StringWrapper; import com.plotsquared.core.util.StringWrapper;
import com.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.plotsquared.util.uuid.UUIDWrapper; import com.plotsquared.core.util.uuid.UUIDWrapper;
import com.google.common.base.Charsets; import com.google.common.base.Charsets;
import com.google.common.collect.BiMap; import com.google.common.collect.BiMap;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;

22
Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/SQLUUIDHandler.java
View File

@ -1,16 +1,16 @@
package com.plotsquared.bukkit.util.uuid; package com.plotsquared.bukkit.util.uuid;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.config.Settings; import com.plotsquared.core.config.Settings;
import com.plotsquared.database.SQLite; import com.plotsquared.core.database.SQLite;
import com.plotsquared.util.tasks.RunnableVal; import com.plotsquared.core.util.task.RunnableVal;
import com.plotsquared.util.StringWrapper; import com.plotsquared.core.util.StringWrapper;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.tasks.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import com.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.plotsquared.util.uuid.UUIDHandlerImplementation; import com.plotsquared.core.util.uuid.UUIDHandlerImplementation;
import com.plotsquared.util.uuid.UUIDWrapper; import com.plotsquared.core.util.uuid.UUIDWrapper;
import com.google.common.collect.HashBiMap; import com.google.common.collect.HashBiMap;
import org.json.simple.JSONArray; import org.json.simple.JSONArray;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;

32
Core/src/main/java/com/plotsquared/IPlotMain.java → Core/src/main/java/com/plotsquared/core/IPlotMain.java
View File

@ -1,20 +1,20 @@
package com.plotsquared; package com.plotsquared.core;
import com.plotsquared.generator.GeneratorWrapper; import com.plotsquared.core.generator.GeneratorWrapper;
import com.plotsquared.generator.HybridUtils; import com.plotsquared.core.generator.HybridUtils;
import com.plotsquared.generator.IndependentPlotGenerator; import com.plotsquared.core.generator.IndependentPlotGenerator;
import com.plotsquared.util.logger.ILogger; import com.plotsquared.core.util.logger.ILogger;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.ChatManager; import com.plotsquared.core.util.ChatManager;
import com.plotsquared.util.ChunkManager; import com.plotsquared.core.util.ChunkManager;
import com.plotsquared.util.EconHandler; import com.plotsquared.core.util.EconHandler;
import com.plotsquared.util.InventoryUtil; import com.plotsquared.core.util.InventoryUtil;
import com.plotsquared.util.SchematicHandler; import com.plotsquared.core.util.SchematicHandler;
import com.plotsquared.util.SetupUtils; import com.plotsquared.core.util.SetupUtils;
import com.plotsquared.util.tasks.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import com.plotsquared.util.uuid.UUIDHandlerImplementation; import com.plotsquared.core.util.uuid.UUIDHandlerImplementation;
import com.plotsquared.util.WorldUtil; import com.plotsquared.core.util.WorldUtil;
import com.plotsquared.queue.QueueProvider; import com.plotsquared.core.queue.QueueProvider;
import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.extension.platform.Actor;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

2
Core/src/main/java/com/plotsquared/Platform.java → Core/src/main/java/com/plotsquared/core/Platform.java
View File

@ -1,4 +1,4 @@
package com.plotsquared; package com.plotsquared.core;
public enum Platform { public enum Platform {
Bukkit, Sponge, Spigot, Paper Bukkit, Sponge, Spigot, Paper

117
Core/src/main/java/com/plotsquared/PlotSquared.java → Core/src/main/java/com/plotsquared/core/PlotSquared.java
View File

@ -1,62 +1,62 @@
package com.plotsquared; package com.plotsquared.core;
import com.plotsquared.configuration.ConfigurationSection; import com.plotsquared.core.configuration.ConfigurationSection;
import com.plotsquared.configuration.MemorySection; import com.plotsquared.core.configuration.MemorySection;
import com.plotsquared.configuration.file.YamlConfiguration; import com.plotsquared.core.configuration.file.YamlConfiguration;
import com.plotsquared.configuration.serialization.ConfigurationSerialization; import com.plotsquared.core.configuration.serialization.ConfigurationSerialization;
import com.plotsquared.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.player.ConsolePlayer; import com.plotsquared.core.player.ConsolePlayer;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.commands.WE_Anywhere; import com.plotsquared.core.command.WE_Anywhere;
import com.plotsquared.config.Caption; import com.plotsquared.core.config.Caption;
import com.plotsquared.config.CaptionUtility; import com.plotsquared.core.config.CaptionUtility;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.config.Configuration; import com.plotsquared.core.config.Configuration;
import com.plotsquared.config.Settings; import com.plotsquared.core.config.Settings;
import com.plotsquared.config.Storage; import com.plotsquared.core.config.Storage;
import com.plotsquared.database.DBFunc; import com.plotsquared.core.database.DBFunc;
import com.plotsquared.database.Database; import com.plotsquared.core.database.Database;
import com.plotsquared.database.MySQL; import com.plotsquared.core.database.MySQL;
import com.plotsquared.database.SQLManager; import com.plotsquared.core.database.SQLManager;
import com.plotsquared.database.SQLite; import com.plotsquared.core.database.SQLite;
import com.plotsquared.generator.GeneratorWrapper; import com.plotsquared.core.generator.GeneratorWrapper;
import com.plotsquared.generator.HybridPlotWorld; import com.plotsquared.core.generator.HybridPlotWorld;
import com.plotsquared.generator.HybridUtils; import com.plotsquared.core.generator.HybridUtils;
import com.plotsquared.generator.IndependentPlotGenerator; import com.plotsquared.core.generator.IndependentPlotGenerator;
import com.plotsquared.listener.WESubscriber; import com.plotsquared.core.listener.WESubscriber;
import com.plotsquared.plot.comment.CommentManager; import com.plotsquared.core.plot.comment.CommentManager;
import com.plotsquared.util.ChatManager; import com.plotsquared.core.util.ChatManager;
import com.plotsquared.plot.BlockBucket; import com.plotsquared.core.plot.BlockBucket;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.plot.PlotArea; import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.plot.PlotAreaType; import com.plotsquared.core.plot.PlotAreaType;
import com.plotsquared.plot.PlotCluster; import com.plotsquared.core.plot.PlotCluster;
import com.plotsquared.plot.PlotFilter; import com.plotsquared.core.plot.PlotFilter;
import com.plotsquared.plot.PlotId; import com.plotsquared.core.plot.PlotId;
import com.plotsquared.plot.PlotManager; import com.plotsquared.core.plot.PlotManager;
import com.plotsquared.util.StringWrapper; import com.plotsquared.core.util.StringWrapper;
import com.plotsquared.util.ChunkManager; import com.plotsquared.core.util.ChunkManager;
import com.plotsquared.util.EconHandler; import com.plotsquared.core.util.EconHandler;
import com.plotsquared.util.EventDispatcher; import com.plotsquared.core.util.EventDispatcher;
import com.plotsquared.util.LegacyConverter; import com.plotsquared.core.util.LegacyConverter;
import com.plotsquared.util.MathMan; import com.plotsquared.core.util.MathMan;
import com.plotsquared.util.SchematicHandler; import com.plotsquared.core.util.SchematicHandler;
import com.plotsquared.util.StringMan; import com.plotsquared.core.util.StringMan;
import com.plotsquared.util.logger.ILogger; import com.plotsquared.core.util.logger.ILogger;
import com.plotsquared.plot.worlds.DefaultPlotAreaManager; import com.plotsquared.core.plot.world.DefaultPlotAreaManager;
import com.plotsquared.plot.worlds.PlotAreaManager; import com.plotsquared.core.plot.world.PlotAreaManager;
import com.plotsquared.plot.worlds.SinglePlotArea; import com.plotsquared.core.plot.world.SinglePlotArea;
import com.plotsquared.plot.worlds.SinglePlotAreaManager; import com.plotsquared.core.plot.world.SinglePlotAreaManager;
import com.plotsquared.queue.GlobalBlockQueue; import com.plotsquared.core.queue.GlobalBlockQueue;
import com.plotsquared.plot.expiration.ExpireManager; import com.plotsquared.core.plot.expiration.ExpireManager;
import com.plotsquared.plot.expiration.ExpiryTask; import com.plotsquared.core.plot.expiration.ExpiryTask;
import com.plotsquared.util.InventoryUtil; import com.plotsquared.core.util.InventoryUtil;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.ReflectionUtils; import com.plotsquared.core.util.ReflectionUtils;
import com.plotsquared.util.SetupUtils; import com.plotsquared.core.util.SetupUtils;
import com.plotsquared.util.WorldUtil; import com.plotsquared.core.util.WorldUtil;
import com.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.plotsquared.util.tasks.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector2;
import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.regions.CuboidRegion;
@ -75,6 +75,7 @@ import java.sql.SQLException;
import java.util.*; import java.util.*;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;

2
Core/src/main/java/com/plotsquared/PlotVersion.java → Core/src/main/java/com/plotsquared/core/PlotVersion.java
View File

@ -1,4 +1,4 @@
package com.plotsquared; package com.plotsquared.core;
public class PlotVersion { public class PlotVersion {
public final int year, month, day, hash, build; public final int year, month, day, hash, build;

34
Core/src/main/java/com/plotsquared/api/PlotAPI.java → Core/src/main/java/com/plotsquared/core/api/PlotAPI.java
View File

@ -1,20 +1,20 @@
package com.plotsquared.api; package com.plotsquared.core.api;
import com.plotsquared.configuration.file.YamlConfiguration; import com.plotsquared.core.configuration.file.YamlConfiguration;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Caption; import com.plotsquared.core.config.Caption;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.plot.PlotArea; import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.queue.GlobalBlockQueue; import com.plotsquared.core.queue.GlobalBlockQueue;
import com.plotsquared.util.ChunkManager; import com.plotsquared.core.util.ChunkManager;
import com.plotsquared.util.EventDispatcher; import com.plotsquared.core.util.EventDispatcher;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.SchematicHandler; import com.plotsquared.core.util.SchematicHandler;
import com.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.plotsquared.util.uuid.UUIDWrapper; import com.plotsquared.core.util.uuid.UUIDWrapper;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.util.Collections; import java.util.Collections;
@ -33,7 +33,7 @@ import java.util.UUID;
* <li>{@link PlotSquared}</li> * <li>{@link PlotSquared}</li>
* </ul> * </ul>
* *
* @version 3.3.3 * @version 5
*/ */
@SuppressWarnings({"unused", "WeakerAccess"}) @NoArgsConstructor public class PlotAPI { @SuppressWarnings({"unused", "WeakerAccess"}) @NoArgsConstructor public class PlotAPI {

2
Core/src/main/java/com/plotsquared/collection/ArrayUtil.java → Core/src/main/java/com/plotsquared/core/collection/ArrayUtil.java
View File

@ -1,4 +1,4 @@
package com.plotsquared.collection; package com.plotsquared.core.collection;
import java.util.Arrays; import java.util.Arrays;

2
Core/src/main/java/com/plotsquared/util/ByteArrayUtilities.java → Core/src/main/java/com/plotsquared/core/collection/ByteArrayUtilities.java
View File

@ -1,4 +1,4 @@
package com.plotsquared.util; package com.plotsquared.core.collection;
public class ByteArrayUtilities { public class ByteArrayUtilities {

4
Core/src/main/java/com/plotsquared/collection/FlatRandomCollection.java → Core/src/main/java/com/plotsquared/core/collection/FlatRandomCollection.java
View File

@ -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.ArrayList;
import java.util.Map; import java.util.Map;

4
Core/src/main/java/com/plotsquared/util/area/QuadMap.java → Core/src/main/java/com/plotsquared/core/collection/QuadMap.java
View File

@ -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 com.sk89q.worldedit.regions.CuboidRegion;
import java.util.HashSet; import java.util.HashSet;

2
Core/src/main/java/com/plotsquared/collection/RandomCollection.java → Core/src/main/java/com/plotsquared/core/collection/RandomCollection.java
View File

@ -1,4 +1,4 @@
package com.plotsquared.collection; package com.plotsquared.core.collection;
import java.util.Map; import java.util.Map;
import java.util.Random; import java.util.Random;

2
Core/src/main/java/com/plotsquared/collection/SimpleRandomCollection.java → Core/src/main/java/com/plotsquared/core/collection/SimpleRandomCollection.java
View File

@ -1,4 +1,4 @@
package com.plotsquared.collection; package com.plotsquared.core.collection;
import java.util.Map; import java.util.Map;
import java.util.NavigableMap; import java.util.NavigableMap;

20
Core/src/main/java/com/plotsquared/commands/Add.java → Core/src/main/java/com/plotsquared/core/command/Add.java
View File

@ -1,14 +1,14 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.database.DBFunc; import com.plotsquared.core.database.DBFunc;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.tasks.RunnableVal2; import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.util.tasks.RunnableVal3; import com.plotsquared.core.util.task.RunnableVal3;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.Permissions; import com.plotsquared.core.util.Permissions;
import java.util.Iterator; import java.util.Iterator;
import java.util.Set; import java.util.Set;

22
Core/src/main/java/com/plotsquared/commands/Alias.java → Core/src/main/java/com/plotsquared/core/command/Alias.java
View File

@ -1,15 +1,15 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.StringWrapper; import com.plotsquared.core.util.StringWrapper;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.MathMan; import com.plotsquared.core.util.MathMan;
import com.plotsquared.util.Permissions; import com.plotsquared.core.util.Permissions;
import com.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
@CommandDeclaration(command = "setalias", @CommandDeclaration(command = "setalias",
permission = "plots.alias", permission = "plots.alias",

52
Core/src/main/java/com/plotsquared/commands/Area.java → Core/src/main/java/com/plotsquared/core/command/Area.java
View File

@ -1,30 +1,30 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.configuration.ConfigurationSection; import com.plotsquared.core.configuration.ConfigurationSection;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.config.Configuration; import com.plotsquared.core.config.Configuration;
import com.plotsquared.generator.AugmentedUtils; import com.plotsquared.core.generator.AugmentedUtils;
import com.plotsquared.generator.HybridPlotWorld; import com.plotsquared.core.generator.HybridPlotWorld;
import com.plotsquared.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.plot.PlotArea; import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.plot.PlotAreaTerrainType; import com.plotsquared.core.plot.PlotAreaTerrainType;
import com.plotsquared.plot.PlotAreaType; import com.plotsquared.core.plot.PlotAreaType;
import com.plotsquared.plot.PlotId; import com.plotsquared.core.plot.PlotId;
import com.plotsquared.plot.message.PlotMessage; import com.plotsquared.core.plot.message.PlotMessage;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.tasks.RunnableVal; import com.plotsquared.core.util.task.RunnableVal;
import com.plotsquared.util.tasks.RunnableVal3; import com.plotsquared.core.util.task.RunnableVal3;
import com.plotsquared.plot.SetupObject; import com.plotsquared.core.plot.SetupObject;
import com.plotsquared.events.TeleportCause; import com.plotsquared.core.events.TeleportCause;
import com.plotsquared.util.ChunkManager; import com.plotsquared.core.util.ChunkManager;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.MathMan; import com.plotsquared.core.util.MathMan;
import com.plotsquared.util.Permissions; import com.plotsquared.core.util.Permissions;
import com.plotsquared.util.SetupUtils; import com.plotsquared.core.util.SetupUtils;
import com.plotsquared.util.StringMan; import com.plotsquared.core.util.StringMan;
import com.plotsquared.util.WorldUtil; import com.plotsquared.core.util.WorldUtil;
import com.plotsquared.util.RegionUtil; import com.plotsquared.core.util.RegionUtil;
import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector2;
import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.regions.CuboidRegion;

4
Core/src/main/java/com/plotsquared/commands/Argument.java → Core/src/main/java/com/plotsquared/core/command/Argument.java
View File

@ -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<T> { public abstract class Argument<T> {

44
Core/src/main/java/com/plotsquared/commands/Auto.java → Core/src/main/java/com/plotsquared/core/command/Auto.java
View File

@ -1,26 +1,26 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.CaptionUtility; import com.plotsquared.core.config.CaptionUtility;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.config.Settings; import com.plotsquared.core.config.Settings;
import com.plotsquared.database.DBFunc; import com.plotsquared.core.database.DBFunc;
import com.plotsquared.events.PlayerAutoPlotEvent; import com.plotsquared.core.events.PlayerAutoPlotEvent;
import com.plotsquared.events.PlotAutoMergeEvent; import com.plotsquared.core.events.PlotAutoMergeEvent;
import com.plotsquared.events.Result; import com.plotsquared.core.events.Result;
import com.plotsquared.util.Expression; import com.plotsquared.core.util.Expression;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.plot.PlotArea; import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.plot.PlotAreaType; import com.plotsquared.core.plot.PlotAreaType;
import com.plotsquared.plot.PlotId; import com.plotsquared.core.plot.PlotId;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.tasks.RunnableVal; import com.plotsquared.core.util.task.RunnableVal;
import com.plotsquared.events.TeleportCause; import com.plotsquared.core.events.TeleportCause;
import com.plotsquared.util.tasks.AutoClaimFinishTask; import com.plotsquared.core.util.task.AutoClaimFinishTask;
import com.plotsquared.util.EconHandler; import com.plotsquared.core.util.EconHandler;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.Permissions; import com.plotsquared.core.util.Permissions;
import com.plotsquared.util.tasks.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import com.google.common.primitives.Ints; import com.google.common.primitives.Ints;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;

12
Core/src/main/java/com/plotsquared/commands/Biome.java → Core/src/main/java/com/plotsquared/core/command/Biome.java
View File

@ -1,10 +1,10 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.StringMan; import com.plotsquared.core.util.StringMan;
import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.biome.BiomeTypes; import com.sk89q.worldedit.world.biome.BiomeTypes;

28
Core/src/main/java/com/plotsquared/commands/Buy.java → Core/src/main/java/com/plotsquared/core/command/Buy.java
View File

@ -1,18 +1,18 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.events.PlotFlagRemoveEvent; import com.plotsquared.core.events.PlotFlagRemoveEvent;
import com.plotsquared.events.Result; import com.plotsquared.core.events.Result;
import com.plotsquared.plot.flags.PlotFlag; import com.plotsquared.core.plot.flag.PlotFlag;
import com.plotsquared.plot.flags.implementations.PriceFlag; import com.plotsquared.core.plot.flag.implementations.PriceFlag;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.tasks.RunnableVal2; import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.util.tasks.RunnableVal3; import com.plotsquared.core.util.task.RunnableVal3;
import com.plotsquared.util.EconHandler; import com.plotsquared.core.util.EconHandler;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;

4
Core/src/main/java/com/plotsquared/commands/Chat.java → Core/src/main/java/com/plotsquared/core/command/Chat.java
View File

@ -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", @CommandDeclaration(command = "chat",
description = "Toggle plot chat on or off", description = "Toggle plot chat on or off",

38
Core/src/main/java/com/plotsquared/commands/Claim.java → Core/src/main/java/com/plotsquared/core/command/Claim.java
View File

@ -1,24 +1,24 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.config.CaptionUtility; import com.plotsquared.core.config.CaptionUtility;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.config.Settings; import com.plotsquared.core.config.Settings;
import com.plotsquared.database.DBFunc; import com.plotsquared.core.database.DBFunc;
import com.plotsquared.events.PlayerClaimPlotEvent; import com.plotsquared.core.events.PlayerClaimPlotEvent;
import com.plotsquared.events.PlotMergeEvent; import com.plotsquared.core.events.PlotMergeEvent;
import com.plotsquared.events.Result; import com.plotsquared.core.events.Result;
import com.plotsquared.util.EconHandler; import com.plotsquared.core.util.EconHandler;
import com.plotsquared.util.Permissions; import com.plotsquared.core.util.Permissions;
import com.plotsquared.util.tasks.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import com.plotsquared.util.tasks.RunnableVal; import com.plotsquared.core.util.task.RunnableVal;
import com.google.common.primitives.Ints; import com.google.common.primitives.Ints;
import com.plotsquared.location.Direction; import com.plotsquared.core.location.Direction;
import com.plotsquared.util.Expression; import com.plotsquared.core.util.Expression;
import com.plotsquared.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.plot.PlotArea; import com.plotsquared.core.plot.PlotArea;
@CommandDeclaration(command = "claim", @CommandDeclaration(command = "claim",
aliases = "c", aliases = "c",

34
Core/src/main/java/com/plotsquared/commands/Clear.java → Core/src/main/java/com/plotsquared/core/command/Clear.java
View File

@ -1,24 +1,24 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.config.Settings; import com.plotsquared.core.config.Settings;
import com.plotsquared.events.PlotFlagRemoveEvent; import com.plotsquared.core.events.PlotFlagRemoveEvent;
import com.plotsquared.events.Result; import com.plotsquared.core.events.Result;
import com.plotsquared.plot.flags.PlotFlag; import com.plotsquared.core.plot.flag.PlotFlag;
import com.plotsquared.plot.flags.implementations.AnalysisFlag; import com.plotsquared.core.plot.flag.implementations.AnalysisFlag;
import com.plotsquared.plot.flags.implementations.DoneFlag; import com.plotsquared.core.plot.flag.implementations.DoneFlag;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.tasks.RunnableVal2; import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.util.tasks.RunnableVal3; import com.plotsquared.core.util.task.RunnableVal3;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.Permissions; import com.plotsquared.core.util.Permissions;
import com.plotsquared.queue.GlobalBlockQueue; import com.plotsquared.core.queue.GlobalBlockQueue;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import static com.plotsquared.commands.SubCommand.sendMessage; import static com.plotsquared.core.command.SubCommand.sendMessage;
@CommandDeclaration(command = "clear", @CommandDeclaration(command = "clear",
description = "Clear the plot you stand on", description = "Clear the plot you stand on",

32
Core/src/main/java/com/plotsquared/commands/Cluster.java → Core/src/main/java/com/plotsquared/core/command/Cluster.java
View File

@ -1,20 +1,20 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.config.Settings; import com.plotsquared.core.config.Settings;
import com.plotsquared.database.DBFunc; import com.plotsquared.core.database.DBFunc;
import com.plotsquared.location.BlockLoc; import com.plotsquared.core.location.BlockLoc;
import com.plotsquared.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.plot.PlotArea; import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.plot.PlotCluster; import com.plotsquared.core.plot.PlotCluster;
import com.plotsquared.plot.PlotId; import com.plotsquared.core.plot.PlotId;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.events.TeleportCause; import com.plotsquared.core.events.TeleportCause;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.Permissions; import com.plotsquared.core.util.Permissions;
import com.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;

10
Core/src/main/java/com/plotsquared/commands/CmdConfirm.java → Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java
View File

@ -1,9 +1,9 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.tasks.TaskManager; import com.plotsquared.core.util.task.TaskManager;
public class CmdConfirm { public class CmdConfirm {

2
Core/src/main/java/com/plotsquared/commands/CmdInstance.java → Core/src/main/java/com/plotsquared/core/command/CmdInstance.java
View File

@ -1,4 +1,4 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
public class CmdInstance { public class CmdInstance {
public final Runnable command; public final Runnable command;

26
Core/src/main/java/com/plotsquared/commands/Command.java → Core/src/main/java/com/plotsquared/core/command/Command.java
View File

@ -1,17 +1,17 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.configuration.file.YamlConfiguration; import com.plotsquared.core.configuration.file.YamlConfiguration;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.plot.message.PlotMessage; import com.plotsquared.core.plot.message.PlotMessage;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.tasks.RunnableVal2; import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.util.tasks.RunnableVal3; import com.plotsquared.core.util.task.RunnableVal3;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.MathMan; import com.plotsquared.core.util.MathMan;
import com.plotsquared.util.Permissions; import com.plotsquared.core.util.Permissions;
import com.plotsquared.util.StringComparison; import com.plotsquared.core.util.StringComparison;
import com.plotsquared.util.StringMan; import com.plotsquared.core.util.StringMan;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;

2
Core/src/main/java/com/plotsquared/commands/CommandCaller.java → Core/src/main/java/com/plotsquared/core/command/CommandCaller.java
View File

@ -1,4 +1,4 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
public interface CommandCaller { public interface CommandCaller {

4
Core/src/main/java/com/plotsquared/commands/CommandCategory.java → Core/src/main/java/com/plotsquared/core/command/CommandCategory.java
View File

@ -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; import lombok.RequiredArgsConstructor;
/** /**

2
Core/src/main/java/com/plotsquared/commands/CommandDeclaration.java → Core/src/main/java/com/plotsquared/core/command/CommandDeclaration.java
View File

@ -1,4 +1,4 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;

20
Core/src/main/java/com/plotsquared/commands/Comment.java → Core/src/main/java/com/plotsquared/core/command/Comment.java
View File

@ -1,14 +1,14 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.plot.comment.CommentInbox; import com.plotsquared.core.plot.comment.CommentInbox;
import com.plotsquared.plot.comment.PlotComment; import com.plotsquared.core.plot.comment.PlotComment;
import com.plotsquared.plot.comment.CommentManager; import com.plotsquared.core.plot.comment.CommentManager;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.StringMan; import com.plotsquared.core.util.StringMan;
import com.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale; import java.util.Locale;

20
Core/src/main/java/com/plotsquared/commands/Condense.java → Core/src/main/java/com/plotsquared/core/command/Condense.java
View File

@ -1,14 +1,14 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.plot.PlotArea; import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.plot.PlotId; import com.plotsquared.core.plot.PlotId;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.MathMan; import com.plotsquared.core.util.MathMan;
import com.plotsquared.util.tasks.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import com.plotsquared.util.WorldUtil; import com.plotsquared.core.util.WorldUtil;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;

12
Core/src/main/java/com/plotsquared/commands/Confirm.java → Core/src/main/java/com/plotsquared/core/command/Confirm.java
View File

@ -1,10 +1,10 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.config.Settings; import com.plotsquared.core.config.Settings;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.tasks.TaskManager; import com.plotsquared.core.util.task.TaskManager;
@CommandDeclaration(command = "confirm", @CommandDeclaration(command = "confirm",
permission = "plots.use", permission = "plots.use",

24
Core/src/main/java/com/plotsquared/commands/Continue.java → Core/src/main/java/com/plotsquared/core/command/Continue.java
View File

@ -1,16 +1,16 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.config.Settings; import com.plotsquared.core.config.Settings;
import com.plotsquared.events.PlotFlagRemoveEvent; import com.plotsquared.core.events.PlotFlagRemoveEvent;
import com.plotsquared.events.Result; import com.plotsquared.core.events.Result;
import com.plotsquared.plot.flags.PlotFlag; import com.plotsquared.core.plot.flag.PlotFlag;
import com.plotsquared.plot.flags.implementations.DoneFlag; import com.plotsquared.core.plot.flag.implementations.DoneFlag;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.Permissions; import com.plotsquared.core.util.Permissions;
@CommandDeclaration(command = "continue", @CommandDeclaration(command = "continue",
description = "Continue a plot that was previously marked as done", description = "Continue a plot that was previously marked as done",

14
Core/src/main/java/com/plotsquared/commands/Copy.java → Core/src/main/java/com/plotsquared/core/command/Copy.java
View File

@ -1,11 +1,11 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.Permissions; import com.plotsquared.core.util.Permissions;
@CommandDeclaration(command = "copy", @CommandDeclaration(command = "copy",
permission = "plots.copy", permission = "plots.copy",

16
Core/src/main/java/com/plotsquared/commands/CreateRoadSchematic.java → Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java
View File

@ -1,12 +1,12 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.generator.HybridPlotWorld; import com.plotsquared.core.generator.HybridPlotWorld;
import com.plotsquared.generator.HybridUtils; import com.plotsquared.core.generator.HybridUtils;
import com.plotsquared.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
@CommandDeclaration(command = "createroadschematic", @CommandDeclaration(command = "createroadschematic",
aliases = {"crs"}, aliases = {"crs"},

28
Core/src/main/java/com/plotsquared/commands/DatabaseCommand.java → Core/src/main/java/com/plotsquared/core/command/DatabaseCommand.java
View File

@ -1,18 +1,18 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.database.DBFunc; import com.plotsquared.core.database.DBFunc;
import com.plotsquared.database.MySQL; import com.plotsquared.core.database.MySQL;
import com.plotsquared.database.SQLManager; import com.plotsquared.core.database.SQLManager;
import com.plotsquared.database.SQLite; import com.plotsquared.core.database.SQLite;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.plot.PlotArea; import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.plot.PlotId; import com.plotsquared.core.plot.PlotId;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.plot.worlds.SinglePlotArea; import com.plotsquared.core.plot.world.SinglePlotArea;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.tasks.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import com.plotsquared.database.Database; import com.plotsquared.core.database.Database;
import java.io.File; import java.io.File;
import java.sql.SQLException; import java.sql.SQLException;

16
Core/src/main/java/com/plotsquared/commands/Debug.java → Core/src/main/java/com/plotsquared/core/command/Debug.java
View File

@ -1,12 +1,12 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.ChunkManager; import com.plotsquared.core.util.ChunkManager;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.StringMan; import com.plotsquared.core.util.StringMan;
import com.plotsquared.util.tasks.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import java.util.Map; import java.util.Map;

6
Core/src/main/java/com/plotsquared/commands/DebugAllowUnsafe.java → Core/src/main/java/com/plotsquared/core/command/DebugAllowUnsafe.java
View File

@ -1,7 +1,7 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

28
Core/src/main/java/com/plotsquared/commands/DebugClaimTest.java → Core/src/main/java/com/plotsquared/core/command/DebugClaimTest.java
View File

@ -1,18 +1,18 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.plot.PlotArea; import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.plot.PlotId; import com.plotsquared.core.plot.PlotId;
import com.plotsquared.plot.PlotManager; import com.plotsquared.core.plot.PlotManager;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.StringWrapper; import com.plotsquared.core.util.StringWrapper;
import com.plotsquared.util.ChunkManager; import com.plotsquared.core.util.ChunkManager;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.plotsquared.util.WorldUtil; import com.plotsquared.core.util.WorldUtil;
import com.google.common.collect.BiMap; import com.google.common.collect.BiMap;
import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector2;

70
Core/src/main/java/com/plotsquared/commands/DebugExec.java → Core/src/main/java/com/plotsquared/core/command/DebugExec.java
View File

@ -1,39 +1,39 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.config.Settings; import com.plotsquared.core.config.Settings;
import com.plotsquared.database.DBFunc; import com.plotsquared.core.database.DBFunc;
import com.plotsquared.events.PlotFlagRemoveEvent; import com.plotsquared.core.events.PlotFlagRemoveEvent;
import com.plotsquared.events.Result; import com.plotsquared.core.events.Result;
import com.plotsquared.plot.flags.GlobalFlagContainer; import com.plotsquared.core.plot.flag.GlobalFlagContainer;
import com.plotsquared.plot.flags.PlotFlag; import com.plotsquared.core.plot.flag.PlotFlag;
import com.plotsquared.generator.HybridUtils; import com.plotsquared.core.generator.HybridUtils;
import com.plotsquared.listener.WEManager; import com.plotsquared.core.util.WEManager;
import com.plotsquared.player.ConsolePlayer; import com.plotsquared.core.player.ConsolePlayer;
import com.plotsquared.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.player.OfflinePlotPlayer; import com.plotsquared.core.player.OfflinePlotPlayer;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.plot.PlotArea; import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.plot.PlotId; import com.plotsquared.core.plot.PlotId;
import com.plotsquared.plot.message.PlotMessage; import com.plotsquared.core.plot.message.PlotMessage;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.tasks.RunnableVal; import com.plotsquared.core.util.task.RunnableVal;
import com.plotsquared.util.tasks.RunnableVal2; import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.util.tasks.RunnableVal3; import com.plotsquared.core.util.task.RunnableVal3;
import com.plotsquared.util.ChunkManager; import com.plotsquared.core.util.ChunkManager;
import com.plotsquared.util.EconHandler; import com.plotsquared.core.util.EconHandler;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.MathMan; import com.plotsquared.core.util.MathMan;
import com.plotsquared.util.SchematicHandler; import com.plotsquared.core.util.SchematicHandler;
import com.plotsquared.util.SetupUtils; import com.plotsquared.core.util.SetupUtils;
import com.plotsquared.util.StringMan; import com.plotsquared.core.util.StringMan;
import com.plotsquared.util.tasks.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import com.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.plotsquared.util.WorldUtil; import com.plotsquared.core.util.WorldUtil;
import com.plotsquared.queue.GlobalBlockQueue; import com.plotsquared.core.queue.GlobalBlockQueue;
import com.plotsquared.plot.expiration.ExpireManager; import com.plotsquared.core.plot.expiration.ExpireManager;
import com.plotsquared.plot.expiration.PlotAnalysis; import com.plotsquared.core.plot.expiration.PlotAnalysis;
import com.google.common.io.Files; import com.google.common.io.Files;
import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.block.BlockState;

22
Core/src/main/java/com/plotsquared/commands/DebugImportWorlds.java → Core/src/main/java/com/plotsquared/core/command/DebugImportWorlds.java
View File

@ -1,15 +1,15 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.plot.PlotId; import com.plotsquared.core.plot.PlotId;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.tasks.RunnableVal2; import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.util.tasks.RunnableVal3; import com.plotsquared.core.util.task.RunnableVal3;
import com.plotsquared.plot.worlds.PlotAreaManager; import com.plotsquared.core.plot.world.PlotAreaManager;
import com.plotsquared.plot.worlds.SinglePlotArea; import com.plotsquared.core.plot.world.SinglePlotArea;
import com.plotsquared.plot.worlds.SinglePlotAreaManager; import com.plotsquared.core.plot.world.SinglePlotAreaManager;
import com.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.plotsquared.util.WorldUtil; import com.plotsquared.core.util.WorldUtil;
import com.google.common.base.Charsets; import com.google.common.base.Charsets;
import java.io.File; import java.io.File;

8
Core/src/main/java/com/plotsquared/commands/DebugLoadTest.java → Core/src/main/java/com/plotsquared/core/command/DebugLoadTest.java
View File

@ -1,8 +1,8 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.database.DBFunc; import com.plotsquared.core.database.DBFunc;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
@CommandDeclaration(command = "debugloadtest", @CommandDeclaration(command = "debugloadtest",
permission = "plots.debugloadtest", permission = "plots.debugloadtest",

20
Core/src/main/java/com/plotsquared/commands/DebugPaste.java → Core/src/main/java/com/plotsquared/core/command/DebugPaste.java
View File

@ -1,16 +1,16 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.config.Settings; import com.plotsquared.core.config.Settings;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.net.IncendoPaster; import com.plotsquared.core.util.net.IncendoPaster;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.tasks.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import com.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
import com.plotsquared.util.PremiumVerification; import com.plotsquared.core.util.PremiumVerification;
import lombok.NonNull; import lombok.NonNull;
import java.io.BufferedReader; import java.io.BufferedReader;

20
Core/src/main/java/com/plotsquared/commands/DebugRoadRegen.java → Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java
View File

@ -1,14 +1,14 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.generator.HybridPlotManager; import com.plotsquared.core.generator.HybridPlotManager;
import com.plotsquared.generator.HybridUtils; import com.plotsquared.core.generator.HybridUtils;
import com.plotsquared.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.plot.PlotArea; import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.plot.PlotManager; import com.plotsquared.core.plot.PlotManager;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import java.util.Arrays; import java.util.Arrays;

12
Core/src/main/java/com/plotsquared/commands/DebugSaveTest.java → Core/src/main/java/com/plotsquared/core/command/DebugSaveTest.java
View File

@ -1,10 +1,10 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.database.DBFunc; import com.plotsquared.core.database.DBFunc;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import java.util.ArrayList; import java.util.ArrayList;

28
Core/src/main/java/com/plotsquared/commands/Delete.java → Core/src/main/java/com/plotsquared/core/command/Delete.java
View File

@ -1,18 +1,18 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.config.Settings; import com.plotsquared.core.config.Settings;
import com.plotsquared.events.Result; import com.plotsquared.core.events.Result;
import com.plotsquared.util.Expression; import com.plotsquared.core.util.Expression;
import com.plotsquared.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.plot.PlotArea; import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.EconHandler; import com.plotsquared.core.util.EconHandler;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.Permissions; import com.plotsquared.core.util.Permissions;
import com.plotsquared.util.tasks.TaskManager; import com.plotsquared.core.util.task.TaskManager;
@CommandDeclaration(command = "delete", @CommandDeclaration(command = "delete",

22
Core/src/main/java/com/plotsquared/commands/Deny.java → Core/src/main/java/com/plotsquared/core/command/Deny.java
View File

@ -1,15 +1,15 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.database.DBFunc; import com.plotsquared.core.database.DBFunc;
import com.plotsquared.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.Permissions; import com.plotsquared.core.util.Permissions;
import com.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.plotsquared.util.WorldUtil; import com.plotsquared.core.util.WorldUtil;
import com.sk89q.worldedit.world.gamemode.GameModes; import com.sk89q.worldedit.world.gamemode.GameModes;
import java.util.Set; import java.util.Set;

20
Core/src/main/java/com/plotsquared/commands/Desc.java → Core/src/main/java/com/plotsquared/core/command/Desc.java
View File

@ -1,14 +1,14 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.events.PlotFlagAddEvent; import com.plotsquared.core.events.PlotFlagAddEvent;
import com.plotsquared.events.PlotFlagRemoveEvent; import com.plotsquared.core.events.PlotFlagRemoveEvent;
import com.plotsquared.events.Result; import com.plotsquared.core.events.Result;
import com.plotsquared.plot.flags.implementations.DescriptionFlag; import com.plotsquared.core.plot.flag.implementations.DescriptionFlag;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
@CommandDeclaration(command = "setdescription", @CommandDeclaration(command = "setdescription",
permission = "plots.set.desc", permission = "plots.set.desc",

4
Core/src/main/java/com/plotsquared/commands/Dislike.java → Core/src/main/java/com/plotsquared/core/command/Dislike.java
View File

@ -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", @CommandDeclaration(command = "dislike",
permission = "plots.dislike", permission = "plots.dislike",

36
Core/src/main/java/com/plotsquared/commands/Done.java → Core/src/main/java/com/plotsquared/core/command/Done.java
View File

@ -1,22 +1,22 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.config.Settings; import com.plotsquared.core.config.Settings;
import com.plotsquared.events.PlotDoneEvent; import com.plotsquared.core.events.PlotDoneEvent;
import com.plotsquared.events.PlotFlagAddEvent; import com.plotsquared.core.events.PlotFlagAddEvent;
import com.plotsquared.events.Result; import com.plotsquared.core.events.Result;
import com.plotsquared.plot.flags.PlotFlag; import com.plotsquared.core.plot.flag.PlotFlag;
import com.plotsquared.plot.flags.implementations.DoneFlag; import com.plotsquared.core.plot.flag.implementations.DoneFlag;
import com.plotsquared.generator.HybridUtils; import com.plotsquared.core.generator.HybridUtils;
import com.plotsquared.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.tasks.RunnableVal; import com.plotsquared.core.util.task.RunnableVal;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.Permissions; import com.plotsquared.core.util.Permissions;
import com.plotsquared.plot.expiration.ExpireManager; import com.plotsquared.core.plot.expiration.ExpireManager;
import com.plotsquared.plot.expiration.PlotAnalysis; import com.plotsquared.core.plot.expiration.PlotAnalysis;
@CommandDeclaration(command = "done", @CommandDeclaration(command = "done",
aliases = {"submit"}, aliases = {"submit"},

26
Core/src/main/java/com/plotsquared/commands/Download.java → Core/src/main/java/com/plotsquared/core/command/Download.java
View File

@ -1,17 +1,17 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.config.Settings; import com.plotsquared.core.config.Settings;
import com.plotsquared.plot.flags.implementations.DoneFlag; import com.plotsquared.core.plot.flag.implementations.DoneFlag;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.tasks.RunnableVal; import com.plotsquared.core.util.task.RunnableVal;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.Permissions; import com.plotsquared.core.util.Permissions;
import com.plotsquared.util.SchematicHandler; import com.plotsquared.core.util.SchematicHandler;
import com.plotsquared.util.StringMan; import com.plotsquared.core.util.StringMan;
import com.plotsquared.util.WorldUtil; import com.plotsquared.core.util.WorldUtil;
import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.CompoundTag;
import java.net.URL; import java.net.URL;

52
Core/src/main/java/com/plotsquared/commands/FlagCommand.java → Core/src/main/java/com/plotsquared/core/command/FlagCommand.java
View File

@ -1,30 +1,30 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.CaptionUtility; import com.plotsquared.core.config.CaptionUtility;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.config.Settings; import com.plotsquared.core.config.Settings;
import com.plotsquared.events.PlotFlagAddEvent; import com.plotsquared.core.events.PlotFlagAddEvent;
import com.plotsquared.events.PlotFlagRemoveEvent; import com.plotsquared.core.events.PlotFlagRemoveEvent;
import com.plotsquared.events.Result; import com.plotsquared.core.events.Result;
import com.plotsquared.plot.flags.FlagParseException; import com.plotsquared.core.plot.flag.FlagParseException;
import com.plotsquared.plot.flags.GlobalFlagContainer; import com.plotsquared.core.plot.flag.GlobalFlagContainer;
import com.plotsquared.plot.flags.InternalFlag; import com.plotsquared.core.plot.flag.InternalFlag;
import com.plotsquared.plot.flags.PlotFlag; import com.plotsquared.core.plot.flag.PlotFlag;
import com.plotsquared.plot.flags.types.IntegerFlag; import com.plotsquared.core.plot.flag.types.IntegerFlag;
import com.plotsquared.plot.flags.types.ListFlag; import com.plotsquared.core.plot.flag.types.ListFlag;
import com.plotsquared.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.plot.message.PlotMessage; import com.plotsquared.core.plot.message.PlotMessage;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.tasks.RunnableVal2; import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.util.tasks.RunnableVal3; import com.plotsquared.core.util.task.RunnableVal3;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.MathMan; import com.plotsquared.core.util.MathMan;
import com.plotsquared.util.Permissions; import com.plotsquared.core.util.Permissions;
import com.plotsquared.util.StringComparison; import com.plotsquared.core.util.StringComparison;
import com.plotsquared.util.StringMan; import com.plotsquared.core.util.StringMan;
import com.plotsquared.util.helpmenu.HelpMenu; import com.plotsquared.core.util.helpmenu.HelpMenu;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;

22
Core/src/main/java/com/plotsquared/commands/Grant.java → Core/src/main/java/com/plotsquared/core/command/Grant.java
View File

@ -1,15 +1,15 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.config.CaptionUtility; import com.plotsquared.core.config.CaptionUtility;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.database.DBFunc; import com.plotsquared.core.database.DBFunc;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.tasks.RunnableVal; import com.plotsquared.core.util.task.RunnableVal;
import com.plotsquared.util.tasks.RunnableVal2; import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.util.tasks.RunnableVal3; import com.plotsquared.core.util.task.RunnableVal3;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.Permissions; import com.plotsquared.core.util.Permissions;
import com.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.google.common.primitives.Ints; import com.google.common.primitives.Ints;
import java.util.UUID; import java.util.UUID;

18
Core/src/main/java/com/plotsquared/commands/Help.java → Core/src/main/java/com/plotsquared/core/command/Help.java
View File

@ -1,13 +1,13 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.tasks.RunnableVal2; import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.util.tasks.RunnableVal3; import com.plotsquared.core.util.task.RunnableVal3;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.MathMan; import com.plotsquared.core.util.MathMan;
import com.plotsquared.util.StringMan; import com.plotsquared.core.util.StringMan;
import com.plotsquared.util.helpmenu.HelpMenu; import com.plotsquared.core.util.helpmenu.HelpMenu;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;

20
Core/src/main/java/com/plotsquared/commands/Inbox.java → Core/src/main/java/com/plotsquared/core/command/Inbox.java
View File

@ -1,14 +1,14 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.tasks.RunnableVal; import com.plotsquared.core.util.task.RunnableVal;
import com.plotsquared.plot.comment.CommentInbox; import com.plotsquared.core.plot.comment.CommentInbox;
import com.plotsquared.plot.comment.PlotComment; import com.plotsquared.core.plot.comment.PlotComment;
import com.plotsquared.plot.comment.CommentManager; import com.plotsquared.core.plot.comment.CommentManager;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.StringMan; import com.plotsquared.core.util.StringMan;
import java.util.List; import java.util.List;

18
Core/src/main/java/com/plotsquared/commands/Info.java → Core/src/main/java/com/plotsquared/core/command/Info.java
View File

@ -1,13 +1,13 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.config.Settings; import com.plotsquared.core.config.Settings;
import com.plotsquared.database.DBFunc; import com.plotsquared.core.database.DBFunc;
import com.plotsquared.plot.flags.implementations.HideInfoFlag; import com.plotsquared.core.plot.flag.implementations.HideInfoFlag;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.tasks.RunnableVal; import com.plotsquared.core.util.task.RunnableVal;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
@CommandDeclaration(command = "info", @CommandDeclaration(command = "info",
aliases = "i", aliases = "i",

22
Core/src/main/java/com/plotsquared/commands/Kick.java → Core/src/main/java/com/plotsquared/core/command/Kick.java
View File

@ -1,15 +1,15 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.database.DBFunc; import com.plotsquared.core.database.DBFunc;
import com.plotsquared.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.Permissions; import com.plotsquared.core.util.Permissions;
import com.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.plotsquared.util.WorldUtil; import com.plotsquared.core.util.WorldUtil;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;

16
Core/src/main/java/com/plotsquared/commands/Leave.java → Core/src/main/java/com/plotsquared/core/command/Leave.java
View File

@ -1,12 +1,12 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.tasks.RunnableVal2; import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.util.tasks.RunnableVal3; import com.plotsquared.core.util.task.RunnableVal3;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;

28
Core/src/main/java/com/plotsquared/commands/Like.java → Core/src/main/java/com/plotsquared/core/command/Like.java
View File

@ -1,18 +1,18 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.config.Settings; import com.plotsquared.core.config.Settings;
import com.plotsquared.database.DBFunc; import com.plotsquared.core.database.DBFunc;
import com.plotsquared.events.PlotRateEvent; import com.plotsquared.core.events.PlotRateEvent;
import com.plotsquared.plot.flags.implementations.DoneFlag; import com.plotsquared.core.plot.flag.implementations.DoneFlag;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.plot.Rating; import com.plotsquared.core.plot.Rating;
import com.plotsquared.events.TeleportCause; import com.plotsquared.core.events.TeleportCause;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.Permissions; import com.plotsquared.core.util.Permissions;
import com.plotsquared.util.tasks.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;

42
Core/src/main/java/com/plotsquared/commands/ListCmd.java → Core/src/main/java/com/plotsquared/core/command/ListCmd.java
View File

@ -1,25 +1,25 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.PlotSquared.SortType; import com.plotsquared.core.PlotSquared.SortType;
import com.plotsquared.config.CaptionUtility; import com.plotsquared.core.config.CaptionUtility;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.plot.flags.implementations.DoneFlag; import com.plotsquared.core.plot.flag.implementations.DoneFlag;
import com.plotsquared.plot.flags.implementations.PriceFlag; import com.plotsquared.core.plot.flag.implementations.PriceFlag;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.plot.PlotArea; import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.plot.message.PlotMessage; import com.plotsquared.core.plot.message.PlotMessage;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.plot.Rating; import com.plotsquared.core.plot.Rating;
import com.plotsquared.util.tasks.RunnableVal3; import com.plotsquared.core.util.task.RunnableVal3;
import com.plotsquared.util.EconHandler; import com.plotsquared.core.util.EconHandler;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.MathMan; import com.plotsquared.core.util.MathMan;
import com.plotsquared.util.Permissions; import com.plotsquared.core.util.Permissions;
import com.plotsquared.util.StringComparison; import com.plotsquared.core.util.StringComparison;
import com.plotsquared.util.StringMan; import com.plotsquared.core.util.StringMan;
import com.plotsquared.util.uuid.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandler;
import com.plotsquared.plot.expiration.ExpireManager; import com.plotsquared.core.plot.expiration.ExpireManager;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;

28
Core/src/main/java/com/plotsquared/commands/Load.java → Core/src/main/java/com/plotsquared/core/command/Load.java
View File

@ -1,18 +1,18 @@
package com.plotsquared.commands; package com.plotsquared.core.command;
import com.plotsquared.PlotSquared; import com.plotsquared.core.PlotSquared;
import com.plotsquared.config.Captions; import com.plotsquared.core.config.Captions;
import com.plotsquared.config.Settings; import com.plotsquared.core.config.Settings;
import com.plotsquared.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.plotsquared.plot.PlotArea; import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.plot.PlotId; import com.plotsquared.core.plot.PlotId;
import com.plotsquared.player.PlotPlayer; import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.util.tasks.RunnableVal; import com.plotsquared.core.util.task.RunnableVal;
import com.plotsquared.plot.schematic.Schematic; import com.plotsquared.core.plot.schematic.Schematic;
import com.plotsquared.util.MainUtil; import com.plotsquared.core.util.MainUtil;
import com.plotsquared.util.Permissions; import com.plotsquared.core.util.Permissions;
import com.plotsquared.util.SchematicHandler; import com.plotsquared.core.util.SchematicHandler;
import com.plotsquared.util.tasks.TaskManager; import com.plotsquared.core.util.task.TaskManager;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;

Some files were not shown because too many files have changed in this diff Show More