Upstream/Advanced-Portals
1
0
Fork 0
mirror of https://github.com/sekwah41/Advanced-Portals.git synced 2024-07-19 10:44:43 +02:00
Code Issues Projects Releases Wiki Activity

Moving more stuff

Browse Source
This commit is contained in:
Sekwah 2020-06-29 00:39:27 +01:00
parent b87edaa8a8
commit 3c2b53b4ff
No known key found for this signature in database
GPG Key ID: C3BE2E6C861A461A
57 changed files with 109 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/sekwah/advancedportals/ConfigRepository.java
View File

@ -1,6 +1,6 @@
package com.sekwah.advancedportals; package com.sekwah.advancedportals;
import com.sekwah.advancedportals.data.DataStorage; import com.sekwah.advancedportals.core.data.DataStorage;
public interface ConfigRepository { public interface ConfigRepository {

4
src/main/java/com/sekwah/advancedportals/ConfigRepositoryImpl.java
View File

@ -1,8 +1,8 @@
package com.sekwah.advancedportals; package com.sekwah.advancedportals;
import com.google.inject.Singleton; import com.google.inject.Singleton;
import com.sekwah.advancedportals.config.Config; import com.sekwah.advancedportals.core.config.Config;
import com.sekwah.advancedportals.data.DataStorage; import com.sekwah.advancedportals.core.data.DataStorage;
import java.util.HashMap; import java.util.HashMap;

8
src/main/java/com/sekwah/advancedportals/core/AdvancedPortalsCore.java
View File

@ -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.CommandWithSubCommands;
import com.sekwah.advancedportals.core.commands.subcommands.desti.CreateDestiSubCommand; import com.sekwah.advancedportals.core.commands.subcommands.desti.CreateDestiSubCommand;
import com.sekwah.advancedportals.core.commands.subcommands.portal.*; import com.sekwah.advancedportals.core.commands.subcommands.portal.*;
import com.sekwah.advancedportals.config.RepositoryModule; import com.sekwah.advancedportals.core.config.RepositoryModule;
import com.sekwah.advancedportals.data.DataStorage; import com.sekwah.advancedportals.core.data.DataStorage;
import com.sekwah.advancedportals.ConfigRepository; import com.sekwah.advancedportals.ConfigRepository;
import com.sekwah.advancedportals.core.util.InfoLogger; import com.sekwah.advancedportals.core.util.InfoLogger;
import com.sekwah.advancedportals.core.util.Lang; import com.sekwah.advancedportals.core.util.Lang;
import com.sekwah.advancedportals.coreconnector.command.CommandRegister; import com.sekwah.advancedportals.core.connector.command.CommandRegister;
import com.sekwah.advancedportals.coreconnector.info.DataCollector; import com.sekwah.advancedportals.core.connector.info.DataCollector;
import java.io.File; import java.io.File;

8
src/main/java/com/sekwah/advancedportals/core/CoreListeners.java
View File

@ -3,11 +3,11 @@ package com.sekwah.advancedportals.core;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.sekwah.advancedportals.core.api.services.PortalServices; import com.sekwah.advancedportals.core.api.services.PortalServices;
import com.sekwah.advancedportals.core.api.services.PortalTempDataServices; import com.sekwah.advancedportals.core.api.services.PortalTempDataServices;
import com.sekwah.advancedportals.PlayerLocation; import com.sekwah.advancedportals.core.data.PlayerLocation;
import com.sekwah.advancedportals.PortalLocation; import com.sekwah.advancedportals.core.data.PortalLocation;
import com.sekwah.advancedportals.core.util.Lang; 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.coreconnector.container.WorldContainer; import com.sekwah.advancedportals.core.connector.container.WorldContainer;
public class CoreListeners { public class CoreListeners {

2
src/main/java/com/sekwah/advancedportals/core/api/commands/SubCommand.java
View File

@ -1,6 +1,6 @@
package com.sekwah.advancedportals.core.api.commands; 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; import java.util.List;

6
src/main/java/com/sekwah/advancedportals/core/api/destination/Destination.java
View File

@ -5,9 +5,9 @@ import com.sekwah.advancedportals.core.AdvancedPortalsCore;
import com.sekwah.advancedportals.core.api.registry.TagRegistry; import com.sekwah.advancedportals.core.api.registry.TagRegistry;
import com.sekwah.advancedportals.core.api.warphandler.ActivationData; import com.sekwah.advancedportals.core.api.warphandler.ActivationData;
import com.sekwah.advancedportals.core.api.warphandler.TagHandler; import com.sekwah.advancedportals.core.api.warphandler.TagHandler;
import com.sekwah.advancedportals.DataTag; import com.sekwah.advancedportals.core.data.DataTag;
import com.sekwah.advancedportals.PlayerLocation; import com.sekwah.advancedportals.core.data.PlayerLocation;
import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; import com.sekwah.advancedportals.core.connector.container.PlayerContainer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;

4
src/main/java/com/sekwah/advancedportals/core/api/effect/TestEffect.java
View File

@ -1,8 +1,8 @@
package com.sekwah.advancedportals.core.api.effect; package com.sekwah.advancedportals.core.api.effect;
import com.sekwah.advancedportals.core.api.portal.AdvancedPortal; import com.sekwah.advancedportals.core.api.portal.AdvancedPortal;
import com.sekwah.advancedportals.PortalLocation; import com.sekwah.advancedportals.core.data.PortalLocation;
import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; import com.sekwah.advancedportals.core.connector.container.PlayerContainer;
/** /**
* @author sekwah41 * @author sekwah41

4
src/main/java/com/sekwah/advancedportals/core/api/effect/WarpEffect.java
View File

@ -1,8 +1,8 @@
package com.sekwah.advancedportals.core.api.effect; package com.sekwah.advancedportals.core.api.effect;
import com.sekwah.advancedportals.core.api.portal.AdvancedPortal; import com.sekwah.advancedportals.core.api.portal.AdvancedPortal;
import com.sekwah.advancedportals.PortalLocation; import com.sekwah.advancedportals.core.data.PortalLocation;
import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; import com.sekwah.advancedportals.core.connector.container.PlayerContainer;
/** /**
* Effects to be registered to the list. * Effects to be registered to the list.

6
src/main/java/com/sekwah/advancedportals/core/api/portal/AdvancedPortal.java
View File

@ -5,9 +5,9 @@ import com.sekwah.advancedportals.core.AdvancedPortalsCore;
import com.sekwah.advancedportals.core.api.registry.TagRegistry; import com.sekwah.advancedportals.core.api.registry.TagRegistry;
import com.sekwah.advancedportals.core.api.warphandler.ActivationData; import com.sekwah.advancedportals.core.api.warphandler.ActivationData;
import com.sekwah.advancedportals.core.api.warphandler.TagHandler; import com.sekwah.advancedportals.core.api.warphandler.TagHandler;
import com.sekwah.advancedportals.DataTag; import com.sekwah.advancedportals.core.data.DataTag;
import com.sekwah.advancedportals.PortalLocation; import com.sekwah.advancedportals.core.data.PortalLocation;
import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; import com.sekwah.advancedportals.core.connector.container.PlayerContainer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;

6
src/main/java/com/sekwah/advancedportals/core/api/services/DestinationServices.java
View File

@ -1,10 +1,10 @@
package com.sekwah.advancedportals.core.api.services; package com.sekwah.advancedportals.core.api.services;
import com.sekwah.advancedportals.core.api.destination.Destination; import com.sekwah.advancedportals.core.api.destination.Destination;
import com.sekwah.advancedportals.DataTag; import com.sekwah.advancedportals.core.data.DataTag;
import com.sekwah.advancedportals.PlayerLocation; import com.sekwah.advancedportals.core.data.PlayerLocation;
import com.sekwah.advancedportals.repository.DestinationRepositoryOld; 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; /** import java.util.ArrayList; /**
* https://github.com/sekwah41/Advanced-Portals/blob/24175610892152828e21f4ff824eb1589ccb0338/src/com/sekwah/advancedportals/core/api/managers/DestinationManager.java * https://github.com/sekwah41/Advanced-Portals/blob/24175610892152828e21f4ff824eb1589ccb0338/src/com/sekwah/advancedportals/core/api/managers/DestinationManager.java

6
src/main/java/com/sekwah/advancedportals/core/api/services/PortalServices.java
View File

@ -3,9 +3,9 @@ package com.sekwah.advancedportals.core.api.services;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.sekwah.advancedportals.repository.PortalRepository; import com.sekwah.advancedportals.repository.PortalRepository;
import com.sekwah.advancedportals.core.api.portal.AdvancedPortal; import com.sekwah.advancedportals.core.api.portal.AdvancedPortal;
import com.sekwah.advancedportals.DataTag; import com.sekwah.advancedportals.core.data.DataTag;
import com.sekwah.advancedportals.PlayerLocation; import com.sekwah.advancedportals.core.data.PlayerLocation;
import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; import com.sekwah.advancedportals.core.connector.container.PlayerContainer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;

6
src/main/java/com/sekwah/advancedportals/core/api/services/PortalTempDataServices.java
View File

@ -1,8 +1,8 @@
package com.sekwah.advancedportals.core.api.services; package com.sekwah.advancedportals.core.api.services;
import com.sekwah.advancedportals.PlayerTempData; import com.sekwah.advancedportals.core.data.PlayerTempData;
import com.sekwah.advancedportals.PortalLocation; import com.sekwah.advancedportals.core.data.PortalLocation;
import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; import com.sekwah.advancedportals.core.connector.container.PlayerContainer;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

2
src/main/java/com/sekwah/advancedportals/core/api/warphandler/ActivationData.java
View File

@ -1,7 +1,7 @@
package com.sekwah.advancedportals.core.api.warphandler; 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. * Created by on 30/07/2016.

2
src/main/java/com/sekwah/advancedportals/core/api/warphandler/TagHandler.java
View File

@ -1,6 +1,6 @@
package com.sekwah.advancedportals.core.api.warphandler; 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 * If a tag can be used for any of them then either make it cast the target or if it doesnt need a target

2
src/main/java/com/sekwah/advancedportals/core/commands/CommandTemplate.java
View File

@ -1,6 +1,6 @@
package com.sekwah.advancedportals.core.commands; 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; import java.util.List;

2
src/main/java/com/sekwah/advancedportals/core/commands/CommandWithSubCommands.java
View File

@ -3,7 +3,7 @@ package com.sekwah.advancedportals.core.commands;
import com.sekwah.advancedportals.core.api.commands.SubCommand; import com.sekwah.advancedportals.core.api.commands.SubCommand;
import com.sekwah.advancedportals.core.api.registry.SubCommandRegistry; import com.sekwah.advancedportals.core.api.registry.SubCommandRegistry;
import com.sekwah.advancedportals.core.util.Lang; 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.ArrayList;
import java.util.Collections; import java.util.Collections;

2
src/main/java/com/sekwah/advancedportals/core/commands/subcommands/CreateSubCommand.java
View File

@ -1,6 +1,6 @@
package com.sekwah.advancedportals.core.commands.subcommands; package com.sekwah.advancedportals.core.commands.subcommands;
import com.sekwah.advancedportals.DataTag; import com.sekwah.advancedportals.core.data.DataTag;
import java.util.ArrayList; import java.util.ArrayList;

6
src/main/java/com/sekwah/advancedportals/core/commands/subcommands/desti/CreateDestiSubCommand.java
View File

@ -4,10 +4,10 @@ import com.sekwah.advancedportals.core.AdvancedPortalsCore;
import com.sekwah.advancedportals.core.api.commands.SubCommand; import com.sekwah.advancedportals.core.api.commands.SubCommand;
import com.sekwah.advancedportals.core.api.destination.Destination; import com.sekwah.advancedportals.core.api.destination.Destination;
import com.sekwah.advancedportals.core.commands.subcommands.CreateSubCommand; 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.core.util.Lang;
import com.sekwah.advancedportals.coreconnector.container.CommandSenderContainer; import com.sekwah.advancedportals.core.connector.container.CommandSenderContainer;
import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; import com.sekwah.advancedportals.core.connector.container.PlayerContainer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

6
src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/CreatePortalSubCommand.java
View File

@ -4,10 +4,10 @@ import com.sekwah.advancedportals.core.AdvancedPortalsCore;
import com.sekwah.advancedportals.core.api.commands.SubCommand; import com.sekwah.advancedportals.core.api.commands.SubCommand;
import com.sekwah.advancedportals.core.api.portal.AdvancedPortal; import com.sekwah.advancedportals.core.api.portal.AdvancedPortal;
import com.sekwah.advancedportals.core.commands.subcommands.CreateSubCommand; 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.core.util.Lang;
import com.sekwah.advancedportals.coreconnector.container.CommandSenderContainer; import com.sekwah.advancedportals.core.connector.container.CommandSenderContainer;
import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; import com.sekwah.advancedportals.core.connector.container.PlayerContainer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;

4
src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/EndGatewayBlockSubCommand.java
View File

@ -4,8 +4,8 @@ import com.google.inject.Inject;
import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.core.AdvancedPortalsCore;
import com.sekwah.advancedportals.core.api.commands.SubCommand; import com.sekwah.advancedportals.core.api.commands.SubCommand;
import com.sekwah.advancedportals.core.util.Lang; import com.sekwah.advancedportals.core.util.Lang;
import com.sekwah.advancedportals.coreconnector.container.CommandSenderContainer; import com.sekwah.advancedportals.core.connector.container.CommandSenderContainer;
import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; import com.sekwah.advancedportals.core.connector.container.PlayerContainer;
import java.util.List; import java.util.List;

4
src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/EndPortalBlockSubCommand.java
View File

@ -4,8 +4,8 @@ import com.google.inject.Inject;
import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.core.AdvancedPortalsCore;
import com.sekwah.advancedportals.core.api.commands.SubCommand; import com.sekwah.advancedportals.core.api.commands.SubCommand;
import com.sekwah.advancedportals.core.util.Lang; import com.sekwah.advancedportals.core.util.Lang;
import com.sekwah.advancedportals.coreconnector.container.CommandSenderContainer; import com.sekwah.advancedportals.core.connector.container.CommandSenderContainer;
import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; import com.sekwah.advancedportals.core.connector.container.PlayerContainer;
import java.util.List; import java.util.List;

4
src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/PortalBlockSubCommand.java
View File

@ -4,8 +4,8 @@ import com.google.inject.Inject;
import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.core.AdvancedPortalsCore;
import com.sekwah.advancedportals.core.api.commands.SubCommand; import com.sekwah.advancedportals.core.api.commands.SubCommand;
import com.sekwah.advancedportals.core.util.Lang; import com.sekwah.advancedportals.core.util.Lang;
import com.sekwah.advancedportals.coreconnector.container.CommandSenderContainer; import com.sekwah.advancedportals.core.connector.container.CommandSenderContainer;
import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; import com.sekwah.advancedportals.core.connector.container.PlayerContainer;
import java.util.List; import java.util.List;

2
src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/ReloadSubCommand.java
View File

@ -4,7 +4,7 @@ import com.google.inject.Inject;
import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.core.AdvancedPortalsCore;
import com.sekwah.advancedportals.core.api.commands.SubCommand; import com.sekwah.advancedportals.core.api.commands.SubCommand;
import com.sekwah.advancedportals.core.util.Lang; 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; import java.util.List;

4
src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/RemoveSubCommand.java
View File

@ -4,8 +4,8 @@ import com.sekwah.advancedportals.core.AdvancedPortalsCore;
import com.sekwah.advancedportals.core.api.commands.SubCommand; import com.sekwah.advancedportals.core.api.commands.SubCommand;
import com.sekwah.advancedportals.core.api.portal.AdvancedPortal; import com.sekwah.advancedportals.core.api.portal.AdvancedPortal;
import com.sekwah.advancedportals.core.util.Lang; import com.sekwah.advancedportals.core.util.Lang;
import com.sekwah.advancedportals.coreconnector.container.CommandSenderContainer; import com.sekwah.advancedportals.core.connector.container.CommandSenderContainer;
import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; import com.sekwah.advancedportals.core.connector.container.PlayerContainer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;

4
src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/SelectorSubCommand.java
View File

@ -4,8 +4,8 @@ import com.google.inject.Inject;
import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.core.AdvancedPortalsCore;
import com.sekwah.advancedportals.core.api.commands.SubCommand; import com.sekwah.advancedportals.core.api.commands.SubCommand;
import com.sekwah.advancedportals.core.util.Lang; import com.sekwah.advancedportals.core.util.Lang;
import com.sekwah.advancedportals.coreconnector.container.CommandSenderContainer; import com.sekwah.advancedportals.core.connector.container.CommandSenderContainer;
import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; import com.sekwah.advancedportals.core.connector.container.PlayerContainer;
import java.util.List; import java.util.List;

2
src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/TransUpdateSubCommand.java
View File

@ -4,7 +4,7 @@ import com.google.inject.Inject;
import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.core.AdvancedPortalsCore;
import com.sekwah.advancedportals.core.api.commands.SubCommand; import com.sekwah.advancedportals.core.api.commands.SubCommand;
import com.sekwah.advancedportals.core.util.Lang; 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; import java.util.List;

2
src/main/java/com/sekwah/advancedportals/core/commands/subcommands/portal/VersionSubCommand.java
View File

@ -4,7 +4,7 @@ import com.sekwah.advancedportals.core.AdvancedPortalsCore;
import com.sekwah.advancedportals.core.api.commands.SubCommand; import com.sekwah.advancedportals.core.api.commands.SubCommand;
import com.sekwah.advancedportals.core.registry.SubCmd; import com.sekwah.advancedportals.core.registry.SubCmd;
import com.sekwah.advancedportals.core.util.Lang; 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; import java.util.List;

2
src/main/java/com/sekwah/advancedportals/config/Config.java → src/main/java/com/sekwah/advancedportals/core/config/Config.java
View File

@ -1,4 +1,4 @@
package com.sekwah.advancedportals.config; package com.sekwah.advancedportals.core.config;
/** /**
* To store the data for config * To store the data for config

3
src/main/java/com/sekwah/advancedportals/config/RepositoryModule.java → src/main/java/com/sekwah/advancedportals/core/config/RepositoryModule.java
View File

@ -1,9 +1,8 @@
package com.sekwah.advancedportals.config; package com.sekwah.advancedportals.core.config;
import com.google.inject.AbstractModule; import com.google.inject.AbstractModule;
import com.google.inject.Provides; import com.google.inject.Provides;
import com.google.inject.Scopes; import com.google.inject.Scopes;
import com.google.inject.matcher.Matchers;
import com.sekwah.advancedportals.*; import com.sekwah.advancedportals.*;
import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.core.AdvancedPortalsCore;
import com.sekwah.advancedportals.repository.*; import com.sekwah.advancedportals.repository.*;

2
src/main/java/com/sekwah/advancedportals/coreconnector/command/CommandHandler.java → src/main/java/com/sekwah/advancedportals/core/connector/command/CommandHandler.java
View File

@ -1,4 +1,4 @@
package com.sekwah.advancedportals.coreconnector.command; package com.sekwah.advancedportals.core.connector.command;
import com.sekwah.advancedportals.core.commands.CommandTemplate; import com.sekwah.advancedportals.core.commands.CommandTemplate;

2
src/main/java/com/sekwah/advancedportals/coreconnector/command/CommandRegister.java → src/main/java/com/sekwah/advancedportals/core/connector/command/CommandRegister.java
View File

@ -1,4 +1,4 @@
package com.sekwah.advancedportals.coreconnector.command; package com.sekwah.advancedportals.core.connector.command;
import com.sekwah.advancedportals.core.commands.CommandTemplate; import com.sekwah.advancedportals.core.commands.CommandTemplate;

2
src/main/java/com/sekwah/advancedportals/coreconnector/container/CommandSenderContainer.java → src/main/java/com/sekwah/advancedportals/core/connector/container/CommandSenderContainer.java
View File

@ -1,4 +1,4 @@
package com.sekwah.advancedportals.coreconnector.container; package com.sekwah.advancedportals.core.connector.container;
public interface CommandSenderContainer { public interface CommandSenderContainer {

6
src/main/java/com/sekwah/advancedportals/coreconnector/container/PlayerContainer.java → src/main/java/com/sekwah/advancedportals/core/connector/container/PlayerContainer.java
View File

@ -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.core.data.PlayerLocation;
import com.sekwah.advancedportals.PortalLocation; import com.sekwah.advancedportals.core.data.PortalLocation;
import java.util.UUID; import java.util.UUID;

2
src/main/java/com/sekwah/advancedportals/coreconnector/container/ServerContainer.java → src/main/java/com/sekwah/advancedportals/core/connector/container/ServerContainer.java
View File

@ -1,4 +1,4 @@
package com.sekwah.advancedportals.coreconnector.container; package com.sekwah.advancedportals.core.connector.container;
public interface ServerContainer { public interface ServerContainer {

4
src/main/java/com/sekwah/advancedportals/coreconnector/container/WorldContainer.java → src/main/java/com/sekwah/advancedportals/core/connector/container/WorldContainer.java
View File

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

2
src/main/java/com/sekwah/advancedportals/coreconnector/info/DataCollector.java → src/main/java/com/sekwah/advancedportals/core/connector/info/DataCollector.java
View File

@ -1,4 +1,4 @@
package com.sekwah.advancedportals.coreconnector.info; package com.sekwah.advancedportals.core.connector.info;
import java.util.List; import java.util.List;

2
src/main/java/com/sekwah/advancedportals/data/DataStorage.java → src/main/java/com/sekwah/advancedportals/core/data/DataStorage.java
View File

@ -1,4 +1,4 @@
package com.sekwah.advancedportals.data; package com.sekwah.advancedportals.core.data;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;

2
src/main/java/com/sekwah/advancedportals/DataTag.java → src/main/java/com/sekwah/advancedportals/core/data/DataTag.java
View File

@ -1,4 +1,4 @@
package com.sekwah.advancedportals; package com.sekwah.advancedportals.core.data;
public class DataTag { public class DataTag {

7
src/main/java/com/sekwah/advancedportals/PlayerLocation.java → src/main/java/com/sekwah/advancedportals/core/data/PlayerLocation.java
View File

@ -1,4 +1,4 @@
package com.sekwah.advancedportals; package com.sekwah.advancedportals.core.data;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
@ -7,14 +7,19 @@ public class PlayerLocation {
@SerializedName("x") @SerializedName("x")
private final double posX; private final double posX;
@SerializedName("y") @SerializedName("y")
private final double posY; private final double posY;
@SerializedName("z") @SerializedName("z")
private final double posZ; private final double posZ;
@SerializedName("w") @SerializedName("w")
private final String worldName; private final String worldName;
@SerializedName("yaw") @SerializedName("yaw")
private final float yaw; private final float yaw;
@SerializedName("p") @SerializedName("p")
private final float pitch; private final float pitch;

2
src/main/java/com/sekwah/advancedportals/PlayerTempData.java → src/main/java/com/sekwah/advancedportals/core/data/PlayerTempData.java
View File

@ -1,4 +1,4 @@
package com.sekwah.advancedportals; package com.sekwah.advancedportals.core.data;
public class PlayerTempData { public class PlayerTempData {

5
src/main/java/com/sekwah/advancedportals/PortalLocation.java → src/main/java/com/sekwah/advancedportals/core/data/PortalLocation.java
View File

@ -1,4 +1,4 @@
package com.sekwah.advancedportals; package com.sekwah.advancedportals.core.data;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
@ -6,10 +6,13 @@ public class PortalLocation {
@SerializedName("x") @SerializedName("x")
public final int posX; public final int posX;
@SerializedName("y") @SerializedName("y")
public final int posY; public final int posY;
@SerializedName("z") @SerializedName("z")
public final int posZ; public final int posZ;
@SerializedName("w") @SerializedName("w")
public final String worldName; public final String worldName;

2
src/main/java/com/sekwah/advancedportals/repository/PortalRepository.java
View File

@ -1,6 +1,6 @@
package com.sekwah.advancedportals.repository; package com.sekwah.advancedportals.repository;
import com.sekwah.advancedportals.PortalLocation; import com.sekwah.advancedportals.core.data.PortalLocation;
public interface PortalRepository extends JsonRepository<PortalLocation> { public interface PortalRepository extends JsonRepository<PortalLocation> {

5
src/main/java/com/sekwah/advancedportals/repository/PortalRepositoryImpl.java
View File

@ -2,11 +2,8 @@ package com.sekwah.advancedportals.repository;
import com.google.common.cache.Cache; import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
import com.google.common.cache.LoadingCache;
import com.google.inject.Singleton; import com.google.inject.Singleton;
import com.sekwah.advancedportals.PlayerLocation; import com.sekwah.advancedportals.core.data.PortalLocation;
import com.sekwah.advancedportals.PortalLocation;
import com.sekwah.advancedportals.coreconnector.container.PlayerContainer;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;

6
src/main/java/com/sekwah/advancedportals/repository/PortalTempDataRepository.java
View File

@ -1,8 +1,8 @@
package com.sekwah.advancedportals.repository; package com.sekwah.advancedportals.repository;
import com.sekwah.advancedportals.PlayerLocation; import com.sekwah.advancedportals.core.data.PlayerLocation;
import com.sekwah.advancedportals.PortalLocation; import com.sekwah.advancedportals.core.data.PortalLocation;
import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; import com.sekwah.advancedportals.core.connector.container.PlayerContainer;
import java.util.UUID; import java.util.UUID;

6
src/main/java/com/sekwah/advancedportals/repository/PortalTempDataRepositoryImpl.java
View File

@ -5,9 +5,9 @@ import com.google.common.cache.CacheBuilder;
import com.google.common.collect.HashBasedTable; import com.google.common.collect.HashBasedTable;
import com.google.common.collect.Table; import com.google.common.collect.Table;
import com.google.inject.Singleton; import com.google.inject.Singleton;
import com.sekwah.advancedportals.PlayerLocation; import com.sekwah.advancedportals.core.data.PlayerLocation;
import com.sekwah.advancedportals.PortalLocation; import com.sekwah.advancedportals.core.data.PortalLocation;
import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; import com.sekwah.advancedportals.core.connector.container.PlayerContainer;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;

6
src/main/java/com/sekwah/advancedportals/services/DestinationServices.java
View File

@ -3,13 +3,13 @@ package com.sekwah.advancedportals.services;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.sekwah.advancedportals.DataTag; import com.sekwah.advancedportals.core.data.DataTag;
import com.sekwah.advancedportals.PlayerLocation; import com.sekwah.advancedportals.core.data.PlayerLocation;
import com.sekwah.advancedportals.core.api.destination.Destination; import com.sekwah.advancedportals.core.api.destination.Destination;
import com.sekwah.advancedportals.core.api.warphandler.TagHandler; import com.sekwah.advancedportals.core.api.warphandler.TagHandler;
import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.core.AdvancedPortalsCore;
import com.sekwah.advancedportals.core.util.Lang; 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 com.sekwah.advancedportals.repository.DestinationRepositoryImpl;
import javax.inject.Inject; import javax.inject.Inject;

6
src/main/java/com/sekwah/advancedportals/services/PortalServices.java
View File

@ -1,9 +1,9 @@
package com.sekwah.advancedportals.services; package com.sekwah.advancedportals.services;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.sekwah.advancedportals.PlayerLocation; import com.sekwah.advancedportals.core.data.PlayerLocation;
import com.sekwah.advancedportals.PortalLocation; import com.sekwah.advancedportals.core.data.PortalLocation;
import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; import com.sekwah.advancedportals.core.connector.container.PlayerContainer;
import com.sekwah.advancedportals.repository.PortalRepository; import com.sekwah.advancedportals.repository.PortalRepository;
import java.util.UUID; import java.util.UUID;

2
src/main/java/com/sekwah/advancedportals/spigot/AdvancedPortalsPlugin.java
View File

@ -3,7 +3,7 @@ package com.sekwah.advancedportals.spigot;
import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.core.AdvancedPortalsCore;
import com.sekwah.advancedportals.spigot.coreconnector.command.SpigotCommandRegister; import com.sekwah.advancedportals.spigot.coreconnector.command.SpigotCommandRegister;
import com.sekwah.advancedportals.spigot.coreconnector.info.SpigotDataCollector; 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.Bukkit;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;

2
src/main/java/com/sekwah/advancedportals/spigot/Listeners.java
View File

@ -2,7 +2,7 @@ package com.sekwah.advancedportals.spigot;
import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.core.AdvancedPortalsCore;
import com.sekwah.advancedportals.core.CoreListeners; 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 com.sekwah.advancedportals.spigot.coreconnector.container.SpigotPlayerContainer;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;

2
src/main/java/com/sekwah/advancedportals/spigot/convertolddata/ConvertOldSubCommand.java
View File

@ -2,7 +2,7 @@ package com.sekwah.advancedportals.spigot.convertolddata;
import com.sekwah.advancedportals.core.api.commands.SubCommand; import com.sekwah.advancedportals.core.api.commands.SubCommand;
import com.sekwah.advancedportals.core.util.Lang; 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; import java.util.List;

2
src/main/java/com/sekwah/advancedportals/spigot/coreconnector/command/SpigotCommandRegister.java
View File

@ -1,7 +1,7 @@
package com.sekwah.advancedportals.spigot.coreconnector.command; package com.sekwah.advancedportals.spigot.coreconnector.command;
import com.sekwah.advancedportals.core.commands.CommandTemplate; 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; import com.sekwah.advancedportals.spigot.AdvancedPortalsPlugin;
/** /**

2
src/main/java/com/sekwah/advancedportals/spigot/coreconnector/container/SpigotCommandSenderContainer.java
View File

@ -1,6 +1,6 @@
package com.sekwah.advancedportals.spigot.coreconnector.container; 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.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

8
src/main/java/com/sekwah/advancedportals/spigot/coreconnector/container/SpigotPlayerContainer.java
View File

@ -2,10 +2,10 @@ package com.sekwah.advancedportals.spigot.coreconnector.container;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.sekwah.advancedportals.core.AdvancedPortalsCore; import com.sekwah.advancedportals.core.AdvancedPortalsCore;
import com.sekwah.advancedportals.PlayerLocation; import com.sekwah.advancedportals.core.data.PlayerLocation;
import com.sekwah.advancedportals.PortalLocation; import com.sekwah.advancedportals.core.data.PortalLocation;
import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; import com.sekwah.advancedportals.core.connector.container.PlayerContainer;
import com.sekwah.advancedportals.coreconnector.container.WorldContainer; import com.sekwah.advancedportals.core.connector.container.WorldContainer;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.DyeColor; import org.bukkit.DyeColor;
import org.bukkit.Location; import org.bukkit.Location;

4
src/main/java/com/sekwah/advancedportals/spigot/coreconnector/container/SpigotWorldContainer.java
View File

@ -1,7 +1,7 @@
package com.sekwah.advancedportals.spigot.coreconnector.container; package com.sekwah.advancedportals.spigot.coreconnector.container;
import com.sekwah.advancedportals.PortalLocation; import com.sekwah.advancedportals.core.data.PortalLocation;
import com.sekwah.advancedportals.coreconnector.container.WorldContainer; import com.sekwah.advancedportals.core.connector.container.WorldContainer;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;

2
src/main/java/com/sekwah/advancedportals/spigot/coreconnector/info/SpigotDataCollector.java
View File

@ -1,6 +1,6 @@
package com.sekwah.advancedportals.spigot.coreconnector.info; 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 org.bukkit.Material;
import java.util.ArrayList; import java.util.ArrayList;

4
src/main/java/com/sekwah/advancedportals/spigot/effect/WarpEffectEnder.java
View File

@ -2,8 +2,8 @@ package com.sekwah.advancedportals.spigot.effect;
import com.sekwah.advancedportals.core.api.effect.WarpEffect; import com.sekwah.advancedportals.core.api.effect.WarpEffect;
import com.sekwah.advancedportals.core.api.portal.AdvancedPortal; import com.sekwah.advancedportals.core.api.portal.AdvancedPortal;
import com.sekwah.advancedportals.PortalLocation; import com.sekwah.advancedportals.core.data.PortalLocation;
import com.sekwah.advancedportals.coreconnector.container.PlayerContainer; import com.sekwah.advancedportals.core.connector.container.PlayerContainer;
public class WarpEffectEnder extends WarpEffect { public class WarpEffectEnder extends WarpEffect {
@Override @Override

2
src/main/java/com/sekwah/advancedportals/metrics/Metrics.java → src/main/java/com/sekwah/advancedportals/spigot/metrics/Metrics.java
View File

@ -1,4 +1,4 @@
package com.sekwah.advancedportals.metrics; package com.sekwah.advancedportals.spigot.metrics;
import com.google.gson.JsonArray; import com.google.gson.JsonArray;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;