Merge pull request #277 from Panakotta00/development

Merge v0.3.16 Release

.github/workflows/build.yml

@@ -0,0 +1,102 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+      - dev
+    paths:
+      - "FicsItNetworks.uplugin"
+      - "Content/**"
+      - "Source/**"
+      - "ThirdParty/**"
+  pull_request:
+    branches:
+      - "master"
+      - "development"
+    paths:
+      - "Content/**"
+      - "Source/**"
+      - "ThirdParty/**"
+  workflow_dispatch:
+  workflow_call:
+    secrets:
+      WWISE_EMAIL:
+        required: true
+      WWISE_PASSWORD:
+        required: true
+      GH_TOKEN:
+        required: false
+
+jobs:
+  build:
+    runs-on: windows-latest
+    steps:
+      - name: Cleanup
+        run: Remove-Item C:\workspace\SatisfactoryModLoader -Recurse -Force -Confirm:$false -ErrorAction Ignore
+
+      - uses: actions/checkout@master
+        with:
+          repository: satisfactorymodding/SatisfactoryModLoader
+          ref: refs/heads/dev
+          path: SatisfactoryModLoader
+
+      - uses: actions/checkout@v2
+        with:
+          path: Mods/FicsItNetworks
+
+      - name: Apply FG Patches
+        run: git apply .\Mods\FicsItNetworks\SML_Patch.patch -v
+
+      - name: Create UE directory
+        run: mkdir ue
+
+      - name: Download, Extract and Setup UE
+        working-directory: ue
+        run: |
+          gh release download --repo satisfactorymodding/UnrealEngine -p "UnrealEngine-CSS-Editor-Win64.7z.*"
+          7z x UnrealEngine-CSS-Editor-Win64.7z.001
+          rm UnrealEngine-CSS-Editor-Win64.7z*
+          .\\SetupScripts\\Register.bat
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+
+      - name: Add Wwise
+        run: |
+          gh release download --repo mircearoata/wwise-cli -p "wwise-cli.exe"
+          ./wwise-cli.exe download     --sdk-version "2022.1.5.8242"          --filter Packages=SDK --filter DeploymentPlatforms=Windows_vc140 --filter DeploymentPlatforms=Windows_vc150 --filter DeploymentPlatforms=Windows_vc160 --filter DeploymentPlatforms=Windows_vc170 --filter DeploymentPlatforms=Linux --filter DeploymentPlatforms=
+          ./wwise-cli.exe integrate-ue --integration-version "2022.1.5.2714"  --project "${{ github.workspace }}\SatisfactoryModLoader\FactoryGame.uproject"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          WWISE_EMAIL: ${{ secrets.WWISE_EMAIL }}
+          WWISE_PASSWORD: ${{ secrets.WWISE_PASSWORD }}
+
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v1
+
+      - name: Generate VS project files
+        run: ${{ github.workspace }}\ue\Engine\Build\BatchFiles\Build.bat -projectfiles -project='${{ github.workspace }}\SatisfactoryModLoader\FactoryGame.uproject' -game -rocket -progres
+
+      - name: Build for Development Editor
+        run: MSBuild.exe '${{ github.workspace }}\SatisfactoryModLoader\FactoryGame.sln' /p:Configuration='Development Editor' /p:Platform='Win64' /t:'Games\FactoryGame' -m
+
+      - name: Build for Shipping/Client
+        run: MSBuild.exe '${{ github.workspace }}\SatisfactoryModLoader\FactoryGame.sln' /p:Configuration='Shipping' /p:Platform='Win64' /t:'Games\FactoryGame' -m
+
+      - name: Build for Win64 Dedicated Server
+        run: MSBuild.exe '${{ github.workspace }}\SatisfactoryModLoader\FactoryGame.sln' /p:Configuration='Shipping Server' /p:Platform='Win64' /t:'Games\FactoryGame' -m
+
+      - 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 -platform=Win64 -nocompileeditor -installed
+
+      - name: List Artifacts
+        run: |
+          dir ${{ github.workspace }}\SatisfactoryModLoader\Saved\ArchivedPlugins\FicsItNetworks\
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: FicsItNetworks-Windows
+          path: ${{ github.workspace }}\SatisfactoryModLoader\Saved\ArchivedPlugins\FicsItNetworks\FicsItNetworks-Windows.zip

.github/workflows/docs.yml

@@ -2,6 +2,8 @@ name: Push
 
 on:
   push:
+    if:
+    branches: main
     paths:
       - 'docs/**'
 

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "ThirdParty/eris"]
+	path = ThirdParty/eris
+	url = https://github.com/Panakotta00/eris.git

Config/AccessTransformers.ini

