Replaced NodeUuid with Guid.

Author: KN4CK3R

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.IO;
@@ -104,7 +104,7 @@ public void Load(Stream input, ILogger logger)
 				{
 					var node = new ClassNode(false)
 					{
-						Uuid = NodeUuid.FromBase64String(element.Attribute(XmlUuidAttribute)?.Value, true),
+						Uuid = ParseUuid(element.Attribute(XmlUuidAttribute)?.Value),
 						Name = element.Attribute(XmlNameAttribute)?.Value ?? string.Empty,
 						Comment = element.Attribute(XmlCommentAttribute)?.Value ?? string.Empty,
 						AddressFormula = element.Attribute(XmlAddressAttribute)?.Value ?? string.Empty
@@ -173,7 +173,7 @@ BaseNode CreateNode()
 			{
 				ClassNode GetClassNodeFromElementReference()
 				{
-					var reference = NodeUuid.FromBase64String(element.Attribute(XmlReferenceAttribute)?.Value, false);
+					var reference = ParseUuid(element.Attribute(XmlReferenceAttribute)?.Value);
 					if (!project.ContainsClass(reference))
 					{
 						logger.Log(LogLevel.Error, $"Skipping node with unknown reference: {reference}");
@@ -286,7 +286,7 @@ ClassNode GetClassNodeFromElementReference()
 				{
 					functionNode.Signature = element.Attribute(XmlSignatureAttribute)?.Value ?? string.Empty;
 
-					var reference = NodeUuid.FromBase64String(element.Attribute(XmlReferenceAttribute)?.Value, false);
+					var reference = ParseUuid(element.Attribute(XmlReferenceAttribute)?.Value);
 					if (project.ContainsClass(reference))
 					{
 						functionNode.BelongsToClass = project.GetClassByUuid(reference);
@@ -306,6 +306,12 @@ ClassNode GetClassNodeFromElementReference()
 			return node;
 		}
 
+		private static Guid ParseUuid(string raw) => raw == null
+				? throw new ArgumentNullException()
+				: raw.Length == 24
+					? new Guid(Convert.FromBase64String(raw))
+					: Guid.Parse(raw);
+
 		public static Tuple<List<ClassNode>, List<BaseNode>> DeserializeNodesFromStream(Stream input, ReClassNetProject templateProject, ILogger logger)
 		{
 			Contract.Requires(input != null);

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

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.IO;
 using System.IO.Compression;
@@ -67,7 +68,7 @@ private static IEnumerable<XElement> CreateClassElements(IEnumerable<ClassNode>
 
 			return classes.Select(c => new XElement(
 				XmlClassElement,
-				new XAttribute(XmlUuidAttribute, c.Uuid.ToBase64String()),
+				new XAttribute(XmlUuidAttribute, c.Uuid),
 				new XAttribute(XmlNameAttribute, c.Name ?? string.Empty),
 				new XAttribute(XmlCommentAttribute, c.Comment ?? string.Empty),
 				new XAttribute(XmlAddressAttribute, c.AddressFormula ?? string.Empty),
@@ -118,7 +119,7 @@ XElement CreateElement()
 			{
 				if (node is BaseClassWrapperNode classWrapperNode)
 				{
-					element.SetAttributeValue(XmlReferenceAttribute, ((ClassNode)classWrapperNode.InnerNode).Uuid.ToBase64String());
+					element.SetAttributeValue(XmlReferenceAttribute, ((ClassNode)classWrapperNode.InnerNode).Uuid);
 				}
 				else if (wrapperNode.InnerNode != null)
 				{
@@ -160,8 +161,8 @@ XElement CreateElement()
 				}
 				case FunctionNode functionNode:
 				{
-					var uuid = functionNode.BelongsToClass == null ? NodeUuid.Zero : functionNode.BelongsToClass.Uuid;
-					element.SetAttributeValue(XmlReferenceAttribute, uuid.ToBase64String());
+					var uuid = functionNode.BelongsToClass?.Uuid ?? Guid.Empty;
+					element.SetAttributeValue(XmlReferenceAttribute, uuid);
 					element.SetAttributeValue(XmlSignatureAttribute, functionNode.Signature);
 					break;
 				}

ReClass.NET/Nodes/ClassNode.cs

@@ -25,17 +25,7 @@ public class ClassNode : BaseContainerNode
 
 		protected override bool ShouldCompensateSizeChanges => true;
 
-		private NodeUuid uuid;
-		public NodeUuid Uuid
-		{
-			get => uuid;
-			set
-			{
-				Contract.Requires(value != null);
-
-				uuid = value;
-			}
-		}
+		public Guid Uuid { get; set; }
 
 		public string AddressFormula { get; set; } = DefaultAddressFormula;
 
@@ -47,7 +37,7 @@ internal ClassNode(bool notifyClassCreated)
 
 			LevelsOpen.DefaultValue = true;
 
-			Uuid = new NodeUuid(true);
+			Uuid = Guid.NewGuid();
 
 			if (notifyClassCreated)
 			{

ReClass.NET/Nodes/NodeUuid.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
@@ -59,14 +59,14 @@ public void AddClass(ClassNode node)
 			ClassAdded?.Invoke(node);
 		}
 
-		public bool ContainsClass(NodeUuid uuid)
+		public bool ContainsClass(Guid uuid)
 		{
 			Contract.Requires(uuid != null);
 
 			return classes.Any(c => c.Uuid.Equals(uuid));
 		}
 
-		public ClassNode GetClassByUuid(NodeUuid uuid)
+		public ClassNode GetClassByUuid(Guid uuid)
 		{
 			Contract.Requires(uuid != null);
 

ReClass.NET/Project/ReClassNetProject.cs

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -290,7 +290,6 @@
     <Compile Include="Nodes\EnumNode.cs" />
     <Compile Include="Nodes\FunctionNode.cs" />
     <Compile Include="Nodes\NIntNode.cs" />
-    <Compile Include="Nodes\NodeUuid.cs" />
     <Compile Include="Nodes\PointerNode.cs" />
     <Compile Include="Nodes\NUIntNode.cs" />
     <Compile Include="Nodes\UnionNode.cs" />