Break JobGauges

Dalamud/Game/ClientState/Structs/JobGauge/BLMGauge.cs

@@ -8,35 +8,43 @@ namespace Dalamud.Game.ClientState.Structs.JobGauge
     [StructLayout(LayoutKind.Explicit)]
     public struct BLMGauge
     {
-        /// <summary>
-        /// Gets the time until the next Polyglot stack in milliseconds.
-        /// </summary>
         [FieldOffset(0)]
-        public short TimeUntilNextPolyglot;  // enochian timer
+        private short timeUntilNextPolyglot;  // enochian timer
 
-        /// <summary>
-        /// Gets the time remaining for Astral Fire or Umbral Ice in milliseconds.
-        /// </summary>
         [FieldOffset(2)]
-        public short ElementTimeRemaining;  // umbral ice and astral fire timer
+        private short elementTimeRemaining;  // umbral ice and astral fire timer
 
         [FieldOffset(4)]
         private byte elementStance; // umbral ice or astral fire
 
-        /// <summary>
-        /// Gets the number of Umbral Hearts remaining.
-        /// </summary>
         [FieldOffset(5)]
-        public byte NumUmbralHearts;
+        private byte numUmbralHearts;
+
+        [FieldOffset(6)]
+        private byte numPolyglotStacks;
+
+        [FieldOffset(7)]
+        private byte enochianState;
+
+        /// <summary>
+        /// Gets the time until the next Polyglot stack in milliseconds.
+        /// </summary>
+        public short TimeUntilNextPolyglot => this.timeUntilNextPolyglot;
+
+        /// <summary>
+        /// Gets the time remaining for Astral Fire or Umbral Ice in milliseconds.
+        /// </summary>
+        public short ElementTimeRemaining => this.elementTimeRemaining;
 
         /// <summary>
         /// Gets the number of Polyglot stacks remaining.
         /// </summary>
-        [FieldOffset(6)]
+        public byte NumPolyglotStacks => this.numPolyglotStacks;
-        public byte NumPolyglotStacks;
 
-        [FieldOffset(7)]
+        /// <summary>
-        private byte enochianState;
+        /// Gets the number of Umbral Hearts remaining.
+        /// </summary>
+        public byte NumUmbralHearts => this.numUmbralHearts;
 
         /// <summary>
         /// Gets if the player is in Umbral Ice.

Dalamud/Game/ClientState/Structs/JobGauge/BRDGauge.cs

@@ -8,28 +8,36 @@ namespace Dalamud.Game.ClientState.Structs.JobGauge
     [StructLayout(LayoutKind.Explicit)]
     public struct BRDGauge
     {
+        [FieldOffset(0)]
+        private short songTimer;
+
+        [FieldOffset(2)]
+        private byte numSongStacks;
+
+        [FieldOffset(3)]
+        private byte soulVoiceValue;
+
+        [FieldOffset(4)]
+        private CurrentSong activeSong;
+
         /// <summary>
         /// Gets the current song timer in milliseconds.
         /// </summary>
-        [FieldOffset(0)]
+        public short SongTimer => this.songTimer;
-        public short SongTimer;
 
         /// <summary>
         /// Gets the number of stacks for the current song.
         /// </summary>
-        [FieldOffset(2)]
+        public byte NumSongStacks => this.numSongStacks;
-        public byte NumSongStacks;
 
         /// <summary>
         /// Gets the amount of Soul Voice accumulated.
         /// </summary>
-        [FieldOffset(3)]
+        public byte SoulVoiceValue => this.soulVoiceValue;
-        public byte SoulVoiceValue;
 
         /// <summary>
         /// Gets the type of song that is active.
         /// </summary>
-        [FieldOffset(4)]
+        public CurrentSong ActiveSong => this.activeSong;
-        public CurrentSong ActiveSong;
     }
 }

Dalamud/Game/ClientState/Structs/JobGauge/DNCGauge.cs

