From 3c2b53b4ff14a9698dbf044f05917d0f27c7e1ab Mon Sep 17 00:00:00 2001 From: Sekwah Date: Mon, 29 Jun 2020 00:39:27 +0100 Subject: [PATCH] Moving more stuff --- .../java/com/sekwah/advancedportals/ConfigRepository.java | 2 +- .../com/sekwah/advancedportals/ConfigRepositoryImpl.java | 4 ++-- .../sekwah/advancedportals/core/AdvancedPortalsCore.java | 8 ++++---- .../com/sekwah/advancedportals/core/CoreListeners.java | 8 ++++---- .../advancedportals/core/api/commands/SubCommand.java | 2 +- .../advancedportals/core/api/destination/Destination.java | 6 +++--- .../advancedportals/core/api/effect/TestEffect.java | 4 ++-- .../advancedportals/core/api/effect/WarpEffect.java | 4 ++-- .../advancedportals/core/api/portal/AdvancedPortal.java | 6 +++--- .../core/api/services/DestinationServices.java | 6 +++--- .../advancedportals/core/api/services/PortalServices.java | 6 +++--- .../core/api/services/PortalTempDataServices.java | 6 +++--- .../core/api/warphandler/ActivationData.java | 2 +- .../advancedportals/core/api/warphandler/TagHandler.java | 2 +- .../advancedportals/core/commands/CommandTemplate.java | 2 +- .../core/commands/CommandWithSubCommands.java | 2 +- .../core/commands/subcommands/CreateSubCommand.java | 2 +- .../commands/subcommands/desti/CreateDestiSubCommand.java | 6 +++--- .../subcommands/portal/CreatePortalSubCommand.java | 6 +++--- .../subcommands/portal/EndGatewayBlockSubCommand.java | 4 ++-- .../subcommands/portal/EndPortalBlockSubCommand.java | 4 ++-- .../subcommands/portal/PortalBlockSubCommand.java | 4 ++-- .../commands/subcommands/portal/ReloadSubCommand.java | 2 +- .../commands/subcommands/portal/RemoveSubCommand.java | 4 ++-- .../commands/subcommands/portal/SelectorSubCommand.java | 4 ++-- .../subcommands/portal/TransUpdateSubCommand.java | 2 +- .../commands/subcommands/portal/VersionSubCommand.java | 2 +- .../sekwah/advancedportals/{ => core}/config/Config.java | 2 +- .../{ => core}/config/RepositoryModule.java | 3 +-- .../connector}/command/CommandHandler.java | 2 +- .../connector}/command/CommandRegister.java | 2 +- .../connector}/container/CommandSenderContainer.java | 2 +- .../connector}/container/PlayerContainer.java | 6 +++--- .../connector}/container/ServerContainer.java | 2 +- .../connector}/container/WorldContainer.java | 4 ++-- .../connector}/info/DataCollector.java | 2 +- .../advancedportals/{ => core}/data/DataStorage.java | 2 +- .../sekwah/advancedportals/{ => core/data}/DataTag.java | 2 +- .../advancedportals/{ => core/data}/PlayerLocation.java | 7 ++++++- .../advancedportals/{ => core/data}/PlayerTempData.java | 2 +- .../advancedportals/{ => core/data}/PortalLocation.java | 5 ++++- .../advancedportals/repository/PortalRepository.java | 2 +- .../advancedportals/repository/PortalRepositoryImpl.java | 5 +---- .../repository/PortalTempDataRepository.java | 6 +++--- .../repository/PortalTempDataRepositoryImpl.java | 6 +++--- .../advancedportals/services/DestinationServices.java | 6 +++--- .../sekwah/advancedportals/services/PortalServices.java | 6 +++--- .../advancedportals/spigot/AdvancedPortalsPlugin.java | 2 +- .../java/com/sekwah/advancedportals/spigot/Listeners.java | 2 +- .../spigot/convertolddata/ConvertOldSubCommand.java | 2 +- .../coreconnector/command/SpigotCommandRegister.java | 2 +- .../container/SpigotCommandSenderContainer.java | 2 +- .../coreconnector/container/SpigotPlayerContainer.java | 8 ++++---- .../coreconnector/container/SpigotWorldContainer.java | 4 ++-- .../spigot/coreconnector/info/SpigotDataCollector.java | 2 +- .../advancedportals/spigot/effect/WarpEffectEnder.java | 4 ++-- .../advancedportals/{ => spigot}/metrics/Metrics.java | 2 +- 57 files changed, 109 insertions(+), 105 deletions(-) rename src/main/java/com/sekwah/advancedportals/{ => core}/config/Config.java (93%) rename src/main/java/com/sekwah/advancedportals/{ => core}/config/RepositoryModule.java (92%) rename src/main/java/com/sekwah/advancedportals/{coreconnector => core/connector}/command/CommandHandler.java (82%) rename src/main/java/com/sekwah/advancedportals/{coreconnector => core/connector}/command/CommandRegister.java (84%) rename src/main/java/com/sekwah/advancedportals/{coreconnector => core/connector}/container/CommandSenderContainer.java (81%) rename src/main/java/com/sekwah/advancedportals/{coreconnector => core/connector}/container/PlayerContainer.java (83%) rename src/main/java/com/sekwah/advancedportals/{coreconnector => core/connector}/container/ServerContainer.java (57%) rename src/main/java/com/sekwah/advancedportals/{coreconnector => core/connector}/container/WorldContainer.java (67%) rename src/main/java/com/sekwah/advancedportals/{coreconnector => core/connector}/info/DataCollector.java (78%) rename src/main/java/com/sekwah/advancedportals/{ => core}/data/DataStorage.java (99%) rename src/main/java/com/sekwah/advancedportals/{ => core/data}/DataTag.java (81%) rename src/main/java/com/sekwah/advancedportals/{ => core/data}/PlayerLocation.java (96%) rename src/main/java/com/sekwah/advancedportals/{ => core/data}/PlayerTempData.java (78%) rename src/main/java/com/sekwah/advancedportals/{ => core/data}/PortalLocation.java (91%) rename src/main/java/com/sekwah/advancedportals/{ => spigot}/metrics/Metrics.java (99%) diff --git a/src/main/java/com/sekwah/advancedportals/ConfigRepository.java b/src/main/java/com/sekwah/advancedportals/ConfigRepository.java index d7344d1..5f4ae26 100644 --- a/src/main/java/com/sekwah/advancedportals/ConfigRepository.java +++ b/src/main/java/com/sekwah/advancedportals/ConfigRepository.java @@ -1,6 +1,6 @@ package com.sekwah.advancedportals; -import com.sekwah.advancedportals.data.DataStorage; +import com.sekwah.advancedportals.core.data.DataStorage; public interface ConfigRepository { diff --git a/src/main/java/com/sekwah/advancedportals/ConfigRepositoryImpl.java b/src/main/java/com/sekwah/advancedportals/ConfigRepositoryImpl.java index 994b548..7bb6a52 100644 --- a/src/main/java/com/sekwah/advancedportals/ConfigRepositoryImpl.java +++ b/src/main/java/com/sekwah/advancedportals/ConfigRepositoryImpl.java @@ -1,8 +1,8 @@ package com.sekwah.advancedportals; import com.google.inject.Singleton; -import com.sekwah.advancedportals.config.Config; -import com.sekwah.advancedportals.data.DataStorage; +import com.sekwah.advancedportals.core.config.Config; +import com.sekwah.advancedportals.core.data.DataStorage; import java.util.HashMap; diff --git a/src/main/java/com/sekwah/advancedportals/core/AdvancedPortalsCore.java b/src/main/java/com/sekwah/advancedportals/core/AdvancedPortalsCore.java index 8ee3640..38af4d4 100644 --- a/src/main/java/com/sekwah/advancedportals/core/AdvancedPortalsCore.java +++ b/src/main/java/com/sekwah/advancedportals/core/AdvancedPortalsCore.java @@ -13,13 +13,13 @@ import com.sekwah.advancedportals.core.api.services.PortalTempDataServices; import com.sekwah.advancedportals.core.commands.CommandWithSubCommands; import com.sekwah.advancedportals.core.commands.subcommands.desti.CreateDestiSubCommand; import com.sekwah.advancedportals.core.commands.subcommands.portal.*; -import com.sekwah.advancedportals.config.RepositoryModule; -import com.sekwah.advancedportals.data.DataStorage; +import com.sekwah.advancedportals.core.config.RepositoryModule; +import com.sekwah.advancedportals.core.data.DataStorage; import com.sekwah.advancedportals.ConfigRepository; import com.sekwah.advancedportals.core.util.InfoLogger; import com.sekwah.advancedportals.core.util.Lang; -import com.sekwah.advancedportals.coreconnector.command.CommandRegister; -import com.sekwah.advancedportals.coreconnector.info.DataCollector; +import com.sekwah.advancedportals.core.connector.command.CommandRegister; +import com.sekwah.advancedportals.core.connector.info.DataCollector; import java.io.File; diff --git a/src/main/java/com/sekwah/advancedportals/core/CoreListeners.java b/src/main/java/com/sekwah/advancedportals/core/CoreListeners.java index 55470f5..174d634 100644 --- a/src/main/java/com/sekwah/advancedportals/core/CoreListeners.java +++ b/src/main/java/com/sekwah/advancedportals/core/CoreListeners.java @@ -3,11 +3,11 @@ package com.sekwah.advancedportals.core; import com.google.inject.Inject; import com.sekwah.advancedportals.core.api.services.PortalServices; import com.sekwah.advancedportals.core.api.services.PortalTempDataServices; -import com.sekwah.advancedportals.PlayerLocation; -import com.sekwah.advancedportals.PortalLocation; +import com.sekwah.advancedportals.core.data.PlayerLocation; +import com.sekwah.advancedportals.core.data.PortalLocation; import com.sekwah.advancedportals.core.util.Lang; -import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; -import com.sekwah.advancedportals.coreconnector.container.WorldContainer; +import com.sekwah.advancedportals.core.connector.container.PlayerContainer; +import com.sekwah.advancedportals.core.connector.container.WorldContainer; public class CoreListeners { diff --git a/src/main/java/com/sekwah/advancedportals/core/api/commands/SubCommand.java b/src/main/java/com/sekwah/advancedportals/core/api/commands/SubCommand.java index d939b87..6b94e71 100644 --- a/src/main/java/com/sekwah/advancedportals/core/api/commands/SubCommand.java +++ b/src/main/java/com/sekwah/advancedportals/core/api/commands/SubCommand.java @@ -1,6 +1,6 @@ package com.sekwah.advancedportals.core.api.commands; -import com.sekwah.advancedportals.coreconnector.container.CommandSenderContainer; +import com.sekwah.advancedportals.core.connector.container.CommandSenderContainer; import java.util.List; diff --git a/src/main/java/com/sekwah/advancedportals/core/api/destination/Destination.java b/src/main/java/com/sekwah/advancedportals/core/api/destination/Destination.java index 1b1cddd..7fbf44b 100644 --- a/src/main/java/com/sekwah/advancedportals/core/api/destination/Destination.java +++ b/src/main/java/com/sekwah/advancedportals/core/api/destination/Destination.java @@ -5,9 +5,9 @@ import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.core.api.registry.TagRegistry; import com.sekwah.advancedportals.core.api.warphandler.ActivationData; import com.sekwah.advancedportals.core.api.warphandler.TagHandler; -import com.sekwah.advancedportals.DataTag; -import com.sekwah.advancedportals.PlayerLocation; -import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; +import com.sekwah.advancedportals.core.data.DataTag; +import com.sekwah.advancedportals.core.data.PlayerLocation; +import com.sekwah.advancedportals.core.connector.container.PlayerContainer; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/sekwah/advancedportals/core/api/effect/TestEffect.java b/src/main/java/com/sekwah/advancedportals/core/api/effect/TestEffect.java index 216b386..291afdf 100644 --- a/src/main/java/com/sekwah/advancedportals/core/api/effect/TestEffect.java +++ b/src/main/java/com/sekwah/advancedportals/core/api/effect/TestEffect.java @@ -1,8 +1,8 @@ package com.sekwah.advancedportals.core.api.effect; import com.sekwah.advancedportals.core.api.portal.AdvancedPortal; -import com.sekwah.advancedportals.PortalLocation; -import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; +import com.sekwah.advancedportals.core.data.PortalLocation; +import com.sekwah.advancedportals.core.connector.container.PlayerContainer; /** * @author sekwah41 diff --git a/src/main/java/com/sekwah/advancedportals/core/api/effect/WarpEffect.java b/src/main/java/com/sekwah/advancedportals/core/api/effect/WarpEffect.java index c1773d0..a7d2c87 100644 --- a/src/main/java/com/sekwah/advancedportals/core/api/effect/WarpEffect.java +++ b/src/main/java/com/sekwah/advancedportals/core/api/effect/WarpEffect.java @@ -1,8 +1,8 @@ package com.sekwah.advancedportals.core.api.effect; import com.sekwah.advancedportals.core.api.portal.AdvancedPortal; -import com.sekwah.advancedportals.PortalLocation; -import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; +import com.sekwah.advancedportals.core.data.PortalLocation; +import com.sekwah.advancedportals.core.connector.container.PlayerContainer; /** * Effects to be registered to the list. diff --git a/src/main/java/com/sekwah/advancedportals/core/api/portal/AdvancedPortal.java b/src/main/java/com/sekwah/advancedportals/core/api/portal/AdvancedPortal.java index 9f5af33..001287a 100644 --- a/src/main/java/com/sekwah/advancedportals/core/api/portal/AdvancedPortal.java +++ b/src/main/java/com/sekwah/advancedportals/core/api/portal/AdvancedPortal.java @@ -5,9 +5,9 @@ import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.core.api.registry.TagRegistry; import com.sekwah.advancedportals.core.api.warphandler.ActivationData; import com.sekwah.advancedportals.core.api.warphandler.TagHandler; -import com.sekwah.advancedportals.DataTag; -import com.sekwah.advancedportals.PortalLocation; -import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; +import com.sekwah.advancedportals.core.data.DataTag; +import com.sekwah.advancedportals.core.data.PortalLocation; +import com.sekwah.advancedportals.core.connector.container.PlayerContainer; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/sekwah/advancedportals/core/api/services/DestinationServices.java b/src/main/java/com/sekwah/advancedportals/core/api/services/DestinationServices.java index 60dc28a..104ed94 100644 --- a/src/main/java/com/sekwah/advancedportals/core/api/services/DestinationServices.java +++ b/src/main/java/com/sekwah/advancedportals/core/api/services/DestinationServices.java @@ -1,10 +1,10 @@ package com.sekwah.advancedportals.core.api.services; import com.sekwah.advancedportals.core.api.destination.Destination; -import com.sekwah.advancedportals.DataTag; -import com.sekwah.advancedportals.PlayerLocation; +import com.sekwah.advancedportals.core.data.DataTag; +import com.sekwah.advancedportals.core.data.PlayerLocation; import com.sekwah.advancedportals.repository.DestinationRepositoryOld; -import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; +import com.sekwah.advancedportals.core.connector.container.PlayerContainer; import java.util.ArrayList; /** * https://github.com/sekwah41/Advanced-Portals/blob/24175610892152828e21f4ff824eb1589ccb0338/src/com/sekwah/advancedportals/core/api/managers/DestinationManager.java diff --git a/src/main/java/com/sekwah/advancedportals/core/api/services/PortalServices.java b/src/main/java/com/sekwah/advancedportals/core/api/services/PortalServices.java index fc324ad..a06c334 100644 --- a/src/main/java/com/sekwah/advancedportals/core/api/services/PortalServices.java +++ b/src/main/java/com/sekwah/advancedportals/core/api/services/PortalServices.java @@ -3,9 +3,9 @@ package com.sekwah.advancedportals.core.api.services; import com.google.common.collect.ImmutableList; import com.sekwah.advancedportals.repository.PortalRepository; import com.sekwah.advancedportals.core.api.portal.AdvancedPortal; -import com.sekwah.advancedportals.DataTag; -import com.sekwah.advancedportals.PlayerLocation; -import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; +import com.sekwah.advancedportals.core.data.DataTag; +import com.sekwah.advancedportals.core.data.PlayerLocation; +import com.sekwah.advancedportals.core.connector.container.PlayerContainer; import java.util.ArrayList; import java.util.Map; diff --git a/src/main/java/com/sekwah/advancedportals/core/api/services/PortalTempDataServices.java b/src/main/java/com/sekwah/advancedportals/core/api/services/PortalTempDataServices.java index 1ca5ea6..3437985 100644 --- a/src/main/java/com/sekwah/advancedportals/core/api/services/PortalTempDataServices.java +++ b/src/main/java/com/sekwah/advancedportals/core/api/services/PortalTempDataServices.java @@ -1,8 +1,8 @@ package com.sekwah.advancedportals.core.api.services; -import com.sekwah.advancedportals.PlayerTempData; -import com.sekwah.advancedportals.PortalLocation; -import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; +import com.sekwah.advancedportals.core.data.PlayerTempData; +import com.sekwah.advancedportals.core.data.PortalLocation; +import com.sekwah.advancedportals.core.connector.container.PlayerContainer; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/sekwah/advancedportals/core/api/warphandler/ActivationData.java b/src/main/java/com/sekwah/advancedportals/core/api/warphandler/ActivationData.java index 7e66957..b40720f 100644 --- a/src/main/java/com/sekwah/advancedportals/core/api/warphandler/ActivationData.java +++ b/src/main/java/com/sekwah/advancedportals/core/api/warphandler/ActivationData.java @@ -1,7 +1,7 @@ package com.sekwah.advancedportals.core.api.warphandler; -import com.sekwah.advancedportals.PlayerLocation; +import com.sekwah.advancedportals.core.data.PlayerLocation; /** * Created by on 30/07/2016. diff --git a/src/main/java/com/sekwah/advancedportals/core/api/warphandler/TagHandler.java b/src/main/java/com/sekwah/advancedportals/core/api/warphandler/TagHandler.java index 7af2ae4..377f769 100644 --- a/src/main/java/com/sekwah/advancedportals/core/api/warphandler/TagHandler.java +++ b/src/main/java/com/sekwah/advancedportals/core/api/warphandler/TagHandler.java @@ -1,6 +1,6 @@ package com.sekwah.advancedportals.core.api.warphandler; -import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; +import com.sekwah.advancedportals.core.connector.container.PlayerContainer; /** * If a tag can be used for any of them then either make it cast the target or if it doesnt need a target diff --git a/src/main/java/com/sekwah/advancedportals/core/commands/CommandTemplate.java b/src/main/java/com/sekwah/advancedportals/core/commands/CommandTemplate.java index 7ccf62a..aa1132b 100644 --- a/src/main/java/com/sekwah/advancedportals/core/commands/CommandTemplate.java +++ b/src/main/java/com/sekwah/advancedportals/core/commands/CommandTemplate.java @@ -1,6 +1,6 @@ package com.sekwah.advancedportals.core.commands; -import com.sekwah.advancedportals.coreconnector.container.CommandSenderContainer; +import com.sekwah.advancedportals.core.connector.container.CommandSenderContainer; import java.util.List; diff --git a/src/main/java/com/sekwah/advancedportals/core/commands/CommandWithSubCommands.java b/src/main/java/com/sekwah/advancedportals/core/commands/CommandWithSubCommands.java index e34bd68..a000b14 100644 --- a/src/main/java/com/sekwah/advancedportals/core/commands/CommandWithSubCommands.java +++ b/src/main/java/com/sekwah/advancedportals/core/commands/CommandWithSubCommands.java @@ -3,7 +3,7 @@ package com.sekwah.advancedportals.core.commands; import com.sekwah.advancedportals.core.api.commands.SubCommand; import com.sekwah.advancedportals.core.api.registry.SubCommandRegistry; import com.sekwah.advancedportals.core.util.Lang; -import com.sekwah.advancedportals.coreconnector.container.CommandSenderContainer; +import com.sekwah.advancedportals.core.connector.container.CommandSenderContainer; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/CreateSubCommand.java b/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/CreateSubCommand.java index f946fd3..2adcaf3 100644 --- a/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/CreateSubCommand.java +++ b/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/CreateSubCommand.java @@ -1,6 +1,6 @@ package com.sekwah.advancedportals.core.commands.subcommands; -import com.sekwah.advancedportals.DataTag; +import com.sekwah.advancedportals.core.data.DataTag; import java.util.ArrayList; diff --git a/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/desti/CreateDestiSubCommand.java b/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/desti/CreateDestiSubCommand.java index eccbd2f..8dbd896 100644 --- a/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/desti/CreateDestiSubCommand.java +++ b/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/desti/CreateDestiSubCommand.java @@ -4,10 +4,10 @@ import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.core.api.commands.SubCommand; import com.sekwah.advancedportals.core.api.destination.Destination; import com.sekwah.advancedportals.core.commands.subcommands.CreateSubCommand; -import com.sekwah.advancedportals.DataTag; +import com.sekwah.advancedportals.core.data.DataTag; import com.sekwah.advancedportals.core.util.Lang; -import com.sekwah.advancedportals.coreconnector.container.CommandSenderContainer; -import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; +import com.sekwah.advancedportals.core.connector.container.CommandSenderContainer; +import com.sekwah.advancedportals.core.connector.container.PlayerContainer; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/CreatePortalSubCommand.java b/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/CreatePortalSubCommand.java index e34b6f4..c050811 100644 --- a/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/CreatePortalSubCommand.java +++ b/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/CreatePortalSubCommand.java @@ -4,10 +4,10 @@ import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.core.api.commands.SubCommand; import com.sekwah.advancedportals.core.api.portal.AdvancedPortal; import com.sekwah.advancedportals.core.commands.subcommands.CreateSubCommand; -import com.sekwah.advancedportals.DataTag; +import com.sekwah.advancedportals.core.data.DataTag; import com.sekwah.advancedportals.core.util.Lang; -import com.sekwah.advancedportals.coreconnector.container.CommandSenderContainer; -import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; +import com.sekwah.advancedportals.core.connector.container.CommandSenderContainer; +import com.sekwah.advancedportals.core.connector.container.PlayerContainer; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/EndGatewayBlockSubCommand.java b/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/EndGatewayBlockSubCommand.java index 1aa8fc1..22216ec 100644 --- a/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/EndGatewayBlockSubCommand.java +++ b/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/EndGatewayBlockSubCommand.java @@ -4,8 +4,8 @@ import com.google.inject.Inject; import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.core.api.commands.SubCommand; import com.sekwah.advancedportals.core.util.Lang; -import com.sekwah.advancedportals.coreconnector.container.CommandSenderContainer; -import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; +import com.sekwah.advancedportals.core.connector.container.CommandSenderContainer; +import com.sekwah.advancedportals.core.connector.container.PlayerContainer; import java.util.List; diff --git a/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/EndPortalBlockSubCommand.java b/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/EndPortalBlockSubCommand.java index 01a45ac..5933ef8 100644 --- a/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/EndPortalBlockSubCommand.java +++ b/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/EndPortalBlockSubCommand.java @@ -4,8 +4,8 @@ import com.google.inject.Inject; import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.core.api.commands.SubCommand; import com.sekwah.advancedportals.core.util.Lang; -import com.sekwah.advancedportals.coreconnector.container.CommandSenderContainer; -import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; +import com.sekwah.advancedportals.core.connector.container.CommandSenderContainer; +import com.sekwah.advancedportals.core.connector.container.PlayerContainer; import java.util.List; diff --git a/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/PortalBlockSubCommand.java b/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/PortalBlockSubCommand.java index 5b5ec4f..dbec891 100644 --- a/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/PortalBlockSubCommand.java +++ b/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/PortalBlockSubCommand.java @@ -4,8 +4,8 @@ import com.google.inject.Inject; import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.core.api.commands.SubCommand; import com.sekwah.advancedportals.core.util.Lang; -import com.sekwah.advancedportals.coreconnector.container.CommandSenderContainer; -import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; +import com.sekwah.advancedportals.core.connector.container.CommandSenderContainer; +import com.sekwah.advancedportals.core.connector.container.PlayerContainer; import java.util.List; diff --git a/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/ReloadSubCommand.java b/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/ReloadSubCommand.java index ca9df45..f41a2b8 100644 --- a/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/ReloadSubCommand.java +++ b/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/ReloadSubCommand.java @@ -4,7 +4,7 @@ import com.google.inject.Inject; import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.core.api.commands.SubCommand; import com.sekwah.advancedportals.core.util.Lang; -import com.sekwah.advancedportals.coreconnector.container.CommandSenderContainer; +import com.sekwah.advancedportals.core.connector.container.CommandSenderContainer; import java.util.List; diff --git a/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/RemoveSubCommand.java b/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/RemoveSubCommand.java index 47c0a25..207a38b 100644 --- a/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/RemoveSubCommand.java +++ b/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/RemoveSubCommand.java @@ -4,8 +4,8 @@ import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.core.api.commands.SubCommand; import com.sekwah.advancedportals.core.api.portal.AdvancedPortal; import com.sekwah.advancedportals.core.util.Lang; -import com.sekwah.advancedportals.coreconnector.container.CommandSenderContainer; -import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; +import com.sekwah.advancedportals.core.connector.container.CommandSenderContainer; +import com.sekwah.advancedportals.core.connector.container.PlayerContainer; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/SelectorSubCommand.java b/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/SelectorSubCommand.java index 841db69..b3086ca 100644 --- a/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/SelectorSubCommand.java +++ b/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/SelectorSubCommand.java @@ -4,8 +4,8 @@ import com.google.inject.Inject; import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.core.api.commands.SubCommand; import com.sekwah.advancedportals.core.util.Lang; -import com.sekwah.advancedportals.coreconnector.container.CommandSenderContainer; -import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; +import com.sekwah.advancedportals.core.connector.container.CommandSenderContainer; +import com.sekwah.advancedportals.core.connector.container.PlayerContainer; import java.util.List; diff --git a/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/TransUpdateSubCommand.java b/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/TransUpdateSubCommand.java index cede614..2069a28 100644 --- a/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/TransUpdateSubCommand.java +++ b/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/TransUpdateSubCommand.java @@ -4,7 +4,7 @@ import com.google.inject.Inject; import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.core.api.commands.SubCommand; import com.sekwah.advancedportals.core.util.Lang; -import com.sekwah.advancedportals.coreconnector.container.CommandSenderContainer; +import com.sekwah.advancedportals.core.connector.container.CommandSenderContainer; import java.util.List; diff --git a/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/VersionSubCommand.java b/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/VersionSubCommand.java index 9e39624..89d23fe 100644 --- a/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/VersionSubCommand.java +++ b/src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/VersionSubCommand.java @@ -4,7 +4,7 @@ import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.core.api.commands.SubCommand; import com.sekwah.advancedportals.core.registry.SubCmd; import com.sekwah.advancedportals.core.util.Lang; -import com.sekwah.advancedportals.coreconnector.container.CommandSenderContainer; +import com.sekwah.advancedportals.core.connector.container.CommandSenderContainer; import java.util.List; diff --git a/src/main/java/com/sekwah/advancedportals/config/Config.java b/src/main/java/com/sekwah/advancedportals/core/config/Config.java similarity index 93% rename from src/main/java/com/sekwah/advancedportals/config/Config.java rename to src/main/java/com/sekwah/advancedportals/core/config/Config.java index ecc888a..c9f23d6 100644 --- a/src/main/java/com/sekwah/advancedportals/config/Config.java +++ b/src/main/java/com/sekwah/advancedportals/core/config/Config.java @@ -1,4 +1,4 @@ -package com.sekwah.advancedportals.config; +package com.sekwah.advancedportals.core.config; /** * To store the data for config diff --git a/src/main/java/com/sekwah/advancedportals/config/RepositoryModule.java b/src/main/java/com/sekwah/advancedportals/core/config/RepositoryModule.java similarity index 92% rename from src/main/java/com/sekwah/advancedportals/config/RepositoryModule.java rename to src/main/java/com/sekwah/advancedportals/core/config/RepositoryModule.java index 1cd2f9a..b9262ca 100644 --- a/src/main/java/com/sekwah/advancedportals/config/RepositoryModule.java +++ b/src/main/java/com/sekwah/advancedportals/core/config/RepositoryModule.java @@ -1,9 +1,8 @@ -package com.sekwah.advancedportals.config; +package com.sekwah.advancedportals.core.config; import com.google.inject.AbstractModule; import com.google.inject.Provides; import com.google.inject.Scopes; -import com.google.inject.matcher.Matchers; import com.sekwah.advancedportals.*; import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.repository.*; diff --git a/src/main/java/com/sekwah/advancedportals/coreconnector/command/CommandHandler.java b/src/main/java/com/sekwah/advancedportals/core/connector/command/CommandHandler.java similarity index 82% rename from src/main/java/com/sekwah/advancedportals/coreconnector/command/CommandHandler.java rename to src/main/java/com/sekwah/advancedportals/core/connector/command/CommandHandler.java index b43f8ff..06137d6 100644 --- a/src/main/java/com/sekwah/advancedportals/coreconnector/command/CommandHandler.java +++ b/src/main/java/com/sekwah/advancedportals/core/connector/command/CommandHandler.java @@ -1,4 +1,4 @@ -package com.sekwah.advancedportals.coreconnector.command; +package com.sekwah.advancedportals.core.connector.command; import com.sekwah.advancedportals.core.commands.CommandTemplate; diff --git a/src/main/java/com/sekwah/advancedportals/coreconnector/command/CommandRegister.java b/src/main/java/com/sekwah/advancedportals/core/connector/command/CommandRegister.java similarity index 84% rename from src/main/java/com/sekwah/advancedportals/coreconnector/command/CommandRegister.java rename to src/main/java/com/sekwah/advancedportals/core/connector/command/CommandRegister.java index 683f34d..29caf3d 100644 --- a/src/main/java/com/sekwah/advancedportals/coreconnector/command/CommandRegister.java +++ b/src/main/java/com/sekwah/advancedportals/core/connector/command/CommandRegister.java @@ -1,4 +1,4 @@ -package com.sekwah.advancedportals.coreconnector.command; +package com.sekwah.advancedportals.core.connector.command; import com.sekwah.advancedportals.core.commands.CommandTemplate; diff --git a/src/main/java/com/sekwah/advancedportals/coreconnector/container/CommandSenderContainer.java b/src/main/java/com/sekwah/advancedportals/core/connector/container/CommandSenderContainer.java similarity index 81% rename from src/main/java/com/sekwah/advancedportals/coreconnector/container/CommandSenderContainer.java rename to src/main/java/com/sekwah/advancedportals/core/connector/container/CommandSenderContainer.java index 267744b..2da5d69 100644 --- a/src/main/java/com/sekwah/advancedportals/coreconnector/container/CommandSenderContainer.java +++ b/src/main/java/com/sekwah/advancedportals/core/connector/container/CommandSenderContainer.java @@ -1,4 +1,4 @@ -package com.sekwah.advancedportals.coreconnector.container; +package com.sekwah.advancedportals.core.connector.container; public interface CommandSenderContainer { diff --git a/src/main/java/com/sekwah/advancedportals/coreconnector/container/PlayerContainer.java b/src/main/java/com/sekwah/advancedportals/core/connector/container/PlayerContainer.java similarity index 83% rename from src/main/java/com/sekwah/advancedportals/coreconnector/container/PlayerContainer.java rename to src/main/java/com/sekwah/advancedportals/core/connector/container/PlayerContainer.java index 7bfe8db..f68dd00 100644 --- a/src/main/java/com/sekwah/advancedportals/coreconnector/container/PlayerContainer.java +++ b/src/main/java/com/sekwah/advancedportals/core/connector/container/PlayerContainer.java @@ -1,7 +1,7 @@ -package com.sekwah.advancedportals.coreconnector.container; +package com.sekwah.advancedportals.core.connector.container; -import com.sekwah.advancedportals.PlayerLocation; -import com.sekwah.advancedportals.PortalLocation; +import com.sekwah.advancedportals.core.data.PlayerLocation; +import com.sekwah.advancedportals.core.data.PortalLocation; import java.util.UUID; diff --git a/src/main/java/com/sekwah/advancedportals/coreconnector/container/ServerContainer.java b/src/main/java/com/sekwah/advancedportals/core/connector/container/ServerContainer.java similarity index 57% rename from src/main/java/com/sekwah/advancedportals/coreconnector/container/ServerContainer.java rename to src/main/java/com/sekwah/advancedportals/core/connector/container/ServerContainer.java index 85192c7..5883e74 100644 --- a/src/main/java/com/sekwah/advancedportals/coreconnector/container/ServerContainer.java +++ b/src/main/java/com/sekwah/advancedportals/core/connector/container/ServerContainer.java @@ -1,4 +1,4 @@ -package com.sekwah.advancedportals.coreconnector.container; +package com.sekwah.advancedportals.core.connector.container; public interface ServerContainer { diff --git a/src/main/java/com/sekwah/advancedportals/coreconnector/container/WorldContainer.java b/src/main/java/com/sekwah/advancedportals/core/connector/container/WorldContainer.java similarity index 67% rename from src/main/java/com/sekwah/advancedportals/coreconnector/container/WorldContainer.java rename to src/main/java/com/sekwah/advancedportals/core/connector/container/WorldContainer.java index e133ac2..8f85027 100644 --- a/src/main/java/com/sekwah/advancedportals/coreconnector/container/WorldContainer.java +++ b/src/main/java/com/sekwah/advancedportals/core/connector/container/WorldContainer.java @@ -1,6 +1,6 @@ -package com.sekwah.advancedportals.coreconnector.container; +package com.sekwah.advancedportals.core.connector.container; -import com.sekwah.advancedportals.PortalLocation; +import com.sekwah.advancedportals.core.data.PortalLocation; public interface WorldContainer { diff --git a/src/main/java/com/sekwah/advancedportals/coreconnector/info/DataCollector.java b/src/main/java/com/sekwah/advancedportals/core/connector/info/DataCollector.java similarity index 78% rename from src/main/java/com/sekwah/advancedportals/coreconnector/info/DataCollector.java rename to src/main/java/com/sekwah/advancedportals/core/connector/info/DataCollector.java index 8893a7d..1aeb238 100644 --- a/src/main/java/com/sekwah/advancedportals/coreconnector/info/DataCollector.java +++ b/src/main/java/com/sekwah/advancedportals/core/connector/info/DataCollector.java @@ -1,4 +1,4 @@ -package com.sekwah.advancedportals.coreconnector.info; +package com.sekwah.advancedportals.core.connector.info; import java.util.List; diff --git a/src/main/java/com/sekwah/advancedportals/data/DataStorage.java b/src/main/java/com/sekwah/advancedportals/core/data/DataStorage.java similarity index 99% rename from src/main/java/com/sekwah/advancedportals/data/DataStorage.java rename to src/main/java/com/sekwah/advancedportals/core/data/DataStorage.java index c63fb70..6a90a86 100644 --- a/src/main/java/com/sekwah/advancedportals/data/DataStorage.java +++ b/src/main/java/com/sekwah/advancedportals/core/data/DataStorage.java @@ -1,4 +1,4 @@ -package com.sekwah.advancedportals.data; +package com.sekwah.advancedportals.core.data; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/src/main/java/com/sekwah/advancedportals/DataTag.java b/src/main/java/com/sekwah/advancedportals/core/data/DataTag.java similarity index 81% rename from src/main/java/com/sekwah/advancedportals/DataTag.java rename to src/main/java/com/sekwah/advancedportals/core/data/DataTag.java index 35a0c16..6e55b31 100644 --- a/src/main/java/com/sekwah/advancedportals/DataTag.java +++ b/src/main/java/com/sekwah/advancedportals/core/data/DataTag.java @@ -1,4 +1,4 @@ -package com.sekwah.advancedportals; +package com.sekwah.advancedportals.core.data; public class DataTag { diff --git a/src/main/java/com/sekwah/advancedportals/PlayerLocation.java b/src/main/java/com/sekwah/advancedportals/core/data/PlayerLocation.java similarity index 96% rename from src/main/java/com/sekwah/advancedportals/PlayerLocation.java rename to src/main/java/com/sekwah/advancedportals/core/data/PlayerLocation.java index f16b69c..1730e91 100644 --- a/src/main/java/com/sekwah/advancedportals/PlayerLocation.java +++ b/src/main/java/com/sekwah/advancedportals/core/data/PlayerLocation.java @@ -1,4 +1,4 @@ -package com.sekwah.advancedportals; +package com.sekwah.advancedportals.core.data; import com.google.gson.annotations.SerializedName; @@ -7,14 +7,19 @@ public class PlayerLocation { @SerializedName("x") private final double posX; + @SerializedName("y") private final double posY; + @SerializedName("z") private final double posZ; + @SerializedName("w") private final String worldName; + @SerializedName("yaw") private final float yaw; + @SerializedName("p") private final float pitch; diff --git a/src/main/java/com/sekwah/advancedportals/PlayerTempData.java b/src/main/java/com/sekwah/advancedportals/core/data/PlayerTempData.java similarity index 78% rename from src/main/java/com/sekwah/advancedportals/PlayerTempData.java rename to src/main/java/com/sekwah/advancedportals/core/data/PlayerTempData.java index e9769a5..192c766 100644 --- a/src/main/java/com/sekwah/advancedportals/PlayerTempData.java +++ b/src/main/java/com/sekwah/advancedportals/core/data/PlayerTempData.java @@ -1,4 +1,4 @@ -package com.sekwah.advancedportals; +package com.sekwah.advancedportals.core.data; public class PlayerTempData { diff --git a/src/main/java/com/sekwah/advancedportals/PortalLocation.java b/src/main/java/com/sekwah/advancedportals/core/data/PortalLocation.java similarity index 91% rename from src/main/java/com/sekwah/advancedportals/PortalLocation.java rename to src/main/java/com/sekwah/advancedportals/core/data/PortalLocation.java index bd92eda..9a57515 100644 --- a/src/main/java/com/sekwah/advancedportals/PortalLocation.java +++ b/src/main/java/com/sekwah/advancedportals/core/data/PortalLocation.java @@ -1,4 +1,4 @@ -package com.sekwah.advancedportals; +package com.sekwah.advancedportals.core.data; import com.google.gson.annotations.SerializedName; @@ -6,10 +6,13 @@ public class PortalLocation { @SerializedName("x") public final int posX; + @SerializedName("y") public final int posY; + @SerializedName("z") public final int posZ; + @SerializedName("w") public final String worldName; diff --git a/src/main/java/com/sekwah/advancedportals/repository/PortalRepository.java b/src/main/java/com/sekwah/advancedportals/repository/PortalRepository.java index 59c33f7..c6f6597 100644 --- a/src/main/java/com/sekwah/advancedportals/repository/PortalRepository.java +++ b/src/main/java/com/sekwah/advancedportals/repository/PortalRepository.java @@ -1,6 +1,6 @@ package com.sekwah.advancedportals.repository; -import com.sekwah.advancedportals.PortalLocation; +import com.sekwah.advancedportals.core.data.PortalLocation; public interface PortalRepository extends JsonRepository { diff --git a/src/main/java/com/sekwah/advancedportals/repository/PortalRepositoryImpl.java b/src/main/java/com/sekwah/advancedportals/repository/PortalRepositoryImpl.java index e25f9ec..380e8d0 100644 --- a/src/main/java/com/sekwah/advancedportals/repository/PortalRepositoryImpl.java +++ b/src/main/java/com/sekwah/advancedportals/repository/PortalRepositoryImpl.java @@ -2,11 +2,8 @@ package com.sekwah.advancedportals.repository; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; -import com.google.common.cache.LoadingCache; import com.google.inject.Singleton; -import com.sekwah.advancedportals.PlayerLocation; -import com.sekwah.advancedportals.PortalLocation; -import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; +import com.sekwah.advancedportals.core.data.PortalLocation; import java.util.UUID; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/com/sekwah/advancedportals/repository/PortalTempDataRepository.java b/src/main/java/com/sekwah/advancedportals/repository/PortalTempDataRepository.java index 53962c7..aa1130c 100644 --- a/src/main/java/com/sekwah/advancedportals/repository/PortalTempDataRepository.java +++ b/src/main/java/com/sekwah/advancedportals/repository/PortalTempDataRepository.java @@ -1,8 +1,8 @@ package com.sekwah.advancedportals.repository; -import com.sekwah.advancedportals.PlayerLocation; -import com.sekwah.advancedportals.PortalLocation; -import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; +import com.sekwah.advancedportals.core.data.PlayerLocation; +import com.sekwah.advancedportals.core.data.PortalLocation; +import com.sekwah.advancedportals.core.connector.container.PlayerContainer; import java.util.UUID; diff --git a/src/main/java/com/sekwah/advancedportals/repository/PortalTempDataRepositoryImpl.java b/src/main/java/com/sekwah/advancedportals/repository/PortalTempDataRepositoryImpl.java index 849ecf2..2eb19c2 100644 --- a/src/main/java/com/sekwah/advancedportals/repository/PortalTempDataRepositoryImpl.java +++ b/src/main/java/com/sekwah/advancedportals/repository/PortalTempDataRepositoryImpl.java @@ -5,9 +5,9 @@ import com.google.common.cache.CacheBuilder; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Table; import com.google.inject.Singleton; -import com.sekwah.advancedportals.PlayerLocation; -import com.sekwah.advancedportals.PortalLocation; -import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; +import com.sekwah.advancedportals.core.data.PlayerLocation; +import com.sekwah.advancedportals.core.data.PortalLocation; +import com.sekwah.advancedportals.core.connector.container.PlayerContainer; import java.util.UUID; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/com/sekwah/advancedportals/services/DestinationServices.java b/src/main/java/com/sekwah/advancedportals/services/DestinationServices.java index e320b8d..d3893ce 100644 --- a/src/main/java/com/sekwah/advancedportals/services/DestinationServices.java +++ b/src/main/java/com/sekwah/advancedportals/services/DestinationServices.java @@ -3,13 +3,13 @@ package com.sekwah.advancedportals.services; import com.google.common.collect.ImmutableMap; import com.google.gson.reflect.TypeToken; -import com.sekwah.advancedportals.DataTag; -import com.sekwah.advancedportals.PlayerLocation; +import com.sekwah.advancedportals.core.data.DataTag; +import com.sekwah.advancedportals.core.data.PlayerLocation; import com.sekwah.advancedportals.core.api.destination.Destination; import com.sekwah.advancedportals.core.api.warphandler.TagHandler; import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.core.util.Lang; -import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; +import com.sekwah.advancedportals.core.connector.container.PlayerContainer; import com.sekwah.advancedportals.repository.DestinationRepositoryImpl; import javax.inject.Inject; diff --git a/src/main/java/com/sekwah/advancedportals/services/PortalServices.java b/src/main/java/com/sekwah/advancedportals/services/PortalServices.java index ca3bb12..a87532d 100644 --- a/src/main/java/com/sekwah/advancedportals/services/PortalServices.java +++ b/src/main/java/com/sekwah/advancedportals/services/PortalServices.java @@ -1,9 +1,9 @@ package com.sekwah.advancedportals.services; import com.google.inject.Inject; -import com.sekwah.advancedportals.PlayerLocation; -import com.sekwah.advancedportals.PortalLocation; -import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; +import com.sekwah.advancedportals.core.data.PlayerLocation; +import com.sekwah.advancedportals.core.data.PortalLocation; +import com.sekwah.advancedportals.core.connector.container.PlayerContainer; import com.sekwah.advancedportals.repository.PortalRepository; import java.util.UUID; diff --git a/src/main/java/com/sekwah/advancedportals/spigot/AdvancedPortalsPlugin.java b/src/main/java/com/sekwah/advancedportals/spigot/AdvancedPortalsPlugin.java index f834868..37ec7ca 100644 --- a/src/main/java/com/sekwah/advancedportals/spigot/AdvancedPortalsPlugin.java +++ b/src/main/java/com/sekwah/advancedportals/spigot/AdvancedPortalsPlugin.java @@ -3,7 +3,7 @@ package com.sekwah.advancedportals.spigot; import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.spigot.coreconnector.command.SpigotCommandRegister; import com.sekwah.advancedportals.spigot.coreconnector.info.SpigotDataCollector; -import com.sekwah.advancedportals.metrics.Metrics; +import com.sekwah.advancedportals.spigot.metrics.Metrics; import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; diff --git a/src/main/java/com/sekwah/advancedportals/spigot/Listeners.java b/src/main/java/com/sekwah/advancedportals/spigot/Listeners.java index 2be2397..caa4f3f 100644 --- a/src/main/java/com/sekwah/advancedportals/spigot/Listeners.java +++ b/src/main/java/com/sekwah/advancedportals/spigot/Listeners.java @@ -2,7 +2,7 @@ package com.sekwah.advancedportals.spigot; import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.core.CoreListeners; -import com.sekwah.advancedportals.PortalLocation; +import com.sekwah.advancedportals.core.data.PortalLocation; import com.sekwah.advancedportals.spigot.coreconnector.container.SpigotPlayerContainer; import org.bukkit.Location; import org.bukkit.event.EventHandler; diff --git a/src/main/java/com/sekwah/advancedportals/spigot/convertolddata/ConvertOldSubCommand.java b/src/main/java/com/sekwah/advancedportals/spigot/convertolddata/ConvertOldSubCommand.java index 89f9499..e22beb2 100644 --- a/src/main/java/com/sekwah/advancedportals/spigot/convertolddata/ConvertOldSubCommand.java +++ b/src/main/java/com/sekwah/advancedportals/spigot/convertolddata/ConvertOldSubCommand.java @@ -2,7 +2,7 @@ package com.sekwah.advancedportals.spigot.convertolddata; import com.sekwah.advancedportals.core.api.commands.SubCommand; import com.sekwah.advancedportals.core.util.Lang; -import com.sekwah.advancedportals.coreconnector.container.CommandSenderContainer; +import com.sekwah.advancedportals.core.connector.container.CommandSenderContainer; import java.util.List; diff --git a/src/main/java/com/sekwah/advancedportals/spigot/coreconnector/command/SpigotCommandRegister.java b/src/main/java/com/sekwah/advancedportals/spigot/coreconnector/command/SpigotCommandRegister.java index e281451..fb504f0 100644 --- a/src/main/java/com/sekwah/advancedportals/spigot/coreconnector/command/SpigotCommandRegister.java +++ b/src/main/java/com/sekwah/advancedportals/spigot/coreconnector/command/SpigotCommandRegister.java @@ -1,7 +1,7 @@ package com.sekwah.advancedportals.spigot.coreconnector.command; import com.sekwah.advancedportals.core.commands.CommandTemplate; -import com.sekwah.advancedportals.coreconnector.command.CommandRegister; +import com.sekwah.advancedportals.core.connector.command.CommandRegister; import com.sekwah.advancedportals.spigot.AdvancedPortalsPlugin; /** diff --git a/src/main/java/com/sekwah/advancedportals/spigot/coreconnector/container/SpigotCommandSenderContainer.java b/src/main/java/com/sekwah/advancedportals/spigot/coreconnector/container/SpigotCommandSenderContainer.java index 4d27a1d..9b9c8b0 100644 --- a/src/main/java/com/sekwah/advancedportals/spigot/coreconnector/container/SpigotCommandSenderContainer.java +++ b/src/main/java/com/sekwah/advancedportals/spigot/coreconnector/container/SpigotCommandSenderContainer.java @@ -1,6 +1,6 @@ package com.sekwah.advancedportals.spigot.coreconnector.container; -import com.sekwah.advancedportals.coreconnector.container.CommandSenderContainer; +import com.sekwah.advancedportals.core.connector.container.CommandSenderContainer; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/com/sekwah/advancedportals/spigot/coreconnector/container/SpigotPlayerContainer.java b/src/main/java/com/sekwah/advancedportals/spigot/coreconnector/container/SpigotPlayerContainer.java index 8724e46..0dba44f 100644 --- a/src/main/java/com/sekwah/advancedportals/spigot/coreconnector/container/SpigotPlayerContainer.java +++ b/src/main/java/com/sekwah/advancedportals/spigot/coreconnector/container/SpigotPlayerContainer.java @@ -2,10 +2,10 @@ package com.sekwah.advancedportals.spigot.coreconnector.container; import com.google.inject.Inject; import com.sekwah.advancedportals.core.AdvancedPortalsCore; -import com.sekwah.advancedportals.PlayerLocation; -import com.sekwah.advancedportals.PortalLocation; -import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; -import com.sekwah.advancedportals.coreconnector.container.WorldContainer; +import com.sekwah.advancedportals.core.data.PlayerLocation; +import com.sekwah.advancedportals.core.data.PortalLocation; +import com.sekwah.advancedportals.core.connector.container.PlayerContainer; +import com.sekwah.advancedportals.core.connector.container.WorldContainer; import org.bukkit.Bukkit; import org.bukkit.DyeColor; import org.bukkit.Location; diff --git a/src/main/java/com/sekwah/advancedportals/spigot/coreconnector/container/SpigotWorldContainer.java b/src/main/java/com/sekwah/advancedportals/spigot/coreconnector/container/SpigotWorldContainer.java index 2250ea9..3ee23f1 100644 --- a/src/main/java/com/sekwah/advancedportals/spigot/coreconnector/container/SpigotWorldContainer.java +++ b/src/main/java/com/sekwah/advancedportals/spigot/coreconnector/container/SpigotWorldContainer.java @@ -1,7 +1,7 @@ package com.sekwah.advancedportals.spigot.coreconnector.container; -import com.sekwah.advancedportals.PortalLocation; -import com.sekwah.advancedportals.coreconnector.container.WorldContainer; +import com.sekwah.advancedportals.core.data.PortalLocation; +import com.sekwah.advancedportals.core.connector.container.WorldContainer; import org.bukkit.Material; import org.bukkit.World; import org.bukkit.block.BlockFace; diff --git a/src/main/java/com/sekwah/advancedportals/spigot/coreconnector/info/SpigotDataCollector.java b/src/main/java/com/sekwah/advancedportals/spigot/coreconnector/info/SpigotDataCollector.java index 8e9d738..9d8bbc6 100644 --- a/src/main/java/com/sekwah/advancedportals/spigot/coreconnector/info/SpigotDataCollector.java +++ b/src/main/java/com/sekwah/advancedportals/spigot/coreconnector/info/SpigotDataCollector.java @@ -1,6 +1,6 @@ package com.sekwah.advancedportals.spigot.coreconnector.info; -import com.sekwah.advancedportals.coreconnector.info.DataCollector; +import com.sekwah.advancedportals.core.connector.info.DataCollector; import org.bukkit.Material; import java.util.ArrayList; diff --git a/src/main/java/com/sekwah/advancedportals/spigot/effect/WarpEffectEnder.java b/src/main/java/com/sekwah/advancedportals/spigot/effect/WarpEffectEnder.java index c44f3e5..b2d2160 100644 --- a/src/main/java/com/sekwah/advancedportals/spigot/effect/WarpEffectEnder.java +++ b/src/main/java/com/sekwah/advancedportals/spigot/effect/WarpEffectEnder.java @@ -2,8 +2,8 @@ package com.sekwah.advancedportals.spigot.effect; import com.sekwah.advancedportals.core.api.effect.WarpEffect; import com.sekwah.advancedportals.core.api.portal.AdvancedPortal; -import com.sekwah.advancedportals.PortalLocation; -import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; +import com.sekwah.advancedportals.core.data.PortalLocation; +import com.sekwah.advancedportals.core.connector.container.PlayerContainer; public class WarpEffectEnder extends WarpEffect { @Override diff --git a/src/main/java/com/sekwah/advancedportals/metrics/Metrics.java b/src/main/java/com/sekwah/advancedportals/spigot/metrics/Metrics.java similarity index 99% rename from src/main/java/com/sekwah/advancedportals/metrics/Metrics.java rename to src/main/java/com/sekwah/advancedportals/spigot/metrics/Metrics.java index a513903..8617f34 100644 --- a/src/main/java/com/sekwah/advancedportals/metrics/Metrics.java +++ b/src/main/java/com/sekwah/advancedportals/spigot/metrics/Metrics.java @@ -1,4 +1,4 @@ -package com.sekwah.advancedportals.metrics; +package com.sekwah.advancedportals.spigot.metrics; import com.google.gson.JsonArray; import com.google.gson.JsonObject;