Skip to content

⚡ Bolt: Replace expensive FindObjectsOfType with game-managed singletons #216

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: Replace expensive FindObjectsOfType with game-managed singletons #216

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
12 changes: 11 additions & 1 deletion src/API/GregAPI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,11 @@ public static uint GetServerCount()
try
{
var nm = Il2Cpp.NetworkMap.instance;
if (nm != null)
{
var arr = nm.GetNumberOfDevices();
if (arr != null && arr.Length > 0) return (uint)arr[0];
}
return nm != null && nm.servers != null ? (uint)nm.servers.Count : 0u;
}
catch { return 0u; }
Expand All @@ -208,7 +213,7 @@ public static uint GetRackCount()
if (arr != null && arr.Length > 2) return (uint)arr[2];
}
var racks = UnityEngine.Object.FindObjectsOfType<Il2Cpp.Rack>();
return racks != null ? (uint)racks.Count : 0u;
return racks != null ? (uint)racks.Length : 0u;
}
catch { return 0u; }
}
Expand All @@ -218,6 +223,11 @@ public static uint GetSwitchCount()
try
{
var nm = Il2Cpp.NetworkMap.instance;
if (nm != null)
{
var arr = nm.GetNumberOfDevices();
if (arr != null && arr.Length > 1) return (uint)arr[1];
}
return nm != null && nm.switches != null ? (uint)nm.switches.Count : 0u;
}
catch { return 0u; }
Expand Down
46 changes: 42 additions & 4 deletions src/Compatibility/DataCenterModLoader/GameHooks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,8 @@ public static int EnsureAllRackPositionUIDs()

try
{
var servers = UnityEngine.Object.FindObjectsOfType<Il2Cpp.Server>();
int updated = 0;
foreach (var srv in servers)
Action<Il2Cpp.Server> processServer = (srv) =>
{
try
{
Expand All @@ -87,6 +86,26 @@ public static int EnsureAllRackPositionUIDs()
}
}
catch { }
};

var nm = Il2Cpp.NetworkMap.instance;
if (nm != null && nm.servers != null)
{
foreach (var kvp in nm.servers)
{
processServer(kvp.Value);
}
}
else
{
var servers = UnityEngine.Object.FindObjectsOfType<Il2Cpp.Server>();
if (servers != null)
{
foreach (var srv in servers)
{
processServer(srv);
}
}
}
if (updated > 0)
CrashLog.Log($"[WorldSync] EnsureAllRackPositionUIDs: updated {updated} server rackPositionUID references");
Expand All @@ -98,9 +117,8 @@ public static int EnsureAllRackPositionUIDs()

try
{
var switches = UnityEngine.Object.FindObjectsOfType<Il2Cpp.NetworkSwitch>();
int swUpdated = 0;
foreach (var sw in switches)
Action<Il2Cpp.NetworkSwitch> processSwitch = (sw) =>
{
try
{
Expand All @@ -116,6 +134,26 @@ public static int EnsureAllRackPositionUIDs()
}
}
catch { }
};

var nm = Il2Cpp.NetworkMap.instance;
if (nm != null && nm.switches != null)
{
foreach (var kvp in nm.switches)
{
processSwitch(kvp.Value);
}
}
else
{
var switches = UnityEngine.Object.FindObjectsOfType<Il2Cpp.NetworkSwitch>();
if (switches != null)
{
foreach (var sw in switches)
{
processSwitch(sw);
}
}
}
if (swUpdated > 0)
CrashLog.Log($"[WorldSync] EnsureAllRackPositionUIDs: updated {swUpdated} switch rackPositionUID references");
Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure/Scripting/Lua/Modules/LuaRackModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public static void Register(Table greg, Script script, string modId)
if (arr != null && arr.Length > 2) return arr[2];
}
var racks = UnityEngine.Object.FindObjectsOfType<Il2Cpp.Rack>();
return racks?.Count ?? 0;
return racks?.Length ?? 0;
}
catch { return 0; }
});
Expand Down
88 changes: 77 additions & 11 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,10 +21,10 @@ public static void Register(Table greg, Script script, string modId)
{
try
{
var servers = UnityEngine.Object.FindObjectsOfType<Il2Cpp.Server>();
var result = new Table(script);
int i = 1;
foreach (var s in servers)

Action<Il2Cpp.Server> processServer = (s) =>
{
try
{
Expand All @@ -42,6 +42,26 @@ public static void Register(Table greg, Script script, string modId)
result[i++] = info;
}
catch { }
};

var nm = Il2Cpp.NetworkMap.instance;
if (nm != null && nm.servers != null)
{
foreach (var kvp in nm.servers)
{
processServer(kvp.Value);
}
}
else
{
var servers = UnityEngine.Object.FindObjectsOfType<Il2Cpp.Server>();
if (servers != null)
{
foreach (var s in servers)
{
processServer(s);
}
}
}
return result;
}
Expand All @@ -58,12 +78,16 @@ public static void Register(Table greg, Script script, string modId)
try
{
var nm = Il2Cpp.NetworkMap.instance;
if (nm != null && nm.servers != null)
if (nm != null)
{
return nm.servers.Count;
var counts = nm.GetNumberOfDevices();
if (counts != null && counts.Length > 0)
{
return counts[0];
}
}
var servers = UnityEngine.Object.FindObjectsOfType<Il2Cpp.Server>();
return servers?.Count ?? 0;
return servers?.Length ?? 0;
}
catch { return 0; }
});
Expand All @@ -80,20 +104,43 @@ public static void Register(Table greg, Script script, string modId)
{
try
{
var servers = UnityEngine.Object.FindObjectsOfType<Il2Cpp.Server>();
foreach (var s in servers)
bool repaired = false;
Action<Il2Cpp.Server> processServer = (s) =>
{
if (repaired) return;
try
{
if (s.GetHashCode() == hash && s.isBroken)
{
s.RepairDevice();
return true;
repaired = true;
}
}
catch { }
};

var nm = Il2Cpp.NetworkMap.instance;
if (nm != null && nm.servers != null)
{
foreach (var kvp in nm.servers)
{
processServer(kvp.Value);
if (repaired) return true;
}
}
return false;
else
{
var servers = UnityEngine.Object.FindObjectsOfType<Il2Cpp.Server>();
if (servers != null)
{
foreach (var s in servers)
{
processServer(s);
if (repaired) return true;
}
}
}
return repaired;
}
catch { return false; }
});
Expand All @@ -104,8 +151,7 @@ public static void Register(Table greg, Script script, string modId)
try
{
int repaired = 0;
var servers = UnityEngine.Object.FindObjectsOfType<Il2Cpp.Server>();
foreach (var s in servers)
Action<Il2Cpp.Server> processServer = (s) =>
{
try
{
Expand All @@ -116,6 +162,26 @@ public static void Register(Table greg, Script script, string modId)
}
}
catch { }
};

var nm = Il2Cpp.NetworkMap.instance;
if (nm != null && nm.servers != null)
{
foreach (var kvp in nm.servers)
{
processServer(kvp.Value);
}
}
else
{
var servers = UnityEngine.Object.FindObjectsOfType<Il2Cpp.Server>();
if (servers != null)
{
foreach (var s in servers)
{
processServer(s);
}
}
}
return repaired;
}
Expand Down
Loading