refactor: update for API changes

This commit is contained in:
Anna 2021-08-28 15:07:17 -04:00
parent ef913288d3
commit 3cc60bc52a
2 changed files with 4 additions and 15 deletions

View File

@ -1,11 +1,8 @@
using System;
using System.Reflection;
using Dalamud.Data;
using Dalamud.Data;
using Dalamud.Game;
using Dalamud.Game.ClientState;
using Dalamud.Game.Command;
using Dalamud.Game.Gui;
using Dalamud.Game.Text.SeStringHandling;
using Dalamud.IoC;
using Dalamud.Plugin;
using FFXIVWeather.Lumina;
@ -32,9 +29,6 @@ namespace Tourist {
[PluginService]
internal GameGui GameGui { get; init; } = null!;
[PluginService]
internal SeStringManager SeStringManager { get; init; } = null!;
[PluginService]
internal SigScanner SigScanner { get; init; } = null!;
@ -51,13 +45,7 @@ namespace Tourist {
this.Config = this.Interface.GetPluginConfig() as Configuration ?? new Configuration();
this.Config.Initialise(this);
var gameDataField = this.DataManager.GetType().GetField("gameData", BindingFlags.Instance | BindingFlags.NonPublic);
if (gameDataField == null) {
throw new Exception("Missing gameData field");
}
var lumina = (Lumina.GameData) gameDataField.GetValue(this.DataManager)!;
this.Weather = new FFXIVWeatherLuminaService(lumina);
this.Weather = new FFXIVWeatherLuminaService(this.DataManager.GameData);
this.Functions = new GameFunctions(this);

View File

@ -1,6 +1,7 @@
using System;
using System.Linq;
using System.Numerics;
using Dalamud.Game.Text.SeStringHandling;
using ImGuiNET;
using Lumina.Excel.GeneratedSheets;
@ -194,7 +195,7 @@ namespace Tourist {
? string.Empty
: $" ({(countdown.Value - DateTimeOffset.UtcNow).ToHumanReadable()})";
var name = this.Plugin.SeStringManager.Parse(adventure.Name.RawData.ToArray());
var name = (SeString) adventure.Name;
var header = ImGui.CollapsingHeader($"#{idx + 1} - {name.TextValue}{next}###adventure-{adventure.RowId}");
if (has || available) {