refactor: UConfigPropertys are now directly given the json value from which they should deserialize

RebeccaStevens · RebeccaStevens · commit 848d22735a66 · 2026-06-08T03:49:11.000+12:00
For `URawFormatValue::FromJson` of values capable of having children, if the `UConfigProperty` is avaliable,
that `UConfigProperty` is now used to perform the deserialize of the child value.
diff --git a/Mods/SML/Source/SML/Private/Configuration/ConfigManager.cpp b/Mods/SML/Source/SML/Private/Configuration/ConfigManager.cpp
@@ -96,8 +96,7 @@ void UConfigManager::LoadConfigurationInternal(const FConfigId& ConfigId, URootC
 
     //Convert JSON tree into the raw value tree and feed it to root section value
     const TSharedRef<FJsonValue> RootValue = MakeShareable(new FJsonValueObject(JsonObject));
-    URawFormatValue* RawFormatValue = URawFormatValueObject::FromJson(this, RootValue);
-    RootConfigValueHolder->GetWrappedValue()->Deserialize(RawFormatValue);
+    RootConfigValueHolder->GetWrappedValue()->DeserializeFromJson(RootValue);
 
     UE_LOG(LogConfigManager, Display, TEXT("Successfully loaded configuration from %s"), *ConfigurationFilePath);
 
diff --git a/Mods/SML/Source/SML/Public/Configuration/ConfigProperty.h b/Mods/SML/Source/SML/Public/Configuration/ConfigProperty.h
@@ -3,7 +3,9 @@
 #include "FGGameMode.h"
 #include "UObject/Object.h"
 #include "Configuration/CodeGeneration/ConfigVariableDescriptor.h"
+#include "Configuration/RawFileFormat/Json/JsonRawFormatConverter.h"
 #include "Reflection/BlueprintReflectedObject.h"
+#include "SatisfactoryModLoader.h"
 #include "ConfigProperty.generated.h"
 
 class URawFormatValue;
@@ -59,6 +61,19 @@ class SML_API UConfigProperty : public UObject {
 	UFUNCTION(BlueprintCallable, BlueprintNativeEvent)
     void Deserialize(const URawFormatValue* Value);
 
+  /** Deserializes passed json value into this property state */
+  void DeserializeFromJson(const TSharedPtr<FJsonValue>& JsonValue) {
+    Deserialize(CreateRawFormatValue(this, JsonValue));
+  }
+
+	/** Creates a raw format value from the passed json value */
+	virtual URawFormatValue* CreateRawFormatValue(UObject* Outer, const TSharedPtr<FJsonValue>& JsonValue) {
+		// This is a fallback. Derived classes should create a specific raw format value based on the expected type.
+		UE_LOG(LogSatisfactoryModLoader, Warning, TEXT("Creating raw format value for property %s with fallback implementation."), *GetName());
+		#pragma warning(suppress : 4996)
+		return FJsonRawFormatConverter::ConvertToRawFormat(Outer, JsonValue);
+	}
+
 	/** Marks this property directly, forcing file system synchronization to happen afterwards */
 	UFUNCTION(BlueprintCallable)
     virtual void MarkDirty();
diff --git a/Mods/SML/Source/SML/Public/Configuration/Properties/ConfigPropertyArray.h b/Mods/SML/Source/SML/Public/Configuration/Properties/ConfigPropertyArray.h
@@ -2,6 +2,7 @@
 #include "Configuration/ConfigProperty.h"
 #include "Configuration/ConfigValueArrayInterface.h"
 #include "Configuration/ConfigValueDirtyHandlerInterface.h"
+#include "Configuration/RawFileFormat/RawFormatValueArray.h"
 #include "ConfigPropertyArray.generated.h"
 
 /** Describes array configuration property with single nested element type */
@@ -58,6 +59,10 @@ class SML_API UConfigPropertyArray : public UConfigProperty, public IConfigValue
     virtual bool ResetToDefault_Implementation() override;
     virtual bool IsSetToDefaultValue_Implementation() const override;
     virtual FString GetDefaultValueAsString_Implementation() const override;
+
+    virtual URawFormatValueArray* CreateRawFormatValue(UObject* Outer, const TSharedPtr<FJsonValue>& JsonValue) override {
+        return URawFormatValueArray::FromJson(Outer, JsonValue);
+    }
     //End UConfigProperty
 
     //Begin IConfigValueDirtyHandlerInterface
diff --git a/Mods/SML/Source/SML/Public/Configuration/Properties/ConfigPropertyBool.h b/Mods/SML/Source/SML/Public/Configuration/Properties/ConfigPropertyBool.h
@@ -1,5 +1,6 @@
 ﻿#pragma once
 #include "Configuration/ConfigProperty.h"
+#include "Configuration/RawFileFormat/RawFormatValueBool.h"
 #include "ConfigPropertyBool.generated.h"
 
 UCLASS()
@@ -32,5 +33,9 @@ class SML_API UConfigPropertyBool : public UConfigProperty {
     virtual bool ResetToDefault_Implementation() override;
     virtual bool IsSetToDefaultValue_Implementation() const override;
     virtual FString GetDefaultValueAsString_Implementation() const override;
+    
+    virtual URawFormatValueBool* CreateRawFormatValue(UObject* Outer, const TSharedPtr<FJsonValue>& JsonValue) override {
+        return URawFormatValueBool::FromJson(Outer, JsonValue);
+    }
     //End UConfigProperty
 };
diff --git a/Mods/SML/Source/SML/Public/Configuration/Properties/ConfigPropertyClass.h b/Mods/SML/Source/SML/Public/Configuration/Properties/ConfigPropertyClass.h
@@ -1,5 +1,6 @@
 ﻿#pragma once
 #include "Configuration/ConfigProperty.h"
+#include "Configuration/RawFileFormat/RawFormatValueString.h"
 #include "ConfigPropertyClass.generated.h"
 
 UCLASS()
@@ -60,5 +61,9 @@ class SML_API UConfigPropertyClass : public UConfigProperty {
     virtual bool ResetToDefault_Implementation() override;
     virtual bool IsSetToDefaultValue_Implementation() const override;
     virtual FString GetDefaultValueAsString_Implementation() const override;
+    
+    virtual URawFormatValueString* CreateRawFormatValue(UObject* Outer, const TSharedPtr<FJsonValue>& JsonValue) override {
+        return URawFormatValueString::FromJson(Outer, JsonValue);
+    }
     //End UConfigProperty
 };
diff --git a/Mods/SML/Source/SML/Public/Configuration/Properties/ConfigPropertyFloat.h b/Mods/SML/Source/SML/Public/Configuration/Properties/ConfigPropertyFloat.h
@@ -1,5 +1,6 @@
 ﻿#pragma once
 #include "Configuration/ConfigProperty.h"
+#include "Configuration/RawFileFormat/RawFormatValueNumber.h"
 #include "ConfigPropertyFloat.generated.h"
 
 UCLASS()
@@ -32,5 +33,9 @@ class SML_API UConfigPropertyFloat : public UConfigProperty {
     virtual bool ResetToDefault_Implementation() override;
     virtual bool IsSetToDefaultValue_Implementation() const override;
     virtual FString GetDefaultValueAsString_Implementation() const override;
+    
+    virtual URawFormatValueNumber* CreateRawFormatValue(UObject* Outer, const TSharedPtr<FJsonValue>& JsonValue) override {
+        return URawFormatValueNumber::FromJson(Outer, JsonValue);
+    }
     //End UConfigProperty
 };
diff --git a/Mods/SML/Source/SML/Public/Configuration/Properties/ConfigPropertyInteger.h b/Mods/SML/Source/SML/Public/Configuration/Properties/ConfigPropertyInteger.h
@@ -1,5 +1,6 @@
 ﻿#pragma once
 #include "Configuration/ConfigProperty.h"
+#include "Configuration/RawFileFormat/RawFormatValueNumber.h"
 #include "ConfigPropertyInteger.generated.h"
 
 UCLASS()
@@ -32,5 +33,9 @@ class SML_API UConfigPropertyInteger : public UConfigProperty {
     virtual bool ResetToDefault_Implementation() override;
     virtual bool IsSetToDefaultValue_Implementation() const override;
     virtual FString GetDefaultValueAsString_Implementation() const override;
+
+    virtual URawFormatValueNumber* CreateRawFormatValue(UObject* Outer, const TSharedPtr<FJsonValue>& JsonValue) override {
+        return URawFormatValueNumber::FromJson(Outer, JsonValue);
+    }
 	//End UConfigProperty
 };
diff --git a/Mods/SML/Source/SML/Public/Configuration/Properties/ConfigPropertySection.h b/Mods/SML/Source/SML/Public/Configuration/Properties/ConfigPropertySection.h
@@ -2,6 +2,7 @@
 #include "Configuration/ConfigProperty.h"
 #include "Configuration/ConfigValueObjectInterface.h"
 #include "Configuration/ConfigValueDirtyHandlerInterface.h"
+#include "Configuration/RawFileFormat/RawFormatValueObject.h"
 #include "ConfigPropertySection.generated.h"
 
 /** Describes a single configuration section with nested properties */
@@ -38,6 +39,10 @@ class SML_API UConfigPropertySection : public UConfigProperty, public IConfigVal
 	virtual bool ResetToDefault_Implementation() override;
 	virtual bool IsSetToDefaultValue_Implementation() const override;
 	virtual FString GetDefaultValueAsString_Implementation() const override;
+
+	virtual URawFormatValueObject* CreateRawFormatValue(UObject* Outer, const TSharedPtr<FJsonValue>& JsonValue) override {
+		return URawFormatValueObject::FromJson(Outer, JsonValue);
+	}
 	//End UConfigProperty
 
 	//Begin IConfigValueDirtyHandlerInterface
diff --git a/Mods/SML/Source/SML/Public/Configuration/Properties/ConfigPropertyString.h b/Mods/SML/Source/SML/Public/Configuration/Properties/ConfigPropertyString.h
@@ -1,5 +1,6 @@
 #pragma once
 #include "Configuration/ConfigProperty.h"
+#include "Configuration/RawFileFormat/RawFormatValueString.h"
 #include "ConfigPropertyString.generated.h"
 
 UCLASS()
@@ -32,5 +33,9 @@ class SML_API UConfigPropertyString : public UConfigProperty {
     virtual bool ResetToDefault_Implementation() override;
     virtual bool IsSetToDefaultValue_Implementation() const override;
     virtual FString GetDefaultValueAsString_Implementation() const override;
+    
+    virtual URawFormatValueString* CreateRawFormatValue(UObject* Outer, const TSharedPtr<FJsonValue>& JsonValue) override {
+        return URawFormatValueString::FromJson(Outer, JsonValue);
+    }
     //End UConfigProperty
 };
diff --git a/Mods/SML/Source/SML/Public/Configuration/RawFileFormat/RawFormatValueArray.h b/Mods/SML/Source/SML/Public/Configuration/RawFileFormat/RawFormatValueArray.h
@@ -1,5 +1,6 @@
 #pragma once
 #include "Configuration/ConfigProperty.h"
+#include "Configuration/ConfigValueArrayInterface.h"
 #include "Configuration/RawFileFormat/Json/JsonRawFormatConverter.h"
 #include "Configuration/RawFileFormat/RawFormatValue.h"
 #include "Configuration/RawFileFormat/RawFormatValueNumber.h"
@@ -128,11 +129,22 @@ FORCEINLINE TSharedPtr<FJsonValue> URawFormatValueArray::ToJson() const {
 
 FORCEINLINE URawFormatValueArray* URawFormatValueArray::FromJson(UObject* Outer, const TSharedPtr<FJsonValue>& JsonValue) {
     URawFormatValueArray* Array = NewObject<URawFormatValueArray>(Outer);
-    for (const TSharedPtr<FJsonValue>& ChildValue : JsonValue->AsArray()) {
-        // TODO: Base child property deserialization on the child config property.
+    const TArray<TSharedPtr<FJsonValue>>& JsonArray = JsonValue->AsArray();
+    const int32 ChildNum = JsonArray.Num();
+    for (int32 ChildIndex = 0; ChildIndex < ChildNum; ChildIndex++) {
+        const TSharedPtr<FJsonValue>& ChildValue = JsonArray[ChildIndex];
+        UConfigProperty* Owner = Cast<UConfigProperty>(Outer);
+        if (IsValid(Owner) && Owner->Implements<UConfigValueArrayInterface>()) {
+            UConfigProperty* ChildProperty = IConfigValueArrayInterface::Execute_GetChildProperty(Owner, ChildIndex);
+            if (IsValid(ChildProperty)) {
+                Array->AddValue(ChildProperty->CreateRawFormatValue(Array, ChildValue));
+                continue;
+            }
+        }
+
         UE_LOG(LogSatisfactoryModLoader, Warning, TEXT("Deserializing JSON array value for property with fallback implementation."));
         #pragma warning(suppress : 4996)
         Array->AddValue(FJsonRawFormatConverter::ConvertToRawFormat(Array, ChildValue));
     }
     return Array;
-}
+}
diff --git a/Mods/SML/Source/SML/Public/Configuration/RawFileFormat/RawFormatValueObject.h b/Mods/SML/Source/SML/Public/Configuration/RawFileFormat/RawFormatValueObject.h
@@ -1,6 +1,7 @@
 #pragma once
 #include "Templates/SubclassOf.h"
 #include "Configuration/ConfigProperty.h"
+#include "Configuration/ConfigValueObjectInterface.h"
 #include "Configuration/RawFileFormat/Json/JsonRawFormatConverter.h"
 #include "Configuration/RawFileFormat/RawFormatValueArray.h"
 #include "SatisfactoryModLoader.h"
@@ -126,10 +127,18 @@ FORCEINLINE TSharedPtr<FJsonValue> URawFormatValueObject::ToJson() const {
 FORCEINLINE URawFormatValueObject* URawFormatValueObject::FromJson(UObject* Outer, const TSharedPtr<FJsonValue>& JsonValue) {
     URawFormatValueObject* Object = NewObject<URawFormatValueObject>(Outer);
     for (const TPair<FString, TSharedPtr<FJsonValue>>& Pair : JsonValue->AsObject()->Values) {
-        // TODO: Base child property deserialization on the child config property.
+        UConfigProperty* Owner = Cast<UConfigProperty>(Outer);
+        if (IsValid(Owner) && Owner->Implements<UConfigValueObjectInterface>()) {
+            UConfigProperty* ChildProperty = IConfigValueObjectInterface::Execute_GetChildProperty(Owner, Pair.Key);
+            if (IsValid(ChildProperty)) {
+                Object->AddValue(Pair.Key, ChildProperty->CreateRawFormatValue(Object, Pair.Value));
+                continue;
+            }
+        }
+
         UE_LOG(LogSatisfactoryModLoader, Warning, TEXT("Deserializing JSON value for property %s with fallback implementation."), *Pair.Key);
         #pragma warning(suppress : 4996)
         Object->AddValue(Pair.Key, FJsonRawFormatConverter::ConvertToRawFormat(Object, Pair.Value));
     }
     return Object;
-}
+}
