juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix warnings and code cleanup/fixes (#13570)

Browse Source
This commit is contained in:
Visne
2023-01-19 03:56:45 +01:00
committed by GitHub
parent 3ca5a0224b
commit c6d3e4f3bd
265 changed files with 499 additions and 666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Tools/Merger.cs
View File

@@ -101,8 +101,8 @@ namespace Content.Tools
var outB = new byte[ExpectedChunkSize];
{
using (var outS = new MemoryStream(outB))
using (var outW = new BinaryWriter(outS))
using var outS = new MemoryStream(outB);
using var outW = new BinaryWriter(outS);
for (var i = 0; i < ExpectedChunkSize; i += 4)
{
@@ -239,8 +239,8 @@ namespace Content.Tools
if (!MapEntity(otherMapped))
return false;
// Merge stuff that isn't components
var path = "Entity" + (other["uid"].ToString());
YamlTools.MergeYamlMappings(ours, based, otherMapped, path, new string[] {"components"});
var path = "Entity" + other["uid"];
YamlTools.MergeYamlMappings(ours, based, otherMapped, path, new[] {"components"});
// Components are special
var ourComponents = new Dictionary<string, YamlMappingNode>();
var basedComponents = new Dictionary<string, YamlMappingNode>();
@@ -278,7 +278,7 @@ namespace Content.Tools
public bool MapEntity(YamlMappingNode other)
{
var path = "Entity" + (other["uid"].ToString());
var path = "Entity" + other["uid"];
if (other.Children.ContainsKey("components"))
{
var components = (YamlSequenceNode) other["components"];
@@ -341,7 +341,7 @@ namespace Content.Tools
if (!MapEntityRecursiveAndBadly(kvp.Key, path))
return false;
foreach (var kvp in subMapping)
if (!MapEntityRecursiveAndBadly(kvp.Value, path + "/" + kvp.Key.ToString()))
if (!MapEntityRecursiveAndBadly(kvp.Value, path + "/" + kvp.Key))
return false;
return true;
case YamlScalarNode subScalar:

4
Content.Tools/YamlTools.cs
View File

@@ -92,7 +92,7 @@ namespace Content.Tools
if (ignoreThese.Contains(kvp.Key.ToString()))
continue;
var localPath = path + "/" + kvp.Key.ToString();
var localPath = path + "/" + kvp.Key;
var deletedByOurs = !ours.Children.ContainsKey(kvp.Key);
var deletedByOther = !other.Children.ContainsKey(kvp.Key);
if (deletedByOther && (!deletedByOurs))
@@ -123,7 +123,7 @@ namespace Content.Tools
if (ignoreThese.Contains(kvp.Key.ToString()))
continue;
var localPath = path + "/" + kvp.Key.ToString();
var localPath = path + "/" + kvp.Key;
if (!based.Children.ContainsKey(kvp.Key))
{
if (ours.Children.ContainsKey(kvp.Key))