diff --git a/Advocate/Models/JSON/Manifest.cs b/Advocate/Models/JSON/Manifest.cs index 4202f4f..41bbd0c 100644 --- a/Advocate/Models/JSON/Manifest.cs +++ b/Advocate/Models/JSON/Manifest.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Advocate.Models.JSON { diff --git a/Advocate/Models/JSON/Map.cs b/Advocate/Models/JSON/Map.cs index 0b331b3..c0887fc 100644 --- a/Advocate/Models/JSON/Map.cs +++ b/Advocate/Models/JSON/Map.cs @@ -1,10 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Text.Json; +using System.Collections.Generic; using System.Text.Json.Serialization; -using System.Threading.Tasks; namespace Advocate.Models.JSON { diff --git a/Advocate/Models/JSON/Mod.cs b/Advocate/Models/JSON/Mod.cs index e61f0f6..5cd8be1 100644 --- a/Advocate/Models/JSON/Mod.cs +++ b/Advocate/Models/JSON/Mod.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Advocate.Models.JSON +namespace Advocate.Models.JSON { internal class Mod { diff --git a/Advocate/Models/JSON/RPak.cs b/Advocate/Models/JSON/RPak.cs deleted file mode 100644 index b92496b..0000000 --- a/Advocate/Models/JSON/RPak.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Advocate.Models.JSON -{ - internal class RPak - { - public Dictionary Preload { get; set; } - // there is also Postload and Aliases but we dont need them for now - } -} diff --git a/Advocate/Pages/Converter/ConverterPage.xaml.cs b/Advocate/Pages/Converter/ConverterPage.xaml.cs index 7fd1b0d..48719e6 100644 --- a/Advocate/Pages/Converter/ConverterPage.xaml.cs +++ b/Advocate/Pages/Converter/ConverterPage.xaml.cs @@ -1,21 +1,10 @@ using System; -using System.Collections.Generic; using System.ComponentModel; using System.IO; -using System.Linq; -using System.Text; using System.Text.RegularExpressions; -using System.Threading; using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; using Advocate.Logging; using HandyControl.Themes; using Microsoft.Win32; diff --git a/Advocate/Pages/Converter/DescriptionHelpWindow.xaml.cs b/Advocate/Pages/Converter/DescriptionHelpWindow.xaml.cs index 8720303..dbe06cd 100644 --- a/Advocate/Pages/Converter/DescriptionHelpWindow.xaml.cs +++ b/Advocate/Pages/Converter/DescriptionHelpWindow.xaml.cs @@ -1,17 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.ObjectModel; using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Shapes; namespace Advocate.Pages.Converter { diff --git a/Advocate/Pages/Converter/SettingsWindow.xaml.cs b/Advocate/Pages/Converter/SettingsWindow.xaml.cs index fee4a9c..8adb026 100644 --- a/Advocate/Pages/Converter/SettingsWindow.xaml.cs +++ b/Advocate/Pages/Converter/SettingsWindow.xaml.cs @@ -1,19 +1,6 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Shapes; using Advocate.Logging; -using HandyControl.Themes; using Microsoft.Win32; namespace Advocate.Pages.Converter diff --git a/Advocate/Pages/NoseArtCreator/DescriptionHelpWindow.xaml.cs b/Advocate/Pages/NoseArtCreator/DescriptionHelpWindow.xaml.cs index d4d40cb..d7c2ad4 100644 --- a/Advocate/Pages/NoseArtCreator/DescriptionHelpWindow.xaml.cs +++ b/Advocate/Pages/NoseArtCreator/DescriptionHelpWindow.xaml.cs @@ -1,17 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.ObjectModel; using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Shapes; namespace Advocate.Pages.NoseArtCreator { diff --git a/Advocate/Pages/NoseArtCreator/NoseArtCreatorPage.xaml.cs b/Advocate/Pages/NoseArtCreator/NoseArtCreatorPage.xaml.cs index 95faf90..860a109 100644 --- a/Advocate/Pages/NoseArtCreator/NoseArtCreatorPage.xaml.cs +++ b/Advocate/Pages/NoseArtCreator/NoseArtCreatorPage.xaml.cs @@ -1,5 +1,4 @@ using System; -using System.Collections; using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel; @@ -7,10 +6,8 @@ using System.IO; using System.Linq; using System.Reflection; -using System.Resources; using System.Text.Json; using System.Text.RegularExpressions; -using System.Threading; using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; diff --git a/Advocate/Pages/NoseArtCreator/SettingsWindow.xaml.cs b/Advocate/Pages/NoseArtCreator/SettingsWindow.xaml.cs index b678ece..5a053c5 100644 --- a/Advocate/Pages/NoseArtCreator/SettingsWindow.xaml.cs +++ b/Advocate/Pages/NoseArtCreator/SettingsWindow.xaml.cs @@ -1,19 +1,6 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Shapes; using Advocate.Logging; -using HandyControl.Themes; using Microsoft.Win32; namespace Advocate.Pages.NoseArtCreator diff --git a/Advocate/Scripts/Conversion/Converter.cs b/Advocate/Scripts/Conversion/Converter.cs index fa69e96..488354b 100644 --- a/Advocate/Scripts/Conversion/Converter.cs +++ b/Advocate/Scripts/Conversion/Converter.cs @@ -455,13 +455,10 @@ public bool Convert(string outputPath, string repakPath, string texconvPath, str // set the message for the new conversion step Info("Generating rpak.json..."); - // we can just preload our rpak, since it should only contain textures - RPak rpak = new() - { - Preload = new() { { $"{SkinName}.rpak", true } } - }; + // load our rpak on any map + Dictionary rpakJson = new() { { $"{SkinName}.rpak", ".*" } }; - File.WriteAllText($"{modTempFolderPath}/mods/{AuthorName}.{SkinName}/paks/rpak.json", JsonSerializer.Serialize(rpak, jsonOptions)); + File.WriteAllText($"{modTempFolderPath}/mods/{AuthorName}.{SkinName}/paks/rpak.json", JsonSerializer.Serialize(rpakJson, jsonOptions)); // move progress bar ConvertTaskComplete(); diff --git a/Advocate/Scripts/Conversion/DescriptionHandler.cs b/Advocate/Scripts/Conversion/DescriptionHandler.cs index 7efc881..f2cb2bf 100644 --- a/Advocate/Scripts/Conversion/DescriptionHandler.cs +++ b/Advocate/Scripts/Conversion/DescriptionHandler.cs @@ -1,9 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; using System.Text.RegularExpressions; -using System.Threading.Tasks; namespace Advocate.Scripts.Conversion { diff --git a/Advocate/Scripts/DDS/Header.cs b/Advocate/Scripts/DDS/Header.cs index bdf30db..15fa252 100644 --- a/Advocate/Scripts/DDS/Header.cs +++ b/Advocate/Scripts/DDS/Header.cs @@ -1,9 +1,5 @@ using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using Advocate.Logging; namespace Advocate.Scripts.DDS diff --git a/Advocate/Scripts/NoseArts/DescriptionHandler.cs b/Advocate/Scripts/NoseArts/DescriptionHandler.cs index ae73255..5fbd2d4 100644 --- a/Advocate/Scripts/NoseArts/DescriptionHandler.cs +++ b/Advocate/Scripts/NoseArts/DescriptionHandler.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Text.RegularExpressions; -using System.Threading.Tasks; +using System.Text.RegularExpressions; namespace Advocate.Scripts.NoseArts { diff --git a/Advocate/Scripts/NoseArts/NoseArtCreator.cs b/Advocate/Scripts/NoseArts/NoseArtCreator.cs index 63e6923..55db2a7 100644 --- a/Advocate/Scripts/NoseArts/NoseArtCreator.cs +++ b/Advocate/Scripts/NoseArts/NoseArtCreator.cs @@ -4,17 +4,11 @@ using System.Drawing; using System.IO; using System.IO.Compression; -using System.Linq; -using System.Text; using System.Text.Json; using System.Text.RegularExpressions; -using System.Threading.Tasks; using System.Windows; -using System.Windows.Media.Media3D; -using System.Windows.Media.TextFormatting; using Advocate.Logging; using Advocate.Models.JSON; -using static System.Windows.Forms.DataFormats; namespace Advocate.Scripts.NoseArts { @@ -376,13 +370,10 @@ public bool CreateNoseArt(string outputPath, string repakPath, string texconvPat Info("Writing rpak.json"); - // we can just preload our rpak, since it should only contain textures - RPak rpak = new() - { - Preload = new() { { $"{ModName}.rpak", true } } - }; + // load our rpak on any map + Dictionary rpakJson = new() { { $"{ModName}.rpak", ".*" } }; - File.WriteAllText($"{tempModPath}/mods/{AuthorName}.{ModName}/paks/rpak.json", JsonSerializer.Serialize(rpak, jsonOptions)); + File.WriteAllText($"{tempModPath}/mods/{AuthorName}.{ModName}/paks/rpak.json", JsonSerializer.Serialize(rpakJson, jsonOptions)); // move progress bar ConvertTaskComplete();