Leahnaya/ClanServer
1
0
Fork 0
mirror of https://github.com/BtbN/ClanServer.git synced 2026-04-23 09:47:50 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement all missing NodeTypes

Browse Source
This commit is contained in:
BtbN 2019-04-17 21:37:15 +02:00
parent f69d4116d0
commit 49aead3bb1
3 changed files with 284 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eAmuseCore/KBinXML/KBinXML.cs
View File

@ -69,6 +69,13 @@ namespace eAmuseCore.KBinXML
this.doc = doc;
}
public XDocument Document => doc;
public override string ToString()
{
return doc.ToString();
}
private void Parse(IEnumerable<byte> input)
{
doc = new XDocument();
@ -265,12 +272,9 @@ namespace eAmuseCore.KBinXML
IEnumerable<byte> data = TakeDataAligned(totSize, isArray);
SetNodeValue(node, data, nodeAttrs, varCount, arrCount);
Console.WriteLine(fakeroot.FirstNode.ToString());
}
doc = new XDocument(fakeroot.FirstNode);
Console.WriteLine(doc.ToString());
}
}
}

274
eAmuseCore/KBinXML/XmlTypes.cs
View File

@ -243,6 +243,46 @@ namespace eAmuseCore.KBinXML.XmlTypes
static public K2U32 FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K2U32>(input);
}
[KValue(22, "2s64", "vs64", Count = 2, Size = 8)]
public class K2S64 : KValueArray<S64>
{
public K2S64(S64 v1, S64 v2) : base(v1, v2) { }
static public K2S64 FromString(string input) => XmlTypes.ValueListTypeFromString<K2S64>(input);
static public K2S64 FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K2S64>(input);
}
[KValue(23, "2u64", "vu64", Count = 2, Size = 8)]
public class K2U64 : KValueArray<U64>
{
public K2U64(U64 v1, U64 v2) : base(v1, v2) { }
static public K2U64 FromString(string input) => XmlTypes.ValueListTypeFromString<K2U64>(input);
static public K2U64 FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K2U64>(input);
}
[KValue(24, "2f", Count = 2, Size = 4)]
public class K2F : KValueArray<KFloat>
{
public K2F(KFloat v1, KFloat v2) : base(v1, v2) { }
static public K2F FromString(string input) => XmlTypes.ValueListTypeFromString<K2F>(input);
static public K2F FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K2F>(input);
}
[KValue(25, "2d", "vd", Count = 2, Size = 8)]
public class K2D : KValueArray<KDouble>
{
public K2D(KDouble v1, KDouble v2) : base(v1, v2) { }
static public K2D FromString(string input) => XmlTypes.ValueListTypeFromString<K2D>(input);
static public K2D FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K2D>(input);
}
[KValue(26, "3s8", Count = 3, Size = 1)]
public class K3S8 : KValueArray<S8>
{
public K3S8(S8 v1, S8 v2, S8 v3) : base(v1, v2, v3) { }
static public K3S8 FromString(string input) => XmlTypes.ValueListTypeFromString<K3S8>(input);
static public K3S8 FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K3S8>(input);
}
[KValue(27, "3u8", Count = 3, Size = 1)]
public class K3U8 : KValueArray<U8>
{
@ -251,12 +291,246 @@ namespace eAmuseCore.KBinXML.XmlTypes
static public K3U8 FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K3U8>(input);
}
[KValue(28, "3s16", Count = 3, Size = 2)]
public class K3S16 : KValueArray<S16>
{
public K3S16(S16 v1, S16 v2, S16 v3) : base(v1, v2, v3) { }
static public K3S16 FromString(string input) => XmlTypes.ValueListTypeFromString<K3S16>(input);
static public K3S16 FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K3S16>(input);
}
[KValue(29, "3u16", Count = 3, Size = 2)]
public class K3U16 : KValueArray<U16>
{
public K3U16(U16 v1, U16 v2, U16 v3) : base(v1, v2, v3) { }
static public K3U16 FromString(string input) => XmlTypes.ValueListTypeFromString<K3U16>(input);
static public K3U16 FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K3U16>(input);
}
[KValue(30, "3s32", Count = 3, Size = 4)]
public class K3S32 : KValueArray<S32>
{
public K3S32(S32 v1, S32 v2, S32 v3) : base(v1, v2, v3) { }
static public K3S32 FromString(string input) => XmlTypes.ValueListTypeFromString<K3S32>(input);
static public K3S32 FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K3S32>(input);
}
[KValue(31, "3u32", Count = 3, Size = 4)]
public class K3U32 : KValueArray<U32>
{
public K3U32(U32 v1, U32 v2, U32 v3) : base(v1, v2, v3) { }
static public K3U32 FromString(string input) => XmlTypes.ValueListTypeFromString<K3U32>(input);
static public K3U32 FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K3U32>(input);
}
[KValue(32, "3s64", Count = 3, Size = 8)]
public class K3S64 : KValueArray<S64>
{
public K3S64(S64 v1, S64 v2, S64 v3) : base(v1, v2, v3) { }
static public K3S64 FromString(string input) => XmlTypes.ValueListTypeFromString<K3S64>(input);
static public K3S64 FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K3S64>(input);
}
[KValue(33, "3u64", Count = 3, Size = 8)]
public class K3U64 : KValueArray<U64>
{
public K3U64(U64 v1, U64 v2, U64 v3) : base(v1, v2, v3) { }
static public K3U64 FromString(string input) => XmlTypes.ValueListTypeFromString<K3U64>(input);
static public K3U64 FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K3U64>(input);
}
[KValue(34, "3f", Count = 3, Size = 4)]
public class K3F : KValueArray<KFloat>
{
public K3F(KFloat v1, KFloat v2, KFloat v3) : base(v1, v2, v3) { }
static public K3F FromString(string input) => XmlTypes.ValueListTypeFromString<K3F>(input);
static public K3F FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K3F>(input);
}
[KValue(35, "3d", Count = 3, Size = 8)]
public class K3D : KValueArray<KDouble>
{
public K3D(KDouble v1, KDouble v2, KDouble v3) : base(v1, v2, v3) { }
static public K3D FromString(string input) => XmlTypes.ValueListTypeFromString<K3D>(input);
static public K3D FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K3D>(input);
}
[KValue(36, "4s8", Count = 4, Size = 1)]
public class K4S8 : KValueArray<S8>
{
public K4S8(S8 v1, S8 v2, S8 v3, S8 v4) : base(v1, v2, v3, v4) { }
static public K4S8 FromString(string input) => XmlTypes.ValueListTypeFromString<K4S8>(input);
static public K4S8 FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K4S8>(input);
}
[KValue(37, "4u8", Count = 4, Size = 1)]
public class K4U8 : KValueArray<U8>
{
public K4U8(U8 v1, U8 v2, U8 v3, U8 v4) : base(v1, v2, v3, v4) { }
static public K4U8 FromString(string input) => XmlTypes.ValueListTypeFromString<K4U8>(input);
static public K4U8 FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K4U8>(input);
}
[KValue(38, "4s16", Count = 4, Size = 2)]
public class K4S16 : KValueArray<S16>
{
public K4S16(S16 v1, S16 v2, S16 v3, S16 v4) : base(v1, v2, v3, v4) { }
static public K4S16 FromString(string input) => XmlTypes.ValueListTypeFromString<K4S16>(input);
static public K4S16 FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K4S16>(input);
}
[KValue(39, "4u16", Count = 4, Size = 2)]
public class K4U16 : KValueArray<U16>
{
public K4U16(U16 v1, U16 v2, U16 v3, U16 v4) : base(v1, v2, v3, v4) { }
static public K4U16 FromString(string input) => XmlTypes.ValueListTypeFromString<K4U16>(input);
static public K4U16 FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K4U16>(input);
}
[KValue(40, "4s32", "vs32", Count = 4, Size = 4)]
public class K4S32 : KValueArray<S32>
{
public K4S32(S32 v1, S32 v2, S32 v3, S32 v4) : base(v1, v2, v3, v4) { }
static public K4S32 FromString(string input) => XmlTypes.ValueListTypeFromString<K4S32>(input);
static public K4S32 FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K4S32>(input);
}
[KValue(41, "4u32", "vu32", Count = 4, Size = 4)]
public class K4U32 : KValueArray<U32>
{
public K4U32(U32 v1, U32 v2, U32 v3, U32 v4) : base(v1, v2, v3, v4) { }
static public K4U32 FromString(string input) => XmlTypes.ValueListTypeFromString<K4U32>(input);
static public K4U32 FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K4U32>(input);
}
[KValue(42, "4s64", Count = 4, Size = 8)]
public class K4S64 : KValueArray<S64>
{
public K4S64(S64 v1, S64 v2, S64 v3, S64 v4) : base(v1, v2, v3, v4) { }
static public K4S64 FromString(string input) => XmlTypes.ValueListTypeFromString<K4S64>(input);
static public K4S64 FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K4S64>(input);
}
[KValue(43, "4u64", Count = 4, Size = 8)]
public class K4U64 : KValueArray<U64>
{
public K4U64(U64 v1, U64 v2, U64 v3, U64 v4) : base(v1, v2, v3, v4) { }
static public K4U64 FromString(string input) => XmlTypes.ValueListTypeFromString<K4U64>(input);
static public K4U64 FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K4U64>(input);
}
[KValue(44, "4f", "vf", Count = 4, Size = 4)]
public class K4F : KValueArray<KFloat>
{
public K4F(KFloat v1, KFloat v2, KFloat v3, KFloat v4) : base(v1, v2, v3, v4) { }
static public K4F FromString(string input) => XmlTypes.ValueListTypeFromString<K4F>(input);
static public K4F FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K4F>(input);
}
[KValue(45, "4d", Count = 4, Size = 8)]
public class K4D : KValueArray<KDouble>
{
public K4D(KDouble v1, KDouble v2, KDouble v3, KDouble v4) : base(v1, v2, v3, v4) { }
static public K4D FromString(string input) => XmlTypes.ValueListTypeFromString<K4D>(input);
static public K4D FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K4D>(input);
}
[KValue(48, "vs8", Count = 16, Size = 1)]
public class KVS8 : KValueArray<S8>
{
public KVS8(S8 v1, S8 v2, S8 v3, S8 v4, S8 v5, S8 v6, S8 v7, S8 v8, S8 v9, S8 v10, S8 v11, S8 v12, S8 v13, S8 v14, S8 v15, S8 v16)
: base(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16) { }
static public KVS8 FromString(string input) => XmlTypes.ValueListTypeFromString<KVS8>(input);
static public KVS8 FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<KVS8>(input);
}
[KValue(49, "vu8", Count = 16, Size = 1)]
public class KVU8 : KValueArray<U8>
{
public KVU8(U8 v1, U8 v2, U8 v3, U8 v4, U8 v5, U8 v6, U8 v7, U8 v8, U8 v9, U8 v10, U8 v11, U8 v12, U8 v13, U8 v14, U8 v15, U8 v16)
: base(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16) { }
static public KVU8 FromString(string input) => XmlTypes.ValueListTypeFromString<KVU8>(input);
static public KVU8 FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<KVU8>(input);
}
[KValue(50, "vs16", Count = 8, Size = 2)]
public class KVS16 : KValueArray<S16>
{
public KVS16(S16 v1, S16 v2, S16 v3, S16 v4, S16 v5, S16 v6, S16 v7, S16 v8)
: base(v1, v2, v3, v4, v5, v6, v7, v8) { }
static public KVS16 FromString(string input) => XmlTypes.ValueListTypeFromString<KVS16>(input);
static public KVS16 FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<KVS16>(input);
}
[KValue(51, "vu16", Count = 8, Size = 2)]
public class KVU16 : KValueArray<U16>
{
public KVU16(U16 v1, U16 v2, U16 v3, U16 v4, U16 v5, U16 v6, U16 v7, U16 v8)
: base(v1, v2, v3, v4, v5, v6, v7, v8) { }
static public KVU16 FromString(string input) => XmlTypes.ValueListTypeFromString<KVU16>(input);
static public KVU16 FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<KVU16>(input);
}
[KValue(52, "bool", "b", Count = 1, Size = 1)]
public class KBool : KValue<bool>
{
public KBool(bool value) => Value = value;
public override string ToString() => Value ? "1" : "0";
public override IEnumerable<byte> ToBytes() => new byte[] { (byte)(Value ? 1 : 0) };
static public KBool FromString(string input)
{
if (input == "0")
return new KBool(false);
else if (input == "1")
return new KBool(true);
else
return new KBool(Convert.ToBoolean(input));
}
static public KBool FromBytes(IEnumerable<byte> input) => new KBool(input.FirstU8() != 0);
}
[KValue(53, "2b", Count = 2, Size = 1)]
public class K2B : KValueArray<KBool>
{
public K2B(KBool v1, KBool v2) : base(v1, v2) { }
static public K2B FromString(string input) => XmlTypes.ValueListTypeFromString<K2B>(input);
static public K2B FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K2B>(input);
}
[KValue(54, "3b", Count = 3, Size = 1)]
public class K3B : KValueArray<KBool>
{
public K3B(KBool v1, KBool v2, KBool v3) : base(v1, v2, v3) { }
static public K3B FromString(string input) => XmlTypes.ValueListTypeFromString<K3B>(input);
static public K3B FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K3B>(input);
}
[KValue(55, "4b", Count = 4, Size = 1)]
public class K4B : KValueArray<KBool>
{
public K4B(KBool v1, KBool v2, KBool v3, KBool v4) : base(v1, v2, v3, v4) { }
static public K4B FromString(string input) => XmlTypes.ValueListTypeFromString<K4B>(input);
static public K4B FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<K4B>(input);
}
[KValue(56, "vb", Count = 16, Size = 1)]
public class KVB : KValueArray<KBool>
{
public KVB(KBool v1, KBool v2, KBool v3, KBool v4, KBool v5, KBool v6, KBool v7, KBool v8, KBool v9, KBool v10, KBool v11, KBool v12, KBool v13, KBool v14, KBool v15, KBool v16)
: base(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16) { }
static public KVB FromString(string input) => XmlTypes.ValueListTypeFromString<KVB>(input);
static public KVB FromBytes(IEnumerable<byte> input) => XmlTypes.ValueListTypeFromBytes<KVB>(input);
}
public static class XmlTypes
{
public const int NodeStartType = 1;
public const int BinType = 10;
public const int StrType = 11;
public const int AttrType = 46;
public const int ArrayType = 47;
public const int NodeEndType = 190;
public const int SectionEndType = 191;

5
eAmuseTest/Program.cs
View File

@ -46,9 +46,10 @@ namespace eAmuseTest
else if (compress != "none")
throw new ArgumentException("Unsupported compression algorithm");
//KBinXML kbinxml = new KBinXML(rawData);
KBinXML kbinxml = new KBinXML(rawData);
KBinXML testDoc = new KBinXML(ExtractResource("eAmuseTest.testcases_out.kbin"));
Console.WriteLine(testDoc.ToString());
}
private static string BytesToString(IEnumerable<byte> bytes)