fixed addons sometimes not adding to the lists

fgsfds · fgsfds · commit 6e6cd2b73913 · 2024-05-30T12:56:43.000+05:00
diff --git a/src/Avalonia/Core/ViewModels/CampaignsViewModel.cs b/src/Avalonia/Core/ViewModels/CampaignsViewModel.cs
@@ -39,7 +39,8 @@ ScoresProvider scoresProvider
             _playtimeProvider = playtimeProvider;
 
             _gamesProvider.GameChangedEvent += OnGameChanged;
-            Game.DownloadableAddonsProvider.AddonDownloadedEvent += OnAddonDownloaded;
+            Game.DownloadableAddonsProvider.AddonDownloadedEvent += OnAddonChanged;
+            Game.InstalledAddonsProvider.AddonsChangedEvent += OnAddonChanged;
         }
 
 
@@ -215,15 +216,12 @@ private void OnGameChanged(GameEnum parameterName)
             }
         }
 
-        private void OnAddonDownloaded(IGame game, AddonTypeEnum addonType)
+        private void OnAddonChanged(IGame game, AddonTypeEnum? addonType)
         {
-            if (game.GameEnum != Game.GameEnum ||
-                addonType is not AddonTypeEnum.TC)
+            if (game.GameEnum == Game.GameEnum && (addonType is AddonTypeEnum.TC || addonType is null))
             {
-                return;
+                OnPropertyChanged(nameof(CampaignsList));
             }
-
-            OnPropertyChanged(nameof(CampaignsList));
         }
     }
 }
diff --git a/src/Avalonia/Core/ViewModels/DownloadsViewModel.cs b/src/Avalonia/Core/ViewModels/DownloadsViewModel.cs
@@ -19,7 +19,7 @@ public DownloadsViewModel(IGame game)
             Game = game;
 
             Game.DownloadableAddonsProvider.AddonDownloadedEvent += OnAddonChanged;
-            Game.InstalledAddonsProvider.AddonDeletedEvent += OnAddonChanged;
+            Game.InstalledAddonsProvider.AddonsChangedEvent += OnAddonChanged;
         }
 
 
@@ -195,7 +195,7 @@ private void OnProgressChanged(object? sender, float e)
             OnPropertyChanged(nameof(ProgressBarValue));
         }
 
-        private void OnAddonChanged(IGame game, AddonTypeEnum addonType)
+        private void OnAddonChanged(IGame game, AddonTypeEnum? addonType)
         {
             if (game.GameEnum != Game.GameEnum)
             {
diff --git a/src/Avalonia/Core/ViewModels/MapsViewModel.cs b/src/Avalonia/Core/ViewModels/MapsViewModel.cs
@@ -39,7 +39,8 @@ ScoresProvider scoresProvider
             _playtimeProvider = playtimeProvider;
 
             _gamesProvider.GameChangedEvent += OnGameChanged;
-            Game.DownloadableAddonsProvider.AddonDownloadedEvent += OnAddonDownloaded;
+            Game.DownloadableAddonsProvider.AddonDownloadedEvent += OnAddonChanged;
+            Game.InstalledAddonsProvider.AddonsChangedEvent += OnAddonChanged;
         }
 
 
@@ -218,15 +219,12 @@ private void OnGameChanged(GameEnum parameterName)
             }
         }
 
-        private void OnAddonDownloaded(IGame game, AddonTypeEnum addonType)
+        private void OnAddonChanged(IGame game, AddonTypeEnum? addonType)
         {
-            if (game.GameEnum != Game.GameEnum ||
-                addonType is not AddonTypeEnum.Map)
+            if (game.GameEnum == Game.GameEnum && (addonType is AddonTypeEnum.Map || addonType is null))
             {
-                return;
+                OnPropertyChanged(nameof(MapsList));
             }
-
-            OnPropertyChanged(nameof(MapsList));
         }
     }
 }
diff --git a/src/Avalonia/Core/ViewModels/ModsViewModel.cs b/src/Avalonia/Core/ViewModels/ModsViewModel.cs
@@ -38,7 +38,8 @@ ScoresProvider scoresProvider
             _playtimeProvider = playtimeProvider;
 
             _gamesProvider.GameChangedEvent += OnGameChanged;
