Support Unreal Engine 5.4 (#17)

.circleci/config.yml

@@ -7,6 +7,7 @@ workflows:
             - unreal-engine-ci
           matrix:
             parameters:
+              # TODO: The container image is not supported for 5.4.0.
               unreal-engine-version: ["4.27.0", "5.0.0", "5.1.0", "5.2.0", "5.3.0"]
               version: ["free", "full"]
       - build-sample:

.github/workflows/release.yaml

@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         unreal_engine_version:
-          ["4.26.0", "4.27.0", "5.0.0", "5.1.0", "5.2.0", "5.3.0"]
+          ["4.26.0", "4.27.0", "5.0.0", "5.1.0", "5.2.0", "5.3.0", "5.4.0"]
         version:
           ["free", "full"]
     steps:

README.md

@@ -34,7 +34,7 @@ The **Shortcut** asset supports the following features.
 
 This plugin supports on the below environment.
 
-* Unreal Engine Version: 4.27 / 5.0 / 5.1 / 5.2 / 5.3
+* Unreal Engine Version: 4.27 / 5.0 / 5.1 / 5.2 / 5.3 / 5.4
 * Development Platforms: Windows / macOS / Linux
 * Target Build Platforms: All platform
 

ShortcutAsset/ShortcutAsset.uplugin

@@ -4,7 +4,7 @@
   "VersionName": "1.2.0",
   "FriendlyName": "Shortcut Asset",
   "Description": "Asset to open the linked asset/directory",
-  "EngineVersion": "5.3.0",
+  "EngineVersion": "5.4.0",
   "Category": "Other",
   "CreatedBy": "nutti (Colory Games)",
   "CreatedByURL": "https://github.com/colory-games/UEPlugin-ShortcutAssets",

ShortcutAsset/Source/ShortcutAsset/Private/ShortcutAssetActions.cpp

@@ -151,7 +151,11 @@ void FShortcutAssetActions::OpenAssetEditor(const TArray<UObject*>& InObjects, T
 					TEXT("The link stored in '{0}' is missing.\nDo you want to edit the link?"), {ShortcutAsset->GetName()});
 				FText TitleText = LOCTEXT("Title", "Missing Link Error");
 				FText MessageText = FText::AsCultureInvariant(Message);
+#if UE_VERSION_OLDER_THAN(5, 4, 0)
 				if (FMessageDialog::Open(EAppMsgType::OkCancel, MessageText, &TitleText) == EAppReturnType::Ok)
+#else
+				if (FMessageDialog::Open(EAppMsgType::OkCancel, MessageText, TitleText) == EAppReturnType::Ok)
+#endif
 				{
 					UShortcutAssetSubsystem* Subsystem = GEditor->GetEditorSubsystem<UShortcutAssetSubsystem>();
 					Subsystem->OpenShortcutAssetEditor({ShortcutAsset});

ShortcutAsset/Source/ShortcutAsset/Private/ShortcutAssetEditorToolkit.cpp

@@ -64,9 +64,15 @@ FShortcutAssetEditorToolkit::~FShortcutAssetEditorToolkit()
 	UShortcutAssetSubsystem* Subsystem = GEditor->GetEditorSubsystem<UShortcutAssetSubsystem>();
 	if (Subsystem)
 	{
-		TArray<OBJECT_PTR(UObject)> ObjectsToEdit;
+		TArray<UObject*> ObjectsToEdit;
 		OwningAssetEditor->GetObjectsToEdit(ObjectsToEdit);
-		Subsystem->NotifyShortcutAssetEditorClosed(ObjectsToEdit);
+
+		TArray<OBJECT_PTR(UObject)> ObjectsToEditWithObjectPtr;
+		for (auto& O : ObjectsToEdit)
+		{
+			ObjectsToEditWithObjectPtr.Add(O);
+		}
+		Subsystem->NotifyShortcutAssetEditorClosed(ObjectsToEditWithObjectPtr);
 	}
 }
 
@@ -105,7 +111,13 @@ void FShortcutAssetEditorToolkit::RegisterTabSpawners(const TSharedRef<FTabManag
 	InTabManager->RegisterTabSpawner(TabID, FOnSpawnTab::CreateSP(this, &FShortcutAssetEditorToolkit::HandleTabManagerSpawnTab, TabID))
 		.SetDisplayName(LOCTEXT("ShortcutEditorTabName", "Shortcut Editor"))
 		.SetGroup(WorkspaceMenuCategory.ToSharedRef())
-		.SetIcon(FSlateIcon(FEditorStyle::GetStyleSetName(), "LevelEditor.Tabs.Viewports"));
+		.SetIcon(FSlateIcon(
+#if UE_VERSION_NEWER_THAN(5, 1, 0)
+			FAppStyle::GetAppStyleSetName(), "LevelEditor.Tabs.Viewports")
+#else
+			FEditorStyle::GetStyleSetName(), "LevelEditor.Tabs.Viewports")
+#endif
+		);
 	// clang-format on
 }
 

