Merge branch 'master' of https://github.com/ModTheGungeon/ETGMod

dadebert · Feb 23, 2017 · 997f3e9 · 997f3e9
2 parents 3ec7751 + f1567a4
commit 997f3e9
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 18 deletions.
diff --git a/UnityEngine.Base.mm/UnityEngine.Base.mm.csproj b/UnityEngine.Base.mm/UnityEngine.Base.mm.csproj
@@ -24,7 +24,8 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType></DebugType>
+    <DebugType>
+    </DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE;UNITYENGINE</DefineConstants>
@@ -43,8 +44,15 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\Assembly-CSharp.Base.mm\src\MonoMod\Platform.cs">
+      <Link>src\MonoMod\Platform.cs</Link>
+    </Compile>
+    <Compile Include="..\Assembly-CSharp.Base.mm\src\MonoMod\PlatformHelper.cs">
+      <Link>src\MonoMod\PlatformHelper.cs</Link>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="src\ETGModUnityEngineHooks.cs" />
+    <Compile Include="src\MonoMod\MonoModConstructor.cs" />
     <Compile Include="src\MonoMod\MonoModIgnore.cs" />
     <Compile Include="src\MonoMod\MonoModLinkTo.cs" />
     <Compile Include="src\MonoMod\MonoModOriginal.cs" />
@@ -56,17 +64,11 @@
     <Compile Include="..\Assembly-CSharp.Base.mm\src\PInvokeHelper.cs">
       <Link>src\PInvokeHelper.cs</Link>
     </Compile>
-    <Compile Include="..\Assembly-CSharp.Base.mm\src\MonoMod\Platform.cs">
-      <Link>src\MonoMod\Platform.cs</Link>
-    </Compile>
-    <Compile Include="..\Assembly-CSharp.Base.mm\src\MonoMod\PlatformHelper.cs">
-      <Link>src\MonoMod\PlatformHelper.cs</Link>
-    </Compile>
     <Compile Include="src\MonoDebug.cs" />
     <Compile Include="src\patch_ClassLibraryInitializer.cs" />
-    <Compile Include="src\MonoMod\MonoModConstructor.cs" />
     <Compile Include="src\patch_GameObject.cs" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/UnityEngine.Base.mm/src/MonoMod/MonoModConstructor.cs b/UnityEngine.Base.mm/src/MonoMod/MonoModConstructor.cs
@@ -1,12 +1,11 @@
 using System;
 
 namespace MonoMod {
-    [MonoModIgnore]
     /// <summary>
     /// MonoMod constructor attribute.
     /// Apply it onto a constructor and it will be patched by MonoMod.
+    /// Or apply it onto a method and it will be handled like a constructor.
     /// </summary>
     public class MonoModConstructor : Attribute {
     }
 }
-
diff --git a/UnityEngine.Base.mm/src/MonoMod/MonoModIgnore.cs b/UnityEngine.Base.mm/src/MonoMod/MonoModIgnore.cs
@@ -1,7 +1,6 @@
 using System;
 
 namespace MonoMod {
-    [MonoModIgnore]
     /// <summary>
     /// MonoMod ignore attribute.
     /// Apply it onto a method / type and it will be ignored by MonoMod.

diff --git a/UnityEngine.Base.mm/src/MonoMod/MonoModLinkTo.cs b/UnityEngine.Base.mm/src/MonoMod/MonoModLinkTo.cs
@@ -1,18 +1,19 @@
 using System;
 
 namespace MonoMod {
-    [MonoModIgnore]
     /// <summary>
     /// MonoMod linkto attribute.
-    /// Apply it onto a method / field and calls to it by mods will be relinked to another target.
+    /// Apply it onto a type / method / field and calls to it by mods will be relinked to another target.
     /// </summary>
     class MonoModLinkTo : Attribute {
-        public MonoModLinkTo(Delegate d) {
+        public MonoModLinkTo(string t) {
         }
-        public MonoModLinkTo(Type t, string n) {
+        public MonoModLinkTo(Type t) {
         }
         public MonoModLinkTo(string t, string n) {
         }
+        public MonoModLinkTo(Type t, string n) {
+        }
     }
 }
 
diff --git a/UnityEngine.Base.mm/src/MonoMod/MonoModOriginal.cs b/UnityEngine.Base.mm/src/MonoMod/MonoModOriginal.cs
@@ -1,12 +1,11 @@
 using System;
 
 namespace MonoMod {
-    [MonoModIgnore]
     /// <summary>
     /// MonoMod original name.
     /// Will be applied by MonoMod automatically on original methods. Use it (or MonoModIgnore) to mark non-"orig_" originals!
     /// </summary>
-    class MonoModOriginal : Attribute {
+    public class MonoModOriginal : Attribute {
     }
 }
 
diff --git a/UnityEngine.Base.mm/src/MonoMod/MonoModOriginalName.cs b/UnityEngine.Base.mm/src/MonoMod/MonoModOriginalName.cs
@@ -1,7 +1,6 @@
 using System;
 
 namespace MonoMod {
-    [MonoModIgnore]
     /// <summary>
     /// MonoMod original name attribute.
     /// Apply it onto a method (not the orig_) and its orig_ method will instead be named like that.