Skip to content

⚡ Bolt: Optimize LuaServerModule queries to use O(1) game singletons #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mleem97 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

⚡ Bolt: Optimize LuaServerModule queries to use O(1) game singletons #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/GameLayer/Patches/Networking/CablePositionsPatch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,13 @@
}
while (Interlocked.CompareExchange(ref _nextCableId, baseId + 1, current) != current);

MelonLogger.Msg($"[CablePatch] Cable ID counter set to {baseId + 1}");
try { LogBaseIdSet(baseId + 1); } catch { }

Check warning on line 70 in src/GameLayer/Patches/Networking/CablePositionsPatch.cs

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

src/GameLayer/Patches/Networking/CablePositionsPatch.cs#L70 

Handle the exception or explain in a comment why it can be ignored.
}

[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
private static void LogBaseIdSet(int newBaseId)
{
MelonLogger.Msg($"[CablePatch] Cable ID counter set to {newBaseId}");
}

public static int PeekNextId() => _nextCableId;
Expand Down
109 changes: 91 additions & 18 deletions src/Infrastructure/Scripting/Lua/Modules/LuaServerModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,27 +21,56 @@ public static void Register(Table greg, Script script, string modId)
{
try
{
var servers = UnityEngine.Object.FindObjectsOfType<Il2Cpp.Server>();
var nm = Il2Cpp.NetworkMap.instance;
var servers = nm != null && nm.servers != null ? nm.servers.Values : null;

var result = new Table(script);
int i = 1;
foreach (var s in servers)

if (servers != null)
{
try
foreach (var s in servers)
{
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;
try
{
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 { }
}
}
else
{
var fbServers = UnityEngine.Object.FindObjectsOfType<Il2Cpp.Server>();
foreach (var s in fbServers)
{
try
{
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 { }
}
catch { }
}
return result;
}
Expand Down Expand Up @@ -80,8 +109,27 @@ public static void Register(Table greg, Script script, string modId)
{
try
{
var servers = UnityEngine.Object.FindObjectsOfType<Il2Cpp.Server>();
foreach (var s in servers)
var nm = Il2Cpp.NetworkMap.instance;
var servers = nm != null && nm.brokenServers != null ? nm.brokenServers.Values : null;

if (servers != null)
{
foreach (var s in servers)
{
try
{
if (s.GetHashCode() == hash && s.isBroken)
{
s.RepairDevice();
return true;
}
}
catch { }
}
}

var fbServers = UnityEngine.Object.FindObjectsOfType<Il2Cpp.Server>();
foreach (var s in fbServers)
{
try
{
Expand All @@ -104,6 +152,31 @@ 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 && nm.brokenServers.Count > 0)
{
var brokenList = new System.Collections.Generic.List<Il2Cpp.Server>();
foreach (var kvp in nm.brokenServers)
{
brokenList.Add(kvp.Value);
}

foreach (var s in brokenList)
{
try
{
if (s.isBroken)
{
s.RepairDevice();
repaired++;
}
}
catch { }
}
return repaired;
}

var servers = UnityEngine.Object.FindObjectsOfType<Il2Cpp.Server>();
foreach (var s in servers)
{
Expand Down
Loading