com.wallstop-studios.unity-helpers 2.0.0-rc02 → 2.0.0-rc04

package/Runtime/Core/DataStructure/Adapters/KGuid.cs

@@ -2,6 +2,7 @@
 {
     using System;
     using System.Runtime.Serialization;
+    using System.Text.Json.Serialization;
     using Helper;
     using ProtoBuf;
 
@@ -16,40 +17,52 @@
          */
         [ProtoMember(1)]
         private int _a;
+
         [ProtoMember(2)]
         private short _b;
+
         [ProtoMember(3)]
         private short _c;
+
         [ProtoMember(4)]
         private byte _d;
+
         [ProtoMember(5)]
         private byte _e;
+
         [ProtoMember(6)]
         private byte _f;
+
         [ProtoMember(7)]
         private byte _g;
+
         [ProtoMember(8)]
         private byte _h;
+
         [ProtoMember(9)]
         private byte _i;
+
         [ProtoMember(10)]
         private byte _j;
+
         [ProtoMember(11)]
         private byte _k;
 
         private int _hashCode;
 
-        [DataMember] 
-        private string Guid => ((Guid) this).ToString();
+        [JsonInclude]
+        [DataMember]
+        private string Guid => ((Guid)this).ToString();
 
         public static KGuid NewGuid()
         {
             return new KGuid(System.Guid.NewGuid());
         }
-        
-        public KGuid(Guid guid) : this(guid.ToByteArray())
-        {
-        }
+
+        public KGuid(Guid guid) : this(guid.ToByteArray()) { }
+
+        [JsonConstructor]
+        public KGuid(string guid) : this(System.Guid.Parse(guid)) { }
 
         public KGuid(byte[] guidBytes)
         {
@@ -69,7 +82,8 @@
 
         public static implicit operator Guid(KGuid guid)
         {
-            return new Guid(guid._a, guid._b, guid._c, guid._d, guid._e, guid._f, guid._g, guid._h, guid._i, guid._j, guid._k);
+            return new Guid(
+                guid._a, guid._b, guid._c, guid._d, guid._e, guid._f, guid._g, guid._h, guid._i, guid._j, guid._k);
         }
 
         public static implicit operator KGuid(Guid guid)
@@ -244,16 +258,16 @@
 
         public byte[] ToByteArray()
         {
-            return new []
+            return new[]
             {
-                (byte) _a,
-                (byte) (_a >> 8),
-                (byte) (_a >> 16),
-                (byte) (_a >> 24),
-                (byte) _b,
-                (byte) ((uint) _b >> 8),
-                (byte) _c,
-                (byte) ((uint) _c >> 8),
+                (byte)_a,
+                (byte)(_a >> 8),
+                (byte)(_a >> 16),
+                (byte)(_a >> 24),
+                (byte)_b,
+                (byte)((uint)_b >> 8),
+                (byte)_c,
+                (byte)((uint)_c >> 8),
                 _d,
                 _e,
                 _f,
@@ -271,4 +285,4 @@
             _hashCode = 0;
         }
     }
-}
+}

package/Runtime/Core/Math/Range.cs

@@ -4,6 +4,7 @@
     using Helper;
     using System;
     using System.Runtime.Serialization;
+    using System.Text.Json.Serialization;
 
     /// <summary>
     ///     Inclusive Range [min,max]
