v0.3.20 Release Merge

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: CI
+name: Build
 
 on:
   push:
@@ -26,15 +26,17 @@ on:
       WWISE_PASSWORD:
         required: true
       GH_TOKEN:
-        required: false
+        required: true
+      WEBHOOK_URL:
+        required: true
 
 jobs:
   build:
+    name: Build FicsIt-Networks
     runs-on: Windows2019-selfhosted
     steps:
-      - name: Cleanup
+      - name: Pre Cleanup
         run: Remove-Item C:\actions-runner\_work\FicsIt-Networks\FicsIt-Networks\* -Recurse -Force -Confirm:$false -ErrorAction Ignore
-
       - uses: actions/checkout@v4
         with:
           repository: satisfactorymodding/SatisfactoryModLoader
@@ -46,13 +48,6 @@ jobs:
           path: SatisfactoryModLoader/Mods/FicsItNetworks
           submodules: recursive
 
-#      - name: List Stuff
-#        run: |
-#          dir SatisfactoryModLoader/Mods/FicsItNetworks
-#          dir SatisfactoryModLoader/Mods/FicsItNetworks/ThirdParty
-#          dir SatisfactoryModLoader/Mods/FicsItNetworks/ThirdParty/eris
-#          dir SatisfactoryModLoader/Mods/FicsItNetworks/ThirdParty/eris/src
-
       - name: Apply FG Patches
         working-directory: SatisfactoryModLoader
         run: git apply .\Mods\FicsItNetworks\SML_Patch.patch -v
@@ -97,19 +92,137 @@ jobs:
 
 #      - name: Build for Linux Dedicated Server
 #        run: MSBuild.exe '${{ github.workspace }}\SatisfactoryModLoader\FactoryGame.sln' /p:Configuration='Shipping Server' /p:Platform='Linux' /t:'Games\FactoryGame' -m
-
+      
       - name: Package FicsItNetworks Mod
         run: ${{ github.workspace }}\ue\Engine\Build\BatchFiles\RunUAT.bat -ScriptsForProject='${{ github.workspace }}\SatisfactoryModLoader\FactoryGame.uproject' PackagePlugin -project='${{ github.workspace }}\SatisfactoryModLoader\FactoryGame.uproject' -clientconfig=Shipping -serverconfig=Shipping -DLCName='FicsItNetworks' -build -utf8output -platform=Win64 -nocompileeditor -installed -abslog="C:\Users\runneradmin\AppData\Roaming\Unreal Engine\AutomationTool\Logs\D+a+FicsIt-Networks+FicsIt-Networks+ue\Log.txt"
-
-#      - name: Show Package Log
-#        if: always()
-#        run: more "C:\Users\runneradmin\AppData\Roaming\Unreal Engine\AutomationTool\Logs\D+a+FicsIt-Networks+FicsIt-Networks+ue\Cook-*"
 
-#      - name: List Artifacts
-#        run: |
-#          dir ${{ github.workspace }}\SatisfactoryModLoader\Saved\ArchivedPlugins\FicsItNetworks\
+#      - name: Generate Reflection & Lua Documentation
+#        run: ${{ github.workspace }}\ue\\Engine\Binaries\Win64\UnrealEditor-Cmd.exe "${{ github.workspace }}\SatisfactoryModLoader\FactoryGame.uproject" -skipcompile -Unattended -NoPause -AllowSoftwareRendering "-ExecCmds=FINGenRefDoc,FINGenLuaDoc,quit_editor"
 
-      - uses: actions/upload-artifact@v4
+      - name: Upload FicsItNetworks-Windows.zip
+        id: upload-win64
+        uses: actions/upload-artifact@v4
         with:
           name: FicsItNetworks-Windows
           path: ${{github.workspace}}\SatisfactoryModLoader\Saved\ArchivedPlugins\FicsItNetworks\FicsItNetworks-Windows.zip
