Fix for Session Settings not syncing (#266)

satisfactorymodding · Jun 22, 2024 · b462bf7 · b462bf7
1 parent 6bf0052
commit b462bf7
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 2 deletions.
diff --git a/Mods/SML/Source/SML/Private/SessionSettings/SessionSettingsSubsystem.cpp b/Mods/SML/Source/SML/Private/SessionSettings/SessionSettingsSubsystem.cpp
@@ -2,6 +2,8 @@
 #include "FGGameMode.h"
 #include "FGPlayerController.h"
 #include "Subsystem/SubsystemActorManager.h"
+#include "Settings/FGUserSettingApplyType.h"
+#include "Net/UnrealNetwork.h"
 
 ASessionSettingsSubsystem::ASessionSettingsSubsystem() {
 	ReplicationPolicy = ESubsystemReplicationPolicy::SpawnOnServer_Replicate;
@@ -11,6 +13,14 @@ void ASessionSettingsSubsystem::Init() {
 	USessionSettingsManager* SessionSettingsManager = GetWorld()->GetSubsystem<USessionSettingsManager>();
 	check(SessionSettingsManager);
 
+	if (!HasAuthority())
+	{
+		// We're a client, so we only have our own player controller
+		AFGPlayerController* PlayerController = Cast<AFGPlayerController>(GetWorld()->GetFirstPlayerController());
+		USMLSessionSettingsRemoteCallObject* RCO = PlayerController->GetRemoteCallObjectOfClass<USMLSessionSettingsRemoteCallObject>();
+		RCO->Server_RequestAllSessionSettings();
+	}
+
 	OnOptionUpdatedDelegate = FOnOptionUpdated::CreateUObject(this, &ASessionSettingsSubsystem::OnSessionSettingUpdated);
 	SessionSettingsManager->SubscribeToAllOptionUpdates(OnOptionUpdatedDelegate);
 }
@@ -65,3 +75,35 @@ bool USMLSessionSettingsRemoteCallObject::Server_RequestSessionSettingUpdate_Val
 
 	return SessionSettingsManager != NULL && SessionSettingsManager->FindSessionSetting(SessionSettingName) != NULL;
 }
+
+void USMLSessionSettingsRemoteCallObject::Server_RequestAllSessionSettings_Implementation()
+{
+	USessionSettingsManager* SessionSettingsManager = GetWorld()->GetSubsystem<USessionSettingsManager>();
+	TMap<FString, UFGUserSettingApplyType*> Settings = SessionSettingsManager->GetAllSessionSettings();
+	for (TPair<FString, UFGUserSettingApplyType*> Setting : Settings)
+	{
+		FVariant AppliedValue = Setting.Value->GetAppliedValue();
+		FString ValueString = USessionSettingsManager::VariantToString(AppliedValue);
+		Client_SendSessionSetting(Setting.Key, ValueString);
+	}
+}
+
+bool USMLSessionSettingsRemoteCallObject::Server_RequestAllSessionSettings_Validate()
+{
+	USessionSettingsManager* SessionSettingsManager = GetWorld()->GetSubsystem<USessionSettingsManager>();
+	return SessionSettingsManager != NULL;
+}
+
+void USMLSessionSettingsRemoteCallObject::Client_SendSessionSetting_Implementation(const FString& SessionSettingName, const FString& ValueString)
+{
+	ASessionSettingsSubsystem* SessionSettingsSubsystem = ASessionSettingsSubsystem::Get(GetWorld());
+	check(SessionSettingsSubsystem);
+
+	SessionSettingsSubsystem->PushSettingToSessionSettings(SessionSettingName, USessionSettingsManager::StringToVariant(ValueString));
+}
+
+bool USMLSessionSettingsRemoteCallObject::Client_SendSessionSetting_Validate(const FString& SessionSettingName, const FString& ValueString)
+{
+	const USessionSettingsManager* SessionSettingsManager = GetWorld()->GetSubsystem<USessionSettingsManager>();
+	return SessionSettingsManager != NULL && !SessionSettingName.IsEmpty() && !ValueString.IsEmpty();
+}
diff --git a/Mods/SML/Source/SML/Public/SessionSettings/SessionSettingsManager.h b/Mods/SML/Source/SML/Public/SessionSettings/SessionSettingsManager.h
@@ -56,6 +56,8 @@ class SML_API USessionSettingsManager : public UWorldSubsystem, public IFGOption
 	void SubscribeToAllOptionUpdates(const FOnOptionUpdated& onOptionUpdatedDelegate);
 	void UnsubscribeToAllOptionUpdates(const FOnOptionUpdated& onOptionUpdatedDelegate);
 
+	TMap<FString, UFGUserSettingApplyType*> GetAllSessionSettings() { return SessionSettings; };
+
 	UFUNCTION(BlueprintCallable, Category = "Session Settings Manager")
 	void InitializeForMap(const TSoftObjectPtr<UWorld>& World, bool bAttemptPreserveValues);
 

diff --git a/Mods/SML/Source/SML/Public/SessionSettings/SessionSettingsSubsystem.h b/Mods/SML/Source/SML/Public/SessionSettings/SessionSettingsSubsystem.h
@@ -13,8 +13,6 @@ class SML_API ASessionSettingsSubsystem : public AModSubsystem {
 
 	virtual void Init() override;
 
-	// TODO: Use this to sync the settings to the client on join
-
 	static ASessionSettingsSubsystem* Get(UWorld* World);
 
 	void OnSessionSettingUpdated(const FString StrID, FVariant value);
@@ -36,6 +34,13 @@ class SML_API USMLSessionSettingsRemoteCallObject : public UFGRemoteCallObject {
 
 	UFUNCTION(Server, Reliable, WithValidation)
 	void Server_RequestSessionSettingUpdate(const FString& SessionSettingName, const FString& ValueString);
+
+	UFUNCTION(Server, Reliable, WithValidation)
+	void Server_RequestAllSessionSettings();
+
+	UFUNCTION(Client, Reliable, WithValidation)
+	void Client_SendSessionSetting(const FString& SessionSettingName, const FString& ValueString);
+
 private:
 	UPROPERTY(Replicated)
 	bool mForceNetField_USMLSessionSettingsRemoteCallObject;