Rebase

ValveResourceFormat · Feb 9, 2024 · 3a0c305 · 3a0c305
1 parent 9b72cfc
commit 3a0c305
Show file tree

Hide file tree

Showing 20 changed files with 5 additions and 87 deletions.
diff --git a/ValveKeyValue/ValveKeyValue.Test/TextKV3/BasicKV3TestCases.cs b/ValveKeyValue/ValveKeyValue.Test/TextKV3/BasicKV3TestCases.cs
@@ -1,5 +1,3 @@
-using NUnit.Framework;
-
 namespace ValveKeyValue.Test.TextKV3
 {
     class BasicKV3TestCases
@@ -97,7 +95,7 @@ public void DeserializesArray()
 
             var arrayValue = (KVArrayValue)data["arrayValue"];
 
-            Assert.That(arrayValue.Count, Is.EqualTo(2));
+            Assert.That(arrayValue, Has.Count.EqualTo(2));
             Assert.That(arrayValue[0].ToString(), Is.EqualTo("a"));
             Assert.That(arrayValue[1].ToString(), Is.EqualTo("b"));
 

diff --git a/ValveKeyValue/ValveKeyValue.Test/TextKV3/HeadersTestCase.cs b/ValveKeyValue/ValveKeyValue.Test/TextKV3/HeadersTestCase.cs
@@ -1,7 +1,4 @@
-using System;
-using System.IO;
 using System.Text;
-using NUnit.Framework;
 
 namespace ValveKeyValue.Test.TextKV3
 {

diff --git a/ValveKeyValue/ValveKeyValue.Test/TextKV3/Kv1ToKv3TestCase.cs b/ValveKeyValue/ValveKeyValue.Test/TextKV3/Kv1ToKv3TestCase.cs
@@ -1,7 +1,3 @@
-using System;
-using System.IO;
-using NUnit.Framework;
-
 namespace ValveKeyValue.Test.TextKV3
 {
     class Kv1ToKv3TestCase

diff --git a/ValveKeyValue/ValveKeyValue.Test/TextKV3/Kv3ToKv1TestCase.cs b/ValveKeyValue/ValveKeyValue.Test/TextKV3/Kv3ToKv1TestCase.cs
@@ -1,6 +1,3 @@
-using System.IO;
-using NUnit.Framework;
-
 namespace ValveKeyValue.Test.TextKV3
 {
     class Kv3ToKv1TestCase

diff --git a/ValveKeyValue/ValveKeyValue.Test/TextKV3/RootTypesTestCase.cs b/ValveKeyValue/ValveKeyValue.Test/TextKV3/RootTypesTestCase.cs
@@ -1,5 +1,3 @@
-using NUnit.Framework;
-
 namespace ValveKeyValue.Test.TextKV3
 {
     class RootTypesTestCase

diff --git a/ValveKeyValue/ValveKeyValue.Test/TextKV3/SerializationTestCase.cs b/ValveKeyValue/ValveKeyValue.Test/TextKV3/SerializationTestCase.cs
@@ -1,6 +1,3 @@
-using System.IO;
-using NUnit.Framework;
-
 namespace ValveKeyValue.Test.TextKV3
 {
     class SerializationTestCase

diff --git a/ValveKeyValue/ValveKeyValue/Deserialization/KeyValues3/KV3TextReader.cs b/ValveKeyValue/ValveKeyValue/Deserialization/KeyValues3/KV3TextReader.cs
@@ -1,6 +1,4 @@
-using System;
 using System.Globalization;
-using System.IO;
 using ValveKeyValue.Abstraction;
 
 namespace ValveKeyValue.Deserialization.KeyValues3
@@ -183,7 +181,7 @@ void ReadText(string text)
 
         void ReadBinaryBlob(string text)
         {
-            var bytes = Utils.ParseHexStringAsByteArrayNoReverse(text);
+            var bytes = HexStringHelper.ParseHexStringAsByteArray(text);
             var value = new KVBinaryBlob(bytes)
             {
                 Flag = stateMachine.GetAndResetFlag()

diff --git a/ValveKeyValue/ValveKeyValue/Deserialization/KeyValues3/KV3TextReaderState.cs b/ValveKeyValue/ValveKeyValue/Deserialization/KeyValues3/KV3TextReaderState.cs
@@ -1,4 +1,4 @@
-namespace ValveKeyValue.Deserialization.KeyValues3
+namespace ValveKeyValue.Deserialization.KeyValues3
 {
     enum KV3TextReaderState
     {

diff --git a/ValveKeyValue/ValveKeyValue/Deserialization/KeyValues3/KV3TextReaderStateMachine.cs b/ValveKeyValue/ValveKeyValue/Deserialization/KeyValues3/KV3TextReaderStateMachine.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 namespace ValveKeyValue.Deserialization.KeyValues3
 {
     class KV3TextReaderStateMachine

diff --git a/ValveKeyValue/ValveKeyValue/Deserialization/KeyValues3/KV3TokenReader.cs b/ValveKeyValue/ValveKeyValue/Deserialization/KeyValues3/KV3TokenReader.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Text;
 using ValveKeyValue.KeyValues3;

diff --git a/ValveKeyValue/ValveKeyValue/KVArrayValue.cs b/ValveKeyValue/ValveKeyValue/KVArrayValue.cs
@@ -1,6 +1,4 @@
-using System;
 using System.Collections;
-using System.Collections.Generic;
 
 namespace ValveKeyValue
 {

diff --git a/ValveKeyValue/ValveKeyValue/KVBinaryBlob.cs b/ValveKeyValue/ValveKeyValue/KVBinaryBlob.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Text;
 
 namespace ValveKeyValue

diff --git a/ValveKeyValue/ValveKeyValue/KVFile.cs b/ValveKeyValue/ValveKeyValue/KVFile.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace ValveKeyValue
 {
     public class KVFile : KVObject

diff --git a/ValveKeyValue/ValveKeyValue/KVFlag.cs b/ValveKeyValue/ValveKeyValue/KVFlag.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace ValveKeyValue
 {
     public enum KVFlag

diff --git a/ValveKeyValue/ValveKeyValue/KVHeader.cs b/ValveKeyValue/ValveKeyValue/KVHeader.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace ValveKeyValue
 {
     public class KVHeader

diff --git a/ValveKeyValue/ValveKeyValue/KeyValues3/Encoding.cs b/ValveKeyValue/ValveKeyValue/KeyValues3/Encoding.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace ValveKeyValue.KeyValues3
 {
     public class Encoding

diff --git a/ValveKeyValue/ValveKeyValue/KeyValues3/Format.cs b/ValveKeyValue/ValveKeyValue/KeyValues3/Format.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace ValveKeyValue.KeyValues3
 {
     public class Format

diff --git a/ValveKeyValue/ValveKeyValue/Serialization/KeyValues1/KV1TextSerializer.cs b/ValveKeyValue/ValveKeyValue/Serialization/KeyValues1/KV1TextSerializer.cs
@@ -21,7 +21,7 @@ public KV1TextSerializer(Stream stream, KVSerializerOptions options)
         readonly KVSerializerOptions options;
         readonly TextWriter writer;
         int indentation = 0;
-        Stack<int> arrayCount = new();
+        readonly Stack<int> arrayCount = new();
 
         public void Dispose()
         {

diff --git a/ValveKeyValue/ValveKeyValue/Serialization/KeyValues3/KV3TextSerializer.cs b/ValveKeyValue/ValveKeyValue/Serialization/KeyValues3/KV3TextSerializer.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Text;
 using ValveKeyValue.Abstraction;
 
@@ -23,7 +20,7 @@ public KV3TextSerializer(Stream stream)
 
         readonly TextWriter writer;
         int indentation = 0;
-        Stack<bool> inArray = new();
+        readonly Stack<bool> inArray = new();
 
         bool IsInArray => inArray.Count > 0 && inArray.Peek();
 

diff --git a/ValveKeyValue/ValveKeyValue/Utils.cs b/ValveKeyValue/ValveKeyValue/Utils.cs