Merge pull request #11 from MalikuMane/pr

Ji-Rath · web-flow · commit 6431f636bec0 · 2024-12-16T10:33:20.000-05:00
Update module and plugin dependencies to fix build errors and warnings for 5.5.
diff --git a/MassAITesting.uproject b/MassAITesting.uproject
@@ -19,10 +19,6 @@
 			"Name": "AnimToTexture",
 			"Enabled": true
 		},
-		{
-			"Name": "MassEntity",
-			"Enabled": true
-		},
 		{
 			"Name": "MassCrowd",
 			"Enabled": true
@@ -46,6 +42,14 @@
 		{
 			"Name": "GameplayStateTree",
 			"Enabled": true
+		},
+		{
+			"Name": "StateTree",
+			"Enabled": true
+		},
+		{
+			"Name": "SmartObjects",
+			"Enabled": true
 		}
 	]
 }
diff --git a/Plugins/BuildingManager/BuildingManager.uplugin b/Plugins/BuildingManager/BuildingManager.uplugin
@@ -20,5 +20,15 @@
 			"Type": "Runtime",
 			"LoadingPhase": "Default"
 		}
+	],
+	"Plugins": [
+		{
+			"Name": "SmartObjects",
+			"Enabled": true
+		},
+		{
+			"Name": "MassGameplay",
+			"Enabled": true
+		}
 	]
 }
diff --git a/Plugins/BuildingManager/Source/BuildingManager/BuildingManager.Build.cs b/Plugins/BuildingManager/Source/BuildingManager/BuildingManager.Build.cs
@@ -28,7 +28,8 @@ public BuildingManager(ReadOnlyTargetRules Target) : base(Target)
 				"Core", 
 				"SmartObjectsModule", 
 				"MassSmartObjects",
-				"GameplayTags"
+				"GameplayTags",
+				"MassEntity"
 				// ... add other public dependencies that you statically link with here ...
 			}
 			);
diff --git a/Plugins/MassNavMesh/MassNavMesh.uplugin b/Plugins/MassNavMesh/MassNavMesh.uplugin
@@ -19,5 +19,19 @@
 			"Type": "Runtime",
 			"LoadingPhase": "Default"
 		}
+	],
+	"Plugins": [
+		{
+			"Name": "MassAI",
+			"Enabled": true
+		},
+		{
+			"Name": "StateTree",
+			"Enabled": true
+		},
+		{
+			"Name": "MassGameplay",
+			"Enabled": true
+		}
 	]
 }
diff --git a/Plugins/MassPersistence/MassPersistence.uplugin b/Plugins/MassPersistence/MassPersistence.uplugin
@@ -19,5 +19,11 @@
 			"Type": "Runtime",
 			"LoadingPhase": "Default"
 		}
+	],
+	"Plugins": [
+		{
+			"Name": "MassGameplay",
+			"Enabled": true
+		}
 	]
 }
diff --git a/Plugins/MassPersistence/Source/MassPersistence/MassPersistence.Build.cs b/Plugins/MassPersistence/Source/MassPersistence/MassPersistence.Build.cs
@@ -25,7 +25,7 @@ public MassPersistence(ReadOnlyTargetRules Target) : base(Target)
 		PublicDependencyModuleNames.AddRange(
 			new string[]
 			{
-				"Core", "MassEntity", "MassSignals", "MassSpawner", "StructUtils", "MassSignals"
+				"Core", "MassEntity", "MassSignals", "MassSpawner", "MassSignals"
 				// ... add other public dependencies that you statically link with here ...
 			}
 			);
diff --git a/Plugins/MassSmartObjectAI/MassSmartObjectAI.uplugin b/Plugins/MassSmartObjectAI/MassSmartObjectAI.uplugin
@@ -19,5 +19,23 @@
 			"Type": "Runtime",
 			"LoadingPhase": "Default"
 		}
+	],
+	"Plugins": [
+		{
+			"Name": "SmartObjects",
+			"Enabled": true
+		},
+		{
+			"Name": "StateTree",
+			"Enabled": true
+		},
+		{
+			"Name": "MassGameplay",
+			"Enabled": true
+		},
+		{
+			"Name": "MassAI",
+			"Enabled": true
+		}
 	]
 }
diff --git a/Plugins/MassWanderAI/MassWanderAI.uplugin b/Plugins/MassWanderAI/MassWanderAI.uplugin
@@ -19,5 +19,19 @@
 			"Type": "Runtime",
 			"LoadingPhase": "Default"
 		}
