Merge branch '5.4_dev' into 5.4

pavlicekdominik · pavlicekdominik · commit f8310b472cc1 · 2025-06-22T20:19:02.000+02:00
diff --git a/ActorInteractionPlugin.uplugin b/ActorInteractionPlugin.uplugin
@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 4,
-	"VersionName": "4.2.3.54",
+	"VersionName": "4.2.4.54",
 	"FriendlyName": "Mountea Interaction System",
 	"Description": "Mountea Interaction System is an Open-source Mountea Framework components-based simple framework providing utilities for smart Actor Interaction with other Actors.\nDeveloped with Game Developers in mind to allow as easy as possible implementation while maintaining high scalability and diverse options to tweak everything.",
 	"Category": "Mountea Framework",
@@ -12,8 +12,6 @@
 	"SupportURL": "https://bit.ly/DominikPavlicek_SupportServer",
 	"EngineVersion": "5.4.0",
 	"CanContainContent": true,
-	"IsBetaVersion": false,
-	"IsExperimentalVersion": false,
 	"Installed": true,
 	"Modules": [
 		{
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-Current Version: 4.2.3.54
+Current Version: 4.2.3.52
 
 # Changelog
 
diff --git a/Resources/FolderIcon.png b/Resources/FolderIcon.png
diff --git a/Resources/LevelIcon.png b/Resources/LevelIcon.png
diff --git a/Source/ActorInteractionPlugin/Private/Components/Interactable/ActorInteractableComponentBase.cpp b/Source/ActorInteractionPlugin/Private/Components/Interactable/ActorInteractableComponentBase.cpp
@@ -1270,16 +1270,9 @@ void UActorInteractableComponentBase::InteractorFound_Implementation(const TScri
 		if (Execute_CanBeTriggered(this))
 		{
 			Execute_SetInteractor(this, FoundInteractor);
-		
-			if (UMounteaInteractionSystemBFL::CanExecuteCosmeticEvents(GetWorld()))
-			{
-				ProcessToggleActive(true);
-			}
-			else
-			{
-				InteractorFound_Client(FoundInteractor);
-				ProcessToggleActive_Client(true);
-			}
+			
+			InteractorFound_Client(FoundInteractor);
+			ProcessToggleActive_Client(true);
 		
 			Execute_OnInteractorFoundEvent(this, FoundInteractor);
 		}
@@ -1303,8 +1296,6 @@ void UActorInteractableComponentBase::InteractorLost_Implementation(const TScrip
 	
 	GetWorld()->GetTimerManager().ClearTimer(Timer_Interaction);
 	GetWorld()->GetTimerManager().ClearTimer(Timer_ProgressExpiration);
-
-	//GetWorld()->GetTimerManager().ClearTimer(Timer_Cooldown);
 		
 	if (GetOwner() && GetOwner()->HasAuthority())
 	{
@@ -1540,19 +1531,19 @@ void UActorInteractableComponentBase::InteractionCooldownCompleted_Implementatio
 	{		
 		if (Interactor->Execute_GetActiveInteractable(Interactor.GetObject()) == this)
 		{
-			ProcessToggleActive(true);
+			ProcessToggleActive_Client(true);
 			
 			Execute_SetState(this, EInteractableStateV2::EIS_Awake);
 		}
 		else
 		{
-			ProcessToggleActive(false);
+			ProcessToggleActive_Client(false);
 			Execute_SetState(this, DefaultInteractableState);
 		}
 	}
 	else
 	{
-		ProcessToggleActive(false);
+		ProcessToggleActive_Client(false);
 		Execute_SetState(this, DefaultInteractableState);
 	}
 	
diff --git a/Source/ActorInteractionPlugin/Private/Components/Interactable/ActorInteractableComponentMash.cpp b/Source/ActorInteractionPlugin/Private/Components/Interactable/ActorInteractableComponentMash.cpp
@@ -55,7 +55,16 @@ void UActorInteractableComponentMash::OnInteractionCompletedCallback()
 		if (Execute_TriggerCooldown(this)) return;
 	}
 	
-	OnInteractionCompleted.Broadcast(GetWorld()->GetTimeSeconds(), Execute_GetInteractor(this));
+	if (ActualMashAmount >= MinMashAmountRequired)
+	{
+		OnInteractionCompleted.Broadcast(GetWorld()->GetTimeSeconds(), Execute_GetInteractor(this));
+	}
+	else
+	{
+		OnInteractionFailed.Broadcast();
+	}
+
+	CleanupComponent();
 }
 
 void UActorInteractableComponentMash::CleanupComponent()
@@ -133,20 +142,6 @@ void UActorInteractableComponentMash::InteractionCanceled_Implementation()
 	CleanupComponent();
 }
 
-void UActorInteractableComponentMash::InteractionCompleted_Implementation(const float& TimeCompleted, const TScriptInterface<IActorInteractorInterface>& CausingInteractor)
-{
-	if (ActualMashAmount >= MinMashAmountRequired)
-	{
-		Super::InteractionCompleted_Implementation(TimeCompleted, CausingInteractor);
-	}
-	else
-	{
-		OnInteractionFailed.Broadcast();
-	}
-
-	CleanupComponent();
-}
-
 int32 UActorInteractableComponentMash::GetMinMashAmountRequired() const
 { return MinMashAmountRequired; }
 
diff --git a/Source/ActorInteractionPlugin/Private/Helpers/MounteaInteractionSystemBFL.cpp b/Source/ActorInteractionPlugin/Private/Helpers/MounteaInteractionSystemBFL.cpp
@@ -251,4 +251,4 @@ bool UMounteaInteractionSystemBFL::IsInputKeyPairSupported(APlayerController* Pl
 	}
 
 	return false;
-}
+}
diff --git a/Source/ActorInteractionPlugin/Public/Components/Interactable/ActorInteractableComponentMash.h b/Source/ActorInteractionPlugin/Public/Components/Interactable/ActorInteractableComponentMash.h
@@ -36,7 +36,6 @@ class ACTORINTERACTIONPLUGIN_API UActorInteractableComponentMash : public UActor
 	virtual void InteractionStarted_Implementation(const float& TimeStarted, const TScriptInterface<IActorInteractorInterface>& CausingInteractor) override;
 	virtual void InteractionStopped_Implementation(const float& TimeStarted, const TScriptInterface<IActorInteractorInterface>& CausingInteractor) override;
 	virtual void InteractionCanceled_Implementation() override;
