From dbcd107343603dd71e2ad5457da837536daaceab Mon Sep 17 00:00:00 2001
From: mrhid6 <dominic.richardson1@hotmail.co.uk>
Date: Fri, 5 Jun 2026 21:19:21 +0100
Subject: [PATCH] feat: Raw Pointers to TObjectPtr migration

---
 .../Subsystems/RRDADataAssetSubsystem.cpp     | 12 +++++-----
 .../Public/DataAssets/RRDABoilerDataAsset.h   |  2 +-
 .../DataAssets/RRDADataAssetDSModAdapter.h    |  2 +-
 .../DataAssets/RRDAGeneratorDataAsset.h       |  2 +-
 .../Subsystems/RRDADataAssetSubsystem.h       | 24 +++++++++----------
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Source/RefinedRDApi/Private/Subsystems/RRDADataAssetSubsystem.cpp b/Source/RefinedRDApi/Private/Subsystems/RRDADataAssetSubsystem.cpp
index d21bc31..1d1383a 100644
--- a/Source/RefinedRDApi/Private/Subsystems/RRDADataAssetSubsystem.cpp
+++ b/Source/RefinedRDApi/Private/Subsystems/RRDADataAssetSubsystem.cpp
@@ -265,13 +265,13 @@ int32 URRDADataAssetSubsystem::GetAllDirtItems(TArray<TSubclassOf<UFGItemDescrip
 
 URRDADirtDataAsset* URRDADataAssetSubsystem::GetDataForDirtItem(TSubclassOf<UFGItemDescriptor> Item) const {
 	if (!Item) return nullptr;
-	URRDADirtDataAsset* const* Desc = mDirtAssets.Find(Item);
+	TObjectPtr<URRDADirtDataAsset> const* Desc = mDirtAssets.Find(Item);
 	if (!Desc) return nullptr;
 	return *Desc;
 }
 
 TArray<URRDADirtDataAsset*> URRDADataAssetSubsystem::GetAllDirtAssets() const {
-	TArray<URRDADirtDataAsset*> Assets;
+	TArray<TObjectPtr<URRDADirtDataAsset>> Assets;
 	mDirtAssets.GenerateValueArray(Assets);
 	return Assets;
 }
@@ -402,7 +402,7 @@ TArray<URRDATurbineDataAsset*> URRDADataAssetSubsystem::GetAllTurbineAssets(int3
 		return TArray<URRDATurbineDataAsset*>();
 	}
 
-	TArray<URRDATurbineDataAsset*> Assets;
+	TArray<TObjectPtr<URRDATurbineDataAsset>> Assets;
 	mTurbineAssets[Tier].Data.GenerateValueArray(Assets);
 	return Assets;
 }
@@ -444,7 +444,7 @@ TArray<URRDACoolerDataAsset*> URRDADataAssetSubsystem::GetAllCoolerAssets(ERRDAC
 		return TArray<URRDACoolerDataAsset*>();
 	}
 
-	TArray<URRDACoolerDataAsset*> Assets;
+	TArray<TObjectPtr<URRDACoolerDataAsset>> Assets;
 	mCoolerAssets[Type].Data.GenerateValueArray(Assets);
 
 	return Assets;
@@ -490,7 +490,7 @@ TArray<URRDABoilerDataAsset*> URRDADataAssetSubsystem::GetAllBoilerAssets(int32
 		return TArray<URRDABoilerDataAsset*>();
 	}
 
-	TArray<URRDABoilerDataAsset*> Assets;
+	TArray<TObjectPtr<URRDABoilerDataAsset>> Assets;
 	mBoilerAssets[Tier].Data.GenerateValueArray(Assets);
 
 	return Assets;
@@ -531,7 +531,7 @@ TArray<URRDAHeaterDataAsset*> URRDADataAssetSubsystem::GetAllHeaterAssets(ERRDAH
 		return TArray<URRDAHeaterDataAsset*>();
 	}
 
-	TArray<URRDAHeaterDataAsset*> Assets;
+	TArray<TObjectPtr<URRDAHeaterDataAsset>> Assets;
 	mHeaterAssets[Type].Data.GenerateValueArray(Assets);
 
 	return Assets;
diff --git a/Source/RefinedRDApi/Public/DataAssets/RRDABoilerDataAsset.h b/Source/RefinedRDApi/Public/DataAssets/RRDABoilerDataAsset.h
index f8271ed..55315a4 100644
--- a/Source/RefinedRDApi/Public/DataAssets/RRDABoilerDataAsset.h
+++ b/Source/RefinedRDApi/Public/DataAssets/RRDABoilerDataAsset.h
@@ -42,5 +42,5 @@ public:
 	 * Curve for the production to Heat
 	 */
 	UPROPERTY( EditDefaultsOnly, BlueprintReadOnly, Category = "Boiler" )
-	UCurveFloat* mBoilerCurve;
+	TObjectPtr<UCurveFloat> mBoilerCurve;
 };
\ No newline at end of file
diff --git a/Source/RefinedRDApi/Public/DataAssets/RRDADataAssetDSModAdapter.h b/Source/RefinedRDApi/Public/DataAssets/RRDADataAssetDSModAdapter.h
index 54c2438..8b3707c 100644
--- a/Source/RefinedRDApi/Public/DataAssets/RRDADataAssetDSModAdapter.h
+++ b/Source/RefinedRDApi/Public/DataAssets/RRDADataAssetDSModAdapter.h
@@ -24,7 +24,7 @@ public:
 
 	/* The Adapter Cover Asset */
 	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="ModAdapter")
