Fixed our circular insanity

Co-Authored-By: Cazdotsys <[email protected]>
Far-Beyond-Dev · Dec 13, 2024 · 4b34e44 · 4b34e44
1 parent 6bd4d96
commit 4b34e44
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/plugin_api/src/plugin_imports.rs b/plugin_api/src/plugin_imports.rs
@@ -0,0 +1,22 @@
+// This file is automatically generated by build.rs
+// Do not edit this file manually!
+
+use horizon_plugin_api::{Pluginstate, LoadedPlugin, Plugin};
+use std::collections::HashMap;
+
+pub use chronos_plugin;
+pub use chronos_plugin::*;
+pub use chronos_plugin::Plugin as chronos_plugin_plugin;
+pub use player_lib;
+pub use player_lib::*;
+pub use player_lib::Plugin as player_lib_plugin;
+
+
+// Invoke the macro with all discovered plugins
+pub fn load_plugins() -> HashMap<String, (Pluginstate, Plugin)> {
+    let plugins = crate::load_plugins!(
+        chronos_plugin,
+        player_lib
+    );
+    plugins
+}
diff --git a/plugins/chronos_plugin/Cargo.toml b/plugins/chronos_plugin/Cargo.toml
@@ -8,6 +8,4 @@ horizon-plugin-api = "0.2.0"
 horizon_data_types = "0.4.0"
 lazy_static = "1.5.0"
 parking_lot = "0.12.3"
-socketioxide = "0.15.1"
-
-plugin_imports = { path = "../../plugin_imports", version = "0.1.0" }
+socketioxide = "0.15.1"
diff --git a/plugins/player_lib/Cargo.toml b/plugins/player_lib/Cargo.toml
@@ -8,6 +8,4 @@ PebbleVault = "0.6.1"
 horizon-plugin-api = "0.2.0"
 horizon_data_types = "0.4.0"
 socketioxide = "0.15.1"
-parking_lot = "0.12.3"
-
-plugin_imports = { path = "../../plugin_imports", version = "0.1.0" }
+parking_lot = "0.12.3"