Merge pull request #10 from AxeelAnder/master

Version 1.1.1.4

.gitignore

@@ -260,4 +260,5 @@ paket-files/
 
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
-*.pyc
+*.pyc
+/Localizer/Plugins

Localizer/DataModel/Default/BasicPrefixFile.cs

@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+using System.Linq;
+using Localizer.Attributes;
+
+namespace Localizer.DataModel.Default
+{
+    public class PrefixEntry : IEntry
+    {
+        [TModLocalizeTextProp("DisplayName")] public BaseEntry Name { get; set; }
+
+        public IEntry Clone()
+        {
+            return new PrefixEntry {Name = Name.Clone() as BaseEntry};
+        }
+    }
+
+    public class BasicPrefixFile : IFile
+    {
+        [TModLocalizeField("prefixes")]
+        public Dictionary<string, PrefixEntry> Prefixes { get; set; } = new Dictionary<string, PrefixEntry>();
+
+        public List<string> GetKeys()
+        {
+            return Prefixes.Keys.ToList();
+        }
+
+        public IEntry GetValue(string key)
+        {
+            return Prefixes[key];
+        }
+    }
+}

Localizer/DataModel/Default/BasicProjectileFile.cs

@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+using System.Linq;
+using Localizer.Attributes;
+
+namespace Localizer.DataModel.Default
+{
+    public class ProjectileEntry : IEntry
+    {
+        [TModLocalizeTextProp("DisplayName")] public BaseEntry Name { get; set; }
+
+        public IEntry Clone()
+        {
+            return new ProjectileEntry {Name = Name.Clone() as BaseEntry};
+        }
+    }
+
+    public class BasicProjectileFile : IFile
+    {
+        [TModLocalizeField("projectiles")]
+        public Dictionary<string, ProjectileEntry> Projectiles { get; set; } = new Dictionary<string, ProjectileEntry>();
+
+        public List<string> GetKeys()
+        {
+            return Projectiles.Keys.ToList();
+        }
+
+        public IEntry GetValue(string key)
+        {
+            return Projectiles[key];
+        }
+    }
+}

Localizer/DataModel/Default/GitHubUpdateInfo.cs

@@ -0,0 +1,45 @@
+using System;
+
+namespace Localizer.DataModel.Default
+{
+    public class GitHubUpdateInfo : IUpdateInfo
+    {
+        public UpdateType Type => type;
+
+        public Version Version => version;
+
+        private UpdateType type;
+        private Version version;
+
+        private string versionString;
+
+        public GitHubUpdateInfo(string versionString)
+        {
+            this.versionString = versionString;
+
+            Parse();
+        }
+
+        internal void Parse()
+        {
+            type = ParseType(versionString[0]);
+
+            version = Version.Parse(versionString.Substring(1, versionString.Length - 1));
+        }
+
+        internal UpdateType ParseType(char t)
+        {
+            switch (t)
+            {
+                case 'a':
+                    return UpdateType.Minor;
+                case 'b':
+                    return UpdateType.Major;
+                case 'c':
+                    return UpdateType.Critical;
+                default:
+                    return UpdateType.None;
+            }
+        }
+    }
+}

Localizer/DataModel/IUpdateInfo.cs

@@ -0,0 +1,19 @@
+using System;
+
+namespace Localizer.DataModel
+{
+    public enum UpdateType
+    {
+        None,
+        Minor,
+        Major,
+        Critical,
+    }
+
+    public interface IUpdateInfo
+    {
+        UpdateType Type { get; }
+
+        Version Version { get; }
+    }
+}

Localizer/Helpers/UI.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Reflection;
+using Terraria.ModLoader;
+using Terraria.UI;
+
+namespace Localizer
+{
+    public static class UI
+    {
+        public static void ShowInfoMessage(string message, int gotoMenu, UIState state = null, string altButtonText = "", Action altButtonAction = null)
+        {
+
+        }
+
+        public static object GetModLoaderUI(string uiName)
+        {
+            var ui = typeof(Mod).Module.GetType("Terraria.ModLoader.Interface");
+
+            return ui.GetField(uiName, BindingFlags.Static | BindingFlags.NonPublic).GetValue(null);
+        }
+    }
+}

Localizer/Utils.cs → Localizer/Helpers/Utils.cs

@@ -3,8 +3,10 @@
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
+using System.Net;
 using System.Reflection;
 using System.Reflection.Emit;
+using System.Text;
 using Harmony.ILCopying;
 using Localizer.Attributes;
 using Localizer.DataModel;