@@ -2,8 +2,16 @@
 Friend=(Class="AFGBuildableHologram", FriendClass="FFicsItNetworksModule")
 Friend=(Class="AFGBuildableHologram", FriendClass="AFINNetworkCableHologram")
 Friend=(Class="AFGHologram", FriendClass="AFINNetworkCableHologram")
+Friend=(Class="UFGPipeConnectionComponentBase", FriendClass="UFINPipeHyperStartHook")
+Friend=(Class="UFGCharacterMovementComponent", FriendClass="UFINPipeHyperStartHook")
 ; Friend=(Class="AFGBuildableDoor", FriendClass="FIN_StaticRef_AFGBuildableDoor::FIN_StaticRefProp_Member_Door::Set")
 Friend=(Class="AFGBuildableDoor", FriendClass="FStaticReflectionSourceHelper")
+Friend=(Class="AFGBuildableWidgetSign", FriendClass="AFINComputerSubsystem")
+Friend=(Class="UFGRailroadTrackConnectionComponent", FriendClass="AFINComputerSubsystem")
+Friend=(Class="AFGBuildableRailroadSignal", FriendClass="AFINComputerSubsystem")
+Friend=(Class="AFGRailroadSubsystem", FriendClass="AFINComputerSubsystem")
+Friend=(Class="AFGBuildableRailroadStation", FriendClass="UFINRailroadStationHook")
 Accessor=(Class="AFGBuildableDoor", Property="mDoorConfiguration")
 Accessor=(Class="AFGBuildableRailroadSwitchControl", Property="mControlledConnection")
+Accessor=(Class="UFGRailroadTrackConnectionComponent", Property="mConnectedComponents")
 

Config/Localization/FicsItNetworks.ini

