Merge branch '5.1' into 5.2_dev

Author: pavlicekdominik

Content/Example/BP_InteractionExample_Character.uasset

@@ -1032,6 +1032,8 @@ void UActorInteractorComponentBase::SetState_Server_Implementation(const EIntera
 
 void UActorInteractorComponentBase::PostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent)
 {
+	Super::PostEditChangeChainProperty(PropertyChangedEvent);
+	
 	const FName PropertyName = (PropertyChangedEvent.MemberProperty != nullptr) ? PropertyChangedEvent.GetPropertyName() : NAME_None;
 
 	FString InteractorName = GetName();

Content/Input/IA_Jump.uasset

@@ -59,7 +59,9 @@ public ActorInteractionPluginEditor(ReadOnlyTargetRules Target) : base(Target)
 				"ToolMenus",
 				"InputCore",
 
-				"UMG"
+				"UMG",
+				
+				"GameplayTags"
 			}
 		);
 

Content/Input/IA_Look.uasset

@@ -13,6 +13,7 @@
 #include "AssetActions/InteractableComponentAssetActions.h"
 
 #include "AssetToolsModule.h"
+#include "GameplayTagsManager.h"
 #include "HttpModule.h"
 #include "HelpButton/AIntPCommands.h"
 #include "HelpButton/AIntPHelpStyle.h"
@@ -28,21 +29,23 @@
 
 #include "Interfaces/IMainFrameModule.h"
 #include "Serialization/JsonReader.h"
+#include "Settings/MounteaInteractionEditorSettings.h"
 
 DEFINE_LOG_CATEGORY(ActorInteractionPluginEditor);
 
-static const FName AIntPHelpTabName("MounteaFramework");
-
 const FString ChangelogURL = FString("https://raw.githubusercontent.com/Mountea-Framework/MounteaInteractionSystem/5.1/CHANGELOG.md");
 
 #define LOCTEXT_NAMESPACE "FActorInteractionPluginEditor"
 
+static const FName MenuName("LevelEditor.LevelEditorToolBar.PlayToolBar");
+
 void FActorInteractionPluginEditor::StartupModule()
 {
-	// Try to request Changelog from GitHub
+	// Try to request Changelog from GitHub & GameplayTags
 	{
 		Http = &FHttpModule::Get();
 		SendHTTPGet();
+		SendHTTPGet_Tags();
 	}
 
 	// Register Category
@@ -158,7 +161,7 @@ void FActorInteractionPluginEditor::StartupModule()
 		}
 	}
 
