tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix warnings in Content.Tools module (#17862)

Browse Source
This commit is contained in:
TemporalOroboros
2023-07-10 00:39:21 -07:00
committed by GitHub
parent 4cc771f539
commit 7ec8bea20f
4 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Content.Tools/Merger.cs
View File

@@ -111,7 +111,7 @@ namespace Content.Tools
var cI = MapTileId(cR.ReadUInt32(), TileMapFromOtherToOurs);
// cI needs translation.
uint result = aI;
var result = aI;
if (aI == bI)
{
// If aI == bI then aI did not change anything, so cI always wins
@@ -138,12 +138,12 @@ namespace Content.Tools
}
}
public uint MapTileId(uint src, Dictionary<uint, uint> mapping)
public static uint MapTileId(uint src, Dictionary<uint, uint> mapping)
{
return (src & 0xFFFF0000) | mapping[src & 0xFFFF];
}
public Dictionary<string, YamlMappingNode> ConvertTileChunks(YamlSequenceNode chunks)
public static Dictionary<string, YamlMappingNode> ConvertTileChunks(YamlSequenceNode chunks)
{
var map = new Dictionary<string, YamlMappingNode>();
foreach (var chunk in chunks)
@@ -151,7 +151,7 @@ namespace Content.Tools
return map;
}
public byte[] GetChunkBytes(Dictionary<string, YamlMappingNode> chunks, string ind)
public static byte[] GetChunkBytes(Dictionary<string, YamlMappingNode> chunks, string ind)
{
if (!chunks.ContainsKey(ind))
return new byte[ExpectedChunkSize];
@@ -197,7 +197,7 @@ namespace Content.Tools
public bool MergeEntities()
{
bool success = true;
var success = true;
foreach (var kvp in EntityMapFromOtherToOurs)
{
// For debug use.
@@ -220,10 +220,13 @@ namespace Content.Tools
else
{
oursEnt = (YamlMappingNode) YamlTools.CopyYamlNodes(MapOther.Entities[kvp.Key]);
if (!MapEntity(oursEnt)) {
if (!MapEntity(oursEnt))
{
Console.WriteLine("Unable to successfully import entity C/" + kvp.Key);
success = false;
} else {
}
else
{
MapOurs.Entities[kvp.Value] = oursEnt;
}
}
@@ -240,7 +243,7 @@ namespace Content.Tools
return false;
// Merge stuff that isn't components
var path = "Entity" + other["uid"];
YamlTools.MergeYamlMappings(ours, based, otherMapped, path, new[] {"components"});
YamlTools.MergeYamlMappings(ours, based, otherMapped, path, new[] { "components" });
// Components are special
var ourComponents = new Dictionary<string, YamlMappingNode>();
var basedComponents = new Dictionary<string, YamlMappingNode>();
@@ -301,10 +304,11 @@ namespace Content.Tools
public bool MapEntityProperty(YamlMappingNode node, string property, string path)
{
if (node.Children.ContainsKey(property)) {
if (node.Children.ContainsKey(property))
{
var prop = node[property];
if (prop is YamlScalarNode)
return MapEntityProperty((YamlScalarNode) prop, path + "/" + property);
if (prop is YamlScalarNode yamlProp)
return MapEntityProperty(yamlProp, path + "/" + property);
}
return true;
}
@@ -333,7 +337,7 @@ namespace Content.Tools
case YamlSequenceNode subSequence:
var idx = 0;
foreach (var val in subSequence)
if (!MapEntityRecursiveAndBadly(val, path + "/" + (idx++)))
if (!MapEntityRecursiveAndBadly(val, path + "/" + idx++))
return false;
return true;
case YamlMappingNode subMapping: