Merge branch 'develop'

Centrifuge-Modding-Framework · Nov 10, 2019 · 741486a · 741486a
2 parents 18f9be9 + 7cd5dd3
commit 741486a
Show file tree

Hide file tree

Showing 13 changed files with 85 additions and 29 deletions.
diff --git a/Reactor.API/Properties/AssemblyInfo.cs b/Reactor.API/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("1.2.0")]
+[assembly: AssemblyFileVersion("1.2.1")]
 
 [assembly: InternalsVisibleTo("Reactor", AllInternalsVisible = true)]
diff --git a/Reactor.API/Reactor.API.csproj b/Reactor.API/Reactor.API.csproj
@@ -32,6 +32,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <LangVersion>8.0</LangVersion>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="0Harmony, Version=1.2.0.1, Culture=neutral, processorArchitecture=MSIL">

diff --git a/Reactor/Properties/AssemblyInfo.cs b/Reactor/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("1.2.0")]
+[assembly: AssemblyFileVersion("1.2.1")]
diff --git a/Reactor/Reactor.csproj b/Reactor/Reactor.csproj
@@ -32,6 +32,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <LangVersion>8.0</LangVersion>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="0Harmony, Version=1.2.0.1, Culture=neutral, processorArchitecture=MSIL">

diff --git a/Spindle/App.config b/Spindle/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
-    </startup>
-</configuration>
+
+    <supportedRuntime version="v2.0.50727"/></startup>
+</configuration>
diff --git a/Spindle/IO/ColoredOutput.cs b/Spindle/IO/ColoredOutput.cs
@@ -21,9 +21,16 @@ public static void WriteInformation(string message)
 
         private static void WriteColoredText(string message, ConsoleColor consoleColor)
         {
-            Console.ForegroundColor = consoleColor;
-            Console.WriteLine(message);
-            Console.ResetColor();
+            if (Platform.IsMono() || Platform.IsUnix())
+            {
+                Console.WriteLine(message);
+            }
+            else
+            {
+                Console.ForegroundColor = consoleColor;
+                Console.WriteLine(message);
+                Console.ResetColor();
+            }
         }
     }
 }
diff --git a/Spindle/Patches/CentrifugeInitPatch.cs b/Spindle/Patches/CentrifugeInitPatch.cs
@@ -26,7 +26,7 @@ public override void Run(ModuleDefinition sourceModule, ModuleDefinition targetM
                 ilProcessor.Append(initInstruction);
                 ilProcessor.Append(ilProcessor.Create(OpCodes.Ret));
 
-                var moduleClass = targetModule.Types.FirstOrDefault(t => t.Name == "<Module>");
+                var moduleClass = FindModuleInitializer(targetModule);
 
                 if (moduleClass == null)
                 {
@@ -43,5 +43,16 @@ public override void Run(ModuleDefinition sourceModule, ModuleDefinition targetM
                 OnPatchFailed(this, eventArgs);
             }
         }
+
+        private static TypeDefinition FindModuleInitializer(ModuleDefinition targetModule)
+        {
+            foreach (var type in targetModule.Types)
+            {
+                if (type.Name == "<Module>")
+                    return type;
+            }
+
+            return null;
+        }
     }
 }
