[Major] removes reference to UTMTLib, adds error more handling

Author: remyCases

ModShardPackerReference.csproj

@@ -26,12 +26,6 @@
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0"/>
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="UndertaleModLib">
-      <HintPath>lib\UndertaleModLib.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <PropertyGroup>
     <RepositoryUrl>https://github.com/ModShardTeam/ModShardPackerReference</RepositoryUrl>
   </PropertyGroup>

ModShardPackerReference.sln

@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.002.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModShardPackerReference", "ModShardPackerReference.csproj", "{F7C22641-71DE-406D-AF57-C4432CD07417}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F7C22641-71DE-406D-AF57-C4432CD07417}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F7C22641-71DE-406D-AF57-C4432CD07417}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F7C22641-71DE-406D-AF57-C4432CD07417}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F7C22641-71DE-406D-AF57-C4432CD07417}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {EE385F3E-12A2-4C02-8D0C-AD9AF8D732D8}
+	EndGlobalSection
+EndGlobal

Packer.cs

@@ -13,7 +13,18 @@
 namespace ModShardPackerReference;
 public static class FilePacker
 {
-    public static bool Pack(string? namePacked, string folderToPack, string outputfolder, string dllfolder, string frontVersion, Type ModShardLauncherModType)
+    /// <summary>
+    /// Pack function
+    /// </summary>
+    /// <param name="namePacked"></param>
+    /// <param name="folderToPack"></param>
+    /// <param name="outputfolder"></param>
+    /// <param name="dllfolder"></param>
+    /// <param name="frontVersion"></param>
+    /// <param name="neededType"></param>
+    /// <returns></returns>
+    /// <exception cref="DirectoryNotFoundException"></exception>
+    public static bool Pack(string? namePacked, string folderToPack, string outputfolder, string dllfolder, string frontVersion, Type[] neededType)
     {
         Log.Information("Starting packing {0}", folderToPack);
 
@@ -108,7 +119,18 @@ public static bool Pack(string? namePacked, string folderToPack, string outputfo
         Log.Information("Writting assemblies...");
 
         Log.Information("Starting compilation...");
-        bool successful = CompileMod(namePacked, folderToPack, dllfolder, ModShardLauncherModType, out byte[] code, out _);
+
+        bool successful;
+        byte[] code;
+        try
+        {
+            successful = CompileMod(namePacked, folderToPack, dllfolder, neededType, out code, out _);
+        }
+        catch
+        {
+            throw;
+        }
+
         if (!successful)
         {
             fs.Close();
@@ -173,7 +195,7 @@ public static List<MetadataReference> GetSystemMetadataReferences()
         IEnumerable<string> filteredPath = trustedList.Where(p => required.Exists(r => p.Contains(r)));
         return filteredPath.Select(x => MetadataReference.CreateFromFile(x) as MetadataReference).ToList();
     }
-    public static Diagnostic[] RoslynCompile(string name, IEnumerable<string> files, IEnumerable<string> preprocessorSymbols, string dllfolder, Type ModShardLauncherModType, out byte[] code, out byte[] pdb)
+    public static Diagnostic[] RoslynCompile(string name, IEnumerable<string> files, IEnumerable<string> preprocessorSymbols, string dllfolder, Type[] neededType, out byte[] code, out byte[] pdb)
     {
         NameSyntax[] qualifiedNames = {
             SyntaxFactory.ParseName("System"),
@@ -200,14 +222,16 @@ public static Diagnostic[] RoslynCompile(string name, IEnumerable<string> files,
         IEnumerable<MetadataReference> defaultReferences = Directory.GetFiles(dllfolder, "*.dll")
             .Select(x => MetadataReference.CreateFromFile(x));
 
-        // add more references
-        Type[] neededType = { 
-            typeof(UndertaleModLib.Models.UndertaleCode),
-            ModShardLauncherModType
-        };
-        defaultReferences = defaultReferences
-            .Concat(neededType.Select(x => MetadataReference.CreateFromFile(x.Assembly.Location)))
-            .Concat(GetSystemMetadataReferences());
+        try
+        {
+            defaultReferences = defaultReferences
+                .Concat(neededType.Select(x => MetadataReference.CreateFromFile(x.Assembly.Location)))
+                .Concat(GetSystemMetadataReferences());
+        }
+        catch
+        {
+            throw;
+        }
 
         IEnumerable<SyntaxTree> src = files.Select(f => SyntaxFactory.ParseSyntaxTree(File.ReadAllText(f), parseOptions, f, Encoding.UTF8));
         // update tree before compilation to add needed using
@@ -262,14 +286,23 @@ public static Diagnostic[] RoslynCompile(string name, IEnumerable<string> files,
 
         return results.Diagnostics.ToArray();
     }
-    public static bool CompileMod(string name, string path, string dllfolder, Type ModShardLauncherModType, out byte[] code, out byte[] pdb)
+    public static bool CompileMod(string name, string path, string dllfolder, Type[] neededType, out byte[] code, out byte[] pdb)
     {
         IEnumerable<string> files = Directory
             .GetFiles(path, "*.cs", SearchOption.AllDirectories)
             .Where(file => !IgnoreCompletely(path, file));
 
         Log.Information("Compilation: Gathering files...");
-        Diagnostic[] result = RoslynCompile(name, files, new[] { "FNA" }, dllfolder, ModShardLauncherModType, out code, out pdb);
+
+        Diagnostic[] result = Array.Empty<Diagnostic>();
+        try
+        {
+            result = RoslynCompile(name, files, new[] { "FNA" }, dllfolder, neededType, out code, out pdb);
+        }
+        catch
+        {
+            throw;
+        }
 
         Log.Information("Compilation: Gathering results...");