From dd51bdae3f0ccb05c454209ffe6543a6bcc1a214 Mon Sep 17 00:00:00 2001 From: Evil Factory <36804725+evilfactory@users.noreply.github.com> Date: Sat, 14 Mar 2026 12:04:29 -0300 Subject: [PATCH] Revert "performance fixes for IDE/attached debugger stuttering." This reverts commit e5aa381e38b5a075b0bb588d0314d1bc9cc59852. --- .../_Services/LuaScriptManagementService.cs | 25 +----------- .../_Services/_Lua/DefaultLuaRegistrar.cs | 38 ++----------------- Libraries/moonsharp | 2 +- 3 files changed, 5 insertions(+), 60 deletions(-) diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/LuaScriptManagementService.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/LuaScriptManagementService.cs index 39e238e6e..b3770a90a 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/LuaScriptManagementService.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/LuaScriptManagementService.cs @@ -26,7 +26,7 @@ using System.Diagnostics; namespace Barotrauma.LuaCs; -internal sealed class LuaScriptManagementService : ILuaScriptManagementService, ILuaDataService +class LuaScriptManagementService : ILuaScriptManagementService, ILuaDataService { public Script? InternalScript => _script; @@ -335,29 +335,6 @@ internal sealed class LuaScriptManagementService : ILuaScriptManagementService, UserData.RegisterType(typeof(IResourceInfo)); UserData.RegisterType(typeof(IUserDataDescriptor)); UserData.RegisterType(typeof(INetworkingService)); - - // Config/Settings - UserData.RegisterType(typeof(IConfigService)); - UserData.RegisterType(typeof(ISettingBase)); - UserData.RegisterType(typeof(ISettingBase)); - UserData.RegisterType(typeof(ISettingBase)); - UserData.RegisterType(typeof(ISettingBase)); - UserData.RegisterType(typeof(ISettingBase)); - UserData.RegisterType(typeof(ISettingBase)); - UserData.RegisterType(typeof(ISettingBase)); - UserData.RegisterType(typeof(ISettingBase)); - UserData.RegisterType(typeof(ISettingBase)); - UserData.RegisterType(typeof(ISettingBase)); - UserData.RegisterType(typeof(ISettingBase)); - UserData.RegisterType(typeof(ISettingBase)); - UserData.RegisterType(typeof(ISettingBase)); - UserData.RegisterType(typeof(ISettingBase)); - UserData.RegisterType(typeof(ISettingRangeBase)); - UserData.RegisterType(typeof(ISettingRangeBase)); -#if CLIENT - UserData.RegisterType(typeof(ISettingControl)); -#endif - new LuaConverters(this).RegisterLuaConverters(); diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/_Lua/DefaultLuaRegistrar.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/_Lua/DefaultLuaRegistrar.cs index ed854722f..ff92e09ec 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/_Lua/DefaultLuaRegistrar.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/_Lua/DefaultLuaRegistrar.cs @@ -6,7 +6,6 @@ using System.Linq; using System.Numerics; using System.Reflection; using System.Runtime.CompilerServices; -using Barotrauma.LuaCs.Data; namespace Barotrauma.LuaCs; @@ -42,48 +41,17 @@ public class DefaultLuaRegistrar : IDefaultLuaRegistrar _userDataService.RegisterType("Barotrauma.Range`1"); _userDataService.RegisterType("Barotrauma.ItemPrefab"); - List assembliesToScan = [ - typeof(DefaultLuaRegistrar).Assembly, - typeof(Identifier).Assembly, - //causes tons of lag (high lookup time) - //typeof(Microsoft.Xna.Framework.Vector2).Assembly - ]; + List assembliesToScan = [typeof(DefaultLuaRegistrar).Assembly, typeof(Identifier).Assembly, typeof(Microsoft.Xna.Framework.Vector2).Assembly]; - foreach (var type in assembliesToScan.SelectMany(a => a.GetSafeTypes())) + foreach (var type in assembliesToScan.SelectMany(a => a.GetTypes())) { if (type.IsEnum || type.Name.StartsWith("<") || type.IsDefined(typeof(CompilerGeneratedAttribute)) || !_safeUserDataService.IsAllowed(type.FullName)) { continue; } - - if (type.FullName?.StartsWith("Barotrauma.LuaCs") ?? false) - { - continue; - } - + _userDataService.RegisterType(type.FullName); } - - _userDataService.RegisterType(typeof(IConfigService).FullName); - _userDataService.RegisterType(typeof(ISettingBase).FullName); - _userDataService.RegisterType(typeof(ISettingBase).FullName); - _userDataService.RegisterType(typeof(ISettingBase).FullName); - _userDataService.RegisterType(typeof(ISettingBase).FullName); - _userDataService.RegisterType(typeof(ISettingBase).FullName); - _userDataService.RegisterType(typeof(ISettingBase).FullName); - _userDataService.RegisterType(typeof(ISettingBase).FullName); - _userDataService.RegisterType(typeof(ISettingBase).FullName); - _userDataService.RegisterType(typeof(ISettingBase).FullName); - _userDataService.RegisterType(typeof(ISettingBase).FullName); - _userDataService.RegisterType(typeof(ISettingBase).FullName); - _userDataService.RegisterType(typeof(ISettingBase).FullName); - _userDataService.RegisterType(typeof(ISettingBase).FullName); - _userDataService.RegisterType(typeof(ISettingBase).FullName); - _userDataService.RegisterType(typeof(ISettingRangeBase).FullName); - _userDataService.RegisterType(typeof(ISettingRangeBase).FullName); -#if CLIENT - _userDataService.RegisterType(typeof(ISettingControl).FullName); -#endif _userDataService.RegisterType("Barotrauma.LuaSByte"); _userDataService.RegisterType("Barotrauma.LuaByte"); diff --git a/Libraries/moonsharp b/Libraries/moonsharp index 7b78e0883..e3c2270e8 160000 --- a/Libraries/moonsharp +++ b/Libraries/moonsharp @@ -1 +1 @@ -Subproject commit 7b78e0883c0be1771f7d1ec6d4a94b96c24dd735 +Subproject commit e3c2270e8277de98b0ec2b42b42909e6e6c8afd9