3.0.5515.15265

code cleanup and fix item parsing in chatcleaner
FFXIVAPP · Feb 6, 2015 · a8d7cd1 · a8d7cd1
1 parent ba657fd
commit a8d7cd1
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 14 deletions.
diff --git a/FFXIVAPP.Client/Delegates/PCWorkerDelegate.cs b/FFXIVAPP.Client/Delegates/PCWorkerDelegate.cs
@@ -98,11 +98,10 @@ public static IList<ActorEntity> GetUniqueNPCEntities()
 
         #region Declarations
 
-        public static ActorEntity CurrentUser { get; set; }
-
         private static IList<ActorEntity> _npcEntities = new List<ActorEntity>();
 
         private static IList<ActorEntity> _uniqueNPCEntities = new List<ActorEntity>();
+        public static ActorEntity CurrentUser { get; set; }
 
         #endregion
     }

diff --git a/FFXIVAPP.Client/Helpers/ActorEntityHelper.cs b/FFXIVAPP.Client/Helpers/ActorEntityHelper.cs
@@ -29,12 +29,12 @@
 
 using System;
 using System.Collections.Generic;
+using FFXIVAPP.Client.Delegates;
 using FFXIVAPP.Client.Memory;
 using FFXIVAPP.Client.Properties;
 using FFXIVAPP.Common.Core.Memory;
 using FFXIVAPP.Common.Core.Memory.Enums;
 using FFXIVAPP.Common.Helpers;
-using FFXIVAPP.Client.Delegates;
 
 namespace FFXIVAPP.Client.Helpers
 {

diff --git a/FFXIVAPP.Client/Memory/ChatCleaner.cs b/FFXIVAPP.Client/Memory/ChatCleaner.cs
@@ -111,8 +111,6 @@ private string ProcessFullLine(byte[] bytes)
             {
                 var autoTranslateList = new List<byte>();
                 var newList = new List<byte>();
-                //var check = Encoding.UTF8.GetString(bytes.Take(4)
-                //                                         .ToArray());
                 for (var x = 0; x < bytes.Count(); x++)
                 {
                     if (bytes[x] == 2)
@@ -133,14 +131,16 @@ private string ProcessFullLine(byte[] bytes)
                             //2 46 5 7 242 2 210 3
                             //2 29 1 3
                             var length = bytes[x + 2];
+                            var limit = length - 1;
                             if (length > 1)
                             {
                                 x = x + 3;
                                 autoTranslateList.Add(Convert.ToByte('['));
-                                while (bytes[x] != 3)
+                                var translated = new byte[limit];
+                                Buffer.BlockCopy(bytes, x, translated, 0, limit);
+                                foreach (var b in translated)
                                 {
-                                    autoTranslateList.AddRange(Encoding.UTF8.GetBytes(bytes[x].ToString("X2")));
-                                    x++;
+                                    autoTranslateList.AddRange(Encoding.UTF8.GetBytes(b.ToString("X2")));
                                 }
                                 autoTranslateList.Add(Convert.ToByte(']'));
                                 string aCheckStr;
@@ -150,9 +150,16 @@ private string ProcessFullLine(byte[] bytes)
                                 {
                                     aCheckStr = "";
                                 }
-                                var atbyte = (!String.IsNullOrWhiteSpace(aCheckStr)) ? Encoding.UTF8.GetBytes(aCheckStr) : autoTranslateList.ToArray();
-                                newList.AddRange(atbyte);
+                                if (String.IsNullOrWhiteSpace(aCheckStr))
+                                {
+                                    // TODO: implement showing or using in the chatlog
+                                }
+                                else
+                                {
+                                    newList.AddRange(Encoding.UTF8.GetBytes(aCheckStr));
+                                }
                                 autoTranslateList.Clear();
+                                x += limit;
                             }
                             else
                             {
@@ -166,15 +173,19 @@ private string ProcessFullLine(byte[] bytes)
                             break;
                     }
                 }
+                //var cleanedList = newList.Where(v => (v >= 0x0020 && v <= 0xD7FF) || (v >= 0xE000 && v <= 0xFFFD) || v == 0x0009 || v == 0x000A || v == 0x000D);
                 var cleaned = HttpUtility.HtmlDecode(Encoding.UTF8.GetString(newList.ToArray()))
                                          .Replace("  ", " ");
                 autoTranslateList.Clear();
                 newList.Clear();
                 cleaned = Regex.Replace(cleaned, @"", "⇒");
                 cleaned = Regex.Replace(cleaned, @"", "[HQ]");
+                cleaned = Regex.Replace(cleaned, @"", "");
+                cleaned = Regex.Replace(cleaned, @"�", "");
                 cleaned = Regex.Replace(cleaned, @"\[+0([12])010101([\w]+)?\]+", "");
                 cleaned = Regex.Replace(cleaned, @"\[+CF010101([\w]+)?\]+", "");
                 cleaned = Regex.Replace(cleaned, @"\[+..FF\w{6}\]+|\[+EC\]+", "");
+                cleaned = Regex.Replace(cleaned, @"\[\]+", "");
                 line = cleaned;
             }
             catch (Exception ex)

diff --git a/FFXIVAPP.Client/Memory/MonsterWorker.cs b/FFXIVAPP.Client/Memory/MonsterWorker.cs
@@ -40,7 +40,6 @@
 using FFXIVAPP.Common.Core.Memory;
 using FFXIVAPP.Common.Core.Memory.Enums;
 using NLog;
-using FFXIVAPP.Client.Delegates;
 
 namespace FFXIVAPP.Client.Memory
 {
@@ -156,7 +155,7 @@ private void ScanTimerElapsed(object sender, ElapsedEventArgs e)
 
                             #region ActorEntity Handlers
 
-                            bool firstTime = true;
+                            var firstTime = true;
 
                             var monsterEntries = new List<ActorEntity>();
                             var pcEntries = new List<ActorEntity>();

diff --git a/FFXIVAPP.Client/Memory/PlayerInfoWorker.cs b/FFXIVAPP.Client/Memory/PlayerInfoWorker.cs
@@ -131,7 +131,7 @@ private void ScanTimerElapsed(object sender, ElapsedEventArgs e)
                                     {
                                         ID = (uint) MemoryHandler.Instance.GetInt32(address),
                                         Name = MemoryHandler.Instance.GetString(address + 4),
-                                        Enmity = (uint)MemoryHandler.Instance.GetInt16(address + 72)
+                                        Enmity = (uint) MemoryHandler.Instance.GetInt16(address + 72)
                                     };
                                     if (enmityEntry.ID > 0)
                                     {

diff --git a/FFXIVAPP.Client/Memory/TargetWorker.cs b/FFXIVAPP.Client/Memory/TargetWorker.cs
@@ -113,7 +113,7 @@ private void ScanTimerElapsed(object sender, ElapsedEventArgs e)
                     {
                         try
                         {
-                            var targetHateStructure = MemoryHandler.Instance.SigScanner.Locations["CHARMAP"] - 120584;// + 1136;
+                            var targetHateStructure = MemoryHandler.Instance.SigScanner.Locations["CHARMAP"] - 120584; // + 1136;
                             var enmityEntries = new List<EnmityEntry>();
                             var targetEntity = new TargetEntity();
                             if (MemoryHandler.Instance.SigScanner.Locations.ContainsKey("TARGET"))

diff --git a/distribution/FFXIVAPP.Client.exe b/distribution/FFXIVAPP.Client.exe
diff --git a/distribution/FFXIVAPP.Updater.exe b/distribution/FFXIVAPP.Updater.exe