[FAB] package plugin fixes

Ciberusps · Ciberusps · commit 10000d12114e · 2025-05-11T18:48:35.000+03:00
diff --git a/Config/DefaultUnrealHelperLibrary.ini b/Config/DefaultUnrealHelperLibrary.ini
@@ -113,7 +113,7 @@
 
 +ClassRedirects=(OldName="/Script/UnrealHelperLibrary.BTT_TurnTo",NewName="/Script/UHLAI.BTT_TurnTo")
 
-+StructRedirects=(OldName="/Script/UnrealHelperLibrary.ValueOrBBKey_GameplayTag",NewName="/Script/UHLAI.ValueOrBBKey_GameplayTag")
++StructRedirects=(OldName="/Script/UnrealHelperLibrary.ValueOrBBKey_GameplayTag",NewName="/Script/UHLAI.UHLValueOrBBKey_GameplayTag")
 
 
 ; UHL GAS
@@ -201,3 +201,4 @@
 +PropertyRedirects=(OldName="/Script/CommonMaps.CommonMapCategory.AutoSearchMapsInFolder",NewName="/Script/CommonMaps.CommonMapCategory.SearchFolder")
 +ClassRedirects=(OldName="/Script/UnrealHelperLibrary.AN_AttachWithUniqueId",NewName="/Script/UnrealHelperLibrary.AN_AttachActorWithUniqueId")
 +FunctionRedirects=(OldName="/Script/UnrealHelperLibrary.UnrealHelperLibraryBPL.IsOtherCharacterInRange",NewName="/Script/UnrealHelperLibrary.UnrealHelperLibraryBPL.InRangeToOtherCharacter")
++StructRedirects=(OldName="/Script/UHLAI.ValueOrBBKey_GameplayTag",NewName="/Script/UHLAI.UHLValueOrBBKey_GameplayTag")
diff --git a/Source/CommonMaps/Public/CommonMapsDeveloperSettings.h b/Source/CommonMaps/Public/CommonMapsDeveloperSettings.h
@@ -15,19 +15,19 @@ struct FCommonMapCategory
 	explicit FCommonMapCategory(FName CategoryName_In, const TArray<FSoftObjectPath>& InPaths)
 		: Name(CategoryName_In), Maps({ InPaths }) {};
 	
-	UPROPERTY(EditAnywhere, Category="")
+	UPROPERTY(EditAnywhere, Category="CommonMapCategory")
 	FName Name = "";
 
-	UPROPERTY(EditAnywhere, Category="")
+	UPROPERTY(EditAnywhere, Category="CommonMapCategory")
 	bool bAutoSearchMapsInFolder = false;
 	
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, meta=(ContentDir, EditCondition="bAutoSearchMapsInFolder", EditConditionHides))
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="CommonMapCategory", meta=(ContentDir, EditCondition="bAutoSearchMapsInFolder", EditConditionHides))
 	FDirectoryPath SearchFolder;
 
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, meta=(EditCondition="bAutoSearchMapsInFolder", EditConditionHides))
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="CommonMapCategory", meta=(EditCondition="bAutoSearchMapsInFolder", EditConditionHides))
 	int32 SubmenuDepth = 1;
 	
-	UPROPERTY(EditAnywhere, Category="", meta=(AllowedClasses="/Script/Engine.World", TitleProperty="Name"))
+	UPROPERTY(EditAnywhere, Category="CommonMapCategory", meta=(AllowedClasses="/Script/Engine.World", TitleProperty="Name"))
 	TArray<FSoftObjectPath> Maps = {};
 
 	bool operator==(const FCommonMapCategory& Other) const
diff --git a/Source/UHLAI/Private/Decorators/BTD_GameplayEffectCooldown.cpp b/Source/UHLAI/Private/Decorators/BTD_GameplayEffectCooldown.cpp
@@ -3,6 +3,7 @@
 
 #include "Decorators/BTD_GameplayEffectCooldown.h"
 
+#include "Engine/World.h"
 #include "AIController.h"
 #include "AbilitySystemBlueprintLibrary.h"
 #include "AbilitySystemComponent.h"