-	// Register Help Button
+	// Register Menu Button
 	{
 		FAIntPHelpStyle::Initialize();
 		FAIntPHelpStyle::ReloadTextures();
@@ -257,7 +260,108 @@ void FActorInteractionPluginEditor::HandleNewInteractableBlueprintCreated(UBluep
 	Blueprint->BroadcastChanged();
 }
 
-void FActorInteractionPluginEditor::PluginButtonClicked()
+bool FActorInteractionPluginEditor::DoesHaveValidTags() const
+{
+	if (!GConfig) return false;
+	
+	const FString PluginDirectory = IPluginManager::Get().FindPlugin(TEXT("ActorInteractionPlugin"))->GetBaseDir();
+	const FString ConfigFilePath = PluginDirectory + "/Config/Tags/MounteaInteractionSystemTags.ini";
+	FString NormalizedConfigFilePath = FConfigCacheIni::NormalizeConfigIniPath(ConfigFilePath);
+	
+	if (FPaths::FileExists(ConfigFilePath))
+	{
+		return GConfig->Find(NormalizedConfigFilePath) != nullptr;
+	}
+	
+	return false;
+}
+
+void FActorInteractionPluginEditor::RefreshGameplayTags()
+{
+	TSharedPtr<IPlugin> ThisPlugin = IPluginManager::Get().FindPlugin(TEXT("ActorInteractionPlugin"));
+	check(ThisPlugin.IsValid());
+	
+	UGameplayTagsManager::Get().EditorRefreshGameplayTagTree();
+}
+
+void FActorInteractionPluginEditor::UpdateTagsConfig(const FString& NewContent)
+{
+	if (!GConfig) return;
+
+	const FString PluginDirectory = IPluginManager::Get().FindPlugin(TEXT("ActorInteractionPlugin"))->GetBaseDir();
+	const FString ConfigFilePath = PluginDirectory + "/Config/Tags/MounteaInteractionSystemTags.ini";
+
+	FConfigFile* CurrentConfig = GConfig->Find(ConfigFilePath);
+
+	FString CurrentContent;
+	CurrentConfig->WriteToString(CurrentContent);
+
+	TArray<FString> Lines;
+	NewContent.ParseIntoArray(Lines, TEXT("\n"), true);
+
+	TArray<FString> CleanedLines;
+	for (FString& Itr : Lines)
+	{
+		if (Itr.Equals("[/Script/GameplayTags.GameplayTagsList]")) continue;
+
+		if (Itr.Contains("GameplayTagList="))
+		{
+			FString NewValue = Itr.Replace(TEXT("GameplayTagList="), TEXT(""));
+
+			CleanedLines.Add(NewValue);
+		}
+	}
+
+	if (!CurrentContent.Equals(NewContent))
+	{
+		TArray<FString> CurrentLines;
+		FConfigFile NewConfig;
+		NewConfig.SetArray(TEXT("/Script/GameplayTags.GameplayTagsList"), TEXT("GameplayTagList"), CleanedLines);
+		CurrentConfig->GetArray(TEXT("/Script/GameplayTags.GameplayTagsList"), TEXT("GameplayTagList"), CurrentLines);
+
+		for (const FString& Itr : CleanedLines)
+		{
+			if (CurrentLines.Contains(Itr)) continue;
+
+			CurrentLines.AddUnique(Itr);
+		}
+
+		CurrentConfig->SetArray(TEXT("/Script/GameplayTags.GameplayTagsList"), TEXT("GameplayTagList"), CurrentLines);
+		CurrentConfig->Write(ConfigFilePath);
+
+		RefreshGameplayTags();
+	}
+}
+
+void FActorInteractionPluginEditor::CreateTagsConfig(const FString& NewContent)
+{
+	if (!GConfig) return;
+
+	const FString PluginDirectory = IPluginManager::Get().FindPlugin(TEXT("ActorInteractionPlugin"))->GetBaseDir();
+	const FString ConfigFilePath = PluginDirectory + "/Config/Tags/MounteaInteractionSystemTags.ini";
+
+	TArray<FString> Lines;
+	NewContent.ParseIntoArray(Lines, TEXT("\n"), true);
+
+	TArray<FString> CleanedLines;
+	for (FString& Itr : Lines)
+	{
+		if (Itr.Equals("[/Script/GameplayTags.GameplayTagsList]")) continue;
+
+		if (Itr.Contains("GameplayTagList="))
+		{
+			FString NewValue = Itr.Replace(TEXT("GameplayTagList="), TEXT(""));
+
+			CleanedLines.Add(NewValue);
+		}
+	}
+	
+	FConfigFile NewConfig;
+	NewConfig.SetArray(TEXT("/Script/GameplayTags.GameplayTagsList"), TEXT("GameplayTagList"), CleanedLines);
+	NewConfig.Write(ConfigFilePath);
+}
+
+void FActorInteractionPluginEditor::PluginButtonClicked() const
 {
 	const FString URL = "https://discord.gg/waYT2cn37z"; // Interaction Specific Link
 
@@ -267,46 +371,124 @@ void FActorInteractionPluginEditor::PluginButtonClicked()
 	}
 }
 
