Compare commits

...

5 Commits
v1.0.6 ... main

Author SHA1 Message Date
mrhid6
74badcca9b Bump version to 1.0.7.
All checks were successful
Mod Build / Setup (push) Successful in 12s
Mod Build / PullMods (RefinedRDApi) (push) Successful in 2s
Mod Build / UpdateUPlugins (RefinedRDApi) (push) Successful in 2s
Mod Build / CompileEditor (push) Successful in 3m24s
Mod Build / BuildMods (RefinedRDApi) (push) Successful in 10m24s
Mod Build / SMRDeploy (push) Successful in 39s
2025-06-16 18:04:41 +01:00
mrhid6
0b4b8c5e07 chore: Bump game version 2025-06-10 17:08:44 +01:00
mrhid6
9b59c2bc05 chore: Bump SML Version 2025-06-07 12:58:51 +01:00
mrhid6
01283bc50a chore: Bump SML Version 2025-06-03 21:31:07 +01:00
mrhid6
39ecb1df11 feat(SP): New buildings data assets 2025-05-07 23:26:48 +01:00
8 changed files with 82 additions and 7 deletions

View File

@ -19,7 +19,7 @@ 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}}
@ -33,7 +33,8 @@ jobs:
git lfs fetch --all
git lfs pull
git lfs checkout
copy-item ${{env.SML_DIR}}/SML_WwiseProject/SML-DEV_WwiseProject.wproj ${{env.SML_DIR}}/SML_WwiseProject/SML_WwiseProject.wproj -force
& "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

View File

@ -1,3 +1,9 @@
## 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

View File

@ -1,8 +1,8 @@
{
"FileVersion": 3,
"Version": 1,
"VersionName": "1.0.6",
"SemVersion": "1.0.6",
"VersionName": "1.0.7",
"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.10.0"
"SemVersion": "^3.11.1"
}
],
"GameVersion": ">=383729"
"GameVersion": ">=416835"
}

View File

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

View File

@ -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!"));
@ -516,3 +536,8 @@ TArray<URRDAHeaterDataAsset*> URRDADataAssetSubsystem::GetAllHeaterAssets(ERRDAH
return Assets;
}
TArray<URRDADataAssetSolarPower*> URRDADataAssetSubsystem::GetAllSolarPowerAssets() const
{
return mSolarPowerAssets;
}

View File

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

View File

@ -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"
@ -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
@ -242,6 +247,9 @@ public:
UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
TMap<ERRDAHeaterType, FRRDADataHolderHeaterData> mHeaterAssets;
UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
TArray<URRDADataAssetSolarPower*> mSolarPowerAssets;
UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
TSet<URRDADataAssetBase*> mDisabledDataAssets;

View File

@ -1 +1 @@
1.0.6
1.0.7