adapt new changes

Nexus-Mods · Aug 1, 2024 · 33664f8 · 33664f8
1 parent 16e0d9a
commit 33664f8
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 44 deletions.
diff --git a/src/Games/NexusMods.Games.UnrealEngine/Installers/SmartUEInstaller.cs b/src/Games/NexusMods.Games.UnrealEngine/Installers/SmartUEInstaller.cs
@@ -172,8 +172,9 @@ public async ValueTask<IEnumerable<ModInstallerResult>> GetModsAsync(
         }];
     }
 
-    public override async ValueTask<LoadoutItem.New[]> ExecuteAsync(
+    public override async ValueTask<InstallerResult> ExecuteAsync(
         LibraryArchive.ReadOnly libraryArchive,
+        LoadoutItemGroup.New loadoutGroup,
         ITransaction transaction,
         Loadout.ReadOnly loadout,
         CancellationToken cancellationToken)
@@ -183,10 +184,10 @@ public async ValueTask<IEnumerable<ModInstallerResult>> GetModsAsync(
         if (achiveFiles.Length == 0)
         {
             Logger.LogError("Archive contains 0 files");
-            return [];
+            return new NotSupported();
         }
 
-        var group = libraryArchive.ToGroup(loadout, transaction, out var loadoutItem);
+        var group = loadoutGroup;
 
         var gameFilesLookup = loadout.Mods
             .First(mod => mod.Category == ModCategory.GameFiles).Files // TODO: fogure out what to use instead of ModCategory
@@ -244,13 +245,13 @@ public async ValueTask<IEnumerable<ModInstallerResult>> GetModsAsync(
         if (modFiles.Length == 0)
         {
             Logger.LogError("0 files were processed");
-            return [];
+            return new NotSupported();
         }
         else if (modFiles.Length != achiveFiles.Length)
         {
             Logger.LogWarning("Of {} files in archive only {} were processed", achiveFiles.Length, modFiles.Length);
         }
 
-        return [loadoutItem];
+        return new Success();
     }
 }
diff --git a/...usMods.Games.UnrealEngine/PacificDrive.cs → ...alEngine/PacificDrive/PacificDriveGame.cs b/...usMods.Games.UnrealEngine/PacificDrive.cs → ...alEngine/PacificDrive/PacificDriveGame.cs
@@ -14,16 +14,16 @@
 using JetBrains.Annotations;
 using NexusMods.Abstractions.Library.Installers;
 
-namespace NexusMods.Games.UnrealEngine;
+namespace NexusMods.Games.UnrealEngine.PacificDrive;
 
 [UsedImplicitly]
-public class PacificDrive : AGame, ISteamGame//, IEpicGame
+public class PacificDriveGame : AGame, ISteamGame//, IEpicGame
 {
     public static readonly GameDomain StaticDomain = GameDomain.From("pacificdrive");
     private readonly IFileSystem _fileSystem;
     private readonly IServiceProvider _serviceProvider;
 
-    public PacificDrive(IEnumerable<IGameLocator> gameLocators, IFileSystem fileSystem, IServiceProvider provider) : base(provider)
+    public PacificDriveGame(IEnumerable<IGameLocator> gameLocators, IFileSystem fileSystem, IServiceProvider provider) : base(provider)
     {
         _fileSystem = fileSystem;
         _serviceProvider = provider;
@@ -38,7 +38,7 @@ protected override IReadOnlyDictionary<LocationId, AbsolutePath> GetLocations(IF
         var result = new Dictionary<LocationId, AbsolutePath>()
         {
             { LocationId.Game, installation.Path },
-            { Constants.GameMainUE, installation.Path.Combine("PenDriverPro")}, 
+            { Constants.GameMainUE, installation.Path.Combine("PenDriverPro")},
             {
                 LocationId.Saves,
                 fileSystem.GetKnownPath(KnownPath.LocalApplicationDataDirectory)
@@ -58,10 +58,10 @@ protected override IReadOnlyDictionary<LocationId, AbsolutePath> GetLocations(IF
     public IEnumerable<string> EpicCatalogItemId => ["5beededaad9743df90e8f07d92df153f"]; // TODO: ask someone
 
     public override IStreamFactory Icon =>
-        new EmbededResourceStreamFactory<PacificDrive>("NexusMods.Games.UnrealEngine.Resources.PacificDrive.icon.png");
+        new EmbededResourceStreamFactory<PacificDriveGame>("NexusMods.Games.UnrealEngine.Resources.PacificDrive.icon.png");
 
     public override IStreamFactory GameImage =>
-        new EmbededResourceStreamFactory<PacificDrive>("NexusMods.Games.UnrealEngine.Resources.PacificDrive.game_image.jpg");
+        new EmbededResourceStreamFactory<PacificDriveGame>("NexusMods.Games.UnrealEngine.Resources.PacificDrive.game_image.jpg");
 
     public override IEnumerable<IModInstaller> Installers =>
     [
@@ -76,11 +76,6 @@ protected override IReadOnlyDictionary<LocationId, AbsolutePath> GetLocations(IF
     public override List<IModInstallDestination> GetInstallDestinations(IReadOnlyDictionary<LocationId, AbsolutePath> locations)
         => ModInstallDestinationHelpers.GetCommonLocations(locations);
 
-    protected override ILoadoutSynchronizerOld MakeSynchronizerOld(IServiceProvider provider)
-    {
-        return new PacificDriveLoadoutSynchronizerOld(provider);
-    }
-
     protected override ILoadoutSynchronizer MakeSynchronizer(IServiceProvider provider)
     {
         return new PacificDriveLoadoutSynchronizer(provider);

diff --git a/...Engine/PacificDriveLoadoutSynchronizer.cs → ...cDrive/PacificDriveLoadoutSynchronizer.cs b/...Engine/PacificDriveLoadoutSynchronizer.cs → ...cDrive/PacificDriveLoadoutSynchronizer.cs
@@ -3,7 +3,7 @@
 using NexusMods.Abstractions.Loadouts.Synchronizers;
 using NexusMods.Abstractions.Settings;
 
-namespace NexusMods.Games.UnrealEngine;
+namespace NexusMods.Games.UnrealEngine.PacificDrive;
 
 public class PacificDriveLoadoutSynchronizer : ALoadoutSynchronizer
 {

diff --git a/...ames.UnrealEngine/PacificDriveSettings.cs → ...gine/PacificDrive/PacificDriveSettings.cs b/...ames.UnrealEngine/PacificDriveSettings.cs → ...gine/PacificDrive/PacificDriveSettings.cs
@@ -1,6 +1,6 @@
 using NexusMods.Abstractions.Settings;
 
-namespace NexusMods.Games.UnrealEngine;
+namespace NexusMods.Games.UnrealEngine.PacificDrive;
 
 public class PacificDriveSettings : ISettings
 {

diff --git a/src/Games/NexusMods.Games.UnrealEngine/PacificDriveLoadoutSynchronizerOld.cs b/src/Games/NexusMods.Games.UnrealEngine/PacificDriveLoadoutSynchronizerOld.cs
diff --git a/src/Games/NexusMods.Games.UnrealEngine/Services.cs b/src/Games/NexusMods.Games.UnrealEngine/Services.cs
@@ -3,6 +3,7 @@
 using NexusMods.Abstractions.Loadouts;
 using NexusMods.Abstractions.Settings;
 using NexusMods.Games.UnrealEngine.Installers;
+using NexusMods.Games.UnrealEngine.PacificDrive;
 
 namespace NexusMods.Games.UnrealEngine;
 
@@ -11,8 +12,8 @@ public static class Services
     public static IServiceCollection AddPacificDrive(this IServiceCollection services)
     {
         services
-            .AddGame<PacificDrive>()
-            .AddSingleton<ITool, RunGameTool<PacificDrive>>()
+            .AddGame<PacificDriveGame>()
+            .AddSingleton<ITool, RunGameTool<PacificDriveGame>>()
 
             // Misc
             .AddSettings<PacificDriveSettings>();