Sync with upstream

* Update bug-reports.yml * Fix modifyChatMessage hook * Add LuaCsSetup.Lua back for compatibility * Fix Game.AssignOnExecute having command arguments be passed as varargs instead of a table * Actually use the PackageId const everywhere we need to refer to our content package * Load languages files even if the package is disabled * Fix Hook.Remove not being implemented properly * - Changed event aliases to be case insensitive. * - Fixed assembly logging style. - Fixed double logging during execution. * Fix garbage network data being read by the game when reading LuaCs network messages * PackageId -> PackageName * Added caching toggle to PluginManagementService * Fix LuaCs initializing too late for singleplayer campaigns and rework the C# prompt to only show when enabling mods/joining server * Oops, fix NRE crash * Fix hide username in logs config not doing anything * Fix Cs prompt showing up more than one between rounds * Fix server host being prompted twice with the C# popup * Ignore our workshop packages from the game's dependency thing since it doesn't really make sense * Load console commands after executing and possible fix for the not console command permitted * Added fallback friendly name resolution for ModConfig assembly contents. * Register Voronoi2 stuff * Added configinfo null check to SettingBase.cs * Add safety check so this stops crashing when we look at it the wrong way * Fixed "Folder" attribute files not being found. * Keep the LuaCsConfig class laying around for compatibility, not sure anywhere in our code base (and shouldn't be) * Added fallback compilation for UseInternalsAwareAssembly if the publicized script compilation fails. * Added legacy overload of AddCommand for mod compat. * Added LoggerService to Lua env. Made ILoggerService compliant with LuaCsLogger API. * Changed csharp script compilation algorithm to be best effort. * Added "RunUnrestricted" mode for lua scripts that need to run outside of sandbox. * - Fixed networking sync vars failing to sync initially. - Fixed lua failing to differentiate overloads ISettingBase. * Add alias for human.CPRSuccess and human.CPRFailed * - Fixed up the settings menu. - Made SettingEntry throw an error if "Value" attribute is not found in XML. - Fixed saved values for settings sometimes not reloading after disabling and re-enabling a package. * Fix LuaCs net messages received during connection initialization to be read incorrectly, happened because we would reset the BitPosition in our harmony patch which would cause the message to be read incorrectly later * Allow reloadlua to force the state to running * New icon for settings and make the top left text more user friendly * Fix client.packages hook sending normal packages * Fixed OnUpdate() not passing in deltaTime instead of totalTime. * Missing diffs from bb21a09244 * Added networking tests for configs. * Added missing diffs for f61f852a25. * Some tweaks to the text * Remove missing Value error, it should just use the default value if it's not specified * Fix UseInternalAccessName * Always purge cashes for plugin content on unloading. * Fix texture not multiple of 4 * v1.12.7.0 (Spring Update 2026 Hotfix 1) --------- Co-authored-by: Joonas Rikkonen <poe.regalis@gmail.com> Co-authored-by: Evil Factory <36804725+evilfactory@users.noreply.github.com> Co-authored-by: MapleWheels <njainanan@hotmail.com>
2026-04-25 12:10:24 +08:00
parent 928cfb4fde
commit 9b35f6b23f
65 changed files with 1253 additions and 396 deletions
@@ -87,6 +87,9 @@ public class PluginManagementService : IAssemblyManagementService
        ScriptParseOptions);

    private ImmutableArray<MetadataReference> _baseMetadataReferences = ImmutableArray<MetadataReference>.Empty;
+    private ImmutableArray<MetadataReference> _baseMetadataReferencesNonPublicized = ImmutableArray<MetadataReference>.Empty;
+    
+    
    private IEnumerable<MetadataReference> BaseMetadataReferences
    {
        get
@@ -110,6 +113,25 @@ public class PluginManagementService : IAssemblyManagementService
        }
    }
    
