Cleanup dll mess

Switch_FileFormatsMain/FileFormats/Archives/SARC.cs

@@ -53,7 +53,7 @@ namespace FirstPlugin
             sarcData.endianness = GetByteOrder(stream);
             SarcHash = Utils.GenerateUniqueHashID();
 
-            FillTreeNodes(this, SzsFiles.Files, SarcHash);
+            FillTreeNodes(this, SzsFiles.Files, sarcData.HashOnly);
 
             Text = FileName;
 
@@ -427,7 +427,7 @@ namespace FirstPlugin
                 }
             }
         }
-        void FillTreeNodes(TreeNode root, Dictionary<string, byte[]> files, string SarcHash)
+        void FillTreeNodes(TreeNode root, Dictionary<string, byte[]> files, bool HashOnly)
         {
             var rootText = root.Text;
             var rootTextLength = rootText.Length;
@@ -436,6 +436,9 @@ namespace FirstPlugin
             {
                 string nodeString = node.Key;
 
+                if (HashOnly)
+                    nodeString = SARCExt.SARC.TryGetNameFromHashTable(nodeString);
+
                 var roots = nodeString.Split(new char[] { '/' },
                     StringSplitOptions.RemoveEmptyEntries);
 
@@ -459,7 +462,7 @@ namespace FirstPlugin
                         var folder = new FolderEntry(parentName, 0, 0);
                         if (rootIndex == roots.Length - 1)
                         {
-                            var file = SetupFileEntry(node.Value, parentName, node.Key, SarcHash);
+                            var file = SetupFileEntry(node.Value, parentName, node.Key);
                             file.Name = nodeName;
                             parentNode.Nodes.Add(file);
                             parentNode = file;
@@ -502,7 +505,7 @@ namespace FirstPlugin
             return finalList;
         }
 
-        public SarcEntry SetupFileEntry(byte[] data, string name, string fullName, string SarchHash)
+        public SarcEntry SetupFileEntry(byte[] data, string name, string fullName)
         {
             SarcEntry sarcEntry = new SarcEntry();
             sarcEntry.FullName = fullName;
@@ -510,7 +513,6 @@ namespace FirstPlugin
             sarcEntry.Text = name;
             sarcEntry.sarc = this;
             sarcEntry.Data = data;
-            sarcEntry.sarcHash = SarcHash;
 
             Console.WriteLine(name);
 

Switch_Toolbox_Library/Switch_Toolbox.Library.dll.config

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <loadFromRemoteSources enabled="true" />
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="OpenTK" publicKeyToken="bad199fe84eb3df4" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="LZ4pn" publicKeyToken="62e1b5ec1eec9bdd" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.10.93" newVersion="1.0.10.93" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="K4os.Hash.xxHash" publicKeyToken="32cd54395057cec3" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.5.0" newVersion="1.0.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup></configuration>

Switch_Toolbox_Library/Switch_Toolbox_Library.csproj

@@ -38,6 +38,7 @@
   <ItemGroup>
     <Reference Include="AssimpNet, Version=4.1.0.0, Culture=neutral, PublicKeyToken=0d51b391f59f42a6, processorArchitecture=MSIL">
       <HintPath>..\packages\AssimpNet.4.1.0\lib\net40\AssimpNet.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Be.Windows.Forms.HexBox">
       <HintPath>..\Toolbox\Lib\Be.Windows.Forms.HexBox.dll</HintPath>
@@ -78,6 +79,7 @@
     </Reference>
     <Reference Include="LZ4.Frame">
       <HintPath>..\Toolbox\Lib\LZ4.Frame.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="NAudio, Version=1.8.4.0, Culture=neutral, processorArchitecture=MSIL">
@@ -97,6 +99,7 @@
     <Reference Include="OpenGl_EditorFramework, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Toolbox\OpenGl_EditorFramework.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="OpenTK">
       <HintPath>..\Toolbox\Lib\OpenTK.dll</HintPath>
@@ -145,7 +148,7 @@
     <Reference Include="System.Activities" />
     <Reference Include="System.Buffers">
       <HintPath>..\Switch_FileFormatsMain\System.Buffers.dll</HintPath>
-      <Private>True</Private>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="System.Design" />
@@ -153,11 +156,12 @@
     <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Memory">
       <HintPath>..\Switch_FileFormatsMain\System.Memory.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Runtime.CompilerServices.Unsafe">
       <HintPath>..\Switch_FileFormatsMain\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-      <Private>True</Private>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">

Toolbox/Toolbox.csproj

@@ -205,6 +205,7 @@
     <ProjectReference Include="..\Switch_Toolbox_Library\Switch_Toolbox_Library.csproj">
       <Project>{96820047-2a39-4e5a-bfa4-e84fff5c66cf}</Project>
       <Name>Switch_Toolbox_Library</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Updater\Updater.csproj">
       <Project>{d82a2c08-2a65-43af-bda6-a36cc27aa003}</Project>