Merge "113-improve-and-clean-codebase" into develop

.vscode/settings.json

@@ -44,7 +44,7 @@
   },
   "Lua.diagnostics.disable": [
     "lowercase-global",
-    "undefined-field"
+    "deprecated"
   ],
   "files.associations": {
     "stdbool.h": "c",

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [v4.1.0-alpha+1195](https://github.com/Ismoh/NoitaMP/tree/v4.1.0-alpha+1195) (05.03.2023)
+
+[Full Changelog](https://github.com/Ismoh/NoitaMP/compare/v4.1.0-alpha+1184...v4.1.0-alpha+1195)
+
+## [v4.1.0-alpha+1184](https://github.com/Ismoh/NoitaMP/tree/v4.1.0-alpha+1184) (05.03.2023)
+
+[Full Changelog](https://github.com/Ismoh/NoitaMP/compare/v4.0.1-alpha+792...v4.1.0-alpha+1184)
+
+**Implemented enhancements:**
+
+- Developer want to sync children and components [\#107](https://github.com/Ismoh/NoitaMP/issues/107) [[enhancement](https://github.com/Ismoh/NoitaMP/labels/enhancement)]
+
+**Closed issues:**
+
+- Update CHANGELOG.md [\#112](https://github.com/Ismoh/NoitaMP/issues/112) [[documentation](https://github.com/Ismoh/NoitaMP/labels/documentation)] [[github_actions](https://github.com/Ismoh/NoitaMP/labels/github_actions)]
+
 ## [v4.0.1-alpha+792](https://github.com/Ismoh/NoitaMP/tree/v4.0.1-alpha+792) (17.02.2023)
 
 [Full Changelog](https://github.com/Ismoh/NoitaMP/compare/v4.0.0-alpha+1302...v4.0.1-alpha+792)

mods/noita-mp/.version

@@ -1 +1 @@
-{"version":"v4.0.1-alpha+792"}
+{"version":"v4.0.1-alpha+1195"}

mods/noita-mp/config.lua

@@ -48,13 +48,13 @@ local NoitaApiModSettingGet          = ModSettingGet
 local NoitaApiModSettingSetNextValue = ModSettingSetNextValue
 local NoitaApiModSettingGetNextValue = ModSettingGetNextValue
 
-if not util then
+if not Utils then
     if require then
-        util = require("util")
+        Utils = require("Utils")
     else
         -- when NoitaComponents with their own restricted LuaContext load this file,
         -- util isn't available!
-        util = dofile_once("mods/noita-mp/files/scripts/util/util.lua")
+        Utils = dofile_once("mods/noita-mp/files/scripts/util/Utils.lua")
         if not MinaUtils and not require then
             MinaUtils = dofile_once("mods/noita-mp/files/scripts/util/MinaUtils.lua")
         end
@@ -74,7 +74,7 @@ end
 ModSettingGet          = function(id)
     if id == "noita-mp.name" then
         local name = MinaUtils.getLocalMinaName()
-        if not util.IsEmpty(name) then
+        if not Utils.IsEmpty(name) then
             return name
         else
             name = NoitaApiModSettingGet(id)
@@ -84,7 +84,7 @@ ModSettingGet          = function(id)
     end
     if id == "noita-mp.guid" then
         local guid = MinaUtils.getLocalMinaGuid()
-        if not util.IsEmpty(guid) then
+        if not Utils.IsEmpty(guid) then
             return guid
         else
             guid = NoitaApiModSettingGet(id)
@@ -108,13 +108,13 @@ end
 ModSettingGetNextValue = function(id)
     if id == "noita-mp.name" and name then
         local name = MinaUtils.getLocalMinaName()
-        if not util.IsEmpty(name) then
+        if not Utils.IsEmpty(name) then
             return name
         end
     end
     if id == "noita-mp.guid" and guid then
         local guid = MinaUtils.getLocalMinaGuid()
-        if not util.IsEmpty(guid) then
+        if not Utils.IsEmpty(guid) then
             return guid
         end
     end

mods/noita-mp/files/scripts/NoitaMpSettings.lua

@@ -10,11 +10,11 @@
 ------------------------------------------------------------------------------------------------------------------------
 --- 'Imports'
 ------------------------------------------------------------------------------------------------------------------------
-local fu        = require("file_util")
+local fu        = require("FileUtils")
 local lfs       = require("lfs")
 local winapi    = require("winapi")
 local json      = require("json")
-local util      = require("util")
+local Utils      = require("Utils")
 
 ------------------------------------------------------------------------------------------------------------------------
 --- NoitaMpSettings
@@ -23,9 +23,9 @@ NoitaMpSettings = {}
 
 function NoitaMpSettings.clearAndCreateSettings()
     local cpc         = CustomProfiler.start("NoitaMpSettings.clearAndCreateSettings")
-    local settingsDir = fu.getAbsolutePathOfNoitaMpSettingsDirectory()
-    if fu.exists(settingsDir) then
-        fu.removeContentOfDirectory(settingsDir)
+    local settingsDir = fu.GetAbsolutePathOfNoitaMpSettingsDirectory()
+    if fu.Exists(settingsDir) then
+        fu.RemoveContentOfDirectory(settingsDir)
         Logger.info(Logger.channels.initialize, ("Removed old settings in '%s'!"):format(settingsDir))
     else
         lfs.mkdir(settingsDir)
@@ -36,11 +36,11 @@ end
 
 function NoitaMpSettings.writeSettings(key, value)
     local cpc = CustomProfiler.start("NoitaMpSettings.writeSettings")
-    if util.IsEmpty(key) or type(key) ~= "string" then
+    if Utils.IsEmpty(key) or type(key) ~= "string" then
         error(("'key' must not be nil or is not type of string!"):format(key), 2)
     end
 
-    if util.IsEmpty(value) or type(value) ~= "string" then
+    if Utils.IsEmpty(value) or type(value) ~= "string" then
         error(("'value' must not be nil or is not type of string!"):format(value), 2)
     end
 
@@ -51,9 +51,9 @@ function NoitaMpSettings.writeSettings(key, value)
         who = whoAmI()
     end
     local settingsFile = ("%s%s%s%s.json")
-            :format(fu.getAbsolutePathOfNoitaMpSettingsDirectory(), pathSeparator, pid, who)
+            :format(fu.GetAbsolutePathOfNoitaMpSettingsDirectory(), pathSeparator, pid, who)
 
-    if not fu.exists(settingsFile) then
+    if not fu.Exists(settingsFile) then
         fu.WriteFile(settingsFile, "{}")
     end
 
@@ -75,16 +75,16 @@ function NoitaMpSettings.getSetting(key)
     local pid          = winapi.get_current_pid()
 
     local settingsFile = ("%s%s%s%s.json")
-            :format(fu.getAbsolutePathOfNoitaMpSettingsDirectory(), pathSeparator, pid, whoAmI())
+            :format(fu.GetAbsolutePathOfNoitaMpSettingsDirectory(), pathSeparator, pid, whoAmI())
 
-    if not fu.exists(settingsFile) then
+    if not fu.Exists(settingsFile) then
         fu.WriteFile(settingsFile, "{}")
     end
 
     local contentString = fu.ReadFile(settingsFile)
     local contentJson   = json.decode(contentString)
 
-    if util.IsEmpty(contentJson[key]) then
+    if Utils.IsEmpty(contentJson[key]) then
         error(("Unable to find '%s' in NoitaMpSettings: %s"):format(key, contentString), 2)
     end
     local value = contentJson[key]

mods/noita-mp/files/scripts/Ui.lua

@@ -6,15 +6,16 @@
 ----------------------------------------
 -- 'Imports'
 ----------------------------------------
-local renderEzgui                 = dofile_once("mods/noita-mp/lua_modules/share/lua/5.1/ezgui/EZGUI.lua").init("mods/noita-mp/lua_modules/share/lua/5.1/ezgui")
-local fu = require("file_util")
+local renderEzgui                 = dofile_once("mods/noita-mp/lua_modules/share/lua/5.1/ezgui/EZGUI.lua").init(
+    "mods/noita-mp/lua_modules/share/lua/5.1/ezgui")
+local fu                          = require("FileUtils")
 
 ----------------------------------------------------------------------------------------------------
 --- Ui
 --- @see PlayerList.xml
 --- @see FoldingMenu.xml
 ----------------------------------------------------------------------------------------------------
-Ui                                = {}
+Ui = {}
 
 ----------------------------------------
 -- Global private variables:
@@ -50,7 +51,7 @@ end
 --- Ui constructor
 ----------------------------------------------------------------------------------------------------
 function Ui.new()
-    local self            = {}
+    local self = {}
 
     ------------------------------------
     -- Private variables:
@@ -87,31 +88,31 @@ function Ui.new()
             cellWidth        = 50,
         },
         methods  = {
-            toggleAddress        = function()
+            toggleAddress = function()
                 showAddress = not showAddress
             end,
-            copyAddress          = function()
-                util.copyToClipboard(("%s:%s"):format(_G.Server:getAddress(), _G.Server:getPort()))
+            copyAddress = function()
+                Utils.copyToClipboard(("%s:%s"):format(_G.Server:getAddress(), _G.Server:getPort()))
             end,
-            kick                 = function(data, element, arg1)
+            kick = function(data, element, arg1)
                 _G.Server.kick(arg1)
             end,
-            ban                  = function(data, element, arg1)
+            ban = function(data, element, arg1)
                 _G.Server.ban(arg1)
             end,
-            start                = function()
+            start = function()
                 _G.Server.start(nil, nil)
             end,
-            stop                 = function()
+            stop = function()
                 _G.Server.stop()
             end,
-            connect              = function()
+            connect = function()
                 _G.Client.connect()
             end,
-            disconnect           = function()
+            disconnect = function()
                 _G.Client.disconnect()
             end,
-            toggleDebug          = function()
+            toggleDebug = function()
                 debug = not debug
             end,
             reportCustomProfiler = function()
@@ -150,12 +151,12 @@ function Ui.new()
         local text = ""
         if foldingOpen then
             self.ezguiFoldingData.data.text = ("[- NoitaMP] %s eCache:%s pCache:%s nCache:%s %s")
-                    :format(fu.getVersionByFile(), EntityCache.size(), CustomProfiler.getSize(),
-                            NetworkUtils.getClientOrServer().getAckCacheSize(), GameGetFrameNum())
+                :format(fu.GetVersionByFile(), EntityCache.size(), CustomProfiler.getSize(),
+                    NetworkUtils.getClientOrServer().getAckCacheSize(), GameGetFrameNum())
         else
             self.ezguiFoldingData.data.text = ("[+ NoitaMP] eCache:%s pCache:%s nCache:%s %s")
-                    :format(EntityCache.size(), CustomProfiler.getSize(),
-                            NetworkUtils.getClientOrServer().getAckCacheSize(), GameGetFrameNum())
+                :format(EntityCache.size(), CustomProfiler.getSize(),
+                    NetworkUtils.getClientOrServer().getAckCacheSize(), GameGetFrameNum())
         end
 
         renderEzgui(0, height - 10, "mods/noita-mp/files/data/ezgui/FoldingMenu.xml", self.ezguiFoldingData)
@@ -181,9 +182,6 @@ function Ui.new()
             })
             table.insertAllButNotDuplicates(player, _G.Server.clients)
             for i = 2, #player do
-                --player[i].name = string.ExtendOrCutStringToLength(player[i].name, 12, ".", true)
-                --player[i].health = { current = i, max = 2 }
-                --player[i].transform = { x = 123, y = 12334 }
                 player[i].rtt = player[i]:getRoundTripTime()
             end
         else
@@ -271,7 +269,7 @@ function Ui.new()
             if clicked then
                 missingModGuiDismissed = true
                 Client:send(NetworkUtils.events.needModContent.name,
-                            { NetworkUtils.getNextNetworkMessageId(), Client.missingMods })
+                    { NetworkUtils.getNextNetworkMessageId(), Client.missingMods })
             end
             if hovered then
                 missingModGuiButton1Hovered = true
@@ -318,7 +316,6 @@ function Ui.new()
             GuiZSetForNextWidget(gui, 110)
             GuiImageNinePiece(gui, npID, 73, 73, w + 3, y - 71)
         end
-
     end
 
     ------------------------------------
@@ -328,7 +325,6 @@ function Ui.new()
         drawFolding()
         drawMenu()
         drawModConflictWarning()
-
         if EntityCache.size() >= EntityUtils.maxPoolSize then
             gui = gui or GuiCreate()
             GuiStartFrame(gui)