-	virtual void InteractionCompleted_Implementation(const float& TimeCompleted, const TScriptInterface<IActorInteractorInterface>& CausingInteractor) override;
 
 protected:
 	
diff --git a/Source/ActorInteractionPluginEditor/Private/ActorInteractionPluginEditor.cpp b/Source/ActorInteractionPluginEditor/Private/ActorInteractionPluginEditor.cpp
@@ -13,8 +13,11 @@
 #include "AssetActions/InteractableComponentAssetActions.h"
 
 #include "AssetToolsModule.h"
+#include "ContentBrowserModule.h"
+#include "FileHelpers.h"
 #include "GameplayTagsManager.h"
 #include "HttpModule.h"
+#include "IContentBrowserSingleton.h"
 #include "HelpButton/AIntPCommands.h"
 #include "HelpButton/AIntPHelpStyle.h"
 #include "Kismet2/KismetEditorUtilities.h"
@@ -28,6 +31,7 @@
 #include "WorkspaceMenuStructure.h"
 #include "WorkspaceMenuStructureModule.h"
 #include "HelpButton/InteractionSystemTutorialPage.h"
+#include "Helpers/MounteaInteractionSystemEditorLog.h"
 #include "Interfaces/IHttpResponse.h"
 
 #include "Interfaces/IMainFrameModule.h"
@@ -36,7 +40,7 @@
 
 DEFINE_LOG_CATEGORY(ActorInteractionPluginEditor);
 
-const FString ChangelogURL = FString("https://raw.githubusercontent.com/Mountea-Framework/MounteaInteractionSystem/5.1/CHANGELOG.md");
+const FString ChangelogURL = FString("https://raw.githubusercontent.com/Mountea-Framework/MounteaInteractionSystem/master/CHANGELOG.md");
 
 #define LOCTEXT_NAMESPACE "FActorInteractionPluginEditor"
 
@@ -519,13 +523,43 @@ TSharedRef<SWidget> FActorInteractionPluginEditor::MakeMounteaMenuWidget() const
 		FSlateIcon(FAIntPHelpStyle::GetStyleSetName(), "AIntPStyleSet.Tutorial"),
 		FUIAction(
 			FExecuteAction::CreateRaw(this, &FActorInteractionPluginEditor::TutorialButtonClicked)
-	)
-);
+			)
+		);
+		
+		MenuBuilder.AddMenuEntry(
+        		LOCTEXT("MounteaSystemEditor_OpenExampleLevel_Label", "Open Example Level"),
+        		LOCTEXT("MounteaSystemEditor_OpenExampleLevel_ToolTip", "🌄 Opens an example level demonstrating Mountea Interaction System"),
+        		FSlateIcon(FAIntPHelpStyle::GetStyleSetName(), "AIntPStyleSet.Level"),
+        		FUIAction(
+        			FExecuteAction::CreateLambda([]()
+        			{
+        				const FString mapPath = TEXT("/ActorInteractionPlugin/Example/M_Example");
+						if (FPackageName::DoesPackageExist(mapPath))
+							FEditorFileUtils::LoadMap(mapPath, false, true);
+        				else
+        					EDITOR_LOG_ERROR(TEXT("Example map not found at:\nContent/Mountea/Maps/ExampleMap.umap"))
+        			})
+        		)
+        	);
 
