Merge branch 'develop' into rust_beta/staging

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>2023.11.02.0</CarbonProtocol>
+		<CarbonProtocol>2023.10.23.0</CarbonProtocol>
 	</PropertyGroup>
 </Project>

Carbon.Core/Carbon/Carbon.csproj

@@ -20,7 +20,6 @@
 		<PackageReference Include="Lib.Harmony" Version="2.2.2" />
 		<ProjectReference Include="$(SolutionDir)\Carbon.Components\Carbon.Common\Carbon.Common.csproj" Private="false" />
 		<ProjectReference Include="$(SolutionDir)\Carbon.Components\Carbon.Common.Client\Carbon.Common.Client.csproj" />
-		<ProjectReference Include="$(SolutionDir)\Carbon.Components\Carbon.Compiler\Carbon.Compiler.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -34,4 +33,4 @@
 	<Target Name="CustomRelease" AfterTargets="Build" DependsOnTargets="PrepareRelease">
 		<Copy SourceFiles="$(OutputPath)$(Product).dll" DestinationFolder="$(c_managed)" />
 	</Target>
-</Project>
+</Project>

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

@@ -58,7 +58,7 @@ public override object[] AllocateBuffer(int count)
 
 		return buffer;
 	}
-	public override object[] RescaleBuffer(object[] oldBuffer, int newScale)
+	public override object[] RescaleBuffer(object[] oldBuffer, int newScale, CachedHook hook)
 	{
 		if (oldBuffer.Length == newScale)
 		{
@@ -69,18 +69,37 @@ public override object[] RescaleBuffer(object[] oldBuffer, int newScale)
 
 		for (int i = 0; i < newScale; i++)
 		{
+			var value = newBuffer[i];
+
 			if (i > oldBuffer.Length - 1)
 			{
-				newBuffer[i] = null;
+				newBuffer[i] = value = null;
 			}
 			else
 			{
-				newBuffer[i] = oldBuffer[i];
+				newBuffer[i] = value = oldBuffer[i];
+			}
+
+			if (i <= hook.DefaultParameterValues.Length - 1 && value == null)
+			{
+				newBuffer[i] = hook.DefaultParameterValues[i];
 			}
 		}
 
 		return newBuffer;
 	}
+	public override void ProcessDefaults(object[] buffer, CachedHook hook)
+	{
+		var length = buffer.Length;
+
+		for (int i = 0; i < length; i++)
+		{
+			if (i <= hook.DefaultParameterValues.Length - 1 && buffer[i] == null)
+			{
+				buffer[i] = hook.DefaultParameterValues[i];
+			}
+		}
+	}
 	public override void ClearBuffer(object[] buffer)
 	{
 		for (int i = 0; i < buffer.Length; i++)
@@ -121,7 +140,11 @@ public override object CallHook<T>(T hookable, uint hookId, BindingFlags flags,
 
 					if (actualLength != args.Length)
 					{
-						args = RescaleBuffer(args, actualLength);
+						args = RescaleBuffer(args, actualLength, cachedHook);
+					}
+					else
+					{
+						ProcessDefaults(args, cachedHook);
 					}
 				}
 			}
@@ -228,7 +251,11 @@ object DoCall(CachedHook hook)
 
 					if (actualLength != args.Length)
 					{
-						args = RescaleBuffer(args, actualLength);
+						args = RescaleBuffer(args, actualLength, hook);
+					}
+					else
+					{
+						ProcessDefaults(args, hook);
 					}
 				}
 

Carbon.Core/Carbon/src/Hooks/HookEx.cs

@@ -119,18 +119,13 @@ public HookEx(TypeInfo type)
 			TargetMethods = new();
 			TargetType = metadata.Target;
 
-			if (Attribute.IsDefined(type, typeof(HookAttribute.Identifier), false))
-				Identifier = type.GetCustomAttribute<HookAttribute.Identifier>()?.Value ?? $"{Guid.NewGuid():N}";
-
-			if (Attribute.IsDefined(type, typeof(HookAttribute.Options), false))
-				Options = type.GetCustomAttribute<HookAttribute.Options>()?.Value ?? HookFlags.None;
+			Identifier = type.GetCustomAttribute<HookAttribute.Identifier>()?.Value ?? $"{Guid.NewGuid():N}";
+			Options = type.GetCustomAttribute<HookAttribute.Options>()?.Value ?? HookFlags.None;
+			Checksum = type.GetCustomAttribute<HookAttribute.Checksum>()?.Value ?? default;
 
 			if (Attribute.IsDefined(type, typeof(HookAttribute.Dependencies), false))
 				Dependencies = type.GetCustomAttribute<HookAttribute.Dependencies>()?.Value ?? default;
 
-			if (Attribute.IsDefined(type, typeof(HookAttribute.Checksum), false))
-				Checksum = type.GetCustomAttribute<HookAttribute.Checksum>()?.Value ?? default;
-
 			if (Options.HasFlag(HookFlags.MetadataOnly))
 			{
 				SetStatus(HookState.Inactive);

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

@@ -12,7 +12,6 @@
 using Carbon.Core;
 using Carbon.Extensions;
 using Carbon.Jobs;
-using Facepunch;
 using Oxide.Core;
 using Oxide.Core.Plugins;
 using Oxide.Plugins;

Tools/Build/linux/publish_git.sh

@@ -12,8 +12,16 @@ if [ ! -d "$TEMP" ]; then
     mkdir -p "$TEMP"
 fi
 
+git fetch --tags
+
 echo "** Git Metadata:"
 
+for tag in $(git tag -l); do
+    git tag -d "$tag"
+done
+
+git fetch --tags
+
 cd "$TEMP"
 git branch --show-current > .gitbranch
 echo "**   Branch done."
@@ -33,6 +41,9 @@ echo "**   Comment done."
 git log -1 --format="%ci" HEAD > .gitdate
 echo "**   Date done."
 
+git describe --tags > .gittag
+echo "**   Tag done."
+
 git remote get-url origin > .giturl
 echo "**   URL done."
 

Tools/Build/win/build.bat

@@ -15,7 +15,7 @@ if "%1" EQU "" (
 	set BUILD_TARGET=%1
 )
 
-call "%~dp0publish_git.bat"
+call "%~dp0publish_git.bat" %3
 
 echo ** Set the build target config to %BUILD_TARGET%
 

Tools/Build/win/publish_git.bat

@@ -1,5 +1,5 @@
 ::
-:: Copyright (c) 2022-2023 Carbon Community 
+:: Copyright (c) 2022-2023 Carbon Community
 :: All rights reserved
 ::
 @echo off
@@ -13,6 +13,13 @@ if not exist %TEMP% (
 
 echo ** Git Metadata:
 
+FOR /F "tokens=*" %%i IN ('git tag -l') DO (
+    git tag -d %%i
+)
+
+git fetch --tags
+
+
 cd %TEMP%
 git branch --show-current > .gitbranch
 echo **   Branch done.
@@ -32,10 +39,20 @@ echo **   Comment done.
 git log -1 --format=%%%ci HEAD > .gitdate
 echo **   Date done.
 
+if "%1" EQU "" (
+	git describe --tags > .gittag
+	echo **   Tag done.
+) else (
+	echo %1 > .gittag
+	echo **   Tag done.
+)
+
+
+
 git remote get-url origin > .giturl
 echo **   URL done.
 
 git log -1 --name-status --format= > .gitchanges
 echo **   Changes done.
 
-cd %HOME%
+cd %HOME%