From 0a381653592e8c7723e4a85b8a9629f0793003b1 Mon Sep 17 00:00:00 2001
From: "Chris Weermann (TGE)" <smartychrisje@hotmail.com>
Date: Thu, 18 Jun 2020 14:42:27 +0200
Subject: [PATCH] TMX: save UserId, allow editing in UI AMD: fix 'Cannot open a
 closed file'

---
 .../System.ValueTuple.4.4.0/.signature.p7s    | Bin 0 -> 9482 bytes
 .../Nuget/morelinq.2.10.0/.signature.p7s      | Bin 0 -> 9463 bytes
 Source/Amicitia/Properties/AssemblyInfo.cs    |   4 +--
 Source/Amicitia/ResourceWrapperFactory.cs     |   3 +++
 .../ResourceWrappers/PAKFileSystemWrapper.cs  |   3 +--
 .../ResourceWrappers/ResourceWrapper.cs       |  11 +++++++++
 .../ResourceWrappers/TMXFileWrapper.cs        |  23 ++++++++++++++++++
 .../FileSystems/AMD/AMDFile.cs                |   3 ++-
 .../FileSystems/CVM/CVMExecutableListing.cs   |   4 +--
 .../Graphics/RenderWare/RMDNodeLink.cs        |   4 +--
 .../AmicitiaLibrary/Graphics/TMX/TMXFile.cs   |  11 ++++++---
 11 files changed, 53 insertions(+), 13 deletions(-)
 create mode 100644 Dependencies/Nuget/System.ValueTuple.4.4.0/.signature.p7s
 create mode 100644 Dependencies/Nuget/morelinq.2.10.0/.signature.p7s

diff --git a/Dependencies/Nuget/System.ValueTuple.4.4.0/.signature.p7s b/Dependencies/Nuget/System.ValueTuple.4.4.0/.signature.p7s
new file mode 100644
index 0000000000000000000000000000000000000000..1b0092581327584e794d6373d53f6660d7798bdc
GIT binary patch
literal 9482
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
L=rBhB&&&S-x|1>f

literal 0
HcmV?d00001

diff --git a/Dependencies/Nuget/morelinq.2.10.0/.signature.p7s b/Dependencies/Nuget/morelinq.2.10.0/.signature.p7s
new file mode 100644
index 0000000000000000000000000000000000000000..6eef2459c29ccf913c3ea4c9c3d233c891db80ce
GIT binary patch
literal 9463
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
MTh1S#BYqM3KP**G6aWAK

literal 0
HcmV?d00001

