From 54902f78be5121e699269f10e1f9a6e2f6e84c94 Mon Sep 17 00:00:00 2001
From: goat <16760685+goaaats@users.noreply.github.com>
Date: Thu, 15 Apr 2021 23:50:52 +0200
Subject: [PATCH] fix: random file paths in ttmps

---
 Penumbra/Importer/TexToolsImport.cs | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/Penumbra/Importer/TexToolsImport.cs b/Penumbra/Importer/TexToolsImport.cs
index 271faf98..c82b63c2 100644
--- a/Penumbra/Importer/TexToolsImport.cs
+++ b/Penumbra/Importer/TexToolsImport.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -63,12 +64,28 @@ namespace Penumbra.Importer
             fs.Close();
         }
 
+        // You can in no way rely on any file paths in TTMPs so we need to just do this, sorry
+        private ZipEntry FindZipEntry( ZipFile file, string fileName )
+        {
+            for( var i = 0; i < file.Count; i++ )
+            {
+                var entry = file[ i ];
+
+                if( entry.Name.Contains( fileName ) )
+                    return entry;
+            }
+
+            return null;
+        }
+
         private PenumbraSqPackStream GetMagicSqPackDeleterStream( ZipFile file, string entryName )
         {
             State = ImporterState.WritingPackToDisk;
 
             // write shitty zip garbage to disk
-            var       entry = file.GetEntry( entryName );
+            var entry = FindZipEntry( file, entryName );
+            Debug.Assert( entry != null, $"Could not find in mod zip: {entryName}" );
+
             using var s     = file.GetInputStream( entry );
 
             WriteZipEntryToTempFile( s );
@@ -81,8 +98,11 @@ namespace Penumbra.Importer
         {
             using var zfs              = modPackFile.OpenRead();
             using var extractedModPack = new ZipFile( zfs );
-            var       mpl              = extractedModPack.GetEntry( "TTMPL.mpl" );
-            var       modRaw           = GetStringFromZipEntry( extractedModPack, mpl, Encoding.UTF8 );
+
+            var mpl            = FindZipEntry( extractedModPack, "TTMPL.mpl" );
+            Debug.Assert( mpl != null, "Could not find mod meta in ZIP." );
+
+            var modRaw = GetStringFromZipEntry( extractedModPack, mpl, Encoding.UTF8 );
 
             // At least a better validation than going by the extension.
             if( modRaw.Contains( "\"TTMPVersion\":" ) )