+
+ #     - name: Upload Documentation
+ #       id: upload-documentation
+ #       uses: actions/upload-artifact@v4
+ #       with:
+ #         name: Documentation
+ #         path: |
+ #           %LocalAppData%\FactoryGame\Saved\FINReflectionDocumentation.json
+ #           %LocalAppData%\FactoryGame\Saved\FINLuaDocumentation.lua
+
+      - name: Create Discord Webhook Action
+        uses: devops-actions/[email protected]
+        if: success()
+        with:
+          filename: "discord-webhook.json"
+          json: >
+            {
+              "username": "GitHub",
+              "avatar_url": "https://cdn.discordapp.com/avatars/735904925900472323/df91181b3f1cf0ef1592fbe18e0962d7.webp?size=128",
+              "embeds": [{
+                "title": "${{ github.ref_name }}",
+                "url": "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}",
+                "description": "Build Successful!",
+                "color": 65280,
+                "fields": [{
+                  "value": "[FicsIt-Networks.zip](${{ steps.upload-win64.outputs.artifact-url }})",
+                  "name": "",
+                  "inline": true
+                }]
+              }]
+            }
+      - name: Create Discord Webhook Action
+        uses: devops-actions/[email protected]
+        if: cancelled()
+        with:
+          filename: "discord-webhook.json"
+          json: >
+            {
+              "username": "GitHub",
+              "avatar_url": "https://cdn.discordapp.com/avatars/735904925900472323/df91181b3f1cf0ef1592fbe18e0962d7.webp?size=128",
+              "embeds": [{
+                "title": "${{ github.ref_name }}",
+                "url": "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}",
+                "description": "Build Cancelled!",
+                "color": 13158580
+              }]
+            }
+      - name: Create Discord Webhook Action
+        uses: devops-actions/[email protected]
+        if: failure()
+        with:
+          filename: "discord-webhook.json"
+          json: >
+            {
+              "username": "GitHub",
+              "avatar_url": "https://cdn.discordapp.com/avatars/735904925900472323/df91181b3f1cf0ef1592fbe18e0962d7.webp?size=128",
+              "embeds": [{
+                "title": "${{ github.ref_name }}",
+                "url": "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}",
+                "description": "Build Failed",
+                "color": 16711680
+              }]
+            }
+      - name: Create Discord Webhook Action
+        uses: devops-actions/[email protected]
+        if: ${{ !success() && !failure() && !cancelled() }}
+        with:
+          filename: "discord-webhook.json"
+          json: >
+            {
+              "username": "GitHub",
+              "avatar_url": "https://cdn.discordapp.com/avatars/735904925900472323/df91181b3f1cf0ef1592fbe18e0962d7.webp?size=128",
+              "embeds": [{
+                "title": "${{ github.ref_name }}",
+                "url": "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}",
+                "description": "Build Done!",
+                "color": 6579300
+              }]
+            }
+
+      - name: Discord Webhook Action
+        uses: tsickert/[email protected]
+        if: always()
+        with:
+          webhook-url: ${{ secrets.WEBHOOK_URL }}
+          raw-data: discord-webhook.json
+#          embed-title: ${{ github.ref_name }}
+#          embed-url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+#          embed-description: Build ${{ success() && 'Successful' || cancelled() && 'Cancelled' || failure() && 'Failed' || 'Done' }}!
+#          embed-color: ${{ success() && '65280' || cancelled() && '13158580' || failure() && '16711680' || '6579300' }}
+      - name: Post Cleanup
+        if: ${{ !failure() }}
+        run: Remove-Item C:\actions-runner\_work\FicsIt-Networks\FicsIt-Networks\* -Recurse -Force -Confirm:$false -ErrorAction Ignore
+
+#  documentation:
+#    needs: build
+#    if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
+#    name: Update Documentation
+#    runs-on: ubuntu-latest
+#    permissions:
+#      contents: write
+#    steps:
+#      - uses: actions/checkout@v4
+#      - name: Download Reflection Documentation
+#        uses: actions/download-artifact@v4
+#        with:
+#          name: Documentation
+#          path: ./docs
+#      - name: Rewrite ASCIIDOC with new Documentation
+#        run: python ./docs/PatchDocWithReflectionDoc.py FINReflectionDocumentation.json
+#      - name: Configure Git
+#        run: |
+#          git config user.name "$GITHUB_ACTOR"
+#          git config user.email "[email protected]"
+#      - name: Commit
+#        run: |
+#          git add index.zip
+#          git commit -m "Update Reflection Documentation"
+#      - name: Push
+#        run: |
+#          git push

.github/workflows/docs.yml

@@ -2,8 +2,7 @@ name: Push
 
 on:
   push:
-    if:
-    branches: main
+    branches: master
     paths:
       - 'docs/**'
 
@@ -17,4 +16,4 @@ jobs:
         with:
           token: ${{ secrets.DOCS_REPO_ACCESS_TOKEN }}
           repository: satisfactorymodding/Documentation
-          event-type: mod-docs-update
+          event-type: mod-docs-update

FicsItNetworks.uplugin

@@ -2,7 +2,7 @@
 	"FileVersion": 3,
 	"Version": 0,
 	"VersionName": "0.3",
-	"SemVersion": "0.3.19",
+	"SemVersion": "0.3.20",
 	"FriendlyName": "FicsIt-Networks",
 	"Description": "Adds a computer network and programmable computers to the Game.",
 	"Category": "Modding",
@@ -31,10 +31,20 @@
 			"Type": "Runtime",
 			"LoadingPhase": "PostDefault"
 		},
