Merge pull request #67 from lichie567/develop

Fix 0 dps bug
lichie567 · Jul 21, 2024 · a2e1829 · a2e1829
2 parents 24e6332 + 74f7bcc
commit a2e1829
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 24 deletions.
diff --git a/LMeter/ACT/DataStructures/Combatant.cs b/LMeter/ACT/DataStructures/Combatant.cs
@@ -21,14 +21,6 @@ public class Combatant : IActData<Combatant>
 
     public string? NameOverwrite { get; set; } = null;
 
-// These have to be here because newtonsoft and overlayplugin suck
-#pragma warning disable 0169
-    [JsonProperty("ENCDPS")]
-    private readonly string? _encdps;
-    [JsonProperty("ENCHPS")]
-    private readonly string? _enchps;
-#pragma warning restore 0169
-
     [TextTag]
     [JsonIgnore]
     public string Name => NameOverwrite ?? OriginalName;

diff --git a/LMeter/ACT/DataStructures/Encounter.cs b/LMeter/ACT/DataStructures/Encounter.cs
@@ -20,15 +20,6 @@ public string GetFormattedString(string format, string numberFormat)
         return TextTagFormatter.TextTagRegex.Replace(format, new TextTagFormatter(this, numberFormat, _textTagMembers).Evaluate);
     }
 
-
-// These have to be here because newtonsoft and overlayplugin suck
-#pragma warning disable 0169
-    [JsonProperty("ENCDPS")]
-    private readonly string? _encdps;
-    [JsonProperty("ENCHPS")]
-    private readonly string? _enchps;
-#pragma warning restore 0169
-
     [TextTag]
     [JsonProperty("title")]
     public string Title { get; set; } = string.Empty;

diff --git a/LMeter/ACT/LazyFloatConverter.cs b/LMeter/ACT/LazyFloatConverter.cs
@@ -28,7 +28,7 @@ public override void WriteJson(JsonWriter writer, object? value, JsonSerializer
 
             return reader.TokenType switch
             {
-                JsonToken.Float or JsonToken.Integer => serializer.Deserialize<float>(reader),
+                JsonToken.Float or JsonToken.Integer => new LazyFloat(serializer.Deserialize<float>(reader)),
                 JsonToken.String => new LazyFloat(serializer.Deserialize<string?>(reader)),
                 _ => new LazyFloat(0f)
             };

diff --git a/LMeter/LMeter.csproj b/LMeter/LMeter.csproj
@@ -10,9 +10,9 @@
     <!-- Assembly Configuration -->
     <PropertyGroup>
         <AssemblyName>LMeter</AssemblyName>
-        <AssemblyVersion>0.4.0.0</AssemblyVersion>
-        <FileVersion>0.4.0.0</FileVersion>
-        <InformationalVersion>0.4.0.0</InformationalVersion>
+        <AssemblyVersion>0.4.0.1</AssemblyVersion>
+        <FileVersion>0.4.0.1</FileVersion>
+        <InformationalVersion>0.4.0.1</InformationalVersion>
     </PropertyGroup>
 
     <!-- Build Configuration -->

diff --git a/LMeter/Plugin.cs b/LMeter/Plugin.cs
@@ -17,7 +17,7 @@ public class Plugin : IDalamudPlugin
     {
         public const string ConfigFileName = "LMeter.json";
 
-        public static string Version { get; private set; } = "0.4.0.0";
+        public static string Version { get; private set; } = "0.4.0.1";
         public static string ConfigFileDir { get; private set; } = "";
         public static string ConfigFilePath { get; private set; } = "";
         public static string AssemblyFileDir { get; private set; } = "";

diff --git a/LMeter/changelog.md b/LMeter/changelog.md
@@ -1,3 +1,6 @@
+# Version 0.4.0.1
+- Fix bug causing many numbers to show 0
+
 # Version 0.4.0.0
 - Redesigned Text options to allow significantly more customization
     - Can now create as many separate bar texts as you would like

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.4.0.0")]
-[assembly: AssemblyFileVersion("0.4.0.0")]
+[assembly: AssemblyVersion("0.4.0.1")]
+[assembly: AssemblyFileVersion("0.4.0.1")]