@@ -8,26 +8,32 @@ namespace Dalamud.Game.ClientState.Structs.JobGauge
     [StructLayout(LayoutKind.Explicit)]
     public unsafe struct DNCGauge
     {
-        /// <summary>
-        /// Gets the number of feathers available.
-        /// </summary>
         [FieldOffset(0)]
-        public byte NumFeathers;
+        private byte numFeathers;
 
-        /// <summary>
-        /// Gets the amount of Espirit available.
-        /// </summary>
         [FieldOffset(1)]
-        public byte Esprit;
+        private byte esprit;
 
         [FieldOffset(2)]
         private fixed byte stepOrder[4];
 
+        [FieldOffset(6)]
+        private byte numCompleteSteps;
+
+        /// <summary>
+        /// Gets the number of feathers available.
+        /// </summary>
+        public byte NumFeathers => this.numFeathers;
+
+        /// <summary>
+        /// Gets the amount of Espirit available.
+        /// </summary>
+        public byte Esprit => this.esprit;
+
         /// <summary>
         /// Gets the number of steps completed for the current dance.
         /// </summary>
-        [FieldOffset(6)]
+        public byte NumCompleteSteps => this.numCompleteSteps;
-        public byte NumCompleteSteps;
 
         /// <summary>
         /// Gets the next step in the current dance.

Dalamud/Game/ClientState/Structs/JobGauge/DRGGauge.cs

@@ -8,22 +8,28 @@ namespace Dalamud.Game.ClientState.Structs.JobGauge
     [StructLayout(LayoutKind.Explicit)]
     public struct DRGGauge
     {
+        [FieldOffset(0)]
+        private short botdTimer;
+
+        [FieldOffset(2)]
+        private BOTDState botdState;
+
+        [FieldOffset(3)]
+        private byte eyeCount;
+
         /// <summary>
         /// Gets the time remaining for Blood of the Dragon in milliseconds.
         /// </summary>
-        [FieldOffset(0)]
+        public short BOTDTimer => this.botdTimer;
-        public short BOTDTimer;
 
         /// <summary>
         /// Gets the current state of Blood of the Dragon.
         /// </summary>
-        [FieldOffset(2)]
+        public BOTDState BOTDState => this.botdState;
-        public BOTDState BOTDState;
 
         /// <summary>
         /// Gets the count of eyes opened during Blood of the Dragon.
         /// </summary>
-        [FieldOffset(3)]
+        public byte EyeCount => this.eyeCount;
-        public byte EyeCount;
     }
 }

Dalamud/Game/ClientState/Structs/JobGauge/DRKGauge.cs

@@ -8,26 +8,32 @@ namespace Dalamud.Game.ClientState.Structs.JobGauge
     [StructLayout(LayoutKind.Explicit)]
     public struct DRKGauge
     {
-        /// <summary>
-        /// Gets the amount of blood accumulated.
-        /// </summary>
         [FieldOffset(0)]
-        public byte Blood;
+        private byte blood;
 
-        /// <summary>
-        /// Gets the Darkside time remaining in milliseconds.
-        /// </summary>
         [FieldOffset(2)]
-        public ushort DarksideTimeRemaining;
+        private ushort darksideTimeRemaining;
 
         [FieldOffset(4)]
         private byte darkArtsState;
 
+        [FieldOffset(6)]
+        private ushort shadowTimeRemaining;
+
+        /// <summary>
+        /// Gets the amount of blood accumulated.
+        /// </summary>
+        public byte Blood => this.blood;
+
+        /// <summary>
+        /// Gets the Darkside time remaining in milliseconds.
+        /// </summary>
+        public ushort DarksideTimeRemaining => this.darksideTimeRemaining;
+
         /// <summary>
         /// Gets the Shadow time remaining in milliseconds.
         /// </summary>
-        [FieldOffset(6)]
+        public ushort ShadowTimeRemaining => this.shadowTimeRemaining;
-        public ushort ShadowTimeRemaining;
 
         /// <summary>
         /// Gets if the player has Dark Arts or not.

Dalamud/Game/ClientState/Structs/JobGauge/GNBGauge.cs

@@ -8,22 +8,28 @@ namespace Dalamud.Game.ClientState.Structs.JobGauge
     [StructLayout(LayoutKind.Explicit)]
     public struct GNBGauge
     {
+        [FieldOffset(0)]
+        private byte numAmmo;
+
+        [FieldOffset(2)]
+        private short maxTimerDuration;
+
+        [FieldOffset(4)]
+        private byte ammoComboStepNumber;
+
         /// <summary>
         /// Gets the amount of ammo available.
         /// </summary>
-        [FieldOffset(0)]
+        public byte NumAmmo => this.numAmmo;
-        public byte NumAmmo;
 
         /// <summary>
         /// Gets the max combo time of the Gnashing Fang combo.
         /// </summary>
-        [FieldOffset(2)]
+        public short MaxTimerDuration => this.maxTimerDuration;
-        public short MaxTimerDuration;
 
         /// <summary>
         /// Gets the current step of the Gnashing Fang combo.
         /// </summary>
-        [FieldOffset(4)]
+        public byte AmmoComboStepNumber => this.ammoComboStepNumber;
-        public byte AmmoComboStepNumber;
     }
 }