-            Game.DownloadableAddonsProvider.AddonDownloadedEvent += OnModDownloaded;
+            Game.DownloadableAddonsProvider.AddonDownloadedEvent += OnAddonChanged;
+            Game.InstalledAddonsProvider.AddonsChangedEvent += OnAddonChanged;
         }
 
 
@@ -157,15 +158,12 @@ private void OnGameChanged(GameEnum parameterName)
             }
         }
 
-        private void OnModDownloaded(IGame game, AddonTypeEnum addonType)
+        private void OnAddonChanged(IGame game, AddonTypeEnum? addonType)
         {
-            if (game.GameEnum != Game.GameEnum ||
-                addonType is not AddonTypeEnum.Mod)
+            if (game.GameEnum == Game.GameEnum && (addonType is AddonTypeEnum.Mod || addonType is null))
             {
-                return;
+                OnPropertyChanged(nameof(ModsList));
             }
-
-            OnPropertyChanged(nameof(ModsList));
         }
     }
 }
diff --git a/src/ClientCommon/Config/ConfigProvider.cs b/src/ClientCommon/Config/ConfigProvider.cs
@@ -216,6 +216,11 @@ private void SetGamePathValue(string? value, [CallerMemberName] string caller =
     {
         var setting = _dbContext.GamePaths.Find([caller]);
 
+        if (string.IsNullOrWhiteSpace(value))
+        {
+            value = null;
+        }
+
         if (setting is null)
         {
             _dbContext.GamePaths.Add(new() { Game = caller, Path = value });
diff --git a/src/Common/Helpers/Events.cs b/src/Common/Helpers/Events.cs
@@ -3,5 +3,5 @@
 
 namespace Common.Helpers
 {
-    public delegate void AddonChanged(IGame game, AddonTypeEnum modType);
+    public delegate void AddonChanged(IGame game, AddonTypeEnum? modType);
 }
diff --git a/src/Common/Interfaces/IInstalledAddonsProvider.cs b/src/Common/Interfaces/IInstalledAddonsProvider.cs
@@ -5,7 +5,7 @@ namespace Common.Interfaces
 {
     public interface IInstalledAddonsProvider
     {
-        event AddonChanged AddonDeletedEvent;
+        event AddonChanged AddonsChangedEvent;
 
         /// <summary>
         /// Add addon to cache
diff --git a/src/Mods/Providers/DownloadableAddonsProvider.cs b/src/Mods/Providers/DownloadableAddonsProvider.cs
@@ -18,6 +18,7 @@ public sealed class DownloadableAddonsProvider : IDownloadableAddonsProvider
         private readonly ApiInterface _apiInterface;
 
         private Dictionary<AddonTypeEnum, Dictionary<string, IDownloadableAddon>>? _cache;
+        private readonly SemaphoreSlim _semaphore = new(1);
 
         public event AddonChanged AddonDownloadedEvent;
 
@@ -42,15 +43,19 @@ ApiInterface apiInterface
         /// <inheritdoc/>
         public async Task CreateCacheAsync()
         {
+            await _semaphore.WaitAsync();
+
             if (_cache is not null)
             {
+                _semaphore.Release();
                 return;
             }
 
             var addons = await _apiInterface.GetAddonsAsync(_game.GameEnum).ConfigureAwait(false);
 
             if (addons is null ||  addons.Count == 0)
             {
+                _semaphore.Release();
                 return;
             }
 
@@ -61,6 +66,8 @@ public async Task CreateCacheAsync()
                 _cache.TryAdd(addon.AddonType, []);
                 _cache[addon.AddonType].TryAdd(addon.Id, addon);
             }
+
+            _semaphore.Release();
         }
 
 
diff --git a/src/Mods/Providers/InstalledAddonsProvider.cs b/src/Mods/Providers/InstalledAddonsProvider.cs
@@ -21,9 +21,11 @@ public sealed class InstalledAddonsProvider : IInstalledAddonsProvider
     private readonly PlaytimeProvider _playtimeProvider;
 
     private readonly Dictionary<AddonTypeEnum, Dictionary<string, IAddon>> _cache;
-    private readonly SemaphoreSlim _semaphore = new(1);
+    private static readonly SemaphoreSlim _semaphore = new(1);
 
-    public event AddonChanged AddonDeletedEvent;
+    private bool _isCacheUpdating = false;
+
+    public event AddonChanged AddonsChangedEvent;
 
     [Obsolete($"Don't create directly. Use {nameof(InstalledAddonsProvider)}.")]
     public InstalledAddonsProvider(
@@ -42,7 +44,8 @@ PlaytimeProvider playtimeProvider
     /// <inheritdoc/>
     public async Task CreateCache(bool createNew)
     {
-        _semaphore.Wait();
+        await _semaphore.WaitAsync();
+        _isCacheUpdating = true;
 
         if (createNew)
         {
@@ -55,7 +58,7 @@ await Task.Run(() =>
             {
                 IEnumerable<string> files;
 
-                files = Directory.GetFiles(_game.CampaignsFolderPath).Where(static x => x.EndsWith(".zip", StringComparison.OrdinalIgnoreCase) || x.EndsWith(".grp", StringComparison.OrdinalIgnoreCase));
+                files = Directory.GetFiles(_game.CampaignsFolderPath, "*.zip");
                 var camps = GetAddonsFromFiles(AddonTypeEnum.TC, files);
                 _cache.Add(AddonTypeEnum.TC, camps);
 
@@ -66,9 +69,11 @@ await Task.Run(() =>
                 files = Directory.GetFiles(_game.ModsFolderPath, "*.zip");
                 var mods = GetAddonsFromFiles(AddonTypeEnum.Mod, files);
                 _cache.Add(AddonTypeEnum.Mod, mods);
-            });
+            }).WaitAsync(CancellationToken.None);
         }
 
+        _isCacheUpdating = false;
+        AddonsChangedEvent?.Invoke(_game, null);
         _semaphore.Release();
 
         _cache.ThrowIfNull();
@@ -110,7 +115,7 @@ public void DeleteAddon(IAddon addon)
 
         _cache[addon.Type].Remove(addon.Id);
 
-        AddonDeletedEvent?.Invoke(_game, addon.Type);
+        AddonsChangedEvent?.Invoke(_game, addon.Type);
     }
 
     /// <inheritdoc/>
@@ -132,6 +137,11 @@ public void DisableAddon(string addonId)
     /// <inheritdoc/>
     public Dictionary<string, IAddon> GetInstalledAddons(AddonTypeEnum addonType)
     {
+        if (_isCacheUpdating)
+        {
+            return [];
+        }
+
         _cache.ThrowIfNull();
 
         _cache.TryGetValue(addonType, out var result);
@@ -233,8 +243,6 @@ newAddon.Version is not null &&
         Dictionary<string, string?>? incompatibles = null;
         IStartMap? startMap = null;
 
-        DukeVersionEnum? dukeVersion = null;
-
         if (ArchiveFactory.IsArchive(pathToFile, out var _))
         {
             using var archive = ArchiveFactory.Open(pathToFile);
@@ -302,15 +310,12 @@ newAddon.Version is not null &&
             {
                 if (manifest.SupportedGame.Version == DukeVersionEnum.Duke3D_13D.ToString())
                 {
-                    dukeVersion = DukeVersionEnum.Duke3D_13D;
                 }
                 else if (manifest.SupportedGame.Version == DukeVersionEnum.Duke3D_Atomic.ToString())
                 {
-                    dukeVersion = DukeVersionEnum.Duke3D_Atomic;
                 }
                 else if (manifest.SupportedGame.Version == DukeVersionEnum.Duke3D_WT.ToString())
                 {
-                    dukeVersion = DukeVersionEnum.Duke3D_WT;
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,8 @@ ScoresProvider scoresProvider`
`39`	`39`	`_playtimeProvider = playtimeProvider;`
`40`	`40`
`41`	`41`	`_gamesProvider.GameChangedEvent += OnGameChanged;`
`42`		`- Game.DownloadableAddonsProvider.AddonDownloadedEvent += OnAddonDownloaded;`
	`42`	`+ Game.DownloadableAddonsProvider.AddonDownloadedEvent += OnAddonChanged;`
	`43`	`+ Game.InstalledAddonsProvider.AddonsChangedEvent += OnAddonChanged;`
`43`	`44`	`}`
`44`	`45`
`45`	`46`
`@@ -215,15 +216,12 @@ private void OnGameChanged(GameEnum parameterName)`
`215`	`216`	`}`
`216`	`217`	`}`
`217`	`218`
`218`		`- private void OnAddonDownloaded(IGame game, AddonTypeEnum addonType)`
	`219`	`+ private void OnAddonChanged(IGame game, AddonTypeEnum? addonType)`
`219`	`220`	`{`
`220`		`- if (game.GameEnum != Game.GameEnum \|\|`
`221`		`- addonType is not AddonTypeEnum.TC)`
	`221`	`+ if (game.GameEnum == Game.GameEnum && (addonType is AddonTypeEnum.TC \|\| addonType is null))`
`222`	`222`	`{`
`223`		`- return;`
	`223`	`+ OnPropertyChanged(nameof(CampaignsList));`
`224`	`224`	`}`
`225`		`-`
`226`		`- OnPropertyChanged(nameof(CampaignsList));`
`227`	`225`	`}`
`228`	`226`	`}`
`229`	`227`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public DownloadsViewModel(IGame game)`
`19`	`19`	`Game = game;`
`20`	`20`
`21`	`21`	`Game.DownloadableAddonsProvider.AddonDownloadedEvent += OnAddonChanged;`
`22`		`- Game.InstalledAddonsProvider.AddonDeletedEvent += OnAddonChanged;`
	`22`	`+ Game.InstalledAddonsProvider.AddonsChangedEvent += OnAddonChanged;`
`23`	`23`	`}`
`24`	`24`
`25`	`25`
`@@ -195,7 +195,7 @@ private void OnProgressChanged(object? sender, float e)`
`195`	`195`	`OnPropertyChanged(nameof(ProgressBarValue));`
`196`	`196`	`}`
`197`	`197`
`198`		`- private void OnAddonChanged(IGame game, AddonTypeEnum addonType)`
	`198`	`+ private void OnAddonChanged(IGame game, AddonTypeEnum? addonType)`
`199`	`199`	`{`
`200`	`200`	`if (game.GameEnum != Game.GameEnum)`
`201`	`201`	`{`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,8 @@ ScoresProvider scoresProvider`
`38`	`38`	`_playtimeProvider = playtimeProvider;`
`39`	`39`
`40`	`40`	`_gamesProvider.GameChangedEvent += OnGameChanged;`
`41`		`- Game.DownloadableAddonsProvider.AddonDownloadedEvent += OnModDownloaded;`
	`41`	`+ Game.DownloadableAddonsProvider.AddonDownloadedEvent += OnAddonChanged;`
	`42`	`+ Game.InstalledAddonsProvider.AddonsChangedEvent += OnAddonChanged;`
`42`	`43`	`}`
`43`	`44`
`44`	`45`
`@@ -157,15 +158,12 @@ private void OnGameChanged(GameEnum parameterName)`
`157`	`158`	`}`
`158`	`159`	`}`
`159`	`160`
`160`		`- private void OnModDownloaded(IGame game, AddonTypeEnum addonType)`
	`161`	`+ private void OnAddonChanged(IGame game, AddonTypeEnum? addonType)`
`161`	`162`	`{`
`162`		`- if (game.GameEnum != Game.GameEnum \|\|`
`163`		`- addonType is not AddonTypeEnum.Mod)`
	`163`	`+ if (game.GameEnum == Game.GameEnum && (addonType is AddonTypeEnum.Mod \|\| addonType is null))`
`164`	`164`	`{`
`165`		`- return;`
	`165`	`+ OnPropertyChanged(nameof(ModsList));`
`166`	`166`	`}`
`167`		`-`
`168`		`- OnPropertyChanged(nameof(ModsList));`
`169`	`167`	`}`
`170`	`168`	`}`
`171`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -216,6 +216,11 @@ private void SetGamePathValue(string? value, [CallerMemberName] string caller =`
`216`	`216`	`{`
`217`	`217`	`var setting = _dbContext.GamePaths.Find([caller]);`
`218`	`218`
	`219`	`+ if (string.IsNullOrWhiteSpace(value))`
	`220`	`+ {`
	`221`	`+ value = null;`
	`222`	`+ }`
	`223`	`+`