+void FActorInteractionPluginEditor::WikiButtonClicked() const
+{
+	const FString URL = "https://github.com/Mountea-Framework/MounteaInteractionSystem/wiki/How-to-Setup-Interaction";
+
+	if (!URL.IsEmpty())
+	{
+		FPlatformProcess::LaunchURL(*URL, nullptr, nullptr);
+	}
+}
+
+void FActorInteractionPluginEditor::DialoguerButtonClicked() const
+{
+	const FString URL = "https://mountea-framework.github.io/MounteaDialoguer/";
+
+	if (!URL.IsEmpty())
+	{
+		FPlatformProcess::LaunchURL(*URL, nullptr, nullptr);
+	}
+}
+
 void FActorInteractionPluginEditor::RegisterMenus()
 {
 	// Owner will be used for cleanup in call to UToolMenus::UnregisterOwner
 	FToolMenuOwnerScoped OwnerScoped(this);
 
 	// Register in Window tab
 	{
-		UToolMenu* Menu = UToolMenus::Get()->ExtendMenu("LevelEditor.MainMenu.Help");
+		if (UToolMenu* Menu = UToolMenus::Get()->ExtendMenu("LevelEditor.MainMenu.Help"))
 		{
-			FToolMenuSection& Section = Menu->FindOrAddSection("MounteaFramework");
-			Section.Label = FText::FromString(TEXT("Mountea Framework"));
-						
-			FToolMenuEntry Entry = Section.AddMenuEntryWithCommandList
-			(
-				FAIntPCommands::Get().PluginAction,
-				PluginCommands,
-				NSLOCTEXT("MounteaSupport", "TabTitle", "Mountea Support"),
-				NSLOCTEXT("MounteaSupport", "TooltipText", "Opens Mountea Framework Support channel"),
-				FSlateIcon(FAIntPHelpStyle::GetStyleSetName(), "AIntPSupport.PluginAction.small")
-			);
+			if (Menu->ContainsSection("MounteaFramework") == false)
+			{
+				FToolMenuSection& Section = Menu->FindOrAddSection("MounteaFramework");
+				
+				Section.InsertPosition.Position = EToolMenuInsertType::First;
+				Section.Label = FText::FromString(TEXT("Mountea Framework"));
+				
+				FToolMenuEntry SupportEntry = Section.AddMenuEntryWithCommandList
+				(
+					FAIntPCommands::Get().PluginAction,
+					PluginCommands,
+					LOCTEXT("MounteaSystemEditor_SupportButton_Label", "Mountea Support"),
+					LOCTEXT("MounteaSystemEditor_SupportButton_ToolTip", "🆘 Open Mountea Framework Support channel"),
+					FSlateIcon(FAIntPHelpStyle::GetStyleSetName(), "AIntPStyleSet.Help")
+				);
+				SupportEntry.Name = FName("MounteaFrameworkSupport");
+			}
 		}
 	}
 
 	// Register in Level Editor Toolbar
 	{
-		UToolMenu* ToolbarMenu = UToolMenus::Get()->ExtendMenu("LevelEditor.LevelEditorToolBar.PlayToolBar");
+		UToolMenu* ToolbarMenu = UToolMenus::Get()->ExtendMenu(MenuName);
 		{
-			FToolMenuSection& Section = ToolbarMenu->FindOrAddSection("MounteaFramework");
-			{
-				Section.Label = FText::FromString(TEXT("Mountea Framework"));
-				
-				FToolMenuEntry& Entry = Section.AddEntry(FToolMenuEntry::InitToolBarButton(FAIntPCommands::Get().PluginAction));
-				Entry.SetCommandList(PluginCommands);
-				
-				Entry.InsertPosition.Position = EToolMenuInsertType::First;
-			}
+			ToolbarMenu->RemoveSection("MounteaFramework"); // Cleanup
+			FToolMenuEntry& Entry = ToolbarMenu->FindOrAddSection("MounteaFramework")
+				.AddEntry(FToolMenuEntry::InitComboButton(
+					"MounteaMenu",
+					FUIAction(),
+					FOnGetContent::CreateRaw(this, &FActorInteractionPluginEditor::MakeMounteaMenuWidget),
+					LOCTEXT("MounteaMainMenu_Label", "Mountea Framework"),
+					LOCTEXT("MounteaMainMenu_Tooltip", "📂 Open Mountea Framework menu.\n\n❔ Provides link to Documentation, Support Discord and Dialogue tool."),
+					FSlateIcon(FAIntPHelpStyle::Get().GetStyleSetName(), "AIntPStyleSet.Dialoguer"),
+					false,
+					"MounteaMenu"
+				));
+			
+			Entry.Label = LOCTEXT("MounteaFramework_Label", "Mountea Framework");
+			Entry.Name = TEXT("MounteaMenu");
+			Entry.StyleNameOverride = "CalloutToolbar";
+			Entry.SetCommandList(PluginCommands);
 		}
 	}
 }
 
