Refactor plugin and scheduler interfaces

sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java

@@ -29,7 +29,6 @@ import com.google.inject.Inject;
 import me.lucko.luckperms.api.Contexts;
 import me.lucko.luckperms.api.LuckPermsApi;
 import me.lucko.luckperms.api.PlatformType;
-import me.lucko.luckperms.common.LuckPermsPlugin;
 import me.lucko.luckperms.common.api.ApiHandler;
 import me.lucko.luckperms.common.api.ApiProvider;
 import me.lucko.luckperms.common.caching.handlers.CachedStateManager;
@@ -37,7 +36,7 @@ import me.lucko.luckperms.common.calculators.CalculatorFactory;
 import me.lucko.luckperms.common.commands.BaseCommand;
 import me.lucko.luckperms.common.commands.sender.Sender;
 import me.lucko.luckperms.common.config.ConfigKeys;
-import me.lucko.luckperms.common.config.LPConfiguration;
+import me.lucko.luckperms.common.config.LuckPermsConfiguration;
 import me.lucko.luckperms.common.constants.Permission;
 import me.lucko.luckperms.common.contexts.ContextManager;
 import me.lucko.luckperms.common.contexts.ServerCalculator;
@@ -53,6 +52,8 @@ import me.lucko.luckperms.common.managers.TrackManager;
 import me.lucko.luckperms.common.managers.impl.GenericTrackManager;
 import me.lucko.luckperms.common.messaging.InternalMessagingService;
 import me.lucko.luckperms.common.messaging.RedisMessaging;
+import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
+import me.lucko.luckperms.common.plugin.LuckPermsScheduler;
 import me.lucko.luckperms.common.storage.Storage;
 import me.lucko.luckperms.common.storage.StorageFactory;
 import me.lucko.luckperms.common.storage.StorageType;
@@ -86,12 +87,10 @@ import org.spongepowered.api.event.game.state.GamePostInitializationEvent;
 import org.spongepowered.api.event.game.state.GamePreInitializationEvent;
 import org.spongepowered.api.event.game.state.GameStoppingServerEvent;
 import org.spongepowered.api.plugin.Plugin;
-import org.spongepowered.api.plugin.PluginContainer;
 import org.spongepowered.api.scheduler.AsynchronousExecutor;
 import org.spongepowered.api.scheduler.Scheduler;
 import org.spongepowered.api.scheduler.SpongeExecutorService;
 import org.spongepowered.api.scheduler.SynchronousExecutor;
-import org.spongepowered.api.scheduler.Task;
 import org.spongepowered.api.service.permission.PermissionDescription;
 import org.spongepowered.api.service.permission.PermissionService;
 import org.spongepowered.api.service.permission.Subject;
@@ -102,14 +101,12 @@ import java.io.File;
 import java.io.InputStream;
 import java.nio.file.Path;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
