Update data control namespaces (#667)

Part of #653.
LostArtefacts · May 6, 2024 · 55cddd5 · 55cddd5
1 parent e8955af
commit 55cddd5
Show file tree

Hide file tree

Showing 37 changed files with 48 additions and 55 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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 → ...aControl/Transport/TR1/TR1MassExporter.cs b/TRDataControl/Mass/Types/TR1MassExporter.cs → ...aControl/Transport/TR1/TR1MassExporter.cs
@@ -2,7 +2,7 @@
 using TRLevelControl.Helpers;
 using TRLevelControl.Model;
 
-namespace TRDataControl.Utils;
+namespace TRDataControl;
 
 public class TR1MassExporter : TRMassExporter<TR1Level, TR1Type, TR1SFX, TR1Blob>
 {

diff --git a/...rol/Remapping/Types/TR1TextureRemapper.cs → ...ntrol/Transport/TR1/TR1TextureRemapper.cs b/...rol/Remapping/Types/TR1TextureRemapper.cs → ...ntrol/Transport/TR1/TR1TextureRemapper.cs
@@ -1,7 +1,7 @@
 using TRImageControl.Packing;
 using TRLevelControl.Model;
 
-namespace TRDataControl.Remapping;
+namespace TRDataControl;
 
 public class TR1TextureRemapper : TRTextureRemapper<TR1Level>
 {

diff --git 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
@@ -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 → ...aControl/Transport/TR2/TR2MassExporter.cs b/TRDataControl/Mass/Types/TR2MassExporter.cs → ...aControl/Transport/TR2/TR2MassExporter.cs
@@ -2,7 +2,7 @@
 using TRLevelControl.Helpers;
 using TRLevelControl.Model;
 
-namespace TRDataControl.Utils;
+namespace TRDataControl;
 
 public class TR2MassExporter : TRMassExporter<TR2Level, TR2Type, TR2SFX, TR2Blob>
 {

diff --git a/...rol/Remapping/Types/TR2TextureRemapper.cs → ...ntrol/Transport/TR2/TR2TextureRemapper.cs b/...rol/Remapping/Types/TR2TextureRemapper.cs → ...ntrol/Transport/TR2/TR2TextureRemapper.cs
@@ -1,7 +1,7 @@
 using TRImageControl.Packing;
 using TRLevelControl.Model;
 
-namespace TRDataControl.Remapping;
+namespace TRDataControl;
 
 public class TR2TextureRemapper : TRTextureRemapper<TR2Level>
 {

diff --git 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
@@ -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 → ...aControl/Transport/TR3/TR3MassExporter.cs b/TRDataControl/Mass/Types/TR3MassExporter.cs → ...aControl/Transport/TR3/TR3MassExporter.cs
@@ -2,7 +2,7 @@
 using TRLevelControl.Helpers;
 using TRLevelControl.Model;
 
-namespace TRDataControl.Utils;
+namespace TRDataControl;
 
 public class TR3MassExporter : TRMassExporter<TR3Level, TR3Type, TR3SFX, TR3Blob>
 {

diff --git a/...rol/Remapping/Types/TR3TextureRemapper.cs → ...ntrol/Transport/TR3/TR3TextureRemapper.cs b/...rol/Remapping/Types/TR3TextureRemapper.cs → ...ntrol/Transport/TR3/TR3TextureRemapper.cs
@@ -1,7 +1,7 @@
 using TRImageControl.Packing;
 using TRLevelControl.Model;
 
-namespace TRDataControl.Remapping;
+namespace TRDataControl;
 
 public class TR3TextureRemapper : TRTextureRemapper<TR3Level>
 {

diff --git 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
@@ -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 → ...aControl/Transport/TR4/TR4MassExporter.cs b/TRDataControl/Mass/Types/TR4MassExporter.cs → ...aControl/Transport/TR4/TR4MassExporter.cs
@@ -1,7 +1,7 @@
 using TRLevelControl;
 using TRLevelControl.Model;
 
-namespace TRDataControl.Utils;
+namespace TRDataControl;
 
 public class TR4MassExporter : TRMassExporter<TR4Level, TR4Type, TR4SFX, TR4Blob>
 {

diff --git a/...rol/Remapping/Types/TR4TextureRemapper.cs → ...ntrol/Transport/TR4/TR4TextureRemapper.cs b/...rol/Remapping/Types/TR4TextureRemapper.cs → ...ntrol/Transport/TR4/TR4TextureRemapper.cs
@@ -1,7 +1,7 @@
 using TRImageControl.Packing;
 using TRLevelControl.Model;
 
-namespace TRDataControl.Remapping;
+namespace TRDataControl;
 
 public class TR4TextureRemapper : TRTextureRemapper<TR4Level>
 {

diff --git 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
@@ -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 → ...aControl/Transport/TR5/TR5MassExporter.cs b/TRDataControl/Mass/Types/TR5MassExporter.cs → ...aControl/Transport/TR5/TR5MassExporter.cs
@@ -1,7 +1,7 @@
 using TRLevelControl;
 using TRLevelControl.Model;
 
-namespace TRDataControl.Utils;
+namespace TRDataControl;
 
 public class TR5MassExporter : TRMassExporter<TR5Level, TR5Type, TR5SFX, TR5Blob>
 {

diff --git a/...rol/Remapping/Types/TR5TextureRemapper.cs → ...ntrol/Transport/TR5/TR5TextureRemapper.cs b/...rol/Remapping/Types/TR5TextureRemapper.cs → ...ntrol/Transport/TR5/TR5TextureRemapper.cs
@@ -1,7 +1,7 @@
 using TRImageControl.Packing;
 using TRLevelControl.Model;
 
-namespace TRDataControl.Remapping;
+namespace TRDataControl;
 
 public class TR5TextureRemapper : TRTextureRemapper<TR5Level>
 {

diff --git 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
@@ -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 → TRDataControl/Transport/TRMassExporter.cs b/TRDataControl/Mass/TRMassExporter.cs → TRDataControl/Transport/TRMassExporter.cs
@@ -1,6 +1,6 @@
 using TRLevelControl.Model;
 
-namespace TRDataControl.Utils;
+namespace TRDataControl;
 
 public abstract class TRMassExporter<L, T, S, B>
     where L : TRLevelBase

diff --git a/TRDataControl/Remapping/TRTextureRemapper.cs → TRDataControl/Transport/TRTextureRemapper.cs b/TRDataControl/Remapping/TRTextureRemapper.cs → TRDataControl/Transport/TRTextureRemapper.cs
@@ -1,7 +1,7 @@
 using TRImageControl.Packing;
 using TRLevelControl.Model;
 
-namespace TRDataControl.Remapping;
+namespace TRDataControl;
 
 public abstract class TRTextureRemapper<L>
     where L : TRLevelBase

diff --git 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
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
+using TRDataControl;
 using TRImageControl.Packing;
 using TRLevelControl.Model;
-using TRModelTransporter.Helpers;
 
 namespace TRModelTransporter.Utilities;
 

diff --git 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()
     {

diff --git 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();

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;