diff --git a/ic_plugin/src/main/java/nl/interestingcorner/coordinates/db/.LCKCoordinate.java~ b/ic_plugin/src/main/java/nl/interestingcorner/coordinates/db/.LCKCoordinate.java~ new file mode 100644 index 0000000..fde4fbf --- /dev/null +++ b/ic_plugin/src/main/java/nl/interestingcorner/coordinates/db/.LCKCoordinate.java~ @@ -0,0 +1 @@ +/home/sem/Development/Minecraft/mc-ic-server/ic_plugin/src/main/java/nl/interestingcorner/coordinates/db/Coordinate.java \ No newline at end of file diff --git a/ic_plugin/src/main/java/nl/interestingcorner/coordinates/db/.LCKMinecraftColor.java~ b/ic_plugin/src/main/java/nl/interestingcorner/coordinates/db/.LCKMinecraftColor.java~ new file mode 100644 index 0000000..399af69 --- /dev/null +++ b/ic_plugin/src/main/java/nl/interestingcorner/coordinates/db/.LCKMinecraftColor.java~ @@ -0,0 +1 @@ +/home/sem/Development/Minecraft/mc-ic-server/ic_plugin/src/main/java/nl/interestingcorner/coordinates/db/MinecraftColor.java \ No newline at end of file diff --git a/ic_plugin_coordinates/src/main/java/nl/interestingcorner/coordinates/commands/AddCoordinateCommandHandler.java b/ic_plugin_coordinates/src/main/java/nl/interestingcorner/coordinates/commands/AddCoordinateCommandHandler.java index 7c3ac37..fea348e 100644 --- a/ic_plugin_coordinates/src/main/java/nl/interestingcorner/coordinates/commands/AddCoordinateCommandHandler.java +++ b/ic_plugin_coordinates/src/main/java/nl/interestingcorner/coordinates/commands/AddCoordinateCommandHandler.java @@ -12,7 +12,7 @@ import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.TextComponent; import nl.interestingcorner.coordinates.db.Coordinate; import nl.interestingcorner.coordinates.db.CoordinatesDatabaseManager; -import nl.interestingcorner.coordinates.db.MinecraftColor; +import nl.interestingcorner.core.MinecraftColor; public class AddCoordinateCommandHandler implements CoordinatesCommandHandler { diff --git a/ic_plugin_coordinates/src/main/java/nl/interestingcorner/coordinates/db/Coordinate.java b/ic_plugin_coordinates/src/main/java/nl/interestingcorner/coordinates/db/Coordinate.java index fb72c83..61b9819 100644 --- a/ic_plugin_coordinates/src/main/java/nl/interestingcorner/coordinates/db/Coordinate.java +++ b/ic_plugin_coordinates/src/main/java/nl/interestingcorner/coordinates/db/Coordinate.java @@ -1,5 +1,7 @@ package nl.interestingcorner.coordinates.db; +import nl.interestingcorner.core.MinecraftColor; + /** * +-------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------+------+-----+---------+----------------+ * | Field | Type | Null | Key | Default | Extra | diff --git a/ic_plugin_coordinates/src/main/java/nl/interestingcorner/coordinates/db/CoordinatesDatabaseManager.java b/ic_plugin_coordinates/src/main/java/nl/interestingcorner/coordinates/db/CoordinatesDatabaseManager.java index 79d33d4..1319c1d 100644 --- a/ic_plugin_coordinates/src/main/java/nl/interestingcorner/coordinates/db/CoordinatesDatabaseManager.java +++ b/ic_plugin_coordinates/src/main/java/nl/interestingcorner/coordinates/db/CoordinatesDatabaseManager.java @@ -10,6 +10,8 @@ import java.util.logging.Level; import org.bukkit.plugin.java.JavaPlugin; +import nl.interestingcorner.core.MinecraftColor; + public enum CoordinatesDatabaseManager implements nl.interestingcorner.core.db.DatabaseInitializeListener{ INSTANCE; diff --git a/ic_plugin_coordinates/src/main/java/nl/interestingcorner/coordinates/gui/CoordinatesGUI.java b/ic_plugin_coordinates/src/main/java/nl/interestingcorner/coordinates/gui/CoordinatesGUI.java index 626afc5..88a1c06 100644 --- a/ic_plugin_coordinates/src/main/java/nl/interestingcorner/coordinates/gui/CoordinatesGUI.java +++ b/ic_plugin_coordinates/src/main/java/nl/interestingcorner/coordinates/gui/CoordinatesGUI.java @@ -10,7 +10,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import nl.interestingcorner.coordinates.db.Coordinate; -import nl.interestingcorner.coordinates.db.MinecraftColor; +import nl.interestingcorner.core.MinecraftColor; public class CoordinatesGUI { public static void open(Player player, List coordinates) { diff --git a/ic_plugin_coordinates/src/main/java/nl/interestingcorner/coordinates/db/MinecraftColor.java b/ic_plugin_core/src/main/java/nl/interestingcorner/core/MinecraftColor.java similarity index 98% rename from ic_plugin_coordinates/src/main/java/nl/interestingcorner/coordinates/db/MinecraftColor.java rename to ic_plugin_core/src/main/java/nl/interestingcorner/core/MinecraftColor.java index 11fbd1f..99defad 100644 --- a/ic_plugin_coordinates/src/main/java/nl/interestingcorner/coordinates/db/MinecraftColor.java +++ b/ic_plugin_core/src/main/java/nl/interestingcorner/core/MinecraftColor.java @@ -1,4 +1,4 @@ -package nl.interestingcorner.coordinates.db; +package nl.interestingcorner.core; import java.util.HashMap;