A bit more tidying up

core/common/src/lua.rs

@@ -8,8 +8,8 @@ use std::{any::Any, sync::Arc};
 pub use mlua::prelude::*;
 
 use crate::{
-  Callable, Callback, CallbackError, Color, Color32, FromVariant, Quat, ToVariant, ToVirtualPath, Variant, Vec2, Vec3,
-  Vec4,
+  Callable, Callback, CallbackError, Color, Color32, FromVariant, Quat, StringName, ToVariant, ToVirtualPath, Variant,
+  Vec2, Vec3, Vec4,
 };
 
 /// A Lua scripting engine.
@@ -196,6 +196,22 @@ impl<'lua> FromLua<'lua> for Variant {
   }
 }
 
+/// Special handling for StringNames directly into IDs
+impl<'lua> IntoLua<'lua> for StringName {
+  fn into_lua(self, _lua: &'lua Lua) -> LuaResult<LuaValue<'lua>> {
+    Ok(LuaValue::Integer(self.id().into()))
+  }
+}
+
+impl<'lua> FromLua<'lua> for StringName {
+  fn from_lua(value: LuaValue<'lua>, _lua: &'lua Lua) -> LuaResult<Self> {
+    match value {
+      LuaValue::Integer(value) => Ok(StringName::from_id(value.into())),
+      _ => Err(LuaError::UserDataTypeMismatch),
+    }
+  }
+}
+
 /// Wraps many [`Variant`]s to be passed as arguments to a Lua function.
 ///
 /// This is necessary because Lua does not support variadic arguments.

core/common/src/strings/names.rs

@@ -6,7 +6,7 @@ use std::{
 
 use crate::{Arena, Singleton};
 
-crate::impl_arena_index!(StringId, "Identifies a string in a string pool.");
+crate::impl_arena_index!(pub(crate) StringId, "Identifies a string in a string pool.");
 
 /// A trait for objects that can be converted to a [`StringName`].
 pub trait ToStringName {
@@ -34,6 +34,16 @@ impl StringName {
       id: unsafe { intern_string(value) },
     }
   }
+
+  /// Creates a new string name from a string ID.
+  pub(crate) fn from_id(id: StringId) -> Self {
+    Self { id }
+  }
+
+  /// Returns the ID of the string.
+  pub(crate) fn id(&self) -> StringId {
+    self.id
+  }
 }
 
 /// Converts a string reference to a string name.

core/input/src/keyboards.rs

@@ -7,15 +7,15 @@ pub trait KeyboardDevice {
 }
 
 /// A keyboard event.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub enum KeyboardEvent {
   KeyDown(VirtualKey),
   KeyUp(VirtualKey),
 }
 
 /// Possible key codes on a keyboard.
 #[repr(u32)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum VirtualKey {
   Escape,
   F0,

core/input/src/mouse.rs

@@ -7,7 +7,7 @@ pub trait MouseDevice {
 }
 
 /// A mouse event.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub enum MouseEvent {
   MouseMove { position: Vec2, delta: Vec2 },
   MouseDown(MouseButton),