feat: Inital 1.2 update

.gitea/workflows/main.yaml

@@ -19,12 +19,22 @@ jobs:
         steps:
             - name: Setup SML
               run: |
-                  if (!(Test-Path ${{env.SML_DIR}} -PathType Container)) {git clone --branch master https://github.com/satisfactorymodding/SatisfactoryModLoader.git ${{env.SML_DIR}}}
+                  if (!(Test-Path ${{env.SML_DIR}} -PathType Container)) {git clone --branch dev https://github.com/satisfactorymodding/SatisfactoryModLoader.git ${{env.SML_DIR}}}
             - name: Install WWise
               run: |
                   cd ${{env.SML_DIR}}
                   if ((Test-Path ${{env.SML_DIR}}/Plugins/Wwise) -eq $true){ echo "WWise already Installed Skipping.."; exit 0 }
                   S:/SF/Scripts/wwise-cli.exe integrate-ue --integration-version "2022.1.5.2714"  --project "${{env.SML_DIR}}/FactoryGame.uproject"
+            - name: Pull WWise Project
+              run: |
+                  cd ${{env.SML_DIR}}/SML_WwiseProject
+                  git fetch --all
+                  git reset --hard origin/main
+                  git lfs fetch --all
+                  git lfs pull
+                  git lfs checkout
+                  & "C:/Program Files (x86)/Audiokinetic/Wwise2023.1.3.8471/Authoring/x64/Release/bin/WwiseConsole.exe" generate-soundbank "${{env.SML_DIR}}/SML_WwiseProject/SML_WwiseProject.wproj" --platform Windows Mac --verbose
+                  echo "Done"
             - name: "SML Headers"
               run: |
                   cd S:/SF/Scripts/sml-fixer

CHANGELOG.md

@@ -1,3 +1,24 @@
+## 1.0.7 (June 16, 2025)
+  - chore: Bump game version
+  - chore: Bump SML Version
+  - chore: Bump SML Version
+  - feat(SP): New buildings data assets
+
+## 1.0.6 (March 06, 2025)
+  - feat: SML Bump
+  - feat: Bump SML
+
+## 1.0.5 (January 10, 2025)
+  - ci: LFS Changes
+  - ci: wwise project
+
+## 1.0.4 (December 17, 2024)
+  - feat: Bump sml version
+  - feat: Mod Adapter struct updates
+
+## 1.0.3 (November 30, 2024)
+  - feat: Changed forms to array
+
 ## 1.0.2 (November 29, 2024)
   - feat: Item filters
   - feat: Additional DS Options

RefinedRDApi.uplugin

@@ -1,8 +1,8 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "1.0.2",
+	"VersionName": "1.0.7",
-	"SemVersion": "1.0.2",
+	"SemVersion": "1.0.7",
 	"FriendlyName": "Refined R&D Api",
 	"Description": "This Lib can be used to create Mod Compatability with Refined R&D Mods",
 	"Category": "Modding",
@@ -26,8 +26,8 @@
 		{
 			"Name": "SML",
 			"Enabled": true,
-			"SemVersion": "^3.8.0"
+			"SemVersion": "^3.11.3"
 		}
 	],
-	"GameVersion": ">=377620"
+	"GameVersion": ">=491125"
 }

Source/RefinedRDApi/Private/DataAssets/RRDADataAssetSolarPower.cpp

@@ -0,0 +1,3 @@
+//
+
+#include "DataAssets/RRDADataAssetSolarPower.h"

Source/RefinedRDApi/Private/Subsystems/RRDADataAssetSubsystem.cpp

