Further AoT x JSON warnings

SakulFlee · Dec 10, 2024 · 12d2e3c · 12d2e3c
1 parent 5552fd5
commit 12d2e3c
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 28 deletions.
diff --git a/Godot Project/addons/match_maker/MatchMakerRequest.cs b/Godot Project/addons/match_maker/MatchMakerRequest.cs
@@ -1,9 +1,6 @@
-using System.Text.Json.Serialization;
-
 /// <summary>
 /// An outgoing packet send to the Match Maker Server to request a queue to be created or joined.
 /// </summary>
-[JsonSerializable(typeof(MatchMakerRequest))]
 public class MatchMakerRequest
 {
     public string name { get; set; }

diff --git a/Godot Project/addons/match_maker/MatchMakerResponse.cs b/Godot Project/addons/match_maker/MatchMakerResponse.cs
@@ -1,10 +1,7 @@
-using System.Text.Json.Serialization;
-
 /// <summary>
 /// An incoming response received from the Match Maker Server once a queue filled.
 /// Contains all the necessary information to make a P2P connection via WebRTC possible.
 /// </summary>
-[JsonSerializable(typeof(MatchMakerResponse))]
 public class MatchMakerResponse
 {
     public string ownUUID { get; set; }

diff --git a/Godot Project/addons/match_maker/MatchMakierUpdate.cs b/Godot Project/addons/match_maker/MatchMakierUpdate.cs
@@ -1,10 +1,7 @@
-using System.Text.Json.Serialization;
-
 /// <summary>
 /// An incoming response received from the Match Maker Server once a queue filled.
 /// Contains all the necessary information to make a P2P connection via WebRTC possible.
 /// </summary>
-[JsonSerializable(typeof(MatchMakerUpdate))]
 public class MatchMakerUpdate
 {
     public uint currentPeerCount { get; set; }

diff --git a/Godot Project/addons/match_maker/Packet.cs b/Godot Project/addons/match_maker/Packet.cs
@@ -6,7 +6,6 @@
 /// <summary>
 /// The general packet/package send and received to and from the Match Maker Server.
 /// </summary>
-[JsonSerializable(typeof(Packet))]
 public class Packet
 {
     /// <summary>
@@ -96,12 +95,7 @@ public MatchMakerRequest ParseMatchMakerRequest()
             return null;
         }
 
-        var result = JsonSerializer.Deserialize<MatchMakerRequest>(json, new JsonSerializerOptions()
-        {
-            IncludeFields = true,
-            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-        });
-        return result;
+        return JsonSerializer.Deserialize(json, typeof(MatchMakerRequest), JsonSourceGenContext.Default) as MatchMakerRequest;
     }
 
     /// <summary>
@@ -118,12 +112,7 @@ public MatchMakerResponse ParseMatchMakerResponse()
             return null;
         }
 
-        var result = JsonSerializer.Deserialize<MatchMakerResponse>(json, new JsonSerializerOptions()
-        {
-            IncludeFields = true,
-            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-        });
-        return result;
+        return JsonSerializer.Deserialize(json, typeof(MatchMakerResponse), JsonSourceGenContext.Default) as MatchMakerResponse;
     }
 
     /// <summary>
@@ -140,11 +129,6 @@ public MatchMakerUpdate ParseMatchMakerUpdate()
             return null;
         }
 
-        var result = JsonSerializer.Deserialize<MatchMakerUpdate>(json, new JsonSerializerOptions()
-        {
-            IncludeFields = true,
-            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-        });
-        return result;
+        return JsonSerializer.Deserialize(json, typeof(MatchMakerUpdate), JsonSourceGenContext.Default) as MatchMakerUpdate;
     }
 }