Merge pull request #144 from nooperation/develop

develop to master
nooperation · Apr 10, 2019 · 096d29d · 096d29d
2 parents 9bb5fa5 + ff7c4c8
commit 096d29d
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 28 deletions.
diff --git a/AtlasView/AtlasView.csproj b/AtlasView/AtlasView.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\LibSanBag.1.7.1\build\LibSanBag.props" Condition="Exists('..\packages\LibSanBag.1.7.1\build\LibSanBag.props')" />
+  <Import Project="..\packages\LibSanBag.1.7.4\build\LibSanBag.props" Condition="Exists('..\packages\LibSanBag.1.7.4\build\LibSanBag.props')" />
   <Import Project="..\packages\SanTools.LibUserPreferences.1.0.6\build\SanTools.LibUserPreferences.props" Condition="Exists('..\packages\SanTools.LibUserPreferences.1.0.6\build\SanTools.LibUserPreferences.props')" />
   <Import Project="..\packages\SanTools.LibFSB.1.0.2\build\SanTools.LibFSB.props" Condition="Exists('..\packages\SanTools.LibFSB.1.0.2\build\SanTools.LibFSB.props')" />
   <Import Project="..\packages\SanTools.LibCRN.1.0.8\build\SanTools.LibCRN.props" Condition="Exists('..\packages\SanTools.LibCRN.1.0.8\build\SanTools.LibCRN.props')" />
@@ -42,8 +42,8 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="LibSanBag, Version=1.7.1.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\LibSanBag.1.7.1\lib\net472\LibSanBag.dll</HintPath>
+    <Reference Include="LibSanBag, Version=1.7.4.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\LibSanBag.1.7.4\lib\net472\LibSanBag.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -146,6 +146,6 @@
     <Error Condition="!Exists('..\packages\SanTools.LibCRN.1.0.8\build\SanTools.LibCRN.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SanTools.LibCRN.1.0.8\build\SanTools.LibCRN.props'))" />
     <Error Condition="!Exists('..\packages\SanTools.LibFSB.1.0.2\build\SanTools.LibFSB.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SanTools.LibFSB.1.0.2\build\SanTools.LibFSB.props'))" />
     <Error Condition="!Exists('..\packages\SanTools.LibUserPreferences.1.0.6\build\SanTools.LibUserPreferences.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SanTools.LibUserPreferences.1.0.6\build\SanTools.LibUserPreferences.props'))" />
-    <Error Condition="!Exists('..\packages\LibSanBag.1.7.1\build\LibSanBag.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibSanBag.1.7.1\build\LibSanBag.props'))" />
+    <Error Condition="!Exists('..\packages\LibSanBag.1.7.4\build\LibSanBag.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibSanBag.1.7.4\build\LibSanBag.props'))" />
   </Target>
 </Project>
diff --git a/AtlasView/packages.config b/AtlasView/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="LibSanBag" version="1.7.1" targetFramework="net472" />
+  <package id="LibSanBag" version="1.7.4" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net472" />
   <package id="SanTools.LibCRN" version="1.0.8" targetFramework="net472" />
   <package id="SanTools.LibFSB" version="1.0.2" targetFramework="net472" />

diff --git a/CommonUI/CommonUI.csproj b/CommonUI/CommonUI.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\LibSanBag.1.7.1\build\LibSanBag.props" Condition="Exists('..\packages\LibSanBag.1.7.1\build\LibSanBag.props')" />
+  <Import Project="..\packages\LibSanBag.1.7.4\build\LibSanBag.props" Condition="Exists('..\packages\LibSanBag.1.7.4\build\LibSanBag.props')" />
   <Import Project="..\packages\SanTools.LibUserPreferences.1.0.6\build\SanTools.LibUserPreferences.props" Condition="Exists('..\packages\SanTools.LibUserPreferences.1.0.6\build\SanTools.LibUserPreferences.props')" />
   <Import Project="..\packages\SanTools.LibFSB.1.0.2\build\SanTools.LibFSB.props" Condition="Exists('..\packages\SanTools.LibFSB.1.0.2\build\SanTools.LibFSB.props')" />
   <Import Project="..\packages\SanTools.LibCRN.1.0.8\build\SanTools.LibCRN.props" Condition="Exists('..\packages\SanTools.LibCRN.1.0.8\build\SanTools.LibCRN.props')" />
@@ -50,8 +50,8 @@
     <Reference Include="ICSharpCode.Decompiler, Version=4.0.0.4521, Culture=neutral, PublicKeyToken=d4bfe873e7598c49, processorArchitecture=MSIL">
       <HintPath>..\packages\ICSharpCode.Decompiler.4.0.0.4521\lib\net46\ICSharpCode.Decompiler.dll</HintPath>
     </Reference>