+    private IEnumerable<MetadataReference> BaseMetadataReferencesWithBarotrauma
+    {
+        get
+        {
+            if (_baseMetadataReferencesNonPublicized.IsDefaultOrEmpty)
+            {
+                _baseMetadataReferencesNonPublicized = Basic.Reference.Assemblies.Net80.References.All
+                    .Union(AssemblyLoadContext.Default.Assemblies
+                        .Where(ass => !ass.IsDynamic)
+                        .Where(ass => !ass.Location.IsNullOrWhiteSpace())
+                        .Select(MetadataReference (ass) => MetadataReference.CreateFromFile(ass.Location)))
+                    .Where(ar => ar is not null)
+                    .ToImmutableArray();
+            }
+
+            return _baseMetadataReferencesNonPublicized;
+        }
+    }
+    
    #endregion
    
    #region Disposal
@@ -129,6 +151,7 @@ public class PluginManagementService : IAssemblyManagementService
        _logger = null;
        _configService = null;
        _luaScriptManagementService = null;
+        _luaCsInfoProvider = null;
        
        GC.SuppressFinalize(this);
    }
@@ -199,6 +222,7 @@ public class PluginManagementService : IAssemblyManagementService
    private IEventService _pluginEventService;
    private Lazy<ILuaPatcher> _pluginLuaPatcherService;
    private Func<IConsoleCommandsService> _consoleCommandServiceFactory;
+    private ILuaCsInfoProvider _luaCsInfoProvider;
    private readonly ConcurrentDictionary<ContentPackage, IAssemblyLoaderService> _assemblyLoaders = new();
    private readonly ConcurrentDictionary<Type, ContentPackage> _pluginPackageLookup = new();
    private readonly ConcurrentDictionary<ContentPackage, ImmutableArray<IAssemblyPlugin>> _pluginInstances = new();
@@ -215,7 +239,8 @@ public class PluginManagementService : IAssemblyManagementService
        Lazy<ILuaScriptManagementService> luaScriptManagementService, 
        Lazy<IConfigService> configService, 
        Lazy<ILuaPatcher> pluginLuaPatcherService, 
-        Func<IConsoleCommandsService> consoleCommandServiceFactory)
+        Func<IConsoleCommandsService> consoleCommandServiceFactory, 
+        ILuaCsInfoProvider luaCsInfoProvider)
    {
        _assemblyLoaderFactory = assemblyLoaderFactory;
        _storageService = storageService;
@@ -225,6 +250,7 @@ public class PluginManagementService : IAssemblyManagementService
        _configService = configService;
        _pluginLuaPatcherService = pluginLuaPatcherService;
        _consoleCommandServiceFactory = consoleCommandServiceFactory;
+        _luaCsInfoProvider = luaCsInfoProvider;
    }

    private ServiceContainer CreatePluginServiceContainer()
@@ -485,6 +511,12 @@ public class PluginManagementService : IAssemblyManagementService
        }
        using var lck = _operationsLock.AcquireReaderLock().ConfigureAwait(false).GetAwaiter().GetResult();
        IService.CheckDisposed(this);
+
+        _storageService.UseCaching = _luaCsInfoProvider.UseCaching;
+        if (!_luaCsInfoProvider.UseCaching)
+        {
+            _storageService.PurgeCache();
+        }
        
        var orderedContentPacks = resources.GroupBy(res => res.OwnerPackage)
            .OrderBy(res => resources.FindIndex(r2 => r2.OwnerPackage == res.Key))
@@ -554,7 +586,8 @@ public class PluginManagementService : IAssemblyManagementService
                return;
            }