@@ -118,7 +115,6 @@ import java.util.stream.StreamSupport;
 public class LPSpongePlugin implements LuckPermsPlugin {
 
     private final Set<UUID> ignoringLogs = ConcurrentHashMap.newKeySet();
-    private final Set<Runnable> shutdownHooks = Collections.synchronizedSet(new HashSet<>());
 
     @Inject
     private Logger logger;
@@ -130,20 +126,21 @@ public class LPSpongePlugin implements LuckPermsPlugin {
     @ConfigDir(sharedRoot = false)
     private Path configDir;
 
-    private Scheduler scheduler = Sponge.getScheduler();
+    private Scheduler spongeScheduler = Sponge.getScheduler();
 
     @Inject
     @SynchronousExecutor
-    private SpongeExecutorService syncExecutor;
+    private SpongeExecutorService syncExecutorService;
 
     @Inject
     @AsynchronousExecutor
-    private SpongeExecutorService asyncExecutor;
+    private SpongeExecutorService asyncExecutorService;
 
     private LPTimings timings;
     private boolean lateLoad = false;
 
-    private LPConfiguration configuration;
+    private LuckPermsScheduler scheduler;
+    private LuckPermsConfiguration configuration;
     private SpongeUserManager userManager;
     private SpongeGroupManager groupManager;
     private TrackManager trackManager;
@@ -165,12 +162,13 @@ public class LPSpongePlugin implements LuckPermsPlugin {
 
     @Listener(order = Order.FIRST)
     public void onEnable(GamePreInitializationEvent event) {
+        scheduler = new LPSpongeScheduler(this);
         localeManager = new NoopLocaleManager();
         senderFactory = new SpongeSenderFactory(this);
         log = new LoggerImpl(getConsoleSender());
         LuckPermsPlugin.sendStartupBanner(getConsoleSender(), this);
-        debugHandler = new DebugHandler(asyncExecutor, getVersion());
-        permissionCache = new PermissionCache(asyncExecutor);
+        debugHandler = new DebugHandler(scheduler.getAsyncExecutor(), getVersion());
+        permissionCache = new PermissionCache(scheduler.getAsyncExecutor());
         timings = new LPTimings(this);
 
         getLog().info("Loading configuration...");
@@ -228,7 +226,7 @@ public class LPSpongePlugin implements LuckPermsPlugin {
 
         // load locale
         localeManager = new SimpleLocaleManager();
-        File locale = new File(getMainDir(), "lang.yml");
+        File locale = new File(getDataDirectory(), "lang.yml");
         if (locale.exists()) {
             getLog().info("Found locale file. Attempting to load from it.");
             try {
@@ -279,23 +277,19 @@ public class LPSpongePlugin implements LuckPermsPlugin {
         // schedule update tasks
         int mins = getConfiguration().get(ConfigKeys.SYNC_TIME);
         if (mins > 0) {
-            Task t = scheduler.createTaskBuilder().async().interval(mins, TimeUnit.MINUTES).execute(new UpdateTask(this))
-                    .submit(LPSpongePlugin.this);
-            addShutdownHook(t::cancel);
+            long ticks = mins * 60 * 20;
+            scheduler.doAsyncRepeating(() -> updateTaskBuffer.request(), ticks);
         }
+        scheduler.doAsyncLater(() -> updateTaskBuffer.request(), 40L);
 
         // run an update instantly.
         updateTaskBuffer.requestDirectly();
 
         // register tasks
-        Task t2 = scheduler.createTaskBuilder().async().intervalTicks(60L).execute(new ExpireTemporaryTask(this)).submit(this);
-        Task t3 = scheduler.createTaskBuilder().async().intervalTicks(2400L).execute(new CacheHousekeepingTask(this)).submit(this);
-        Task t4 = scheduler.createTaskBuilder().async().intervalTicks(2400L).execute(new ServiceCacheHousekeepingTask(service)).submit(this);
-        Task t5 = scheduler.createTaskBuilder().async().intervalTicks(2400L).execute(() -> userManager.performCleanup()).submit(this);
-        addShutdownHook(t2::cancel);
-        addShutdownHook(t3::cancel);
-        addShutdownHook(t4::cancel);
-        addShutdownHook(t5::cancel);
+        scheduler.doAsyncRepeating(new ExpireTemporaryTask(this), 60L);
+        scheduler.doAsyncRepeating(new CacheHousekeepingTask(this), 2400L);
+        scheduler.doAsyncRepeating(new ServiceCacheHousekeepingTask(service), 2400L);
+        scheduler.doAsyncRepeating(() -> userManager.performCleanup(), 2400L);
 
         getLog().info("Successfully loaded.");
     }
@@ -320,6 +314,8 @@ public class LPSpongePlugin implements LuckPermsPlugin {
 
         getLog().info("Unregistering API...");
         ApiHandler.unregisterProvider();
+
+        scheduler.shutdown();
     }
 
     @Listener
@@ -356,9 +352,8 @@ public class LPSpongePlugin implements LuckPermsPlugin {
         service.invalidateParentCaches();
     }
 
-    @SuppressWarnings("ResultOfMethodCallIgnored")
     @Override
-    public File getMainDir() {
+    public File getDataDirectory() {
         File base = configDir.toFile().getParentFile().getParentFile();
         File luckPermsDir = new File(base, "luckperms");
         luckPermsDir.mkdirs();
@@ -366,8 +361,8 @@ public class LPSpongePlugin implements LuckPermsPlugin {
     }
 
     @Override
-    public File getDataFolder() {
-        return getMainDir();
+    public File getConfigDirectory() {
+        return configDir.toFile();
     }
 
     @Override
@@ -403,13 +398,13 @@ public class LPSpongePlugin implements LuckPermsPlugin {
     }
 
     @Override
-    public PlatformType getType() {
+    public PlatformType getServerType() {
         return PlatformType.SPONGE;
     }
 
     @Override
     public String getServerName() {
-        return getGame().getPlatform().getType().name();
+        return getGame().getPlatform().getImplementation().getDescription().orElse("null");
     }
 
     @Override
@@ -433,12 +428,12 @@ public class LPSpongePlugin implements LuckPermsPlugin {
     }
 
     @Override
-    public boolean isOnline(UUID external) {
+    public boolean isPlayerOnline(UUID external) {
         return game.getServer().getPlayer(external).isPresent();
     }
 
     @Override
-    public List<Sender> getSenders() {
+    public List<Sender> getOnlineSenders() {
         return game.getServer().getOnlinePlayers().stream()
                 .map(s -> getSenderFactory().wrap(s))
                 .collect(Collectors.toList());
@@ -455,45 +450,10 @@ public class LPSpongePlugin implements LuckPermsPlugin {
     }
 
     @Override
-    public Object getPlugin(String name) {
-        return game.getPluginManager().getPlugin(name).map(PluginContainer::getInstance).orElse(null);
-    }
-
-    @Override
-    public Object getService(Class clazz) {
-        return game.getServiceManager().provideUnchecked(clazz);
-    }
-
-    @Override
-    public UUID getUUID(String playerName) {
+    public UUID getUuidFromUsername(String playerName) {
         return game.getServer().getPlayer(playerName).map(Player::getUniqueId).orElse(null);
     }
 
-    @Override
-    public boolean isPluginLoaded(String name) {
-        return game.getPluginManager().isLoaded(name);
-    }
-
-    @Override
-    public void addShutdownHook(Runnable r) {
-        shutdownHooks.add(r);
-    }
-
-    @Override
-    public void doAsync(Runnable r) {
-        scheduler.createTaskBuilder().async().execute(r).submit(this);
-    }
-
-    @Override
-    public void doSync(Runnable r) {
-        scheduler.createTaskBuilder().execute(r).submit(this);
-    }
-
-    @Override
-    public void doAsyncRepeating(Runnable r, long interval) {
-        scheduler.createTaskBuilder().async().intervalTicks(interval).execute(r).submit(this);
-    }
-
     @Override
     public List<BaseCommand> getExtraCommands() {
         return Collections.singletonList(new SpongeMainCommand(this));

sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongeScheduler.java

@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.sponge;
+
+import me.lucko.luckperms.common.plugin.LuckPermsScheduler;
+
+import org.spongepowered.api.scheduler.Task;
+
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executor;
+
+public class LPSpongeScheduler implements LuckPermsScheduler {
+    private final LPSpongePlugin plugin;
+    private Set<Task> tasks = ConcurrentHashMap.newKeySet();
+
+    public LPSpongeScheduler(LPSpongePlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public Executor getAsyncExecutor() {
+        return plugin.getAsyncExecutorService();
+    }
+
+    @Override
+    public Executor getSyncExecutor() {
+        return plugin.getSyncExecutorService();
+    }
+
+    @Override
+    public void doAsync(Runnable r) {
+        plugin.getSpongeScheduler().createTaskBuilder().async().execute(r).submit(plugin);
+    }
+
+    @Override
+    public void doSync(Runnable r) {
+        plugin.getSpongeScheduler().createTaskBuilder().execute(r).submit(plugin);
+    }
+
+    @Override
+    public void doAsyncRepeating(Runnable r, long interval) {
+        Task task = plugin.getSpongeScheduler().createTaskBuilder().async().intervalTicks(interval).delayTicks(interval).execute(r).submit(plugin);
+        tasks.add(task);
+    }
+
+    @Override
+    public void doSyncRepeating(Runnable r, long interval) {
+        Task task = plugin.getSpongeScheduler().createTaskBuilder().intervalTicks(interval).delayTicks(interval).execute(r).submit(plugin);
+        tasks.add(task);
+    }
+
+    @Override
+    public void doAsyncLater(Runnable r, long delay) {
+        plugin.getSpongeScheduler().createTaskBuilder().async().delayTicks(delay).execute(r).submit(plugin);
+    }
+
+    @Override
+    public void doSyncLater(Runnable r, long delay) {
+        plugin.getSpongeScheduler().createTaskBuilder().delayTicks(delay).execute(r).submit(plugin);
+    }
+
+    @Override
+    public void shutdown() {
+        tasks.forEach(Task::cancel);
+    }
+}

sponge/src/main/java/me/lucko/luckperms/sponge/SpongeSenderFactory.java

@@ -22,9 +22,9 @@
 
 package me.lucko.luckperms.sponge;
 
-import me.lucko.luckperms.common.LuckPermsPlugin;
 import me.lucko.luckperms.common.commands.sender.SenderFactory;
 import me.lucko.luckperms.common.constants.Constants;
+import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 
 import org.spongepowered.api.command.CommandSource;
 import org.spongepowered.api.entity.living.player.Player;

sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionClear.java

@@ -23,7 +23,6 @@
 package me.lucko.luckperms.sponge.commands;
 
 import me.lucko.luckperms.api.context.ContextSet;
-import me.lucko.luckperms.common.LuckPermsPlugin;
 import me.lucko.luckperms.common.commands.Arg;
 import me.lucko.luckperms.common.commands.CommandException;
 import me.lucko.luckperms.common.commands.CommandResult;
@@ -32,6 +31,7 @@ import me.lucko.luckperms.common.commands.sender.Sender;
 import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
 import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.constants.Permission;
+import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.utils.Predicates;
 
 import org.spongepowered.api.service.permission.SubjectData;

sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionInfo.java

@@ -23,7 +23,6 @@
 package me.lucko.luckperms.sponge.commands;
 
 import me.lucko.luckperms.api.context.ContextSet;
-import me.lucko.luckperms.common.LuckPermsPlugin;
 import me.lucko.luckperms.common.commands.Arg;
 import me.lucko.luckperms.common.commands.CommandException;
 import me.lucko.luckperms.common.commands.CommandResult;
@@ -32,6 +31,7 @@ import me.lucko.luckperms.common.commands.sender.Sender;
 import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
 import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.constants.Permission;
+import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.utils.Predicates;
 
 import org.spongepowered.api.service.context.Context;

sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionSet.java

@@ -23,7 +23,6 @@
 package me.lucko.luckperms.sponge.commands;
 
 import me.lucko.luckperms.api.context.ContextSet;
-import me.lucko.luckperms.common.LuckPermsPlugin;
 import me.lucko.luckperms.common.commands.Arg;
 import me.lucko.luckperms.common.commands.CommandException;
 import me.lucko.luckperms.common.commands.CommandResult;
@@ -32,6 +31,7 @@ import me.lucko.luckperms.common.commands.sender.Sender;
 import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
 import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.constants.Permission;
+import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.utils.Predicates;
 
 import org.spongepowered.api.service.permission.SubjectData;

sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionUnset.java

@@ -23,7 +23,6 @@
 package me.lucko.luckperms.sponge.commands;
 
 import me.lucko.luckperms.api.context.ContextSet;
-import me.lucko.luckperms.common.LuckPermsPlugin;
 import me.lucko.luckperms.common.commands.Arg;
 import me.lucko.luckperms.common.commands.CommandException;
 import me.lucko.luckperms.common.commands.CommandResult;
@@ -32,6 +31,7 @@ import me.lucko.luckperms.common.commands.sender.Sender;
 import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
 import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.constants.Permission;
+import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.utils.Predicates;
 
 import org.spongepowered.api.service.permission.SubjectData;

sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentAdd.java

@@ -23,7 +23,6 @@
 package me.lucko.luckperms.sponge.commands;
 
 import me.lucko.luckperms.api.context.ContextSet;
-import me.lucko.luckperms.common.LuckPermsPlugin;
 import me.lucko.luckperms.common.commands.Arg;
 import me.lucko.luckperms.common.commands.CommandException;
 import me.lucko.luckperms.common.commands.CommandResult;
@@ -32,6 +31,7 @@ import me.lucko.luckperms.common.commands.sender.Sender;
 import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
 import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.constants.Permission;
+import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.utils.Predicates;
 
 import org.spongepowered.api.Sponge;

sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentClear.java

@@ -23,7 +23,6 @@
 package me.lucko.luckperms.sponge.commands;
 
 import me.lucko.luckperms.api.context.ContextSet;
-import me.lucko.luckperms.common.LuckPermsPlugin;
 import me.lucko.luckperms.common.commands.Arg;
 import me.lucko.luckperms.common.commands.CommandException;
 import me.lucko.luckperms.common.commands.CommandResult;
@@ -32,6 +31,7 @@ import me.lucko.luckperms.common.commands.sender.Sender;
 import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
 import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.constants.Permission;
+import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.utils.Predicates;
 
 import org.spongepowered.api.service.permission.SubjectData;

sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentInfo.java

@@ -23,7 +23,6 @@
 package me.lucko.luckperms.sponge.commands;
 
 import me.lucko.luckperms.api.context.ContextSet;
-import me.lucko.luckperms.common.LuckPermsPlugin;
 import me.lucko.luckperms.common.commands.Arg;
 import me.lucko.luckperms.common.commands.CommandException;
 import me.lucko.luckperms.common.commands.CommandResult;
@@ -32,6 +31,7 @@ import me.lucko.luckperms.common.commands.sender.Sender;
 import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
 import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.constants.Permission;
+import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.utils.Predicates;
 
 import org.spongepowered.api.service.context.Context;

sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentRemove.java

@@ -23,7 +23,6 @@
 package me.lucko.luckperms.sponge.commands;
 
 import me.lucko.luckperms.api.context.ContextSet;
-import me.lucko.luckperms.common.LuckPermsPlugin;
 import me.lucko.luckperms.common.commands.Arg;
 import me.lucko.luckperms.common.commands.CommandException;
 import me.lucko.luckperms.common.commands.CommandResult;
@@ -32,6 +31,7 @@ import me.lucko.luckperms.common.commands.sender.Sender;
 import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
 import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.constants.Permission;
+import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.utils.Predicates;
 
 import org.spongepowered.api.Sponge;

sponge/src/main/java/me/lucko/luckperms/sponge/commands/PermissionClear.java

@@ -23,7 +23,6 @@
 package me.lucko.luckperms.sponge.commands;
 
 import me.lucko.luckperms.api.context.ContextSet;
-import me.lucko.luckperms.common.LuckPermsPlugin;
 import me.lucko.luckperms.common.commands.Arg;
 import me.lucko.luckperms.common.commands.CommandException;
 import me.lucko.luckperms.common.commands.CommandResult;
@@ -32,6 +31,7 @@ import me.lucko.luckperms.common.commands.sender.Sender;
 import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
 import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.constants.Permission;
+import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.utils.Predicates;
 
 import org.spongepowered.api.service.permission.SubjectData;

sponge/src/main/java/me/lucko/luckperms/sponge/commands/PermissionInfo.java

@@ -23,7 +23,6 @@
 package me.lucko.luckperms.sponge.commands;
 
 import me.lucko.luckperms.api.context.ContextSet;
-import me.lucko.luckperms.common.LuckPermsPlugin;
 import me.lucko.luckperms.common.commands.Arg;
 import me.lucko.luckperms.common.commands.CommandException;
 import me.lucko.luckperms.common.commands.CommandResult;
@@ -32,6 +31,7 @@ import me.lucko.luckperms.common.commands.sender.Sender;
 import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
 import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.constants.Permission;
+import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.utils.Predicates;
 
 import org.spongepowered.api.service.context.Context;

sponge/src/main/java/me/lucko/luckperms/sponge/commands/PermissionSet.java

@@ -23,7 +23,6 @@
 package me.lucko.luckperms.sponge.commands;
 
 import me.lucko.luckperms.api.context.ContextSet;
-import me.lucko.luckperms.common.LuckPermsPlugin;
 import me.lucko.luckperms.common.commands.Arg;
 import me.lucko.luckperms.common.commands.CommandException;
 import me.lucko.luckperms.common.commands.CommandResult;
@@ -32,6 +31,7 @@ import me.lucko.luckperms.common.commands.sender.Sender;
 import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
 import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.constants.Permission;
+import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.utils.Predicates;
 
 import org.spongepowered.api.service.permission.SubjectData;

sponge/src/main/java/me/lucko/luckperms/sponge/commands/SpongeMainCommand.java

@@ -25,7 +25,6 @@ package me.lucko.luckperms.sponge.commands;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 
-import me.lucko.luckperms.common.LuckPermsPlugin;
 import me.lucko.luckperms.common.commands.Arg;
 import me.lucko.luckperms.common.commands.BaseCommand;
 import me.lucko.luckperms.common.commands.Command;
@@ -35,6 +34,7 @@ import me.lucko.luckperms.common.commands.CommandResult;
 import me.lucko.luckperms.common.commands.sender.Sender;
 import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.constants.Message;
+import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.utils.ImmutableCollectors;
 import me.lucko.luckperms.common.utils.Predicates;
 import me.lucko.luckperms.sponge.LPSpongePlugin;

sponge/src/main/java/me/lucko/luckperms/sponge/messaging/BungeeMessagingService.java

@@ -63,7 +63,7 @@ public class BungeeMessagingService extends AbstractMessagingService implements
 
     @Override
     protected void sendMessage(String channel, String message) {
-        plugin.getScheduler().createTaskBuilder().interval(10, TimeUnit.SECONDS).execute(task -> {
+        plugin.getSpongeScheduler().createTaskBuilder().interval(10, TimeUnit.SECONDS).execute(task -> {
             Collection<Player> players = plugin.getGame().getServer().getOnlinePlayers();
             if (players.isEmpty()) {
                 return;

sponge/src/main/java/me/lucko/luckperms/sponge/migration/MigrationPermissionManager.java

@@ -22,7 +22,6 @@
 
 package me.lucko.luckperms.sponge.migration;
 
-import me.lucko.luckperms.common.LuckPermsPlugin;
 import me.lucko.luckperms.common.commands.CommandException;
 import me.lucko.luckperms.common.commands.CommandResult;
 import me.lucko.luckperms.common.commands.SubCommand;
@@ -32,6 +31,7 @@ import me.lucko.luckperms.common.constants.Message;
 import me.lucko.luckperms.common.constants.Permission;
 import me.lucko.luckperms.common.core.model.Group;
 import me.lucko.luckperms.common.core.model.User;
+import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.utils.Predicates;
 
 import org.spongepowered.api.Sponge;

sponge/src/main/java/me/lucko/luckperms/sponge/migration/MigrationPermissionsEx.java

@@ -22,7 +22,6 @@
 
 package me.lucko.luckperms.sponge.migration;
 
-import me.lucko.luckperms.common.LuckPermsPlugin;
 import me.lucko.luckperms.common.commands.CommandException;
 import me.lucko.luckperms.common.commands.CommandResult;
 import me.lucko.luckperms.common.commands.SubCommand;
@@ -33,6 +32,7 @@ import me.lucko.luckperms.common.constants.Permission;
 import me.lucko.luckperms.common.core.model.Group;
 import me.lucko.luckperms.common.core.model.Track;
 import me.lucko.luckperms.common.core.model.User;
+import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.utils.Predicates;
 import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
 import me.lucko.luckperms.sponge.LPSpongePlugin;

sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsService.java

@@ -129,7 +129,7 @@ public class LuckPermsService implements PermissionService {
         localOptionCaches = Collections.newSetFromMap(new MapMaker().weakKeys().makeMap());
         localDataCaches = Collections.newSetFromMap(new MapMaker().weakKeys().makeMap());
 
-        storage = new SubjectStorage(new File(plugin.getDataFolder(), "local"));
+        storage = new SubjectStorage(new File(plugin.getDataDirectory(), "local"));
 
         userSubjects = plugin.getUserManager();
         fallbackUserSubjects = new PersistedCollection(this, "fallback-users", true);

sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsSubjectData.java

@@ -74,11 +74,11 @@ public class LuckPermsSubjectData implements LPSubjectData {
     private void objectSave(PermissionHolder t) {
         if (t instanceof User) {
             service.getPlugin().getStorage().saveUser(((User) t))
-                    .thenRunAsync(() -> ((User) t).getRefreshBuffer().request(), service.getPlugin().getAsyncExecutor());
+                    .thenRunAsync(() -> ((User) t).getRefreshBuffer().request(), service.getPlugin().getScheduler().getAsyncExecutor());
         }
         if (t instanceof Group) {
             service.getPlugin().getStorage().saveGroup((Group) t)
-                    .thenRunAsync(() -> service.getPlugin().getUpdateTaskBuffer().request(), service.getPlugin().getAsyncExecutor());
+                    .thenRunAsync(() -> service.getPlugin().getUpdateTaskBuffer().request(), service.getPlugin().getScheduler().getAsyncExecutor());
         }
     }