From 08a0803fdeb0e9912155ad0d54f09dd5347624ea Mon Sep 17 00:00:00 2001
From: Raymond <daemitus@gmail.com>
Date: Thu, 9 Dec 2021 13:07:46 -0500
Subject: [PATCH] MNKGauge fix + client structs

---
 .../JobGauge/Enums/{Chakra.cs => BeastChakra.cs}     |  4 ++--
 Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs      |  2 +-
 Dalamud/Game/ClientState/JobGauge/Types/BLMGauge.cs  |  2 +-
 Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs  | 12 +++++++++---
 lib/FFXIVClientStructs                               |  2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)
 rename Dalamud/Game/ClientState/JobGauge/Enums/{Chakra.cs => BeastChakra.cs} (87%)

diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/Chakra.cs b/Dalamud/Game/ClientState/JobGauge/Enums/BeastChakra.cs
similarity index 87%
rename from Dalamud/Game/ClientState/JobGauge/Enums/Chakra.cs
rename to Dalamud/Game/ClientState/JobGauge/Enums/BeastChakra.cs
index 33e544633..00e71d1a4 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/Chakra.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/BeastChakra.cs
@@ -1,9 +1,9 @@
 namespace Dalamud.Game.ClientState.JobGauge.Enums
 {
     /// <summary>
-    /// MNK Chakra types.
+    /// MNK Beast Chakra types.
     /// </summary>
-    public enum Chakra : byte
+    public enum BeastChakra : byte
     {
         /// <summary>
         /// No card.
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs b/Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs
index 80994907d..f84a7e55e 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Dalamud.Game.ClientState.JobGauge.Enums
 {
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/BLMGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/BLMGauge.cs
index 445f4615a..b4df46c38 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/BLMGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/BLMGauge.cs
@@ -66,7 +66,7 @@ namespace Dalamud.Game.ClientState.JobGauge.Types
         public bool IsEnochianActive => this.Struct->EnochianActive;
 
         /// <summary>
-        /// Gets a value indicating whether or not Paradox is active.
+        /// Gets a value indicating whether Paradox is active.
         /// </summary>
         /// <returns><c>true</c> or <c>false</c>.</returns>
         public bool IsParadoxActive => this.Struct->ParadoxActive;
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs
index a1c8365d7..6c078f9c9 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs
@@ -1,3 +1,4 @@
+using Dalamud.Game.ClientState.JobGauge.Enums;
 using System;
 using System.Linq;
 
@@ -20,12 +21,17 @@ namespace Dalamud.Game.ClientState.JobGauge.Types
         }
 
         /// <summary>
-        /// Gets the types of Chakra available.
+        /// Gets the amount of Chakra available.
+        /// </summary>
+        public byte Chakra => this.Struct->Chakra;
+
+        /// <summary>
+        /// Gets the types of Beast Chakra available.
         /// </summary>
         /// <remarks>
-        /// This will always return an array of size 3, inactive Chakra are represented by <see cref="Chakra.NONE"/>.
+        /// This will always return an array of size 3, inactive Beast Chakra are represented by <see cref="BeastChakra.NONE"/>.
         /// </remarks>
-        public Chakra[] Chakra => this.Struct->CurrentChakra.Select(c => (Chakra)c).ToArray();
+        public BeastChakra[] BeastChakra => this.Struct->BeastChakra.Select(c => (BeastChakra)c).ToArray();
 
         /// <summary>
         /// Gets the types of Nadi available.
diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs
index 224a4fa2a..6279047d0 160000
--- a/lib/FFXIVClientStructs
+++ b/lib/FFXIVClientStructs
@@ -1 +1 @@
-Subproject commit 224a4fa2ac4c0ae260b8ff4778c7fd6f1efb41b6
+Subproject commit 6279047d055187a2bb568cd6bc83da985417140a