plugin loader works now, but events are broken

Author: IoIxD

build.gradle

@@ -44,7 +44,6 @@ dependencies {
 
 shadowJar {
     dependencies {
-        include(dependency("io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT"))
         include(dependency("io.github.classgraph:classgraph:4.8.160"))
     }
 }

src/main/java/net/ioixd/blackbox/BlackBox.java

@@ -1,10 +1,11 @@
 package net.ioixd.blackbox;
 
+import org.bukkit.Bukkit;
 import org.bukkit.event.Event;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.Listener;
-import org.bukkit.plugin.RegisteredListener;
+import org.bukkit.plugin.InvalidDescriptionException;
+import org.bukkit.plugin.InvalidPluginException;
+import org.bukkit.plugin.PluginManager;
+import org.bukkit.plugin.UnknownDependencyException;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import io.github.classgraph.ClassGraph;
@@ -13,22 +14,18 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.file.FileSystems;
 import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.Arrays;
+import java.nio.file.Paths;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public final class BlackBox extends JavaPlugin {
+    PluginManager pm = null;
+
     @Override
-    public void onEnable() {
-        // Make sure everything has been loaded.
-        ClassGraph clsgraph = new ClassGraph();
-        clsgraph.acceptPackages("org.bukkit");
-        clsgraph.initializeLoadedClasses();
-        ClassInfoList info = clsgraph.scan().getSubclasses(Event.class.getName());
-        info.forEach(cls -> {
-            cls.loadClass();
-        });
+    public void onLoad() {
+        pm = Bukkit.getServer().getPluginManager();
+        pm.registerInterface(BlackBoxPluginLoader.class);
 
         // extract the .dll or .so from the .jar into the plugins folder and run it.
         // i do not care if this is the wrong way. i have spent so fucking long trying
@@ -44,17 +41,16 @@ public void onEnable() {
             getLogger().severe("Unsupported operating system \"" + os + "\". Stopping now.");
             getServer().shutdown();
         }
+
         File dir = new File(getDataFolder().getAbsolutePath());
         if (!dir.exists()) {
             dir.mkdir();
         }
-        File file = new File(
-                getDataFolder().getAbsolutePath() +
-                        FileSystems.getDefault().getSeparator() +
-                        filename);
+        File file = new File(Paths.get(getDataFolder().getAbsolutePath(), filename).toString());
         if (file.exists()) {
             file.delete();
         }
+
         InputStream link = (BlackBox.class.getResourceAsStream("/" + filename));
         try {
             Files.copy(link, file.getAbsoluteFile().toPath());
@@ -66,7 +62,36 @@ public void onEnable() {
 
         System.load(file.getAbsolutePath());
 
-        this.getServer().getPluginManager().registerInterface(BlackBoxPluginLoader.class);
+        for (File f : this.getFile().getParentFile().listFiles()) {
+            for (Pattern filter : BlackBoxPluginLoader.fileFilters) {
+                Matcher match = filter.matcher(f.getAbsolutePath());
+                if (!match.find()) {
+                    continue;
+                }
+
+                try {
+                    pm.loadPlugin(f);
+                } catch (InvalidPluginException e) {
+                    e.printStackTrace();
+                } catch (InvalidDescriptionException e) {
+                    e.printStackTrace();
+                } catch (UnknownDependencyException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onEnable() {
+        // Make sure everything has been loaded.
+        ClassGraph clsgraph = new ClassGraph();
+        clsgraph.acceptPackages("org.bukkit");
+        clsgraph.initializeLoadedClasses();
+        ClassInfoList info = clsgraph.scan().getSubclasses(Event.class.getName());
+        info.forEach(cls -> {
+            cls.loadClass();
+        });
     }
 
     @Override

src/main/java/net/ioixd/blackbox/BlackBoxPlugin.java

@@ -32,8 +32,6 @@
 
 import com.google.common.base.Charsets;
 
-import io.papermc.paper.plugin.configuration.PluginMeta;
-
 public class BlackBoxPlugin implements Plugin {
     String library;
     BlackBox parent;
@@ -49,45 +47,64 @@ public class BlackBoxPlugin implements Plugin {
     private FileConfiguration newConfig = null;
     private File configFile = null;
 
-    private PluginMeta pluginMeta = null;
+    BlackBoxPluginListener listener;
+
+    public class BlackBoxPluginListener implements Listener {
+        BlackBoxPlugin plugin;
+        RegisteredListener registeredListener;
+        String library;
+
+        public BlackBoxPluginListener(BlackBoxPlugin plugin, String library) {
+            this.plugin = plugin;
+            this.registeredListener = new RegisteredListener(this, this::onEvent, EventPriority.NORMAL, plugin, false);
+            for (HandlerList handler : HandlerList.getHandlerLists()) {
+                handler.register(this.registeredListener);
+            }
+        }
 
-    RegisteredListener registeredListener = null;
+        public void onEvent(Listener listener, Event event) {
+            // get the event name
+            String name = event.getEventName();
+            String hookName = "__on__" + name;
+            this.plugin.getLogger().info(hookName);
+
+            try {
+                boolean result = Native.libraryHasFunction(library, hookName);
+                if (result == false) {
+                    HandlerList handler = event.getHandlers();
+                    handler.unregister(registeredListener);
+                } else {
+                    Native.sendEvent(library, hookName, event);
+                }
+            } catch (Exception ex) {
+                this.plugin.getLogger().severe(ex.toString());
+            }
+        }
+    }
 
-    BlackBoxPlugin(String library, BlackBox parent, PluginLoader loader) throws IOException {
+    BlackBoxPlugin(String library, BlackBox parent, PluginLoader loader) {
         this.library = library;
         this.isEnabled = true;
         this.naggable = true;
         this.parent = parent;
         File pluginsFolder = parent.getDataFolder().getParentFile();
         if (!Paths.get(pluginsFolder.getPath(), library).toFile().exists()) {
-            Paths.get(pluginsFolder.getPath(), library).toFile().createNewFile();
+            pluginsFolder.mkdir();
+            Paths.get(pluginsFolder.getPath(), library).toFile().mkdir();
         }
         this.dataFolder = Paths.get(pluginsFolder.getPath(), library).toFile();
         this.loader = loader;
-
-        this.pluginMeta = new BlackBoxPluginMeta(library);
+        this.file = new File(library);
+        this.listener = new BlackBoxPluginListener(this, this.library);
     }
 
-    public void setRegisteredListener(RegisteredListener registeredListener) {
-        this.registeredListener = registeredListener;
+    public String getInnerLibraryName() {
+        return library;
     }
 
-    public void onEvent(Listener listener, Event event) {
-        // get the event name
-        String name = event.getEventName();
-        String hookName = "__on__" + name;
-
-        try {
-            boolean result = Native.libraryHasFunction(library, hookName);
-            if (result == false) {
-                HandlerList handler = event.getHandlers();
-                handler.unregister(registeredListener);
-            } else {
-                Native.sendEvent(library, hookName, event);
-            }
-        } catch (Exception ex) {
-            this.getLogger().severe(ex.toString());
-        }
+    @Override
+    public String getName() {
+        return library;
     }
 
     Object execNative(String functionName, Object[] objects) {
@@ -107,15 +124,6 @@ Object execNative(String functionName, Object[] objects) {
         return null;
     }
 
-    public String getInnerLibraryName() {
-        return library;
-    }
-
-    @Override
-    public String getName() {
-        return library;
-    }
-
     @Override
     public FileConfiguration getConfig() {
         Object func = execNative("getConfig", new Object[] {});
@@ -289,10 +297,6 @@ public void saveResource(String resourcePath, boolean replace) {
         }
     }
 
-    public PluginMeta getPluginMeta() {
-        return this.pluginMeta;
-    }
-
     @Override
     public String toString() {
         Object func = execNative("toString", new Object[] {});