From 69bbc1696ccdcaf34961389f21d92cf42467c3b8 Mon Sep 17 00:00:00 2001 From: "Tristan Poland (Trident_For_U)" <34868944+tristanpoland@users.noreply.github.com> Date: Mon, 30 Dec 2024 12:56:50 -0500 Subject: [PATCH 1/2] Moved Code Success! --- backends/stars_beyond/Cargo.toml | 1 + backends/stars_beyond/src/lib.rs | 14 ++++++++++++-- plugins/player_lib/Cargo.toml | 3 +++ plugins/player_lib/src/lib.rs | 2 ++ .../mod.rs => plugins/player_lib/src/world.rs | 4 +--- server/src/server/mod.rs | 14 ++------------ 6 files changed, 21 insertions(+), 17 deletions(-) rename server/src/server/in_world/mod.rs => plugins/player_lib/src/world.rs (92%) diff --git a/backends/stars_beyond/Cargo.toml b/backends/stars_beyond/Cargo.toml index 18ccc16..4b50e32 100644 --- a/backends/stars_beyond/Cargo.toml +++ b/backends/stars_beyond/Cargo.toml @@ -9,6 +9,7 @@ horizon-plugin-api = "0.2.0" horizon_data_types = "0.4.0" socketioxide = "0.15.1" parking_lot = "0.12.3" +serde_json = "1.0.134" # # # diff --git a/backends/stars_beyond/src/lib.rs b/backends/stars_beyond/src/lib.rs index 837c78e..2323634 100644 --- a/backends/stars_beyond/src/lib.rs +++ b/backends/stars_beyond/src/lib.rs @@ -4,6 +4,7 @@ pub use horizon_plugin_api::{Plugin, Pluginstate, LoadedPlugin}; use parking_lot::RwLock; use std::sync::Arc; use std::collections::HashMap; +use player_lib::world; // use socketioxide::packet::Str; pub trait PluginAPI { @@ -30,10 +31,19 @@ impl PluginConstruct for Plugin { impl PluginAPI for Plugin { fn player_joined(&self, socket: SocketRef, player: Arc>) { println!("player_lib"); - setup_listeners(socket, player); + setup_listeners(&socket, player); + + // TODO: move this to example backend + let player_char = world::Object::new("Player Character".to_string(), true); + println!("Player joined: {:?}", player_char.get_uuid().to_string()); + + let player_json_value: serde_json::Value = serde_json::json!({ "joined": true }); + player_char.send_event(socket, "playerjoined".to_string(), player_json_value); + println!("Sent player joined event Successfully"); } } -fn setup_listeners(_socket: SocketRef, _player: Arc>) { +fn setup_listeners(_socket: &SocketRef, _player: Arc>) { + } \ No newline at end of file diff --git a/plugins/player_lib/Cargo.toml b/plugins/player_lib/Cargo.toml index 39f8520..8ee5c00 100644 --- a/plugins/player_lib/Cargo.toml +++ b/plugins/player_lib/Cargo.toml @@ -9,3 +9,6 @@ horizon-plugin-api = "0.2.0" horizon_data_types = "0.4.0" socketioxide = "0.15.1" parking_lot = "0.12.3" +serde = "1.0.217" +serde_json = "1.0.134" +uuid = "1.11.0" diff --git a/plugins/player_lib/src/lib.rs b/plugins/player_lib/src/lib.rs index 1bdc4f0..74ab486 100644 --- a/plugins/player_lib/src/lib.rs +++ b/plugins/player_lib/src/lib.rs @@ -4,6 +4,8 @@ pub use horizon_plugin_api::{Plugin, Pluginstate, LoadedPlugin}; use parking_lot::RwLock; use std::sync::Arc; use std::collections::HashMap; + +pub mod world; // use socketioxide::packet::Str; // use PebbleVault; diff --git a/server/src/server/in_world/mod.rs b/plugins/player_lib/src/world.rs similarity index 92% rename from server/src/server/in_world/mod.rs rename to plugins/player_lib/src/world.rs index 0642b5d..8ac8518 100644 --- a/server/src/server/in_world/mod.rs +++ b/plugins/player_lib/src/world.rs @@ -1,10 +1,8 @@ use socketioxide::extract::{ SocketRef, Data }; -use serde::Serialize; use serde_json::Value; -use std::collections::HashMap; use uuid::Uuid; - +#[allow(dead_code)] pub struct Object { uuid: Uuid, name: String, diff --git a/server/src/server/mod.rs b/server/src/server/mod.rs index 94b705f..e36de05 100644 --- a/server/src/server/mod.rs +++ b/server/src/server/mod.rs @@ -20,7 +20,7 @@ use axum::{routing::get, Router}; use config::ServerConfig; use horizon_data_types::Player; use horizon_logger::{log_debug, log_error, log_info}; -use horizon_plugin_api::{LoadedPlugin}; +use horizon_plugin_api::LoadedPlugin; use parking_lot::RwLock; use socketioxide::{ extract::{AckSender, Data, SocketRef}, @@ -30,9 +30,8 @@ use std::collections::HashMap; use std::sync::Arc; use tokio::sync::Mutex; use uuid::Uuid; -use plugin_api::*; pub mod config; -pub mod in_world; + use lazy_static::lazy_static; @@ -189,15 +188,6 @@ fn on_connect(socket: SocketRef, Data(data): Data) { let player_arc: Arc = Arc::new(player); - // TODO: move this to example backend - let player_char = in_world::Object::new("Player Character".to_string(), true); - println!("Player joined: {:?}", player_char.get_uuid().to_string()); - - let player_json_value: serde_json::Value = serde_json::json!({ "joined": true }); - player_char.send_event(socket, "playerjoined".to_string(), player_json_value); - println!("Sent player joined event Successfully"); - - // let casted_struct = plugin_api::get_plugin!(unreal_adapter_horizon, target_thread.plugins); // casted_struct.player_joined(socket, player_arc); } From 84311f06671e44c4878464caeee6b0ac539fb866 Mon Sep 17 00:00:00 2001 From: "Tristan Poland (Trident_For_U)" <34868944+tristanpoland@users.noreply.github.com> Date: Mon, 30 Dec 2024 12:58:51 -0500 Subject: [PATCH 2/2] Update lib.rs --- backends/stars_beyond/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/backends/stars_beyond/src/lib.rs b/backends/stars_beyond/src/lib.rs index 2323634..b4d799d 100644 --- a/backends/stars_beyond/src/lib.rs +++ b/backends/stars_beyond/src/lib.rs @@ -33,7 +33,6 @@ impl PluginAPI for Plugin { println!("player_lib"); setup_listeners(&socket, player); - // TODO: move this to example backend let player_char = world::Object::new("Player Character".to_string(), true); println!("Player joined: {:?}", player_char.get_uuid().to_string());