fix winforms project - this is likely the last ever update for it...

Author: LeftofZen

WinGui/MainForm.cs

@@ -1,4 +1,3 @@
-using Dat;
 using NAudio.Gui;
 using NAudio.Wave;
 using OpenLoco.Common;
@@ -127,10 +126,6 @@ public MainForm()
 			const string paletteFilename = "WinGui.palette.png";
 			using (var stream = assembly.GetManifestResourceStream(paletteFilename))
 			{
-				//var paletteBitmap = (Bitmap)Image.FromStream(stream!);
-				//var palette = PaletteHelpers.PaletteFromBitmap(paletteBitmap);
-				//model = new MainFormModel(logger, SettingsFile, palette);
-
 				var paletteBitmap = SixLabors.ImageSharp.Image.Load<Rgba32>(stream!);
 				var palette = new PaletteMap(paletteBitmap);
 				model = new MainFormModel(logger, SettingsFile, palette);
@@ -283,13 +278,13 @@ static ImageList MakeImageList(MainFormModel model, ILogger? logger = null)
 
 		static void AddObjectNode(string key, string text, string objName, uint objChecksum, TreeView tv)
 		{
-			var imageIndex = S5Header.IsOriginal(objName, objChecksum) ? 1 : 0;
+			var imageIndex = S5Header.IsVanilla(objName, objChecksum) ? 1 : 0;
 			_ = tv.Nodes.Add(key, text, imageIndex, imageIndex);
 		}
 
 		static void AddObjectNode(string key, string text, string objName, uint objChecksum, TreeNode tn)
 		{
-			var imageIndex = S5Header.IsOriginal(objName, objChecksum) ? 1 : 0;
+			var imageIndex = S5Header.IsVanilla(objName, objChecksum) ? 1 : 0;
 			_ = tn.Nodes.Add(key, text, imageIndex, imageIndex);
 		}
 
@@ -305,14 +300,14 @@ void InitFileTreeView(bool vanillaOnly, string fileFilter)
 			var filteredIndicies = filteredFiles
 				.Select(f => f)
 				.OfType<ObjectIndexEntry>()
-				.Where(f => !vanillaOnly || S5Header.IsOriginal(f.ObjectName, f.Checksum));
+				.Where(f => !vanillaOnly || S5Header.IsVanilla(f.DatName, f.DatChecksum));
 
 			tvFileTree.ImageList = MakeImageList(model);
 
 			foreach (var obj in filteredIndicies)
 			{
 				var relative = Path.GetRelativePath(model.Settings.ObjDataDirectory, obj.Filename);
-				AddObjectNode(obj.Filename, relative, obj.ObjectName, obj.Checksum, tvFileTree);
+				AddObjectNode(obj.Filename, relative, obj.DatName, obj.DatChecksum, tvFileTree);
 			}
 
 			tvFileTree.Sort();
@@ -351,7 +346,7 @@ void InitObjectCategoryTree(bool vanillaOnly, string fileFilter)
 			var filteredIndicies = filteredFiles
 				.Select(f => f)
 				.OfType<ObjectIndexEntry>()
-				.Where(f => !vanillaOnly || S5Header.IsOriginal(f.ObjectName, f.Checksum));
+				.Where(f => !vanillaOnly || S5Header.IsVanilla(f.DatName, f.DatChecksum));
 
 			tvObjType.ImageList = MakeImageList(model);
 
@@ -364,7 +359,7 @@ void InitObjectCategoryTree(bool vanillaOnly, string fileFilter)
 				{
 					foreach (var obj in group)
 					{
-						AddObjectNode(obj.Filename, obj.ObjectName, obj.ObjectName, obj.Checksum, objTypeNode);
+						AddObjectNode(obj.Filename, obj.DatName, obj.DatName, obj.DatChecksum, objTypeNode);
 					}
 				}
 				else
@@ -374,7 +369,7 @@ void InitObjectCategoryTree(bool vanillaOnly, string fileFilter)
 						var vehicleTypeNode = new TreeNode(vehicleType.Key.ToString());
 						foreach (var veh in vehicleType)
 						{
-							AddObjectNode(veh.Filename, veh.ObjectName, veh.ObjectName, veh.Checksum, vehicleTypeNode);
+							AddObjectNode(veh.Filename, veh.DatName, veh.DatName, veh.DatChecksum, vehicleTypeNode);
 						}
 
 						_ = objTypeNode.Nodes.Add(vehicleTypeNode);

WinGui/MainFormModel.cs

@@ -1,5 +1,4 @@
 global using ObjectCache = System.Collections.Generic.Dictionary<string, OpenLoco.WinGui.UiLocoObject>;
-using Dat;
 using OpenLoco.Common;
 using OpenLoco.Common.Logging;
 using OpenLoco.Dat;
@@ -147,7 +146,7 @@ public void SaveSettings()
 		// this method loads every single object entirely. it takes a long time to run
 		void CreateIndex(string[] allFiles, IProgress<float>? progress)
 		{
-			ConcurrentDictionary<string, ObjectIndexEntryBase> ccHeaderIndex = new(); // key is full path/filename
+			ConcurrentDictionary<string, ObjectIndexEntry> ccHeaderIndex = new(); // key is full path/filename
 			ConcurrentDictionary<string, UiLocoObject> ccObjectCache = new(); // key is full path/filename
 
 			var count = 0;
@@ -187,8 +186,8 @@ void CreateIndex(string[] allFiles, IProgress<float>? progress)
 					}
 
 					var s5 = fileInfo.S5Header;
-					var isVanilla = s5.IsOriginal();
-					var indexObjectHeader = new ObjectIndexEntry(file, s5.Name, s5.ObjectType, isVanilla, s5.Checksum, veh);
+					var isVanilla = s5.IsVanilla();
+					var indexObjectHeader = new ObjectIndexEntry(file, s5.Name, s5.Checksum, s5.ObjectType, isVanilla, veh);
 					if (!ccHeaderIndex.TryAdd(file, indexObjectHeader))
 					{
 						logger.Warning($"Didn't add file {file} to index - already exists (how???)");
@@ -202,7 +201,7 @@ void CreateIndex(string[] allFiles, IProgress<float>? progress)
 				catch (Exception ex)
 				{
 					logger.Error($"Failed to load \"{file}\"", ex);
-					_ = ccHeaderIndex.TryAdd(file, new ObjectIndexFailedEntry(file));
+					//_ = ccHeaderIndex.TryAdd(file, new ObjectIndexEntry(file));
 				}
 				finally
 				{
@@ -212,7 +211,7 @@ void CreateIndex(string[] allFiles, IProgress<float>? progress)
 				//}
 			});
 
-			ObjectIndex = new ObjectIndex() { Objects = ccHeaderIndex.Values.OfType<ObjectIndexEntry>().ToList(), ObjectsFailed = ccHeaderIndex.Values.OfType<ObjectIndexFailedEntry>().ToList() };
+			ObjectIndex = new ObjectIndex() { Objects = ccHeaderIndex.Values.OfType<ObjectIndexEntry>().ToList() };
 			ObjectCache = ccObjectCache.OrderBy(kvp => kvp.Key).ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
 
 			sw.Stop();
@@ -260,7 +259,7 @@ public void LoadObjDirectory(string directory, IProgress<float>? progress, bool
 			{
 				ObjectIndex = ObjectIndex.LoadIndex(indexFileName) ?? ObjectIndex;
 
-				var filenames = ObjectIndex.Objects.Select(x => x.Filename).Concat(ObjectIndex.ObjectsFailed.Select(x => x.Filename));
+				var filenames = ObjectIndex.Objects.Select(x => x.Filename);
 				var a = filenames.Except(allFiles);
 				var b = allFiles.Except(filenames);
 				if (a.Any() || b.Any())

WinGui/WinGui.csproj

@@ -25,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="..\palette.png">
+    <EmbeddedResource Include="..\AvaGui\Assets\palette.png">
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </EmbeddedResource>
     <EmbeddedResource Include=".\version.txt">