API 4.0 - this is a breaking change

bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java

@@ -28,8 +28,7 @@ package me.lucko.luckperms.bungee;
 import lombok.Getter;
 
 import me.lucko.luckperms.api.Contexts;
-import me.lucko.luckperms.api.Logger;
-import me.lucko.luckperms.api.PlatformType;
+import me.lucko.luckperms.api.platform.PlatformType;
 import me.lucko.luckperms.bungee.calculators.BungeeCalculatorFactory;
 import me.lucko.luckperms.bungee.contexts.BackendServerCalculator;
 import me.lucko.luckperms.bungee.contexts.BungeeContextManager;
@@ -39,8 +38,8 @@ import me.lucko.luckperms.bungee.listeners.BungeePermissionCheckListener;
 import me.lucko.luckperms.bungee.messaging.BungeeMessagingFactory;
 import me.lucko.luckperms.bungee.util.RedisBungeeUtil;
 import me.lucko.luckperms.common.actionlog.LogDispatcher;
-import me.lucko.luckperms.common.api.ApiHandler;
 import me.lucko.luckperms.common.api.ApiProvider;
+import me.lucko.luckperms.common.api.ApiSingletonUtils;
 import me.lucko.luckperms.common.buffers.BufferedRequest;
 import me.lucko.luckperms.common.buffers.UpdateTaskBuffer;
 import me.lucko.luckperms.common.caching.handlers.CachedStateManager;
@@ -57,6 +56,7 @@ import me.lucko.luckperms.common.dependencies.DependencyManager;
 import me.lucko.luckperms.common.locale.LocaleManager;
 import me.lucko.luckperms.common.locale.NoopLocaleManager;
 import me.lucko.luckperms.common.locale.SimpleLocaleManager;
+import me.lucko.luckperms.common.logging.Logger;
 import me.lucko.luckperms.common.logging.SenderLogger;
 import me.lucko.luckperms.common.managers.GenericGroupManager;
 import me.lucko.luckperms.common.managers.GenericTrackManager;
@@ -188,15 +188,15 @@ public class LPBungeePlugin extends Plugin implements LuckPermsPlugin {
         // setup context manager
         contextManager = new BungeeContextManager(this);
         contextManager.registerCalculator(new BackendServerCalculator(this));
-        contextManager.registerCalculator(new LuckPermsCalculator<>(getConfiguration()), true);
+        contextManager.registerStaticCalculator(new LuckPermsCalculator(getConfiguration()));
 
         if (getProxy().getPluginManager().getPlugin("RedisBungee") != null) {
-            contextManager.registerCalculator(new RedisBungeeCalculator(), true);
+            contextManager.registerStaticCalculator(new RedisBungeeCalculator());
         }
 
         // register with the LP API
         apiProvider = new ApiProvider(this);
-        ApiHandler.registerProvider(apiProvider);
+        ApiSingletonUtils.registerProvider(apiProvider);
 
         // schedule update tasks
         int mins = getConfiguration().get(ConfigKeys.SYNC_TIME);
@@ -234,7 +234,7 @@ public class LPBungeePlugin extends Plugin implements LuckPermsPlugin {
             messagingService.close();
         }
 
-        ApiHandler.unregisterProvider();
+        ApiSingletonUtils.unregisterProvider();
 
         getLog().info("Shutting down internal scheduler...");
         scheduler.shutdown();

bungee/src/main/java/me/lucko/luckperms/bungee/contexts/BungeeContextManager.java

@@ -35,7 +35,7 @@ import net.md_5.bungee.api.connection.ProxiedPlayer;
 
 public class BungeeContextManager extends AbstractContextManager<ProxiedPlayer> {
     public BungeeContextManager(LPBungeePlugin plugin) {
-        super(plugin);
+        super(plugin, ProxiedPlayer.class);
     }
 
     @Override

bungee/src/main/java/me/lucko/luckperms/bungee/contexts/RedisBungeeCalculator.java

@@ -28,16 +28,14 @@ package me.lucko.luckperms.bungee.contexts;
 import com.imaginarycode.minecraft.redisbungee.RedisBungee;
 import com.imaginarycode.minecraft.redisbungee.RedisBungeeAPI;
 
-import me.lucko.luckperms.api.context.ContextCalculator;
 import me.lucko.luckperms.api.context.MutableContextSet;
+import me.lucko.luckperms.api.context.StaticContextCalculator;
 
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-
-public class RedisBungeeCalculator implements ContextCalculator<ProxiedPlayer> {
+public class RedisBungeeCalculator implements StaticContextCalculator {
     private static final String PROXY_KEY = "proxy";
 
     @Override
-    public MutableContextSet giveApplicableContext(ProxiedPlayer subject, MutableContextSet accumulator) {
+    public MutableContextSet giveApplicableContext(MutableContextSet accumulator) {
         RedisBungeeAPI redisBungee = RedisBungee.getApi();
         if (redisBungee != null) {
             accumulator.add(PROXY_KEY, redisBungee.getServerId());