Update 1.1

XyLe-GBP · Jun 13, 2022 · 0de9043 · 0de9043
1 parent 2d25d33
commit 0de9043
Show file tree

Hide file tree

Showing 24 changed files with 5,284 additions and 184 deletions.
diff --git a/MLTDABD-Rel.csproj b/MLTDABD-Rel.csproj
@@ -9,6 +9,10 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+    <ApplicationIcon>Properties\ICON_256.ico</ApplicationIcon>
+    <AssemblyVersion>1.1.2220.613</AssemblyVersion>
+    <FileVersion>1.1.2220.613</FileVersion>
+    <RepositoryType>git</RepositoryType>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,6 +21,10 @@
     <Compile Include="src\APIs\Main\Matsurihi\.MeCommon\Version.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Include="Properties\ICON_256.ico" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
     <PackageReference Include="LruCacheNet" Version="1.2.0" />

diff --git a/MLTDABD-Rel.csproj.user b/MLTDABD-Rel.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <_LastSelectedProfileId>C:\Users\kawak\source\repos\MLTDABD-Rel\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
+    <_LastSelectedProfileId>C:\Users\kawak\source\repos\MLTDABD-Rel\Properties\PublishProfiles\release.pubxml</_LastSelectedProfileId>
   </PropertyGroup>
   <ItemGroup>
     <Compile Update="src\AssetStudioGUI\AssetStudioGUIForm.cs">
@@ -13,6 +13,9 @@
     <Compile Update="src\AssetStudioGUI\ExportOptions.cs">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Update="src\Forms\FormProgress.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Update="src\Forms\UserControls\AssetTreeList.cs">
       <SubType>UserControl</SubType>
     </Compile>

diff --git a/Properties/ICON.png b/Properties/ICON.png
diff --git a/Properties/ICON_256.ico b/Properties/ICON_256.ico
diff --git a/Properties/PublishProfiles/portable.pubxml b/Properties/PublishProfiles/portable.pubxml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>bin\Release\net6.0-windows\publish\portable\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <SelfContained>false</SelfContained>
+    <PublishSingleFile>true</PublishSingleFile>
+    <PublishReadyToRun>false</PublishReadyToRun>
+  </PropertyGroup>
+</Project>
diff --git a/Properties/PublishProfiles/portable.pubxml.user b/Properties/PublishProfiles/portable.pubxml.user
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <History>True|2022-06-13T12:59:31.2151307Z;True|2022-06-13T21:56:01.9967938+09:00;True|2022-01-19T17:35:56.2858861+09:00;True|2022-01-19T17:10:42.9540211+09:00;True|2022-01-19T17:09:59.6128835+09:00;</History>
+  </PropertyGroup>
+</Project>
diff --git a/Properties/PublishProfiles/release.pubxml b/Properties/PublishProfiles/release.pubxml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>bin\Release\net6.0-windows\publish\release</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>true</PublishSingleFile>
+    <PublishReadyToRun>false</PublishReadyToRun>
+  </PropertyGroup>
+</Project>
diff --git a/Properties/PublishProfiles/release.pubxml.user b/Properties/PublishProfiles/release.pubxml.user
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <History>True|2022-06-13T12:58:42.4841042Z;True|2022-06-13T21:58:21.2512262+09:00;True|2022-06-13T21:57:31.0889724+09:00;</History>
+  </PropertyGroup>
+</Project>
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
@@ -112,11 +112,38 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="vs" xml:space="preserve">
+    <value>#version 140
+
+in vec3 vertexPosition;
+in vec3 normalDirection;
+in vec4 vertexColor;
+uniform mat4 modelMatrix;
+uniform mat4 viewMatrix;
+uniform mat4 projMatrix;
+
+out vec3 normal;
+out vec4 color;
+
+void main()
+{
+	gl_Position = projMatrix * viewMatrix * modelMatrix * vec4(vertexPosition, 1.0);
+	normal = normalDirection;
+	color = vertexColor; 
+}</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="preview" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\preview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_as" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\as.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="fs" xml:space="preserve">
     <value>#version 140
 
@@ -158,31 +185,7 @@ void main()
 	outputColor = color;
 }</value>
   </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="preview" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\preview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="vs" xml:space="preserve">
-    <value>#version 140
-
-in vec3 vertexPosition;
-in vec3 normalDirection;
-in vec4 vertexColor;
-uniform mat4 modelMatrix;
-uniform mat4 viewMatrix;
-uniform mat4 projMatrix;
-
-out vec3 normal;
-out vec4 color;
-
-void main()
-{
-	gl_Position = projMatrix * viewMatrix * modelMatrix * vec4(vertexPosition, 1.0);
-	normal = normalDirection;
-	color = vertexColor; 
-}</value>
-  </data>
-  <data name="_as" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\as.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ICON" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
diff --git a/src/AssetStudioGUI/TGASharpLib.cs b/src/AssetStudioGUI/TGASharpLib.cs
@@ -4440,11 +4440,11 @@ public static bool IsElementsEqual<T>(T[] Arr, int Offset1, int Offset2, int Cou
 
     public class TGA : ICloneable
     {
-        public TgaHeader Header = new TgaHeader();
-        public TgaImgOrColMap ImageOrColorMapArea = new TgaImgOrColMap();
-        public TgaDevArea DevArea = null;
-        public TgaExtArea ExtArea = null;
-        public TgaFooter Footer = null;
+        public TgaHeader Header = new();
+        public TgaImgOrColMap ImageOrColorMapArea = new();
+        public TgaDevArea DevArea = null!;
+        public TgaExtArea ExtArea = null!;
+        public TgaFooter Footer = null!;
 
         #region TGA Creation, Loading, Saving (all are public, have reference to private metods).
         /// <summary>

diff --git a/src/Forms/Common.cs b/src/Forms/Common.cs
@@ -349,4 +349,8 @@ public enum TreeListView
         TreeView = 1,
 
     }
+
+    public sealed class Utils
+    {
+    }
 }
diff --git a/src/Forms/FormAbout.Designer.cs b/src/Forms/FormAbout.Designer.cs
diff --git a/src/Forms/FormAsset.cs b/src/Forms/FormAsset.cs
@@ -442,7 +442,7 @@ private void BtnFilterReset_Click(object sender, EventArgs e)
         private readonly ManifestOpening _opening;
 
         [CanBeNull]
-        private readonly DownloadConfig _downloadConfig;
+        public readonly DownloadConfig _downloadConfig;
 
         [NotNull, ItemNotNull]
         private readonly HashSet<TreeListItem> _downloadPendingSet;
-Original file line number
+Diff line change
@@ Expand Up / @@ -349,4 +349,8 @@ public enum TreeListView @@
             TreeView = 1,
         }
+        public sealed class Utils
+        {
+        }
     }