Update Modular Features plugin + Create new settings class + Start ad…

…apting the project to MF Extra Features next changes
lucoiso · Nov 6, 2022 · 19f9d24 · 19f9d24
1 parent f2e09d4
commit 19f9d24
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 10 deletions.
diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini
@@ -123,3 +123,8 @@ MetaDataTagsForAssetRegistry=()
 [/Script/GameFeatures.GameFeaturesSubsystemSettings]
 GameFeaturesManagerClassName=/Script/GameFeatures.DefaultGameFeaturesProjectPolicies
 
+[/Script/ModularFeatures_ExtraActions.MFEA_Settings]
+bUseInputEnumeration=True
+bEnableAbilityAutoBinding=False
+InputIDEnumeration=/Game/Main/Data/GAS/EN_AbilityInputID.EN_AbilityInputID
+
diff --git a/Plugins/GameFeatures/Weapons/Content/Blueprints/Example_Pistol/BP_WeaponPackage.uasset b/Plugins/GameFeatures/Weapons/Content/Blueprints/Example_Pistol/BP_WeaponPackage.uasset
diff --git a/Plugins/GameFeatures/Weapons/Content/Data/DA_Pistol.uasset b/Plugins/GameFeatures/Weapons/Content/Data/DA_Pistol.uasset
diff --git a/Plugins/UEModularFeatures_ExtraActions b/Plugins/UEModularFeatures_ExtraActions
diff --git a/ProjectElementus.uproject b/ProjectElementus.uproject
@@ -9,7 +9,8 @@
 			"Type": "Runtime",
 			"LoadingPhase": "Default",
 			"AdditionalDependencies": [
-				"Engine"
+				"Engine",
+				"DeveloperSettings"
 			]
 		}
 	],
