Merge pull request #38 from derail-valley-modding/paint_everything

Paint Everything
derail-valley-modding · Feb 3, 2025 · 25a4a84 · 25a4a84
2 parents 98e05d4 + d772cb3
commit 25a4a84
Show file tree

Hide file tree

Showing 48 changed files with 1,965 additions and 1,207 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/SMShared/Json/ModInfoJson.cs b/SMShared/Json/ModInfoJson.cs
@@ -1,18 +1,14 @@
 using System;
 
-#if PACKAGER
-#nullable disable
-#endif
-
 namespace SMShared.Json
 {
     [Serializable]
     public class ModInfoJson
     {
-        public string Id;
-        public string DisplayName;
+        public string? Id;
+        public string? DisplayName;
         public string Version = "1.0.0";
-        public string Author;
+        public string? Author;
         public readonly string ManagerVersion = "0.27.3";
         public readonly string[] Requirements = { "SkinManagerMod" };
     }

diff --git a/SMShared/Json/ResourceConfigJson.cs b/SMShared/Json/ResourceConfigJson.cs
@@ -1,8 +1,6 @@
 using System;
 
-#if PACKAGER
 #nullable disable
-#endif
 
 namespace SMShared.Json
 {

diff --git a/SMShared/Json/SkinConfigJson.cs b/SMShared/Json/SkinConfigJson.cs
@@ -1,15 +1,11 @@
 using System;
 
-#if PACKAGER
-#nullable disable
-#endif
-
 namespace SMShared.Json
 {
     [Serializable]
     public class SkinConfigJson : ResourceConfigJson
     {
-        public string[] ResourceNames;
+        public string[]? ResourceNames;
         public BaseTheme BaseTheme = BaseTheme.DVRT;
     }
 

diff --git a/SMShared/Json/ThemeConfigJson.cs b/SMShared/Json/ThemeConfigJson.cs
@@ -2,30 +2,26 @@
 using System.Collections.Generic;
 using System.Text;
 
-#if PACKAGER
-#nullable disable
-#endif
-
 namespace SMShared.Json
 {
     [Serializable]
     public class ThemeConfigJson
     {
-        public string Version = "1.0.0";
-        public ThemeConfigItem[] Themes;
+        public string? Version = "1.0.0";
+        public ThemeConfigItem[]? Themes;
     }
 
     [Serializable]
     public class ThemeConfigItem
     {
-        public string Name;
+        public string? Name;
         public bool HideFromStores;
         public bool PreventRandomSpawning;
         public float? CanPrice;
 
-        public string LabelTextureFile;
-        public string LabelBaseColor;
-        public string LabelAccentColorA;
-        public string LabelAccentColorB;
+        public string? LabelTextureFile;
+        public string? LabelBaseColor;
+        public string? LabelAccentColorA;
+        public string? LabelAccentColorB;
     }
 }
diff --git a/SMShared/Remaps.cs b/SMShared/Remaps.cs
@@ -1,10 +1,4 @@
-#if PACKAGER
-    #nullable disable
-#else
-    using DV.ThingTypes;
-#endif
-
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -15,7 +9,7 @@ public static class Remaps
     {
         private static readonly Dictionary<string, string> _newToOldCarIdMap;
 
-        public static bool TryGetOldTrainCarId(string newId, out string oldId)
+        public static bool TryGetOldTrainCarId(string newId, out string? oldId)
         {
             return _newToOldCarIdMap.TryGetValue(newId, out oldId);
         }
@@ -67,7 +61,7 @@ public static bool TryGetOldTrainCarId(string newId, out string oldId)
             { "CarNuclearFlask",            "NuclearFlask" },
         };
 
-        public static bool TryGetUpdatedCarId(string oldId, out string newId)
+        public static bool TryGetUpdatedCarId(string oldId, out string? newId)
         {
             return _oldToNewCarIdMap.TryGetValue(oldId, out newId);
         }
@@ -100,7 +94,7 @@ public IEnumerator<KeyValuePair<string, string>> GetEnumerator()
                 return ((IEnumerable<KeyValuePair<string, string>>)_map).GetEnumerator();
             }
 
-            public bool TryGetUpdatedName(string oldName, out string newName)
+            public bool TryGetUpdatedName(string oldName, out string? newName)
             {
                 return _map.TryGetValue(oldName, out newName);
             }
@@ -255,9 +249,9 @@ static Remaps()
             });
         }
 
-        public static bool TryGetUpdatedTextureName(string liveryId, string oldName, out string newName)
+        public static bool TryGetUpdatedTextureName(string liveryId, string oldName, out string? newName)
         {
-            if (_legacyTextureNameMap.TryGetValue(liveryId, out TextureMapping textureMapping))
+            if (_legacyTextureNameMap.TryGetValue(liveryId, out TextureMapping? textureMapping))
             {
                 return textureMapping.TryGetUpdatedName(oldName, out newName);
             }
@@ -266,8 +260,4 @@ public static bool TryGetUpdatedTextureName(string liveryId, string oldName, out
             return false;
         }
     }
-}
-
-#if PACKAGER
-    #nullable restore
-#endif
+}
diff --git a/SkinConfigurator/FolderPackager.cs b/SkinConfigurator/FolderPackager.cs
@@ -1,13 +1,8 @@
 using SkinConfigurator.ViewModels;
 using SMShared;
 using SMShared.Json;
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
 using System.Text.Json;
