代码清理

Editor/Emit/EvalStackCalculator.cs

@@ -1,6 +1,5 @@
 using dnlib.DotNet;
 using dnlib.DotNet.Emit;
-using dnlib.DotNet.Writer;
 using Obfuz.Utils;
 using System;
 using System.Collections.Generic;

Editor/EncryptionVM/Instructions/MultipleInstruction.cs

@@ -1,6 +1,5 @@
 using NUnit.Framework;
 using Obfuz.Utils;
-using System;
 using System.Collections.Generic;
 
 namespace Obfuz.EncryptionVM.Instructions

Editor/ObfusPasses/BasicBlockObfuscationPassBase.cs

@@ -2,7 +2,6 @@
 using dnlib.DotNet.Emit;
 using Obfuz.Emit;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace Obfuz.ObfusPasses
 {

Editor/ObfusPasses/EvalStackObfus/ConfigurableObfuscationPolicy.cs

@@ -1,12 +1,9 @@
 using dnlib.DotNet;
 using Obfuz.Conf;
 using Obfuz.Settings;
-using Obfuz.Utils;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Xml;
-using UnityEditor.VersionControl;
 
 namespace Obfuz.ObfusPasses.EvalStackObfus
 {

Editor/ObfusPasses/EvalStackObfus/EvalStackObfusPass.cs

@@ -4,12 +4,7 @@ using Obfuz.Data;
 using Obfuz.Emit;
 using Obfuz.Settings;
 using Obfuz.Utils;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
 
 namespace Obfuz.ObfusPasses.EvalStackObfus
 {

Editor/ObfusPasses/EvalStackObfus/IObfuscator.cs

@@ -1,6 +1,4 @@
-using dnlib.DotNet;
+using dnlib.DotNet.Emit;
-using dnlib.DotNet.Emit;
-using Obfuz.Emit;
 using System.Collections.Generic;
 
 namespace Obfuz.ObfusPasses.EvalStackObfus

Editor/ObfusPasses/ExprObfus/ConfigurableObfuscationPolicy.cs

@@ -1,12 +1,9 @@
 using dnlib.DotNet;
 using Obfuz.Conf;
 using Obfuz.Settings;
-using Obfuz.Utils;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Xml;
-using UnityEditor.VersionControl;
 
 namespace Obfuz.ObfusPasses.ExprObfus
 {

Editor/ObfusPasses/ExprObfus/ExprObfusPass.cs

@@ -6,8 +6,6 @@ using Obfuz.ObfusPasses.ExprObfus.Obfuscators;
 using Obfuz.Settings;
 using Obfuz.Utils;
 using System.Collections.Generic;
-using System.Linq;
-using UnityEngine;
 
 namespace Obfuz.ObfusPasses.ExprObfus
 {

Editor/ObfusPasses/ExprObfus/IObfuscator.cs

@@ -1,5 +1,4 @@
-using dnlib.DotNet;
+using dnlib.DotNet.Emit;
-using dnlib.DotNet.Emit;
 using Obfuz.Emit;
 using System.Collections.Generic;
 

Editor/ObfusPasses/ExprObfus/Obfuscators/AdvancedObfuscator.cs

@@ -1,13 +1,8 @@
 using dnlib.DotNet.Emit;
-using dnlib.DotNet;
-using Obfuz.Emit;
-using System.Collections.Generic;
-using Obfuz.Utils;
 using Obfuz.Data;
-using UnityEngine;
+using Obfuz.Emit;
-using UnityEngine.Assertions;
+using Obfuz.Utils;
-using JetBrains.Annotations;
+using System.Collections.Generic;
-using System;
 
 namespace Obfuz.ObfusPasses.ExprObfus.Obfuscators
 {

Editor/ObfusPasses/ExprObfus/Obfuscators/BasicObfuscator.cs

@@ -1,12 +1,7 @@
 using dnlib.DotNet;
 using dnlib.DotNet.Emit;
 using Obfuz.Emit;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
 
 namespace Obfuz.ObfusPasses.ExprObfus.Obfuscators

Editor/ObfusPasses/Instinct/InstinctPass.cs

@@ -1,12 +1,9 @@
 using dnlib.DotNet;
 using dnlib.DotNet.Emit;
 using Obfuz.Editor;
-using Obfuz.Emit;
-using Obfuz.Settings;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net.Security;
 using System.Text;
 using UnityEngine.Assertions;
 

Editor/ObfusPasses/InstructionObfuscationPassBase.cs

@@ -1,7 +1,6 @@
 using dnlib.DotNet;
 using dnlib.DotNet.Emit;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace Obfuz.ObfusPasses
 {

Editor/ObfusPasses/SymbolObfus/NameMakers/NameMakerBase.cs

@@ -1,6 +1,5 @@
 using dnlib.DotNet;
 using System.Collections.Generic;
-using System.Linq;
 using UnityEngine.Assertions;
 
 namespace Obfuz.ObfusPasses.SymbolObfus.NameMakers

Editor/ObfusPasses/SymbolObfus/Policies/SystemRenamePolicy.cs

@@ -2,7 +2,6 @@
 using Obfuz.Editor;
 using Obfuz.Utils;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace Obfuz.ObfusPasses.SymbolObfus.Policies
 {

Editor/ObfusPasses/SymbolObfus/ReflectionCompatibilityDetector.cs

@@ -3,8 +3,6 @@ using dnlib.DotNet.Emit;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
 
 namespace Obfuz.ObfusPasses.SymbolObfus

Editor/ObfuscatorBuilder.cs

@@ -2,6 +2,7 @@
 using Obfuz.ObfusPasses;
 using Obfuz.ObfusPasses.CallObfus;
 using Obfuz.ObfusPasses.ConstEncrypt;
+using Obfuz.ObfusPasses.ControlFlowObfus;
 using Obfuz.ObfusPasses.EvalStackObfus;
 using Obfuz.ObfusPasses.ExprObfus;
 using Obfuz.ObfusPasses.FieldEncrypt;
@@ -186,6 +187,10 @@ namespace Obfuz
             {
                 builder.AddPass(new CallObfusPass(settings.callObfusSettings.ToFacade()));
             }
+            if (obfuscationPasses.HasFlag(ObfuscationPassType.ControlFlowObfus))
+            {
+                builder.AddPass(new ControlFlowObfusPass(settings.controlFlowObfuscationSettings.ToFacade()));
+            }
             if (obfuscationPasses.HasFlag(ObfuscationPassType.SymbolObfus))
             {
                 builder.AddPass(new SymbolObfusPass(settings.symbolObfusSettings.ToFacade()));

Editor/Settings/ObfuzSettings.cs

@@ -40,6 +40,9 @@ namespace Obfuz.Settings
         [Tooltip("expression obfuscation settings")]
         public ExprObfuscationSettings exprObfusSettings;
 
+        [Tooltip("control flow obfuscation settings")]
+        public ControlFlowObfuscationSettings controlFlowObfuscationSettings;
+
         public string ObfuzRootDir => $"Library/Obfuz";
 
         public string GetObfuscatedAssemblyOutputPath(BuildTarget target)

Editor/Settings/ObfuzSettingsProvider.cs

@@ -36,6 +36,7 @@ namespace Obfuz.Settings
         private SerializedProperty _fieldEncryptSettings;
         private SerializedProperty _callObfusSettings;
         private SerializedProperty _exprObfusSettings;
+        private SerializedProperty _controlFlowObfusSettings;
 
         public ObfuzSettingsProvider() : base("Project/Obfuz", SettingsScope.Project)
         {
@@ -70,6 +71,7 @@ namespace Obfuz.Settings
             _exprObfusSettings = _serializedObject.FindProperty("exprObfusSettings");
             _fieldEncryptSettings = _serializedObject.FindProperty("fieldEncryptSettings");
             _callObfusSettings = _serializedObject.FindProperty("callObfusSettings");
+            _controlFlowObfusSettings = _serializedObject.FindProperty("controlFlowObfuscationSettings");
         }
 
         public override void OnGUI(string searchContext)
@@ -94,6 +96,7 @@ namespace Obfuz.Settings
             EditorGUILayout.PropertyField(_exprObfusSettings);
             EditorGUILayout.PropertyField(_fieldEncryptSettings);
             EditorGUILayout.PropertyField(_callObfusSettings);
+            EditorGUILayout.PropertyField(_controlFlowObfusSettings);
 
 
             if (EditorGUI.EndChangeCheck())

Editor/Utils/ConstObfusUtil.cs

@@ -1,11 +1,7 @@
-using dnlib.DotNet.Emit;
+using dnlib.DotNet;
-using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using Obfuz.Data;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Obfuz.Utils
 {

Editor/Utils/DisableTypeDefFindCacheScope.cs

@@ -1,9 +1,5 @@
 using dnlib.DotNet;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Obfuz.Utils
 {

Editor/Utils/MathUtil.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Obfuz.Utils
 {

Runtime/ObfuscationInstincts.cs

@@ -1,10 +1,4 @@
-using System;
+namespace Obfuz
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Obfuz
 {
     public static class ObfuscationInstincts
     {

Runtime/ObfuscationTypeMapper.cs

@@ -1,10 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Obfuz
 {