#67 ImGui is awesome!

Ismoh · May 20, 2023 · d5b3de4 · d5b3de4
1 parent 54c6d7d
commit d5b3de4
Show file tree

Hide file tree

Showing 9 changed files with 469 additions and 71 deletions.
diff --git a/mods/noita-mp/config.lua b/mods/noita-mp/config.lua
@@ -48,7 +48,7 @@ if not EntitySerialisationUtils then
     _G.EntitySerialisationUtils = {}
 end
 
-EntitySerialisationUtils.ignore      = {
+EntitySerialisationUtils.ignore                = {
     --- Components listed in byComponentsName will be ignored in serialisation
     byComponentsType = {
         "AdvancedFishAIComponent",
@@ -99,26 +99,29 @@ EntitySerialisationUtils.ignore      = {
 --- Furthermore it holds ModSettings, which shouldn't be set by Noita, because one computer shares ModSettings in
 ---  multiple Noita.exe instances.
 ------------------------------------------------------------------------------------------------------------------------
-local NoitaApiModSettingSet          = ModSettingSet
-local NoitaApiModSettingGet          = ModSettingGet
-local NoitaApiModSettingSetNextValue = ModSettingSetNextValue
-local NoitaApiModSettingGetNextValue = ModSettingGetNextValue
-
-if not Utils then
-    if require then
-        Utils = require("Utils")
-    else
-        -- when NoitaComponents with their own restricted LuaContext load this file,
-        -- util isn't available!
-        Utils = dofile_once("mods/noita-mp/files/scripts/util/Utils.lua")
-        if not MinaUtils and not require then
-            ----@type MinaUtils
-            --MinaUtils = dofile_once("mods/noita-mp/files/scripts/util/MinaUtils.lua")
-        end
-    end
-end
+local NoitaApiModSettingSet                    = ModSettingSet
+local NoitaApiModSettingGet                    = ModSettingGet
+local NoitaApiModSettingSetNextValue           = ModSettingSetNextValue
+local NoitaApiModSettingGetNextValue           = ModSettingGetNextValue
+
+-- if not Utils then
+--     if require then
+--         Utils = require("Utils")
+--     else
+--         -- when NoitaComponents with their own restricted LuaContext load this file,
+--         -- util isn't available!
+--         Utils = dofile_once("mods/noita-mp/files/scripts/util/Utils.lua")
+--         if not MinaUtils and not require then
+--             ----@type MinaUtils
+--             --MinaUtils = dofile_once("mods/noita-mp/files/scripts/util/MinaUtils.lua")
+--         end
+--     end
+-- end
 
 ModSettingSet                                  = function(id, value)
+    if id:contains("noita-mp") then
+        error("Get rid off ModSettings!", 2)
+    end
     if id == "noita-mp.name" then
         MinaUtils.setLocalMinaName(value)
     end
@@ -129,6 +132,9 @@ ModSettingSet                                  = function(id, value)
 end
 
 ModSettingGet                                  = function(id)
+    if id:contains("noita-mp") then
+        error("Get rid off ModSettings!", 2)
+    end
     if id == "noita-mp.name" then
         local name = MinaUtils.getLocalMinaName()
         if not Utils.IsEmpty(name) then
@@ -153,6 +159,9 @@ ModSettingGet                                  = function(id)
 end
 
 ModSettingSetNextValue                         = function(id, value, is_default)
+    if id:contains("noita-mp") then
+        error("Get rid off ModSettings!", 2)
+    end
     if id == "noita-mp.name" then
         name = value
     end
@@ -163,6 +172,9 @@ ModSettingSetNextValue                         = function(id, value, is_default)
 end
 
 ModSettingGetNextValue                         = function(id)
+    if id:contains("noita-mp") then
+        error("Get rid off ModSettings!", 2)
+    end
     if id == "noita-mp.name" and name then
         local name = MinaUtils.getLocalMinaName()
         if not Utils.IsEmpty(name) then

diff --git a/mods/noita-mp/files/data/entities/imgui_warning.xml b/mods/noita-mp/files/data/entities/imgui_warning.xml
@@ -0,0 +1,10 @@
+<!-- https://github.com/dextercd/Noita-Component-Explorer/blob/main/component-explorer/entities/imgui_warning.xml -->
+<Entity>
+    <!-- Script removes the entity after a couple runs -->
+    <LuaComponent
+        script_source_file="mods/noita-mp/files/scripts/noita-components/imgui_warning.lua"
+        execute_every_n_frame="60"
+        execute_on_added="1"
+        execute_times="-1"
+    />
+</Entity>