migrate to XIVHuntUtils

ScoutHelper/Config/Configuration.cs

@@ -5,6 +5,7 @@
 using Dalamud.Plugin;
 using Dalamud.Plugin.Services;
 using ScoutHelper.Models;
+using XIVHuntUtils.Models;
 using static ScoutHelper.Utils.Utils;
 
 namespace ScoutHelper.Config;

ScoutHelper/Constants.cs

@@ -3,6 +3,7 @@
 using System.Net.Http.Headers;
 using System.Reflection;
 using ScoutHelper.Models;
+using XIVHuntUtils.Models;
 
 namespace ScoutHelper;
 

ScoutHelper/Managers/BearManager.cs

@@ -12,6 +12,8 @@
 using ScoutHelper.Models;
 using ScoutHelper.Models.Http;
 using ScoutHelper.Utils;
+using XIVHuntUtils.Models;
+using TrainMob = ScoutHelper.Models.TrainMob;
 
 namespace ScoutHelper.Managers;
 

ScoutHelper/Managers/InitializationManager.cs

@@ -1,7 +1,8 @@
 using System.Linq;
 using Dalamud.Plugin.Services;
 using ScoutHelper.Config;
-using ScoutHelper.Models;
+using XIVHuntUtils.Managers;
+using XIVHuntUtils.Models;
 using static ScoutHelper.Utils.Utils;
 
 namespace ScoutHelper.Managers;
@@ -50,5 +51,5 @@ private void InitializeInstanceMap() {
 	}
 
 	private void InitializeTerritoryInstances() =>
-		TerritoryExtensions.SetTerritoryInstances(_conf, _territoryManager.GetTerritoryIds());
+		TerritoryExtensions.SetTerritoryInstances(_conf.Instances, _territoryManager.GetTerritoryIds());
 }

ScoutHelper/Managers/SirenManager.cs

@@ -9,14 +9,16 @@
 using CSharpFunctionalExtensions;
 using Dalamud.Plugin.Services;
 using Dalamud.Utility;
+using DitzyExtensions.Functional;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using ScoutHelper.Config;
 using ScoutHelper.Models;
 using ScoutHelper.Models.Json;
 using ScoutHelper.Utils;
-using ScoutHelper.Utils.Functional;
+using XIVHuntUtils.Managers;
+using XIVHuntUtils.Models;
 using static ScoutHelper.Utils.Utils;
+using TrainMob = ScoutHelper.Models.TrainMob;
 
 namespace ScoutHelper.Managers;
 
@@ -40,7 +42,9 @@ MobManager mobManager
 		(_patchData, _mobToPatch) = LoadData(options.SirenDataFile, territoryManager, mobManager);
 	}
 
-	public AccResults<Maybe<(string Url, Patch HighestPatch)>, string> GenerateSirenLink(IList<TrainMob> mobList) {
+	public AccumulatedResults<Maybe<(string Url, Patch HighestPatch)>, string> GenerateSirenLink(
+		IList<TrainMob> mobList
+	) {
 		_log.Debug("Generating a siren link for mob list: {0}", mobList);
 
 		var patches = mobList
@@ -53,9 +57,9 @@ MobManager mobManager
 		_log.Debug("Patches represented in mob list: {0}", patches);
 
 		if (patches.IsEmpty())
-			return AccResults.From(
+			return AccumulatedResults.From(
 				Maybe<(string, Patch)>.None,
-				"No mobs in the train are supported by Siren Hunts ;-;".AsSingletonList()
+				"No mobs in the train are supported by Siren Hunts ;-;"
 			);
 
 		return patches
@@ -140,7 +144,7 @@ MobManager mobManager
 		return (patchesData.Value, mobToPatch);
 	}
 
-	private static AccResults<(Patch patch, SirenPatchData), string> ParsePatchData(
+	private static AccumulatedResults<(Patch patch, SirenPatchData), string> ParsePatchData(
 		TerritoryManager territoryManager,
 		MobManager mobManager,
 		KeyValuePair<string, SirenJsonPatchData> patchData
@@ -159,11 +163,7 @@ KeyValuePair<string, SirenJsonPatchData> patchData
 					.Map(
 						mapId => mapMobs
 							.Mobs
-							.SelectResults(
-								mobName => mobManager
-									.GetMobId(mobName)
-									.ToResult($"No mobId found for mobName: {mobName}")
-							)
+							.SelectResults(mobManager.GetMobId)
 							.WithValue(mobIds => SirenMapData.From(mapId, mobIds))
 					)
 			);
@@ -200,7 +200,7 @@ KeyValuePair<string, SirenJsonPatchData> patchData
 			)
 			.WithValue(value => value.ToDict());
 
-		return parsedMobOrder.Join(
+		return parsedMobOrder.JoinWith(
 			mapResults,
 			(mobOrder, maps) => (patch, SirenPatchData.From(mobOrder, maps))
 		);