More cleanup and prep for R2Northstar/NorthstarLauncher#766

ASpoonPlaysGames · Aug 31, 2024 · 23238e4 · 23238e4
1 parent dcd23fd
commit 23238e4
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 127 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,16 +1,13 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Drawing;
 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
@@ -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
@@ -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<string, string> 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
@@ -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
@@ -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
@@ -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
@@ -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<string, string> 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();