Switched key and value.

Author: KN4CK3R

ReClass.NET/DataExchange/ReClass/ReClassNetFile.Read.cs

@@ -76,13 +76,13 @@ public void Load(Stream input, ILogger logger)
 							var useFlagsMode = (bool?)enumElement.Attribute(XmlFlagsAttribute) ?? false;
 							var size = enumElement.Attribute(XmlSizeAttribute).GetEnumValue<EnumMetaData.UnderlyingTypeSize>();
 
-							var values = new Dictionary<long, string>();
+							var values = new Dictionary<string, long>();
 							foreach (var itemElement in enumElement.Elements(XmlItemElement))
 							{
 								var itemName = itemElement.Attribute(XmlNameAttribute)?.Value ?? string.Empty;
-								var itemValue = (long?)itemElement.Attribute(XmlValueAttribute) ?? 0;
+								var itemValue = (long?)itemElement.Attribute(XmlValueAttribute) ?? 0L;
 
-								values.Add(itemValue, itemName);
+								values.Add(itemName, itemValue);
 							}
 
 							var @enum = new EnumMetaData

ReClass.NET/DataExchange/ReClass/ReClassNetFile.Write.cs

@@ -55,8 +55,8 @@ private static IEnumerable<XElement> CreateEnumElements(IEnumerable<EnumMetaData
 				new XAttribute(XmlFlagsAttribute, e.UseFlagsMode),
 				e.Values.Select(kv => new XElement(
 					XmlItemElement,
-					new XAttribute(XmlValueAttribute, kv.Key),
-					new XAttribute(XmlNameAttribute, kv.Value)
+					new XAttribute(XmlNameAttribute, kv.Key),
+					new XAttribute(XmlValueAttribute, kv.Value)
 				))
 			));
 		}

ReClass.NET/Forms/EnumEditorForm.cs

@@ -45,18 +45,18 @@ private void saveButton_Click(object sender, EventArgs e)
 		{
 			@enum.Name = enumNameTextBox.Text;
 
-			var values = new Dictionary<long, string>();
+			var values = new Dictionary<string, long>();
 
 			foreach (var row in enumDataGridView.Rows.Cast<DataGridViewRow>().Where(r => r.IsNewRow == false))
 			{
-				if (!long.TryParse(Convert.ToString(row.Cells[0].Value), out var valueKey))
+				if (!long.TryParse(Convert.ToString(row.Cells[0].Value), out var itemValue))
 				{
 					continue;
 				}
 
-				var valueName = Convert.ToString(row.Cells[1].Value);
+				var itemName = Convert.ToString(row.Cells[1].Value);
 
-				values.Add(valueKey, valueName);
+				values.Add(itemName, itemValue);
 			}
 
 			@enum.SetData(enumFlagCheckBox.Checked, enumUnderlyingTypeSizeComboBox.SelectedValue, values);

ReClass.NET/Nodes/EnumNode.cs

@@ -73,13 +73,13 @@ private string GetStringRepresentation(long value)
 		{
 			if (!MetaData.UseFlagsMode)
 			{
-				var index = MetaData.Values.FindIndex(kv => kv.Key == value);
+				var index = MetaData.Values.FindIndex(kv => kv.Value == value);
 				if (index == -1)
 				{
 					return value.ToString();
 				}
 
-				return MetaData.Values[index].Value;
+				return MetaData.Values[index].Key;
 			}
 
 			return GetFlagsStringRepresentation(value);
@@ -98,7 +98,7 @@ private string GetFlagsStringRepresentation(long value)
 
 			while (index >= 0)
 			{
-				var temp = (ulong)values[index].Key;
+				var temp = (ulong)values[index].Value;
 				if (index == 0 && temp == 0)
 				{
 					break;
@@ -112,7 +112,7 @@ private string GetFlagsStringRepresentation(long value)
 						retval.Prepend(" | ");
 					}
 
-					retval.Prepend(values[index].Value);
+					retval.Prepend(values[index].Key);
 					firstTime = false;
 				}
 
@@ -126,9 +126,9 @@ private string GetFlagsStringRepresentation(long value)
 
 			if (saveResult == 0)
 			{
-				if (values.Count > 0 && values[0].Key == 0)
+				if (values.Count > 0 && values[0].Value == 0)
 				{
-					return values[0].Value;
+					return values[0].Key;
 				}
 
 				return "0";

ReClass.NET/Project/EnumMetaData.cs

@@ -22,9 +22,9 @@ public enum UnderlyingTypeSize
 
 		public UnderlyingTypeSize Size { get; private set; } = UnderlyingTypeSize.FourBytes;
 
-		public IReadOnlyList<KeyValuePair<long, string>> Values { get; private set; } = new Dictionary<long, string>().ToList();
+		public IReadOnlyList<KeyValuePair<string, long>> Values { get; private set; } = new Dictionary<string, long>().ToList();
 
-		public void SetData(bool useFlagsMode, UnderlyingTypeSize size, IEnumerable<KeyValuePair<long, string>> values)
+		public void SetData(bool useFlagsMode, UnderlyingTypeSize size, IEnumerable<KeyValuePair<string, long>> values)
 		{
 			var temp = values.OrderBy(t => t.Key).ToList();
 
@@ -44,7 +44,7 @@ public void SetData(bool useFlagsMode, UnderlyingTypeSize size, IEnumerable<KeyV
 						break;
 				}
 
-				if (temp.Select(kv => (ulong)kv.Key).Max() > maxPossibleValue)
+				if (temp.Select(kv => (ulong)kv.Value).Max() > maxPossibleValue)
 				{
 					throw new ArgumentOutOfRangeException();
 				}
@@ -69,7 +69,7 @@ public void SetData(bool useFlagsMode, UnderlyingTypeSize size, IEnumerable<KeyV
 						break;
 				}
 
-				if (temp.Max(kv => kv.Key) > maxPossibleValue || temp.Min(kv => kv.Key) < minPossibleValue)
+				if (temp.Max(kv => kv.Value) > maxPossibleValue || temp.Min(kv => kv.Value) < minPossibleValue)
 				{
 					throw new ArgumentOutOfRangeException();
 				}