allow disabling caching, add logging option, move log perf option to noita

ewext/src/lib.rs

@@ -743,6 +743,18 @@ pub unsafe extern "C" fn luaopen_ewext(lua: *mut lua_State) -> c_int {
             })?
         }
         add_lua_fn!(set_log);
+        fn set_cache(lua: LuaState) -> eyre::Result<()> {
+            ExtState::with_global(|state| {
+                state
+                    .modules
+                    .entity_sync
+                    .as_mut()
+                    .unwrap()
+                    .set_cache(lua.to_bool(1));
+                Ok(())
+            })?
+        }
+        add_lua_fn!(set_cache);
     }
     #[cfg(debug_assertions)]
     println!("Initializing ewext - Ok");

ewext/src/modules/entity_sync.rs

@@ -63,6 +63,9 @@ impl EntitySync {
     pub(crate) fn set_perf(&mut self, perf: bool) {
         self.log_performance = perf;
     }
+    pub(crate) fn set_cache(&mut self, cache: bool) {
+        self.entity_manager.set_cache(cache);
+    }
     /*pub(crate) fn has_gid(&self, gid: Gid) -> bool {
         self.local_diff_model.has_gid(gid) || self.remote_models.values().any(|r| r.has_gid(gid))
     }*/

noita-proxy/src/lib.rs

@@ -2321,12 +2321,6 @@ impl App {
                             }
                         }
                     }
