diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java similarity index 93% rename from Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java index d8e13d446..92b6e56a5 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java @@ -1,33 +1,33 @@ -package com.plotsquared.bukkit; +package com.github.intellectualsites.plotsquared.bukkit; -import com.intellectualcrafters.configuration.ConfigurationSection; -import com.intellectualcrafters.plot.IPlotMain; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.ConfigurationNode; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.generator.GeneratorWrapper; -import com.intellectualcrafters.plot.generator.HybridGen; -import com.intellectualcrafters.plot.generator.HybridUtils; -import com.intellectualcrafters.plot.generator.IndependentPlotGenerator; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.object.chat.PlainChatManager; -import com.intellectualcrafters.plot.object.worlds.PlotAreaManager; -import com.intellectualcrafters.plot.object.worlds.SinglePlotArea; -import com.intellectualcrafters.plot.object.worlds.SinglePlotAreaManager; -import com.intellectualcrafters.plot.object.worlds.SingleWorldGenerator; -import com.intellectualcrafters.plot.util.*; -import com.intellectualcrafters.plot.util.block.QueueProvider; -import com.intellectualcrafters.plot.uuid.UUIDWrapper; -import com.plotsquared.bukkit.database.plotme.ClassicPlotMeConnector; -import com.plotsquared.bukkit.database.plotme.LikePlotMeConverter; -import com.plotsquared.bukkit.database.plotme.PlotMeConnector_017; -import com.plotsquared.bukkit.generator.BukkitPlotGenerator; -import com.plotsquared.bukkit.listeners.*; -import com.plotsquared.bukkit.titles.DefaultTitle_111; -import com.plotsquared.bukkit.util.*; -import com.plotsquared.bukkit.util.block.*; -import com.plotsquared.bukkit.uuid.*; +import com.github.intellectualsites.plotsquared.bukkit.database.plotme.ClassicPlotMeConnector; +import com.github.intellectualsites.plotsquared.bukkit.database.plotme.LikePlotMeConverter; +import com.github.intellectualsites.plotsquared.bukkit.database.plotme.PlotMeConnector_017; +import com.github.intellectualsites.plotsquared.bukkit.generator.BukkitPlotGenerator; +import com.github.intellectualsites.plotsquared.bukkit.listeners.*; +import com.github.intellectualsites.plotsquared.bukkit.titles.DefaultTitle_111; +import com.github.intellectualsites.plotsquared.bukkit.util.*; +import com.github.intellectualsites.plotsquared.bukkit.util.block.*; +import com.github.intellectualsites.plotsquared.bukkit.uuid.*; +import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; +import com.github.intellectualsites.plotsquared.plot.IPlotMain; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; +import com.github.intellectualsites.plotsquared.plot.generator.HybridGen; +import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; +import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.object.chat.PlainChatManager; +import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; +import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea; +import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; +import com.github.intellectualsites.plotsquared.plot.object.worlds.SingleWorldGenerator; +import com.github.intellectualsites.plotsquared.plot.util.*; +import com.github.intellectualsites.plotsquared.plot.util.block.QueueProvider; +import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; import com.sk89q.worldedit.WorldEdit; import org.bukkit.*; import org.bukkit.Location; @@ -49,7 +49,7 @@ import java.lang.reflect.Method; import java.util.*; import java.util.concurrent.ConcurrentHashMap; -import static com.intellectualcrafters.plot.util.ReflectionUtils.getRefClass; +import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass; public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain { @@ -350,7 +350,8 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain case MINECART_TNT: case BOAT: if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) { - com.intellectualcrafters.plot.object.Location location = + com.github.intellectualsites.plotsquared.plot.object.Location + location = BukkitUtil.getLocation(entity.getLocation()); Plot plot = location.getPlot(); if (plot == null) { @@ -479,7 +480,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain PlotId originalPlotId = (PlotId) meta.get(0).value(); if (originalPlotId != null) { - com.intellectualcrafters.plot.object.Location + com.github.intellectualsites.plotsquared.plot.object.Location pLoc = BukkitUtil .getLocation(entity.getLocation()); PlotArea area = pLoc.getPlotArea(); @@ -497,7 +498,8 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain } } else { //This is to apply the metadata to already spawned shulkers (see EntitySpawnListener.java) - com.intellectualcrafters.plot.object.Location pLoc = + com.github.intellectualsites.plotsquared.plot.object.Location + pLoc = BukkitUtil.getLocation(entity.getLocation()); PlotArea area = pLoc.getPlotArea(); if (area != null) { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/chat/ArrayWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/ArrayWrapper.java similarity index 97% rename from Bukkit/src/main/java/com/plotsquared/bukkit/chat/ArrayWrapper.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/ArrayWrapper.java index 269588f01..064d77d86 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/chat/ArrayWrapper.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/ArrayWrapper.java @@ -1,4 +1,4 @@ -package com.plotsquared.bukkit.chat; +package com.github.intellectualsites.plotsquared.bukkit.chat; import org.apache.commons.lang.Validate; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java similarity index 98% rename from Bukkit/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java index 544713a9c..3b2c5bf82 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java @@ -1,4 +1,4 @@ -package com.plotsquared.bukkit.chat; +package com.github.intellectualsites.plotsquared.bukkit.chat; import com.google.gson.JsonArray; import com.google.gson.JsonElement; @@ -20,8 +20,6 @@ import java.lang.reflect.*; import java.util.*; import java.util.logging.Level; -import static com.plotsquared.bukkit.chat.TextualComponent.rawText; - /** * Represents a formattable message. Such messages can use elements such as colors, formatting codes, hover and click data, and other features provided by the vanilla Minecraft JSON message formatter. * This class allows plugins to emulate the functionality of the vanilla Minecraft tellraw command. @@ -55,7 +53,7 @@ public class FancyMessage * @param firstPartText The existing text in the message. */ public FancyMessage(final String firstPartText) { - this(rawText(firstPartText)); + this(TextualComponent.rawText(firstPartText)); } private FancyMessage(final TextualComponent firstPartText) { @@ -198,7 +196,7 @@ public class FancyMessage */ public FancyMessage text(String text) { MessagePart latest = latest(); - latest.text = rawText(text); + latest.text = TextualComponent.rawText(text); dirty = true; return this; } @@ -514,7 +512,7 @@ public class FancyMessage * @return This builder instance. */ public FancyMessage tooltip(final Iterable lines) { - tooltip(com.plotsquared.bukkit.chat.ArrayWrapper.toArray(lines, String.class)); + tooltip(ArrayWrapper.toArray(lines, String.class)); return this; } /* @@ -605,7 +603,7 @@ public class FancyMessage } } if (i != lines.length - 1) { - result.messageParts.add(new MessagePart(rawText("\n"))); + result.messageParts.add(new MessagePart(TextualComponent.rawText("\n"))); } } catch (CloneNotSupportedException e) { Bukkit.getLogger().log(Level.WARNING, "Failed to clone object", e); @@ -625,7 +623,7 @@ public class FancyMessage */ public FancyMessage formattedTooltip(final Iterable lines) { return formattedTooltip( - com.plotsquared.bukkit.chat.ArrayWrapper.toArray(lines, FancyMessage.class)); + ArrayWrapper.toArray(lines, FancyMessage.class)); } /** @@ -667,7 +665,7 @@ public class FancyMessage */ public FancyMessage translationReplacements(final Iterable replacements) { return translationReplacements( - com.plotsquared.bukkit.chat.ArrayWrapper.toArray(replacements, FancyMessage.class)); + ArrayWrapper.toArray(replacements, FancyMessage.class)); } /** @@ -678,7 +676,7 @@ public class FancyMessage * @return This builder instance. */ public FancyMessage then(final String text) { - return then(rawText(text)); + return then(TextualComponent.rawText(text)); } /** diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/chat/JsonRepresentedObject.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/JsonRepresentedObject.java similarity index 88% rename from Bukkit/src/main/java/com/plotsquared/bukkit/chat/JsonRepresentedObject.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/JsonRepresentedObject.java index a4a66d3bf..04f036526 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/chat/JsonRepresentedObject.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/JsonRepresentedObject.java @@ -1,4 +1,4 @@ -package com.plotsquared.bukkit.chat; +package com.github.intellectualsites.plotsquared.bukkit.chat; import com.google.gson.stream.JsonWriter; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/chat/JsonString.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/JsonString.java similarity index 95% rename from Bukkit/src/main/java/com/plotsquared/bukkit/chat/JsonString.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/JsonString.java index 931ab9394..7f8dd4d29 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/chat/JsonString.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/JsonString.java @@ -1,4 +1,4 @@ -package com.plotsquared.bukkit.chat; +package com.github.intellectualsites.plotsquared.bukkit.chat; import com.google.gson.stream.JsonWriter; import org.bukkit.configuration.serialization.ConfigurationSerializable; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/chat/MessagePart.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/MessagePart.java similarity index 98% rename from Bukkit/src/main/java/com/plotsquared/bukkit/chat/MessagePart.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/MessagePart.java index 31f6d2522..6c2e838d6 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/chat/MessagePart.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/MessagePart.java @@ -1,4 +1,4 @@ -package com.plotsquared.bukkit.chat; +package com.github.intellectualsites.plotsquared.bukkit.chat; import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableBiMap; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/chat/Reflection.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/Reflection.java similarity index 99% rename from Bukkit/src/main/java/com/plotsquared/bukkit/chat/Reflection.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/Reflection.java index 7ef4b5160..79c445dcc 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/chat/Reflection.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/Reflection.java @@ -1,4 +1,4 @@ -package com.plotsquared.bukkit.chat; +package com.github.intellectualsites.plotsquared.bukkit.chat; import org.bukkit.Bukkit; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/chat/TextualComponent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/TextualComponent.java similarity index 99% rename from Bukkit/src/main/java/com/plotsquared/bukkit/chat/TextualComponent.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/TextualComponent.java index cd62548df..b8fc6dfa5 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/chat/TextualComponent.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/TextualComponent.java @@ -1,4 +1,4 @@ -package com.plotsquared.bukkit.chat; +package com.github.intellectualsites.plotsquared.bukkit.chat; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/commands/DebugUUID.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/commands/DebugUUID.java similarity index 90% rename from Bukkit/src/main/java/com/plotsquared/bukkit/commands/DebugUUID.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/commands/DebugUUID.java index fb664103a..df30144a5 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/commands/DebugUUID.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/commands/DebugUUID.java @@ -1,24 +1,24 @@ -package com.plotsquared.bukkit.commands; +package com.github.intellectualsites.plotsquared.bukkit.commands; +import com.github.intellectualsites.plotsquared.bukkit.uuid.DatFileFilter; +import com.github.intellectualsites.plotsquared.bukkit.uuid.DefaultUUIDWrapper; +import com.github.intellectualsites.plotsquared.bukkit.uuid.LowerOfflineUUIDWrapper; +import com.github.intellectualsites.plotsquared.bukkit.uuid.OfflineUUIDWrapper; +import com.github.intellectualsites.plotsquared.commands.Argument; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory; +import com.github.intellectualsites.plotsquared.plot.commands.RequiredType; +import com.github.intellectualsites.plotsquared.plot.commands.SubCommand; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; +import com.github.intellectualsites.plotsquared.plot.util.*; +import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; import com.google.common.collect.Sets; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.commands.CommandCategory; -import com.intellectualcrafters.plot.commands.RequiredType; -import com.intellectualcrafters.plot.commands.SubCommand; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.object.OfflinePlotPlayer; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.StringWrapper; -import com.intellectualcrafters.plot.util.*; -import com.intellectualcrafters.plot.uuid.UUIDWrapper; -import com.plotsquared.bukkit.uuid.DatFileFilter; -import com.plotsquared.bukkit.uuid.DefaultUUIDWrapper; -import com.plotsquared.bukkit.uuid.LowerOfflineUUIDWrapper; -import com.plotsquared.bukkit.uuid.OfflineUUIDWrapper; -import com.plotsquared.general.commands.Argument; -import com.plotsquared.general.commands.CommandDeclaration; import java.io.File; import java.io.IOException; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/APlotMeConnector.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/database/plotme/APlotMeConnector.java similarity index 89% rename from Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/APlotMeConnector.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/database/plotme/APlotMeConnector.java index 8d006a943..740307ad7 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/APlotMeConnector.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/database/plotme/APlotMeConnector.java @@ -1,10 +1,10 @@ -package com.plotsquared.bukkit.database.plotme; +package com.github.intellectualsites.plotsquared.bukkit.database.plotme; -import com.intellectualcrafters.configuration.file.FileConfiguration; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotId; +import com.github.intellectualsites.plotsquared.configuration.file.FileConfiguration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; import java.sql.Connection; import java.sql.SQLException; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/ClassicPlotMeConnector.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/database/plotme/ClassicPlotMeConnector.java similarity index 94% rename from Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/ClassicPlotMeConnector.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/database/plotme/ClassicPlotMeConnector.java index a67b0256e..17aaa2073 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/ClassicPlotMeConnector.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/database/plotme/ClassicPlotMeConnector.java @@ -1,13 +1,13 @@ -package com.plotsquared.bukkit.database.plotme; +package com.github.intellectualsites.plotsquared.bukkit.database.plotme; +import com.github.intellectualsites.plotsquared.configuration.file.FileConfiguration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.database.SQLite; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; import com.google.common.base.Charsets; -import com.intellectualcrafters.configuration.file.FileConfiguration; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.database.SQLite; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.UUIDHandler; import java.io.File; import java.nio.ByteBuffer; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/LikePlotMeConverter.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/database/plotme/LikePlotMeConverter.java similarity index 94% rename from Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/LikePlotMeConverter.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/database/plotme/LikePlotMeConverter.java index 16fe01f39..e42c87c61 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/LikePlotMeConverter.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/database/plotme/LikePlotMeConverter.java @@ -1,17 +1,17 @@ -package com.plotsquared.bukkit.database.plotme; +package com.github.intellectualsites.plotsquared.bukkit.database.plotme; -import com.intellectualcrafters.configuration.ConfigurationSection; -import com.intellectualcrafters.configuration.MemorySection; -import com.intellectualcrafters.configuration.file.FileConfiguration; -import com.intellectualcrafters.configuration.file.YamlConfiguration; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotArea; -import com.intellectualcrafters.plot.object.PlotId; -import com.intellectualcrafters.plot.util.TaskManager; -import com.plotsquared.bukkit.generator.BukkitPlotGenerator; +import com.github.intellectualsites.plotsquared.bukkit.generator.BukkitPlotGenerator; +import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; +import com.github.intellectualsites.plotsquared.configuration.MemorySection; +import com.github.intellectualsites.plotsquared.configuration.file.FileConfiguration; +import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.WorldCreator; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/PlotMeConnector_017.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/database/plotme/PlotMeConnector_017.java similarity index 93% rename from Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/PlotMeConnector_017.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/database/plotme/PlotMeConnector_017.java index 5617c1f9e..e3fc827bb 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/PlotMeConnector_017.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/database/plotme/PlotMeConnector_017.java @@ -1,12 +1,12 @@ -package com.plotsquared.bukkit.database.plotme; +package com.github.intellectualsites.plotsquared.bukkit.database.plotme; -import com.intellectualcrafters.configuration.file.FileConfiguration; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.database.SQLite; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.configuration.file.FileConfiguration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.database.SQLite; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; import java.io.File; import java.sql.*; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java similarity index 87% rename from Bukkit/src/main/java/com/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java index 10ae21dac..40acef111 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java @@ -1,7 +1,7 @@ -package com.plotsquared.bukkit.events; +package com.github.intellectualsites.plotsquared.bukkit.events; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.object.PlotCluster; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.object.PlotCluster; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerClaimPlotEvent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerClaimPlotEvent.java similarity index 90% rename from Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerClaimPlotEvent.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerClaimPlotEvent.java index e209849d5..269b64296 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerClaimPlotEvent.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerClaimPlotEvent.java @@ -1,59 +1,59 @@ -package com.plotsquared.bukkit.events; - -import com.intellectualcrafters.plot.object.Plot; -import org.bukkit.entity.Player; -import org.bukkit.event.Cancellable; -import org.bukkit.event.HandlerList; -import org.bukkit.event.player.PlayerEvent; - -public class PlayerClaimPlotEvent extends PlayerEvent implements Cancellable { - - private static final HandlerList handlers = new HandlerList(); - private final Plot plot; - private final boolean auto; - private boolean cancelled; - - /** - * PlayerClaimPlotEvent: Called when a plot is claimed. - * - * @param player Player that claimed the plot - * @param plot Plot that was claimed - */ - public PlayerClaimPlotEvent(Player player, Plot plot, boolean auto) { - super(player); - this.plot = plot; - this.auto = auto; - } - - public static HandlerList getHandlerList() { - return handlers; - } - - /** - * Get the plot involved - * - * @return Plot - */ - public Plot getPlot() { - return this.plot; - } - - /** - * @return true if it was an automated claim, else false - */ - public boolean wasAuto() { - return this.auto; - } - - @Override public HandlerList getHandlers() { - return handlers; - } - - @Override public boolean isCancelled() { - return this.cancelled; - } - - @Override public void setCancelled(boolean b) { - this.cancelled = b; - } -} +package com.github.intellectualsites.plotsquared.bukkit.events; + +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import org.bukkit.entity.Player; +import org.bukkit.event.Cancellable; +import org.bukkit.event.HandlerList; +import org.bukkit.event.player.PlayerEvent; + +public class PlayerClaimPlotEvent extends PlayerEvent implements Cancellable { + + private static final HandlerList handlers = new HandlerList(); + private final Plot plot; + private final boolean auto; + private boolean cancelled; + + /** + * PlayerClaimPlotEvent: Called when a plot is claimed. + * + * @param player Player that claimed the plot + * @param plot Plot that was claimed + */ + public PlayerClaimPlotEvent(Player player, Plot plot, boolean auto) { + super(player); + this.plot = plot; + this.auto = auto; + } + + public static HandlerList getHandlerList() { + return handlers; + } + + /** + * Get the plot involved + * + * @return Plot + */ + public Plot getPlot() { + return this.plot; + } + + /** + * @return true if it was an automated claim, else false + */ + public boolean wasAuto() { + return this.auto; + } + + @Override public HandlerList getHandlers() { + return handlers; + } + + @Override public boolean isCancelled() { + return this.cancelled; + } + + @Override public void setCancelled(boolean b) { + this.cancelled = b; + } +} diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerEnterPlotEvent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerEnterPlotEvent.java similarity index 86% rename from Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerEnterPlotEvent.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerEnterPlotEvent.java index 34c0f4f97..a40365b40 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerEnterPlotEvent.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerEnterPlotEvent.java @@ -1,40 +1,40 @@ -package com.plotsquared.bukkit.events; - -import com.intellectualcrafters.plot.object.Plot; -import org.bukkit.entity.Player; -import org.bukkit.event.HandlerList; -import org.bukkit.event.player.PlayerEvent; - -public class PlayerEnterPlotEvent extends PlayerEvent { - - private static final HandlerList handlers = new HandlerList(); - private final Plot plot; - - /** - * Called when a player leaves a plot. - * - * @param player Player that entered the plot - * @param plot Plot that was entered - */ - public PlayerEnterPlotEvent(Player player, Plot plot) { - super(player); - this.plot = plot; - } - - public static HandlerList getHandlerList() { - return handlers; - } - - /** - * Get the plot involved. - * - * @return Plot - */ - public Plot getPlot() { - return this.plot; - } - - @Override public HandlerList getHandlers() { - return handlers; - } -} +package com.github.intellectualsites.plotsquared.bukkit.events; + +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import org.bukkit.entity.Player; +import org.bukkit.event.HandlerList; +import org.bukkit.event.player.PlayerEvent; + +public class PlayerEnterPlotEvent extends PlayerEvent { + + private static final HandlerList handlers = new HandlerList(); + private final Plot plot; + + /** + * Called when a player leaves a plot. + * + * @param player Player that entered the plot + * @param plot Plot that was entered + */ + public PlayerEnterPlotEvent(Player player, Plot plot) { + super(player); + this.plot = plot; + } + + public static HandlerList getHandlerList() { + return handlers; + } + + /** + * Get the plot involved. + * + * @return Plot + */ + public Plot getPlot() { + return this.plot; + } + + @Override public HandlerList getHandlers() { + return handlers; + } +} diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerLeavePlotEvent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerLeavePlotEvent.java similarity index 86% rename from Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerLeavePlotEvent.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerLeavePlotEvent.java index 0b9f671aa..465e8cee9 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerLeavePlotEvent.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerLeavePlotEvent.java @@ -1,44 +1,44 @@ -package com.plotsquared.bukkit.events; - -import com.intellectualcrafters.plot.object.Plot; -import org.bukkit.entity.Player; -import org.bukkit.event.HandlerList; -import org.bukkit.event.player.PlayerEvent; - -/** - - - */ -public class PlayerLeavePlotEvent extends PlayerEvent { - - private static final HandlerList handlers = new HandlerList(); - private final Plot plot; - - /** - * PlayerLeavePlotEvent: Called when a player leaves a plot - * - * @param player Player that left the plot - * @param plot Plot that was left - */ - public PlayerLeavePlotEvent(Player player, Plot plot) { - super(player); - this.plot = plot; - } - - public static HandlerList getHandlerList() { - return handlers; - } - - /** - * Get the plot involved - * - * @return Plot - */ - public Plot getPlot() { - return this.plot; - } - - @Override public HandlerList getHandlers() { - return handlers; - } -} +package com.github.intellectualsites.plotsquared.bukkit.events; + +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import org.bukkit.entity.Player; +import org.bukkit.event.HandlerList; +import org.bukkit.event.player.PlayerEvent; + +/** + + + */ +public class PlayerLeavePlotEvent extends PlayerEvent { + + private static final HandlerList handlers = new HandlerList(); + private final Plot plot; + + /** + * PlayerLeavePlotEvent: Called when a player leaves a plot + * + * @param player Player that left the plot + * @param plot Plot that was left + */ + public PlayerLeavePlotEvent(Player player, Plot plot) { + super(player); + this.plot = plot; + } + + public static HandlerList getHandlerList() { + return handlers; + } + + /** + * Get the plot involved + * + * @return Plot + */ + public Plot getPlot() { + return this.plot; + } + + @Override public HandlerList getHandlers() { + return handlers; + } +} diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerPlotDeniedEvent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerPlotDeniedEvent.java similarity index 90% rename from Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerPlotDeniedEvent.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerPlotDeniedEvent.java index a06962c16..c9c4d56b9 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerPlotDeniedEvent.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerPlotDeniedEvent.java @@ -1,65 +1,65 @@ -package com.plotsquared.bukkit.events; - -import com.intellectualcrafters.plot.object.Plot; -import org.bukkit.entity.Player; -import org.bukkit.event.HandlerList; - -import java.util.UUID; - -public class PlayerPlotDeniedEvent extends PlotEvent { - - private static final HandlerList handlers = new HandlerList(); - private final Player initiator; - private final boolean added; - private final UUID player; - - /** - * PlayerPlotDeniedEvent: Called when the denied UUID list is modified for a plot. - * - * @param initiator Player that initiated the event - * @param plot Plot in which the event occurred - * @param player Player that was denied/un-denied - * @param added true of add to deny list, false if removed - */ - public PlayerPlotDeniedEvent(Player initiator, Plot plot, UUID player, boolean added) { - super(plot); - this.initiator = initiator; - this.added = added; - this.player = player; - } - - public static HandlerList getHandlerList() { - return handlers; - } - - /** - * If a user was added. - * - * @return boolean - */ - public boolean wasAdded() { - return this.added; - } - - /** - * The player added/removed. - * - * @return UUID - */ - public UUID getPlayer() { - return this.player; - } - - /** - * The player initiating the action. - * - * @return Player - */ - public Player getInitiator() { - return this.initiator; - } - - @Override public HandlerList getHandlers() { - return handlers; - } -} +package com.github.intellectualsites.plotsquared.bukkit.events; + +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import org.bukkit.entity.Player; +import org.bukkit.event.HandlerList; + +import java.util.UUID; + +public class PlayerPlotDeniedEvent extends PlotEvent { + + private static final HandlerList handlers = new HandlerList(); + private final Player initiator; + private final boolean added; + private final UUID player; + + /** + * PlayerPlotDeniedEvent: Called when the denied UUID list is modified for a plot. + * + * @param initiator Player that initiated the event + * @param plot Plot in which the event occurred + * @param player Player that was denied/un-denied + * @param added true of add to deny list, false if removed + */ + public PlayerPlotDeniedEvent(Player initiator, Plot plot, UUID player, boolean added) { + super(plot); + this.initiator = initiator; + this.added = added; + this.player = player; + } + + public static HandlerList getHandlerList() { + return handlers; + } + + /** + * If a user was added. + * + * @return boolean + */ + public boolean wasAdded() { + return this.added; + } + + /** + * The player added/removed. + * + * @return UUID + */ + public UUID getPlayer() { + return this.player; + } + + /** + * The player initiating the action. + * + * @return Player + */ + public Player getInitiator() { + return this.initiator; + } + + @Override public HandlerList getHandlers() { + return handlers; + } +} diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerPlotHelperEvent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerPlotHelperEvent.java similarity index 90% rename from Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerPlotHelperEvent.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerPlotHelperEvent.java index 0e7b33200..2773f9b73 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerPlotHelperEvent.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerPlotHelperEvent.java @@ -1,69 +1,69 @@ -package com.plotsquared.bukkit.events; - -import com.intellectualcrafters.plot.object.Plot; -import org.bukkit.entity.Player; -import org.bukkit.event.HandlerList; - -import java.util.UUID; - -/** - - - */ -public class PlayerPlotHelperEvent extends PlotEvent { - - private static final HandlerList handlers = new HandlerList(); - private final Player initiator; - private final boolean added; - private final UUID player; - - /** - * PlayerPlotHelperEvent: Called when a plot helper is added/removed - * - * @param initiator Player that initiated the event - * @param plot Plot in which the event occurred - * @param player Player that was added/removed from the helper list - * @param added true of the player was added, false if the player was removed - */ - public PlayerPlotHelperEvent(Player initiator, Plot plot, UUID player, boolean added) { - super(plot); - this.initiator = initiator; - this.added = added; - this.player = player; - } - - public static HandlerList getHandlerList() { - return handlers; - } - - /** - * If a player was added - * - * @return boolean - */ - public boolean wasAdded() { - return this.added; - } - - /** - * The UUID added/removed - * - * @return UUID - */ - public UUID getPlayer() { - return this.player; - } - - /** - * The player initiating the action - * - * @return Player - */ - public Player getInitiator() { - return this.initiator; - } - - @Override public HandlerList getHandlers() { - return handlers; - } -} +package com.github.intellectualsites.plotsquared.bukkit.events; + +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import org.bukkit.entity.Player; +import org.bukkit.event.HandlerList; + +import java.util.UUID; + +/** + + + */ +public class PlayerPlotHelperEvent extends PlotEvent { + + private static final HandlerList handlers = new HandlerList(); + private final Player initiator; + private final boolean added; + private final UUID player; + + /** + * PlayerPlotHelperEvent: Called when a plot helper is added/removed + * + * @param initiator Player that initiated the event + * @param plot Plot in which the event occurred + * @param player Player that was added/removed from the helper list + * @param added true of the player was added, false if the player was removed + */ + public PlayerPlotHelperEvent(Player initiator, Plot plot, UUID player, boolean added) { + super(plot); + this.initiator = initiator; + this.added = added; + this.player = player; + } + + public static HandlerList getHandlerList() { + return handlers; + } + + /** + * If a player was added + * + * @return boolean + */ + public boolean wasAdded() { + return this.added; + } + + /** + * The UUID added/removed + * + * @return UUID + */ + public UUID getPlayer() { + return this.player; + } + + /** + * The player initiating the action + * + * @return Player + */ + public Player getInitiator() { + return this.initiator; + } + + @Override public HandlerList getHandlers() { + return handlers; + } +} diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerPlotTrustedEvent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerPlotTrustedEvent.java similarity index 90% rename from Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerPlotTrustedEvent.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerPlotTrustedEvent.java index 824c1d2d7..95440056f 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerPlotTrustedEvent.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerPlotTrustedEvent.java @@ -1,69 +1,69 @@ -package com.plotsquared.bukkit.events; - -import com.intellectualcrafters.plot.object.Plot; -import org.bukkit.entity.Player; -import org.bukkit.event.HandlerList; - -import java.util.UUID; - -/** - - - */ -public class PlayerPlotTrustedEvent extends PlotEvent { - - private static final HandlerList handlers = new HandlerList(); - private final Player initiator; - private final boolean added; - private final UUID player; - - /** - * PlayerPlotTrustedEvent: Called when a plot trusted user is added/removed - * - * @param initiator Player that initiated the event - * @param plot Plot in which the event occurred - * @param player Player that was added/removed from the trusted list - * @param added true of the player was added, false if the player was removed - */ - public PlayerPlotTrustedEvent(Player initiator, Plot plot, UUID player, boolean added) { - super(plot); - this.initiator = initiator; - this.added = added; - this.player = player; - } - - public static HandlerList getHandlerList() { - return handlers; - } - - /** - * If a player was added - * - * @return boolean - */ - public boolean wasAdded() { - return this.added; - } - - /** - * The UUID added/removed - * - * @return UUID - */ - public UUID getPlayer() { - return this.player; - } - - /** - * The player initiating the action - * - * @return Player - */ - public Player getInitiator() { - return this.initiator; - } - - @Override public HandlerList getHandlers() { - return handlers; - } -} +package com.github.intellectualsites.plotsquared.bukkit.events; + +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import org.bukkit.entity.Player; +import org.bukkit.event.HandlerList; + +import java.util.UUID; + +/** + + + */ +public class PlayerPlotTrustedEvent extends PlotEvent { + + private static final HandlerList handlers = new HandlerList(); + private final Player initiator; + private final boolean added; + private final UUID player; + + /** + * PlayerPlotTrustedEvent: Called when a plot trusted user is added/removed + * + * @param initiator Player that initiated the event + * @param plot Plot in which the event occurred + * @param player Player that was added/removed from the trusted list + * @param added true of the player was added, false if the player was removed + */ + public PlayerPlotTrustedEvent(Player initiator, Plot plot, UUID player, boolean added) { + super(plot); + this.initiator = initiator; + this.added = added; + this.player = player; + } + + public static HandlerList getHandlerList() { + return handlers; + } + + /** + * If a player was added + * + * @return boolean + */ + public boolean wasAdded() { + return this.added; + } + + /** + * The UUID added/removed + * + * @return UUID + */ + public UUID getPlayer() { + return this.player; + } + + /** + * The player initiating the action + * + * @return Player + */ + public Player getInitiator() { + return this.initiator; + } + + @Override public HandlerList getHandlers() { + return handlers; + } +} diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerTeleportToPlotEvent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerTeleportToPlotEvent.java similarity index 87% rename from Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerTeleportToPlotEvent.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerTeleportToPlotEvent.java index 776fa0074..79d43391e 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerTeleportToPlotEvent.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerTeleportToPlotEvent.java @@ -1,66 +1,66 @@ -package com.plotsquared.bukkit.events; - -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import org.bukkit.entity.Player; -import org.bukkit.event.Cancellable; -import org.bukkit.event.HandlerList; -import org.bukkit.event.player.PlayerEvent; - -/** - * Called when a player teleports to a plot - */ -public class PlayerTeleportToPlotEvent extends PlayerEvent implements Cancellable { - - private static final HandlerList handlers = new HandlerList(); - private final Location from; - private final Plot plot; - private boolean cancelled; - - /** - * PlayerTeleportToPlotEvent: Called when a player teleports to a plot - * - * @param player That was teleported - * @param from Start location - * @param plot Plot to which the player was teleported - */ - public PlayerTeleportToPlotEvent(Player player, Location from, Plot plot) { - super(player); - this.from = from; - this.plot = plot; - } - - public static HandlerList getHandlerList() { - return handlers; - } - - @Override public HandlerList getHandlers() { - return handlers; - } - - /** - * Get the from location - * - * @return Location - */ - public Location getFrom() { - return this.from; - } - - /** - * Get the plot involved - * - * @return Plot - */ - public Plot getPlot() { - return this.plot; - } - - @Override public boolean isCancelled() { - return this.cancelled; - } - - @Override public void setCancelled(boolean cancelled) { - this.cancelled = cancelled; - } -} +package com.github.intellectualsites.plotsquared.bukkit.events; + +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import org.bukkit.entity.Player; +import org.bukkit.event.Cancellable; +import org.bukkit.event.HandlerList; +import org.bukkit.event.player.PlayerEvent; + +/** + * Called when a player teleports to a plot + */ +public class PlayerTeleportToPlotEvent extends PlayerEvent implements Cancellable { + + private static final HandlerList handlers = new HandlerList(); + private final Location from; + private final Plot plot; + private boolean cancelled; + + /** + * PlayerTeleportToPlotEvent: Called when a player teleports to a plot + * + * @param player That was teleported + * @param from Start location + * @param plot Plot to which the player was teleported + */ + public PlayerTeleportToPlotEvent(Player player, Location from, Plot plot) { + super(player); + this.from = from; + this.plot = plot; + } + + public static HandlerList getHandlerList() { + return handlers; + } + + @Override public HandlerList getHandlers() { + return handlers; + } + + /** + * Get the from location + * + * @return Location + */ + public Location getFrom() { + return this.from; + } + + /** + * Get the plot involved + * + * @return Plot + */ + public Plot getPlot() { + return this.plot; + } + + @Override public boolean isCancelled() { + return this.cancelled; + } + + @Override public void setCancelled(boolean cancelled) { + this.cancelled = cancelled; + } +} diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotClearEvent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotClearEvent.java similarity index 83% rename from Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotClearEvent.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotClearEvent.java index 124cccaa2..b4ab469a2 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotClearEvent.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotClearEvent.java @@ -1,53 +1,53 @@ -package com.plotsquared.bukkit.events; - -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotId; -import org.bukkit.event.Cancellable; -import org.bukkit.event.HandlerList; - -/** - * Called when a plot is cleared - */ -public class PlotClearEvent extends PlotEvent implements Cancellable { - - private static final HandlerList handlers = new HandlerList(); - private boolean cancelled; - - public PlotClearEvent(Plot plot) { - super(plot); - } - - public static HandlerList getHandlerList() { - return handlers; - } - - /** - * Get the PlotId. - * - * @return PlotId - */ - public PlotId getPlotId() { - return getPlot().getId(); - } - - /** - * Get the world name. - * - * @return String - */ - public String getWorld() { - return getPlot().getWorldName(); - } - - @Override public HandlerList getHandlers() { - return handlers; - } - - @Override public boolean isCancelled() { - return this.cancelled; - } - - @Override public void setCancelled(boolean b) { - this.cancelled = b; - } -} +package com.github.intellectualsites.plotsquared.bukkit.events; + +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; +import org.bukkit.event.Cancellable; +import org.bukkit.event.HandlerList; + +/** + * Called when a plot is cleared + */ +public class PlotClearEvent extends PlotEvent implements Cancellable { + + private static final HandlerList handlers = new HandlerList(); + private boolean cancelled; + + public PlotClearEvent(Plot plot) { + super(plot); + } + + public static HandlerList getHandlerList() { + return handlers; + } + + /** + * Get the PlotId. + * + * @return PlotId + */ + public PlotId getPlotId() { + return getPlot().getId(); + } + + /** + * Get the world name. + * + * @return String + */ + public String getWorld() { + return getPlot().getWorldName(); + } + + @Override public HandlerList getHandlers() { + return handlers; + } + + @Override public boolean isCancelled() { + return this.cancelled; + } + + @Override public void setCancelled(boolean b) { + this.cancelled = b; + } +} diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotComponentSetEvent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotComponentSetEvent.java similarity index 83% rename from Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotComponentSetEvent.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotComponentSetEvent.java index 2578007ab..6911ccdd4 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotComponentSetEvent.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotComponentSetEvent.java @@ -1,7 +1,7 @@ -package com.plotsquared.bukkit.events; +package com.github.intellectualsites.plotsquared.bukkit.events; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotId; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; import org.bukkit.event.HandlerList; /** diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotDeleteEvent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotDeleteEvent.java similarity index 78% rename from Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotDeleteEvent.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotDeleteEvent.java index 3be92f7c8..d8669279d 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotDeleteEvent.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotDeleteEvent.java @@ -1,43 +1,43 @@ -package com.plotsquared.bukkit.events; - -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotId; -import org.bukkit.event.HandlerList; - -/** - * Called when a plot is deleted - */ -public class PlotDeleteEvent extends PlotEvent { - - private static final HandlerList handlers = new HandlerList(); - - public PlotDeleteEvent(Plot plot) { - super(plot); - } - - public static HandlerList getHandlerList() { - return handlers; - } - - /** - * Get the PlotId - * - * @return PlotId - */ - public PlotId getPlotId() { - return getPlot().getId(); - } - - /** - * Get the world name - * - * @return String - */ - public String getWorld() { - return getPlot().getWorldName(); - } - - @Override public HandlerList getHandlers() { - return handlers; - } -} +package com.github.intellectualsites.plotsquared.bukkit.events; + +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; +import org.bukkit.event.HandlerList; + +/** + * Called when a plot is deleted + */ +public class PlotDeleteEvent extends PlotEvent { + + private static final HandlerList handlers = new HandlerList(); + + public PlotDeleteEvent(Plot plot) { + super(plot); + } + + public static HandlerList getHandlerList() { + return handlers; + } + + /** + * Get the PlotId + * + * @return PlotId + */ + public PlotId getPlotId() { + return getPlot().getId(); + } + + /** + * Get the world name + * + * @return String + */ + public String getWorld() { + return getPlot().getWorldName(); + } + + @Override public HandlerList getHandlers() { + return handlers; + } +} diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotEvent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotEvent.java similarity index 65% rename from Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotEvent.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotEvent.java index 94e2dc4cc..ae4b0c1d7 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotEvent.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotEvent.java @@ -1,6 +1,6 @@ -package com.plotsquared.bukkit.events; +package com.github.intellectualsites.plotsquared.bukkit.events; -import com.intellectualcrafters.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.Plot; import org.bukkit.event.Event; public abstract class PlotEvent extends Event { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotFlagAddEvent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotFlagAddEvent.java similarity index 85% rename from Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotFlagAddEvent.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotFlagAddEvent.java index 35249b696..e8c4ac63c 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotFlagAddEvent.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotFlagAddEvent.java @@ -1,52 +1,52 @@ -package com.plotsquared.bukkit.events; - -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.object.Plot; -import org.bukkit.event.Cancellable; -import org.bukkit.event.HandlerList; - -/** - * Called when a Flag is added to a plot. - */ -public class PlotFlagAddEvent extends PlotEvent implements Cancellable { - - private static final HandlerList handlers = new HandlerList(); - private final Flag flag; - private boolean cancelled; - - /** - * PlotFlagAddEvent: Called when a Flag is added to a plot. - * - * @param flag Flag that was added - * @param plot Plot to which the flag was added - */ - public PlotFlagAddEvent(Flag flag, Plot plot) { - super(plot); - this.flag = flag; - } - - public static HandlerList getHandlerList() { - return handlers; - } - - /** - * Get the flag involved. - * - * @return Flag - */ - public Flag getFlag() { - return this.flag; - } - - @Override public HandlerList getHandlers() { - return handlers; - } - - @Override public final boolean isCancelled() { - return this.cancelled; - } - - @Override public final void setCancelled(boolean cancelled) { - this.cancelled = cancelled; - } -} +package com.github.intellectualsites.plotsquared.bukkit.events; + +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import org.bukkit.event.Cancellable; +import org.bukkit.event.HandlerList; + +/** + * Called when a Flag is added to a plot. + */ +public class PlotFlagAddEvent extends PlotEvent implements Cancellable { + + private static final HandlerList handlers = new HandlerList(); + private final Flag flag; + private boolean cancelled; + + /** + * PlotFlagAddEvent: Called when a Flag is added to a plot. + * + * @param flag Flag that was added + * @param plot Plot to which the flag was added + */ + public PlotFlagAddEvent(Flag flag, Plot plot) { + super(plot); + this.flag = flag; + } + + public static HandlerList getHandlerList() { + return handlers; + } + + /** + * Get the flag involved. + * + * @return Flag + */ + public Flag getFlag() { + return this.flag; + } + + @Override public HandlerList getHandlers() { + return handlers; + } + + @Override public final boolean isCancelled() { + return this.cancelled; + } + + @Override public final void setCancelled(boolean cancelled) { + this.cancelled = cancelled; + } +} diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotFlagRemoveEvent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotFlagRemoveEvent.java similarity index 85% rename from Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotFlagRemoveEvent.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotFlagRemoveEvent.java index bfa3850f7..3e3e48b55 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotFlagRemoveEvent.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotFlagRemoveEvent.java @@ -1,52 +1,52 @@ -package com.plotsquared.bukkit.events; - -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.object.Plot; -import org.bukkit.event.Cancellable; -import org.bukkit.event.HandlerList; - -/** - * Called when a flag is removed from a plot - */ -public class PlotFlagRemoveEvent extends PlotEvent implements Cancellable { - - private static final HandlerList handlers = new HandlerList(); - private final Flag flag; - private boolean cancelled; - - /** - * PlotFlagRemoveEvent: Called when a flag is removed from a plot - * - * @param flag Flag that was removed - * @param plot Plot from which the flag was removed - */ - public PlotFlagRemoveEvent(Flag flag, Plot plot) { - super(plot); - this.flag = flag; - } - - public static HandlerList getHandlerList() { - return handlers; - } - - /** - * Get the flag involved - * - * @return Flag - */ - public Flag getFlag() { - return this.flag; - } - - @Override public HandlerList getHandlers() { - return handlers; - } - - @Override public final boolean isCancelled() { - return this.cancelled; - } - - @Override public final void setCancelled(boolean cancelled) { - this.cancelled = cancelled; - } -} +package com.github.intellectualsites.plotsquared.bukkit.events; + +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import org.bukkit.event.Cancellable; +import org.bukkit.event.HandlerList; + +/** + * Called when a flag is removed from a plot + */ +public class PlotFlagRemoveEvent extends PlotEvent implements Cancellable { + + private static final HandlerList handlers = new HandlerList(); + private final Flag flag; + private boolean cancelled; + + /** + * PlotFlagRemoveEvent: Called when a flag is removed from a plot + * + * @param flag Flag that was removed + * @param plot Plot from which the flag was removed + */ + public PlotFlagRemoveEvent(Flag flag, Plot plot) { + super(plot); + this.flag = flag; + } + + public static HandlerList getHandlerList() { + return handlers; + } + + /** + * Get the flag involved + * + * @return Flag + */ + public Flag getFlag() { + return this.flag; + } + + @Override public HandlerList getHandlers() { + return handlers; + } + + @Override public final boolean isCancelled() { + return this.cancelled; + } + + @Override public final void setCancelled(boolean cancelled) { + this.cancelled = cancelled; + } +} diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotMergeEvent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotMergeEvent.java similarity index 86% rename from Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotMergeEvent.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotMergeEvent.java index f7f4f9ef2..20e88f90a 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotMergeEvent.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotMergeEvent.java @@ -1,59 +1,59 @@ -package com.plotsquared.bukkit.events; - -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotId; -import org.bukkit.World; -import org.bukkit.event.Cancellable; -import org.bukkit.event.HandlerList; - -import java.util.ArrayList; - -public class PlotMergeEvent extends PlotEvent implements Cancellable { - - private static final HandlerList handlers = new HandlerList(); - private final ArrayList plots; - private final World world; - private boolean cancelled; - - /** - * PlotMergeEvent: Called when plots are merged - * - * @param world World in which the event occurred - * @param plot Plot that was merged - * @param plots A list of plots involved in the event - */ - public PlotMergeEvent(World world, Plot plot, ArrayList plots) { - super(plot); - this.world = world; - this.plots = plots; - } - - public static HandlerList getHandlerList() { - return handlers; - } - - /** - * Get the plots being added. - * - * @return Plot - */ - public ArrayList getPlots() { - return this.plots; - } - - public World getWorld() { - return this.world; - } - - @Override public HandlerList getHandlers() { - return handlers; - } - - @Override public boolean isCancelled() { - return this.cancelled; - } - - @Override public void setCancelled(boolean b) { - this.cancelled = b; - } -} +package com.github.intellectualsites.plotsquared.bukkit.events; + +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; +import org.bukkit.World; +import org.bukkit.event.Cancellable; +import org.bukkit.event.HandlerList; + +import java.util.ArrayList; + +public class PlotMergeEvent extends PlotEvent implements Cancellable { + + private static final HandlerList handlers = new HandlerList(); + private final ArrayList plots; + private final World world; + private boolean cancelled; + + /** + * PlotMergeEvent: Called when plots are merged + * + * @param world World in which the event occurred + * @param plot Plot that was merged + * @param plots A list of plots involved in the event + */ + public PlotMergeEvent(World world, Plot plot, ArrayList plots) { + super(plot); + this.world = world; + this.plots = plots; + } + + public static HandlerList getHandlerList() { + return handlers; + } + + /** + * Get the plots being added. + * + * @return Plot + */ + public ArrayList getPlots() { + return this.plots; + } + + public World getWorld() { + return this.world; + } + + @Override public HandlerList getHandlers() { + return handlers; + } + + @Override public boolean isCancelled() { + return this.cancelled; + } + + @Override public void setCancelled(boolean b) { + this.cancelled = b; + } +} diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotRateEvent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotRateEvent.java similarity index 73% rename from Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotRateEvent.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotRateEvent.java index 801ab400d..29e7a8df7 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotRateEvent.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotRateEvent.java @@ -1,40 +1,40 @@ -package com.plotsquared.bukkit.events; - -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.Rating; -import org.bukkit.event.HandlerList; - -public class PlotRateEvent extends PlotEvent { - - private static final HandlerList handlers = new HandlerList(); - private final PlotPlayer rater; - private Rating rating; - - public PlotRateEvent(PlotPlayer rater, Rating rating, Plot plot) { - super(plot); - this.rater = rater; - this.rating = rating; - } - - public static HandlerList getHandlerList() { - return handlers; - } - - public PlotPlayer getRater() { - return this.rater; - } - - public Rating getRating() { - return this.rating; - } - - public void setRating(Rating rating) { - this.rating = rating; - } - - @Override public HandlerList getHandlers() { - return handlers; - } - -} +package com.github.intellectualsites.plotsquared.bukkit.events; + +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.Rating; +import org.bukkit.event.HandlerList; + +public class PlotRateEvent extends PlotEvent { + + private static final HandlerList handlers = new HandlerList(); + private final PlotPlayer rater; + private Rating rating; + + public PlotRateEvent(PlotPlayer rater, Rating rating, Plot plot) { + super(plot); + this.rater = rater; + this.rating = rating; + } + + public static HandlerList getHandlerList() { + return handlers; + } + + public PlotPlayer getRater() { + return this.rater; + } + + public Rating getRating() { + return this.rating; + } + + public void setRating(Rating rating) { + this.rating = rating; + } + + @Override public HandlerList getHandlers() { + return handlers; + } + +} diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotUnlinkEvent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotUnlinkEvent.java similarity index 87% rename from Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotUnlinkEvent.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotUnlinkEvent.java index d9caab923..914f394fd 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotUnlinkEvent.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotUnlinkEvent.java @@ -1,64 +1,64 @@ -package com.plotsquared.bukkit.events; - -import com.intellectualcrafters.plot.object.PlotArea; -import com.intellectualcrafters.plot.object.PlotId; -import org.bukkit.World; -import org.bukkit.event.Cancellable; -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; - -import java.util.ArrayList; - -public class PlotUnlinkEvent extends Event implements Cancellable { - - private static final HandlerList handlers = new HandlerList(); - private final ArrayList plots; - private final World world; - private final PlotArea area; - private boolean cancelled; - - /** - * Called when a mega-plot is unlinked. - * - * @param world World in which the event occurred - * @param plots Plots that are involved in the event - */ - public PlotUnlinkEvent(World world, PlotArea area, ArrayList plots) { - this.plots = plots; - this.world = world; - this.area = area; - } - - public static HandlerList getHandlerList() { - return handlers; - } - - /** - * Get the plots involved. - * - * @return The {@link PlotId}'s of the plots involved - */ - public ArrayList getPlots() { - return this.plots; - } - - public World getWorld() { - return this.world; - } - - public PlotArea getArea() { - return this.area; - } - - @Override public HandlerList getHandlers() { - return handlers; - } - - @Override public boolean isCancelled() { - return this.cancelled; - } - - @Override public void setCancelled(boolean b) { - this.cancelled = b; - } -} +package com.github.intellectualsites.plotsquared.bukkit.events; + +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; +import org.bukkit.World; +import org.bukkit.event.Cancellable; +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; + +import java.util.ArrayList; + +public class PlotUnlinkEvent extends Event implements Cancellable { + + private static final HandlerList handlers = new HandlerList(); + private final ArrayList plots; + private final World world; + private final PlotArea area; + private boolean cancelled; + + /** + * Called when a mega-plot is unlinked. + * + * @param world World in which the event occurred + * @param plots Plots that are involved in the event + */ + public PlotUnlinkEvent(World world, PlotArea area, ArrayList plots) { + this.plots = plots; + this.world = world; + this.area = area; + } + + public static HandlerList getHandlerList() { + return handlers; + } + + /** + * Get the plots involved. + * + * @return The {@link PlotId}'s of the plots involved + */ + public ArrayList getPlots() { + return this.plots; + } + + public World getWorld() { + return this.world; + } + + public PlotArea getArea() { + return this.area; + } + + @Override public HandlerList getHandlers() { + return handlers; + } + + @Override public boolean isCancelled() { + return this.cancelled; + } + + @Override public void setCancelled(boolean b) { + this.cancelled = b; + } +} diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java similarity index 85% rename from Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java index 9993e9eb9..6022632eb 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java @@ -1,6 +1,6 @@ -package com.plotsquared.bukkit.generator; +package com.github.intellectualsites.plotsquared.bukkit.generator; -import com.intellectualcrafters.plot.generator.AugmentedUtils; +import com.github.intellectualsites.plotsquared.plot.generator.AugmentedUtils; import org.bukkit.Chunk; import org.bukkit.World; import org.bukkit.generator.BlockPopulator; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java similarity index 92% rename from Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java index c7ebefff7..22f6f8483 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java @@ -1,18 +1,18 @@ -package com.plotsquared.bukkit.generator; +package com.github.intellectualsites.plotsquared.bukkit.generator; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.generator.GeneratorWrapper; -import com.intellectualcrafters.plot.generator.IndependentPlotGenerator; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.object.worlds.SingleWorldGenerator; -import com.intellectualcrafters.plot.util.ChunkManager; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.MathMan; -import com.intellectualcrafters.plot.util.block.GlobalBlockQueue; -import com.intellectualcrafters.plot.util.block.LocalBlockQueue; -import com.intellectualcrafters.plot.util.block.ScopedLocalBlockQueue; -import com.plotsquared.bukkit.util.BukkitUtil; -import com.plotsquared.bukkit.util.block.GenChunk; +import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; +import com.github.intellectualsites.plotsquared.bukkit.util.block.GenChunk; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; +import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.object.worlds.SingleWorldGenerator; +import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.MathMan; +import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue; import org.bukkit.Chunk; import org.bukkit.World; import org.bukkit.block.Biome; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/ChunkListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java similarity index 92% rename from Bukkit/src/main/java/com/plotsquared/bukkit/listeners/ChunkListener.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java index 4448517cb..46ccb4a97 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/ChunkListener.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java @@ -1,14 +1,14 @@ -package com.plotsquared.bukkit.listeners; +package com.github.intellectualsites.plotsquared.bukkit.listeners; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.util.ReflectionUtils.RefClass; -import com.intellectualcrafters.plot.util.ReflectionUtils.RefField; -import com.intellectualcrafters.plot.util.ReflectionUtils.RefMethod; -import com.intellectualcrafters.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefClass; +import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefField; +import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefMethod; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.Material; @@ -30,7 +30,7 @@ import org.bukkit.event.world.ChunkUnloadEvent; import java.lang.reflect.Method; import java.util.HashSet; -import static com.intellectualcrafters.plot.util.ReflectionUtils.getRefClass; +import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass; public class ChunkListener implements Listener { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/EntityPortal_1_7_9.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntityPortal_1_7_9.java similarity index 96% rename from Bukkit/src/main/java/com/plotsquared/bukkit/listeners/EntityPortal_1_7_9.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntityPortal_1_7_9.java index 4429dd64b..8c4eeb9d0 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/EntityPortal_1_7_9.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntityPortal_1_7_9.java @@ -1,6 +1,6 @@ -package com.plotsquared.bukkit.listeners; +package com.github.intellectualsites.plotsquared.bukkit.listeners; -import com.intellectualcrafters.plot.PS; +import com.github.intellectualsites.plotsquared.plot.PS; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.ArmorStand; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/EntitySpawnListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java similarity index 78% rename from Bukkit/src/main/java/com/plotsquared/bukkit/listeners/EntitySpawnListener.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java index aba9934f3..0fbbce055 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/EntitySpawnListener.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java @@ -1,12 +1,12 @@ -package com.plotsquared.bukkit.listeners; +package com.github.intellectualsites.plotsquared.bukkit.listeners; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotArea; -import com.plotsquared.bukkit.util.BukkitUtil; +import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.event.EventHandler; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/ForceFieldListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ForceFieldListener.java similarity index 84% rename from Bukkit/src/main/java/com/plotsquared/bukkit/listeners/ForceFieldListener.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ForceFieldListener.java index 7280c2b20..0eeae748f 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/ForceFieldListener.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ForceFieldListener.java @@ -1,104 +1,104 @@ -package com.plotsquared.bukkit.listeners; - -import com.google.common.collect.Iterables; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.Permissions; -import com.plotsquared.bukkit.object.BukkitPlayer; -import com.plotsquared.bukkit.util.BukkitUtil; -import org.bukkit.entity.Player; -import org.bukkit.util.Vector; - -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; - -public class ForceFieldListener { - - private static Set getNearbyPlayers(Player player, Plot plot) { - Set players = new HashSet<>(); - for (Player nearPlayer : Iterables - .filter(player.getNearbyEntities(5d, 5d, 5d), Player.class)) { - PlotPlayer plotPlayer; - if ((plotPlayer = BukkitUtil.getPlayer(nearPlayer)) == null || !plot - .equals(plotPlayer.getCurrentPlot())) { - continue; - } - if (!plot.isAdded(plotPlayer.getUUID())) { - players.add(plotPlayer); - } - } - return players; - } - - private static PlotPlayer hasNearbyPermitted(Player player, Plot plot) { - for (Player nearPlayer : Iterables - .filter(player.getNearbyEntities(5d, 5d, 5d), Player.class)) { - PlotPlayer plotPlayer; - if ((plotPlayer = BukkitUtil.getPlayer(nearPlayer)) == null || !plot - .equals(plotPlayer.getCurrentPlot())) { - continue; - } - if (plot.isAdded(plotPlayer.getUUID())) { - return plotPlayer; - } - } - return null; - } - - private static Vector calculateVelocity(PlotPlayer player, PlotPlayer e) { - Location playerLocation = player.getLocationFull(); - Location oPlayerLocation = e.getLocation(); - double playerX = playerLocation.getX(); - double playerY = playerLocation.getY(); - double playerZ = playerLocation.getZ(); - double oPlayerX = oPlayerLocation.getX(); - double oPlayerY = oPlayerLocation.getY(); - double oPlayerZ = oPlayerLocation.getZ(); - double x = 0d; - if (playerX < oPlayerX) { - x = 1.0d; - } else if (playerX > oPlayerX) { - x = -1.0d; - } - double y = 0d; - if (playerY < oPlayerY) { - y = 0.5d; - } else if (playerY > oPlayerY) { - y = -0.5d; - } - double z = 0d; - if (playerZ < oPlayerZ) { - z = 1.0d; - } else if (playerZ > oPlayerZ) { - z = -1.0d; - } - return new Vector(x, y, z); - } - - public static void handleForcefield(Player player, PlotPlayer plotPlayer, Plot plot) { - if (Flags.FORCEFIELD.isTrue(plot)) { - UUID uuid = plotPlayer.getUUID(); - if (plot.isAdded(uuid)) { - Set players = getNearbyPlayers(player, plot); - for (PlotPlayer oPlayer : players) { - if (!Permissions.hasPermission(oPlayer, C.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) { - ((BukkitPlayer) oPlayer).player - .setVelocity(calculateVelocity(plotPlayer, oPlayer)); - } - } - } else { - PlotPlayer oPlayer = hasNearbyPermitted(player, plot); - if (oPlayer == null) { - return; - } - if (!Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) { - player.setVelocity(calculateVelocity(oPlayer, plotPlayer)); - } - } - } - } -} +package com.github.intellectualsites.plotsquared.bukkit.listeners; + +import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; +import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.Permissions; +import com.google.common.collect.Iterables; +import org.bukkit.entity.Player; +import org.bukkit.util.Vector; + +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + +public class ForceFieldListener { + + private static Set getNearbyPlayers(Player player, Plot plot) { + Set players = new HashSet<>(); + for (Player nearPlayer : Iterables + .filter(player.getNearbyEntities(5d, 5d, 5d), Player.class)) { + PlotPlayer plotPlayer; + if ((plotPlayer = BukkitUtil.getPlayer(nearPlayer)) == null || !plot + .equals(plotPlayer.getCurrentPlot())) { + continue; + } + if (!plot.isAdded(plotPlayer.getUUID())) { + players.add(plotPlayer); + } + } + return players; + } + + private static PlotPlayer hasNearbyPermitted(Player player, Plot plot) { + for (Player nearPlayer : Iterables + .filter(player.getNearbyEntities(5d, 5d, 5d), Player.class)) { + PlotPlayer plotPlayer; + if ((plotPlayer = BukkitUtil.getPlayer(nearPlayer)) == null || !plot + .equals(plotPlayer.getCurrentPlot())) { + continue; + } + if (plot.isAdded(plotPlayer.getUUID())) { + return plotPlayer; + } + } + return null; + } + + private static Vector calculateVelocity(PlotPlayer player, PlotPlayer e) { + Location playerLocation = player.getLocationFull(); + Location oPlayerLocation = e.getLocation(); + double playerX = playerLocation.getX(); + double playerY = playerLocation.getY(); + double playerZ = playerLocation.getZ(); + double oPlayerX = oPlayerLocation.getX(); + double oPlayerY = oPlayerLocation.getY(); + double oPlayerZ = oPlayerLocation.getZ(); + double x = 0d; + if (playerX < oPlayerX) { + x = 1.0d; + } else if (playerX > oPlayerX) { + x = -1.0d; + } + double y = 0d; + if (playerY < oPlayerY) { + y = 0.5d; + } else if (playerY > oPlayerY) { + y = -0.5d; + } + double z = 0d; + if (playerZ < oPlayerZ) { + z = 1.0d; + } else if (playerZ > oPlayerZ) { + z = -1.0d; + } + return new Vector(x, y, z); + } + + public static void handleForcefield(Player player, PlotPlayer plotPlayer, Plot plot) { + if (Flags.FORCEFIELD.isTrue(plot)) { + UUID uuid = plotPlayer.getUUID(); + if (plot.isAdded(uuid)) { + Set players = getNearbyPlayers(player, plot); + for (PlotPlayer oPlayer : players) { + if (!Permissions.hasPermission(oPlayer, C.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) { + ((BukkitPlayer) oPlayer).player + .setVelocity(calculateVelocity(plotPlayer, oPlayer)); + } + } + } else { + PlotPlayer oPlayer = hasNearbyPermitted(player, plot); + if (oPlayer == null) { + return; + } + if (!Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) { + player.setVelocity(calculateVelocity(oPlayer, plotPlayer)); + } + } + } + } +} diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java similarity index 99% rename from Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java index b7bf4a884..97a1c5ad2 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java @@ -1,20 +1,20 @@ -package com.plotsquared.bukkit.listeners; +package com.github.intellectualsites.plotsquared.bukkit.listeners; +import com.github.intellectualsites.plotsquared.bukkit.BukkitMain; +import com.github.intellectualsites.plotsquared.bukkit.object.BukkitLazyBlock; +import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; +import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; +import com.github.intellectualsites.plotsquared.bukkit.util.BukkitVersion; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.flag.IntegerFlag; +import com.github.intellectualsites.plotsquared.plot.listener.PlayerBlockEventType; +import com.github.intellectualsites.plotsquared.plot.listener.PlotListener; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.*; import com.google.common.base.Optional; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.flag.IntegerFlag; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.*; -import com.plotsquared.bukkit.BukkitMain; -import com.plotsquared.bukkit.object.BukkitLazyBlock; -import com.plotsquared.bukkit.object.BukkitPlayer; -import com.plotsquared.bukkit.util.BukkitUtil; -import com.plotsquared.bukkit.util.BukkitVersion; -import com.plotsquared.listener.PlayerBlockEventType; -import com.plotsquared.listener.PlotListener; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents183.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents183.java similarity index 76% rename from Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents183.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents183.java index f58cee225..3f6116bc7 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents183.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents183.java @@ -1,11 +1,11 @@ -package com.plotsquared.bukkit.listeners; +package com.github.intellectualsites.plotsquared.bukkit.listeners; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotArea; -import com.plotsquared.bukkit.util.BukkitUtil; +import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import org.bukkit.block.Block; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents_1_8.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents_1_8.java similarity index 88% rename from Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents_1_8.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents_1_8.java index e221af62b..552077e3d 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents_1_8.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents_1_8.java @@ -1,16 +1,16 @@ -package com.plotsquared.bukkit.listeners; +package com.github.intellectualsites.plotsquared.bukkit.listeners; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotArea; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.Permissions; -import com.plotsquared.bukkit.util.BukkitUtil; -import com.plotsquared.listener.PlotListener; +import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.listener.PlotListener; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.Permissions; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockState; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents_1_9.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents_1_9.java similarity index 75% rename from Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents_1_9.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents_1_9.java index 6a9b3abb0..d8c74a9ed 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents_1_9.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents_1_9.java @@ -1,8 +1,8 @@ -package com.plotsquared.bukkit.listeners; +package com.github.intellectualsites.plotsquared.bukkit.listeners; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.Location; -import com.plotsquared.bukkit.util.BukkitUtil; +import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.object.Location; import org.bukkit.entity.LingeringPotion; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlotPlusListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java similarity index 91% rename from Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlotPlusListener.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java index f22ee5aa6..87bea7b24 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlotPlusListener.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java @@ -1,13 +1,13 @@ -package com.plotsquared.bukkit.listeners; +package com.github.intellectualsites.plotsquared.bukkit.listeners; +import com.github.intellectualsites.plotsquared.bukkit.events.PlayerEnterPlotEvent; +import com.github.intellectualsites.plotsquared.bukkit.events.PlayerLeavePlotEvent; +import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.listener.PlotListener; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.google.common.base.Optional; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.plotsquared.bukkit.events.PlayerEnterPlotEvent; -import com.plotsquared.bukkit.events.PlayerLeavePlotEvent; -import com.plotsquared.bukkit.util.BukkitUtil; -import com.plotsquared.listener.PlotListener; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.block.Block; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlotPlusListener_1_12.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener_1_12.java similarity index 71% rename from Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlotPlusListener_1_12.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener_1_12.java index b83f1b1c5..ed8d2245c 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlotPlusListener_1_12.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener_1_12.java @@ -1,9 +1,9 @@ -package com.plotsquared.bukkit.listeners; +package com.github.intellectualsites.plotsquared.bukkit.listeners; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.plotsquared.bukkit.util.BukkitUtil; +import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlotPlusListener_Legacy.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener_Legacy.java similarity index 67% rename from Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlotPlusListener_Legacy.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener_Legacy.java index a5d2eb634..2ba21e19a 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlotPlusListener_Legacy.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener_Legacy.java @@ -1,9 +1,9 @@ -package com.plotsquared.bukkit.listeners; +package com.github.intellectualsites.plotsquared.bukkit.listeners; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.plotsquared.bukkit.util.BukkitUtil; +import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/SingleWorldListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java similarity index 87% rename from Bukkit/src/main/java/com/plotsquared/bukkit/listeners/SingleWorldListener.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java index 9e68384f1..fccf90a25 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/SingleWorldListener.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java @@ -1,9 +1,9 @@ -package com.plotsquared.bukkit.listeners; +package com.github.intellectualsites.plotsquared.bukkit.listeners; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.worlds.PlotAreaManager; -import com.intellectualcrafters.plot.object.worlds.SinglePlotAreaManager; -import com.intellectualcrafters.plot.util.ReflectionUtils; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; +import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; +import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils; import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.World; @@ -17,7 +17,7 @@ import org.bukkit.plugin.Plugin; import java.lang.reflect.Field; import java.lang.reflect.Method; -import static com.intellectualcrafters.plot.util.ReflectionUtils.getRefClass; +import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass; public class SingleWorldListener implements Listener { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/WorldEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/WorldEvents.java similarity index 70% rename from Bukkit/src/main/java/com/plotsquared/bukkit/listeners/WorldEvents.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/WorldEvents.java index 44f884372..505434687 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/WorldEvents.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/WorldEvents.java @@ -1,10 +1,10 @@ -package com.plotsquared.bukkit.listeners; +package com.github.intellectualsites.plotsquared.bukkit.listeners; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.generator.GeneratorWrapper; -import com.intellectualcrafters.plot.object.worlds.PlotAreaManager; -import com.intellectualcrafters.plot.object.worlds.SinglePlotAreaManager; -import com.plotsquared.bukkit.generator.BukkitPlotGenerator; +import com.github.intellectualsites.plotsquared.bukkit.generator.BukkitPlotGenerator; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; +import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; +import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; import org.bukkit.World; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/object/BukkitLazyBlock.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitLazyBlock.java similarity index 93% rename from Bukkit/src/main/java/com/plotsquared/bukkit/object/BukkitLazyBlock.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitLazyBlock.java index 2a1a44314..8668ef387 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/object/BukkitLazyBlock.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitLazyBlock.java @@ -1,7 +1,7 @@ -package com.plotsquared.bukkit.object; +package com.github.intellectualsites.plotsquared.bukkit.object; -import com.intellectualcrafters.plot.object.LazyBlock; -import com.intellectualcrafters.plot.object.PlotBlock; +import com.github.intellectualsites.plotsquared.plot.object.LazyBlock; +import com.github.intellectualsites.plotsquared.plot.object.PlotBlock; import org.bukkit.block.Block; public class BukkitLazyBlock extends LazyBlock { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/object/BukkitOfflinePlayer.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitOfflinePlayer.java similarity index 84% rename from Bukkit/src/main/java/com/plotsquared/bukkit/object/BukkitOfflinePlayer.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitOfflinePlayer.java index 8b770badd..390e9d9be 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/object/BukkitOfflinePlayer.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitOfflinePlayer.java @@ -1,6 +1,6 @@ -package com.plotsquared.bukkit.object; +package com.github.intellectualsites.plotsquared.bukkit.object; -import com.intellectualcrafters.plot.object.OfflinePlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; import org.bukkit.OfflinePlayer; import java.util.UUID; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/object/BukkitPlayer.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java similarity index 95% rename from Bukkit/src/main/java/com/plotsquared/bukkit/object/BukkitPlayer.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java index 7814c8706..bc11c2c37 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/object/BukkitPlayer.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java @@ -1,11 +1,11 @@ -package com.plotsquared.bukkit.object; +package com.github.intellectualsites.plotsquared.bukkit.object; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.*; -import com.plotsquared.bukkit.util.BukkitUtil; +import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.*; import org.bukkit.Effect; import org.bukkit.GameMode; import org.bukkit.WeatherType; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/AgeableStats.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/AgeableStats.java similarity index 52% rename from Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/AgeableStats.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/AgeableStats.java index a7016efb6..5769f0e46 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/AgeableStats.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/AgeableStats.java @@ -1,4 +1,4 @@ -package com.plotsquared.bukkit.object.entity; +package com.github.intellectualsites.plotsquared.bukkit.object.entity; class AgeableStats { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/ArmorStandStats.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ArmorStandStats.java similarity index 83% rename from Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/ArmorStandStats.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ArmorStandStats.java index e6331436c..56b36e2bb 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/ArmorStandStats.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ArmorStandStats.java @@ -1,4 +1,4 @@ -package com.plotsquared.bukkit.object.entity; +package com.github.intellectualsites.plotsquared.bukkit.object.entity; class ArmorStandStats { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/EntityBaseStats.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/EntityBaseStats.java similarity index 67% rename from Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/EntityBaseStats.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/EntityBaseStats.java index 5a26d675f..d33b4d913 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/EntityBaseStats.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/EntityBaseStats.java @@ -1,4 +1,4 @@ -package com.plotsquared.bukkit.object.entity; +package com.github.intellectualsites.plotsquared.bukkit.object.entity; class EntityBaseStats { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/EntityWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/EntityWrapper.java similarity index 99% rename from Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/EntityWrapper.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/EntityWrapper.java index a96d62db0..71dd22191 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/EntityWrapper.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/EntityWrapper.java @@ -1,7 +1,7 @@ -package com.plotsquared.bukkit.object.entity; +package com.github.intellectualsites.plotsquared.bukkit.object.entity; -import com.intellectualcrafters.plot.PS; -import com.plotsquared.bukkit.util.BukkitVersion; +import com.github.intellectualsites.plotsquared.bukkit.util.BukkitVersion; +import com.github.intellectualsites.plotsquared.plot.PS; import org.bukkit.*; import org.bukkit.block.BlockFace; import org.bukkit.entity.*; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/HorseStats.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/HorseStats.java similarity index 69% rename from Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/HorseStats.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/HorseStats.java index 2253136d4..7fd976258 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/HorseStats.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/HorseStats.java @@ -1,4 +1,4 @@ -package com.plotsquared.bukkit.object.entity; +package com.github.intellectualsites.plotsquared.bukkit.object.entity; import org.bukkit.entity.Horse; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/LivingEntityStats.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/LivingEntityStats.java similarity index 88% rename from Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/LivingEntityStats.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/LivingEntityStats.java index 39e79c2b0..c702ffaa7 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/LivingEntityStats.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/LivingEntityStats.java @@ -1,4 +1,4 @@ -package com.plotsquared.bukkit.object.entity; +package com.github.intellectualsites.plotsquared.bukkit.object.entity; import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/TameableStats.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/TameableStats.java similarity index 60% rename from Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/TameableStats.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/TameableStats.java index 217952e49..f9e8ded36 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/TameableStats.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/TameableStats.java @@ -1,4 +1,4 @@ -package com.plotsquared.bukkit.object.entity; +package com.github.intellectualsites.plotsquared.bukkit.object.entity; import org.bukkit.entity.AnimalTamer; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/object/schematic/StateWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java similarity index 93% rename from Bukkit/src/main/java/com/plotsquared/bukkit/object/schematic/StateWrapper.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java index 35f58e446..5ea8f62ee 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/object/schematic/StateWrapper.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java @@ -1,9 +1,9 @@ -package com.plotsquared.bukkit.object.schematic; +package com.github.intellectualsites.plotsquared.bukkit.object.schematic; -import com.intellectualcrafters.jnbt.*; -import com.intellectualcrafters.plot.object.schematic.ItemType; -import com.intellectualcrafters.plot.util.MathMan; -import com.plotsquared.bukkit.util.BukkitUtil; +import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; +import com.github.intellectualsites.plotsquared.jnbt.*; +import com.github.intellectualsites.plotsquared.plot.object.schematic.ItemType; +import com.github.intellectualsites.plotsquared.plot.util.MathMan; import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.block.BlockState; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitleManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitleManager.java similarity index 97% rename from Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitleManager.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitleManager.java index 0bb28c81e..a5447f9bf 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitleManager.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitleManager.java @@ -1,6 +1,6 @@ -package com.plotsquared.bukkit.titles; +package com.github.intellectualsites.plotsquared.bukkit.titles; -import com.plotsquared.bukkit.chat.Reflection; +import com.github.intellectualsites.plotsquared.bukkit.chat.Reflection; import org.bukkit.ChatColor; import org.bukkit.entity.Player; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitleManager_183.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitleManager_183.java similarity index 96% rename from Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitleManager_183.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitleManager_183.java index 5a5a0dd3f..7f9f7aef7 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitleManager_183.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitleManager_183.java @@ -1,6 +1,6 @@ -package com.plotsquared.bukkit.titles; +package com.github.intellectualsites.plotsquared.bukkit.titles; -import com.plotsquared.bukkit.chat.Reflection; +import com.github.intellectualsites.plotsquared.bukkit.chat.Reflection; import org.bukkit.ChatColor; import org.bukkit.entity.Player; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle_111.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle_111.java similarity index 68% rename from Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle_111.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle_111.java index 274b0e96c..30e4f3ceb 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle_111.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle_111.java @@ -1,10 +1,10 @@ -package com.plotsquared.bukkit.titles; +package com.github.intellectualsites.plotsquared.bukkit.titles; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.AbstractTitle; -import com.plotsquared.bukkit.object.BukkitPlayer; -import com.plotsquared.bukkit.util.BukkitVersion; +import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; +import com.github.intellectualsites.plotsquared.bukkit.util.BukkitVersion; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.AbstractTitle; import org.bukkit.entity.Player; @SuppressWarnings("deprecation") public class DefaultTitle_111 extends AbstractTitle { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle_180.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle_180.java similarity index 65% rename from Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle_180.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle_180.java index 5f7836b13..89662bad5 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle_180.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle_180.java @@ -1,8 +1,8 @@ -package com.plotsquared.bukkit.titles; +package com.github.intellectualsites.plotsquared.bukkit.titles; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.AbstractTitle; -import com.plotsquared.bukkit.object.BukkitPlayer; +import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.AbstractTitle; public class DefaultTitle_180 extends AbstractTitle { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle_183.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle_183.java similarity index 65% rename from Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle_183.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle_183.java index 46a81a306..cc87ea67b 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle_183.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle_183.java @@ -1,8 +1,8 @@ -package com.plotsquared.bukkit.titles; +package com.github.intellectualsites.plotsquared.bukkit.titles; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.AbstractTitle; -import com.plotsquared.bukkit.object.BukkitPlayer; +import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.AbstractTitle; public class DefaultTitle_183 extends AbstractTitle { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle_19.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle_19.java similarity index 68% rename from Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle_19.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle_19.java index cf88d7fd5..5795b3364 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle_19.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle_19.java @@ -1,9 +1,9 @@ -package com.plotsquared.bukkit.titles; +package com.github.intellectualsites.plotsquared.bukkit.titles; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.AbstractTitle; -import com.intellectualcrafters.plot.util.TaskManager; -import com.plotsquared.bukkit.object.BukkitPlayer; +import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.AbstractTitle; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import org.bukkit.entity.Player; @SuppressWarnings("deprecation") public class DefaultTitle_19 extends AbstractTitle { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/titles/HackTitle.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/HackTitle.java similarity index 56% rename from Bukkit/src/main/java/com/plotsquared/bukkit/titles/HackTitle.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/HackTitle.java index 508dc03fd..16787bae1 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/titles/HackTitle.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/HackTitle.java @@ -1,10 +1,10 @@ -package com.plotsquared.bukkit.titles; +package com.github.intellectualsites.plotsquared.bukkit.titles; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.AbstractTitle; -import com.plotsquared.bukkit.object.BukkitPlayer; +import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.AbstractTitle; public class HackTitle extends AbstractTitle { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/titles/HackTitleManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/HackTitleManager.java similarity index 98% rename from Bukkit/src/main/java/com/plotsquared/bukkit/titles/HackTitleManager.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/HackTitleManager.java index 98a093646..2ec197927 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/titles/HackTitleManager.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/HackTitleManager.java @@ -1,6 +1,6 @@ -package com.plotsquared.bukkit.titles; +package com.github.intellectualsites.plotsquared.bukkit.titles; -import com.plotsquared.bukkit.chat.Reflection; +import com.github.intellectualsites.plotsquared.bukkit.chat.Reflection; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.entity.Player; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/titles/TitleManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager.java similarity index 99% rename from Bukkit/src/main/java/com/plotsquared/bukkit/titles/TitleManager.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager.java index ccc870dd9..f4c249f97 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/titles/TitleManager.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager.java @@ -1,4 +1,4 @@ -package com.plotsquared.bukkit.titles; +package com.github.intellectualsites.plotsquared.bukkit.titles; import org.bukkit.Bukkit; import org.bukkit.ChatColor; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/titles/TitleManager_1_11.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java similarity index 99% rename from Bukkit/src/main/java/com/plotsquared/bukkit/titles/TitleManager_1_11.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java index a1ed0ec61..92155ba45 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/titles/TitleManager_1_11.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java @@ -1,4 +1,4 @@ -package com.plotsquared.bukkit.titles; +package com.github.intellectualsites.plotsquared.bukkit.titles; import org.bukkit.Bukkit; import org.bukkit.ChatColor; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChatManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChatManager.java similarity index 68% rename from Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChatManager.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChatManager.java index 7c6a6b4a0..a133d9630 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChatManager.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChatManager.java @@ -1,13 +1,13 @@ -package com.plotsquared.bukkit.util; +package com.github.intellectualsites.plotsquared.bukkit.util; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.object.ConsolePlayer; -import com.intellectualcrafters.plot.object.PlotMessage; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.ChatManager; -import com.plotsquared.bukkit.chat.FancyMessage; -import com.plotsquared.bukkit.object.BukkitPlayer; +import com.github.intellectualsites.plotsquared.bukkit.chat.FancyMessage; +import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.object.ConsolePlayer; +import com.github.intellectualsites.plotsquared.plot.object.PlotMessage; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.ChatManager; import org.bukkit.ChatColor; import java.util.ArrayList; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChunkManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java similarity index 95% rename from Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChunkManager.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java index 24369a585..c5d9c37a9 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChunkManager.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java @@ -1,15 +1,14 @@ -package com.plotsquared.bukkit.util; +package com.github.intellectualsites.plotsquared.bukkit.util; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.generator.AugmentedUtils; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.util.ChunkManager; -import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.block.GlobalBlockQueue; -import com.intellectualcrafters.plot.util.block.LocalBlockQueue; -import com.intellectualcrafters.plot.util.block.ScopedLocalBlockQueue; -import com.plotsquared.bukkit.object.entity.EntityWrapper; +import com.github.intellectualsites.plotsquared.bukkit.object.entity.EntityWrapper; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.generator.AugmentedUtils; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue; import org.bukkit.*; import org.bukkit.block.*; import org.bukkit.block.banner.Pattern; @@ -101,12 +100,13 @@ public class BukkitChunkManager extends ChunkManager { return chunks; } - @Override public boolean copyRegion(Location pos1, Location pos2, Location newPos, + @Override public boolean copyRegion( + com.github.intellectualsites.plotsquared.plot.object.Location pos1, com.github.intellectualsites.plotsquared.plot.object.Location pos2, com.github.intellectualsites.plotsquared.plot.object.Location newPos, final Runnable whenDone) { final int relX = newPos.getX() - pos1.getX(); final int relZ = newPos.getZ() - pos1.getZ(); - Location pos4 = - new Location(newPos.getWorld(), newPos.getX() + relX, 256, newPos.getZ() + relZ); + com.github.intellectualsites.plotsquared.plot.object.Location pos4 = + new com.github.intellectualsites.plotsquared.plot.object.Location(newPos.getWorld(), newPos.getX() + relX, 256, newPos.getZ() + relZ); final RegionWrapper region = new RegionWrapper(pos1.getX(), pos2.getX(), pos1.getZ(), pos2.getZ()); @@ -158,7 +158,7 @@ public class BukkitChunkManager extends ChunkManager { return true; } - @Override public boolean regenerateRegion(final Location pos1, final Location pos2, + @Override public boolean regenerateRegion(final com.github.intellectualsites.plotsquared.plot.object.Location pos1, final com.github.intellectualsites.plotsquared.plot.object.Location pos2, final boolean ignoreAugment, final Runnable whenDone) { final String world = pos1.getWorld(); @@ -269,7 +269,8 @@ public class BukkitChunkManager extends ChunkManager { @Override public void run() { setChunkInPlotArea(null, new RunnableVal() { @Override public void run(ScopedLocalBlockQueue value) { - Location min = value.getMin(); + com.github.intellectualsites.plotsquared.plot.object.Location + min = value.getMin(); int bx = min.getX(); int bz = min.getZ(); for (int x = 0; x < 16; x++) { @@ -313,7 +314,8 @@ public class BukkitChunkManager extends ChunkManager { return true; } - @Override public void clearAllEntities(Location pos1, Location pos2) { + @Override public void clearAllEntities( + com.github.intellectualsites.plotsquared.plot.object.Location pos1, com.github.intellectualsites.plotsquared.plot.object.Location pos2) { String world = pos1.getWorld(); List entities = BukkitUtil.getEntities(world); int bx = pos1.getX(); @@ -349,7 +351,7 @@ public class BukkitChunkManager extends ChunkManager { } } - @Override public void swap(Location bot1, Location top1, Location bot2, Location top2, + @Override public void swap(com.github.intellectualsites.plotsquared.plot.object.Location bot1, com.github.intellectualsites.plotsquared.plot.object.Location top1, com.github.intellectualsites.plotsquared.plot.object.Location bot2, com.github.intellectualsites.plotsquared.plot.object.Location top2, final Runnable whenDone) { RegionWrapper region1 = new RegionWrapper(bot1.getX(), top1.getX(), bot1.getZ(), top1.getZ()); @@ -390,8 +392,8 @@ public class BukkitChunkManager extends ChunkManager { PlotArea area = plot.getArea(); World world = BukkitUtil.getWorld(area.worldname); - Location bot = plot.getBottomAbs(); - Location top = plot.getTopAbs(); + com.github.intellectualsites.plotsquared.plot.object.Location bot = plot.getBottomAbs(); + com.github.intellectualsites.plotsquared.plot.object.Location top = plot.getTopAbs(); int bx = bot.getX() >> 4; int bz = bot.getZ() >> 4; @@ -649,7 +651,7 @@ public class BukkitChunkManager extends ChunkManager { public void saveEntitiesOut(Chunk chunk, RegionWrapper region) { for (Entity entity : chunk.getEntities()) { - Location loc = BukkitUtil.getLocation(entity); + com.github.intellectualsites.plotsquared.plot.object.Location loc = BukkitUtil.getLocation(entity); int x = loc.getX(); int z = loc.getZ(); if (isIn(region, x, z)) { @@ -666,7 +668,7 @@ public class BukkitChunkManager extends ChunkManager { public void saveEntitiesIn(Chunk chunk, RegionWrapper region, int offsetX, int offsetZ, boolean delete) { for (Entity entity : chunk.getEntities()) { - Location loc = BukkitUtil.getLocation(entity); + com.github.intellectualsites.plotsquared.plot.object.Location loc = BukkitUtil.getLocation(entity); int x = loc.getX(); int z = loc.getZ(); if (!isIn(region, x, z)) { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitCommand.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitCommand.java similarity index 81% rename from Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitCommand.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitCommand.java index 5dc54c5a4..27edabf78 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitCommand.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitCommand.java @@ -1,9 +1,9 @@ -package com.plotsquared.bukkit.util; +package com.github.intellectualsites.plotsquared.bukkit.util; -import com.intellectualcrafters.plot.commands.MainCommand; -import com.intellectualcrafters.plot.object.ConsolePlayer; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.plotsquared.bukkit.commands.DebugUUID; +import com.github.intellectualsites.plotsquared.bukkit.commands.DebugUUID; +import com.github.intellectualsites.plotsquared.plot.commands.MainCommand; +import com.github.intellectualsites.plotsquared.plot.object.ConsolePlayer; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import org.bukkit.command.*; import org.bukkit.entity.Player; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEconHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEconHandler.java similarity index 85% rename from Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEconHandler.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEconHandler.java index 248a88ca0..a9978b76c 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEconHandler.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEconHandler.java @@ -1,10 +1,10 @@ -package com.plotsquared.bukkit.util; +package com.github.intellectualsites.plotsquared.bukkit.util; -import com.intellectualcrafters.plot.object.OfflinePlotPlayer; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.EconHandler; -import com.plotsquared.bukkit.object.BukkitOfflinePlayer; -import com.plotsquared.bukkit.object.BukkitPlayer; +import com.github.intellectualsites.plotsquared.bukkit.object.BukkitOfflinePlayer; +import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; +import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.EconHandler; import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.permission.Permission; import org.bukkit.Bukkit; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEventUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEventUtil.java similarity index 89% rename from Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEventUtil.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEventUtil.java index 4fe906beb..5a202a62b 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEventUtil.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEventUtil.java @@ -1,10 +1,10 @@ -package com.plotsquared.bukkit.util; +package com.github.intellectualsites.plotsquared.bukkit.util; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.EventUtil; -import com.plotsquared.bukkit.events.*; -import com.plotsquared.bukkit.object.BukkitPlayer; +import com.github.intellectualsites.plotsquared.bukkit.events.*; +import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.EventUtil; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitHybridUtils.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java similarity index 93% rename from Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitHybridUtils.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java index 68b729948..0410ef7a9 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitHybridUtils.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java @@ -1,17 +1,17 @@ -package com.plotsquared.bukkit.util; +package com.github.intellectualsites.plotsquared.bukkit.util; -import com.intellectualcrafters.plot.generator.HybridUtils; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.PlotBlock; -import com.intellectualcrafters.plot.object.RegionWrapper; -import com.intellectualcrafters.plot.object.RunnableVal; -import com.intellectualcrafters.plot.util.ChunkManager; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.MathMan; -import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.block.GlobalBlockQueue; -import com.intellectualcrafters.plot.util.block.LocalBlockQueue; -import com.intellectualcrafters.plot.util.expiry.PlotAnalysis; +import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.PlotBlock; +import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.MathMan; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.util.expiry.PlotAnalysis; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.World; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitInventoryUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java similarity index 89% rename from Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitInventoryUtil.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java index 0de2e354b..5fbf35066 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitInventoryUtil.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java @@ -1,10 +1,10 @@ -package com.plotsquared.bukkit.util; +package com.github.intellectualsites.plotsquared.bukkit.util; -import com.intellectualcrafters.plot.object.PlotInventory; -import com.intellectualcrafters.plot.object.PlotItemStack; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.InventoryUtil; -import com.plotsquared.bukkit.object.BukkitPlayer; +import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; +import com.github.intellectualsites.plotsquared.plot.object.PlotInventory; +import com.github.intellectualsites.plotsquared.plot.object.PlotItemStack; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.InventoryUtil; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.event.inventory.InventoryType; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSchematicHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSchematicHandler.java similarity index 95% rename from Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSchematicHandler.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSchematicHandler.java index ab2e815ce..665eb2ecd 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSchematicHandler.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSchematicHandler.java @@ -1,15 +1,15 @@ -package com.plotsquared.bukkit.util; +package com.github.intellectualsites.plotsquared.bukkit.util; -import com.intellectualcrafters.jnbt.*; -import com.intellectualcrafters.plot.object.ChunkLoc; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.RegionWrapper; -import com.intellectualcrafters.plot.object.RunnableVal; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.SchematicHandler; -import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.block.LocalBlockQueue; -import com.plotsquared.bukkit.object.schematic.StateWrapper; +import com.github.intellectualsites.plotsquared.bukkit.object.schematic.StateWrapper; +import com.github.intellectualsites.plotsquared.jnbt.*; +import com.github.intellectualsites.plotsquared.plot.object.ChunkLoc; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.World; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java similarity index 93% rename from Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java index 27d93b81b..5abf35b3e 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java @@ -1,14 +1,14 @@ -package com.plotsquared.bukkit.util; +package com.github.intellectualsites.plotsquared.bukkit.util; -import com.intellectualcrafters.configuration.ConfigurationSection; -import com.intellectualcrafters.configuration.file.YamlConfiguration; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.ConfigurationNode; -import com.intellectualcrafters.plot.generator.GeneratorWrapper; -import com.intellectualcrafters.plot.object.PlotArea; -import com.intellectualcrafters.plot.object.SetupObject; -import com.intellectualcrafters.plot.util.SetupUtils; -import com.plotsquared.bukkit.generator.BukkitPlotGenerator; +import com.github.intellectualsites.plotsquared.bukkit.generator.BukkitPlotGenerator; +import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; +import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; +import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.SetupObject; +import com.github.intellectualsites.plotsquared.plot.util.SetupUtils; import org.bukkit.*; import org.bukkit.World.Environment; import org.bukkit.entity.Player; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitTaskManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitTaskManager.java similarity index 88% rename from Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitTaskManager.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitTaskManager.java index 13325772b..56448ff34 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitTaskManager.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitTaskManager.java @@ -1,7 +1,7 @@ -package com.plotsquared.bukkit.util; +package com.github.intellectualsites.plotsquared.bukkit.util; -import com.intellectualcrafters.plot.util.TaskManager; -import com.plotsquared.bukkit.BukkitMain; +import com.github.intellectualsites.plotsquared.bukkit.BukkitMain; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import org.bukkit.Bukkit; public class BukkitTaskManager extends TaskManager { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java similarity index 93% rename from Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java index e1abb1b08..5586a96f0 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java @@ -1,15 +1,15 @@ -package com.plotsquared.bukkit.util; +package com.github.intellectualsites.plotsquared.bukkit.util; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.PlotBlock; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.RegionWrapper; -import com.intellectualcrafters.plot.object.schematic.PlotItem; -import com.intellectualcrafters.plot.util.MathMan; -import com.intellectualcrafters.plot.util.StringComparison; -import com.intellectualcrafters.plot.util.UUIDHandler; -import com.intellectualcrafters.plot.util.WorldUtil; -import com.plotsquared.bukkit.object.BukkitPlayer; +import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.PlotBlock; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper; +import com.github.intellectualsites.plotsquared.plot.object.schematic.PlotItem; +import com.github.intellectualsites.plotsquared.plot.util.MathMan; +import com.github.intellectualsites.plotsquared.plot.util.StringComparison; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.OfflinePlayer; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitVersion.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitVersion.java similarity index 90% rename from Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitVersion.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitVersion.java index cdf36fff9..99226ea31 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitVersion.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitVersion.java @@ -1,4 +1,4 @@ -package com.plotsquared.bukkit.util; +package com.github.intellectualsites.plotsquared.bukkit.util; public class BukkitVersion { public static int[] v1_13_0 = {1, 13, 0}; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/Metrics.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/Metrics.java similarity index 99% rename from Bukkit/src/main/java/com/plotsquared/bukkit/util/Metrics.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/Metrics.java index 276ee0c78..1dea71d41 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/Metrics.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/Metrics.java @@ -1,4 +1,4 @@ -package com.plotsquared.bukkit.util; +package com.github.intellectualsites.plotsquared.bukkit.util; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/NbtFactory.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/NbtFactory.java similarity index 99% rename from Bukkit/src/main/java/com/plotsquared/bukkit/util/NbtFactory.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/NbtFactory.java index 54cdfdf7a..ffc69edfc 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/NbtFactory.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/NbtFactory.java @@ -1,4 +1,4 @@ -package com.plotsquared.bukkit.util; +package com.github.intellectualsites.plotsquared.bukkit.util; import com.google.common.base.Splitter; import com.google.common.collect.BiMap; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/OfflinePlayerUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/OfflinePlayerUtil.java similarity index 96% rename from Bukkit/src/main/java/com/plotsquared/bukkit/util/OfflinePlayerUtil.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/OfflinePlayerUtil.java index 607a607ad..2e4a6c4a7 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/OfflinePlayerUtil.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/OfflinePlayerUtil.java @@ -1,4 +1,4 @@ -package com.plotsquared.bukkit.util; +package com.github.intellectualsites.plotsquared.bukkit.util; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; @@ -9,8 +9,6 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.util.UUID; -import static com.intellectualcrafters.plot.util.ReflectionUtils.*; - public class OfflinePlayerUtil { public static Player loadPlayer(String name) { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/SendChunk.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java similarity index 86% rename from Bukkit/src/main/java/com/plotsquared/bukkit/util/SendChunk.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java index 6c843639b..638cf18b8 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/SendChunk.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java @@ -1,17 +1,17 @@ -package com.plotsquared.bukkit.util; +package com.github.intellectualsites.plotsquared.bukkit.util; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.ChunkLoc; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.ReflectionUtils.RefClass; -import com.intellectualcrafters.plot.util.ReflectionUtils.RefConstructor; -import com.intellectualcrafters.plot.util.ReflectionUtils.RefField; -import com.intellectualcrafters.plot.util.ReflectionUtils.RefMethod; -import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.UUIDHandler; -import com.plotsquared.bukkit.object.BukkitPlayer; +import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.object.ChunkLoc; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefClass; +import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefConstructor; +import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefField; +import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefMethod; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.World; @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map.Entry; -import static com.intellectualcrafters.plot.util.ReflectionUtils.getRefClass; +import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass; /** * An utility that can be used to send chunks, rather than using bukkit code diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/SetGenCB.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SetGenCB.java similarity index 84% rename from Bukkit/src/main/java/com/plotsquared/bukkit/util/SetGenCB.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SetGenCB.java index f8c4ece83..c20df4847 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/SetGenCB.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SetGenCB.java @@ -1,9 +1,9 @@ -package com.plotsquared.bukkit.util; +package com.github.intellectualsites.plotsquared.bukkit.util; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.generator.GeneratorWrapper; -import com.intellectualcrafters.plot.util.SetupUtils; -import com.plotsquared.bukkit.generator.BukkitAugmentedGenerator; +import com.github.intellectualsites.plotsquared.bukkit.generator.BukkitAugmentedGenerator; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; +import com.github.intellectualsites.plotsquared.plot.util.SetupUtils; import org.bukkit.World; import org.bukkit.generator.BlockPopulator; import org.bukkit.generator.ChunkGenerator; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java similarity index 94% rename from Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java index 0c398f55c..b0e75a946 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java @@ -1,9 +1,9 @@ -package com.plotsquared.bukkit.util.block; +package com.github.intellectualsites.plotsquared.bukkit.util.block; -import com.intellectualcrafters.plot.object.PlotBlock; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.StringMan; -import com.intellectualcrafters.plot.util.block.BasicLocalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.object.PlotBlock; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.plot.util.block.BasicLocalBlockQueue; import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.World; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue_1_7.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue_1_7.java similarity index 89% rename from Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue_1_7.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue_1_7.java index 57f9bcecc..a4fb27651 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue_1_7.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue_1_7.java @@ -1,18 +1,18 @@ -package com.plotsquared.bukkit.util.block; +package com.github.intellectualsites.plotsquared.bukkit.util.block; -import com.intellectualcrafters.plot.object.ChunkWrapper; -import com.intellectualcrafters.plot.object.PlotBlock; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.ReflectionUtils; -import com.intellectualcrafters.plot.util.TaskManager; -import com.plotsquared.bukkit.util.SendChunk; +import com.github.intellectualsites.plotsquared.bukkit.util.SendChunk; +import com.github.intellectualsites.plotsquared.plot.object.ChunkWrapper; +import com.github.intellectualsites.plotsquared.plot.object.PlotBlock; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.World; import java.util.*; -import static com.intellectualcrafters.plot.util.ReflectionUtils.getRefClass; +import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass; public class BukkitLocalQueue_1_7 extends BukkitLocalQueue { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue_1_8.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue_1_8.java similarity index 94% rename from Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue_1_8.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue_1_8.java index ebc93186d..c7e98f020 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue_1_8.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue_1_8.java @@ -1,13 +1,13 @@ -package com.plotsquared.bukkit.util.block; +package com.github.intellectualsites.plotsquared.bukkit.util.block; -import com.intellectualcrafters.plot.object.ChunkWrapper; -import com.intellectualcrafters.plot.object.PlotBlock; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.ReflectionUtils; -import com.intellectualcrafters.plot.util.ReflectionUtils.RefClass; -import com.intellectualcrafters.plot.util.ReflectionUtils.RefMethod; -import com.intellectualcrafters.plot.util.TaskManager; -import com.plotsquared.bukkit.util.SendChunk; +import com.github.intellectualsites.plotsquared.bukkit.util.SendChunk; +import com.github.intellectualsites.plotsquared.plot.object.ChunkWrapper; +import com.github.intellectualsites.plotsquared.plot.object.PlotBlock; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils; +import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefClass; +import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefMethod; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.World; @@ -15,7 +15,7 @@ import org.bukkit.block.Block; import java.util.*; -import static com.intellectualcrafters.plot.util.ReflectionUtils.getRefClass; +import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass; public class BukkitLocalQueue_1_8 extends BukkitLocalQueue { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue_1_8_3.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue_1_8_3.java similarity index 95% rename from Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue_1_8_3.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue_1_8_3.java index ddb18f549..4db6570df 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue_1_8_3.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue_1_8_3.java @@ -1,14 +1,14 @@ -package com.plotsquared.bukkit.util.block; +package com.github.intellectualsites.plotsquared.bukkit.util.block; -import com.intellectualcrafters.plot.object.ChunkLoc; -import com.intellectualcrafters.plot.object.ChunkWrapper; -import com.intellectualcrafters.plot.object.PseudoRandom; -import com.intellectualcrafters.plot.util.ChunkManager; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.ReflectionUtils; -import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.block.BasicLocalBlockQueue; -import com.plotsquared.bukkit.util.SendChunk; +import com.github.intellectualsites.plotsquared.bukkit.util.SendChunk; +import com.github.intellectualsites.plotsquared.plot.object.ChunkLoc; +import com.github.intellectualsites.plotsquared.plot.object.ChunkWrapper; +import com.github.intellectualsites.plotsquared.plot.object.PseudoRandom; +import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.plot.util.block.BasicLocalBlockQueue; import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.Material; @@ -18,7 +18,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.*; -import static com.intellectualcrafters.plot.util.ReflectionUtils.getRefClass; +import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass; public class BukkitLocalQueue_1_8_3 extends BukkitLocalQueue { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue_1_9.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue_1_9.java similarity index 97% rename from Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue_1_9.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue_1_9.java index 5897efb81..2849f9082 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue_1_9.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue_1_9.java @@ -1,10 +1,10 @@ -package com.plotsquared.bukkit.util.block; +package com.github.intellectualsites.plotsquared.bukkit.util.block; -import com.intellectualcrafters.plot.object.ChunkWrapper; -import com.intellectualcrafters.plot.object.PseudoRandom; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.ReflectionUtils; -import com.intellectualcrafters.plot.util.block.BasicLocalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.object.ChunkWrapper; +import com.github.intellectualsites.plotsquared.plot.object.PseudoRandom; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils; +import com.github.intellectualsites.plotsquared.plot.util.block.BasicLocalBlockQueue; import org.bukkit.Chunk; import org.bukkit.Material; import org.bukkit.World; @@ -13,7 +13,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.*; -import static com.intellectualcrafters.plot.util.ReflectionUtils.getRefClass; +import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass; public class BukkitLocalQueue_1_9 extends BukkitLocalQueue { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/GenChunk.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java similarity index 92% rename from Bukkit/src/main/java/com/plotsquared/bukkit/util/block/GenChunk.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java index 9bc3a713d..e700a3433 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/GenChunk.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java @@ -1,11 +1,11 @@ -package com.plotsquared.bukkit.util.block; +package com.github.intellectualsites.plotsquared.bukkit.util.block; -import com.intellectualcrafters.plot.object.ChunkWrapper; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.PlotBlock; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.block.ScopedLocalBlockQueue; -import com.plotsquared.bukkit.util.BukkitUtil; +import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; +import com.github.intellectualsites.plotsquared.plot.object.ChunkWrapper; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.PlotBlock; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue; import org.bukkit.Chunk; import org.bukkit.Material; import org.bukkit.World; diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/uuid/DatFileFilter.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DatFileFilter.java similarity index 77% rename from Nukkit/src/main/java/com/plotsquared/nukkit/uuid/DatFileFilter.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DatFileFilter.java index 68541ce90..2fb0892a7 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/uuid/DatFileFilter.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DatFileFilter.java @@ -1,4 +1,4 @@ -package com.plotsquared.nukkit.uuid; +package com.github.intellectualsites.plotsquared.bukkit.uuid; import java.io.File; import java.io.FilenameFilter; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java similarity index 71% rename from Bukkit/src/main/java/com/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java index ba24a34e5..3660bef92 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java @@ -1,10 +1,10 @@ -package com.plotsquared.bukkit.uuid; +package com.github.intellectualsites.plotsquared.bukkit.uuid; -import com.intellectualcrafters.plot.object.OfflinePlotPlayer; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.uuid.UUIDWrapper; -import com.plotsquared.bukkit.object.BukkitOfflinePlayer; -import com.plotsquared.bukkit.object.BukkitPlayer; +import com.github.intellectualsites.plotsquared.bukkit.object.BukkitOfflinePlayer; +import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; +import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/FileUUIDHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java similarity index 92% rename from Bukkit/src/main/java/com/plotsquared/bukkit/uuid/FileUUIDHandler.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java index b36aafeb9..fd8843c77 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/FileUUIDHandler.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java @@ -1,20 +1,20 @@ -package com.plotsquared.bukkit.uuid; +package com.github.intellectualsites.plotsquared.bukkit.uuid; +import com.github.intellectualsites.plotsquared.bukkit.util.NbtFactory; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandlerImplementation; +import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager; +import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; import com.google.common.collect.HashBiMap; import com.google.common.collect.Sets; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.object.OfflinePlotPlayer; -import com.intellectualcrafters.plot.object.RunnableVal; -import com.intellectualcrafters.plot.object.StringWrapper; -import com.intellectualcrafters.plot.util.StringMan; -import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.UUIDHandler; -import com.intellectualcrafters.plot.util.UUIDHandlerImplementation; -import com.intellectualcrafters.plot.util.expiry.ExpireManager; -import com.intellectualcrafters.plot.uuid.UUIDWrapper; -import com.plotsquared.bukkit.util.NbtFactory; import org.bukkit.Bukkit; import org.bukkit.World; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/LowerOfflineUUIDWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/LowerOfflineUUIDWrapper.java similarity index 81% rename from Bukkit/src/main/java/com/plotsquared/bukkit/uuid/LowerOfflineUUIDWrapper.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/LowerOfflineUUIDWrapper.java index 90d871165..55e2039a0 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/LowerOfflineUUIDWrapper.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/LowerOfflineUUIDWrapper.java @@ -1,8 +1,8 @@ -package com.plotsquared.bukkit.uuid; +package com.github.intellectualsites.plotsquared.bukkit.uuid; +import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.google.common.base.Charsets; -import com.intellectualcrafters.plot.object.OfflinePlotPlayer; -import com.intellectualcrafters.plot.object.PlotPlayer; import org.bukkit.OfflinePlayer; import java.util.UUID; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java similarity index 86% rename from Bukkit/src/main/java/com/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java index 63899deb7..3fb8f223d 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java @@ -1,14 +1,14 @@ -package com.plotsquared.bukkit.uuid; +package com.github.intellectualsites.plotsquared.bukkit.uuid; +import com.github.intellectualsites.plotsquared.bukkit.object.BukkitOfflinePlayer; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; import com.google.common.base.Charsets; import com.google.common.collect.BiMap; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.OfflinePlotPlayer; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.StringWrapper; -import com.intellectualcrafters.plot.util.UUIDHandler; -import com.intellectualcrafters.plot.uuid.UUIDWrapper; -import com.plotsquared.bukkit.object.BukkitOfflinePlayer; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.Server; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SQLUUIDHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java similarity index 93% rename from Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SQLUUIDHandler.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java index 3e46a8746..2ef3c8ea7 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SQLUUIDHandler.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java @@ -1,17 +1,17 @@ -package com.plotsquared.bukkit.uuid; +package com.github.intellectualsites.plotsquared.bukkit.uuid; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.database.SQLite; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandlerImplementation; +import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; import com.google.common.collect.HashBiMap; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.database.SQLite; -import com.intellectualcrafters.plot.object.RunnableVal; -import com.intellectualcrafters.plot.object.StringWrapper; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.UUIDHandler; -import com.intellectualcrafters.plot.util.UUIDHandlerImplementation; -import com.intellectualcrafters.plot.uuid.UUIDWrapper; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; diff --git a/Bukkit/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/api/PlotAPI.java similarity index 94% rename from Bukkit/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java rename to Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/api/PlotAPI.java index 22a725ded..70b9ed4c0 100644 --- a/Bukkit/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/api/PlotAPI.java @@ -1,17 +1,17 @@ -package com.intellectualcrafters.plot.api; +package com.github.intellectualsites.plotsquared.plot.api; -import com.intellectualcrafters.configuration.file.YamlConfiguration; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.commands.SubCommand; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.flag.FlagManager; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.*; -import com.intellectualcrafters.plot.util.block.GlobalBlockQueue; -import com.intellectualcrafters.plot.uuid.UUIDWrapper; -import com.plotsquared.bukkit.util.BukkitUtil; +import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; +import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.commands.SubCommand; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.flag.FlagManager; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.*; +import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; import org.bukkit.Location; import org.bukkit.OfflinePlayer; import org.bukkit.World; @@ -28,7 +28,7 @@ import java.util.*; *
  • {@link BukkitUtil}
    • *
  • {@link PlotPlayer}
    • *
  • {@link Plot}
    • - *
  • {@link com.intellectualcrafters.plot.object.Location}
    • + *
  • {@link com.github.intellectualsites.plotsquared.plot.object.Location}
    • *
  • {@link PlotArea}
    • *
  • {@link PS}
    • * diff --git a/Bukkit/src/main/resources/plugin.yml b/Bukkit/src/main/resources/plugin.yml index 8c0c8bd9f..655f1d355 100644 --- a/Bukkit/src/main/resources/plugin.yml +++ b/Bukkit/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: ${name} -main: com.plotsquared.bukkit.BukkitMain +main: BukkitMain version: ${version} load: STARTUP description: > @@ -314,4 +314,4 @@ permissions: plots.admin.vehicle.*: true plots.admin.interact.*: true plots.admin.build.*: true - plots.admin.destroy.*: true \ No newline at end of file + plots.admin.destroy.*: true diff --git a/Core/src/main/java/com/plotsquared/general/commands/Argument.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Argument.java similarity index 94% rename from Core/src/main/java/com/plotsquared/general/commands/Argument.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Argument.java index e2a6a0ecf..dd5221a3a 100644 --- a/Core/src/main/java/com/plotsquared/general/commands/Argument.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Argument.java @@ -1,6 +1,6 @@ -package com.plotsquared.general.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.intellectualcrafters.plot.object.PlotId; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; public abstract class Argument { diff --git a/Core/src/main/java/com/plotsquared/general/commands/Command.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java similarity index 96% rename from Core/src/main/java/com/plotsquared/general/commands/Command.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java index ba70bd5f0..4651eed77 100644 --- a/Core/src/main/java/com/plotsquared/general/commands/Command.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java @@ -1,16 +1,16 @@ -package com.plotsquared.general.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.intellectualcrafters.configuration.file.YamlConfiguration; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.commands.CommandCategory; -import com.intellectualcrafters.plot.commands.MainCommand; -import com.intellectualcrafters.plot.commands.RequiredType; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.PlotMessage; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.RunnableVal2; -import com.intellectualcrafters.plot.object.RunnableVal3; -import com.intellectualcrafters.plot.util.*; +import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory; +import com.github.intellectualsites.plotsquared.plot.commands.MainCommand; +import com.github.intellectualsites.plotsquared.plot.commands.RequiredType; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.PlotMessage; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; +import com.github.intellectualsites.plotsquared.plot.util.*; import java.io.IOException; import java.lang.annotation.Annotation; diff --git a/Core/src/main/java/com/plotsquared/general/commands/CommandCaller.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandCaller.java similarity index 77% rename from Core/src/main/java/com/plotsquared/general/commands/CommandCaller.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandCaller.java index 93c29a969..3b5ee295e 100644 --- a/Core/src/main/java/com/plotsquared/general/commands/CommandCaller.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandCaller.java @@ -1,6 +1,6 @@ -package com.plotsquared.general.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.intellectualcrafters.plot.commands.RequiredType; +import com.github.intellectualsites.plotsquared.plot.commands.RequiredType; public interface CommandCaller { diff --git a/Core/src/main/java/com/plotsquared/general/commands/CommandDeclaration.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandDeclaration.java similarity index 74% rename from Core/src/main/java/com/plotsquared/general/commands/CommandDeclaration.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandDeclaration.java index ab6cfdb90..851a03174 100644 --- a/Core/src/main/java/com/plotsquared/general/commands/CommandDeclaration.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandDeclaration.java @@ -1,7 +1,7 @@ -package com.plotsquared.general.commands; +package com.github.intellectualsites.plotsquared.commands; -import com.intellectualcrafters.plot.commands.CommandCategory; -import com.intellectualcrafters.plot.commands.RequiredType; +import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory; +import com.github.intellectualsites.plotsquared.plot.commands.RequiredType; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Core/src/main/java/com/intellectualcrafters/configuration/Configuration.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/Configuration.java similarity index 98% rename from Core/src/main/java/com/intellectualcrafters/configuration/Configuration.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/Configuration.java index 2c26399b0..c2b4b4d95 100644 --- a/Core/src/main/java/com/intellectualcrafters/configuration/Configuration.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/Configuration.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.configuration; +package com.github.intellectualsites.plotsquared.configuration; import java.util.Map; diff --git a/Core/src/main/java/com/intellectualcrafters/configuration/ConfigurationOptions.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationOptions.java similarity index 97% rename from Core/src/main/java/com/intellectualcrafters/configuration/ConfigurationOptions.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationOptions.java index b5f2478bb..d26cac65d 100644 --- a/Core/src/main/java/com/intellectualcrafters/configuration/ConfigurationOptions.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationOptions.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.configuration; +package com.github.intellectualsites.plotsquared.configuration; /** * Various settings for controlling the input and output of a {@link diff --git a/Core/src/main/java/com/intellectualcrafters/configuration/ConfigurationSection.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationSection.java similarity index 99% rename from Core/src/main/java/com/intellectualcrafters/configuration/ConfigurationSection.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationSection.java index b188093c0..9f4fc7da4 100644 --- a/Core/src/main/java/com/intellectualcrafters/configuration/ConfigurationSection.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationSection.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.configuration; +package com.github.intellectualsites.plotsquared.configuration; import java.util.List; import java.util.Map; diff --git a/Core/src/main/java/com/intellectualcrafters/configuration/InvalidConfigurationException.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/InvalidConfigurationException.java similarity index 94% rename from Core/src/main/java/com/intellectualcrafters/configuration/InvalidConfigurationException.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/InvalidConfigurationException.java index 23765e20f..e9c099ed1 100644 --- a/Core/src/main/java/com/intellectualcrafters/configuration/InvalidConfigurationException.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/InvalidConfigurationException.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.configuration; +package com.github.intellectualsites.plotsquared.configuration; /** * Exception thrown when attempting to load an invalid {@link Configuration}. diff --git a/Core/src/main/java/com/intellectualcrafters/configuration/MemoryConfiguration.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfiguration.java similarity index 96% rename from Core/src/main/java/com/intellectualcrafters/configuration/MemoryConfiguration.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfiguration.java index 0b4c73a30..20131cbe1 100644 --- a/Core/src/main/java/com/intellectualcrafters/configuration/MemoryConfiguration.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfiguration.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.configuration; +package com.github.intellectualsites.plotsquared.configuration; import java.util.Map; diff --git a/Core/src/main/java/com/intellectualcrafters/configuration/MemoryConfigurationOptions.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfigurationOptions.java similarity index 91% rename from Core/src/main/java/com/intellectualcrafters/configuration/MemoryConfigurationOptions.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfigurationOptions.java index 13f5f4076..971ea1e70 100644 --- a/Core/src/main/java/com/intellectualcrafters/configuration/MemoryConfigurationOptions.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfigurationOptions.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.configuration; +package com.github.intellectualsites.plotsquared.configuration; /** * Various settings for controlling the input and output of a {@link diff --git a/Core/src/main/java/com/intellectualcrafters/configuration/MemorySection.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemorySection.java similarity index 99% rename from Core/src/main/java/com/intellectualcrafters/configuration/MemorySection.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemorySection.java index 5cca55a37..ddc2506bd 100644 --- a/Core/src/main/java/com/intellectualcrafters/configuration/MemorySection.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemorySection.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.configuration; +package com.github.intellectualsites.plotsquared.configuration; import java.util.*; diff --git a/Core/src/main/java/com/intellectualcrafters/configuration/file/FileConfiguration.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java similarity index 94% rename from Core/src/main/java/com/intellectualcrafters/configuration/file/FileConfiguration.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java index 85e4987da..23a976e7d 100644 --- a/Core/src/main/java/com/intellectualcrafters/configuration/file/FileConfiguration.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java @@ -1,8 +1,8 @@ -package com.intellectualcrafters.configuration.file; +package com.github.intellectualsites.plotsquared.configuration.file; -import com.intellectualcrafters.configuration.Configuration; -import com.intellectualcrafters.configuration.InvalidConfigurationException; -import com.intellectualcrafters.configuration.MemoryConfiguration; +import com.github.intellectualsites.plotsquared.configuration.Configuration; +import com.github.intellectualsites.plotsquared.configuration.InvalidConfigurationException; +import com.github.intellectualsites.plotsquared.configuration.MemoryConfiguration; import java.io.*; import java.nio.charset.StandardCharsets; diff --git a/Core/src/main/java/com/intellectualcrafters/configuration/file/FileConfigurationOptions.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfigurationOptions.java similarity index 92% rename from Core/src/main/java/com/intellectualcrafters/configuration/file/FileConfigurationOptions.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfigurationOptions.java index 2f5d27ef1..646e52d37 100644 --- a/Core/src/main/java/com/intellectualcrafters/configuration/file/FileConfigurationOptions.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfigurationOptions.java @@ -1,8 +1,8 @@ -package com.intellectualcrafters.configuration.file; +package com.github.intellectualsites.plotsquared.configuration.file; -import com.intellectualcrafters.configuration.Configuration; -import com.intellectualcrafters.configuration.MemoryConfiguration; -import com.intellectualcrafters.configuration.MemoryConfigurationOptions; +import com.github.intellectualsites.plotsquared.configuration.Configuration; +import com.github.intellectualsites.plotsquared.configuration.MemoryConfiguration; +import com.github.intellectualsites.plotsquared.configuration.MemoryConfigurationOptions; /** * Various settings for controlling the input and output of a {@link diff --git a/Core/src/main/java/com/intellectualcrafters/configuration/file/YamlConfiguration.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfiguration.java similarity index 94% rename from Core/src/main/java/com/intellectualcrafters/configuration/file/YamlConfiguration.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfiguration.java index a686c7be1..15587bcf7 100644 --- a/Core/src/main/java/com/intellectualcrafters/configuration/file/YamlConfiguration.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfiguration.java @@ -1,9 +1,9 @@ -package com.intellectualcrafters.configuration.file; +package com.github.intellectualsites.plotsquared.configuration.file; -import com.intellectualcrafters.configuration.Configuration; -import com.intellectualcrafters.configuration.ConfigurationSection; -import com.intellectualcrafters.configuration.InvalidConfigurationException; -import com.intellectualcrafters.plot.PS; +import com.github.intellectualsites.plotsquared.configuration.Configuration; +import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; +import com.github.intellectualsites.plotsquared.configuration.InvalidConfigurationException; +import com.github.intellectualsites.plotsquared.plot.PS; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.error.YAMLException; diff --git a/Core/src/main/java/com/intellectualcrafters/configuration/file/YamlConfigurationOptions.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfigurationOptions.java similarity index 96% rename from Core/src/main/java/com/intellectualcrafters/configuration/file/YamlConfigurationOptions.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfigurationOptions.java index c502e682c..0aa0f515e 100644 --- a/Core/src/main/java/com/intellectualcrafters/configuration/file/YamlConfigurationOptions.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfigurationOptions.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.configuration.file; +package com.github.intellectualsites.plotsquared.configuration.file; /** * Various settings for controlling the input and output of a {@link diff --git a/Core/src/main/java/com/intellectualcrafters/configuration/file/YamlConstructor.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConstructor.java similarity index 90% rename from Core/src/main/java/com/intellectualcrafters/configuration/file/YamlConstructor.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConstructor.java index 2c46805a6..1f52f7abb 100644 --- a/Core/src/main/java/com/intellectualcrafters/configuration/file/YamlConstructor.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConstructor.java @@ -1,6 +1,6 @@ -package com.intellectualcrafters.configuration.file; +package com.github.intellectualsites.plotsquared.configuration.file; -import com.intellectualcrafters.configuration.serialization.ConfigurationSerialization; +import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerialization; import org.yaml.snakeyaml.constructor.SafeConstructor; import org.yaml.snakeyaml.error.YAMLException; import org.yaml.snakeyaml.nodes.Node; diff --git a/Core/src/main/java/com/intellectualcrafters/configuration/file/YamlRepresenter.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlRepresenter.java similarity index 77% rename from Core/src/main/java/com/intellectualcrafters/configuration/file/YamlRepresenter.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlRepresenter.java index 239bda7ba..ebe1aebee 100644 --- a/Core/src/main/java/com/intellectualcrafters/configuration/file/YamlRepresenter.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlRepresenter.java @@ -1,8 +1,8 @@ -package com.intellectualcrafters.configuration.file; +package com.github.intellectualsites.plotsquared.configuration.file; -import com.intellectualcrafters.configuration.ConfigurationSection; -import com.intellectualcrafters.configuration.serialization.ConfigurationSerializable; -import com.intellectualcrafters.configuration.serialization.ConfigurationSerialization; +import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; +import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerializable; +import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerialization; import org.yaml.snakeyaml.nodes.Node; import org.yaml.snakeyaml.representer.Representer; diff --git a/Core/src/main/java/com/intellectualcrafters/configuration/serialization/ConfigurationSerializable.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerializable.java similarity index 93% rename from Core/src/main/java/com/intellectualcrafters/configuration/serialization/ConfigurationSerializable.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerializable.java index 2df347043..9010c515c 100644 --- a/Core/src/main/java/com/intellectualcrafters/configuration/serialization/ConfigurationSerializable.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerializable.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.configuration.serialization; +package com.github.intellectualsites.plotsquared.configuration.serialization; import java.util.Map; diff --git a/Core/src/main/java/com/intellectualcrafters/configuration/serialization/ConfigurationSerialization.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerialization.java similarity index 98% rename from Core/src/main/java/com/intellectualcrafters/configuration/serialization/ConfigurationSerialization.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerialization.java index 58f22d14c..0783b4af5 100644 --- a/Core/src/main/java/com/intellectualcrafters/configuration/serialization/ConfigurationSerialization.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerialization.java @@ -1,6 +1,6 @@ -package com.intellectualcrafters.configuration.serialization; +package com.github.intellectualsites.plotsquared.configuration.serialization; -import com.intellectualcrafters.configuration.Configuration; +import com.github.intellectualsites.plotsquared.configuration.Configuration; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/Core/src/main/java/com/intellectualcrafters/configuration/serialization/DelegateDeserialization.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/DelegateDeserialization.java similarity index 88% rename from Core/src/main/java/com/intellectualcrafters/configuration/serialization/DelegateDeserialization.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/DelegateDeserialization.java index 090877f25..8a071cb2e 100644 --- a/Core/src/main/java/com/intellectualcrafters/configuration/serialization/DelegateDeserialization.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/DelegateDeserialization.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.configuration.serialization; +package com.github.intellectualsites.plotsquared.configuration.serialization; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Core/src/main/java/com/intellectualcrafters/configuration/serialization/SerializableAs.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/SerializableAs.java similarity index 93% rename from Core/src/main/java/com/intellectualcrafters/configuration/serialization/SerializableAs.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/SerializableAs.java index 95c6c7af6..79b50998c 100644 --- a/Core/src/main/java/com/intellectualcrafters/configuration/serialization/SerializableAs.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/SerializableAs.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.configuration.serialization; +package com.github.intellectualsites.plotsquared.configuration.serialization; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/ByteArrayTag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/ByteArrayTag.java similarity index 95% rename from Core/src/main/java/com/intellectualcrafters/jnbt/ByteArrayTag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/ByteArrayTag.java index b2c020eb6..ffb013554 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/ByteArrayTag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/ByteArrayTag.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.jnbt; +package com.github.intellectualsites.plotsquared.jnbt; /** * The {@code TAG_Byte_Array} tag. diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/ByteTag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/ByteTag.java similarity index 93% rename from Core/src/main/java/com/intellectualcrafters/jnbt/ByteTag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/ByteTag.java index 5174301ea..786b03251 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/ByteTag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/ByteTag.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.jnbt; +package com.github.intellectualsites.plotsquared.jnbt; /** * The {@code TAG_Byte} tag. diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/CompoundTag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/CompoundTag.java similarity index 99% rename from Core/src/main/java/com/intellectualcrafters/jnbt/CompoundTag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/CompoundTag.java index 2974944d1..0aa98a9ca 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/CompoundTag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/CompoundTag.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.jnbt; +package com.github.intellectualsites.plotsquared.jnbt; import java.util.Collections; import java.util.HashMap; diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/CompoundTagBuilder.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/CompoundTagBuilder.java similarity index 98% rename from Core/src/main/java/com/intellectualcrafters/jnbt/CompoundTagBuilder.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/CompoundTagBuilder.java index 1d650a613..7d31a5a99 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/CompoundTagBuilder.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/CompoundTagBuilder.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.jnbt; +package com.github.intellectualsites.plotsquared.jnbt; import java.util.HashMap; import java.util.Map; diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/DoubleTag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/DoubleTag.java similarity index 94% rename from Core/src/main/java/com/intellectualcrafters/jnbt/DoubleTag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/DoubleTag.java index e05039ac6..b084f9481 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/DoubleTag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/DoubleTag.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.jnbt; +package com.github.intellectualsites.plotsquared.jnbt; /** * The {@code TAG_Double} tag. diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/EndTag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/EndTag.java similarity index 84% rename from Core/src/main/java/com/intellectualcrafters/jnbt/EndTag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/EndTag.java index d226ec8e9..ce0978fb6 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/EndTag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/EndTag.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.jnbt; +package com.github.intellectualsites.plotsquared.jnbt; /** * The {@code TAG_End} tag. diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/FloatTag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/FloatTag.java similarity index 94% rename from Core/src/main/java/com/intellectualcrafters/jnbt/FloatTag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/FloatTag.java index 63207f127..2f7b9f39b 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/FloatTag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/FloatTag.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.jnbt; +package com.github.intellectualsites.plotsquared.jnbt; /** * The {@code TAG_Float} tag. diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/IntArrayTag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/IntArrayTag.java similarity index 95% rename from Core/src/main/java/com/intellectualcrafters/jnbt/IntArrayTag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/IntArrayTag.java index d0f7ccb00..46ddddacd 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/IntArrayTag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/IntArrayTag.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.jnbt; +package com.github.intellectualsites.plotsquared.jnbt; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/IntTag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/IntTag.java similarity index 93% rename from Core/src/main/java/com/intellectualcrafters/jnbt/IntTag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/IntTag.java index 98dae4c51..8bd052dc6 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/IntTag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/IntTag.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.jnbt; +package com.github.intellectualsites.plotsquared.jnbt; /** * The {@code TAG_Int} tag. diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/ListTag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/ListTag.java similarity index 99% rename from Core/src/main/java/com/intellectualcrafters/jnbt/ListTag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/ListTag.java index c00923bc0..bf15607f3 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/ListTag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/ListTag.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.jnbt; +package com.github.intellectualsites.plotsquared.jnbt; import java.util.Collections; import java.util.List; diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/ListTagBuilder.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/ListTagBuilder.java similarity index 98% rename from Core/src/main/java/com/intellectualcrafters/jnbt/ListTagBuilder.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/ListTagBuilder.java index 0dd0450b4..60c2485af 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/ListTagBuilder.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/ListTagBuilder.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.jnbt; +package com.github.intellectualsites.plotsquared.jnbt; import java.util.ArrayList; import java.util.Arrays; diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/LongTag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/LongTag.java similarity index 93% rename from Core/src/main/java/com/intellectualcrafters/jnbt/LongTag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/LongTag.java index 02b2b3079..27f5b1cab 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/LongTag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/LongTag.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.jnbt; +package com.github.intellectualsites.plotsquared.jnbt; /** * The {@code TAG_Long} tag. diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/NBTConstants.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/NBTConstants.java similarity index 97% rename from Core/src/main/java/com/intellectualcrafters/jnbt/NBTConstants.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/NBTConstants.java index cab80688d..9bdd4307b 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/NBTConstants.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/NBTConstants.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.jnbt; +package com.github.intellectualsites.plotsquared.jnbt; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/NBTInputStream.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/NBTInputStream.java similarity index 99% rename from Core/src/main/java/com/intellectualcrafters/jnbt/NBTInputStream.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/NBTInputStream.java index 0d7a2d656..5a031d182 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/NBTInputStream.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/NBTInputStream.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.jnbt; +package com.github.intellectualsites.plotsquared.jnbt; import java.io.Closeable; import java.io.DataInputStream; diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/NBTOutputStream.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/NBTOutputStream.java similarity index 99% rename from Core/src/main/java/com/intellectualcrafters/jnbt/NBTOutputStream.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/NBTOutputStream.java index 0ed66927d..d4e1815f9 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/NBTOutputStream.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/NBTOutputStream.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.jnbt; +package com.github.intellectualsites.plotsquared.jnbt; import java.io.Closeable; import java.io.DataOutputStream; diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/NBTUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/NBTUtils.java similarity index 98% rename from Core/src/main/java/com/intellectualcrafters/jnbt/NBTUtils.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/NBTUtils.java index e663367bf..39ee8d76d 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/NBTUtils.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/NBTUtils.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.jnbt; +package com.github.intellectualsites.plotsquared.jnbt; import java.util.Map; diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/ShortTag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/ShortTag.java similarity index 94% rename from Core/src/main/java/com/intellectualcrafters/jnbt/ShortTag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/ShortTag.java index f74a99700..00fe4a55e 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/ShortTag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/ShortTag.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.jnbt; +package com.github.intellectualsites.plotsquared.jnbt; /** * The {@code TAG_Short} tag. diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/StringTag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/StringTag.java similarity index 94% rename from Core/src/main/java/com/intellectualcrafters/jnbt/StringTag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/StringTag.java index 6724fcc46..af0833d5d 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/StringTag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/StringTag.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.jnbt; +package com.github.intellectualsites.plotsquared.jnbt; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/Tag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/Tag.java similarity index 92% rename from Core/src/main/java/com/intellectualcrafters/jnbt/Tag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/Tag.java index 81a40d367..aff875142 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/Tag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/jnbt/Tag.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.jnbt; +package com.github.intellectualsites.plotsquared.jnbt; /** * Represents a NBT tag. diff --git a/Core/src/main/java/com/intellectualcrafters/json/CDL.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/CDL.java similarity index 99% rename from Core/src/main/java/com/intellectualcrafters/json/CDL.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/json/CDL.java index a06e5d1bc..003e4cb2c 100644 --- a/Core/src/main/java/com/intellectualcrafters/json/CDL.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/CDL.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.json; +package com.github.intellectualsites.plotsquared.json; /** * This provides static methods to convert comma delimited text into a JSONArray, and to covert a JSONArray into comma diff --git a/Core/src/main/java/com/intellectualcrafters/json/Cookie.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/Cookie.java similarity index 98% rename from Core/src/main/java/com/intellectualcrafters/json/Cookie.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/json/Cookie.java index 827799d2f..8e3c7444d 100644 --- a/Core/src/main/java/com/intellectualcrafters/json/Cookie.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/Cookie.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.json; +package com.github.intellectualsites.plotsquared.json; /** * Convert a web browser cookie specification to a JSONObject and back. JSON and Cookies are both notations for diff --git a/Core/src/main/java/com/intellectualcrafters/json/CookieList.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/CookieList.java similarity index 97% rename from Core/src/main/java/com/intellectualcrafters/json/CookieList.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/json/CookieList.java index 522e4e886..90b51cdd7 100644 --- a/Core/src/main/java/com/intellectualcrafters/json/CookieList.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/CookieList.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.json; +package com.github.intellectualsites.plotsquared.json; import java.util.Iterator; diff --git a/Core/src/main/java/com/intellectualcrafters/json/HTTP.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/HTTP.java similarity index 98% rename from Core/src/main/java/com/intellectualcrafters/json/HTTP.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/json/HTTP.java index 43abfc45d..b03eacf69 100644 --- a/Core/src/main/java/com/intellectualcrafters/json/HTTP.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/HTTP.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.json; +package com.github.intellectualsites.plotsquared.json; import java.util.Iterator; diff --git a/Core/src/main/java/com/intellectualcrafters/json/HTTPTokener.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/HTTPTokener.java similarity index 96% rename from Core/src/main/java/com/intellectualcrafters/json/HTTPTokener.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/json/HTTPTokener.java index 2459c6e33..9ee6548cf 100644 --- a/Core/src/main/java/com/intellectualcrafters/json/HTTPTokener.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/HTTPTokener.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.json; +package com.github.intellectualsites.plotsquared.json; /** * The HTTPTokener extends the JSONTokener to provide additional methods for the parsing of HTTP headers. diff --git a/Core/src/main/java/com/intellectualcrafters/json/JSONArray.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONArray.java similarity index 99% rename from Core/src/main/java/com/intellectualcrafters/json/JSONArray.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONArray.java index 33a53acb1..7eec3f8b4 100644 --- a/Core/src/main/java/com/intellectualcrafters/json/JSONArray.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONArray.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.json; +package com.github.intellectualsites.plotsquared.json; import java.io.IOException; import java.io.StringWriter; diff --git a/Core/src/main/java/com/intellectualcrafters/json/JSONException.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONException.java similarity index 94% rename from Core/src/main/java/com/intellectualcrafters/json/JSONException.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONException.java index 8fd9f88da..67de10815 100644 --- a/Core/src/main/java/com/intellectualcrafters/json/JSONException.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONException.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.json; +package com.github.intellectualsites.plotsquared.json; /** * The JSONException is thrown by the JSON.org classes when things are amiss. diff --git a/Core/src/main/java/com/intellectualcrafters/json/JSONML.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONML.java similarity index 99% rename from Core/src/main/java/com/intellectualcrafters/json/JSONML.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONML.java index 5153a38a5..144ebc1d8 100644 --- a/Core/src/main/java/com/intellectualcrafters/json/JSONML.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONML.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.json; +package com.github.intellectualsites.plotsquared.json; import java.util.Iterator; diff --git a/Core/src/main/java/com/intellectualcrafters/json/JSONObject.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONObject.java similarity index 99% rename from Core/src/main/java/com/intellectualcrafters/json/JSONObject.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONObject.java index 4e7d06e84..b428a1f7a 100644 --- a/Core/src/main/java/com/intellectualcrafters/json/JSONObject.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONObject.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.json; +package com.github.intellectualsites.plotsquared.json; import java.io.IOException; import java.io.StringWriter; diff --git a/Core/src/main/java/com/intellectualcrafters/json/JSONString.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONString.java similarity index 92% rename from Core/src/main/java/com/intellectualcrafters/json/JSONString.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONString.java index 231506795..019776e58 100644 --- a/Core/src/main/java/com/intellectualcrafters/json/JSONString.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONString.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.json; +package com.github.intellectualsites.plotsquared.json; /** * The JSONString interface allows a toJSONString() method so that a class can change the diff --git a/Core/src/main/java/com/intellectualcrafters/json/JSONStringer.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONStringer.java similarity index 97% rename from Core/src/main/java/com/intellectualcrafters/json/JSONStringer.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONStringer.java index d668bcb5e..f7e4dcbb6 100644 --- a/Core/src/main/java/com/intellectualcrafters/json/JSONStringer.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONStringer.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.json; +package com.github.intellectualsites.plotsquared.json; import java.io.StringWriter; diff --git a/Core/src/main/java/com/intellectualcrafters/json/JSONTokener.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONTokener.java similarity index 99% rename from Core/src/main/java/com/intellectualcrafters/json/JSONTokener.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONTokener.java index e6e3fef0c..290b9ea0b 100644 --- a/Core/src/main/java/com/intellectualcrafters/json/JSONTokener.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONTokener.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.json; +package com.github.intellectualsites.plotsquared.json; import java.io.*; diff --git a/Core/src/main/java/com/intellectualcrafters/json/JSONWriter.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONWriter.java similarity index 99% rename from Core/src/main/java/com/intellectualcrafters/json/JSONWriter.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONWriter.java index a70c0f9d9..2d669772a 100644 --- a/Core/src/main/java/com/intellectualcrafters/json/JSONWriter.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONWriter.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.json; +package com.github.intellectualsites.plotsquared.json; import java.io.IOException; import java.io.Writer; diff --git a/Core/src/main/java/com/intellectualcrafters/json/Kim.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/Kim.java similarity index 99% rename from Core/src/main/java/com/intellectualcrafters/json/Kim.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/json/Kim.java index 7ad4e98e0..adf696179 100644 --- a/Core/src/main/java/com/intellectualcrafters/json/Kim.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/Kim.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.json; +package com.github.intellectualsites.plotsquared.json; /** * Kim makes immutable eight bit Unicode strings. If the MSB of a byte is set, then the next byte is a continuation diff --git a/Core/src/main/java/com/intellectualcrafters/json/Property.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/Property.java similarity index 96% rename from Core/src/main/java/com/intellectualcrafters/json/Property.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/json/Property.java index f248e98ee..7ace1989b 100644 --- a/Core/src/main/java/com/intellectualcrafters/json/Property.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/Property.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.json; +package com.github.intellectualsites.plotsquared.json; import java.util.Enumeration; import java.util.Iterator; diff --git a/Core/src/main/java/com/intellectualcrafters/json/XML.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/XML.java similarity index 99% rename from Core/src/main/java/com/intellectualcrafters/json/XML.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/json/XML.java index 5ec8e81ed..51a0cdb10 100644 --- a/Core/src/main/java/com/intellectualcrafters/json/XML.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/XML.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.json; +package com.github.intellectualsites.plotsquared.json; import java.util.Iterator; diff --git a/Core/src/main/java/com/intellectualcrafters/json/XMLTokener.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/XMLTokener.java similarity index 99% rename from Core/src/main/java/com/intellectualcrafters/json/XMLTokener.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/json/XMLTokener.java index ea36c3a06..96d65541f 100644 --- a/Core/src/main/java/com/intellectualcrafters/json/XMLTokener.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/XMLTokener.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.json; +package com.github.intellectualsites.plotsquared.json; import java.util.HashMap; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/IPlotMain.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java similarity index 89% rename from Core/src/main/java/com/intellectualcrafters/plot/IPlotMain.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java index c59a6c04c..67001b583 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/IPlotMain.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java @@ -1,12 +1,12 @@ -package com.intellectualcrafters.plot; +package com.github.intellectualsites.plotsquared.plot; -import com.intellectualcrafters.plot.generator.GeneratorWrapper; -import com.intellectualcrafters.plot.generator.HybridUtils; -import com.intellectualcrafters.plot.generator.IndependentPlotGenerator; -import com.intellectualcrafters.plot.logger.ILogger; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.*; -import com.intellectualcrafters.plot.util.block.QueueProvider; +import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; +import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; +import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator; +import com.github.intellectualsites.plotsquared.plot.logger.ILogger; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.*; +import com.github.intellectualsites.plotsquared.plot.util.block.QueueProvider; import java.io.File; import java.util.List; @@ -150,7 +150,7 @@ public interface IPlotMain extends ILogger { EconHandler getEconomyHandler(); /** - * Get the {@link com.intellectualcrafters.plot.util.block.QueueProvider} class. + * Get the {@link QueueProvider} class. * * @return */ diff --git a/Core/src/main/java/com/intellectualcrafters/plot/PS.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PS.java similarity index 97% rename from Core/src/main/java/com/intellectualcrafters/plot/PS.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PS.java index f9ad6d889..686199d14 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/PS.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PS.java @@ -1,32 +1,30 @@ -package com.intellectualcrafters.plot; +package com.github.intellectualsites.plotsquared.plot; -import com.intellectualcrafters.configuration.ConfigurationSection; -import com.intellectualcrafters.configuration.MemorySection; -import com.intellectualcrafters.configuration.file.YamlConfiguration; -import com.intellectualcrafters.plot.commands.WE_Anywhere; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Configuration; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.config.Storage; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.database.Database; -import com.intellectualcrafters.plot.database.SQLManager; -import com.intellectualcrafters.plot.generator.GeneratorWrapper; -import com.intellectualcrafters.plot.generator.HybridPlotWorld; -import com.intellectualcrafters.plot.generator.HybridUtils; -import com.intellectualcrafters.plot.generator.IndependentPlotGenerator; -import com.intellectualcrafters.plot.logger.DelegateLogger; -import com.intellectualcrafters.plot.logger.ILogger; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.object.worlds.DefaultPlotAreaManager; -import com.intellectualcrafters.plot.object.worlds.PlotAreaManager; -import com.intellectualcrafters.plot.object.worlds.SinglePlotArea; -import com.intellectualcrafters.plot.object.worlds.SinglePlotAreaManager; -import com.intellectualcrafters.plot.util.*; -import com.intellectualcrafters.plot.util.block.GlobalBlockQueue; -import com.intellectualcrafters.plot.util.expiry.ExpireManager; -import com.intellectualcrafters.plot.util.expiry.ExpiryTask; -import com.plotsquared.listener.WESubscriber; +import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; +import com.github.intellectualsites.plotsquared.configuration.MemorySection; +import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; +import com.github.intellectualsites.plotsquared.plot.commands.WE_Anywhere; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Configuration; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.config.Storage; +import com.github.intellectualsites.plotsquared.plot.database.*; +import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; +import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld; +import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; +import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator; +import com.github.intellectualsites.plotsquared.plot.listener.WESubscriber; +import com.github.intellectualsites.plotsquared.plot.logger.DelegateLogger; +import com.github.intellectualsites.plotsquared.plot.logger.ILogger; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.object.worlds.DefaultPlotAreaManager; +import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; +import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea; +import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; +import com.github.intellectualsites.plotsquared.plot.util.*; +import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager; +import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpiryTask; import com.sk89q.worldedit.WorldEdit; import java.io.*; @@ -1598,12 +1596,12 @@ public class PS { } Database database; if (Storage.MySQL.USE) { - database = new com.intellectualcrafters.plot.database.MySQL(Storage.MySQL.HOST, + database = new MySQL(Storage.MySQL.HOST, Storage.MySQL.PORT, Storage.MySQL.DATABASE, Storage.MySQL.USER, Storage.MySQL.PASSWORD); } else if (Storage.SQLite.USE) { File file = MainUtil.getFile(IMP.getDirectory(), Storage.SQLite.DB + ".db"); - database = new com.intellectualcrafters.plot.database.SQLite(file); + database = new SQLite(file); } else { PS.log(C.PREFIX + "&cNo storage type is set!"); this.IMP.disable(); diff --git a/Core/src/main/java/com/intellectualcrafters/plot/Platform.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java similarity index 53% rename from Core/src/main/java/com/intellectualcrafters/plot/Platform.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java index 0a6775ccb..b7eb33b83 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/Platform.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot; +package com.github.intellectualsites.plotsquared.plot; public enum Platform { Bukkit, Sponge, Spigot, Cauldron diff --git a/Core/src/main/java/com/intellectualcrafters/plot/PlotVersion.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotVersion.java similarity index 96% rename from Core/src/main/java/com/intellectualcrafters/plot/PlotVersion.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotVersion.java index 946ced65e..3abf51fde 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/PlotVersion.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotVersion.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot; +package com.github.intellectualsites.plotsquared.plot; public class PlotVersion { public final int year, month, day, hash, build; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/Updater.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/Updater.java similarity index 96% rename from Core/src/main/java/com/intellectualcrafters/plot/Updater.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/Updater.java index 2024a543d..7976ab319 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/Updater.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/Updater.java @@ -1,6 +1,6 @@ -package com.intellectualcrafters.plot; +package com.github.intellectualsites.plotsquared.plot; -import com.intellectualcrafters.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import java.io.File; import java.io.FileOutputStream; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Add.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java similarity index 78% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Add.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java index 40e98429a..8664a0d85 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Add.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java @@ -1,16 +1,16 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.RunnableVal2; -import com.intellectualcrafters.plot.object.RunnableVal3; -import com.intellectualcrafters.plot.util.EventUtil; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.Permissions; -import com.plotsquared.general.commands.Command; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.Command; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; +import com.github.intellectualsites.plotsquared.plot.util.EventUtil; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.Permissions; import java.util.Iterator; import java.util.Set; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Alias.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Alias.java similarity index 81% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Alias.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Alias.java index 81647fa33..1394297d8 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Alias.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Alias.java @@ -1,16 +1,16 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.StringWrapper; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.MathMan; -import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.UUIDHandler; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.MathMan; +import com.github.intellectualsites.plotsquared.plot.util.Permissions; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; @CommandDeclaration(command = "setalias", permission = "plots.alias", description = "Set the plot name", usage = "/plot alias ", aliases = { "alias", "sa", "name", "rename", "setname", "seta", diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Area.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java similarity index 97% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Area.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java index 64738ba14..dec8ca5d2 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Area.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java @@ -1,14 +1,14 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.configuration.ConfigurationSection; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Configuration; -import com.intellectualcrafters.plot.generator.AugmentedUtils; -import com.intellectualcrafters.plot.generator.HybridPlotWorld; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.*; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Configuration; +import com.github.intellectualsites.plotsquared.plot.generator.AugmentedUtils; +import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.*; import java.io.IOException; import java.util.ArrayList; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Auto.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java similarity index 94% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Auto.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java index 9f44155d6..2e3cde17b 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Auto.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java @@ -1,12 +1,12 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.*; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.*; import javax.annotation.Nullable; import java.util.Set; @@ -119,7 +119,7 @@ public class Auto extends SubCommand { * @param schem */ public static void autoClaimSafe(final PlotPlayer player, final PlotArea area, PlotId start, - final String schem, @Nullable Integer allowed_plots) { + final String schem, @Nullable final Integer allowed_plots) { player.setMeta(Auto.class.getName(), true); autoClaimFromDatabase(player, area, start, new RunnableVal() { @Override public void run(final Plot plot) { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/BO3.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/BO3.java similarity index 71% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/BO3.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/BO3.java index a25a7679f..e2c634387 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/BO3.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/BO3.java @@ -1,13 +1,13 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.BO3Handler; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.Permissions; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.BO3Handler; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.Permissions; @CommandDeclaration(command = "bo3", aliases = { "bo2"}, description = "Mark a plot as done", permission = "plots.bo3", category = CommandCategory.SCHEMATIC, requiredType = RequiredType.NONE) diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Biome.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Biome.java similarity index 68% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Biome.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Biome.java index 3c187173c..d9c16f1f6 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Biome.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Biome.java @@ -1,12 +1,12 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.StringMan; -import com.intellectualcrafters.plot.util.WorldUtil; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; @CommandDeclaration(command = "setbiome", permission = "plots.set.biome", description = "Set the plot biome", usage = "/plot biome [biome]", aliases = { "biome", "sb", "setb", diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Buy.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java similarity index 74% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Buy.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java index 10f2040a6..370f18493 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Buy.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java @@ -1,17 +1,17 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; +import com.github.intellectualsites.plotsquared.commands.Command; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; +import com.github.intellectualsites.plotsquared.plot.util.EconHandler; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; import com.google.common.base.Optional; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.RunnableVal2; -import com.intellectualcrafters.plot.object.RunnableVal3; -import com.intellectualcrafters.plot.util.EconHandler; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.UUIDHandler; -import com.plotsquared.general.commands.Command; -import com.plotsquared.general.commands.CommandDeclaration; import java.util.Set; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Changelog.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Changelog.java similarity index 75% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Changelog.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Changelog.java index 85d9ac5e1..d26fe3da6 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Changelog.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Changelog.java @@ -1,10 +1,10 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.Updater; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.MainUtil; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.Updater; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import java.io.IOException; import java.net.URL; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Chat.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Chat.java similarity index 67% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Chat.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Chat.java index 679812e84..ef4dc5d33 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Chat.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Chat.java @@ -1,7 +1,7 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; @CommandDeclaration(command = "chat", description = "Toggle plot chat on or off", usage = "/plot chat [on|off]", permission = "plots.chat", category = CommandCategory.CHAT, requiredType = RequiredType.NONE) public class Chat extends SubCommand { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Claim.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java similarity index 85% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Claim.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java index 0f13fb9a6..9edebd05e 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Claim.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java @@ -1,14 +1,14 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.ByteArrayUtilities; -import com.intellectualcrafters.plot.util.EconHandler; -import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.TaskManager; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.ByteArrayUtilities; +import com.github.intellectualsites.plotsquared.plot.util.EconHandler; +import com.github.intellectualsites.plotsquared.plot.util.Permissions; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; @CommandDeclaration(command = "claim", aliases = "c", description = "Claim the current plot you're standing on", category = CommandCategory.CLAIMING, requiredType = RequiredType.NONE, permission = "plots.claim", usage = "/plot claim") public class Claim extends SubCommand { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Clear.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java similarity index 72% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Clear.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java index ec845e57f..ac977ea18 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Clear.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java @@ -1,18 +1,18 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.flag.FlagManager; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.RunnableVal2; -import com.intellectualcrafters.plot.object.RunnableVal3; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.block.GlobalBlockQueue; -import com.plotsquared.general.commands.Command; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.Command; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.flag.FlagManager; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.Permissions; +import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; @CommandDeclaration(command = "clear", description = "Clear a plot", permission = "plots.clear", category = CommandCategory.APPEARANCE, usage = "/plot clear", aliases = "reset", confirmation = true) public class Clear extends Command { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java similarity index 97% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java index 1bc8c4a67..0525a04f7 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java @@ -1,14 +1,14 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.UUIDHandler; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.Permissions; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; import java.util.ArrayList; import java.util.HashSet; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/CommandCategory.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CommandCategory.java similarity index 90% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/CommandCategory.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CommandCategory.java index e724986af..4aeacf85c 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/CommandCategory.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CommandCategory.java @@ -1,56 +1,56 @@ -package com.intellectualcrafters.plot.commands; - -/** - * CommandCategory. - */ -public enum CommandCategory { - /** - * Claiming CommandConfig. - * Such as: /plot claim - */ - CLAIMING("Claiming"), /** - * Teleportation CommandConfig. - * Such as: /plot visit - */ - TELEPORT("Teleport"), /** - * Protection. - */ - SETTINGS("Protection"), /** - * Chat. - */ - CHAT("Chat"), /** - * Web. - */ - SCHEMATIC("Web"), /** - * Cosmetic. - */ - APPEARANCE("Cosmetic"), /** - * Information CommandConfig. - * Such as: /plot info - */ - INFO("Info"), /** - * Debug CommandConfig. - * Such as: /plot debug - */ - DEBUG("Debug"), /** - * Administration commands. - */ - ADMINISTRATION("Admin"); - /** - * The category name (Readable). - */ - private final String name; - - /** - * Constructor. - * - * @param name readable name - */ - CommandCategory(String name) { - this.name = name; - } - - @Override public String toString() { - return this.name; - } -} +package com.github.intellectualsites.plotsquared.plot.commands; + +/** + * CommandCategory. + */ +public enum CommandCategory { + /** + * Claiming CommandConfig. + * Such as: /plot claim + */ + CLAIMING("Claiming"), /** + * Teleportation CommandConfig. + * Such as: /plot visit + */ + TELEPORT("Teleport"), /** + * Protection. + */ + SETTINGS("Protection"), /** + * Chat. + */ + CHAT("Chat"), /** + * Web. + */ + SCHEMATIC("Web"), /** + * Cosmetic. + */ + APPEARANCE("Cosmetic"), /** + * Information CommandConfig. + * Such as: /plot info + */ + INFO("Info"), /** + * Debug CommandConfig. + * Such as: /plot debug + */ + DEBUG("Debug"), /** + * Administration commands. + */ + ADMINISTRATION("Admin"); + /** + * The category name (Readable). + */ + private final String name; + + /** + * Constructor. + * + * @param name readable name + */ + CommandCategory(String name) { + this.name = name; + } + + @Override public String toString() { + return this.name; + } +} diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Comment.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Comment.java similarity index 72% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Comment.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Comment.java index 222115561..7df0d34d1 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Comment.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Comment.java @@ -1,17 +1,17 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotId; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.comment.CommentInbox; -import com.intellectualcrafters.plot.object.comment.PlotComment; -import com.intellectualcrafters.plot.util.CommentManager; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.StringMan; -import com.intellectualcrafters.plot.util.UUIDHandler; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.comment.CommentInbox; +import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment; +import com.github.intellectualsites.plotsquared.plot.util.CommentManager; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; import java.util.Arrays; import java.util.Map.Entry; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Condense.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java similarity index 92% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Condense.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java index cd08ff970..045d9536d 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Condense.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java @@ -1,15 +1,15 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotArea; -import com.intellectualcrafters.plot.object.PlotId; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.MathMan; -import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.WorldUtil; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.MathMan; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; import java.util.*; import java.util.Set; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Confirm.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Confirm.java similarity index 55% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Confirm.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Confirm.java index 9e28da7cb..c4812b30f 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Confirm.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Confirm.java @@ -1,13 +1,13 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.object.CmdInstance; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.CmdConfirm; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.TaskManager; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.object.CmdInstance; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.CmdConfirm; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; @CommandDeclaration(command = "confirm", permission = "plots.use", description = "Confirm an action", category = CommandCategory.INFO) public class Confirm extends SubCommand { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Continue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Continue.java similarity index 69% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Continue.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Continue.java index eb17b8614..9657f0a79 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Continue.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Continue.java @@ -1,13 +1,13 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.Permissions; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.Permissions; @CommandDeclaration(command = "continue", description = "Continue a plot that was previously marked as done", permission = "plots.continue", category = CommandCategory.SETTINGS, requiredType = RequiredType.NONE) public class Continue extends SubCommand { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Copy.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Copy.java similarity index 75% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Copy.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Copy.java index bf34ae36b..ab9c7b8f8 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Copy.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Copy.java @@ -1,12 +1,12 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.Permissions; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.Permissions; @CommandDeclaration(command = "copy", permission = "plots.copy", aliases = { "copypaste"}, category = CommandCategory.CLAIMING, description = "Copy a plot", usage = "/plot copy ", requiredType = RequiredType.NONE) diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/CreateRoadSchematic.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CreateRoadSchematic.java similarity index 61% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/CreateRoadSchematic.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CreateRoadSchematic.java index b901e7267..779bf46c0 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/CreateRoadSchematic.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CreateRoadSchematic.java @@ -1,13 +1,13 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.generator.HybridPlotWorld; -import com.intellectualcrafters.plot.generator.HybridUtils; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.MainUtil; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld; +import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; @CommandDeclaration(command = "createroadschematic", aliases = { "crs"}, category = CommandCategory.ADMINISTRATION, requiredType = RequiredType.NONE, permission = "plots.createroadschematic", description = "Add a road schematic to your world using the roads around your current plot", usage = "/plot createroadschematic") diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Database.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java similarity index 89% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Database.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java index 2e3b576ac..b10b76a03 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Database.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java @@ -1,18 +1,18 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.database.MySQL; -import com.intellectualcrafters.plot.database.SQLManager; -import com.intellectualcrafters.plot.database.SQLite; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotArea; -import com.intellectualcrafters.plot.object.PlotId; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.worlds.SinglePlotArea; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.TaskManager; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.database.MySQL; +import com.github.intellectualsites.plotsquared.plot.database.SQLManager; +import com.github.intellectualsites.plotsquared.plot.database.SQLite; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import java.io.File; import java.sql.SQLException; @@ -70,7 +70,7 @@ public class Database extends SubCommand { return false; } try { - com.intellectualcrafters.plot.database.Database implementation; + com.github.intellectualsites.plotsquared.plot.database.Database implementation; String prefix = ""; switch (args[0].toLowerCase()) { case "import": diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Debug.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Debug.java similarity index 78% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Debug.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Debug.java index e7866fd5f..69831c90f 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Debug.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Debug.java @@ -1,11 +1,11 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.StringMan; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; @CommandDeclaration(command = "debug", category = CommandCategory.DEBUG, description = "Show debug information", usage = "/plot debug [msg]", permission = "plots.admin") public class Debug extends SubCommand { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugAllowUnsafe.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugAllowUnsafe.java similarity index 75% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/DebugAllowUnsafe.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugAllowUnsafe.java index 31a7ab41a..2f558828a 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugAllowUnsafe.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugAllowUnsafe.java @@ -1,8 +1,8 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import java.util.ArrayList; import java.util.List; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugClaimTest.java similarity index 87% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugClaimTest.java index febe462e8..4444db0aa 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugClaimTest.java @@ -1,15 +1,15 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; import com.google.common.collect.BiMap; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.ChunkManager; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.UUIDHandler; -import com.intellectualcrafters.plot.util.WorldUtil; -import com.plotsquared.general.commands.CommandDeclaration; import java.util.ArrayList; import java.util.Map; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java similarity index 94% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java index 354379058..228f27ebc 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java @@ -1,21 +1,21 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; +import com.github.intellectualsites.plotsquared.commands.Command; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.flag.FlagManager; +import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; +import com.github.intellectualsites.plotsquared.plot.listener.WEManager; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.*; +import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager; +import com.github.intellectualsites.plotsquared.plot.util.expiry.PlotAnalysis; import com.google.common.io.Files; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.flag.FlagManager; -import com.intellectualcrafters.plot.generator.HybridUtils; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.*; -import com.intellectualcrafters.plot.util.block.GlobalBlockQueue; -import com.intellectualcrafters.plot.util.expiry.ExpireManager; -import com.intellectualcrafters.plot.util.expiry.PlotAnalysis; -import com.plotsquared.general.commands.Command; -import com.plotsquared.general.commands.CommandDeclaration; -import com.plotsquared.listener.WEManager; import javax.script.*; import java.io.File; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugFixFlags.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugFixFlags.java similarity index 63% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/DebugFixFlags.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugFixFlags.java index 9cfbffd66..03fdf12c2 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugFixFlags.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugFixFlags.java @@ -1,16 +1,16 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotArea; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.WorldUtil; -import com.plotsquared.general.commands.Argument; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.Argument; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; import java.util.HashMap; import java.util.Iterator; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugImportWorlds.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java similarity index 67% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/DebugImportWorlds.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java index d1dd55b48..bc4299d68 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugImportWorlds.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java @@ -1,18 +1,18 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; +import com.github.intellectualsites.plotsquared.commands.Command; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; +import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; +import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea; +import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; import com.google.common.base.Charsets; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.PlotId; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.RunnableVal2; -import com.intellectualcrafters.plot.object.RunnableVal3; -import com.intellectualcrafters.plot.object.worlds.PlotAreaManager; -import com.intellectualcrafters.plot.object.worlds.SinglePlotArea; -import com.intellectualcrafters.plot.object.worlds.SinglePlotAreaManager; -import com.intellectualcrafters.plot.util.UUIDHandler; -import com.intellectualcrafters.plot.util.WorldUtil; -import com.plotsquared.general.commands.Command; -import com.plotsquared.general.commands.CommandDeclaration; import java.io.File; import java.util.UUID; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugLoadTest.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugLoadTest.java similarity index 57% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/DebugLoadTest.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugLoadTest.java index 6d4407fd3..7327fa4a5 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugLoadTest.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugLoadTest.java @@ -1,9 +1,9 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; @CommandDeclaration(command = "debugloadtest", permission = "plots.debugloadtest", description = "This debug command will force the reload of all plots in the DB", usage = "/plot debugloadtest", category = CommandCategory.DEBUG, requiredType = RequiredType.CONSOLE) public class DebugLoadTest extends SubCommand { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugPaste.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java similarity index 87% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/DebugPaste.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java index 56569e51e..568d94228 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugPaste.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java @@ -1,14 +1,14 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.HastebinUtility; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.UUIDHandler; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.HastebinUtility; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; import java.io.File; import java.io.IOException; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugRoadRegen.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java similarity index 76% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/DebugRoadRegen.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java index 251b4b4b8..7b070e20f 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugRoadRegen.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java @@ -1,13 +1,13 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.generator.HybridPlotManager; -import com.intellectualcrafters.plot.generator.HybridPlotWorld; -import com.intellectualcrafters.plot.generator.HybridUtils; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.MathMan; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotManager; +import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld; +import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.MathMan; @CommandDeclaration(command = "debugroadregen", usage = "/plot debugroadregen", requiredType = RequiredType.NONE, description = "Regenerate all roads based on the road schematic", category = CommandCategory.DEBUG, permission = "plots.debugroadregen") public class DebugRoadRegen extends SubCommand { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugSaveTest.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugSaveTest.java similarity index 63% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/DebugSaveTest.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugSaveTest.java index 075234f70..e102eb3ce 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugSaveTest.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugSaveTest.java @@ -1,11 +1,11 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.MainUtil; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import java.util.ArrayList; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Delete.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java similarity index 87% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Delete.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java index 80eed8d6b..6b15563f8 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Delete.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java @@ -1,10 +1,10 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.*; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.*; @CommandDeclaration(command = "delete", permission = "plots.delete", description = "Delete a plot", usage = "/plot delete", aliases = { "dispose", "del", diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Deny.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java similarity index 84% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Deny.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java index 0c61dbf9d..5531158d4 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Deny.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java @@ -1,14 +1,14 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.*; -import com.plotsquared.general.commands.Argument; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.Argument; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.*; import java.util.Iterator; import java.util.Set; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Desc.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Desc.java similarity index 61% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Desc.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Desc.java index 88380071d..83d0636bf 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Desc.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Desc.java @@ -1,12 +1,12 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.flag.FlagManager; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.MainUtil; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.flag.FlagManager; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; @CommandDeclaration(command = "setdescription", permission = "plots.set.desc", description = "Set the plot description", usage = "/plot desc ", aliases = { "desc", "setdesc", "setd", diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Done.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Done.java similarity index 68% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Done.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Done.java index ce95f555e..f3661be2d 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Done.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Done.java @@ -1,18 +1,18 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.generator.HybridUtils; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.RunnableVal; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.expiry.ExpireManager; -import com.intellectualcrafters.plot.util.expiry.PlotAnalysis; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.Permissions; +import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager; +import com.github.intellectualsites.plotsquared.plot.util.expiry.PlotAnalysis; @CommandDeclaration(command = "done", aliases = { "submit"}, description = "Mark a plot as done", permission = "plots.done", category = CommandCategory.SETTINGS, requiredType = RequiredType.NONE) diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Download.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Download.java similarity index 86% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Download.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Download.java index d9091b654..0ae530f09 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Download.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Download.java @@ -1,15 +1,15 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.jnbt.CompoundTag; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.RunnableVal; -import com.intellectualcrafters.plot.util.*; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.jnbt.CompoundTag; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.util.*; import java.net.URL; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/FlagCmd.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java similarity index 94% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/FlagCmd.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java index cd2a7f5a3..66f9e74be 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/FlagCmd.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java @@ -1,16 +1,16 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.flag.*; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.*; import com.google.common.base.Optional; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.flag.*; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.*; -import com.plotsquared.general.commands.CommandDeclaration; import java.util.*; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/GenerateDocs.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/GenerateDocs.java similarity index 97% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/GenerateDocs.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/GenerateDocs.java index 5265df582..5a69479b5 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/GenerateDocs.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/GenerateDocs.java @@ -1,8 +1,8 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.util.StringMan; -import com.plotsquared.general.commands.Command; +import com.github.intellectualsites.plotsquared.commands.Command; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; import java.io.File; import java.io.IOException; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Grant.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Grant.java similarity index 73% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Grant.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Grant.java index b1bf5af2f..81c7f3039 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Grant.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Grant.java @@ -1,17 +1,17 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.RunnableVal; -import com.intellectualcrafters.plot.object.RunnableVal2; -import com.intellectualcrafters.plot.object.RunnableVal3; -import com.intellectualcrafters.plot.util.ByteArrayUtilities; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.UUIDHandler; -import com.plotsquared.general.commands.Command; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.Command; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; +import com.github.intellectualsites.plotsquared.plot.util.ByteArrayUtilities; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.Permissions; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; import java.util.UUID; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Help.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java similarity index 80% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Help.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java index 5f7b791c4..36053b9f1 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Help.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java @@ -1,15 +1,15 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.RunnableVal2; -import com.intellectualcrafters.plot.object.RunnableVal3; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.MathMan; -import com.intellectualcrafters.plot.util.StringMan; -import com.intellectualcrafters.plot.util.helpmenu.HelpMenu; -import com.plotsquared.general.commands.Command; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.Command; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.MathMan; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.plot.util.helpmenu.HelpMenu; @CommandDeclaration(command = "help", description = "Get this help menu", aliases = {"he", "?"}, category = CommandCategory.INFO, usage = "help [category|#]", permission = "plots.use") diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Inbox.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java similarity index 91% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Inbox.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java index 7ef081339..eedc8945b 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Inbox.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java @@ -1,16 +1,16 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.object.comment.CommentInbox; +import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment; +import com.github.intellectualsites.plotsquared.plot.util.CommentManager; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; import com.google.common.base.Optional; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.RunnableVal; -import com.intellectualcrafters.plot.object.comment.CommentInbox; -import com.intellectualcrafters.plot.object.comment.PlotComment; -import com.intellectualcrafters.plot.util.CommentManager; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.StringMan; -import com.plotsquared.general.commands.CommandDeclaration; import java.util.ArrayList; import java.util.List; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Info.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java similarity index 92% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Info.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java index 1d25456b1..4850917f0 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Info.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java @@ -1,11 +1,11 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.expiry.ExpireManager; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager; import java.util.UUID; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Kick.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java similarity index 77% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Kick.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java index 4145d2355..ce8e784c1 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Kick.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java @@ -1,17 +1,17 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.UUIDHandler; -import com.intellectualcrafters.plot.util.WorldUtil; -import com.plotsquared.general.commands.Argument; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.Argument; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.Permissions; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; import java.util.HashSet; import java.util.Set; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Leave.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Leave.java similarity index 68% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Leave.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Leave.java index a0f6e39aa..ae4043af8 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Leave.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Leave.java @@ -1,14 +1,14 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.RunnableVal2; -import com.intellectualcrafters.plot.object.RunnableVal3; -import com.intellectualcrafters.plot.util.EventUtil; -import com.intellectualcrafters.plot.util.MainUtil; -import com.plotsquared.general.commands.Command; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.Command; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; +import com.github.intellectualsites.plotsquared.plot.util.EventUtil; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import java.util.UUID; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/ListCmd.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java similarity index 96% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/ListCmd.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java index 33499dea2..fdc03f77f 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/ListCmd.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java @@ -1,14 +1,14 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.PS.SortType; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.*; +import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager; import com.google.common.base.Optional; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.PS.SortType; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.*; -import com.intellectualcrafters.plot.util.expiry.ExpireManager; -import com.plotsquared.general.commands.CommandDeclaration; import java.util.*; import java.util.Map.Entry; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Load.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java similarity index 89% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Load.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java index fa60527b8..4c75b527a 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Load.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java @@ -1,15 +1,14 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.SchematicHandler; -import com.intellectualcrafters.plot.util.SchematicHandler.Schematic; -import com.intellectualcrafters.plot.util.TaskManager; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.Permissions; +import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import java.net.MalformedURLException; import java.net.URL; @@ -71,7 +70,7 @@ public class Load extends SubCommand { MainUtil.sendMessage(player, C.GENERATING_COMPONENT); TaskManager.runTaskAsync(new Runnable() { @Override public void run() { - Schematic schematic = SchematicHandler.manager.getSchematic(url); + SchematicHandler.Schematic schematic = SchematicHandler.manager.getSchematic(url); if (schematic == null) { plot.removeRunning(); sendMessage(player, C.SCHEMATIC_INVALID, diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java similarity index 94% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java index 264d40d32..2606c5f6f 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java @@ -1,13 +1,13 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.CmdConfirm; -import com.intellectualcrafters.plot.util.EconHandler; -import com.intellectualcrafters.plot.util.Permissions; -import com.plotsquared.general.commands.Command; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.Command; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.CmdConfirm; +import com.github.intellectualsites.plotsquared.plot.util.EconHandler; +import com.github.intellectualsites.plotsquared.plot.util.Permissions; import java.util.Arrays; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Merge.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java similarity index 94% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Merge.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java index b65d2d125..e9527e3bd 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Merge.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java @@ -1,10 +1,10 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.*; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.*; import java.util.UUID; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Middle.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Middle.java similarity index 64% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Middle.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Middle.java index c742aaba5..0105dc8bf 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Middle.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Middle.java @@ -1,10 +1,10 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; /** * @author manuelgu, altered by Citymonstret diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Move.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Move.java similarity index 76% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Move.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Move.java index 85d69b9e3..05031f8f3 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Move.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Move.java @@ -1,14 +1,14 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotArea; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.Permissions; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.Permissions; @CommandDeclaration(usage = "/plot move ", command = "move", description = "Move a plot", aliases = { "debugmove"}, permission = "plots.move", category = CommandCategory.CLAIMING, requiredType = RequiredType.NONE) diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Music.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java similarity index 82% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Music.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java index 4b86583e9..618783f91 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Music.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java @@ -1,10 +1,10 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.WorldUtil; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; @CommandDeclaration(command = "music", permission = "plots.music", description = "Player music in a plot", usage = "/plot music", category = CommandCategory.APPEARANCE, requiredType = RequiredType.PLAYER) public class Music extends SubCommand { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Near.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java similarity index 50% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Near.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java index 4cba97d36..b9929e51e 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Near.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java @@ -1,13 +1,13 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.RunnableVal2; -import com.intellectualcrafters.plot.object.RunnableVal3; -import com.intellectualcrafters.plot.util.StringMan; -import com.plotsquared.general.commands.Command; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.Command; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; @CommandDeclaration(command = "near", aliases = "n", description = "Display nearby players", usage = "/plot near", category = CommandCategory.INFO) public class Near extends Command { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Owner.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java similarity index 87% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Owner.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java index ed63e6ffb..8c1e3f859 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Owner.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java @@ -1,11 +1,11 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.*; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.*; import java.util.Set; import java.util.UUID; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/PluginCmd.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/PluginCmd.java similarity index 70% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/PluginCmd.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/PluginCmd.java index 27bbeb221..991ce6dee 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/PluginCmd.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/PluginCmd.java @@ -1,12 +1,12 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.json.JSONObject; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.HttpUtil; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.TaskManager; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.json.JSONObject; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.HttpUtil; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; @CommandDeclaration(command = "plugin", permission = "plots.use", description = "Show plugin information", aliases = "version", category = CommandCategory.INFO) public class PluginCmd extends SubCommand { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Purge.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java similarity index 86% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Purge.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java index f25f05770..fe274e8ec 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Purge.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java @@ -1,17 +1,17 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotArea; -import com.intellectualcrafters.plot.object.PlotId; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.CmdConfirm; -import com.intellectualcrafters.plot.util.StringMan; -import com.intellectualcrafters.plot.util.UUIDHandler; -import com.plotsquared.general.commands.CommandDeclaration; -import com.plotsquared.listener.PlotListener; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.listener.PlotListener; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.CmdConfirm; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; import java.util.HashMap; import java.util.HashSet; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Rate.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java similarity index 93% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Rate.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java index 8d8ae6790..16a8f0f16 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Rate.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java @@ -1,14 +1,14 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.*; -import com.plotsquared.general.commands.Command; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.Command; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.*; import java.util.*; import java.util.Map.Entry; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/RegenAllRoads.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RegenAllRoads.java similarity index 73% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/RegenAllRoads.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RegenAllRoads.java index c521d203b..0e82a5c0d 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/RegenAllRoads.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RegenAllRoads.java @@ -1,16 +1,16 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.generator.HybridPlotManager; -import com.intellectualcrafters.plot.generator.HybridUtils; -import com.intellectualcrafters.plot.object.ChunkLoc; -import com.intellectualcrafters.plot.object.PlotArea; -import com.intellectualcrafters.plot.object.PlotManager; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.ChunkManager; -import com.intellectualcrafters.plot.util.MainUtil; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotManager; +import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; +import com.github.intellectualsites.plotsquared.plot.object.ChunkLoc; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.PlotManager; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import java.util.Set; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Relight.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Relight.java similarity index 69% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Relight.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Relight.java index 3fc6002c4..eed56e922 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Relight.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Relight.java @@ -1,11 +1,11 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.ChunkManager; -import com.intellectualcrafters.plot.util.block.LocalBlockQueue; -import com.plotsquared.general.commands.Command; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.Command; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; +import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; import java.util.HashSet; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Reload.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java similarity index 81% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Reload.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java index e06dc672b..f7ac1bd62 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Reload.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java @@ -1,15 +1,15 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.configuration.ConfigurationSection; -import com.intellectualcrafters.configuration.MemorySection; -import com.intellectualcrafters.configuration.file.YamlConfiguration; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.PlotArea; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.RunnableVal; -import com.intellectualcrafters.plot.util.MainUtil; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; +import com.github.intellectualsites.plotsquared.configuration.MemorySection; +import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import java.io.IOException; import java.util.Objects; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Remove.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Remove.java similarity index 82% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Remove.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Remove.java index 4c62f19fa..1ff5ee764 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Remove.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Remove.java @@ -1,16 +1,16 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.EventUtil; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.UUIDHandler; -import com.plotsquared.general.commands.Argument; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.Argument; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.EventUtil; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.Permissions; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; import java.util.ArrayList; import java.util.HashSet; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/RequiredType.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RequiredType.java similarity index 67% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/RequiredType.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RequiredType.java index 9ea99c407..3f13368de 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/RequiredType.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RequiredType.java @@ -1,6 +1,6 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.plotsquared.general.commands.CommandCaller; +import com.github.intellectualsites.plotsquared.commands.CommandCaller; public enum RequiredType { CONSOLE, PLAYER, NONE; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Save.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Save.java similarity index 81% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Save.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Save.java index ba34b2df1..95e168a6b 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Save.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Save.java @@ -1,14 +1,14 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.jnbt.CompoundTag; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.SchematicHandler; -import com.intellectualcrafters.plot.util.TaskManager; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.jnbt.CompoundTag; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.Permissions; +import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import java.net.URL; import java.util.List; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/SchematicCmd.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java similarity index 92% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/SchematicCmd.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java index 87ca5fb89..6a30fbf39 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/SchematicCmd.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java @@ -1,15 +1,15 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.SchematicHandler; -import com.intellectualcrafters.plot.util.SchematicHandler.Schematic; -import com.intellectualcrafters.plot.util.TaskManager; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.Permissions; +import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler; +import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler.Schematic; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import java.net.URL; import java.util.ArrayList; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Set.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java similarity index 91% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Set.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java index f8047d47a..b73312854 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Set.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java @@ -1,15 +1,15 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Configuration; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.flag.FlagManager; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.*; -import com.intellectualcrafters.plot.util.block.GlobalBlockQueue; -import com.plotsquared.general.commands.Command; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.Command; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Configuration; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.flag.FlagManager; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.*; +import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; import java.util.ArrayList; import java.util.Arrays; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/SetCommand.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetCommand.java similarity index 70% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/SetCommand.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetCommand.java index ca0386103..aaa1adfa2 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/SetCommand.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetCommand.java @@ -1,12 +1,12 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.Permissions; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; public abstract class SetCommand extends SubCommand { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/SetHome.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetHome.java similarity index 69% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/SetHome.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetHome.java index c7fb60582..fb17626d9 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/SetHome.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetHome.java @@ -1,12 +1,12 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.BlockLoc; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.MainUtil; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.BlockLoc; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; @CommandDeclaration(command = "sethome", permission = "plots.set.home", description = "Set the plot home", usage = "/plot sethome [none]", aliases = { "sh", "seth"}, category = CommandCategory.SETTINGS, requiredType = RequiredType.NONE) diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Setup.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java similarity index 93% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Setup.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java index 201d25267..d973b5de1 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Setup.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java @@ -1,18 +1,18 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.ConfigurationNode; -import com.intellectualcrafters.plot.generator.GeneratorWrapper; -import com.intellectualcrafters.plot.object.PlotArea; -import com.intellectualcrafters.plot.object.PlotId; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.SetupObject; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.SetupUtils; -import com.intellectualcrafters.plot.util.StringMan; -import com.intellectualcrafters.plot.util.WorldUtil; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; +import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.SetupObject; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.SetupUtils; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; import java.util.ArrayList; import java.util.Arrays; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/SubCommand.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java similarity index 62% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/SubCommand.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java index ca1df5732..396185e29 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/SubCommand.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java @@ -1,11 +1,11 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.RunnableVal2; -import com.intellectualcrafters.plot.object.RunnableVal3; -import com.plotsquared.general.commands.Argument; -import com.plotsquared.general.commands.Command; +import com.github.intellectualsites.plotsquared.commands.Argument; +import com.github.intellectualsites.plotsquared.commands.Command; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; /** * SubCommand class diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Swap.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Swap.java similarity index 75% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Swap.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Swap.java index 471f14bb0..4ee9f817c 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Swap.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Swap.java @@ -1,12 +1,12 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.Permissions; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.Permissions; @CommandDeclaration(usage = "/plot swap ", command = "swap", description = "Swap two plots", aliases = { "switch"}, category = CommandCategory.CLAIMING, requiredType = RequiredType.NONE) diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Target.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Target.java similarity index 68% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Target.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Target.java index c69a1cbf6..272e5895c 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Target.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Target.java @@ -1,14 +1,14 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.StringMan; -import com.plotsquared.general.commands.Argument; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.Argument; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; @CommandDeclaration(command = "target", usage = "/plot target <|nearest>", description = "Target a plot with your compass", permission = "plots.target", requiredType = RequiredType.PLAYER, category = CommandCategory.INFO) public class Target extends SubCommand { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Template.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Template.java similarity index 88% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Template.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Template.java index b948c75d6..4431162a1 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Template.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Template.java @@ -1,19 +1,19 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.configuration.ConfigurationSection; -import com.intellectualcrafters.configuration.InvalidConfigurationException; -import com.intellectualcrafters.configuration.file.YamlConfiguration; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.ConfigurationNode; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.SetupUtils; -import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.WorldUtil; -import com.intellectualcrafters.plot.util.block.GlobalBlockQueue; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; +import com.github.intellectualsites.plotsquared.configuration.InvalidConfigurationException; +import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.SetupUtils; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; +import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; import java.io.*; import java.util.Set; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Toggle.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Toggle.java similarity index 85% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Toggle.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Toggle.java index e3f0eb4b7..c805c27e2 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Toggle.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Toggle.java @@ -1,13 +1,13 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.PlotArea; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.RunnableVal2; -import com.intellectualcrafters.plot.object.RunnableVal3; -import com.intellectualcrafters.plot.util.MainUtil; -import com.plotsquared.general.commands.Command; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.Command; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; @CommandDeclaration(command = "toggle", aliases = { "attribute"}, permission = "plots.use", description = "Toggle per user settings", requiredType = RequiredType.NONE, category = CommandCategory.SETTINGS) diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Trim.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java similarity index 91% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Trim.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java index 00c39952d..d78b242b0 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Trim.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java @@ -1,16 +1,16 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.ChunkManager; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.WorldUtil; -import com.intellectualcrafters.plot.util.block.GlobalBlockQueue; -import com.intellectualcrafters.plot.util.block.LocalBlockQueue; -import com.intellectualcrafters.plot.util.expiry.ExpireManager; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; +import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager; import java.io.File; import java.io.IOException; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Trust.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java similarity index 78% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Trust.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java index 2e013f3c7..1cb31b9a9 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Trust.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java @@ -1,16 +1,16 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.RunnableVal2; -import com.intellectualcrafters.plot.object.RunnableVal3; -import com.intellectualcrafters.plot.util.EventUtil; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.Permissions; -import com.plotsquared.general.commands.Command; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.Command; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; +import com.github.intellectualsites.plotsquared.plot.util.EventUtil; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.Permissions; import java.util.Iterator; import java.util.Set; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Unlink.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java similarity index 80% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Unlink.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java index 2f4bdb1bf..4e1bdb2a4 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Unlink.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java @@ -1,11 +1,11 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.*; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.*; @CommandDeclaration(command = "unlink", aliases = {"u", "unmerge"}, description = "Unlink a mega-plot", usage = "/plot unlink", requiredType = RequiredType.NONE, category = CommandCategory.SETTINGS, confirmation = true) diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Visit.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java similarity index 88% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/Visit.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java index 57f64c4e5..b91415a66 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Visit.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java @@ -1,15 +1,15 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.MathMan; -import com.intellectualcrafters.plot.util.Permissions; -import com.intellectualcrafters.plot.util.UUIDHandler; -import com.plotsquared.general.commands.Command; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.Command; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.MathMan; +import com.github.intellectualsites.plotsquared.plot.util.Permissions; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; import java.util.*; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/WE_Anywhere.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/WE_Anywhere.java similarity index 70% rename from Core/src/main/java/com/intellectualcrafters/plot/commands/WE_Anywhere.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/WE_Anywhere.java index f44fcd68b..1bee8ed9b 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/WE_Anywhere.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/WE_Anywhere.java @@ -1,7 +1,7 @@ -package com.intellectualcrafters.plot.commands; +package com.github.intellectualsites.plotsquared.plot.commands; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.plotsquared.general.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; @CommandDeclaration(command = "weanywhere", permission = "plots.worldedit.bypass", description = "Force bypass of WorldEdit", aliases = { "wea"}, usage = "/plot weanywhere", requiredType = RequiredType.NONE, category = CommandCategory.ADMINISTRATION) diff --git a/Core/src/main/java/com/intellectualcrafters/plot/config/C.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/C.java similarity index 99% rename from Core/src/main/java/com/intellectualcrafters/plot/config/C.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/C.java index 49385b87f..c9712f749 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/config/C.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/C.java @@ -1,10 +1,10 @@ -package com.intellectualcrafters.plot.config; +package com.github.intellectualsites.plotsquared.plot.config; -import com.intellectualcrafters.configuration.ConfigurationSection; -import com.intellectualcrafters.configuration.file.YamlConfiguration; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.util.StringMan; -import com.plotsquared.general.commands.CommandCaller; +import com.github.intellectualsites.plotsquared.commands.CommandCaller; +import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; +import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; import java.io.File; import java.io.IOException; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/config/Config.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Config.java similarity index 97% rename from Core/src/main/java/com/intellectualcrafters/plot/config/Config.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Config.java index 39d4e8504..12cc2c18f 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/config/Config.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Config.java @@ -1,9 +1,9 @@ -package com.intellectualcrafters.plot.config; +package com.github.intellectualsites.plotsquared.plot.config; -import com.intellectualcrafters.configuration.MemorySection; -import com.intellectualcrafters.configuration.file.YamlConfiguration; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.configuration.MemorySection; +import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; import java.io.File; import java.io.PrintWriter; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/config/Configuration.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Configuration.java similarity index 93% rename from Core/src/main/java/com/intellectualcrafters/plot/config/Configuration.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Configuration.java index 6eb48adfc..3b82561c8 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/config/Configuration.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Configuration.java @@ -1,201 +1,201 @@ -package com.intellectualcrafters.plot.config; - -import com.intellectualcrafters.plot.object.PlotBlock; -import com.intellectualcrafters.plot.util.StringComparison; -import com.intellectualcrafters.plot.util.WorldUtil; - -import java.util.ArrayList; - -/** - * Main Configuration Utility - */ -public class Configuration { - - public static final SettingValue STRING = new SettingValue("STRING") { - @Override public boolean validateValue(String string) { - return true; - } - - @Override public String parseString(String string) { - return string; - } - }; - public static final SettingValue STRINGLIST = - new SettingValue("STRINGLIST") { - @Override public boolean validateValue(String string) { - return true; - } - - @Override public String[] parseString(String string) { - return string.split(","); - } - }; - public static final SettingValue INTEGER = new SettingValue("INTEGER") { - @Override public boolean validateValue(String string) { - try { - Integer.parseInt(string); - return true; - } catch (NumberFormatException ignored) { - return false; - } - } - - @Override public Integer parseString(String string) { - return Integer.parseInt(string); - } - }; - public static final SettingValue BOOLEAN = new SettingValue("BOOLEAN") { - @Override public boolean validateValue(String string) { - Boolean.parseBoolean(string); - return true; - } - - @Override public Boolean parseString(String string) { - return Boolean.parseBoolean(string); - } - }; - public static final SettingValue DOUBLE = new SettingValue("DOUBLE") { - @Override public boolean validateValue(String string) { - try { - Double.parseDouble(string); - return true; - } catch (NumberFormatException ignored) { - return false; - } - } - - @Override public Double parseString(String string) { - return Double.parseDouble(string); - } - }; - public static final SettingValue BIOME = new SettingValue("BIOME") { - @Override public boolean validateValue(String string) { - try { - int biome = WorldUtil.IMP.getBiomeFromString(string.toUpperCase()); - return biome != -1; - } catch (Exception ignored) { - return false; - } - } - - @Override public String parseString(String string) { - if (validateValue(string)) { - return string.toUpperCase(); - } - return "FOREST"; - } - }; - public static final SettingValue BLOCK = new SettingValue("BLOCK") { - @Override public boolean validateValue(String string) { - StringComparison.ComparisonResult value = - WorldUtil.IMP.getClosestBlock(string); - return !(value == null || value.match > 1); - } - - @Override public PlotBlock parseString(String string) { - StringComparison.ComparisonResult value = - WorldUtil.IMP.getClosestBlock(string); - if (value == null || value.match > 1) { - return null; - } - return value.best; - } - }; - public static final SettingValue BLOCKLIST = - new SettingValue("BLOCKLIST") { - @Override public boolean validateValue(String string) { - try { - for (String block : string.split(",")) { - if (block.contains("%")) { - String[] split = block.split("%"); - Integer.parseInt(split[0]); - block = split[1]; - } - StringComparison.ComparisonResult value = - WorldUtil.IMP.getClosestBlock(block); - if (value == null || value.match > 1) { - return false; - } - } - return true; - } catch (NumberFormatException ignored) { - return false; - } - } - - @Override public PlotBlock[] parseString(String string) { - String[] blocks = string.split(","); - ArrayList parsedvalues = new ArrayList<>(); - PlotBlock[] values = new PlotBlock[blocks.length]; - int[] counts = new int[blocks.length]; - int min = 100; - for (int i = 0; i < blocks.length; i++) { - try { - if (blocks[i].contains("%")) { - String[] split = blocks[i].split("%"); - blocks[i] = split[1]; - int value = Integer.parseInt(split[0]); - counts[i] = value; - if (value < min) { - min = value; - } - } else { - counts[i] = 1; - if (1 < min) { - min = 1; - } - } - StringComparison.ComparisonResult result = - WorldUtil.IMP.getClosestBlock(blocks[i]); - if (result != null && result.match < 2) { - values[i] = result.best; - } - } catch (NumberFormatException ignored) { - } - } - int gcd = gcd(counts); - for (int i = 0; i < counts.length; i++) { - int num = counts[i]; - for (int j = 0; j < num / gcd; j++) { - parsedvalues.add(values[i]); - } - } - return parsedvalues.toArray(new PlotBlock[parsedvalues.size()]); - } - }; - - public static int gcd(int a, int b) { - if (b == 0) { - return a; - } - return gcd(b, a % b); - } - - private static int gcd(int[] a) { - int result = a[0]; - for (int i = 1; i < a.length; i++) { - result = gcd(result, a[i]); - } - return result; - } - - /** - * Create your own SettingValue object to make the management of plotworld configuration easier - */ - public abstract static class SettingValue { - - private final String type; - - public SettingValue(String type) { - this.type = type; - } - - public String getType() { - return this.type; - } - - public abstract T parseString(String string); - - public abstract boolean validateValue(String string); - } -} +package com.github.intellectualsites.plotsquared.plot.config; + +import com.github.intellectualsites.plotsquared.plot.object.PlotBlock; +import com.github.intellectualsites.plotsquared.plot.util.StringComparison; +import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; + +import java.util.ArrayList; + +/** + * Main Configuration Utility + */ +public class Configuration { + + public static final SettingValue STRING = new SettingValue("STRING") { + @Override public boolean validateValue(String string) { + return true; + } + + @Override public String parseString(String string) { + return string; + } + }; + public static final SettingValue STRINGLIST = + new SettingValue("STRINGLIST") { + @Override public boolean validateValue(String string) { + return true; + } + + @Override public String[] parseString(String string) { + return string.split(","); + } + }; + public static final SettingValue INTEGER = new SettingValue("INTEGER") { + @Override public boolean validateValue(String string) { + try { + Integer.parseInt(string); + return true; + } catch (NumberFormatException ignored) { + return false; + } + } + + @Override public Integer parseString(String string) { + return Integer.parseInt(string); + } + }; + public static final SettingValue BOOLEAN = new SettingValue("BOOLEAN") { + @Override public boolean validateValue(String string) { + Boolean.parseBoolean(string); + return true; + } + + @Override public Boolean parseString(String string) { + return Boolean.parseBoolean(string); + } + }; + public static final SettingValue DOUBLE = new SettingValue("DOUBLE") { + @Override public boolean validateValue(String string) { + try { + Double.parseDouble(string); + return true; + } catch (NumberFormatException ignored) { + return false; + } + } + + @Override public Double parseString(String string) { + return Double.parseDouble(string); + } + }; + public static final SettingValue BIOME = new SettingValue("BIOME") { + @Override public boolean validateValue(String string) { + try { + int biome = WorldUtil.IMP.getBiomeFromString(string.toUpperCase()); + return biome != -1; + } catch (Exception ignored) { + return false; + } + } + + @Override public String parseString(String string) { + if (validateValue(string)) { + return string.toUpperCase(); + } + return "FOREST"; + } + }; + public static final SettingValue BLOCK = new SettingValue("BLOCK") { + @Override public boolean validateValue(String string) { + StringComparison.ComparisonResult value = + WorldUtil.IMP.getClosestBlock(string); + return !(value == null || value.match > 1); + } + + @Override public PlotBlock parseString(String string) { + StringComparison.ComparisonResult value = + WorldUtil.IMP.getClosestBlock(string); + if (value == null || value.match > 1) { + return null; + } + return value.best; + } + }; + public static final SettingValue BLOCKLIST = + new SettingValue("BLOCKLIST") { + @Override public boolean validateValue(String string) { + try { + for (String block : string.split(",")) { + if (block.contains("%")) { + String[] split = block.split("%"); + Integer.parseInt(split[0]); + block = split[1]; + } + StringComparison.ComparisonResult value = + WorldUtil.IMP.getClosestBlock(block); + if (value == null || value.match > 1) { + return false; + } + } + return true; + } catch (NumberFormatException ignored) { + return false; + } + } + + @Override public PlotBlock[] parseString(String string) { + String[] blocks = string.split(","); + ArrayList parsedvalues = new ArrayList<>(); + PlotBlock[] values = new PlotBlock[blocks.length]; + int[] counts = new int[blocks.length]; + int min = 100; + for (int i = 0; i < blocks.length; i++) { + try { + if (blocks[i].contains("%")) { + String[] split = blocks[i].split("%"); + blocks[i] = split[1]; + int value = Integer.parseInt(split[0]); + counts[i] = value; + if (value < min) { + min = value; + } + } else { + counts[i] = 1; + if (1 < min) { + min = 1; + } + } + StringComparison.ComparisonResult result = + WorldUtil.IMP.getClosestBlock(blocks[i]); + if (result != null && result.match < 2) { + values[i] = result.best; + } + } catch (NumberFormatException ignored) { + } + } + int gcd = gcd(counts); + for (int i = 0; i < counts.length; i++) { + int num = counts[i]; + for (int j = 0; j < num / gcd; j++) { + parsedvalues.add(values[i]); + } + } + return parsedvalues.toArray(new PlotBlock[parsedvalues.size()]); + } + }; + + public static int gcd(int a, int b) { + if (b == 0) { + return a; + } + return gcd(b, a % b); + } + + private static int gcd(int[] a) { + int result = a[0]; + for (int i = 1; i < a.length; i++) { + result = gcd(result, a[i]); + } + return result; + } + + /** + * Create your own SettingValue object to make the management of plotworld configuration easier + */ + public abstract static class SettingValue { + + private final String type; + + public SettingValue(String type) { + this.type = type; + } + + public String getType() { + return this.type; + } + + public abstract T parseString(String string); + + public abstract boolean validateValue(String string); + } +} diff --git a/Core/src/main/java/com/intellectualcrafters/plot/config/ConfigurationNode.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/ConfigurationNode.java similarity index 82% rename from Core/src/main/java/com/intellectualcrafters/plot/config/ConfigurationNode.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/ConfigurationNode.java index 03511ac4a..2bb9ecf93 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/config/ConfigurationNode.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/ConfigurationNode.java @@ -1,83 +1,82 @@ -package com.intellectualcrafters.plot.config; - -import com.intellectualcrafters.plot.config.Configuration.SettingValue; -import com.intellectualcrafters.plot.object.PlotBlock; -import com.intellectualcrafters.plot.util.StringMan; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -/** - * Configuration Node. - */ -public class ConfigurationNode { - - private final String constant; - private final Object defaultValue; - private final String description; - private final SettingValue type; - private Object value; - - public ConfigurationNode(String constant, Object defaultValue, String description, - SettingValue type) { - this.constant = constant; - this.defaultValue = defaultValue; - this.description = description; - this.value = defaultValue; - this.type = type; - } - - public SettingValue getType() { - return this.type; - } - - public boolean isValid(String string) { - try { - Object result = this.type.parseString(string); - return result != null; - } catch (Exception ignored) { - return false; - } - } - - public boolean setValue(String string) { - if (!this.type.validateValue(string)) { - return false; - } - this.value = this.type.parseString(string); - return true; - } - - public Object getValue() { - if (this.value instanceof String[]) { - return Arrays.asList((String[]) this.value); - } - if (this.value instanceof Object[]) { - List values = new ArrayList<>(); - for (Object value : (Object[]) this.value) { - values.add(value.toString()); - } - return values; - } - if (this.value instanceof PlotBlock) { - return this.value.toString(); - } - return this.value; - } - - public String getConstant() { - return this.constant; - } - - public Object getDefaultValue() { - if (this.defaultValue instanceof Object[]) { - return StringMan.join((Object[]) this.defaultValue, ","); - } - return this.defaultValue; - } - - public String getDescription() { - return this.description; - } -} +package com.github.intellectualsites.plotsquared.plot.config; + +import com.github.intellectualsites.plotsquared.plot.object.PlotBlock; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * Configuration Node. + */ +public class ConfigurationNode { + + private final String constant; + private final Object defaultValue; + private final String description; + private final Configuration.SettingValue type; + private Object value; + + public ConfigurationNode(String constant, Object defaultValue, String description, + Configuration.SettingValue type) { + this.constant = constant; + this.defaultValue = defaultValue; + this.description = description; + this.value = defaultValue; + this.type = type; + } + + public Configuration.SettingValue getType() { + return this.type; + } + + public boolean isValid(String string) { + try { + Object result = this.type.parseString(string); + return result != null; + } catch (Exception ignored) { + return false; + } + } + + public boolean setValue(String string) { + if (!this.type.validateValue(string)) { + return false; + } + this.value = this.type.parseString(string); + return true; + } + + public Object getValue() { + if (this.value instanceof String[]) { + return Arrays.asList((String[]) this.value); + } + if (this.value instanceof Object[]) { + List values = new ArrayList<>(); + for (Object value : (Object[]) this.value) { + values.add(value.toString()); + } + return values; + } + if (this.value instanceof PlotBlock) { + return this.value.toString(); + } + return this.value; + } + + public String getConstant() { + return this.constant; + } + + public Object getDefaultValue() { + if (this.defaultValue instanceof Object[]) { + return StringMan.join((Object[]) this.defaultValue, ","); + } + return this.defaultValue; + } + + public String getDescription() { + return this.description; + } +} diff --git a/Core/src/main/java/com/intellectualcrafters/plot/config/Settings.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java similarity index 97% rename from Core/src/main/java/com/intellectualcrafters/plot/config/Settings.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java index d1a24b16f..19d51ebf4 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/config/Settings.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java @@ -1,355 +1,355 @@ -package com.intellectualcrafters.plot.config; - -import com.intellectualcrafters.configuration.file.YamlConfiguration; - -import java.io.File; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -public class Settings extends Config { - - /* - START OF CONFIGURATION SECTION: - NOTE: Fields are saved in declaration order, classes in reverse order - */ - - @Comment("These first 4 aren't configurable") // This is a comment - @Final // Indicates that this value isn't configurable - public static final String ISSUES = "https://github.com/IntellectualSites/PlotSquared/issues"; - @Final public static final String WIKI = - "https://github.com/IntellectualSites/PlotSquared/wiki"; - @Final public static String DATE; // These values are set from P2 before loading - @Final public static String BUILD; // These values are set from P2 before loading - @Final public static String COMMIT; // These values are set from P2 before loading - @Final public static String PLATFORM; // These values are set from P2 before loading - - @Comment("Show additional information in console") public static boolean DEBUG = true; - @Comment({"The big annoying text that appears when you enter a plot", - "For a single plot: `/plot flag set titles false`", "For just you: `/plot toggle titles`"}) - public static boolean TITLES = true; - - @Create // This value will be generated automatically - public static ConfigBlock AUTO_CLEAR = null; - // A ConfigBlock is a section that can have multiple instances e.g. multiple expiry tasks - - public static void save(File file) { - save(file, Settings.class); - } - - public static void load(File file) { - load(file, Settings.class); - } - - public static boolean convertLegacy(File file) { - if (!file.exists()) { - return false; - } - YamlConfiguration config = YamlConfiguration.loadConfiguration(file); - - // Protection - Redstone.DISABLE_OFFLINE = config.getBoolean("protection.redstone.disable-offline"); - Redstone.DISABLE_UNOCCUPIED = config - .getBoolean("protection.redstone.disable-unoccupied", Redstone.DISABLE_UNOCCUPIED); - - // PlotMe - Enabled_Components.PLOTME_CONVERTER = - config.getBoolean("plotme-convert.enabled", Enabled_Components.PLOTME_CONVERTER); - PlotMe.CACHE_UUDS = config.getBoolean("plotme-convert.cache-uuids", PlotMe.CACHE_UUDS); - - // UUID - UUID.USE_SQLUUIDHANDLER = - config.getBoolean("uuid.use_sqluuidhandler", UUID.USE_SQLUUIDHANDLER); - UUID.OFFLINE = config.getBoolean("UUID.offline", UUID.OFFLINE); - UUID.FORCE_LOWERCASE = config.getBoolean("UUID.force-lowercase", UUID.FORCE_LOWERCASE); - - // Mob stuff - Enabled_Components.KILL_ROAD_MOBS = - config.getBoolean("kill_road_mobs", Enabled_Components.KILL_ROAD_MOBS); - Enabled_Components.KILL_ROAD_VEHICLES = - config.getBoolean("kill_road_vehicles", Enabled_Components.KILL_ROAD_VEHICLES); - - // Clearing + Expiry - //FAST_CLEAR = config.getBoolean("clear.fastmode"); - Enabled_Components.PLOT_EXPIRY = - config.getBoolean("clear.auto.enabled", Enabled_Components.PLOT_EXPIRY); - if (Enabled_Components.PLOT_EXPIRY) { - Enabled_Components.BAN_DELETER = config.getBoolean("clear.on.ban"); - AUTO_CLEAR = new ConfigBlock<>(); - AUTO_CLEAR.put("task1", new Auto_Clear()); - Auto_Clear task = AUTO_CLEAR.get("task1"); - task.CALIBRATION = new Auto_Clear.CALIBRATION(); - - task.DAYS = config.getInt("clear.auto.days", task.DAYS); - task.THRESHOLD = config.getInt("clear.auto.threshold", task.THRESHOLD); - task.CONFIRMATION = config.getBoolean("clear.auto.confirmation", task.CONFIRMATION); - task.CALIBRATION.CHANGES = - config.getInt("clear.auto.calibration.changes", task.CALIBRATION.CHANGES); - task.CALIBRATION.FACES = - config.getInt("clear.auto.calibration.faces", task.CALIBRATION.FACES); - task.CALIBRATION.DATA = - config.getInt("clear.auto.calibration.data", task.CALIBRATION.DATA); - task.CALIBRATION.AIR = - config.getInt("clear.auto.calibration.air", task.CALIBRATION.AIR); - task.CALIBRATION.VARIETY = - config.getInt("clear.auto.calibration.variety", task.CALIBRATION.VARIETY); - task.CALIBRATION.CHANGES_SD = - config.getInt("clear.auto.calibration.changes_sd", task.CALIBRATION.CHANGES_SD); - task.CALIBRATION.FACES_SD = - config.getInt("clear.auto.calibration.faces_sd", task.CALIBRATION.FACES_SD); - task.CALIBRATION.DATA_SD = - config.getInt("clear.auto.calibration.data_sd", task.CALIBRATION.DATA_SD); - task.CALIBRATION.AIR_SD = - config.getInt("clear.auto.calibration.air_sd", task.CALIBRATION.AIR_SD); - task.CALIBRATION.VARIETY_SD = - config.getInt("clear.auto.calibration.variety_sd", task.CALIBRATION.VARIETY_SD); - } - - // Done - Done.REQUIRED_FOR_RATINGS = - config.getBoolean("approval.ratings.check-done", Done.REQUIRED_FOR_RATINGS); - Done.COUNTS_TOWARDS_LIMIT = - config.getBoolean("approval.done.counts-towards-limit", Done.COUNTS_TOWARDS_LIMIT); - Done.RESTRICT_BUILDING = - config.getBoolean("approval.done.restrict-building", Done.RESTRICT_BUILDING); - Done.REQUIRED_FOR_DOWNLOAD = - config.getBoolean("approval.done.required-for-download", Done.REQUIRED_FOR_DOWNLOAD); - - // Schematics - Paths.SCHEMATICS = config.getString("schematics.save_path", Paths.SCHEMATICS); - Paths.BO3 = config.getString("bo3.save_path", Paths.BO3); - - // Web - Web.URL = config.getString("web.url", Web.URL); - - // Caching - Enabled_Components.PERMISSION_CACHE = - config.getBoolean("cache.permissions", Enabled_Components.PERMISSION_CACHE); - Enabled_Components.RATING_CACHE = - config.getBoolean("cache.ratings", Enabled_Components.RATING_CACHE); - - // Rating system - Ratings.CATEGORIES = config.contains("ratings.categories") ? - config.getStringList("ratings.categories") : - Ratings.CATEGORIES; - - // Titles - TITLES = config.getBoolean("titles", TITLES); - - // Teleportation - Teleport.DELAY = config.getInt("teleport.delay", Teleport.DELAY); - Teleport.ON_LOGIN = config.getBoolean("teleport.on_login", Teleport.ON_LOGIN); - Teleport.ON_DEATH = config.getBoolean("teleport.on_death", Teleport.ON_DEATH); - - // WorldEdit - //WE_ALLOW_HELPER = config.getBoolean("worldedit.enable-for-helpers"); - - // Chunk processor - Enabled_Components.CHUNK_PROCESSOR = - config.getBoolean("chunk-processor.enabled", Enabled_Components.CHUNK_PROCESSOR); - Chunk_Processor.AUTO_TRIM = - config.getBoolean("chunk-processor.auto-unload", Chunk_Processor.AUTO_TRIM); - Chunk_Processor.MAX_TILES = - config.getInt("chunk-processor.max-blockstates", Chunk_Processor.MAX_TILES); - Chunk_Processor.MAX_ENTITIES = - config.getInt("chunk-processor.max-entities", Chunk_Processor.MAX_ENTITIES); - Chunk_Processor.DISABLE_PHYSICS = - config.getBoolean("chunk-processor.disable-physics", Chunk_Processor.DISABLE_PHYSICS); - - // Comments - Enabled_Components.COMMENT_NOTIFIER = config - .getBoolean("comments.notifications.enabled", Enabled_Components.COMMENT_NOTIFIER); - - // Plot limits - Claim.MAX_AUTO_AREA = config.getInt("claim.max-auto-area", Claim.MAX_AUTO_AREA); - Limit.MAX_PLOTS = config.getInt("max_plots", Limit.MAX_PLOTS); - Limit.GLOBAL = config.getBoolean("global_limit", Limit.GLOBAL); - - // Misc - DEBUG = config.getBoolean("debug", DEBUG); - Chat.CONSOLE_COLOR = config.getBoolean("console.color", Chat.CONSOLE_COLOR); - Chat.INTERACTIVE = config.getBoolean("chat.fancy", Chat.INTERACTIVE); - - Enabled_Components.METRICS = config.getBoolean("metrics", Enabled_Components.METRICS); - Enabled_Components.UPDATER = - config.getBoolean("update-notifications", Enabled_Components.UPDATER); - Enabled_Components.DATABASE_PURGER = - config.getBoolean("auto-purge", Enabled_Components.DATABASE_PURGER); - return true; - } - - @Comment("This is an auto clearing task called `task1`") @BlockName("task1") - // The name for the default block - public static final class Auto_Clear extends ConfigBlock { - @Create // This value has to be generated since an instance isn't static - public CALIBRATION CALIBRATION = null; - public int THRESHOLD = 1; - public int REQUIRED_PLOTS = -1; - public boolean CONFIRMATION = true; - public int DAYS = 7; - public int SKIP_ACCOUNT_AGE_DAYS = -1; - public List WORLDS = new ArrayList<>(Collections.singletonList("*")); - - - @Comment("See: https://github.com/IntellectualSites/PlotSquared/wiki/Plot-analysis") - public static final class CALIBRATION { - public int VARIETY = 0; - public int VARIETY_SD = 0; - public int CHANGES = 0; - public int CHANGES_SD = 1; - public int FACES = 0; - public int FACES_SD = 0; - public int DATA_SD = 0; - public int AIR = 0; - public int AIR_SD = 0; - public int DATA = 0; - } - } - - - public static class Chunk_Processor { - @Comment("Auto trim will not save chunks which aren't claimed") public static boolean - AUTO_TRIM = false; - @Comment("Max tile entities per chunk") public static int MAX_TILES = 4096; - @Comment("Max entities per chunk") public static int MAX_ENTITIES = 512; - @Comment("Disable block physics") public static boolean DISABLE_PHYSICS = false; - } - - - public static class UUID { - @Comment("Force using offline UUIDs (it usually detects the right mode)") - public static boolean OFFLINE = false; - @Comment("Force using lowercase UUIDs") public static boolean FORCE_LOWERCASE = false; - @Comment("Use a database to store UUID/name info") public static boolean - USE_SQLUUIDHANDLER = false; - @Ignore public static boolean NATIVE_UUID_PROVIDER = false; - } - - - @Comment("Configure the paths that will be used") public static final class Paths { - public static String SCHEMATICS = "schematics"; - public static String BO3 = "bo3"; - public static String SCRIPTS = "scripts"; - public static String TEMPLATES = "templates"; - public static String TRANSLATIONS = "translations"; - } - - - public static class Web { - @Comment({"The web interface for schematics", " - All schematics are anonymous and private", - " - Downloads can be deleted by the user", - " - Supports plot uploads, downloads and saves",}) public static String URL = - "https://empcraft.com/plots/"; - @Comment({"The web interface for assets", " - All schematics are organized and public", - " - Assets can be searched, selected and downloaded",}) public static String ASSETS = - "https://empcraft.com/assetpack/"; - - } - - - public static final class Done { - @Comment("Require a done plot to download") public static boolean REQUIRED_FOR_DOWNLOAD = - false; - @Comment("Only done plots can be rated") public static boolean REQUIRED_FOR_RATINGS = false; - @Comment("Restrict building when a plot is done") public static boolean RESTRICT_BUILDING = - false; - @Comment("The limit being how many plots a player can claim") public static boolean - COUNTS_TOWARDS_LIMIT = true; - } - - - public static final class Chat { - @Comment("Sometimes console color doesn't work, you can disable it here") - public static boolean CONSOLE_COLOR = true; - @Comment("Should chat be interactive") public static boolean INTERACTIVE = true; - } - - - @Comment("Relating to how many plots someone can claim ") public static final class Limit { - @Comment("Should the limit be global (over multiple worlds)") public static boolean GLOBAL = - false; - @Comment("The range of permissions to check e.g. plots.plot.127") public static int - MAX_PLOTS = 127; - } - - - @Comment("Switching from PlotMe?") public static final class PlotMe { - @Comment("Cache the uuids from the PlotMe database") public static boolean CACHE_UUDS = - false; - } - - - public static final class Confirmation { - @Comment("Teleport to your plot on death") public static int CONFIRMATION_TIMEOUT_SECONDS = - 20; - } - - - public static final class Teleport { - @Comment("Teleport to your plot on death") public static boolean ON_DEATH = false; - @Comment("Teleport to your plot on login") public static boolean ON_LOGIN = false; - @Comment("Add a teleportation delay to all commands") public static int DELAY = 0; - @Comment("The visit command is ordered by world instead of globally") public static boolean - PER_WORLD_VISIT = false; - } - - - public static final class Redstone { - @Comment("Disable redstone in unoccupied plots") public static boolean DISABLE_UNOCCUPIED = - false; - @Comment("Disable redstone when all owners/trusted/members are offline") - public static boolean DISABLE_OFFLINE = false; - @Comment("Detect and cancel invalid pistons on the edge of plots (e.g. placed with WorldEdit)") - public static boolean DETECT_INVALID_EDGE_PISTONS = false; - } - - - public static final class Claim { - @Comment("The max plots claimed in a single `/plot auto ` command") public static int - MAX_AUTO_AREA = 4; - } - - - public static final class Ratings { - public static List CATEGORIES = new ArrayList<>(); - } - - - @Comment({"Enable or disable part of the plugin", - "Note: A cache will use some memory if enabled"}) - public static final class Enabled_Components { // Group the following values into a new config section - @Comment("The database stores all the plots") public static boolean DATABASE = true; - @Comment("Events are needed to track a lot of things") public static boolean EVENTS = true; - @Comment("Commands are used to interact with the plugin") public static boolean COMMANDS = - true; - @Comment("The UUID cacher is used to resolve player names") public static boolean - UUID_CACHE = true; - @Comment("The plugin auto updater") public static boolean UPDATER = true; - @Comment("Stores user metadata in a database") public static boolean PERSISTENT_META = true; - @Comment("Optimizes permission checks") public static boolean PERMISSION_CACHE = true; - @Comment("Optimizes block changing code") public static boolean BLOCK_CACHE = true; - @Comment("Getting a rating won't need the database") public static boolean RATING_CACHE = - true; - @Comment("The converter will attempt to convert the PlotMe database") public static boolean - PLOTME_CONVERTER = true; - @Comment("Allow WorldEdit to be restricted to plots") public static boolean - WORLDEDIT_RESTRICTIONS = true; - @Comment("Allow economy to be used") public static boolean ECONOMY = true; - @Comment("Send anonymous usage statistics. Bukkit only setting.") public static boolean - METRICS = true; - @Comment("Expiry will clear old or simplistic plots") public static boolean PLOT_EXPIRY = - false; - @Comment("Processes chunks (trimming, or entity/tile limits) ") public static boolean - CHUNK_PROCESSOR = false; - @Comment("Kill mobs on roads") public static boolean KILL_ROAD_MOBS = false; - @Comment("Kill items on roads") public static boolean KILL_ROAD_ITEMS = false; - @Comment("Kill vehicles on roads") public static boolean KILL_ROAD_VEHICLES = false; - @Comment("Notify a player of any missed comments upon plot entry") public static boolean - COMMENT_NOTIFIER = false; - @Comment("Let player's claim entire worlds with PlotSquared") public static boolean WORLDS = - false; - @Comment("Actively purge invalid database entries") public static boolean DATABASE_PURGER = - false; - @Comment("Delete plots when a player is banned") public static boolean BAN_DELETER = false; - } -} +package com.github.intellectualsites.plotsquared.plot.config; + +import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; + +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class Settings extends Config { + + /* + START OF CONFIGURATION SECTION: + NOTE: Fields are saved in declaration order, classes in reverse order + */ + + @Comment("These first 4 aren't configurable") // This is a comment + @Final // Indicates that this value isn't configurable + public static final String ISSUES = "https://github.com/IntellectualSites/PlotSquared/issues"; + @Final public static final String WIKI = + "https://github.com/IntellectualSites/PlotSquared/wiki"; + @Final public static String DATE; // These values are set from P2 before loading + @Final public static String BUILD; // These values are set from P2 before loading + @Final public static String COMMIT; // These values are set from P2 before loading + @Final public static String PLATFORM; // These values are set from P2 before loading + + @Comment("Show additional information in console") public static boolean DEBUG = true; + @Comment({"The big annoying text that appears when you enter a plot", + "For a single plot: `/plot flag set titles false`", "For just you: `/plot toggle titles`"}) + public static boolean TITLES = true; + + @Create // This value will be generated automatically + public static ConfigBlock AUTO_CLEAR = null; + // A ConfigBlock is a section that can have multiple instances e.g. multiple expiry tasks + + public static void save(File file) { + save(file, Settings.class); + } + + public static void load(File file) { + load(file, Settings.class); + } + + public static boolean convertLegacy(File file) { + if (!file.exists()) { + return false; + } + YamlConfiguration config = YamlConfiguration.loadConfiguration(file); + + // Protection + Redstone.DISABLE_OFFLINE = config.getBoolean("protection.redstone.disable-offline"); + Redstone.DISABLE_UNOCCUPIED = config + .getBoolean("protection.redstone.disable-unoccupied", Redstone.DISABLE_UNOCCUPIED); + + // PlotMe + Enabled_Components.PLOTME_CONVERTER = + config.getBoolean("plotme-convert.enabled", Enabled_Components.PLOTME_CONVERTER); + PlotMe.CACHE_UUDS = config.getBoolean("plotme-convert.cache-uuids", PlotMe.CACHE_UUDS); + + // UUID + UUID.USE_SQLUUIDHANDLER = + config.getBoolean("uuid.use_sqluuidhandler", UUID.USE_SQLUUIDHANDLER); + UUID.OFFLINE = config.getBoolean("UUID.offline", UUID.OFFLINE); + UUID.FORCE_LOWERCASE = config.getBoolean("UUID.force-lowercase", UUID.FORCE_LOWERCASE); + + // Mob stuff + Enabled_Components.KILL_ROAD_MOBS = + config.getBoolean("kill_road_mobs", Enabled_Components.KILL_ROAD_MOBS); + Enabled_Components.KILL_ROAD_VEHICLES = + config.getBoolean("kill_road_vehicles", Enabled_Components.KILL_ROAD_VEHICLES); + + // Clearing + Expiry + //FAST_CLEAR = config.getBoolean("clear.fastmode"); + Enabled_Components.PLOT_EXPIRY = + config.getBoolean("clear.auto.enabled", Enabled_Components.PLOT_EXPIRY); + if (Enabled_Components.PLOT_EXPIRY) { + Enabled_Components.BAN_DELETER = config.getBoolean("clear.on.ban"); + AUTO_CLEAR = new ConfigBlock<>(); + AUTO_CLEAR.put("task1", new Auto_Clear()); + Auto_Clear task = AUTO_CLEAR.get("task1"); + task.CALIBRATION = new Auto_Clear.CALIBRATION(); + + task.DAYS = config.getInt("clear.auto.days", task.DAYS); + task.THRESHOLD = config.getInt("clear.auto.threshold", task.THRESHOLD); + task.CONFIRMATION = config.getBoolean("clear.auto.confirmation", task.CONFIRMATION); + task.CALIBRATION.CHANGES = + config.getInt("clear.auto.calibration.changes", task.CALIBRATION.CHANGES); + task.CALIBRATION.FACES = + config.getInt("clear.auto.calibration.faces", task.CALIBRATION.FACES); + task.CALIBRATION.DATA = + config.getInt("clear.auto.calibration.data", task.CALIBRATION.DATA); + task.CALIBRATION.AIR = + config.getInt("clear.auto.calibration.air", task.CALIBRATION.AIR); + task.CALIBRATION.VARIETY = + config.getInt("clear.auto.calibration.variety", task.CALIBRATION.VARIETY); + task.CALIBRATION.CHANGES_SD = + config.getInt("clear.auto.calibration.changes_sd", task.CALIBRATION.CHANGES_SD); + task.CALIBRATION.FACES_SD = + config.getInt("clear.auto.calibration.faces_sd", task.CALIBRATION.FACES_SD); + task.CALIBRATION.DATA_SD = + config.getInt("clear.auto.calibration.data_sd", task.CALIBRATION.DATA_SD); + task.CALIBRATION.AIR_SD = + config.getInt("clear.auto.calibration.air_sd", task.CALIBRATION.AIR_SD); + task.CALIBRATION.VARIETY_SD = + config.getInt("clear.auto.calibration.variety_sd", task.CALIBRATION.VARIETY_SD); + } + + // Done + Done.REQUIRED_FOR_RATINGS = + config.getBoolean("approval.ratings.check-done", Done.REQUIRED_FOR_RATINGS); + Done.COUNTS_TOWARDS_LIMIT = + config.getBoolean("approval.done.counts-towards-limit", Done.COUNTS_TOWARDS_LIMIT); + Done.RESTRICT_BUILDING = + config.getBoolean("approval.done.restrict-building", Done.RESTRICT_BUILDING); + Done.REQUIRED_FOR_DOWNLOAD = + config.getBoolean("approval.done.required-for-download", Done.REQUIRED_FOR_DOWNLOAD); + + // Schematics + Paths.SCHEMATICS = config.getString("schematics.save_path", Paths.SCHEMATICS); + Paths.BO3 = config.getString("bo3.save_path", Paths.BO3); + + // Web + Web.URL = config.getString("web.url", Web.URL); + + // Caching + Enabled_Components.PERMISSION_CACHE = + config.getBoolean("cache.permissions", Enabled_Components.PERMISSION_CACHE); + Enabled_Components.RATING_CACHE = + config.getBoolean("cache.ratings", Enabled_Components.RATING_CACHE); + + // Rating system + Ratings.CATEGORIES = config.contains("ratings.categories") ? + config.getStringList("ratings.categories") : + Ratings.CATEGORIES; + + // Titles + TITLES = config.getBoolean("titles", TITLES); + + // Teleportation + Teleport.DELAY = config.getInt("teleport.delay", Teleport.DELAY); + Teleport.ON_LOGIN = config.getBoolean("teleport.on_login", Teleport.ON_LOGIN); + Teleport.ON_DEATH = config.getBoolean("teleport.on_death", Teleport.ON_DEATH); + + // WorldEdit + //WE_ALLOW_HELPER = config.getBoolean("worldedit.enable-for-helpers"); + + // Chunk processor + Enabled_Components.CHUNK_PROCESSOR = + config.getBoolean("chunk-processor.enabled", Enabled_Components.CHUNK_PROCESSOR); + Chunk_Processor.AUTO_TRIM = + config.getBoolean("chunk-processor.auto-unload", Chunk_Processor.AUTO_TRIM); + Chunk_Processor.MAX_TILES = + config.getInt("chunk-processor.max-blockstates", Chunk_Processor.MAX_TILES); + Chunk_Processor.MAX_ENTITIES = + config.getInt("chunk-processor.max-entities", Chunk_Processor.MAX_ENTITIES); + Chunk_Processor.DISABLE_PHYSICS = + config.getBoolean("chunk-processor.disable-physics", Chunk_Processor.DISABLE_PHYSICS); + + // Comments + Enabled_Components.COMMENT_NOTIFIER = config + .getBoolean("comments.notifications.enabled", Enabled_Components.COMMENT_NOTIFIER); + + // Plot limits + Claim.MAX_AUTO_AREA = config.getInt("claim.max-auto-area", Claim.MAX_AUTO_AREA); + Limit.MAX_PLOTS = config.getInt("max_plots", Limit.MAX_PLOTS); + Limit.GLOBAL = config.getBoolean("global_limit", Limit.GLOBAL); + + // Misc + DEBUG = config.getBoolean("debug", DEBUG); + Chat.CONSOLE_COLOR = config.getBoolean("console.color", Chat.CONSOLE_COLOR); + Chat.INTERACTIVE = config.getBoolean("chat.fancy", Chat.INTERACTIVE); + + Enabled_Components.METRICS = config.getBoolean("metrics", Enabled_Components.METRICS); + Enabled_Components.UPDATER = + config.getBoolean("update-notifications", Enabled_Components.UPDATER); + Enabled_Components.DATABASE_PURGER = + config.getBoolean("auto-purge", Enabled_Components.DATABASE_PURGER); + return true; + } + + @Comment("This is an auto clearing task called `task1`") @BlockName("task1") + // The name for the default block + public static final class Auto_Clear extends ConfigBlock { + @Create // This value has to be generated since an instance isn't static + public CALIBRATION CALIBRATION = null; + public int THRESHOLD = 1; + public int REQUIRED_PLOTS = -1; + public boolean CONFIRMATION = true; + public int DAYS = 7; + public int SKIP_ACCOUNT_AGE_DAYS = -1; + public List WORLDS = new ArrayList<>(Collections.singletonList("*")); + + + @Comment("See: https://github.com/IntellectualSites/PlotSquared/wiki/Plot-analysis") + public static final class CALIBRATION { + public int VARIETY = 0; + public int VARIETY_SD = 0; + public int CHANGES = 0; + public int CHANGES_SD = 1; + public int FACES = 0; + public int FACES_SD = 0; + public int DATA_SD = 0; + public int AIR = 0; + public int AIR_SD = 0; + public int DATA = 0; + } + } + + + public static class Chunk_Processor { + @Comment("Auto trim will not save chunks which aren't claimed") public static boolean + AUTO_TRIM = false; + @Comment("Max tile entities per chunk") public static int MAX_TILES = 4096; + @Comment("Max entities per chunk") public static int MAX_ENTITIES = 512; + @Comment("Disable block physics") public static boolean DISABLE_PHYSICS = false; + } + + + public static class UUID { + @Comment("Force using offline UUIDs (it usually detects the right mode)") + public static boolean OFFLINE = false; + @Comment("Force using lowercase UUIDs") public static boolean FORCE_LOWERCASE = false; + @Comment("Use a database to store UUID/name info") public static boolean + USE_SQLUUIDHANDLER = false; + @Ignore public static boolean NATIVE_UUID_PROVIDER = false; + } + + + @Comment("Configure the paths that will be used") public static final class Paths { + public static String SCHEMATICS = "schematics"; + public static String BO3 = "bo3"; + public static String SCRIPTS = "scripts"; + public static String TEMPLATES = "templates"; + public static String TRANSLATIONS = "translations"; + } + + + public static class Web { + @Comment({"The web interface for schematics", " - All schematics are anonymous and private", + " - Downloads can be deleted by the user", + " - Supports plot uploads, downloads and saves",}) public static String URL = + "https://empcraft.com/plots/"; + @Comment({"The web interface for assets", " - All schematics are organized and public", + " - Assets can be searched, selected and downloaded",}) public static String ASSETS = + "https://empcraft.com/assetpack/"; + + } + + + public static final class Done { + @Comment("Require a done plot to download") public static boolean REQUIRED_FOR_DOWNLOAD = + false; + @Comment("Only done plots can be rated") public static boolean REQUIRED_FOR_RATINGS = false; + @Comment("Restrict building when a plot is done") public static boolean RESTRICT_BUILDING = + false; + @Comment("The limit being how many plots a player can claim") public static boolean + COUNTS_TOWARDS_LIMIT = true; + } + + + public static final class Chat { + @Comment("Sometimes console color doesn't work, you can disable it here") + public static boolean CONSOLE_COLOR = true; + @Comment("Should chat be interactive") public static boolean INTERACTIVE = true; + } + + + @Comment("Relating to how many plots someone can claim ") public static final class Limit { + @Comment("Should the limit be global (over multiple worlds)") public static boolean GLOBAL = + false; + @Comment("The range of permissions to check e.g. plots.plot.127") public static int + MAX_PLOTS = 127; + } + + + @Comment("Switching from PlotMe?") public static final class PlotMe { + @Comment("Cache the uuids from the PlotMe database") public static boolean CACHE_UUDS = + false; + } + + + public static final class Confirmation { + @Comment("Teleport to your plot on death") public static int CONFIRMATION_TIMEOUT_SECONDS = + 20; + } + + + public static final class Teleport { + @Comment("Teleport to your plot on death") public static boolean ON_DEATH = false; + @Comment("Teleport to your plot on login") public static boolean ON_LOGIN = false; + @Comment("Add a teleportation delay to all commands") public static int DELAY = 0; + @Comment("The visit command is ordered by world instead of globally") public static boolean + PER_WORLD_VISIT = false; + } + + + public static final class Redstone { + @Comment("Disable redstone in unoccupied plots") public static boolean DISABLE_UNOCCUPIED = + false; + @Comment("Disable redstone when all owners/trusted/members are offline") + public static boolean DISABLE_OFFLINE = false; + @Comment("Detect and cancel invalid pistons on the edge of plots (e.g. placed with WorldEdit)") + public static boolean DETECT_INVALID_EDGE_PISTONS = false; + } + + + public static final class Claim { + @Comment("The max plots claimed in a single `/plot auto ` command") public static int + MAX_AUTO_AREA = 4; + } + + + public static final class Ratings { + public static List CATEGORIES = new ArrayList<>(); + } + + + @Comment({"Enable or disable part of the plugin", + "Note: A cache will use some memory if enabled"}) + public static final class Enabled_Components { // Group the following values into a new config section + @Comment("The database stores all the plots") public static boolean DATABASE = true; + @Comment("Events are needed to track a lot of things") public static boolean EVENTS = true; + @Comment("Commands are used to interact with the plugin") public static boolean COMMANDS = + true; + @Comment("The UUID cacher is used to resolve player names") public static boolean + UUID_CACHE = true; + @Comment("The plugin auto updater") public static boolean UPDATER = true; + @Comment("Stores user metadata in a database") public static boolean PERSISTENT_META = true; + @Comment("Optimizes permission checks") public static boolean PERMISSION_CACHE = true; + @Comment("Optimizes block changing code") public static boolean BLOCK_CACHE = true; + @Comment("Getting a rating won't need the database") public static boolean RATING_CACHE = + true; + @Comment("The converter will attempt to convert the PlotMe database") public static boolean + PLOTME_CONVERTER = true; + @Comment("Allow WorldEdit to be restricted to plots") public static boolean + WORLDEDIT_RESTRICTIONS = true; + @Comment("Allow economy to be used") public static boolean ECONOMY = true; + @Comment("Send anonymous usage statistics. Bukkit only setting.") public static boolean + METRICS = true; + @Comment("Expiry will clear old or simplistic plots") public static boolean PLOT_EXPIRY = + false; + @Comment("Processes chunks (trimming, or entity/tile limits) ") public static boolean + CHUNK_PROCESSOR = false; + @Comment("Kill mobs on roads") public static boolean KILL_ROAD_MOBS = false; + @Comment("Kill items on roads") public static boolean KILL_ROAD_ITEMS = false; + @Comment("Kill vehicles on roads") public static boolean KILL_ROAD_VEHICLES = false; + @Comment("Notify a player of any missed comments upon plot entry") public static boolean + COMMENT_NOTIFIER = false; + @Comment("Let player's claim entire worlds with PlotSquared") public static boolean WORLDS = + false; + @Comment("Actively purge invalid database entries") public static boolean DATABASE_PURGER = + false; + @Comment("Delete plots when a player is banned") public static boolean BAN_DELETER = false; + } +} diff --git a/Core/src/main/java/com/intellectualcrafters/plot/config/Storage.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Storage.java similarity index 94% rename from Core/src/main/java/com/intellectualcrafters/plot/config/Storage.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Storage.java index 26c192a53..962e0468f 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/config/Storage.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Storage.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.config; +package com.github.intellectualsites.plotsquared.plot.config; import java.io.File; import java.util.ArrayList; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/database/AbstractDB.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java similarity index 96% rename from Core/src/main/java/com/intellectualcrafters/plot/database/AbstractDB.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java index 9d892e0c8..cb1b22376 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/database/AbstractDB.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java @@ -1,8 +1,8 @@ -package com.intellectualcrafters.plot.database; +package com.github.intellectualsites.plotsquared.plot.database; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.object.comment.PlotComment; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment; import java.util.*; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/database/DBFunc.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java similarity index 98% rename from Core/src/main/java/com/intellectualcrafters/plot/database/DBFunc.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java index 003b948ed..2e3ca140c 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/database/DBFunc.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java @@ -1,8 +1,8 @@ -package com.intellectualcrafters.plot.database; +package com.github.intellectualsites.plotsquared.plot.database; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.object.comment.PlotComment; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment; import java.sql.ResultSet; import java.sql.ResultSetMetaData; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/database/Database.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/Database.java similarity index 97% rename from Core/src/main/java/com/intellectualcrafters/plot/database/Database.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/Database.java index 385594a85..4acecc01f 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/database/Database.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/Database.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.database; +package com.github.intellectualsites.plotsquared.plot.database; import java.sql.Connection; import java.sql.ResultSet; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/database/MySQL.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/MySQL.java similarity index 92% rename from Core/src/main/java/com/intellectualcrafters/plot/database/MySQL.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/MySQL.java index 1d12564de..7e7df9124 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/database/MySQL.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/MySQL.java @@ -1,7 +1,7 @@ -package com.intellectualcrafters.plot.database; +package com.github.intellectualsites.plotsquared.plot.database; -import com.intellectualcrafters.plot.config.Storage; -import com.intellectualcrafters.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.plot.config.Storage; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; import java.sql.*; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java similarity index 99% rename from Core/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java index 4ad6e499d..5ca2f9742 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java @@ -1,18 +1,18 @@ -package com.intellectualcrafters.plot.database; +package com.github.intellectualsites.plotsquared.plot.database; +import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.config.Storage; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.flag.FlagManager; +import com.github.intellectualsites.plotsquared.plot.flag.StringFlag; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import com.google.common.base.Charsets; -import com.intellectualcrafters.configuration.ConfigurationSection; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.config.Storage; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.flag.FlagManager; -import com.intellectualcrafters.plot.flag.StringFlag; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.object.comment.PlotComment; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.StringMan; -import com.intellectualcrafters.plot.util.TaskManager; import java.sql.*; import java.text.ParseException; @@ -678,7 +678,7 @@ import java.util.concurrent.atomic.AtomicInteger; try { stmt.setString(i * 5 + 3, plot.owner.toString()); } catch (SQLException ignored) { - stmt.setString(i * 5 + 3, AbstractDB.everyone.toString()); + stmt.setString(i * 5 + 3, everyone.toString()); } stmt.setString(i * 5 + 4, plot.getArea().toString()); stmt.setTimestamp(i * 5 + 5, new Timestamp(plot.getTimestamp())); @@ -692,7 +692,7 @@ import java.util.concurrent.atomic.AtomicInteger; try { stmt.setString(i * 6 + 4, plot.owner.toString()); } catch (SQLException ignored) { - stmt.setString(i * 6 + 4, AbstractDB.everyone.toString()); + stmt.setString(i * 6 + 4, everyone.toString()); } stmt.setString(i * 6 + 5, plot.getArea().toString()); stmt.setTimestamp(i * 6 + 6, new Timestamp(plot.getTimestamp())); diff --git a/Core/src/main/java/com/intellectualcrafters/plot/database/SQLite.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLite.java similarity index 93% rename from Core/src/main/java/com/intellectualcrafters/plot/database/SQLite.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLite.java index 6f3e99e11..563b689cd 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/database/SQLite.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLite.java @@ -1,86 +1,86 @@ -package com.intellectualcrafters.plot.database; - -import com.intellectualcrafters.plot.PS; - -import java.io.File; -import java.io.IOException; -import java.sql.*; - -/** - * Connects to and uses a SQLite database. - */ -public class SQLite extends Database { - - private final String dbLocation; - private Connection connection; - - /** - * Creates a new SQLite instance - * - * @param dbLocation Location of the Database (Must end in .db) - */ - public SQLite(File dbLocation) { - this.dbLocation = dbLocation.getAbsolutePath(); - } - - @Override public Connection openConnection() throws SQLException, ClassNotFoundException { - if (checkConnection()) { - return this.connection; - } - if (!PS.get().IMP.getDirectory().exists()) { - PS.get().IMP.getDirectory().mkdirs(); - } - File file = new File(this.dbLocation); - if (!file.exists()) { - try { - file.createNewFile(); - } catch (IOException ignored) { - PS.debug("&cUnable to create database!"); - } - } - Class.forName("org.sqlite.JDBC"); - this.connection = DriverManager.getConnection("jdbc:sqlite:" + this.dbLocation); - return this.connection; - } - - @Override public boolean checkConnection() throws SQLException { - return (this.connection != null) && !this.connection.isClosed(); - } - - @Override public Connection getConnection() { - return this.connection; - } - - @Override public boolean closeConnection() throws SQLException { - if (this.connection == null) { - return false; - } - this.connection.close(); - this.connection = null; - return true; - } - - @Override public ResultSet querySQL(String query) throws SQLException, ClassNotFoundException { - if (checkConnection()) { - openConnection(); - } - try (Statement statement = this.connection.createStatement()) { - return statement.executeQuery(query); - } - } - - @Override public int updateSQL(String query) throws SQLException, ClassNotFoundException { - if (checkConnection()) { - openConnection(); - } - try (Statement statement = this.connection.createStatement()) { - return statement.executeUpdate(query); - } - } - - @Override public Connection forceConnection() throws SQLException, ClassNotFoundException { - Class.forName("org.sqlite.JDBC"); - this.connection = DriverManager.getConnection("jdbc:sqlite:" + this.dbLocation); - return this.connection; - } -} +package com.github.intellectualsites.plotsquared.plot.database; + +import com.github.intellectualsites.plotsquared.plot.PS; + +import java.io.File; +import java.io.IOException; +import java.sql.*; + +/** + * Connects to and uses a SQLite database. + */ +public class SQLite extends Database { + + private final String dbLocation; + private Connection connection; + + /** + * Creates a new SQLite instance + * + * @param dbLocation Location of the Database (Must end in .db) + */ + public SQLite(File dbLocation) { + this.dbLocation = dbLocation.getAbsolutePath(); + } + + @Override public Connection openConnection() throws SQLException, ClassNotFoundException { + if (checkConnection()) { + return this.connection; + } + if (!PS.get().IMP.getDirectory().exists()) { + PS.get().IMP.getDirectory().mkdirs(); + } + File file = new File(this.dbLocation); + if (!file.exists()) { + try { + file.createNewFile(); + } catch (IOException ignored) { + PS.debug("&cUnable to create database!"); + } + } + Class.forName("org.sqlite.JDBC"); + this.connection = DriverManager.getConnection("jdbc:sqlite:" + this.dbLocation); + return this.connection; + } + + @Override public boolean checkConnection() throws SQLException { + return (this.connection != null) && !this.connection.isClosed(); + } + + @Override public Connection getConnection() { + return this.connection; + } + + @Override public boolean closeConnection() throws SQLException { + if (this.connection == null) { + return false; + } + this.connection.close(); + this.connection = null; + return true; + } + + @Override public ResultSet querySQL(String query) throws SQLException, ClassNotFoundException { + if (checkConnection()) { + openConnection(); + } + try (Statement statement = this.connection.createStatement()) { + return statement.executeQuery(query); + } + } + + @Override public int updateSQL(String query) throws SQLException, ClassNotFoundException { + if (checkConnection()) { + openConnection(); + } + try (Statement statement = this.connection.createStatement()) { + return statement.executeUpdate(query); + } + } + + @Override public Connection forceConnection() throws SQLException, ClassNotFoundException { + Class.forName("org.sqlite.JDBC"); + this.connection = DriverManager.getConnection("jdbc:sqlite:" + this.dbLocation); + return this.connection; + } +} diff --git a/Core/src/main/java/com/intellectualcrafters/plot/database/StmtMod.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/StmtMod.java similarity index 90% rename from Core/src/main/java/com/intellectualcrafters/plot/database/StmtMod.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/StmtMod.java index 4bd455965..2f3b5217f 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/database/StmtMod.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/StmtMod.java @@ -1,6 +1,6 @@ -package com.intellectualcrafters.plot.database; +package com.github.intellectualsites.plotsquared.plot.database; -import com.intellectualcrafters.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; import java.sql.PreparedStatement; import java.sql.SQLException; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/flag/BooleanFlag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/BooleanFlag.java similarity index 89% rename from Core/src/main/java/com/intellectualcrafters/plot/flag/BooleanFlag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/BooleanFlag.java index 23e3780fe..a492c9c0f 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/flag/BooleanFlag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/BooleanFlag.java @@ -1,6 +1,6 @@ -package com.intellectualcrafters.plot.flag; +package com.github.intellectualsites.plotsquared.plot.flag; -import com.intellectualcrafters.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.Plot; public class BooleanFlag extends Flag { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/flag/DoubleFlag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/DoubleFlag.java similarity index 89% rename from Core/src/main/java/com/intellectualcrafters/plot/flag/DoubleFlag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/DoubleFlag.java index 45598851a..9b46a2cde 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/flag/DoubleFlag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/DoubleFlag.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.flag; +package com.github.intellectualsites.plotsquared.plot.flag; public class DoubleFlag extends Flag { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/flag/EnumFlag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/EnumFlag.java similarity index 84% rename from Core/src/main/java/com/intellectualcrafters/plot/flag/EnumFlag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/EnumFlag.java index 71fe181d7..3ba6b2457 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/flag/EnumFlag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/EnumFlag.java @@ -1,6 +1,6 @@ -package com.intellectualcrafters.plot.flag; +package com.github.intellectualsites.plotsquared.plot.flag; -import com.intellectualcrafters.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; import java.util.Arrays; import java.util.HashSet; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/flag/Flag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flag.java similarity index 86% rename from Core/src/main/java/com/intellectualcrafters/plot/flag/Flag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flag.java index c22342aae..3b247d87a 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/flag/Flag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flag.java @@ -1,7 +1,7 @@ -package com.intellectualcrafters.plot.flag; +package com.github.intellectualsites.plotsquared.plot.flag; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.util.StringComparison; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.util.StringComparison; public abstract class Flag implements StringComparison.StringComparable { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java similarity index 96% rename from Core/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java index 2b9aaa61a..689a890da 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java @@ -1,12 +1,12 @@ -package com.intellectualcrafters.plot.flag; +package com.github.intellectualsites.plotsquared.plot.flag; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.EventUtil; +import com.github.intellectualsites.plotsquared.plot.util.Permissions; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.EventUtil; -import com.intellectualcrafters.plot.util.Permissions; import java.lang.reflect.Field; import java.util.*; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/flag/Flags.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java similarity index 95% rename from Core/src/main/java/com/intellectualcrafters/plot/flag/Flags.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java index e0e931852..2fa217a08 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/flag/Flags.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java @@ -1,12 +1,12 @@ -package com.intellectualcrafters.plot.flag; +package com.github.intellectualsites.plotsquared.plot.flag; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotArea; -import com.intellectualcrafters.plot.object.RunnableVal; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.MathMan; -import com.intellectualcrafters.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.MathMan; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; import java.lang.reflect.Field; import java.util.Collection; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/flag/GameModeFlag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/GameModeFlag.java similarity index 88% rename from Core/src/main/java/com/intellectualcrafters/plot/flag/GameModeFlag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/GameModeFlag.java index 6dd0831f6..cf9dd5c37 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/flag/GameModeFlag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/GameModeFlag.java @@ -1,6 +1,6 @@ -package com.intellectualcrafters.plot.flag; +package com.github.intellectualsites.plotsquared.plot.flag; -import com.intellectualcrafters.plot.util.PlotGameMode; +import com.github.intellectualsites.plotsquared.plot.util.PlotGameMode; public class GameModeFlag extends Flag { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/flag/IntegerFlag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntegerFlag.java similarity index 89% rename from Core/src/main/java/com/intellectualcrafters/plot/flag/IntegerFlag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntegerFlag.java index 56d5fc319..2cafed4d1 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/flag/IntegerFlag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntegerFlag.java @@ -1,6 +1,6 @@ -package com.intellectualcrafters.plot.flag; +package com.github.intellectualsites.plotsquared.plot.flag; -import com.intellectualcrafters.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.Plot; public class IntegerFlag extends Flag { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/flag/IntegerListFlag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntegerListFlag.java similarity index 84% rename from Core/src/main/java/com/intellectualcrafters/plot/flag/IntegerListFlag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntegerListFlag.java index 54d5b854d..66a479fca 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/flag/IntegerListFlag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntegerListFlag.java @@ -1,6 +1,6 @@ -package com.intellectualcrafters.plot.flag; +package com.github.intellectualsites.plotsquared.plot.flag; -import com.intellectualcrafters.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; import java.util.ArrayList; import java.util.List; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/flag/IntervalFlag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntervalFlag.java similarity index 95% rename from Core/src/main/java/com/intellectualcrafters/plot/flag/IntervalFlag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntervalFlag.java index 88bee4c1d..ab7100cb6 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/flag/IntervalFlag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntervalFlag.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.flag; +package com.github.intellectualsites.plotsquared.plot.flag; public class IntervalFlag extends Flag { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/flag/ListFlag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/ListFlag.java similarity index 73% rename from Core/src/main/java/com/intellectualcrafters/plot/flag/ListFlag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/ListFlag.java index 606b8d35c..518c3df11 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/flag/ListFlag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/ListFlag.java @@ -1,6 +1,6 @@ -package com.intellectualcrafters.plot.flag; +package com.github.intellectualsites.plotsquared.plot.flag; -import com.intellectualcrafters.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.Plot; import java.util.Collection; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/flag/LongFlag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/LongFlag.java similarity index 90% rename from Core/src/main/java/com/intellectualcrafters/plot/flag/LongFlag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/LongFlag.java index bcb076c39..464780af8 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/flag/LongFlag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/LongFlag.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.flag; +package com.github.intellectualsites.plotsquared.plot.flag; public class LongFlag extends Flag { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/flag/PlotBlockListFlag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotBlockListFlag.java similarity index 81% rename from Core/src/main/java/com/intellectualcrafters/plot/flag/PlotBlockListFlag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotBlockListFlag.java index e6bf37238..177221df4 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/flag/PlotBlockListFlag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotBlockListFlag.java @@ -1,9 +1,9 @@ -package com.intellectualcrafters.plot.flag; +package com.github.intellectualsites.plotsquared.plot.flag; -import com.intellectualcrafters.plot.object.PlotBlock; -import com.intellectualcrafters.plot.util.StringComparison; -import com.intellectualcrafters.plot.util.StringMan; -import com.intellectualcrafters.plot.util.WorldUtil; +import com.github.intellectualsites.plotsquared.plot.object.PlotBlock; +import com.github.intellectualsites.plotsquared.plot.util.StringComparison; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; import java.util.HashSet; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/flag/PlotWeatherFlag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotWeatherFlag.java similarity index 85% rename from Core/src/main/java/com/intellectualcrafters/plot/flag/PlotWeatherFlag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotWeatherFlag.java index 623060368..b2cbed710 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/flag/PlotWeatherFlag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotWeatherFlag.java @@ -1,6 +1,6 @@ -package com.intellectualcrafters.plot.flag; +package com.github.intellectualsites.plotsquared.plot.flag; -import com.intellectualcrafters.plot.util.PlotWeather; +import com.github.intellectualsites.plotsquared.plot.util.PlotWeather; public class PlotWeatherFlag extends Flag { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/flag/StringFlag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/StringFlag.java similarity index 88% rename from Core/src/main/java/com/intellectualcrafters/plot/flag/StringFlag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/StringFlag.java index 500f3af0a..36a68f66b 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/flag/StringFlag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/StringFlag.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.flag; +package com.github.intellectualsites.plotsquared.plot.flag; public class StringFlag extends Flag { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/flag/StringListFlag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/StringListFlag.java similarity index 81% rename from Core/src/main/java/com/intellectualcrafters/plot/flag/StringListFlag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/StringListFlag.java index 7af5dab88..8f02a3801 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/flag/StringListFlag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/StringListFlag.java @@ -1,6 +1,6 @@ -package com.intellectualcrafters.plot.flag; +package com.github.intellectualsites.plotsquared.plot.flag; -import com.intellectualcrafters.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; import java.util.ArrayList; import java.util.Arrays; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/flag/TeleportDenyFlag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/TeleportDenyFlag.java similarity index 86% rename from Core/src/main/java/com/intellectualcrafters/plot/flag/TeleportDenyFlag.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/TeleportDenyFlag.java index c79ca9166..b24f14faf 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/flag/TeleportDenyFlag.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/TeleportDenyFlag.java @@ -1,7 +1,7 @@ -package com.intellectualcrafters.plot.flag; +package com.github.intellectualsites.plotsquared.plot.flag; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; public class TeleportDenyFlag extends EnumFlag { public TeleportDenyFlag(String name) { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/generator/AugmentedUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java similarity index 90% rename from Core/src/main/java/com/intellectualcrafters/plot/generator/AugmentedUtils.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java index 1169a79c1..7b86278b4 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/generator/AugmentedUtils.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java @@ -1,11 +1,11 @@ -package com.intellectualcrafters.plot.generator; +package com.github.intellectualsites.plotsquared.plot.generator; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.block.DelegateLocalBlockQueue; -import com.intellectualcrafters.plot.util.block.GlobalBlockQueue; -import com.intellectualcrafters.plot.util.block.LocalBlockQueue; -import com.intellectualcrafters.plot.util.block.ScopedLocalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.block.DelegateLocalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue; import java.util.Set; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java similarity index 98% rename from Core/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java index aa9e0ea3b..846822fb0 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java @@ -1,9 +1,9 @@ -package com.intellectualcrafters.plot.generator; +package com.github.intellectualsites.plotsquared.plot.generator; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.MathMan; -import com.intellectualcrafters.plot.util.block.GlobalBlockQueue; -import com.intellectualcrafters.plot.util.block.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.MathMan; +import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; import java.util.ArrayList; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java similarity index 88% rename from Core/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotWorld.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java index 171e09a3f..7f5d93cd1 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotWorld.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java @@ -1,11 +1,11 @@ -package com.intellectualcrafters.plot.generator; +package com.github.intellectualsites.plotsquared.plot.generator; -import com.intellectualcrafters.configuration.ConfigurationSection; -import com.intellectualcrafters.plot.config.Configuration; -import com.intellectualcrafters.plot.config.ConfigurationNode; -import com.intellectualcrafters.plot.object.PlotBlock; -import com.intellectualcrafters.plot.object.PlotId; -import com.intellectualcrafters.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; +import com.github.intellectualsites.plotsquared.plot.config.Configuration; +import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; +import com.github.intellectualsites.plotsquared.plot.object.PlotBlock; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; public abstract class ClassicPlotWorld extends SquarePlotWorld { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/generator/GeneratorWrapper.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GeneratorWrapper.java similarity index 65% rename from Core/src/main/java/com/intellectualcrafters/plot/generator/GeneratorWrapper.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GeneratorWrapper.java index 70f9e263f..ec5f971fc 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/generator/GeneratorWrapper.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GeneratorWrapper.java @@ -1,6 +1,6 @@ -package com.intellectualcrafters.plot.generator; +package com.github.intellectualsites.plotsquared.plot.generator; -import com.intellectualcrafters.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; public interface GeneratorWrapper { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/generator/GridPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotManager.java similarity index 53% rename from Core/src/main/java/com/intellectualcrafters/plot/generator/GridPlotManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotManager.java index ccfac56a0..4ea841c3c 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/generator/GridPlotManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotManager.java @@ -1,6 +1,6 @@ -package com.intellectualcrafters.plot.generator; +package com.github.intellectualsites.plotsquared.plot.generator; -import com.intellectualcrafters.plot.object.PlotManager; +import com.github.intellectualsites.plotsquared.plot.object.PlotManager; /** * A plot manager where plots tessellate in a grid formation symmetrical about x=z. diff --git a/Core/src/main/java/com/intellectualcrafters/plot/generator/GridPlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotWorld.java similarity index 56% rename from Core/src/main/java/com/intellectualcrafters/plot/generator/GridPlotWorld.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotWorld.java index 1cd849502..34dbef203 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/generator/GridPlotWorld.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotWorld.java @@ -1,7 +1,7 @@ -package com.intellectualcrafters.plot.generator; +package com.github.intellectualsites.plotsquared.plot.generator; -import com.intellectualcrafters.plot.object.PlotArea; -import com.intellectualcrafters.plot.object.PlotId; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; public abstract class GridPlotWorld extends PlotArea { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/generator/HybridGen.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java similarity index 93% rename from Core/src/main/java/com/intellectualcrafters/plot/generator/HybridGen.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java index 4295a4c53..a53a626a9 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/generator/HybridGen.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java @@ -1,13 +1,13 @@ -package com.intellectualcrafters.plot.generator; +package com.github.intellectualsites.plotsquared.plot.generator; -import com.intellectualcrafters.jnbt.CompoundTag; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.MathMan; -import com.intellectualcrafters.plot.util.SchematicHandler; -import com.intellectualcrafters.plot.util.block.GlobalBlockQueue; -import com.intellectualcrafters.plot.util.block.LocalBlockQueue; -import com.intellectualcrafters.plot.util.block.ScopedLocalBlockQueue; +import com.github.intellectualsites.plotsquared.jnbt.CompoundTag; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.MathMan; +import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler; +import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue; import java.util.HashMap; import java.util.Map.Entry; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java similarity index 93% rename from Core/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java index 915f29e55..6eeb7cb93 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java @@ -1,14 +1,14 @@ -package com.intellectualcrafters.plot.generator; +package com.github.intellectualsites.plotsquared.plot.generator; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.commands.Template; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.ChunkManager; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.MathMan; -import com.intellectualcrafters.plot.util.block.GlobalBlockQueue; -import com.intellectualcrafters.plot.util.block.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.commands.Template; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.MathMan; +import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; import java.io.File; import java.io.IOException; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java similarity index 90% rename from Core/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotWorld.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java index 6e19d8e4f..cba505f66 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotWorld.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java @@ -1,17 +1,15 @@ -package com.intellectualcrafters.plot.generator; +package com.github.intellectualsites.plotsquared.plot.generator; -import com.intellectualcrafters.configuration.ConfigurationSection; -import com.intellectualcrafters.jnbt.CompoundTag; -import com.intellectualcrafters.jnbt.Tag; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.MathMan; -import com.intellectualcrafters.plot.util.ReflectionUtils; -import com.intellectualcrafters.plot.util.SchematicHandler; -import com.intellectualcrafters.plot.util.SchematicHandler.Dimension; -import com.intellectualcrafters.plot.util.SchematicHandler.Schematic; +import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; +import com.github.intellectualsites.plotsquared.jnbt.CompoundTag; +import com.github.intellectualsites.plotsquared.jnbt.Tag; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.MathMan; +import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils; +import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler; import java.io.File; import java.util.HashMap; @@ -194,9 +192,9 @@ public class HybridPlotWorld extends ClassicPlotWorld { "schematics/GEN_ROAD_SCHEMATIC/" + this.worldname + "/intersection.schematic"); File schem3File = MainUtil.getFile(PS.get().IMP.getDirectory(), "schematics/GEN_ROAD_SCHEMATIC/" + this.worldname + "/plot.schematic"); - Schematic schematic1 = SchematicHandler.manager.getSchematic(schematic1File); - Schematic schematic2 = SchematicHandler.manager.getSchematic(schematic2File); - Schematic schematic3 = SchematicHandler.manager.getSchematic(schem3File); + SchematicHandler.Schematic schematic1 = SchematicHandler.manager.getSchematic(schematic1File); + SchematicHandler.Schematic schematic2 = SchematicHandler.manager.getSchematic(schematic2File); + SchematicHandler.Schematic schematic3 = SchematicHandler.manager.getSchematic(schem3File); int shift = this.ROAD_WIDTH / 2; int oddshift = (this.ROAD_WIDTH & 1) == 0 ? 0 : 1; int minY = Math.min(PLOT_HEIGHT, ROAD_HEIGHT); @@ -204,7 +202,7 @@ public class HybridPlotWorld extends ClassicPlotWorld { this.PLOT_SCHEMATIC = true; short[] ids = schematic3.getIds(); byte[] datas = schematic3.getDatas(); - Dimension d3 = schematic3.getSchematicDimension(); + SchematicHandler.Dimension d3 = schematic3.getSchematicDimension(); short w3 = (short) d3.getX(); short l3 = (short) d3.getZ(); short h3 = (short) d3.getY(); @@ -285,11 +283,11 @@ public class HybridPlotWorld extends ClassicPlotWorld { short[] ids2 = schematic2.getIds(); byte[] datas2 = schematic2.getDatas(); - Dimension d1 = schematic1.getSchematicDimension(); + SchematicHandler.Dimension d1 = schematic1.getSchematicDimension(); short w1 = (short) d1.getX(); short l1 = (short) d1.getZ(); short h1 = (short) d1.getY(); - Dimension d2 = schematic2.getSchematicDimension(); + SchematicHandler.Dimension d2 = schematic2.getSchematicDimension(); short w2 = (short) d2.getX(); short l2 = (short) d2.getZ(); short h2 = (short) d2.getY(); diff --git a/Core/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java similarity index 95% rename from Core/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java index bbbf81d3d..baa180b68 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java @@ -1,18 +1,18 @@ -package com.intellectualcrafters.plot.generator; +package com.github.intellectualsites.plotsquared.plot.generator; -import com.intellectualcrafters.jnbt.CompoundTag; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.flag.FlagManager; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.ChunkManager; -import com.intellectualcrafters.plot.util.MathMan; -import com.intellectualcrafters.plot.util.SchematicHandler; -import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.block.GlobalBlockQueue; -import com.intellectualcrafters.plot.util.block.LocalBlockQueue; -import com.intellectualcrafters.plot.util.expiry.PlotAnalysis; +import com.github.intellectualsites.plotsquared.jnbt.CompoundTag; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.flag.FlagManager; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; +import com.github.intellectualsites.plotsquared.plot.util.MathMan; +import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.util.expiry.PlotAnalysis; import java.io.File; import java.util.*; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/generator/IndependentPlotGenerator.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/IndependentPlotGenerator.java similarity index 89% rename from Core/src/main/java/com/intellectualcrafters/plot/generator/IndependentPlotGenerator.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/IndependentPlotGenerator.java index 9c63dc0b0..3d9de00f6 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/generator/IndependentPlotGenerator.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/IndependentPlotGenerator.java @@ -1,8 +1,8 @@ -package com.intellectualcrafters.plot.generator; +package com.github.intellectualsites.plotsquared.plot.generator; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.block.ScopedLocalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue; /** * This class allows for implementation independent world generation. diff --git a/Core/src/main/java/com/intellectualcrafters/plot/generator/PlotGenerator.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/PlotGenerator.java similarity index 70% rename from Core/src/main/java/com/intellectualcrafters/plot/generator/PlotGenerator.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/PlotGenerator.java index 0133f8cd6..88c7f2557 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/generator/PlotGenerator.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/PlotGenerator.java @@ -1,9 +1,9 @@ -package com.intellectualcrafters.plot.generator; +package com.github.intellectualsites.plotsquared.plot.generator; -import com.intellectualcrafters.plot.object.PlotArea; -import com.intellectualcrafters.plot.object.PlotId; -import com.intellectualcrafters.plot.object.PlotManager; -import com.intellectualcrafters.plot.object.SetupObject; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; +import com.github.intellectualsites.plotsquared.plot.object.PlotManager; +import com.github.intellectualsites.plotsquared.plot.object.SetupObject; public abstract class PlotGenerator { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/generator/SquarePlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java similarity index 95% rename from Core/src/main/java/com/intellectualcrafters/plot/generator/SquarePlotManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java index 78c100511..ef9e0c834 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/generator/SquarePlotManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java @@ -1,9 +1,9 @@ -package com.intellectualcrafters.plot.generator; +package com.github.intellectualsites.plotsquared.plot.generator; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.ChunkManager; -import com.intellectualcrafters.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import java.util.Arrays; import java.util.HashSet; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/generator/SquarePlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotWorld.java similarity index 76% rename from Core/src/main/java/com/intellectualcrafters/plot/generator/SquarePlotWorld.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotWorld.java index 1a22a784b..20da981f6 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/generator/SquarePlotWorld.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotWorld.java @@ -1,8 +1,8 @@ -package com.intellectualcrafters.plot.generator; +package com.github.intellectualsites.plotsquared.plot.generator; -import com.intellectualcrafters.configuration.ConfigurationSection; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.PlotId; +import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; public abstract class SquarePlotWorld extends GridPlotWorld { diff --git a/Core/src/main/java/com/plotsquared/listener/ExtentWrapper.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ExtentWrapper.java similarity index 79% rename from Core/src/main/java/com/plotsquared/listener/ExtentWrapper.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ExtentWrapper.java index 175f95237..5d0c86858 100644 --- a/Core/src/main/java/com/plotsquared/listener/ExtentWrapper.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ExtentWrapper.java @@ -1,4 +1,4 @@ -package com.plotsquared.listener; +package com.github.intellectualsites.plotsquared.plot.listener; import com.sk89q.worldedit.extent.AbstractDelegateExtent; import com.sk89q.worldedit.extent.Extent; diff --git a/Core/src/main/java/com/plotsquared/listener/PlayerBlockEventType.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlayerBlockEventType.java similarity index 90% rename from Core/src/main/java/com/plotsquared/listener/PlayerBlockEventType.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlayerBlockEventType.java index 84f35edc7..815f5ea43 100644 --- a/Core/src/main/java/com/plotsquared/listener/PlayerBlockEventType.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlayerBlockEventType.java @@ -1,4 +1,4 @@ -package com.plotsquared.listener; +package com.github.intellectualsites.plotsquared.plot.listener; public enum PlayerBlockEventType { // Non interactive diff --git a/Core/src/main/java/com/plotsquared/listener/PlotListener.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java similarity index 95% rename from Core/src/main/java/com/plotsquared/listener/PlotListener.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java index e23c09501..7394dbc0a 100644 --- a/Core/src/main/java/com/plotsquared/listener/PlotListener.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java @@ -1,14 +1,14 @@ -package com.plotsquared.listener; +package com.github.intellectualsites.plotsquared.plot.listener; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.flag.FlagManager; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.*; +import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager; import com.google.common.base.Optional; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.flag.FlagManager; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.*; -import com.intellectualcrafters.plot.util.expiry.ExpireManager; import java.util.HashMap; import java.util.Map; diff --git a/Core/src/main/java/com/plotsquared/listener/ProcessedWEExtent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java similarity index 96% rename from Core/src/main/java/com/plotsquared/listener/ProcessedWEExtent.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java index 063b8da15..2adf0901a 100644 --- a/Core/src/main/java/com/plotsquared/listener/ProcessedWEExtent.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java @@ -1,9 +1,9 @@ -package com.plotsquared.listener; +package com.github.intellectualsites.plotsquared.plot.listener; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.object.RegionWrapper; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper; import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector2D; import com.sk89q.worldedit.WorldEditException; diff --git a/Core/src/main/java/com/plotsquared/listener/WEExtent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java similarity index 92% rename from Core/src/main/java/com/plotsquared/listener/WEExtent.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java index 95d886a5e..75e831cf4 100644 --- a/Core/src/main/java/com/plotsquared/listener/WEExtent.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java @@ -1,6 +1,6 @@ -package com.plotsquared.listener; +package com.github.intellectualsites.plotsquared.plot.listener; -import com.intellectualcrafters.plot.object.RegionWrapper; +import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper; import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector2D; import com.sk89q.worldedit.WorldEditException; diff --git a/Core/src/main/java/com/plotsquared/listener/WEManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEManager.java similarity index 89% rename from Core/src/main/java/com/plotsquared/listener/WEManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEManager.java index 13023897d..7612fe379 100644 --- a/Core/src/main/java/com/plotsquared/listener/WEManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEManager.java @@ -1,9 +1,9 @@ -package com.plotsquared.listener; +package com.github.intellectualsites.plotsquared.plot.listener; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.object.*; import com.sk89q.worldedit.blocks.BaseBlock; import java.util.HashSet; diff --git a/Core/src/main/java/com/plotsquared/listener/WESubscriber.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WESubscriber.java similarity index 75% rename from Core/src/main/java/com/plotsquared/listener/WESubscriber.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WESubscriber.java index b92a161aa..adb58fef1 100644 --- a/Core/src/main/java/com/plotsquared/listener/WESubscriber.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WESubscriber.java @@ -1,13 +1,13 @@ -package com.plotsquared.listener; +package com.github.intellectualsites.plotsquared.plot.listener; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.RegionWrapper; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.Permissions; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.Permissions; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.entity.Player; import com.sk89q.worldedit.event.extent.EditSessionEvent; @@ -38,8 +38,8 @@ public class WESubscriber { if (pp == null) { Player player = (Player) actor; Location loc = player.getLocation(); - com.intellectualcrafters.plot.object.Location pLoc = - new com.intellectualcrafters.plot.object.Location(player.getWorld().getName(), + com.github.intellectualsites.plotsquared.plot.object.Location pLoc = + new com.github.intellectualsites.plotsquared.plot.object.Location(player.getWorld().getName(), loc.getBlockX(), loc.getBlockX(), loc.getBlockZ()); Plot plot = pLoc.getPlot(); if (plot == null) { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/logger/DelegateLogger.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/DelegateLogger.java similarity index 83% rename from Core/src/main/java/com/intellectualcrafters/plot/logger/DelegateLogger.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/DelegateLogger.java index bd1360dcd..ed925a135 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/logger/DelegateLogger.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/DelegateLogger.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.logger; +package com.github.intellectualsites.plotsquared.plot.logger; public class DelegateLogger implements ILogger { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/ILogger.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/ILogger.java new file mode 100644 index 000000000..16fb343bf --- /dev/null +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/ILogger.java @@ -0,0 +1,5 @@ +package com.github.intellectualsites.plotsquared.plot.logger; + +public interface ILogger { + void log(String message); +} diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/BO3.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BO3.java similarity index 89% rename from Core/src/main/java/com/intellectualcrafters/plot/object/BO3.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BO3.java index 7cb5c64bf..8423ef5c6 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/BO3.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BO3.java @@ -1,8 +1,8 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import java.io.File; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/BlockLoc.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockLoc.java similarity index 96% rename from Core/src/main/java/com/intellectualcrafters/plot/object/BlockLoc.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockLoc.java index 3489e5369..d170054a8 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/BlockLoc.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockLoc.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; public class BlockLoc { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/ChunkLoc.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkLoc.java similarity index 91% rename from Core/src/main/java/com/intellectualcrafters/plot/object/ChunkLoc.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkLoc.java index de7b6c57e..2035a8811 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/ChunkLoc.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkLoc.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; public class ChunkLoc { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/ChunkWrapper.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkWrapper.java similarity index 82% rename from Core/src/main/java/com/intellectualcrafters/plot/object/ChunkWrapper.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkWrapper.java index 2d119e6f6..e665ea752 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/ChunkWrapper.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkWrapper.java @@ -1,7 +1,7 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; -import com.intellectualcrafters.plot.util.MathMan; -import com.intellectualcrafters.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.plot.util.MathMan; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; public class ChunkWrapper { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/CmdInstance.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/CmdInstance.java similarity index 79% rename from Core/src/main/java/com/intellectualcrafters/plot/object/CmdInstance.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/CmdInstance.java index fda5ff6a0..27cb55216 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/CmdInstance.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/CmdInstance.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; public class CmdInstance { public final Runnable command; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/ConsolePlayer.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ConsolePlayer.java similarity index 87% rename from Core/src/main/java/com/intellectualcrafters/plot/object/ConsolePlayer.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ConsolePlayer.java index e0b7999e3..ed400f448 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/ConsolePlayer.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ConsolePlayer.java @@ -1,10 +1,10 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.commands.RequiredType; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.util.PlotGameMode; -import com.intellectualcrafters.plot.util.PlotWeather; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.commands.RequiredType; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.util.PlotGameMode; +import com.github.intellectualsites.plotsquared.plot.util.PlotWeather; import java.util.UUID; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/Expression.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java similarity index 85% rename from Core/src/main/java/com/intellectualcrafters/plot/object/Expression.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java index 2b8d84819..59c4e921d 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/Expression.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java @@ -1,8 +1,8 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.commands.DebugExec; -import com.intellectualcrafters.plot.commands.MainCommand; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.commands.DebugExec; +import com.github.intellectualsites.plotsquared.plot.commands.MainCommand; import javax.script.ScriptException; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/FileBytes.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/FileBytes.java similarity index 76% rename from Core/src/main/java/com/intellectualcrafters/plot/object/FileBytes.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/FileBytes.java index 97b1ad0d8..d34521ee9 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/FileBytes.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/FileBytes.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; public class FileBytes { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/LazyBlock.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyBlock.java similarity index 70% rename from Core/src/main/java/com/intellectualcrafters/plot/object/LazyBlock.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyBlock.java index 392e6c1dd..df61401aa 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/LazyBlock.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyBlock.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; public abstract class LazyBlock { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/LazyResult.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyResult.java similarity index 83% rename from Core/src/main/java/com/intellectualcrafters/plot/object/LazyResult.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyResult.java index 7507f9c4f..8487c44be 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/LazyResult.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyResult.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; public abstract class LazyResult { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/Location.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Location.java similarity index 96% rename from Core/src/main/java/com/intellectualcrafters/plot/object/Location.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Location.java index 4847a801d..2b923a55d 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/Location.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Location.java @@ -1,7 +1,7 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.util.MathMan; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.util.MathMan; public class Location implements Cloneable, Comparable { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/OfflinePlotPlayer.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/OfflinePlotPlayer.java similarity index 90% rename from Core/src/main/java/com/intellectualcrafters/plot/object/OfflinePlotPlayer.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/OfflinePlotPlayer.java index e423c12ab..709a7cee6 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/OfflinePlotPlayer.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/OfflinePlotPlayer.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; import java.util.UUID; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java similarity index 98% rename from Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java index 3244c94e4..b259737bf 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java @@ -1,24 +1,24 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; +import com.github.intellectualsites.plotsquared.jnbt.CompoundTag; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Configuration; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.flag.FlagManager; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.generator.SquarePlotWorld; +import com.github.intellectualsites.plotsquared.plot.listener.PlotListener; +import com.github.intellectualsites.plotsquared.plot.util.*; +import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager; +import com.github.intellectualsites.plotsquared.plot.util.expiry.PlotAnalysis; import com.google.common.base.Optional; import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableSet; -import com.intellectualcrafters.jnbt.CompoundTag; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Configuration; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.flag.FlagManager; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.generator.SquarePlotWorld; -import com.intellectualcrafters.plot.util.*; -import com.intellectualcrafters.plot.util.block.GlobalBlockQueue; -import com.intellectualcrafters.plot.util.block.LocalBlockQueue; -import com.intellectualcrafters.plot.util.expiry.ExpireManager; -import com.intellectualcrafters.plot.util.expiry.PlotAnalysis; -import com.plotsquared.listener.PlotListener; import java.awt.geom.Area; import java.awt.geom.PathIterator; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java similarity index 96% rename from Core/src/main/java/com/intellectualcrafters/plot/object/PlotArea.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java index 5d07a4649..b861d0e3c 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotArea.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java @@ -1,19 +1,19 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; -import com.intellectualcrafters.configuration.ConfigurationSection; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.Configuration; -import com.intellectualcrafters.plot.config.ConfigurationNode; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.flag.FlagManager; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.generator.GridPlotWorld; -import com.intellectualcrafters.plot.generator.IndependentPlotGenerator; -import com.intellectualcrafters.plot.util.*; -import com.intellectualcrafters.plot.util.area.QuadMap; -import com.intellectualcrafters.plot.util.block.GlobalBlockQueue; -import com.intellectualcrafters.plot.util.block.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.Configuration; +import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.flag.FlagManager; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.generator.GridPlotWorld; +import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator; +import com.github.intellectualsites.plotsquared.plot.util.*; +import com.github.intellectualsites.plotsquared.plot.util.area.QuadMap; +import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; import javax.annotation.Nullable; import java.util.*; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotBlock.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotBlock.java similarity index 91% rename from Core/src/main/java/com/intellectualcrafters/plot/object/PlotBlock.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotBlock.java index b1c3c0022..ca4ef4ca6 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotBlock.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotBlock.java @@ -1,68 +1,68 @@ -package com.intellectualcrafters.plot.object; - -import com.intellectualcrafters.plot.config.Settings; - -public class PlotBlock { - - public static final PlotBlock EVERYTHING = new PlotBlock((short) 0, (byte) 0); - private static final PlotBlock[] CACHE = new PlotBlock[65535]; - - static { - for (int i = 0; i < 65535; i++) { - short id = (short) (i >> 4); - byte data = (byte) (i & 15); - CACHE[i] = new PlotBlock(id, data); - } - } - - public final short id; - public final byte data; - - public PlotBlock(short id, byte data) { - this.id = id; - this.data = data; - } - - public static PlotBlock get(char combinedId) { - switch (combinedId) { - case 0: - return null; - case 1: - return get(0, 0); - default: - return get(combinedId >> 4, combinedId & 15); - } - } - - public static PlotBlock get(int id, int data) { - return Settings.Enabled_Components.BLOCK_CACHE && data > 0 ? - CACHE[(id << 4) + data] : - new PlotBlock((short) id, (byte) data); - } - - @Override public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - PlotBlock other = (PlotBlock) obj; - return (this.id == other.id) && ((this.data == other.data) || (this.data == -1) || ( - other.data == -1)); - } - - @Override public int hashCode() { - return this.id; - } - - @Override public String toString() { - if (this.data == -1) { - return this.id + ""; - } - return this.id + ":" + this.data; - } -} +package com.github.intellectualsites.plotsquared.plot.object; + +import com.github.intellectualsites.plotsquared.plot.config.Settings; + +public class PlotBlock { + + public static final PlotBlock EVERYTHING = new PlotBlock((short) 0, (byte) 0); + private static final PlotBlock[] CACHE = new PlotBlock[65535]; + + static { + for (int i = 0; i < 65535; i++) { + short id = (short) (i >> 4); + byte data = (byte) (i & 15); + CACHE[i] = new PlotBlock(id, data); + } + } + + public final short id; + public final byte data; + + public PlotBlock(short id, byte data) { + this.id = id; + this.data = data; + } + + public static PlotBlock get(char combinedId) { + switch (combinedId) { + case 0: + return null; + case 1: + return get(0, 0); + default: + return get(combinedId >> 4, combinedId & 15); + } + } + + public static PlotBlock get(int id, int data) { + return Settings.Enabled_Components.BLOCK_CACHE && data > 0 ? + CACHE[(id << 4) + data] : + new PlotBlock((short) id, (byte) data); + } + + @Override public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + PlotBlock other = (PlotBlock) obj; + return (this.id == other.id) && ((this.data == other.data) || (this.data == -1) || ( + other.data == -1)); + } + + @Override public int hashCode() { + return this.id; + } + + @Override public String toString() { + if (this.data == -1) { + return this.id + ""; + } + return this.id + ":" + this.data; + } +} diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotCluster.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java similarity index 96% rename from Core/src/main/java/com/intellectualcrafters/plot/object/PlotCluster.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java index d4127eb25..12566b1b6 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotCluster.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java @@ -1,7 +1,7 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; import java.util.HashSet; import java.util.UUID; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotFilter.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotFilter.java similarity index 75% rename from Core/src/main/java/com/intellectualcrafters/plot/object/PlotFilter.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotFilter.java index c6b8d3c32..09759c09d 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotFilter.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotFilter.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; public abstract class PlotFilter { public boolean allowsArea(final PlotArea area) { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotHandler.java similarity index 87% rename from Core/src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotHandler.java index b3c945fda..4faa17b76 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotHandler.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; import java.util.Set; import java.util.UUID; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotId.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java similarity index 98% rename from Core/src/main/java/com/intellectualcrafters/plot/object/PlotId.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java index 88b02d542..113495512 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotId.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; import javax.annotation.Nullable; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotInventory.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotInventory.java similarity index 93% rename from Core/src/main/java/com/intellectualcrafters/plot/object/PlotInventory.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotInventory.java index a2bc9760b..630e36ce7 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotInventory.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotInventory.java @@ -1,6 +1,6 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; -import com.intellectualcrafters.plot.util.InventoryUtil; +import com.github.intellectualsites.plotsquared.plot.util.InventoryUtil; public class PlotInventory { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotItemStack.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotItemStack.java similarity index 80% rename from Core/src/main/java/com/intellectualcrafters/plot/object/PlotItemStack.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotItemStack.java index eb46a92be..e62b1cfee 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotItemStack.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotItemStack.java @@ -1,7 +1,7 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; -import com.intellectualcrafters.plot.util.StringComparison; -import com.intellectualcrafters.plot.util.WorldUtil; +import com.github.intellectualsites.plotsquared.plot.util.StringComparison; +import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; public class PlotItemStack { public final int id; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotLoc.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java similarity index 91% rename from Core/src/main/java/com/intellectualcrafters/plot/object/PlotLoc.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java index 4df971da5..7c7d6c30d 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotLoc.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java @@ -1,6 +1,6 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; -import com.intellectualcrafters.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; public class PlotLoc { public int x; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java similarity index 93% rename from Core/src/main/java/com/intellectualcrafters/plot/object/PlotManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java index 40c858fa0..b6c887bdf 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java @@ -1,7 +1,7 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; -import com.intellectualcrafters.plot.commands.Template; -import com.intellectualcrafters.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.commands.Template; +import com.github.intellectualsites.plotsquared.plot.config.Settings; import java.io.IOException; import java.util.ArrayList; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotMessage.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotMessage.java similarity index 82% rename from Core/src/main/java/com/intellectualcrafters/plot/object/PlotMessage.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotMessage.java index ad0b2eb93..3cc2318f7 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotMessage.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotMessage.java @@ -1,9 +1,9 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.chat.PlainChatManager; -import com.intellectualcrafters.plot.util.ChatManager; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.chat.PlainChatManager; +import com.github.intellectualsites.plotsquared.plot.util.ChatManager; public class PlotMessage { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotPlayer.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java similarity index 95% rename from Core/src/main/java/com/intellectualcrafters/plot/object/PlotPlayer.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java index a60e93e44..a31a5de14 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotPlayer.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java @@ -1,17 +1,17 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.commands.RequiredType; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.object.worlds.PlotAreaManager; -import com.intellectualcrafters.plot.object.worlds.SinglePlotArea; -import com.intellectualcrafters.plot.object.worlds.SinglePlotAreaManager; -import com.intellectualcrafters.plot.util.*; -import com.intellectualcrafters.plot.util.expiry.ExpireManager; -import com.plotsquared.general.commands.CommandCaller; +import com.github.intellectualsites.plotsquared.commands.CommandCaller; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.commands.RequiredType; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; +import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea; +import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; +import com.github.intellectualsites.plotsquared.plot.util.*; +import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager; import java.nio.ByteBuffer; import java.util.*; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotSettings.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java similarity index 94% rename from Core/src/main/java/com/intellectualcrafters/plot/object/PlotSettings.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java index 4efbe724b..2eadd85ff 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotSettings.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java @@ -1,9 +1,9 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment; import com.google.common.base.Optional; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.object.comment.PlotComment; import java.util.*; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/PseudoRandom.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PseudoRandom.java similarity index 89% rename from Core/src/main/java/com/intellectualcrafters/plot/object/PseudoRandom.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PseudoRandom.java index d09dd7abf..490f8c926 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/PseudoRandom.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PseudoRandom.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; public class PseudoRandom { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/Rating.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Rating.java similarity index 94% rename from Core/src/main/java/com/intellectualcrafters/plot/object/Rating.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Rating.java index e91cb037e..874b6155c 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/Rating.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Rating.java @@ -1,6 +1,6 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; -import com.intellectualcrafters.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.config.Settings; import java.util.ArrayList; import java.util.HashMap; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/RegionWrapper.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RegionWrapper.java similarity index 97% rename from Core/src/main/java/com/intellectualcrafters/plot/object/RegionWrapper.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RegionWrapper.java index a8cce630e..ced127a22 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/RegionWrapper.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RegionWrapper.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; public class RegionWrapper { public final int minX; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/RunnableVal.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal.java similarity index 82% rename from Core/src/main/java/com/intellectualcrafters/plot/object/RunnableVal.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal.java index 46e124f80..90074a63a 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/RunnableVal.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; public abstract class RunnableVal implements Runnable { public T value; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/RunnableVal2.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal2.java similarity index 86% rename from Core/src/main/java/com/intellectualcrafters/plot/object/RunnableVal2.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal2.java index 13a2ae289..ee46a417f 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/RunnableVal2.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal2.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; public abstract class RunnableVal2 implements Runnable { public T value1; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/RunnableVal3.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal3.java similarity index 88% rename from Core/src/main/java/com/intellectualcrafters/plot/object/RunnableVal3.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal3.java index 1c89c2403..cb6b2a8be 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/RunnableVal3.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal3.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; public abstract class RunnableVal3 implements Runnable { public T value1; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/SetupObject.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/SetupObject.java similarity index 83% rename from Core/src/main/java/com/intellectualcrafters/plot/object/SetupObject.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/SetupObject.java index d324a903e..e203fa870 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/SetupObject.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/SetupObject.java @@ -1,7 +1,7 @@ -package com.intellectualcrafters.plot.object; +package com.github.intellectualsites.plotsquared.plot.object; -import com.intellectualcrafters.plot.config.ConfigurationNode; -import com.intellectualcrafters.plot.util.SetupUtils; +import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; +import com.github.intellectualsites.plotsquared.plot.util.SetupUtils; public class SetupObject { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/StringWrapper.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringWrapper.java similarity index 92% rename from Core/src/main/java/com/intellectualcrafters/plot/object/StringWrapper.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringWrapper.java index 7f7344c3d..e3f0031ba 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/StringWrapper.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringWrapper.java @@ -1,72 +1,72 @@ -package com.intellectualcrafters.plot.object; - -/** - - */ -public class StringWrapper { - - public final String value; - private int hash; - - /** - * Constructor - * - * @param value to wrap - */ - public StringWrapper(String value) { - this.value = value; - } - - /** - * Check if a wrapped string equals another one - * - * @param obj to compare - * @return true if obj equals the stored value - */ - @Override public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - if (obj.getClass() == String.class) { - return obj.toString().equalsIgnoreCase(this.value); - } - return false; - } - if (obj.hashCode() != hashCode()) { - return false; - } - StringWrapper other = (StringWrapper) obj; - if ((other.value == null) || (this.value == null)) { - return false; - } - return other.value.equalsIgnoreCase(this.value); - } - - /** - * Get the string value. - * - * @return string value - */ - @Override public String toString() { - return this.value; - } - - /** - * Get the hash value. - * - * @return has value - */ - @Override public int hashCode() { - if (this.value == null) { - return 0; - } - if (this.hash == 0) { - this.hash = this.value.toLowerCase().hashCode(); - } - return this.hash; - } -} +package com.github.intellectualsites.plotsquared.plot.object; + +/** + + */ +public class StringWrapper { + + public final String value; + private int hash; + + /** + * Constructor + * + * @param value to wrap + */ + public StringWrapper(String value) { + this.value = value; + } + + /** + * Check if a wrapped string equals another one + * + * @param obj to compare + * @return true if obj equals the stored value + */ + @Override public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + if (obj.getClass() == String.class) { + return obj.toString().equalsIgnoreCase(this.value); + } + return false; + } + if (obj.hashCode() != hashCode()) { + return false; + } + StringWrapper other = (StringWrapper) obj; + if ((other.value == null) || (this.value == null)) { + return false; + } + return other.value.equalsIgnoreCase(this.value); + } + + /** + * Get the string value. + * + * @return string value + */ + @Override public String toString() { + return this.value; + } + + /** + * Get the hash value. + * + * @return has value + */ + @Override public int hashCode() { + if (this.value == null) { + return 0; + } + if (this.hash == 0) { + this.hash = this.value.toLowerCase().hashCode(); + } + return this.hash; + } +} diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/chat/PlainChatManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/chat/PlainChatManager.java similarity index 75% rename from Core/src/main/java/com/intellectualcrafters/plot/object/chat/PlainChatManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/chat/PlainChatManager.java index 004a5e176..0972a4449 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/chat/PlainChatManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/chat/PlainChatManager.java @@ -1,9 +1,9 @@ -package com.intellectualcrafters.plot.object.chat; +package com.github.intellectualsites.plotsquared.plot.object.chat; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.PlotMessage; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.ChatManager; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.PlotMessage; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.ChatManager; import java.util.ArrayList; import java.util.List; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/comment/CommentInbox.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/CommentInbox.java similarity index 82% rename from Core/src/main/java/com/intellectualcrafters/plot/object/comment/CommentInbox.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/CommentInbox.java index 44ad78bcf..30d9b1230 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/comment/CommentInbox.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/CommentInbox.java @@ -1,10 +1,10 @@ -package com.intellectualcrafters.plot.object.comment; +package com.github.intellectualsites.plotsquared.plot.object.comment; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.RunnableVal; -import com.intellectualcrafters.plot.util.Permissions; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.util.Permissions; import java.util.List; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/comment/InboxOwner.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxOwner.java similarity index 80% rename from Core/src/main/java/com/intellectualcrafters/plot/object/comment/InboxOwner.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxOwner.java index a7e758132..d15f194ba 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/comment/InboxOwner.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxOwner.java @@ -1,10 +1,10 @@ -package com.intellectualcrafters.plot.object.comment; +package com.github.intellectualsites.plotsquared.plot.object.comment; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import com.google.common.base.Optional; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.RunnableVal; -import com.intellectualcrafters.plot.util.TaskManager; import java.util.ArrayList; import java.util.List; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/comment/InboxPublic.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxPublic.java similarity index 78% rename from Core/src/main/java/com/intellectualcrafters/plot/object/comment/InboxPublic.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxPublic.java index 0ece50fe0..2d94026f4 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/comment/InboxPublic.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxPublic.java @@ -1,10 +1,10 @@ -package com.intellectualcrafters.plot.object.comment; +package com.github.intellectualsites.plotsquared.plot.object.comment; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import com.google.common.base.Optional; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.RunnableVal; -import com.intellectualcrafters.plot.util.TaskManager; import java.util.ArrayList; import java.util.List; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/comment/InboxReport.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxReport.java similarity index 68% rename from Core/src/main/java/com/intellectualcrafters/plot/object/comment/InboxReport.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxReport.java index 2a6f9a4ad..7c626d8e1 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/comment/InboxReport.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxReport.java @@ -1,9 +1,9 @@ -package com.intellectualcrafters.plot.object.comment; +package com.github.intellectualsites.plotsquared.plot.object.comment; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.RunnableVal; -import com.intellectualcrafters.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import java.util.List; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/comment/PlotComment.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/PlotComment.java similarity index 79% rename from Core/src/main/java/com/intellectualcrafters/plot/object/comment/PlotComment.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/PlotComment.java index 67a090ac2..ada90457f 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/comment/PlotComment.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/PlotComment.java @@ -1,22 +1,22 @@ -package com.intellectualcrafters.plot.object.comment; - -import com.intellectualcrafters.plot.object.PlotId; - -public class PlotComment { - public final String comment; - public final String inbox; - public final String senderName; - public final PlotId id; - public final String world; - public final long timestamp; - - public PlotComment(String world, PlotId id, String comment, String senderName, String inbox, - long timestamp) { - this.world = world; - this.id = id; - this.comment = comment; - this.senderName = senderName; - this.inbox = inbox; - this.timestamp = timestamp; - } -} +package com.github.intellectualsites.plotsquared.plot.object.comment; + +import com.github.intellectualsites.plotsquared.plot.object.PlotId; + +public class PlotComment { + public final String comment; + public final String inbox; + public final String senderName; + public final PlotId id; + public final String world; + public final long timestamp; + + public PlotComment(String world, PlotId id, String comment, String senderName, String inbox, + long timestamp) { + this.world = world; + this.id = id; + this.comment = comment; + this.senderName = senderName; + this.inbox = inbox; + this.timestamp = timestamp; + } +} diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/schematic/ItemType.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/ItemType.java similarity index 99% rename from Core/src/main/java/com/intellectualcrafters/plot/object/schematic/ItemType.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/ItemType.java index b8dd2161f..f558b5243 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/schematic/ItemType.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/ItemType.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.object.schematic; +package com.github.intellectualsites.plotsquared.plot.object.schematic; import java.util.EnumSet; import java.util.HashMap; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/schematic/PlotItem.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/PlotItem.java similarity index 85% rename from Core/src/main/java/com/intellectualcrafters/plot/object/schematic/PlotItem.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/PlotItem.java index 0e4f2b4ee..e943ab71f 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/schematic/PlotItem.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/PlotItem.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.object.schematic; +package com.github.intellectualsites.plotsquared.plot.object.schematic; public class PlotItem { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/stream/AbstractDelegateOutputStream.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/stream/AbstractDelegateOutputStream.java similarity index 91% rename from Core/src/main/java/com/intellectualcrafters/plot/object/stream/AbstractDelegateOutputStream.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/stream/AbstractDelegateOutputStream.java index bbc3ff04a..994f6a465 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/stream/AbstractDelegateOutputStream.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/stream/AbstractDelegateOutputStream.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.object.stream; +package com.github.intellectualsites.plotsquared.plot.object.stream; import java.io.IOException; import java.io.OutputStream; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/worlds/DefaultPlotAreaManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java similarity index 95% rename from Core/src/main/java/com/intellectualcrafters/plot/object/worlds/DefaultPlotAreaManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java index 678b7a577..989948f0c 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/worlds/DefaultPlotAreaManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java @@ -1,10 +1,10 @@ -package com.intellectualcrafters.plot.object.worlds; +package com.github.intellectualsites.plotsquared.plot.object.worlds; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.PlotArea; -import com.intellectualcrafters.plot.object.RegionWrapper; -import com.intellectualcrafters.plot.util.StringMan; -import com.intellectualcrafters.plot.util.area.QuadMap; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.plot.util.area.QuadMap; import java.util.*; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/worlds/PlotAreaManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/PlotAreaManager.java similarity index 66% rename from Core/src/main/java/com/intellectualcrafters/plot/object/worlds/PlotAreaManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/PlotAreaManager.java index b79294c71..aef7f53a8 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/worlds/PlotAreaManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/PlotAreaManager.java @@ -1,8 +1,8 @@ -package com.intellectualcrafters.plot.object.worlds; +package com.github.intellectualsites.plotsquared.plot.object.worlds; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.PlotArea; -import com.intellectualcrafters.plot.object.RegionWrapper; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper; public interface PlotAreaManager { public PlotArea getApplicablePlotArea(Location location); diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/worlds/SinglePlot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java similarity index 87% rename from Core/src/main/java/com/intellectualcrafters/plot/object/worlds/SinglePlot.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java index f01ad6336..5e153c02e 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/worlds/SinglePlot.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java @@ -1,8 +1,8 @@ -package com.intellectualcrafters.plot.object.worlds; +package com.github.intellectualsites.plotsquared.plot.object.worlds; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.object.*; import java.util.Collection; import java.util.HashSet; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/worlds/SinglePlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java similarity index 86% rename from Core/src/main/java/com/intellectualcrafters/plot/object/worlds/SinglePlotArea.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java index 97e3a6aaf..e36f1e07d 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/worlds/SinglePlotArea.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java @@ -1,13 +1,13 @@ -package com.intellectualcrafters.plot.object.worlds; +package com.github.intellectualsites.plotsquared.plot.object.worlds; -import com.intellectualcrafters.configuration.ConfigurationSection; -import com.intellectualcrafters.plot.config.Configuration; -import com.intellectualcrafters.plot.config.ConfigurationNode; -import com.intellectualcrafters.plot.generator.GridPlotWorld; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.SetupUtils; -import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.WorldUtil; +import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; +import com.github.intellectualsites.plotsquared.plot.config.Configuration; +import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; +import com.github.intellectualsites.plotsquared.plot.generator.GridPlotWorld; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.SetupUtils; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; public class SinglePlotArea extends GridPlotWorld { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/worlds/SinglePlotAreaManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java similarity index 90% rename from Core/src/main/java/com/intellectualcrafters/plot/object/worlds/SinglePlotAreaManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java index ac9dd7976..adc462f4e 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/worlds/SinglePlotAreaManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java @@ -1,10 +1,10 @@ -package com.intellectualcrafters.plot.object.worlds; +package com.github.intellectualsites.plotsquared.plot.object.worlds; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.PlotArea; -import com.intellectualcrafters.plot.object.RegionWrapper; -import com.intellectualcrafters.plot.util.ArrayUtil; -import com.intellectualcrafters.plot.util.SetupUtils; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper; +import com.github.intellectualsites.plotsquared.plot.util.ArrayUtil; +import com.github.intellectualsites.plotsquared.plot.util.SetupUtils; public class SinglePlotAreaManager extends DefaultPlotAreaManager { private final SinglePlotArea[] array; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/worlds/SinglePlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java similarity index 88% rename from Core/src/main/java/com/intellectualcrafters/plot/object/worlds/SinglePlotManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java index 018b6c6de..0f32e6006 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/worlds/SinglePlotManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java @@ -1,10 +1,10 @@ -package com.intellectualcrafters.plot.object.worlds; +package com.github.intellectualsites.plotsquared.plot.object.worlds; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.SetupUtils; -import com.intellectualcrafters.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.SetupUtils; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import java.io.File; import java.util.ArrayList; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/worlds/SingleWorldGenerator.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SingleWorldGenerator.java similarity index 80% rename from Core/src/main/java/com/intellectualcrafters/plot/object/worlds/SingleWorldGenerator.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SingleWorldGenerator.java index 6667c7d34..067c3c5af 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/worlds/SingleWorldGenerator.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SingleWorldGenerator.java @@ -1,9 +1,9 @@ -package com.intellectualcrafters.plot.object.worlds; +package com.github.intellectualsites.plotsquared.plot.object.worlds; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.generator.IndependentPlotGenerator; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.block.ScopedLocalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue; public class SingleWorldGenerator extends IndependentPlotGenerator { private Location bedrock1 = new Location(null, 0, 0, 0); diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/AbstractTitle.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/AbstractTitle.java similarity index 71% rename from Core/src/main/java/com/intellectualcrafters/plot/util/AbstractTitle.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/AbstractTitle.java index 9f18849c7..a5f75c96a 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/AbstractTitle.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/AbstractTitle.java @@ -1,7 +1,7 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; -import com.intellectualcrafters.plot.object.ConsolePlayer; -import com.intellectualcrafters.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.ConsolePlayer; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; public abstract class AbstractTitle { public static AbstractTitle TITLE_CLASS; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/ArrayUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ArrayUtil.java similarity index 89% rename from Core/src/main/java/com/intellectualcrafters/plot/util/ArrayUtil.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ArrayUtil.java index 35f010a3e..6052c2a93 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/ArrayUtil.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ArrayUtil.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; import java.util.Arrays; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/BO3Handler.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/BO3Handler.java similarity index 96% rename from Core/src/main/java/com/intellectualcrafters/plot/util/BO3Handler.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/BO3Handler.java index 47f14b2e5..e12f01211 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/BO3Handler.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/BO3Handler.java @@ -1,10 +1,10 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.flag.FlagManager; -import com.intellectualcrafters.plot.generator.ClassicPlotWorld; -import com.intellectualcrafters.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.flag.FlagManager; +import com.github.intellectualsites.plotsquared.plot.generator.ClassicPlotWorld; +import com.github.intellectualsites.plotsquared.plot.object.*; import java.io.*; import java.net.URL; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/ByteArrayUtilities.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ByteArrayUtilities.java similarity index 92% rename from Core/src/main/java/com/intellectualcrafters/plot/util/ByteArrayUtilities.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ByteArrayUtilities.java index f12701855..ace8bb7e4 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/ByteArrayUtilities.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ByteArrayUtilities.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; public class ByteArrayUtilities { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/ChatManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChatManager.java similarity index 73% rename from Core/src/main/java/com/intellectualcrafters/plot/util/ChatManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChatManager.java index 90dd98e13..1177206e6 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/ChatManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChatManager.java @@ -1,7 +1,7 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; -import com.intellectualcrafters.plot.object.PlotMessage; -import com.intellectualcrafters.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.PlotMessage; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; public abstract class ChatManager { public static ChatManager manager; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/ChunkManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java similarity index 96% rename from Core/src/main/java/com/intellectualcrafters/plot/util/ChunkManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java index b5eda0d44..f75965535 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/ChunkManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java @@ -1,10 +1,10 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.block.GlobalBlockQueue; -import com.intellectualcrafters.plot.util.block.LocalBlockQueue; -import com.intellectualcrafters.plot.util.block.ScopedLocalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue; import java.io.File; import java.util.ArrayList; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/CmdConfirm.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java similarity index 73% rename from Core/src/main/java/com/intellectualcrafters/plot/util/CmdConfirm.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java index 90b54e90f..11c157320 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/CmdConfirm.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java @@ -1,8 +1,8 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.CmdInstance; -import com.intellectualcrafters.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.CmdInstance; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; public class CmdConfirm { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/CommentManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java similarity index 83% rename from Core/src/main/java/com/intellectualcrafters/plot/util/CommentManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java index 707a1187a..3dc43fe06 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/CommentManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java @@ -1,11 +1,11 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.RunnableVal; -import com.intellectualcrafters.plot.object.comment.*; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.object.comment.*; import java.util.Collection; import java.util.HashMap; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/ConsoleColors.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ConsoleColors.java similarity index 98% rename from Core/src/main/java/com/intellectualcrafters/plot/util/ConsoleColors.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ConsoleColors.java index 9723f081c..5e9c87a7a 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/ConsoleColors.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ConsoleColors.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; public class ConsoleColors { public static String fromString(String input) { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/EconHandler.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EconHandler.java similarity index 74% rename from Core/src/main/java/com/intellectualcrafters/plot/util/EconHandler.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EconHandler.java index f1979eeaf..9361b8591 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/EconHandler.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EconHandler.java @@ -1,9 +1,9 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.ConsolePlayer; -import com.intellectualcrafters.plot.object.OfflinePlotPlayer; -import com.intellectualcrafters.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.object.ConsolePlayer; +import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; public abstract class EconHandler { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java similarity index 97% rename from Core/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java index feb363cbd..85d6eabbf 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java @@ -1,14 +1,14 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.listener.PlayerBlockEventType; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager; import com.google.common.base.Optional; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.expiry.ExpireManager; -import com.plotsquared.listener.PlayerBlockEventType; import java.util.ArrayList; import java.util.HashSet; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/HastebinUtility.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HastebinUtility.java similarity index 97% rename from Core/src/main/java/com/intellectualcrafters/plot/util/HastebinUtility.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HastebinUtility.java index 8220bcb2a..d2495b646 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/HastebinUtility.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HastebinUtility.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; import java.io.*; import java.net.HttpURLConnection; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/HttpUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HttpUtil.java similarity index 85% rename from Core/src/main/java/com/intellectualcrafters/plot/util/HttpUtil.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HttpUtil.java index 0c5745ff8..761c5aa0a 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/HttpUtil.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HttpUtil.java @@ -1,6 +1,6 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; -import com.intellectualcrafters.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.config.Settings; import java.io.BufferedReader; import java.io.IOException; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/InventoryUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/InventoryUtil.java similarity index 70% rename from Core/src/main/java/com/intellectualcrafters/plot/util/InventoryUtil.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/InventoryUtil.java index 58eca8995..03b87fc2b 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/InventoryUtil.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/InventoryUtil.java @@ -1,8 +1,8 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; -import com.intellectualcrafters.plot.object.PlotInventory; -import com.intellectualcrafters.plot.object.PlotItemStack; -import com.intellectualcrafters.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.PlotInventory; +import com.github.intellectualsites.plotsquared.plot.object.PlotItemStack; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; /** * This class is only used by internal functions, for most cases use the PlotInventory class diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java similarity index 97% rename from Core/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java index 360d35c75..4eea4e801 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java @@ -1,16 +1,16 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.flag.FlagManager; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.object.stream.AbstractDelegateOutputStream; +import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager; import com.google.common.base.Optional; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.flag.FlagManager; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.object.stream.AbstractDelegateOutputStream; -import com.intellectualcrafters.plot.util.expiry.ExpireManager; import java.io.*; import java.net.HttpURLConnection; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/MathMan.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MathMan.java similarity index 99% rename from Core/src/main/java/com/intellectualcrafters/plot/util/MathMan.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MathMan.java index bd94ed431..2e65e9305 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/MathMan.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MathMan.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; public class MathMan { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/Permissions.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/Permissions.java similarity index 92% rename from Core/src/main/java/com/intellectualcrafters/plot/util/Permissions.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/Permissions.java index 1f7e72484..bcd71b186 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/Permissions.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/Permissions.java @@ -1,9 +1,9 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.plotsquared.general.commands.CommandCaller; +import com.github.intellectualsites.plotsquared.commands.CommandCaller; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import java.util.HashMap; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/PlotGameMode.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PlotGameMode.java similarity index 91% rename from Core/src/main/java/com/intellectualcrafters/plot/util/PlotGameMode.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PlotGameMode.java index 3dfbc6944..b3b1fd5a7 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/PlotGameMode.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PlotGameMode.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; public enum PlotGameMode { NOT_SET(-1, ""), SURVIVAL(0, "survival"), CREATIVE(1, "creative"), ADVENTURE(2, diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PlotWeather.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PlotWeather.java new file mode 100644 index 000000000..62ea9cc33 --- /dev/null +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PlotWeather.java @@ -0,0 +1,5 @@ +package com.github.intellectualsites.plotsquared.plot.util; + +public enum PlotWeather { + RAIN, CLEAR, RESET +} diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/ReflectionUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ReflectionUtils.java similarity index 99% rename from Core/src/main/java/com/intellectualcrafters/plot/util/ReflectionUtils.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ReflectionUtils.java index 9ba365319..cf6bbee2d 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/ReflectionUtils.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ReflectionUtils.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; import java.lang.reflect.*; import java.util.*; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/RegExUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/RegExUtil.java similarity index 79% rename from Core/src/main/java/com/intellectualcrafters/plot/util/RegExUtil.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/RegExUtil.java index 230099a92..b9fc6ff09 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/RegExUtil.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/RegExUtil.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; import java.util.HashMap; import java.util.Map; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java similarity index 97% rename from Core/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java index b5fc01de2..4b9f00572 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java @@ -1,14 +1,14 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; -import com.intellectualcrafters.jnbt.*; -import com.intellectualcrafters.json.JSONArray; -import com.intellectualcrafters.json.JSONException; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.generator.ClassicPlotWorld; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.block.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.jnbt.*; +import com.github.intellectualsites.plotsquared.json.JSONArray; +import com.github.intellectualsites.plotsquared.json.JSONException; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.generator.ClassicPlotWorld; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; import java.io.*; import java.net.URL; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/SetupUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SetupUtils.java similarity index 60% rename from Core/src/main/java/com/intellectualcrafters/plot/util/SetupUtils.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SetupUtils.java index 03c00a470..b77d991fe 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/SetupUtils.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SetupUtils.java @@ -1,8 +1,8 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; -import com.intellectualcrafters.plot.generator.GeneratorWrapper; -import com.intellectualcrafters.plot.object.PlotArea; -import com.intellectualcrafters.plot.object.SetupObject; +import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.SetupObject; import java.util.HashMap; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/StringComparison.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringComparison.java similarity index 94% rename from Core/src/main/java/com/intellectualcrafters/plot/util/StringComparison.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringComparison.java index 5f4da1d30..dd6a1f960 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/StringComparison.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringComparison.java @@ -1,157 +1,157 @@ -package com.intellectualcrafters.plot.util; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; - -/** - * String comparison library. - */ -public class StringComparison { - - private T bestMatch; - private double match = Integer.MAX_VALUE; - private T bestMatchObject; - - /** - * Constructor - * - * @param input Input Base Value - * @param objects Objects to compare - */ - public StringComparison(String input, T[] objects) { - init(input, objects); - } - - public StringComparison(String input, Collection objects) { - init(input, (T[]) objects.toArray()); - } - - /** - * You should call init(...) when you are ready to get a String comparison value. - */ - public StringComparison() { - } - - /** - * Compare two strings - * - * @param s1 String Base - * @param s2 Object - * @return match - */ - public static int compare(String s1, String s2) { - int distance = StringMan.getLevenshteinDistance(s1, s2); - if (s2.contains(s1)) { - distance -= Math.min(s1.length(), s2.length()); - } - if (s2.startsWith(s1)) { - distance -= 4; - } - return distance; - } - - /** - * Create an ArrayList containing pairs of letters - * - * @param s string to split - * @return ArrayList - */ - public static ArrayList wLetterPair(String s) { - ArrayList aPairs = new ArrayList<>(); - String[] wo = s.split("\\s"); - for (String aWo : wo) { - String[] po = sLetterPair(aWo); - Collections.addAll(aPairs, po); - } - return aPairs; - } - - /** - * Get an array containing letter pairs - * - * @param s string to split - * @return Array - */ - public static String[] sLetterPair(String s) { - int numPair = s.length() - 1; - String[] p = new String[numPair]; - for (int i = 0; i < numPair; i++) { - p[i] = s.substring(i, i + 2); - } - return p; - } - - public void init(String input, T[] objects) { - int c; - this.bestMatch = objects[0]; - this.bestMatchObject = objects[0]; - input = input.toLowerCase(); - for (T o : objects) { - if ((c = compare(input, getString(o).toLowerCase())) < this.match) { - this.match = c; - this.bestMatch = o; - this.bestMatchObject = o; - } - } - } - - public String getString(T o) { - if (o instanceof StringComparable) { - return ((StringComparable) o).getComparableString(); - } - return o.toString(); - } - - /** - * Get the object - * - * @return match object - */ - public T getMatchObject() { - return this.bestMatchObject; - } - - /** - * Get the best match value - * - * @return match value - */ - public String getBestMatch() { - return getString(this.bestMatch); - } - - /** - * Will return both the match number, and the actual match string - * - * @return object[] containing: double, String - */ - public ComparisonResult getBestMatchAdvanced() { - return new ComparisonResult(this.match, this.bestMatch); - } - - public interface StringComparable { - String getComparableString(); - } - - - /** - * The comparison result - */ - public class ComparisonResult { - - public final T best; - public final double match; - - /** - * The constructor - * - * @param match Match value - * @param best Best Match - */ - public ComparisonResult(double match, T best) { - this.match = match; - this.best = best; - } - } -} +package com.github.intellectualsites.plotsquared.plot.util; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; + +/** + * String comparison library. + */ +public class StringComparison { + + private T bestMatch; + private double match = Integer.MAX_VALUE; + private T bestMatchObject; + + /** + * Constructor + * + * @param input Input Base Value + * @param objects Objects to compare + */ + public StringComparison(String input, T[] objects) { + init(input, objects); + } + + public StringComparison(String input, Collection objects) { + init(input, (T[]) objects.toArray()); + } + + /** + * You should call init(...) when you are ready to get a String comparison value. + */ + public StringComparison() { + } + + /** + * Compare two strings + * + * @param s1 String Base + * @param s2 Object + * @return match + */ + public static int compare(String s1, String s2) { + int distance = StringMan.getLevenshteinDistance(s1, s2); + if (s2.contains(s1)) { + distance -= Math.min(s1.length(), s2.length()); + } + if (s2.startsWith(s1)) { + distance -= 4; + } + return distance; + } + + /** + * Create an ArrayList containing pairs of letters + * + * @param s string to split + * @return ArrayList + */ + public static ArrayList wLetterPair(String s) { + ArrayList aPairs = new ArrayList<>(); + String[] wo = s.split("\\s"); + for (String aWo : wo) { + String[] po = sLetterPair(aWo); + Collections.addAll(aPairs, po); + } + return aPairs; + } + + /** + * Get an array containing letter pairs + * + * @param s string to split + * @return Array + */ + public static String[] sLetterPair(String s) { + int numPair = s.length() - 1; + String[] p = new String[numPair]; + for (int i = 0; i < numPair; i++) { + p[i] = s.substring(i, i + 2); + } + return p; + } + + public void init(String input, T[] objects) { + int c; + this.bestMatch = objects[0]; + this.bestMatchObject = objects[0]; + input = input.toLowerCase(); + for (T o : objects) { + if ((c = compare(input, getString(o).toLowerCase())) < this.match) { + this.match = c; + this.bestMatch = o; + this.bestMatchObject = o; + } + } + } + + public String getString(T o) { + if (o instanceof StringComparable) { + return ((StringComparable) o).getComparableString(); + } + return o.toString(); + } + + /** + * Get the object + * + * @return match object + */ + public T getMatchObject() { + return this.bestMatchObject; + } + + /** + * Get the best match value + * + * @return match value + */ + public String getBestMatch() { + return getString(this.bestMatch); + } + + /** + * Will return both the match number, and the actual match string + * + * @return object[] containing: double, String + */ + public ComparisonResult getBestMatchAdvanced() { + return new ComparisonResult(this.match, this.bestMatch); + } + + public interface StringComparable { + String getComparableString(); + } + + + /** + * The comparison result + */ + public class ComparisonResult { + + public final T best; + public final double match; + + /** + * The constructor + * + * @param match Match value + * @param best Best Match + */ + public ComparisonResult(double match, T best) { + this.match = match; + this.best = best; + } + } +} diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/StringMan.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringMan.java similarity index 99% rename from Core/src/main/java/com/intellectualcrafters/plot/util/StringMan.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringMan.java index 56ed76291..f24bbb08f 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/StringMan.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringMan.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; import java.lang.reflect.Array; import java.util.*; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/TaskManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/TaskManager.java similarity index 96% rename from Core/src/main/java/com/intellectualcrafters/plot/util/TaskManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/TaskManager.java index 562ae09fa..db201d626 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/TaskManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/TaskManager.java @@ -1,7 +1,7 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; import java.util.Collection; import java.util.HashMap; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/UUIDHandler.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java similarity index 94% rename from Core/src/main/java/com/intellectualcrafters/plot/util/UUIDHandler.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java index 29dbb5a1a..b0331b8f1 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/UUIDHandler.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java @@ -1,9 +1,9 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; import com.google.common.collect.BiMap; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.uuid.UUIDWrapper; import java.util.HashMap; import java.util.HashSet; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/UUIDHandlerImplementation.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java similarity index 95% rename from Core/src/main/java/com/intellectualcrafters/plot/util/UUIDHandlerImplementation.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java index c2a1a788b..aee8f7b81 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/UUIDHandlerImplementation.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java @@ -1,14 +1,14 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; import com.google.common.base.Charsets; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.uuid.UUIDWrapper; import java.util.*; import java.util.concurrent.ConcurrentHashMap; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/WorldUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/WorldUtil.java similarity index 94% rename from Core/src/main/java/com/intellectualcrafters/plot/util/WorldUtil.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/WorldUtil.java index 866007877..3744654ff 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/WorldUtil.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/WorldUtil.java @@ -1,9 +1,9 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; -import com.intellectualcrafters.jnbt.*; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.object.schematic.PlotItem; +import com.github.intellectualsites.plotsquared.jnbt.*; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.object.schematic.PlotItem; import java.io.*; import java.net.URL; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/area/QuadMap.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/area/QuadMap.java similarity index 98% rename from Core/src/main/java/com/intellectualcrafters/plot/util/area/QuadMap.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/area/QuadMap.java index c907f576f..133088a2e 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/area/QuadMap.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/area/QuadMap.java @@ -1,6 +1,6 @@ -package com.intellectualcrafters.plot.util.area; +package com.github.intellectualsites.plotsquared.plot.util.area; -import com.intellectualcrafters.plot.object.RegionWrapper; +import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper; import java.util.HashSet; import java.util.Set; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/block/BasicLocalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java similarity index 95% rename from Core/src/main/java/com/intellectualcrafters/plot/util/block/BasicLocalBlockQueue.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java index 809de6e94..cca60d40a 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/block/BasicLocalBlockQueue.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java @@ -1,10 +1,10 @@ -package com.intellectualcrafters.plot.util.block; +package com.github.intellectualsites.plotsquared.plot.util.block; -import com.intellectualcrafters.plot.object.PlotBlock; -import com.intellectualcrafters.plot.object.RunnableVal; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.MathMan; -import com.intellectualcrafters.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.plot.object.PlotBlock; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.MathMan; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedDeque; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/block/DelegateLocalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/DelegateLocalBlockQueue.java similarity index 94% rename from Core/src/main/java/com/intellectualcrafters/plot/util/block/DelegateLocalBlockQueue.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/DelegateLocalBlockQueue.java index 0963528dc..a47c96f0f 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/block/DelegateLocalBlockQueue.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/DelegateLocalBlockQueue.java @@ -1,6 +1,6 @@ -package com.intellectualcrafters.plot.util.block; +package com.github.intellectualsites.plotsquared.plot.util.block; -import com.intellectualcrafters.plot.object.PlotBlock; +import com.github.intellectualsites.plotsquared.plot.object.PlotBlock; public class DelegateLocalBlockQueue extends LocalBlockQueue { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/block/GlobalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java similarity index 97% rename from Core/src/main/java/com/intellectualcrafters/plot/util/block/GlobalBlockQueue.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java index 3f89c7cb4..34a028ad9 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/block/GlobalBlockQueue.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java @@ -1,8 +1,8 @@ -package com.intellectualcrafters.plot.util.block; +package com.github.intellectualsites.plotsquared.plot.util.block; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.RunnableVal2; -import com.intellectualcrafters.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import java.util.ArrayList; import java.util.ConcurrentModificationException; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/block/LocalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/LocalBlockQueue.java similarity index 87% rename from Core/src/main/java/com/intellectualcrafters/plot/util/block/LocalBlockQueue.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/LocalBlockQueue.java index a7fbc201c..5459cf294 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/block/LocalBlockQueue.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/LocalBlockQueue.java @@ -1,11 +1,11 @@ -package com.intellectualcrafters.plot.util.block; +package com.github.intellectualsites.plotsquared.plot.util.block; -import com.intellectualcrafters.jnbt.CompoundTag; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.SchematicHandler; -import com.intellectualcrafters.plot.util.StringMan; -import com.intellectualcrafters.plot.util.UUIDHandler; -import com.intellectualcrafters.plot.util.WorldUtil; +import com.github.intellectualsites.plotsquared.jnbt.CompoundTag; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.plot.util.WorldUtil; import java.util.Map; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/block/OffsetLocalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/OffsetLocalBlockQueue.java similarity index 90% rename from Core/src/main/java/com/intellectualcrafters/plot/util/block/OffsetLocalBlockQueue.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/OffsetLocalBlockQueue.java index ae3369de3..7ac49bced 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/block/OffsetLocalBlockQueue.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/OffsetLocalBlockQueue.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util.block; +package com.github.intellectualsites.plotsquared.plot.util.block; public class OffsetLocalBlockQueue extends DelegateLocalBlockQueue { private final int ox; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/block/QueueProvider.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/QueueProvider.java similarity index 93% rename from Core/src/main/java/com/intellectualcrafters/plot/util/block/QueueProvider.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/QueueProvider.java index b26d3a16d..3c96e0d5f 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/block/QueueProvider.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/QueueProvider.java @@ -1,4 +1,4 @@ -package com.intellectualcrafters.plot.util.block; +package com.github.intellectualsites.plotsquared.plot.util.block; public abstract class QueueProvider { public static QueueProvider of(final Class primary, diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/block/ScopedLocalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/ScopedLocalBlockQueue.java similarity index 93% rename from Core/src/main/java/com/intellectualcrafters/plot/util/block/ScopedLocalBlockQueue.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/ScopedLocalBlockQueue.java index b162d02ba..c7f35b695 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/block/ScopedLocalBlockQueue.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/ScopedLocalBlockQueue.java @@ -1,7 +1,7 @@ -package com.intellectualcrafters.plot.util.block; +package com.github.intellectualsites.plotsquared.plot.util.block; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.object.*; public class ScopedLocalBlockQueue extends DelegateLocalBlockQueue { private final int minX; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/expiry/ExpireManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java similarity index 95% rename from Core/src/main/java/com/intellectualcrafters/plot/util/expiry/ExpireManager.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java index c6734a73d..1cb7cb44c 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/expiry/ExpireManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java @@ -1,18 +1,18 @@ -package com.intellectualcrafters.plot.util.expiry; +package com.github.intellectualsites.plotsquared.plot.util.expiry; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.flag.FlagManager; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; import com.google.common.base.Optional; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.flag.FlagManager; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.generator.HybridUtils; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.StringMan; -import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.UUIDHandler; import java.util.*; import java.util.concurrent.ConcurrentHashMap; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpirySettings.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpirySettings.java new file mode 100644 index 000000000..ab95068da --- /dev/null +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpirySettings.java @@ -0,0 +1,4 @@ +package com.github.intellectualsites.plotsquared.plot.util.expiry; + +public class ExpirySettings { +} diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/expiry/ExpiryTask.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java similarity index 91% rename from Core/src/main/java/com/intellectualcrafters/plot/util/expiry/ExpiryTask.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java index 48c4414de..dbdd6dadb 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/expiry/ExpiryTask.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java @@ -1,10 +1,10 @@ -package com.intellectualcrafters.plot.util.expiry; +package com.github.intellectualsites.plotsquared.plot.util.expiry; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotArea; -import com.intellectualcrafters.plot.object.PlotFilter; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.PlotFilter; import java.util.ArrayList; import java.util.Collections; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/expiry/PlotAnalysis.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java similarity index 97% rename from Core/src/main/java/com/intellectualcrafters/plot/util/expiry/PlotAnalysis.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java index 0dad2ed48..2e161bff3 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/expiry/PlotAnalysis.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java @@ -1,14 +1,14 @@ -package com.intellectualcrafters.plot.util.expiry; +package com.github.intellectualsites.plotsquared.plot.util.expiry; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.util.MathMan; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import com.google.common.base.Optional; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.generator.HybridUtils; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.RunnableVal; -import com.intellectualcrafters.plot.util.MathMan; -import com.intellectualcrafters.plot.util.TaskManager; import java.lang.reflect.Array; import java.util.*; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/helpmenu/HelpMenu.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpMenu.java similarity index 80% rename from Core/src/main/java/com/intellectualcrafters/plot/util/helpmenu/HelpMenu.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpMenu.java index 9051566c7..c4716b8ef 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/helpmenu/HelpMenu.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpMenu.java @@ -1,9 +1,9 @@ -package com.intellectualcrafters.plot.util.helpmenu; +package com.github.intellectualsites.plotsquared.plot.util.helpmenu; -import com.intellectualcrafters.plot.commands.CommandCategory; -import com.intellectualcrafters.plot.commands.MainCommand; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.plotsquared.general.commands.Command; +import com.github.intellectualsites.plotsquared.commands.Command; +import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory; +import com.github.intellectualsites.plotsquared.plot.commands.MainCommand; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import java.util.List; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/helpmenu/HelpObject.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpObject.java similarity index 76% rename from Core/src/main/java/com/intellectualcrafters/plot/util/helpmenu/HelpObject.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpObject.java index 7ffb6bffe..f972f5d8e 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/helpmenu/HelpObject.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpObject.java @@ -1,9 +1,9 @@ -package com.intellectualcrafters.plot.util.helpmenu; +package com.github.intellectualsites.plotsquared.plot.util.helpmenu; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.util.StringMan; -import com.plotsquared.general.commands.Argument; -import com.plotsquared.general.commands.Command; +import com.github.intellectualsites.plotsquared.commands.Argument; +import com.github.intellectualsites.plotsquared.commands.Command; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; public class HelpObject { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/helpmenu/HelpPage.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpPage.java similarity index 70% rename from Core/src/main/java/com/intellectualcrafters/plot/util/helpmenu/HelpPage.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpPage.java index bc33d3506..6d521627b 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/helpmenu/HelpPage.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpPage.java @@ -1,10 +1,10 @@ -package com.intellectualcrafters.plot.util.helpmenu; +package com.github.intellectualsites.plotsquared.plot.util.helpmenu; -import com.intellectualcrafters.plot.commands.CommandCategory; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; import java.util.ArrayList; import java.util.List; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/uuid/UUIDWrapper.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/uuid/UUIDWrapper.java similarity index 66% rename from Core/src/main/java/com/intellectualcrafters/plot/uuid/UUIDWrapper.java rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/uuid/UUIDWrapper.java index dece2e946..235b51a34 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/uuid/UUIDWrapper.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/uuid/UUIDWrapper.java @@ -1,7 +1,7 @@ -package com.intellectualcrafters.plot.uuid; +package com.github.intellectualsites.plotsquared.plot.uuid; -import com.intellectualcrafters.plot.object.OfflinePlotPlayer; -import com.intellectualcrafters.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import java.util.UUID; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/logger/ILogger.java b/Core/src/main/java/com/intellectualcrafters/plot/logger/ILogger.java deleted file mode 100644 index d2f311640..000000000 --- a/Core/src/main/java/com/intellectualcrafters/plot/logger/ILogger.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.intellectualcrafters.plot.logger; - -public interface ILogger { - void log(String message); -} diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/PlotWeather.java b/Core/src/main/java/com/intellectualcrafters/plot/util/PlotWeather.java deleted file mode 100644 index 918d7f4e8..000000000 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/PlotWeather.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.intellectualcrafters.plot.util; - -public enum PlotWeather { - RAIN, CLEAR, RESET -} diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/expiry/ExpirySettings.java b/Core/src/main/java/com/intellectualcrafters/plot/util/expiry/ExpirySettings.java deleted file mode 100644 index 24ba134d3..000000000 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/expiry/ExpirySettings.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.intellectualcrafters.plot.util.expiry; - -public class ExpirySettings { -} diff --git a/Core/src/test/java/com/intellectualcrafters/plot/FlagTest.java b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/FlagTest.java similarity index 69% rename from Core/src/test/java/com/intellectualcrafters/plot/FlagTest.java rename to Core/src/test/java/com/github/intellectualsites/plotsquared/plot/FlagTest.java index 88b863371..cab3040ec 100644 --- a/Core/src/test/java/com/intellectualcrafters/plot/FlagTest.java +++ b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/FlagTest.java @@ -1,15 +1,15 @@ -package com.intellectualcrafters.plot; +package com.github.intellectualsites.plotsquared.plot; +import com.github.intellectualsites.plotsquared.plot.database.AbstractDBTest; +import com.github.intellectualsites.plotsquared.plot.database.DBFunc; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotBlock; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; +import com.github.intellectualsites.plotsquared.plot.util.EventUtil; +import com.github.intellectualsites.plotsquared.plot.util.EventUtilTest; import com.google.common.base.Optional; -import com.intellectualcrafters.plot.database.AbstractDBTest; -import com.intellectualcrafters.plot.database.DBFunc; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotBlock; -import com.intellectualcrafters.plot.object.PlotId; -import com.intellectualcrafters.plot.util.EventUtil; -import com.intellectualcrafters.plot.util.EventUtilTest; import org.junit.Before; import org.junit.Test; diff --git a/Core/src/test/java/com/intellectualcrafters/plot/database/AbstractDBTest.java b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java similarity index 94% rename from Core/src/test/java/com/intellectualcrafters/plot/database/AbstractDBTest.java rename to Core/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java index 0e5ec967f..7b29cdf97 100644 --- a/Core/src/test/java/com/intellectualcrafters/plot/database/AbstractDBTest.java +++ b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java @@ -1,8 +1,8 @@ -package com.intellectualcrafters.plot.database; +package com.github.intellectualsites.plotsquared.plot.database; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.object.comment.PlotComment; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment; import java.util.*; diff --git a/Core/src/test/java/com/intellectualcrafters/plot/util/EventUtilTest.java b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java similarity index 90% rename from Core/src/test/java/com/intellectualcrafters/plot/util/EventUtilTest.java rename to Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java index 82d417f13..203515699 100644 --- a/Core/src/test/java/com/intellectualcrafters/plot/util/EventUtilTest.java +++ b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java @@ -1,7 +1,7 @@ -package com.intellectualcrafters.plot.util; +package com.github.intellectualsites.plotsquared.plot.util; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.object.*; import java.util.ArrayList; import java.util.UUID; diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/NukkitMain.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/NukkitMain.java similarity index 89% rename from Nukkit/src/main/java/com/plotsquared/nukkit/NukkitMain.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/NukkitMain.java index 31405390b..bc2c20105 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/NukkitMain.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/NukkitMain.java @@ -1,4 +1,4 @@ -package com.plotsquared.nukkit; +package com.github.intellectualsites.plotsquared.nukkit; import cn.nukkit.Nukkit; import cn.nukkit.OfflinePlayer; @@ -11,28 +11,28 @@ import cn.nukkit.level.generator.Generator; import cn.nukkit.metadata.MetadataValue; import cn.nukkit.plugin.Plugin; import cn.nukkit.plugin.PluginBase; -import com.intellectualcrafters.configuration.ConfigurationSection; -import com.intellectualcrafters.plot.IPlotMain; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.ConfigurationNode; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.generator.*; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.object.chat.PlainChatManager; -import com.intellectualcrafters.plot.object.worlds.PlotAreaManager; -import com.intellectualcrafters.plot.object.worlds.SinglePlotArea; -import com.intellectualcrafters.plot.object.worlds.SinglePlotAreaManager; -import com.intellectualcrafters.plot.util.*; -import com.intellectualcrafters.plot.util.block.QueueProvider; -import com.plotsquared.nukkit.generator.NukkitPlotGenerator; -import com.plotsquared.nukkit.listeners.PlayerEvents; -import com.plotsquared.nukkit.listeners.WorldEvents; -import com.plotsquared.nukkit.util.*; -import com.plotsquared.nukkit.util.block.NukkitHybridGen; -import com.plotsquared.nukkit.util.block.NukkitLocalQueue; -import com.plotsquared.nukkit.uuid.FileUUIDHandler; -import com.plotsquared.nukkit.uuid.LowerOfflineUUIDWrapper; +import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; +import com.github.intellectualsites.plotsquared.nukkit.generator.NukkitPlotGenerator; +import com.github.intellectualsites.plotsquared.nukkit.listeners.PlayerEvents; +import com.github.intellectualsites.plotsquared.nukkit.listeners.WorldEvents; +import com.github.intellectualsites.plotsquared.nukkit.util.*; +import com.github.intellectualsites.plotsquared.nukkit.util.block.NukkitHybridGen; +import com.github.intellectualsites.plotsquared.nukkit.util.block.NukkitLocalQueue; +import com.github.intellectualsites.plotsquared.nukkit.uuid.FileUUIDHandler; +import com.github.intellectualsites.plotsquared.nukkit.uuid.LowerOfflineUUIDWrapper; +import com.github.intellectualsites.plotsquared.plot.IPlotMain; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.generator.*; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.object.chat.PlainChatManager; +import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; +import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea; +import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; +import com.github.intellectualsites.plotsquared.plot.util.*; +import com.github.intellectualsites.plotsquared.plot.util.block.QueueProvider; import com.sk89q.worldedit.WorldEdit; import java.io.File; @@ -199,7 +199,7 @@ public final class NukkitMain extends PluginBase implements Listener, IPlotMain if (entity instanceof Player) { continue; } - com.intellectualcrafters.plot.object.Location location = + Location location = NukkitUtil.getLocation(entity.getLocation()); Plot plot = location.getPlot(); if (plot == null) { diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/events/ClusterFlagRemoveEvent.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/ClusterFlagRemoveEvent.java similarity index 86% rename from Nukkit/src/main/java/com/plotsquared/nukkit/events/ClusterFlagRemoveEvent.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/ClusterFlagRemoveEvent.java index 0a72fcefa..a2811c481 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/events/ClusterFlagRemoveEvent.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/ClusterFlagRemoveEvent.java @@ -1,10 +1,10 @@ -package com.plotsquared.nukkit.events; +package com.github.intellectualsites.plotsquared.nukkit.events; import cn.nukkit.event.Cancellable; import cn.nukkit.event.Event; import cn.nukkit.event.HandlerList; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.object.PlotCluster; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.object.PlotCluster; /** * Called when a flag is removed from a plot. diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlayerClaimPlotEvent.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlayerClaimPlotEvent.java similarity index 90% rename from Nukkit/src/main/java/com/plotsquared/nukkit/events/PlayerClaimPlotEvent.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlayerClaimPlotEvent.java index 7a33bd7ec..d876d39ad 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlayerClaimPlotEvent.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlayerClaimPlotEvent.java @@ -1,10 +1,10 @@ -package com.plotsquared.nukkit.events; +package com.github.intellectualsites.plotsquared.nukkit.events; import cn.nukkit.Player; import cn.nukkit.event.Cancellable; import cn.nukkit.event.HandlerList; import cn.nukkit.event.player.PlayerEvent; -import com.intellectualcrafters.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.Plot; public class PlayerClaimPlotEvent extends PlayerEvent implements Cancellable { diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlayerEnterPlotEvent.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlayerEnterPlotEvent.java similarity index 85% rename from Nukkit/src/main/java/com/plotsquared/nukkit/events/PlayerEnterPlotEvent.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlayerEnterPlotEvent.java index 8ac37ac9e..cc3e665c0 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlayerEnterPlotEvent.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlayerEnterPlotEvent.java @@ -1,9 +1,9 @@ -package com.plotsquared.nukkit.events; +package com.github.intellectualsites.plotsquared.nukkit.events; import cn.nukkit.Player; import cn.nukkit.event.HandlerList; import cn.nukkit.event.player.PlayerEvent; -import com.intellectualcrafters.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.Plot; public class PlayerEnterPlotEvent extends PlayerEvent { diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlayerLeavePlotEvent.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlayerLeavePlotEvent.java similarity index 85% rename from Nukkit/src/main/java/com/plotsquared/nukkit/events/PlayerLeavePlotEvent.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlayerLeavePlotEvent.java index 0937e7aea..4d1f1689d 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlayerLeavePlotEvent.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlayerLeavePlotEvent.java @@ -1,9 +1,9 @@ -package com.plotsquared.nukkit.events; +package com.github.intellectualsites.plotsquared.nukkit.events; import cn.nukkit.Player; import cn.nukkit.event.HandlerList; import cn.nukkit.event.player.PlayerEvent; -import com.intellectualcrafters.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.Plot; /** diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlayerPlotDeniedEvent.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlayerPlotDeniedEvent.java similarity index 91% rename from Nukkit/src/main/java/com/plotsquared/nukkit/events/PlayerPlotDeniedEvent.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlayerPlotDeniedEvent.java index 8765fa28d..75e6bccfa 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlayerPlotDeniedEvent.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlayerPlotDeniedEvent.java @@ -1,8 +1,8 @@ -package com.plotsquared.nukkit.events; +package com.github.intellectualsites.plotsquared.nukkit.events; import cn.nukkit.Player; import cn.nukkit.event.HandlerList; -import com.intellectualcrafters.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.Plot; import java.util.UUID; diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlayerPlotHelperEvent.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlayerPlotHelperEvent.java similarity index 91% rename from Nukkit/src/main/java/com/plotsquared/nukkit/events/PlayerPlotHelperEvent.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlayerPlotHelperEvent.java index c19fb690a..53a034a2a 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlayerPlotHelperEvent.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlayerPlotHelperEvent.java @@ -1,8 +1,8 @@ -package com.plotsquared.nukkit.events; +package com.github.intellectualsites.plotsquared.nukkit.events; import cn.nukkit.Player; import cn.nukkit.event.HandlerList; -import com.intellectualcrafters.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.Plot; import java.util.UUID; diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlayerPlotTrustedEvent.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlayerPlotTrustedEvent.java similarity index 91% rename from Nukkit/src/main/java/com/plotsquared/nukkit/events/PlayerPlotTrustedEvent.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlayerPlotTrustedEvent.java index 6c119865d..55290c938 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlayerPlotTrustedEvent.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlayerPlotTrustedEvent.java @@ -1,8 +1,8 @@ -package com.plotsquared.nukkit.events; +package com.github.intellectualsites.plotsquared.nukkit.events; import cn.nukkit.Player; import cn.nukkit.event.HandlerList; -import com.intellectualcrafters.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.Plot; import java.util.UUID; diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlayerTeleportToPlotEvent.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlayerTeleportToPlotEvent.java similarity index 86% rename from Nukkit/src/main/java/com/plotsquared/nukkit/events/PlayerTeleportToPlotEvent.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlayerTeleportToPlotEvent.java index cdd9fd9d5..c4c1aacc2 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlayerTeleportToPlotEvent.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlayerTeleportToPlotEvent.java @@ -1,11 +1,11 @@ -package com.plotsquared.nukkit.events; +package com.github.intellectualsites.plotsquared.nukkit.events; import cn.nukkit.Player; import cn.nukkit.event.Cancellable; import cn.nukkit.event.HandlerList; import cn.nukkit.event.player.PlayerEvent; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; /** * Called when a player teleports to a plot diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlotClearEvent.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlotClearEvent.java similarity index 81% rename from Nukkit/src/main/java/com/plotsquared/nukkit/events/PlotClearEvent.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlotClearEvent.java index bc3ed5a34..2fbf98de0 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlotClearEvent.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlotClearEvent.java @@ -1,9 +1,9 @@ -package com.plotsquared.nukkit.events; +package com.github.intellectualsites.plotsquared.nukkit.events; import cn.nukkit.event.Cancellable; import cn.nukkit.event.HandlerList; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotId; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; /** * Called when a plot is cleared diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlotComponentSetEvent.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlotComponentSetEvent.java similarity index 82% rename from Nukkit/src/main/java/com/plotsquared/nukkit/events/PlotComponentSetEvent.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlotComponentSetEvent.java index 733ff1f50..09c68bf4e 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlotComponentSetEvent.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlotComponentSetEvent.java @@ -1,8 +1,8 @@ -package com.plotsquared.nukkit.events; +package com.github.intellectualsites.plotsquared.nukkit.events; import cn.nukkit.event.HandlerList; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotId; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; /** * Called when a plot component is set diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlotDeleteEvent.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlotDeleteEvent.java similarity index 76% rename from Nukkit/src/main/java/com/plotsquared/nukkit/events/PlotDeleteEvent.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlotDeleteEvent.java index bd91ea80f..cb571e366 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlotDeleteEvent.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlotDeleteEvent.java @@ -1,8 +1,8 @@ -package com.plotsquared.nukkit.events; +package com.github.intellectualsites.plotsquared.nukkit.events; import cn.nukkit.event.HandlerList; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotId; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; /** * Called when a plot is deleted diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlotEvent.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlotEvent.java similarity index 65% rename from Nukkit/src/main/java/com/plotsquared/nukkit/events/PlotEvent.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlotEvent.java index 21f90f3bf..b3b471658 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlotEvent.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlotEvent.java @@ -1,7 +1,7 @@ -package com.plotsquared.nukkit.events; +package com.github.intellectualsites.plotsquared.nukkit.events; import cn.nukkit.event.Event; -import com.intellectualcrafters.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.Plot; public abstract class PlotEvent extends Event { diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlotFlagAddEvent.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlotFlagAddEvent.java similarity index 84% rename from Nukkit/src/main/java/com/plotsquared/nukkit/events/PlotFlagAddEvent.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlotFlagAddEvent.java index ecd5560a6..ac1741f6e 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlotFlagAddEvent.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlotFlagAddEvent.java @@ -1,9 +1,9 @@ -package com.plotsquared.nukkit.events; +package com.github.intellectualsites.plotsquared.nukkit.events; import cn.nukkit.event.Cancellable; import cn.nukkit.event.HandlerList; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.object.Plot; /** * Called when a Flag is added to a plot. diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlotFlagRemoveEvent.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlotFlagRemoveEvent.java similarity index 84% rename from Nukkit/src/main/java/com/plotsquared/nukkit/events/PlotFlagRemoveEvent.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlotFlagRemoveEvent.java index b10b5d246..3330c4653 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlotFlagRemoveEvent.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlotFlagRemoveEvent.java @@ -1,9 +1,9 @@ -package com.plotsquared.nukkit.events; +package com.github.intellectualsites.plotsquared.nukkit.events; import cn.nukkit.event.Cancellable; import cn.nukkit.event.HandlerList; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.object.Plot; /** * Called when a flag is removed from a plot diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlotMergeEvent.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlotMergeEvent.java similarity index 86% rename from Nukkit/src/main/java/com/plotsquared/nukkit/events/PlotMergeEvent.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlotMergeEvent.java index 3a45efdf5..97c445fb4 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlotMergeEvent.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlotMergeEvent.java @@ -1,10 +1,10 @@ -package com.plotsquared.nukkit.events; +package com.github.intellectualsites.plotsquared.nukkit.events; import cn.nukkit.event.Cancellable; import cn.nukkit.event.HandlerList; import cn.nukkit.level.Level; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotId; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; import java.util.ArrayList; diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlotRateEvent.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlotRateEvent.java similarity index 71% rename from Nukkit/src/main/java/com/plotsquared/nukkit/events/PlotRateEvent.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlotRateEvent.java index de9a9f0b5..4fbadbf70 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlotRateEvent.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlotRateEvent.java @@ -1,9 +1,9 @@ -package com.plotsquared.nukkit.events; +package com.github.intellectualsites.plotsquared.nukkit.events; import cn.nukkit.event.HandlerList; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.Rating; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.Rating; public class PlotRateEvent extends PlotEvent { diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlotUnlinkEvent.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlotUnlinkEvent.java similarity index 87% rename from Nukkit/src/main/java/com/plotsquared/nukkit/events/PlotUnlinkEvent.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlotUnlinkEvent.java index 94f43ef73..8fa1e766c 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/events/PlotUnlinkEvent.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/events/PlotUnlinkEvent.java @@ -1,11 +1,11 @@ -package com.plotsquared.nukkit.events; +package com.github.intellectualsites.plotsquared.nukkit.events; import cn.nukkit.event.Cancellable; import cn.nukkit.event.Event; import cn.nukkit.event.HandlerList; import cn.nukkit.level.Level; -import com.intellectualcrafters.plot.object.PlotArea; -import com.intellectualcrafters.plot.object.PlotId; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; import java.util.ArrayList; diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/generator/NukkitAugmentedGenerator.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/generator/NukkitAugmentedGenerator.java similarity index 84% rename from Nukkit/src/main/java/com/plotsquared/nukkit/generator/NukkitAugmentedGenerator.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/generator/NukkitAugmentedGenerator.java index a66c930b4..acdf8f5b3 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/generator/NukkitAugmentedGenerator.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/generator/NukkitAugmentedGenerator.java @@ -1,13 +1,13 @@ -package com.plotsquared.nukkit.generator; +package com.github.intellectualsites.plotsquared.nukkit.generator; import cn.nukkit.event.EventHandler; import cn.nukkit.event.Listener; import cn.nukkit.event.level.ChunkLoadEvent; import cn.nukkit.level.Level; import cn.nukkit.level.format.FullChunk; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.generator.AugmentedUtils; -import com.plotsquared.nukkit.NukkitMain; +import com.github.intellectualsites.plotsquared.nukkit.NukkitMain; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.generator.AugmentedUtils; import java.util.concurrent.ConcurrentHashMap; diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/generator/NukkitPlotGenerator.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/generator/NukkitPlotGenerator.java similarity index 89% rename from Nukkit/src/main/java/com/plotsquared/nukkit/generator/NukkitPlotGenerator.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/generator/NukkitPlotGenerator.java index 6d6e9140b..e06f6442d 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/generator/NukkitPlotGenerator.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/generator/NukkitPlotGenerator.java @@ -1,18 +1,18 @@ -package com.plotsquared.nukkit.generator; +package com.github.intellectualsites.plotsquared.nukkit.generator; import cn.nukkit.level.format.generic.BaseFullChunk; import cn.nukkit.level.generator.Generator; import cn.nukkit.math.NukkitRandom; import cn.nukkit.math.Vector3; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.generator.GeneratorWrapper; -import com.intellectualcrafters.plot.generator.IndependentPlotGenerator; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.ChunkManager; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.block.ScopedLocalBlockQueue; -import com.plotsquared.nukkit.util.NukkitUtil; -import com.plotsquared.nukkit.util.block.NukkitWrappedChunk; +import com.github.intellectualsites.plotsquared.nukkit.util.NukkitUtil; +import com.github.intellectualsites.plotsquared.nukkit.util.block.NukkitWrappedChunk; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; +import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue; import java.util.Map; diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/listeners/PlayerEvents.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/listeners/PlayerEvents.java similarity index 98% rename from Nukkit/src/main/java/com/plotsquared/nukkit/listeners/PlayerEvents.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/listeners/PlayerEvents.java index 254b3c17a..8670d24b5 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/listeners/PlayerEvents.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/listeners/PlayerEvents.java @@ -1,4 +1,4 @@ -package com.plotsquared.nukkit.listeners; +package com.github.intellectualsites.plotsquared.nukkit.listeners; import cn.nukkit.Player; import cn.nukkit.Server; @@ -21,17 +21,17 @@ import cn.nukkit.event.potion.PotionCollideEvent; import cn.nukkit.event.redstone.RedstoneUpdateEvent; import cn.nukkit.metadata.MetadataValue; import cn.nukkit.plugin.Plugin; +import com.github.intellectualsites.plotsquared.nukkit.object.NukkitPlayer; +import com.github.intellectualsites.plotsquared.nukkit.util.NukkitUtil; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.flag.IntegerFlag; +import com.github.intellectualsites.plotsquared.plot.listener.PlotListener; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.*; import com.google.common.base.Optional; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.flag.IntegerFlag; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.*; -import com.plotsquared.listener.PlotListener; -import com.plotsquared.nukkit.object.NukkitPlayer; -import com.plotsquared.nukkit.util.NukkitUtil; import java.util.*; import java.util.Map.Entry; diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/listeners/WorldEvents.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/listeners/WorldEvents.java similarity index 80% rename from Nukkit/src/main/java/com/plotsquared/nukkit/listeners/WorldEvents.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/listeners/WorldEvents.java index 753501afc..968977057 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/listeners/WorldEvents.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/listeners/WorldEvents.java @@ -1,4 +1,4 @@ -package com.plotsquared.nukkit.listeners; +package com.github.intellectualsites.plotsquared.nukkit.listeners; import cn.nukkit.event.EventHandler; import cn.nukkit.event.EventPriority; @@ -7,10 +7,10 @@ import cn.nukkit.event.level.LevelInitEvent; import cn.nukkit.event.level.LevelLoadEvent; import cn.nukkit.level.Level; import cn.nukkit.level.generator.Generator; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.generator.GeneratorWrapper; -import com.intellectualcrafters.plot.object.PlotArea; -import com.plotsquared.nukkit.generator.NukkitPlotGenerator; +import com.github.intellectualsites.plotsquared.nukkit.generator.NukkitPlotGenerator; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; import java.util.HashMap; diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/object/NukkitPlayer.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/object/NukkitPlayer.java similarity index 94% rename from Nukkit/src/main/java/com/plotsquared/nukkit/object/NukkitPlayer.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/object/NukkitPlayer.java index a6fb94855..bcc8061aa 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/object/NukkitPlayer.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/object/NukkitPlayer.java @@ -1,4 +1,4 @@ -package com.plotsquared.nukkit.object; +package com.github.intellectualsites.plotsquared.nukkit.object; import cn.nukkit.Player; import cn.nukkit.Server; @@ -6,11 +6,11 @@ import cn.nukkit.event.player.PlayerTeleportEvent; import cn.nukkit.network.protocol.LevelEventPacket; import cn.nukkit.plugin.RegisteredListener; import cn.nukkit.utils.EventException; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.*; -import com.plotsquared.nukkit.util.NukkitUtil; +import com.github.intellectualsites.plotsquared.nukkit.util.NukkitUtil; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.*; import java.util.Collections; import java.util.UUID; diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/util/Metrics.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/Metrics.java similarity index 99% rename from Nukkit/src/main/java/com/plotsquared/nukkit/util/Metrics.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/Metrics.java index 752bac1e6..10db3d683 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/util/Metrics.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/Metrics.java @@ -1,10 +1,10 @@ -package com.plotsquared.nukkit.util; +package com.github.intellectualsites.plotsquared.nukkit.util; import cn.nukkit.plugin.Plugin; import cn.nukkit.plugin.PluginDescription; import cn.nukkit.utils.LogLevel; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import java.io.*; import java.net.Proxy; diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitChunkManager.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitChunkManager.java similarity index 71% rename from Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitChunkManager.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitChunkManager.java index 344174321..892374a9e 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitChunkManager.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitChunkManager.java @@ -1,11 +1,11 @@ -package com.plotsquared.nukkit.util; +package com.github.intellectualsites.plotsquared.nukkit.util; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.ChunkLoc; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.util.ChunkManager; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.object.ChunkLoc; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; public class NukkitChunkManager extends ChunkManager { public NukkitChunkManager() { diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitCommand.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitCommand.java similarity index 80% rename from Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitCommand.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitCommand.java index a63612360..2fd9b6524 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitCommand.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitCommand.java @@ -1,12 +1,12 @@ -package com.plotsquared.nukkit.util; +package com.github.intellectualsites.plotsquared.nukkit.util; import cn.nukkit.Player; import cn.nukkit.command.Command; import cn.nukkit.command.CommandSender; import cn.nukkit.command.ConsoleCommandSender; import cn.nukkit.command.RemoteConsoleCommandSender; -import com.intellectualcrafters.plot.commands.MainCommand; -import com.intellectualcrafters.plot.object.ConsolePlayer; +import com.github.intellectualsites.plotsquared.plot.commands.MainCommand; +import com.github.intellectualsites.plotsquared.plot.object.ConsolePlayer; public class NukkitCommand extends Command { diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitEventUtil.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitEventUtil.java similarity index 87% rename from Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitEventUtil.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitEventUtil.java index a54ca36a0..cdf3c886e 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitEventUtil.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitEventUtil.java @@ -1,14 +1,14 @@ -package com.plotsquared.nukkit.util; +package com.github.intellectualsites.plotsquared.nukkit.util; import cn.nukkit.Player; import cn.nukkit.event.Cancellable; import cn.nukkit.event.Event; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.EventUtil; -import com.plotsquared.nukkit.NukkitMain; -import com.plotsquared.nukkit.events.*; -import com.plotsquared.nukkit.object.NukkitPlayer; +import com.github.intellectualsites.plotsquared.nukkit.NukkitMain; +import com.github.intellectualsites.plotsquared.nukkit.events.*; +import com.github.intellectualsites.plotsquared.nukkit.object.NukkitPlayer; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.EventUtil; import java.util.ArrayList; import java.util.UUID; diff --git a/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitHybridUtils.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitHybridUtils.java new file mode 100644 index 000000000..9a193f2cf --- /dev/null +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitHybridUtils.java @@ -0,0 +1,19 @@ +package com.github.intellectualsites.plotsquared.nukkit.util; + +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; +import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.util.expiry.PlotAnalysis; + +public class NukkitHybridUtils extends HybridUtils { + + public NukkitHybridUtils() { + PS.debug("Not implemented: NukkitHybridUtils"); + } + + @Override public void analyzeRegion(final String world, final RegionWrapper region, + final RunnableVal whenDone) { + throw new UnsupportedOperationException("NOT IMPLEMENTED YET"); + } +} diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitInventoryUtil.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitInventoryUtil.java similarity index 75% rename from Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitInventoryUtil.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitInventoryUtil.java index 80827f8f4..d6aa2b4a2 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitInventoryUtil.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitInventoryUtil.java @@ -1,14 +1,14 @@ -package com.plotsquared.nukkit.util; +package com.github.intellectualsites.plotsquared.nukkit.util; import cn.nukkit.inventory.PlayerInventory; import cn.nukkit.item.Item; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.PlotInventory; -import com.intellectualcrafters.plot.object.PlotItemStack; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.InventoryUtil; -import com.plotsquared.nukkit.object.NukkitPlayer; +import com.github.intellectualsites.plotsquared.nukkit.object.NukkitPlayer; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.PlotInventory; +import com.github.intellectualsites.plotsquared.plot.object.PlotItemStack; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.InventoryUtil; public class NukkitInventoryUtil extends InventoryUtil { diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitSchematicHandler.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitSchematicHandler.java similarity index 91% rename from Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitSchematicHandler.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitSchematicHandler.java index e4eb695ee..7e8fcf362 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitSchematicHandler.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitSchematicHandler.java @@ -1,19 +1,19 @@ -package com.plotsquared.nukkit.util; +package com.github.intellectualsites.plotsquared.nukkit.util; import cn.nukkit.block.Block; import cn.nukkit.level.Level; import cn.nukkit.level.format.generic.BaseFullChunk; import cn.nukkit.math.Vector3; -import com.intellectualcrafters.jnbt.*; -import com.intellectualcrafters.plot.object.ChunkLoc; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.RegionWrapper; -import com.intellectualcrafters.plot.object.RunnableVal; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.SchematicHandler; -import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.block.LocalBlockQueue; -import com.plotsquared.nukkit.NukkitMain; +import com.github.intellectualsites.plotsquared.jnbt.*; +import com.github.intellectualsites.plotsquared.nukkit.NukkitMain; +import com.github.intellectualsites.plotsquared.plot.object.ChunkLoc; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; import java.io.IOException; import java.util.*; diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitSetupUtils.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitSetupUtils.java similarity index 89% rename from Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitSetupUtils.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitSetupUtils.java index e806f6673..f4cbaadba 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitSetupUtils.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitSetupUtils.java @@ -1,17 +1,17 @@ -package com.plotsquared.nukkit.util; +package com.github.intellectualsites.plotsquared.nukkit.util; import cn.nukkit.level.Level; import cn.nukkit.level.generator.Generator; -import com.intellectualcrafters.configuration.ConfigurationSection; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.ConfigurationNode; -import com.intellectualcrafters.plot.generator.GeneratorWrapper; -import com.intellectualcrafters.plot.object.PlotArea; -import com.intellectualcrafters.plot.object.SetupObject; -import com.intellectualcrafters.plot.util.SetupUtils; -import com.plotsquared.nukkit.NukkitMain; -import com.plotsquared.nukkit.generator.NukkitPlotGenerator; -import com.plotsquared.nukkit.util.block.NukkitHybridGen; +import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; +import com.github.intellectualsites.plotsquared.nukkit.NukkitMain; +import com.github.intellectualsites.plotsquared.nukkit.generator.NukkitPlotGenerator; +import com.github.intellectualsites.plotsquared.nukkit.util.block.NukkitHybridGen; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; +import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.SetupObject; +import com.github.intellectualsites.plotsquared.plot.util.SetupUtils; import java.io.IOException; import java.lang.reflect.Field; diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitTaskManager.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitTaskManager.java similarity index 89% rename from Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitTaskManager.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitTaskManager.java index 7e3f25fe9..fd7d9bad8 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitTaskManager.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitTaskManager.java @@ -1,8 +1,8 @@ -package com.plotsquared.nukkit.util; +package com.github.intellectualsites.plotsquared.nukkit.util; import cn.nukkit.scheduler.TaskHandler; -import com.intellectualcrafters.plot.util.TaskManager; -import com.plotsquared.nukkit.NukkitMain; +import com.github.intellectualsites.plotsquared.nukkit.NukkitMain; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import java.util.HashMap; import java.util.concurrent.atomic.AtomicInteger; diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitTitleUtil.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitTitleUtil.java similarity index 51% rename from Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitTitleUtil.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitTitleUtil.java index 67bed7cb1..474241686 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitTitleUtil.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitTitleUtil.java @@ -1,9 +1,9 @@ -package com.plotsquared.nukkit.util; +package com.github.intellectualsites.plotsquared.nukkit.util; import cn.nukkit.Player; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.AbstractTitle; -import com.plotsquared.nukkit.object.NukkitPlayer; +import com.github.intellectualsites.plotsquared.nukkit.object.NukkitPlayer; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.AbstractTitle; public class NukkitTitleUtil extends AbstractTitle { @Override diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitUtil.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitUtil.java similarity index 93% rename from Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitUtil.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitUtil.java index 427eab9ca..4712d129d 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitUtil.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/NukkitUtil.java @@ -1,4 +1,4 @@ -package com.plotsquared.nukkit.util; +package com.github.intellectualsites.plotsquared.nukkit.util; import cn.nukkit.OfflinePlayer; import cn.nukkit.Player; @@ -13,14 +13,14 @@ import cn.nukkit.level.Position; import cn.nukkit.level.biome.Biome; import cn.nukkit.level.biome.EnumBiome; import cn.nukkit.math.Vector3; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.PlotBlock; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.RegionWrapper; -import com.intellectualcrafters.plot.object.schematic.PlotItem; -import com.intellectualcrafters.plot.util.*; -import com.plotsquared.nukkit.NukkitMain; -import com.plotsquared.nukkit.object.NukkitPlayer; +import com.github.intellectualsites.plotsquared.nukkit.NukkitMain; +import com.github.intellectualsites.plotsquared.nukkit.object.NukkitPlayer; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.PlotBlock; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper; +import com.github.intellectualsites.plotsquared.plot.object.schematic.PlotItem; +import com.github.intellectualsites.plotsquared.plot.util.*; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/util/block/NukkitHybridGen.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/block/NukkitHybridGen.java similarity index 75% rename from Nukkit/src/main/java/com/plotsquared/nukkit/util/block/NukkitHybridGen.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/block/NukkitHybridGen.java index f1de3a61a..443a2f293 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/util/block/NukkitHybridGen.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/block/NukkitHybridGen.java @@ -1,9 +1,9 @@ -package com.plotsquared.nukkit.util.block; +package com.github.intellectualsites.plotsquared.nukkit.util.block; import cn.nukkit.level.Level; -import com.intellectualcrafters.plot.PS; -import com.plotsquared.nukkit.NukkitMain; -import com.plotsquared.nukkit.generator.NukkitPlotGenerator; +import com.github.intellectualsites.plotsquared.nukkit.NukkitMain; +import com.github.intellectualsites.plotsquared.nukkit.generator.NukkitPlotGenerator; +import com.github.intellectualsites.plotsquared.plot.PS; import java.util.Map; diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/util/block/NukkitLocalQueue.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/block/NukkitLocalQueue.java similarity index 90% rename from Nukkit/src/main/java/com/plotsquared/nukkit/util/block/NukkitLocalQueue.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/block/NukkitLocalQueue.java index 74f9e32c4..c098447fd 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/util/block/NukkitLocalQueue.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/block/NukkitLocalQueue.java @@ -1,4 +1,4 @@ -package com.plotsquared.nukkit.util.block; +package com.github.intellectualsites.plotsquared.nukkit.util.block; import cn.nukkit.block.Block; import cn.nukkit.level.Level; @@ -6,10 +6,10 @@ import cn.nukkit.level.biome.EnumBiome; import cn.nukkit.level.format.FullChunk; import cn.nukkit.level.format.generic.BaseFullChunk; import cn.nukkit.math.Vector3; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.object.PlotBlock; -import com.intellectualcrafters.plot.util.block.BasicLocalBlockQueue; -import com.plotsquared.nukkit.NukkitMain; +import com.github.intellectualsites.plotsquared.nukkit.NukkitMain; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.object.PlotBlock; +import com.github.intellectualsites.plotsquared.plot.util.block.BasicLocalBlockQueue; public class NukkitLocalQueue extends BasicLocalBlockQueue { diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/util/block/NukkitWrappedChunk.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/block/NukkitWrappedChunk.java similarity index 87% rename from Nukkit/src/main/java/com/plotsquared/nukkit/util/block/NukkitWrappedChunk.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/block/NukkitWrappedChunk.java index 073af1359..1dcb029f5 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/util/block/NukkitWrappedChunk.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/util/block/NukkitWrappedChunk.java @@ -1,11 +1,11 @@ -package com.plotsquared.nukkit.util.block; +package com.github.intellectualsites.plotsquared.nukkit.util.block; import cn.nukkit.level.biome.Biome; import cn.nukkit.level.biome.EnumBiome; import cn.nukkit.level.format.generic.BaseFullChunk; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.PlotBlock; -import com.intellectualcrafters.plot.util.block.ScopedLocalBlockQueue; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.PlotBlock; +import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue; public class NukkitWrappedChunk extends ScopedLocalBlockQueue { private final String world; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/DatFileFilter.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/uuid/DatFileFilter.java similarity index 77% rename from Bukkit/src/main/java/com/plotsquared/bukkit/uuid/DatFileFilter.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/uuid/DatFileFilter.java index 8fc0398dd..a60c7a77c 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/DatFileFilter.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/uuid/DatFileFilter.java @@ -1,4 +1,4 @@ -package com.plotsquared.bukkit.uuid; +package com.github.intellectualsites.plotsquared.nukkit.uuid; import java.io.File; import java.io.FilenameFilter; diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/uuid/FileUUIDHandler.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/uuid/FileUUIDHandler.java similarity index 74% rename from Nukkit/src/main/java/com/plotsquared/nukkit/uuid/FileUUIDHandler.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/uuid/FileUUIDHandler.java index 7c8d68d45..5f6c569ce 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/uuid/FileUUIDHandler.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/uuid/FileUUIDHandler.java @@ -1,14 +1,14 @@ -package com.plotsquared.nukkit.uuid; +package com.github.intellectualsites.plotsquared.nukkit.uuid; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandlerImplementation; +import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager; +import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; import com.google.common.collect.HashBiMap; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.RunnableVal; -import com.intellectualcrafters.plot.object.StringWrapper; -import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.UUIDHandlerImplementation; -import com.intellectualcrafters.plot.util.expiry.ExpireManager; -import com.intellectualcrafters.plot.uuid.UUIDWrapper; import java.io.File; import java.util.HashMap; diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/uuid/LowerOfflineUUIDWrapper.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/uuid/LowerOfflineUUIDWrapper.java similarity index 77% rename from Nukkit/src/main/java/com/plotsquared/nukkit/uuid/LowerOfflineUUIDWrapper.java rename to Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/uuid/LowerOfflineUUIDWrapper.java index 086547265..e2be30654 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/uuid/LowerOfflineUUIDWrapper.java +++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/uuid/LowerOfflineUUIDWrapper.java @@ -1,9 +1,9 @@ -package com.plotsquared.nukkit.uuid; +package com.github.intellectualsites.plotsquared.nukkit.uuid; +import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; import com.google.common.base.Charsets; -import com.intellectualcrafters.plot.object.OfflinePlotPlayer; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.uuid.UUIDWrapper; import java.util.UUID; diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitHybridUtils.java b/Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitHybridUtils.java deleted file mode 100644 index 6ed359f2e..000000000 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitHybridUtils.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.plotsquared.nukkit.util; - -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.generator.HybridUtils; -import com.intellectualcrafters.plot.object.RegionWrapper; -import com.intellectualcrafters.plot.object.RunnableVal; -import com.intellectualcrafters.plot.util.expiry.PlotAnalysis; - -public class NukkitHybridUtils extends HybridUtils { - - public NukkitHybridUtils() { - PS.debug("Not implemented: NukkitHybridUtils"); - } - - @Override public void analyzeRegion(final String world, final RegionWrapper region, - final RunnableVal whenDone) { - throw new UnsupportedOperationException("NOT IMPLEMENTED YET"); - } -} diff --git a/Nukkit/src/main/resources/plugin.yml b/Nukkit/src/main/resources/plugin.yml index ffa54fa1b..a25e26cf9 100644 --- a/Nukkit/src/main/resources/plugin.yml +++ b/Nukkit/src/main/resources/plugin.yml @@ -2,7 +2,7 @@ name: "${name}" version: "${version}" author: Empire92 api: ["1.0.0"] -main: com.plotsquared.nukkit.NukkitMain +main: NukkitMain load: STARTUP permissions: plots.use: @@ -149,4 +149,4 @@ permissions: plots.gamemode.bypass: default: op plots.confirm.bypass: - default: false \ No newline at end of file + default: false diff --git a/Sponge/src/main/java/com/plotsquared/sponge/SpongeMain.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/SpongeMain.java similarity index 84% rename from Sponge/src/main/java/com/plotsquared/sponge/SpongeMain.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/SpongeMain.java index 7d06ed832..b17e3aafb 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/SpongeMain.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/SpongeMain.java @@ -1,36 +1,36 @@ -package com.plotsquared.sponge; +package com.github.intellectualsites.plotsquared.sponge; +import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; +import com.github.intellectualsites.plotsquared.plot.IPlotMain; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; +import com.github.intellectualsites.plotsquared.plot.generator.HybridGen; +import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; +import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.SetupObject; +import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; +import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea; +import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; +import com.github.intellectualsites.plotsquared.plot.object.worlds.SingleWorldGenerator; +import com.github.intellectualsites.plotsquared.plot.util.*; +import com.github.intellectualsites.plotsquared.plot.util.block.QueueProvider; +import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; +import com.github.intellectualsites.plotsquared.sponge.generator.SpongePlotGenerator; +import com.github.intellectualsites.plotsquared.sponge.listener.ChunkProcessor; +import com.github.intellectualsites.plotsquared.sponge.listener.MainListener; +import com.github.intellectualsites.plotsquared.sponge.listener.WorldEvents; +import com.github.intellectualsites.plotsquared.sponge.util.*; +import com.github.intellectualsites.plotsquared.sponge.util.block.SpongeLocalQueue; +import com.github.intellectualsites.plotsquared.sponge.uuid.SpongeLowerOfflineUUIDWrapper; +import com.github.intellectualsites.plotsquared.sponge.uuid.SpongeOnlineUUIDWrapper; +import com.github.intellectualsites.plotsquared.sponge.uuid.SpongeUUIDHandler; import com.google.inject.Inject; -import com.intellectualcrafters.configuration.ConfigurationSection; -import com.intellectualcrafters.plot.IPlotMain; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.config.ConfigurationNode; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.generator.GeneratorWrapper; -import com.intellectualcrafters.plot.generator.HybridGen; -import com.intellectualcrafters.plot.generator.HybridUtils; -import com.intellectualcrafters.plot.generator.IndependentPlotGenerator; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotId; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.SetupObject; -import com.intellectualcrafters.plot.object.worlds.PlotAreaManager; -import com.intellectualcrafters.plot.object.worlds.SinglePlotArea; -import com.intellectualcrafters.plot.object.worlds.SinglePlotAreaManager; -import com.intellectualcrafters.plot.object.worlds.SingleWorldGenerator; -import com.intellectualcrafters.plot.util.*; -import com.intellectualcrafters.plot.util.block.QueueProvider; -import com.intellectualcrafters.plot.uuid.UUIDWrapper; -import com.plotsquared.sponge.generator.SpongePlotGenerator; -import com.plotsquared.sponge.listener.ChunkProcessor; -import com.plotsquared.sponge.listener.MainListener; -import com.plotsquared.sponge.listener.WorldEvents; -import com.plotsquared.sponge.util.*; -import com.plotsquared.sponge.util.block.SpongeLocalQueue; -import com.plotsquared.sponge.uuid.SpongeLowerOfflineUUIDWrapper; -import com.plotsquared.sponge.uuid.SpongeOnlineUUIDWrapper; -import com.plotsquared.sponge.uuid.SpongeUUIDHandler; import net.minecrell.mcstats.SpongeStatsLite; import org.slf4j.Logger; import org.spongepowered.api.Game; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/events/ClusterFlagRemoveEvent.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/ClusterFlagRemoveEvent.java similarity index 83% rename from Sponge/src/main/java/com/plotsquared/sponge/events/ClusterFlagRemoveEvent.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/ClusterFlagRemoveEvent.java index cd962fcb2..09ea38f79 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/events/ClusterFlagRemoveEvent.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/ClusterFlagRemoveEvent.java @@ -1,7 +1,7 @@ -package com.plotsquared.sponge.events; +package com.github.intellectualsites.plotsquared.sponge.events; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.object.PlotCluster; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.object.PlotCluster; import org.spongepowered.api.event.Cancellable; import org.spongepowered.api.event.cause.Cause; import org.spongepowered.api.event.impl.AbstractEvent; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/events/PlayerClaimPlotEvent.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlayerClaimPlotEvent.java similarity index 90% rename from Sponge/src/main/java/com/plotsquared/sponge/events/PlayerClaimPlotEvent.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlayerClaimPlotEvent.java index 2108df17c..d5d417987 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/events/PlayerClaimPlotEvent.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlayerClaimPlotEvent.java @@ -1,6 +1,6 @@ -package com.plotsquared.sponge.events; +package com.github.intellectualsites.plotsquared.sponge.events; -import com.intellectualcrafters.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.Plot; import org.spongepowered.api.entity.living.player.Player; import org.spongepowered.api.event.Cancellable; import org.spongepowered.api.event.cause.Cause; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/events/PlayerEnterPlotEvent.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlayerEnterPlotEvent.java similarity index 84% rename from Sponge/src/main/java/com/plotsquared/sponge/events/PlayerEnterPlotEvent.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlayerEnterPlotEvent.java index b3cb3e520..aa38782ab 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/events/PlayerEnterPlotEvent.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlayerEnterPlotEvent.java @@ -1,6 +1,6 @@ -package com.plotsquared.sponge.events; +package com.github.intellectualsites.plotsquared.sponge.events; -import com.intellectualcrafters.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.Plot; import org.spongepowered.api.entity.living.player.Player; import org.spongepowered.api.event.cause.Cause; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/events/PlayerEvent.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlayerEvent.java similarity index 88% rename from Sponge/src/main/java/com/plotsquared/sponge/events/PlayerEvent.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlayerEvent.java index 861b88561..2bd39c135 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/events/PlayerEvent.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlayerEvent.java @@ -1,4 +1,4 @@ -package com.plotsquared.sponge.events; +package com.github.intellectualsites.plotsquared.sponge.events; import org.spongepowered.api.entity.living.player.Player; import org.spongepowered.api.event.cause.Cause; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/events/PlayerLeavePlotEvent.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlayerLeavePlotEvent.java similarity index 81% rename from Sponge/src/main/java/com/plotsquared/sponge/events/PlayerLeavePlotEvent.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlayerLeavePlotEvent.java index c4e652131..b3ce5746d 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/events/PlayerLeavePlotEvent.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlayerLeavePlotEvent.java @@ -1,6 +1,6 @@ -package com.plotsquared.sponge.events; +package com.github.intellectualsites.plotsquared.sponge.events; -import com.intellectualcrafters.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.Plot; import org.spongepowered.api.entity.living.player.Player; public class PlayerLeavePlotEvent extends PlayerEvent { diff --git a/Sponge/src/main/java/com/plotsquared/sponge/events/PlayerPlotDeniedEvent.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlayerPlotDeniedEvent.java similarity index 90% rename from Sponge/src/main/java/com/plotsquared/sponge/events/PlayerPlotDeniedEvent.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlayerPlotDeniedEvent.java index 7db4e0780..b2c490c97 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/events/PlayerPlotDeniedEvent.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlayerPlotDeniedEvent.java @@ -1,6 +1,6 @@ -package com.plotsquared.sponge.events; +package com.github.intellectualsites.plotsquared.sponge.events; -import com.intellectualcrafters.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.Plot; import org.spongepowered.api.entity.living.player.Player; import java.util.UUID; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/events/PlayerPlotHelperEvent.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlayerPlotHelperEvent.java similarity index 90% rename from Sponge/src/main/java/com/plotsquared/sponge/events/PlayerPlotHelperEvent.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlayerPlotHelperEvent.java index 22ba219b4..d041bdebb 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/events/PlayerPlotHelperEvent.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlayerPlotHelperEvent.java @@ -1,6 +1,6 @@ -package com.plotsquared.sponge.events; +package com.github.intellectualsites.plotsquared.sponge.events; -import com.intellectualcrafters.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.Plot; import org.spongepowered.api.entity.living.player.Player; import java.util.UUID; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/events/PlayerPlotTrustedEvent.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlayerPlotTrustedEvent.java similarity index 90% rename from Sponge/src/main/java/com/plotsquared/sponge/events/PlayerPlotTrustedEvent.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlayerPlotTrustedEvent.java index b1f538566..6705307fd 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/events/PlayerPlotTrustedEvent.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlayerPlotTrustedEvent.java @@ -1,6 +1,6 @@ -package com.plotsquared.sponge.events; +package com.github.intellectualsites.plotsquared.sponge.events; -import com.intellectualcrafters.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.Plot; import org.spongepowered.api.entity.living.player.Player; import java.util.UUID; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/events/PlayerTeleportToPlotEvent.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlayerTeleportToPlotEvent.java similarity index 85% rename from Sponge/src/main/java/com/plotsquared/sponge/events/PlayerTeleportToPlotEvent.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlayerTeleportToPlotEvent.java index 69f3c6b20..41f7e7510 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/events/PlayerTeleportToPlotEvent.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlayerTeleportToPlotEvent.java @@ -1,7 +1,7 @@ -package com.plotsquared.sponge.events; +package com.github.intellectualsites.plotsquared.sponge.events; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; import org.spongepowered.api.entity.living.player.Player; import org.spongepowered.api.event.Cancellable; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/events/PlotClearEvent.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotClearEvent.java similarity index 83% rename from Sponge/src/main/java/com/plotsquared/sponge/events/PlotClearEvent.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotClearEvent.java index c54d55dd6..231b9740e 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/events/PlotClearEvent.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotClearEvent.java @@ -1,7 +1,7 @@ -package com.plotsquared.sponge.events; +package com.github.intellectualsites.plotsquared.sponge.events; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotId; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; import org.spongepowered.api.event.Cancellable; import org.spongepowered.api.event.cause.Cause; import org.spongepowered.api.event.impl.AbstractEvent; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/events/PlotComponentSetEvent.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotComponentSetEvent.java similarity index 84% rename from Sponge/src/main/java/com/plotsquared/sponge/events/PlotComponentSetEvent.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotComponentSetEvent.java index 561e51af7..d9a424cc0 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/events/PlotComponentSetEvent.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotComponentSetEvent.java @@ -1,7 +1,7 @@ -package com.plotsquared.sponge.events; +package com.github.intellectualsites.plotsquared.sponge.events; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotId; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; import org.spongepowered.api.event.cause.Cause; import org.spongepowered.api.event.impl.AbstractEvent; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/events/PlotDeleteEvent.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotDeleteEvent.java similarity index 78% rename from Sponge/src/main/java/com/plotsquared/sponge/events/PlotDeleteEvent.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotDeleteEvent.java index e3dacb731..23b322db4 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/events/PlotDeleteEvent.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotDeleteEvent.java @@ -1,7 +1,7 @@ -package com.plotsquared.sponge.events; +package com.github.intellectualsites.plotsquared.sponge.events; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotId; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; import org.spongepowered.api.event.cause.Cause; import org.spongepowered.api.event.impl.AbstractEvent; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/events/PlotEvent.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotEvent.java similarity index 75% rename from Sponge/src/main/java/com/plotsquared/sponge/events/PlotEvent.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotEvent.java index eac4538c5..70b77c5fc 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/events/PlotEvent.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotEvent.java @@ -1,6 +1,6 @@ -package com.plotsquared.sponge.events; +package com.github.intellectualsites.plotsquared.sponge.events; -import com.intellectualcrafters.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.Plot; import org.spongepowered.api.event.cause.Cause; import org.spongepowered.api.event.impl.AbstractEvent; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/events/PlotFlagAddEvent.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotFlagAddEvent.java similarity index 80% rename from Sponge/src/main/java/com/plotsquared/sponge/events/PlotFlagAddEvent.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotFlagAddEvent.java index 613c7553b..49f5251a3 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/events/PlotFlagAddEvent.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotFlagAddEvent.java @@ -1,7 +1,7 @@ -package com.plotsquared.sponge.events; +package com.github.intellectualsites.plotsquared.sponge.events; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.object.Plot; import org.spongepowered.api.event.Cancellable; public class PlotFlagAddEvent extends PlotEvent implements Cancellable { diff --git a/Sponge/src/main/java/com/plotsquared/sponge/events/PlotFlagRemoveEvent.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotFlagRemoveEvent.java similarity index 80% rename from Sponge/src/main/java/com/plotsquared/sponge/events/PlotFlagRemoveEvent.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotFlagRemoveEvent.java index 7f3b87fd1..a14e5d06f 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/events/PlotFlagRemoveEvent.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotFlagRemoveEvent.java @@ -1,7 +1,7 @@ -package com.plotsquared.sponge.events; +package com.github.intellectualsites.plotsquared.sponge.events; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.object.Plot; import org.spongepowered.api.event.Cancellable; public class PlotFlagRemoveEvent extends PlotEvent implements Cancellable { diff --git a/Sponge/src/main/java/com/plotsquared/sponge/events/PlotMergeEvent.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotMergeEvent.java similarity index 87% rename from Sponge/src/main/java/com/plotsquared/sponge/events/PlotMergeEvent.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotMergeEvent.java index 01a6b34f2..6352169fb 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/events/PlotMergeEvent.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotMergeEvent.java @@ -1,7 +1,7 @@ -package com.plotsquared.sponge.events; +package com.github.intellectualsites.plotsquared.sponge.events; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotId; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; import org.spongepowered.api.event.Cancellable; import org.spongepowered.api.event.cause.Cause; import org.spongepowered.api.event.impl.AbstractEvent; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/events/PlotRateEvent.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotRateEvent.java similarity index 64% rename from Sponge/src/main/java/com/plotsquared/sponge/events/PlotRateEvent.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotRateEvent.java index fb69bd759..3b5b0595b 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/events/PlotRateEvent.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotRateEvent.java @@ -1,8 +1,8 @@ -package com.plotsquared.sponge.events; +package com.github.intellectualsites.plotsquared.sponge.events; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.Rating; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.Rating; public class PlotRateEvent extends PlotEvent { private final PlotPlayer rater; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/events/PlotUnlinkEvent.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotUnlinkEvent.java similarity index 89% rename from Sponge/src/main/java/com/plotsquared/sponge/events/PlotUnlinkEvent.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotUnlinkEvent.java index 31d7842f5..6c0cd2849 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/events/PlotUnlinkEvent.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotUnlinkEvent.java @@ -1,6 +1,6 @@ -package com.plotsquared.sponge.events; +package com.github.intellectualsites.plotsquared.sponge.events; -import com.intellectualcrafters.plot.object.PlotId; +import com.github.intellectualsites.plotsquared.plot.object.PlotId; import org.spongepowered.api.event.Cancellable; import org.spongepowered.api.event.cause.Cause; import org.spongepowered.api.event.impl.AbstractEvent; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/generator/SpongeAugmentedGenerator.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/generator/SpongeAugmentedGenerator.java similarity index 85% rename from Sponge/src/main/java/com/plotsquared/sponge/generator/SpongeAugmentedGenerator.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/generator/SpongeAugmentedGenerator.java index eb0ba2092..78353c9d9 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/generator/SpongeAugmentedGenerator.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/generator/SpongeAugmentedGenerator.java @@ -1,10 +1,10 @@ -package com.plotsquared.sponge.generator; +package com.github.intellectualsites.plotsquared.sponge.generator; import com.flowpowered.math.vector.Vector3i; -import com.intellectualcrafters.plot.generator.AugmentedUtils; -import com.intellectualcrafters.plot.object.PlotBlock; -import com.intellectualcrafters.plot.util.block.DelegateLocalBlockQueue; -import com.plotsquared.sponge.util.SpongeUtil; +import com.github.intellectualsites.plotsquared.plot.generator.AugmentedUtils; +import com.github.intellectualsites.plotsquared.plot.object.PlotBlock; +import com.github.intellectualsites.plotsquared.plot.util.block.DelegateLocalBlockQueue; +import com.github.intellectualsites.plotsquared.sponge.util.SpongeUtil; import org.spongepowered.api.block.BlockState; import org.spongepowered.api.world.World; import org.spongepowered.api.world.extent.ImmutableBiomeVolume; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/generator/SpongePlotGenerator.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/generator/SpongePlotGenerator.java similarity index 86% rename from Sponge/src/main/java/com/plotsquared/sponge/generator/SpongePlotGenerator.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/generator/SpongePlotGenerator.java index 54cbabc5a..6650de76c 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/generator/SpongePlotGenerator.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/generator/SpongePlotGenerator.java @@ -1,14 +1,14 @@ -package com.plotsquared.sponge.generator; +package com.github.intellectualsites.plotsquared.sponge.generator; import com.flowpowered.math.vector.Vector3i; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.generator.GeneratorWrapper; -import com.intellectualcrafters.plot.generator.IndependentPlotGenerator; -import com.intellectualcrafters.plot.object.PlotArea; -import com.intellectualcrafters.plot.object.PlotManager; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.ReflectionUtils; -import com.plotsquared.sponge.util.SpongeUtil; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; +import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.PlotManager; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils; +import com.github.intellectualsites.plotsquared.sponge.util.SpongeUtil; import org.spongepowered.api.data.DataContainer; import org.spongepowered.api.world.biome.BiomeGenerationSettings; import org.spongepowered.api.world.biome.BiomeType; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/generator/SpongeTerrainGen.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/generator/SpongeTerrainGen.java similarity index 78% rename from Sponge/src/main/java/com/plotsquared/sponge/generator/SpongeTerrainGen.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/generator/SpongeTerrainGen.java index ba947fc55..25debe436 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/generator/SpongeTerrainGen.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/generator/SpongeTerrainGen.java @@ -1,16 +1,16 @@ -package com.plotsquared.sponge.generator; +package com.github.intellectualsites.plotsquared.sponge.generator; import com.flowpowered.math.vector.Vector3i; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.generator.GeneratorWrapper; -import com.intellectualcrafters.plot.generator.IndependentPlotGenerator; -import com.intellectualcrafters.plot.object.ChunkWrapper; -import com.intellectualcrafters.plot.object.PlotArea; -import com.intellectualcrafters.plot.object.PseudoRandom; -import com.intellectualcrafters.plot.util.ChunkManager; -import com.intellectualcrafters.plot.util.MainUtil; -import com.plotsquared.sponge.util.SpongeUtil; -import com.plotsquared.sponge.util.block.GenChunk; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; +import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator; +import com.github.intellectualsites.plotsquared.plot.object.ChunkWrapper; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.PseudoRandom; +import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.sponge.util.SpongeUtil; +import com.github.intellectualsites.plotsquared.sponge.util.block.GenChunk; import org.spongepowered.api.world.World; import org.spongepowered.api.world.extent.ImmutableBiomeVolume; import org.spongepowered.api.world.extent.MutableBlockVolume; diff --git a/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/listener/ChunkProcessor.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/listener/ChunkProcessor.java new file mode 100644 index 000000000..29f41c65d --- /dev/null +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/listener/ChunkProcessor.java @@ -0,0 +1,5 @@ +package com.github.intellectualsites.plotsquared.sponge.listener; + +public class ChunkProcessor { + // TODO FIXME +} diff --git a/Sponge/src/main/java/com/plotsquared/sponge/listener/ForceFieldListener.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/listener/ForceFieldListener.java similarity index 87% rename from Sponge/src/main/java/com/plotsquared/sponge/listener/ForceFieldListener.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/listener/ForceFieldListener.java index ae2105a70..4c461db40 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/listener/ForceFieldListener.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/listener/ForceFieldListener.java @@ -1,12 +1,12 @@ -package com.plotsquared.sponge.listener; +package com.github.intellectualsites.plotsquared.sponge.listener; import com.flowpowered.math.vector.Vector3d; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.plotsquared.sponge.object.SpongePlayer; -import com.plotsquared.sponge.util.SpongeUtil; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.sponge.object.SpongePlayer; +import com.github.intellectualsites.plotsquared.sponge.util.SpongeUtil; import org.spongepowered.api.entity.Entity; import org.spongepowered.api.entity.EntityTypes; import org.spongepowered.api.entity.living.player.Player; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/listener/MainListener.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/listener/MainListener.java similarity index 97% rename from Sponge/src/main/java/com/plotsquared/sponge/listener/MainListener.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/listener/MainListener.java index 54a53ee37..6d2394b96 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/listener/MainListener.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/listener/MainListener.java @@ -1,14 +1,14 @@ -package com.plotsquared.sponge.listener; +package com.github.intellectualsites.plotsquared.sponge.listener; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.flag.Flags; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.*; -import com.plotsquared.listener.PlotListener; -import com.plotsquared.sponge.SpongeMain; -import com.plotsquared.sponge.object.SpongePlayer; -import com.plotsquared.sponge.util.SpongeUtil; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.flag.Flags; +import com.github.intellectualsites.plotsquared.plot.listener.PlotListener; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.*; +import com.github.intellectualsites.plotsquared.sponge.SpongeMain; +import com.github.intellectualsites.plotsquared.sponge.object.SpongePlayer; +import com.github.intellectualsites.plotsquared.sponge.util.SpongeUtil; import org.spongepowered.api.block.BlockSnapshot; import org.spongepowered.api.block.BlockState; import org.spongepowered.api.data.Transaction; @@ -259,7 +259,7 @@ import java.util.function.Predicate; // return true; // } // org.spongepowered.api.world.Location loc = relatives.get(dir); - // com.intellectualcrafters.plot.object.Location plotloc = SpongeUtil.getLocation(loc.getExtent().getPluginName(), loc); + // Location plotloc = SpongeUtil.getLocation(loc.getExtent().getPluginName(), loc); // if (area == null) { // return true; // } @@ -274,7 +274,7 @@ import java.util.function.Predicate; // return true; // } // org.spongepowered.api.world.Location relative = loc.getRelative(dir); - // com.intellectualcrafters.plot.object.Location relLoc = SpongeUtil.getLocation(relative.getExtent().getPluginName(), relative); + // Location relLoc = SpongeUtil.getLocation(relative.getExtent().getPluginName(), relative); // if (plot.equals(MainUtil.getPlot(relLoc))) { // return true; // } diff --git a/Sponge/src/main/java/com/plotsquared/sponge/listener/WorldEvents.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/listener/WorldEvents.java similarity index 80% rename from Sponge/src/main/java/com/plotsquared/sponge/listener/WorldEvents.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/listener/WorldEvents.java index 6564cd199..d9dbd8784 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/listener/WorldEvents.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/listener/WorldEvents.java @@ -1,7 +1,7 @@ -package com.plotsquared.sponge.listener; +package com.github.intellectualsites.plotsquared.sponge.listener; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.generator.GeneratorWrapper; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; import org.spongepowered.api.event.Listener; import org.spongepowered.api.event.world.LoadWorldEvent; import org.spongepowered.api.world.World; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/object/SpongeOfflinePlayer.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/object/SpongeOfflinePlayer.java similarity index 79% rename from Sponge/src/main/java/com/plotsquared/sponge/object/SpongeOfflinePlayer.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/object/SpongeOfflinePlayer.java index f85a918ae..1d96c0080 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/object/SpongeOfflinePlayer.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/object/SpongeOfflinePlayer.java @@ -1,6 +1,6 @@ -package com.plotsquared.sponge.object; +package com.github.intellectualsites.plotsquared.sponge.object; -import com.intellectualcrafters.plot.object.OfflinePlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; import org.spongepowered.api.entity.living.player.User; import java.util.UUID; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/object/SpongePlayer.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/object/SpongePlayer.java similarity index 92% rename from Sponge/src/main/java/com/plotsquared/sponge/object/SpongePlayer.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/object/SpongePlayer.java index 460fab987..d42238b63 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/object/SpongePlayer.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/object/SpongePlayer.java @@ -1,15 +1,15 @@ -package com.plotsquared.sponge.object; +package com.github.intellectualsites.plotsquared.sponge.object; import com.flowpowered.math.vector.Vector3d; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.commands.RequiredType; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.PlotGameMode; -import com.intellectualcrafters.plot.util.PlotWeather; -import com.intellectualcrafters.plot.util.StringMan; -import com.intellectualcrafters.plot.util.UUIDHandler; -import com.plotsquared.sponge.util.SpongeUtil; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.commands.RequiredType; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.PlotGameMode; +import com.github.intellectualsites.plotsquared.plot.util.PlotWeather; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.sponge.util.SpongeUtil; import org.spongepowered.api.Sponge; import org.spongepowered.api.data.key.Keys; import org.spongepowered.api.data.manipulator.mutable.TargetedLocationData; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/util/KillRoadMobs.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/KillRoadMobs.java similarity index 72% rename from Sponge/src/main/java/com/plotsquared/sponge/util/KillRoadMobs.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/KillRoadMobs.java index 75f4c738a..ee8ee3659 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/util/KillRoadMobs.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/KillRoadMobs.java @@ -1,4 +1,4 @@ -package com.plotsquared.sponge.util; +package com.github.intellectualsites.plotsquared.sponge.util; public class KillRoadMobs { public void run() { diff --git a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeChatManager.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeChatManager.java similarity index 89% rename from Sponge/src/main/java/com/plotsquared/sponge/util/SpongeChatManager.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeChatManager.java index eb00ba0af..000e71352 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeChatManager.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeChatManager.java @@ -1,11 +1,11 @@ -package com.plotsquared.sponge.util; +package com.github.intellectualsites.plotsquared.sponge.util; -import com.intellectualcrafters.plot.config.Settings; -import com.intellectualcrafters.plot.object.ConsolePlayer; -import com.intellectualcrafters.plot.object.PlotMessage; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.ChatManager; -import com.plotsquared.sponge.object.SpongePlayer; +import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.github.intellectualsites.plotsquared.plot.object.ConsolePlayer; +import com.github.intellectualsites.plotsquared.plot.object.PlotMessage; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.ChatManager; +import com.github.intellectualsites.plotsquared.sponge.object.SpongePlayer; import org.spongepowered.api.text.Text; import org.spongepowered.api.text.action.TextActions; import org.spongepowered.api.text.format.TextColor; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeChunkManager.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeChunkManager.java similarity index 90% rename from Sponge/src/main/java/com/plotsquared/sponge/util/SpongeChunkManager.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeChunkManager.java index 31ad2283d..5de2ae309 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeChunkManager.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeChunkManager.java @@ -1,10 +1,10 @@ -package com.plotsquared.sponge.util; +package com.github.intellectualsites.plotsquared.sponge.util; -import com.intellectualcrafters.plot.object.ChunkLoc; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.Plot; -import com.intellectualcrafters.plot.util.ChunkManager; -import com.intellectualcrafters.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.plot.object.ChunkLoc; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.github.intellectualsites.plotsquared.plot.util.ChunkManager; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; import org.spongepowered.api.entity.Entity; import org.spongepowered.api.entity.living.Living; import org.spongepowered.api.entity.living.animal.Animal; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeCommand.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeCommand.java similarity index 86% rename from Sponge/src/main/java/com/plotsquared/sponge/util/SpongeCommand.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeCommand.java index 67900d405..2c6b9b936 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeCommand.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeCommand.java @@ -1,12 +1,12 @@ -package com.plotsquared.sponge.util; +package com.github.intellectualsites.plotsquared.sponge.util; +import com.github.intellectualsites.plotsquared.plot.commands.MainCommand; +import com.github.intellectualsites.plotsquared.plot.object.ConsolePlayer; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.sponge.SpongeMain; import com.google.common.collect.ImmutableList; -import com.intellectualcrafters.plot.commands.MainCommand; -import com.intellectualcrafters.plot.object.ConsolePlayer; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.UUIDHandler; -import com.plotsquared.sponge.SpongeMain; import org.spongepowered.api.command.CommandCallable; import org.spongepowered.api.command.CommandException; import org.spongepowered.api.command.CommandResult; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeEconHandler.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeEconHandler.java similarity index 86% rename from Sponge/src/main/java/com/plotsquared/sponge/util/SpongeEconHandler.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeEconHandler.java index 0149be33a..1a3ff7a19 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeEconHandler.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeEconHandler.java @@ -1,10 +1,10 @@ -package com.plotsquared.sponge.util; +package com.github.intellectualsites.plotsquared.sponge.util; -import com.intellectualcrafters.plot.object.OfflinePlotPlayer; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.EconHandler; -import com.intellectualcrafters.plot.util.UUIDHandler; -import com.plotsquared.sponge.object.SpongePlayer; +import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.EconHandler; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.sponge.object.SpongePlayer; import org.spongepowered.api.Sponge; import org.spongepowered.api.event.Listener; import org.spongepowered.api.event.service.ChangeServiceProviderEvent; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeEventUtil.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeEventUtil.java similarity index 89% rename from Sponge/src/main/java/com/plotsquared/sponge/util/SpongeEventUtil.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeEventUtil.java index 3e351e3e3..a5b619abf 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeEventUtil.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeEventUtil.java @@ -1,10 +1,10 @@ -package com.plotsquared.sponge.util; +package com.github.intellectualsites.plotsquared.sponge.util; -import com.intellectualcrafters.plot.flag.Flag; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.EventUtil; -import com.plotsquared.sponge.SpongeMain; -import com.plotsquared.sponge.events.*; +import com.github.intellectualsites.plotsquared.plot.flag.Flag; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.EventUtil; +import com.github.intellectualsites.plotsquared.sponge.SpongeMain; +import com.github.intellectualsites.plotsquared.sponge.events.*; import org.spongepowered.api.event.Event; import org.spongepowered.api.event.EventManager; diff --git a/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeHybridUtils.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeHybridUtils.java new file mode 100644 index 000000000..fefc868f6 --- /dev/null +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeHybridUtils.java @@ -0,0 +1,15 @@ +package com.github.intellectualsites.plotsquared.sponge.util; + +import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils; +import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.util.expiry.PlotAnalysis; + +public class SpongeHybridUtils extends HybridUtils { + + @Override public void analyzeRegion(String world, RegionWrapper region, + RunnableVal whenDone) { + throw new UnsupportedOperationException("NOT IMPLEMENTED YET"); + } + +} diff --git a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeInventoryUtil.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeInventoryUtil.java similarity index 87% rename from Sponge/src/main/java/com/plotsquared/sponge/util/SpongeInventoryUtil.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeInventoryUtil.java index fd276d178..ebda5279c 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeInventoryUtil.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeInventoryUtil.java @@ -1,11 +1,11 @@ -package com.plotsquared.sponge.util; +package com.github.intellectualsites.plotsquared.sponge.util; -import com.intellectualcrafters.plot.object.PlotInventory; -import com.intellectualcrafters.plot.object.PlotItemStack; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.InventoryUtil; -import com.plotsquared.sponge.SpongeMain; -import com.plotsquared.sponge.object.SpongePlayer; +import com.github.intellectualsites.plotsquared.plot.object.PlotInventory; +import com.github.intellectualsites.plotsquared.plot.object.PlotItemStack; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.InventoryUtil; +import com.github.intellectualsites.plotsquared.sponge.SpongeMain; +import com.github.intellectualsites.plotsquared.sponge.object.SpongePlayer; import org.spongepowered.api.entity.living.player.Player; import org.spongepowered.api.item.ItemType; import org.spongepowered.api.item.ItemTypes; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeMetrics.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeMetrics.java similarity index 99% rename from Sponge/src/main/java/com/plotsquared/sponge/util/SpongeMetrics.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeMetrics.java index 0dd8dc792..4ec8aa72c 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeMetrics.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeMetrics.java @@ -1,4 +1,4 @@ -package com.plotsquared.sponge.util; +package com.github.intellectualsites.plotsquared.sponge.util; /* * Copyright 2011-2013 Tyler Blair. All rights reserved. @@ -28,8 +28,8 @@ package com.plotsquared.sponge.util; * either expressed or implied, of anybody else. */ +import com.github.intellectualsites.plotsquared.plot.PS; import com.google.inject.Inject; -import com.intellectualcrafters.plot.PS; import ninja.leaping.configurate.commented.CommentedConfigurationNode; import ninja.leaping.configurate.hocon.HoconConfigurationLoader; import ninja.leaping.configurate.loader.ConfigurationLoader; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSchematicHandler.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeSchematicHandler.java similarity index 97% rename from Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSchematicHandler.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeSchematicHandler.java index b2e96a658..d9c217424 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSchematicHandler.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeSchematicHandler.java @@ -1,11 +1,11 @@ -package com.plotsquared.sponge.util; +package com.github.intellectualsites.plotsquared.sponge.util; -import com.intellectualcrafters.jnbt.*; -import com.intellectualcrafters.plot.object.*; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.SchematicHandler; -import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.block.LocalBlockQueue; +import com.github.intellectualsites.plotsquared.jnbt.*; +import com.github.intellectualsites.plotsquared.plot.object.*; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue; import org.spongepowered.api.block.BlockState; import org.spongepowered.api.item.inventory.Carrier; import org.spongepowered.api.item.inventory.type.CarriedInventory; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSetupUtils.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeSetupUtils.java similarity index 92% rename from Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSetupUtils.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeSetupUtils.java index ae349afa0..e8117f3a4 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSetupUtils.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeSetupUtils.java @@ -1,14 +1,14 @@ -package com.plotsquared.sponge.util; +package com.github.intellectualsites.plotsquared.sponge.util; -import com.intellectualcrafters.configuration.ConfigurationSection; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.ConfigurationNode; -import com.intellectualcrafters.plot.generator.GeneratorWrapper; -import com.intellectualcrafters.plot.object.PlotArea; -import com.intellectualcrafters.plot.object.SetupObject; -import com.intellectualcrafters.plot.object.worlds.SingleWorldGenerator; -import com.intellectualcrafters.plot.util.SetupUtils; -import com.plotsquared.sponge.generator.SpongePlotGenerator; +import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; +import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper; +import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.github.intellectualsites.plotsquared.plot.object.SetupObject; +import com.github.intellectualsites.plotsquared.plot.object.worlds.SingleWorldGenerator; +import com.github.intellectualsites.plotsquared.plot.util.SetupUtils; +import com.github.intellectualsites.plotsquared.sponge.generator.SpongePlotGenerator; import org.spongepowered.api.Sponge; import org.spongepowered.api.world.DimensionTypes; import org.spongepowered.api.world.GeneratorTypes; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeTaskManager.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeTaskManager.java similarity index 92% rename from Sponge/src/main/java/com/plotsquared/sponge/util/SpongeTaskManager.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeTaskManager.java index 2a9484770..b7d94ef44 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeTaskManager.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeTaskManager.java @@ -1,7 +1,7 @@ -package com.plotsquared.sponge.util; +package com.github.intellectualsites.plotsquared.sponge.util; -import com.intellectualcrafters.plot.util.TaskManager; -import com.plotsquared.sponge.SpongeMain; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.sponge.SpongeMain; import org.spongepowered.api.scheduler.Task; import java.util.HashMap; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeTitleManager.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeTitleManager.java similarity index 62% rename from Sponge/src/main/java/com/plotsquared/sponge/util/SpongeTitleManager.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeTitleManager.java index b5c255960..3f2ecf521 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeTitleManager.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeTitleManager.java @@ -1,8 +1,8 @@ -package com.plotsquared.sponge.util; +package com.github.intellectualsites.plotsquared.sponge.util; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.AbstractTitle; -import com.plotsquared.sponge.object.SpongePlayer; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.AbstractTitle; +import com.github.intellectualsites.plotsquared.sponge.object.SpongePlayer; import org.spongepowered.api.text.title.Title; public class SpongeTitleManager extends AbstractTitle { diff --git a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeUtil.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeUtil.java similarity index 95% rename from Sponge/src/main/java/com/plotsquared/sponge/util/SpongeUtil.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeUtil.java index e52a028db..ec8a300db 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeUtil.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeUtil.java @@ -1,17 +1,17 @@ -package com.plotsquared.sponge.util; +package com.github.intellectualsites.plotsquared.sponge.util; import com.flowpowered.math.vector.Vector3d; import com.flowpowered.math.vector.Vector3i; -import com.intellectualcrafters.plot.PS; -import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.PlotBlock; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.RegionWrapper; -import com.intellectualcrafters.plot.object.schematic.PlotItem; -import com.intellectualcrafters.plot.util.*; -import com.plotsquared.sponge.SpongeMain; -import com.plotsquared.sponge.object.SpongePlayer; +import com.github.intellectualsites.plotsquared.plot.PS; +import com.github.intellectualsites.plotsquared.plot.config.C; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.PlotBlock; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper; +import com.github.intellectualsites.plotsquared.plot.object.schematic.PlotItem; +import com.github.intellectualsites.plotsquared.plot.util.*; +import com.github.intellectualsites.plotsquared.sponge.SpongeMain; +import com.github.intellectualsites.plotsquared.sponge.object.SpongePlayer; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.world.biome.Biome; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/util/block/GenChunk.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/block/GenChunk.java similarity index 84% rename from Sponge/src/main/java/com/plotsquared/sponge/util/block/GenChunk.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/block/GenChunk.java index ad8fa00f9..f88e8fa0d 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/util/block/GenChunk.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/block/GenChunk.java @@ -1,10 +1,10 @@ -package com.plotsquared.sponge.util.block; +package com.github.intellectualsites.plotsquared.sponge.util.block; -import com.intellectualcrafters.plot.object.ChunkWrapper; -import com.intellectualcrafters.plot.object.Location; -import com.intellectualcrafters.plot.object.PlotBlock; -import com.intellectualcrafters.plot.util.block.ScopedLocalBlockQueue; -import com.plotsquared.sponge.util.SpongeUtil; +import com.github.intellectualsites.plotsquared.plot.object.ChunkWrapper; +import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.github.intellectualsites.plotsquared.plot.object.PlotBlock; +import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue; +import com.github.intellectualsites.plotsquared.sponge.util.SpongeUtil; import org.spongepowered.api.world.biome.BiomeType; import org.spongepowered.api.world.extent.MutableBiomeVolume; import org.spongepowered.api.world.extent.MutableBlockVolume; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/util/block/SpongeLocalQueue.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/block/SpongeLocalQueue.java similarity index 96% rename from Sponge/src/main/java/com/plotsquared/sponge/util/block/SpongeLocalQueue.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/block/SpongeLocalQueue.java index 66bf26b40..4305b1654 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/util/block/SpongeLocalQueue.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/block/SpongeLocalQueue.java @@ -1,12 +1,12 @@ -package com.plotsquared.sponge.util.block; +package com.github.intellectualsites.plotsquared.sponge.util.block; -import com.intellectualcrafters.plot.object.PlotBlock; -import com.intellectualcrafters.plot.object.PseudoRandom; -import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.StringMan; -import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.block.BasicLocalBlockQueue; -import com.plotsquared.sponge.util.SpongeUtil; +import com.github.intellectualsites.plotsquared.plot.object.PlotBlock; +import com.github.intellectualsites.plotsquared.plot.object.PseudoRandom; +import com.github.intellectualsites.plotsquared.plot.util.MainUtil; +import com.github.intellectualsites.plotsquared.plot.util.StringMan; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.plot.util.block.BasicLocalBlockQueue; +import com.github.intellectualsites.plotsquared.sponge.util.SpongeUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/uuid/SpongeLowerOfflineUUIDWrapper.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/uuid/SpongeLowerOfflineUUIDWrapper.java similarity index 86% rename from Sponge/src/main/java/com/plotsquared/sponge/uuid/SpongeLowerOfflineUUIDWrapper.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/uuid/SpongeLowerOfflineUUIDWrapper.java index df1e7c5c0..1e5ef553d 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/uuid/SpongeLowerOfflineUUIDWrapper.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/uuid/SpongeLowerOfflineUUIDWrapper.java @@ -1,11 +1,11 @@ -package com.plotsquared.sponge.uuid; +package com.github.intellectualsites.plotsquared.sponge.uuid; +import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler; +import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; +import com.github.intellectualsites.plotsquared.sponge.SpongeMain; import com.google.common.base.Charsets; -import com.intellectualcrafters.plot.object.OfflinePlotPlayer; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.util.UUIDHandler; -import com.intellectualcrafters.plot.uuid.UUIDWrapper; -import com.plotsquared.sponge.SpongeMain; import org.spongepowered.api.entity.living.player.Player; import org.spongepowered.api.profile.GameProfile; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/uuid/SpongeOnlineUUIDWrapper.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/uuid/SpongeOnlineUUIDWrapper.java similarity index 82% rename from Sponge/src/main/java/com/plotsquared/sponge/uuid/SpongeOnlineUUIDWrapper.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/uuid/SpongeOnlineUUIDWrapper.java index d9006a6ba..0ee7213f3 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/uuid/SpongeOnlineUUIDWrapper.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/uuid/SpongeOnlineUUIDWrapper.java @@ -1,10 +1,10 @@ -package com.plotsquared.sponge.uuid; +package com.github.intellectualsites.plotsquared.sponge.uuid; -import com.intellectualcrafters.plot.object.OfflinePlotPlayer; -import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.uuid.UUIDWrapper; -import com.plotsquared.sponge.object.SpongeOfflinePlayer; -import com.plotsquared.sponge.object.SpongePlayer; +import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer; +import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; +import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; +import com.github.intellectualsites.plotsquared.sponge.object.SpongeOfflinePlayer; +import com.github.intellectualsites.plotsquared.sponge.object.SpongePlayer; import org.spongepowered.api.Sponge; import org.spongepowered.api.entity.living.player.Player; import org.spongepowered.api.entity.living.player.User; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/uuid/SpongeUUIDHandler.java b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/uuid/SpongeUUIDHandler.java similarity index 69% rename from Sponge/src/main/java/com/plotsquared/sponge/uuid/SpongeUUIDHandler.java rename to Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/uuid/SpongeUUIDHandler.java index 413ca62b6..a5ded685a 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/uuid/SpongeUUIDHandler.java +++ b/Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/uuid/SpongeUUIDHandler.java @@ -1,11 +1,11 @@ -package com.plotsquared.sponge.uuid; +package com.github.intellectualsites.plotsquared.sponge.uuid; -import com.intellectualcrafters.plot.object.RunnableVal; -import com.intellectualcrafters.plot.object.StringWrapper; -import com.intellectualcrafters.plot.util.TaskManager; -import com.intellectualcrafters.plot.util.UUIDHandlerImplementation; -import com.intellectualcrafters.plot.uuid.UUIDWrapper; -import com.plotsquared.sponge.SpongeMain; +import com.github.intellectualsites.plotsquared.plot.object.RunnableVal; +import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; +import com.github.intellectualsites.plotsquared.plot.util.TaskManager; +import com.github.intellectualsites.plotsquared.plot.util.UUIDHandlerImplementation; +import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper; +import com.github.intellectualsites.plotsquared.sponge.SpongeMain; import org.spongepowered.api.profile.GameProfile; import java.util.UUID; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/listener/ChunkProcessor.java b/Sponge/src/main/java/com/plotsquared/sponge/listener/ChunkProcessor.java deleted file mode 100644 index 4ef05dcf4..000000000 --- a/Sponge/src/main/java/com/plotsquared/sponge/listener/ChunkProcessor.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.plotsquared.sponge.listener; - -public class ChunkProcessor { - // TODO FIXME -} diff --git a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeHybridUtils.java b/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeHybridUtils.java deleted file mode 100644 index bb942b15f..000000000 --- a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeHybridUtils.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.plotsquared.sponge.util; - -import com.intellectualcrafters.plot.generator.HybridUtils; -import com.intellectualcrafters.plot.object.RegionWrapper; -import com.intellectualcrafters.plot.object.RunnableVal; -import com.intellectualcrafters.plot.util.expiry.PlotAnalysis; - -public class SpongeHybridUtils extends HybridUtils { - - @Override public void analyzeRegion(String world, RegionWrapper region, - RunnableVal whenDone) { - throw new UnsupportedOperationException("NOT IMPLEMENTED YET"); - } - -} diff --git a/build.gradle b/build.gradle index daa443d33..b76ae7b60 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,15 @@ buildscript { } } +plugins { + id 'io.franzbecker.gradle-lombok' version '1.14' +} + +lombok { + version = '1.18.2' + sha256 = "" +} + group = 'com.intellectualcrafters' def revision = "" @@ -46,7 +55,6 @@ subprojects { apply plugin: 'idea' apply plugin: 'com.github.johnrengelman.shadow' - dependencies { compile(group: 'com.sk89q.worldedit', name: 'worldedit-core', version: '6.1.3-SNAPSHOT') { exclude(module: 'bukkit-classloader-check') @@ -61,7 +69,6 @@ subprojects { repositories { mavenCentral() maven { url "http://empcraft.com/maven2" } - maven { url "http://repo.mcstats.org/content/repositories/public" } maven { url "http://maven.sk89q.com/repo/" } maven { url "http://repo.maven.apache.org/maven2" } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b78b6bc99..1740c7e38 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 293fd09bf..3163269b8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Fri Aug 10 17:33:18 CEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 index 9aa616c27..4453ccea3 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -154,16 +154,19 @@ if $cygwin ; then esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save ( ) { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then cd "$(dirname "$0")" fi -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +exec "$JAVACMD" "$@"