@@ -13,17 +14,22 @@
     public struct Range<T> : IEquatable<Range<T>> where T : IEquatable<T>, IComparable<T>
     {
         [DataMember]
+        [JsonInclude]
         public T min;
 
         [DataMember]
+        [JsonInclude]
         public T max;
 
         [DataMember]
+        [JsonInclude]
         public bool startInclusive;
 
         [DataMember]
+        [JsonInclude]
         public bool endInclusive;
 
+        [JsonConstructor]
         public Range(T min, T max, bool startInclusive = true, bool endInclusive = true)
         {
             this.min = min;

package/Runtime/Core/Random/PcgRandom.cs

@@ -2,6 +2,7 @@
 {
     using System;
     using System.Runtime.Serialization;
+    using System.Text.Json.Serialization;
 
     /// <summary>
     ///     Implementation based off of the reference PCG Random, found here: https://www.pcg-random.org/index.html
@@ -12,14 +13,17 @@
     {
         public static IRandom Instance => ThreadLocalRandom<PcgRandom>.Instance;
 
+        [JsonInclude]
+        [JsonPropertyName("Increment")]
         [DataMember(Name = "Increment")]
         internal readonly ulong _increment;
+
+        [JsonInclude]
+        [JsonPropertyName("State")]
         [DataMember(Name = "State")]
         internal ulong _state;
 
-        public PcgRandom() : this(Guid.NewGuid())
-        {
-        }
+        public PcgRandom() : this(Guid.NewGuid()) { }
 
         public PcgRandom(Guid guid)
         {
@@ -35,6 +39,7 @@
             _cachedGaussian = randomState.Gaussian;
         }
 
+        [JsonConstructor]
         public PcgRandom(ulong increment, ulong state)
         {
             _increment = increment;
@@ -45,11 +50,11 @@
         {
             // Start with a nice prime
             _increment = 6554638469UL;
-            _state = unchecked((ulong) seed);
+            _state = unchecked((ulong)seed);
             _increment = NextUlong();
         }
 
-        public override RandomState InternalState => new (_state, _increment, _cachedGaussian);
+        public override RandomState InternalState => new(_state, _increment, _cachedGaussian);
 
         public override uint NextUint()
         {
@@ -87,6 +92,7 @@
                 {
                     return 0;
                 }
+
                 if (_state < other._state)
                 {
                     return -1;
@@ -139,4 +145,4 @@
             return new PcgRandom(InternalState);
         }
     }
-}
+}

package/Runtime/Core/Serialization/Serializer.cs

@@ -25,6 +25,7 @@
                 IgnoreReadOnlyProperties = false,
                 ReferenceHandler = ReferenceHandler.IgnoreCycles,
                 IncludeFields = true,
+                PropertyNameCaseInsensitive = true,
                 Converters =
                 {
                     new JsonStringEnumConverter(),
@@ -38,6 +39,7 @@
                 IgnoreReadOnlyFields = false,
                 IgnoreReadOnlyProperties = false,
                 ReferenceHandler = ReferenceHandler.IgnoreCycles,
+                PropertyNameCaseInsensitive = true,
                 IncludeFields = true,
                 Converters =
                 {

package/Runtime/Utils/AnimatorEnumStateMachine.cs

@@ -6,6 +6,7 @@
     using System.Globalization;
     using System.Linq;
     using System.Runtime.Serialization;
+    using System.Text.Json.Serialization;
     using UnityEngine;
 
     /// <summary>
@@ -19,13 +20,20 @@
     {
         private static readonly T[] Values = Enum.GetValues(typeof(T)).OfType<T>().ToArray();
 
-        [IgnoreDataMember] private readonly HashSet<string> _availableBools = new HashSet<string>();
+        [JsonIgnore]
+        [IgnoreDataMember]
+        private readonly HashSet<string> _availableBools = new HashSet<string>();
 
-        [IgnoreDataMember] public readonly Animator Animator;
+        [JsonIgnore]
+        [IgnoreDataMember]
+        public readonly Animator Animator;
 
-        [IgnoreDataMember] private T _value;
+        [JsonIgnore]
+        [IgnoreDataMember]
+        private T _value;
 
         [DataMember]
+        [JsonInclude]
         public T Value
         {
             get { return _value; }
@@ -45,6 +53,7 @@
         }
 
         [DataMember]
+        [JsonInclude]
         private string Type => typeof(T).Name;
 
         public AnimatorEnumStateMachine(Animator animator, T defaultValue = default(T))
@@ -77,4 +86,4 @@
             return this.ToJson();
         }
     }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.wallstop-studios.unity-helpers",
-  "version": "2.0.0-rc02",
+  "version": "2.0.0-rc04",
   "displayName": "Unity Helpers",
   "description": "Various Unity Helper Library",
   "dependencies": {},