Merging from develop

.githooks/post-checkout

@@ -13,7 +13,7 @@ new_branch=$(git symbolic-ref -q --short HEAD)
 pushd "$(dirname "$0")/../../.."
 BOOTSTRAP_ROOT=$(pwd)
 
-for P in "Carbon.Core/Carbon.Components/Carbon.Bootstrap" "Carbon.Core/Carbon.Components/Carbon.Common" "Carbon.Core/Carbon.Components/Carbon.Common.Client" "Carbon.Core/Carbon.Components/Carbon.Compat" "Carbon.Core/Carbon.Components/Carbon.Modules" "Carbon.Core/Carbon.Components/Carbon.Preloader" "Carbon.Core/Carbon.Components/Carbon.SDK" "Carbon.Core/Carbon.Components/Carbon.Compiler" "Carbon.Core/Carbon.Extensions/Carbon.Ext.Discord" "Carbon.Core/Carbon.Hooks/Carbon.Hooks.Base" "Carbon.Core/Carbon.Hooks/Carbon.Hooks.Oxide" "Carbon.Core/Carbon.Hooks/Carbon.Hooks.Community"; do
+for P in "Carbon.Core/Carbon.Components/Carbon.Bootstrap" "Carbon.Core/Carbon.Components/Carbon.Common" "Carbon.Core/Carbon.Components/Carbon.Common.Client" "Carbon.Core/Carbon.Components/Carbon.Compat" "Carbon.Core/Carbon.Components/Carbon.Modules" "Carbon.Core/Carbon.Components/Carbon.Preloader" "Carbon.Core/Carbon.Components/Carbon.SDK" "Carbon.Core/Carbon.Hooks/Carbon.Hooks.Base" "Carbon.Core/Carbon.Hooks/Carbon.Hooks.Oxide" "Carbon.Core/Carbon.Hooks/Carbon.Hooks.Community"; do
     cd "$BOOTSTRAP_ROOT/Carbon.Core/$P"
     git checkout "${new_branch}" || true
 done

Carbon.Core/.msbuild/Protocol.props

@@ -7,6 +7,6 @@
 			carbon that forces the users to update all the compontents at the
 			same time, like updating core and hooks in one shot.
 		-->
-		<CarbonProtocol>2024.03.07.0</CarbonProtocol>
+		<CarbonProtocol>2024.04.04.0</CarbonProtocol>
 	</PropertyGroup>
 </Project>

Carbon.Core/.msbuild/References.props

@@ -13,7 +13,7 @@
 		<Reference Include="System.Xml" />
 		<Reference Include="System" />
 
-		<PackageReference Include="Lib.Harmony" Version="2.3.1.1" />
+		<PackageReference Include="Lib.Harmony" Version="2.3.3" />
 
 		<!-- Carbon API -->
 		<ProjectReference Include="$(SolutionDir)\Carbon.Components\Carbon.SDK\Carbon.SDK.csproj" Private="false" Condition="!$(Product.Contains('Carbon.SDK')) and !$(Product.Contains('Carbon.Compiler'))" />

Carbon.Core/Carbon/src/Hooks/HookCallerInternal.cs

@@ -121,21 +121,6 @@ public override object CallHook<T>(T hookable, uint hookId, BindingFlags flags,
 			if (hooks != null && hooks.Count > 0)
 			{
 				hook = hooks[0];
-
-				if (args != null)
-				{
-					var actualLength = hook.Parameters.Length;
-
-					if (actualLength != args.Length)
-					{
-						args = RescaleBuffer(args, actualLength, hook);
-						hasRescaledBuffer = true;
-					}
-					else
-					{
-						ProcessDefaults(args, hook);
-					}
-				}
 			}
 
 #if DEBUG

Carbon.Core/Carbon/src/Jobs/ScriptCompilationThread.cs

@@ -35,6 +35,7 @@ public class ScriptCompilationThread : BaseThreadedJob
 	public List<ISource> Sources;
 	public string[] References;
 	public string[] Requires;
+	public string InternalCallHookSource;
 	public bool IsExtension;
 	public List<string> Usings = new();
 	public Dictionary<Type, List<uint>> Hooks = new();
@@ -325,7 +326,7 @@ public override void ThreadFunction()
 
 			try
 			{
-				conditionals.AddRange(Community.Runtime.Config.Debugging.ConditionalCompilationSymbols);
+				conditionals.AddRange(Community.Runtime.Config.Compiler.ConditionalCompilationSymbols);
 			}
 			catch (Exception ex)
 			{
@@ -419,6 +420,7 @@ public override void ThreadFunction()
 					pdbFilename, ClassList);
 
 				InternalCallHookGenTime = _stopwatch.Elapsed;
+				InternalCallHookSource = partialTree.NormalizeWhitespace().ToFullString();
 				trees.Add(partialTree.SyntaxTree);
 			}
 
@@ -570,5 +572,6 @@ public override void Dispose()
 		PluginReferences = null;
 		Exceptions = null;
 		Warnings = null;
+		InternalCallHookSource = null;
 	}
 }

Carbon.Core/Carbon/src/Loaders/ScriptLoader.cs