+	],
+	"Plugins": [
+		{
+			"Name": "MassAI",
+			"Enabled": true
+		},
+		{
+			"Name": "StateTree",
+			"Enabled": true
+		},
+		{
+			"Name": "MassGameplay",
+			"Enabled": true
+		}
 	]
 }
diff --git a/Plugins/MassWanderAI/Source/MassWanderAI/MassWanderAI.Build.cs b/Plugins/MassWanderAI/Source/MassWanderAI/MassWanderAI.Build.cs
@@ -25,7 +25,7 @@ public MassWanderAI(ReadOnlyTargetRules Target) : base(Target)
 		PublicDependencyModuleNames.AddRange(
 			new string[]
 			{
-				"Core", "MassAIBehavior",
+				"Core", "MassAIBehavior", "MassEntity"
 				// ... add other public dependencies that you statically link with here ...
 			}
 			);
@@ -42,7 +42,7 @@ public MassWanderAI(ReadOnlyTargetRules Target) : base(Target)
 				"StateTreeModule",
 				"MassCommon",
 				"MassNavigation",
-				"MassSignals"
+				"MassSignals",
 				// ... add private dependencies that you statically link with here ...	
 			}
 			);
diff --git a/Plugins/SpatialHashGridExample/Source/SpatialHashGridExample/SpatialHashGridExample.Build.cs b/Plugins/SpatialHashGridExample/Source/SpatialHashGridExample/SpatialHashGridExample.Build.cs
@@ -25,7 +25,7 @@ public SpatialHashGridExample(ReadOnlyTargetRules Target) : base(Target)
 		PublicDependencyModuleNames.AddRange(
 			new string[]
 			{
-				"Core", "MassEntity", "AIModule", "MassSignals",
+				"Core", "MassEntity", "AIModule", "MassSignals"
 				// ... add other public dependencies that you statically link with here ...
 			}
 			);
diff --git a/Plugins/SpatialHashGridExample/SpatialHashGridExample.uplugin b/Plugins/SpatialHashGridExample/SpatialHashGridExample.uplugin
@@ -19,5 +19,11 @@
 			"Type": "Runtime",
 			"LoadingPhase": "Default"
 		}
+	],
+	"Plugins": [
+		{
+			"Name": "MassGameplay",
+			"Enabled": true
+		}
 	]
 }
diff --git a/Plugins/VertexAnimCharacter/VertexAnimCharacter.uplugin b/Plugins/VertexAnimCharacter/VertexAnimCharacter.uplugin
@@ -25,6 +25,18 @@
 		{
 			"Name": "AnimToTexture",
 			"Enabled": true
+		},
+		{
+			"Name": "MassAI",
+			"Enabled": true
+		},
+		{
+			"Name": "StateTree",
+			"Enabled": true
+		},
+		{
+			"Name": "MassGameplay",
+			"Enabled": true
 		}
 	]
 }
diff --git a/Plugins/WorldResources/WorldResources.uplugin b/Plugins/WorldResources/WorldResources.uplugin
@@ -20,5 +20,19 @@
 			"Type": "Runtime",
 			"LoadingPhase": "Default"
 		}
+	],
+	"Plugins": [
+		{
+			"Name": "MassAI",
+			"Enabled": true
+		},
+		{
+			"Name": "StateTree",
+			"Enabled": true
+		},
+		{
+			"Name": "MassGameplay",
+			"Enabled": true
+		}
 	]
 }
diff --git a/Source/MassAITesting.Target.cs b/Source/MassAITesting.Target.cs
@@ -9,6 +9,7 @@ public MassAITestingTarget(TargetInfo Target) : base(Target)
 	{
 		Type = TargetType.Game;
 		DefaultBuildSettings = BuildSettingsVersion.Latest;
+		IncludeOrderVersion = EngineIncludeOrderVersion.Latest;
 		ExtraModuleNames.Add("MassAITesting");
 	}
 }
diff --git a/Source/MassAITesting/MassAITesting.Build.cs b/Source/MassAITesting/MassAITesting.Build.cs
@@ -9,7 +9,7 @@ public MassAITesting(ReadOnlyTargetRules Target) : base(Target)
 		PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
 
 		PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "HeadMountedDisplay",
-			"MassEntity", "MassCommon", "MassNavigation", "StructUtils", "MassMovement", "NavigationSystem",
+			"MassEntity", "MassCommon", "MassNavigation", "MassMovement", "NavigationSystem",
 			"AIModule", "MassAIBehavior", "StateTreeModule", "GameplayTags", "SmartObjectsModule", "MassSmartObjects", "MassSignals",
 			"MassRepresentation", "MassLOD", "AnimToTexture"
 		});