-            var metadataReferences = GetMetadataReferences();
+            var metadataReferences = GetMetadataReferences(false).ToImmutableArray();
+            var metadataReferencesNonPublicized = GetMetadataReferences(true).ToImmutableArray();
            
            var assemblyLoader = _assemblyLoaders.GetOrAdd(contentPackRes.Key, (cp) => _assemblyLoaderFactory.CreateInstance(
                new IAssemblyLoaderService.LoaderInitData(
@@ -578,7 +611,10 @@ public class PluginManagementService : IAssemblyManagementService
                
                foreach (var resourceInfo in scripts)
                {
-                    if (!hasInternalsAwareBeenAdded && resourceInfo.UseInternalAccessName)
+                    // this should be the same for the entire collection of src files so we just grab it from the collection
+                    compileWithInternalName = resourceInfo.UseInternalAccessName;
+                    
+                    if (!hasInternalsAwareBeenAdded)
                    {
                        hasInternalsAwareBeenAdded = true;
                        syntaxTreesBuilder.Add(BaseAssemblyImports);
@@ -597,9 +633,6 @@ public class PluginManagementService : IAssemblyManagementService
                            _logger.LogResults(loadRes.ToResult());
                            continue;
                        }
-                    
-                        // this should be the same for the entire collection of src files so we just grab it from the collection
-                        compileWithInternalName = resourceInfo.UseInternalAccessName;
                
                        CancellationToken token = CancellationToken.None;

@@ -622,14 +655,35 @@ public class PluginManagementService : IAssemblyManagementService
                }
                
                _logger.LogMessage($"Compiling assembly for {scripts.Key}, in ContentPackage {contentPackRes.Key.Name}");
-                
-                result.WithReasons(assemblyLoader.CompileScriptAssembly(
+
+                var res = assemblyLoader.CompileScriptAssembly(
                    assemblyName: scripts.Key,
                    compileWithInternalAccess: compileWithInternalName,
                    syntaxTrees: syntaxTreesBuilder.ToImmutable(),
-                    metadataReferences: metadataReferences.ToImmutableArray(),
-                    compilationOptions: CompilationOptions)
-                    .Reasons);
+                    metadataReferences: compileWithInternalName ? metadataReferencesNonPublicized : metadataReferences,
+                    compilationOptions: CompilationOptions);
+
+                // try with internal access instead for legacy mods
+                if (!compileWithInternalName && res.IsFailed)
+                {
+                    _logger.LogMessage($"Attempted compilation of {scripts.Key} for package {contentPackRes.Key.Name}. Trying fallback method.");
+                    var res2 = assemblyLoader.CompileScriptAssembly(
+                        assemblyName: scripts.Key,
+                        compileWithInternalAccess: true,
+                        syntaxTrees: syntaxTreesBuilder.ToImmutable(),
+                        metadataReferences: metadataReferencesNonPublicized,
+                        compilationOptions: CompilationOptions);
+
+                    // overwrite result with good compilation
+                    if (res2.IsSuccess)
+                    {
+                        var reasonsStr = res.Reasons.Aggregate("", (accum, reason) => accum + "\n" + reason.Message);
+                        _logger.LogWarning($"Attempted compilation of {scripts.Key} for package {contentPackRes.Key.Name} succeeded. Original errors were: \n {reasonsStr}");
+                        res = res2;
+                    }
+                }
+
+                result.WithReasons(res.Reasons);
            }
        }
        
@@ -644,14 +698,28 @@ public class PluginManagementService : IAssemblyManagementService
            return res;
        }
        
-        IEnumerable<MetadataReference> GetMetadataReferences()
+        IEnumerable<MetadataReference> GetMetadataReferences(bool useNonPublicizedAssemblies)
        {
            var builder = ImmutableArray.CreateBuilder<MetadataReference>();
-            builder.AddRange(BaseMetadataReferences);
-            foreach (var loaderService in _assemblyLoaders)
+            if (useNonPublicizedAssemblies)
            {
-                builder.AddRange(loaderService.Value.AssemblyReferences.Where(ar => ar is not null));
+                builder.AddRange(BaseMetadataReferencesWithBarotrauma);
+                foreach (var loaderService in _assemblyLoaders
+                             .Where(asl => !asl.Key.Name.Equals("LuaCsForBarotrauma", StringComparison.InvariantCultureIgnoreCase))
+                             .ToImmutableArray())
+                {
+                    builder.AddRange(loaderService.Value.AssemblyReferences.Where(ar => ar is not null));
+                }
            }
+            else
+            {
+                builder.AddRange(BaseMetadataReferences);
+                foreach (var loaderService in _assemblyLoaders)
+                {
+                    builder.AddRange(loaderService.Value.AssemblyReferences.Where(ar => ar is not null));
+                }
+            }
+            
            return builder.ToImmutable();
        }
    }
@@ -768,6 +836,7 @@ public class PluginManagementService : IAssemblyManagementService
        }

        _assemblyLoaders.Clear();
+        _storageService.PurgeCache();
        GC.Collect(GC.MaxGeneration, GCCollectionMode.Aggressive, true);

 #if DEBUG