From 393d26b2a3de858ecd4dc067da751e1c195ed259 Mon Sep 17 00:00:00 2001 From: Robert Xiao Date: Fri, 26 Jun 2020 18:03:04 -0700 Subject: [PATCH] Move non-output to new CppUtils namespace We prefer to have the Outputs directory contain just one file or namespace per output module, so we'll move all C++-related stuff to a new CppUtils namespace instead. --- Il2CppInspector.CLI/Program.cs | 2 +- .../{Outputs => CppUtils}/CppDeclarations.cs | 10 +++++----- .../{Outputs => CppUtils}/Namespace.cs | 2 +- .../UnityHeaders/16-5.3.0-5.3.1.h | 0 .../{Outputs => CppUtils}/UnityHeaders/19-5.3.2.h | 0 .../UnityHeaders/20-5.3.3-5.3.4.h | 0 .../{Outputs => CppUtils}/UnityHeaders/21-5.3.5.h | 0 .../{Outputs => CppUtils}/UnityHeaders/21-5.3.6.h | 0 .../UnityHeaders/21-5.3.7-5.3.8.h | 0 .../{Outputs => CppUtils}/UnityHeaders/21-5.4.0.h | 0 .../UnityHeaders/21-5.4.1-5.4.3.h | 0 .../UnityHeaders/21-5.4.4-5.4.6.h | 0 .../{Outputs => CppUtils}/UnityHeaders/22-5.5.0.h | 0 .../UnityHeaders/22-5.5.1-5.5.2.h | 0 .../UnityHeaders/22-5.5.3-5.5.6.h | 0 .../UnityHeaders/23-5.6.0-5.6.7.h | 0 .../UnityHeaders/24-2017.1.0-2017.1.2.h | 0 .../UnityHeaders/24-2017.1.3-2017.1.5.h | 0 .../{Outputs => CppUtils}/UnityHeaders/24-2017.2.0.h | 0 .../UnityHeaders/24-2017.2.1-2017.4.38.h | 0 .../UnityHeaders/24-2018.1.0-2018.1.9.h | 0 .../UnityHeaders/24-2018.2.0-2018.2.21.h | 0 .../UnityHeaders/24.1-2018.3.0-2018.3.7.h | 0 .../UnityHeaders/24.1-2018.3.8-2018.4.20.h | 0 .../UnityHeaders/24.2-2019.1.0-2019.2.21.h | 0 .../UnityHeaders/24.2-2019.3.0-2019.3.6.h | 0 .../UnityHeaders/24.3-2019.3.7-.h | 0 .../{Outputs => CppUtils}/UnityHeaders/UnityHeader.cs | 6 +++--- .../{Outputs => CppUtils}/UnityHeaders/UnityVersion.cs | 2 +- Il2CppInspector.Common/Il2CppInspector.csproj | 4 ++-- Il2CppInspector.Common/Outputs/IDAPythonScript.cs | 3 ++- Il2CppInspector.GUI/MainWindow.xaml.cs | 2 +- Il2CppTests/TestIDAOutput.cs | 2 +- 33 files changed, 17 insertions(+), 16 deletions(-) rename Il2CppInspector.Common/{Outputs => CppUtils}/CppDeclarations.cs (97%) rename Il2CppInspector.Common/{Outputs => CppUtils}/Namespace.cs (99%) rename Il2CppInspector.Common/{Outputs => CppUtils}/UnityHeaders/16-5.3.0-5.3.1.h (100%) rename Il2CppInspector.Common/{Outputs => CppUtils}/UnityHeaders/19-5.3.2.h (100%) rename Il2CppInspector.Common/{Outputs => CppUtils}/UnityHeaders/20-5.3.3-5.3.4.h (100%) rename Il2CppInspector.Common/{Outputs => CppUtils}/UnityHeaders/21-5.3.5.h (100%) rename Il2CppInspector.Common/{Outputs => CppUtils}/UnityHeaders/21-5.3.6.h (100%) rename Il2CppInspector.Common/{Outputs => CppUtils}/UnityHeaders/21-5.3.7-5.3.8.h (100%) rename Il2CppInspector.Common/{Outputs => CppUtils}/UnityHeaders/21-5.4.0.h (100%) rename Il2CppInspector.Common/{Outputs => CppUtils}/UnityHeaders/21-5.4.1-5.4.3.h (100%) rename Il2CppInspector.Common/{Outputs => CppUtils}/UnityHeaders/21-5.4.4-5.4.6.h (100%) rename Il2CppInspector.Common/{Outputs => CppUtils}/UnityHeaders/22-5.5.0.h (100%) rename Il2CppInspector.Common/{Outputs => CppUtils}/UnityHeaders/22-5.5.1-5.5.2.h (100%) rename Il2CppInspector.Common/{Outputs => CppUtils}/UnityHeaders/22-5.5.3-5.5.6.h (100%) rename Il2CppInspector.Common/{Outputs => CppUtils}/UnityHeaders/23-5.6.0-5.6.7.h (100%) rename Il2CppInspector.Common/{Outputs => CppUtils}/UnityHeaders/24-2017.1.0-2017.1.2.h (100%) rename Il2CppInspector.Common/{Outputs => CppUtils}/UnityHeaders/24-2017.1.3-2017.1.5.h (100%) rename Il2CppInspector.Common/{Outputs => CppUtils}/UnityHeaders/24-2017.2.0.h (100%) rename Il2CppInspector.Common/{Outputs => CppUtils}/UnityHeaders/24-2017.2.1-2017.4.38.h (100%) rename Il2CppInspector.Common/{Outputs => CppUtils}/UnityHeaders/24-2018.1.0-2018.1.9.h (100%) rename Il2CppInspector.Common/{Outputs => CppUtils}/UnityHeaders/24-2018.2.0-2018.2.21.h (100%) rename Il2CppInspector.Common/{Outputs => CppUtils}/UnityHeaders/24.1-2018.3.0-2018.3.7.h (100%) rename Il2CppInspector.Common/{Outputs => CppUtils}/UnityHeaders/24.1-2018.3.8-2018.4.20.h (100%) rename Il2CppInspector.Common/{Outputs => CppUtils}/UnityHeaders/24.2-2019.1.0-2019.2.21.h (100%) rename Il2CppInspector.Common/{Outputs => CppUtils}/UnityHeaders/24.2-2019.3.0-2019.3.6.h (100%) rename Il2CppInspector.Common/{Outputs => CppUtils}/UnityHeaders/24.3-2019.3.7-.h (100%) rename Il2CppInspector.Common/{Outputs => CppUtils}/UnityHeaders/UnityHeader.cs (93%) rename Il2CppInspector.Common/{Outputs => CppUtils}/UnityHeaders/UnityVersion.cs (98%) diff --git a/Il2CppInspector.CLI/Program.cs b/Il2CppInspector.CLI/Program.cs index 4e6a368..b218c3a 100644 --- a/Il2CppInspector.CLI/Program.cs +++ b/Il2CppInspector.CLI/Program.cs @@ -9,7 +9,7 @@ using System.Linq; using CommandLine; using Il2CppInspector.Reflection; using Il2CppInspector.Outputs; -using Il2CppInspector.Outputs.UnityHeaders; +using Il2CppInspector.CppUtils.UnityHeaders; namespace Il2CppInspector.CLI { diff --git a/Il2CppInspector.Common/Outputs/CppDeclarations.cs b/Il2CppInspector.Common/CppUtils/CppDeclarations.cs similarity index 97% rename from Il2CppInspector.Common/Outputs/CppDeclarations.cs rename to Il2CppInspector.Common/CppUtils/CppDeclarations.cs index 0171ff8..f88c44e 100644 --- a/Il2CppInspector.Common/Outputs/CppDeclarations.cs +++ b/Il2CppInspector.Common/CppUtils/CppDeclarations.cs @@ -5,7 +5,7 @@ All rights reserved. */ -using Il2CppInspector.Outputs.UnityHeaders; +using Il2CppInspector.CppUtils.UnityHeaders; using Il2CppInspector.Reflection; using System; using System.Collections.Generic; @@ -13,7 +13,7 @@ using System.Linq; using System.Text; using System.Text.RegularExpressions; -namespace Il2CppInspector.Outputs +namespace Il2CppInspector.CppUtils { // Class for generating C header declarations from Reflection objects (TypeInfo, etc.) public class CppDeclarations @@ -231,7 +231,7 @@ namespace Il2CppInspector.Outputs * We have to be a little careful: the rootmost class needs to have its alignment * set to that of Il2CppObject, but we can't explicitly include Il2CppObject * in the hierarchy because we want to customize the type of the klass parameter. */ - var align = (model.Package.BinaryImage.Bits == 32) ? 4 : 8; + var align = model.Package.BinaryImage.Bits == 32 ? 4 : 8; csrc.Append($"struct __declspec(align({align})) {name}__Fields {{\n"); GenerateFieldList(csrc, ns, ti); csrc.Append($"}};\n"); @@ -346,7 +346,7 @@ namespace Il2CppInspector.Outputs } else if (ti.HasElementType) { VisitType(ti.ElementType); return; - } else if(ti.IsEnum) { + } else if (ti.IsEnum) { VisitFieldStructs(ti); VisitType(ti.GetEnumUnderlyingType()); return; @@ -574,7 +574,7 @@ namespace Il2CppInspector.Outputs ns.ReserveName(keyword); } /* Reserve builtin keywords in IDA */ - foreach(var keyword in new string[] { "_BYTE", "_DWORD", "_OWORD", "_QWORD", "_UNKNOWN", "_WORD", "__cdecl", "__declspec", "__export", "__far", "__fastcall", "__huge", "__import", "__int128", "__int16", "__int32", "__int64", "__int8", "__interrupt", "__near", "__pascal", "__spoils", "__stdcall", "__thiscall", "__thread", "__unaligned", "__usercall", "__userpurge", "_cs", "_ds", "_es", "_ss", "flat" }) { + foreach (var keyword in new string[] { "_BYTE", "_DWORD", "_OWORD", "_QWORD", "_UNKNOWN", "_WORD", "__cdecl", "__declspec", "__export", "__far", "__fastcall", "__huge", "__import", "__int128", "__int16", "__int32", "__int64", "__int8", "__interrupt", "__near", "__pascal", "__spoils", "__stdcall", "__thiscall", "__thread", "__unaligned", "__usercall", "__userpurge", "_cs", "_ds", "_es", "_ss", "flat" }) { ns.ReserveName(keyword); } return ns; diff --git a/Il2CppInspector.Common/Outputs/Namespace.cs b/Il2CppInspector.Common/CppUtils/Namespace.cs similarity index 99% rename from Il2CppInspector.Common/Outputs/Namespace.cs rename to Il2CppInspector.Common/CppUtils/Namespace.cs index 694f1e0..0c363fd 100644 --- a/Il2CppInspector.Common/Outputs/Namespace.cs +++ b/Il2CppInspector.Common/CppUtils/Namespace.cs @@ -9,7 +9,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace Il2CppInspector.Outputs +namespace Il2CppInspector.CppUtils { /// /// A utility class for managing names in a common namespace. diff --git a/Il2CppInspector.Common/Outputs/UnityHeaders/16-5.3.0-5.3.1.h b/Il2CppInspector.Common/CppUtils/UnityHeaders/16-5.3.0-5.3.1.h similarity index 100% rename from Il2CppInspector.Common/Outputs/UnityHeaders/16-5.3.0-5.3.1.h rename to Il2CppInspector.Common/CppUtils/UnityHeaders/16-5.3.0-5.3.1.h diff --git a/Il2CppInspector.Common/Outputs/UnityHeaders/19-5.3.2.h b/Il2CppInspector.Common/CppUtils/UnityHeaders/19-5.3.2.h similarity index 100% rename from Il2CppInspector.Common/Outputs/UnityHeaders/19-5.3.2.h rename to Il2CppInspector.Common/CppUtils/UnityHeaders/19-5.3.2.h diff --git a/Il2CppInspector.Common/Outputs/UnityHeaders/20-5.3.3-5.3.4.h b/Il2CppInspector.Common/CppUtils/UnityHeaders/20-5.3.3-5.3.4.h similarity index 100% rename from Il2CppInspector.Common/Outputs/UnityHeaders/20-5.3.3-5.3.4.h rename to Il2CppInspector.Common/CppUtils/UnityHeaders/20-5.3.3-5.3.4.h diff --git a/Il2CppInspector.Common/Outputs/UnityHeaders/21-5.3.5.h b/Il2CppInspector.Common/CppUtils/UnityHeaders/21-5.3.5.h similarity index 100% rename from Il2CppInspector.Common/Outputs/UnityHeaders/21-5.3.5.h rename to Il2CppInspector.Common/CppUtils/UnityHeaders/21-5.3.5.h diff --git a/Il2CppInspector.Common/Outputs/UnityHeaders/21-5.3.6.h b/Il2CppInspector.Common/CppUtils/UnityHeaders/21-5.3.6.h similarity index 100% rename from Il2CppInspector.Common/Outputs/UnityHeaders/21-5.3.6.h rename to Il2CppInspector.Common/CppUtils/UnityHeaders/21-5.3.6.h diff --git a/Il2CppInspector.Common/Outputs/UnityHeaders/21-5.3.7-5.3.8.h b/Il2CppInspector.Common/CppUtils/UnityHeaders/21-5.3.7-5.3.8.h similarity index 100% rename from Il2CppInspector.Common/Outputs/UnityHeaders/21-5.3.7-5.3.8.h rename to Il2CppInspector.Common/CppUtils/UnityHeaders/21-5.3.7-5.3.8.h diff --git a/Il2CppInspector.Common/Outputs/UnityHeaders/21-5.4.0.h b/Il2CppInspector.Common/CppUtils/UnityHeaders/21-5.4.0.h similarity index 100% rename from Il2CppInspector.Common/Outputs/UnityHeaders/21-5.4.0.h rename to Il2CppInspector.Common/CppUtils/UnityHeaders/21-5.4.0.h diff --git a/Il2CppInspector.Common/Outputs/UnityHeaders/21-5.4.1-5.4.3.h b/Il2CppInspector.Common/CppUtils/UnityHeaders/21-5.4.1-5.4.3.h similarity index 100% rename from Il2CppInspector.Common/Outputs/UnityHeaders/21-5.4.1-5.4.3.h rename to Il2CppInspector.Common/CppUtils/UnityHeaders/21-5.4.1-5.4.3.h diff --git a/Il2CppInspector.Common/Outputs/UnityHeaders/21-5.4.4-5.4.6.h b/Il2CppInspector.Common/CppUtils/UnityHeaders/21-5.4.4-5.4.6.h similarity index 100% rename from Il2CppInspector.Common/Outputs/UnityHeaders/21-5.4.4-5.4.6.h rename to Il2CppInspector.Common/CppUtils/UnityHeaders/21-5.4.4-5.4.6.h diff --git a/Il2CppInspector.Common/Outputs/UnityHeaders/22-5.5.0.h b/Il2CppInspector.Common/CppUtils/UnityHeaders/22-5.5.0.h similarity index 100% rename from Il2CppInspector.Common/Outputs/UnityHeaders/22-5.5.0.h rename to Il2CppInspector.Common/CppUtils/UnityHeaders/22-5.5.0.h diff --git a/Il2CppInspector.Common/Outputs/UnityHeaders/22-5.5.1-5.5.2.h b/Il2CppInspector.Common/CppUtils/UnityHeaders/22-5.5.1-5.5.2.h similarity index 100% rename from Il2CppInspector.Common/Outputs/UnityHeaders/22-5.5.1-5.5.2.h rename to Il2CppInspector.Common/CppUtils/UnityHeaders/22-5.5.1-5.5.2.h diff --git a/Il2CppInspector.Common/Outputs/UnityHeaders/22-5.5.3-5.5.6.h b/Il2CppInspector.Common/CppUtils/UnityHeaders/22-5.5.3-5.5.6.h similarity index 100% rename from Il2CppInspector.Common/Outputs/UnityHeaders/22-5.5.3-5.5.6.h rename to Il2CppInspector.Common/CppUtils/UnityHeaders/22-5.5.3-5.5.6.h diff --git a/Il2CppInspector.Common/Outputs/UnityHeaders/23-5.6.0-5.6.7.h b/Il2CppInspector.Common/CppUtils/UnityHeaders/23-5.6.0-5.6.7.h similarity index 100% rename from Il2CppInspector.Common/Outputs/UnityHeaders/23-5.6.0-5.6.7.h rename to Il2CppInspector.Common/CppUtils/UnityHeaders/23-5.6.0-5.6.7.h diff --git a/Il2CppInspector.Common/Outputs/UnityHeaders/24-2017.1.0-2017.1.2.h b/Il2CppInspector.Common/CppUtils/UnityHeaders/24-2017.1.0-2017.1.2.h similarity index 100% rename from Il2CppInspector.Common/Outputs/UnityHeaders/24-2017.1.0-2017.1.2.h rename to Il2CppInspector.Common/CppUtils/UnityHeaders/24-2017.1.0-2017.1.2.h diff --git a/Il2CppInspector.Common/Outputs/UnityHeaders/24-2017.1.3-2017.1.5.h b/Il2CppInspector.Common/CppUtils/UnityHeaders/24-2017.1.3-2017.1.5.h similarity index 100% rename from Il2CppInspector.Common/Outputs/UnityHeaders/24-2017.1.3-2017.1.5.h rename to Il2CppInspector.Common/CppUtils/UnityHeaders/24-2017.1.3-2017.1.5.h diff --git a/Il2CppInspector.Common/Outputs/UnityHeaders/24-2017.2.0.h b/Il2CppInspector.Common/CppUtils/UnityHeaders/24-2017.2.0.h similarity index 100% rename from Il2CppInspector.Common/Outputs/UnityHeaders/24-2017.2.0.h rename to Il2CppInspector.Common/CppUtils/UnityHeaders/24-2017.2.0.h diff --git a/Il2CppInspector.Common/Outputs/UnityHeaders/24-2017.2.1-2017.4.38.h b/Il2CppInspector.Common/CppUtils/UnityHeaders/24-2017.2.1-2017.4.38.h similarity index 100% rename from Il2CppInspector.Common/Outputs/UnityHeaders/24-2017.2.1-2017.4.38.h rename to Il2CppInspector.Common/CppUtils/UnityHeaders/24-2017.2.1-2017.4.38.h diff --git a/Il2CppInspector.Common/Outputs/UnityHeaders/24-2018.1.0-2018.1.9.h b/Il2CppInspector.Common/CppUtils/UnityHeaders/24-2018.1.0-2018.1.9.h similarity index 100% rename from Il2CppInspector.Common/Outputs/UnityHeaders/24-2018.1.0-2018.1.9.h rename to Il2CppInspector.Common/CppUtils/UnityHeaders/24-2018.1.0-2018.1.9.h diff --git a/Il2CppInspector.Common/Outputs/UnityHeaders/24-2018.2.0-2018.2.21.h b/Il2CppInspector.Common/CppUtils/UnityHeaders/24-2018.2.0-2018.2.21.h similarity index 100% rename from Il2CppInspector.Common/Outputs/UnityHeaders/24-2018.2.0-2018.2.21.h rename to Il2CppInspector.Common/CppUtils/UnityHeaders/24-2018.2.0-2018.2.21.h diff --git a/Il2CppInspector.Common/Outputs/UnityHeaders/24.1-2018.3.0-2018.3.7.h b/Il2CppInspector.Common/CppUtils/UnityHeaders/24.1-2018.3.0-2018.3.7.h similarity index 100% rename from Il2CppInspector.Common/Outputs/UnityHeaders/24.1-2018.3.0-2018.3.7.h rename to Il2CppInspector.Common/CppUtils/UnityHeaders/24.1-2018.3.0-2018.3.7.h diff --git a/Il2CppInspector.Common/Outputs/UnityHeaders/24.1-2018.3.8-2018.4.20.h b/Il2CppInspector.Common/CppUtils/UnityHeaders/24.1-2018.3.8-2018.4.20.h similarity index 100% rename from Il2CppInspector.Common/Outputs/UnityHeaders/24.1-2018.3.8-2018.4.20.h rename to Il2CppInspector.Common/CppUtils/UnityHeaders/24.1-2018.3.8-2018.4.20.h diff --git a/Il2CppInspector.Common/Outputs/UnityHeaders/24.2-2019.1.0-2019.2.21.h b/Il2CppInspector.Common/CppUtils/UnityHeaders/24.2-2019.1.0-2019.2.21.h similarity index 100% rename from Il2CppInspector.Common/Outputs/UnityHeaders/24.2-2019.1.0-2019.2.21.h rename to Il2CppInspector.Common/CppUtils/UnityHeaders/24.2-2019.1.0-2019.2.21.h diff --git a/Il2CppInspector.Common/Outputs/UnityHeaders/24.2-2019.3.0-2019.3.6.h b/Il2CppInspector.Common/CppUtils/UnityHeaders/24.2-2019.3.0-2019.3.6.h similarity index 100% rename from Il2CppInspector.Common/Outputs/UnityHeaders/24.2-2019.3.0-2019.3.6.h rename to Il2CppInspector.Common/CppUtils/UnityHeaders/24.2-2019.3.0-2019.3.6.h diff --git a/Il2CppInspector.Common/Outputs/UnityHeaders/24.3-2019.3.7-.h b/Il2CppInspector.Common/CppUtils/UnityHeaders/24.3-2019.3.7-.h similarity index 100% rename from Il2CppInspector.Common/Outputs/UnityHeaders/24.3-2019.3.7-.h rename to Il2CppInspector.Common/CppUtils/UnityHeaders/24.3-2019.3.7-.h diff --git a/Il2CppInspector.Common/Outputs/UnityHeaders/UnityHeader.cs b/Il2CppInspector.Common/CppUtils/UnityHeaders/UnityHeader.cs similarity index 93% rename from Il2CppInspector.Common/Outputs/UnityHeaders/UnityHeader.cs rename to Il2CppInspector.Common/CppUtils/UnityHeaders/UnityHeader.cs index 37e419d..ea4c2cd 100644 --- a/Il2CppInspector.Common/Outputs/UnityHeaders/UnityHeader.cs +++ b/Il2CppInspector.Common/CppUtils/UnityHeaders/UnityHeader.cs @@ -10,7 +10,7 @@ using System.IO; using System.Linq; using System.Collections.Generic; -namespace Il2CppInspector.Outputs.UnityHeaders +namespace Il2CppInspector.CppUtils.UnityHeaders { // Each instance of UnityHeader represents one header file which potentially covers multiple versions of Unity. public class UnityHeader @@ -84,8 +84,8 @@ namespace Il2CppInspector.Outputs.UnityHeaders continue; if (v.MetadataVersion == 21) { /* Special version logic for metadata version 21 based on the Il2CppMetadataRegistration.fieldOffsets field */ - var headerFieldOffsetsArePointers = (v.MinVersion.CompareTo("5.3.7") >= 0 && v.MinVersion.CompareTo("5.4.0") != 0); - var binaryFieldOffsetsArePointers = (model.Package.Binary.FieldOffsets == null); + var headerFieldOffsetsArePointers = v.MinVersion.CompareTo("5.3.7") >= 0 && v.MinVersion.CompareTo("5.4.0") != 0; + var binaryFieldOffsetsArePointers = model.Package.Binary.FieldOffsets == null; if (headerFieldOffsetsArePointers != binaryFieldOffsetsArePointers) continue; } diff --git a/Il2CppInspector.Common/Outputs/UnityHeaders/UnityVersion.cs b/Il2CppInspector.Common/CppUtils/UnityHeaders/UnityVersion.cs similarity index 98% rename from Il2CppInspector.Common/Outputs/UnityHeaders/UnityVersion.cs rename to Il2CppInspector.Common/CppUtils/UnityHeaders/UnityVersion.cs index 7592891..ce52732 100644 --- a/Il2CppInspector.Common/Outputs/UnityHeaders/UnityVersion.cs +++ b/Il2CppInspector.Common/CppUtils/UnityHeaders/UnityVersion.cs @@ -8,7 +8,7 @@ using System; using System.Text.RegularExpressions; -namespace Il2CppInspector.Outputs.UnityHeaders +namespace Il2CppInspector.CppUtils.UnityHeaders { // Parsed representation of a Unity version number, such as 5.3.0f1 or 2019.3.7. public class UnityVersion : IComparable, IEquatable diff --git a/Il2CppInspector.Common/Il2CppInspector.csproj b/Il2CppInspector.Common/Il2CppInspector.csproj index 22ac2e7..c838280 100644 --- a/Il2CppInspector.Common/Il2CppInspector.csproj +++ b/Il2CppInspector.Common/Il2CppInspector.csproj @@ -10,11 +10,11 @@ - + - + diff --git a/Il2CppInspector.Common/Outputs/IDAPythonScript.cs b/Il2CppInspector.Common/Outputs/IDAPythonScript.cs index da7cb29..e6d3024 100644 --- a/Il2CppInspector.Common/Outputs/IDAPythonScript.cs +++ b/Il2CppInspector.Common/Outputs/IDAPythonScript.cs @@ -9,7 +9,8 @@ using System.Linq; using System.IO; using System.Text; using Il2CppInspector.Reflection; -using Il2CppInspector.Outputs.UnityHeaders; +using Il2CppInspector.CppUtils; +using Il2CppInspector.CppUtils.UnityHeaders; namespace Il2CppInspector.Outputs { diff --git a/Il2CppInspector.GUI/MainWindow.xaml.cs b/Il2CppInspector.GUI/MainWindow.xaml.cs index e90a463..d245749 100644 --- a/Il2CppInspector.GUI/MainWindow.xaml.cs +++ b/Il2CppInspector.GUI/MainWindow.xaml.cs @@ -28,7 +28,7 @@ using Il2CppInspector.Outputs; using Il2CppInspector.Reflection; using Ookii.Dialogs.Wpf; using Path = System.IO.Path; -using Il2CppInspector.Outputs.UnityHeaders; +using Il2CppInspector.CppUtils.UnityHeaders; namespace Il2CppInspectorGUI { diff --git a/Il2CppTests/TestIDAOutput.cs b/Il2CppTests/TestIDAOutput.cs index 309ed20..a91dabf 100644 --- a/Il2CppTests/TestIDAOutput.cs +++ b/Il2CppTests/TestIDAOutput.cs @@ -6,7 +6,7 @@ */ using System.IO; -using Il2CppInspector.Outputs.UnityHeaders; +using Il2CppInspector.CppUtils.UnityHeaders; using Il2CppInspector.Reflection; using NUnit.Framework;