diff --git a/Source/MassAITestingEditor.Target.cs b/Source/MassAITestingEditor.Target.cs
@@ -9,6 +9,7 @@ public MassAITestingEditorTarget(TargetInfo Target) : base(Target)
 	{
 		Type = TargetType.Editor;
 		DefaultBuildSettings = BuildSettingsVersion.Latest;
+		IncludeOrderVersion = EngineIncludeOrderVersion.Latest;
 		ExtraModuleNames.Add("MassAITesting");
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,6 @@`
`19`	`19`	`"Name": "AnimToTexture",`
`20`	`20`	`"Enabled": true`
`21`	`21`	`},`
`22`		`- {`
`23`		`- "Name": "MassEntity",`
`24`		`- "Enabled": true`
`25`		`- },`
`26`	`22`	`{`
`27`	`23`	`"Name": "MassCrowd",`
`28`	`24`	`"Enabled": true`
`@@ -46,6 +42,14 @@`
`46`	`42`	`{`
`47`	`43`	`"Name": "GameplayStateTree",`
`48`	`44`	`"Enabled": true`
	`45`	`+ },`
	`46`	`+ {`
	`47`	`+ "Name": "StateTree",`
	`48`	`+ "Enabled": true`
	`49`	`+ },`
	`50`	`+ {`
	`51`	`+ "Name": "SmartObjects",`
	`52`	`+ "Enabled": true`
`49`	`53`	`}`
`50`	`54`	`]`
`51`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,15 @@`
`20`	`20`	`"Type": "Runtime",`
`21`	`21`	`"LoadingPhase": "Default"`
`22`	`22`	`}`
	`23`	`+ ],`
	`24`	`+ "Plugins": [`
	`25`	`+ {`
	`26`	`+ "Name": "SmartObjects",`
	`27`	`+ "Enabled": true`
	`28`	`+ },`
	`29`	`+ {`
	`30`	`+ "Name": "MassGameplay",`
	`31`	`+ "Enabled": true`
	`32`	`+ }`
`23`	`33`	`]`
`24`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,11 @@`
`19`	`19`	`"Type": "Runtime",`
`20`	`20`	`"LoadingPhase": "Default"`
`21`	`21`	`}`
	`22`	`+ ],`
	`23`	`+ "Plugins": [`
	`24`	`+ {`
	`25`	`+ "Name": "MassGameplay",`
	`26`	`+ "Enabled": true`
	`27`	`+ }`
`22`	`28`	`]`
`23`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public MassPersistence(ReadOnlyTargetRules Target) : base(Target)`
`25`	`25`	`PublicDependencyModuleNames.AddRange(`
`26`	`26`	`new string[]`
`27`	`27`	`{`
`28`		`- "Core", "MassEntity", "MassSignals", "MassSpawner", "StructUtils", "MassSignals"`
	`28`	`+ "Core", "MassEntity", "MassSignals", "MassSpawner", "MassSignals"`
`29`	`29`	`// ... add other public dependencies that you statically link with here ...`
`30`	`30`	`}`
`31`	`31`	`);`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public MassWanderAI(ReadOnlyTargetRules Target) : base(Target)`
`25`	`25`	`PublicDependencyModuleNames.AddRange(`
`26`	`26`	`new string[]`
`27`	`27`	`{`
`28`		`- "Core", "MassAIBehavior",`
	`28`	`+ "Core", "MassAIBehavior", "MassEntity"`
`29`	`29`	`// ... add other public dependencies that you statically link with here ...`
`30`	`30`	`}`
`31`	`31`	`);`
`@@ -42,7 +42,7 @@ public MassWanderAI(ReadOnlyTargetRules Target) : base(Target)`
`42`	`42`	`"StateTreeModule",`
`43`	`43`	`"MassCommon",`
`44`	`44`	`"MassNavigation",`
`45`		`- "MassSignals"`
	`45`	`+ "MassSignals",`
`46`	`46`	`// ... add private dependencies that you statically link with here ...`
`47`	`47`	`}`
`48`	`48`	`);`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public SpatialHashGridExample(ReadOnlyTargetRules Target) : base(Target)`
`25`	`25`	`PublicDependencyModuleNames.AddRange(`
`26`	`26`	`new string[]`
`27`	`27`	`{`
`28`		`- "Core", "MassEntity", "AIModule", "MassSignals",`
	`28`	`+ "Core", "MassEntity", "AIModule", "MassSignals"`
`29`	`29`	`// ... add other public dependencies that you statically link with here ...`
`30`	`30`	`}`
`31`	`31`	`);`