Merge pull request #328 from Panakotta00/development

Release v0.3.21

.github/workflows/build.yml

@@ -36,7 +36,7 @@ jobs:
     runs-on: Windows2019-selfhosted
     steps:
       - name: Pre Cleanup
-        run: Remove-Item C:\actions-runner\_work\FicsIt-Networks\FicsIt-Networks\* -Recurse -Force -Confirm:$false -ErrorAction Ignore
+        run: Remove-Item ${{ github.workspace }}\* -Recurse -Force -Confirm:$false -ErrorAction Ignore
       - uses: actions/checkout@v4
         with:
           repository: satisfactorymodding/SatisfactoryModLoader
@@ -67,9 +67,7 @@ jobs:
 
       - 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"
+           7z x -aoa C:\\CI\\Wwise.7z -o'${{ github.workspace }}\SatisfactoryModLoader\Plugins\'
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
           WWISE_EMAIL: ${{ secrets.WWISE_EMAIL }}
@@ -78,14 +76,16 @@ jobs:
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v2
 
-      - 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: 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
+        run: ${{ github.workspace }}\\ue\\Engine\\Build\\BatchFiles\\Build.bat FactoryEditor Win64 Development -project='${{ github.workspace }}\SatisfactoryModLoader\FactoryGame.uproject'
 
-      - 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 Shipping/Client EGS
+        run: ${{ github.workspace }}\\ue\\Engine\\Build\\BatchFiles\\Build.bat FactoryGameEGS Win64 Shipping -project='${{ github.workspace }}\SatisfactoryModLoader\FactoryGame.uproject'
+      - name: Build for Shipping/Client Steam
+        run: ${{ github.workspace }}\\ue\\Engine\\Build\\BatchFiles\\Build.bat FactoryGameSteam Win64 Shipping -project='${{ github.workspace }}\SatisfactoryModLoader\FactoryGame.uproject'
 
 #      - 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
@@ -94,7 +94,7 @@ jobs:
 #        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"
+        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 -merge
 
 #      - 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"

Config/AccessTransformers.ini

@@ -1,16 +1,17 @@
 [AccessTransformers]
 Friend=(Class="AFGBuildableHologram", FriendClass="FFicsItNetworksModule")
+Friend=(Class="AFGBuildableHologram", FriendClass="FFicsItNetworksCircuitModule")
 Friend=(Class="AFGBuildableHologram", FriendClass="AFINNetworkCableHologram")
 Friend=(Class="AFGHologram", FriendClass="AFINNetworkCableHologram")
-Friend=(Class="UFGPipeConnectionComponentBase", FriendClass="UFINPipeHyperStartHook")
-Friend=(Class="UFGCharacterMovementComponent", FriendClass="UFINPipeHyperStartHook")
+Friend=(Class="UFGPipeConnectionComponentBase", FriendClass="UFIRPipeHyperStartHook")
+Friend=(Class="UFGCharacterMovementComponent", FriendClass="UFIRPipeHyperStartHook")
 ; Friend=(Class="AFGBuildableDoor", FriendClass="FIN_StaticRef_AFGBuildableDoor::FIN_StaticRefProp_Member_Door::Set")
-Friend=(Class="AFGBuildableDoor", FriendClass="FStaticReflectionSourceHelper")
+Friend=(Class="AFGBuildableDoor", FriendClass="FFIRDoorHelper")
 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")
+Friend=(Class="UFGRailroadTrackConnectionComponent", FriendClass="AFIRSubsystem")
+Friend=(Class="AFGBuildableRailroadSignal", FriendClass="AFIRSubsystem")
+Friend=(Class="AFGRailroadSubsystem", FriendClass="AFIRSubsystem")
+Friend=(Class="AFGBuildableRailroadStation", FriendClass="UFIRRailroadStationHook")
 Accessor=(Class="AFGBuildableDoor", Property="mDoorConfiguration")
 Accessor=(Class="AFGBuildableRailroadSwitchControl", Property="mControlledConnection")
 Accessor=(Class="UFGRailroadTrackConnectionComponent", Property="mConnectedComponents")