diff --git a/Source/Amicitia/Properties/AssemblyInfo.cs b/Source/Amicitia/Properties/AssemblyInfo.cs
index 7a5aaef..ddfdce2 100644
--- a/Source/Amicitia/Properties/AssemblyInfo.cs
+++ b/Source/Amicitia/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.9.0.0")]
-[assembly: AssemblyFileVersion("1.9.0.0")]
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]
diff --git a/Source/Amicitia/ResourceWrapperFactory.cs b/Source/Amicitia/ResourceWrapperFactory.cs
index 03f834b..4cd8394 100644
--- a/Source/Amicitia/ResourceWrapperFactory.cs
+++ b/Source/Amicitia/ResourceWrapperFactory.cs
@@ -28,6 +28,9 @@ public static IResourceWrapper GetResourceWrapper(string text, Stream stream, in
         {
             if ( stream is FileStream fileStream )
             {
+                if ( filePath == null )
+                    filePath = fileStream.Name;
+
                 stream = fileStream.ToMemoryStream( leaveOpen: false );
             }
 
diff --git a/Source/Amicitia/ResourceWrappers/PAKFileSystemWrapper.cs b/Source/Amicitia/ResourceWrappers/PAKFileSystemWrapper.cs
index f30e0c0..3102c98 100644
--- a/Source/Amicitia/ResourceWrappers/PAKFileSystemWrapper.cs
+++ b/Source/Amicitia/ResourceWrappers/PAKFileSystemWrapper.cs
@@ -22,8 +22,7 @@ protected override void Initialize()
 
             RegisterFileExportAction(SupportedFileType.PakArchiveFile, ( res, path ) =>
             {
-                res.Save().SaveToFile( leaveOpen: false, path );
-
+                res.Save( path );
             } );
             RegisterFileReplaceAction( SupportedFileType.PakArchiveFile, ( res, path ) =>
             {
diff --git a/Source/Amicitia/ResourceWrappers/ResourceWrapper.cs b/Source/Amicitia/ResourceWrappers/ResourceWrapper.cs
index 9e9f730..f443b6b 100644
--- a/Source/Amicitia/ResourceWrappers/ResourceWrapper.cs
+++ b/Source/Amicitia/ResourceWrappers/ResourceWrapper.cs
@@ -96,6 +96,8 @@ public abstract partial class ResourceWrapper<TResource> : TreeNode, IResourceWr
         private Dictionary<SupportedFileType, Action<string, ResourceWrapper<TResource>>> mFileAddActions;
         private Func<ResourceWrapper<TResource>, TResource> mRebuildAction;
         private List<ContextMenuAction> mCustomActions;
+        private Dictionary<Type, ContextMenuStrip> mContextMenuStripCache
+            = new Dictionary<Type, ContextMenuStrip>();
 
         public event PropertyChangedEventHandler PropertyChanged;
 
@@ -574,6 +576,13 @@ private void PopulateViewFully()
         /// </summary>
         private void PopulateContextMenuStrip()
         {
+            var type = GetType();
+            if (mContextMenuStripCache.TryGetValue( type, out var temp ) )
+            {
+                ContextMenuStrip = temp;
+                return;
+            }
+
             ContextMenuStrip = new ContextMenuStrip();
 
             if ( mCustomActions != null )
@@ -629,6 +638,8 @@ private void PopulateContextMenuStrip()
             {
                 ContextMenuStrip.Items.Add(new ToolStripMenuItem("&Delete", null, DeleteEventHandler, Keys.Control | Keys.Delete));
             }
+
+            mContextMenuStripCache[type] = ContextMenuStrip;
         }
 
         /// <summary>
diff --git a/Source/Amicitia/ResourceWrappers/TMXFileWrapper.cs b/Source/Amicitia/ResourceWrappers/TMXFileWrapper.cs
index 2ff8535..925a3f5 100644
--- a/Source/Amicitia/ResourceWrappers/TMXFileWrapper.cs
+++ b/Source/Amicitia/ResourceWrappers/TMXFileWrapper.cs
@@ -37,6 +37,14 @@ public class TmxFileWrapper : ResourceWrapper<TmxFile>
         [OrderedProperty]
         public byte MipMapCount => Resource.MipMapCount;
 
+        [Category( "Texture format" )]
+        [OrderedProperty]
+        public float MipMapKValue => Resource.MipMapKValue;
+
+        [Category( "Texture format" )]
+        [OrderedProperty]
+        public float MipMapLValue => Resource.MipMapLValue;
+
         [Category("Texture wrapping modes")]
         [OrderedProperty]
         public TmxWrapMode HorizontalWrappingMode
@@ -53,6 +61,13 @@ public TmxWrapMode VerticalWrappingMode
             set => SetProperty(Resource, value);
         }
 
+        [Category("Texture metadata"), OrderedProperty]
+        public short UserId
+        {
+            get => Resource.UserId;
+            set => SetProperty(Resource, value);
+        }
+
         [Category("Texture metadata")]
         [OrderedProperty]
         public int UserTextureId
@@ -77,6 +92,14 @@ public string UserComment
             set => SetProperty(Resource, value);
         }
 
+        [Category("Misc")]
+        [OrderedProperty]
+        public byte Reserved
+        {
+            get => Resource.Reserved;
+            set => SetProperty(Resource, value);
+        }
+
         public TmxFileWrapper(string text, TmxFile resource) : base(text, resource)
         {
         }
diff --git a/Source/AmicitiaLibrary/FileSystems/AMD/AMDFile.cs b/Source/AmicitiaLibrary/FileSystems/AMD/AMDFile.cs
index 3d8b29c..31b2b51 100644
--- a/Source/AmicitiaLibrary/FileSystems/AMD/AMDFile.cs
+++ b/Source/AmicitiaLibrary/FileSystems/AMD/AMDFile.cs
@@ -3,6 +3,7 @@
     using IO;
     using System.Collections.Generic;
     using System.IO;
+    using System.Text;
     using Utilities;
 
     public class AmdFile : BinaryBase
@@ -65,7 +66,7 @@ public AmdFile(string path)
         /// <param name="path">The path pointing to the the file to load.</param>
         public AmdFile(Stream stream, bool leaveOpen = false)
         {
-            using (BinaryReader reader = new BinaryReader(stream))
+            using (BinaryReader reader = new BinaryReader( stream, Encoding.Default, leaveOpen ) )
             {
                 Read(reader);
             }
diff --git a/Source/AmicitiaLibrary/FileSystems/CVM/CVMExecutableListing.cs b/Source/AmicitiaLibrary/FileSystems/CVM/CVMExecutableListing.cs
index 68abb06..b3ad6bc 100644
--- a/Source/AmicitiaLibrary/FileSystems/CVM/CVMExecutableListing.cs
+++ b/Source/AmicitiaLibrary/FileSystems/CVM/CVMExecutableListing.cs
@@ -17,9 +17,9 @@ public CvmExecutableListing(string path)
                 mRootDirectoryListing = new CvmDirectoryListing(reader, null);
         }
 
-        public CvmExecutableListing(Stream stream)
+        public CvmExecutableListing(Stream stream, bool leaveOpen = false)
         {
-            using (BinaryReader reader = new BinaryReader(stream, System.Text.Encoding.Default, true))
+            using (BinaryReader reader = new BinaryReader(stream, System.Text.Encoding.Default, leaveOpen ) )
                 mRootDirectoryListing = new CvmDirectoryListing(reader, null);
         }
 
diff --git a/Source/AmicitiaLibrary/Graphics/RenderWare/RMDNodeLink.cs b/Source/AmicitiaLibrary/Graphics/RenderWare/RMDNodeLink.cs
index 1311929..73bfbcb 100644
--- a/Source/AmicitiaLibrary/Graphics/RenderWare/RMDNodeLink.cs
+++ b/Source/AmicitiaLibrary/Graphics/RenderWare/RMDNodeLink.cs
@@ -35,9 +35,9 @@ public RmdNodeLink(byte[] data)
         {
         }
 
-        public RmdNodeLink(Stream stream)
+        public RmdNodeLink(Stream stream, bool leaveOpen = false)
         {
-            using (BinaryReader reader = new BinaryReader(stream))
+            using (BinaryReader reader = new BinaryReader(stream, System.Text.Encoding.Default, leaveOpen) )
             {
                 Read(reader);
             }
diff --git a/Source/AmicitiaLibrary/Graphics/TMX/TMXFile.cs b/Source/AmicitiaLibrary/Graphics/TMX/TMXFile.cs
index 47c5c92..6201d16 100644
--- a/Source/AmicitiaLibrary/Graphics/TMX/TMXFile.cs
+++ b/Source/AmicitiaLibrary/Graphics/TMX/TMXFile.cs
@@ -96,6 +96,7 @@ internal TmxFile(BinaryReader reader)
         /********************/
         /**** Properties ****/
         /********************/
+        public short UserId { get; set; }
 
         public byte PaletteCount { get; private set; }
 
@@ -139,6 +140,8 @@ public byte MipMapLValue
             }
         }
 
+        public byte Reserved { get; set; }
+
         public TmxWrapMode HorizontalWrappingMode
         {
             get
@@ -289,7 +292,7 @@ internal override void Write(BinaryWriter writer)
             writer.Write((byte)PixelFormat);
             writer.Write(MipMapCount);
             writer.Write(mMipKl);
-            writer.Write((byte)0);
+            writer.Write(Reserved);
             writer.Write(mWrapModes);
             writer.Write(UserTextureId);
             writer.Write(UserClutId);
@@ -311,7 +314,7 @@ internal override void Write(BinaryWriter writer)
             // Seek back to the chunk header and write it
             writer.BaseStream.Seek(posFileStart, SeekOrigin.Begin);
             writer.Write(FLAG);
-            writer.Write((short)0); // userID
+            writer.Write(UserId); // userID
             writer.Write(length);
             writer.WriteCString(TAG, 4);
 
@@ -323,7 +326,7 @@ private void Read(BinaryReader reader)
         {
             long posFileStart = reader.GetPosition();
             short flag = reader.ReadInt16();
-            short userId = reader.ReadInt16();
+            UserId = reader.ReadInt16();
             int length = reader.ReadInt32();
             string tag = reader.ReadCString(4);
             reader.AlignPosition(16);
@@ -340,7 +343,7 @@ private void Read(BinaryReader reader)
             PixelFormat = (PS2PixelFormat)reader.ReadByte();
             MipMapCount = reader.ReadByte();
             mMipKl = reader.ReadUInt16();
-            byte reserved = reader.ReadByte();
+            Reserved = reader.ReadByte();
             mWrapModes = reader.ReadByte();
             UserTextureId = reader.ReadInt32();
             UserClutId = reader.ReadInt32();