+		MenuBuilder.AddMenuEntry(
+			LOCTEXT("MounteaSystemEditor_OpenPluginFolder_Label", "Open Plugin Folder"),
+			LOCTEXT("MounteaSystemEditor_OpenPluginFolder_ToolTip", "📂 Open the Mountea plugin's folder on disk"),
+			FSlateIcon(FAIntPHelpStyle::GetStyleSetName(), "AIntPStyleSet.Folder"),
+			FUIAction(
+				FExecuteAction::CreateLambda([]()
+				{
+					const FContentBrowserModule& contentBrowserModule = FModuleManager::LoadModuleChecked<FContentBrowserModule>("ContentBrowser");
+					TArray<FString> folderPaths;
+					folderPaths.Add(TEXT("/ActorInteractionPlugin"));
+					contentBrowserModule.Get().SetSelectedPaths(folderPaths, true);
+				})
+			)
+		);
 	};
 	MenuBuilder.EndSection();
 	
-	MenuBuilder.BeginSection("MounteaMenu_Tools", LOCTEXT("MounteaMenuOptions_Settings", "Mountea Interaction Settings"));
+	MenuBuilder.BeginSection("MounteaMenu_Settings", LOCTEXT("MounteaMenuOptions_Settings", "Mountea Interaction Settings"));
 	{
 		MenuBuilder.AddMenuEntry(
 			LOCTEXT("MounteaSystemEditor_SettingsButton_Label", "Mountea Interaction Settings"),
diff --git a/Source/ActorInteractionPluginEditor/Private/HelpButton/AIntPHelpStyle.cpp b/Source/ActorInteractionPluginEditor/Private/HelpButton/AIntPHelpStyle.cpp
@@ -88,6 +88,9 @@ TSharedRef<FSlateStyleSet> FAIntPHelpStyle::Create()
 	Style->Set("AIntPStyleSet.Icon.MoneyIcon", new IMAGE_BRUSH(TEXT("MoneyIcon"), Icon16x16));
 
 	Style->Set("AIntPStyleSet.Tutorial", new IMAGE_BRUSH(TEXT("tutorialPage_icon"), Icon40x40));
+
+	Style->Set("AIntPStyleSet.Level", new IMAGE_BRUSH(TEXT("LevelIcon"), Icon40x40));
+	Style->Set("AIntPStyleSet.Folder", new IMAGE_BRUSH(TEXT("FolderIcon"), Icon40x40));
 	return Style;
 }
 
diff --git a/Source/ActorInteractionPluginEditor/Private/Popup/AIntPPopup.cpp b/Source/ActorInteractionPluginEditor/Private/Popup/AIntPPopup.cpp
@@ -102,6 +102,23 @@ void AIntPPopup::FormatTextWithTags(FString& SourceText, const FString& StartMar
 	}
 }
 
+bool AIntPPopup::IsVersionGreater(const FString& NewVersion, const FString& OldVersion)
+{
+	TArray<FString> NewParts, OldParts;
+	NewVersion.ParseIntoArray(NewParts, TEXT("."), true);
+	OldVersion.ParseIntoArray(OldParts, TEXT("."), true);
+	while (NewParts.Num() < 4) NewParts.Add(TEXT("0"));
+	while (OldParts.Num() < 4) OldParts.Add(TEXT("0"));
+	for (int32 i = 0; i < 4; ++i)
+	{
+		int32 NewNum = FCString::Atoi(*NewParts[i]);
+		int32 OldNum = FCString::Atoi(*OldParts[i]);
+		if (NewNum > OldNum) return true;
+		if (NewNum < OldNum) return false;
+	}
+	return false;
+}
+
 MounteaInteractionSystemPopup::FPluginVersion AIntPPopup::GetPluginVersion()
 {
 	const FName PluginName = TEXT("ActorInteractionPlugin");
@@ -160,8 +177,8 @@ void AIntPPopup::Register(const FString& Changelog)
 		
 		CurrentPluginVersion = ChangelogVersion;
 	}