Dalamud/Game/ClientState/Structs/JobGauge/MCHGauge.cs

@@ -8,38 +8,48 @@ namespace Dalamud.Game.ClientState.Structs.JobGauge
     [StructLayout(LayoutKind.Explicit)]
     public struct MCHGauge
     {
+        [FieldOffset(0)]
+        private short overheatTimeRemaining;
+
+        [FieldOffset(2)]
+        private short robotTimeRemaining;
+
+        [FieldOffset(4)]
+        private byte heat;
+
+        [FieldOffset(5)]
+        private byte battery;
+
+        [FieldOffset(6)]
+        private byte lastRobotBatteryPower;
+
+        [FieldOffset(7)]
+        private byte timerActive;
+
         /// <summary>
         /// Gets the time time remaining for Overheat in milliseconds.
         /// </summary>
-        [FieldOffset(0)]
+        public short OverheatTimeRemaining => this.overheatTimeRemaining;
-        public short OverheatTimeRemaining;
 
         /// <summary>
         /// Gets the time remaining for the Rook or Queen in milliseconds.
         /// </summary>
-        [FieldOffset(2)]
+        public short RobotTimeRemaining => this.robotTimeRemaining;
-        public short RobotTimeRemaining;
 
         /// <summary>
         /// Gets the current Heat level.
         /// </summary>
-        [FieldOffset(4)]
+        public byte Heat => this.heat;
-        public byte Heat;
 
         /// <summary>
         /// Gets the current Battery level.
         /// </summary>
-        [FieldOffset(5)]
+        public byte Battery => this.battery;
-        public byte Battery;
 
         /// <summary>
         /// Gets the battery level of the last Robot.
         /// </summary>
-        [FieldOffset(6)]
+        public byte LastRobotBatteryPower => this.lastRobotBatteryPower;
-        public byte LastRobotBatteryPower;
-
-        [FieldOffset(7)]
-        private byte timerActive;
 
         /// <summary>
         /// Gets if the player is currently Overheated.

Dalamud/Game/ClientState/Structs/JobGauge/MNKGauge.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Runtime.InteropServices;
 
 namespace Dalamud.Game.ClientState.Structs.JobGauge
@@ -9,35 +8,12 @@ namespace Dalamud.Game.ClientState.Structs.JobGauge
     [StructLayout(LayoutKind.Explicit)]
     public struct MNKGauge
     {
+        [FieldOffset(0)]
+        private byte numChakra;
+
         /// <summary>
         /// Gets the number of Chakra available.
         /// </summary>
-        [FieldOffset(0)]
+        public byte NumChakra => this.numChakra;
-        public byte NumChakra;
-
-        /// <summary>
-        /// Gets the Greased Lightning timer in milliseconds.
-        /// </summary>
-        [Obsolete("GL has been removed from the game")]
-        [FieldOffset(0)]
-        public byte GLTimer;
-
-        /// <summary>
-        /// Gets the amount of Greased Lightning stacks.
-        /// </summary>
-        [Obsolete("GL has been removed from the game")]
-        [FieldOffset(2)]
-        public byte NumGLStacks;
-
-        [Obsolete("GL has been removed from the game")]
-        [FieldOffset(4)]
-        private byte glTimerFreezeState;
-
-        /// <summary>
-        /// Gets if the Greased Lightning timer has been frozen.
-        /// </summary>
-        /// <returns>><c>true</c> or <c>false</c>.</returns>
-        [Obsolete("GL has been removed from the game")]
-        public bool IsGLTimerFroze() => false;
     }
 }

Dalamud/Game/ClientState/Structs/JobGauge/NINGauge.cs

