Properly manage Carbon patches w/out identifiers

Make build tag optionally assignable through batch parameter (3rd)
CarbonCommunity · Oct 21, 2023 · afbd2c1 · afbd2c1
1 parent 78bbf17
commit afbd2c1
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 15 deletions.
diff --git a/Carbon.Core/Carbon.Components/Carbon.Common b/Carbon.Core/Carbon.Components/Carbon.Common
diff --git a/Carbon.Core/Carbon.Components/Carbon.Modules b/Carbon.Core/Carbon.Components/Carbon.Modules
diff --git a/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Base b/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Base
diff --git a/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Community b/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Community
diff --git a/Carbon.Core/Carbon/src/Hooks/HookEx.cs b/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);

diff --git a/Tools/Build/win/build.bat b/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%
 

diff --git a/Tools/Build/win/publish_git.bat b/Tools/Build/win/publish_git.bat
@@ -39,8 +39,15 @@ echo **   Comment done.
 git log -1 --format=%%%ci HEAD > .gitdate
 echo **   Date done.
 
-git describe --tags > .gittag
-echo **   Tag 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.
+2 −3		src/Fixes/IDelFix.cs
+2 −3		src/Fixes/IFixCarsFix.cs
+1 −2		src/Fixes/IManifestHashFix.cs
+0 −45		src/Fixes/ItemContainerGetAmount.cs
+0 −92		src/Fixes/ItemContainerTake.cs
+2 −3		src/Player/IOnPlayerChat.cs
+1 −2		src/Plugin/OnPluginOutdated.cs
+2 −3		src/Resources/ICraftDurationMultiplier.cs
+2 −3		src/Resources/IMixingSpeedMultiplier.cs
+2 −3		src/Resources/IOnExcavatorInit.cs
+2 −3		src/Resources/IRecyclerThinkSpeed.cs
+3 −5		src/Resources/IVendingBuyDuration.cs
+0 −34		src/Save/IPostSaveLoad.cs
+0 −29		src/Save/IPostSaveSave.cs
+3 −5		src/Static/ICleanDebugLog.cs
+2 −3		src/Static/ICommunityEntityRPC.cs
+2 −3		src/Static/IConsoleEnter.cs
+6 −7		src/Static/IConsoleUpdate.cs
+1 −2		src/Static/IDefaultChatValues.cs
+1 −2		src/Static/IServerAsyncShutdown.cs
+2 −3		src/Static/IServerInfoUpdate.cs
+2 −3		src/Static/IServerMgrOnRPCMessage.cs
+5 −5		src/Static/OnConsoleCommand.cs
+2 −3		src/Static/OnNativeCommandHasPermission.cs
+8 −4		src/Static/OnRconCommand.cs
+7 −5		src/Static/OnServerInitialized.cs
+2 −3		src/Entity/CanPatrolHeliSeePlayer.cs
+2 −3		src/Entity/CanPickupAllFromRack.cs
+2 −3		src/Entity/CanPickupFromRack.cs
+2 −3		src/Entity/CanPlaceOnRack.cs
+2 −3		src/Entity/OnChairComfort.cs
+2 −3		src/Entity/OnEntitySpawn.cs
+2 −3		src/Entity/OnPickUpFromRack.cs
+2 −3		src/Fun/OnChickenScared.cs
+2 −3		src/Fun/OnHorseDung.cs
+2 −3		src/Fun/OnJackieChan.cs
+1 −2		src/Patch/IOnKilledNREFix.cs
+2 −3		src/Player/CanPlayerInheritNetworkGroup.cs
+2 −3		src/Resources/OnGrowableUpdate.cs
+2 −3		src/Vending/OnMarketplaceTerminalPurchase.cs