tirbofish/dropbear · diff

a21b036 · Thribhu K

feature: got a console working, so the output can be sent through. Unverified

diff --git a/crates/eucalyptus-core/src/scripting/jni.rs b/crates/eucalyptus-core/src/scripting/jni.rs
index 5d97c3b..c311882 100644
--- a/crates/eucalyptus-core/src/scripting/jni.rs
+++ b/crates/eucalyptus-core/src/scripting/jni.rs
@@ -390,8 +390,23 @@ impl JavaContext {
                 )?
                 .l()?;
 
-            let std_out_writer_class = env.find_class("com/dropbear/logging/StdoutWriter")?;
-            let log_writer_obj = env.new_object(std_out_writer_class, "()V", &[])?;
+            let log_writer_obj = match RUNTIME_MODE.get() {
+                Some(RuntimeMode::Editor) | Some(RuntimeMode::PlayMode) => {
+                    let port = 56624;
+                    if std::net::TcpStream::connect(format!("127.0.0.1:{}", port)).is_ok() {
+                        let socket_writer_class = env.find_class("com/dropbear/logging/SocketWriter")?;
+                        env.new_object(socket_writer_class, "()V", &[])?
+                    } else {
+                        log::debug!("Editor console not reachable at 127.0.0.1:{}. Falling back to StdoutWriter.", port);
+                        let std_out_writer_class = env.find_class("com/dropbear/logging/StdoutWriter")?;
+                        env.new_object(std_out_writer_class, "()V", &[])?
+                    }
+                }
+                _ => {
+                    let std_out_writer_class = env.find_class("com/dropbear/logging/StdoutWriter")?;
+                    env.new_object(std_out_writer_class, "()V", &[])?
+                }
+            };
 
             if self.system_manager_instance.is_none() {
                 let engine_ref = self
diff --git a/crates/eucalyptus-core/src/states.rs b/crates/eucalyptus-core/src/states.rs
index a0e0ad7..83200aa 100644
--- a/crates/eucalyptus-core/src/states.rs
+++ b/crates/eucalyptus-core/src/states.rs
@@ -257,6 +257,7 @@ pub enum EditorTab {
     ModelEntityList,   // right side,
     Viewport,          // middle,
     ErrorConsole,
+    Console,
     Plugin(usize),
 }
 
diff --git a/crates/eucalyptus-core/src/ui.rs b/crates/eucalyptus-core/src/ui.rs
index bd919e3..91ed930 100644
--- a/crates/eucalyptus-core/src/ui.rs
+++ b/crates/eucalyptus-core/src/ui.rs
@@ -41,12 +41,11 @@ pub struct UiContext {
 pub fn poll() {
     UI_CONTEXT.with(|v| {
         let ctx = v.borrow();

Large diffs are not rendered by default. Showing the first 50 of 702 lines. Show full diff