diff --git a/Plugins/AutoSplitters/AutoSplitters.uplugin b/Plugins/AutoSplitters/AutoSplitters.uplugin index e7d00c2..8f8f589 100644 --- a/Plugins/AutoSplitters/AutoSplitters.uplugin +++ b/Plugins/AutoSplitters/AutoSplitters.uplugin @@ -1,8 +1,8 @@ { "FileVersion": 3, "Version": 0, - "VersionName": "0.4.0", - "SemVersion": "0.4.0", + "VersionName": "0.4.4", + "SemVersion": "0.4.4", "FriendlyName": "Auto Splitters", "Description": "Auto-balancing splitters for the rest of us who don't want to build gigantic load balancers.", "Category": "Modding", @@ -16,7 +16,7 @@ "IsExperimentalVersion": false, "Installed": false, "AcceptsAnyRemoteVersion": false, - "RemoteVersionRange": "0.4.0", + "RemoteVersionRange": "0.4.4", "Modules": [ { "Name": "AutoSplitters", @@ -27,7 +27,7 @@ "Plugins": [ { "Name": "SML", - "SemVersion": "^3.1.1", + "SemVersion": "^3.2.1", "Enabled": true } ] diff --git a/Plugins/AutoSplitters/Config/AccessTransformers.ini b/Plugins/AutoSplitters/Config/AccessTransformers.ini new file mode 100644 index 0000000..967c268 --- /dev/null +++ b/Plugins/AutoSplitters/Config/AccessTransformers.ini @@ -0,0 +1,2 @@ +[AccessTransformers] +Friend=(Class="AFGAttachmentSplitterHologram", FriendClass="AMFGAutoSplitterHologram") \ No newline at end of file diff --git a/Plugins/AutoSplitters/Source/AutoSplitters/AutoSplitters.Build.cs b/Plugins/AutoSplitters/Source/AutoSplitters/AutoSplitters.Build.cs index a4818d6..86a0d10 100644 --- a/Plugins/AutoSplitters/Source/AutoSplitters/AutoSplitters.Build.cs +++ b/Plugins/AutoSplitters/Source/AutoSplitters/AutoSplitters.Build.cs @@ -22,7 +22,7 @@ public AutoSplitters(ReadOnlyTargetRules Target) : base(Target) // ... add other private include paths required here ... } ); - + PublicDependencyModuleNames.AddRange( new string[] diff --git a/Plugins/AutoSplitters/Source/AutoSplitters/Private/AutoSplittersLog.cpp b/Plugins/AutoSplitters/Source/AutoSplitters/Private/AutoSplittersLog.cpp deleted file mode 100644 index 7542902..0000000 --- a/Plugins/AutoSplitters/Source/AutoSplitters/Private/AutoSplittersLog.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#include - -DEFINE_LOG_CATEGORY(LogAutoSplitters); \ No newline at end of file diff --git a/Plugins/AutoSplitters/Source/AutoSplitters/Private/AutoSplittersModule.cpp b/Plugins/AutoSplitters/Source/AutoSplitters/Private/AutoSplittersModule.cpp index ea51020..661dc36 100644 --- a/Plugins/AutoSplitters/Source/AutoSplitters/Private/AutoSplittersModule.cpp +++ b/Plugins/AutoSplitters/Source/AutoSplitters/Private/AutoSplittersModule.cpp @@ -2,6 +2,7 @@ #include "Patching/NativeHookManager.h" +#include "CoreMinimal.h" #include "UI/FGPopupWidget.h" #include "FGWorldSettings.h" #include "FGPlayerController.h" @@ -9,13 +10,19 @@ #include "FGBuildableSubsystem.h" #include "Buildables/MFGBuildableAutoSplitter.h" #include "Hologram/MFGAutoSplitterHologram.h" -#include "AutoSplittersLog.h" #include "Engine/RendererSettings.h" #include "Subsystem/AutoSplittersSubsystem.h" #include "Registry/ModContentRegistry.h" #include "Resources/FGBuildingDescriptor.h" #include "ModLoading/PluginModuleLoader.h" +#define LOCTEXT_NAMESPACE "AutoSplitters" + +// Fixes linker bug +DEFINE_LOG_CATEGORY(LogGame) + +DEFINE_LOG_CATEGORY(LogAutoSplitters) + // #pragma optimize( "", off ) void FAutoSplittersModule::OnSplitterLoadedFromSaveGame(AMFGBuildableAutoSplitter* Splitter) @@ -55,9 +62,9 @@ void FAutoSplittersModule::ReplacePreComponentFixSplitters(UWorld* World, AAutoS if (RecipeInfo.OwnedByModReference != FName("AutoSplitters")) continue; auto Recipe = Cast(RecipeInfo.RegisteredObject->GetDefaultObject()); - if (Recipe->mProduct.Num() != 1) + if (Recipe->GetProducts().Num() != 1) continue; - auto BuildingDescriptor = Recipe->mProduct[0].ItemClass->GetDefaultObject(); + auto BuildingDescriptor = Recipe->GetProducts()[0].ItemClass->GetDefaultObject(); if (!BuildingDescriptor) continue; diff --git a/Plugins/AutoSplitters/Source/AutoSplitters/Private/Buildables/MFGBuildableAutoSplitter.cpp b/Plugins/AutoSplitters/Source/AutoSplitters/Private/Buildables/MFGBuildableAutoSplitter.cpp index 966d46e..c5a2f85 100644 --- a/Plugins/AutoSplitters/Source/AutoSplitters/Private/Buildables/MFGBuildableAutoSplitter.cpp +++ b/Plugins/AutoSplitters/Source/AutoSplitters/Private/Buildables/MFGBuildableAutoSplitter.cpp @@ -3,6 +3,7 @@ #include "Buildables/MFGBuildableAutoSplitter.h" #include +#include #include "AutoSplittersLog.h" #include "AutoSplittersModule.h" diff --git a/Plugins/AutoSplitters/Source/AutoSplitters/Public/AutoSplittersModule.h b/Plugins/AutoSplitters/Source/AutoSplitters/Public/AutoSplittersModule.h index d3fa21c..fbad53f 100644 --- a/Plugins/AutoSplitters/Source/AutoSplitters/Public/AutoSplittersModule.h +++ b/Plugins/AutoSplitters/Source/AutoSplitters/Public/AutoSplittersModule.h @@ -3,8 +3,11 @@ // define to 1 to get more debug output to console when the debug flag is set in the splitter UI #define AUTO_SPLITTERS_DEBUG 1 +#include "CoreMinimal.h" #include +#include "AutoSplittersLog.h" + #include "Buildables/MFGBuildableAutoSplitter.h" #include "Modules/ModuleManager.h" diff --git a/Plugins/AutoSplitters/Source/AutoSplitters/Public/Buildables/MFGBuildableAutoSplitter.h b/Plugins/AutoSplitters/Source/AutoSplitters/Public/Buildables/MFGBuildableAutoSplitter.h index 30d2078..f6ff45c 100644 --- a/Plugins/AutoSplitters/Source/AutoSplitters/Public/Buildables/MFGBuildableAutoSplitter.h +++ b/Plugins/AutoSplitters/Source/AutoSplitters/Public/Buildables/MFGBuildableAutoSplitter.h @@ -3,6 +3,7 @@ #pragma once #include +#include #include "FGPlayerController.h" #include "FGFactoryConnectionComponent.h" diff --git a/Source/FactoryGame/Public/Hologram/FGAttachmentSplitterHologram.h b/Source/FactoryGame/Public/Hologram/FGAttachmentSplitterHologram.h deleted file mode 100755 index 1662eb9..0000000 --- a/Source/FactoryGame/Public/Hologram/FGAttachmentSplitterHologram.h +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright Coffee Stain Studios. All Rights Reserved. - -#pragma once - -#include "CoreMinimal.h" -#include "Hologram/FGConveyorAttachmentHologram.h" -#include "FGAttachmentSplitterHologram.generated.h" - -/** - * Adds up/downgrade for splitters. - */ -UCLASS() -class FACTORYGAME_API AFGAttachmentSplitterHologram : public AFGConveyorAttachmentHologram -{ - GENERATED_BODY() -public: - AFGAttachmentSplitterHologram(); - - // Begin AFGHologram Interface - virtual bool TryUpgrade( const FHitResult& hitResult ) override; - virtual bool DoMultiStepPlacement(bool isInputFromARelease) override; - virtual AActor* GetUpgradedActor() const override; - // End AFGHologram Interface - -protected: - // Begin AFGBuildableHologram Interface - virtual void ConfigureComponents( class AFGBuildable* inBuildable ) const override; - // End AFGBuildableHologram Interface - -private: - -protected: - /** If we're upgrading another actor. */ - UPROPERTY() - class AFGBuildableAttachmentSplitter* mUpgradedSplitter; - - /** Used when upgrading. */ - UPROPERTY() - TArray< UFGFactoryConnectionComponent* > mSnappedConnectionComponents; -};