-using System.Threading.Tasks;
 
 namespace SkinConfigurator
 {
@@ -75,7 +70,7 @@ protected override void WriteThemeConfig()
             for (int i = 0; i < _model.ThemeConfigs.Count; i++)
             {
                 var config = _model.ThemeConfigs[i];
-                if (config.HideFromStores)
+                if (config.HasValidImage)
                 {
                     string destPath = config.PackagedLabelTexturePath;
                     File.Copy(config.TempPath, destPath, true);

diff --git a/SkinConfigurator/ResourceSelector.xaml.cs b/SkinConfigurator/ResourceSelector.xaml.cs
@@ -91,7 +91,7 @@ public void RefreshAvailableItems()
             if ((SkinPack is not null) && (Skin is not null))
             {
                 available = SkinPack.PackComponents
-                    .Where(c => (c.Type == PackComponentType.Resource) && !string.IsNullOrWhiteSpace(c.Name) && (c.CarId == Skin.CarId))
+                    .Where(c => (c.Type == PackComponentType.Resource) && !string.IsNullOrWhiteSpace(c.Name))
                     .OrderBy(c => c.Name)
                     .ToList();
 

diff --git a/SkinConfigurator/ViewModels/PackComponentModel.cs b/SkinConfigurator/ViewModels/PackComponentModel.cs
@@ -33,7 +33,7 @@ public ResourceConfigJson JsonModel()
                 {
                     Name = Name,
                     CarId = CarId,
-                    ResourceNames = Resources?.Select(r => r.Name).ToArray(),
+                    ResourceNames = Resources?.Select(r => r.Name!).ToArray(),
                     BaseTheme = BaseTheme,
                 };
             }

diff --git a/SkinConfigurator/ViewModels/SkinFileModel.cs b/SkinConfigurator/ViewModels/SkinFileModel.cs
@@ -26,7 +26,7 @@ public string FileName
             set 
             {
                 SetValue(FileNameProperty, value);
-                CanUpgradeFileName = Remaps.TryGetUpdatedTextureName(Parent.CarId, Path.GetFileNameWithoutExtension(value), out _);
+                CanUpgradeFileName = Remaps.TryGetUpdatedTextureName(Parent.CarId!, Path.GetFileNameWithoutExtension(value), out _);
                 FileNameChanged?.Invoke();
             }
         }
@@ -61,7 +61,7 @@ public void UpgradeFileName()
         {
             string name = Path.GetFileNameWithoutExtension(FileName);
 
-            if (Remaps.TryGetUpdatedTextureName(Parent.CarId, name, out string newName))
+            if (Remaps.TryGetUpdatedTextureName(Parent.CarId!, name, out string? newName))
             {
                 FileName = $"{newName}{Extension}";
             }

diff --git a/SkinConfigurator/ViewModels/SkinModInfoModel.cs b/SkinConfigurator/ViewModels/SkinModInfoModel.cs
@@ -20,7 +20,7 @@ public ModInfoJson JsonModel()
             {
                 Id = Id,
                 DisplayName = DisplayName,
-                Version = Version,
+                Version = Version!,
                 Author = string.IsNullOrWhiteSpace(Author) ? null : Author,
             };
         }

diff --git a/SkinConfigurator/ViewModels/ThemeConfigModel.cs b/SkinConfigurator/ViewModels/ThemeConfigModel.cs
@@ -158,6 +158,10 @@ public ThemeConfigModel(SkinPackModel parent, ThemeConfigItem json, string dirPa
         {
             ParentPack = parent;
             ThemeName = json.Name;
+            HideFromStores = json.HideFromStores;
+            PreventRandomSpawning = json.PreventRandomSpawning;
+            CanPrice = json.CanPrice;
+
             if (!string.IsNullOrEmpty(json.LabelTextureFile))
             {
                 string texturePath = Path.Combine(dirPath, json.LabelTextureFile);
@@ -169,7 +173,7 @@ public ThemeConfigModel(SkinPackModel parent, ThemeConfigItem json, string dirPa
             LabelAccentColorB = TryParseColor(json.LabelAccentColorB);
         }
 
-        private static Color TryParseColor(string value)
+        private static Color TryParseColor(string? value)
         {
             if (!string.IsNullOrEmpty(value))
             {

diff --git a/SkinManagerMod.sln b/SkinManagerMod.sln
@@ -32,7 +32,7 @@ Global
 	EndGlobalSection
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		SMShared\SMShared.projitems*{3c5dfee2-5da9-4674-96d8-c1503efca3c0}*SharedItemsImports = 5
-		SMShared\SMShared.projitems*{bbdceb20-83d5-4fc8-88f9-0e08df1b1dde}*SharedItemsImports = 4
+		SMShared\SMShared.projitems*{bbdceb20-83d5-4fc8-88f9-0e08df1b1dde}*SharedItemsImports = 5
 		SMShared\SMShared.projitems*{f951746d-cb16-45ee-80a7-01e07ac461be}*SharedItemsImports = 13
 	EndGlobalSection
 EndGlobal
diff --git a/SkinManagerMod/.gitignore b/SkinManagerMod/.gitignore