Clean up

diff --git a/LLib b/LLib
index e6e3a1f29715e2af4976dd7338ed2f09ae82c99c..6dfc18ee6a187138036ee2d51ba2257741c1e568 160000 (submodule)
--- a/LLib
+++ b/LLib
@@ -1 +1 @@
-Subproject commit e6e3a1f29715e2af4976dd7338ed2f09ae82c99c
+Subproject commit 6dfc18ee6a187138036ee2d51ba2257741c1e568

diff --git a/Questionable/Controller/GameUi/ShopController.cs b/Questionable/Controller/GameUi/ShopController.cs
index 611078e5119eb590ec069c0029405e7a3e83adbb..7c45e3cf1d23bcfab9c9f333d98f6c7b7a23ff6d 100644 (file)
--- a/Questionable/Controller/GameUi/ShopController.cs
+++ b/Questionable/Controller/GameUi/ShopController.cs
@@ -5,9 +5,9 @@ using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Component.GUI;
 using LLib.GameUI;
 using LLib.Shop;
+using LLib.Shop.Model;
 using Microsoft.Extensions.Logging;
 using Questionable.Model.Questing;
-using Workshoppa.GameData.Shops;
 using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.ValueType;
 
 namespace Questionable.Controller.GameUi;

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

diff --git a/Questionable/Controller/Steps/IRevisitAware.cs b/Questionable/Controller/Steps/IRevisitAware.cs
index 6af5d689f979cdae5c2b9d78d3c9c9969ec4af49..96d183bed43cfb98e5417a751b2d460d9ff43c72 100644 (file)
--- a/Questionable/Controller/Steps/IRevisitAware.cs
+++ b/Questionable/Controller/Steps/IRevisitAware.cs
@@ -1,6 +1,6 @@
 namespace Questionable.Controller.Steps;
 
-internal interface IRevisitAware : ITask
+internal interface IRevisitAware
 {
     void OnRevisit();
 }