From 2b229f49d1e54bb0e33fa7dd794b2f4ac16ae4d5 Mon Sep 17 00:00:00 2001
From: Sauilitired <citymonstret@hotmail.com>
Date: Mon, 27 Jul 2015 22:27:44 +0200
Subject: [PATCH] Move UUID implementations to the bukkit package

---
 .../com/intellectualcrafters/plot/commands/DebugUUID.java   | 6 +++---
 .../plot/util/UUIDHandlerImplementation.java                | 4 ++--
 src/main/java/com/plotsquared/bukkit/BukkitMain.java        | 6 +++---
 .../bukkit}/uuid/DefaultUUIDWrapper.java                    | 3 ++-
 .../bukkit}/uuid/LowerOfflineUUIDWrapper.java               | 2 +-
 .../bukkit}/uuid/OfflineUUIDWrapper.java                    | 3 ++-
 6 files changed, 13 insertions(+), 11 deletions(-)
 rename src/main/java/com/{intellectualcrafters/plot => plotsquared/bukkit}/uuid/DefaultUUIDWrapper.java (93%)
 rename src/main/java/com/{intellectualcrafters/plot => plotsquared/bukkit}/uuid/LowerOfflineUUIDWrapper.java (98%)
 rename src/main/java/com/{intellectualcrafters/plot => plotsquared/bukkit}/uuid/OfflineUUIDWrapper.java (97%)

diff --git a/src/main/java/com/intellectualcrafters/plot/commands/DebugUUID.java b/src/main/java/com/intellectualcrafters/plot/commands/DebugUUID.java
index 6aa40082c..88e108843 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/DebugUUID.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/DebugUUID.java
@@ -33,9 +33,9 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.PlayerManager;
 import com.intellectualcrafters.plot.util.TaskManager;
 import com.intellectualcrafters.plot.util.UUIDHandler;
-import com.intellectualcrafters.plot.uuid.DefaultUUIDWrapper;
-import com.intellectualcrafters.plot.uuid.LowerOfflineUUIDWrapper;
-import com.intellectualcrafters.plot.uuid.OfflineUUIDWrapper;
+import com.plotsquared.bukkit.uuid.DefaultUUIDWrapper;
+import com.plotsquared.bukkit.uuid.LowerOfflineUUIDWrapper;
+import com.plotsquared.bukkit.uuid.OfflineUUIDWrapper;
 import com.intellectualcrafters.plot.uuid.UUIDWrapper;
 import com.plotsquared.general.commands.Argument;
 import com.plotsquared.general.commands.CommandDeclaration;
diff --git a/src/main/java/com/intellectualcrafters/plot/util/UUIDHandlerImplementation.java b/src/main/java/com/intellectualcrafters/plot/util/UUIDHandlerImplementation.java
index 2a4c71d2a..c430ada4c 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/UUIDHandlerImplementation.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/UUIDHandlerImplementation.java
@@ -9,8 +9,8 @@ import com.intellectualcrafters.plot.object.OfflinePlotPlayer;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.RunnableVal;
 import com.intellectualcrafters.plot.object.StringWrapper;
-import com.intellectualcrafters.plot.uuid.LowerOfflineUUIDWrapper;
-import com.intellectualcrafters.plot.uuid.OfflineUUIDWrapper;
+import com.plotsquared.bukkit.uuid.LowerOfflineUUIDWrapper;
+import com.plotsquared.bukkit.uuid.OfflineUUIDWrapper;
 import com.intellectualcrafters.plot.uuid.UUIDWrapper;
 
 import java.util.HashMap;
diff --git a/src/main/java/com/plotsquared/bukkit/BukkitMain.java b/src/main/java/com/plotsquared/bukkit/BukkitMain.java
index 72256b9ee..0cffa42ee 100644
--- a/src/main/java/com/plotsquared/bukkit/BukkitMain.java
+++ b/src/main/java/com/plotsquared/bukkit/BukkitMain.java
@@ -12,9 +12,9 @@ import com.intellectualcrafters.plot.generator.HybridUtils;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.PlotWorld;
 import com.intellectualcrafters.plot.util.*;
