forks
/
annas-questmap
1
0
Fork 0
Code

-----BEGIN PGP SIGNATURE----- 

iHUEABYKAB0WIQTa9butFCxnjN0YMdtxmfjXJ9VfZwUCZR0bzQAKCRBxmfjXJ9Vf
 Z4owAQCVRaakSOdehfMGuXkOo4pjqTaMn3a5mrhJrLQUDytE2AEAsh/7AhsVFGDW
 jRFev0bwtim9TabfLfEKcqhlLfiQDwg=
 =HkpP
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iHUEABYKAB0WIQTa9butFCxnjN0YMdtxmfjXJ9VfZwUCZR0cvgAKCRBxmfjXJ9Vf
 Z+IWAQC/QV0IPf+ivipkb/O8yVtqqxSfjyJ4O3+6O2E39VaNBAEAvcGCh6N+fhlI
 UI2xaTIRuXtHc4vzhKWb9hVKQz075AE=
 =khmi
 -----END PGP SIGNATURE-----

Merge tag 'v1.4.7'

# -----BEGIN PGP SIGNATURE-----
#
# iHUEABYKAB0WIQTa9butFCxnjN0YMdtxmfjXJ9VfZwUCZR0bzQAKCRBxmfjXJ9Vf
# Z4owAQCVRaakSOdehfMGuXkOo4pjqTaMn3a5mrhJrLQUDytE2AEAsh/7AhsVFGDW
# jRFev0bwtim9TabfLfEKcqhlLfiQDwg=
# =HkpP
# -----END PGP SIGNATURE-----
# gpg: Signatur vom 04.10.2023 10:01:17 W. Europe Daylight Time
# gpg:                mittels EDDSA-Schlüssel DAF5BBAD142C678CDD1831DB7199F8D727D55F67
# gpg: Korrekte Signatur von "Liza Carvelli <liza@liza.sh>" [ultimativ]

# Conflicts:
#	QuestMap/Plugin.cs
#	QuestMap/QuestMap.yaml
main
Liza 2023-10-04 10:05:18 +02:00
parent 4e6a1d4228 61702e638d
commit e4c55f7086
6 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
QuestMap/Plugin.cs
View File

