diff --git a/Shared/SneakWorld.cs b/Shared/SneakWorld.cs index 63d948c..fa6b814 100644 --- a/Shared/SneakWorld.cs +++ b/Shared/SneakWorld.cs @@ -1,8 +1,8 @@ using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; -using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; +using System.Text.Json; namespace SemiColinGames { @@ -14,7 +14,7 @@ namespace SemiColinGames { private readonly Tile[] obstacles; private readonly Tile[] decorations; // Kept around for resetting the world's entities after player death or level restart. - private readonly JToken entitiesLayer; + private readonly JsonElement entitiesLayer; private NPC[] npcs; public Player Player { get; private set; } @@ -31,17 +31,17 @@ namespace SemiColinGames { Camera = new Camera(); LinesOfSight = new LinesOfSight(graphics); - JObject root = JObject.Parse(json); - Width = root.SelectToken("width").Value(); - Height = root.SelectToken("height").Value(); + JsonElement jsonRoot = JsonDocument.Parse(json).RootElement; + Width = jsonRoot.GetProperty("width").GetInt32(); + Height = jsonRoot.GetProperty("height").GetInt32(); List hazardTiles = new List(); List obstacleTiles = new List(); List obstacleTiles8 = new List(); List decorationTiles = new List(); List backgroundTiles = new List(); - foreach (JToken layer in root.SelectToken("layers").Children()) { - string layerName = layer.SelectToken("name").Value(); + foreach (JsonElement layer in jsonRoot.GetProperty("layers").EnumerateArray()) { + string layerName = layer.GetProperty("name").GetString(); if (layerName == "entities") { entitiesLayer = layer; (Player, npcs) = ParseEntities(layer); @@ -99,21 +99,22 @@ namespace SemiColinGames { GC.SuppressFinalize(this); } - private List ParseLayer(JToken layer) { - string layerName = layer.SelectToken("name").Value(); + private List ParseLayer(JsonElement layer) { + string layerName = layer.GetProperty("name").GetString(); var tileList = new List(); - int layerWidth = layer.SelectToken("gridCellsX").Value(); - int layerHeight = layer.SelectToken("gridCellsY").Value(); + int layerWidth = layer.GetProperty("gridCellsX").GetInt32(); + int layerHeight = layer.GetProperty("gridCellsY").GetInt32(); gridWidth = Math.Max(gridWidth, layerWidth); gridHeight = Math.Max(gridHeight, layerHeight); int dataIndex = -1; - int tileWidth = layer.SelectToken("gridCellWidth").Value(); - int tileHeight = layer.SelectToken("gridCellHeight").Value(); + int tileWidth = layer.GetProperty("gridCellWidth").GetInt32(); + int tileHeight = layer.GetProperty("gridCellHeight").GetInt32(); int textureWidth = Textures.Grassland.Get.Width / tileWidth; - foreach (int textureIndex in layer.SelectToken("data").Values()) { + foreach (JsonElement textureIndexElement in layer.GetProperty("data").EnumerateArray()) { + int textureIndex = textureIndexElement.GetInt32(); dataIndex++; if (textureIndex == -1) { continue; @@ -133,14 +134,14 @@ namespace SemiColinGames { return tileList; } - private (Player, NPC[]) ParseEntities(JToken layer) { + private (Player, NPC[]) ParseEntities(JsonElement layer) { Player player = null; List npcs = new List(); - foreach (JToken entity in layer.SelectToken("entities").Children()) { - string name = entity.SelectToken("name").Value(); - int x = entity.SelectToken("x").Value(); - int y = entity.SelectToken("y").Value(); - int facing = entity.SelectToken("flippedX").Value() ? -1 : 1; + foreach (JsonElement entity in layer.GetProperty("entities").EnumerateArray()) { + string name = entity.GetProperty("name").GetString(); + int x = entity.GetProperty("x").GetInt32(); + int y = entity.GetProperty("y").GetInt32(); + int facing = entity.GetProperty("flippedX").GetBoolean() ? -1 : 1; if (name == "player") { player = new Player(new Vector2(x, y), facing); } else if (name == "executioner") {