+TSharedRef<SWidget> FActorInteractionPluginEditor::MakeMounteaMenuWidget() const
+{
+	FMenuBuilder MenuBuilder(true, PluginCommands);
+
+	MenuBuilder.BeginSection("MounteaMenu_Links", LOCTEXT("MounteaMenuOptions_Options", "Mountea Links"));
+	{
+		// Support Entry
+		MenuBuilder.AddMenuEntry(
+			LOCTEXT("MounteaSystemEditor_SupportButton_Label", "Mountea Support"),
+			LOCTEXT("MounteaSystemEditor_SupportButton_ToolTip", "🆘 Open Mountea Framework Support channel"),
+			FSlateIcon(FAIntPHelpStyle::GetStyleSetName(), "AIntPStyleSet.Help"),
+			FUIAction(
+				FExecuteAction::CreateRaw(this, &FActorInteractionPluginEditor::PluginButtonClicked)
+			)
+		);
+		// Wiki Entry
+		MenuBuilder.AddMenuEntry(
+			LOCTEXT("MounteaSystemEditor_WikiButton_Label", "Mountea Wiki"),
+			LOCTEXT("MounteaSystemEditor_WikiButton_ToolTip", "📖 Open Mountea Framework Documentation"),
+			FSlateIcon(FAIntPHelpStyle::GetStyleSetName(), "AIntPStyleSet.Wiki"),
+			FUIAction(
+				FExecuteAction::CreateRaw(this, &FActorInteractionPluginEditor::WikiButtonClicked)
+			)
+		);
+	}
+	MenuBuilder.EndSection();
+
+	MenuBuilder.BeginSection("MounteaMenu_Tools", LOCTEXT("MounteaMenuOptions_Tools", "Mountea Tools"));
+	{
+		// Dialoguer Entry
+		MenuBuilder.AddMenuEntry(
+			LOCTEXT("MounteaSystemEditor_DialoguerButton_Label", "Mountea Dialoguer"),
+			LOCTEXT("MounteaSystemEditor_DialoguerButton_ToolTip", "⛰ Open Mountea Dialoguer Standalone Tool\n\n❔ Mountea Dialoguer is a standalone tool created for Dialogue crafting. Mountea Dialogue System supports native import for `.mnteadlg` files."),
+			FSlateIcon(FAIntPHelpStyle::GetStyleSetName(), "AIntPStyleSet.Dialoguer"),
+			FUIAction(
+				FExecuteAction::CreateRaw(this, &FActorInteractionPluginEditor::DialoguerButtonClicked)
+			)
+		);
+	}
+	MenuBuilder.EndSection();
+
+	return MenuBuilder.MakeWidget();
+}
+
 void FActorInteractionPluginEditor::OnGetResponse(FHttpRequestPtr Request, FHttpResponsePtr Response, bool bWasSuccessful)
 {
 	FString ResponseBody;
@@ -337,6 +519,33 @@ void FActorInteractionPluginEditor::SendHTTPGet()
 	Request->ProcessRequest();
 }
 
+void FActorInteractionPluginEditor::OnGetResponse_Tags(FHttpRequestPtr Request, FHttpResponsePtr Response, bool bWasSuccessful)
+{
+	
+}
+
+void FActorInteractionPluginEditor::SendHTTPGet_Tags()
+{
+	const UMounteaInteractionEditorSettings* Settings = GetDefault<UMounteaInteractionEditorSettings>();
+	if (DoesHaveValidTags())
+	{
+		if (!Settings->AllowCheckTagUpdate())
+		{
+			return;
+		}
+	}
+	
+	const TSharedRef<IHttpRequest, ESPMode::ThreadSafe> Request = Http->CreateRequest();
+	
+	Request->OnProcessRequestComplete().BindRaw(this, &FActorInteractionPluginEditor::OnGetResponse_Tags);
+	Request->SetURL(Settings->GetGameplayTagsURL());
+
+	Request->SetVerb("GET");
+	Request->SetHeader("User-Agent", "X-UnrealEngine-Agent");
+	Request->SetHeader("Content-Type", "text");
+	Request->ProcessRequest();
+}
+
 #undef LOCTEXT_NAMESPACE
 
 IMPLEMENT_MODULE(FActorInteractionPluginEditor, ActorInteractionPluginEditor);