@@ -70,6 +70,8 @@ void URRDADataAssetSubsystem::StartScanForDataAssets() {
 	ReCacheDSItemFilters();
 	ReCacheDSModAdapterDataAssets();
 	ReCacheDSAdapterCoversDataAssets();
+
+	ReCacheSolarPowerDataAssets();
 }
 
 void URRDADataAssetSubsystem::ReCacheDirtDataAssets() {
@@ -236,6 +238,24 @@ void URRDADataAssetSubsystem::ReCacheDSItemFilters() {
 	UE_LOGFMT(LogRRDApi, Log, "ReCacheDSItemFilters: {0}", mDSBuildingData.Num());
 }
 
+void URRDADataAssetSubsystem::ReCacheSolarPowerDataAssets()
+{
+	mSolarPowerAssets.Empty();
+	TSet<URRDADataAssetSolarPower*> DataAssets;
+	
+	if (FindAllDataAssetsOfClass(DataAssets)) {
+		for (URRDADataAssetSolarPower* DataAsset : DataAssets) {
+			fgcheckf(DataAsset->mInput.ItemClass, TEXT("SolarPowerDataAsset %s has no ItemClass"), *DataAsset->GetPathName());
+			
+			if (!mSolarPowerAssets.Contains(DataAsset)) {
+				mSolarPowerAssets.AddUnique(DataAsset);
+			}
+		}
+	}
+
+	UE_LOG(LogRRDApi, Log, TEXT("ReCacheSolarPowerDataAssets: %d"), mSolarPowerAssets.Num());
+}
+
 int32 URRDADataAssetSubsystem::GetAllDirtItems(TArray<TSubclassOf<UFGItemDescriptor>>& Items) const {
 	if (!mDirtAssets.Num()) {
 		UE_LOG(LogRRDApi, Error, TEXT("No Dirts found!"));
@@ -245,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;
 }
@@ -382,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;
 }
@@ -424,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;
@@ -470,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;
@@ -511,8 +531,13 @@ TArray<URRDAHeaterDataAsset*> URRDADataAssetSubsystem::GetAllHeaterAssets(ERRDAH
 		return TArray<URRDAHeaterDataAsset*>();
 	}
 
-	TArray<URRDAHeaterDataAsset*> Assets;
+	TArray<TObjectPtr<URRDAHeaterDataAsset>> Assets;
 	mHeaterAssets[Type].Data.GenerateValueArray(Assets);
 
 	return Assets;
 }
+
+TArray<URRDADataAssetSolarPower*> URRDADataAssetSubsystem::GetAllSolarPowerAssets() const
+{
+	return mSolarPowerAssets;
+}

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;
 };

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")

Source/RefinedRDApi/Public/DataAssets/RRDADataAssetSolarPower.h

@@ -0,0 +1,32 @@
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RRDADataAssetBase.h"
+#include "ItemAmount.h"
+
+#include "RRDADataAssetSolarPower.generated.h"
+
+UCLASS( BlueprintType )
+class REFINEDRDAPI_API URRDADataAssetSolarPower : public URRDADataAssetBase
+{
+	GENERATED_BODY()
+
+public:
+	/**
+	 * Fuel item that this uses
+	 */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "SolarPower")
+	FItemAmount mInput;
+	
+	/**
+	 * What this produces
+	 */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "SolarPower")
+	FItemAmount mOutput;
+
+	/**
+	 * What the min heat is needed to produce
+	 */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "SolarPower")
+	float mMinHeatValue = 0.0f;
+};

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;
 };

Source/RefinedRDApi/Public/Enums/RRDADSEnums.h

@@ -8,4 +8,5 @@ enum class ERRDADSInventorySlotAccessInteraction : uint8
 	Ignore,
 	ImportToNetworkFromSlot,
 	ExportFromNetworkToSlot,
+	LetPlayerDecide,
 };

Source/RefinedRDApi/Public/Structs/RRDADSStructs.h

@@ -42,11 +42,11 @@ public:
 	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly)
 	ERRDADSInventorySlotAccessInteraction mInteraction = ERRDADSInventorySlotAccessInteraction::Ignore;
 
-	/* Select the item resource form that will be displayed in the digital storage UI
+	/* Select the item resource forms that will be displayed in the digital storage UI
-	   This will only display items of this form when players search for an item.
+	   This will only display items of these forms when players search for an item.
 	 */
 	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly)
-	EResourceForm mSlotItemForm = EResourceForm::RF_SOLID;
+	TArray<EResourceForm> mSlotItemForms;
 
 	UPROPERTY(BlueprintReadOnly, meta=(NoAutoJson = true))
 	bool mOverrideItemFilter = false;
@@ -65,6 +65,10 @@ public:
 	 */
 	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly)
 	bool mAutomaticallySetFromSlotItemFilter = false;
+
+	/* This slot will represent the full inventory and will access all inventory slots */
+	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly)
+	bool mSlotRepresentsFullInventory = false;
 };
 
 USTRUCT(BlueprintType)
@@ -88,4 +92,8 @@ public:
 	/* The Inventory slots to allow access to Digital Storage */
 	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly)
 	TArray<FRRDADSModAdapterInventorySlotAccess> mInventorySlots;
+
+	/* Use the inventory on the universal adapter instead of the building adapter */
+	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly)
+	bool mUseAdapterInventory = false;
 };

