Safe mode version

CMakeLists.txt

@@ -143,4 +143,6 @@ install(
     COMPONENT ComponentExplorer
 )
 
+install(DIRECTORY unsafe-explorer DESTINATION "." COMPONENT ComponentExplorer-Unsafe)
+
 include(packaging/CMakeLists.txt)

component-explorer/component_fields.lua

@@ -1,12 +1,15 @@
 local stringify = dofile_once("mods/component-explorer/deps/datadumper.lua")
 dofile_once("mods/component-explorer/field_enums.lua")
 dofile_once("mods/component-explorer/entity.lua")
-dofile_once("mods/component-explorer/utils/settings_util.lua")
 local file_viewer = dofile_once("mods/component-explorer/file_viewer.lua")
 local matutil = dofile_once("mods/component-explorer/utils/matutil.lua")
+
 ---@module 'component-explorer.help'
 local help = dofile_once("mods/component-explorer/help.lua")
 
+---@module 'component-explorer.utils.ce_settings'
+local ce_settings = dofile_once("mods/component-explorer/utils/ce_settings.lua")
+
 ---@module 'component-explorer.utils.math_util'
 local math_util = dofile_once("mods/component-explorer/utils/math_util.lua")
 
@@ -67,7 +70,7 @@ end
 
 -- float format
 local function ff(type)
-    local configured = setting_get("preferred_decimal_format")
+    local configured = ce_settings.get("preferred_decimal_format")
 
     if
         type == "double" and configured == "double_scientific" or

component-explorer/entity_list.lua

@@ -1,9 +1,12 @@
 local string_util = dofile_once("mods/component-explorer/utils/strings.lua")
 dofile_once("mods/component-explorer/entity.lua")
 
+---@module 'component-explorer.utils.ce_settings'
+local ce_settings = dofile_once("mods/component-explorer/utils/ce_settings.lua")
+
 local entity_list = {}
 
-entity_list.open = setting_get("window_open_entity_list")
+entity_list.open = ce_settings.get("window_open_entity_list")
 
 local entity_search = ""
 local include_child_entities = false

component-explorer/globals.lua

@@ -239,7 +239,7 @@ end
 function globals.show()
     imgui.SetNextWindowSize(600, 200, imgui.Cond.FirstUseEver)
     local should_show
-    should_show, globals.open = imgui.Begin("Globals / flags", globals.open)
+    should_show, globals.open = imgui.Begin("Globals", globals.open)
 
     if not should_show then return end
 

component-explorer/init.lua

@@ -3,338 +3,10 @@ if not load_imgui then
         EntityLoad("mods/component-explorer/entities/imgui_warning.xml")
     end
     error("Missing ImGui.")
