大规模重构

Editor/ObfusPasses/CallObfus/ConfigProxyCallPolicy.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Obfuz.DynamicProxy
+namespace Obfuz.ObfusPasses.CallObfus
 {
     public class ConfigProxyCallPolicy : ProxyCallPolicyBase
     {

Editor/ObfusPasses/CallObfus/DefaultProxyCallObfuscator.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using Obfuz.Utils;
 using Obfuz.Emit;
 
-namespace Obfuz.DynamicProxy
+namespace Obfuz.ObfusPasses.CallObfus
 {
     public class DefaultProxyCallObfuscator : ProxyCallObfuscatorBase
     {

Editor/ObfusPasses/CallObfus/IProxyCallObfuscator.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Obfuz.DynamicProxy
+namespace Obfuz.ObfusPasses.CallObfus
 {
     public interface IProxyCallObfuscator
     {

Editor/ObfusPasses/CallObfus/IProxyCallPolicy.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Obfuz.DynamicProxy
+namespace Obfuz.ObfusPasses.CallObfus
 {
     public interface IProxyCallPolicy
     {

Editor/ObfusPasses/CallObfus/ProxyCallObfuscatorBase.cs

@@ -2,7 +2,7 @@
 using dnlib.DotNet;
 using System.Collections.Generic;
 
-namespace Obfuz.DynamicProxy
+namespace Obfuz.ObfusPasses.CallObfus
 {
     public abstract class ProxyCallObfuscatorBase : IProxyCallObfuscator
     {

Editor/ObfusPasses/CallObfus/ProxyCallPass.cs

@@ -10,9 +10,9 @@ using System.Text;
 using System.Threading.Tasks;
 using UnityEngine.Assertions;
 
-namespace Obfuz.DynamicProxy
+namespace Obfuz.ObfusPasses.CallObfus
 {
-    public class ProxyCallPass : MethodBodyObfuscationPassBase
+    public class ProxyCallPass : InstructionObfuscationPassBase
     {
         private readonly IRandom _random;
         private readonly IProxyCallPolicy _dynamicProxyPolicy;

Editor/ObfusPasses/CallObfus/ProxyCallPolicyBase.cs

@@ -1,6 +1,6 @@
 using dnlib.DotNet;
 
-namespace Obfuz.DynamicProxy
+namespace Obfuz.ObfusPasses.CallObfus
 {
     public abstract class ProxyCallPolicyBase : IProxyCallPolicy
     {

Editor/ObfusPasses/CleanUp/CleanUpInstructionPass.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Obfuz
+namespace Obfuz.ObfusPasses.CleanUp
 {
     public class CleanUpInstructionPass : ObfuscationPassBase
     {

Editor/ObfusPasses/ConstObfus/ConfigDataObfuscationPolicy.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Obfuz.Virtualization
+namespace Obfuz.ObfusPasses.ConstObfus
 {
     public class ConfigDataObfuscationPolicy : DataObfuscationPolicyBase
     {

Editor/ObfusPasses/ConstObfus/DataObfuscationPolicyBase.cs

@@ -1,6 +1,6 @@
 using dnlib.DotNet;
 
-namespace Obfuz.Virtualization
+namespace Obfuz.ObfusPasses.ConstObfus
 {
     public abstract class DataObfuscationPolicyBase : IDataObfuscationPolicy
     {

Editor/ObfusPasses/ConstObfus/DataVirtualizationPass.cs

@@ -8,10 +8,10 @@ using System.Text;
 using System.Threading.Tasks;
 using UnityEngine.Assertions;
 
-namespace Obfuz.Virtualization
+namespace Obfuz.ObfusPasses.ConstObfus
 {
 
-    public class DataVirtualizationPass : MethodBodyObfuscationPassBase
+    public class DataVirtualizationPass : InstructionObfuscationPassBase
     {
         private IDataObfuscationPolicy _dataObfuscatorPolicy;
         private IDataObfuscator _dataObfuscator;

Editor/ObfusPasses/ConstObfus/DefaultDataObfuscator.cs

@@ -5,7 +5,7 @@ using Obfuz.Utils;
 using System;
 using System.Collections.Generic;
 
-namespace Obfuz.Virtualization
+namespace Obfuz.ObfusPasses.ConstObfus
 {
     public class DefaultDataObfuscator : IDataObfuscator
     {

Editor/ObfusPasses/ConstObfus/IDataObfuscationPolicy.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Obfuz.Virtualization
+namespace Obfuz.ObfusPasses.ConstObfus
 {
     public interface IDataObfuscationPolicy
     {

Editor/ObfusPasses/ConstObfus/IDataObfuscator.cs

@@ -3,7 +3,7 @@ using dnlib.DotNet.Emit;
 using System;
 using System.Collections.Generic;
 
-namespace Obfuz.Virtualization
+namespace Obfuz.ObfusPasses.ConstObfus
 {
     public interface IDataObfuscator
     {

Editor/ObfusPasses/ExprObfus/ExprObfuscationPass.cs

@@ -6,9 +6,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Obfuz.ExprObfus
+namespace Obfuz.ObfusPasses.ExprObfus
 {
-    public class ExprObfuscationPass : MethodBodyObfuscationPassBase
+    public class ExprObfuscationPass : InstructionObfuscationPassBase
     {
 
 

Editor/ObfusPasses/IObfuscationPass.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Obfuz
+namespace Obfuz.ObfusPasses
 {
     public interface IObfuscationPass
     {

Editor/ObfusPasses/InstructionObfuscationPassBase.cs

@@ -3,9 +3,9 @@ using dnlib.DotNet;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Obfuz
+namespace Obfuz.ObfusPasses
 {
-    public abstract class MethodBodyObfuscationPassBase : ObfuscationPassBase
+    public abstract class InstructionObfuscationPassBase : ObfuscationPassBase
     {
         protected abstract bool NeedObfuscateMethod(MethodDef method);
 

Editor/ObfusPasses/MemEncrypt/ConfigEncryptionPolicy.cs

@@ -1,6 +1,6 @@
 using dnlib.DotNet;
 
-namespace Obfuz.MemEncrypt
+namespace Obfuz.ObfusPasses.MemEncrypt
 {
     public class ConfigEncryptionPolicy : EncryptionPolicyBase
     {

Editor/ObfusPasses/MemEncrypt/DefaultMemoryEncryptor.cs

@@ -6,7 +6,7 @@ using System;
 using System.Collections.Generic;
 using UnityEngine.Assertions;
 
-namespace Obfuz.MemEncrypt
+namespace Obfuz.ObfusPasses.MemEncrypt
 {
     public class DefaultMemoryEncryptor : MemoryEncryptorBase
     {

Editor/ObfusPasses/MemEncrypt/EncryptionPolicyBase.cs

@@ -1,6 +1,6 @@
 using dnlib.DotNet;
 
-namespace Obfuz.MemEncrypt
+namespace Obfuz.ObfusPasses.MemEncrypt
 {
     public abstract class EncryptionPolicyBase : IEncryptionPolicy
     {

Editor/ObfusPasses/MemEncrypt/IEncryptionPolicy.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Obfuz.MemEncrypt
+namespace Obfuz.ObfusPasses.MemEncrypt
 {
     public interface IEncryptionPolicy
     {

Editor/ObfusPasses/MemEncrypt/IMemoryEncryptor.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Obfuz.MemEncrypt
+namespace Obfuz.ObfusPasses.MemEncrypt
 {
     public class MemoryEncryptionContext
     {

Editor/ObfusPasses/MemEncrypt/MemoryEncryptionPass.cs

@@ -1,15 +1,15 @@
 using dnlib.DotNet;
 using dnlib.DotNet.Emit;
 using Obfuz;
-using Obfuz.MemEncrypt;
+using Obfuz.ObfusPasses.MemEncrypt;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace Obfuz.MemEncrypt
+namespace Obfuz.ObfusPasses.MemEncrypt
 {
 
-    public class MemoryEncryptionPass : MethodBodyObfuscationPassBase
+    public class MemoryEncryptionPass : InstructionObfuscationPassBase
     {
         private readonly IEncryptionPolicy _encryptionPolicy = new ConfigEncryptionPolicy();
         private readonly IMemoryEncryptor _memoryEncryptor = new DefaultMemoryEncryptor();

Editor/ObfusPasses/MemEncrypt/MemoryEncryptorBase.cs

@@ -2,7 +2,7 @@
 using dnlib.DotNet.Emit;
 using System.Collections.Generic;
 
-namespace Obfuz.MemEncrypt
+namespace Obfuz.ObfusPasses.MemEncrypt
 {
     public abstract class MemoryEncryptorBase : IMemoryEncryptor
     {

Editor/ObfusPasses/ObfuscationPassBase.cs

@@ -1,6 +1,6 @@
 using Obfuz.Emit;
 
-namespace Obfuz
+namespace Obfuz.ObfusPasses
 {
     public abstract class ObfuscationPassBase : IObfuscationPass
     {

Editor/ObfusPasses/ObfuscationPassContext.cs

@@ -1,5 +1,5 @@
 using dnlib.DotNet;
-using Obfuz.Rename;
+using Obfuz.ObfusPasses.SymbolObfus;
 using Obfuz.Utils;
 using System;
 using System.Collections.Generic;
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Obfuz
+namespace Obfuz.ObfusPasses
 {
 
     public class ObfuscationPassContext

Editor/ObfusPasses/ObfuscationPassType.cs

@@ -0,0 +1,23 @@
+using System;
+
+namespace Obfuz.ObfusPasses
+{
+    [Flags]
+    public enum ObfuscationPassType
+    {
+        None = 0,
+
+        ConstEncryption = 0x1,
+        MemoryEncryption = 0x2,
+
+        SymbolObfuscation = 0x100,
+        CallProxy = 0x200,
+        ExprObfuscation = 0x400,
+        ControlFlowObfuscation = 0x800,
+
+
+        AllDataEncryption = ConstEncryption | MemoryEncryption,
+        AllCodeObfuscation = SymbolObfuscation | CallProxy | ExprObfuscation | ControlFlowObfuscation,
+        All = AllDataEncryption | AllCodeObfuscation,
+    }
+}

Editor/ObfusPasses/SymbolObfus/CacheRenamePolicy.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Obfuz.Rename
+namespace Obfuz.ObfusPasses.SymbolObfus
 {
     public class CacheRenamePolicy : RenamePolicyBase
     {

Editor/ObfusPasses/SymbolObfus/CombineRenamePolicy.cs

@@ -1,7 +1,7 @@
 using dnlib.DotNet;
 using System.Linq;
 
-namespace Obfuz.Rename
+namespace Obfuz.ObfusPasses.SymbolObfus
 {
     public class CombineRenamePolicy : IRenamePolicy
     {

Editor/ObfusPasses/SymbolObfus/INameMaker.cs

@@ -1,6 +1,6 @@
 using dnlib.DotNet;
 
-namespace Obfuz.Rename
+namespace Obfuz.ObfusPasses.SymbolObfus
 {
     public interface INameMaker
     {

Editor/ObfusPasses/SymbolObfus/INameScope.cs

@@ -1,4 +1,4 @@
-namespace Obfuz.Rename
+namespace Obfuz.ObfusPasses.SymbolObfus
 {
     public interface INameScope
     {

Editor/ObfusPasses/SymbolObfus/IRenamePolicy.cs

@@ -1,6 +1,6 @@
 using dnlib.DotNet;
 
-namespace Obfuz.Rename
+namespace Obfuz.ObfusPasses.SymbolObfus
 {
     public interface IRenamePolicy
     {

Editor/ObfusPasses/SymbolObfus/NameMaker.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Obfuz.Rename
+namespace Obfuz.ObfusPasses.SymbolObfus
 {
 
     public class NameMaker : NameMakerBase

Editor/ObfusPasses/SymbolObfus/NameMakerBase.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Obfuz.Rename
+namespace Obfuz.ObfusPasses.SymbolObfus
 {
     public abstract class NameMakerBase : INameMaker
     {

Editor/ObfusPasses/SymbolObfus/NameMakerFactory.cs

@@ -5,7 +5,7 @@ using System.Runtime.Remoting.Messaging;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Obfuz.Rename
+namespace Obfuz.ObfusPasses.SymbolObfus
 {
     public static class NameMakerFactory
     {

Editor/ObfusPasses/SymbolObfus/NameScope.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Obfuz.Rename
+namespace Obfuz.ObfusPasses.SymbolObfus
 {
 
     public class NameScope : NameScopeBase

Editor/ObfusPasses/SymbolObfus/NameScopeBase.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Obfuz.Rename
+namespace Obfuz.ObfusPasses.SymbolObfus
 {
     public abstract class NameScopeBase : INameScope
     {

Editor/ObfusPasses/SymbolObfus/ObfuscateRuleConfig.cs

@@ -1,5 +1,4 @@
 using dnlib.DotNet;
-using Obfuz.Rename;
 using Obfuz.Utils;
 using System;
 using System.Collections.Generic;
@@ -9,7 +8,7 @@ using System.Threading.Tasks;
 using System.Xml;
 using UnityEngine;
 
-namespace Obfuz
+namespace Obfuz.ObfusPasses.SymbolObfus
 {
 
     public class ObfuscateRuleConfig : RenamePolicyBase

Editor/ObfusPasses/SymbolObfus/RenamePolicyBase.cs

@@ -1,6 +1,6 @@
 using dnlib.DotNet;
 
-namespace Obfuz.Rename
+namespace Obfuz.ObfusPasses.SymbolObfus
 {
     public abstract class RenamePolicyBase : IRenamePolicy
     {

Editor/ObfusPasses/SymbolObfus/RenameRecordMap.cs

@@ -1,5 +1,4 @@
 using dnlib.DotNet;
-using Obfuz.Rename;
 using Obfuz.Utils;
 using System.Collections.Generic;
 using System.IO;
@@ -10,7 +9,7 @@ using System.Xml;
 using System.Xml.Linq;
 using UnityEngine;
 
-namespace Obfuz
+namespace Obfuz.ObfusPasses.SymbolObfus
 {
 
     public class RenameRecordMap

Editor/ObfusPasses/SymbolObfus/RenameSymbolPass.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Obfuz.Rename
+namespace Obfuz.ObfusPasses.SymbolObfus
 {
     public class RenameSymbolPass : ObfuscationPassBase
     {

Editor/ObfusPasses/SymbolObfus/SymbolRename.cs

@@ -1,5 +1,5 @@
 using dnlib.DotNet;
-using Obfuz.Rename;
+using Obfuz.ObfusPasses.SymbolObfus;
 using Obfuz.Utils;
 using System;
 using System.Collections;
@@ -12,10 +12,8 @@ using UnityEditor.SceneManagement;
 using UnityEngine;
 using UnityEngine.Assertions;
 
-namespace Obfuz
+namespace Obfuz.ObfusPasses.SymbolObfus
 {
-
-
     public class SymbolRename
     {
         class AssemblyReferenceInfo

Editor/ObfusPasses/SymbolObfus/SystemRenamePolicy.cs

@@ -1,6 +1,6 @@
 using dnlib.DotNet;
 
-namespace Obfuz.Rename
+namespace Obfuz.ObfusPasses.SymbolObfus
 {
     public class SystemRenamePolicy : RenamePolicyBase
     {

Editor/ObfusPasses/SymbolObfus/TestNameMaker.cs

@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace Obfuz.Rename
+namespace Obfuz.ObfusPasses.SymbolObfus
 {
     public class TestNameMaker : NameMakerBase
     {

Editor/ObfusPasses/SymbolObfus/UnityRenamePolicy.cs

@@ -6,7 +6,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Obfuz.Rename
+namespace Obfuz.ObfusPasses.SymbolObfus
 {
 
     public class UnityRenamePolicy : RenamePolicyBase

Editor/ObfusPasses/SymbolObfus/VirtualMethodGroupCalculator.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Obfuz.Rename
+namespace Obfuz.ObfusPasses.SymbolObfus
 {
 
     public class VirtualMethodGroup

Editor/Obfuscator.cs

@@ -1,5 +1,6 @@
 using dnlib.DotNet;
 using Obfuz.Emit;
+using Obfuz.ObfusPasses;
 using Obfuz.Utils;
 using System;
 using System.Collections.Generic;
@@ -42,8 +43,6 @@ namespace Obfuz
             {
                 _pipeline.AddPass(pass);
             }
-
-            _pipeline.AddPass(new CleanUpInstructionPass());
         }
 
         public void Run()

Editor/ObfuscatorBuilder.cs

@@ -1,11 +1,14 @@
-using Obfuz.DynamicProxy;
-using Obfuz.MemEncrypt;
-using Obfuz.Rename;
+using Obfuz.ObfusPasses;
+using Obfuz.ObfusPasses.CallObfus;
+using Obfuz.ObfusPasses.CleanUp;
+using Obfuz.ObfusPasses.ConstObfus;
+using Obfuz.ObfusPasses.ExprObfus;
+using Obfuz.ObfusPasses.MemEncrypt;
+using Obfuz.ObfusPasses.SymbolObfus;
+using Obfuz.Settings;
 using System.Collections.Generic;
 using System.Linq;
-using Obfuz.Virtualization;
 using UnityEditor;
-using Obfuz.ExprObfus;
 
 namespace Obfuz
 {
@@ -92,6 +95,7 @@ namespace Obfuz
             {
                 builder.AddPass(new RenameSymbolPass(settings.ruleFiles.ToList(), settings.mappingFile));
             }
+            builder.AddPass(new CleanUpInstructionPass());
             return builder;
         }
     }

Editor/Pipeline.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using Obfuz.ObfusPasses;
+using System.Collections.Generic;
 
 namespace Obfuz
 {

Editor/Settings/ObfuzSettings.cs

@@ -1,4 +1,4 @@
-using System;
+using Obfuz.ObfusPasses;
 using System.Collections.Generic;
 using System.IO;
 using System.Runtime.Remoting.Messaging;
@@ -6,26 +6,8 @@ using UnityEditor;
 using UnityEditorInternal;
 using UnityEngine;
 
-namespace Obfuz
+namespace Obfuz.Settings
 {
-    [Flags]
-    public enum ObfuscationPassType
-    {
-        None = 0,
-
-        ConstEncryption = 0x1,
-        MemoryEncryption = 0x2,
-
-        SymbolObfuscation = 0x100,
-        CallProxy = 0x200,
-        ExprObfuscation = 0x400,
-        ControlFlowObfuscation = 0x800,
-
-
-        AllDataEncryption = ConstEncryption | MemoryEncryption,
-        AllCodeObfuscation = SymbolObfuscation | CallProxy | ExprObfuscation | ControlFlowObfuscation,
-        All = AllDataEncryption | AllCodeObfuscation,
-    }
 
     public class ObfuzSettings : ScriptableObject
     {

Editor/Settings/ObfuzSettingsProvider.cs

@@ -5,7 +5,7 @@ using UnityEditor.Presets;
 using UnityEngine;
 using UnityEngine.UIElements;
 
-namespace Obfuz
+namespace Obfuz.Settings
 {
     public class ObfuzSettingsProvider : SettingsProvider
     {

Editor/Unity/ObfuscationBeginEventArgs.cs

@@ -0,0 +1,8 @@
+namespace Obfuz.Unity
+{
+    public class ObfuscationBeginEventArgs
+    {
+        public string scriptAssembliesPath;
+        public string obfuscatedScriptAssembliesPath;
+    }
+}

Editor/Unity/ObfuscationEndEventArgs.cs

@@ -0,0 +1,9 @@
+namespace Obfuz.Unity
+{
+    public class ObfuscationEndEventArgs
+    {
+        public bool success;
+        public string originalScriptAssembliesPath;
+        public string obfuscatedScriptAssembliesPath;
+    }
+}

Editor/Unity/ObfuscationProcess.cs

@@ -11,8 +11,9 @@ using UnityEngine;
 using UnityEditor.Compilation;
 using Obfuz.Utils;
 using FileUtil = Obfuz.Utils.FileUtil;
+using Obfuz.Settings;
 
-namespace Obfuz.BuildProcess
+namespace Obfuz.Unity
 {
 
 #if UNITY_2019_1_OR_NEWER
@@ -22,19 +23,6 @@ namespace Obfuz.BuildProcess
 
         public int callbackOrder => 10000;
 
-        public class ObfuscationBeginEventArgs : EventArgs
-        {
-            public string scriptAssembliesPath;
-            public string obfuscatedScriptAssembliesPath;
-        }
-
-        public class ObfuscationEndEventArgs : EventArgs
-        {
-            public bool success;
-            public string originalScriptAssembliesPath;
-            public string obfuscatedScriptAssembliesPath;
-        }
-
         public static event Action<ObfuscationBeginEventArgs> OnObfuscationBegin;
 
         public static event Action<ObfuscationEndEventArgs> OnObfuscationEnd;

Editor/Unity/ObfuzMenu.cs

@@ -1,7 +1,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Obfuz
+namespace Obfuz.Unity
 {
     public static class ObfuzMenu
     {