Move codeblocks into single json config file

AICUpdater/AICUpdaterHelper.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using UCPAIConversion;

AICUpdater/Program.cs

@@ -19,7 +19,7 @@ static void Main(string[] args)
                 Console.WriteLine("The property names of the following .aic files will be updated.");
                 Console.WriteLine("Any custom comments will be lost in the process!");
                 Console.WriteLine();
-                foreach(string file in files)
+                foreach (string file in files)
                 {
                     Console.WriteLine(Path.GetFileName(file));
                 }

AICUpdater/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // Allgemeine Informationen über eine Assembly werden über die folgenden

CodeBlox/CodeBlock.cs

@@ -1,9 +1,17 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
+using System.Globalization;
+
+/* Unmerged change from project 'UnofficialCrusaderPatch'
+Before:
 using System.Text;
 using System.IO;
-using System.Globalization;
+After:
+using System.IO;
+using System.Linq;
+*/
+using System.IO;
+using System.Text;
 
 namespace CodeBlox
 {
@@ -42,6 +50,12 @@ public static implicit operator Element(bool wildcard)
         public int Length { get { return elements.Length; } }
         public IEnumerable<Element> Elements { get { return this.elements; } }
 
+        public static CodeBlock Get(string codeBlockName)
+        {
+            string codeBlock = CodeBlockRetriever.CodeBlocks[codeBlockName];
+            return new CodeBlock(new MemoryStream(Encoding.UTF8.GetBytes(codeBlock)));
+        }
+
         public CodeBlock(Stream stream)
         {
             List<Element> list = new List<Element>((int)stream.Length / 2);

CodeBlox/CodeBlockRetriever.cs

@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using System.Web.Script.Serialization;
+
+namespace CodeBlox
+{
+    public class CodeBlockRetriever
+    {
+
+        public static Dictionary<string, string> CodeBlocks { get; set; }
+        static CodeBlockRetriever()
+        {
+            Assembly asm = Assembly.GetExecutingAssembly();
+            string file = string.Format("UCP.CodeBlocks.CodeBlocks.json");
+            using (Stream stream = asm.GetManifestResourceStream(file))
+                CodeBlocks = new JavaScriptSerializer().Deserialize<Dictionary<string, string>>(new StreamReader(stream).ReadToEnd());
+        }
+    }
+}

CodeBlox/CodeBlox.csproj

@@ -34,6 +34,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -43,6 +44,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CodeBlock.cs" />
+    <Compile Include="CodeBlockRetriever.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

CodeBlox/Program.cs

@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.IO;
 using System.Globalization;
+using System.IO;
 
 namespace CodeBlox
 {

CodeBlox/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // Allgemeine Informationen über eine Assembly werden über die folgenden

IDAParser/AICharacters/AICCollection.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.IO;
-using System.Reflection;
+using System.Linq;
 
 namespace UCP.AICharacters
 {

IDAParser/AICharacters/AICIndex.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace UCP.AICharacters
+namespace UCP.AICharacters
 {
     /// <summary>
     /// Indices with which each AI is identified in the game, the order is defined Crusader-intern

IDAParser/AICharacters/AICharacter.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace UCP.AICharacters
+namespace UCP.AICharacters
 {
     /// <summary>
     /// The topmost character class which contains the AI's personality, its Crusader-intern index and more in the future

IDAParser/AICharacters/AIFileHeader.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace UCP.AICharacters
+namespace UCP.AICharacters
 {
     public class AIFileHeader
     {

IDAParser/AICharacters/AIPersonality.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Reflection;
+using System.Reflection;
 
 namespace UCP.AICharacters
 {

IDAParser/AICharacters/AIReader.cs

@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.IO;
 using System.Reflection;
+using System.Text;
 
 namespace UCP.AICharacters
 {
@@ -91,7 +90,7 @@ void CheckComments(ref string line)
                     return default(T);
 
             } while (line != type.Name);
-            
+
             T result = new T();
             this.Read(result);
             return result;
@@ -115,7 +114,7 @@ void Read(object o)
             {
                 if (line == "}")
                     break;
-                
+
                 // get name of field
                 string fieldName;
                 int endIndex = line.IndexOfAny(whiteSpaces);

IDAParser/AICharacters/AIWriter.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.IO;
+using System.Linq;
 using System.Reflection;
+using System.Text;
 
 namespace UCP.AICharacters
 {
@@ -70,7 +70,7 @@ public void CloseCommentSec()
             this.WriteLine("*/");
             commenting = false;
         }
-        
+
         public void Write(object o, string name = null)
         {
             if (o == null)
@@ -87,9 +87,9 @@ public void Write(object o, string name = null)
                 this.WriteLine(name ?? type.Name);
                 this.OpenSec();
 
-                foreach(FieldInfo fi in type.GetFields(Flags))
+                foreach (FieldInfo fi in type.GetFields(Flags))
                 {
-                    object value = fi.GetValue(o);                    
+                    object value = fi.GetValue(o);
                     this.Write(value, fi.Name);
                 }
 
@@ -104,7 +104,7 @@ public void WriteInfo(Type type, string name = null, string comment = null)
         {
             if (type == null)
                 throw new ArgumentNullException("type");
-            
+
             if (!String.IsNullOrWhiteSpace(name))
             {
                 sb.Append(name);

IDAParser/AICharacters/PersonalityEnums/Buildings.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace UCP.AICharacters
+namespace UCP.AICharacters
 {
     /// <summary>
     /// Crusader-intern military unit IDs

IDAParser/AICharacters/PersonalityEnums/Resources.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace UCP.AICharacters
+namespace UCP.AICharacters
 {
     /// <summary>
     /// Crusader-intern resource IDs

IDAParser/AICharacters/PersonalityEnums/SiegeEngines.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace UCP.AICharacters
+namespace UCP.AICharacters
 {
     /// <summary>
     /// Crusader-intern military unit IDs

IDAParser/AICharacters/PersonalityEnums/TargetingType.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace UCP.AICharacters
+namespace UCP.AICharacters
 {
     /// <summary> How the AI determines its next attack target. </summary>
     public enum TargetingType