diff --git a/src/main/java/com/onarandombox/MultiverseCore/MVTeleport.java b/src/main/java/com/onarandombox/MultiverseCore/MVTeleport.java index 3da0736e..765a9e5f 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/MVTeleport.java +++ b/src/main/java/com/onarandombox/MultiverseCore/MVTeleport.java @@ -8,8 +8,8 @@ package com.onarandombox.MultiverseCore; import com.onarandombox.MultiverseCore.api.MVDestination; +import com.onarandombox.MultiverseCore.destination.InvalidDestination; import com.onarandombox.utils.BlockSafety; -import com.onarandombox.utils.InvalidDestination; import com.onarandombox.utils.LocationManipulation; import org.bukkit.Location; import org.bukkit.entity.Entity; diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java index bba7c0b9..fecdd808 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java +++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java @@ -14,6 +14,7 @@ import com.onarandombox.MultiverseCore.commands.*; import com.onarandombox.MultiverseCore.configuration.DefaultConfig; import com.onarandombox.MultiverseCore.configuration.MVConfigMigrator; import com.onarandombox.MultiverseCore.configuration.MVCoreConfigMigrator; +import com.onarandombox.MultiverseCore.destination.*; import com.onarandombox.MultiverseCore.listeners.MVEntityListener; import com.onarandombox.MultiverseCore.listeners.MVPlayerListener; import com.onarandombox.MultiverseCore.listeners.MVPluginListener; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java index d63f06e5..496c7e17 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java @@ -10,6 +10,9 @@ package com.onarandombox.MultiverseCore.commands; import com.onarandombox.MultiverseCore.MVTeleport; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MVDestination; +import com.onarandombox.MultiverseCore.destination.DestinationFactory; +import com.onarandombox.MultiverseCore.destination.InvalidDestination; +import com.onarandombox.MultiverseCore.destination.WorldDestination; import com.onarandombox.MultiverseCore.event.MVTeleportEvent; import com.onarandombox.utils.*; import org.bukkit.ChatColor; diff --git a/src/main/java/com/onarandombox/utils/BedDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/BedDestination.java similarity index 97% rename from src/main/java/com/onarandombox/utils/BedDestination.java rename to src/main/java/com/onarandombox/MultiverseCore/destination/BedDestination.java index 26b73eb9..81176d04 100644 --- a/src/main/java/com/onarandombox/utils/BedDestination.java +++ b/src/main/java/com/onarandombox/MultiverseCore/destination/BedDestination.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.utils; +package com.onarandombox.MultiverseCore.destination; import com.onarandombox.MultiverseCore.api.MVDestination; import org.bukkit.Location; diff --git a/src/main/java/com/onarandombox/utils/CannonDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/CannonDestination.java similarity index 99% rename from src/main/java/com/onarandombox/utils/CannonDestination.java rename to src/main/java/com/onarandombox/MultiverseCore/destination/CannonDestination.java index 3876bedf..575f3374 100644 --- a/src/main/java/com/onarandombox/utils/CannonDestination.java +++ b/src/main/java/com/onarandombox/MultiverseCore/destination/CannonDestination.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.utils; +package com.onarandombox.MultiverseCore.destination; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/onarandombox/utils/DestinationFactory.java b/src/main/java/com/onarandombox/MultiverseCore/destination/DestinationFactory.java similarity index 97% rename from src/main/java/com/onarandombox/utils/DestinationFactory.java rename to src/main/java/com/onarandombox/MultiverseCore/destination/DestinationFactory.java index 54814a9b..e1d8d8a5 100644 --- a/src/main/java/com/onarandombox/utils/DestinationFactory.java +++ b/src/main/java/com/onarandombox/MultiverseCore/destination/DestinationFactory.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.utils; +package com.onarandombox.MultiverseCore.destination; import java.util.HashMap; import java.util.List; @@ -14,6 +14,7 @@ import java.util.Map; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MVDestination; import com.onarandombox.MultiverseCore.commands.TeleportCommand; +import com.onarandombox.utils.PermissionTools; import com.pneumaticraft.commandhandler.Command; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; diff --git a/src/main/java/com/onarandombox/utils/ExactDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/ExactDestination.java similarity index 99% rename from src/main/java/com/onarandombox/utils/ExactDestination.java rename to src/main/java/com/onarandombox/MultiverseCore/destination/ExactDestination.java index e598a68d..f025d19a 100644 --- a/src/main/java/com/onarandombox/utils/ExactDestination.java +++ b/src/main/java/com/onarandombox/MultiverseCore/destination/ExactDestination.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.utils; +package com.onarandombox.MultiverseCore.destination; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/onarandombox/utils/InvalidDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/InvalidDestination.java similarity index 97% rename from src/main/java/com/onarandombox/utils/InvalidDestination.java rename to src/main/java/com/onarandombox/MultiverseCore/destination/InvalidDestination.java index d951b832..4a44c548 100644 --- a/src/main/java/com/onarandombox/utils/InvalidDestination.java +++ b/src/main/java/com/onarandombox/MultiverseCore/destination/InvalidDestination.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.utils; +package com.onarandombox.MultiverseCore.destination; import com.onarandombox.MultiverseCore.api.MVDestination; import org.bukkit.ChatColor; diff --git a/src/main/java/com/onarandombox/utils/PlayerDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/PlayerDestination.java similarity index 98% rename from src/main/java/com/onarandombox/utils/PlayerDestination.java rename to src/main/java/com/onarandombox/MultiverseCore/destination/PlayerDestination.java index b2cf5487..b17e890c 100644 --- a/src/main/java/com/onarandombox/utils/PlayerDestination.java +++ b/src/main/java/com/onarandombox/MultiverseCore/destination/PlayerDestination.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.utils; +package com.onarandombox.MultiverseCore.destination; import com.onarandombox.MultiverseCore.api.MVDestination; import org.bukkit.Location; diff --git a/src/main/java/com/onarandombox/utils/WorldDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/WorldDestination.java similarity index 97% rename from src/main/java/com/onarandombox/utils/WorldDestination.java rename to src/main/java/com/onarandombox/MultiverseCore/destination/WorldDestination.java index c606d53e..9d6b906e 100644 --- a/src/main/java/com/onarandombox/utils/WorldDestination.java +++ b/src/main/java/com/onarandombox/MultiverseCore/destination/WorldDestination.java @@ -5,9 +5,10 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.utils; +package com.onarandombox.MultiverseCore.destination; import com.onarandombox.MultiverseCore.api.MVDestination; +import com.onarandombox.utils.LocationManipulation; import org.bukkit.Location; import org.bukkit.entity.Entity; import org.bukkit.plugin.java.JavaPlugin; diff --git a/src/main/java/com/onarandombox/utils/MVTravelAgent.java b/src/main/java/com/onarandombox/utils/MVTravelAgent.java index ecdb0bea..0767befe 100644 --- a/src/main/java/com/onarandombox/utils/MVTravelAgent.java +++ b/src/main/java/com/onarandombox/utils/MVTravelAgent.java @@ -10,6 +10,7 @@ package com.onarandombox.utils; import java.util.logging.Level; import com.onarandombox.MultiverseCore.api.MVDestination; +import com.onarandombox.MultiverseCore.destination.CannonDestination; import org.bukkit.Location; import org.bukkit.TravelAgent; import org.bukkit.entity.Player;