Replace AssetTypeActions for AssetDefinition (POTENTIALLY BREAKING CHANGE) (#245)

Added UAssetDefinition_FlowNodeBlueprint & UAssetDefinition_FlowNodeAddOnBlueprint just like Krzysztof Justyński added UAssetDefinition_FlowAsset in commit: "5ef45f328809213024c99e9aba883ace7a104c58".

This is a direct replacement for FAssetTypeActions_FlowNodeBlueprint/FAssetTypeActions_FlowNodeAddOnBlueprint.

(cherry picked from commit 07f3616eca03c2e57332e58ff318cec62f586b7b)

Co-authored-by: szabob <[email protected]>

Author: Benxidosz

Flow.uplugin

@@ -30,6 +30,10 @@
 			"Name": "AssetSearch",
 			"Enabled": true
 		},
+		{
+		  "Name": "EngineAssetDefinitions",
+		  "Enabled": true
+		},
 		{
 			"Name": "EditorScriptingUtilities",
 			"Enabled": true

Source/FlowEditor/FlowEditor.Build.cs

@@ -20,6 +20,7 @@ public FlowEditor(ReadOnlyTargetRules target) : base(target)
 			"Flow",
 			"MessageLog",
 			"AIModule", // For BlueprintNodeHelpers::DescribeProperty (could be copy/pasted out to remove editor-only dependency)
+			"EngineAssetDefinitions", // For UAssetDefinition_Blueprint
 		});
 
 		PrivateDependencyModuleNames.AddRange(new[]

Source/FlowEditor/Private/FlowEditorModule.cpp

@@ -10,8 +10,6 @@
 #include "Graph/FlowGraphSettings.h"
 #include "Utils/SLevelEditorFlow.h"
 #include "MovieScene/FlowTrackEditor.h"
-#include "Nodes/AssetTypeActions_FlowNodeBlueprint.h"
-#include "Nodes/AssetTypeActions_FlowNodeAddOnBlueprint.h"
 #include "Pins/SFlowInputPinHandle.h"
 #include "Pins/SFlowOutputPinHandle.h"
 
@@ -164,14 +162,6 @@ void FFlowEditorModule::RegisterAssets()
 			FlowAssetCategory = AssetTools.RegisterAdvancedAssetCategory(FName(TEXT("Flow")), AssetCategoryText);
 		}
 	}
-
-	const TSharedRef<IAssetTypeActions> FlowNodeActions = MakeShareable(new FAssetTypeActions_FlowNodeBlueprint());
-	RegisteredAssetActions.Add(FlowNodeActions);
-	AssetTools.RegisterAssetTypeActions(FlowNodeActions);
-
-	const TSharedRef<IAssetTypeActions> FlowNodeAddOnActions = MakeShareable(new FAssetTypeActions_FlowNodeAddOnBlueprint());
-	RegisteredAssetActions.Add(FlowNodeAddOnActions);
-	AssetTools.RegisterAssetTypeActions(FlowNodeAddOnActions);
 }
 
 void FFlowEditorModule::UnregisterAssets()

Source/FlowEditor/Private/Nodes/AssetTypeActions_FlowNodeAddOnBlueprint.cpp renamed to Source/FlowEditor/Private/Nodes/AssetDefinition_FlowNodeAddOnBlueprint.cpp

@@ -1,6 +1,6 @@
 // Copyright https://github.com/MothCocoon/FlowGraph/graphs/contributors
 
-#include "Nodes/AssetTypeActions_FlowNodeAddOnBlueprint.h"
+#include "Nodes/AssetDefinition_FlowNodeAddOnBlueprint.h"
 #include "Nodes/FlowNodeBlueprintFactory.h"
 #include "Nodes/FlowNodeAddOnBlueprint.h"
 #include "AddOns/FlowNodeAddOn.h"
@@ -9,22 +9,28 @@
 
 #define LOCTEXT_NAMESPACE "AssetTypeActions_FlowNodeAddOnBlueprint"
 
-FText FAssetTypeActions_FlowNodeAddOnBlueprint::GetName() const
+TSoftClassPtr<UObject> UAssetDefinition_FlowNodeAddOnBlueprint::GetAssetClass() const
 {
-	return LOCTEXT("AssetTypeActions_FlowNodeBlueprint", "Flow Node AddOn Blueprint");
+	return UFlowNodeAddOnBlueprint::StaticClass();
 }
 
-uint32 FAssetTypeActions_FlowNodeAddOnBlueprint::GetCategories()
+FText UAssetDefinition_FlowNodeAddOnBlueprint::GetAssetDisplayName() const
 {
-	return UFlowGraphSettings::Get()->bExposeFlowNodeCreation ? FFlowEditorModule::FlowAssetCategory : 0;
+	return LOCTEXT("AssetTypeActions_FlowNodeBlueprint", "Flow Node AddOn Blueprint");
 }
 
-UClass* FAssetTypeActions_FlowNodeAddOnBlueprint::GetSupportedClass() const
+TConstArrayView<FAssetCategoryPath> UAssetDefinition_FlowNodeAddOnBlueprint::GetAssetCategories() const
 {
-	return UFlowNodeAddOnBlueprint::StaticClass();
+	if (UFlowGraphSettings::Get()->bExposeFlowAssetCreation)
+	{
+		static const auto Categories = {FFLowAssetCategoryPaths::Flow};
+		return Categories;
+	}
+
+	return {};
 }
 