-    <Reference Include="LibSanBag, Version=1.7.1.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\LibSanBag.1.7.1\lib\net472\LibSanBag.dll</HintPath>
+    <Reference Include="LibSanBag, Version=1.7.4.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\LibSanBag.1.7.4\lib\net472\LibSanBag.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -254,6 +254,6 @@
     <Error Condition="!Exists('..\packages\SanTools.LibCRN.1.0.8\build\SanTools.LibCRN.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SanTools.LibCRN.1.0.8\build\SanTools.LibCRN.props'))" />
     <Error Condition="!Exists('..\packages\SanTools.LibFSB.1.0.2\build\SanTools.LibFSB.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SanTools.LibFSB.1.0.2\build\SanTools.LibFSB.props'))" />
     <Error Condition="!Exists('..\packages\SanTools.LibUserPreferences.1.0.6\build\SanTools.LibUserPreferences.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SanTools.LibUserPreferences.1.0.6\build\SanTools.LibUserPreferences.props'))" />
-    <Error Condition="!Exists('..\packages\LibSanBag.1.7.1\build\LibSanBag.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibSanBag.1.7.1\build\LibSanBag.props'))" />
+    <Error Condition="!Exists('..\packages\LibSanBag.1.7.4\build\LibSanBag.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibSanBag.1.7.4\build\LibSanBag.props'))" />
   </Target>
 </Project>
diff --git a/CommonUI/ViewModels/ResourceViewModels/ScriptMetaDataResourceviewModel.cs b/CommonUI/ViewModels/ResourceViewModels/ScriptMetaDataResourceviewModel.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -224,24 +225,31 @@ public async void Disassemble()
 
                 var decompiler = new CSharpDecompiler(peFile, resolver, settings);
 
-                RawTextResourceViewModel viewModel;
-
+                string source;
                 if(CurrentScript.ClassName != null)
                 {
-                    viewModel = new RawTextResourceViewModel
-                    {
-                        CurrentText = decompiler.DecompileTypeAsString(
-                            new FullTypeName(CurrentScript.ClassName)
-                        )
-                    };
+                    source = decompiler.DecompileTypeAsString(
+                        new FullTypeName(CurrentScript.ClassName)
+                    );
                 }
                 else
                 {
-                    viewModel = new RawTextResourceViewModel
-                    {
-                        CurrentText = decompiler.DecompileWholeModuleAsString()
-                    };
+                    source = decompiler.DecompileWholeModuleAsString();
                 }