Content/Input/IA_Move.uasset

@@ -50,6 +50,7 @@ FName FAIntPHelpStyle::GetStyleSetName()
 #define TTF_FONT( RelativePath, ... ) FSlateFontInfo( Style->RootToContentDir( RelativePath, TEXT(".ttf") ), __VA_ARGS__ )
 #define OTF_FONT( RelativePath, ... ) FSlateFontInfo( Style->RootToContentDir( RelativePath, TEXT(".otf") ), __VA_ARGS__ )
 
+const FVector2D Icon12x12(12.0f, 12.0f);
 const FVector2D Icon16x16(16.0f, 16.0f);
 const FVector2D Icon20x20(20.0f, 20.0f);
 const FVector2D Icon40x40(40.0f, 40.0f);
@@ -59,8 +60,23 @@ TSharedRef<FSlateStyleSet> FAIntPHelpStyle::Create()
 	TSharedRef< FSlateStyleSet > Style = MakeShareable(new FSlateStyleSet("AIntPHelpStyle"));
 	Style->SetContentRoot(IPluginManager::Get().FindPlugin("ActorInteractionPlugin")->GetBaseDir() / TEXT("Resources"));
 
-	Style->Set("AIntPSupport.PluginAction", new IMAGE_BRUSH(TEXT("Mountea_Logo"), Icon40x40));
-	Style->Set("AIntPSupport.PluginAction.small", new IMAGE_BRUSH(TEXT("HelpIcon"), Icon20x20));
+	Style->Set("AIntPStyleSet.PluginAction", new IMAGE_BRUSH(TEXT("Mountea_Logo"), Icon40x40));
+	Style->Set("AIntPStyleSet.PluginAction.Small", new IMAGE_BRUSH(TEXT("Help_Icon"), Icon20x20));
+
+	Style->Set("AIntPStyleSet.Help.Small", new IMAGE_BRUSH(TEXT("Help_Icon"), Icon16x16));
+	Style->Set("AIntPStyleSet.Help", new IMAGE_BRUSH(TEXT("Help_Icon"), Icon40x40));
+
+	Style->Set("AIntPStyleSet.Dialoguer.Small", new IMAGE_BRUSH(TEXT("Dialoguer_Icon"), Icon16x16));
+	Style->Set("AIntPStyleSet.Dialoguer", new IMAGE_BRUSH(TEXT("Dialoguer_Icon"), Icon40x40));
+
+	Style->Set("AIntPStyleSet.Wiki.Small", new IMAGE_BRUSH(TEXT("Wiki_Icon"), Icon16x16));
+	Style->Set("AIntPStyleSet.Wiki", new IMAGE_BRUSH(TEXT("Wiki_Icon"), Icon40x40));
+
+	Style->Set("AIntPStyleSet.Icon.Close", new IMAGE_BRUSH(TEXT("CloseIcon"), Icon16x16));
+	Style->Set("AIntPStyleSet.Icon.SupportDiscord", new IMAGE_BRUSH(TEXT("Help_Icon"), Icon16x16));
+	Style->Set("AIntPStyleSet.Icon.HeartIcon", new IMAGE_BRUSH(TEXT("HeartIcon"), Icon16x16));
+	Style->Set("AIntPStyleSet.Icon.UBIcon", new IMAGE_BRUSH(TEXT("UnrealBucketIcon"), Icon16x16));
+	Style->Set("AIntPStyleSet.Icon.MoneyIcon", new IMAGE_BRUSH(TEXT("MoneyIcon"), Icon16x16));
 
 	return Style;
 }

Content/Input/IMC_Default.uasset

@@ -5,7 +5,7 @@
 #include "CoreMinimal.h"
 #include "Styling/SlateStyle.h"
 
-class FAIntPHelpStyle
+class FAIntPHelpStyle : public FAppStyle
 {
 public: