From 13dc5deb61f04158bdef268c8777053184b7628b Mon Sep 17 00:00:00 2001
From: Anna <git@anna.lgbt>
Date: Mon, 6 Dec 2021 19:14:44 -0500
Subject: [PATCH] fix: update to 6.0

---
 Quest Map/PluginUi.cs      | 8 ++++----
 Quest Map/Quest Map.csproj | 6 +++---
 Quest Map/Quests.cs        | 5 +++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Quest Map/PluginUi.cs b/Quest Map/PluginUi.cs
index 3bc1d51..7fa210e 100644
--- a/Quest Map/PluginUi.cs	
+++ b/Quest Map/PluginUi.cs	
@@ -535,8 +535,8 @@ namespace QuestMap {
             if (quest.ItemRewardType is 0 or 1 or 3 or 5) {
                 DrawItemRewards(
                     "Rewards",
-                    quest.ItemReward0
-                        .Zip(quest.ItemCountReward0, (id, qty) => (id, qty))
+                    quest.ItemReward
+                        .Zip(quest.ItemCountReward, (id, qty) => (id, qty))
                         .Where(entry => entry.id != 0)
                         .Select(entry => (item: this.Plugin.DataManager.GetExcelSheet<Item>()!.GetRow(entry.id), entry.qty))
                         .Where(entry => entry.item != null)
@@ -546,8 +546,8 @@ namespace QuestMap {
 
                 DrawItemRewards(
                     "Optional rewards",
-                    quest.ItemReward1
-                        .Zip(quest.ItemCountReward1, (row, qty) => (row, qty))
+                    quest.OptionalItemReward
+                        .Zip(quest.OptionalItemCountReward, (row, qty) => (row, qty))
                         .Where(entry => entry.row.Row != 0)
                         .Select(entry => (item: entry.row.Value, entry.qty))
                         .Where(entry => entry.item != null)
diff --git a/Quest Map/Quest Map.csproj b/Quest Map/Quest Map.csproj
index 9ff142d..1443150 100755
--- a/Quest Map/Quest Map.csproj	
+++ b/Quest Map/Quest Map.csproj	
@@ -40,9 +40,9 @@
     <ItemGroup>
         <PackageReference Include="AutomaticGraphLayout" Version="1.1.12"/>
         <PackageReference Include="DalamudLinter" Version="1.0.3"/>
-        <PackageReference Include="DalamudPackager" Version="2.1.2"/>
-        <PackageReference Include="System.Threading.Channels" Version="5.0.0"/>
-        <PackageReference Include="XivCommon" Version="3.0.2"/>
+        <PackageReference Include="DalamudPackager" Version="2.1.5"/>
+        <PackageReference Include="System.Threading.Channels" Version="6.0.0"/>
+        <PackageReference Include="XivCommon" Version="4.0.0-alpha.1"/>
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Quest Map/Quests.cs b/Quest Map/Quests.cs
index b80af9f..c0cb3a8 100644
--- a/Quest Map/Quests.cs	
+++ b/Quest Map/Quests.cs	
@@ -52,7 +52,7 @@ namespace QuestMap {
                     emoteRewards[quest.RowId] = quest.EmoteReward.Value!;
                 }
 
-                foreach (var row in quest.ItemReward0.Where(item => item != 0)) {
+                foreach (var row in quest.ItemReward.Where(item => item != 0)) {
                     var item = this.Plugin.DataManager.GetExcelSheet<Item>()!.GetRow(row);
                     if (item == null) {
                         continue;
@@ -69,7 +69,7 @@ namespace QuestMap {
                     rewards.Add(item);
                 }
 
-                foreach (var row in quest.ItemReward1.Where(item => item.Row != 0)) {
+                foreach (var row in quest.OptionalItemReward.Where(item => item.Row != 0)) {
                     var item = row.Value;
 
                     List<Item> rewards;
@@ -248,6 +248,7 @@ namespace QuestMap {
                 69552 => "Futures Rewritten (5.4)",
                 69599 => "Death Unto Dawn - Part 1 (5.5)",
                 69602 => "Death Unto Dawn - Part 2 (5.55)",
+                70000 => "Endwalker (6.0)",
                 _ => null,
             };