feat: add new config property for storing raw values

RebeccaStevens · RebeccaStevens · commit 873428a6d297 · 2026-06-08T03:31:56.000+12:00
diff --git a/Mods/SML/Content/Interface/UI/Menu/Mods/ConfigProperties/BP_ConfigPropertyRaw.uasset b/Mods/SML/Content/Interface/UI/Menu/Mods/ConfigProperties/BP_ConfigPropertyRaw.uasset
diff --git a/Mods/SML/Source/SML/Private/Configuration/CodeGeneration/ConfigVariableDescriptor.cpp b/Mods/SML/Source/SML/Private/Configuration/CodeGeneration/ConfigVariableDescriptor.cpp
@@ -107,6 +107,10 @@ void FConfigVariableDescriptor::SetupAsObject(UClass* NewBaseObjectClass) {
     this->BaseObjectClass = NewBaseObjectClass;   
 }
 
+void FConfigVariableDescriptor::SetupAsRawJsonValue() {
+    this->VariableType = EConfigVariableType::ECVT_RawJsonValue;
+}
+
 UScriptStruct* FConfigVariableDescriptor::GetCustomStructType() const {
     if (VariableType == EConfigVariableType::ECVT_CustomStruct)
         return CustomStructType;
diff --git a/Mods/SML/Source/SML/Private/Configuration/CodeGeneration/ConfigVariableLibrary.cpp b/Mods/SML/Source/SML/Private/Configuration/CodeGeneration/ConfigVariableLibrary.cpp
@@ -49,3 +49,9 @@ FConfigVariableDescriptor UConfigVariableLibrary::MakeConfigVariableMap(const FC
     VariableDescriptor.SetupAsMap(KeyType, ValueType);
     return VariableDescriptor;
 }
+
+FConfigVariableDescriptor UConfigVariableLibrary::MakeConfigVariableRawJsonValue() {
+    FConfigVariableDescriptor VariableDescriptor{};
+    VariableDescriptor.SetupAsRawJsonValue();
+    return VariableDescriptor;
+}
diff --git a/Mods/SML/Source/SML/Private/Configuration/Properties/ConfigPropertyRaw.cpp b/Mods/SML/Source/SML/Private/Configuration/Properties/ConfigPropertyRaw.cpp
@@ -0,0 +1,81 @@
+﻿#include "Configuration/Properties/ConfigPropertyRaw.h"
+#include "Configuration/CodeGeneration/ConfigVariableDescriptor.h"
+#include "Configuration/CodeGeneration/ConfigVariableLibrary.h"
+#include "Configuration/RawFileFormat/RawFormatValueRawJson.h"
+#include "Reflection/BlueprintReflectedObject.h"
+
+void UConfigPropertyRaw::SetValue(TSharedPtr<FJsonValue> NewValue) {
+    Value = NewValue.ToSharedRef();
+}
+
+void UConfigPropertyRaw::SetValue(TSharedPtr<FJsonObject> NewValue) {
+    Value = MakeShared<FJsonValueObject>(NewValue);
+}
+
+FString UConfigPropertyRaw::DescribeValue_Implementation() const {
+    return TEXT("[raw]");
+}
+
+URawFormatValue* UConfigPropertyRaw::Serialize_Implementation(UObject* Outer) const {
+    URawFormatValueRawJson* JsonValue = NewObject<URawFormatValueRawJson>(Outer);
+    JsonValue->Value = Value;
+    return JsonValue;
+}
+
+void UConfigPropertyRaw::Deserialize_Implementation(const URawFormatValue* RawValue) {
+    const URawFormatValueRawJson* JsonValue = Cast<URawFormatValueRawJson>(RawValue);
+    Value = JsonValue->Value;
+}
+
+void UConfigPropertyRaw::FillConfigStruct_Implementation(
+    const FReflectedObject& ReflectedObject, const FString& VariableName) const {
+    checkf(false, TEXT("UConfigPropertyRaw::FillConfigStruct_Implementation: not supported"));
+}
+
+bool UConfigPropertyRaw::ResetToDefault_Implementation() {
+    return false;
+}
+
+bool UConfigPropertyRaw::IsSetToDefaultValue_Implementation() const {
+    return false;
+}
+
+FString UConfigPropertyRaw::GetDefaultValueAsString_Implementation() const {
+    return TEXT("");
+}
+
+FConfigVariableDescriptor UConfigPropertyRaw::CreatePropertyDescriptor_Implementation(
+    UConfigGenerationContext* Context, const FString& OuterPath) const {
+    return UConfigVariableLibrary::MakeConfigVariablePrimitive(EConfigVariableType::ECVT_RawJsonValue);
+}
+
+void UConfigPropertyRaw::PostInitProperties() {
+    Super::PostInitProperties();
+
+    bHidden = 1;
+    bAllowUserReset = false;
+    bRequiresWorldReload = 0;
+}
+
+#if WITH_EDITOR
+bool UConfigPropertyRaw::CanEditChange(const FProperty* InProperty) const {
+    auto Name = InProperty->GetFName();
+    if (Name == GET_MEMBER_NAME_CHECKED(UConfigPropertyRaw, bHidden)) {
+        return false;
+    }
+    if (Name == GET_MEMBER_NAME_CHECKED(UConfigPropertyRaw, bAllowUserReset)) {
+        return false;
+    }
+    if (Name == GET_MEMBER_NAME_CHECKED(UConfigPropertyRaw, bRequiresWorldReload)) {
+        return false;
+    }
+    if (Name == GET_MEMBER_NAME_CHECKED(UConfigPropertyRaw, DisplayName)) {
+        return false;
+    }
+    if (Name == GET_MEMBER_NAME_CHECKED(UConfigPropertyRaw, Tooltip)) {
+        return false;
+    }
+
+    return Super::CanEditChange(InProperty);
+}
+#endif
diff --git a/Mods/SML/Source/SML/Private/Configuration/Properties/WidgetExtension/CP_Raw.cpp b/Mods/SML/Source/SML/Private/Configuration/Properties/WidgetExtension/CP_Raw.cpp
@@ -0,0 +1 @@
+﻿#include "Configuration/Properties/WidgetExtension/CP_Raw.h"
diff --git a/Mods/SML/Source/SML/Private/Configuration/RawFileFormat/Json/JsonRawFormatConverter.cpp b/Mods/SML/Source/SML/Private/Configuration/RawFileFormat/Json/JsonRawFormatConverter.cpp
@@ -4,6 +4,7 @@
 #include "Configuration/RawFileFormat/RawFormatValueNumber.h"
 #include "Configuration/RawFileFormat/RawFormatValueString.h"
 #include "Configuration/RawFileFormat/RawFormatValueBool.h"
+#include "Configuration/RawFileFormat/RawFormatValueRawJson.h"
 #include "Dom/JsonObject.h"
 
 TSharedPtr<FJsonValue> FJsonRawFormatConverter::ConvertToJson(const URawFormatValue* RawFormatValue) {
@@ -22,6 +23,9 @@ TSharedPtr<FJsonValue> FJsonRawFormatConverter::ConvertToJson(const URawFormatVa
     if (const URawFormatValueObject* Object = Cast<URawFormatValueObject>(RawFormatValue)) {
         return Object->ToJson();
     }
+    if (const URawFormatValueRawJson* RawJson = Cast<URawFormatValueRawJson>(RawFormatValue)) {
+        return RawJson->ToJson();
+    }
     checkf(false, TEXT("Unreachable code"));
     return NULL;
 }
diff --git a/Mods/SML/Source/SML/Public/Configuration/CodeGeneration/ConfigVariableDescriptor.h b/Mods/SML/Source/SML/Public/Configuration/CodeGeneration/ConfigVariableDescriptor.h
@@ -16,7 +16,8 @@ enum class EConfigVariableType : uint8 {
     ECVT_Object UMETA(DisplayName = "Object"),
     ECVT_Class UMETA(DisplayName = "Class"),
     ECVT_CustomStruct UMETA(DisplayName = "Custom Structure"),
-    ECVT_ConfigGeneratedStruct UMETA(DisplayName = "Config Generated Struct (delayed)")
+    ECVT_ConfigGeneratedStruct UMETA(DisplayName = "Config Generated Struct (delayed)"),
+    ECVT_RawJsonValue UMETA(DisplayName = "Raw Json Value")
 };
 
 /** Describes variable generated by the config property and associated metadata */
@@ -45,6 +46,8 @@ struct SML_API FConfigVariableDescriptor {
 
     void SetupAsClass(UClass* BaseClassType);
 
+    void SetupAsRawJsonValue();
+
     /** Type of the generated variable. Decides which of the settings below are applied */
     FORCEINLINE EConfigVariableType GetVariableType() const { return VariableType; }
    
diff --git a/Mods/SML/Source/SML/Public/Configuration/CodeGeneration/ConfigVariableLibrary.h b/Mods/SML/Source/SML/Public/Configuration/CodeGeneration/ConfigVariableLibrary.h
@@ -68,6 +68,10 @@ class SML_API UConfigVariableLibrary : public UBlueprintFunctionLibrary {
     UFUNCTION(BlueprintPure, Category="ConfigVariables", meta=(DisplayName = "Make Config Variable (Map)", Keywords="construct build", NativeMakeFunc))
     static FConfigVariableDescriptor MakeConfigVariableMap(const FConfigVariableDescriptor& KeyType, const FConfigVariableDescriptor& ValueType);
 
+    /** Creates new instance of raw json value config variable */
+    UFUNCTION(BlueprintPure, Category="ConfigVariables", meta=(DisplayName = "Make Config Variable (Raw Json Value)", Keywords="construct build", NativeMakeFunc))
+    static FConfigVariableDescriptor MakeConfigVariableRawJsonValue();
+
     DECLARE_FUNCTION(execMakeConfigVariableStruct) {
         const FDynamicStructInfo StructInfo = FReflectionHelper::CheckStructParameter(Context, Stack);
         P_FINISH;
diff --git a/Mods/SML/Source/SML/Public/Configuration/Properties/ConfigPropertyRaw.h b/Mods/SML/Source/SML/Public/Configuration/Properties/ConfigPropertyRaw.h
@@ -0,0 +1,47 @@
+﻿#pragma once
+#include "Configuration/ConfigProperty.h"
+#include "Configuration/ConfigValueDirtyHandlerInterface.h"
+#include "Configuration/RawFileFormat/RawFormatValueRawJson.h"
+#include "ConfigPropertyRaw.generated.h"
+
+/**
+ * Describes a raw configuration property not designed to be edited by the player.
+ * 
+ * Note: Changes to this property's value will need to be made through C++ code.
+ *       Blueprint editing of this property is not supported.
+ */
+UCLASS()
+class SML_API UConfigPropertyRaw : public UConfigProperty {
+    GENERATED_BODY()
+public:
+    TSharedRef<FJsonValue> Value = MakeShared<FJsonValueObject>(MakeShareable(new FJsonObject())); // Default to empty JSON object
+
+    void SetValue(TSharedPtr<FJsonValue> NewValue);
+    void SetValue(TSharedPtr<FJsonObject> NewValue);
+
+    // Begin UConfigProperty
+public:
+    virtual FString DescribeValue_Implementation() const override;
+    virtual URawFormatValue* Serialize_Implementation(UObject* Outer) const override;
+    virtual void Deserialize_Implementation(const URawFormatValue* Value) override;
+    virtual FConfigVariableDescriptor CreatePropertyDescriptor_Implementation( UConfigGenerationContext* Context, const FString& OuterPath) const override;
+    virtual void FillConfigStruct_Implementation(const FReflectedObject& ReflectedObject, const FString& VariableName) const override;
+    virtual bool ResetToDefault_Implementation() override;
+    virtual bool IsSetToDefaultValue_Implementation() const override;
+    virtual FString GetDefaultValueAsString_Implementation() const override;
+    
+    virtual URawFormatValueRawJson* CreateRawFormatValue(UObject* Outer, const TSharedPtr<FJsonValue>& JsonValue) override {
+        return URawFormatValueRawJson::FromJson(Outer, JsonValue);
+    }
+    // End UConfigProperty
+
+    // Begin UObject
+protected:
+    virtual void PostInitProperties() override;
+
+public:
+#if WITH_EDITOR
+    virtual bool CanEditChange(const FProperty* InProperty) const override;
+#endif
+    // End UObject
+};
diff --git a/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_Raw.h b/Mods/SML/Source/SML/Public/Configuration/Properties/WidgetExtension/CP_Raw.h
@@ -0,0 +1,9 @@
+﻿#pragma once
+#include "Configuration/Properties/ConfigPropertyRaw.h"
+#include "CP_Raw.generated.h"
+
+UCLASS(EditInlineNew, Abstract)
+class SML_API UCP_Raw : public UConfigPropertyRaw {
+    GENERATED_BODY()
+public:
+};
diff --git a/Mods/SML/Source/SML/Public/Configuration/RawFileFormat/RawFormatValueRawJson.h b/Mods/SML/Source/SML/Public/Configuration/RawFileFormat/RawFormatValueRawJson.h
@@ -0,0 +1,32 @@
+#pragma once
+#include "Configuration/RawFileFormat/RawFormatValue.h"
+#include "CoreMinimal.h"
+#include "RawFormatValueRawJson.generated.h"
+
+/** 
+ * Holds a raw JSON value.
+ * 
+ * Note: Changes to this value will need to be made through C++ code.
+ *       Blueprint editing of this value is not supported.
+ */
+UCLASS()
+class SML_API URawFormatValueRawJson : public URawFormatValue {
+    GENERATED_BODY()
+public:
+    TSharedRef<FJsonValue> Value = MakeShared<FJsonValueObject>(MakeShareable(new FJsonObject())); // Default to empty JSON object
+
+    virtual TSharedPtr<FJsonValue> ToJson() const override;
+
+    /** Creates a new URawFormatValueRawJson from the given JSON value */
+    static URawFormatValueRawJson* FromJson(UObject* Outer, const TSharedPtr<FJsonValue>& JsonValue);
+};
+
+FORCEINLINE TSharedPtr<FJsonValue> URawFormatValueRawJson::ToJson() const {
+    return Value.ToSharedPtr();
+}
+
+FORCEINLINE URawFormatValueRawJson* URawFormatValueRawJson::FromJson(UObject* Outer, const TSharedPtr<FJsonValue>& JsonValue) {
+    URawFormatValueRawJson* JsonValueWrapper = NewObject<URawFormatValueRawJson>(Outer);
+    JsonValueWrapper->Value = JsonValue.ToSharedRef();
+    return JsonValueWrapper;
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+#include "Configuration/Properties/WidgetExtension/CP_Raw.h"`