-	
-	if (AIntPPopupConfig->PluginVersionUpdate != CurrentPluginVersion)
+
+	if (IsVersionGreater(CurrentPluginVersion, AIntPPopupConfig->PluginVersionUpdate))
 	{
 		AIntPPopupConfig->PluginVersionUpdate = CurrentPluginVersion;
 		AIntPPopupConfig->SaveConfig(CPF_Config, *NormalizedConfigFilePath);
diff --git a/Source/ActorInteractionPluginEditor/Private/Popup/AIntPPopup.h b/Source/ActorInteractionPluginEditor/Private/Popup/AIntPPopup.h
@@ -23,6 +23,7 @@ class AIntPPopup
 
 	static void		FormatChangelog(FString& InChangelog);
 	static void		FormatTextWithTags(FString& SourceText, const FString& StartMarker, const FString& EndMarker, const FString& StartTag, const FString& EndTag);
-
+	static bool		IsVersionGreater(const FString& NewVersion, const FString& OldVersion);
+	
 	static MounteaInteractionSystemPopup::FPluginVersion GetPluginVersion();
 };

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Current Version: 4.2.3.54`
	`1`	`+Current Version: 4.2.3.52`
`2`	`2`
`3`	`3`	`# Changelog`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1270,16 +1270,9 @@ void UActorInteractableComponentBase::InteractorFound_Implementation(const TScri`
`1270`	`1270`	`if (Execute_CanBeTriggered(this))`
`1271`	`1271`	`{`
`1272`	`1272`	`Execute_SetInteractor(this, FoundInteractor);`
`1273`		`-`
`1274`		`- if (UMounteaInteractionSystemBFL::CanExecuteCosmeticEvents(GetWorld()))`
`1275`		`- {`
`1276`		`- ProcessToggleActive(true);`
`1277`		`- }`
`1278`		`- else`
`1279`		`- {`
`1280`		`- InteractorFound_Client(FoundInteractor);`
`1281`		`- ProcessToggleActive_Client(true);`
`1282`		`- }`
	`1273`	`+`
	`1274`	`+ InteractorFound_Client(FoundInteractor);`
	`1275`	`+ ProcessToggleActive_Client(true);`
`1283`	`1276`
`1284`	`1277`	`Execute_OnInteractorFoundEvent(this, FoundInteractor);`
`1285`	`1278`	`}`
`@@ -1303,8 +1296,6 @@ void UActorInteractableComponentBase::InteractorLost_Implementation(const TScrip`
`1303`	`1296`
`1304`	`1297`	`GetWorld()->GetTimerManager().ClearTimer(Timer_Interaction);`
`1305`	`1298`	`GetWorld()->GetTimerManager().ClearTimer(Timer_ProgressExpiration);`
`1306`		`-`
`1307`		`- //GetWorld()->GetTimerManager().ClearTimer(Timer_Cooldown);`
`1308`	`1299`
`1309`	`1300`	`if (GetOwner() && GetOwner()->HasAuthority())`
`1310`	`1301`	`{`
`@@ -1540,19 +1531,19 @@ void UActorInteractableComponentBase::InteractionCooldownCompleted_Implementatio`
`1540`	`1531`	`{`
`1541`	`1532`	`if (Interactor->Execute_GetActiveInteractable(Interactor.GetObject()) == this)`
`1542`	`1533`	`{`
`1543`		`- ProcessToggleActive(true);`
	`1534`	`+ ProcessToggleActive_Client(true);`
`1544`	`1535`
`1545`	`1536`	`Execute_SetState(this, EInteractableStateV2::EIS_Awake);`
`1546`	`1537`	`}`
`1547`	`1538`	`else`
`1548`	`1539`	`{`
`1549`		`- ProcessToggleActive(false);`
	`1540`	`+ ProcessToggleActive_Client(false);`
`1550`	`1541`	`Execute_SetState(this, DefaultInteractableState);`
`1551`	`1542`	`}`
`1552`	`1543`	`}`
`1553`	`1544`	`else`
`1554`	`1545`	`{`
`1555`		`- ProcessToggleActive(false);`
	`1546`	`+ ProcessToggleActive_Client(false);`
`1556`	`1547`	`Execute_SetState(this, DefaultInteractableState);`
`1557`	`1548`	`}`
`1558`	`1549`
Original file line number	Diff line number	Diff line change
`@@ -251,4 +251,4 @@ bool UMounteaInteractionSystemBFL::IsInputKeyPairSupported(APlayerController* Pl`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`return false;`
`254`		`-}`
	`254`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,9 @@ TSharedRef<FSlateStyleSet> FAIntPHelpStyle::Create()`
`88`	`88`	`Style->Set("AIntPStyleSet.Icon.MoneyIcon", new IMAGE_BRUSH(TEXT("MoneyIcon"), Icon16x16));`
`89`	`89`
`90`	`90`	`Style->Set("AIntPStyleSet.Tutorial", new IMAGE_BRUSH(TEXT("tutorialPage_icon"), Icon40x40));`
	`91`	`+`
	`92`	`+ Style->Set("AIntPStyleSet.Level", new IMAGE_BRUSH(TEXT("LevelIcon"), Icon40x40));`
	`93`	`+ Style->Set("AIntPStyleSet.Folder", new IMAGE_BRUSH(TEXT("FolderIcon"), Icon40x40));`
`91`	`94`	`return Style;`
`92`	`95`	`}`
`93`	`96`