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

0.462.0.416719

Browse Source
This commit is contained in:
CloneTrooper1019
2021-01-20 14:45:58 -06:00
parent 1a34e9c849
commit 1acb895eaf
17 changed files with 63 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
XmlFormat/IO/XmlFileReader.cs
View File

@ -109,7 +109,7 @@ namespace RobloxFiles.XmlFormat
if (!tokenHandler.ReadProperty(prop, propNode) && RobloxFile.LogErrors)
{
var readError = error($"Could not read property: {prop.GetFullName()}!");
Console.Error.WriteLine(readError.Message);
RobloxFile.LogError(readError.Message);
}
instance.AddProperty(ref prop);
@ -117,7 +117,7 @@ namespace RobloxFiles.XmlFormat
else if (RobloxFile.LogErrors)
{
var tokenError = error($"No {nameof(IXmlPropertyToken)} found for property type: {propType}!");
Console.Error.WriteLine(tokenError.Message);
RobloxFile.LogError(tokenError.Message);
}
}
}
@ -142,7 +142,7 @@ namespace RobloxFiles.XmlFormat
if (RobloxFile.LogErrors)
{
var typeError = error($"Unknown class {className} while reading Item.");
Console.Error.WriteLine(typeError.Message);
RobloxFile.LogError(typeError.Message);
}
return null;

4
XmlFormat/IO/XmlFileWriter.cs
View File

@ -94,9 +94,7 @@ namespace RobloxFiles.XmlFormat
if (handler == null)
{
if (RobloxFile.LogErrors)
Console.Error.WriteLine("XmlDataWriter.WriteProperty: No token handler found for property type: {0}", propType);
RobloxFile.LogError($"XmlRobloxFileWriter.WriteProperty: No token handler found for property type: {propType}");
return null;
}

5
XmlFormat/Tokens/Content.cs
View File

@ -30,10 +30,7 @@ namespace RobloxFiles.XmlFormat.PropertyTokens
}
catch
{
if (!RobloxFile.LogErrors)
return true;
Console.Error.WriteLine("ContentToken: Got illegal base64 string: {0}", data);
RobloxFile.LogError($"ContentToken: Got illegal base64 string: {data}");
}
}
}

14
XmlFormat/XmlRobloxFile.cs
View File

@ -97,11 +97,7 @@ namespace RobloxFiles
}
else if (refId != "null")
{
string name = refProp.GetFullName();
if (LogErrors)
Console.Error.WriteLine("XmlRobloxFile: Could not resolve reference for {0}", name);
LogError($"XmlRobloxFile: Could not resolve reference for {refProp.GetFullName()}");
refProp.Value = null;
}
}
@ -112,6 +108,14 @@ namespace RobloxFiles
foreach (Property sharedProp in sharedProps)
{
SharedString shared = sharedProp.CastValue<SharedString>();
if (shared == null)
{
var nullBuffer = Array.Empty<byte>();
shared = SharedString.FromBuffer(nullBuffer);
sharedProp.Value = shared;
}
SharedStrings.Add(shared.Key);
}
}