+
+                source = Regex.Replace(
+                    source,
+                    "long [a-zA-Z0-9]+ = Sansar.Microthreading.Microthread.GetCurrentThreadTicks\\(\\);\\s*",
+                    "");
+                source = Regex.Replace(
+                    source,
+                    "[a-zA-Z0-9]+ = Sansar.Microthreading.Microthread.YieldIfQuantaExceeded\\([a-zA-Z0-9]+\\);\\s*",
+                    "");
+
+                var viewModel = new RawTextResourceViewModel
+                {
+                    CurrentText = source
+                };
 
                 CurrentResourceView = new RawTextResourceView
                 {

diff --git a/CommonUI/packages.config b/CommonUI/packages.config
@@ -4,7 +4,7 @@
   <package id="HelixToolkit.Wpf" version="2.6.0" targetFramework="net472" />
   <package id="Humanizer.Core" version="2.2.0" targetFramework="net472" />
   <package id="ICSharpCode.Decompiler" version="4.0.0.4521" targetFramework="net472" />
-  <package id="LibSanBag" version="1.7.1" targetFramework="net472" />
+  <package id="LibSanBag" version="1.7.4" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net472" />
   <package id="SanTools.LibCRN" version="1.0.8" targetFramework="net472" />
   <package id="SanTools.LibFSB" version="1.0.2" targetFramework="net472" />

diff --git a/README.md b/README.md
@@ -6,4 +6,21 @@ Project Sansar Bag Utilities
 
 ## Requirements
 This software does not include all required dependencies. The following list are additional dependencies that need to be acquired and added to the Sanbag directory:
-* `oo2core_7_win64.dll` Can be found in the [warframe](https://www.warframe.com/download) installation directory *\Warframe\Tools\Oodle\x64\final\oo2core_7_win64.dll*
+* `oo2core_7_win64.dll` Can be found in the [warframe](https://www.warframe.com/download) installation directory *\Warframe\Tools\Oodle\x64\final\oo2core_7_win64.dll. This file can also be downloaded direclty from the [Warframe content location here](http://content.warframe.com/Tools/Oodle/x64/final/oo2core_7_win64.dll.B486C6F46A3D802966D04911A619B2ED.lzma), but this will require you to unzip it and rename it to oo2core_7_win64.dll) *
+
+## Dependencies
+* [LibSanBag](https://github.com/nooperation/LibSanBag)
+* [SanTools.LibCRN](https://github.com/nooperation/LibCRN)
+* [SanTools.LibDDS](https://github.com/nooperation/LibDDS)
+* [SanTools.LibFSB](https://github.com/nooperation/LibFSB)
+  * [Fmod](https://www.fmod.com/download)
+* [SanTools.LibUserPreferences](https://github.com/nooperation/UserPreferencesExplorer)
+* [HelixToolkit](https://www.nuget.org/packages/HelixToolkit/)
+* [HelixToolkit.Wpf](https://www.nuget.org/packages/HelixToolkit.Wpf/)
+* [Humanizer.Core](https://www.nuget.org/packages/Humanizer.Core/)
+* [ICSharpCode.Decompiler](https://www.nuget.org/packages/ICSharpCode.Decompiler/)
+* [Newtonsoft.Json](https://www.nuget.org/packages/Newtonsoft.Json/)
+* [System.Collections.Immutable](https://www.nuget.org/packages/System.Collections.Immutable/)
+* [System.Reflection.Metadata](https://www.nuget.org/packages/System.Reflection.Metadata/)
+* [System.ValueTuple](https://www.nuget.org/packages/System.ValueTuple/)
+* [WPFHexaEditor](https://www.nuget.org/packages/WPFHexaEditor/)
diff --git a/SanBag/SanBag.csproj b/SanBag/SanBag.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\LibSanBag.1.7.1\build\LibSanBag.props" Condition="Exists('..\packages\LibSanBag.1.7.1\build\LibSanBag.props')" />
+  <Import Project="..\packages\LibSanBag.1.7.4\build\LibSanBag.props" Condition="Exists('..\packages\LibSanBag.1.7.4\build\LibSanBag.props')" />
   <Import Project="..\packages\SanTools.LibUserPreferences.1.0.6\build\SanTools.LibUserPreferences.props" Condition="Exists('..\packages\SanTools.LibUserPreferences.1.0.6\build\SanTools.LibUserPreferences.props')" />
   <Import Project="..\packages\SanTools.LibFSB.1.0.2\build\SanTools.LibFSB.props" Condition="Exists('..\packages\SanTools.LibFSB.1.0.2\build\SanTools.LibFSB.props')" />
   <Import Project="..\packages\SanTools.LibCRN.1.0.8\build\SanTools.LibCRN.props" Condition="Exists('..\packages\SanTools.LibCRN.1.0.8\build\SanTools.LibCRN.props')" />
@@ -42,8 +42,8 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="LibSanBag, Version=1.7.1.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\LibSanBag.1.7.1\lib\net472\LibSanBag.dll</HintPath>
+    <Reference Include="LibSanBag, Version=1.7.4.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\LibSanBag.1.7.4\lib\net472\LibSanBag.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -159,6 +159,6 @@
     <Error Condition="!Exists('..\packages\SanTools.LibCRN.1.0.8\build\SanTools.LibCRN.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SanTools.LibCRN.1.0.8\build\SanTools.LibCRN.props'))" />
     <Error Condition="!Exists('..\packages\SanTools.LibFSB.1.0.2\build\SanTools.LibFSB.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SanTools.LibFSB.1.0.2\build\SanTools.LibFSB.props'))" />
     <Error Condition="!Exists('..\packages\SanTools.LibUserPreferences.1.0.6\build\SanTools.LibUserPreferences.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SanTools.LibUserPreferences.1.0.6\build\SanTools.LibUserPreferences.props'))" />
-    <Error Condition="!Exists('..\packages\LibSanBag.1.7.1\build\LibSanBag.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibSanBag.1.7.1\build\LibSanBag.props'))" />
+    <Error Condition="!Exists('..\packages\LibSanBag.1.7.4\build\LibSanBag.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibSanBag.1.7.4\build\LibSanBag.props'))" />
   </Target>
 </Project>
diff --git a/SanBag/packages.config b/SanBag/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="LibSanBag" version="1.7.1" targetFramework="net472" />
+  <package id="LibSanBag" version="1.7.4" targetFramework="net472" />
   <package id="SanTools.LibCRN" version="1.0.8" targetFramework="net472" />
   <package id="SanTools.LibFSB" version="1.0.2" targetFramework="net472" />
   <package id="SanTools.LibUserPreferences" version="1.0.6" targetFramework="net472" />