Source2Roblox/Roblox-File-Format
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some minor issues.

Browse Source
This commit is contained in:
CloneTrooper1019 2019-05-25 18:45:54 -05:00
parent 9c3a673d95
commit cb063d1ada
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XmlFormat/IO/XmlFileWriter.cs
View File

@ -40,7 +40,7 @@ namespace RobloxFiles.XmlFormat
foreach (Instance child in inst.GetChildren()) foreach (Instance child in inst.GetChildren())
RecordInstances(file, child); RecordInstances(file, child);
if (inst.XmlReferent == "") if (inst.XmlReferent.Length < 35)
inst.XmlReferent = CreateReferent(); inst.XmlReferent = CreateReferent();
file.Instances.Add(inst.XmlReferent, inst); file.Instances.Add(inst.XmlReferent, inst);

24
XmlFormat/PropertyTokens/Tokens/Content.cs
View File

@ -20,9 +20,16 @@ namespace RobloxFiles.XmlFormat.PropertyTokens
if (contentType.StartsWith("binary") || contentType == "hash") if (contentType.StartsWith("binary") || contentType == "hash")
{ {
// Roblox technically doesn't support this anymore, but load it anyway :P try
byte[] buffer = Convert.FromBase64String(content); {
prop.RawBuffer = buffer; // Roblox technically doesn't support this anymore, but load it anyway :P
byte[] buffer = Convert.FromBase64String(content);
prop.RawBuffer = buffer;
}
catch
{
Console.WriteLine("ContentToken: Got illegal base64 string: {0}", content);
}
} }
} }
@ -40,8 +47,17 @@ namespace RobloxFiles.XmlFormat.PropertyTokens
type = "url"; type = "url";
XmlElement contentType = doc.CreateElement(type); XmlElement contentType = doc.CreateElement(type);
contentType.InnerText = content;
if (type == "binary")
{
XmlCDataSection cdata = doc.CreateCDataSection(content);
contentType.AppendChild(cdata);
}
else
{
contentType.InnerText = content;
}
node.AppendChild(contentType); node.AppendChild(contentType);
} }
} }

4
XmlFormat/XmlRobloxFile.cs
View File

@ -29,7 +29,7 @@ namespace RobloxFiles.XmlFormat
string xml = Encoding.UTF8.GetString(buffer); string xml = Encoding.UTF8.GetString(buffer);
Root.LoadXml(xml); Root.LoadXml(xml);
} }
catch catch (Exception e)
{ {
throw new Exception("XmlRobloxFile: Could not read provided buffer as XML!"); throw new Exception("XmlRobloxFile: Could not read provided buffer as XML!");
} }
@ -82,6 +82,7 @@ namespace RobloxFiles.XmlFormat
{ {
string name = refProp.GetFullName(); string name = refProp.GetFullName();
Console.WriteLine("XmlRobloxFile: Could not resolve reference for {0}", name); Console.WriteLine("XmlRobloxFile: Could not resolve reference for {0}", name);
refProp.Value = null;
} }
} }
@ -158,6 +159,7 @@ namespace RobloxFiles.XmlFormat
using (BinaryWriter writer = new BinaryWriter(stream)) using (BinaryWriter writer = new BinaryWriter(stream))
{ {
byte[] data = Encoding.UTF8.GetBytes(result); byte[] data = Encoding.UTF8.GetBytes(result);
stream.SetLength(0);
writer.Write(data); writer.Write(data);
} }
} }