ShortcutAsset/Source/ShortcutAsset/Private/ShortcutAssetUtils.cpp

@@ -10,7 +10,9 @@
 #include "ShortcutAssetUtils.h"
 
 #include "AssetRegistry/AssetRegistryModule.h"
+#include "Misc/EngineVersionComparison.h"
 #include "Misc/MessageDialog.h"
+#include "ShortcutAsset.h"
 
 #define LOCTEXT_NAMESPACE "ShortcutAsset"
 
@@ -25,15 +27,23 @@ bool ReachFreeVersionLimitation(bool bIsCreateNew)
 	FAssetRegistryModule& AssetRegistryModule = FModuleManager::LoadModuleChecked<FAssetRegistryModule>(FName("AssetRegistry"));
 	FARFilter Filter;
 	TArray<FAssetData> AssetData;
+#if UE_VERSION_NEWER_THAN(5, 1, 0)
+	Filter.ClassPaths.Add(UShortcutAsset::StaticClass()->GetClassPathName());
+#else
 	Filter.ClassNames.Add(UShortcutAsset::StaticClass()->GetFName());
+#endif
 
 	AssetRegistryModule.Get().GetAssets(Filter, AssetData);
 	if (AssetData.Num() >= MaxAssets)
 	{
 		FText TitleText = LOCTEXT("Title", "Reached Free Version Limitation");
 		FText MessageText =
 			LOCTEXT("Message", "Free version can only create up to 3 assets.\nDo you want to open the marketplace of this plugin?");
+#if UE_VERSION_OLDER_THAN(5, 4, 0)
 		if (FMessageDialog::Open(EAppMsgType::OkCancel, MessageText, &TitleText) == EAppReturnType::Ok)
+#else
+		if (FMessageDialog::Open(EAppMsgType::OkCancel, MessageText, TitleText) == EAppReturnType::Ok)
+#endif
 		{
 			FPlatformProcess::LaunchURL(
 				TEXT("https://forums.unrealengine.com/t/how-to-open-a-browser-from-the-game/24346/3"), NULL, NULL);

tools/remove_code.sh

@@ -6,7 +6,7 @@ set -eEu
 
 SUPPORTED_VERSIONS=(
     "4.26.0" "4.27.0"
-    "5.0.0" "5.1.0" "5.2.0" "5.3.0"
+    "5.0.0" "5.1.0" "5.2.0" "5.3.0" "5.4.0"
 )
 
 function usage() {

tools/replace_engine_version.sh

@@ -6,7 +6,7 @@ set -eEu
 
 SUPPORTED_VERSIONS=(
     "4.26.0" "4.27.0"
-    "5.0.0" "5.1.0" "5.2.0" "5.3.0"
+    "5.0.0" "5.1.0" "5.2.0" "5.3.0" "5.4.0"
 )
 
 function usage() {
@@ -34,6 +34,6 @@ if [ ${supported} -eq 0 ]; then
 fi
 
 for file in `find ${source_dir} -name "*.uplugin"`; do
-    sed -i -e "s/\"EngineVersion\": \"5.3.0\",/\"EngineVersion\": \"${engine_version}\",/g" ${file}
+    sed -i -e "s/\"EngineVersion\": \"5.4.0\",/\"EngineVersion\": \"${engine_version}\",/g" ${file}
     echo "Replaced engine version in ${file}"
 done