mirror of
https://github.com/sekwah41/Advanced-Portals.git
synced 2024-09-03 19:50:27 +02:00
Moving more stuff
This commit is contained in:
parent
b87edaa8a8
commit
3c2b53b4ff
|
@ -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 {
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
|
|
||||||
|
|
|
@ -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 {
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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.
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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.
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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;
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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;
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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,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,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,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,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,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,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,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,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;
|
||||||
|
|
||||||
|
|
|
@ -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
|
|
@ -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.*;
|
|
@ -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;
|
|
@ -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;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.sekwah.advancedportals.coreconnector.container;
|
package com.sekwah.advancedportals.core.connector.container;
|
||||||
|
|
||||||
public interface CommandSenderContainer {
|
public interface CommandSenderContainer {
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.sekwah.advancedportals.coreconnector.container;
|
package com.sekwah.advancedportals.core.connector.container;
|
||||||
|
|
||||||
public interface ServerContainer {
|
public interface ServerContainer {
|
||||||
|
|
|
@ -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 {
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.sekwah.advancedportals;
|
package com.sekwah.advancedportals.core.data;
|
||||||
|
|
||||||
public class DataTag {
|
public class DataTag {
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.sekwah.advancedportals;
|
package com.sekwah.advancedportals.core.data;
|
||||||
|
|
||||||
public class PlayerTempData {
|
public class PlayerTempData {
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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> {
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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;
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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,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,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;
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -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;
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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;
|
Loading…
Reference in New Issue
Block a user