@@ -46,7 +47,7 @@
 		{
 			"Name": "EOSSDKHandler",
 			"Enabled": true
-		},
+		}
 	],
 	"TargetPlatforms": [
 		"Linux",

diff --git a/Source/ProjectElementus/Private/Actors/Character/PEPlayerController.cpp b/Source/ProjectElementus/Private/Actors/Character/PEPlayerController.cpp
@@ -20,6 +20,7 @@
 #include "ElementusInventoryFunctions.h"
 #include "Management/Data/PEGlobalTags.h"
 #include "Management/Functions/PEPlayerLibrary.h"
+#include "MFEA_Settings.h"
 
 constexpr float BaseTurnRate = 45.f;
 constexpr float BaseLookUpRate = 45.f;
@@ -32,10 +33,10 @@ APEPlayerController::APEPlayerController(const FObjectInitializer& ObjectInitial
 	PrimaryActorTick.bCanEverTick = true;
 	PrimaryActorTick.bStartWithTickEnabled = true;
 
-	static const ConstructorHelpers::FObjectFinder<UEnum> InputIDEnum_ObjRef(TEXT("/Game/Main/Data/GAS/EN_AbilityInputID"));
-	if (InputIDEnum_ObjRef.Succeeded())
+	if (const UMFEA_Settings* MF_Settings = GetDefault<UMFEA_Settings>();
+		!MF_Settings->InputIDEnumeration.IsNull())
 	{
-		InputEnumHandle = InputIDEnum_ObjRef.Object;
+		InputEnumHandle = MF_Settings->InputIDEnumeration.LoadSynchronous();
 	}
 
 	static ConstructorHelpers::FClassFinder<UUserWidget> InventoryWidget_ClassRef(TEXT("/Game/Main/Blueprints/Widgets/Inventory/WB_Inventory_Example"));

diff --git a/Source/ProjectElementus/Private/Components/PEInventoryComponent.cpp b/Source/ProjectElementus/Private/Components/PEInventoryComponent.cpp
@@ -9,16 +9,17 @@
 #include "Actors/Character/PECharacter.h"
 #include "GAS/System/PEAbilitySystemComponent.h"
 #include "GAS/System/PEAbilityFunctions.h"
+#include "MFEA_Settings.h"
 
 UPEInventoryComponent::UPEInventoryComponent(const FObjectInitializer& ObjectInitializer) : Super(ObjectInitializer)
 {
 	PrimaryComponentTick.bCanEverTick = false;
 	PrimaryComponentTick.bStartWithTickEnabled = false;
 
-	static const ConstructorHelpers::FObjectFinder<UEnum> InputIDEnum_ObjRef(TEXT("/Game/Main/Data/GAS/EN_AbilityInputID"));
-	if (InputIDEnum_ObjRef.Succeeded())
+	if (const UMFEA_Settings* MF_Settings = GetDefault<UMFEA_Settings>();
+		!MF_Settings->InputIDEnumeration.IsNull())
 	{
-		InputEnumHandle = InputIDEnum_ObjRef.Object;
+		InputEnumHandle = MF_Settings->InputIDEnumeration.LoadSynchronous();
 	}
 }
 

diff --git a/Source/ProjectElementus/Private/Management/PEDevSettings.cpp b/Source/ProjectElementus/Private/Management/PEDevSettings.cpp
@@ -0,0 +1,9 @@
+// Author: Lucas Vilas-Boas
+// Year: 2022
+// Repo: https://github.com/lucoiso/UEProject_Elementus
+
+#include "Management/PEDevSettings.h"
+
+UPEDevSettings::UPEDevSettings(const FObjectInitializer& ObjectInitializer) : Super(ObjectInitializer)
+{
+}
diff --git a/Source/ProjectElementus/Public/Actors/Character/PEPlayerController.h b/Source/ProjectElementus/Public/Actors/Character/PEPlayerController.h
@@ -48,7 +48,7 @@ class PROJECTELEMENTUS_API APEPlayerController final : public APlayerController,
 	/* This function came from IAbilityInputBinding interface,
 	 * provided by GameFeatures_ExtraActions plugin to manage ability bindings */
 	UFUNCTION(Client, Reliable)
-	virtual void SetupAbilityInputBinding_Implementation(UInputAction* Action, const int32 InputID) override;
+	virtual void SetupAbilityInputBinding_Implementation(UInputAction* Action, const int32 InputID = -1) override;
 
 	/* This function came from IAbilityInputBinding interface,
 	 * provided by GameFeatures_ExtraActions plugin to manage ability bindings */

diff --git a/Source/ProjectElementus/Public/Management/PEDevSettings.h b/Source/ProjectElementus/Public/Management/PEDevSettings.h
@@ -0,0 +1,21 @@
+// Author: Lucas Vilas-Boas
+// Year: 2022
+// Repo: https://github.com/lucoiso/UEProject_Elementus
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Engine/DeveloperSettings.h"
+#include "PEDevSettings.generated.h"
+
+/**
+ * 
+ */
+UCLASS(Config = Game, DefaultConfig, Meta = (DisplayName = "Project Elementus Settings"))
+class PROJECTELEMENTUS_API UPEDevSettings : public UDeveloperSettings
+{
+	GENERATED_BODY()
+
+public:
+	explicit UPEDevSettings(const FObjectInitializer& ObjectInitializer);
+};
+ −		ModularFeatures_ExtraActions.uplugin
+2 −1		Source/ModularFeatures_ExtraActions.Build.cs
+1 −1		Source/Private/AbilityInputBinding.cpp
+34 −43		Source/Private/GameFeatureAction_AddAbilities.cpp
+1 −1		Source/Private/GameFeatureAction_AddAttribute.cpp
+1 −1		Source/Private/GameFeatureAction_AddEffects.cpp
+48 −49		Source/Private/GameFeatureAction_AddInputs.cpp
+12 −13		Source/Private/GameFeatureAction_WorldActionBase.cpp
+11 −0		Source/Private/MFEA_Settings.cpp
+91 −9		Source/Private/ModularFeatures_InternalFuncs.h
+4 −1		Source/Public/AbilityInputBinding.h
+5 −12		Source/Public/GameFeatureAction_AddAbilities.h
+4 −10		Source/Public/GameFeatureAction_AddInputs.h
+2 −11		Source/Public/GameFeatureAction_WorldActionBase.h
+44 −0		Source/Public/MFEA_Settings.h
+2 −0		Source/Public/ModularFeatures_ExtraActions.h