Move IntendedUse to LLib

diff --git a/GatheringPathRenderer/packages.lock.json b/GatheringPathRenderer/packages.lock.json
index d1884a3..2aa08db 100644 (file)
--- a/GatheringPathRenderer/packages.lock.json
+++ b/GatheringPathRenderer/packages.lock.json
@@ -24,6 +24,11 @@
           "Microsoft.SourceLink.Common": "8.0.0"
         }
       },
+      "JetBrains.Annotations": {
+        "type": "Transitive",
+        "resolved": "2024.3.0",
+        "contentHash": "ox5pkeLQXjvJdyAB4b2sBYAlqZGLh3PjSnP1bQNVx72ONuTJ9+34/+Rq91Fc0dG29XG9RgZur9+NcP4riihTug=="
+      },
       "Microsoft.Build.Tasks.Git": {
         "type": "Transitive",
         "resolved": "8.0.0",
@@ -986,7 +991,8 @@
       "llib": {
         "type": "Project",
         "dependencies": {
-          "DalamudPackager": "[12.0.0, )"
+          "DalamudPackager": "[12.0.0, )",
+          "JetBrains.Annotations": "[2024.3.0, )"
         }
       },
       "pictomancy": {

diff --git a/LLib b/LLib
index 7293429..edbe9b6 160000 (submodule)
--- a/LLib
+++ b/LLib
@@ -1 +1 @@
-Subproject commit 72934290c0049ffce6378e8128afbe546985d0be
+Subproject commit edbe9b6be03249192cb07000ca032dd91f7c5f13

diff --git a/Questionable.IpcTest/packages.lock.json b/Questionable.IpcTest/packages.lock.json
index cbadd6f..95bd15e 100644 (file)
--- a/Questionable.IpcTest/packages.lock.json
+++ b/Questionable.IpcTest/packages.lock.json
@@ -24,6 +24,11 @@
           "Microsoft.SourceLink.Common": "8.0.0"
         }
       },
+      "JetBrains.Annotations": {
+        "type": "Transitive",
+        "resolved": "2024.3.0",
+        "contentHash": "ox5pkeLQXjvJdyAB4b2sBYAlqZGLh3PjSnP1bQNVx72ONuTJ9+34/+Rq91Fc0dG29XG9RgZur9+NcP4riihTug=="
+      },
       "Microsoft.Build.Tasks.Git": {
         "type": "Transitive",
         "resolved": "8.0.0",
@@ -37,7 +42,8 @@
       "llib": {
         "type": "Project",
         "dependencies": {
-          "DalamudPackager": "[12.0.0, )"
+          "DalamudPackager": "[12.0.0, )",
+          "JetBrains.Annotations": "[2024.3.0, )"
         }
       }
     }

diff --git a/Questionable/Controller/Utils/PartyWatchDog.cs b/Questionable/Controller/Utils/PartyWatchDog.cs
index c443954..de6f621 100644 (file)
--- a/Questionable/Controller/Utils/PartyWatchDog.cs
+++ b/Questionable/Controller/Utils/PartyWatchDog.cs
@@ -2,7 +2,7 @@ using System;
 using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using FFXIVClientStructs.FFXIV.Client.Game.Group;
-using JetBrains.Annotations;
+using LLib.GameData;
 using Microsoft.Extensions.Logging;
 
 namespace Questionable.Controller.Utils;
