liza
/
Questionable
2
1
Fork 16
Code Pull Requests 8 Releases 77 Activity

Clean up

pull/61/head
Liza 2024-09-22 23:02:40 +02:00
parent 09f8cb9078
commit 26ad97c9e2
Signed by: liza
GPG Key ID: 7199F8D727D55F67
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LLib

@ -1 +1 @@
Subproject commit e6e3a1f29715e2af4976dd7338ed2f09ae82c99c Subproject commit 6dfc18ee6a187138036ee2d51ba2257741c1e568

2
Questionable/Controller/GameUi/ShopController.cs
View File

@ -5,9 +5,9 @@ using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Component.GUI; using FFXIVClientStructs.FFXIV.Component.GUI;
using LLib.GameUI; using LLib.GameUI;
using LLib.Shop; using LLib.Shop;
using LLib.Shop.Model;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Questionable.Model.Questing; using Questionable.Model.Questing;
using Workshoppa.GameData.Shops;
using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.ValueType; using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.ValueType;
namespace Questionable.Controller.GameUi; namespace Questionable.Controller.GameUi;

8
Questionable/Controller/GatheringPointRegistry.cs
View File

@ -80,8 +80,7 @@ internal sealed class GatheringPointRegistry : IDisposable
{ {
foreach (var expansionFolder in ExpansionData.ExpansionFolders.Values) foreach (var expansionFolder in ExpansionData.ExpansionFolders.Values)
LoadFromDirectory( LoadFromDirectory(
new DirectoryInfo(Path.Combine(pathProjectDirectory.FullName, expansionFolder)), new DirectoryInfo(Path.Combine(pathProjectDirectory.FullName, expansionFolder)));
LogLevel.Trace);
} }
catch (Exception e) catch (Exception e)
{ {
@ -102,7 +101,7 @@ internal sealed class GatheringPointRegistry : IDisposable
_gatheringPoints[gatheringPointId] = JsonSerializer.Deserialize<GatheringRoot>(stream)!; _gatheringPoints[gatheringPointId] = JsonSerializer.Deserialize<GatheringRoot>(stream)!;
} }
private void LoadFromDirectory(DirectoryInfo directory, LogLevel logLevel = LogLevel.Information) private void LoadFromDirectory(DirectoryInfo directory)
{ {
if (!directory.Exists) if (!directory.Exists)
{ {
@ -110,7 +109,6 @@ internal sealed class GatheringPointRegistry : IDisposable
return; return;
} }
//_logger.Log(logLevel, "Loading gathering points from {DirectoryName}", directory);
foreach (FileInfo fileInfo in directory.GetFiles("*.json")) foreach (FileInfo fileInfo in directory.GetFiles("*.json"))
{ {
try try
@ -125,7 +123,7 @@ internal sealed class GatheringPointRegistry : IDisposable
} }
foreach (DirectoryInfo childDirectory in directory.GetDirectories()) foreach (DirectoryInfo childDirectory in directory.GetDirectories())
LoadFromDirectory(childDirectory, logLevel); LoadFromDirectory(childDirectory);
} }
private static GatheringPointId? ExtractGatheringPointIdFromName(string resourceName) private static GatheringPointId? ExtractGatheringPointIdFromName(string resourceName)

2
Questionable/Controller/Steps/IRevisitAware.cs
View File

@ -1,6 +1,6 @@
namespace Questionable.Controller.Steps; namespace Questionable.Controller.Steps;
internal interface IRevisitAware : ITask internal interface IRevisitAware
{ {
void OnRevisit(); void OnRevisit();
} }