From 4681bf6151ca656bcbb4dd4d1ffeca81b405f935 Mon Sep 17 00:00:00 2001 From: lichie Date: Sun, 21 Jul 2024 12:05:37 -0700 Subject: [PATCH 1/3] fix LazyFloatConverter --- LMeter/ACT/LazyFloatConverter.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LMeter/ACT/LazyFloatConverter.cs b/LMeter/ACT/LazyFloatConverter.cs index ac384a3..6d8c54e 100644 --- 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(reader), + JsonToken.Float or JsonToken.Integer => new LazyFloat(serializer.Deserialize(reader)), JsonToken.String => new LazyFloat(serializer.Deserialize(reader)), _ => new LazyFloat(0f) }; From 30f61d0708cba15166d73a1047675e2a5e6ad4fd Mon Sep 17 00:00:00 2001 From: lichie Date: Sun, 21 Jul 2024 12:28:52 -0700 Subject: [PATCH 2/3] remove throwaways causing 0 dps --- LMeter/ACT/DataStructures/Combatant.cs | 8 -------- LMeter/ACT/DataStructures/Encounter.cs | 9 --------- 2 files changed, 17 deletions(-) diff --git a/LMeter/ACT/DataStructures/Combatant.cs b/LMeter/ACT/DataStructures/Combatant.cs index 608c9f8..9cf6cc6 100644 --- a/LMeter/ACT/DataStructures/Combatant.cs +++ b/LMeter/ACT/DataStructures/Combatant.cs @@ -21,14 +21,6 @@ public class Combatant : IActData 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 index f247641..17d5f54 100644 --- 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; From 74f7bccdf0552d49edb5a72a3df84219b2f2f4fb Mon Sep 17 00:00:00 2001 From: lichie Date: Sun, 21 Jul 2024 12:32:54 -0700 Subject: [PATCH 3/3] bump version --- LMeter/LMeter.csproj | 6 +++--- LMeter/Plugin.cs | 2 +- LMeter/changelog.md | 3 +++ Properties/AssemblyInfo.cs | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/LMeter/LMeter.csproj b/LMeter/LMeter.csproj index aaabca6..023d2b7 100644 --- a/LMeter/LMeter.csproj +++ b/LMeter/LMeter.csproj @@ -10,9 +10,9 @@ LMeter - 0.4.0.0 - 0.4.0.0 - 0.4.0.0 + 0.4.0.1 + 0.4.0.1 + 0.4.0.1 diff --git a/LMeter/Plugin.cs b/LMeter/Plugin.cs index dcc9777..a9dd1ec 100644 --- 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 index 57a639d..8e24bbd 100644 --- 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 index 9f1d22e..a59746c 100644 --- 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")]