+		{
+			"Name": "FicsItNetworksDocumentation",
+			"Type": "Runtime",
+			"LoadingPhase": "Default"
+		},
 		{
 			"Name": "Tracy",
 			"Type": "Runtime",
 			"LoadingPhase": "PostDefault"
+		},
+		{
+			"Name": "FicsItNetworksRepository",
+			"Type": "Runtime",
+			"LoadingPhase": "PostDefault"
 		}
 	],
 	"Plugins": [

Source/FicsItNetworks/Private/Components/FINCodeableSplitter.cpp

@@ -117,8 +117,19 @@ bool AFINCodeableSplitter::netFunc_canOutput(int output) {
 	return outputQueue.Num() < 2;
 }
 
-void AFINCodeableSplitter::netSig_ItemRequest_Implementation(const FInventoryItem& item) {}
-void AFINCodeableSplitter::netSig_ItemOutputted_Implementation(int output, const FInventoryItem& item) {}
+UFGFactoryConnectionComponent* AFINCodeableSplitter::netFunc_getConnectorByIndex(int outputIndex) {
+	switch (FMath::Abs(outputIndex) % 3) {
+		case 0:
+			return Output2;
+		case 1:
+			return Output1;
+		default:
+			return Output3;
+	}
+}
+
+void AFINCodeableSplitter::netSig_ItemRequest_Implementation(FInventoryItem item) {}
+void AFINCodeableSplitter::netSig_ItemOutputted_Implementation(int output, FInventoryItem item) {}
 
 TArray<FInventoryItem>& AFINCodeableSplitter::GetOutput(int output) {
 	output = (output < 0) ? 0 : ((output > 2) ? 2 : output);

Source/FicsItNetworks/Private/Computer/FINComputerDriveDesc.cpp

@@ -4,6 +4,7 @@
 #include "Components/GridSlot.h"
 #include "Components/TextBlock.h"
 #include "Net/UnrealNetwork.h"
+#include "Utils/FINLabelContainerInterface.h"
 
 UFINComputerDriveDesc::UFINComputerDriveDesc() {
 	mStackSize = EStackSize::SS_ONE;
@@ -16,7 +17,14 @@ void UFINComputerDriveDesc::GetLifetimeReplicatedProps(TArray<FLifetimeProperty>
 }
 
 FText UFINComputerDriveDesc::GetOverridenItemName_Implementation(APlayerController* OwningPlayer, const FInventoryStack& InventoryStack) {
-	return UFGItemDescriptor::GetItemName(InventoryStack.Item.GetItemClass());
+	FText Name = UFGItemDescriptor::GetItemName(InventoryStack.Item.GetItemClass());
+	if (InventoryStack.Item.ItemState.IsValid() && InventoryStack.Item.ItemState.Get()->Implements<UFINLabelContainerInterface>()) {
+		FString Label = IFINLabelContainerInterface::Execute_GetLabel(InventoryStack.Item.ItemState.Get());
+		if (!Label.IsEmpty()) {
+			return FText::FromString(FString::Printf(TEXT("%s - \"%s\""), *Name.ToString(), *Label));
+		}
+	}
+	return Name;
 }
 
 FText UFINComputerDriveDesc::GetOverridenItemDescription_Implementation(APlayerController* OwningPlayer, const FInventoryStack& InventoryStack) {

Source/FicsItNetworks/Private/Computer/FINComputerEEPROMDesc.cpp

@@ -22,6 +22,17 @@ bool UFINComputerEEPROMDesc::CopyData_Implementation(UObject* WorldContext, cons
 	return From->CopyDataTo(To);
 }
 
+FText UFINComputerEEPROMDesc::GetOverridenItemName_Implementation(APlayerController* OwningPlayer, const FInventoryStack& InventoryStack) {
+	FText Name = UFGItemDescriptor::GetItemName(InventoryStack.Item.GetItemClass());
+	if (InventoryStack.Item.ItemState.IsValid() && InventoryStack.Item.ItemState.Get()->Implements<UFINLabelContainerInterface>()) {
+		FString Label = IFINLabelContainerInterface::Execute_GetLabel(InventoryStack.Item.ItemState.Get());
+		if (!Label.IsEmpty()) {
+			return FText::FromString(FString::Printf(TEXT("%s - \"%s\""), *Name.ToString(), *Label));
+		}
+	}
+	return Name;
+}
+
 AFINStateEEPROM* UFINComputerEEPROMDesc::GetEEPROM(UFGInventoryComponent* Inv, int SlotIdx) {
 	FInventoryStack stack;
 	if (!IsValid(Inv) || !Inv->GetStackFromIndex(SlotIdx, stack) || !IsValid(stack.Item.GetItemClass())) return nullptr;

Source/FicsItNetworks/Private/Computer/FINComputerRCO.cpp

@@ -183,3 +183,9 @@ void UFINComputerRCO::LogRehandleAllEntries_Implementation(UFINLog* Log) {
 void UFINComputerRCO::GPUT2MouseWheelEvent_Implementation(AFINComputerGPUT2* GPU, FVector2D Position, float Delta, int Modifiers) {
 	GPU->netSig_OnMouseWheel(Position, Delta, Modifiers);
 }
+
+void UFINComputerRCO::SetLabel_Implementation(UObject* Container, const FString& Label) {
+	if (IsValid(Container) && Container->Implements<UFINLabelContainerInterface>()) {
+		IFINLabelContainerInterface::Execute_SetLabel(Container, Label);
+	}
+}

Source/FicsItNetworks/Private/FINGlobalRegisterHelper.cpp

@@ -3,12 +3,18 @@
 FFINGlobalRegisterHelper FFINGlobalRegisterHelper::Instance;
 
 void FFINGlobalRegisterHelper::Register() {
-	for (const RegisterFunction& Func : Get().FunctionsToCall) {
-		Func();
+	TArray<int> priorities;
+	Get().FunctionsToCall.GetKeys(priorities);
+	priorities.Sort();
+	Algo::Reverse(priorities);
+	for (int priority : priorities) {
+		for (const RegisterFunction& Func : Get().FunctionsToCall[priority]) {
+			Func();
+		}
 	}
 	Get().FunctionsToCall.Empty();
 }
 
-void FFINGlobalRegisterHelper::AddFunction(const RegisterFunction& Func) {
-	Get().FunctionsToCall.Add(Func);
+void FFINGlobalRegisterHelper::AddFunction(const RegisterFunction& Func, int Priority) {
+	Get().FunctionsToCall.FindOrAdd(Priority).Add(Func);
 }

Source/FicsItNetworks/Private/FicsItKernel/FicsItFS/FINFileSystemState.cpp

@@ -21,7 +21,11 @@ AFINFileSystemState::~AFINFileSystemState() {}
 void AFINFileSystemState::GetLifetimeReplicatedProps(TArray<FLifetimeProperty>& OutLifetimeProps) const {
 	Super::GetLifetimeReplicatedProps(OutLifetimeProps);
 
+	DOREPLIFETIME(AFINFileSystemState, ID);
+	DOREPLIFETIME(AFINFileSystemState, IdCreated);
 	DOREPLIFETIME(AFINFileSystemState, Usage);
+	DOREPLIFETIME(AFINFileSystemState, Label);
+	DOREPLIFETIME(AFINFileSystemState, Capacity);
 }
 
 int AskForDiskOrSave(FString Name) {
@@ -256,6 +260,14 @@ bool AFINFileSystemState::ShouldSave_Implementation() const {
 	return true;
 }
 
+FString AFINFileSystemState::GetLabel_Implementation() {
+	return Label;
+}
+
+void AFINFileSystemState::SetLabel_Implementation(const FString& InLabel) {
+	Label = InLabel;
+}
+
 CodersFileSystem::SRef<CodersFileSystem::Device> AFINFileSystemState::GetDevice(bool bInForceUpdate, bool bInForceCreate) {
 	if (!HasAuthority()) return nullptr;
 

Source/FicsItNetworks/Private/FicsItKernel/FicsItKernel.cpp

@@ -359,9 +359,11 @@ int64 UFINKernelSystem::GetTimeSinceStart() const {
 }
 
 void UFINKernelSystem::AddReferencer(void* Referencer, const TFunction<void(void*, FReferenceCollector&)>& CollectorFunc) {
+	UE::TScopeLock Lock(ReferenceObjectMutex);
 	ReferencedObjects.FindOrAdd(Referencer) = CollectorFunc;
 }
 
 void UFINKernelSystem::RemoveReferencer(void* Referencer) {
+	UE::TScopeLock Lock(ReferenceObjectMutex);
 	ReferencedObjects.Remove(Referencer);
 }

Source/FicsItNetworks/Private/FicsItKernel/Processor/FINStateEEPROM.cpp

@@ -1,5 +1,7 @@
 #include "FicsItKernel/Processor/FINStateEEPROM.h"
 
+#include "Net/UnrealNetwork.h"
+
 AFINStateEEPROM::AFINStateEEPROM() {
 	RootComponent = CreateDefaultSubobject<USceneComponent>(L"RootComponent");
 
@@ -10,6 +12,12 @@ AFINStateEEPROM::AFINStateEEPROM() {
 	SetActorTickEnabled(true);
 }
 
+void AFINStateEEPROM::GetLifetimeReplicatedProps(TArray<FLifetimeProperty>& OutLifetimeProps) const {
+	Super::GetLifetimeReplicatedProps(OutLifetimeProps);
+
+	DOREPLIFETIME(AFINStateEEPROM, Label);
+}
+
 void AFINStateEEPROM::Tick(float DeltaSeconds) {
 	Super::Tick(DeltaSeconds);