-                    {
-                        let mut temp = netman.log_performance.load(Ordering::Relaxed);
-                        if ui.checkbox(&mut temp, "log performance metrics, requires noita to be restarted").changed() {
-                            netman.log_performance.store(temp, Ordering::Relaxed);
-                        }
-                    }
                 }
                 ConnectedMenu::Mods => {
                     let mods_list = netman.active_mods.lock().unwrap();

noita-proxy/src/net.rs

@@ -213,7 +213,6 @@ pub struct NetManager {
     pub players_sprite: Mutex<FxHashMap<OmniPeerId, (Option<WorldPos>, bool, bool, RgbaImage)>>,
     pub reset_map: AtomicBool,
     colors: Mutex<FxHashMap<u16, u32>>,
-    pub log_performance: AtomicBool,
 }
 
 impl NetManager {
@@ -256,7 +255,6 @@ impl NetManager {
             no_chunkmap_to_players: AtomicBool::new(true),
             no_chunkmap: AtomicBool::new(true),
             colors: Default::default(),
-            log_performance: AtomicBool::new(false),
         }
         .into()
     }
@@ -1066,10 +1064,6 @@ impl NetManager {
             "perk_ban_list",
             lst.perk_ban_list.unwrap_or(def.perk_ban_list).as_str(),
         );
-        state.try_ws_write_option(
-            "log_performance",
-            self.log_performance.load(Ordering::Relaxed),
-        );
         state.try_ws_write_option(
             "spell_ban_list",
             lst.spell_ban_list.unwrap_or(def.spell_ban_list).as_str(),

noita_api/src/lib.rs

@@ -1270,6 +1270,7 @@ pub struct EntityManager {
     pub files: Option<FxHashMap<Cow<'static, str>, Vec<String>>>,
     frame_num: i32,
     camera_pos: (f64, f64),
+    use_cache: bool,
 }
 impl Default for EntityManager {
     fn default() -> Self {
@@ -1281,6 +1282,7 @@ impl Default for EntityManager {
             files: Some(FxHashMap::with_capacity_and_hasher(512, FxBuildHasher)),
             frame_num: -1,
             camera_pos: (0.0, 0.0),
+            use_cache: false,
         }
     }
 }
@@ -1338,6 +1340,9 @@ impl EntityData {
     }
 }
 impl EntityManager {
+    pub fn set_cache(&mut self, cache: bool) {
+        self.use_cache = cache;
+    }
     pub fn init_frame_num(&mut self) -> eyre::Result<()> {
         if self.frame_num == -1 {
             self.frame_num = raw::game_get_frame_num()?;
@@ -1356,11 +1361,11 @@ impl EntityManager {
     pub fn camera_pos(&self) -> (f64, f64) {
         self.camera_pos
     }
-    pub fn cache_entity(&mut self, ent: EntityID) -> eyre::Result<()> {
-        self.cache.insert(ent, EntityData::new(ent)?);
-        Ok(())
-    }
     pub fn set_current_entity(&mut self, ent: EntityID) -> eyre::Result<()> {
+        if self.use_cache {
+            self.current_entity = ent;
+            return Ok(());
+        }
         if self.current_entity == ent {
             return Ok(());
         }
@@ -1380,6 +1385,7 @@ impl EntityManager {
         }
         Ok(())
     }
+    #[inline]
     pub fn entity(&self) -> EntityID {
         self.current_entity
     }
@@ -1387,7 +1393,7 @@ impl EntityManager {
         self.has_ran = false;
     }
     pub fn remove_ent(&mut self, ent: &EntityID) {
-        if &self.current_entity == ent {
+        if &self.current_entity == ent || self.use_cache {
             self.has_ran = false;
         } else {
             self.cache.remove(ent);
@@ -1395,18 +1401,30 @@ impl EntityManager {
     }
     pub fn add_tag(&mut self, tag: CachedTag) -> eyre::Result<()> {
         self.current_entity.add_tag(tag.to_tag())?;
+        if self.use_cache {
+            return Ok(());
+        }
         self.current_data.add_tag(tag);
         Ok(())
     }
     pub fn has_tag(&self, tag: CachedTag) -> bool {
+        if self.use_cache {
+            return self.entity().has_tag(tag.to_tag());
+        }
         self.current_data.has_tag(tag)
     }
     pub fn remove_tag(&mut self, tag: CachedTag) -> eyre::Result<()> {
         self.current_entity.remove_tag(tag.to_tag())?;
+        if self.use_cache {
+            return Ok(());
+        }
         self.current_data.remove_tag(tag);
         Ok(())
     }
     pub fn check_all_phys_init(&mut self) -> eyre::Result<bool> {
+        if self.use_cache {
+            return self.entity().check_all_phys_init();
+        }
         if self.current_data.phys_init {
             return Ok(true);
         }
@@ -1419,6 +1437,16 @@ impl EntityManager {
         Ok(true)
     }
     pub fn try_get_first_component<C: Component>(&self, tag: ComponentTag) -> Option<C> {
+        if self.use_cache {
+            return self
+                .entity()
+                .try_get_first_component::<C>(if matches!(tag, ComponentTag::None) {
+                    None
+                } else {
+                    Some(tag.to_str().into())
+                })
+                .unwrap_or(None);
+        }
         self.current_data.components[const { CachedComponent::from_component::<C>() as usize }]
             .iter()
             .find(|c| c.enabled && (tag == ComponentTag::None || c.tags.get(tag as u16)))
@@ -1428,12 +1456,33 @@ impl EntityManager {
         &self,
         tag: ComponentTag,
     ) -> Option<C> {
+        if self.use_cache {
+            return self
+                .entity()
+                .try_get_first_component_including_disabled::<C>(
+                    if matches!(tag, ComponentTag::None) {
+                        None
+                    } else {
+                        Some(tag.to_str().into())
+                    },
+                )
+                .unwrap_or(None);
+        }
         self.current_data.components[const { CachedComponent::from_component::<C>() as usize }]
             .iter()
             .find(|c| tag == ComponentTag::None || c.tags.get(tag as u16))
             .map(|c| C::from(c.id))
     }
     pub fn get_first_component<C: Component>(&self, tag: ComponentTag) -> eyre::Result<C> {
+        if self.use_cache {
+            return self
+                .entity()
+                .get_first_component::<C>(if matches!(tag, ComponentTag::None) {
+                    None
+                } else {
+                    Some(tag.to_str().into())
+                });
+        }
         if let Some(coms) = self.current_data.components
             [const { CachedComponent::from_component::<C>() as usize }]
         .iter()
@@ -1449,6 +1498,15 @@ impl EntityManager {
         &self,
         tag: ComponentTag,
     ) -> eyre::Result<C> {
+        if self.use_cache {
+            return self.entity().get_first_component_including_disabled::<C>(
+                if matches!(tag, ComponentTag::None) {
+                    None
+                } else {
+                    Some(tag.to_str().into())
+                },
+            );
+        }
         if let Some(coms) = self.current_data.components
             [const { CachedComponent::from_component::<C>() as usize }]
         .iter()
@@ -1463,6 +1521,15 @@ impl EntityManager {
         &mut self,
         tags: ComponentTag,
     ) -> eyre::Result<bool> {
+        if self.use_cache {
+            return self.entity().remove_all_components_of_type::<C>(
+                if matches!(tags, ComponentTag::None) {
+                    None
+                } else {
+                    Some(tags.to_str().into())
+                },
+            );
+        }
         let mut is_some = false;
         let vec = std::mem::take(
             &mut self.current_data.components[const { CachedComponent::from_component::<C>() as usize }],
@@ -1482,6 +1549,15 @@ impl EntityManager {
         &self,
         tag: ComponentTag,
     ) -> impl Iterator<Item = C> {
+        if self.use_cache {
+            return self.entity().iter_all_components_of_type::<C>(
+                if matches!(tag, ComponentTag::None) {
+                    None
+                } else {
+                    Some(tag.to_str().into())
+                },
+            );
+        }
         self.current_data.components[const { CachedComponent::from_component::<C>() as usize }]
             .iter()
             .filter(move |c| c.enabled && (tag == ComponentTag::None || c.tags.get(tag as u16)))
@@ -1498,6 +1574,17 @@ impl EntityManager {
         &self,
         tag: ComponentTag,
     ) -> impl Iterator<Item = C> {
+        if self.use_cache {
+            return self
+                .entity()
+                .iter_all_components_of_type_including_disabled::<C>(
+                    if matches!(tag, ComponentTag::None) {
+                        None
+                    } else {
+                        Some(tag.to_str().into())
+                    },
+                );
+        }
         self.current_data.components[const { CachedComponent::from_component::<C>() as usize }]
             .iter()
             .filter(move |c| tag == ComponentTag::None || c.tags.get(tag as u16))
@@ -1510,6 +1597,9 @@ impl EntityManager {
             .iter()
     }
     pub fn add_component<C: Component>(&mut self) -> eyre::Result<C> {
+        if self.use_cache {
+            return self.entity().add_component();
+        }
         let c = self.current_entity.add_component::<C>()?;
         self.current_data.components[const { CachedComponent::from_component::<C>() as usize }]
             .push(ComponentData::new(
@@ -1525,6 +1615,9 @@ impl EntityManager {
         Ok(c)
     }
     pub fn get_var(&self, name: VarName) -> Option<VariableStorageComponent> {
+        if self.use_cache {
+            return self.entity().get_var(name.to_str());
+        }
         let mut i =
             self.iter_all_components_of_type_including_disabled_raw::<VariableStorageComponent>();
         i.find_map(|var| {
@@ -1536,6 +1629,9 @@ impl EntityManager {
         })
     }
     pub fn get_var_unknown(&self, name: &str) -> Option<VariableStorageComponent> {
+        if self.use_cache {
+            return self.entity().get_var(name);
+        }
         let mut i =
             self.iter_all_components_of_type_including_disabled_raw::<VariableStorageComponent>();
         i.find_map(|var| {
@@ -1552,6 +1648,9 @@ impl EntityManager {
         })
     }
     pub fn get_var_or_default(&mut self, name: VarName) -> eyre::Result<VariableStorageComponent> {
+        if self.use_cache {
+            return self.entity().get_var_or_default(name.to_str());
+        }
         if let Some(var) = self.get_var(name) {
             Ok(var)
         } else {
@@ -1564,6 +1663,9 @@ impl EntityManager {
         &mut self,
         name: &str,
     ) -> eyre::Result<VariableStorageComponent> {
+        if self.use_cache {
+            return self.entity().get_var_or_default(name);
+        }
         if let Some(var) = self.get_var_unknown(name) {
             Ok(var)
         } else {
@@ -1573,6 +1675,9 @@ impl EntityManager {
         }
     }
     pub fn add_lua_init_component<C: Component>(&mut self, file: &str) -> eyre::Result<C> {
+        if self.use_cache {
+            return self.entity().add_lua_init_component(file);
+        }
         let c = self.current_entity.add_lua_init_component::<C>(file)?;
         self.current_data.components[const { CachedComponent::from_component::<C>() as usize }]
             .push(ComponentData::new(*c, false));
@@ -1583,6 +1688,11 @@ impl EntityManager {
         tag: ComponentTag,
         enabled: bool,
     ) -> eyre::Result<()> {
+        if self.use_cache {
+            return self
+                .entity()
+                .set_components_with_tag_enabled(tag.to_str().into(), enabled);
+        }
         let mut some = false;
         for c in self.current_data.components.iter_mut().flatten() {
             if c.tags.get(tag as u16) {
@@ -1601,6 +1711,9 @@ impl EntityManager {
         com: C,
         enabled: bool,
     ) -> eyre::Result<()> {
+        if self.use_cache {
+            return self.entity().set_component_enabled(*com, enabled);
+        }
         let id = *com;
         if let Some(n) = self.current_data.components
             [const { CachedComponent::from_component::<C>() as usize }]
@@ -1614,6 +1727,9 @@ impl EntityManager {
         Ok(())
     }
     pub fn remove_component<C: Component>(&mut self, component: C) -> eyre::Result<()> {
+        if self.use_cache {
+            return self.entity().remove_component(*component);
+        }
         let id = *component;
         if let Some(n) = self.current_data.components
             [const { CachedComponent::from_component::<C>() as usize }]
@@ -1626,6 +1742,9 @@ impl EntityManager {
         self.current_entity.remove_component(id)
     }
     pub fn get_current_stains(&self) -> eyre::Result<u64> {
+        if self.use_cache {
+            return self.entity().get_current_stains();
+        }
         let mut current = 0;
         if let Some(status) =
             self.try_get_first_component::<StatusEffectDataComponent>(ComponentTag::None)
@@ -1639,6 +1758,9 @@ impl EntityManager {
         Ok(current)
     }
     pub fn set_current_stains(&self, current_stains: u64) -> eyre::Result<()> {
+        if self.use_cache {
+            return self.entity().set_current_stains(current_stains);
+        }
         if let Some(status) =
             self.try_get_first_component::<StatusEffectDataComponent>(ComponentTag::None)
         {

quant.ew/files/system/ewext_init/ewext_init.lua

@@ -7,6 +7,10 @@ local initial_world_state_entity
 
 local module = {}
 
+local log = false
+
+local cache = false
+
 -- Used in ewext
 EwextSerialize = util.serialize_entity
 EwextDeserialize = util.deserialize_entity
@@ -29,7 +33,10 @@ function module.on_world_initialized()
     local material_list = tonumber(ffi.cast("intptr_t", world_ffi.get_material_ptr(0)))
     ewext.init_particle_world_state(grid_world, chunk_map, material_list)
     ewext.module_on_world_init()
-    ewext.set_log(ctx.proxy_opt.log_performance)
+    log = ModSettingGet("quant.ew.log_performance") or false
+    ewext.set_log(log)
+    cache = ModSettingGet("quant.ew.cache") or false
+    ewext.set_cache(cache)
 end
 
 local function oh_another_world_state(entity)
@@ -81,6 +88,16 @@ function module.on_draw_debug_window(imgui)
 end
 
 function module.on_world_update()
+    local temp = ModSettingGet("quant.ew.log_performance") or false
+    if temp ~= log then
+        log = temp
+        ewext.set_log(log)
+    end
+    local temp = ModSettingGet("quant.ew.cache") or false
+    if temp ~= cache then
+        cache = temp
+        ewext.set_cache(cache)
+    end
     if GameGetWorldStateEntity() ~= initial_world_state_entity then
         oh_another_world_state(GameGetWorldStateEntity())
         initial_world_state_entity = GameGetWorldStateEntity()

quant.ew/files/system/wang_hooks/wang_hooks.lua

@@ -201,7 +201,7 @@ function module.on_late_init()
         end
         local ok, biome_file = pcall(nxml.parse_file, biome_filename)
         if not ok then
-            print("Failed to parse file: "..biome_filename)
+            print("Failed to parse file: " .. biome_filename)
             goto continue
         end
         for topology in biome_file:each_of("Topology") do

quant.ew/init.lua

@@ -35,8 +35,11 @@ dofile_once("data/scripts/lib/coroutines.lua")
 ModLuaFileAppend("data/scripts/gun/gun.lua", "mods/quant.ew/files/resource/append/gun.lua")
 ModLuaFileAppend("data/scripts/gun/gun_actions.lua", "mods/quant.ew/files/resource/append/action_fix.lua")
 
---ModMagicNumbersFileAdd("mods/quant.ew/files/magic.xml")
-ModMagicNumbersFileAdd("mods/quant.ew/files/magic_numbers.xml")
+if ModSettingGet("quant.ew.enable_log") or true then
+    ModMagicNumbersFileAdd("mods/quant.ew/files/magic_numbers.xml")
+else
+    ModMagicNumbersFileAdd("mods/quant.ew/files/magic.xml")
+end
 
 util.add_cross_call("ew_per_peer_seed", function()
     return tonumber(string.sub(ctx.my_id, 8, 12), 16), tonumber(string.sub(ctx.my_id, 12), 16)
@@ -706,4 +709,4 @@ end
 function OnPlayerDied(player_entity)
     ctx.hook.on_player_died(player_entity)
     print("player died")
-end
+end

quant.ew/settings.lua

@@ -277,6 +277,27 @@ local function build_settings()
                     value_default = false,
                     scope = MOD_SETTING_SCOPE_RUNTIME,
                 },
+                {
+                    id = "log_performance",
+                    ui_name = "log performance data",
+                    ui_description = "logs performance data to your log",
+                    value_default = false,
+                    scope = MOD_SETTING_SCOPE_RUNTIME,
+                },
+                {
+                    id = "cache",
+                    ui_name = "cache entities",
+                    ui_description = "cache entity data to improve performance",
+                    value_default = false,
+                    scope = MOD_SETTING_SCOPE_RUNTIME,
+                },
+                {
+                    id = "enable_log",
+                    ui_name = "enable log",
+                    ui_description = "enabled noita log costing some performance",
+                    value_default = true,
+                    scope = MOD_SETTING_SCOPE_NEW_GAME,
+                },
                 {
                     id = "text_range",
                     ui_name = "text chat range",