`219`	`224`	`if (setting is null)`
`220`	`225`	`{`
`221`	`226`	`_dbContext.GamePaths.Add(new() { Game = caller, Path = value });`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@`
`3`	`3`
`4`	`4`	`namespace Common.Helpers`
`5`	`5`	`{`
`6`		`- public delegate void AddonChanged(IGame game, AddonTypeEnum modType);`
	`6`	`+ public delegate void AddonChanged(IGame game, AddonTypeEnum? modType);`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace Common.Interfaces`
`5`	`5`	`{`
`6`	`6`	`public interface IInstalledAddonsProvider`
`7`	`7`	`{`
`8`		`- event AddonChanged AddonDeletedEvent;`
	`8`	`+ event AddonChanged AddonsChangedEvent;`
`9`	`9`
`10`	`10`	`/// <summary>`
`11`	`11`	`/// Add addon to cache`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ public sealed class DownloadableAddonsProvider : IDownloadableAddonsProvider`
`18`	`18`	`private readonly ApiInterface _apiInterface;`
`19`	`19`
`20`	`20`	`private Dictionary<AddonTypeEnum, Dictionary<string, IDownloadableAddon>>? _cache;`
	`21`	`+ private readonly SemaphoreSlim _semaphore = new(1);`
`21`	`22`
`22`	`23`	`public event AddonChanged AddonDownloadedEvent;`
`23`	`24`
`@@ -42,15 +43,19 @@ ApiInterface apiInterface`
`42`	`43`	`/// <inheritdoc/>`
`43`	`44`	`public async Task CreateCacheAsync()`
`44`	`45`	`{`
	`46`	`+ await _semaphore.WaitAsync();`
	`47`	`+`
`45`	`48`	`if (_cache is not null)`
`46`	`49`	`{`
	`50`	`+ _semaphore.Release();`
`47`	`51`	`return;`
`48`	`52`	`}`
`49`	`53`
`50`	`54`	`var addons = await _apiInterface.GetAddonsAsync(_game.GameEnum).ConfigureAwait(false);`
`51`	`55`
`52`	`56`	`if (addons is null \|\| addons.Count == 0)`
`53`	`57`	`{`
	`58`	`+ _semaphore.Release();`
`54`	`59`	`return;`
`55`	`60`	`}`
`56`	`61`
`@@ -61,6 +66,8 @@ public async Task CreateCacheAsync()`
`61`	`66`	`_cache.TryAdd(addon.AddonType, []);`
`62`	`67`	`_cache[addon.AddonType].TryAdd(addon.Id, addon);`
`63`	`68`	`}`
	`69`	`+`
	`70`	`+ _semaphore.Release();`
`64`	`71`	`}`
`65`	`72`
`66`	`73`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,11 @@ public sealed class InstalledAddonsProvider : IInstalledAddonsProvider`
`21`	`21`	`private readonly PlaytimeProvider _playtimeProvider;`
`22`	`22`
`23`	`23`	`private readonly Dictionary<AddonTypeEnum, Dictionary<string, IAddon>> _cache;`
`24`		`- private readonly SemaphoreSlim _semaphore = new(1);`
	`24`	`+ private static readonly SemaphoreSlim _semaphore = new(1);`
`25`	`25`
`26`		`- public event AddonChanged AddonDeletedEvent;`
	`26`	`+ private bool _isCacheUpdating = false;`
	`27`	`+`
	`28`	`+ public event AddonChanged AddonsChangedEvent;`
`27`	`29`
`28`	`30`	`[Obsolete($"Don't create directly. Use {nameof(InstalledAddonsProvider)}.")]`
`29`	`31`	`public InstalledAddonsProvider(`
`@@ -42,7 +44,8 @@ PlaytimeProvider playtimeProvider`
`42`	`44`	`/// <inheritdoc/>`
`43`	`45`	`public async Task CreateCache(bool createNew)`
`44`	`46`	`{`
`45`		`- _semaphore.Wait();`
	`47`	`+ await _semaphore.WaitAsync();`
	`48`	`+ _isCacheUpdating = true;`
`46`	`49`
`47`	`50`	`if (createNew)`
`48`	`51`	`{`
`@@ -55,7 +58,7 @@ await Task.Run(() =>`
`55`	`58`	`{`
`56`	`59`	`IEnumerable<string> files;`
`57`	`60`
`58`		`- files = Directory.GetFiles(_game.CampaignsFolderPath).Where(static x => x.EndsWith(".zip", StringComparison.OrdinalIgnoreCase) \|\| x.EndsWith(".grp", StringComparison.OrdinalIgnoreCase));`
	`61`	`+ files = Directory.GetFiles(_game.CampaignsFolderPath, "*.zip");`
`59`	`62`	`var camps = GetAddonsFromFiles(AddonTypeEnum.TC, files);`
`60`	`63`	`_cache.Add(AddonTypeEnum.TC, camps);`
`61`	`64`
`@@ -66,9 +69,11 @@ await Task.Run(() =>`
`66`	`69`	`files = Directory.GetFiles(_game.ModsFolderPath, "*.zip");`
`67`	`70`	`var mods = GetAddonsFromFiles(AddonTypeEnum.Mod, files);`
`68`	`71`	`_cache.Add(AddonTypeEnum.Mod, mods);`
`69`		`- });`
	`72`	`+ }).WaitAsync(CancellationToken.None);`
`70`	`73`	`}`
`71`	`74`
	`75`	`+ _isCacheUpdating = false;`
	`76`	`+ AddonsChangedEvent?.Invoke(_game, null);`
`72`	`77`	`_semaphore.Release();`
`73`	`78`
`74`	`79`	`_cache.ThrowIfNull();`
`@@ -110,7 +115,7 @@ public void DeleteAddon(IAddon addon)`
`110`	`115`
`111`	`116`	`_cache[addon.Type].Remove(addon.Id);`
`112`	`117`
`113`		`- AddonDeletedEvent?.Invoke(_game, addon.Type);`
	`118`	`+ AddonsChangedEvent?.Invoke(_game, addon.Type);`
`114`	`119`	`}`
`115`	`120`
`116`	`121`	`/// <inheritdoc/>`
`@@ -132,6 +137,11 @@ public void DisableAddon(string addonId)`
`132`	`137`	`/// <inheritdoc/>`
`133`	`138`	`public Dictionary<string, IAddon> GetInstalledAddons(AddonTypeEnum addonType)`
`134`	`139`	`{`
	`140`	`+ if (_isCacheUpdating)`
	`141`	`+ {`
	`142`	`+ return [];`
	`143`	`+ }`
	`144`	`+`
`135`	`145`	`_cache.ThrowIfNull();`
`136`	`146`
`137`	`147`	`_cache.TryGetValue(addonType, out var result);`
`@@ -233,8 +243,6 @@ newAddon.Version is not null &&`
`233`	`243`	`Dictionary<string, string?>? incompatibles = null;`
`234`	`244`	`IStartMap? startMap = null;`
`235`	`245`
`236`		`- DukeVersionEnum? dukeVersion = null;`
`237`		`-`
`238`	`246`	`if (ArchiveFactory.IsArchive(pathToFile, out var _))`
`239`	`247`	`{`
`240`	`248`	`using var archive = ArchiveFactory.Open(pathToFile);`
`@@ -302,15 +310,12 @@ newAddon.Version is not null &&`
`302`	`310`	`{`
`303`	`311`	`if (manifest.SupportedGame.Version == DukeVersionEnum.Duke3D_13D.ToString())`
`304`	`312`	`{`
`305`		`- dukeVersion = DukeVersionEnum.Duke3D_13D;`
`306`	`313`	`}`
`307`	`314`	`else if (manifest.SupportedGame.Version == DukeVersionEnum.Duke3D_Atomic.ToString())`
`308`	`315`	`{`
`309`		`- dukeVersion = DukeVersionEnum.Duke3D_Atomic;`
`310`	`316`	`}`
`311`	`317`	`else if (manifest.SupportedGame.Version == DukeVersionEnum.Duke3D_WT.ToString())`
`312`	`318`	`{`
`313`		`- dukeVersion = DukeVersionEnum.Duke3D_WT;`
`314`	`319`	`}`
`315`	`320`	`}`
`316`	`321`	`}`