plugins are now loaded more properlier, allowing custom world generation

IoIxD · IoIxD · commit 98d1e845ed88 · 2023-07-12T18:49:50.000-07:00
diff --git a/native/src/lib.rs b/native/src/lib.rs
@@ -72,7 +72,25 @@ pub extern "system" fn Java_net_ioixd_blackbox_Native_loadPlugin<'a>(
             return;
         }
         let lib = lib.unwrap();
-        LIBRARY_MANAGER.push_lib(file, (lib, true));
+        let parts = file
+            .split(std::path::MAIN_SEPARATOR)
+            .map(|f| f.to_string())
+            .collect::<Vec<String>>();
+        let mut name = parts.get(parts.len() - 1).unwrap().clone();
+        #[cfg(target_os = "windows")]
+        {
+            name = name.replace(".dll", "");
+        }
+        #[cfg(target_os = "macos")]
+        {
+            name = name.replace(".dylib", "");
+        }
+        #[cfg(target_os = "linux")]
+        {
+            name = name.replace(".so", "");
+        }
+        println!("{}", name);
+        LIBRARY_MANAGER.push_lib(name, (lib, true));
     }
 }
 
@@ -144,19 +162,17 @@ pub extern "system" fn Java_net_ioixd_blackbox_Native_libraryHasFunction<'a>(
     libname_raw: JString,
     funcname_raw: JString,
 ) -> jboolean {
-    let libname = &env
-        .get_string(&libname_raw)
-        .unwrap()
+    let libname_raw = env.get_string(&libname_raw);
+    let libname = unwrap_result_or_java_error(&mut env, "unknown library", libname_raw)
         .to_string_lossy()
         .to_string();
-    let funcname = &env
-        .get_string(&funcname_raw)
-        .unwrap()
+    let funcname_raw = env.get_string(&funcname_raw);
+    let funcname = unwrap_result_or_java_error(&mut env, &libname, funcname_raw)
         .to_string_lossy()
         .to_string();
 
     let manager = unsafe { LIBRARY_MANAGER.loaded_libraries.lock() };
-    let lib = manager.get(libname).unwrap().library();
+    let lib = manager.get(&libname).unwrap().library();
     let func: Result<
         libloading::Symbol<unsafe extern "C" fn(JNIEnv<'_>, JObject<'_>)>,
         libloading::Error,
@@ -245,8 +261,13 @@ pub extern "system" fn Java_net_ioixd_blackbox_Native_execute<'a>(
         .to_string();
 
     let manager = unsafe { LIBRARY_MANAGER.loaded_libraries.lock() };
-    let lib =
-        unwrap_option_or_java_error(&mut env, &libname, &libname, manager.get(&libname)).library();
+    let lib = unwrap_option_or_java_error(
+        &mut env,
+        &libname,
+        &format!("manager.get({})", &libname),
+        manager.get(&libname),
+    )
+    .library();
     let func: Result<
         libloading::Symbol<extern "C" fn(JNIEnv<'_>, JObject<'_>) -> JObject<'a>>,
         libloading::Error,
@@ -277,7 +298,7 @@ where
             throw_with_error(
                 &mut env,
                 "net/ioixd/blackbox/exceptions/NativeLibrarySymbolLoadException",
-                format!("error loading {}: {:?}", &libname, err),
+                format!("error with {}: {:?}", &libname, err),
             );
             unreachable!();
         }
@@ -299,7 +320,7 @@ where
             throw_with_error(
                 &mut env,
                 "net/ioixd/blackbox/exceptions/NativeLibrarySymbolLoadException",
-                format!("error loading {}: {} is None", &libname, valname),
+                format!("error with {}: {} is None", &libname, valname),
             );
             unreachable!();
         }