@@ -9,30 +9,28 @@ namespace Dalamud.Game.ClientState.Structs.JobGauge
     [StructLayout(LayoutKind.Explicit)]
     public struct NINGauge
     {
+        [FieldOffset(0)]
+        private int hutonTimeLeft;
+
+        [FieldOffset(4)]
+        private byte ninki;
+
+        [FieldOffset(5)]
+        private byte numHutonManualCasts;
+
         /// <summary>
         /// Gets the time left on Huton in milliseconds.
         /// </summary>
-        // TODO: Probably a short, confirm.
+        public int HutonTimeLeft => this.hutonTimeLeft;
-        [FieldOffset(0)]
-        public int HutonTimeLeft;
 
         /// <summary>
         /// Gets the amount of Ninki available.
         /// </summary>
-        [FieldOffset(4)]
+        public byte Ninki => this.ninki;
-        public byte Ninki;
-
-        /// <summary>
-        /// Obsolete.
-        /// </summary>
-        [Obsolete("Does not appear to be used")]
-        [FieldOffset(4)]
-        public byte TCJMudrasUsed;
 
         /// <summary>
         /// Gets the number of times Huton has been cast manually.
         /// </summary>
-        [FieldOffset(5)]
+        public byte NumHutonManualCasts => this.numHutonManualCasts;
-        public byte NumHutonManualCasts;
     }
 }

Dalamud/Game/ClientState/Structs/JobGauge/PLDGauge.cs

@@ -8,10 +8,12 @@ namespace Dalamud.Game.ClientState.Structs.JobGauge
     [StructLayout(LayoutKind.Explicit)]
     public struct PLDGauge
     {
+        [FieldOffset(0)]
+        private byte gaugeAmount;
+
         /// <summary>
         /// Gets the current level of the Oath gauge.
         /// </summary>
-        [FieldOffset(0)]
+        public byte GaugeAmount => this.gaugeAmount;
-        public byte GaugeAmount;
     }
 }

Dalamud/Game/ClientState/Structs/JobGauge/RDMGauge.cs

@@ -8,16 +8,20 @@ namespace Dalamud.Game.ClientState.Structs.JobGauge
     [StructLayout(LayoutKind.Explicit)]
     public struct RDMGauge
     {
+        [FieldOffset(0)]
+        private byte whiteGauge;
+
+        [FieldOffset(1)]
+        private byte blackGauge;
+
         /// <summary>
         /// Gets the level of the White gauge.
         /// </summary>
-        [FieldOffset(0)]
+        public byte WhiteGauge => this.whiteGauge;
-        public byte WhiteGauge;
 
         /// <summary>
         /// Gets the level of the Black gauge.
         /// </summary>
-        [FieldOffset(1)]
+        public byte BlackGauge => this.blackGauge;
-        public byte BlackGauge;
     }
 }

Dalamud/Game/ClientState/Structs/JobGauge/SAMGauge.cs

@@ -8,23 +8,29 @@ namespace Dalamud.Game.ClientState.Structs.JobGauge
     [StructLayout(LayoutKind.Explicit)]
     public struct SAMGauge
     {
+        [FieldOffset(3)]
+        private byte kenki;
+
+        [FieldOffset(4)]
+        private byte meditationStacks;
+
+        [FieldOffset(5)]
+        private Sen sen;
+
         /// <summary>
         /// Gets the current amount of Kenki available.
         /// </summary>
-        [FieldOffset(3)]
+        public byte Kenki => this.kenki;
-        public byte Kenki;
 
         /// <summary>
         /// Gets the amount of Meditation stacks.
         /// </summary>
-        [FieldOffset(4)]
+        public byte MeditationStacks => this.meditationStacks;
-        public byte MeditationStacks;
 
         /// <summary>
         /// Gets the active Sen.
         /// </summary>
-        [FieldOffset(5)]
+        public Sen Sen => this.sen;
-        public Sen Sen;
 
         /// <summary>
         /// Gets if the Setsu Sen is active.

Dalamud/Game/ClientState/Structs/JobGauge/SCHGauge.cs

@@ -8,28 +8,36 @@ namespace Dalamud.Game.ClientState.Structs.JobGauge
     [StructLayout(LayoutKind.Explicit)]
     public struct SCHGauge
     {
+        [FieldOffset(2)]
+        private byte numAetherflowStacks;
+
+        [FieldOffset(3)]
+        private byte fairyGaugeAmount;
+
+        [FieldOffset(4)]
+        private short seraphTimer;
+
+        [FieldOffset(6)]
+        private DismissedFairy dismissedFairy;
+
         /// <summary>
         /// Gets the amount of Aetherflow stacks available.
         /// </summary>
-        [FieldOffset(2)]
+        public byte NumAetherflowStacks => this.numAetherflowStacks;
-        public byte NumAetherflowStacks;
 
         /// <summary>
         /// Gets the current level of the Fairy Gauge.
         /// </summary>
-        [FieldOffset(3)]
+        public byte FairyGaugeAmount => this.fairyGaugeAmount;
-        public byte FairyGaugeAmount;
 
         /// <summary>
         /// Gets the Seraph time remaining in milliseconds.
         /// </summary>
-        [FieldOffset(4)]
+        public short SeraphTimer => this.seraphTimer;
-        public short SeraphTimer;
 
         /// <summary>
         /// Gets the last dismissed fairy.
         /// </summary>
-        [FieldOffset(6)]
+        public DismissedFairy DismissedFairy => this.dismissedFairy;
-        public DismissedFairy DismissedFairy;
     }
 }