@@ -104,7 +104,7 @@ void ExecuteProcess(IScriptProcessor processor, bool folderMode, params string[]
 
 			foreach (var plugin in processor.InstanceBuffer)
 			{
-				plugin.Value.SetDirty();
+				plugin.Value.MarkDirty();
 			}
 
 			Array.Clear(folders, 0, folders.Length);
@@ -114,9 +114,6 @@ void ExecuteProcess(IScriptProcessor processor, bool folderMode, params string[]
 
 	public void Clear()
 	{
-		AsyncLoader?.Abort();
-		AsyncLoader = null;
-
 		if (Scripts != null)
 		{
 			for (int i = 0; i < Scripts.Count; i++)
@@ -356,31 +353,45 @@ public IEnumerator Compile()
 					Logger.Error($"  {i + 1:n0}. {print}");
 				}
 
-				var compilationFailure = new ModLoader.FailedCompilation
+				var compilationFailure = ModLoader.GetOrCreateFailedCompilation(InitialSource.ContextFilePath);
+				compilationFailure.Clear();
+
+				compilationFailure.RollbackType = ModLoader.GetRegisteredType(InitialSource.ContextFilePath);
+				compilationFailure.AppendErrors(AsyncLoader.Exceptions.Select(x => new ModLoader.Trace
 				{
-					File = InitialSource.ContextFilePath,
-					Errors = AsyncLoader.Exceptions.Select(x => new ModLoader.FailedCompilation.Trace
-					{
-						Message = x.Error.ErrorText,
-						Number = x.Error.ErrorNumber,
-						Column = x.Error.Column,
-						Line = x.Error.Line
-					}).ToArray(),
+					Message = x.Error.ErrorText,
+					Number = x.Error.ErrorNumber,
+					Column = x.Error.Column,
+					Line = x.Error.Line
+				}));
+
 #if DEBUG
-					Warnings = AsyncLoader.Warnings.Select(x => new ModLoader.FailedCompilation.Trace
-					{
-						Message = x.Error.ErrorText,
-						Number = x.Error.ErrorNumber,
-						Column = x.Error.Column,
-						Line = x.Error.Line
-					}).ToArray()
+				compilationFailure.AppendWarnings(AsyncLoader.Warnings.Select(x => new ModLoader.Trace
+				{
+					Message = x.Error.ErrorText,
+					Number = x.Error.ErrorNumber,
+					Column = x.Error.Column,
+					Line = x.Error.Line
+				}));
 #endif
-				};
 
 				// OnCompilationFail
-				HookCaller.CallStaticHook(150731668, InitialSource.ContextFilePath, compilationFailure.Errors, compilationFailure.Warnings);
+				HookCaller.CallStaticHook(150731668, InitialSource.ContextFilePath, compilationFailure);
+
+				if (Community.Runtime.Config.Compiler.UnloadOnFailure)
+				{
+					var rollbackTypeName = compilationFailure.GetRollbackTypeName();
 
-				ModLoader.FailedCompilations.Add(compilationFailure);
+					if (!string.IsNullOrEmpty(rollbackTypeName))
+					{
+						var existentPlugin = ModLoader.FindPlugin(rollbackTypeName);
+
+						if (existentPlugin != null)
+						{
+							ModLoader.UninitializePlugin(existentPlugin);
+						}
+					}
+				}
 			}
 
 			AsyncLoader.Exceptions?.Clear();
@@ -397,8 +408,6 @@ public IEnumerator Compile()
 
 		Logger.Debug($" Compiling '{(!string.IsNullOrEmpty(InitialSource.FilePath) ? Path.GetFileNameWithoutExtension(InitialSource.FilePath) : "<unknown>")}' took {AsyncLoader.CompileTime.TotalMilliseconds:0}ms [int. {AsyncLoader.InternalCallHookGenTime.TotalMilliseconds:0}ms]...", 1);
 
-		ModLoader.RegisterAssembly(AsyncLoader.Assembly);
-
 		var assembly = AsyncLoader.Assembly;
 		var firstPlugin = true;
 
@@ -413,7 +422,7 @@ public IEnumerator Compile()
 
 				if (type.GetCustomAttribute(typeof(InfoAttribute), true) is not InfoAttribute info) continue;
 
-				if (!IsExtension && firstPlugin && Community.Runtime.Config.Watchers.FileNameCheck && !BypassFileNameChecks)
+				if (!IsExtension && firstPlugin && !BypassFileNameChecks)
 				{
 					var name = Path.GetFileNameWithoutExtension(InitialSource.FilePath).ToLower().Replace(" ", "").Replace(".", "").Replace("-", "");
 
@@ -442,7 +451,7 @@ public IEnumerator Compile()
 						p.HasConditionals = Sources.Any(x => x.Content.Contains("#if "));
 						p.IsExtension = IsExtension;
 #if DEBUG
-						p.CompileWarnings = AsyncLoader.Warnings.Select(x => new ModLoader.FailedCompilation.Trace
+						p.CompileWarnings = AsyncLoader.Warnings.Select(x => new ModLoader.Trace
 						{
 							Message = x.Error.ErrorText,
 							Number = x.Error.ErrorNumber,
@@ -462,6 +471,7 @@ public IEnumerator Compile()
 						p.SetProcessor(Community.Runtime.ScriptProcessor);
 						p.CompileTime = AsyncLoader.CompileTime;
 						p.InternalCallHookGenTime = AsyncLoader.InternalCallHookGenTime;
+						p.InternalCallHookSource = AsyncLoader.InternalCallHookSource;
 
 						p.FilePath = AsyncLoader.InitialSource.ContextFilePath;
 						p.FileName = AsyncLoader.InitialSource.ContextFileName;
@@ -471,7 +481,7 @@ public IEnumerator Compile()
 
 					Community.Runtime.Events.Trigger(CarbonEvent.PluginPreload, new CarbonEventArgs(rustPlugin));
 
-					ModLoader.RegisterAssembly(plugin.Name, AsyncLoader.Assembly);
+					ModLoader.RegisterType(AsyncLoader.InitialSource.ContextFilePath, type);
 
 					Plugin.InternalApplyAllPluginReferences();
 
@@ -505,6 +515,9 @@ public void Dispose()
 	{
 		HasFinished = true;
 
+		AsyncLoader?.Abort();
+		AsyncLoader = null;
+
 		if (Scripts != null)
 		{
 			foreach (var script in Scripts)