@ -1,31 +1,31 @@
using System.Threading.Channels; using System.Threading.Channels;
using Dalamud.Data;
using Dalamud.Game.ClientState;
using Dalamud.Game.Command;
using Dalamud.Game.Gui;
using Dalamud.IoC; using Dalamud.IoC;
using Dalamud.Plugin; using Dalamud.Plugin;
using Dalamud.Plugin.Services;
using XivCommon; using XivCommon;
namespace QuestMap { namespace QuestMap {
// ReSharper disable once ClassNeverInstantiated.Global // ReSharper disable once ClassNeverInstantiated.Global
internal class Plugin : IDalamudPlugin { internal class Plugin : IDalamudPlugin {
public string Name => "Quest Map"; internal static string Name => "Quest Map";
[PluginService] [PluginService]
internal DalamudPluginInterface Interface { get; init; } = null!; internal DalamudPluginInterface Interface { get; init; } = null!;
[PluginService] [PluginService]
internal ClientState ClientState { get; init; } = null!; internal IClientState ClientState { get; init; } = null!;
[PluginService] [PluginService]
internal CommandManager CommandManager { get; init; } = null!; internal ICommandManager CommandManager { get; init; } = null!;
[PluginService] [PluginService]
internal DataManager DataManager { get; init; } = null!; internal IDataManager DataManager { get; init; } = null!;
[PluginService] [PluginService]
internal GameGui GameGui { get; init; } = null!; internal IGameGui GameGui { get; init; } = null!;
[PluginService]
internal ITextureProvider TextureProvider { get; init; } = null!;
internal XivCommonBase Common { get; } internal XivCommonBase Common { get; }
internal Configuration Config { get; } internal Configuration Config { get; }
@ -35,7 +35,7 @@ namespace QuestMap {
public Plugin(DalamudPluginInterface pi) { public Plugin(DalamudPluginInterface pi) {
pi.Inject(this); // not sure why [PluginInterface] above aren't initialized by dalamud, but they're null pi.Inject(this); // not sure why [PluginInterface] above aren't initialized by dalamud, but they're null
this.Common = new XivCommonBase(); this.Common = new XivCommonBase(this.Interface);
this.Config = this.Interface.GetPluginConfig() as Configuration ?? new Configuration(); this.Config = this.Interface.GetPluginConfig() as Configuration ?? new Configuration();
var graphChannel = Channel.CreateUnbounded<GraphInfo>(); var graphChannel = Channel.CreateUnbounded<GraphInfo>();

10
QuestMap/PluginUi.cs
View File

@ -9,8 +9,8 @@ using Dalamud;
using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Game.Text.SeStringHandling.Payloads; using Dalamud.Game.Text.SeStringHandling.Payloads;
using Dalamud.Interface; using Dalamud.Interface;
using Dalamud.Interface.Internal;
using ImGuiNET; using ImGuiNET;
using ImGuiScene;
using Lumina.Data; using Lumina.Data;
using Lumina.Excel; using Lumina.Excel;
using Lumina.Excel.GeneratedSheets; using Lumina.Excel.GeneratedSheets;
@ -43,7 +43,7 @@ namespace QuestMap {
private ChannelReader<GraphInfo> GraphChannel { get; } private ChannelReader<GraphInfo> GraphChannel { get; }
private CancellationTokenSource? CancellationTokenSource { get; set; } private CancellationTokenSource? CancellationTokenSource { get; set; }
private HashSet<uint> InfoWindows { get; } = new(); private HashSet<uint> InfoWindows { get; } = new();
private Dictionary<uint, TextureWrap> Icons { get; } = new(); private Dictionary<uint, IDalamudTextureWrap> Icons { get; } = new();
private List<(Quest, bool, string)> FilteredQuests { get; } = new(); private List<(Quest, bool, string)> FilteredQuests { get; } = new();
internal bool Show; internal bool Show;
@ -204,7 +204,7 @@ namespace QuestMap {
ImGui.SetNextWindowSize(new Vector2(675, 600), ImGuiCond.FirstUseEver); ImGui.SetNextWindowSize(new Vector2(675, 600), ImGuiCond.FirstUseEver);
if (!ImGui.Begin(this.Plugin.Name, ref this.Show, ImGuiWindowFlags.MenuBar)) { if (!ImGui.Begin(Plugin.Name, ref this.Show, ImGuiWindowFlags.MenuBar)) {
ImGui.End(); ImGui.End();
return; return;
} }
@ -405,12 +405,12 @@ namespace QuestMap {
ImGui.PopFont(); ImGui.PopFont();
} }
TextureWrap? GetIcon(uint id) { IDalamudTextureWrap? GetIcon(uint id) {
if (this.Icons.TryGetValue(id, out var wrap)) { if (this.Icons.TryGetValue(id, out var wrap)) {
return wrap; return wrap;
} }
wrap = this.Plugin.DataManager.GetImGuiTextureIcon(this.Plugin.ClientState.ClientLanguage, id); wrap = this.Plugin.TextureProvider.GetIcon(id);
if (wrap != null) { if (wrap != null) {
this.Icons[id] = wrap; this.Icons[id] = wrap;
} }

10
QuestMap/QuestMap.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7-windows</TargetFramework> <TargetFramework>net7-windows</TargetFramework>
<RootNamespace>QuestMap</RootNamespace> <RootNamespace>QuestMap</RootNamespace>
<Version>1.4.5</Version> <Version>1.4.7</Version>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@ -33,10 +33,6 @@
<HintPath>$(DalamudLibPath)\ImGui.NET.dll</HintPath> <HintPath>$(DalamudLibPath)\ImGui.NET.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="ImGuiScene">
<HintPath>$(DalamudLibPath)\ImGuiScene.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Lumina"> <Reference Include="Lumina">
<HintPath>$(DalamudLibPath)\Lumina.dll</HintPath> <HintPath>$(DalamudLibPath)\Lumina.dll</HintPath>
<Private>False</Private> <Private>False</Private>
@ -49,9 +45,9 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutomaticGraphLayout" Version="1.1.12"/> <PackageReference Include="AutomaticGraphLayout" Version="1.1.12"/>
<PackageReference Include="DalamudPackager" Version="2.1.10"/> <PackageReference Include="DalamudPackager" Version="2.1.12"/>
<PackageReference Include="System.Threading.Channels" Version="7.0.0"/> <PackageReference Include="System.Threading.Channels" Version="7.0.0"/>
<PackageReference Include="XivCommon" Version="7.0.0-alpha.1"/> <PackageReference Include="XivCommon" Version="9.0.0"/>
</ItemGroup> </ItemGroup>
</Project> </Project>

6
QuestMap/QuestMap.yaml
View File

@ -1,5 +1,5 @@
name: Filtered Quest Map name: Quest Map
author: Liza Carvelli, ascclemens author: Liza Carvelli, Anna
punchline: Explore quests and their rewards. punchline: Explore quests and their rewards.
description: |- description: |-
Explore quests and their rewards. Explore quests and their rewards.
@ -11,4 +11,4 @@ description: |-
Icons: treasure map by Anthony Ledoux from the Noun Project and Icons: treasure map by Anthony Ledoux from the Noun Project and
locked book by Anthony Ledoux from the Noun Project locked book by Anthony Ledoux from the Noun Project
repo_url: https://github.com/carvelli/FilteredQuestMap repo_url: https://git.carvel.li/forks/annas-questmap

2
QuestMap/Quests.cs
View File

@ -252,6 +252,8 @@ namespace QuestMap {
70062 => "Newfound Adventure (6.1)", 70062 => "Newfound Adventure (6.1)",
70136 => "Buried Memory (6.2)", 70136 => "Buried Memory (6.2)",
70214 => "Gods Revel, Lands Tremble (6.3)", 70214 => "Gods Revel, Lands Tremble (6.3)",
70279 => "The Dark Throne (6.4)",
70286 => "Growing Light (6.5)",
_ => null, _ => null,
}; };

12
QuestMap/packages.lock.json Executable file → Normal file
View File

@ -10,9 +10,9 @@
}, },
"DalamudPackager": { "DalamudPackager": {
"type": "Direct", "type": "Direct",
"requested": "[2.1.10, )", "requested": "[2.1.12, )",
"resolved": "2.1.10", "resolved": "2.1.12",
"contentHash": "S6NrvvOnLgT4GDdgwuKVJjbFo+8ZEj+JsEYk9ojjOR/MMfv1dIFpT8aRJQfI24rtDcw1uF+GnSSMN4WW1yt7fw==" "contentHash": "Sc0PVxvgg4NQjcI8n10/VfUQBAS4O+Fw2pZrAqBdRMbthYGeogzu5+xmIGCGmsEZ/ukMOBuAqiNiB5qA3MRalg=="
}, },
"System.Threading.Channels": { "System.Threading.Channels": {
"type": "Direct", "type": "Direct",
@ -22,9 +22,9 @@
}, },
"XivCommon": { "XivCommon": {
"type": "Direct", "type": "Direct",
"requested": "[7.0.0-alpha.1, )", "requested": "[9.0.0, )",
"resolved": "7.0.0-alpha.1", "resolved": "9.0.0",
"contentHash": "4Yy4Wg3bnI/g9BSEYAqOZALmVMJZS0wcP847VlUIThBqIS/47O6tw2BI84he4KuPSTfIsYOzrcz3vAia8+Pn3g==" "contentHash": "avaBp3FmSCi/PiQhntCeBDYOHejdyTWmFtz4pRBVQQ8vHkmRx+YTk1la9dkYBMlXxRXKckEdH1iI1Fu61JlE7w=="
} }
} }
} }