From 5a828f9bb7446743bee1c15f369c9154882ee207 Mon Sep 17 00:00:00 2001 From: Dev Date: Mon, 20 May 2024 13:45:00 +0100 Subject: [PATCH] Further adjusted dll names for consistency + updated dll existence check to work with new names + minor error message spacing fix --- project/Aki.Common/Aki.Common.csproj | 2 +- project/Aki.Core/Aki.Core.csproj | 2 +- project/Aki.Custom/Aki.Custom.csproj | 2 +- project/Aki.Debugging/Aki.Debugging.csproj | 2 +- project/Aki.PrePatch/Aki.PrePatch.csproj | 2 +- project/Aki.PrePatch/AkiBotsPrePatcher.cs | 8 ++++---- project/Aki.Reflection/Aki.Reflection.csproj | 2 +- project/Aki.SinglePlayer/Aki.SinglePlayer.csproj | 2 +- project/build.ps1 | 14 +++++++------- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/project/Aki.Common/Aki.Common.csproj b/project/Aki.Common/Aki.Common.csproj index a5a3d7a..2350caa 100644 --- a/project/Aki.Common/Aki.Common.csproj +++ b/project/Aki.Common/Aki.Common.csproj @@ -3,7 +3,7 @@ 1.0.0.0 net471 - aki-common + spt-common Release diff --git a/project/Aki.Core/Aki.Core.csproj b/project/Aki.Core/Aki.Core.csproj index f762b57..253a2c8 100644 --- a/project/Aki.Core/Aki.Core.csproj +++ b/project/Aki.Core/Aki.Core.csproj @@ -2,7 +2,7 @@ net471 - aki-core + spt-core Release diff --git a/project/Aki.Custom/Aki.Custom.csproj b/project/Aki.Custom/Aki.Custom.csproj index e5d4afe..74df4b1 100644 --- a/project/Aki.Custom/Aki.Custom.csproj +++ b/project/Aki.Custom/Aki.Custom.csproj @@ -2,7 +2,7 @@ net471 - aki-custom + spt-custom Release diff --git a/project/Aki.Debugging/Aki.Debugging.csproj b/project/Aki.Debugging/Aki.Debugging.csproj index e6b446e..9a36793 100644 --- a/project/Aki.Debugging/Aki.Debugging.csproj +++ b/project/Aki.Debugging/Aki.Debugging.csproj @@ -2,7 +2,7 @@ net471 - aki-debugging + spt-debugging Release diff --git a/project/Aki.PrePatch/Aki.PrePatch.csproj b/project/Aki.PrePatch/Aki.PrePatch.csproj index 806f815..089a516 100644 --- a/project/Aki.PrePatch/Aki.PrePatch.csproj +++ b/project/Aki.PrePatch/Aki.PrePatch.csproj @@ -3,7 +3,7 @@ net471 - aki-prepatch + spt-prepatch Release diff --git a/project/Aki.PrePatch/AkiBotsPrePatcher.cs b/project/Aki.PrePatch/AkiBotsPrePatcher.cs index ff31e4b..7c1c4c0 100644 --- a/project/Aki.PrePatch/AkiBotsPrePatcher.cs +++ b/project/Aki.PrePatch/AkiBotsPrePatcher.cs @@ -86,14 +86,14 @@ namespace Aki.PrePatch } // Validate that the folder exists, and contains our plugins - string[] sptPlugins = new string[] { "aki-core.dll", "aki-custom.dll", "aki-singleplayer.dll" }; + string[] sptPlugins = new string[] { "spt-common.dll", "spt-reflection.dll", "spt-core.dll", "spt-custom.dll", "spt-singleplayer.dll" }; string[] foundPlugins = Directory.GetFiles(sptPluginPath).Select(x => Path.GetFileName(x)).ToArray(); - foreach (string plugin in sptPlugins) + foreach (string pluginNameAndSuffix in sptPlugins) { - if (!foundPlugins.Contains(plugin)) + if (!foundPlugins.Contains(pluginNameAndSuffix)) { - message = $"Required SPT plugins missing from '{sptPluginPath}'{exitMessage}"; + message = $"Required SPT plugin: {pluginNameAndSuffix} missing from '{sptPluginPath}' {exitMessage}"; logger.LogError(message); return false; } diff --git a/project/Aki.Reflection/Aki.Reflection.csproj b/project/Aki.Reflection/Aki.Reflection.csproj index e75be53..639987b 100644 --- a/project/Aki.Reflection/Aki.Reflection.csproj +++ b/project/Aki.Reflection/Aki.Reflection.csproj @@ -3,7 +3,7 @@ net471 Release - aki-reflection + spt-reflection diff --git a/project/Aki.SinglePlayer/Aki.SinglePlayer.csproj b/project/Aki.SinglePlayer/Aki.SinglePlayer.csproj index a43eb3f..10251a3 100644 --- a/project/Aki.SinglePlayer/Aki.SinglePlayer.csproj +++ b/project/Aki.SinglePlayer/Aki.SinglePlayer.csproj @@ -2,7 +2,7 @@ net471 - aki-singleplayer + spt-singleplayer Release diff --git a/project/build.ps1 b/project/build.ps1 index edca16d..6b6c990 100644 --- a/project/build.ps1 +++ b/project/build.ps1 @@ -16,13 +16,13 @@ foreach ($folder in $foldersToCreate) { } # Move DLLs from project's bin-release folder to the build folder -Copy-Item "$projReleaseFolder\aki-common.dll" -Destination "$bepinexSptFolder" -Copy-Item "$projReleaseFolder\aki-reflection.dll" -Destination "$bepinexSptFolder" -Copy-Item "$projReleaseFolder\aki-prepatch.dll" -Destination "$bepinexPatchFolder" -Copy-Item "$projReleaseFolder\aki-core.dll" -Destination "$bepinexSptFolder" -Copy-Item "$projReleaseFolder\aki-custom.dll" -Destination "$bepinexSptFolder" -Copy-Item "$projReleaseFolder\aki-debugging.dll" -Destination "$bepinexSptFolder" -Copy-Item "$projReleaseFolder\aki-singleplayer.dll" -Destination "$bepinexSptFolder" +Copy-Item "$projReleaseFolder\spt-common.dll" -Destination "$bepinexSptFolder" +Copy-Item "$projReleaseFolder\spt-reflection.dll" -Destination "$bepinexSptFolder" +Copy-Item "$projReleaseFolder\spt-prepatch.dll" -Destination "$bepinexPatchFolder" +Copy-Item "$projReleaseFolder\spt-core.dll" -Destination "$bepinexSptFolder" +Copy-Item "$projReleaseFolder\spt-custom.dll" -Destination "$bepinexSptFolder" +Copy-Item "$projReleaseFolder\spt-debugging.dll" -Destination "$bepinexSptFolder" +Copy-Item "$projReleaseFolder\spt-singleplayer.dll" -Destination "$bepinexSptFolder" # If any new DLLs need to be copied, add here # Write the contents of the license file to a txt