diff --git a/Spindle/Platform.cs b/Spindle/Platform.cs
@@ -0,0 +1,26 @@
+using System;
+
+namespace Spindle
+{
+    internal class Platform
+    {
+        internal static bool IsMono()
+        {
+            var platformID = (int)Environment.OSVersion.Platform;
+            return platformID == 4 || platformID == 6 || platformID == 128;
+        }
+
+        internal static bool IsUnix()
+        {
+            var platformID = Environment.OSVersion.Platform;
+            switch (platformID)
+            {
+                case PlatformID.MacOSX:
+                case PlatformID.Unix:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+    }
+}
diff --git a/Spindle/Program.cs b/Spindle/Program.cs
@@ -87,11 +87,10 @@ internal static void Main(string[] args)
 
         private static void WriteStartupHeader()
         {
-            Console.ForegroundColor = ConsoleColor.Magenta;
             var version = Assembly.GetExecutingAssembly().GetName().Version;
-            Console.WriteLine($"Centrifuge Spindle for Unity Engine. Version {version.Major}.{version.Minor}.{version.Build}.{version.Revision}");
-            Console.WriteLine("------------------------------------------");
-            Console.ResetColor();
+
+            ColoredOutput.WriteInformation($"Centrifuge Spindle for Unity Engine. Version {version.Major}.{version.Minor}.{version.Build}.{version.Revision}");
+            ColoredOutput.WriteInformation("------------------------------------------");
         }
 
         private static bool IsValidSyntax(ICollection<string> args)

diff --git a/Spindle/Properties/AssemblyInfo.cs b/Spindle/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0")]
-[assembly: AssemblyFileVersion("2.0.0")]
+[assembly: AssemblyVersion("2.1.0")]
+[assembly: AssemblyFileVersion("2.1.0")]
diff --git a/Spindle/Runtime/PatchHelper.cs b/Spindle/Runtime/PatchHelper.cs
@@ -8,9 +8,20 @@ public class PatchHelper
         public static MethodReference ImportBootstrapMethodReference(ModuleDefinition targetModule, ModuleDefinition bootstrapModule)
         {
             var bootstrapType = bootstrapModule.GetType(Resources.CentrifugeBootstrapTypeName);
-            var bootstrapInitMethod = bootstrapType.Methods.Single(m => m.Name == Resources.CentrifugeInitMethodName);
+            var bootstrapInitMethod = FindBootstrapInitMethod(bootstrapType);
 
             return targetModule.ImportReference(bootstrapInitMethod);
         }
+
+        private static MethodDefinition FindBootstrapInitMethod(TypeDefinition bootstrapType)
+        {
+            foreach (var method in bootstrapType.Methods)
+            {
+                if (method.Name == Resources.CentrifugeInitMethodName)
+                    return method;
+            }
+
+            return null;
+        }
     }
 }
diff --git a/Spindle/Spindle.csproj b/Spindle/Spindle.csproj
@@ -8,10 +8,11 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>Spindle</RootNamespace>
     <AssemblyName>Spindle</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -35,25 +36,23 @@
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Mono.Cecil, Version=0.11.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.11.0\lib\net40\Mono.Cecil.dll</HintPath>
+    <Reference Include="Mono.Cecil, Version=0.10.4.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.10.4\lib\net35\Mono.Cecil.dll</HintPath>
     </Reference>
-    <Reference Include="Mono.Cecil.Mdb, Version=0.11.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.11.0\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
+    <Reference Include="Mono.Cecil.Mdb, Version=0.10.4.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.10.4\lib\net35\Mono.Cecil.Mdb.dll</HintPath>
     </Reference>
-    <Reference Include="Mono.Cecil.Pdb, Version=0.11.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.11.0\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
+    <Reference Include="Mono.Cecil.Pdb, Version=0.10.4.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.10.4\lib\net35\Mono.Cecil.Pdb.dll</HintPath>
     </Reference>
-    <Reference Include="Mono.Cecil.Rocks, Version=0.11.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.11.0\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
+    <Reference Include="Mono.Cecil.Rocks, Version=0.10.4.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.10.4\lib\net35\Mono.Cecil.Rocks.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -64,6 +63,7 @@
     <Compile Include="IO\ModuleWriter.cs" />
     <Compile Include="Patches\DecapsulationPatch.cs" />
     <Compile Include="Patches\CentrifugeInitPatch.cs" />
+    <Compile Include="Platform.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Resources.cs" />

diff --git a/Spindle/packages.config b/Spindle/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Mono.Cecil" version="0.11.0" targetFramework="net46" />
+  <package id="Mono.Cecil" version="0.10.4" targetFramework="net35" />
 </packages>