diff --git a/Source/UHLAI/Private/Decorators/BTD_RandomChance.cpp b/Source/UHLAI/Private/Decorators/BTD_RandomChance.cpp
@@ -4,6 +4,7 @@
 #include "Decorators/BTD_RandomChance.h"
 
 #include "BehaviorTree/BTCompositeNode.h"
+#include "Engine/Engine.h"
 #include "UObject/UObjectGlobals.h"
 #include "UObject/UnrealType.h"
 #include "BehaviorTree/BlackboardData.h"
diff --git a/Source/UHLAI/Private/UHLValueOrBBKey_GameplayTag.cpp b/Source/UHLAI/Private/UHLValueOrBBKey_GameplayTag.cpp
@@ -1,54 +1,54 @@
 // Pavel Penkov 2025 All Rights Reserved.
 
 
-#include "ValueOrBBKey_GameplayTag.h"
+#include "UHLValueOrBBKey_GameplayTag.h"
 
 #include "GameplayTagContainer.h"
 #include "BehaviorTree/ValueOrBBKey.h"
 #include "BehaviorTree/Blackboard/BlackboardKeyType_Name.h"
 #include "Utils/UnrealHelperLibraryBPL.h"
 
-#include UE_INLINE_GENERATED_CPP_BY_NAME(ValueOrBBKey_GameplayTag)
+#include UE_INLINE_GENERATED_CPP_BY_NAME(UHLValueOrBBKey_GameplayTag)
 
-FGameplayTag FValueOrBBKey_GameplayTag::GetValue(const UBlackboardComponent& Blackboard) const
+FGameplayTag FUHLValueOrBBKey_GameplayTag::GetValue(const UBlackboardComponent& Blackboard) const
 {
 	FName TagName = FBlackboard::GetValue<UBlackboardKeyType_Name>(Blackboard, Key, KeyId, DefaultValue.GetTagName());
 	FGameplayTag FoundGameplayTag = FGameplayTag::RequestGameplayTag(TagName, false);
 	if (!FoundGameplayTag.IsValid())
 	{
 		UUnrealHelperLibraryBPL::DebugPrintString(Blackboard.GetWorld(),
-			FString::Printf(TEXT("FValueOrBBKey_GameplayTag::GetValue GameplayTag %s not found"), *Key.ToString())
+			FString::Printf(TEXT("FUHLValueOrBBKey_GameplayTag::GetValue GameplayTag %s not found"), *Key.ToString())
 		);
 		return DefaultValue;
 	}
 	return FoundGameplayTag;
 }
 
-FGameplayTag FValueOrBBKey_GameplayTag::GetValue(const UBlackboardComponent* Blackboard) const
+FGameplayTag FUHLValueOrBBKey_GameplayTag::GetValue(const UBlackboardComponent* Blackboard) const
 {
 	return Blackboard ? GetValue(*Blackboard) : DefaultValue;
 }
 
-FGameplayTag FValueOrBBKey_GameplayTag::GetValue(const UBehaviorTreeComponent& BehaviorComp) const
+FGameplayTag FUHLValueOrBBKey_GameplayTag::GetValue(const UBehaviorTreeComponent& BehaviorComp) const
 {
 	FName TagName = FBlackboard::GetValue<UBlackboardKeyType_Name>(BehaviorComp, Key, KeyId, DefaultValue.GetTagName());
 	FGameplayTag FoundGameplayTag = FGameplayTag::RequestGameplayTag(TagName, false);
 	if (!FoundGameplayTag.IsValid())
 	{
 		UUnrealHelperLibraryBPL::DebugPrintString(BehaviorComp.GetWorld(),
-			FString::Printf(TEXT("FValueOrBBKey_GameplayTag::GetValue GameplayTag %s not found"), *Key.ToString())
+			FString::Printf(TEXT("FUHLValueOrBBKey_GameplayTag::GetValue GameplayTag %s not found"), *Key.ToString())
 		);
 		return DefaultValue;
 	}
 	return FoundGameplayTag;
 }
 
