Add extra parameter to EventBus#subscribe which allows a handler to be bound to a plugin

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

@@ -27,12 +27,14 @@ package me.lucko.luckperms.sponge;
 
 import me.lucko.luckperms.api.Contexts;
 import me.lucko.luckperms.api.LuckPermsApi;
+import me.lucko.luckperms.common.api.LuckPermsApiProvider;
 import me.lucko.luckperms.common.calculators.PlatformCalculatorFactory;
 import me.lucko.luckperms.common.command.CommandManager;
 import me.lucko.luckperms.common.command.abstraction.Command;
 import me.lucko.luckperms.common.command.access.CommandPermission;
 import me.lucko.luckperms.common.config.adapter.ConfigurationAdapter;
 import me.lucko.luckperms.common.contexts.ContextManager;
+import me.lucko.luckperms.common.event.AbstractEventBus;
 import me.lucko.luckperms.common.managers.track.StandardTrackManager;
 import me.lucko.luckperms.common.messaging.MessagingFactory;
 import me.lucko.luckperms.common.model.User;
@@ -159,6 +161,11 @@ public class LPSpongePlugin extends AbstractLuckPermsPlugin {
         }
     }
 
+    @Override
+    protected AbstractEventBus provideEventBus(LuckPermsApiProvider apiProvider) {
+        return new SpongeEventBus(this, apiProvider);
+    }
+
     @Override
     protected void registerApiOnPlatform(LuckPermsApi api) {
         this.bootstrap.getGame().getServiceManager().setProvider(this.bootstrap, LuckPermsApi.class, api);

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

@@ -52,7 +52,7 @@ public class SpongeCommandExecutor extends CommandManager implements CommandCall
 
     private final LPSpongePlugin plugin;
 
-    SpongeCommandExecutor(LPSpongePlugin plugin) {
+    public SpongeCommandExecutor(LPSpongePlugin plugin) {
         super(plugin);
         this.plugin = plugin;
     }

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

@@ -0,0 +1,71 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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.api.LuckPermsApiProvider;
+import me.lucko.luckperms.common.event.AbstractEventBus;
+
+import org.spongepowered.api.Sponge;
+import org.spongepowered.api.event.Listener;
+import org.spongepowered.api.event.cause.EventContextKeys;
+import org.spongepowered.api.event.game.GameReloadEvent;
+import org.spongepowered.api.plugin.PluginContainer;
+
+public class SpongeEventBus extends AbstractEventBus<PluginContainer> {
+    public SpongeEventBus(LPSpongePlugin plugin, LuckPermsApiProvider apiProvider) {
+        super(plugin, apiProvider);
+
+        // register listener
+        LPSpongeBootstrap bootstrap = plugin.getBootstrap();
+        bootstrap.getGame().getEventManager().registerListeners(bootstrap, this);
+    }
+
+    @Override
+    protected PluginContainer checkPlugin(Object plugin) throws IllegalArgumentException {
+        if (plugin instanceof PluginContainer) {
+            return (PluginContainer) plugin;
+        }
+
+        PluginContainer pluginContainer = Sponge.getPluginManager().fromInstance(plugin).orElse(null);
+        if (pluginContainer != null) {
+            return pluginContainer;
+        }
+
+        throw new IllegalArgumentException("Object " + plugin + " (" + plugin.getClass().getName() + ") is not a plugin.");
+    }
+
+    @Listener
+    public void onReload(GameReloadEvent e) {
+        // sponge doesn't really support unloading of plugins at runtime.
+        // this probably won't ever work/be useful, but I suppose it's worth a try.
+        PluginContainer pluginContainer = e.getContext().get(EventContextKeys.PLUGIN).orElse(null);
+        if (pluginContainer == null) {
+            return;
+        }
+        unregisterHandlers(pluginContainer);
+    }
+
+}