Bump version to 1.0.4.

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 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
+
 ## 1.0.1 (November 25, 2024)
 
 

RefinedRDApi.uplugin

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

Source/RefinedRDApi/Private/DataAssets/RRDADataAssetDSItemFilter.cpp

@@ -0,0 +1,5 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+
+#include "DataAssets/RRDADataAssetDSItemFilter.h"
+

Source/RefinedRDApi/Private/Subsystems/RRDADataAssetSubsystem.cpp

@@ -67,6 +67,7 @@ void URRDADataAssetSubsystem::StartScanForDataAssets() {
 	ReCacheGeneratorDataAssets();
 
 	mDSBuildingData.Empty();
+	ReCacheDSItemFilters();
 	ReCacheDSModAdapterDataAssets();
 	ReCacheDSAdapterCoversDataAssets();
 }
@@ -178,6 +179,8 @@ void URRDADataAssetSubsystem::ReCacheDSModAdapterDataAssets() {
 	TSet<URRDADataAssetDSModAdapter*> DataAssets;
 	if (FindAllDataAssetsOfClass(DataAssets)) {
 		for (URRDADataAssetDSModAdapter* DataAsset : DataAssets) {
+			if (DataAsset->mBuildingClass == nullptr) continue;
+
 			FRRDADataHolderDSBuildingData* existingData = mDSBuildingData.Find(DataAsset->mBuildingClass);
 			if (existingData == nullptr) {
 				FRRDADataHolderDSBuildingData newData = FRRDADataHolderDSBuildingData();
@@ -197,6 +200,8 @@ void URRDADataAssetSubsystem::ReCacheDSAdapterCoversDataAssets() {
 	TSet<URRDADataAssetDSAdapterCovers*> DataAssets;
 	if (FindAllDataAssetsOfClass(DataAssets)) {
 		for (URRDADataAssetDSAdapterCovers* DataAsset : DataAssets) {
+			if (DataAsset->mBuildingClass == nullptr) continue;
+
 			FRRDADataHolderDSBuildingData* existingData = mDSBuildingData.Find(DataAsset->mBuildingClass);
 			if (existingData == nullptr) {
 				FRRDADataHolderDSBuildingData newData = FRRDADataHolderDSBuildingData();
@@ -211,6 +216,26 @@ void URRDADataAssetSubsystem::ReCacheDSAdapterCoversDataAssets() {
 	UE_LOGFMT(LogRRDApi, Log, "ReCacheDSAdapterCoversDataAssets: {0}", mDSBuildingData.Num());
 }
 
+void URRDADataAssetSubsystem::ReCacheDSItemFilters() {
+	TSet<URRDADataAssetDSItemFilter*> DataAssets;
+	if (FindAllDataAssetsOfClass(DataAssets)) {
+		for (URRDADataAssetDSItemFilter* DataAsset : DataAssets) {
+			if (DataAsset->mBuildingClass == nullptr) continue;
+
+			FRRDADataHolderDSBuildingData* existingData = mDSBuildingData.Find(DataAsset->mBuildingClass);
+			if (existingData == nullptr) {
+				FRRDADataHolderDSBuildingData newData = FRRDADataHolderDSBuildingData();
+				newData.ItemFilters.AddUnique(DataAsset);
+				mDSBuildingData.Add(DataAsset->mBuildingClass, newData);
+			}
+			else {
+				existingData->ItemFilters.AddUnique(DataAsset);
+			}
+		}
+	}
+	UE_LOGFMT(LogRRDApi, Log, "ReCacheDSItemFilters: {0}", mDSBuildingData.Num());
+}
+
 int32 URRDADataAssetSubsystem::GetAllDirtItems(TArray<TSubclassOf<UFGItemDescriptor>>& Items) const {
 	if (!mDirtAssets.Num()) {
 		UE_LOG(LogRRDApi, Error, TEXT("No Dirts found!"));
@@ -308,6 +333,27 @@ bool URRDADataAssetSubsystem::HasDSAdaperCoversForBuildingClass(TSubclassOf<AFGB
 	return IsValid(GetDSAdapterCoverDataAssetForBuildingClass(BuildingClass));
 }
 
+TArray<URRDADataAssetDSItemFilter*> URRDADataAssetSubsystem::GetDSItemFiltersDataAssetsForBuildingClass(TSubclassOf<AFGBuildableFactory> BuildingClass) const {
+	if (!BuildingClass) return TArray<URRDADataAssetDSItemFilter*>{};
+
+	const FRRDADataHolderDSBuildingData* data = mDSBuildingData.Find(BuildingClass);
+	if (data == nullptr) return TArray<URRDADataAssetDSItemFilter*>{};
+
+	return data->ItemFilters;
+}
+
+TArray<URRDADataAssetDSItemFilter*> URRDADataAssetSubsystem::GetAllDSItemFiltersDataAssets() const {
+	TArray<URRDADataAssetDSItemFilter*> Assets;
+	TArray<FRRDADataHolderDSBuildingData> buildingDatas;
+
+	mDSBuildingData.GenerateValueArray(buildingDatas);
+
+	for (FRRDADataHolderDSBuildingData& buildingData : buildingDatas) {
+		Assets.Append(buildingData.ItemFilters);
+	}
+	return Assets;
+}
+
 bool URRDADataAssetSubsystem::GetAllTurbineItems(TArray<TSubclassOf<UFGItemDescriptor>>& Items, int32 Tier) const {
 	if (!mTurbineAssets.Contains(Tier)) {
 		return false;

Source/RefinedRDApi/Public/DataAssets/RRDADataAssetDSItemFilter.h

@@ -0,0 +1,31 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "DataAssets/RRDADataAssetBase.h"
+#include "Resources/FGItemDescriptor.h"
+#include "RRDADataAssetDSItemFilter.generated.h"
+
+/**
+ * 
+ */
+UCLASS()
+class REFINEDRDAPI_API URRDADataAssetDSItemFilter : public URRDADataAssetBase
+{
+	GENERATED_BODY()
+
+public:
+	/* The Building class this item filter should be used on */
+	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="ItemFilter")
+	TSubclassOf<AFGBuildableFactory> mBuildingClass;
+
+	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="ItemFilter")
+	int mInventoryIndex = 0;
+
+	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="ItemFilter")
+	int mInventorySlotIndex = 0;
+
+	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="ItemFilter")
+	TArray<TSubclassOf<UFGItemDescriptor>> mItemFilterClasses;
+};

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;
@@ -55,12 +55,20 @@ public:
 	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, meta=(EditCondition = mOverrideItemFilter))
 	TArray<TSubclassOf<UFGItemDescriptor>> mItemFilter;
 
+	/* Adds only the filtered item from the slot to the Item Selection dropdown. */
+	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly)
+	bool mCheckSlotItemFilter = false;
+
 	/* Should check if the inventory slot has an Item Filter set
 	 This will override the item class that the player selects with the allowed item class on the slot.
 	 Also disables item selection in the UI.
 	 */
 	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly)
-	bool mCheckSlotItemFilter = false;
+	bool mAutomaticallySetFromSlotItemFilter = false;
+
+	/* This slot will represent the full inventory and will access all inventory slots */
+	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly)
+	bool mSlotRepresentsFullInventory = false;
 };
 
 USTRUCT(BlueprintType)
@@ -84,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

@@ -13,6 +13,7 @@
 #include "DataAssets/RRDAHeaterDataAsset.h"
 #include "DataAssets/RRDATurbineDataAsset.h"
 #include "DataAssets/RRDACoolerDataAsset.h"
+#include "DataAssets/RRDADataAssetDSItemFilter.h"
 #include "DataAssets/RRDADataAssetDSModAdapter.h"
 #include "Enums/RRDARPEnums.h"
 #include "Resources/FGItemDescriptor.h"
@@ -66,6 +67,9 @@ struct FRRDADataHolderDSBuildingData
 
 	UPROPERTY()
 	URRDADataAssetDSModAdapter* ModAdapter;
+
+	UPROPERTY()
+	TArray<URRDADataAssetDSItemFilter*> ItemFilters;
 };
 
 UCLASS()
@@ -98,6 +102,7 @@ public:
 	void ReCacheGeneratorDataAssets();
 	void ReCacheDSModAdapterDataAssets();
 	void ReCacheDSAdapterCoversDataAssets();
+	void ReCacheDSItemFilters();
 
 public:
 	// Dirt Functions
@@ -133,6 +138,14 @@ public:
 	UFUNCTION(BlueprintCallable, Category = "RRDA|DataAsset|DS")
 	bool HasDSAdaperCoversForBuildingClass(TSubclassOf<AFGBuildableFactory> BuildingClass);
 
+	// DS Item Filters
+
+	UFUNCTION(BlueprintCallable, Category = "RRDA|DataAsset|DS")
+	TArray<URRDADataAssetDSItemFilter*> GetDSItemFiltersDataAssetsForBuildingClass(TSubclassOf<AFGBuildableFactory> BuildingClass) const;
+
+	UFUNCTION(BlueprintPure, Category = "RRDA|DataAsset|DS")
+	TArray<URRDADataAssetDSItemFilter*> GetAllDSItemFiltersDataAssets() const;
+
 	// Turbine Functions
 	UFUNCTION(BlueprintPure, Category = "RRDA|DataAsset|RP|MP")
 	bool GetAllTurbineItems(TArray<TSubclassOf<UFGItemDescriptor>>& Items, int32 Tier) const;

VERSION

@@ -1 +1 @@
-1.0.1
+1.0.4