refactor: apply lints
This commit is contained in:
parent
3241b26929
commit
ee9197f276
@ -24,19 +24,11 @@ public class WhenNodeDeserialiser : INodeDeserializer {
|
|||||||
throw new YamlException("invalid when: missing key");
|
throw new YamlException("invalid when: missing key");
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (name.Value) {
|
value = name.Value switch {
|
||||||
case "quest": {
|
"quest" => nestedObjectDeserializer(reader, typeof(WhenQuest)),
|
||||||
value = nestedObjectDeserializer(reader, typeof(WhenQuest));
|
"level" => nestedObjectDeserializer(reader, typeof(WhenLevel)),
|
||||||
break;
|
_ => throw new YamlException($"invalid when: unknown type \"{name.Value}\""),
|
||||||
}
|
};
|
||||||
case "level": {
|
|
||||||
value = nestedObjectDeserializer(reader, typeof(WhenLevel));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
default: {
|
|
||||||
throw new YamlException($"invalid when: unknown type \"{name.Value}\"");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
reader.Consume<MappingEnd>();
|
reader.Consume<MappingEnd>();
|
||||||
|
|
||||||
|
@ -31,7 +31,7 @@ public class WhenLevelConverter : IYamlTypeConverter {
|
|||||||
return type == typeof(WhenLevel);
|
return type == typeof(WhenLevel);
|
||||||
}
|
}
|
||||||
|
|
||||||
public object? ReadYaml(IParser parser, Type type) {
|
public object ReadYaml(IParser parser, Type type) {
|
||||||
parser.Consume<MappingStart>();
|
parser.Consume<MappingStart>();
|
||||||
|
|
||||||
string? text = null;
|
string? text = null;
|
||||||
@ -46,20 +46,6 @@ public class WhenLevelConverter : IYamlTypeConverter {
|
|||||||
|
|
||||||
var value = parser.Consume<Scalar>();
|
var value = parser.Consume<Scalar>();
|
||||||
|
|
||||||
void ParseOperation(int comparer) {
|
|
||||||
if (comparerResult != null) {
|
|
||||||
throw new YamlException("duplicate operations in whenlevel");
|
|
||||||
}
|
|
||||||
|
|
||||||
comparerResult = comparer;
|
|
||||||
|
|
||||||
if (!uint.TryParse(value.Value, out var lvl)) {
|
|
||||||
throw new YamlException("invalid whenlevel: level was not numeric");
|
|
||||||
}
|
|
||||||
|
|
||||||
level = lvl;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (key.Value) {
|
switch (key.Value) {
|
||||||
case "greaterThan": {
|
case "greaterThan": {
|
||||||
ParseOperation(1);
|
ParseOperation(1);
|
||||||
@ -88,6 +74,22 @@ public class WhenLevelConverter : IYamlTypeConverter {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
continue;
|
||||||
|
|
||||||
|
void ParseOperation(int comparer) {
|
||||||
|
if (comparerResult != null) {
|
||||||
|
throw new YamlException("duplicate operations in whenlevel");
|
||||||
|
}
|
||||||
|
|
||||||
|
comparerResult = comparer;
|
||||||
|
|
||||||
|
if (!uint.TryParse(value.Value, out var lvl)) {
|
||||||
|
throw new YamlException("invalid whenlevel: level was not numeric");
|
||||||
|
}
|
||||||
|
|
||||||
|
level = lvl;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
parser.Consume<MappingEnd>();
|
parser.Consume<MappingEnd>();
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
|
namespace TimePasses.Model;
|
||||||
|
|
||||||
[Serializable]
|
[Serializable]
|
||||||
public enum QuestStatus {
|
public enum QuestStatus {
|
||||||
Complete,
|
Complete,
|
||||||
|
17
Plugin.cs
17
Plugin.cs
@ -8,6 +8,7 @@ using Dalamud.Plugin;
|
|||||||
using Dalamud.Plugin.Services;
|
using Dalamud.Plugin.Services;
|
||||||
using Dalamud.Utility.Signatures;
|
using Dalamud.Utility.Signatures;
|
||||||
using TimePasses.Model;
|
using TimePasses.Model;
|
||||||
|
using TimePasses.Util;
|
||||||
using YamlDotNet.Serialization;
|
using YamlDotNet.Serialization;
|
||||||
using YamlDotNet.Serialization.NamingConventions;
|
using YamlDotNet.Serialization.NamingConventions;
|
||||||
|
|
||||||
@ -99,15 +100,15 @@ public sealed class Plugin : IDalamudPlugin {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var when = rep.When.FirstOrDefault(when => when.IsValid(this));
|
var when = rep.When.FirstOrDefault(when => when.IsValid(this));
|
||||||
if (when == null) {
|
if (when != null) {
|
||||||
if (rep.Text != null) {
|
return this.GetOrCreateReplacementPointer(when.Text, when.Slowly);
|
||||||
return this.GetOrCreateReplacementPointer(rep.Text, rep.Slowly);
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return this.GetOrCreateReplacementPointer(when.Text, when.Slowly);
|
if (rep.Text != null) {
|
||||||
|
return this.GetOrCreateReplacementPointer(rep.Text, rep.Slowly);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private nint GetOrCreateReplacementPointer(string text, bool slowly) {
|
private nint GetOrCreateReplacementPointer(string text, bool slowly) {
|
||||||
@ -174,7 +175,7 @@ public sealed class Plugin : IDalamudPlugin {
|
|||||||
bytes[textBytes.Length] = 0;
|
bytes[textBytes.Length] = 0;
|
||||||
Marshal.Copy(textBytes, 0, (nint) bytes, textBytes.Length);
|
Marshal.Copy(textBytes, 0, (nint) bytes, textBytes.Length);
|
||||||
|
|
||||||
this.ReplacementPointers![(text, slowly)] = (nint) ptr;
|
this.ReplacementPointers[(text, slowly)] = (nint) ptr;
|
||||||
return (nint) ptr;
|
return (nint) ptr;
|
||||||
} catch {
|
} catch {
|
||||||
Marshal.FreeHGlobal((nint) ptr);
|
Marshal.FreeHGlobal((nint) ptr);
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
namespace TimePasses.Model;
|
namespace TimePasses.Util;
|
||||||
|
|
||||||
internal class OnDispose : IDisposable {
|
internal class OnDispose : IDisposable {
|
||||||
private bool _disposed;
|
private bool _disposed;
|
||||||
|
Loading…
Reference in New Issue
Block a user