Merge pull request #9 from Goose-Bomb/dev

Hotfix 🌶
Nullkooland · Aug 27, 2019 · ad0a18b · ad0a18b
2 parents e677352 + 6c0e355
commit ad0a18b
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 31 deletions.
diff --git a/GBCLV3/Properties/AssemblyInfo.cs b/GBCLV3/Properties/AssemblyInfo.cs
@@ -11,8 +11,8 @@
 [assembly: AssemblyCopyright("Copyright © Goose Bomb 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.0.2.36")]
-[assembly: AssemblyFileVersion("3.0.2.36")]
+[assembly: AssemblyVersion("3.0.2.38")]
+[assembly: AssemblyFileVersion("3.0.2.38")]
 
 [assembly: ComVisible(false)]
 

diff --git a/GBCLV3/Services/Launcher/AssetService.cs b/GBCLV3/Services/Launcher/AssetService.cs
@@ -99,7 +99,7 @@ public async Task<bool> DownloadIndexJsonAsync(AssetsInfo info)
         {
             try
             {
-                string json = await _client.GetStringAsync(_urlService.Base.Json + info.IndexUrl);
+                string json = await _client.GetStringAsync(info.IndexUrl);
                 string indexDir = $"{_gamePathService.AssetsDir}/indexes";
 
                 //Make sure directory exists

diff --git a/GBCLV3/Services/Launcher/LibraryService.cs b/GBCLV3/Services/Launcher/LibraryService.cs
@@ -67,6 +67,7 @@ string GetUrl(Library lib)
                     case LibraryType.Forge:
                         return _urlService.Base.Forge + lib.Url;
                     case LibraryType.Minecraft:
+                    case LibraryType.Native:
                         return _urlService.Base.Library + (lib.Url ?? lib.Path);
                     case LibraryType.Maven:
                         return _urlService.Base.Maven + (lib.Url ?? lib.Path);

diff --git a/GBCLV3/Services/Launcher/VersionService.cs b/GBCLV3/Services/Launcher/VersionService.cs
@@ -384,7 +384,7 @@ private static Version Load(string json)
                 {
                     ID = jver.assetIndex.id,
                     IndexSize = jver.assetIndex.size,
-                    IndexUrl = jver.assetIndex.url.Substring(32),
+                    IndexUrl = jver.assetIndex.url,
                     IndexSHA1 = jver.assetIndex.sha1,
                     TotalSize = jver.assetIndex.totalSize,
                 };

diff --git a/GBCLV3/ViewModels/GameInstallViewModel.cs b/GBCLV3/ViewModels/GameInstallViewModel.cs
@@ -127,13 +127,12 @@ public async void InstallSelectedVersion(VersionDownload download)
             var missingLibs = _libraryService.CheckIntegrity(version.Libraries);
             downloads = downloads.Concat(_libraryService.GetDownloads(missingLibs));
 
-            if (IsDownloadAssets)
-            {
-                if (await _assetService.DownloadIndexJsonAsync(version.AssetsInfo))
-                {
-                    _assetService.LoadAllObjects(version.AssetsInfo);
-                }
+            // Download assets index json
+            await _assetService.DownloadIndexJsonAsync(version.AssetsInfo);
 
+            // Download assets objects on user's discretion
+            if (IsDownloadAssets && _assetService.LoadAllObjects(version.AssetsInfo))
+            {
                 var missingAssets = await _assetService.CheckIntegrityAsync(version.AssetsInfo);
                 downloads = downloads.Concat(_assetService.GetDownloads(missingAssets));
             }

diff --git a/GBCLV3/ViewModels/GameSettingsViewModel.cs b/GBCLV3/ViewModels/GameSettingsViewModel.cs
@@ -157,12 +157,12 @@ public string ExtraMinecraftArgs
 
         public bool IsShowAdvancedSettings { get; set; }
 
-        public void OnPasswordLoaded(PasswordBox passwordBox, EventArgs args)
+        public void OnPasswordLoaded(PasswordBox passwordBox, EventArgs _)
         {
             passwordBox.Password = _config.Password;
         }
 
-        public void OnPasswordChanged(PasswordBox passwordBox, EventArgs args)
+        public void OnPasswordChanged(PasswordBox passwordBox, EventArgs _)
         {
             _config.Password = passwordBox.Password;
         }

diff --git a/GBCLV3/ViewModels/Pages/AboutViewModel.cs b/GBCLV3/ViewModels/Pages/AboutViewModel.cs
@@ -12,21 +12,15 @@ class AboutViewModel : Screen
         #region Private Members
 
         // IoC
-        private readonly int _;
-
-        private readonly Config _config;
         private readonly IWindowManager _windowManager;
 
         #endregion
 
         #region Constructor
 
         [Inject]
-        public AboutViewModel(
-            ConfigService configService,
-            IWindowManager windowManager)
+        public AboutViewModel(IWindowManager windowManager)
         {
-            _config = configService.Entries;
             _windowManager = windowManager;
         }
 

diff --git a/GBCLV3/ViewModels/Pages/LaunchViewModel.cs b/GBCLV3/ViewModels/Pages/LaunchViewModel.cs
@@ -24,7 +24,6 @@ class LaunchViewModel : Conductor<IScreen>.Collection.OneActive
         // IoC
         private readonly Config _config;
         private readonly VersionService _versionService;
-        private readonly ForgeInstallService _forgeService;
         private readonly LibraryService _libraryService;
         private readonly AssetService _assetService;
         private readonly LaunchService _launchService;
@@ -46,7 +45,6 @@ public LaunchViewModel(
 
             ConfigService configService,
             VersionService versionService,
-            ForgeInstallService forgeService,
             LibraryService libraryService,
             AssetService assetService,
             LaunchService launchService,
@@ -61,7 +59,6 @@ public LaunchViewModel(
             _config = configService.Entries;
 
             _versionService = versionService;
-            _forgeService = forgeService;
             _libraryService = libraryService;
             _assetService = assetService;
             _launchService = launchService;

diff --git a/GBCLV3/ViewModels/VersionsManagementViewModel.cs b/GBCLV3/ViewModels/VersionsManagementViewModel.cs
@@ -26,9 +26,6 @@ class VersionsManagementViewModel : Screen
         private readonly GamePathService _gamePathService;
         private readonly VersionService _versionService;
 
-        private readonly GameInstallViewModel _gameInstallVM;
-        private readonly ForgeInstallViewModel _forgeInstallVM;
-
         private readonly IWindowManager _windowManager;
 
         #endregion
@@ -41,9 +38,6 @@ public VersionsManagementViewModel(
             GamePathService gamePathService,
             VersionService versionService,
 
-            GameInstallViewModel gameInstallVM,
-            ForgeInstallViewModel forgeInstallVM,
-
             IWindowManager windowManager)
         {
             _windowManager = windowManager;
@@ -59,9 +53,6 @@ public VersionsManagementViewModel(
             };
             _versionService.Created += version => Versions.Insert(0, version);
             _versionService.Deleted += version => Versions.Remove(version);
-
-            _gameInstallVM = gameInstallVM;
-            _forgeInstallVM = forgeInstallVM;
         }
 
         #endregion

diff --git a/GBCLV3/ViewModels/Windows/MainViewModel.cs b/GBCLV3/ViewModels/Windows/MainViewModel.cs