Removed redundant code.

Author: KN4CK3R

ReClass.NET/Memory/MemoryBuffer.cs

@@ -502,7 +502,17 @@ public string ReadPrintableAsciiString(int offset, int length)
 			return sb.ToString();
 		}
 
-		private string ReadString(Encoding encoding, int offset, int length)
+		public string ReadString(Encoding encoding, IntPtr offset, int length)
+		{
+			Contract.Requires(encoding != null);
+			Contract.Requires(offset.ToInt32() >= 0);
+			Contract.Requires(length >= 0);
+			Contract.Ensures(Contract.Result<string>() != null);
+
+			return ReadString(encoding, offset.ToInt32(), length);
+		}
+
+		public string ReadString(Encoding encoding, int offset, int length)
 		{
 			Contract.Requires(encoding != null);
 			Contract.Requires(offset >= 0);
@@ -525,33 +535,6 @@ private string ReadString(Encoding encoding, int offset, int length)
 			return sb.ToString();
 		}
 
-		public string ReadUtf8String(IntPtr offset, int length)
-		{
-			Contract.Requires(offset.ToInt32() >= 0);
-			Contract.Requires(length >= 0);
-			Contract.Ensures(Contract.Result<string>() != null);
-
-			return ReadString(Encoding.UTF8, offset.ToInt32(), length);
-		}
-
-		public string ReadUtf16String(IntPtr offset, int length)
-		{
-			Contract.Requires(offset.ToInt32() >= 0);
-			Contract.Requires(length >= 0);
-			Contract.Ensures(Contract.Result<string>() != null);
-
-			return ReadString(Encoding.Unicode, offset.ToInt32(), length);
-		}
-
-		public string ReadUtf32String(IntPtr offset, int length)
-		{
-			Contract.Requires(offset.ToInt32() >= 0);
-			Contract.Requires(length >= 0);
-			Contract.Ensures(Contract.Result<string>() != null);
-
-			return ReadString(Encoding.UTF32, offset.ToInt32(), length);
-		}
-
 		public bool HasChanged(IntPtr offset, int length)
 		{
 			return HasChanged(offset.ToInt32(), length);

ReClass.NET/Nodes/BaseTextNode.cs

@@ -2,6 +2,7 @@
 using System.Diagnostics.Contracts;
 using System.Drawing;
 using System.Text;
+using ReClassNET.Memory;
 using ReClassNET.UI;
 using ReClassNET.Util;
 
@@ -25,17 +26,19 @@ public override void CopyFromNode(BaseNode node)
 			Length = node.MemorySize / CharacterSize;
 		}
 
-		protected Size DrawText(ViewInfo view, int x, int y, string type, int length, string text)
+		protected Size DrawText(ViewInfo view, int x, int y, string type)
 		{
 			Contract.Requires(view != null);
 			Contract.Requires(type != null);
-			Contract.Requires(text != null);
 
 			if (IsHidden)
 			{
 				return DrawHidden(view, x, y);
 			}
 
+			var length = MemorySize / CharacterSize;
+			var text = ReadValueFromMemory(view.Memory);
+
 			DrawInvalidMemoryIndicator(view, y);
 
 			var origX = x;
@@ -83,6 +86,11 @@ public override void Update(HotSpot spot)
 				}
 			}
 		}
+
+		public string ReadValueFromMemory(MemoryBuffer memory)
+		{
+			return memory.ReadString(Encoding, Offset, MemorySize);
+		}
 	}
 
 	[ContractClassFor(typeof(BaseTextNode))]

ReClass.NET/Nodes/UTF16TextNode.cs

@@ -11,19 +11,9 @@ public class Utf16TextNode : BaseTextNode
 
 		public override Encoding Encoding => Encoding.Unicode;
 
-		/// <summary>Draws this node.</summary>
-		/// <param name="view">The view information.</param>
-		/// <param name="x">The x coordinate.</param>
-		/// <param name="y">The y coordinate.</param>
-		/// <returns>The pixel size the node occupies.</returns>
 		public override Size Draw(ViewInfo view, int x, int y)
 		{
-			return DrawText(view, x, y, "Text16", MemorySize / CharacterSize, view.Memory.ReadUtf16String(Offset, MemorySize));
-		}
-
-		public string ReadValueFromMemory(MemoryBuffer memory)
-		{
-			return memory.ReadUtf16String(Offset, MemorySize);
+			return DrawText(view, x, y, "Text16");
 		}
 	}
 }

ReClass.NET/Nodes/UTF32TextNode.cs

@@ -11,19 +11,9 @@ public class Utf32TextNode : BaseTextNode
 
 		public override Encoding Encoding => Encoding.UTF32;
 
-		/// <summary>Draws this node.</summary>
-		/// <param name="view">The view information.</param>
-		/// <param name="x">The x coordinate.</param>
-		/// <param name="y">The y coordinate.</param>
-		/// <returns>The pixel size the node occupies.</returns>
 		public override Size Draw(ViewInfo view, int x, int y)
 		{
-			return DrawText(view, x, y, "Text32", MemorySize / CharacterSize, view.Memory.ReadUtf32String(Offset, MemorySize));
-		}
-
-		public string ReadValueFromMemory(MemoryBuffer memory)
-		{
-			return memory.ReadUtf32String(Offset, MemorySize);
+			return DrawText(view, x, y, "Text32");
 		}
 	}
 }

ReClass.NET/Nodes/UTF8TextNode.cs

@@ -11,19 +11,9 @@ public class Utf8TextNode : BaseTextNode
 
 		public override Encoding Encoding => Encoding.UTF8;
 
-		/// <summary>Draws this node.</summary>
-		/// <param name="view">The view information.</param>
-		/// <param name="x">The x coordinate.</param>
-		/// <param name="y">The y coordinate.</param>
-		/// <returns>The pixel size the node occupies.</returns>
 		public override Size Draw(ViewInfo view, int x, int y)
 		{
-			return DrawText(view, x, y, "Text8", MemorySize, view.Memory.ReadUtf8String(Offset, MemorySize));
-		}
-
-		public string ReadValueFromMemory(MemoryBuffer memory)
-		{
-			return memory.ReadUtf8String(Offset, MemorySize);
+			return DrawText(view, x, y, "Text8");
 		}
 	}
 }