Remove Newtonsoft.Json.dll and its references from the project.

Pilihp64 · Jul 19, 2015 · e516ae1 · e516ae1
1 parent 7e2f55f
commit e516ae1
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 292 deletions.
diff --git a/...braries.Steamworks.NET.Steamworks.NET.dll → Steamworks.NET.dll b/...braries.Steamworks.NET.Steamworks.NET.dll → Steamworks.NET.dll
diff --git a/Terraria.Libraries.JSON.NET.Net40.Newtonsoft.Json.dll b/Terraria.Libraries.JSON.NET.Net40.Newtonsoft.Json.dll
diff --git a/Terraria/Achievements/Achievement.cs b/Terraria/Achievements/Achievement.cs
@@ -1,5 +1,3 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Threading;
@@ -8,7 +6,6 @@
 
 namespace Terraria.Achievements
 {
-	[JsonObject(MemberSerialization.OptIn)]
 	public class Achievement
 	{
 		private static int _totalAchievements;
@@ -25,7 +22,6 @@ public class Achievement
 
 		private IAchievementTracker _tracker;
 
-		[JsonProperty("Conditions")]
 		private Dictionary<string, AchievementCondition> _conditions;
 
 		private int _completedCount;
@@ -121,29 +117,6 @@ public IAchievementTracker GetTracker()
 			return this._tracker;
 		}
 
-		public void Load(Dictionary<string, JObject> conditions)
-		{
-			AchievementCondition achievementCondition;
-			foreach (KeyValuePair<string, JObject> condition in conditions)
-			{
-				if (!this._conditions.TryGetValue(condition.Key, out achievementCondition))
-				{
-					continue;
-				}
-				achievementCondition.Load(condition.Value);
-				if (!achievementCondition.IsCompleted)
-				{
-					continue;
-				}
-				Achievement achievement = this;
-				achievement._completedCount = achievement._completedCount + 1;
-			}
-			if (this._tracker != null)
-			{
-				this._tracker.Load();
-			}
-		}
-
 		private void OnConditionComplete(AchievementCondition condition)
 		{
 			Achievement achievement = this;

diff --git a/Terraria/Achievements/AchievementCondition.cs b/Terraria/Achievements/AchievementCondition.cs
@@ -1,18 +1,14 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using System;
 using System.Threading;
 
 namespace Terraria.Achievements
 {
-	[JsonObject(MemberSerialization.OptIn)]
 	public abstract class AchievementCondition
 	{
 		public readonly string Name;
 
 		protected IAchievementTracker _tracker;
 
-		[JsonProperty("Completed")]
 		private bool _isCompleted;
 
 		public bool IsCompleted
@@ -60,11 +56,6 @@ public IAchievementTracker GetAchievementTracker()
 			return this._tracker;
 		}
 
-		public virtual void Load(JObject state)
-		{
-			this._isCompleted = (bool)state["Completed"];
-		}
-
 		public event AchievementCondition.AchievementUpdate OnComplete;
 
 		public delegate void AchievementUpdate(AchievementCondition condition);

diff --git a/Terraria/Achievements/AchievementManager.cs b/Terraria/Achievements/AchievementManager.cs
@@ -1,6 +1,3 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Bson;
-using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -21,8 +18,6 @@ public class AchievementManager
 
 		private Dictionary<string, Achievement> _achievements = new Dictionary<string, Achievement>();
 
-		private readonly JsonSerializerSettings _serializerSettings = new JsonSerializerSettings();
-
 		private ICryptoTransform _encryptor;
 
 		private ICryptoTransform _decryptor;
@@ -107,73 +102,7 @@ public int GetIconIndex(string achievementName)
 
 		public void Load()
 		{
-			this.Load(this._savePath);
-		}
-
-		private void Load(string path)
-		{
-			bool flag = false;
-			lock (AchievementManager._ioLock)
-			{
-				if (FileUtilities.Exists(path))
-				{
-					byte[] numArray = FileUtilities.ReadAllBytes(path);
-					Dictionary<string, AchievementManager.StoredAchievement> strs = null;
-					try
-					{
-						using (MemoryStream memoryStream = new MemoryStream(numArray))
-						{
-							using (CryptoStream cryptoStream = new CryptoStream(memoryStream, this._decryptor, CryptoStreamMode.Read))
-							{
-								using (BsonReader bsonReader = new BsonReader(cryptoStream))
-								{
-									strs = JsonSerializer.Create(this._serializerSettings).Deserialize<Dictionary<string, AchievementManager.StoredAchievement>>(bsonReader);
-								}
-							}
-						}
-					}
-					catch (Exception)
-					{
-						FileUtilities.Delete(path);
-						return;
-					}
-					if (strs != null)
-					{
-						foreach (KeyValuePair<string, AchievementManager.StoredAchievement> keyValuePair in strs)
-						{
-							if (!this._achievements.ContainsKey(keyValuePair.Key))
-							{
-								continue;
-							}
-							this._achievements[keyValuePair.Key].Load(keyValuePair.Value.Conditions);
-						}
-						if (SocialAPI.Achievements != null)
-						{
-							foreach (KeyValuePair<string, Achievement> _achievement in this._achievements)
-							{
-								if (!_achievement.Value.IsCompleted || SocialAPI.Achievements.IsAchievementCompleted(_achievement.Key))
-								{
-									continue;
-								}
-								flag = true;
-								_achievement.Value.ClearProgress();
-							}
-						}
-					}
-					else
-					{
-						return;
-					}
-				}
-				else
-				{
-					return;
-				}
-			}
-			if (flag)
-			{
-				this.Save();
-			}
+
 		}
 
 		public void Register(Achievement achievement)
@@ -194,53 +123,9 @@ public void RegisterIconIndex(string achievementName, int iconIndex)
 
 		public void Save()
 		{
-			this.Save(this._savePath);
-		}
-
-		private void Save(string path)
-		{
-			lock (AchievementManager._ioLock)
-			{
-				if (SocialAPI.Achievements != null)
-				{
-					SocialAPI.Achievements.StoreStats();
-				}
-				try
-				{
-					using (MemoryStream memoryStream = new MemoryStream())
-					{
-						using (CryptoStream cryptoStream = new CryptoStream(memoryStream, this._encryptor, CryptoStreamMode.Write))
-						{
-							using (BsonWriter bsonWriter = new BsonWriter(cryptoStream))
-							{
-								JsonSerializer.Create(this._serializerSettings).Serialize(bsonWriter, this._achievements);
-								bsonWriter.Flush();
-								cryptoStream.FlushFinalBlock();
-								FileUtilities.Write(path, memoryStream.GetBuffer(), (int)memoryStream.Length);
-							}
-						}
-					}
-				}
-				catch (Exception ex)
-				{
-#if DEBUG
-					Console.WriteLine(ex);
-					System.Diagnostics.Debugger.Break();
-
-#endif
-				}
-			}
+
 		}
 
 		public event Achievement.AchievementCompleted OnAchievementCompleted;
-
-		private class StoredAchievement
-		{
-			public Dictionary<string, JObject> Conditions;
-
-			public StoredAchievement()
-			{
-			}
-		}
 	}
 }
diff --git a/Terraria/GameContent/Achievements/CustomFloatCondition.cs b/Terraria/GameContent/Achievements/CustomFloatCondition.cs
@@ -1,5 +1,3 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using System;
 using Terraria;
 using Terraria.Achievements;
@@ -8,7 +6,6 @@ namespace Terraria.GameContent.Achievements
 {
 	internal class CustomFloatCondition : AchievementCondition
 	{
-		[JsonProperty("Value")]
 		private float _value;
 
 		private float _maxValue;
@@ -55,15 +52,5 @@ protected override IAchievementTracker CreateAchievementTracker()
 		{
 			return new ConditionFloatTracker(this._maxValue);
 		}
-
-		public override void Load(JObject state)
-		{
-			base.Load(state);
-			this._value = (float)((float)state["Value"]);
-			if (this._tracker != null)
-			{
-				((ConditionFloatTracker)this._tracker).SetValue(this._value, false);
-			}
-		}
 	}
 }
diff --git a/Terraria/GameContent/Achievements/CustomIntCondition.cs b/Terraria/GameContent/Achievements/CustomIntCondition.cs
@@ -1,5 +1,3 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using System;
 using Terraria;
 using Terraria.Achievements;
@@ -8,7 +6,6 @@ namespace Terraria.GameContent.Achievements
 {
 	internal class CustomIntCondition : AchievementCondition
 	{
-		[JsonProperty("Value")]
 		private int _value;
 
 		private int _maxValue;
@@ -55,15 +52,5 @@ protected override IAchievementTracker CreateAchievementTracker()
 		{
 			return new ConditionIntTracker(this._maxValue);
 		}
-
-		public override void Load(JObject state)
-		{
-			base.Load(state);
-			this._value = (int)state["Value"];
-			if (this._tracker != null)
-			{
-				((ConditionIntTracker)this._tracker).SetValue(this._value, false);
-			}
-		}
 	}
 }