From 4a80cff42a054bf55d246a9066fe8bc4a72ad362 Mon Sep 17 00:00:00 2001 From: lahm86 <33758420+lahm86@users.noreply.github.com> Date: Mon, 6 May 2024 18:27:54 +0100 Subject: [PATCH 1/3] Reorganise folders/namespaces --- ModelExport/Program.cs | 2 +- TRDataControl/Events/SegmentEventArgs.cs | 9 --------- TRDataControl/Helpers/TRModelExtensions.cs | 2 +- TRDataControl/Transport/TR1/TR1DataExporter.cs | 3 +-- TRDataControl/Transport/TR1/TR1DataImporter.cs | 3 +-- .../{Mass/Types => Transport/TR1}/TR1MassExporter.cs | 2 +- .../Types => Transport/TR1}/TR1TextureRemapper.cs | 2 +- TRDataControl/Transport/TR2/TR2DataExporter.cs | 1 - TRDataControl/Transport/TR2/TR2DataImporter.cs | 3 +-- .../{Mass/Types => Transport/TR2}/TR2MassExporter.cs | 2 +- .../Types => Transport/TR2}/TR2TextureRemapper.cs | 2 +- TRDataControl/Transport/TR3/TR3DataExporter.cs | 3 +-- TRDataControl/Transport/TR3/TR3DataImporter.cs | 3 +-- .../{Mass/Types => Transport/TR3}/TR3MassExporter.cs | 2 +- .../Types => Transport/TR3}/TR3TextureRemapper.cs | 2 +- TRDataControl/Transport/TR4/TR4DataExporter.cs | 3 +-- TRDataControl/Transport/TR4/TR4DataImporter.cs | 3 +-- .../{Mass/Types => Transport/TR4}/TR4MassExporter.cs | 2 +- .../Types => Transport/TR4}/TR4TextureRemapper.cs | 2 +- TRDataControl/Transport/TR5/TR5DataExporter.cs | 3 +-- TRDataControl/Transport/TR5/TR5DataImporter.cs | 3 +-- .../{Mass/Types => Transport/TR5}/TR5MassExporter.cs | 2 +- .../Types => Transport/TR5}/TR5TextureRemapper.cs | 2 +- TRDataControl/Transport/TRDataImporter.cs | 1 - TRDataControl/Transport/TRDataTransport.cs | 3 +-- TRDataControl/{Mass => Transport}/TRMassExporter.cs | 2 +- .../{Remapping => Transport}/TRTextureRemapper.cs | 2 +- TRDataControl/Transport/TransportException.cs | 2 +- .../Deduplication/TR2LevelTextureDeduplicator.cs | 2 +- TRRandomizerCore/Randomizers/TR1/TR1OutfitRandomizer.cs | 1 - TRRandomizerCore/Textures/DynamicTextureBuilder.cs | 1 - .../Textures/Wireframing/AbstractTRWireframer.cs | 2 +- TRRandomizerCore/Textures/Wireframing/TR1Wireframer.cs | 2 +- TRRandomizerCore/Textures/Wireframing/TR2Wireframer.cs | 2 +- TRRandomizerCore/Textures/Wireframing/TR3Wireframer.cs | 2 +- 35 files changed, 30 insertions(+), 53 deletions(-) delete mode 100644 TRDataControl/Events/SegmentEventArgs.cs rename TRDataControl/{Mass/Types => Transport/TR1}/TR1MassExporter.cs (98%) rename TRDataControl/{Remapping/Types => Transport/TR1}/TR1TextureRemapper.cs (94%) rename TRDataControl/{Mass/Types => Transport/TR2}/TR2MassExporter.cs (99%) rename TRDataControl/{Remapping/Types => Transport/TR2}/TR2TextureRemapper.cs (94%) rename TRDataControl/{Mass/Types => Transport/TR3}/TR3MassExporter.cs (99%) rename TRDataControl/{Remapping/Types => Transport/TR3}/TR3TextureRemapper.cs (94%) rename TRDataControl/{Mass/Types => Transport/TR4}/TR4MassExporter.cs (94%) rename TRDataControl/{Remapping/Types => Transport/TR4}/TR4TextureRemapper.cs (94%) rename TRDataControl/{Mass/Types => Transport/TR5}/TR5MassExporter.cs (94%) rename TRDataControl/{Remapping/Types => Transport/TR5}/TR5TextureRemapper.cs (94%) rename TRDataControl/{Mass => Transport}/TRMassExporter.cs (97%) rename TRDataControl/{Remapping => Transport}/TRTextureRemapper.cs (99%) diff --git a/ModelExport/Program.cs b/ModelExport/Program.cs index ea1f5203e..a950f6561 100644 --- a/ModelExport/Program.cs +++ b/ModelExport/Program.cs @@ -1,4 +1,4 @@ -using TRDataControl.Utils; +using TRDataControl; namespace ModelExport; diff --git a/TRDataControl/Events/SegmentEventArgs.cs b/TRDataControl/Events/SegmentEventArgs.cs deleted file mode 100644 index afd6b55ef..000000000 --- a/TRDataControl/Events/SegmentEventArgs.cs +++ /dev/null @@ -1,9 +0,0 @@ -using TRImageControl; - -namespace TRModelTransporter.Events; - -public class SegmentEventArgs : EventArgs -{ - public int SegmentIndex { get; set; } - public TRImage Image { get; set; } -} diff --git a/TRDataControl/Helpers/TRModelExtensions.cs b/TRDataControl/Helpers/TRModelExtensions.cs index 2f6797d4a..01422f3a2 100644 --- a/TRDataControl/Helpers/TRModelExtensions.cs +++ b/TRDataControl/Helpers/TRModelExtensions.cs @@ -3,7 +3,7 @@ using TRLevelControl.Build; using TRLevelControl.Model; -namespace TRModelTransporter.Helpers; +namespace TRDataControl; public static class TRModelExtensions { diff --git a/TRDataControl/Transport/TR1/TR1DataExporter.cs b/TRDataControl/Transport/TR1/TR1DataExporter.cs index 1fadbfe65..cffe24542 100644 --- a/TRDataControl/Transport/TR1/TR1DataExporter.cs +++ b/TRDataControl/Transport/TR1/TR1DataExporter.cs @@ -1,5 +1,4 @@ -using TRDataControl.Remapping; -using TRImageControl.Packing; +using TRImageControl.Packing; using TRLevelControl; using TRLevelControl.Helpers; using TRLevelControl.Model; diff --git a/TRDataControl/Transport/TR1/TR1DataImporter.cs b/TRDataControl/Transport/TR1/TR1DataImporter.cs index 940a1ee29..e0554300e 100644 --- a/TRDataControl/Transport/TR1/TR1DataImporter.cs +++ b/TRDataControl/Transport/TR1/TR1DataImporter.cs @@ -1,5 +1,4 @@ -using TRDataControl.Remapping; -using TRImageControl; +using TRImageControl; using TRImageControl.Packing; using TRLevelControl.Model; diff --git a/TRDataControl/Mass/Types/TR1MassExporter.cs b/TRDataControl/Transport/TR1/TR1MassExporter.cs similarity index 98% rename from TRDataControl/Mass/Types/TR1MassExporter.cs rename to TRDataControl/Transport/TR1/TR1MassExporter.cs index 26df1dbd1..ce393ec1f 100644 --- a/TRDataControl/Mass/Types/TR1MassExporter.cs +++ b/TRDataControl/Transport/TR1/TR1MassExporter.cs @@ -2,7 +2,7 @@ using TRLevelControl.Helpers; using TRLevelControl.Model; -namespace TRDataControl.Utils; +namespace TRDataControl; public class TR1MassExporter : TRMassExporter { diff --git a/TRDataControl/Remapping/Types/TR1TextureRemapper.cs b/TRDataControl/Transport/TR1/TR1TextureRemapper.cs similarity index 94% rename from TRDataControl/Remapping/Types/TR1TextureRemapper.cs rename to TRDataControl/Transport/TR1/TR1TextureRemapper.cs index b9257978b..c8be64550 100644 --- a/TRDataControl/Remapping/Types/TR1TextureRemapper.cs +++ b/TRDataControl/Transport/TR1/TR1TextureRemapper.cs @@ -1,7 +1,7 @@ using TRImageControl.Packing; using TRLevelControl.Model; -namespace TRDataControl.Remapping; +namespace TRDataControl; public class TR1TextureRemapper : TRTextureRemapper { diff --git a/TRDataControl/Transport/TR2/TR2DataExporter.cs b/TRDataControl/Transport/TR2/TR2DataExporter.cs index 25278f371..027161ef7 100644 --- a/TRDataControl/Transport/TR2/TR2DataExporter.cs +++ b/TRDataControl/Transport/TR2/TR2DataExporter.cs @@ -1,6 +1,5 @@ using System.Diagnostics; using System.Drawing; -using TRDataControl.Remapping; using TRImageControl.Packing; using TRLevelControl.Model; diff --git a/TRDataControl/Transport/TR2/TR2DataImporter.cs b/TRDataControl/Transport/TR2/TR2DataImporter.cs index 4b7142bbf..56ab4b6c3 100644 --- a/TRDataControl/Transport/TR2/TR2DataImporter.cs +++ b/TRDataControl/Transport/TR2/TR2DataImporter.cs @@ -1,5 +1,4 @@ -using TRDataControl.Remapping; -using TRImageControl; +using TRImageControl; using TRImageControl.Packing; using TRLevelControl.Model; diff --git a/TRDataControl/Mass/Types/TR2MassExporter.cs b/TRDataControl/Transport/TR2/TR2MassExporter.cs similarity index 99% rename from TRDataControl/Mass/Types/TR2MassExporter.cs rename to TRDataControl/Transport/TR2/TR2MassExporter.cs index fefd81a9c..d52b02833 100644 --- a/TRDataControl/Mass/Types/TR2MassExporter.cs +++ b/TRDataControl/Transport/TR2/TR2MassExporter.cs @@ -2,7 +2,7 @@ using TRLevelControl.Helpers; using TRLevelControl.Model; -namespace TRDataControl.Utils; +namespace TRDataControl; public class TR2MassExporter : TRMassExporter { diff --git a/TRDataControl/Remapping/Types/TR2TextureRemapper.cs b/TRDataControl/Transport/TR2/TR2TextureRemapper.cs similarity index 94% rename from TRDataControl/Remapping/Types/TR2TextureRemapper.cs rename to TRDataControl/Transport/TR2/TR2TextureRemapper.cs index 92dda72c5..637ac0f70 100644 --- a/TRDataControl/Remapping/Types/TR2TextureRemapper.cs +++ b/TRDataControl/Transport/TR2/TR2TextureRemapper.cs @@ -1,7 +1,7 @@ using TRImageControl.Packing; using TRLevelControl.Model; -namespace TRDataControl.Remapping; +namespace TRDataControl; public class TR2TextureRemapper : TRTextureRemapper { diff --git a/TRDataControl/Transport/TR3/TR3DataExporter.cs b/TRDataControl/Transport/TR3/TR3DataExporter.cs index 00e1d992d..d00314670 100644 --- a/TRDataControl/Transport/TR3/TR3DataExporter.cs +++ b/TRDataControl/Transport/TR3/TR3DataExporter.cs @@ -1,5 +1,4 @@ -using TRDataControl.Remapping; -using TRImageControl.Packing; +using TRImageControl.Packing; using TRLevelControl.Model; namespace TRDataControl; diff --git a/TRDataControl/Transport/TR3/TR3DataImporter.cs b/TRDataControl/Transport/TR3/TR3DataImporter.cs index 31875739b..8c5167d4b 100644 --- a/TRDataControl/Transport/TR3/TR3DataImporter.cs +++ b/TRDataControl/Transport/TR3/TR3DataImporter.cs @@ -1,5 +1,4 @@ -using TRDataControl.Remapping; -using TRImageControl; +using TRImageControl; using TRImageControl.Packing; using TRLevelControl.Model; diff --git a/TRDataControl/Mass/Types/TR3MassExporter.cs b/TRDataControl/Transport/TR3/TR3MassExporter.cs similarity index 99% rename from TRDataControl/Mass/Types/TR3MassExporter.cs rename to TRDataControl/Transport/TR3/TR3MassExporter.cs index 16d47df8d..d4957e30f 100644 --- a/TRDataControl/Mass/Types/TR3MassExporter.cs +++ b/TRDataControl/Transport/TR3/TR3MassExporter.cs @@ -2,7 +2,7 @@ using TRLevelControl.Helpers; using TRLevelControl.Model; -namespace TRDataControl.Utils; +namespace TRDataControl; public class TR3MassExporter : TRMassExporter { diff --git a/TRDataControl/Remapping/Types/TR3TextureRemapper.cs b/TRDataControl/Transport/TR3/TR3TextureRemapper.cs similarity index 94% rename from TRDataControl/Remapping/Types/TR3TextureRemapper.cs rename to TRDataControl/Transport/TR3/TR3TextureRemapper.cs index 28d2c51be..37a9cf13a 100644 --- a/TRDataControl/Remapping/Types/TR3TextureRemapper.cs +++ b/TRDataControl/Transport/TR3/TR3TextureRemapper.cs @@ -1,7 +1,7 @@ using TRImageControl.Packing; using TRLevelControl.Model; -namespace TRDataControl.Remapping; +namespace TRDataControl; public class TR3TextureRemapper : TRTextureRemapper { diff --git a/TRDataControl/Transport/TR4/TR4DataExporter.cs b/TRDataControl/Transport/TR4/TR4DataExporter.cs index a0f6b5d1d..37e569580 100644 --- a/TRDataControl/Transport/TR4/TR4DataExporter.cs +++ b/TRDataControl/Transport/TR4/TR4DataExporter.cs @@ -1,5 +1,4 @@ -using TRDataControl.Remapping; -using TRImageControl.Packing; +using TRImageControl.Packing; using TRLevelControl.Model; namespace TRDataControl; diff --git a/TRDataControl/Transport/TR4/TR4DataImporter.cs b/TRDataControl/Transport/TR4/TR4DataImporter.cs index d21503ec6..f5d1ac2e1 100644 --- a/TRDataControl/Transport/TR4/TR4DataImporter.cs +++ b/TRDataControl/Transport/TR4/TR4DataImporter.cs @@ -1,5 +1,4 @@ -using TRDataControl.Remapping; -using TRImageControl.Packing; +using TRImageControl.Packing; using TRLevelControl.Model; namespace TRDataControl; diff --git a/TRDataControl/Mass/Types/TR4MassExporter.cs b/TRDataControl/Transport/TR4/TR4MassExporter.cs similarity index 94% rename from TRDataControl/Mass/Types/TR4MassExporter.cs rename to TRDataControl/Transport/TR4/TR4MassExporter.cs index 02bbe7c4b..cb3d7d720 100644 --- a/TRDataControl/Mass/Types/TR4MassExporter.cs +++ b/TRDataControl/Transport/TR4/TR4MassExporter.cs @@ -1,7 +1,7 @@ using TRLevelControl; using TRLevelControl.Model; -namespace TRDataControl.Utils; +namespace TRDataControl; public class TR4MassExporter : TRMassExporter { diff --git a/TRDataControl/Remapping/Types/TR4TextureRemapper.cs b/TRDataControl/Transport/TR4/TR4TextureRemapper.cs similarity index 94% rename from TRDataControl/Remapping/Types/TR4TextureRemapper.cs rename to TRDataControl/Transport/TR4/TR4TextureRemapper.cs index 5aa78b38a..213939052 100644 --- a/TRDataControl/Remapping/Types/TR4TextureRemapper.cs +++ b/TRDataControl/Transport/TR4/TR4TextureRemapper.cs @@ -1,7 +1,7 @@ using TRImageControl.Packing; using TRLevelControl.Model; -namespace TRDataControl.Remapping; +namespace TRDataControl; public class TR4TextureRemapper : TRTextureRemapper { diff --git a/TRDataControl/Transport/TR5/TR5DataExporter.cs b/TRDataControl/Transport/TR5/TR5DataExporter.cs index 75403f90b..ca3329530 100644 --- a/TRDataControl/Transport/TR5/TR5DataExporter.cs +++ b/TRDataControl/Transport/TR5/TR5DataExporter.cs @@ -1,5 +1,4 @@ -using TRDataControl.Remapping; -using TRImageControl.Packing; +using TRImageControl.Packing; using TRLevelControl.Model; namespace TRDataControl; diff --git a/TRDataControl/Transport/TR5/TR5DataImporter.cs b/TRDataControl/Transport/TR5/TR5DataImporter.cs index 91364b49f..f4077dbb6 100644 --- a/TRDataControl/Transport/TR5/TR5DataImporter.cs +++ b/TRDataControl/Transport/TR5/TR5DataImporter.cs @@ -1,5 +1,4 @@ -using TRDataControl.Remapping; -using TRImageControl.Packing; +using TRImageControl.Packing; using TRLevelControl.Model; namespace TRDataControl; diff --git a/TRDataControl/Mass/Types/TR5MassExporter.cs b/TRDataControl/Transport/TR5/TR5MassExporter.cs similarity index 94% rename from TRDataControl/Mass/Types/TR5MassExporter.cs rename to TRDataControl/Transport/TR5/TR5MassExporter.cs index abb5a1bf7..8f0ddbff6 100644 --- a/TRDataControl/Mass/Types/TR5MassExporter.cs +++ b/TRDataControl/Transport/TR5/TR5MassExporter.cs @@ -1,7 +1,7 @@ using TRLevelControl; using TRLevelControl.Model; -namespace TRDataControl.Utils; +namespace TRDataControl; public class TR5MassExporter : TRMassExporter { diff --git a/TRDataControl/Remapping/Types/TR5TextureRemapper.cs b/TRDataControl/Transport/TR5/TR5TextureRemapper.cs similarity index 94% rename from TRDataControl/Remapping/Types/TR5TextureRemapper.cs rename to TRDataControl/Transport/TR5/TR5TextureRemapper.cs index 8fd2c7b5a..14b4aebc3 100644 --- a/TRDataControl/Remapping/Types/TR5TextureRemapper.cs +++ b/TRDataControl/Transport/TR5/TR5TextureRemapper.cs @@ -1,7 +1,7 @@ using TRImageControl.Packing; using TRLevelControl.Model; -namespace TRDataControl.Remapping; +namespace TRDataControl; public class TR5TextureRemapper : TRTextureRemapper { diff --git a/TRDataControl/Transport/TRDataImporter.cs b/TRDataControl/Transport/TRDataImporter.cs index 6da1ddc85..dee84435c 100644 --- a/TRDataControl/Transport/TRDataImporter.cs +++ b/TRDataControl/Transport/TRDataImporter.cs @@ -1,7 +1,6 @@ using RectanglePacker.Events; using TRImageControl.Packing; using TRLevelControl.Model; -using TRModelTransporter.Transport; namespace TRDataControl; diff --git a/TRDataControl/Transport/TRDataTransport.cs b/TRDataControl/Transport/TRDataTransport.cs index 9365d3348..4b27b3529 100644 --- a/TRDataControl/Transport/TRDataTransport.cs +++ b/TRDataControl/Transport/TRDataTransport.cs @@ -1,5 +1,4 @@ -using TRDataControl.Remapping; -using TRImageControl.Packing; +using TRImageControl.Packing; using TRLevelControl.Model; namespace TRDataControl; diff --git a/TRDataControl/Mass/TRMassExporter.cs b/TRDataControl/Transport/TRMassExporter.cs similarity index 97% rename from TRDataControl/Mass/TRMassExporter.cs rename to TRDataControl/Transport/TRMassExporter.cs index c8ea85ab5..44d4bd062 100644 --- a/TRDataControl/Mass/TRMassExporter.cs +++ b/TRDataControl/Transport/TRMassExporter.cs @@ -1,6 +1,6 @@ using TRLevelControl.Model; -namespace TRDataControl.Utils; +namespace TRDataControl; public abstract class TRMassExporter where L : TRLevelBase diff --git a/TRDataControl/Remapping/TRTextureRemapper.cs b/TRDataControl/Transport/TRTextureRemapper.cs similarity index 99% rename from TRDataControl/Remapping/TRTextureRemapper.cs rename to TRDataControl/Transport/TRTextureRemapper.cs index 8a08883f6..5d9f0a580 100644 --- a/TRDataControl/Remapping/TRTextureRemapper.cs +++ b/TRDataControl/Transport/TRTextureRemapper.cs @@ -1,7 +1,7 @@ using TRImageControl.Packing; using TRLevelControl.Model; -namespace TRDataControl.Remapping; +namespace TRDataControl; public abstract class TRTextureRemapper where L : TRLevelBase diff --git a/TRDataControl/Transport/TransportException.cs b/TRDataControl/Transport/TransportException.cs index 925ee0160..d9b5e932e 100644 --- a/TRDataControl/Transport/TransportException.cs +++ b/TRDataControl/Transport/TransportException.cs @@ -1,4 +1,4 @@ -namespace TRModelTransporter.Transport; +namespace TRDataControl; public class TransportException : Exception { diff --git a/TRDataControl/Utilities/Deduplication/TR2LevelTextureDeduplicator.cs b/TRDataControl/Utilities/Deduplication/TR2LevelTextureDeduplicator.cs index acf03e953..855a49d29 100644 --- a/TRDataControl/Utilities/Deduplication/TR2LevelTextureDeduplicator.cs +++ b/TRDataControl/Utilities/Deduplication/TR2LevelTextureDeduplicator.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; +using TRDataControl; using TRImageControl.Packing; using TRLevelControl.Model; -using TRModelTransporter.Helpers; namespace TRModelTransporter.Utilities; diff --git a/TRRandomizerCore/Randomizers/TR1/TR1OutfitRandomizer.cs b/TRRandomizerCore/Randomizers/TR1/TR1OutfitRandomizer.cs index 55084807d..ca0d65f40 100644 --- a/TRRandomizerCore/Randomizers/TR1/TR1OutfitRandomizer.cs +++ b/TRRandomizerCore/Randomizers/TR1/TR1OutfitRandomizer.cs @@ -8,7 +8,6 @@ using TRLevelControl; using TRLevelControl.Helpers; using TRLevelControl.Model; -using TRModelTransporter.Helpers; using TRRandomizerCore.Helpers; using TRRandomizerCore.Levels; using TRRandomizerCore.Meshes; diff --git a/TRRandomizerCore/Textures/DynamicTextureBuilder.cs b/TRRandomizerCore/Textures/DynamicTextureBuilder.cs index fd6ac7652..25ce4f318 100644 --- a/TRRandomizerCore/Textures/DynamicTextureBuilder.cs +++ b/TRRandomizerCore/Textures/DynamicTextureBuilder.cs @@ -4,7 +4,6 @@ using TRImageControl.Textures; using TRLevelControl.Helpers; using TRLevelControl.Model; -using TRModelTransporter.Helpers; using TRRandomizerCore.Levels; using TRRandomizerCore.Utilities; diff --git a/TRRandomizerCore/Textures/Wireframing/AbstractTRWireframer.cs b/TRRandomizerCore/Textures/Wireframing/AbstractTRWireframer.cs index 28164b594..195de6c27 100644 --- a/TRRandomizerCore/Textures/Wireframing/AbstractTRWireframer.cs +++ b/TRRandomizerCore/Textures/Wireframing/AbstractTRWireframer.cs @@ -1,10 +1,10 @@ using RectanglePacker.Organisation; using System.Drawing; using System.Drawing.Drawing2D; +using TRDataControl; using TRImageControl; using TRImageControl.Packing; using TRLevelControl.Model; -using TRModelTransporter.Helpers; namespace TRRandomizerCore.Textures; diff --git a/TRRandomizerCore/Textures/Wireframing/TR1Wireframer.cs b/TRRandomizerCore/Textures/Wireframing/TR1Wireframer.cs index d1329d4e7..33f370739 100644 --- a/TRRandomizerCore/Textures/Wireframing/TR1Wireframer.cs +++ b/TRRandomizerCore/Textures/Wireframing/TR1Wireframer.cs @@ -1,10 +1,10 @@ using System.Drawing; using System.Drawing.Drawing2D; +using TRDataControl; using TRImageControl; using TRImageControl.Packing; using TRLevelControl.Helpers; using TRLevelControl.Model; -using TRModelTransporter.Helpers; using TRRandomizerCore.Utilities; namespace TRRandomizerCore.Textures; diff --git a/TRRandomizerCore/Textures/Wireframing/TR2Wireframer.cs b/TRRandomizerCore/Textures/Wireframing/TR2Wireframer.cs index 716254d9c..1171799c5 100644 --- a/TRRandomizerCore/Textures/Wireframing/TR2Wireframer.cs +++ b/TRRandomizerCore/Textures/Wireframing/TR2Wireframer.cs @@ -1,9 +1,9 @@ using System.Drawing; +using TRDataControl; using TRImageControl; using TRImageControl.Packing; using TRLevelControl.Helpers; using TRLevelControl.Model; -using TRModelTransporter.Helpers; using TRRandomizerCore.Utilities; namespace TRRandomizerCore.Textures; diff --git a/TRRandomizerCore/Textures/Wireframing/TR3Wireframer.cs b/TRRandomizerCore/Textures/Wireframing/TR3Wireframer.cs index 96f3690c5..c1d158a66 100644 --- a/TRRandomizerCore/Textures/Wireframing/TR3Wireframer.cs +++ b/TRRandomizerCore/Textures/Wireframing/TR3Wireframer.cs @@ -1,10 +1,10 @@ using System.Drawing; using System.Drawing.Drawing2D; +using TRDataControl; using TRImageControl; using TRImageControl.Packing; using TRLevelControl.Helpers; using TRLevelControl.Model; -using TRModelTransporter.Helpers; using TRRandomizerCore.Utilities; namespace TRRandomizerCore.Textures; From d6097f199787cb99739a5244a51795e170469ad0 Mon Sep 17 00:00:00 2001 From: lahm86 <33758420+lahm86@users.noreply.github.com> Date: Mon, 6 May 2024 18:28:10 +0100 Subject: [PATCH 2/3] Fix test categories --- TRDataControlTests/IO/ExportTests.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/TRDataControlTests/IO/ExportTests.cs b/TRDataControlTests/IO/ExportTests.cs index 1bfa14c9a..d0052f95d 100644 --- a/TRDataControlTests/IO/ExportTests.cs +++ b/TRDataControlTests/IO/ExportTests.cs @@ -151,7 +151,6 @@ public void TestTR3ExportIO() } [TestMethod] - [TestCategory("Model")] [Description("Test creating a TR4 model export.")] public void TestTR4ExportProperties() { @@ -174,7 +173,6 @@ public void TestTR4ExportProperties() } [TestMethod] - [TestCategory("Model")] [Description("Test TR4 model export IO.")] public void TestTR4ExportIO() { From 14470589289b284ae0bc60191c1048688d21592a Mon Sep 17 00:00:00 2001 From: lahm86 <33758420+lahm86@users.noreply.github.com> Date: Mon, 6 May 2024 18:42:50 +0100 Subject: [PATCH 3/3] Add alias test --- TRDataControlTests/IO/ImportTests.cs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/TRDataControlTests/IO/ImportTests.cs b/TRDataControlTests/IO/ImportTests.cs index a617cf12b..219f96fd1 100644 --- a/TRDataControlTests/IO/ImportTests.cs +++ b/TRDataControlTests/IO/ImportTests.cs @@ -108,6 +108,24 @@ public void TestTR5Import() Assert.IsTrue(level.Models.ContainsKey(TR5Type.Huskie)); } + [TestMethod] + [Description("Test that importing a non-specific type that has aliases fails.")] + public void TestAliasImport() + { + TR2DataImporter importer = new() + { + Level = GetTR2TestLevel(), + TypesToImport = new() { TR2Type.StickWieldingGoon1 }, + }; + + try + { + importer.Import(); + Assert.Fail(); + } + catch (TransportException) { } + } + private static void ExportTR1Model(TR1Type type, TRBlobType blobType) { TR1Level level = GetTR1TestLevel();