TotalFreedomMC/TF-PlotSquared
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-PlotSquared.git synced 2024-12-23 00:15:06 +00:00
Code Issues Projects Releases Wiki Activity

Update packages. This will not be appreciated 🐱

Browse source
This commit is contained in:
sauilitired 2018-08-10 17:53:14 +02:00
parent 1646cd0f5a
commit b0348cfc34
484 changed files with 4438 additions and 4433 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
View file

@ -1,33 +1,33 @@
package com.plotsquared.bukkit; package com.github.intellectualsites.plotsquared.bukkit;
import com.intellectualcrafters.configuration.ConfigurationSection; import com.github.intellectualsites.plotsquared.bukkit.database.plotme.ClassicPlotMeConnector;
import com.intellectualcrafters.plot.IPlotMain; import com.github.intellectualsites.plotsquared.bukkit.database.plotme.LikePlotMeConverter;
import com.intellectualcrafters.plot.PS; import com.github.intellectualsites.plotsquared.bukkit.database.plotme.PlotMeConnector_017;
import com.intellectualcrafters.plot.config.C; import com.github.intellectualsites.plotsquared.bukkit.generator.BukkitPlotGenerator;
import com.intellectualcrafters.plot.config.ConfigurationNode; import com.github.intellectualsites.plotsquared.bukkit.listeners.*;
import com.intellectualcrafters.plot.config.Settings; import com.github.intellectualsites.plotsquared.bukkit.titles.DefaultTitle_111;
import com.intellectualcrafters.plot.generator.GeneratorWrapper; import com.github.intellectualsites.plotsquared.bukkit.util.*;
import com.intellectualcrafters.plot.generator.HybridGen; import com.github.intellectualsites.plotsquared.bukkit.util.block.*;
import com.intellectualcrafters.plot.generator.HybridUtils; import com.github.intellectualsites.plotsquared.bukkit.uuid.*;
import com.intellectualcrafters.plot.generator.IndependentPlotGenerator; import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
import com.intellectualcrafters.plot.object.*; import com.github.intellectualsites.plotsquared.plot.IPlotMain;
import com.intellectualcrafters.plot.object.chat.PlainChatManager; import com.github.intellectualsites.plotsquared.plot.PS;
import com.intellectualcrafters.plot.object.worlds.PlotAreaManager; import com.github.intellectualsites.plotsquared.plot.config.C;
import com.intellectualcrafters.plot.object.worlds.SinglePlotArea; import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode;
import com.intellectualcrafters.plot.object.worlds.SinglePlotAreaManager; import com.github.intellectualsites.plotsquared.plot.config.Settings;
import com.intellectualcrafters.plot.object.worlds.SingleWorldGenerator; import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper;
import com.intellectualcrafters.plot.util.*; import com.github.intellectualsites.plotsquared.plot.generator.HybridGen;
import com.intellectualcrafters.plot.util.block.QueueProvider; import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils;
import com.intellectualcrafters.plot.uuid.UUIDWrapper; import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator;
import com.plotsquared.bukkit.database.plotme.ClassicPlotMeConnector; import com.github.intellectualsites.plotsquared.plot.object.*;
import com.plotsquared.bukkit.database.plotme.LikePlotMeConverter; import com.github.intellectualsites.plotsquared.plot.object.chat.PlainChatManager;
import com.plotsquared.bukkit.database.plotme.PlotMeConnector_017; import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager;
import com.plotsquared.bukkit.generator.BukkitPlotGenerator; import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea;
import com.plotsquared.bukkit.listeners.*; import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager;
import com.plotsquared.bukkit.titles.DefaultTitle_111; import com.github.intellectualsites.plotsquared.plot.object.worlds.SingleWorldGenerator;
import com.plotsquared.bukkit.util.*; import com.github.intellectualsites.plotsquared.plot.util.*;
import com.plotsquared.bukkit.util.block.*; import com.github.intellectualsites.plotsquared.plot.util.block.QueueProvider;
import com.plotsquared.bukkit.uuid.*; import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper;
import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEdit;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.Location; import org.bukkit.Location;
@ -49,7 +49,7 @@ import java.lang.reflect.Method;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap; 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 { 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 MINECART_TNT:
case BOAT: case BOAT:
if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) { 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()); BukkitUtil.getLocation(entity.getLocation());
Plot plot = location.getPlot(); Plot plot = location.getPlot();
if (plot == null) { if (plot == null) {
@ -479,7 +480,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
PlotId originalPlotId = PlotId originalPlotId =
(PlotId) meta.get(0).value(); (PlotId) meta.get(0).value();
if (originalPlotId != null) { if (originalPlotId != null) {
com.intellectualcrafters.plot.object.Location com.github.intellectualsites.plotsquared.plot.object.Location
pLoc = BukkitUtil pLoc = BukkitUtil
.getLocation(entity.getLocation()); .getLocation(entity.getLocation());
PlotArea area = pLoc.getPlotArea(); PlotArea area = pLoc.getPlotArea();
@ -497,7 +498,8 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
} }
} else { } else {
//This is to apply the metadata to already spawned shulkers (see EntitySpawnListener.java) //This is to apply the metadata to already spawned shulkers (see EntitySpawnListener.java)
com.intellectualcrafters.plot.object.Location pLoc = com.github.intellectualsites.plotsquared.plot.object.Location
pLoc =
BukkitUtil.getLocation(entity.getLocation()); BukkitUtil.getLocation(entity.getLocation());
PlotArea area = pLoc.getPlotArea(); PlotArea area = pLoc.getPlotArea();
if (area != null) { if (area != null) {

2
Bukkit/src/main/java/com/plotsquared/bukkit/chat/ArrayWrapper.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/ArrayWrapper.java
View file

@ -1,4 +1,4 @@
package com.plotsquared.bukkit.chat; package com.github.intellectualsites.plotsquared.bukkit.chat;
import org.apache.commons.lang.Validate; import org.apache.commons.lang.Validate;

18
Bukkit/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java
View file

@ -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.JsonArray;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
@ -20,8 +20,6 @@ import java.lang.reflect.*;
import java.util.*; import java.util.*;
import java.util.logging.Level; 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 <a href="http://minecraft.gamepedia.com/Tellraw#Raw_JSON_Text">JSON message formatter</a>. * 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 <a href="http://minecraft.gamepedia.com/Tellraw#Raw_JSON_Text">JSON message formatter</a>.
* This class allows plugins to emulate the functionality of the vanilla Minecraft <a href="http://minecraft.gamepedia.com/Commands#tellraw">tellraw command</a>. * This class allows plugins to emulate the functionality of the vanilla Minecraft <a href="http://minecraft.gamepedia.com/Commands#tellraw">tellraw command</a>.
@ -55,7 +53,7 @@ public class FancyMessage
* @param firstPartText The existing text in the message. * @param firstPartText The existing text in the message.
*/ */
public FancyMessage(final String firstPartText) { public FancyMessage(final String firstPartText) {
this(rawText(firstPartText)); this(TextualComponent.rawText(firstPartText));
} }
private FancyMessage(final TextualComponent firstPartText) { private FancyMessage(final TextualComponent firstPartText) {
@ -198,7 +196,7 @@ public class FancyMessage
*/ */
public FancyMessage text(String text) { public FancyMessage text(String text) {
MessagePart latest = latest(); MessagePart latest = latest();
latest.text = rawText(text); latest.text = TextualComponent.rawText(text);
dirty = true; dirty = true;
return this; return this;
} }
@ -514,7 +512,7 @@ public class FancyMessage
* @return This builder instance. * @return This builder instance.
*/ */
public FancyMessage tooltip(final Iterable<String> lines) { public FancyMessage tooltip(final Iterable<String> lines) {
tooltip(com.plotsquared.bukkit.chat.ArrayWrapper.toArray(lines, String.class)); tooltip(ArrayWrapper.toArray(lines, String.class));
return this; return this;
} }
/* /*
@ -605,7 +603,7 @@ public class FancyMessage
} }
} }
if (i != lines.length - 1) { if (i != lines.length - 1) {
result.messageParts.add(new MessagePart(rawText("\n"))); result.messageParts.add(new MessagePart(TextualComponent.rawText("\n")));
} }
} catch (CloneNotSupportedException e) { } catch (CloneNotSupportedException e) {
Bukkit.getLogger().log(Level.WARNING, "Failed to clone object", e); Bukkit.getLogger().log(Level.WARNING, "Failed to clone object", e);
@ -625,7 +623,7 @@ public class FancyMessage
*/ */
public FancyMessage formattedTooltip(final Iterable<FancyMessage> lines) { public FancyMessage formattedTooltip(final Iterable<FancyMessage> lines) {
return formattedTooltip( 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<FancyMessage> replacements) { public FancyMessage translationReplacements(final Iterable<FancyMessage> replacements) {
return translationReplacements( 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. * @return This builder instance.
*/ */
public FancyMessage then(final String text) { public FancyMessage then(final String text) {
return then(rawText(text)); return then(TextualComponent.rawText(text));
} }
/** /**

2
Bukkit/src/main/java/com/plotsquared/bukkit/chat/JsonRepresentedObject.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/JsonRepresentedObject.java
View file

@ -1,4 +1,4 @@
package com.plotsquared.bukkit.chat; package com.github.intellectualsites.plotsquared.bukkit.chat;
import com.google.gson.stream.JsonWriter; import com.google.gson.stream.JsonWriter;

2
Bukkit/src/main/java/com/plotsquared/bukkit/chat/JsonString.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/JsonString.java
View file

@ -1,4 +1,4 @@
package com.plotsquared.bukkit.chat; package com.github.intellectualsites.plotsquared.bukkit.chat;
import com.google.gson.stream.JsonWriter; import com.google.gson.stream.JsonWriter;
import org.bukkit.configuration.serialization.ConfigurationSerializable; import org.bukkit.configuration.serialization.ConfigurationSerializable;

2
Bukkit/src/main/java/com/plotsquared/bukkit/chat/MessagePart.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/MessagePart.java
View file

@ -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.BiMap;
import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableBiMap;

2
Bukkit/src/main/java/com/plotsquared/bukkit/chat/Reflection.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/Reflection.java
View file

@ -1,4 +1,4 @@
package com.plotsquared.bukkit.chat; package com.github.intellectualsites.plotsquared.bukkit.chat;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;

2
Bukkit/src/main/java/com/plotsquared/bukkit/chat/TextualComponent.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/TextualComponent.java
View file

@ -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.base.Preconditions;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;

38
Bukkit/src/main/java/com/plotsquared/bukkit/commands/DebugUUID.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/commands/DebugUUID.java
View file

@ -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.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.File;
import java.io.IOException; import java.io.IOException;

12
Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/APlotMeConnector.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/database/plotme/APlotMeConnector.java
View file

@ -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.github.intellectualsites.plotsquared.configuration.file.FileConfiguration;
import com.intellectualcrafters.plot.PS; import com.github.intellectualsites.plotsquared.plot.PS;
import com.intellectualcrafters.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Location;
import com.intellectualcrafters.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.Plot;
import com.intellectualcrafters.plot.object.PlotId; import com.github.intellectualsites.plotsquared.plot.object.PlotId;
import java.sql.Connection; import java.sql.Connection;
import java.sql.SQLException; import java.sql.SQLException;

16
Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/ClassicPlotMeConnector.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/database/plotme/ClassicPlotMeConnector.java
View file

@ -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.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.io.File;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;

26
Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/LikePlotMeConverter.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/database/plotme/LikePlotMeConverter.java
View file

@ -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.github.intellectualsites.plotsquared.bukkit.generator.BukkitPlotGenerator;
import com.intellectualcrafters.configuration.MemorySection; import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
import com.intellectualcrafters.configuration.file.FileConfiguration; import com.github.intellectualsites.plotsquared.configuration.MemorySection;
import com.intellectualcrafters.configuration.file.YamlConfiguration; import com.github.intellectualsites.plotsquared.configuration.file.FileConfiguration;
import com.intellectualcrafters.plot.PS; import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration;
import com.intellectualcrafters.plot.config.Settings; import com.github.intellectualsites.plotsquared.plot.PS;
import com.intellectualcrafters.plot.database.DBFunc; import com.github.intellectualsites.plotsquared.plot.config.Settings;
import com.intellectualcrafters.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
import com.intellectualcrafters.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.Plot;
import com.intellectualcrafters.plot.object.PlotId; import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
import com.intellectualcrafters.plot.util.TaskManager; import com.github.intellectualsites.plotsquared.plot.object.PlotId;
import com.plotsquared.bukkit.generator.BukkitPlotGenerator; import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.WorldCreator; import org.bukkit.WorldCreator;

16
Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/PlotMeConnector_017.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/database/plotme/PlotMeConnector_017.java
View file

@ -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.github.intellectualsites.plotsquared.configuration.file.FileConfiguration;
import com.intellectualcrafters.plot.PS; import com.github.intellectualsites.plotsquared.plot.PS;
import com.intellectualcrafters.plot.config.Settings; import com.github.intellectualsites.plotsquared.plot.config.Settings;
import com.intellectualcrafters.plot.database.DBFunc; import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
import com.intellectualcrafters.plot.database.SQLite; import com.github.intellectualsites.plotsquared.plot.database.SQLite;
import com.intellectualcrafters.plot.object.*; import com.github.intellectualsites.plotsquared.plot.object.*;
import com.intellectualcrafters.plot.util.UUIDHandler; import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
import java.io.File; import java.io.File;
import java.sql.*; import java.sql.*;

6
Bukkit/src/main/java/com/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java
View file

@ -1,7 +1,7 @@
package com.plotsquared.bukkit.events; package com.github.intellectualsites.plotsquared.bukkit.events;
import com.intellectualcrafters.plot.flag.Flag; import com.github.intellectualsites.plotsquared.plot.flag.Flag;
import com.intellectualcrafters.plot.object.PlotCluster; import com.github.intellectualsites.plotsquared.plot.object.PlotCluster;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;

118
Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerClaimPlotEvent.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerClaimPlotEvent.java
View file

@ -1,59 +1,59 @@
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.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.bukkit.event.player.PlayerEvent; import org.bukkit.event.player.PlayerEvent;
public class PlayerClaimPlotEvent extends PlayerEvent implements Cancellable { public class PlayerClaimPlotEvent extends PlayerEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
private final Plot plot; private final Plot plot;
private final boolean auto; private final boolean auto;
private boolean cancelled; private boolean cancelled;
/** /**
* PlayerClaimPlotEvent: Called when a plot is claimed. * PlayerClaimPlotEvent: Called when a plot is claimed.
* *
* @param player Player that claimed the plot * @param player Player that claimed the plot
* @param plot Plot that was claimed * @param plot Plot that was claimed
*/ */
public PlayerClaimPlotEvent(Player player, Plot plot, boolean auto) { public PlayerClaimPlotEvent(Player player, Plot plot, boolean auto) {
super(player); super(player);
this.plot = plot; this.plot = plot;
this.auto = auto; this.auto = auto;
} }
public static HandlerList getHandlerList() { public static HandlerList getHandlerList() {
return handlers; return handlers;
} }
/** /**
* Get the plot involved * Get the plot involved
* *
* @return Plot * @return Plot
*/ */
public Plot getPlot() { public Plot getPlot() {
return this.plot; return this.plot;
} }
/** /**
* @return true if it was an automated claim, else false * @return true if it was an automated claim, else false
*/ */
public boolean wasAuto() { public boolean wasAuto() {
return this.auto; return this.auto;
} }
@Override public HandlerList getHandlers() { @Override public HandlerList getHandlers() {
return handlers; return handlers;
} }
@Override public boolean isCancelled() { @Override public boolean isCancelled() {
return this.cancelled; return this.cancelled;
} }
@Override public void setCancelled(boolean b) { @Override public void setCancelled(boolean b) {
this.cancelled = b; this.cancelled = b;
} }
} }

80
Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerEnterPlotEvent.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerEnterPlotEvent.java
View file

@ -1,40 +1,40 @@
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.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.bukkit.event.player.PlayerEvent; import org.bukkit.event.player.PlayerEvent;
public class PlayerEnterPlotEvent extends PlayerEvent { public class PlayerEnterPlotEvent extends PlayerEvent {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
private final Plot plot; private final Plot plot;
/** /**
* Called when a player leaves a plot. * Called when a player leaves a plot.
* *
* @param player Player that entered the plot * @param player Player that entered the plot
* @param plot Plot that was entered * @param plot Plot that was entered
*/ */
public PlayerEnterPlotEvent(Player player, Plot plot) { public PlayerEnterPlotEvent(Player player, Plot plot) {
super(player); super(player);
this.plot = plot; this.plot = plot;
} }
public static HandlerList getHandlerList() { public static HandlerList getHandlerList() {
return handlers; return handlers;
} }
/** /**
* Get the plot involved. * Get the plot involved.
* *
* @return Plot * @return Plot
*/ */
public Plot getPlot() { public Plot getPlot() {
return this.plot; return this.plot;
} }
@Override public HandlerList getHandlers() { @Override public HandlerList getHandlers() {
return handlers; return handlers;
} }
} }

88
Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerLeavePlotEvent.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerLeavePlotEvent.java
View file

@ -1,44 +1,44 @@
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.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.bukkit.event.player.PlayerEvent; import org.bukkit.event.player.PlayerEvent;
/** /**
*/ */
public class PlayerLeavePlotEvent extends PlayerEvent { public class PlayerLeavePlotEvent extends PlayerEvent {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
private final Plot plot; private final Plot plot;
/** /**
* PlayerLeavePlotEvent: Called when a player leaves a plot * PlayerLeavePlotEvent: Called when a player leaves a plot
* *
* @param player Player that left the plot * @param player Player that left the plot
* @param plot Plot that was left * @param plot Plot that was left
*/ */
public PlayerLeavePlotEvent(Player player, Plot plot) { public PlayerLeavePlotEvent(Player player, Plot plot) {
super(player); super(player);
this.plot = plot; this.plot = plot;
} }
public static HandlerList getHandlerList() { public static HandlerList getHandlerList() {
return handlers; return handlers;
} }
/** /**
* Get the plot involved * Get the plot involved
* *
* @return Plot * @return Plot
*/ */
public Plot getPlot() { public Plot getPlot() {
return this.plot; return this.plot;
} }
@Override public HandlerList getHandlers() { @Override public HandlerList getHandlers() {
return handlers; return handlers;
} }
} }

130
Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerPlotDeniedEvent.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerPlotDeniedEvent.java
View file

@ -1,65 +1,65 @@
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.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import java.util.UUID; import java.util.UUID;
public class PlayerPlotDeniedEvent extends PlotEvent { public class PlayerPlotDeniedEvent extends PlotEvent {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
private final Player initiator; private final Player initiator;
private final boolean added; private final boolean added;
private final UUID player; private final UUID player;
/** /**
* PlayerPlotDeniedEvent: Called when the denied UUID list is modified for a plot. * PlayerPlotDeniedEvent: Called when the denied UUID list is modified for a plot.
* *
* @param initiator Player that initiated the event * @param initiator Player that initiated the event
* @param plot Plot in which the event occurred * @param plot Plot in which the event occurred
* @param player Player that was denied/un-denied * @param player Player that was denied/un-denied
* @param added true of add to deny list, false if removed * @param added true of add to deny list, false if removed
*/ */
public PlayerPlotDeniedEvent(Player initiator, Plot plot, UUID player, boolean added) { public PlayerPlotDeniedEvent(Player initiator, Plot plot, UUID player, boolean added) {
super(plot); super(plot);
this.initiator = initiator; this.initiator = initiator;
this.added = added; this.added = added;
this.player = player; this.player = player;
} }
public static HandlerList getHandlerList() { public static HandlerList getHandlerList() {
return handlers; return handlers;
} }
/** /**
* If a user was added. * If a user was added.
* *
* @return boolean * @return boolean
*/ */
public boolean wasAdded() { public boolean wasAdded() {
return this.added; return this.added;
} }
/** /**
* The player added/removed. * The player added/removed.
* *
* @return UUID * @return UUID
*/ */
public UUID getPlayer() { public UUID getPlayer() {
return this.player; return this.player;
} }
/** /**
* The player initiating the action. * The player initiating the action.
* *
* @return Player * @return Player
*/ */
public Player getInitiator() { public Player getInitiator() {
return this.initiator; return this.initiator;
} }
@Override public HandlerList getHandlers() { @Override public HandlerList getHandlers() {
return handlers; return handlers;
} }
} }

138
Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerPlotHelperEvent.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerPlotHelperEvent.java
View file

@ -1,69 +1,69 @@
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.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import java.util.UUID; import java.util.UUID;
/** /**
*/ */
public class PlayerPlotHelperEvent extends PlotEvent { public class PlayerPlotHelperEvent extends PlotEvent {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
private final Player initiator; private final Player initiator;
private final boolean added; private final boolean added;
private final UUID player; private final UUID player;
/** /**
* PlayerPlotHelperEvent: Called when a plot helper is added/removed * PlayerPlotHelperEvent: Called when a plot helper is added/removed
* *
* @param initiator Player that initiated the event * @param initiator Player that initiated the event
* @param plot Plot in which the event occurred * @param plot Plot in which the event occurred
* @param player Player that was added/removed from the helper list * @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 * @param added true of the player was added, false if the player was removed
*/ */
public PlayerPlotHelperEvent(Player initiator, Plot plot, UUID player, boolean added) { public PlayerPlotHelperEvent(Player initiator, Plot plot, UUID player, boolean added) {
super(plot); super(plot);
this.initiator = initiator; this.initiator = initiator;
this.added = added; this.added = added;
this.player = player; this.player = player;
} }
public static HandlerList getHandlerList() { public static HandlerList getHandlerList() {
return handlers; return handlers;
} }
/** /**
* If a player was added * If a player was added
* *
* @return boolean * @return boolean
*/ */
public boolean wasAdded() { public boolean wasAdded() {
return this.added; return this.added;
} }
/** /**
* The UUID added/removed * The UUID added/removed
* *
* @return UUID * @return UUID
*/ */
public UUID getPlayer() { public UUID getPlayer() {
return this.player; return this.player;
} }
/** /**
* The player initiating the action * The player initiating the action
* *
* @return Player * @return Player
*/ */
public Player getInitiator() { public Player getInitiator() {
return this.initiator; return this.initiator;
} }
@Override public HandlerList getHandlers() { @Override public HandlerList getHandlers() {
return handlers; return handlers;
} }
} }

138
Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerPlotTrustedEvent.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerPlotTrustedEvent.java
View file

@ -1,69 +1,69 @@
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.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import java.util.UUID; import java.util.UUID;
/** /**
*/ */
public class PlayerPlotTrustedEvent extends PlotEvent { public class PlayerPlotTrustedEvent extends PlotEvent {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
private final Player initiator; private final Player initiator;
private final boolean added; private final boolean added;
private final UUID player; private final UUID player;
/** /**
* PlayerPlotTrustedEvent: Called when a plot trusted user is added/removed * PlayerPlotTrustedEvent: Called when a plot trusted user is added/removed
* *
* @param initiator Player that initiated the event * @param initiator Player that initiated the event
* @param plot Plot in which the event occurred * @param plot Plot in which the event occurred
* @param player Player that was added/removed from the trusted list * @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 * @param added true of the player was added, false if the player was removed
*/ */
public PlayerPlotTrustedEvent(Player initiator, Plot plot, UUID player, boolean added) { public PlayerPlotTrustedEvent(Player initiator, Plot plot, UUID player, boolean added) {
super(plot); super(plot);
this.initiator = initiator; this.initiator = initiator;
this.added = added; this.added = added;
this.player = player; this.player = player;
} }
public static HandlerList getHandlerList() { public static HandlerList getHandlerList() {
return handlers; return handlers;
} }
/** /**
* If a player was added * If a player was added
* *
* @return boolean * @return boolean
*/ */
public boolean wasAdded() { public boolean wasAdded() {
return this.added; return this.added;
} }
/** /**
* The UUID added/removed * The UUID added/removed
* *
* @return UUID * @return UUID
*/ */
public UUID getPlayer() { public UUID getPlayer() {
return this.player; return this.player;
} }
/** /**
* The player initiating the action * The player initiating the action
* *
* @return Player * @return Player
*/ */
public Player getInitiator() { public Player getInitiator() {
return this.initiator; return this.initiator;
} }
@Override public HandlerList getHandlers() { @Override public HandlerList getHandlers() {
return handlers; return handlers;
} }
} }

132
Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerTeleportToPlotEvent.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerTeleportToPlotEvent.java
View file

@ -1,66 +1,66 @@
package com.plotsquared.bukkit.events; package com.github.intellectualsites.plotsquared.bukkit.events;
import com.intellectualcrafters.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Location;
import com.intellectualcrafters.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.Plot;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.bukkit.event.player.PlayerEvent; import org.bukkit.event.player.PlayerEvent;
/** /**
* Called when a player teleports to a plot * Called when a player teleports to a plot
*/ */
public class PlayerTeleportToPlotEvent extends PlayerEvent implements Cancellable { public class PlayerTeleportToPlotEvent extends PlayerEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
private final Location from; private final Location from;
private final Plot plot; private final Plot plot;
private boolean cancelled; private boolean cancelled;
/** /**
* PlayerTeleportToPlotEvent: Called when a player teleports to a plot * PlayerTeleportToPlotEvent: Called when a player teleports to a plot
* *
* @param player That was teleported * @param player That was teleported
* @param from Start location * @param from Start location
* @param plot Plot to which the player was teleported * @param plot Plot to which the player was teleported
*/ */
public PlayerTeleportToPlotEvent(Player player, Location from, Plot plot) { public PlayerTeleportToPlotEvent(Player player, Location from, Plot plot) {
super(player); super(player);
this.from = from; this.from = from;
this.plot = plot; this.plot = plot;
} }
public static HandlerList getHandlerList() { public static HandlerList getHandlerList() {
return handlers; return handlers;
} }
@Override public HandlerList getHandlers() { @Override public HandlerList getHandlers() {
return handlers; return handlers;
} }
/** /**
* Get the from location * Get the from location
* *
* @return Location * @return Location
*/ */
public Location getFrom() { public Location getFrom() {
return this.from; return this.from;
} }
/** /**
* Get the plot involved * Get the plot involved
* *
* @return Plot * @return Plot
*/ */
public Plot getPlot() { public Plot getPlot() {
return this.plot; return this.plot;
} }
@Override public boolean isCancelled() { @Override public boolean isCancelled() {
return this.cancelled; return this.cancelled;
} }
@Override public void setCancelled(boolean cancelled) { @Override public void setCancelled(boolean cancelled) {
this.cancelled = cancelled; this.cancelled = cancelled;
} }
} }

106
Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotClearEvent.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotClearEvent.java
View file

@ -1,53 +1,53 @@
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 com.intellectualcrafters.plot.object.PlotId; import com.github.intellectualsites.plotsquared.plot.object.PlotId;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
/** /**
* Called when a plot is cleared * Called when a plot is cleared
*/ */
public class PlotClearEvent extends PlotEvent implements Cancellable { public class PlotClearEvent extends PlotEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
private boolean cancelled; private boolean cancelled;
public PlotClearEvent(Plot plot) { public PlotClearEvent(Plot plot) {
super(plot); super(plot);
} }
public static HandlerList getHandlerList() { public static HandlerList getHandlerList() {
return handlers; return handlers;
} }
/** /**
* Get the PlotId. * Get the PlotId.
* *
* @return PlotId * @return PlotId
*/ */
public PlotId getPlotId() { public PlotId getPlotId() {
return getPlot().getId(); return getPlot().getId();
} }
/** /**
* Get the world name. * Get the world name.
* *
* @return String * @return String
*/ */
public String getWorld() { public String getWorld() {
return getPlot().getWorldName(); return getPlot().getWorldName();
} }
@Override public HandlerList getHandlers() { @Override public HandlerList getHandlers() {
return handlers; return handlers;
} }
@Override public boolean isCancelled() { @Override public boolean isCancelled() {
return this.cancelled; return this.cancelled;
} }
@Override public void setCancelled(boolean b) { @Override public void setCancelled(boolean b) {
this.cancelled = b; this.cancelled = b;
} }
} }

6
Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotComponentSetEvent.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotComponentSetEvent.java
View file

@ -1,7 +1,7 @@
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 com.intellectualcrafters.plot.object.PlotId; import com.github.intellectualsites.plotsquared.plot.object.PlotId;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
/** /**

86
Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotDeleteEvent.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotDeleteEvent.java
View file

@ -1,43 +1,43 @@
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 com.intellectualcrafters.plot.object.PlotId; import com.github.intellectualsites.plotsquared.plot.object.PlotId;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
/** /**
* Called when a plot is deleted * Called when a plot is deleted
*/ */
public class PlotDeleteEvent extends PlotEvent { public class PlotDeleteEvent extends PlotEvent {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
public PlotDeleteEvent(Plot plot) { public PlotDeleteEvent(Plot plot) {
super(plot); super(plot);
} }
public static HandlerList getHandlerList() { public static HandlerList getHandlerList() {
return handlers; return handlers;
} }
/** /**
* Get the PlotId * Get the PlotId
* *
* @return PlotId * @return PlotId
*/ */
public PlotId getPlotId() { public PlotId getPlotId() {
return getPlot().getId(); return getPlot().getId();
} }
/** /**
* Get the world name * Get the world name
* *
* @return String * @return String
*/ */
public String getWorld() { public String getWorld() {
return getPlot().getWorldName(); return getPlot().getWorldName();
} }
@Override public HandlerList getHandlers() { @Override public HandlerList getHandlers() {
return handlers; return handlers;
} }
} }

4
Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotEvent.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotEvent.java
View file

@ -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; import org.bukkit.event.Event;
public abstract class PlotEvent extends Event { public abstract class PlotEvent extends Event {

104
Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotFlagAddEvent.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotFlagAddEvent.java
View file

@ -1,52 +1,52 @@
package com.plotsquared.bukkit.events; package com.github.intellectualsites.plotsquared.bukkit.events;
import com.intellectualcrafters.plot.flag.Flag; import com.github.intellectualsites.plotsquared.plot.flag.Flag;
import com.intellectualcrafters.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.Plot;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
/** /**
* Called when a Flag is added to a plot. * Called when a Flag is added to a plot.
*/ */
public class PlotFlagAddEvent extends PlotEvent implements Cancellable { public class PlotFlagAddEvent extends PlotEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
private final Flag flag; private final Flag flag;
private boolean cancelled; private boolean cancelled;
/** /**
* PlotFlagAddEvent: Called when a Flag is added to a plot. * PlotFlagAddEvent: Called when a Flag is added to a plot.
* *
* @param flag Flag that was added * @param flag Flag that was added
* @param plot Plot to which the flag was added * @param plot Plot to which the flag was added
*/ */
public PlotFlagAddEvent(Flag flag, Plot plot) { public PlotFlagAddEvent(Flag flag, Plot plot) {
super(plot); super(plot);
this.flag = flag; this.flag = flag;
} }
public static HandlerList getHandlerList() { public static HandlerList getHandlerList() {
return handlers; return handlers;
} }
/** /**
* Get the flag involved. * Get the flag involved.
* *
* @return Flag * @return Flag
*/ */
public Flag getFlag() { public Flag getFlag() {
return this.flag; return this.flag;
} }
@Override public HandlerList getHandlers() { @Override public HandlerList getHandlers() {
return handlers; return handlers;
} }
@Override public final boolean isCancelled() { @Override public final boolean isCancelled() {
return this.cancelled; return this.cancelled;
} }
@Override public final void setCancelled(boolean cancelled) { @Override public final void setCancelled(boolean cancelled) {
this.cancelled = cancelled; this.cancelled = cancelled;
} }
} }

104
Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotFlagRemoveEvent.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotFlagRemoveEvent.java
View file

@ -1,52 +1,52 @@
package com.plotsquared.bukkit.events; package com.github.intellectualsites.plotsquared.bukkit.events;
import com.intellectualcrafters.plot.flag.Flag; import com.github.intellectualsites.plotsquared.plot.flag.Flag;
import com.intellectualcrafters.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.Plot;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
/** /**
* Called when a flag is removed from a plot * Called when a flag is removed from a plot
*/ */
public class PlotFlagRemoveEvent extends PlotEvent implements Cancellable { public class PlotFlagRemoveEvent extends PlotEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
private final Flag flag; private final Flag flag;
private boolean cancelled; private boolean cancelled;
/** /**
* PlotFlagRemoveEvent: Called when a flag is removed from a plot * PlotFlagRemoveEvent: Called when a flag is removed from a plot
* *
* @param flag Flag that was removed * @param flag Flag that was removed
* @param plot Plot from which the flag was removed * @param plot Plot from which the flag was removed
*/ */
public PlotFlagRemoveEvent(Flag flag, Plot plot) { public PlotFlagRemoveEvent(Flag flag, Plot plot) {
super(plot); super(plot);
this.flag = flag; this.flag = flag;
} }
public static HandlerList getHandlerList() { public static HandlerList getHandlerList() {
return handlers; return handlers;
} }
/** /**
* Get the flag involved * Get the flag involved
* *
* @return Flag * @return Flag
*/ */
public Flag getFlag() { public Flag getFlag() {
return this.flag; return this.flag;
} }
@Override public HandlerList getHandlers() { @Override public HandlerList getHandlers() {
return handlers; return handlers;
} }
@Override public final boolean isCancelled() { @Override public final boolean isCancelled() {
return this.cancelled; return this.cancelled;
} }
@Override public final void setCancelled(boolean cancelled) { @Override public final void setCancelled(boolean cancelled) {
this.cancelled = cancelled; this.cancelled = cancelled;
} }
} }

118
Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotMergeEvent.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotMergeEvent.java
View file

@ -1,59 +1,59 @@
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 com.intellectualcrafters.plot.object.PlotId; import com.github.intellectualsites.plotsquared.plot.object.PlotId;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import java.util.ArrayList; import java.util.ArrayList;
public class PlotMergeEvent extends PlotEvent implements Cancellable { public class PlotMergeEvent extends PlotEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
private final ArrayList<PlotId> plots; private final ArrayList<PlotId> plots;
private final World world; private final World world;
private boolean cancelled; private boolean cancelled;
/** /**
* PlotMergeEvent: Called when plots are merged * PlotMergeEvent: Called when plots are merged
* *
* @param world World in which the event occurred * @param world World in which the event occurred
* @param plot Plot that was merged * @param plot Plot that was merged
* @param plots A list of plots involved in the event * @param plots A list of plots involved in the event
*/ */
public PlotMergeEvent(World world, Plot plot, ArrayList<PlotId> plots) { public PlotMergeEvent(World world, Plot plot, ArrayList<PlotId> plots) {
super(plot); super(plot);
this.world = world; this.world = world;
this.plots = plots; this.plots = plots;
} }
public static HandlerList getHandlerList() { public static HandlerList getHandlerList() {
return handlers; return handlers;
} }
/** /**
* Get the plots being added. * Get the plots being added.
* *
* @return Plot * @return Plot
*/ */
public ArrayList<PlotId> getPlots() { public ArrayList<PlotId> getPlots() {
return this.plots; return this.plots;
} }
public World getWorld() { public World getWorld() {
return this.world; return this.world;
} }
@Override public HandlerList getHandlers() { @Override public HandlerList getHandlers() {
return handlers; return handlers;
} }
@Override public boolean isCancelled() { @Override public boolean isCancelled() {
return this.cancelled; return this.cancelled;
} }
@Override public void setCancelled(boolean b) { @Override public void setCancelled(boolean b) {
this.cancelled = b; this.cancelled = b;
} }
} }

80
Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotRateEvent.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotRateEvent.java
View file

@ -1,40 +1,40 @@
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 com.intellectualcrafters.plot.object.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.object.Rating; import com.github.intellectualsites.plotsquared.plot.object.Rating;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
public class PlotRateEvent extends PlotEvent { public class PlotRateEvent extends PlotEvent {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
private final PlotPlayer rater; private final PlotPlayer rater;
private Rating rating; private Rating rating;
public PlotRateEvent(PlotPlayer rater, Rating rating, Plot plot) { public PlotRateEvent(PlotPlayer rater, Rating rating, Plot plot) {
super(plot); super(plot);
this.rater = rater; this.rater = rater;
this.rating = rating; this.rating = rating;
} }
public static HandlerList getHandlerList() { public static HandlerList getHandlerList() {
return handlers; return handlers;
} }
public PlotPlayer getRater() { public PlotPlayer getRater() {
return this.rater; return this.rater;
} }
public Rating getRating() { public Rating getRating() {
return this.rating; return this.rating;
} }
public void setRating(Rating rating) { public void setRating(Rating rating) {
this.rating = rating; this.rating = rating;
} }
@Override public HandlerList getHandlers() { @Override public HandlerList getHandlers() {
return handlers; return handlers;
} }
} }

128
Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotUnlinkEvent.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotUnlinkEvent.java
View file

@ -1,64 +1,64 @@
package com.plotsquared.bukkit.events; package com.github.intellectualsites.plotsquared.bukkit.events;
import com.intellectualcrafters.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
import com.intellectualcrafters.plot.object.PlotId; import com.github.intellectualsites.plotsquared.plot.object.PlotId;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import java.util.ArrayList; import java.util.ArrayList;
public class PlotUnlinkEvent extends Event implements Cancellable { public class PlotUnlinkEvent extends Event implements Cancellable {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
private final ArrayList<PlotId> plots; private final ArrayList<PlotId> plots;
private final World world; private final World world;
private final PlotArea area; private final PlotArea area;
private boolean cancelled; private boolean cancelled;
/** /**
* Called when a mega-plot is unlinked. * Called when a mega-plot is unlinked.
* *
* @param world World in which the event occurred * @param world World in which the event occurred
* @param plots Plots that are involved in the event * @param plots Plots that are involved in the event
*/ */
public PlotUnlinkEvent(World world, PlotArea area, ArrayList<PlotId> plots) { public PlotUnlinkEvent(World world, PlotArea area, ArrayList<PlotId> plots) {
this.plots = plots; this.plots = plots;
this.world = world; this.world = world;
this.area = area; this.area = area;
} }
public static HandlerList getHandlerList() { public static HandlerList getHandlerList() {
return handlers; return handlers;
} }
/** /**
* Get the plots involved. * Get the plots involved.
* *
* @return The {@link PlotId}'s of the plots involved * @return The {@link PlotId}'s of the plots involved
*/ */
public ArrayList<PlotId> getPlots() { public ArrayList<PlotId> getPlots() {
return this.plots; return this.plots;
} }
public World getWorld() { public World getWorld() {
return this.world; return this.world;
} }
public PlotArea getArea() { public PlotArea getArea() {
return this.area; return this.area;
} }
@Override public HandlerList getHandlers() { @Override public HandlerList getHandlers() {
return handlers; return handlers;
} }
@Override public boolean isCancelled() { @Override public boolean isCancelled() {
return this.cancelled; return this.cancelled;
} }
@Override public void setCancelled(boolean b) { @Override public void setCancelled(boolean b) {
this.cancelled = b; this.cancelled = b;
} }
} }

4
Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java
View file

@ -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.Chunk;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.generator.BlockPopulator; import org.bukkit.generator.BlockPopulator;

28
Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
View file

@ -1,18 +1,18 @@
package com.plotsquared.bukkit.generator; package com.github.intellectualsites.plotsquared.bukkit.generator;
import com.intellectualcrafters.plot.PS; import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil;
import com.intellectualcrafters.plot.generator.GeneratorWrapper; import com.github.intellectualsites.plotsquared.bukkit.util.block.GenChunk;
import com.intellectualcrafters.plot.generator.IndependentPlotGenerator; import com.github.intellectualsites.plotsquared.plot.PS;
import com.intellectualcrafters.plot.object.*; import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper;
import com.intellectualcrafters.plot.object.worlds.SingleWorldGenerator; import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator;
import com.intellectualcrafters.plot.util.ChunkManager; import com.github.intellectualsites.plotsquared.plot.object.*;
import com.intellectualcrafters.plot.util.MainUtil; import com.github.intellectualsites.plotsquared.plot.object.worlds.SingleWorldGenerator;
import com.intellectualcrafters.plot.util.MathMan; import com.github.intellectualsites.plotsquared.plot.util.ChunkManager;
import com.intellectualcrafters.plot.util.block.GlobalBlockQueue; import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.block.LocalBlockQueue; import com.github.intellectualsites.plotsquared.plot.util.MathMan;
import com.intellectualcrafters.plot.util.block.ScopedLocalBlockQueue; import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
import com.plotsquared.bukkit.util.BukkitUtil; import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
import com.plotsquared.bukkit.util.block.GenChunk; import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.block.Biome; import org.bukkit.block.Biome;

22
Bukkit/src/main/java/com/plotsquared/bukkit/listeners/ChunkListener.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
View file

@ -1,14 +1,14 @@
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 com.intellectualcrafters.plot.config.C; import com.github.intellectualsites.plotsquared.plot.config.C;
import com.intellectualcrafters.plot.config.Settings; import com.github.intellectualsites.plotsquared.plot.config.Settings;
import com.intellectualcrafters.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Location;
import com.intellectualcrafters.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.Plot;
import com.intellectualcrafters.plot.util.ReflectionUtils.RefClass; import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefClass;
import com.intellectualcrafters.plot.util.ReflectionUtils.RefField; import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefField;
import com.intellectualcrafters.plot.util.ReflectionUtils.RefMethod; import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefMethod;
import com.intellectualcrafters.plot.util.TaskManager; import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.Material; import org.bukkit.Material;
@ -30,7 +30,7 @@ import org.bukkit.event.world.ChunkUnloadEvent;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.HashSet; import java.util.HashSet;
import static com.intellectualcrafters.plot.util.ReflectionUtils.getRefClass; import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass;
public class ChunkListener implements Listener { public class ChunkListener implements Listener {

4
Bukkit/src/main/java/com/plotsquared/bukkit/listeners/EntityPortal_1_7_9.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntityPortal_1_7_9.java
View file

@ -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.Location;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.ArmorStand; import org.bukkit.entity.ArmorStand;

16
Bukkit/src/main/java/com/plotsquared/bukkit/listeners/EntitySpawnListener.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
View file

@ -1,12 +1,12 @@
package com.plotsquared.bukkit.listeners; package com.github.intellectualsites.plotsquared.bukkit.listeners;
import com.intellectualcrafters.plot.PS; import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil;
import com.intellectualcrafters.plot.config.Settings; import com.github.intellectualsites.plotsquared.plot.PS;
import com.intellectualcrafters.plot.flag.Flags; import com.github.intellectualsites.plotsquared.plot.config.Settings;
import com.intellectualcrafters.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.flag.Flags;
import com.intellectualcrafters.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.Location;
import com.intellectualcrafters.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.Plot;
import com.plotsquared.bukkit.util.BukkitUtil; import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;

208
Bukkit/src/main/java/com/plotsquared/bukkit/listeners/ForceFieldListener.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ForceFieldListener.java
View file

@ -1,104 +1,104 @@
package com.plotsquared.bukkit.listeners; package com.github.intellectualsites.plotsquared.bukkit.listeners;
import com.google.common.collect.Iterables; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
import com.intellectualcrafters.plot.config.C; import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil;
import com.intellectualcrafters.plot.flag.Flags; import com.github.intellectualsites.plotsquared.plot.config.C;
import com.intellectualcrafters.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.flag.Flags;
import com.intellectualcrafters.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.Location;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.Plot;
import com.intellectualcrafters.plot.util.Permissions; import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
import com.plotsquared.bukkit.object.BukkitPlayer; import com.github.intellectualsites.plotsquared.plot.util.Permissions;
import com.plotsquared.bukkit.util.BukkitUtil; import com.google.common.collect.Iterables;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
public class ForceFieldListener { public class ForceFieldListener {
private static Set<PlotPlayer> getNearbyPlayers(Player player, Plot plot) { private static Set<PlotPlayer> getNearbyPlayers(Player player, Plot plot) {
Set<PlotPlayer> players = new HashSet<>(); Set<PlotPlayer> players = new HashSet<>();
for (Player nearPlayer : Iterables for (Player nearPlayer : Iterables
.filter(player.getNearbyEntities(5d, 5d, 5d), Player.class)) { .filter(player.getNearbyEntities(5d, 5d, 5d), Player.class)) {
PlotPlayer plotPlayer; PlotPlayer plotPlayer;
if ((plotPlayer = BukkitUtil.getPlayer(nearPlayer)) == null || !plot if ((plotPlayer = BukkitUtil.getPlayer(nearPlayer)) == null || !plot
.equals(plotPlayer.getCurrentPlot())) { .equals(plotPlayer.getCurrentPlot())) {
continue; continue;
} }
if (!plot.isAdded(plotPlayer.getUUID())) { if (!plot.isAdded(plotPlayer.getUUID())) {
players.add(plotPlayer); players.add(plotPlayer);
} }
} }
return players; return players;
} }
private static PlotPlayer hasNearbyPermitted(Player player, Plot plot) { private static PlotPlayer hasNearbyPermitted(Player player, Plot plot) {
for (Player nearPlayer : Iterables for (Player nearPlayer : Iterables
.filter(player.getNearbyEntities(5d, 5d, 5d), Player.class)) { .filter(player.getNearbyEntities(5d, 5d, 5d), Player.class)) {
PlotPlayer plotPlayer; PlotPlayer plotPlayer;
if ((plotPlayer = BukkitUtil.getPlayer(nearPlayer)) == null || !plot if ((plotPlayer = BukkitUtil.getPlayer(nearPlayer)) == null || !plot
.equals(plotPlayer.getCurrentPlot())) { .equals(plotPlayer.getCurrentPlot())) {
continue; continue;
} }
if (plot.isAdded(plotPlayer.getUUID())) { if (plot.isAdded(plotPlayer.getUUID())) {
return plotPlayer; return plotPlayer;
} }
} }
return null; return null;
} }
private static Vector calculateVelocity(PlotPlayer player, PlotPlayer e) { private static Vector calculateVelocity(PlotPlayer player, PlotPlayer e) {
Location playerLocation = player.getLocationFull(); Location playerLocation = player.getLocationFull();
Location oPlayerLocation = e.getLocation(); Location oPlayerLocation = e.getLocation();
double playerX = playerLocation.getX(); double playerX = playerLocation.getX();
double playerY = playerLocation.getY(); double playerY = playerLocation.getY();
double playerZ = playerLocation.getZ(); double playerZ = playerLocation.getZ();
double oPlayerX = oPlayerLocation.getX(); double oPlayerX = oPlayerLocation.getX();
double oPlayerY = oPlayerLocation.getY(); double oPlayerY = oPlayerLocation.getY();
double oPlayerZ = oPlayerLocation.getZ(); double oPlayerZ = oPlayerLocation.getZ();
double x = 0d; double x = 0d;
if (playerX < oPlayerX) { if (playerX < oPlayerX) {
x = 1.0d; x = 1.0d;
} else if (playerX > oPlayerX) { } else if (playerX > oPlayerX) {
x = -1.0d; x = -1.0d;
} }
double y = 0d; double y = 0d;
if (playerY < oPlayerY) { if (playerY < oPlayerY) {
y = 0.5d; y = 0.5d;
} else if (playerY > oPlayerY) { } else if (playerY > oPlayerY) {
y = -0.5d; y = -0.5d;
} }
double z = 0d; double z = 0d;
if (playerZ < oPlayerZ) { if (playerZ < oPlayerZ) {
z = 1.0d; z = 1.0d;
} else if (playerZ > oPlayerZ) { } else if (playerZ > oPlayerZ) {
z = -1.0d; z = -1.0d;
} }
return new Vector(x, y, z); return new Vector(x, y, z);
} }
public static void handleForcefield(Player player, PlotPlayer plotPlayer, Plot plot) { public static void handleForcefield(Player player, PlotPlayer plotPlayer, Plot plot) {
if (Flags.FORCEFIELD.isTrue(plot)) { if (Flags.FORCEFIELD.isTrue(plot)) {
UUID uuid = plotPlayer.getUUID(); UUID uuid = plotPlayer.getUUID();
if (plot.isAdded(uuid)) { if (plot.isAdded(uuid)) {
Set<PlotPlayer> players = getNearbyPlayers(player, plot); Set<PlotPlayer> players = getNearbyPlayers(player, plot);
for (PlotPlayer oPlayer : players) { for (PlotPlayer oPlayer : players) {
if (!Permissions.hasPermission(oPlayer, C.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) { if (!Permissions.hasPermission(oPlayer, C.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) {
((BukkitPlayer) oPlayer).player ((BukkitPlayer) oPlayer).player
.setVelocity(calculateVelocity(plotPlayer, oPlayer)); .setVelocity(calculateVelocity(plotPlayer, oPlayer));
} }
} }
} else { } else {
PlotPlayer oPlayer = hasNearbyPermitted(player, plot); PlotPlayer oPlayer = hasNearbyPermitted(player, plot);
if (oPlayer == null) { if (oPlayer == null) {
return; return;
} }
if (!Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) { if (!Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) {
player.setVelocity(calculateVelocity(oPlayer, plotPlayer)); player.setVelocity(calculateVelocity(oPlayer, plotPlayer));
} }
} }
} }
} }
} }

30
Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
View file

@ -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.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.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Material; import org.bukkit.Material;

14
Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents183.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents183.java
View file

@ -1,11 +1,11 @@
package com.plotsquared.bukkit.listeners; package com.github.intellectualsites.plotsquared.bukkit.listeners;
import com.intellectualcrafters.plot.PS; import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil;
import com.intellectualcrafters.plot.flag.Flags; import com.github.intellectualsites.plotsquared.plot.PS;
import com.intellectualcrafters.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.flag.Flags;
import com.intellectualcrafters.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.Location;
import com.intellectualcrafters.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.Plot;
import com.plotsquared.bukkit.util.BukkitUtil; import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;

24
Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents_1_8.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents_1_8.java
View file

@ -1,16 +1,16 @@
package com.plotsquared.bukkit.listeners; package com.github.intellectualsites.plotsquared.bukkit.listeners;
import com.intellectualcrafters.plot.PS; import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil;
import com.intellectualcrafters.plot.config.C; import com.github.intellectualsites.plotsquared.plot.PS;
import com.intellectualcrafters.plot.flag.Flags; import com.github.intellectualsites.plotsquared.plot.config.C;
import com.intellectualcrafters.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.flag.Flags;
import com.intellectualcrafters.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.listener.PlotListener;
import com.intellectualcrafters.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.object.Location;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.Plot;
import com.intellectualcrafters.plot.util.MainUtil; import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
import com.intellectualcrafters.plot.util.Permissions; import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
import com.plotsquared.bukkit.util.BukkitUtil; import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
import com.plotsquared.listener.PlotListener; import com.github.intellectualsites.plotsquared.plot.util.Permissions;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockState; import org.bukkit.block.BlockState;

8
Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents_1_9.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents_1_9.java
View file

@ -1,8 +1,8 @@
package com.plotsquared.bukkit.listeners; package com.github.intellectualsites.plotsquared.bukkit.listeners;
import com.intellectualcrafters.plot.PS; import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil;
import com.intellectualcrafters.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.PS;
import com.plotsquared.bukkit.util.BukkitUtil; import com.github.intellectualsites.plotsquared.plot.object.Location;
import org.bukkit.entity.LingeringPotion; import org.bukkit.entity.LingeringPotion;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;

16
Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlotPlusListener.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java
View file

@ -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.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.Bukkit;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.block.Block; import org.bukkit.block.Block;

10
Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlotPlusListener_1_12.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener_1_12.java
View file

@ -1,9 +1,9 @@
package com.plotsquared.bukkit.listeners; package com.github.intellectualsites.plotsquared.bukkit.listeners;
import com.intellectualcrafters.plot.flag.Flags; import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil;
import com.intellectualcrafters.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.flag.Flags;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.Plot;
import com.plotsquared.bukkit.util.BukkitUtil; import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;

10
Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlotPlusListener_Legacy.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener_Legacy.java
View file

@ -1,9 +1,9 @@
package com.plotsquared.bukkit.listeners; package com.github.intellectualsites.plotsquared.bukkit.listeners;
import com.intellectualcrafters.plot.flag.Flags; import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil;
import com.intellectualcrafters.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.flag.Flags;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.Plot;
import com.plotsquared.bukkit.util.BukkitUtil; import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;

12
Bukkit/src/main/java/com/plotsquared/bukkit/listeners/SingleWorldListener.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java
View file

@ -1,9 +1,9 @@
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 com.intellectualcrafters.plot.object.worlds.PlotAreaManager; import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager;
import com.intellectualcrafters.plot.object.worlds.SinglePlotAreaManager; import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager;
import com.intellectualcrafters.plot.util.ReflectionUtils; import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.World; import org.bukkit.World;
@ -17,7 +17,7 @@ import org.bukkit.plugin.Plugin;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import static com.intellectualcrafters.plot.util.ReflectionUtils.getRefClass; import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass;
public class SingleWorldListener implements Listener { public class SingleWorldListener implements Listener {

12
Bukkit/src/main/java/com/plotsquared/bukkit/listeners/WorldEvents.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/WorldEvents.java
View file

@ -1,10 +1,10 @@
package com.plotsquared.bukkit.listeners; package com.github.intellectualsites.plotsquared.bukkit.listeners;
import com.intellectualcrafters.plot.PS; import com.github.intellectualsites.plotsquared.bukkit.generator.BukkitPlotGenerator;
import com.intellectualcrafters.plot.generator.GeneratorWrapper; import com.github.intellectualsites.plotsquared.plot.PS;
import com.intellectualcrafters.plot.object.worlds.PlotAreaManager; import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper;
import com.intellectualcrafters.plot.object.worlds.SinglePlotAreaManager; import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager;
import com.plotsquared.bukkit.generator.BukkitPlotGenerator; import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;

6
Bukkit/src/main/java/com/plotsquared/bukkit/object/BukkitLazyBlock.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitLazyBlock.java
View file

@ -1,7 +1,7 @@
package com.plotsquared.bukkit.object; package com.github.intellectualsites.plotsquared.bukkit.object;
import com.intellectualcrafters.plot.object.LazyBlock; import com.github.intellectualsites.plotsquared.plot.object.LazyBlock;
import com.intellectualcrafters.plot.object.PlotBlock; import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
import org.bukkit.block.Block; import org.bukkit.block.Block;
public class BukkitLazyBlock extends LazyBlock { public class BukkitLazyBlock extends LazyBlock {

4
Bukkit/src/main/java/com/plotsquared/bukkit/object/BukkitOfflinePlayer.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitOfflinePlayer.java
View file

@ -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 org.bukkit.OfflinePlayer;
import java.util.UUID; import java.util.UUID;

14
Bukkit/src/main/java/com/plotsquared/bukkit/object/BukkitPlayer.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
View file

@ -1,11 +1,11 @@
package com.plotsquared.bukkit.object; package com.github.intellectualsites.plotsquared.bukkit.object;
import com.intellectualcrafters.plot.PS; import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil;
import com.intellectualcrafters.plot.config.C; import com.github.intellectualsites.plotsquared.plot.PS;
import com.intellectualcrafters.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.config.C;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.Location;
import com.intellectualcrafters.plot.util.*; import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
import com.plotsquared.bukkit.util.BukkitUtil; import com.github.intellectualsites.plotsquared.plot.util.*;
import org.bukkit.Effect; import org.bukkit.Effect;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.WeatherType; import org.bukkit.WeatherType;

2
Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/AgeableStats.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/AgeableStats.java
View file

@ -1,4 +1,4 @@
package com.plotsquared.bukkit.object.entity; package com.github.intellectualsites.plotsquared.bukkit.object.entity;
class AgeableStats { class AgeableStats {

2
Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/ArmorStandStats.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ArmorStandStats.java
View file

@ -1,4 +1,4 @@
package com.plotsquared.bukkit.object.entity; package com.github.intellectualsites.plotsquared.bukkit.object.entity;
class ArmorStandStats { class ArmorStandStats {

2
Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/EntityBaseStats.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/EntityBaseStats.java
View file

@ -1,4 +1,4 @@
package com.plotsquared.bukkit.object.entity; package com.github.intellectualsites.plotsquared.bukkit.object.entity;
class EntityBaseStats { class EntityBaseStats {

6
Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/EntityWrapper.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/EntityWrapper.java
View file

@ -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.github.intellectualsites.plotsquared.bukkit.util.BukkitVersion;
import com.plotsquared.bukkit.util.BukkitVersion; import com.github.intellectualsites.plotsquared.plot.PS;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.entity.*; import org.bukkit.entity.*;

2
Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/HorseStats.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/HorseStats.java
View file

@ -1,4 +1,4 @@
package com.plotsquared.bukkit.object.entity; package com.github.intellectualsites.plotsquared.bukkit.object.entity;
import org.bukkit.entity.Horse; import org.bukkit.entity.Horse;

2
Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/LivingEntityStats.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/LivingEntityStats.java
View file

@ -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.inventory.ItemStack;
import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffect;

2
Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/TameableStats.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/TameableStats.java
View file

@ -1,4 +1,4 @@
package com.plotsquared.bukkit.object.entity; package com.github.intellectualsites.plotsquared.bukkit.object.entity;
import org.bukkit.entity.AnimalTamer; import org.bukkit.entity.AnimalTamer;

10
Bukkit/src/main/java/com/plotsquared/bukkit/object/schematic/StateWrapper.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java
View file

@ -1,9 +1,9 @@
package com.plotsquared.bukkit.object.schematic; package com.github.intellectualsites.plotsquared.bukkit.object.schematic;
import com.intellectualcrafters.jnbt.*; import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil;
import com.intellectualcrafters.plot.object.schematic.ItemType; import com.github.intellectualsites.plotsquared.jnbt.*;
import com.intellectualcrafters.plot.util.MathMan; import com.github.intellectualsites.plotsquared.plot.object.schematic.ItemType;
import com.plotsquared.bukkit.util.BukkitUtil; import com.github.intellectualsites.plotsquared.plot.util.MathMan;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockState; import org.bukkit.block.BlockState;

4
Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitleManager.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitleManager.java
View file

@ -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.ChatColor;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

4
Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitleManager_183.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitleManager_183.java
View file

@ -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.ChatColor;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

12
Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle_111.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle_111.java
View file

@ -1,10 +1,10 @@
package com.plotsquared.bukkit.titles; package com.github.intellectualsites.plotsquared.bukkit.titles;
import com.intellectualcrafters.plot.PS; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.github.intellectualsites.plotsquared.bukkit.util.BukkitVersion;
import com.intellectualcrafters.plot.util.AbstractTitle; import com.github.intellectualsites.plotsquared.plot.PS;
import com.plotsquared.bukkit.object.BukkitPlayer; import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
import com.plotsquared.bukkit.util.BukkitVersion; import com.github.intellectualsites.plotsquared.plot.util.AbstractTitle;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@SuppressWarnings("deprecation") public class DefaultTitle_111 extends AbstractTitle { @SuppressWarnings("deprecation") public class DefaultTitle_111 extends AbstractTitle {

8
Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle_180.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle_180.java
View file

@ -1,8 +1,8 @@
package com.plotsquared.bukkit.titles; package com.github.intellectualsites.plotsquared.bukkit.titles;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
import com.intellectualcrafters.plot.util.AbstractTitle; import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
import com.plotsquared.bukkit.object.BukkitPlayer; import com.github.intellectualsites.plotsquared.plot.util.AbstractTitle;
public class DefaultTitle_180 extends AbstractTitle { public class DefaultTitle_180 extends AbstractTitle {

8
Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle_183.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle_183.java
View file

@ -1,8 +1,8 @@
package com.plotsquared.bukkit.titles; package com.github.intellectualsites.plotsquared.bukkit.titles;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
import com.intellectualcrafters.plot.util.AbstractTitle; import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
import com.plotsquared.bukkit.object.BukkitPlayer; import com.github.intellectualsites.plotsquared.plot.util.AbstractTitle;
public class DefaultTitle_183 extends AbstractTitle { public class DefaultTitle_183 extends AbstractTitle {

10
Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle_19.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle_19.java
View file

@ -1,9 +1,9 @@
package com.plotsquared.bukkit.titles; package com.github.intellectualsites.plotsquared.bukkit.titles;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
import com.intellectualcrafters.plot.util.AbstractTitle; import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.util.TaskManager; import com.github.intellectualsites.plotsquared.plot.util.AbstractTitle;
import com.plotsquared.bukkit.object.BukkitPlayer; import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@SuppressWarnings("deprecation") public class DefaultTitle_19 extends AbstractTitle { @SuppressWarnings("deprecation") public class DefaultTitle_19 extends AbstractTitle {

12
Bukkit/src/main/java/com/plotsquared/bukkit/titles/HackTitle.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/HackTitle.java
View file

@ -1,10 +1,10 @@
package com.plotsquared.bukkit.titles; package com.github.intellectualsites.plotsquared.bukkit.titles;
import com.intellectualcrafters.plot.PS; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
import com.intellectualcrafters.plot.config.Settings; import com.github.intellectualsites.plotsquared.plot.PS;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.config.Settings;
import com.intellectualcrafters.plot.util.AbstractTitle; import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
import com.plotsquared.bukkit.object.BukkitPlayer; import com.github.intellectualsites.plotsquared.plot.util.AbstractTitle;
public class HackTitle extends AbstractTitle { public class HackTitle extends AbstractTitle {

4
Bukkit/src/main/java/com/plotsquared/bukkit/titles/HackTitleManager.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/HackTitleManager.java
View file

@ -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.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

2
Bukkit/src/main/java/com/plotsquared/bukkit/titles/TitleManager.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager.java
View file

@ -1,4 +1,4 @@
package com.plotsquared.bukkit.titles; package com.github.intellectualsites.plotsquared.bukkit.titles;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;

2
Bukkit/src/main/java/com/plotsquared/bukkit/titles/TitleManager_1_11.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java
View file

@ -1,4 +1,4 @@
package com.plotsquared.bukkit.titles; package com.github.intellectualsites.plotsquared.bukkit.titles;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;

18
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChatManager.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChatManager.java
View file

@ -1,13 +1,13 @@
package com.plotsquared.bukkit.util; package com.github.intellectualsites.plotsquared.bukkit.util;
import com.intellectualcrafters.plot.config.C; import com.github.intellectualsites.plotsquared.bukkit.chat.FancyMessage;
import com.intellectualcrafters.plot.config.Settings; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
import com.intellectualcrafters.plot.object.ConsolePlayer; import com.github.intellectualsites.plotsquared.plot.config.C;
import com.intellectualcrafters.plot.object.PlotMessage; import com.github.intellectualsites.plotsquared.plot.config.Settings;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.ConsolePlayer;
import com.intellectualcrafters.plot.util.ChatManager; import com.github.intellectualsites.plotsquared.plot.object.PlotMessage;
import com.plotsquared.bukkit.chat.FancyMessage; import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
import com.plotsquared.bukkit.object.BukkitPlayer; import com.github.intellectualsites.plotsquared.plot.util.ChatManager;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import java.util.ArrayList; import java.util.ArrayList;

46
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChunkManager.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
View file

@ -1,15 +1,14 @@
package com.plotsquared.bukkit.util; package com.github.intellectualsites.plotsquared.bukkit.util;
import com.intellectualcrafters.plot.PS; import com.github.intellectualsites.plotsquared.bukkit.object.entity.EntityWrapper;
import com.intellectualcrafters.plot.generator.AugmentedUtils; import com.github.intellectualsites.plotsquared.plot.PS;
import com.intellectualcrafters.plot.object.*; import com.github.intellectualsites.plotsquared.plot.generator.AugmentedUtils;
import com.intellectualcrafters.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.*;
import com.intellectualcrafters.plot.util.ChunkManager; import com.github.intellectualsites.plotsquared.plot.util.ChunkManager;
import com.intellectualcrafters.plot.util.TaskManager; import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
import com.intellectualcrafters.plot.util.block.GlobalBlockQueue; import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
import com.intellectualcrafters.plot.util.block.LocalBlockQueue; import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
import com.intellectualcrafters.plot.util.block.ScopedLocalBlockQueue; import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue;
import com.plotsquared.bukkit.object.entity.EntityWrapper;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.block.*; import org.bukkit.block.*;
import org.bukkit.block.banner.Pattern; import org.bukkit.block.banner.Pattern;
@ -101,12 +100,13 @@ public class BukkitChunkManager extends ChunkManager {
return chunks; 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 Runnable whenDone) {
final int relX = newPos.getX() - pos1.getX(); final int relX = newPos.getX() - pos1.getX();
final int relZ = newPos.getZ() - pos1.getZ(); final int relZ = newPos.getZ() - pos1.getZ();
Location pos4 = com.github.intellectualsites.plotsquared.plot.object.Location pos4 =
new Location(newPos.getWorld(), newPos.getX() + relX, 256, newPos.getZ() + relZ); new com.github.intellectualsites.plotsquared.plot.object.Location(newPos.getWorld(), newPos.getX() + relX, 256, newPos.getZ() + relZ);
final RegionWrapper region = final RegionWrapper region =
new RegionWrapper(pos1.getX(), pos2.getX(), pos1.getZ(), pos2.getZ()); new RegionWrapper(pos1.getX(), pos2.getX(), pos1.getZ(), pos2.getZ());
@ -158,7 +158,7 @@ public class BukkitChunkManager extends ChunkManager {
return true; 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 boolean ignoreAugment, final Runnable whenDone) {
final String world = pos1.getWorld(); final String world = pos1.getWorld();
@ -269,7 +269,8 @@ public class BukkitChunkManager extends ChunkManager {
@Override public void run() { @Override public void run() {
setChunkInPlotArea(null, new RunnableVal<ScopedLocalBlockQueue>() { setChunkInPlotArea(null, new RunnableVal<ScopedLocalBlockQueue>() {
@Override public void run(ScopedLocalBlockQueue value) { @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 bx = min.getX();
int bz = min.getZ(); int bz = min.getZ();
for (int x = 0; x < 16; x++) { for (int x = 0; x < 16; x++) {
@ -313,7 +314,8 @@ public class BukkitChunkManager extends ChunkManager {
return true; 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(); String world = pos1.getWorld();
List<Entity> entities = BukkitUtil.getEntities(world); List<Entity> entities = BukkitUtil.getEntities(world);
int bx = pos1.getX(); 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) { final Runnable whenDone) {
RegionWrapper region1 = RegionWrapper region1 =
new RegionWrapper(bot1.getX(), top1.getX(), bot1.getZ(), top1.getZ()); new RegionWrapper(bot1.getX(), top1.getX(), bot1.getZ(), top1.getZ());
@ -390,8 +392,8 @@ public class BukkitChunkManager extends ChunkManager {
PlotArea area = plot.getArea(); PlotArea area = plot.getArea();
World world = BukkitUtil.getWorld(area.worldname); World world = BukkitUtil.getWorld(area.worldname);
Location bot = plot.getBottomAbs(); com.github.intellectualsites.plotsquared.plot.object.Location bot = plot.getBottomAbs();
Location top = plot.getTopAbs(); com.github.intellectualsites.plotsquared.plot.object.Location top = plot.getTopAbs();
int bx = bot.getX() >> 4; int bx = bot.getX() >> 4;
int bz = bot.getZ() >> 4; int bz = bot.getZ() >> 4;
@ -649,7 +651,7 @@ public class BukkitChunkManager extends ChunkManager {
public void saveEntitiesOut(Chunk chunk, RegionWrapper region) { public void saveEntitiesOut(Chunk chunk, RegionWrapper region) {
for (Entity entity : chunk.getEntities()) { 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 x = loc.getX();
int z = loc.getZ(); int z = loc.getZ();
if (isIn(region, x, z)) { 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, public void saveEntitiesIn(Chunk chunk, RegionWrapper region, int offsetX, int offsetZ,
boolean delete) { boolean delete) {
for (Entity entity : chunk.getEntities()) { 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 x = loc.getX();
int z = loc.getZ(); int z = loc.getZ();
if (!isIn(region, x, z)) { if (!isIn(region, x, z)) {

10
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitCommand.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitCommand.java
View file

@ -1,9 +1,9 @@
package com.plotsquared.bukkit.util; package com.github.intellectualsites.plotsquared.bukkit.util;
import com.intellectualcrafters.plot.commands.MainCommand; import com.github.intellectualsites.plotsquared.bukkit.commands.DebugUUID;
import com.intellectualcrafters.plot.object.ConsolePlayer; import com.github.intellectualsites.plotsquared.plot.commands.MainCommand;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.ConsolePlayer;
import com.plotsquared.bukkit.commands.DebugUUID; import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
import org.bukkit.command.*; import org.bukkit.command.*;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

12
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEconHandler.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEconHandler.java
View file

@ -1,10 +1,10 @@
package com.plotsquared.bukkit.util; package com.github.intellectualsites.plotsquared.bukkit.util;
import com.intellectualcrafters.plot.object.OfflinePlotPlayer; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitOfflinePlayer;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
import com.intellectualcrafters.plot.util.EconHandler; import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer;
import com.plotsquared.bukkit.object.BukkitOfflinePlayer; import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
import com.plotsquared.bukkit.object.BukkitPlayer; import com.github.intellectualsites.plotsquared.plot.util.EconHandler;
import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.economy.Economy;
import net.milkbowl.vault.permission.Permission; import net.milkbowl.vault.permission.Permission;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;

12
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEventUtil.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEventUtil.java
View file

@ -1,10 +1,10 @@
package com.plotsquared.bukkit.util; package com.github.intellectualsites.plotsquared.bukkit.util;
import com.intellectualcrafters.plot.flag.Flag; import com.github.intellectualsites.plotsquared.bukkit.events.*;
import com.intellectualcrafters.plot.object.*; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
import com.intellectualcrafters.plot.util.EventUtil; import com.github.intellectualsites.plotsquared.plot.flag.Flag;
import com.plotsquared.bukkit.events.*; import com.github.intellectualsites.plotsquared.plot.object.*;
import com.plotsquared.bukkit.object.BukkitPlayer; import com.github.intellectualsites.plotsquared.plot.util.EventUtil;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;

26
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitHybridUtils.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java
View file

@ -1,17 +1,17 @@
package com.plotsquared.bukkit.util; package com.github.intellectualsites.plotsquared.bukkit.util;
import com.intellectualcrafters.plot.generator.HybridUtils; import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils;
import com.intellectualcrafters.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.Location;
import com.intellectualcrafters.plot.object.PlotBlock; import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
import com.intellectualcrafters.plot.object.RegionWrapper; import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper;
import com.intellectualcrafters.plot.object.RunnableVal; import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
import com.intellectualcrafters.plot.util.ChunkManager; import com.github.intellectualsites.plotsquared.plot.util.ChunkManager;
import com.intellectualcrafters.plot.util.MainUtil; import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.MathMan; import com.github.intellectualsites.plotsquared.plot.util.MathMan;
import com.intellectualcrafters.plot.util.TaskManager; import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
import com.intellectualcrafters.plot.util.block.GlobalBlockQueue; import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
import com.intellectualcrafters.plot.util.block.LocalBlockQueue; import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
import com.intellectualcrafters.plot.util.expiry.PlotAnalysis; import com.github.intellectualsites.plotsquared.plot.util.expiry.PlotAnalysis;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.World; import org.bukkit.World;

12
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitInventoryUtil.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java
View file

@ -1,10 +1,10 @@
package com.plotsquared.bukkit.util; package com.github.intellectualsites.plotsquared.bukkit.util;
import com.intellectualcrafters.plot.object.PlotInventory; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
import com.intellectualcrafters.plot.object.PlotItemStack; import com.github.intellectualsites.plotsquared.plot.object.PlotInventory;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.PlotItemStack;
import com.intellectualcrafters.plot.util.InventoryUtil; import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
import com.plotsquared.bukkit.object.BukkitPlayer; import com.github.intellectualsites.plotsquared.plot.util.InventoryUtil;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.inventory.InventoryType;

22
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSchematicHandler.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSchematicHandler.java
View file

@ -1,15 +1,15 @@
package com.plotsquared.bukkit.util; package com.github.intellectualsites.plotsquared.bukkit.util;
import com.intellectualcrafters.jnbt.*; import com.github.intellectualsites.plotsquared.bukkit.object.schematic.StateWrapper;
import com.intellectualcrafters.plot.object.ChunkLoc; import com.github.intellectualsites.plotsquared.jnbt.*;
import com.intellectualcrafters.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.ChunkLoc;
import com.intellectualcrafters.plot.object.RegionWrapper; import com.github.intellectualsites.plotsquared.plot.object.Location;
import com.intellectualcrafters.plot.object.RunnableVal; import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper;
import com.intellectualcrafters.plot.util.MainUtil; import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
import com.intellectualcrafters.plot.util.SchematicHandler; import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.TaskManager; import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler;
import com.intellectualcrafters.plot.util.block.LocalBlockQueue; import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
import com.plotsquared.bukkit.object.schematic.StateWrapper; import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.World; import org.bukkit.World;

20
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java
View file

@ -1,14 +1,14 @@
package com.plotsquared.bukkit.util; package com.github.intellectualsites.plotsquared.bukkit.util;
import com.intellectualcrafters.configuration.ConfigurationSection; import com.github.intellectualsites.plotsquared.bukkit.generator.BukkitPlotGenerator;
import com.intellectualcrafters.configuration.file.YamlConfiguration; import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
import com.intellectualcrafters.plot.PS; import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration;
import com.intellectualcrafters.plot.config.ConfigurationNode; import com.github.intellectualsites.plotsquared.plot.PS;
import com.intellectualcrafters.plot.generator.GeneratorWrapper; import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode;
import com.intellectualcrafters.plot.object.PlotArea; import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper;
import com.intellectualcrafters.plot.object.SetupObject; import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
import com.intellectualcrafters.plot.util.SetupUtils; import com.github.intellectualsites.plotsquared.plot.object.SetupObject;
import com.plotsquared.bukkit.generator.BukkitPlotGenerator; import com.github.intellectualsites.plotsquared.plot.util.SetupUtils;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.World.Environment; import org.bukkit.World.Environment;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

6
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitTaskManager.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitTaskManager.java
View file

@ -1,7 +1,7 @@
package com.plotsquared.bukkit.util; package com.github.intellectualsites.plotsquared.bukkit.util;
import com.intellectualcrafters.plot.util.TaskManager; import com.github.intellectualsites.plotsquared.bukkit.BukkitMain;
import com.plotsquared.bukkit.BukkitMain; import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
public class BukkitTaskManager extends TaskManager { public class BukkitTaskManager extends TaskManager {

22
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
View file

@ -1,15 +1,15 @@
package com.plotsquared.bukkit.util; package com.github.intellectualsites.plotsquared.bukkit.util;
import com.intellectualcrafters.plot.object.Location; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
import com.intellectualcrafters.plot.object.PlotBlock; import com.github.intellectualsites.plotsquared.plot.object.Location;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
import com.intellectualcrafters.plot.object.RegionWrapper; import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.object.schematic.PlotItem; import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper;
import com.intellectualcrafters.plot.util.MathMan; import com.github.intellectualsites.plotsquared.plot.object.schematic.PlotItem;
import com.intellectualcrafters.plot.util.StringComparison; import com.github.intellectualsites.plotsquared.plot.util.MathMan;
import com.intellectualcrafters.plot.util.UUIDHandler; import com.github.intellectualsites.plotsquared.plot.util.StringComparison;
import com.intellectualcrafters.plot.util.WorldUtil; import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
import com.plotsquared.bukkit.object.BukkitPlayer; import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;

2
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitVersion.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitVersion.java
View file

@ -1,4 +1,4 @@
package com.plotsquared.bukkit.util; package com.github.intellectualsites.plotsquared.bukkit.util;
public class BukkitVersion { public class BukkitVersion {
public static int[] v1_13_0 = {1, 13, 0}; public static int[] v1_13_0 = {1, 13, 0};

2
Bukkit/src/main/java/com/plotsquared/bukkit/util/Metrics.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/Metrics.java
View file

@ -1,4 +1,4 @@
package com.plotsquared.bukkit.util; package com.github.intellectualsites.plotsquared.bukkit.util;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

2
Bukkit/src/main/java/com/plotsquared/bukkit/util/NbtFactory.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/NbtFactory.java
View file

@ -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.base.Splitter;
import com.google.common.collect.BiMap; import com.google.common.collect.BiMap;

4
Bukkit/src/main/java/com/plotsquared/bukkit/util/OfflinePlayerUtil.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/OfflinePlayerUtil.java
View file

@ -1,4 +1,4 @@
package com.plotsquared.bukkit.util; package com.github.intellectualsites.plotsquared.bukkit.util;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
@ -9,8 +9,6 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.UUID; import java.util.UUID;
import static com.intellectualcrafters.plot.util.ReflectionUtils.*;
public class OfflinePlayerUtil { public class OfflinePlayerUtil {
public static Player loadPlayer(String name) { public static Player loadPlayer(String name) {

28
Bukkit/src/main/java/com/plotsquared/bukkit/util/SendChunk.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java
View file

@ -1,17 +1,17 @@
package com.plotsquared.bukkit.util; package com.github.intellectualsites.plotsquared.bukkit.util;
import com.intellectualcrafters.plot.PS; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
import com.intellectualcrafters.plot.object.ChunkLoc; import com.github.intellectualsites.plotsquared.plot.PS;
import com.intellectualcrafters.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.ChunkLoc;
import com.intellectualcrafters.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.Location;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.Plot;
import com.intellectualcrafters.plot.util.ReflectionUtils.RefClass; import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.util.ReflectionUtils.RefConstructor; import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefClass;
import com.intellectualcrafters.plot.util.ReflectionUtils.RefField; import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefConstructor;
import com.intellectualcrafters.plot.util.ReflectionUtils.RefMethod; import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefField;
import com.intellectualcrafters.plot.util.TaskManager; import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefMethod;
import com.intellectualcrafters.plot.util.UUIDHandler; import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
import com.plotsquared.bukkit.object.BukkitPlayer; import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.World; import org.bukkit.World;
@ -23,7 +23,7 @@ import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map.Entry; import java.util.Map.Entry;
import static com.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 * An utility that can be used to send chunks, rather than using bukkit code

10
Bukkit/src/main/java/com/plotsquared/bukkit/util/SetGenCB.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SetGenCB.java
View file

@ -1,9 +1,9 @@
package com.plotsquared.bukkit.util; package com.github.intellectualsites.plotsquared.bukkit.util;
import com.intellectualcrafters.plot.PS; import com.github.intellectualsites.plotsquared.bukkit.generator.BukkitAugmentedGenerator;
import com.intellectualcrafters.plot.generator.GeneratorWrapper; import com.github.intellectualsites.plotsquared.plot.PS;
import com.intellectualcrafters.plot.util.SetupUtils; import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper;
import com.plotsquared.bukkit.generator.BukkitAugmentedGenerator; import com.github.intellectualsites.plotsquared.plot.util.SetupUtils;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.generator.BlockPopulator; import org.bukkit.generator.BlockPopulator;
import org.bukkit.generator.ChunkGenerator; import org.bukkit.generator.ChunkGenerator;

10
Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java
View file

@ -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.github.intellectualsites.plotsquared.plot.object.PlotBlock;
import com.intellectualcrafters.plot.util.MainUtil; import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.StringMan; import com.github.intellectualsites.plotsquared.plot.util.StringMan;
import com.intellectualcrafters.plot.util.block.BasicLocalBlockQueue; import com.github.intellectualsites.plotsquared.plot.util.block.BasicLocalBlockQueue;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.World; import org.bukkit.World;

16
Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue_1_7.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue_1_7.java
View file

@ -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.github.intellectualsites.plotsquared.bukkit.util.SendChunk;
import com.intellectualcrafters.plot.object.PlotBlock; import com.github.intellectualsites.plotsquared.plot.object.ChunkWrapper;
import com.intellectualcrafters.plot.util.MainUtil; import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
import com.intellectualcrafters.plot.util.ReflectionUtils; import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.TaskManager; import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils;
import com.plotsquared.bukkit.util.SendChunk; import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.World; import org.bukkit.World;
import java.util.*; 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<PlotBlock[]> { public class BukkitLocalQueue_1_7 extends BukkitLocalQueue<PlotBlock[]> {

20
Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue_1_8.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue_1_8.java
View file

@ -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.github.intellectualsites.plotsquared.bukkit.util.SendChunk;
import com.intellectualcrafters.plot.object.PlotBlock; import com.github.intellectualsites.plotsquared.plot.object.ChunkWrapper;
import com.intellectualcrafters.plot.util.MainUtil; import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
import com.intellectualcrafters.plot.util.ReflectionUtils; import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.ReflectionUtils.RefClass; import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils;
import com.intellectualcrafters.plot.util.ReflectionUtils.RefMethod; import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefClass;
import com.intellectualcrafters.plot.util.TaskManager; import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefMethod;
import com.plotsquared.bukkit.util.SendChunk; import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.World; import org.bukkit.World;
@ -15,7 +15,7 @@ import org.bukkit.block.Block;
import java.util.*; 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<PlotBlock[]> { public class BukkitLocalQueue_1_8 extends BukkitLocalQueue<PlotBlock[]> {

22
Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue_1_8_3.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue_1_8_3.java
View file

@ -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.github.intellectualsites.plotsquared.bukkit.util.SendChunk;
import com.intellectualcrafters.plot.object.ChunkWrapper; import com.github.intellectualsites.plotsquared.plot.object.ChunkLoc;
import com.intellectualcrafters.plot.object.PseudoRandom; import com.github.intellectualsites.plotsquared.plot.object.ChunkWrapper;
import com.intellectualcrafters.plot.util.ChunkManager; import com.github.intellectualsites.plotsquared.plot.object.PseudoRandom;
import com.intellectualcrafters.plot.util.MainUtil; import com.github.intellectualsites.plotsquared.plot.util.ChunkManager;
import com.intellectualcrafters.plot.util.ReflectionUtils; import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.TaskManager; import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils;
import com.intellectualcrafters.plot.util.block.BasicLocalBlockQueue; import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
import com.plotsquared.bukkit.util.SendChunk; import com.github.intellectualsites.plotsquared.plot.util.block.BasicLocalBlockQueue;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.Material; import org.bukkit.Material;
@ -18,7 +18,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.*; 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<char[]> { public class BukkitLocalQueue_1_8_3 extends BukkitLocalQueue<char[]> {

14
Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue_1_9.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue_1_9.java
View file

@ -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.github.intellectualsites.plotsquared.plot.object.ChunkWrapper;
import com.intellectualcrafters.plot.object.PseudoRandom; import com.github.intellectualsites.plotsquared.plot.object.PseudoRandom;
import com.intellectualcrafters.plot.util.MainUtil; import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.ReflectionUtils; import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils;
import com.intellectualcrafters.plot.util.block.BasicLocalBlockQueue; import com.github.intellectualsites.plotsquared.plot.util.block.BasicLocalBlockQueue;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.World; import org.bukkit.World;
@ -13,7 +13,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.*; 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<char[]> { public class BukkitLocalQueue_1_9 extends BukkitLocalQueue<char[]> {

14
Bukkit/src/main/java/com/plotsquared/bukkit/util/block/GenChunk.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java
View file

@ -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.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil;
import com.intellectualcrafters.plot.object.Location; import com.github.intellectualsites.plotsquared.plot.object.ChunkWrapper;
import com.intellectualcrafters.plot.object.PlotBlock; import com.github.intellectualsites.plotsquared.plot.object.Location;
import com.intellectualcrafters.plot.util.MainUtil; import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
import com.intellectualcrafters.plot.util.block.ScopedLocalBlockQueue; import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
import com.plotsquared.bukkit.util.BukkitUtil; import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.World; import org.bukkit.World;

2
Nukkit/src/main/java/com/plotsquared/nukkit/uuid/DatFileFilter.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DatFileFilter.java
View file

@ -1,4 +1,4 @@
package com.plotsquared.nukkit.uuid; package com.github.intellectualsites.plotsquared.bukkit.uuid;
import java.io.File; import java.io.File;
import java.io.FilenameFilter; import java.io.FilenameFilter;

12
Bukkit/src/main/java/com/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java
View file

@ -1,10 +1,10 @@
package com.plotsquared.bukkit.uuid; package com.github.intellectualsites.plotsquared.bukkit.uuid;
import com.intellectualcrafters.plot.object.OfflinePlotPlayer; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitOfflinePlayer;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
import com.intellectualcrafters.plot.uuid.UUIDWrapper; import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer;
import com.plotsquared.bukkit.object.BukkitOfflinePlayer; import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
import com.plotsquared.bukkit.object.BukkitPlayer; import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;

28
Bukkit/src/main/java/com/plotsquared/bukkit/uuid/FileUUIDHandler.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java
View file

@ -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.HashBiMap;
import com.google.common.collect.Sets; 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.Bukkit;
import org.bukkit.World; import org.bukkit.World;

6
Bukkit/src/main/java/com/plotsquared/bukkit/uuid/LowerOfflineUUIDWrapper.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/LowerOfflineUUIDWrapper.java
View file

@ -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.google.common.base.Charsets;
import com.intellectualcrafters.plot.object.OfflinePlotPlayer;
import com.intellectualcrafters.plot.object.PlotPlayer;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import java.util.UUID; import java.util.UUID;

16
Bukkit/src/main/java/com/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java
View file

@ -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.base.Charsets;
import com.google.common.collect.BiMap; 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.Bukkit;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.Server; import org.bukkit.Server;

24
Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SQLUUIDHandler.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java
View file

@ -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.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.JSONArray;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser; import org.json.simple.parser.JSONParser;

28
Bukkit/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java → Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/api/PlotAPI.java
View file

@ -1,17 +1,17 @@
package com.intellectualcrafters.plot.api; package com.github.intellectualsites.plotsquared.plot.api;
import com.intellectualcrafters.configuration.file.YamlConfiguration; import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil;
import com.intellectualcrafters.plot.PS; import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration;
import com.intellectualcrafters.plot.commands.SubCommand; import com.github.intellectualsites.plotsquared.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.github.intellectualsites.plotsquared.plot.commands.SubCommand;
import com.intellectualcrafters.plot.flag.Flag; import com.github.intellectualsites.plotsquared.plot.config.C;
import com.intellectualcrafters.plot.flag.FlagManager; import com.github.intellectualsites.plotsquared.plot.flag.Flag;
import com.intellectualcrafters.plot.flag.Flags; import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
import com.intellectualcrafters.plot.object.*; import com.github.intellectualsites.plotsquared.plot.flag.Flags;
import com.intellectualcrafters.plot.util.*; import com.github.intellectualsites.plotsquared.plot.object.*;
import com.intellectualcrafters.plot.util.block.GlobalBlockQueue; import com.github.intellectualsites.plotsquared.plot.util.*;
import com.intellectualcrafters.plot.uuid.UUIDWrapper; import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
import com.plotsquared.bukkit.util.BukkitUtil; import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.World; import org.bukkit.World;
@ -28,7 +28,7 @@ import java.util.*;
* <li>{@link BukkitUtil}</li> * <li>{@link BukkitUtil}</li>
* <li>{@link PlotPlayer}</li> * <li>{@link PlotPlayer}</li>
* <li>{@link Plot}</li> * <li>{@link Plot}</li>
* <li>{@link com.intellectualcrafters.plot.object.Location}</li> * <li>{@link com.github.intellectualsites.plotsquared.plot.object.Location}</li>
* <li>{@link PlotArea}</li> * <li>{@link PlotArea}</li>
* <li>{@link PS}</li> * <li>{@link PS}</li>
* </ul> * </ul>

4
Bukkit/src/main/resources/plugin.yml
View file

@ -1,5 +1,5 @@
name: ${name} name: ${name}
main: com.plotsquared.bukkit.BukkitMain main: BukkitMain
version: ${version} version: ${version}
load: STARTUP load: STARTUP
description: > description: >
@ -314,4 +314,4 @@ permissions:
plots.admin.vehicle.*: true plots.admin.vehicle.*: true
plots.admin.interact.*: true plots.admin.interact.*: true
plots.admin.build.*: true plots.admin.build.*: true
plots.admin.destroy.*: true plots.admin.destroy.*: true

4
Core/src/main/java/com/plotsquared/general/commands/Argument.java → Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Argument.java
View file

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

24
Core/src/main/java/com/plotsquared/general/commands/Command.java → Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java
View file

@ -1,16 +1,16 @@
package com.plotsquared.general.commands; package com.github.intellectualsites.plotsquared.commands;
import com.intellectualcrafters.configuration.file.YamlConfiguration; import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration;
import com.intellectualcrafters.plot.PS; import com.github.intellectualsites.plotsquared.plot.PS;
import com.intellectualcrafters.plot.commands.CommandCategory; import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory;
import com.intellectualcrafters.plot.commands.MainCommand; import com.github.intellectualsites.plotsquared.plot.commands.MainCommand;
import com.intellectualcrafters.plot.commands.RequiredType; import com.github.intellectualsites.plotsquared.plot.commands.RequiredType;
import com.intellectualcrafters.plot.config.C; import com.github.intellectualsites.plotsquared.plot.config.C;
import com.intellectualcrafters.plot.object.PlotMessage; import com.github.intellectualsites.plotsquared.plot.object.PlotMessage;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.object.RunnableVal2; import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
import com.intellectualcrafters.plot.object.RunnableVal3; import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
import com.intellectualcrafters.plot.util.*; import com.github.intellectualsites.plotsquared.plot.util.*;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;

4
Core/src/main/java/com/plotsquared/general/commands/CommandCaller.java → Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandCaller.java
View file

@ -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 { public interface CommandCaller {

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