bug fix: Fixes bug where all files would corrupt

Author: matthe815

JPKDecoder.cs

@@ -8,10 +8,10 @@ namespace MHFQuestEditor
 {
     class JPKDecoder
     {
-        public static int m_shiftIndex = 0;
-        public static byte m_flag = 0;
+        public int m_shiftIndex = 0;
+        public byte m_flag = 0;
 
-        public static byte[] UnpackSimple(byte[] data)
+        public byte[] UnpackSimple(byte[] data)
         {
             MemoryStream msInput = new MemoryStream(data);
             BinaryReader brInput = new BinaryReader(msInput);
@@ -36,15 +36,15 @@ public static byte[] UnpackSimple(byte[] data)
             return data;
         }
 
-        public static void jpkcpy_lz(byte[] outBuffer, int offset, int length, ref int index)
+        public void jpkcpy_lz(byte[] outBuffer, int offset, int length, ref int index)
         {
             for (int i = 0; i < length; i++, index++)
             {
                 outBuffer[index] = outBuffer[index - offset - 1];
             }
         }
 
-        public static byte jpkbit_lz(Stream s)
+        public byte jpkbit_lz(Stream s)
         {
             m_shiftIndex--;
             if (m_shiftIndex < 0)
@@ -56,7 +56,7 @@ public static byte jpkbit_lz(Stream s)
             return (byte)((m_flag >> m_shiftIndex) & 1);
         }
 
-        public static void ProcessOnDecode(Stream inStream, byte[] outBuffer)//implements jpkdec_lz
+        public void ProcessOnDecode(Stream inStream, byte[] outBuffer)//implements jpkdec_lz
         {
             int outIndex = 0;
             while (inStream.Position < inStream.Length && outIndex < outBuffer.Length)
@@ -120,7 +120,7 @@ public static void ProcessOnDecode(Stream inStream, byte[] outBuffer)//implement
             }
         }
 
-        public static byte ReadByte(Stream s)
+        public byte ReadByte(Stream s)
         {
             int value = s.ReadByte();
             if (value < 0)

JPKEncoder.cs

@@ -8,20 +8,18 @@ namespace MHFQuestEditor
 {
     class JPKEncoder
     {
-        public static byte m_flag;
-        public static int m_shiftIndex;
-        public static int m_ind;
-        public static byte[] m_inp;
-        public static int m_level = 280;
-        public static int m_maxdist = 0x300;//0x1fff;
-        public static Stream m_outstream;
-        public static byte[] m_towrite = new byte[1000];
-        public static int m_itowrite;
+        public byte m_flag;
+        public int m_shiftIndex;
+        public int m_ind;
+        public byte[] m_inp;
+        public int m_level = 280;
+        public int m_maxdist = 0x300;//0x1fff;
+        public Stream m_outstream;
+        public byte[] m_towrite = new byte[1000];
+        public int m_itowrite;
 
-        public static void JPKEncode(byte[] data, UInt16 atype, string otPath, int level)
+        public void JPKEncode(byte[] data, UInt16 atype, string otPath, int level)
         {
-            Directory.CreateDirectory("output");
-
             UInt16 type = atype;
             byte[] buffer = data;
             int insize = buffer.Length;
@@ -44,7 +42,7 @@ public static void JPKEncode(byte[] data, UInt16 atype, string otPath, int level
             fsot.Close();
         }
 
-        public static unsafe int FindRep(int ind, out uint ofs)
+        public unsafe int FindRep(int ind, out uint ofs)
         {
             int nlen = Math.Min(m_level, m_inp.Length - ind);
             ofs = 0;
@@ -78,7 +76,7 @@ public static unsafe int FindRep(int ind, out uint ofs)
                 return len;
             }
         }
-        public static void flushflag(bool final)
+        public void flushflag(bool final)
         {
             if (!final || m_itowrite > 0)
                 WriteByte(m_outstream, m_flag);
@@ -87,7 +85,7 @@ public static void flushflag(bool final)
                 WriteByte(m_outstream, m_towrite[i]);
             m_itowrite = 0;
         }
-        public static void SetFlag(byte b)
+        public void SetFlag(byte b)
         {
             m_shiftIndex--;
             if (m_shiftIndex < 0)
@@ -97,14 +95,14 @@ public static void SetFlag(byte b)
             }
             m_flag |= (byte)(b << m_shiftIndex);
         }
-        public static void SetFlagsL(byte b, int cnt)
+        public void SetFlagsL(byte b, int cnt)
         {
             for (int i = cnt - 1; i >= 0; i--)
             {
                 SetFlag((byte)((b >> i) & 1));
             }
         }
-        public static void ProcessOnEncode(byte[] inBuffer, Stream outStream, int level = 1000)
+        public void ProcessOnEncode(byte[] inBuffer, Stream outStream, int level = 1000)
         {
             long perc, perc0 = 0;
             long percbord = 0;
@@ -172,7 +170,7 @@ public static void ProcessOnEncode(byte[] inBuffer, Stream outStream, int level
             }
             flushflag(true);
         }
-        public static void WriteByte(Stream s, byte b)
+        public void WriteByte(Stream s, byte b)
         {
             s.WriteByte(b);
         }

Quest.cs

@@ -30,7 +30,7 @@ public void Load (string questId, string meta)
             byte[] data = new byte[file.Length];
             file.Read(data, 0, data.Length);
 
-            data = JPKDecoder.UnpackSimple(data);
+            data = new JPKDecoder().UnpackSimple(data);
             MemoryStream decryptedData = new MemoryStream(data);
 
             int mainPropsPointer = decryptedData.ReadByte();

QuestEditor.cs

@@ -185,8 +185,7 @@ void RewriteFile()
 
                 writer.Close();
 
-                JPKEncoder.JPKEncode(data, 3, f.fileName, 10);
-
+                new JPKEncoder().JPKEncode(data, 3, f.fileName, 100);
             });
         }