Compare commits

..

No commits in common. "main" and "v1.0.6" have entirely different histories.
main ... v1.0.6

8 changed files with 7 additions and 82 deletions

View File

@ -19,7 +19,7 @@ jobs:
steps: steps:
- name: Setup SML - name: Setup SML
run: | run: |
if (!(Test-Path ${{env.SML_DIR}} -PathType Container)) {git clone --branch dev https://github.com/satisfactorymodding/SatisfactoryModLoader.git ${{env.SML_DIR}}} if (!(Test-Path ${{env.SML_DIR}} -PathType Container)) {git clone --branch master https://github.com/satisfactorymodding/SatisfactoryModLoader.git ${{env.SML_DIR}}}
- name: Install WWise - name: Install WWise
run: | run: |
cd ${{env.SML_DIR}} cd ${{env.SML_DIR}}
@ -33,8 +33,7 @@ jobs:
git lfs fetch --all git lfs fetch --all
git lfs pull git lfs pull
git lfs checkout 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 copy-item ${{env.SML_DIR}}/SML_WwiseProject/SML-DEV_WwiseProject.wproj ${{env.SML_DIR}}/SML_WwiseProject/SML_WwiseProject.wproj -force
echo "Done"
- name: "SML Headers" - name: "SML Headers"
run: | run: |
cd S:/SF/Scripts/sml-fixer cd S:/SF/Scripts/sml-fixer

View File

@ -1,9 +1,3 @@
## 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) ## 1.0.6 (March 06, 2025)
- feat: SML Bump - feat: SML Bump
- feat: Bump SML - feat: Bump SML

View File

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

View File

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

View File

@ -70,8 +70,6 @@ void URRDADataAssetSubsystem::StartScanForDataAssets() {
ReCacheDSItemFilters(); ReCacheDSItemFilters();
ReCacheDSModAdapterDataAssets(); ReCacheDSModAdapterDataAssets();
ReCacheDSAdapterCoversDataAssets(); ReCacheDSAdapterCoversDataAssets();
ReCacheSolarPowerDataAssets();
} }
void URRDADataAssetSubsystem::ReCacheDirtDataAssets() { void URRDADataAssetSubsystem::ReCacheDirtDataAssets() {
@ -238,24 +236,6 @@ void URRDADataAssetSubsystem::ReCacheDSItemFilters() {
UE_LOGFMT(LogRRDApi, Log, "ReCacheDSItemFilters: {0}", mDSBuildingData.Num()); 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 { int32 URRDADataAssetSubsystem::GetAllDirtItems(TArray<TSubclassOf<UFGItemDescriptor>>& Items) const {
if (!mDirtAssets.Num()) { if (!mDirtAssets.Num()) {
UE_LOG(LogRRDApi, Error, TEXT("No Dirts found!")); UE_LOG(LogRRDApi, Error, TEXT("No Dirts found!"));
@ -536,8 +516,3 @@ TArray<URRDAHeaterDataAsset*> URRDADataAssetSubsystem::GetAllHeaterAssets(ERRDAH
return Assets; return Assets;
} }
TArray<URRDADataAssetSolarPower*> URRDADataAssetSubsystem::GetAllSolarPowerAssets() const
{
return mSolarPowerAssets;
}

View File

@ -1,32 +0,0 @@
#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,7 +15,6 @@
#include "DataAssets/RRDACoolerDataAsset.h" #include "DataAssets/RRDACoolerDataAsset.h"
#include "DataAssets/RRDADataAssetDSItemFilter.h" #include "DataAssets/RRDADataAssetDSItemFilter.h"
#include "DataAssets/RRDADataAssetDSModAdapter.h" #include "DataAssets/RRDADataAssetDSModAdapter.h"
#include "DataAssets/RRDADataAssetSolarPower.h"
#include "Enums/RRDARPEnums.h" #include "Enums/RRDARPEnums.h"
#include "Resources/FGItemDescriptor.h" #include "Resources/FGItemDescriptor.h"
@ -104,7 +103,6 @@ public:
void ReCacheDSModAdapterDataAssets(); void ReCacheDSModAdapterDataAssets();
void ReCacheDSAdapterCoversDataAssets(); void ReCacheDSAdapterCoversDataAssets();
void ReCacheDSItemFilters(); void ReCacheDSItemFilters();
void ReCacheSolarPowerDataAssets();
public: public:
// Dirt Functions // Dirt Functions
@ -213,9 +211,6 @@ public:
UFUNCTION(BlueprintPure, Category = "RRDA|DataAsset|RP|MP") UFUNCTION(BlueprintPure, Category = "RRDA|DataAsset|RP|MP")
TArray<URRDAHeaterDataAsset*> GetAllHeaterAssets(ERRDAHeaterType Type) const; TArray<URRDAHeaterDataAsset*> GetAllHeaterAssets(ERRDAHeaterType Type) const;
UFUNCTION(BlueprintPure, Category = "RRDA|DataAsset|RP|Solar")
TArray<URRDADataAssetSolarPower*> GetAllSolarPowerAssets() const;
public: public:
/** /**
* Find all data assets of a specific class * Find all data assets of a specific class
@ -247,9 +242,6 @@ public:
UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset") UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
TMap<ERRDAHeaterType, FRRDADataHolderHeaterData> mHeaterAssets; TMap<ERRDAHeaterType, FRRDADataHolderHeaterData> mHeaterAssets;
UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
TArray<URRDADataAssetSolarPower*> mSolarPowerAssets;
UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset") UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
TSet<URRDADataAssetBase*> mDisabledDataAssets; TSet<URRDADataAssetBase*> mDisabledDataAssets;

View File

@ -1 +1 @@
1.0.7 1.0.6