@@ -0,0 +1,47 @@
+; THESE ARE GENERATED FILES, DO NOT EDIT DIRECTLY!
+; USE THE LOCALIZATION DASHBOARD IN THE UNREAL EDITOR TO EDIT THE CONFIGURATION
+[CommonSettings]
+ModulesToPreload=FicsItNetworks
+SourcePath=Mods/FicsItNetworks/Content/Localization/FicsItNetworks
+DestinationPath=Mods/FicsItNetworks/Content/Localization/FicsItNetworks
+ManifestName=FicsItNetworks.manifest
+ArchiveName=FicsItNetworks.archive
+NativeCulture=en
+CulturesToGenerate=en
+
+[GatherTextStep0]
+CommandletClass=GatherTextFromSource
+SearchDirectoryPaths=%LOCPROJECTROOT%Mods/FicsItNetworks/Source
+SearchDirectoryPaths=%LOCPROJECTROOT%Mods/FicsItNetworks/Config
+ExcludePathFilters=Config/Localization/*
+FileNameFilters=*.h
+FileNameFilters=*.cpp
+FileNameFilters=*.ini
+ShouldGatherFromEditorOnlyData=false
+
+[GatherTextStep1]
+CommandletClass=GatherTextFromAssets
+IncludePathFilters=%LOCPROJECTROOT%Mods/FicsItNetworks/Content/*
+ExcludePathFilters=Content/Localization/*
+ExcludePathFilters=Content/L10N/*
+PackageFileNameFilters=*.umap
+PackageFileNameFilters=*.uasset
+ShouldExcludeDerivedClasses=false
+ShouldGatherFromEditorOnlyData=false
+SkipGatherCache=false
+
+[GatherTextStep2]
+CommandletClass=FINGatherTextFromReflection
+
+[GatherTextStep3]
+CommandletClass=GenerateGatherManifest
+
+[GatherTextStep4]
+CommandletClass=GenerateGatherArchive
+
+[GatherTextStep5]
+CommandletClass=GenerateTextLocalizationReport
+bWordCountReport=true
+WordCountReportName=FicsItNetworks.csv
+bConflictReport=true
+ConflictReportName=FicsItNetworks_Conflicts.txt

Config/Localization/FicsItNetworks_Compile.ini

@@ -0,0 +1,18 @@
+; THESE ARE GENERATED FILES, DO NOT EDIT DIRECTLY!
+; USE THE LOCALIZATION DASHBOARD IN THE UNREAL EDITOR TO EDIT THE CONFIGURATION
+[CommonSettings]
+SourcePath=Mods/FicsItNetworks/Content/Localization/FicsItNetworks
+DestinationPath=Mods/FicsItNetworks/Content/Localization/FicsItNetworks
+ManifestName=FicsItNetworks.manifest
+ArchiveName=FicsItNetworks.archive
+ResourceName=FicsItNetworks.locres
+bSkipSourceCheck=false
+bValidateFormatPatterns=true
+bValidateSafeWhitespace=false
+NativeCulture=en
+CulturesToGenerate=en
+CulturesToGenerate=de
+
+[GatherTextStep0]
+CommandletClass=GenerateTextLocalizationResource
+

Config/Localization/FicsItNetworks_Export.ini

@@ -0,0 +1,20 @@
+; THESE ARE GENERATED FILES, DO NOT EDIT DIRECTLY!
+; USE THE LOCALIZATION DASHBOARD IN THE UNREAL EDITOR TO EDIT THE CONFIGURATION
+[CommonSettings]
+SourcePath=Mods/FicsItNetworks/Content/Localization/FicsItNetworks
+DestinationPath=Mods/FicsItNetworks/Content/Localization/FicsItNetworks
+NativeCulture=en
+CulturesToGenerate=en
+CulturesToGenerate=de
+ManifestName=FicsItNetworks.manifest
+ArchiveName=FicsItNetworks.archive
+PortableObjectName=FicsItNetworks.po
+
+[GatherTextStep0]
+CommandletClass=InternationalizationExport
+bExportLoc=true
+LocalizedTextCollapseMode=ELocalizedTextCollapseMode::IdenticalTextIdAndSource
+POFormat=EPortableObjectFormat::Unreal
+ShouldPersistCommentsOnExport=false
+ShouldAddSourceLocationsAsComments=true
+

Config/Localization/FicsItNetworks_ExportDialogueScript.ini

@@ -0,0 +1,15 @@
+; THESE ARE GENERATED FILES, DO NOT EDIT DIRECTLY!
+; USE THE LOCALIZATION DASHBOARD IN THE UNREAL EDITOR TO EDIT THE CONFIGURATION
+[CommonSettings]
+SourcePath=Mods/FicsItNetworks/Content/Localization/FicsItNetworks
+DestinationPath=Mods/FicsItNetworks/Content/Localization/FicsItNetworks
+NativeCulture=en
+CulturesToGenerate=en
+CulturesToGenerate=de
+ManifestName=FicsItNetworks.manifest
+ArchiveName=FicsItNetworks.archive
+DialogueScriptName=FicsItNetworksDialogue.csv
+
+[GatherTextStep0]
+CommandletClass=ExportDialogueScript
+

Config/Localization/FicsItNetworks_Gather.ini

@@ -0,0 +1,46 @@
+; THESE ARE GENERATED FILES, DO NOT EDIT DIRECTLY!
+; USE THE LOCALIZATION DASHBOARD IN THE UNREAL EDITOR TO EDIT THE CONFIGURATION
+[CommonSettings]
+ModulesToPreload=FicsItNetworks
+SourcePath=Mods/FicsItNetworks/Content/Localization/FicsItNetworks
+DestinationPath=Mods/FicsItNetworks/Content/Localization/FicsItNetworks
+ManifestName=FicsItNetworks.manifest
+ArchiveName=FicsItNetworks.archive
+NativeCulture=en
+CulturesToGenerate=en
+CulturesToGenerate=de
+
+[GatherTextStep0]
+CommandletClass=GatherTextFromSource
+SearchDirectoryPaths=%LOCPROJECTROOT%Mods/FicsItNetworks/Source
+SearchDirectoryPaths=%LOCPROJECTROOT%Mods/FicsItNetworks/Config
+ExcludePathFilters=Config/Localization/*
+FileNameFilters=*.h
+FileNameFilters=*.cpp
+FileNameFilters=*.ini
+ShouldGatherFromEditorOnlyData=false
+
+[GatherTextStep1]
+CommandletClass=GatherTextFromAssets
+IncludePathFilters=%LOCPROJECTROOT%Mods/FicsItNetworks/Content/*
+ExcludePathFilters=Content/Localization/*
+ExcludePathFilters=Content/L10N/*
+PackageFileNameFilters=*.umap
+PackageFileNameFilters=*.uasset
+ShouldExcludeDerivedClasses=false
+ShouldGatherFromEditorOnlyData=false
+SkipGatherCache=false
+
+[GatherTextStep2]
+CommandletClass=GenerateGatherManifest
+
+[GatherTextStep3]
+CommandletClass=GenerateGatherArchive
+
+[GatherTextStep4]
+CommandletClass=GenerateTextLocalizationReport
+bWordCountReport=true
+WordCountReportName=FicsItNetworks.csv
+bConflictReport=true
+ConflictReportName=FicsItNetworks_Conflicts.txt
+

Config/Localization/FicsItNetworks_GenerateReports.ini

@@ -0,0 +1,15 @@
+; THESE ARE GENERATED FILES, DO NOT EDIT DIRECTLY!
+; USE THE LOCALIZATION DASHBOARD IN THE UNREAL EDITOR TO EDIT THE CONFIGURATION
+[CommonSettings]
+SourcePath=Mods/FicsItNetworks/Content/Localization/FicsItNetworks
+DestinationPath=Mods/FicsItNetworks/Content/Localization/FicsItNetworks
+ManifestName=FicsItNetworks.manifest
+ArchiveName=FicsItNetworks.archive
+CulturesToGenerate=en
+CulturesToGenerate=de
+
+[GatherTextStep0]
+CommandletClass=GenerateTextLocalizationReport
+bWordCountReport=true
+WordCountReportName=FicsItNetworks.csv
+

Config/Localization/FicsItNetworks_Import.ini

@@ -0,0 +1,18 @@
+; THESE ARE GENERATED FILES, DO NOT EDIT DIRECTLY!
+; USE THE LOCALIZATION DASHBOARD IN THE UNREAL EDITOR TO EDIT THE CONFIGURATION
+[CommonSettings]
+SourcePath=Mods/FicsItNetworks/Content/Localization/FicsItNetworks
+DestinationPath=Mods/FicsItNetworks/Content/Localization/FicsItNetworks
+NativeCulture=en
+CulturesToGenerate=en
+CulturesToGenerate=de
+ManifestName=FicsItNetworks.manifest
+ArchiveName=FicsItNetworks.archive
+PortableObjectName=FicsItNetworks.po
+
+[GatherTextStep0]
+CommandletClass=InternationalizationExport
+bImportLoc=true
+LocalizedTextCollapseMode=ELocalizedTextCollapseMode::IdenticalTextIdAndSource
+POFormat=EPortableObjectFormat::Unreal
+

Config/Localization/FicsItNetworks_ImportDialogue.ini

@@ -0,0 +1,16 @@
+; THESE ARE GENERATED FILES, DO NOT EDIT DIRECTLY!
+; USE THE LOCALIZATION DASHBOARD IN THE UNREAL EDITOR TO EDIT THE CONFIGURATION
+[CommonSettings]
+SourcePath=Mods/FicsItNetworks/Content/Localization/FicsItNetworks
+ManifestName=FicsItNetworks.manifest
+ArchiveName=FicsItNetworks.archive
+NativeCulture=en
+CulturesToGenerate=en
+CulturesToGenerate=de
+
+[GatherTextStep0]
+CommandletClass=ImportLocalizedDialogue
+RawAudioPath=
+ImportedDialogueFolder=ImportedDialogue
+bImportNativeAsSource=false
+

Config/Localization/FicsItNetworks_ImportDialogueScript.ini

@@ -0,0 +1,15 @@
+; THESE ARE GENERATED FILES, DO NOT EDIT DIRECTLY!
+; USE THE LOCALIZATION DASHBOARD IN THE UNREAL EDITOR TO EDIT THE CONFIGURATION
+[CommonSettings]
+SourcePath=Mods/FicsItNetworks/Content/Localization/FicsItNetworks
+DestinationPath=Mods/FicsItNetworks/Content/Localization/FicsItNetworks
+NativeCulture=en
+CulturesToGenerate=en
+CulturesToGenerate=de
+ManifestName=FicsItNetworks.manifest
+ArchiveName=FicsItNetworks.archive
+DialogueScriptName=FicsItNetworksDialogue.csv
+
+[GatherTextStep0]
+CommandletClass=ImportDialogueScript
+

Config/PluginLocalization.ini

@@ -0,0 +1,3 @@
+[PluginLocalizationSettings]
+PluginLocalizationTargets=(PluginName="FicsItNetworks",LocalizationTargetName="FicsItNetworks",Settings=(Name="FicsItNetworks",Guid=7BDA661E8316EC119BF8E2B75B7B69C0,RequiredModuleNames=("FicsItNetworks"),GatherFromTextFiles=(SearchDirectories=((PathRoot=Project,Path="Mods/FicsItNetworks/Source"),(PathRoot=Project,Path="Mods/FicsItNetworks/Config"))),GatherFromPackages=(IncludePathWildcards=((PathRoot=Project,Pattern="Mods/FicsItNetworks/Content/*"))),NativeCultureIndex=0,SupportedCulturesStatistics=((CultureName="en"),(CultureName="de"))))
+

Content/Localization/FicsItNetworks/FicsItNetworks.csv

@@ -0,0 +1,16 @@
+Date/Time,Word Count,de,en
+2023.09.26-21.52.59,3698,0,3698
+2023.09.26-22.40.03,3702,0,3702
+2023.09.26-23.26.52,14562,0,14562
+2023.09.27-11.26.47,3698,3686,3698
+2023.09.27-11.32.23,14562,0,14562
+2023.09.27-12.23.09,3698,3686,3698
+2023.09.27-12.23.33,12015,0,12015
+2023.09.27-12.33.28,3698,3686,3698
+2023.09.27-12.34.11,12015,0,12015
+2023.09.27-12.38.31,3698,3686,3698
+2023.09.27-12.39.09,12015,0,12015
+2023.09.27-12.56.39,3698,3686,3698
+2023.09.27-12.57.05,12015,0,12015
+2023.09.27-15.12.20,3698,0,3698
+2023.09.27-15.12.45,12015,0,12015