diff --git a/PlotSquared/PlotSquared.iml b/PlotSquared/PlotSquared.iml index a03cc3899..00d921f84 100644 --- a/PlotSquared/PlotSquared.iml +++ b/PlotSquared/PlotSquared.iml @@ -1,16 +1,26 @@ - - - + + + + - + + + + - - - - + + + + + + + + + + diff --git a/PlotSquared/pom.xml b/PlotSquared/pom.xml new file mode 100644 index 000000000..91d6984e6 --- /dev/null +++ b/PlotSquared/pom.xml @@ -0,0 +1,96 @@ + + + 4.0.0 + com.intellectualcrafters + + PlotSquared + 2.2.0 + PlotSquared + jar + + PlotSquared + src/main/java + + + . + true + ${basedir}/src/main/resources/ + + + plugin.yml + + + + + + + maven-compiler-plugin + 2.3.2 + + 1.7 + 1.7 + + + + + + + bukkit-repo + http://repo.bukkit.org/content/groups/public/ + + + confuser-repo + http://ci.frostcast.net/plugin/repository/everything + + + hawkfalcon-repo + http://ci.hawkfalcon.com/plugin/repository/everything/ + + + sk80q + http://maven.sk89q.com/artifactory/repo/ + + + vault-repo + http://nexus.theyeticave.net/content/repositories/pub_releases + + + + + net.milkbowl.vault + Vault + 1.3.2 + + + org.bukkit + bukkit + 1.7.10-R0.1-SNAPSHOT + + + com.sk89q + worldedit + 6.0.0-SNAPSHOT + jar + compile + + + me.confuser + BarAPI + 2.0 + + + com.sk89q + worldguard + 5.9 + jar + compile + + + com.worldcretornica + PlotMe-Core + 0.14-SNAPSHOT + + + \ No newline at end of file diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Camera.java b/PlotSquared/src/com/intellectualcrafters/plot/commands/Camera.java deleted file mode 100644 index bc97008c2..000000000 --- a/PlotSquared/src/com/intellectualcrafters/plot/commands/Camera.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.intellectualcrafters.plot.commands; - -import java.util.ArrayList; - -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.World; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; - -import ca.mera.CameraAPI; -import ca.mera.CameraController; -import ca.mera.events.TravelEndEvent; - -import com.intellectualcrafters.plot.C; -import com.intellectualcrafters.plot.PlayerFunctions; -import com.intellectualcrafters.plot.Plot; -import com.intellectualcrafters.plot.PlotHelper; - -/** - * Created by Citymonstret on 2014-08-15. - */ -public class Camera extends SubCommand implements Listener { - - private CameraAPI api; - - public Camera() { - super("camera", "plots.camera", "Go into camera mode", "camera", "c", CommandCategory.TELEPORT, true); - this.api = CameraAPI.getInstance(); - this.travelers = new ArrayList(); - } - - private ArrayList travelers; - - @Override - public boolean execute(Player player, String... args) { - if (!PlayerFunctions.isInPlot(player)) { - PlayerFunctions.sendMessage(player, C.NOT_IN_PLOT); - return false; - } - this.api = CameraAPI.getInstance(); - Plot plot = PlotHelper.getCurrentPlot(player.getLocation()); - if (this.api.isTravelling(player)) { - this.api.stopTravel(player); - PlayerFunctions.sendMessage(player, C.CAMERA_STOPPED); - return true; - } - this.api.travel(getController(player, plot)); - PlayerFunctions.sendMessage(player, C.CAMERA_STARTED, plot.getId().x + ";" + plot.getId().y); - this.travelers.add(player.getName()); - return true; - } - - @EventHandler - public void onTravelEnded(TravelEndEvent event) { - if (this.travelers.contains(event.getPlayer().getName())) { - - this.travelers.remove(event.getPlayer().getName()); - PlayerFunctions.sendMessage(event.getPlayer(), C.CAMERA_STOPPED); - } - if (this.travelers.contains(event.getPlayer().getName())) { - event.getHandlers().bake(); - } - } - - public CameraController getController(Player player, Plot plot) { - World w = Bukkit.getWorld(plot.world); - int seconds = PlotHelper.getPlotWidth(w, plot.id) * 5; - Location loc1, loc2, loc3, loc4, loc5; - double y = player.getLocation().getY(); - Location bottomLoc = PlotHelper.getPlotBottomLoc(w, plot.id); - Location topLoc = PlotHelper.getPlotTopLoc(w, plot.id); - World world = bottomLoc.getWorld(); - int maxX = Math.max(bottomLoc.getBlockX(), topLoc.getBlockX()); - int maxZ = Math.max(bottomLoc.getBlockZ(), topLoc.getBlockZ()); - int minX = Math.min(bottomLoc.getBlockX(), topLoc.getBlockX()); - int minZ = Math.min(bottomLoc.getBlockZ(), topLoc.getBlockZ()); - loc1 = new Location(world, maxX, y, maxZ); - loc2 = new Location(world, maxX, y, minZ); - loc3 = new Location(world, minX, y, minZ); - loc4 = new Location(world, minX, y, maxZ); - loc1.setYaw(((3 / 4.0F) * 360.0F) - 0.5F); - loc3.setYaw(((1 / 4.0F) * 360.0F) - 0.5F); - loc4.setYaw(((2 / 4.0F) * 360.0F) - 0.5F); - loc2.setYaw(((0 / 4.0F) * 360.0F) - 0.5F); - loc5 = loc1.clone(); - CameraController controller = this.api.createController(player, seconds, loc1, loc2, loc3, loc4, loc5); - return controller; - } -} diff --git a/PlotSquared/src/com/intellectualcrafters/jnbt/ByteArrayTag.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ByteArrayTag.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/jnbt/ByteArrayTag.java rename to PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ByteArrayTag.java diff --git a/PlotSquared/src/com/intellectualcrafters/jnbt/ByteTag.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ByteTag.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/jnbt/ByteTag.java rename to PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ByteTag.java diff --git a/PlotSquared/src/com/intellectualcrafters/jnbt/CompoundTag.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/CompoundTag.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/jnbt/CompoundTag.java rename to PlotSquared/src/main/java/com/intellectualcrafters/jnbt/CompoundTag.java diff --git a/PlotSquared/src/com/intellectualcrafters/jnbt/CompoundTagBuilder.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/CompoundTagBuilder.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/jnbt/CompoundTagBuilder.java rename to PlotSquared/src/main/java/com/intellectualcrafters/jnbt/CompoundTagBuilder.java diff --git a/PlotSquared/src/com/intellectualcrafters/jnbt/DoubleTag.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/DoubleTag.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/jnbt/DoubleTag.java rename to PlotSquared/src/main/java/com/intellectualcrafters/jnbt/DoubleTag.java diff --git a/PlotSquared/src/com/intellectualcrafters/jnbt/EndTag.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/EndTag.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/jnbt/EndTag.java rename to PlotSquared/src/main/java/com/intellectualcrafters/jnbt/EndTag.java diff --git a/PlotSquared/src/com/intellectualcrafters/jnbt/FloatTag.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/FloatTag.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/jnbt/FloatTag.java rename to PlotSquared/src/main/java/com/intellectualcrafters/jnbt/FloatTag.java diff --git a/PlotSquared/src/com/intellectualcrafters/jnbt/IntArrayTag.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/IntArrayTag.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/jnbt/IntArrayTag.java rename to PlotSquared/src/main/java/com/intellectualcrafters/jnbt/IntArrayTag.java diff --git a/PlotSquared/src/com/intellectualcrafters/jnbt/IntTag.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/IntTag.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/jnbt/IntTag.java rename to PlotSquared/src/main/java/com/intellectualcrafters/jnbt/IntTag.java diff --git a/PlotSquared/src/com/intellectualcrafters/jnbt/ListTag.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ListTag.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/jnbt/ListTag.java rename to PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ListTag.java diff --git a/PlotSquared/src/com/intellectualcrafters/jnbt/ListTagBuilder.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ListTagBuilder.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/jnbt/ListTagBuilder.java rename to PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ListTagBuilder.java diff --git a/PlotSquared/src/com/intellectualcrafters/jnbt/LongTag.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/LongTag.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/jnbt/LongTag.java rename to PlotSquared/src/main/java/com/intellectualcrafters/jnbt/LongTag.java diff --git a/PlotSquared/src/com/intellectualcrafters/jnbt/NBTConstants.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTConstants.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/jnbt/NBTConstants.java rename to PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTConstants.java diff --git a/PlotSquared/src/com/intellectualcrafters/jnbt/NBTInputStream.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTInputStream.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/jnbt/NBTInputStream.java rename to PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTInputStream.java diff --git a/PlotSquared/src/com/intellectualcrafters/jnbt/NBTOutputStream.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTOutputStream.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/jnbt/NBTOutputStream.java rename to PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTOutputStream.java diff --git a/PlotSquared/src/com/intellectualcrafters/jnbt/NBTUtils.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTUtils.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/jnbt/NBTUtils.java rename to PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTUtils.java diff --git a/PlotSquared/src/com/intellectualcrafters/jnbt/ShortTag.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ShortTag.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/jnbt/ShortTag.java rename to PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ShortTag.java diff --git a/PlotSquared/src/com/intellectualcrafters/jnbt/StringTag.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/StringTag.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/jnbt/StringTag.java rename to PlotSquared/src/main/java/com/intellectualcrafters/jnbt/StringTag.java diff --git a/PlotSquared/src/com/intellectualcrafters/jnbt/Tag.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/Tag.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/jnbt/Tag.java rename to PlotSquared/src/main/java/com/intellectualcrafters/jnbt/Tag.java diff --git a/PlotSquared/src/com/intellectualcrafters/json/CDL.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/CDL.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/json/CDL.java rename to PlotSquared/src/main/java/com/intellectualcrafters/json/CDL.java diff --git a/PlotSquared/src/com/intellectualcrafters/json/Cookie.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/Cookie.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/json/Cookie.java rename to PlotSquared/src/main/java/com/intellectualcrafters/json/Cookie.java diff --git a/PlotSquared/src/com/intellectualcrafters/json/CookieList.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/CookieList.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/json/CookieList.java rename to PlotSquared/src/main/java/com/intellectualcrafters/json/CookieList.java diff --git a/PlotSquared/src/com/intellectualcrafters/json/HTTP.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/HTTP.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/json/HTTP.java rename to PlotSquared/src/main/java/com/intellectualcrafters/json/HTTP.java diff --git a/PlotSquared/src/com/intellectualcrafters/json/HTTPTokener.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/HTTPTokener.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/json/HTTPTokener.java rename to PlotSquared/src/main/java/com/intellectualcrafters/json/HTTPTokener.java diff --git a/PlotSquared/src/com/intellectualcrafters/json/JSONArray.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONArray.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/json/JSONArray.java rename to PlotSquared/src/main/java/com/intellectualcrafters/json/JSONArray.java diff --git a/PlotSquared/src/com/intellectualcrafters/json/JSONException.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONException.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/json/JSONException.java rename to PlotSquared/src/main/java/com/intellectualcrafters/json/JSONException.java diff --git a/PlotSquared/src/com/intellectualcrafters/json/JSONML.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONML.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/json/JSONML.java rename to PlotSquared/src/main/java/com/intellectualcrafters/json/JSONML.java diff --git a/PlotSquared/src/com/intellectualcrafters/json/JSONObject.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONObject.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/json/JSONObject.java rename to PlotSquared/src/main/java/com/intellectualcrafters/json/JSONObject.java diff --git a/PlotSquared/src/com/intellectualcrafters/json/JSONString.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONString.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/json/JSONString.java rename to PlotSquared/src/main/java/com/intellectualcrafters/json/JSONString.java diff --git a/PlotSquared/src/com/intellectualcrafters/json/JSONStringer.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONStringer.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/json/JSONStringer.java rename to PlotSquared/src/main/java/com/intellectualcrafters/json/JSONStringer.java diff --git a/PlotSquared/src/com/intellectualcrafters/json/JSONTokener.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONTokener.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/json/JSONTokener.java rename to PlotSquared/src/main/java/com/intellectualcrafters/json/JSONTokener.java diff --git a/PlotSquared/src/com/intellectualcrafters/json/JSONWriter.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONWriter.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/json/JSONWriter.java rename to PlotSquared/src/main/java/com/intellectualcrafters/json/JSONWriter.java diff --git a/PlotSquared/src/com/intellectualcrafters/json/Kim.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/Kim.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/json/Kim.java rename to PlotSquared/src/main/java/com/intellectualcrafters/json/Kim.java diff --git a/PlotSquared/src/com/intellectualcrafters/json/Property.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/Property.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/json/Property.java rename to PlotSquared/src/main/java/com/intellectualcrafters/json/Property.java diff --git a/PlotSquared/src/com/intellectualcrafters/json/XML.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/XML.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/json/XML.java rename to PlotSquared/src/main/java/com/intellectualcrafters/json/XML.java diff --git a/PlotSquared/src/com/intellectualcrafters/json/XMLTokener.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/XMLTokener.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/json/XMLTokener.java rename to PlotSquared/src/main/java/com/intellectualcrafters/json/XMLTokener.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/AbstractFlag.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/AbstractFlag.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/AbstractFlag.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/AbstractFlag.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/BlockWrapper.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/BlockWrapper.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/BlockWrapper.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/BlockWrapper.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/C.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/C.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/C.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/C.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/Configuration.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/Configuration.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/Configuration.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/Configuration.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/ConfigurationNode.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/ConfigurationNode.java similarity index 99% rename from PlotSquared/src/com/intellectualcrafters/plot/ConfigurationNode.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/ConfigurationNode.java index f69e15cf0..802da7517 100644 --- a/PlotSquared/src/com/intellectualcrafters/plot/ConfigurationNode.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/ConfigurationNode.java @@ -1,10 +1,9 @@ package com.intellectualcrafters.plot; -import java.util.Arrays; - +import com.intellectualcrafters.plot.Configuration.SettingValue; import org.apache.commons.lang.StringUtils; -import com.intellectualcrafters.plot.Configuration.SettingValue; +import java.util.Arrays; public class ConfigurationNode { private String constant; diff --git a/PlotSquared/src/com/intellectualcrafters/plot/ConsoleColors.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/ConsoleColors.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/ConsoleColors.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/ConsoleColors.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/Flag.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/Flag.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/Flag.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/Flag.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/FlagManager.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/FlagManager.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/FlagManager.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/FlagManager.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/LSetCube.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/LSetCube.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/LSetCube.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/LSetCube.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/Lag.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/Lag.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/Lag.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/Lag.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/Logger.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/Logger.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/Logger.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/Logger.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/Metrics.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/Metrics.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/Metrics.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/Metrics.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/PWE.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PWE.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/PWE.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/PWE.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/PlayerFunctions.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlayerFunctions.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/PlayerFunctions.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/PlayerFunctions.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/Plot.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/Plot.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/Plot.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/Plot.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/PlotBlock.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotBlock.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/PlotBlock.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotBlock.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/PlotComment.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotComment.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/PlotComment.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotComment.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/PlotGenerator.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotGenerator.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/PlotGenerator.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotGenerator.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotHelper.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotHelper.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/PlotHomePosition.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotHomePosition.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/PlotHomePosition.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotHomePosition.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/PlotId.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotId.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/PlotId.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotId.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotMain.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotMain.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/PlotManager.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotManager.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/PlotManager.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotManager.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/PlotSelection.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSelection.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/PlotSelection.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSelection.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/PlotSettings.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSettings.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/PlotSettings.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSettings.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/PlotSquaredException.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSquaredException.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/PlotSquaredException.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSquaredException.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/PlotWorld.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotWorld.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/PlotWorld.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotWorld.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/RUtils.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/RUtils.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/RUtils.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/RUtils.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/ReflectionUtils.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/ReflectionUtils.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/ReflectionUtils.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/ReflectionUtils.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/SchematicHandler.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/SchematicHandler.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/SchematicHandler.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/SchematicHandler.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/SetBlockFast.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/SetBlockFast.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/SetBlockFast.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/SetBlockFast.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/Settings.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/Settings.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/Settings.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/Settings.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/StringWrapper.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/StringWrapper.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/StringWrapper.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/StringWrapper.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/Title.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/Title.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/Title.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/Title.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/UUIDHandler.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/UUIDHandler.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/UUIDHandler.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/UUIDHandler.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/api/PlotAPI.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/api/PlotAPI.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Auto.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Auto.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Auto.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Auto.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Claim.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Claim.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Claim.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Claim.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Clear.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Clear.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Clear.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Clear.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Clipboard.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Clipboard.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Clipboard.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Clipboard.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Command.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Command.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Command.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Command.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/CommandPermission.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/CommandPermission.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/CommandPermission.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/CommandPermission.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Comment.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Comment.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Comment.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Comment.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Copy.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Copy.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Copy.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Copy.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Debug.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Debug.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Debug.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Debug.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/DebugClaimTest.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/DebugClaimTest.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Delete.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Delete.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Delete.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Delete.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Denied.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Denied.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Denied.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Denied.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Help.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Help.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Help.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Help.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Helpers.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Helpers.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Helpers.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Helpers.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Home.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Home.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Home.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Home.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Inbox.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Inbox.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Inbox.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Inbox.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Info.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Info.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Info.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Info.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Inventory.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Inventory.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Inventory.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Inventory.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Kick.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Kick.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Kick.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Kick.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/MainCommand.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/MainCommand.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Merge.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Merge.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Merge.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Merge.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Paste.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Paste.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Paste.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Paste.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Purge.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Purge.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Purge.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Purge.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Rate.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Rate.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Rate.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Rate.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Reload.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Reload.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Reload.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Reload.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Schematic.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Schematic.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Schematic.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Schematic.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Set.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Set.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Set.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Set.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/SetOwner.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/SetOwner.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/SetOwner.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/SetOwner.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Setup.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Setup.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Setup.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Setup.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/SubCommand.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/SubCommand.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/SubCommand.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/SubCommand.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Swap.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Swap.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Swap.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Swap.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/TP.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/TP.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/TP.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/TP.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Trusted.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Trusted.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Trusted.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Trusted.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Unlink.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unlink.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Unlink.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unlink.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Visit.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Visit.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/Visit.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Visit.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/list.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/list.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/list.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/list.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/plugin.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/plugin.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/commands/plugin.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/plugin.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/database/AbstractDB.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/AbstractDB.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/database/AbstractDB.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/database/AbstractDB.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/DBFunc.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/database/DBFunc.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/database/Database.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/Database.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/database/Database.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/database/Database.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/database/FlatFileManager.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/FlatFileManager.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/database/FlatFileManager.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/database/FlatFileManager.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/database/MySQL.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/MySQL.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/database/MySQL.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/database/MySQL.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/database/PlotMeConverter.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/PlotMeConverter.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/database/PlotMeConverter.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/database/PlotMeConverter.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/database/SQLManager.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/database/SQLManager.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/database/SQLite.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLite.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/database/SQLite.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLite.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerClaimPlotEvent.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerClaimPlotEvent.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/events/PlayerClaimPlotEvent.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerClaimPlotEvent.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerEnterPlotEvent.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerEnterPlotEvent.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/events/PlayerEnterPlotEvent.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerEnterPlotEvent.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerLeavePlotEvent.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerLeavePlotEvent.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/events/PlayerLeavePlotEvent.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerLeavePlotEvent.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerPlotDeniedEvent.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotDeniedEvent.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/events/PlayerPlotDeniedEvent.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotDeniedEvent.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerPlotHelperEvent.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotHelperEvent.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/events/PlayerPlotHelperEvent.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotHelperEvent.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerPlotTrustedEvent.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotTrustedEvent.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/events/PlayerPlotTrustedEvent.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotTrustedEvent.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/events/PlayerTeleportToPlotEvent.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerTeleportToPlotEvent.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/events/PlayerTeleportToPlotEvent.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerTeleportToPlotEvent.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/events/PlotClearEvent.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotClearEvent.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/events/PlotClearEvent.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotClearEvent.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/events/PlotDeleteEvent.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotDeleteEvent.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/events/PlotDeleteEvent.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotDeleteEvent.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/events/PlotFlagAddEvent.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotFlagAddEvent.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/events/PlotFlagAddEvent.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotFlagAddEvent.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/events/PlotFlagRemoveEvent.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotFlagRemoveEvent.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/events/PlotFlagRemoveEvent.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotFlagRemoveEvent.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/events/PlotMergeEvent.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotMergeEvent.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/events/PlotMergeEvent.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotMergeEvent.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/events/PlotUnlinkEvent.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotUnlinkEvent.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/events/PlotUnlinkEvent.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotUnlinkEvent.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/generator/DefaultPlotManager.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/DefaultPlotManager.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/generator/DefaultPlotManager.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/DefaultPlotManager.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/generator/DefaultPlotWorld.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/DefaultPlotWorld.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/generator/DefaultPlotWorld.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/DefaultPlotWorld.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/generator/WorldGenerator.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/WorldGenerator.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/generator/WorldGenerator.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/WorldGenerator.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/generator/XPopulator.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/XPopulator.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/generator/XPopulator.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/XPopulator.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlotListener.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlotListener.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/listeners/PlotListener.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlotListener.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/listeners/WorldEditListener.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldEditListener.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/listeners/WorldEditListener.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldEditListener.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/listeners/WorldGuardListener.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldGuardListener.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/listeners/WorldGuardListener.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldGuardListener.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/uuid/NameFetcher.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/NameFetcher.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/uuid/NameFetcher.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/NameFetcher.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/uuid/PlotUUIDSaver.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/PlotUUIDSaver.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/uuid/PlotUUIDSaver.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/PlotUUIDSaver.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/uuid/UUIDFetcher.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/UUIDFetcher.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/uuid/UUIDFetcher.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/UUIDFetcher.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/uuid/UUIDSaver.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/UUIDSaver.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/uuid/UUIDSaver.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/UUIDSaver.java diff --git a/PlotSquared/src/com/intellectualcrafters/plot/uuid/UUIDSet.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/UUIDSet.java similarity index 100% rename from PlotSquared/src/com/intellectualcrafters/plot/uuid/UUIDSet.java rename to PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/UUIDSet.java diff --git a/PlotSquared/src/plugin.yml b/PlotSquared/src/main/resources/plugin.yml similarity index 100% rename from PlotSquared/src/plugin.yml rename to PlotSquared/src/main/resources/plugin.yml