diff --git a/src/GameLayer/Patches/Networking/CablePositionsPatch.cs b/src/GameLayer/Patches/Networking/CablePositionsPatch.cs index 84c3f50c..574c55e8 100644 --- a/src/GameLayer/Patches/Networking/CablePositionsPatch.cs +++ b/src/GameLayer/Patches/Networking/CablePositionsPatch.cs @@ -67,8 +67,11 @@ public static void SetBaseId(int baseId) } while (Interlocked.CompareExchange(ref _nextCableId, baseId + 1, current) != current); - MelonLogger.Msg($"[CablePatch] Cable ID counter set to {baseId + 1}"); + try { LogMessage(baseId + 1); } catch { } } public static int PeekNextId() => _nextCableId; + + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] + private static void LogMessage(int id) { MelonLogger.Msg($"[CablePatch] Cable ID counter set to {id}"); } } diff --git a/src/Infrastructure/Scripting/Lua/Modules/LuaServerModule.cs b/src/Infrastructure/Scripting/Lua/Modules/LuaServerModule.cs index 17bd8abb..efb6e8b3 100644 --- a/src/Infrastructure/Scripting/Lua/Modules/LuaServerModule.cs +++ b/src/Infrastructure/Scripting/Lua/Modules/LuaServerModule.cs @@ -7,6 +7,7 @@ using System; using MoonSharp.Interpreter; using MelonLoader; +using System.Linq; namespace gregCore.Infrastructure.Scripting.Lua.Modules; @@ -21,9 +22,37 @@ public static void Register(Table greg, Script script, string modId) { try { - var servers = UnityEngine.Object.FindObjectsOfType(); var result = new Table(script); int i = 1; + + var nm = Il2Cpp.NetworkMap.instance; + if (nm != null && nm.servers != null) + { + foreach (var kvp in nm.servers) + { + try + { + var s = kvp.Value; + if (s == null) continue; + var info = new Table(script); + info["id"] = s.ServerID ?? s.GetHashCode().ToString(); + info["hash"] = s.GetHashCode(); + info["is_on"] = s.isOn; + info["is_broken"] = s.isBroken; + info["server_type"] = (int)s.serverType; + info["size_u"] = s.sizeInU; + var pos = s.transform?.position ?? UnityEngine.Vector3.zero; + info["x"] = (double)pos.x; + info["y"] = (double)pos.y; + info["z"] = (double)pos.z; + result[i++] = info; + } + catch { } + } + return result; + } + + var servers = UnityEngine.Object.FindObjectsOfType(); foreach (var s in servers) { try @@ -80,6 +109,25 @@ public static void Register(Table greg, Script script, string modId) { try { + var nm = Il2Cpp.NetworkMap.instance; + if (nm != null && nm.brokenServers != null) + { + foreach (var kvp in nm.brokenServers) + { + try + { + var s = kvp.Value; + if (s != null && s.GetHashCode() == hash && s.isBroken) + { + s.RepairDevice(); + return true; + } + } + catch { } + } + return false; + } + var servers = UnityEngine.Object.FindObjectsOfType(); foreach (var s in servers) { @@ -104,6 +152,29 @@ public static void Register(Table greg, Script script, string modId) try { int repaired = 0; + var nm = Il2Cpp.NetworkMap.instance; + if (nm != null && nm.brokenServers != null) + { + if (nm.brokenServers.Count == 0) return 0; + + var brokenList = new System.Collections.Generic.List(); + foreach (var kvp in nm.brokenServers) brokenList.Add(kvp.Value); + + foreach (var s in brokenList) + { + try + { + if (s != null && s.isBroken) + { + s.RepairDevice(); + repaired++; + } + } + catch { } + } + return repaired; + } + var servers = UnityEngine.Object.FindObjectsOfType(); foreach (var s in servers) {