summaryrefslogtreecommitdiff
path: root/src/SMAPI/Framework/ModLoading
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2021-07-23 20:37:26 -0400
committerJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2021-07-23 20:37:26 -0400
commit175eaad68373185b010410c5e2de1af9afbba1f5 (patch)
treee1fcb726eafb0918e734b8b4cffb8b7ce38be6e6 /src/SMAPI/Framework/ModLoading
parent167d5831d12f0b7c58b3533b716f9041f6ae02e7 (diff)
downloadSMAPI-175eaad68373185b010410c5e2de1af9afbba1f5.tar.gz
SMAPI-175eaad68373185b010410c5e2de1af9afbba1f5.tar.bz2
SMAPI-175eaad68373185b010410c5e2de1af9afbba1f5.zip
remove now-unneeded Mono.Cecil aliases (#711)
Diffstat (limited to 'src/SMAPI/Framework/ModLoading')
-rw-r--r--src/SMAPI/Framework/ModLoading/AssemblyDefinitionResolver.cs4
-rw-r--r--src/SMAPI/Framework/ModLoading/AssemblyLoader.cs6
-rw-r--r--src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs4
-rw-r--r--src/SMAPI/Framework/ModLoading/Finders/EventFinder.cs6
-rw-r--r--src/SMAPI/Framework/ModLoading/Finders/FieldFinder.cs6
-rw-r--r--src/SMAPI/Framework/ModLoading/Finders/MethodFinder.cs6
-rw-r--r--src/SMAPI/Framework/ModLoading/Finders/PropertyFinder.cs6
-rw-r--r--src/SMAPI/Framework/ModLoading/Finders/ReferenceToMemberWithUnexpectedTypeFinder.cs6
-rw-r--r--src/SMAPI/Framework/ModLoading/Finders/ReferenceToMissingMemberFinder.cs6
-rw-r--r--src/SMAPI/Framework/ModLoading/Finders/TypeAssemblyFinder.cs4
-rw-r--r--src/SMAPI/Framework/ModLoading/Finders/TypeFinder.cs4
-rw-r--r--src/SMAPI/Framework/ModLoading/Framework/BaseInstructionHandler.cs6
-rw-r--r--src/SMAPI/Framework/ModLoading/Framework/RecursiveRewriter.cs8
-rw-r--r--src/SMAPI/Framework/ModLoading/Framework/RewriteHelper.cs6
-rw-r--r--src/SMAPI/Framework/ModLoading/IInstructionHandler.cs6
-rw-r--r--src/SMAPI/Framework/ModLoading/PlatformAssemblyMap.cs4
-rw-r--r--src/SMAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs6
-rw-r--r--src/SMAPI/Framework/ModLoading/Rewriters/Harmony1AssemblyRewriter.cs6
-rw-r--r--src/SMAPI/Framework/ModLoading/Rewriters/HeuristicFieldRewriter.cs6
-rw-r--r--src/SMAPI/Framework/ModLoading/Rewriters/HeuristicMethodRewriter.cs6
-rw-r--r--src/SMAPI/Framework/ModLoading/Rewriters/MethodParentRewriter.cs6
-rw-r--r--src/SMAPI/Framework/ModLoading/Rewriters/TypeReferenceRewriter.cs4
-rw-r--r--src/SMAPI/Framework/ModLoading/TypeReferenceComparer.cs4
23 files changed, 40 insertions, 86 deletions
diff --git a/src/SMAPI/Framework/ModLoading/AssemblyDefinitionResolver.cs b/src/SMAPI/Framework/ModLoading/AssemblyDefinitionResolver.cs
index 9867ed8b..aefb0126 100644
--- a/src/SMAPI/Framework/ModLoading/AssemblyDefinitionResolver.cs
+++ b/src/SMAPI/Framework/ModLoading/AssemblyDefinitionResolver.cs
@@ -1,7 +1,5 @@
-extern alias MonoCecilPackage;
-
using System.Collections.Generic;
-using MonoCecilPackage.Mono.Cecil;
+using Mono.Cecil;
namespace StardewModdingAPI.Framework.ModLoading
{
diff --git a/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs b/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
index 8311a4b9..3606eb66 100644
--- a/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
+++ b/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
@@ -1,12 +1,10 @@
-extern alias MonoCecilPackage;
-
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
-using MonoCecilPackage.Mono.Cecil;
-using MonoCecilPackage.Mono.Cecil.Cil;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
using StardewModdingAPI.Framework.Exceptions;
using StardewModdingAPI.Framework.ModLoading.Framework;
using StardewModdingAPI.Metadata;
diff --git a/src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs b/src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs
index 6493ccf8..b56a776c 100644
--- a/src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs
+++ b/src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs
@@ -1,7 +1,5 @@
-extern alias MonoCecilPackage;
-
using System.IO;
-using MonoCecilPackage.Mono.Cecil;
+using Mono.Cecil;
namespace StardewModdingAPI.Framework.ModLoading
{
diff --git a/src/SMAPI/Framework/ModLoading/Finders/EventFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/EventFinder.cs
index 2e349616..01ed153b 100644
--- a/src/SMAPI/Framework/ModLoading/Finders/EventFinder.cs
+++ b/src/SMAPI/Framework/ModLoading/Finders/EventFinder.cs
@@ -1,7 +1,5 @@
-extern alias MonoCecilPackage;
-
-using MonoCecilPackage.Mono.Cecil;
-using MonoCecilPackage.Mono.Cecil.Cil;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
using StardewModdingAPI.Framework.ModLoading.Framework;
namespace StardewModdingAPI.Framework.ModLoading.Finders
diff --git a/src/SMAPI/Framework/ModLoading/Finders/FieldFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/FieldFinder.cs
index 434ff5ab..2c062243 100644
--- a/src/SMAPI/Framework/ModLoading/Finders/FieldFinder.cs
+++ b/src/SMAPI/Framework/ModLoading/Finders/FieldFinder.cs
@@ -1,7 +1,5 @@
-extern alias MonoCecilPackage;
-
-using MonoCecilPackage.Mono.Cecil;
-using MonoCecilPackage.Mono.Cecil.Cil;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
using StardewModdingAPI.Framework.ModLoading.Framework;
namespace StardewModdingAPI.Framework.ModLoading.Finders
diff --git a/src/SMAPI/Framework/ModLoading/Finders/MethodFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/MethodFinder.cs
index 80229155..d2340f01 100644
--- a/src/SMAPI/Framework/ModLoading/Finders/MethodFinder.cs
+++ b/src/SMAPI/Framework/ModLoading/Finders/MethodFinder.cs
@@ -1,7 +1,5 @@
-extern alias MonoCecilPackage;
-
-using MonoCecilPackage.Mono.Cecil;
-using MonoCecilPackage.Mono.Cecil.Cil;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
using StardewModdingAPI.Framework.ModLoading.Framework;
namespace StardewModdingAPI.Framework.ModLoading.Finders
diff --git a/src/SMAPI/Framework/ModLoading/Finders/PropertyFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/PropertyFinder.cs
index 5ef66df4..99344848 100644
--- a/src/SMAPI/Framework/ModLoading/Finders/PropertyFinder.cs
+++ b/src/SMAPI/Framework/ModLoading/Finders/PropertyFinder.cs
@@ -1,7 +1,5 @@
-extern alias MonoCecilPackage;
-
-using MonoCecilPackage.Mono.Cecil;
-using MonoCecilPackage.Mono.Cecil.Cil;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
using StardewModdingAPI.Framework.ModLoading.Framework;
namespace StardewModdingAPI.Framework.ModLoading.Finders
diff --git a/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMemberWithUnexpectedTypeFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMemberWithUnexpectedTypeFinder.cs
index 80296e38..b01a3240 100644
--- a/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMemberWithUnexpectedTypeFinder.cs
+++ b/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMemberWithUnexpectedTypeFinder.cs
@@ -1,9 +1,7 @@
-extern alias MonoCecilPackage;
-
using System.Collections.Generic;
using System.Linq;
-using MonoCecilPackage.Mono.Cecil;
-using MonoCecilPackage.Mono.Cecil.Cil;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
using StardewModdingAPI.Framework.ModLoading.Framework;
namespace StardewModdingAPI.Framework.ModLoading.Finders
diff --git a/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMissingMemberFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMissingMemberFinder.cs
index fae8ee95..b64a255e 100644
--- a/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMissingMemberFinder.cs
+++ b/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMissingMemberFinder.cs
@@ -1,8 +1,6 @@
-extern alias MonoCecilPackage;
-
using System.Collections.Generic;
-using MonoCecilPackage.Mono.Cecil;
-using MonoCecilPackage.Mono.Cecil.Cil;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
using StardewModdingAPI.Framework.ModLoading.Framework;
namespace StardewModdingAPI.Framework.ModLoading.Finders
diff --git a/src/SMAPI/Framework/ModLoading/Finders/TypeAssemblyFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/TypeAssemblyFinder.cs
index 3e107b90..24ab2eca 100644
--- a/src/SMAPI/Framework/ModLoading/Finders/TypeAssemblyFinder.cs
+++ b/src/SMAPI/Framework/ModLoading/Finders/TypeAssemblyFinder.cs
@@ -1,7 +1,5 @@
-extern alias MonoCecilPackage;
-
using System;
-using MonoCecilPackage.Mono.Cecil;
+using Mono.Cecil;
using StardewModdingAPI.Framework.ModLoading.Framework;
namespace StardewModdingAPI.Framework.ModLoading.Finders
diff --git a/src/SMAPI/Framework/ModLoading/Finders/TypeFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/TypeFinder.cs
index 9453c39f..bbd081e8 100644
--- a/src/SMAPI/Framework/ModLoading/Finders/TypeFinder.cs
+++ b/src/SMAPI/Framework/ModLoading/Finders/TypeFinder.cs
@@ -1,7 +1,5 @@
-extern alias MonoCecilPackage;
-
using System;
-using MonoCecilPackage.Mono.Cecil;
+using Mono.Cecil;
using StardewModdingAPI.Framework.ModLoading.Framework;
namespace StardewModdingAPI.Framework.ModLoading.Finders
diff --git a/src/SMAPI/Framework/ModLoading/Framework/BaseInstructionHandler.cs b/src/SMAPI/Framework/ModLoading/Framework/BaseInstructionHandler.cs
index 3979d431..624113b3 100644
--- a/src/SMAPI/Framework/ModLoading/Framework/BaseInstructionHandler.cs
+++ b/src/SMAPI/Framework/ModLoading/Framework/BaseInstructionHandler.cs
@@ -1,9 +1,7 @@
-extern alias MonoCecilPackage;
-
using System;
using System.Collections.Generic;
-using MonoCecilPackage.Mono.Cecil;
-using MonoCecilPackage.Mono.Cecil.Cil;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
namespace StardewModdingAPI.Framework.ModLoading.Framework
{
diff --git a/src/SMAPI/Framework/ModLoading/Framework/RecursiveRewriter.cs b/src/SMAPI/Framework/ModLoading/Framework/RecursiveRewriter.cs
index e79bb488..10f68f0d 100644
--- a/src/SMAPI/Framework/ModLoading/Framework/RecursiveRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Framework/RecursiveRewriter.cs
@@ -1,11 +1,9 @@
-extern alias MonoCecilPackage;
-
using System;
using System.Collections.Generic;
using System.Linq;
-using MonoCecilPackage.Mono.Cecil;
-using MonoCecilPackage.Mono.Cecil.Cil;
-using MonoCecilPackage.Mono.Collections.Generic;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
+using Mono.Collections.Generic;
namespace StardewModdingAPI.Framework.ModLoading.Framework
{
diff --git a/src/SMAPI/Framework/ModLoading/Framework/RewriteHelper.cs b/src/SMAPI/Framework/ModLoading/Framework/RewriteHelper.cs
index e88b75ed..60bbd2c7 100644
--- a/src/SMAPI/Framework/ModLoading/Framework/RewriteHelper.cs
+++ b/src/SMAPI/Framework/ModLoading/Framework/RewriteHelper.cs
@@ -1,10 +1,8 @@
-extern alias MonoCecilPackage;
-
using System;
using System.Linq;
using System.Reflection;
-using MonoCecilPackage::Mono.Cecil;
-using MonoCecilPackage::Mono.Cecil.Cil;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
namespace StardewModdingAPI.Framework.ModLoading.Framework
{
diff --git a/src/SMAPI/Framework/ModLoading/IInstructionHandler.cs b/src/SMAPI/Framework/ModLoading/IInstructionHandler.cs
index 342721cd..17c9ba68 100644
--- a/src/SMAPI/Framework/ModLoading/IInstructionHandler.cs
+++ b/src/SMAPI/Framework/ModLoading/IInstructionHandler.cs
@@ -1,9 +1,7 @@
-extern alias MonoCecilPackage;
-
using System;
using System.Collections.Generic;
-using MonoCecilPackage.Mono.Cecil;
-using MonoCecilPackage.Mono.Cecil.Cil;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
namespace StardewModdingAPI.Framework.ModLoading
{
diff --git a/src/SMAPI/Framework/ModLoading/PlatformAssemblyMap.cs b/src/SMAPI/Framework/ModLoading/PlatformAssemblyMap.cs
index ee123e75..d4366294 100644
--- a/src/SMAPI/Framework/ModLoading/PlatformAssemblyMap.cs
+++ b/src/SMAPI/Framework/ModLoading/PlatformAssemblyMap.cs
@@ -1,10 +1,8 @@
-extern alias MonoCecilPackage;
-
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
-using MonoCecilPackage.Mono.Cecil;
+using Mono.Cecil;
using StardewModdingAPI.Toolkit.Utilities;
namespace StardewModdingAPI.Framework.ModLoading
diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs
index d40d4111..0b679e9d 100644
--- a/src/SMAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs
@@ -1,9 +1,7 @@
-extern alias MonoCecilPackage;
-
using System;
using System.Reflection;
-using MonoCecilPackage.Mono.Cecil;
-using MonoCecilPackage.Mono.Cecil.Cil;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
using StardewModdingAPI.Framework.ModLoading.Framework;
namespace StardewModdingAPI.Framework.ModLoading.Rewriters
diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/Harmony1AssemblyRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/Harmony1AssemblyRewriter.cs
index 5a84a16a..723983be 100644
--- a/src/SMAPI/Framework/ModLoading/Rewriters/Harmony1AssemblyRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/Harmony1AssemblyRewriter.cs
@@ -1,9 +1,7 @@
-extern alias MonoCecilPackage;
-
using System;
using HarmonyLib;
-using MonoCecilPackage.Mono.Cecil;
-using MonoCecilPackage.Mono.Cecil.Cil;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
using StardewModdingAPI.Framework.ModLoading.Framework;
using StardewModdingAPI.Framework.ModLoading.RewriteFacades;
diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicFieldRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicFieldRewriter.cs
index c381e4e5..f59a6ab1 100644
--- a/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicFieldRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicFieldRewriter.cs
@@ -1,9 +1,7 @@
-extern alias MonoCecilPackage;
-
using System.Collections.Generic;
using System.Linq;
-using MonoCecilPackage.Mono.Cecil;
-using MonoCecilPackage.Mono.Cecil.Cil;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
using StardewModdingAPI.Framework.ModLoading.Framework;
namespace StardewModdingAPI.Framework.ModLoading.Rewriters
diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicMethodRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicMethodRewriter.cs
index 748c1e6f..e133b6fa 100644
--- a/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicMethodRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicMethodRewriter.cs
@@ -1,9 +1,7 @@
-extern alias MonoCecilPackage;
-
using System.Collections.Generic;
using System.Linq;
-using MonoCecilPackage.Mono.Cecil;
-using MonoCecilPackage.Mono.Cecil.Cil;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
using StardewModdingAPI.Framework.ModLoading.Framework;
namespace StardewModdingAPI.Framework.ModLoading.Rewriters
diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/MethodParentRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/MethodParentRewriter.cs
index 5e0d9c70..9933e2ca 100644
--- a/src/SMAPI/Framework/ModLoading/Rewriters/MethodParentRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/MethodParentRewriter.cs
@@ -1,9 +1,7 @@
-extern alias MonoCecilPackage;
-
using System;
using System.Linq;
-using MonoCecilPackage.Mono.Cecil;
-using MonoCecilPackage.Mono.Cecil.Cil;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
using StardewModdingAPI.Framework.ModLoading.Framework;
namespace StardewModdingAPI.Framework.ModLoading.Rewriters
diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/TypeReferenceRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/TypeReferenceRewriter.cs
index a4d09ae9..ad5cb96f 100644
--- a/src/SMAPI/Framework/ModLoading/Rewriters/TypeReferenceRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/TypeReferenceRewriter.cs
@@ -1,7 +1,5 @@
-extern alias MonoCecilPackage;
-
using System;
-using MonoCecilPackage.Mono.Cecil;
+using Mono.Cecil;
using StardewModdingAPI.Framework.ModLoading.Framework;
namespace StardewModdingAPI.Framework.ModLoading.Rewriters
diff --git a/src/SMAPI/Framework/ModLoading/TypeReferenceComparer.cs b/src/SMAPI/Framework/ModLoading/TypeReferenceComparer.cs
index fab424f3..a4ac54e2 100644
--- a/src/SMAPI/Framework/ModLoading/TypeReferenceComparer.cs
+++ b/src/SMAPI/Framework/ModLoading/TypeReferenceComparer.cs
@@ -1,9 +1,7 @@
-extern alias MonoCecilPackage;
-
using System;
using System.Collections.Generic;
using System.Linq;
-using MonoCecilPackage.Mono.Cecil;
+using Mono.Cecil;
namespace StardewModdingAPI.Framework.ModLoading
{