-import com.intellectualcrafters.plot.uuid.DefaultUUIDWrapper;
-import com.intellectualcrafters.plot.uuid.LowerOfflineUUIDWrapper;
-import com.intellectualcrafters.plot.uuid.OfflineUUIDWrapper;
+import com.plotsquared.bukkit.uuid.DefaultUUIDWrapper;
+import com.plotsquared.bukkit.uuid.LowerOfflineUUIDWrapper;
+import com.plotsquared.bukkit.uuid.OfflineUUIDWrapper;
 import com.intellectualcrafters.plot.uuid.UUIDWrapper;
 import com.plotsquared.bukkit.commands.BukkitCommand;
 import com.plotsquared.bukkit.database.plotme.ClassicPlotMeConnector;
diff --git a/src/main/java/com/intellectualcrafters/plot/uuid/DefaultUUIDWrapper.java b/src/main/java/com/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java
similarity index 93%
rename from src/main/java/com/intellectualcrafters/plot/uuid/DefaultUUIDWrapper.java
rename to src/main/java/com/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java
index 1c699c5fc..890da232e 100644
--- a/src/main/java/com/intellectualcrafters/plot/uuid/DefaultUUIDWrapper.java
+++ b/src/main/java/com/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java
@@ -1,7 +1,8 @@
-package com.intellectualcrafters.plot.uuid;
+package com.plotsquared.bukkit.uuid;
 
 import com.intellectualcrafters.plot.object.OfflinePlotPlayer;
 import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.uuid.UUIDWrapper;
 import com.plotsquared.bukkit.object.BukkitOfflinePlayer;
 import com.plotsquared.bukkit.object.BukkitPlayer;
 import org.bukkit.Bukkit;
diff --git a/src/main/java/com/intellectualcrafters/plot/uuid/LowerOfflineUUIDWrapper.java b/src/main/java/com/plotsquared/bukkit/uuid/LowerOfflineUUIDWrapper.java
similarity index 98%
rename from src/main/java/com/intellectualcrafters/plot/uuid/LowerOfflineUUIDWrapper.java
rename to src/main/java/com/plotsquared/bukkit/uuid/LowerOfflineUUIDWrapper.java
index d66d573d7..f7b570553 100644
--- a/src/main/java/com/intellectualcrafters/plot/uuid/LowerOfflineUUIDWrapper.java
+++ b/src/main/java/com/plotsquared/bukkit/uuid/LowerOfflineUUIDWrapper.java
@@ -1,4 +1,4 @@
-package com.intellectualcrafters.plot.uuid;
+package com.plotsquared.bukkit.uuid;
 
 import com.google.common.base.Charsets;
 import com.google.common.collect.BiMap;
diff --git a/src/main/java/com/intellectualcrafters/plot/uuid/OfflineUUIDWrapper.java b/src/main/java/com/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java
similarity index 97%
rename from src/main/java/com/intellectualcrafters/plot/uuid/OfflineUUIDWrapper.java
rename to src/main/java/com/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java
index f8b6e92c2..41980956f 100644
--- a/src/main/java/com/intellectualcrafters/plot/uuid/OfflineUUIDWrapper.java
+++ b/src/main/java/com/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java
@@ -1,4 +1,4 @@
-package com.intellectualcrafters.plot.uuid;
+package com.plotsquared.bukkit.uuid;
 
 import com.google.common.base.Charsets;
 import com.google.common.collect.BiMap;
@@ -7,6 +7,7 @@ import com.intellectualcrafters.plot.object.OfflinePlotPlayer;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.StringWrapper;
 import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.uuid.UUIDWrapper;
 import com.plotsquared.bukkit.object.BukkitOfflinePlayer;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;