diff --git a/src/main/java/net/ioixd/blackbox/BlackBox.java b/src/main/java/net/ioixd/blackbox/BlackBox.java
@@ -16,12 +16,15 @@
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public final class BlackBox extends JavaPlugin {
     PluginManager pm = null;
 
+    private ArrayList<BlackBoxPlugin> plugins = new ArrayList<>();
+
     @Override
     public void onLoad() {
         pm = Bukkit.getServer().getPluginManager();
@@ -68,9 +71,11 @@ public void onLoad() {
                 if (!match.find()) {
                     continue;
                 }
-
                 try {
-                    pm.loadPlugin(f);
+                    BlackBoxPlugin p = (BlackBoxPlugin) pm.loadPlugin(f);
+                    if (p != null) {
+                        plugins.add(p);
+                    }
                 } catch (InvalidPluginException e) {
                     e.printStackTrace();
                 } catch (InvalidDescriptionException e) {
@@ -90,8 +95,14 @@ public void onEnable() {
         clsgraph.initializeLoadedClasses();
         ClassInfoList info = clsgraph.scan().getSubclasses(Event.class.getName());
         info.forEach(cls -> {
-            cls.loadClass();
+            cls.loadClass(true);
         });
+        for (BlackBoxPlugin p : plugins) {
+            if (p == null) {
+                continue;
+            }
+            p.updateEventListeners();
+        }
     }
 
     @Override
diff --git a/src/main/java/net/ioixd/blackbox/BlackBoxPlugin.java b/src/main/java/net/ioixd/blackbox/BlackBoxPlugin.java
@@ -56,6 +56,7 @@ public class BlackBoxPluginListener implements Listener {
 
         public BlackBoxPluginListener(BlackBoxPlugin plugin, String library) {
             this.plugin = plugin;
+            this.library = library;
             this.registeredListener = new RegisteredListener(this, this::onEvent, EventPriority.NORMAL, plugin, false);
             for (HandlerList handler : HandlerList.getHandlerLists()) {
                 handler.register(this.registeredListener);
@@ -66,7 +67,7 @@ public void onEvent(Listener listener, Event event) {
             // get the event name
             String name = event.getEventName();
             String hookName = "__on__" + name;
-            this.plugin.getLogger().info(hookName);
+            System.out.println(this.library + ", " + hookName);
 
             try {
                 boolean result = Native.libraryHasFunction(library, hookName);
@@ -84,17 +85,21 @@ public void onEvent(Listener listener, Event event) {
 
     BlackBoxPlugin(String library, BlackBox parent, PluginLoader loader) {
         this.library = library;
+        this.listener = new BlackBoxPluginListener(this, this.library);
         this.isEnabled = true;
         this.naggable = true;
         this.parent = parent;
         File pluginsFolder = parent.getDataFolder().getParentFile();
-        if (!Paths.get(pluginsFolder.getPath(), library).toFile().exists()) {
+        if (!Paths.get(pluginsFolder.getPath(), this.library).toFile().exists()) {
             pluginsFolder.mkdir();
-            Paths.get(pluginsFolder.getPath(), library).toFile().mkdir();
+            Paths.get(pluginsFolder.getPath(), this.library).toFile().mkdir();
         }
-        this.dataFolder = Paths.get(pluginsFolder.getPath(), library).toFile();
+        this.dataFolder = Paths.get(pluginsFolder.getPath(), this.library).toFile();
         this.loader = loader;
-        this.file = new File(library);
+        this.file = new File(this.library);
+    }
+
+    public void updateEventListeners() {
         this.listener = new BlackBoxPluginListener(this, this.library);
     }
 
@@ -109,9 +114,10 @@ public String getName() {
 
     Object execNative(String functionName, Object[] objects) {
         try {
-            boolean hasFunc = Native.libraryHasFunction(library, "getConfig");
+            boolean hasFunc = Native.libraryHasFunction(library, functionName);
             if (hasFunc) {
-                return Native.execute(this.library, "__getConfig", this, objects);
+                System.out.println(this.library);
+                return Native.execute(this.library, "__" + functionName, this, objects);
             } else {
                 // default
                 return null;
@@ -121,6 +127,7 @@ Object execNative(String functionName, Object[] objects) {
             // this.getLogger().severe("Disabling self");
             // this.disable();
         }
+        this.getLogger().info(library + ", " + functionName);
         return null;
     }
 
diff --git a/src/main/java/net/ioixd/blackbox/BlackBoxPluginLoader.java b/src/main/java/net/ioixd/blackbox/BlackBoxPluginLoader.java
@@ -7,6 +7,7 @@
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
@@ -44,29 +45,41 @@ public BlackBoxPluginLoader(@NotNull Server instance) {
     @Override
     @NotNull
     public Plugin loadPlugin(@NotNull final File file) {
-        this.server.getLogger().warning("loadPlugin");
+        return loadPlugin(file, null);
+    }
+
+    public Plugin loadPlugin(@NotNull final File file, List<BlackBoxPlugin> returnedPlugins) {
+        String library = file.getAbsolutePath();
 
-        server.getLogger().info("Loading native plugin " + file.getAbsolutePath());
+        String[] parts = library.split(File.separator);
+        String libraryName = parts[parts.length - 1].replace(BlackBoxPluginLoader.getFileExtension(), "").replace("-",
+                "_");
+        ;
 
         Preconditions.checkArgument(file != null, "File cannot be null");
 
         if (!file.exists()) {
-            server.getLogger().severe(file.getPath() + " does not exist");
+            server.getLogger().severe(file.getAbsolutePath() + " does not exist");
             return null;
         }
 
-        Native.loadPlugin(file.getAbsolutePath());
+        Native.loadPlugin(library);
 
-        BlackBoxPlugin plugin = new BlackBoxPlugin(file.getAbsolutePath(),
+        server.getLogger().info("Loading native plugin " + libraryName);
+
+        BlackBoxPlugin plugin = new BlackBoxPlugin(libraryName,
                 (BlackBox) server.getPluginManager().getPlugin("BlackBox"), this);
         libNameMap.put(plugin, plugin);
+        if (returnedPlugins != null) {
+            returnedPlugins.add(plugin);
+        }
 
+        System.out.println("Returning " + plugin.toString());
         return plugin;
     }
 
     @Override
     public void enablePlugin(@NotNull final Plugin plugin) {
-        this.server.getLogger().warning("enablePlugin");
         if (libNameMap.containsKey(plugin)) {
             Native.enablePlugin(libNameMap.get(plugin).getInnerLibraryName());
         } else {
@@ -76,7 +89,6 @@ public void enablePlugin(@NotNull final Plugin plugin) {
 
     @Override
     public void disablePlugin(@NotNull Plugin plugin) {
-        this.server.getLogger().warning("disablePlugin");
         if (libNameMap.containsKey(plugin)) {
             Native.disablePlugin(libNameMap.get(plugin).getInnerLibraryName());
         } else {
@@ -87,7 +99,6 @@ public void disablePlugin(@NotNull Plugin plugin) {
     @Override
     @NotNull
     public PluginDescriptionFile getPluginDescription(@NotNull File file) {
-        this.server.getLogger().warning("getPluginDescription");
         if (file == null) {
             this.server.getLogger().severe("null passed to getPluginDescription");
             return null;
@@ -107,12 +118,10 @@ public PluginDescriptionFile getPluginDescription(@NotNull File file) {
     @Override
     @NotNull
     public Pattern[] getPluginFileFilters() {
-        this.server.getLogger().warning("getPluginFileFilters");
         return fileFilters;
     }
 
     public static String getFileExtension() {
-        System.out.println("getFileExtension");
         String os = System.getProperty("os.name").toLowerCase();
         if (os.contains("win")) {
             return ".so";
@@ -130,7 +139,6 @@ public static String getFileExtension() {
     @NotNull
     public Map<Class<? extends Event>, Set<RegisteredListener>> createRegisteredListeners(@NotNull Listener listener,
             @NotNull final Plugin plugin) {
-        this.server.getLogger().warning("createRegisteredListeners");
         Preconditions.checkArgument(plugin != null, "Plugin can not be null");
         Preconditions.checkArgument(listener != null, "Listener can not be null");
 