-end
-
--- Loading imgui early so it's available when other files are loaded
-imgui = load_imgui({version="1.7.0", mod="Component Explorer"})
-
-dofile_once("mods/component-explorer/utils/settings_util.lua") -- Should be loaded early
-dofile_once("mods/component-explorer/lua_console.lua")
----@module 'component-explorer.globals'
-local globals = dofile_once("mods/component-explorer/globals.lua")
-dofile_once("mods/component-explorer/components.lua")
----@module 'component-explorer.entity_list'
-local entity_list = dofile_once("mods/component-explorer/entity_list.lua")
-dofile_once("mods/component-explorer/entity.lua")
-local version = dofile_once("mods/component-explorer/version.lua")
----@module 'component-explorer.entity_picker'
-local entity_picker = dofile_once("mods/component-explorer/entity_picker.lua")
----@module 'component-explorer.wiki_wands'
-local wiki_wands = dofile_once("mods/component-explorer/wiki_wands.lua")
----@module 'component-explorer.link_ui'
-local link_ui = dofile_once("mods/component-explorer/link_ui.lua")
----@module 'component-explorer.user_scripts'
-local us = dofile_once("mods/component-explorer/user_scripts.lua")
----@module 'component-explorer.file_viewer'
-local file_viewer = dofile_once("mods/component-explorer/file_viewer.lua")
----@module 'component-explorer.mod_settings'
-local mod_settings = dofile_once("mods/component-explorer/mod_settings.lua")
----@module 'component-explorer.help'
-local help = dofile_once("mods/component-explorer/help.lua")
-
----@module 'component-explorer.logger'
-dofile_once("mods/component-explorer/logger.lua")
----@module 'component-explorer.utils.noita_version'
-dofile_once("mods/component-explorer/utils/noita_version.lua")
-if is_steam_version() then
-    dofile_once("mods/component-explorer/magic_numbers.lua")
-    dofile_once("mods/component-explorer/debug.lua")
-end
-
-local console = new_console()
-
-console.open = setting_get("window_open_lua_console")
-console.user_scripts_open = setting_get("window_open_user_scripts")
-window_open_logs = setting_get("window_open_logs")
-local window_open_about = false
-local overlay_open_logs = setting_get("overlay_open_logs")
-local windows_hidden_component = false
-local windows_hidden_entity = false
-
-function OnMagicNumbersAndWorldSeedInitialized()
-    local function run_us_ifexists(script)
-        if us.exists(script) then
-            console_run_command(console, us.user_script_call_string(script))
-        end
-    end
-
-    run_us_ifexists("init.lua")
-    run_us_ifexists("_init.lua")
-end
-
-is_escape_paused = false
-is_inventory_paused = false
-
-function OnPausedChanged(paused, inventory_pause)
-    load_settings()  -- Settings might've changed, reload
-
-    is_escape_paused = paused and not inventory_pause
-    is_inventory_paused = inventory_pause
-
-    if not paused then update_ui(true, GameGetFrameNum()) end
-end
-
-function OnWorldPreUpdate()
-    update_ui(false, GameGetFrameNum())
-end
-
-function OnPausePreUpdate()
-    update_ui(true, GameGetFrameNum())
-end
-
-function show_view_menu_items()
-    local function sct(shortcut_text)
-        return setting_get("keyboard_shortcuts") and shortcut_text or ""
-    end
-
-    local _
-    _, console.open      = imgui.MenuItem("Lua Console", sct("CTRL+SHIFT+L"), console.open)
-    _, entity_list.open  = imgui.MenuItem("Entity List", sct("CTRL+SHIFT+K"), entity_list.open)
-    _, window_open_logs  = imgui.MenuItem("Logs Window", "", window_open_logs)
-    _, overlay_open_logs = imgui.MenuItem("Logs Overlay", sct("CTRL+SHIFT+O"), overlay_open_logs)
-    _, wiki_wands.open   = imgui.MenuItem("Wiki Wands", "", wiki_wands.open)
-    _, file_viewer.open  = imgui.MenuItem("File Viewer", sct("CTRL+SHIFT+F"), file_viewer.open)
-
-    local clicked
-    clicked, entity_picker.open = imgui.MenuItem("Entity Picker...", sct("CTRL+SHIFT+E"), entity_picker.open)
-    if clicked then
-        imgui.SetWindowFocus(nil)
-    end
-
-    if imgui.IsItemHovered() then
-        help.tooltip(table.concat({
-            "Allows you to move your mouse over an entity to open a window for it. ",
-            "Press the entry number to select the entity. ESC to cancel the action.\n\n",
-            "When keyboard shortcuts are enabled, you can hit CTRL+SHIFT+E to open or close the picker.",
-        }))
-    end
-
-    _, globals.open  = imgui.MenuItem("Globals", "", globals.open)
-    _, mod_settings.open  = imgui.MenuItem("Mod Settings", "", mod_settings.open)
-
-    if is_steam_version() then
-        imgui.Separator()
-        _, window_open_magic_numbers = imgui.MenuItem("Magic Numbers", sct("CTRL+SHIFT+M"), window_open_magic_numbers)
-        _, window_open_debug = imgui.MenuItem("Debug", sct("CTRL+SHIFT+D"), window_open_debug)
-    end
-
-    imgui.Separator()
-    _, windows_hidden_entity     = imgui.MenuItem("Hide entity windows", "", windows_hidden_entity)
-    _, windows_hidden_component  = imgui.MenuItem("Hide component windows", "", windows_hidden_component)
-end
-
--- Can't know the width before creating the window.. Just an initial value, it's updated
--- to the real value once we can call imgui.GetWindowWidth()
-local main_window_width = 100
-
-function main_window_position()
-    local menubar_height = imgui.GetFontSize() + 2 * imgui.GetStyle().FramePadding_y
-
-    -- Available space
-    local aw, ah = imgui.GetMainViewportSize()
-    aw = aw - main_window_width
-    ah = ah - menubar_height + 3  -- Bit extra to get rid of the bottom deadzone of the window
-
-    local rx, ry
-
-    local side = setting_get("main_window_side")
-
-    if     side == "top"    then ry = 0
-    elseif side == "bottom" then ry = 1
-    elseif side == "left"   then rx = 0
-    elseif side == "right"  then rx = 1 end
-
-    local roffset = setting_get("main_window_side_offset") / 100
-
-    if     rx == nil then rx = roffset
-    elseif ry == nil then ry = roffset end
-
-    local vx, vy = imgui.GetMainViewportWorkPos()
-    return vx + aw * rx, vy + ah * ry
-end
-
-function main_window()
-    local window_flags = bit.bor(
-        imgui.WindowFlags.MenuBar,
-        imgui.WindowFlags.NoDocking,
-        imgui.WindowFlags.NoSavedSettings,
-        imgui.WindowFlags.NoFocusOnAppearing,
-        imgui.WindowFlags.NoMove,
-        imgui.WindowFlags.NoDecoration,
-        imgui.WindowFlags.NoBackground
-    )
-
-    imgui.SetNextWindowViewport(imgui.GetMainViewportID())
-    imgui.SetNextWindowPos(main_window_position())
-    imgui.SetNextWindowSize(0, 0)
-
-    if imgui.Begin("Main Menu", nil, window_flags) then
-        -- Save actual window width for next positioning
-        main_window_width = imgui.GetWindowWidth()
-
-        if imgui.BeginMenuBar() then
-            if imgui.BeginMenu("CE") then
-                local _
-                _, window_open_about = imgui.MenuItem("About", "", window_open_about)
-                link_ui.menu_item("Docs", "Opens noita.wiki.gg", version.wiki)
-                imgui.EndMenu()
-            end
-
-            if imgui.BeginMenu("View") then
-                show_view_menu_items()
-                imgui.EndMenu()
-            end
-
-            imgui.EndMenuBar()
-        end
-
-        imgui.End()
-    end
-end
-
-function show_about_window()
-    local should_show
-    should_show, window_open_about = imgui.Begin("About", window_open_about)
-    if should_show then
-        imgui.Text("Component explorer version " .. version.version)
-        imgui.Text("Made by dextercd")
-        link_ui.button("Homepage", version.homepage)
-
-        imgui.End()
-    end
-end
-
-local last_frame_run = -1
-
-function update_ui(paused, current_frame_run)
-    if paused then
-        if is_escape_paused and not setting_get("pause_escape") or
-           is_inventory_paused and not setting_get("pause_wands")
-        then
-            return
-        end
-    else
-        if last_frame_run >= current_frame_run then
-            return
-        end
-    end
-    last_frame_run = current_frame_run
-
-    if setting_get("keyboard_shortcuts") then
-        keyboard_shortcuts()
-    end
-
-    main_window()
-
-    if window_open_about then
-        show_about_window()
-    end
-
-    if globals.open then
-        globals.show()
-    end
-
-    if not windows_hidden_entity then
-        show_entity_windows()
-    end
-
-    if not windows_hidden_component then
-        show_component_windows()
-    end
-
-    if entity_list.open then
-        entity_list.show()
-    end
-
-    if console.open then
-        console_draw(console)
-        -- So that current setting is preserved
-        setting_set("window_open_user_scripts", console.user_scripts_open)
-    end
-
-    if window_open_logs then
-        draw_log_window()
-    end
-
-    if overlay_open_logs then
-        draw_log_overlay()
-    end
-
-    if entity_picker.open then
-        entity_picker.show()
-    end
-
-    if wiki_wands.open then
-        wiki_wands.show()
-    end
-
-    if file_viewer.open then
-        file_viewer.show()
-    end
-
-    if mod_settings.open then
-        mod_settings.show()
-    end
-
-    if is_steam_version() then
-        if window_open_magic_numbers then
-            show_magic_numbers()
-        end
-
-        if window_open_debug then
-            show_debug()
-        end
-    end
-end
-
-function keyboard_shortcuts()
-    if not imgui.IsKeyDown(imgui.Key.LeftCtrl) then return end
-    if not imgui.IsKeyDown(imgui.Key.LeftShift) then return end
-
-    if imgui.IsKeyPressed(imgui.Key.E) then
-        entity_picker.open = not entity_picker.open
-    end
-
-    if imgui.IsKeyPressed(imgui.Key.F) then
-        file_viewer.open = not file_viewer.open
-    end
-
-    if imgui.IsKeyPressed(imgui.Key.W) then
-        local world_entity = GameGetWorldStateEntity()
-        local world_component = EntityGetFirstComponent(world_entity, "WorldStateComponent")
-        toggle_watch_component(world_entity, world_component)
-    end
-
-    if imgui.IsKeyPressed(imgui.Key.P) then
-        local players = EntityGetWithTag("player_unit")
-        for _, player in ipairs(players) do
-            toggle_watch_entity(player)
-        end
-    end
-
-    if imgui.IsKeyPressed(imgui.Key.K) then
-        entity_list.open = not entity_list.open
-    end
-
-    if imgui.IsKeyPressed(imgui.Key.L) then
-        console.open = not console.open
-    end
-
-    if imgui.IsKeyPressed(imgui.Key.U) then
-        console.user_scripts_open = not console.user_scripts_open
-    end
-
-    if imgui.IsKeyPressed(imgui.Key.O) then
-        overlay_open_logs = not overlay_open_logs
-    end
-
-    if is_steam_version() then
-        if imgui.IsKeyPressed(imgui.Key.M) then
-            window_open_magic_numbers = not window_open_magic_numbers
-        end
-
-        if imgui.IsKeyPressed(imgui.Key.D) then
-            window_open_debug = not window_open_debug
-        end
+else
+    function OnModPostInit()
+        -- Delay dofile calls until latter end of mod initialisation, so that other
+        -- mods can do ModLuaFileAppend to the component-explorer files.
+        dofile("mods/component-explorer/main.lua")
     end
 end