diff --git a/EVEmuTool.sln b/EVEmuTool.sln index 2a0a38f..4a18dd3 100644 --- a/EVEmuTool.sln +++ b/EVEmuTool.sln @@ -8,14 +8,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EVEmuTool", "Editor\EVEmuTo {D8B26B12-E45C-47EA-88F7-56628EB2CCD1} = {D8B26B12-E45C-47EA-88F7-56628EB2CCD1} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EVESharp.PythonTypes", "External\EVESharp\Server\EVESharp.PythonTypes\EVESharp.PythonTypes.csproj", "{6055C65E-F54F-4254-BAF8-98C9C853305E}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EVESharp.EVE", "External\EVESharp\Server\EVESharp.EVE\EVESharp.EVE.csproj", "{8A9E3C2C-28E0-4AB9-9034-F9406B5CBBDF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EVESharp.Common", "External\EVESharp\Server\EVESharp.Common\EVESharp.Common.csproj", "{9EF5A968-08F8-40CF-BC97-975C7FFB21E4}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LSLibNative", "LSLibNative\LSLibNative.vcxproj", "{D8B26B12-E45C-47EA-88F7-56628EB2CCD1}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EVESharp.Types", "External\EVESharp\Server\EVESharp.Types\EVESharp.Types.csproj", "{26E65E4A-9A0C-4341-A415-23EEBF199EE5}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EVESharp.Database.MySql", "External\EVESharp\Server\EVESharp.Database.MySql\EVESharp.Database.MySql.csproj", "{679E88EC-573E-4392-8BFD-6BD91FB81D2A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -47,24 +49,6 @@ Global {5C202FBF-DDB2-4827-A637-0948B329F8C0}.Release|x64.Build.0 = Release|Any CPU {5C202FBF-DDB2-4827-A637-0948B329F8C0}.Release|x86.ActiveCfg = Release|Any CPU {5C202FBF-DDB2-4827-A637-0948B329F8C0}.Release|x86.Build.0 = Release|Any CPU - {6055C65E-F54F-4254-BAF8-98C9C853305E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6055C65E-F54F-4254-BAF8-98C9C853305E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6055C65E-F54F-4254-BAF8-98C9C853305E}.Debug|x64.ActiveCfg = Debug|Any CPU - {6055C65E-F54F-4254-BAF8-98C9C853305E}.Debug|x64.Build.0 = Debug|Any CPU - {6055C65E-F54F-4254-BAF8-98C9C853305E}.Debug|x86.ActiveCfg = Debug|Any CPU - {6055C65E-F54F-4254-BAF8-98C9C853305E}.Debug|x86.Build.0 = Debug|Any CPU - {6055C65E-F54F-4254-BAF8-98C9C853305E}.Editor Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6055C65E-F54F-4254-BAF8-98C9C853305E}.Editor Debug|Any CPU.Build.0 = Debug|Any CPU - {6055C65E-F54F-4254-BAF8-98C9C853305E}.Editor Debug|x64.ActiveCfg = Debug|Any CPU - {6055C65E-F54F-4254-BAF8-98C9C853305E}.Editor Debug|x64.Build.0 = Debug|Any CPU - {6055C65E-F54F-4254-BAF8-98C9C853305E}.Editor Debug|x86.ActiveCfg = Debug|Any CPU - {6055C65E-F54F-4254-BAF8-98C9C853305E}.Editor Debug|x86.Build.0 = Debug|Any CPU - {6055C65E-F54F-4254-BAF8-98C9C853305E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6055C65E-F54F-4254-BAF8-98C9C853305E}.Release|Any CPU.Build.0 = Release|Any CPU - {6055C65E-F54F-4254-BAF8-98C9C853305E}.Release|x64.ActiveCfg = Release|Any CPU - {6055C65E-F54F-4254-BAF8-98C9C853305E}.Release|x64.Build.0 = Release|Any CPU - {6055C65E-F54F-4254-BAF8-98C9C853305E}.Release|x86.ActiveCfg = Release|Any CPU - {6055C65E-F54F-4254-BAF8-98C9C853305E}.Release|x86.Build.0 = Release|Any CPU {8A9E3C2C-28E0-4AB9-9034-F9406B5CBBDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8A9E3C2C-28E0-4AB9-9034-F9406B5CBBDF}.Debug|Any CPU.Build.0 = Debug|Any CPU {8A9E3C2C-28E0-4AB9-9034-F9406B5CBBDF}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -119,6 +103,42 @@ Global {D8B26B12-E45C-47EA-88F7-56628EB2CCD1}.Release|x64.Build.0 = Release|x64 {D8B26B12-E45C-47EA-88F7-56628EB2CCD1}.Release|x86.ActiveCfg = Release|x64 {D8B26B12-E45C-47EA-88F7-56628EB2CCD1}.Release|x86.Build.0 = Release|x64 + {26E65E4A-9A0C-4341-A415-23EEBF199EE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {26E65E4A-9A0C-4341-A415-23EEBF199EE5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {26E65E4A-9A0C-4341-A415-23EEBF199EE5}.Debug|x64.ActiveCfg = Debug|Any CPU + {26E65E4A-9A0C-4341-A415-23EEBF199EE5}.Debug|x64.Build.0 = Debug|Any CPU + {26E65E4A-9A0C-4341-A415-23EEBF199EE5}.Debug|x86.ActiveCfg = Debug|Any CPU + {26E65E4A-9A0C-4341-A415-23EEBF199EE5}.Debug|x86.Build.0 = Debug|Any CPU + {26E65E4A-9A0C-4341-A415-23EEBF199EE5}.Editor Debug|Any CPU.ActiveCfg = Debug|Any CPU + {26E65E4A-9A0C-4341-A415-23EEBF199EE5}.Editor Debug|Any CPU.Build.0 = Debug|Any CPU + {26E65E4A-9A0C-4341-A415-23EEBF199EE5}.Editor Debug|x64.ActiveCfg = Debug|Any CPU + {26E65E4A-9A0C-4341-A415-23EEBF199EE5}.Editor Debug|x64.Build.0 = Debug|Any CPU + {26E65E4A-9A0C-4341-A415-23EEBF199EE5}.Editor Debug|x86.ActiveCfg = Debug|Any CPU + {26E65E4A-9A0C-4341-A415-23EEBF199EE5}.Editor Debug|x86.Build.0 = Debug|Any CPU + {26E65E4A-9A0C-4341-A415-23EEBF199EE5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {26E65E4A-9A0C-4341-A415-23EEBF199EE5}.Release|Any CPU.Build.0 = Release|Any CPU + {26E65E4A-9A0C-4341-A415-23EEBF199EE5}.Release|x64.ActiveCfg = Release|Any CPU + {26E65E4A-9A0C-4341-A415-23EEBF199EE5}.Release|x64.Build.0 = Release|Any CPU + {26E65E4A-9A0C-4341-A415-23EEBF199EE5}.Release|x86.ActiveCfg = Release|Any CPU + {26E65E4A-9A0C-4341-A415-23EEBF199EE5}.Release|x86.Build.0 = Release|Any CPU + {679E88EC-573E-4392-8BFD-6BD91FB81D2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {679E88EC-573E-4392-8BFD-6BD91FB81D2A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {679E88EC-573E-4392-8BFD-6BD91FB81D2A}.Debug|x64.ActiveCfg = Debug|Any CPU + {679E88EC-573E-4392-8BFD-6BD91FB81D2A}.Debug|x64.Build.0 = Debug|Any CPU + {679E88EC-573E-4392-8BFD-6BD91FB81D2A}.Debug|x86.ActiveCfg = Debug|Any CPU + {679E88EC-573E-4392-8BFD-6BD91FB81D2A}.Debug|x86.Build.0 = Debug|Any CPU + {679E88EC-573E-4392-8BFD-6BD91FB81D2A}.Editor Debug|Any CPU.ActiveCfg = Debug|Any CPU + {679E88EC-573E-4392-8BFD-6BD91FB81D2A}.Editor Debug|Any CPU.Build.0 = Debug|Any CPU + {679E88EC-573E-4392-8BFD-6BD91FB81D2A}.Editor Debug|x64.ActiveCfg = Debug|Any CPU + {679E88EC-573E-4392-8BFD-6BD91FB81D2A}.Editor Debug|x64.Build.0 = Debug|Any CPU + {679E88EC-573E-4392-8BFD-6BD91FB81D2A}.Editor Debug|x86.ActiveCfg = Debug|Any CPU + {679E88EC-573E-4392-8BFD-6BD91FB81D2A}.Editor Debug|x86.Build.0 = Debug|Any CPU + {679E88EC-573E-4392-8BFD-6BD91FB81D2A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {679E88EC-573E-4392-8BFD-6BD91FB81D2A}.Release|Any CPU.Build.0 = Release|Any CPU + {679E88EC-573E-4392-8BFD-6BD91FB81D2A}.Release|x64.ActiveCfg = Release|Any CPU + {679E88EC-573E-4392-8BFD-6BD91FB81D2A}.Release|x64.Build.0 = Release|Any CPU + {679E88EC-573E-4392-8BFD-6BD91FB81D2A}.Release|x86.ActiveCfg = Release|Any CPU + {679E88EC-573E-4392-8BFD-6BD91FB81D2A}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Editor/Capture/CaptureEntry.cs b/Editor/Capture/CaptureEntry.cs index 0a46e13..d97aa3d 100644 --- a/Editor/Capture/CaptureEntry.cs +++ b/Editor/Capture/CaptureEntry.cs @@ -1,5 +1,5 @@ -using EVESharp.PythonTypes.Types.Network; -using EVESharp.PythonTypes.Types.Primitives; +using EVESharp.EVE.Types.Network; +using EVESharp.Types; using System; using System.Collections.Generic; using System.Linq; diff --git a/Editor/Capture/CaptureMessage.cs b/Editor/Capture/CaptureMessage.cs index 6b97bb9..0140efb 100644 --- a/Editor/Capture/CaptureMessage.cs +++ b/Editor/Capture/CaptureMessage.cs @@ -1,5 +1,5 @@ -using EVESharp.Common.Network; -using EVESharp.Common.Network.Messages; +using EVESharp.EVE.Messages; +using EVESharp.EVE.Network.Sockets; using System; using System.Collections.Generic; using System.Linq; diff --git a/Editor/Capture/CaptureProcessor.cs b/Editor/Capture/CaptureProcessor.cs index fb6f6ec..03f6b64 100644 --- a/Editor/Capture/CaptureProcessor.cs +++ b/Editor/Capture/CaptureProcessor.cs @@ -1,9 +1,8 @@ using EVESharp.Common.Logging; -using EVESharp.Common.Network.Messages; -using EVESharp.PythonTypes.Marshal; -using EVESharp.PythonTypes.Types.Collections; -using EVESharp.PythonTypes.Types.Network; -using EVESharp.PythonTypes.Types.Primitives; +using EVESharp.EVE.Types.Network; +using EVESharp.Types; +using EVESharp.Types.Collections; +using EVESharp.Types.Serialization; using Serilog; using System; using System.Collections.Generic; diff --git a/Editor/Capture/CaptureServer.cs b/Editor/Capture/CaptureServer.cs index db4fac7..f44a025 100644 --- a/Editor/Capture/CaptureServer.cs +++ b/Editor/Capture/CaptureServer.cs @@ -1,7 +1,5 @@ using EVEmuTool.Configuration; using EVEmuTool.Extensions; -using EVESharp.Common.Network; -using EVESharp.Common.Network.Messages; using Serilog; using System; using System.Collections.Generic; diff --git a/Editor/Capture/CaptureSocket.cs b/Editor/Capture/CaptureSocket.cs index 1fdf248..d009e71 100644 --- a/Editor/Capture/CaptureSocket.cs +++ b/Editor/Capture/CaptureSocket.cs @@ -1,4 +1,4 @@ -using EVESharp.Common.Network; +using EVESharp.EVE.Network.Sockets; using System; using System.Collections.Concurrent; using System.Collections.Generic; diff --git a/Editor/CustomMarshal/CustomTypes/Complex/CustomCacheObject.cs b/Editor/CustomMarshal/CustomTypes/Complex/CustomCacheObject.cs index 6984e5b..8091815 100644 --- a/Editor/CustomMarshal/CustomTypes/Complex/CustomCacheObject.cs +++ b/Editor/CustomMarshal/CustomTypes/Complex/CustomCacheObject.cs @@ -1,6 +1,6 @@ using EVESharp.EVE.Packets.Complex; -using EVESharp.PythonTypes.Types.Collections; -using EVESharp.PythonTypes.Types.Primitives; +using EVESharp.Types; +using EVESharp.Types.Collections; using System; using System.Collections.Generic; using System.Linq; diff --git a/Editor/CustomMarshal/CustomTypes/PyByteString.cs b/Editor/CustomMarshal/CustomTypes/PyByteString.cs index 52e798e..adae2b4 100644 --- a/Editor/CustomMarshal/CustomTypes/PyByteString.cs +++ b/Editor/CustomMarshal/CustomTypes/PyByteString.cs @@ -1,5 +1,5 @@ -using EVESharp.PythonTypes.Marshal; -using EVESharp.PythonTypes.Types.Primitives; +using EVESharp.Types; +using EVESharp.Types.Serialization; using System; using System.Collections.Generic; using System.Linq; diff --git a/Editor/CustomMarshal/CustomTypes/PyInsightSubStream.cs b/Editor/CustomMarshal/CustomTypes/PyInsightSubStream.cs index 02d6f23..db0a55c 100644 --- a/Editor/CustomMarshal/CustomTypes/PyInsightSubStream.cs +++ b/Editor/CustomMarshal/CustomTypes/PyInsightSubStream.cs @@ -1,6 +1,6 @@ -using EVESharp.PythonTypes; -using EVESharp.PythonTypes.Marshal; -using EVESharp.PythonTypes.Types.Primitives; +using EVESharp.Common.Checksum; +using EVESharp.Types; +using EVESharp.Types.Serialization; using System; using System.Collections.Generic; using System.Linq; diff --git a/Editor/CustomMarshal/CustomUnmarshal.cs b/Editor/CustomMarshal/CustomUnmarshal.cs index 538953b..0d79f0a 100644 --- a/Editor/CustomMarshal/CustomUnmarshal.cs +++ b/Editor/CustomMarshal/CustomUnmarshal.cs @@ -1,9 +1,6 @@ -using EVESharp.PythonTypes; -using EVESharp.PythonTypes.Compression; -using EVESharp.PythonTypes.Marshal; -using EVESharp.PythonTypes.Types.Collections; -using EVESharp.PythonTypes.Types.Database; -using EVESharp.PythonTypes.Types.Primitives; +using EVESharp.Common; +using EVESharp.Types; +using EVESharp.Types.Serialization; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/Editor/CustomMarshal/InsightEntry.cs b/Editor/CustomMarshal/InsightEntry.cs index df37bd1..76d2d38 100644 --- a/Editor/CustomMarshal/InsightEntry.cs +++ b/Editor/CustomMarshal/InsightEntry.cs @@ -1,5 +1,5 @@ -using EVESharp.PythonTypes.Marshal; -using EVESharp.PythonTypes.Types.Primitives; +using EVESharp.Types; +using EVESharp.Types.Serialization; using System.Windows.Forms; namespace EVEmuTool.CustomMarshal; diff --git a/Editor/CustomMarshal/InsightUnmarshal.cs b/Editor/CustomMarshal/InsightUnmarshal.cs index 58e33b6..dbb8a60 100644 --- a/Editor/CustomMarshal/InsightUnmarshal.cs +++ b/Editor/CustomMarshal/InsightUnmarshal.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.IO; using EVEmuTool.CustomMarshal.CustomTypes; -using EVESharp.PythonTypes; -using EVESharp.PythonTypes.Marshal; -using EVESharp.PythonTypes.Types.Primitives; +using EVESharp.Common; +using EVESharp.Types; +using EVESharp.Types.Serialization; namespace EVEmuTool.CustomMarshal; diff --git a/Editor/CustomMarshal/LogViewerUnmarshaler.cs b/Editor/CustomMarshal/LogViewerUnmarshaler.cs index 4d68875..bca5ad5 100644 --- a/Editor/CustomMarshal/LogViewerUnmarshaler.cs +++ b/Editor/CustomMarshal/LogViewerUnmarshaler.cs @@ -1,4 +1,4 @@ -using EVESharp.PythonTypes.Marshal; +using EVESharp.Types.Serialization; using System; using System.Collections.Generic; using System.Linq; diff --git a/Editor/CustomMarshal/PartialUnmarshal.cs b/Editor/CustomMarshal/PartialUnmarshal.cs index 52fe248..60ea3b6 100644 --- a/Editor/CustomMarshal/PartialUnmarshal.cs +++ b/Editor/CustomMarshal/PartialUnmarshal.cs @@ -1,10 +1,9 @@ using EVEmuTool.CustomMarshal.CustomTypes; -using EVESharp.PythonTypes; -using EVESharp.PythonTypes.Compression; -using EVESharp.PythonTypes.Marshal; -using EVESharp.PythonTypes.Types.Collections; -using EVESharp.PythonTypes.Types.Database; -using EVESharp.PythonTypes.Types.Primitives; +using EVESharp.Common; +using EVESharp.Common.Compression; +using EVESharp.Types; +using EVESharp.Types.Collections; +using EVESharp.Types.Serialization; using System; using System.Collections.Generic; using System.IO; @@ -296,7 +295,7 @@ protected override PyDataType ProcessPackedRow() foreach (DBRowDescriptor.Column column in descriptor.Columns) { - int bitLength = Utils.GetTypeBits(column.Type); + int bitLength = column.Type.GetBits(); if (column.Type == FieldType.Bool) { @@ -311,7 +310,7 @@ protected override PyDataType ProcessPackedRow() } // sort columns by the bit size and calculate other statistics for the PackedRow - IOrderedEnumerable enumerator = descriptor.Columns.OrderByDescending(c => Utils.GetTypeBits(c.Type)); + IOrderedEnumerable enumerator = descriptor.Columns.OrderByDescending(c => c.Type.GetBits()); MemoryStream decompressedStream = ZeroCompressionUtils.LoadZeroCompressed(this.mReader, wholeBytes + ((nullBits + boolBits) >> 3) + 1); BinaryReader decompressedReader = new BinaryReader(decompressedStream); @@ -428,13 +427,13 @@ protected override PyDataType ProcessObject(Opcode opcode) PyList list = new PyList(); PyDictionary dict = new PyDictionary(); - while (this.mReader.PeekChar() != Marshal.PACKED_TERMINATOR) + while (this.mReader.PeekChar() != Specification.PACKED_TERMINATOR) list.Add(this.ProcessGuard(new PyObject(isType2, null, list, null), false)); // ignore packed terminator this.mReader.ReadByte(); - while (this.mReader.PeekChar() != Marshal.PACKED_TERMINATOR) + while (this.mReader.PeekChar() != Specification.PACKED_TERMINATOR) { PyString key = this.ProcessGuard(new PyObject(isType2, null, list, dict), false) as PyString; PyDataType value = this.ProcessGuard(new PyObject(isType2, null, list, dict), false); diff --git a/Editor/CustomMarshal/UnmarshallException.cs b/Editor/CustomMarshal/UnmarshallException.cs index 0f152fa..52f9cd1 100644 --- a/Editor/CustomMarshal/UnmarshallException.cs +++ b/Editor/CustomMarshal/UnmarshallException.cs @@ -1,4 +1,4 @@ -using EVESharp.PythonTypes.Types.Primitives; +using EVESharp.Types; using System; using System.Collections.Generic; using System.Linq; diff --git a/Editor/EVEmuTool.csproj b/Editor/EVEmuTool.csproj index bb6b126..4ac3372 100644 --- a/Editor/EVEmuTool.csproj +++ b/Editor/EVEmuTool.csproj @@ -27,11 +27,11 @@ + - @@ -40,7 +40,6 @@ - diff --git a/Editor/Forms/CacheViewerForm.cs b/Editor/Forms/CacheViewerForm.cs index 72fb575..8a88935 100644 --- a/Editor/Forms/CacheViewerForm.cs +++ b/Editor/Forms/CacheViewerForm.cs @@ -1,8 +1,8 @@ using EVEmuTool.CustomMarshal.CustomTypes; using EVEmuTool.CustomMarshal.CustomTypes.Complex; using EVESharp.EVE.Packets.Complex; -using EVESharp.PythonTypes.Types.Collections; -using EVESharp.PythonTypes.Types.Primitives; +using EVESharp.Types; +using EVESharp.Types.Collections; using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/Editor/Forms/Components/GR2RenderComponent.cs b/Editor/Forms/Components/GR2RenderComponent.cs index 777f11b..7ae31d6 100644 --- a/Editor/Forms/Components/GR2RenderComponent.cs +++ b/Editor/Forms/Components/GR2RenderComponent.cs @@ -36,7 +36,7 @@ public GR2RenderComponent(Root model) InitializeComponent(); this.mModel = model; - this.mRefreshTimer = new Timer () + this.mRefreshTimer = new Timer (this.components) { Interval = 16, Enabled = true diff --git a/Editor/Forms/Components/MarshalDataViewerComponent.cs b/Editor/Forms/Components/MarshalDataViewerComponent.cs index 6c54648..fd27552 100644 --- a/Editor/Forms/Components/MarshalDataViewerComponent.cs +++ b/Editor/Forms/Components/MarshalDataViewerComponent.cs @@ -1,8 +1,7 @@ using EVEmuTool.CustomMarshal; using EVEmuTool.UI; -using EVESharp.PythonTypes; -using EVESharp.PythonTypes.Compression; -using EVESharp.PythonTypes.Marshal; +using EVESharp.Common.Compression; +using EVESharp.Types.Serialization; using Org.BouncyCastle.Utilities.Zlib; using System; using System.Collections.Generic; diff --git a/Editor/Forms/LogViewerForm.cs b/Editor/Forms/LogViewerForm.cs index a22a66a..0c1e28e 100644 --- a/Editor/Forms/LogViewerForm.cs +++ b/Editor/Forms/LogViewerForm.cs @@ -1,5 +1,5 @@ using EVEmuTool.LogServer; -using EVESharp.PythonTypes.Marshal; +using EVESharp.Types.Serialization; using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/Editor/Forms/PacketCaptureForm.cs b/Editor/Forms/PacketCaptureForm.cs index e127624..2dae8b3 100644 --- a/Editor/Forms/PacketCaptureForm.cs +++ b/Editor/Forms/PacketCaptureForm.cs @@ -1,6 +1,6 @@ using EVEmuTool.Capture; using EVEmuTool.CustomMarshal; -using EVESharp.PythonTypes.Types.Network; +using EVESharp.EVE.Types.Network; using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/Editor/Forms/StuffExplorer.cs b/Editor/Forms/StuffExplorer.cs index 3c4678d..5a37520 100644 --- a/Editor/Forms/StuffExplorer.cs +++ b/Editor/Forms/StuffExplorer.cs @@ -11,7 +11,6 @@ using EVEmuTool.EmbedFS; using EVEmuTool.Trinity; using EVEmuTool.Forms.Components; -using EVESharp.PythonTypes.Compression; using Org.BouncyCastle.Utilities.Zlib; using LSLib.Granny; using LSLib.Granny.Model; diff --git a/Editor/RAD/GR2/Format.cs b/Editor/RAD/GR2/Format.cs index 3dfb1c0..7159870 100644 --- a/Editor/RAD/GR2/Format.cs +++ b/Editor/RAD/GR2/Format.cs @@ -6,7 +6,7 @@ using OpenTK.Mathematics; using System.IO; using System.Reflection; -using EVESharp.PythonTypes; +using EVESharp.Common.Checksum; namespace LSLib.Granny.GR2 { diff --git a/Editor/UI/CustomPrettyPrinter.cs b/Editor/UI/CustomPrettyPrinter.cs index f5fdeb8..22494cc 100644 --- a/Editor/UI/CustomPrettyPrinter.cs +++ b/Editor/UI/CustomPrettyPrinter.cs @@ -1,6 +1,5 @@ using EVEmuTool.CustomMarshal.CustomTypes; -using EVESharp.PythonTypes; -using EVESharp.PythonTypes.Types.Primitives; +using EVESharp.Types; using System; using System.Collections.Generic; using System.Linq; diff --git a/Editor/UI/InsightPrettyPrinter.cs b/Editor/UI/InsightPrettyPrinter.cs index 3738b76..8687894 100644 --- a/Editor/UI/InsightPrettyPrinter.cs +++ b/Editor/UI/InsightPrettyPrinter.cs @@ -1,6 +1,5 @@ using EVEmuTool.CustomMarshal; -using EVESharp.PythonTypes.Marshal; -using EVESharp.PythonTypes.Types.Primitives; +using EVESharp.Types; using System; using System.Collections.Generic; using System.Linq; diff --git a/Editor/UI/NativeToPython.cs b/Editor/UI/NativeToPython.cs index 5da2416..8bf7f0f 100644 --- a/Editor/UI/NativeToPython.cs +++ b/Editor/UI/NativeToPython.cs @@ -1,5 +1,5 @@ -using EVESharp.PythonTypes.Types.Collections; -using EVESharp.PythonTypes.Types.Primitives; +using EVESharp.Types; +using EVESharp.Types.Collections; using System; using System.Collections; using System.Collections.Generic; diff --git a/Editor/UI/TreeViewPrettyPrinter.cs b/Editor/UI/TreeViewPrettyPrinter.cs index db53198..6eaff9e 100644 --- a/Editor/UI/TreeViewPrettyPrinter.cs +++ b/Editor/UI/TreeViewPrettyPrinter.cs @@ -1,8 +1,7 @@ using EVEmuTool.CustomMarshal.CustomTypes; -using EVESharp.PythonTypes; -using EVESharp.PythonTypes.Types.Collections; -using EVESharp.PythonTypes.Types.Database; -using EVESharp.PythonTypes.Types.Primitives; +using EVESharp.Common; +using EVESharp.Types; +using EVESharp.Types.Collections; using System; using System.Collections.Generic; using System.Runtime.CompilerServices; diff --git a/External/EVESharp b/External/EVESharp index b6867b4..3465a60 160000 --- a/External/EVESharp +++ b/External/EVESharp @@ -1 +1 @@ -Subproject commit b6867b48868d3a45c6e59af8898b0733b1972f9b +Subproject commit 3465a60fbbf7649fe48f93e28f485bed3a26c5f7