Remove Teleporter Dependency

MidoriKami · Nov 17, 2024 · 1ed0a06 · 1ed0a06
1 parent e1170a3
commit 1ed0a06
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 48 deletions.
diff --git a/Mappy/Classes/Teleporter.cs b/Mappy/Classes/Teleporter.cs
diff --git a/Mappy/Extensions/MapMarkerInfoExtensions.cs b/Mappy/Extensions/MapMarkerInfoExtensions.cs
@@ -7,9 +7,12 @@
 using Dalamud.Interface;
 using Dalamud.Memory;
 using Dalamud.Utility;
+using FFXIVClientStructs.FFXIV.Client.Game.UI;
 using FFXIVClientStructs.FFXIV.Client.UI.Agent;
 using Lumina.Excel.Sheets;
 using Mappy.Classes;
+using Map = Lumina.Excel.Sheets.Map;
+using MarkerInfo = Mappy.Classes.MarkerInfo;
 
 namespace Mappy.Extensions;
 
@@ -30,8 +33,30 @@ public  static unsafe void Draw(this MapMarkerInfo marker, Vector2 offset, float
             PrimaryText = GetMarkerPrimaryTooltip(marker, tooltipText),
             OnLeftClicked = marker.DataType switch {
                 1 when !DrawHelpers.IsDisallowedIcon(marker.MapMarker.IconId) => () => System.IntegrationsController.OpenMap(marker.DataKey),
-                3 => () => System.Teleporter.Teleport(Service.DataManager.GetExcelSheet<Aetheryte>().GetRow(marker.DataKey)), // Gonna assume that can't be null, because it's a row index that comes from the active gamestate.
-                4 when GetAetheryteForAethernet(marker.DataKey) is not null => () => System.Teleporter.Teleport(GetAetheryteForAethernet(marker.DataKey)!.Value),
+                3 => () => {
+                    var aetheryte = Service.DataManager.GetExcelSheet<Aetheryte>().GetRow(marker.DataKey);
+                    Telepo.Instance()->Teleport(marker.DataKey, 0);
+                    Service.ChatGui.Print(new XivChatEntry {
+                        Message = new SeStringBuilder()
+                            .AddUiForeground("[Mappy] ", 45)
+                            .AddUiForeground("[Teleport] ", 62)
+                            .AddText("Teleporting to ")
+                            .AddUiForeground(aetheryte.PlaceName.Value.Name.ExtractText(), 576)
+                            .Build(),
+                    });
+                }, // Gonna assume that can't be null, because it's a row index that comes from the active gamestate.
+                4 when GetAetheryteForAethernet(marker.DataKey) is not null => () => {
+                    var aetheryte = Service.DataManager.GetExcelSheet<Aetheryte>().GetRow(marker.DataKey);
+                    Telepo.Instance()->Teleport(marker.DataKey, 0);
+                    Service.ChatGui.Print(new XivChatEntry {
+                        Message = new SeStringBuilder()
+                            .AddUiForeground("[Mappy] ", 45)
+                            .AddUiForeground("[Teleport] ", 62)
+                            .AddText("Teleporting to ")
+                            .AddUiForeground(aetheryte.PlaceName.Value.Name.ExtractText(), 576)
+                            .Build(),
+                    });
+                },
                 _ => null,
             },
             SecondaryText = marker.DataType switch {

diff --git a/Mappy/MappyPlugin.cs b/Mappy/MappyPlugin.cs
@@ -2,7 +2,6 @@
 using FFXIVClientStructs.FFXIV.Client.UI.Agent;
 using KamiLib.CommandManager;
 using KamiLib.Window;
-using Mappy.Classes;
 using Mappy.Controllers;
 using Mappy.Data;
 using Mappy.Windows;
@@ -16,8 +15,6 @@ public MappyPlugin(IDalamudPluginInterface pluginInterface) {
         System.SystemConfig = SystemConfig.Load();
         System.IconConfig = IconConfig.Load();
 
-        System.Teleporter = new Teleporter();
-
         System.CommandManager = new CommandManager(Service.PluginInterface, "mappy");
 
         System.MapRenderer = new MapRenderer.MapRenderer();

diff --git a/Mappy/System.cs b/Mappy/System.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using KamiLib.CommandManager;
 using KamiLib.Window;
-using Mappy.Classes;
 using Mappy.Classes.Caches;
 using Mappy.Controllers;
 using Mappy.Data;
@@ -26,7 +25,6 @@ public static class System {
         new FateModule(),
     ];
 
-    public static Teleporter Teleporter { get; set; }
     public static TooltipCache TooltipCache { get; set; } = new();
     public static CardRewardCache CardRewardCache { get; set; } = new();
     public static GatheringPointNameCache GatheringPointNameCache { get; set; } = new();