@@ -16,7 +18,7 @@
 
 namespace Localizer
 {
-    public static class Utils
+    public static partial class Utils
     {
         #region Zip
 
@@ -160,6 +162,45 @@ public static void LogInfo(object o)
 
         #endregion
 
+        #region Network
+
+        public static HttpWebResponse GET(string url)
+        {
+            var request = (HttpWebRequest)WebRequest.Create(url);
+            request.Method = "GET";
+            request.ContentType = "application/json;charset=UTF-8";
+            request.UserAgent = null;
+            request.Timeout = 9000;
+
+            return (HttpWebResponse)request.GetResponse();
+        }
+
+        public static string GetResponseBody(HttpWebResponse response)
+        {
+            if (response == null)
+                return null;
+
+            Encoding encoding;
+            try
+            {
+                encoding = Encoding.GetEncoding(response.ContentEncoding);
+            }
+            catch (ArgumentException e)
+            {
+                encoding = Encoding.UTF8;
+            }
+
+            using (var myResponseStream = response.GetResponseStream())
+            {
+                using (var myStreamReader = new StreamReader(myResponseStream, encoding))
+                {
+                    return myStreamReader.ReadToEnd();
+                }
+            }
+        }
+
+        #endregion
+
         #region Others
 
         /// <summary>
@@ -238,6 +279,46 @@ public static List<ILInstruction> GetInstructions(MethodInfo method)
             var dummy = new DynamicMethod("Dummy", typeof(void), new Type[] { });
             return MethodBodyReader.GetInstructions(dummy.GetILGenerator(), method);
         }
+
+        public static void SafeWrap(Action action)
+        {
+            SafeWrap(action, out var ex);
+        }
+
+        public static void SafeWrap(Action action, out Exception ex)
+        {
+            try
+            {
+                ex = null;
+                action();
+            }
+            catch (Exception e)
+            {
+                ex = e;
+                LogError(e);
+            }
+        }
+
+        public static T SafeWrap<T>(Func<T> func)
+        {
+            return SafeWrap(func, out var ex);
+        }
+
+        public static T SafeWrap<T>(Func<T> func, out Exception ex)
+        {
+            try
+            {
+                ex = null;
+                return func();
+            }
+            catch (Exception e)
+            {
+                ex = e;
+                LogError(e);
+            }
+
+            return default;
+        }
         #endregion
     }
 }

Localizer/Localizer.cs

@@ -2,12 +2,19 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+using System.Threading.Tasks;
 using Localizer.Modules;
+using Localizer.ServiceInterfaces.Network;
+using Localizer.Services;
 using log4net;
+using Microsoft.Xna.Framework;
 using MonoMod.RuntimeDetour.HookGen;
+using Ninject;
 using Ninject.Modules;
+using Terraria;
 using Terraria.Localization;
 using Terraria.ModLoader;
+using Terraria.UI;
 
 namespace Localizer
 {
@@ -24,6 +31,10 @@ public Localizer()
         {
             _gameCultures =
                 typeof(GameCulture).GetFieldDirectly(null, "_legacyCultures") as Dictionary<int, GameCulture>;
+
+            Kernel = new LocalizerKernel();
+            Kernel.Bind<RefreshLanguageService>().To<RefreshLanguageService>().InSingletonScope();
+            Kernel.Get<RefreshLanguageService>();
         }
 
         public static ILog Log { get; private set; }
@@ -50,8 +61,6 @@ public override void Load()
             Utils.CreateDirectory(DownloadPackageDirPath);
 
             LoadConfig();
-
-            Kernel = new LocalizerKernel();
             Kernel.Load(new NinjectModule[]
             {
                 new DefaultPackageModule(), new DefaultFileExportModule(),
@@ -65,6 +74,25 @@ public override void PostSetupContent()
             PluginManager.LoadPlugins();
         }
 
+        public void CheckUpdate()
+        {
+            Task.Run(() =>
+            {
+                var curVersion = this.Version;
+                if (Kernel.Get<IUpdateService>().CheckUpdate(curVersion, out var updateInfo))
+                {
+                    if (Main.gameMenu)
+                    {
+
+                    }
+                    else
+                    {
+                        Main.NewText("New Version Detected!", Color.Red);
+                    }
+                }
+            });
+        }
+
         public override void Unload()
         {
             try
@@ -124,15 +152,15 @@ public static GameCulture CultureInfoToGameCulture(CultureInfo culture)
             var gc = GameCulture.FromName(culture.Name);
             return gc ?? AddGameCulture(culture);
         }
-
-        public static void RefreshLanguages(CultureInfo lang)
+        
+        public static void RefreshLanguages()
         {
-            ModContent.RefreshModLanguage(CultureInfoToGameCulture(lang));
+            Kernel.Get<RefreshLanguageService>().Refresh();
         }
 
-        public static void RefreshLanguages()
+        public static void CloseTmodFile()
         {
-            ModContent.RefreshModLanguage(LanguageManager.Instance.ActiveCulture);
+
         }
     }
 }