@@ -29,43 +29,43 @@ internal sealed class PartyWatchDog : IDisposable
 
     private unsafe void TerritoryChanged(ushort newTerritoryId)
     {
-        var intendedUse = (ETerritoryIntendedUseEnum)GameMain.Instance()->CurrentTerritoryIntendedUseId;
+        var intendedUse = (ETerritoryIntendedUse)GameMain.Instance()->CurrentTerritoryIntendedUseId;
         switch (intendedUse)
         {
-            case ETerritoryIntendedUseEnum.Gaol:
-            case ETerritoryIntendedUseEnum.Frontline:
-            case ETerritoryIntendedUseEnum.LordOfVerminion:
-            case ETerritoryIntendedUseEnum.Diadem:
-            case ETerritoryIntendedUseEnum.CrystallineConflict:
-            case ETerritoryIntendedUseEnum.Battlehall:
-            case ETerritoryIntendedUseEnum.CrystallineConflict2:
-            case ETerritoryIntendedUseEnum.DeepDungeon:
-            case ETerritoryIntendedUseEnum.TreasureMapDuty:
-            case ETerritoryIntendedUseEnum.Diadem2:
-            case ETerritoryIntendedUseEnum.RivalWings:
-            case ETerritoryIntendedUseEnum.Eureka:
-            case ETerritoryIntendedUseEnum.LeapOfFaith:
-            case ETerritoryIntendedUseEnum.OceanFishing:
-            case ETerritoryIntendedUseEnum.Diadem3:
-            case ETerritoryIntendedUseEnum.Bozja:
-            case ETerritoryIntendedUseEnum.Battlehall2:
-            case ETerritoryIntendedUseEnum.Battlehall3:
-            case ETerritoryIntendedUseEnum.LargeScaleRaid:
-            case ETerritoryIntendedUseEnum.LargeScaleSavageRaid:
-            case ETerritoryIntendedUseEnum.Blunderville:
+            case ETerritoryIntendedUse.Gaol:
+            case ETerritoryIntendedUse.Frontline:
+            case ETerritoryIntendedUse.LordOfVerminion:
+            case ETerritoryIntendedUse.Diadem:
+            case ETerritoryIntendedUse.CrystallineConflict:
+            case ETerritoryIntendedUse.Battlehall:
+            case ETerritoryIntendedUse.CrystallineConflict2:
+            case ETerritoryIntendedUse.DeepDungeon:
+            case ETerritoryIntendedUse.TreasureMapDuty:
+            case ETerritoryIntendedUse.Diadem2:
+            case ETerritoryIntendedUse.RivalWings:
+            case ETerritoryIntendedUse.Eureka:
+            case ETerritoryIntendedUse.LeapOfFaith:
+            case ETerritoryIntendedUse.OceanFishing:
+            case ETerritoryIntendedUse.Diadem3:
+            case ETerritoryIntendedUse.Bozja:
+            case ETerritoryIntendedUse.Battlehall2:
+            case ETerritoryIntendedUse.Battlehall3:
+            case ETerritoryIntendedUse.LargeScaleRaid:
+            case ETerritoryIntendedUse.LargeScaleSavageRaid:
+            case ETerritoryIntendedUse.Blunderville:
                 StopIfRunning($"Unsupported Area entered ({newTerritoryId})");
                 break;
 
-            case ETerritoryIntendedUseEnum.Dungeon:
-            case ETerritoryIntendedUseEnum.VariantDungeon:
-            case ETerritoryIntendedUseEnum.AllianceRaid:
-            case ETerritoryIntendedUseEnum.Trial:
-            case ETerritoryIntendedUseEnum.Raid:
-            case ETerritoryIntendedUseEnum.Raid2:
-            case ETerritoryIntendedUseEnum.SeasonalEvent:
-            case ETerritoryIntendedUseEnum.SeasonalEvent2:
-            case ETerritoryIntendedUseEnum.CriterionDuty:
-            case ETerritoryIntendedUseEnum.CriterionSavageDuty:
+            case ETerritoryIntendedUse.Dungeon:
+            case ETerritoryIntendedUse.VariantDungeon:
+            case ETerritoryIntendedUse.AllianceRaid:
+            case ETerritoryIntendedUse.Trial:
+            case ETerritoryIntendedUse.Raid:
+            case ETerritoryIntendedUse.Raid2:
+            case ETerritoryIntendedUse.SeasonalEvent:
+            case ETerritoryIntendedUse.SeasonalEvent2:
+            case ETerritoryIntendedUse.CriterionDuty:
+            case ETerritoryIntendedUse.CriterionSavageDuty:
                 _uncheckedTeritoryId = newTerritoryId;
                 _logger.LogInformation("Will check territory {TerritoryId} after loading", newTerritoryId);
                 break;
@@ -106,64 +106,4 @@ internal sealed class PartyWatchDog : IDisposable
     {
         _clientState.TerritoryChanged -= TerritoryChanged;
     }
-
-    // from https://github.com/NightmareXIV/ECommons/blob/f69e460e95134c72592654059843b138b4c01a9e/ECommons/ExcelServices/TerritoryIntendedUseEnum.cs#L5
-    [UsedImplicitly(ImplicitUseTargetFlags.Members, Reason = "game data")]
-    private enum ETerritoryIntendedUseEnum : byte
-    {
-        CityArea = 0,
-        OpenWorld = 1,
-        Inn = 2,
-        Dungeon = 3,
-        VariantDungeon = 4,
-        Gaol = 5,
-        StartingArea = 6,
-        QuestArea = 7,
-        AllianceRaid = 8,
-        QuestBattle = 9,
-        Trial = 10,
-        QuestArea2 = 12,
-        ResidentialArea = 13,
-        HousingInstances = 14,
-        QuestArea3 = 15,
-        Raid = 16,
-        Raid2 = 17,
-        Frontline = 18,
-        ChocoboSquare = 20,
-        RestorationEvent = 21,
-        Sanctum = 22,
-        GoldSaucer = 23,
-        LordOfVerminion = 25,
-        Diadem = 26,
-        HallOfTheNovice = 27,
-        CrystallineConflict = 28,
-        QuestBattle2 = 29,
-        Barracks = 30,
-        DeepDungeon = 31,
-        SeasonalEvent = 32,
-        TreasureMapDuty = 33,
-        SeasonalEventDuty = 34,
-        Battlehall = 35,
-        CrystallineConflict2 = 37,
-        Diadem2 = 38,
-        RivalWings = 39,
-        Unknown1 = 40,
-        Eureka = 41,
-        SeasonalEvent2 = 43,
-        LeapOfFaith = 44,
-        MaskedCarnivale = 45,
-        OceanFishing = 46,
-        Diadem3 = 47,
-        Bozja = 48,
-        IslandSanctuary = 49,
-        Battlehall2 = 50,
-        Battlehall3 = 51,
-        LargeScaleRaid = 52,
-        LargeScaleSavageRaid = 53,
-        QuestArea4 = 54,
-        TribalInstance = 56,
-        CriterionDuty = 57,
-        CriterionSavageDuty = 58,
-        Blunderville = 59,
-    }
 }

diff --git a/Questionable/packages.lock.json b/Questionable/packages.lock.json
index a6e8ea6..7b4ddbe 100644 (file)
--- a/Questionable/packages.lock.json
+++ b/Questionable/packages.lock.json
@@ -132,13 +132,14 @@
       "gatheringpaths": {
         "type": "Project",
         "dependencies": {
-          "Questionable.Model": "[4.26.0, )"
+          "Questionable.Model": "[5.10.0, )"
         }
       },
       "llib": {
         "type": "Project",
         "dependencies": {
-          "DalamudPackager": "[12.0.0, )"
+          "DalamudPackager": "[12.0.0, )",
+          "JetBrains.Annotations": "[2024.3.0, )"
         }
       },
       "notificationmasterapi": {
@@ -153,7 +154,7 @@
       "questpaths": {
         "type": "Project",
         "dependencies": {
-          "Questionable.Model": "[4.26.0, )"
+          "Questionable.Model": "[5.10.0, )"
         }
       }
     }