add option to line-break before links

SlashNephy · Apr 29, 2024 · dbc33c1 · dbc33c1
1 parent 4c515c4
commit dbc33c1
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 14 deletions.
diff --git a/AetheryteLinkInChat/AetheryteLinkInChat.cs b/AetheryteLinkInChat/AetheryteLinkInChat.cs
@@ -97,46 +97,41 @@ private void AppendNearestAetheryteLink(ref SeString message)
                 Dalamud.ClientState.TerritoryType);
         }
 
+        var payloads = new List<Payload>();
         foreach (var (index, path) in paths.Select((x, i) => (i, x)))
         {
             switch (path)
             {
                 // テレポ可能なエーテライト
                 case AetheryteTeleportPath { Aetheryte.IsAetheryte: true } aetheryte:
-                    var payloads = new List<Payload>
-                    {
+                    payloads.AddRange([
                         new IconPayload(BitmapFontIcon.Aetheryte),
                         new UIForegroundPayload(069),
+                        ..SeString.TextArrowPayloads,
                         aetheryteLinkPayload,
                         new TextPayload(aetheryte.Aetheryte.PlaceName.Value?.Name.RawString),
                         new AetherytePayload(aetheryte.Aetheryte).ToRawPayload(),
                         RawPayload.LinkTerminator,
                         UIForegroundPayload.UIForegroundOff,
-                    };
-                    payloads.InsertRange(2, SeString.TextArrowPayloads);
-
-                    message = message.Append(payloads);
+                    ]);
                     break;
                 // 仮設エーテライト・都市内エーテライト
                 case AetheryteTeleportPath { Aetheryte.IsAetheryte: false } aetheryte:
-                    message = message.Append(
-                    [
+                    payloads.AddRange([
                         new IconPayload(BitmapFontIcon.Aethernet),
                         new TextPayload(aetheryte.Aetheryte.AethernetName.Value?.Name.RawString),
                     ]);
                     break;
                 // マップ境界
                 case BoundaryTeleportPath boundary:
-                    message = message.Append(
-                    [
+                    payloads.AddRange([
                         new IconPayload(BitmapFontIcon.FlyZone),
                         new TextPayload(boundary.ConnectedMarker.PlaceNameSubtext.Value?.Name.RawString),
                     ]);
                     break;
                 // ワールド間テレポ
                 case WorldTeleportPath world:
-                    message = message.Append(
-                    [
+                    payloads.AddRange([
                         new IconPayload(BitmapFontIcon.Aetheryte),
                         new UIForegroundPayload(069),
                         aetheryteLinkPayload,
@@ -153,15 +148,15 @@ private void AppendNearestAetheryteLink(ref SeString message)
 
             if (index != paths.Count - 1)
             {
-                message = message.Append(new TextPayload($" {SeIconChar.ArrowRight.ToIconString()} "));
+                payloads.Add(new TextPayload($" {SeIconChar.ArrowRight.ToIconString()} "));
             }
         }
 
         if (Config.EnableLifestreamIntegration && teleporter.IsLifestreamAvailable())
         {
             var world = solver.DetectWorld(message, Dalamud.ClientState.LocalPlayer?.CurrentWorld.GameData);
 
-            message = message.Append([
+            payloads.AddRange([
                 new TextPayload(" ["),
                 new IconPayload(BitmapFontIcon.Aetheryte),
                 new UIForegroundPayload(069),
@@ -174,6 +169,16 @@ private void AppendNearestAetheryteLink(ref SeString message)
                 new TextPayload("]"),
             ]);
         }
+
+        if (payloads.Count > 0)
+        {
+            if (Config.DisplayLineBreak)
+            {
+                payloads.Insert(0, new TextPayload("\n"));
+            }
+
+            message.Payloads.AddRange(payloads);
+        }
     }
 
     private void HandleAetheryteLink(uint _, SeString link)

diff --git a/AetheryteLinkInChat/Config/PluginConfig.cs b/AetheryteLinkInChat/Config/PluginConfig.cs
@@ -12,6 +12,7 @@ public class PluginConfig : IPluginConfiguration
     public int PreferredGrandCompanyAetheryte;
     public bool ConsiderTeleportsToOtherWorlds;
     public bool EnableLifestreamIntegration;
+    public bool DisplayLineBreak;
 
     public bool EnableChatNotificationOnTeleport = true;
     public bool EnableQuestNotificationOnTeleport = true;

diff --git a/AetheryteLinkInChat/Config/PluginConfigWindow.cs b/AetheryteLinkInChat/Config/PluginConfigWindow.cs
@@ -90,6 +90,8 @@ private void DrawGeneralTab()
             ImGui.Text(Localization.EnableLifestreamIntegrationDescription);
             ImGui.Unindent();
 
+            ImGui.Checkbox(Localization.DisplayLineBreak, ref Config.DisplayLineBreak);
+
             ImGui.Checkbox(Localization.EnableChatNotificationOnTeleport, ref Config.EnableChatNotificationOnTeleport);
             ImGui.Checkbox(Localization.EnableQuestNotificationOnTeleport, ref Config.EnableQuestNotificationOnTeleport);
 

diff --git a/AetheryteLinkInChat/Localization.cs b/AetheryteLinkInChat/Localization.cs
@@ -120,6 +120,12 @@ public static class Localization
         Ja = "Lifestream がインストールされていません。",
     };
 
+    public static readonly LocalizedString DisplayLineBreak = new()
+    {
+        En = "Line break before teleport links",
+        Ja = "テレポリンクの前に改行を入れる",
+    };
+
     public static readonly LocalizedString EnableChatNotificationOnTeleport = new()
     {
         En = "Enable Chat Notification on Teleport",