Dalamud/Game/ClientState/Structs/JobGauge/SMNGauge.cs

@@ -8,30 +8,38 @@ namespace Dalamud.Game.ClientState.Structs.JobGauge
     [StructLayout(LayoutKind.Explicit)]
     public struct SMNGauge
     {
+        [FieldOffset(0)]
+        private short timerRemaining;
+
+        [FieldOffset(2)]
+        private SummonPet returnSummon;
+
+        [FieldOffset(3)]
+        private PetGlam returnSummonGlam;
+
+        [FieldOffset(4)]
+        private byte numStacks;
+
         /// <summary>
         /// Gets the time remaining for the current summon.
         /// </summary>
-        [FieldOffset(0)]
+        public short TimerRemaining => this.timerRemaining;
-        public short TimerRemaining;
 
         /// <summary>
         /// Gets the summon that will return after the current summon expires.
         /// </summary>
-        [FieldOffset(2)]
+        public SummonPet ReturnSummon => this.returnSummon;
-        public SummonPet ReturnSummon;
 
         /// <summary>
         /// Gets the summon glam for the <see cref="ReturnSummon"/>.
         /// </summary>
-        [FieldOffset(3)]
+        public PetGlam ReturnSummonGlam => this.returnSummonGlam;
-        public PetGlam ReturnSummonGlam;
 
         /// <summary>
         /// Gets the current stacks.
         /// Use the summon accessors instead.
         /// </summary>
-        [FieldOffset(4)]
+        public byte NumStacks => this.numStacks;
-        public byte NumStacks;
 
         /// <summary>
         /// Gets if Phoenix is ready to be summoned.

Dalamud/Game/ClientState/Structs/JobGauge/WARGauge.cs

@@ -8,10 +8,12 @@ namespace Dalamud.Game.ClientState.Structs.JobGauge
     [StructLayout(LayoutKind.Explicit)]
     public struct WARGauge
     {
+        [FieldOffset(0)]
+        private byte beastGaugeAmount;
+
         /// <summary>
         /// Gets the amount of wrath in the Beast gauge.
         /// </summary>
-        [FieldOffset(0)]
+        public byte BeastGaugeAmount => this.beastGaugeAmount;
-        public byte BeastGaugeAmount;
     }
 }

Dalamud/Game/ClientState/Structs/JobGauge/WHMGauge.cs

@@ -8,22 +8,28 @@ namespace Dalamud.Game.ClientState.Structs.JobGauge
     [StructLayout(LayoutKind.Explicit)]
     public struct WHMGauge
     {
+        [FieldOffset(2)]
+        private short lilyTimer;
+
+        [FieldOffset(4)]
+        private byte numLilies;
+
+        [FieldOffset(5)]
+        private byte numBloodLily;
+
         /// <summary>
         /// Gets the time to next lily in milliseconds.
         /// </summary>
-        [FieldOffset(2)]
+        public short LilyTimer => this.lilyTimer;
-        public short LilyTimer;
 
         /// <summary>
         /// Gets the number of Lilies.
         /// </summary>
-        [FieldOffset(4)]
+        public byte NumLilies => this.numLilies;
-        public byte NumLilies;
 
         /// <summary>
         /// Gets the number of times the blood lily has been nourished.
         /// </summary>
-        [FieldOffset(5)]
+        public byte NumBloodLily => this.numBloodLily;
-        public byte NumBloodLily;
     }
 }