From 15e8844514b0559674027770a7d1aa59bccd7a4c Mon Sep 17 00:00:00 2001
From: meli <57847713+ff-meli@users.noreply.github.com>
Date: Thu, 2 Apr 2020 22:20:06 -0700
Subject: [PATCH] Remove temp lumina injection; needs to happen somehow, but
 can hopefully be done a bit more cleanly.

---
 Dalamud/Dalamud.cs                            |  3 ---
 Dalamud/Game/Chat/SeStringHandling/Payload.cs | 10 +---------
 .../Payloads/MapLinkPayload.cs                | 19 ++++++++++---------
 .../Game/Chat/SeStringHandling/SeString.cs    |  4 +---
 4 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/Dalamud/Dalamud.cs b/Dalamud/Dalamud.cs
index 5dcc85c8e..3ed3b2ef8 100644
--- a/Dalamud/Dalamud.cs
+++ b/Dalamud/Dalamud.cs
@@ -88,9 +88,6 @@ namespace Dalamud {
             this.Data = new DataManager(this.StartInfo.Language);
             this.Data.Initialize();
 
-            // FIXME: need a better way to get this into the string payloads
-            Game.Chat.SeStringHandling.SeString.DataResolver = this.Data;
-
             this.ClientState = new ClientState(this, info, this.SigScanner);
 
             this.BotManager = new DiscordBotManager(this, this.Configuration.DiscordFeatureConfig);
diff --git a/Dalamud/Game/Chat/SeStringHandling/Payload.cs b/Dalamud/Game/Chat/SeStringHandling/Payload.cs
index 8f48c4174..b932a338d 100644
--- a/Dalamud/Game/Chat/SeStringHandling/Payload.cs
+++ b/Dalamud/Game/Chat/SeStringHandling/Payload.cs
@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Dalamud.Data;
 using Dalamud.Game.Chat.SeStringHandling.Payloads;
 using Serilog;
 
@@ -15,15 +14,13 @@ namespace Dalamud.Game.Chat.SeStringHandling
     {
         public abstract PayloadType Type { get; }
 
-        protected DataManager dataResolver;
-
         public abstract void Resolve();
 
         public abstract byte[] Encode();
 
         protected abstract void ProcessChunkImpl(BinaryReader reader, long endOfStream);
 
-        public static Payload Process(BinaryReader reader, DataManager dataResolver)
+        public static Payload Process(BinaryReader reader)
         {
             Payload payload = null;
             if ((byte)reader.PeekChar() != START_BYTE)
@@ -35,11 +32,6 @@ namespace Dalamud.Game.Chat.SeStringHandling
                 payload = ProcessChunk(reader);
             }
 
-            if (payload != null)
-            {
-                payload.dataResolver = dataResolver;
-            }
-
             return payload;
         }
 
diff --git a/Dalamud/Game/Chat/SeStringHandling/Payloads/MapLinkPayload.cs b/Dalamud/Game/Chat/SeStringHandling/Payloads/MapLinkPayload.cs
index 8060333d9..6115adab2 100644
--- a/Dalamud/Game/Chat/SeStringHandling/Payloads/MapLinkPayload.cs
+++ b/Dalamud/Game/Chat/SeStringHandling/Payloads/MapLinkPayload.cs
@@ -52,16 +52,17 @@ namespace Dalamud.Game.Chat.SeStringHandling.Payloads
 
         public override void Resolve()
         {
-            if (string.IsNullOrEmpty(Territory))
-            {
-                var terrRow = dataResolver.GetExcelSheet<TerritoryType>().GetRow((int)TerritoryTypeId);
-                Territory = dataResolver.GetExcelSheet<PlaceName>().GetRow(terrRow.PlaceName).Name;
-                Zone = dataResolver.GetExcelSheet<PlaceName>().GetRow(terrRow.PlaceNameZone).Name;
+            // TODO: add once lumina DI is figured out
+            //if (string.IsNullOrEmpty(Territory))
+            //{
+            //    var terrRow = dataResolver.GetExcelSheet<TerritoryType>().GetRow((int)TerritoryTypeId);
+            //    Territory = dataResolver.GetExcelSheet<PlaceName>().GetRow(terrRow.PlaceName).Name;
+            //    Zone = dataResolver.GetExcelSheet<PlaceName>().GetRow(terrRow.PlaceNameZone).Name;
 
-                var mapSizeFactor = dataResolver.GetExcelSheet<Map>().GetRow((int)MapId).SizeFactor;
-                XCoord = ConvertRawPositionToMapCoordinate(RawX, mapSizeFactor);
-                YCoord = ConvertRawPositionToMapCoordinate(RawY, mapSizeFactor);
-            }
+            //    var mapSizeFactor = dataResolver.GetExcelSheet<Map>().GetRow((int)MapId).SizeFactor;
+            //    XCoord = ConvertRawPositionToMapCoordinate(RawX, mapSizeFactor);
+            //    YCoord = ConvertRawPositionToMapCoordinate(RawY, mapSizeFactor);
+            //}
         }
 
         protected override void ProcessChunkImpl(BinaryReader reader, long endOfStream)
diff --git a/Dalamud/Game/Chat/SeStringHandling/SeString.cs b/Dalamud/Game/Chat/SeStringHandling/SeString.cs
index 0bd9b3b51..87e7dee62 100644
--- a/Dalamud/Game/Chat/SeStringHandling/SeString.cs
+++ b/Dalamud/Game/Chat/SeStringHandling/SeString.cs
@@ -14,8 +14,6 @@ namespace Dalamud.Game.Chat.SeStringHandling
     /// </summary>
     public class SeString
     {
-        public static DataManager DataResolver { get; set; }
-
         public List<Payload> Payloads { get; }
 
         public SeString(List<Payload> payloads)
@@ -59,7 +57,7 @@ namespace Dalamud.Game.Chat.SeStringHandling
 
                 while (stream.Position < bytes.Length)
                 {
-                    var payload = Payload.Process(reader, DataResolver);
+                    var payload = Payload.Process(reader);
                     if (payload != null)
                         payloads.Add(payload);
                 }