Stowage/noita_entangled_worlds
2
0
Fork 0
mirror of https://github.com/IntQuant/noita_entangled_worlds.git synced 2025-10-19 07:03:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Higher level component stuff

Browse source
This commit is contained in:
IQuant 2024-11-25 21:21:18 +03:00
parent 61035d8b0c
commit 0f26126ad9
4 changed files with 43 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
ewext/noita_api/src/lib.rs
View file

@ -1,4 +1,6 @@
use std::num::NonZero;
use std::{borrow::Cow, num::NonZero};
use eyre::{eyre, Context};
pub mod lua;
@ -12,10 +14,30 @@ pub struct Obj(pub usize);
pub struct Color(pub u32);
pub trait Component: From<ComponentID> {
const NAME_STR: &'static str;
}
noita_api_macro::generate_components!();
impl EntityID {
pub fn try_get_first_component<C: Component>(
self,
tag: Option<Cow<'_, str>>,
) -> eyre::Result<Option<C>> {
raw::entity_get_first_component(self, C::NAME_STR.into(), tag)
.map(|x| x.map(Into::into))
.wrap_err_with(|| eyre!("Failed to get first component {} for {self:?}", C::NAME_STR))
}
pub fn get_first_component<C: Component>(self, tag: Option<Cow<'_, str>>) -> eyre::Result<C> {
self.try_get_first_component(tag)?
.ok_or_else(|| eyre!("Entity {self:?} has no component {}", C::NAME_STR))
}
}
pub mod raw {
use eyre::Ok;
use eyre::eyre;
use eyre::Context;
use super::{Color, ComponentID, EntityID, Obj};
use crate::lua::LuaGetValue;
@ -37,7 +59,7 @@ pub mod raw {
lua.call(2, T::size_on_stack());
let ret = T::get(lua, -1);
lua.pop_last_n(T::size_on_stack());
ret
ret.wrap_err_with(|| eyre!("Getting {field} for {component:?}"))
}
pub(crate) fn component_set_value<T>(

2
ewext/noita_api/src/lua.rs
View file

@ -68,7 +68,7 @@ impl LuaState {
let slice = unsafe { slice::from_raw_parts(buf as *const u8, size) };
Ok(String::from_utf8(slice.to_owned())
.context("Attempting to get lua string, expecting it to be utf-8")?)
.wrap_err("Attempting to get lua string, expecting it to be utf-8")?)
}
pub fn to_cfunction(&self, index: i32) -> lua_CFunction {