-	URRDADataAssetDSAdapterCovers* mAdapterCoversAsset;
+	TObjectPtr<URRDADataAssetDSAdapterCovers> mAdapterCoversAsset;
 
 	/* Select which inventories can be accessed by Digital Storage */
 	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="ModAdapter")
diff --git a/Source/RefinedRDApi/Public/DataAssets/RRDAGeneratorDataAsset.h b/Source/RefinedRDApi/Public/DataAssets/RRDAGeneratorDataAsset.h
index 68951cd..ccc3360 100644
--- a/Source/RefinedRDApi/Public/DataAssets/RRDAGeneratorDataAsset.h
+++ b/Source/RefinedRDApi/Public/DataAssets/RRDAGeneratorDataAsset.h
@@ -36,5 +36,5 @@ public:
 	* Curve that defines the power output of the generator
 	*/
 	UPROPERTY( EditAnywhere, BlueprintReadWrite, Category = "Generator" )
-	UCurveFloat* mGeneratorCurve;
+	TObjectPtr<UCurveFloat> mGeneratorCurve;
 };
\ No newline at end of file
diff --git a/Source/RefinedRDApi/Public/Subsystems/RRDADataAssetSubsystem.h b/Source/RefinedRDApi/Public/Subsystems/RRDADataAssetSubsystem.h
index c6e4296..c6cee23 100644
--- a/Source/RefinedRDApi/Public/Subsystems/RRDADataAssetSubsystem.h
+++ b/Source/RefinedRDApi/Public/Subsystems/RRDADataAssetSubsystem.h
@@ -28,7 +28,7 @@ struct FRRDADataHolderTurbineData
 	GENERATED_BODY()
 
 	UPROPERTY(BlueprintReadOnly)
-	TMap<TSubclassOf<UFGItemDescriptor>, URRDATurbineDataAsset*> Data;
+	TMap<TSubclassOf<UFGItemDescriptor>, TObjectPtr<URRDATurbineDataAsset>> Data;
 };
 
 USTRUCT(BlueprintType)
@@ -37,7 +37,7 @@ struct FRRDADataHolderBoilerData
 	GENERATED_BODY()
 
 	UPROPERTY(BlueprintReadOnly)
-	TMap<TSubclassOf<UFGItemDescriptor>, URRDABoilerDataAsset*> Data;
+	TMap<TSubclassOf<UFGItemDescriptor>, TObjectPtr<URRDABoilerDataAsset>> Data;
 };
 
 USTRUCT(BlueprintType)
@@ -46,7 +46,7 @@ struct FRRDADataHolderCoolerData
 	GENERATED_BODY()
 
 	UPROPERTY(BlueprintReadOnly)
-	TMap<TSubclassOf<UFGItemDescriptor>, URRDACoolerDataAsset*> Data;
+	TMap<TSubclassOf<UFGItemDescriptor>, TObjectPtr<URRDACoolerDataAsset>> Data;
 };
 
 USTRUCT(BlueprintType)
@@ -55,7 +55,7 @@ struct FRRDADataHolderHeaterData
 	GENERATED_BODY()
 
 	UPROPERTY(BlueprintReadOnly)
-	TMap<TSubclassOf<UFGItemDescriptor>, URRDAHeaterDataAsset*> Data;
+	TMap<TSubclassOf<UFGItemDescriptor>, TObjectPtr<URRDAHeaterDataAsset>> Data;
 };
 
 USTRUCT(BlueprintType)
@@ -64,13 +64,13 @@ struct FRRDADataHolderDSBuildingData
 	GENERATED_BODY()
 
 	UPROPERTY()
-	URRDADataAssetDSAdapterCovers* AdapterCovers;
+	TObjectPtr<URRDADataAssetDSAdapterCovers> AdapterCovers;
 
 	UPROPERTY()
-	URRDADataAssetDSModAdapter* ModAdapter;
+	TObjectPtr<URRDADataAssetDSModAdapter> ModAdapter;
 
 	UPROPERTY()
-	TArray<URRDADataAssetDSItemFilter*> ItemFilters;
+	TArray<TObjectPtr<URRDADataAssetDSItemFilter>> ItemFilters;
 };
 
 UCLASS()
@@ -227,13 +227,13 @@ public:
 
 public:
 	UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
-	TMap<TSubclassOf<UFGItemDescriptor>, URRDADirtDataAsset*> mDirtAssets;
+	TMap<TSubclassOf<UFGItemDescriptor>, TObjectPtr<URRDADirtDataAsset>> mDirtAssets;
 
 	UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
 	TMap<TSubclassOf<AFGBuildableFactory>, FRRDADataHolderDSBuildingData> mDSBuildingData;
 
 	UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
-	TMap<int32, URRDAGeneratorDataAsset*> mGeneratorAssets;
+	TMap<int32, TObjectPtr<URRDAGeneratorDataAsset>> mGeneratorAssets;
 
 	UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
 	TMap<int32, FRRDADataHolderTurbineData> mTurbineAssets;
@@ -248,13 +248,13 @@ public:
 	TMap<ERRDAHeaterType, FRRDADataHolderHeaterData> mHeaterAssets;
 
 	UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
-	TArray<URRDADataAssetSolarPower*> mSolarPowerAssets;
+	TArray<TObjectPtr<URRDADataAssetSolarPower>> mSolarPowerAssets;
 
 	UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
-	TSet<URRDADataAssetBase*> mDisabledDataAssets;
+	TSet<TObjectPtr<URRDADataAssetBase>> mDisabledDataAssets;
 
 	UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
-	TSet<URRDADataAssetBase*> mEnabledDataAssets;
+	TSet<TObjectPtr<URRDADataAssetBase>> mEnabledDataAssets;
 };
 
 template <class T>