-FGameplayTag FValueOrBBKey_GameplayTag::GetValue(const UBehaviorTreeComponent* BehaviorComp) const
+FGameplayTag FUHLValueOrBBKey_GameplayTag::GetValue(const UBehaviorTreeComponent* BehaviorComp) const
 {
 	return BehaviorComp ? GetValue(*BehaviorComp) : DefaultValue;
 }
 
-bool FValueOrBBKey_GameplayTag::SerializeFromMismatchedTag(
+bool FUHLValueOrBBKey_GameplayTag::SerializeFromMismatchedTag(
 	const FPropertyTag& Tag, FStructuredArchive::FSlot Slot)
 {
 	if (Tag.Type == NAME_StructProperty && Tag.GetType().IsStruct(FGameplayTag::StaticStruct()->GetFName()))
@@ -63,13 +63,13 @@ bool FValueOrBBKey_GameplayTag::SerializeFromMismatchedTag(
 }
 
 #if WITH_EDITOR
-bool FValueOrBBKey_GameplayTag::IsCompatibleType(const UBlackboardKeyType* KeyType) const
+bool FUHLValueOrBBKey_GameplayTag::IsCompatibleType(const UBlackboardKeyType* KeyType) const
 {
 	return KeyType && KeyType->GetClass() == UBlackboardKeyType_Name::StaticClass();
 }
 #endif
 
-FString FValueOrBBKey_GameplayTag::ToString() const
+FString FUHLValueOrBBKey_GameplayTag::ToString() const
 {
 	if (!Key.IsNone())
 	{
diff --git a/Source/UHLAI/Public/Tasks/BTT_InvokeGameplayAbility.h b/Source/UHLAI/Public/Tasks/BTT_InvokeGameplayAbility.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "ValueOrBBKey_GameplayTag.h"
+#include "UHLValueOrBBKey_GameplayTag.h"
 #include "Abilities/GameplayAbilityTypes.h"
 #include "BehaviorTree/BTTaskNode.h"
 #include "BTT_InvokeGameplayAbility.generated.h"
@@ -32,7 +32,7 @@ class UHLAI_API UBTT_InvokeGameplayAbility : public UBTTaskNode
     UBTT_InvokeGameplayAbility(const FObjectInitializer& ObjectInitializer);
 
     UPROPERTY(Category="Blackboard", EditAnywhere)
-    FValueOrBBKey_GameplayTag GameplayTag;
+    FUHLValueOrBBKey_GameplayTag GameplayTag;
 
 	UPROPERTY(Category="Blackboard", EditAnywhere, DisplayName = "Activate")
     FValueOrBBKey_Bool bActivate = true;
diff --git a/Source/UHLAI/Public/Tasks/BTT_TurnTo.h b/Source/UHLAI/Public/Tasks/BTT_TurnTo.h
@@ -7,7 +7,7 @@
 #include "BehaviorTree/BTTaskNode.h"
 #include "BehaviorTree/Services/BTService_DefaultFocus.h"
 #include "BehaviorTree/Tasks/BTTask_BlackboardBase.h"
-#include "UnrealHelperLibrary/UnrealHelperLibraryTypes.h"
+#include "UnrealHelperLibraryTypes.h"
 #include "BTT_TurnTo.generated.h"
 
 class AAIController;
diff --git a/Source/UHLAI/Public/UHLValueOrBBKey_GameplayTag.h b/Source/UHLAI/Public/UHLValueOrBBKey_GameplayTag.h
@@ -4,15 +4,17 @@
 
 #include "CoreMinimal.h"
 #include "BehaviorTree/ValueOrBBKey.h"
-#include "ValueOrBBKey_GameplayTag.generated.h"
+#include "UHLValueOrBBKey_GameplayTag.generated.h"
 
+// TODO: Looks like there is same thing(not sure) in 
+// Experimental/GameplayBehaviors/Source/GameplayBehaviorsModule/Public/AI/ValueOrBBKey_GameplayTag.h
 
 USTRUCT(BlueprintType, Category = "UnrealHelperLibrary")
-struct UHLAI_API FValueOrBBKey_GameplayTag : public FValueOrBlackboardKeyBase
+struct UHLAI_API FUHLValueOrBBKey_GameplayTag : public FValueOrBlackboardKeyBase
 {
 	GENERATED_BODY()
 
-	FValueOrBBKey_GameplayTag(FGameplayTag Default = FGameplayTag::EmptyTag)
+	FUHLValueOrBBKey_GameplayTag(FGameplayTag Default = FGameplayTag::EmptyTag)
 		: DefaultValue(Default) {}
 	FGameplayTag GetValue(const UBehaviorTreeComponent& BehaviorComp) const;
 	FGameplayTag GetValue(const UBehaviorTreeComponent* BehaviorComp) const;
@@ -36,7 +38,7 @@ struct UHLAI_API FValueOrBBKey_GameplayTag : public FValueOrBlackboardKeyBase
 };
 
 template <>
-struct TStructOpsTypeTraits<FValueOrBBKey_GameplayTag> : public TStructOpsTypeTraitsBase2<FValueOrBBKey_GameplayTag>
+struct TStructOpsTypeTraits<FUHLValueOrBBKey_GameplayTag> : public TStructOpsTypeTraitsBase2<FUHLValueOrBBKey_GameplayTag>
 {
 	enum
 	{
diff --git a/Source/UHLDebugSystem/Private/UHLDebugCategory.cpp b/Source/UHLDebugSystem/Private/UHLDebugCategory.cpp
@@ -1,8 +1,8 @@
 // Pavel Penkov 2025 All Rights Reserved.
 
-
 #include "UHLDebugCategory.h"
 
+#include "Templates/SubclassOf.h"
 #include "UHLDebugCategoryComponent.h"
 
 #include UE_INLINE_GENERATED_CPP_BY_NAME(UHLDebugCategory)
diff --git a/Source/UHLDebugSystem/Private/UHLDebugSystemSubsystem.cpp b/Source/UHLDebugSystem/Private/UHLDebugSystemSubsystem.cpp
@@ -4,7 +4,10 @@
 #include "UHLDebugSystemSubsystem.h"
 
 #include "GameFramework/Pawn.h"
+#include "GameFramework/Controller.h"
+#include "GameFramework/PlayerController.h"
 #include "Development/UHLDebugSystemSettings.h"
+#include "UnrealHelperLibraryTypes.h"
 #include "Utils/UnrealHelperLibraryBPL.h"
 
 #include UE_INLINE_GENERATED_CPP_BY_NAME(UHLDebugSystemSubsystem)
diff --git a/Source/UHLDebugSystem/Public/UHLDebugCategory.h b/Source/UHLDebugSystem/Public/UHLDebugCategory.h
@@ -3,13 +3,12 @@
 #pragma once
 
 #include "CoreMinimal.h"
+#include "UHLDebugCategoryComponent.h"
 #include "GameplayTagContainer.h"
-#include "UnrealHelperLibrary/UnrealHelperLibraryTypes.h"
+#include "UnrealHelperLibraryTypes.h"
 #include "UHLDebugCategory.generated.h"
 
 
-class UUHLDebugCategoryComponent;
-
 USTRUCT(BlueprintType)
 struct FUHLDebugCategory
 {
diff --git a/Source/UHLDebugSystem/UHLDebugSystem.Build.cs b/Source/UHLDebugSystem/UHLDebugSystem.Build.cs
@@ -28,20 +28,24 @@ public UHLDebugSystem(ReadOnlyTargetRules Target) : base(Target)
 			new string[]
 			{
 				"Core",
+				"CoreUObject",
+				"Engine",
+				
 				// ... add other public dependencies that you statically link with here ...
 				"GameplayAbilities",
 				"GameplayTags",
 				"GameplayTasks",
-				"EnhancedInput",
+				"EnhancedInput", 
+				
+				// TODO remove if possible used only for DebugPrints and EUHLBuildType
+				"UnrealHelperLibrary",
 			}
 			);
 
 
 		PrivateDependencyModuleNames.AddRange(
 			new string[]
 			{
-				"CoreUObject",
-				"Engine",
 				"Slate",
 				"SlateCore",
 				"UMG",
@@ -50,11 +54,6 @@ public UHLDebugSystem(ReadOnlyTargetRules Target) : base(Target)
 				
 				// Should not use any other UHL modules
 				
-				// TODO remove if possible used only for DebugPrints
-				// what if UHL debugging functions should be here in this module
-				// or in separate module UHLDebugLibrary?
-				"UnrealHelperLibrary",
-				
 				"UHLModulesHelper",
 				// ... add private dependencies that you statically link with here ...
 			}
diff --git a/Source/UHLGAS/Public/Development/UHLGASSettings.h b/Source/UHLGAS/Public/Development/UHLGASSettings.h
@@ -5,6 +5,7 @@
 #include "CoreMinimal.h"
 #include "UHLAbilitySystemConfig.h"
 #include "Engine/DeveloperSettings.h"
+#include "Misc/App.h"
 #include "UHLGASSettings.generated.h"
 
 /**
diff --git a/Source/UnrealHelperLibrary/Private/Animation/Notifies/AN_AttachActorWithUniqueId.cpp b/Source/UnrealHelperLibrary/Private/Animation/Notifies/AN_AttachActorWithUniqueId.cpp
@@ -3,6 +3,8 @@
 
 #include "Animation/Notifies/AN_AttachActorWithUniqueId.h"
 
+#include "Components/SkeletalMeshComponent.h"
+
 #include UE_INLINE_GENERATED_CPP_BY_NAME(AN_AttachActorWithUniqueId)
 
 #if WITH_EDITOR
diff --git a/Source/UnrealHelperLibrary/Private/Animation/Notifies/AN_DetachActorWithUniqueId.cpp b/Source/UnrealHelperLibrary/Private/Animation/Notifies/AN_DetachActorWithUniqueId.cpp
@@ -2,9 +2,11 @@
 
 
 #include "Animation/Notifies/AN_DetachActorWithUniqueId.h"
+
+#include "Components/SkeletalMeshComponent.h"
 #include "Components/PrimitiveComponent.h"
 #include "Components/ActorComponent.h"
-
+#include "TimerManager.h"
 #include "Utils/UnrealHelperLibraryBPL.h"
 
 #if WITH_EDITOR
diff --git a/Source/UnrealHelperLibrary/Private/Subsystems/EnemyTickManager/EnemyTickOptimizerSubsystem.cpp b/Source/UnrealHelperLibrary/Private/Subsystems/EnemyTickManager/EnemyTickOptimizerSubsystem.cpp
@@ -3,9 +3,11 @@
 
 #include "Subsystems/EnemyTickManager/EnemyTickOptimizerSubsystem.h"
 
-#include "Development/UHLSettings.h"
 #include "GameFramework/Character.h"
+#include "Development/UHLSettings.h"
 #include "Kismet/GameplayStatics.h"
+#include "Engine/World.h"
+#include "TimerManager.h"
 
 void UEnemyTickOptimizerSubsystem::Initialize(FSubsystemCollectionBase& Collection)
 {
@@ -112,4 +114,4 @@ void UEnemyTickOptimizerSubsystem::UpdateTickIntervals()
 			}
 		}
 	}
-}
+}
diff --git a/Source/UnrealHelperLibrary/Public/Core/UHLAttachmentRules.h b/Source/UnrealHelperLibrary/Public/Core/UHLAttachmentRules.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "Engine/EngineTypes.h"
 #include "UHLAttachmentRules.generated.h"
 
 USTRUCT(BlueprintType)
diff --git a/Source/UnrealHelperLibrary/Public/Subsystems/EnemyTickManager/EnemyTickOptimizerSubsystem.h b/Source/UnrealHelperLibrary/Public/Subsystems/EnemyTickManager/EnemyTickOptimizerSubsystem.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
+#include "GameFramework/Character.h"
 #include "Subsystems/GameInstanceSubsystem.h"
 #include "EnemyTickOptimizerSubsystem.generated.h"
 
diff --git a/Source/UnrealHelperLibrary/Public/UnrealHelperLibraryTypes.h b/Source/UnrealHelperLibrary/Public/UnrealHelperLibraryTypes.h
@@ -2,7 +2,10 @@
 
 #pragma once
 
-const FVector VECTOR_ERROR = FVector(404, 404, 404);
+#include "CoreMinimal.h"  // This includes FVector definition
+#include "UnrealHelperLibraryTypes.generated.h"  // Required for UENUM macros
+
+const FVector VECTOR_ERROR = FVector(404.0f, 404.0f, 404.0f);
 const float FLOAT_ERROR = -99999.0f;
 
 
diff --git a/Source/UnrealHelperLibrary/Public/Utils/UnrealHelperLibraryBPL.h b/Source/UnrealHelperLibrary/Public/Utils/UnrealHelperLibraryBPL.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "UnrealHelperLibrary/UnrealHelperLibraryTypes.h"
+#include "UnrealHelperLibraryTypes.h"
 #include "AssetRegistry/AssetData.h"
 #include "AssetRegistry/AssetRegistryModule.h"
 #include "Kismet/BlueprintFunctionLibrary.h"
diff --git a/UnrealHelperLibrary.uplugin b/UnrealHelperLibrary.uplugin
@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
-	"Version": 5,
-	"VersionName": "1.3.0",
+	"Version": 150,
+	"VersionName": "1.5.0",
 	"FriendlyName": "UnrealHelperLibrary",
 	"Description": "Helps working with AI, GAS, customizing editor and so on",
 	"Category": "AI",

Original file line number	Diff line number	Diff line change
`@@ -1,54 +1,54 @@`
`1`	`1`	`// Pavel Penkov 2025 All Rights Reserved.`
`2`	`2`
`3`	`3`
`4`		`-#include "ValueOrBBKey_GameplayTag.h"`
	`4`	`+#include "UHLValueOrBBKey_GameplayTag.h"`
`5`	`5`
`6`	`6`	`#include "GameplayTagContainer.h"`
`7`	`7`	`#include "BehaviorTree/ValueOrBBKey.h"`
`8`	`8`	`#include "BehaviorTree/Blackboard/BlackboardKeyType_Name.h"`
`9`	`9`	`#include "Utils/UnrealHelperLibraryBPL.h"`
`10`	`10`
`11`		`-#include UE_INLINE_GENERATED_CPP_BY_NAME(ValueOrBBKey_GameplayTag)`
	`11`	`+#include UE_INLINE_GENERATED_CPP_BY_NAME(UHLValueOrBBKey_GameplayTag)`
`12`	`12`
`13`		`-FGameplayTag FValueOrBBKey_GameplayTag::GetValue(const UBlackboardComponent& Blackboard) const`
	`13`	`+FGameplayTag FUHLValueOrBBKey_GameplayTag::GetValue(const UBlackboardComponent& Blackboard) const`
`14`	`14`	`{`
`15`	`15`	`FName TagName = FBlackboard::GetValue<UBlackboardKeyType_Name>(Blackboard, Key, KeyId, DefaultValue.GetTagName());`
`16`	`16`	`FGameplayTag FoundGameplayTag = FGameplayTag::RequestGameplayTag(TagName, false);`
`17`	`17`	`if (!FoundGameplayTag.IsValid())`
`18`	`18`	`{`
`19`	`19`	`UUnrealHelperLibraryBPL::DebugPrintString(Blackboard.GetWorld(),`
`20`		`- FString::Printf(TEXT("FValueOrBBKey_GameplayTag::GetValue GameplayTag %s not found"), *Key.ToString())`
	`20`	`+ FString::Printf(TEXT("FUHLValueOrBBKey_GameplayTag::GetValue GameplayTag %s not found"), *Key.ToString())`
`21`	`21`	`);`
`22`	`22`	`return DefaultValue;`
`23`	`23`	`}`
`24`	`24`	`return FoundGameplayTag;`
`25`	`25`	`}`
`26`	`26`
`27`		`-FGameplayTag FValueOrBBKey_GameplayTag::GetValue(const UBlackboardComponent* Blackboard) const`
	`27`	`+FGameplayTag FUHLValueOrBBKey_GameplayTag::GetValue(const UBlackboardComponent* Blackboard) const`
`28`	`28`	`{`
`29`	`29`	`return Blackboard ? GetValue(*Blackboard) : DefaultValue;`
`30`	`30`	`}`
`31`	`31`
`32`		`-FGameplayTag FValueOrBBKey_GameplayTag::GetValue(const UBehaviorTreeComponent& BehaviorComp) const`
	`32`	`+FGameplayTag FUHLValueOrBBKey_GameplayTag::GetValue(const UBehaviorTreeComponent& BehaviorComp) const`
`33`	`33`	`{`
`34`	`34`	`FName TagName = FBlackboard::GetValue<UBlackboardKeyType_Name>(BehaviorComp, Key, KeyId, DefaultValue.GetTagName());`
`35`	`35`	`FGameplayTag FoundGameplayTag = FGameplayTag::RequestGameplayTag(TagName, false);`
`36`	`36`	`if (!FoundGameplayTag.IsValid())`
`37`	`37`	`{`
`38`	`38`	`UUnrealHelperLibraryBPL::DebugPrintString(BehaviorComp.GetWorld(),`
`39`		`- FString::Printf(TEXT("FValueOrBBKey_GameplayTag::GetValue GameplayTag %s not found"), *Key.ToString())`
	`39`	`+ FString::Printf(TEXT("FUHLValueOrBBKey_GameplayTag::GetValue GameplayTag %s not found"), *Key.ToString())`
`40`	`40`	`);`
`41`	`41`	`return DefaultValue;`
`42`	`42`	`}`
`43`	`43`	`return FoundGameplayTag;`
`44`	`44`	`}`
`45`	`45`
`46`		`-FGameplayTag FValueOrBBKey_GameplayTag::GetValue(const UBehaviorTreeComponent* BehaviorComp) const`
	`46`	`+FGameplayTag FUHLValueOrBBKey_GameplayTag::GetValue(const UBehaviorTreeComponent* BehaviorComp) const`
`47`	`47`	`{`
`48`	`48`	`return BehaviorComp ? GetValue(*BehaviorComp) : DefaultValue;`
`49`	`49`	`}`
`50`	`50`
`51`		`-bool FValueOrBBKey_GameplayTag::SerializeFromMismatchedTag(`
	`51`	`+bool FUHLValueOrBBKey_GameplayTag::SerializeFromMismatchedTag(`
`52`	`52`	`const FPropertyTag& Tag, FStructuredArchive::FSlot Slot)`
`53`	`53`	`{`
`54`	`54`	`if (Tag.Type == NAME_StructProperty && Tag.GetType().IsStruct(FGameplayTag::StaticStruct()->GetFName()))`
`@@ -63,13 +63,13 @@ bool FValueOrBBKey_GameplayTag::SerializeFromMismatchedTag(`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`#if WITH_EDITOR`
`66`		`-bool FValueOrBBKey_GameplayTag::IsCompatibleType(const UBlackboardKeyType* KeyType) const`
	`66`	`+bool FUHLValueOrBBKey_GameplayTag::IsCompatibleType(const UBlackboardKeyType* KeyType) const`
`67`	`67`	`{`
`68`	`68`	`return KeyType && KeyType->GetClass() == UBlackboardKeyType_Name::StaticClass();`
`69`	`69`	`}`
`70`	`70`	`#endif`
`71`	`71`
`72`		`-FString FValueOrBBKey_GameplayTag::ToString() const`
	`72`	`+FString FUHLValueOrBBKey_GameplayTag::ToString() const`
`73`	`73`	`{`
`74`	`74`	`if (!Key.IsNone())`
`75`	`75`	`{`