Fix init when pasting in a programmable block
All checks were successful
Build / Compute Version (push) Successful in 6s
Build / Build Nuget package (CringeBootstrap.Abstractions) (push) Successful in 1m30s
Build / Build Nuget package (SharedCringe) (push) Successful in 1m45s
Build / Build Nuget package (NuGet) (push) Successful in 1m47s
Build / Build Nuget package (CringePlugins) (push) Successful in 1m58s
Build / Build Launcher (push) Successful in 2m24s

Improvements for imgui input handling
This commit is contained in:
2025-05-16 22:52:15 -04:00
parent a87161f2f5
commit bd626f7a2b
4 changed files with 76 additions and 16 deletions

View File

@@ -21,6 +21,7 @@ using System.Runtime.CompilerServices;
using System.Runtime.Loader;
using System.Text;
using VRage;
using VRage.Collections;
using VRage.ModAPI;
using VRage.Scripting;
using Message = VRage.Scripting.Message;
@@ -30,6 +31,8 @@ namespace CringeLauncher.Patches;
[HarmonyPatch]
public static class ModScriptCompilerPatch
{
internal static readonly MyConcurrentHashSet<MyProgrammableBlock> CompilingPbs = [];
private static readonly Logger Log = LogManager.GetCurrentClassLogger();
private static ModAssemblyLoadContext _modContext;
private static readonly HashSet<string> LoadedModAssemblyNames = [];
@@ -87,7 +90,7 @@ public static class ModScriptCompilerPatch
ref MyProgrammableBlock.ScriptTerminationReason ___m_terminationReason,
MyIngameScriptComponent ___m_scriptComponent)
{
if (!MySession.Static.EnableIngameScripts || __instance.CubeGrid is { IsPreview: true } or { CreatePhysics: false })
if (!MySession.Static.EnableIngameScripts || __instance.CubeGrid is { IsPreview: true } or { CreatePhysics: false } || !CompilingPbs.Add(__instance))
return false;
___m_terminationReason = MyProgrammableBlock.ScriptTerminationReason.None;
@@ -164,13 +167,13 @@ public static class ModScriptCompilerPatch
string storage,
bool instantiate, MyIngameScriptComponent scriptComponent)
{
scriptComponent.NeedsUpdate = MyEntityUpdateEnum.NONE;
scriptComponent.UpdateFrequency = UpdateFrequency.None;
SetDetailedInfoMethod.Invoke(block, ["Compiling..."]);
try
{
scriptComponent.NeedsUpdate = MyEntityUpdateEnum.NONE;
scriptComponent.UpdateFrequency = UpdateFrequency.None;
SetDetailedInfoMethod.Invoke(block, ["Compiling..."]);
if (LoadContexts.TryGetValue(block, out var context))
{
AccessTools.FieldRefAccess<MyProgrammableBlock, IMyGridProgram?>(block, InstanceField) = null;
@@ -203,6 +206,10 @@ public static class ModScriptCompilerPatch
SetDetailedInfoMethod.Invoke(block, [e.ToString()]);
Log.Error(e);
}
finally
{
CompilingPbs.Remove(block);
}
}
private static async Task<Assembly?> CompileAsync(AssemblyLoadContext context, MyApiTarget target,