-UFactory* FAssetTypeActions_FlowNodeAddOnBlueprint::GetFactoryForBlueprintType(UBlueprint* InBlueprint) const
+UFactory* UAssetDefinition_FlowNodeAddOnBlueprint::GetFactoryForBlueprintType(UBlueprint* InBlueprint) const
 {
 	UFlowNodeAddOnBlueprintFactory* FlowNodeAddOnBlueprintFactory = NewObject<UFlowNodeAddOnBlueprintFactory>();
 	FlowNodeAddOnBlueprintFactory->ParentClass = TSubclassOf<UFlowNodeAddOn>(*InBlueprint->GeneratedClass);

Source/FlowEditor/Private/Nodes/AssetTypeActions_FlowNodeBlueprint.cpp renamed to Source/FlowEditor/Private/Nodes/AssetDefinition_FlowNodeBlueprint.cpp

@@ -1,6 +1,6 @@
 // Copyright https://github.com/MothCocoon/FlowGraph/graphs/contributors
 
-#include "Nodes/AssetTypeActions_FlowNodeBlueprint.h"
+#include "Nodes/AssetDefinition_FlowNodeBlueprint.h"
 #include "Nodes/FlowNodeBlueprintFactory.h"
 #include "Nodes/FlowNodeBlueprint.h"
 #include "Nodes/FlowNode.h"
@@ -10,22 +10,28 @@
 
 #define LOCTEXT_NAMESPACE "AssetTypeActions_FlowNodeBlueprint"
 
-FText FAssetTypeActions_FlowNodeBlueprint::GetName() const
+TSoftClassPtr<UObject> UAssetDefinition_FlowNodeBlueprint::GetAssetClass() const
 {
-	return LOCTEXT("AssetTypeActions_FlowNodeBlueprint", "Flow Node Blueprint");
+	return UFlowNodeBlueprint::StaticClass();
 }
 
-uint32 FAssetTypeActions_FlowNodeBlueprint::GetCategories()
+FText UAssetDefinition_FlowNodeBlueprint::GetAssetDisplayName() const
 {
-	return UFlowGraphSettings::Get()->bExposeFlowNodeCreation ? FFlowEditorModule::FlowAssetCategory : 0;
+	return LOCTEXT("AssetTypeActions_FlowNodeBlueprint", "Flow Node Blueprint");
 }
 
-UClass* FAssetTypeActions_FlowNodeBlueprint::GetSupportedClass() const
+TConstArrayView<FAssetCategoryPath> UAssetDefinition_FlowNodeBlueprint::GetAssetCategories() const
 {
-	return UFlowNodeBlueprint::StaticClass();
+	if (UFlowGraphSettings::Get()->bExposeFlowAssetCreation)
+	{
+		static const auto Categories = {FFLowAssetCategoryPaths::Flow};
+		return Categories;
+	}
+
+	return {};
 }
 
-UFactory* FAssetTypeActions_FlowNodeBlueprint::GetFactoryForBlueprintType(UBlueprint* InBlueprint) const
+UFactory* UAssetDefinition_FlowNodeBlueprint::GetFactoryForBlueprintType(UBlueprint* InBlueprint) const
 {
 	UFlowNodeBlueprintFactory* FlowNodeBlueprintFactory = NewObject<UFlowNodeBlueprintFactory>();
 	FlowNodeBlueprintFactory->ParentClass = TSubclassOf<UFlowNode>(*InBlueprint->GeneratedClass);

Source/FlowEditor/Public/Nodes/AssetDefinition_FlowNodeAddOnBlueprint.h

@@ -0,0 +1,25 @@
+// Copyright https://github.com/MothCocoon/FlowGraph/graphs/contributors
+
+#pragma once
+
+#include "Script/AssetDefinition_Blueprint.h"
+#include "AssetDefinition_FlowNodeAddOnBlueprint.generated.h"
+
+UCLASS()
+class FLOWEDITOR_API UAssetDefinition_FlowNodeAddOnBlueprint : public UAssetDefinition_Blueprint
+{
+	GENERATED_BODY()
+public:
+	// UAssetDefinition
+	virtual TSoftClassPtr<UObject> GetAssetClass() const override;
+	virtual FLinearColor GetAssetColor() const override { return FColor(255, 196, 128); }
+	virtual FText GetAssetDisplayName() const override;
+	virtual TConstArrayView<FAssetCategoryPath> GetAssetCategories() const override;
+	// --
+
+protected:
+	// FAssetTypeActions_Blueprint
+	//virtual bool CanCreateNewDerivedBlueprint() const override { return false; }
+	virtual UFactory* GetFactoryForBlueprintType(UBlueprint* InBlueprint) const override;
+	// --
+};

Source/FlowEditor/Public/Nodes/AssetDefinition_FlowNodeBlueprint.h

@@ -0,0 +1,25 @@
+// Copyright https://github.com/MothCocoon/FlowGraph/graphs/contributors
+
+#pragma once
+
+#include "Script/AssetDefinition_Blueprint.h"
+#include "AssetDefinition_FlowNodeBlueprint.generated.h"
+
+UCLASS()
+class FLOWEDITOR_API UAssetDefinition_FlowNodeBlueprint : public UAssetDefinition_Blueprint
+{
+	GENERATED_BODY()
+	
+public:
+	// UAssetDefinition
+	virtual TSoftClassPtr<UObject> GetAssetClass() const override;
+	virtual FLinearColor GetAssetColor() const override { return FColor(255, 196, 128); }
+	virtual FText GetAssetDisplayName() const override;
+	virtual TConstArrayView<FAssetCategoryPath> GetAssetCategories() const override;
+	// --
+
+protected:
+	// UAssetDefinition_Blueprint
+	virtual UFactory* GetFactoryForBlueprintType(UBlueprint* InBlueprint) const override;
+	// --
+};