Source/RefinedRDApi/Public/Subsystems/RRDADataAssetSubsystem.h

@@ -15,6 +15,7 @@
 #include "DataAssets/RRDACoolerDataAsset.h"
 #include "DataAssets/RRDADataAssetDSItemFilter.h"
 #include "DataAssets/RRDADataAssetDSModAdapter.h"
+#include "DataAssets/RRDADataAssetSolarPower.h"
 #include "Enums/RRDARPEnums.h"
 #include "Resources/FGItemDescriptor.h"
 
@@ -27,7 +28,7 @@ struct FRRDADataHolderTurbineData
 	GENERATED_BODY()
 
 	UPROPERTY(BlueprintReadOnly)
-	TMap<TSubclassOf<UFGItemDescriptor>, URRDATurbineDataAsset*> Data;
+	TMap<TSubclassOf<UFGItemDescriptor>, TObjectPtr<URRDATurbineDataAsset>> Data;
 };
 
 USTRUCT(BlueprintType)
@@ -36,7 +37,7 @@ struct FRRDADataHolderBoilerData
 	GENERATED_BODY()
 
 	UPROPERTY(BlueprintReadOnly)
-	TMap<TSubclassOf<UFGItemDescriptor>, URRDABoilerDataAsset*> Data;
+	TMap<TSubclassOf<UFGItemDescriptor>, TObjectPtr<URRDABoilerDataAsset>> Data;
 };
 
 USTRUCT(BlueprintType)
@@ -45,7 +46,7 @@ struct FRRDADataHolderCoolerData
 	GENERATED_BODY()
 
 	UPROPERTY(BlueprintReadOnly)
-	TMap<TSubclassOf<UFGItemDescriptor>, URRDACoolerDataAsset*> Data;
+	TMap<TSubclassOf<UFGItemDescriptor>, TObjectPtr<URRDACoolerDataAsset>> Data;
 };
 
 USTRUCT(BlueprintType)
@@ -54,7 +55,7 @@ struct FRRDADataHolderHeaterData
 	GENERATED_BODY()
 
 	UPROPERTY(BlueprintReadOnly)
-	TMap<TSubclassOf<UFGItemDescriptor>, URRDAHeaterDataAsset*> Data;
+	TMap<TSubclassOf<UFGItemDescriptor>, TObjectPtr<URRDAHeaterDataAsset>> Data;
 };
 
 USTRUCT(BlueprintType)
@@ -63,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()
@@ -103,6 +104,7 @@ public:
 	void ReCacheDSModAdapterDataAssets();
 	void ReCacheDSAdapterCoversDataAssets();
 	void ReCacheDSItemFilters();
+	void ReCacheSolarPowerDataAssets();
 
 public:
 	// Dirt Functions
@@ -211,6 +213,9 @@ public:
 	UFUNCTION(BlueprintPure, Category = "RRDA|DataAsset|RP|MP")
 	TArray<URRDAHeaterDataAsset*> GetAllHeaterAssets(ERRDAHeaterType Type) const;
 
+	UFUNCTION(BlueprintPure, Category = "RRDA|DataAsset|RP|Solar")
+	TArray<URRDADataAssetSolarPower*> GetAllSolarPowerAssets() const;
+
 public:
 	/**
 	 * Find all data assets of a specific class
@@ -222,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;
@@ -243,10 +248,13 @@ public:
 	TMap<ERRDAHeaterType, FRRDADataHolderHeaterData> mHeaterAssets;
 
 	UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
-	TSet<URRDADataAssetBase*> mDisabledDataAssets;
+	TArray<TObjectPtr<URRDADataAssetSolarPower>> mSolarPowerAssets;
 
 	UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
-	TSet<URRDADataAssetBase*> mEnabledDataAssets;
+	TSet<TObjectPtr<URRDADataAssetBase>> mDisabledDataAssets;
+
+	UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
+	TSet<TObjectPtr<URRDADataAssetBase>> mEnabledDataAssets;
 };
 
 template <class T>

Source/RefinedRDApi/RefinedRDApi.Build.cs

@@ -47,7 +47,7 @@ public class RefinedRDApi : ModuleRules
 		PublicDependencyModuleNames.AddRange(new[]
 		{
 			"AbstractInstance",
-			"InstancedSplinesComponent",
+			//"InstancedSplinesComponent",
 			"SignificanceISPC"
 		});
 

VERSION

@@ -1 +1 @@
-1.0.2
+1.0.7