Reorganise folder structures (LostArtefacts#669)

Part of LostArtefacts#653.

TRDataControl/Environment/Model/Conditions/Entities/EMEntityPropertyCondition.cs

@@ -80,11 +80,11 @@ private bool GetResult<T>(TREntity<T> entity)
         bool result = true;
         if (EntityType.HasValue)
         {
-            result &= EqualityComparer<T>.Default.Equals(entity.TypeID, (T)(object)(int)EntityType.Value);
+            result &= EqualityComparer<T>.Default.Equals(entity.TypeID, (T)(object)(uint)EntityType.Value);
         }
         if (EntityTypes != null)
         {
-            result &= EntityTypes.Any(e => EqualityComparer<T>.Default.Equals(entity.TypeID, (T)(object)(int)e));
+            result &= EntityTypes.Any(e => EqualityComparer<T>.Default.Equals(entity.TypeID, (T)(object)(uint)e));
         }
         if (Invisible.HasValue)
         {

TRDataControl/Transport/TR1/TR1DataImporter.cs

@@ -32,7 +32,7 @@ protected override List<TR1Type> GetExistingTypes()
     protected override TRTextureRemapper<TR1Level> CreateRemapper(TR1Level level)
         => new TR1TextureRemapper(level);
 
-    protected override AbstractTextureRemapGroup<TR1Type, TR1Level> GetRemapGroup()
+    protected override TRTextureRemapGroup<TR1Type, TR1Level> GetRemapGroup()
         => JsonConvert.DeserializeObject<TR1TextureRemapGroup>(File.ReadAllText(TextureRemapPath));
 
     protected override bool IsMasterType(TR1Type type)

TRDataControl/Transport/TR2/TR2DataImporter.cs

@@ -25,7 +25,7 @@ protected override List<TR2Type> GetExistingTypes()
     protected override TRTextureRemapper<TR2Level> CreateRemapper(TR2Level level)
         => new TR2TextureRemapper(level);
 
-    protected override AbstractTextureRemapGroup<TR2Type, TR2Level> GetRemapGroup()
+    protected override TRTextureRemapGroup<TR2Type, TR2Level> GetRemapGroup()
         => JsonConvert.DeserializeObject<TR2TextureRemapGroup>(File.ReadAllText(TextureRemapPath));
 
     protected override bool IsMasterType(TR2Type type)

TRDataControl/Transport/TR3/TR3DataImporter.cs

@@ -25,7 +25,7 @@ protected override List<TR3Type> GetExistingTypes()
     protected override TRTextureRemapper<TR3Level> CreateRemapper(TR3Level level)
         => new TR3TextureRemapper(level);
 
-    protected override AbstractTextureRemapGroup<TR3Type, TR3Level> GetRemapGroup()
+    protected override TRTextureRemapGroup<TR3Type, TR3Level> GetRemapGroup()
         => JsonConvert.DeserializeObject<TR3TextureRemapGroup>(File.ReadAllText(TextureRemapPath));
 
     protected override bool IsMasterType(TR3Type type)

TRDataControl/Transport/TR4/TR4DataImporter.cs

@@ -17,7 +17,7 @@ protected override List<TR4Type> GetExistingTypes()
     protected override TRTextureRemapper<TR4Level> CreateRemapper(TR4Level level)
         => new TR4TextureRemapper(level);
 
-    protected override AbstractTextureRemapGroup<TR4Type, TR4Level> GetRemapGroup()
+    protected override TRTextureRemapGroup<TR4Type, TR4Level> GetRemapGroup()
         => JsonConvert.DeserializeObject<TR4TextureRemapGroup>(File.ReadAllText(TextureRemapPath));
 
     protected override bool IsMasterType(TR4Type type)

TRDataControl/Transport/TR5/TR5DataImporter.cs

@@ -17,7 +17,7 @@ protected override List<TR5Type> GetExistingTypes()
     protected override TRTextureRemapper<TR5Level> CreateRemapper(TR5Level level)
         => new TR5TextureRemapper(level);
 
-    protected override AbstractTextureRemapGroup<TR5Type, TR5Level> GetRemapGroup()
+    protected override TRTextureRemapGroup<TR5Type, TR5Level> GetRemapGroup()
         => JsonConvert.DeserializeObject<TR5TextureRemapGroup>(File.ReadAllText(TextureRemapPath));
 
     protected override bool IsMasterType(TR5Type type)

TRDataControl/Transport/TRDataImporter.cs

@@ -297,7 +297,7 @@ protected void RemoveData()
         staleTextures = new(staleTextures.Distinct());
         if (staleTextures.Count > 0)
         {
-            AbstractTextureRemapGroup<T, L> remapGroup = TextureRemapPath == null ? null : GetRemapGroup();
+            TRTextureRemapGroup<T, L> remapGroup = TextureRemapPath == null ? null : GetRemapGroup();
             CreateRemapper(Level)?.RemoveUnusedTextures(staleTextures,
                 (tile, bounds) => remapGroup?.CanRemoveRectangle(tile, bounds, TypesToRemove) ?? true);
         }
@@ -349,7 +349,7 @@ protected void ImportTextures(List<B> blobs)
 
                 if (Level.ObjectTextures.Count >= Data.TextureObjectLimit)
                 {
-                    throw new TransportException($"Limit of {Data.TextureObjectLimit} textures reached.");
+                    throw new PackingException($"Limit of {Data.TextureObjectLimit} textures reached.");
                 }
 
                 globalRemap[region.ID][segment.Index] = Level.ObjectTextures.Count;
@@ -513,5 +513,5 @@ protected virtual void BlobImported(B blob) { }
     protected abstract void ImportSound(B blob);
 
     protected abstract List<T> GetExistingTypes();
-    protected abstract AbstractTextureRemapGroup<T, L> GetRemapGroup();
+    protected abstract TRTextureRemapGroup<T, L> GetRemapGroup();
 }

TRImageControl/Packing/Textures/RemapTypes/TR1TextureRemapGroup.cs → TRImageControl/Packing/Remapping/RemapTypes/TR1TextureRemapGroup.cs

@@ -2,7 +2,7 @@
 
 namespace TRImageControl.Packing;
 
-public class TR1TextureRemapGroup : AbstractTextureRemapGroup<TR1Type, TR1Level>
+public class TR1TextureRemapGroup : TRTextureRemapGroup<TR1Type, TR1Level>
 {
     protected override TRTexturePacker CreatePacker(TR1Level level)
         => new TR1TexturePacker(level);

TRImageControl/Packing/Textures/RemapTypes/TR2TextureRemapGroup.cs → TRImageControl/Packing/Remapping/RemapTypes/TR2TextureRemapGroup.cs

@@ -2,7 +2,7 @@
 
 namespace TRImageControl.Packing;
 
-public class TR2TextureRemapGroup : AbstractTextureRemapGroup<TR2Type, TR2Level>
+public class TR2TextureRemapGroup : TRTextureRemapGroup<TR2Type, TR2Level>
 {
     protected override TRTexturePacker CreatePacker(TR2Level level)
         => new TR2TexturePacker(level);

TRImageControl/Packing/Textures/RemapTypes/TR3TextureRemapGroup.cs → TRImageControl/Packing/Remapping/RemapTypes/TR3TextureRemapGroup.cs

@@ -2,7 +2,7 @@
 
 namespace TRImageControl.Packing;
 
-public class TR3TextureRemapGroup : AbstractTextureRemapGroup<TR3Type, TR3Level>
+public class TR3TextureRemapGroup : TRTextureRemapGroup<TR3Type, TR3Level>
 {
     protected override TRTexturePacker CreatePacker(TR3Level level)
         => new TR3TexturePacker(level);

TRImageControl/Packing/Textures/RemapTypes/TR4TextureRemapGroup.cs → TRImageControl/Packing/Remapping/RemapTypes/TR4TextureRemapGroup.cs

@@ -2,7 +2,7 @@
 
 namespace TRImageControl.Packing;
 
-public class TR4TextureRemapGroup : AbstractTextureRemapGroup<TR4Type, TR4Level>
+public class TR4TextureRemapGroup : TRTextureRemapGroup<TR4Type, TR4Level>
 {
     protected override TRTexturePacker CreatePacker(TR4Level level)
         => new TR4TexturePacker(level, TRGroupPackingMode.All);

TRImageControl/Packing/Textures/RemapTypes/TR5TextureRemapGroup.cs → TRImageControl/Packing/Remapping/RemapTypes/TR5TextureRemapGroup.cs

@@ -2,7 +2,7 @@
 
 namespace TRImageControl.Packing;
 
-public class TR5TextureRemapGroup : AbstractTextureRemapGroup<TR5Type, TR5Level>
+public class TR5TextureRemapGroup : TRTextureRemapGroup<TR5Type, TR5Level>
 {
     protected override TRTexturePacker CreatePacker(TR5Level level)
         => new TR5TexturePacker(level, TRGroupPackingMode.All);

TRImageControl/Packing/Textures/AbstractTextureRemapGroup.cs → TRImageControl/Packing/Remapping/TRTextureRemapGroup.cs

@@ -3,7 +3,7 @@
 
 namespace TRImageControl.Packing;
 
-public abstract class AbstractTextureRemapGroup<T, L> 
+public abstract class TRTextureRemapGroup<T, L> 
     where T : Enum
     where L : TRLevelBase
 {

TRRandomizerCore/Processors/TR2/TR2TextureDeduplicator.cs

@@ -1,14 +1,18 @@
-using TRRandomizerCore.Levels;
+using Newtonsoft.Json;
+using TRDataControl;
 using TRGE.Core;
+using TRImageControl.Packing;
+using TRLevelControl.Model;
 using TRModelTransporter.Utilities;
+using TRRandomizerCore.Levels;
 
 namespace TRRandomizerCore.Processors;
 
 internal class TR2TextureDeduplicator : TR2LevelProcessor
 {
     public void Deduplicate()
     {
-        List<DeduplicationProcessor> processors = new() { new DeduplicationProcessor(this) };
+        List<DeduplicationProcessor> processors = new() { new(this) };
         int levelSplit = (int)(Levels.Count / _maxThreads);
 
         bool beginProcessing = true;
@@ -18,7 +22,7 @@ public void Deduplicate()
             {
                 // Kick start the last one
                 processors[^1].Start();
-                processors.Add(new DeduplicationProcessor(this));
+                processors.Add(new(this));
             }
 
             processors[^1].AddLevel(LoadCombinedLevel(lvl));
@@ -49,15 +53,13 @@ public void Deduplicate()
     internal class DeduplicationProcessor : AbstractProcessorThread<TR2TextureDeduplicator>
     {
         private readonly List<TR2CombinedLevel> _levels;
-        private readonly TR2LevelTextureDeduplicator _deduplicator;
 
         internal override int LevelCount => _levels.Count;
 
         internal DeduplicationProcessor(TR2TextureDeduplicator outer)
             :base(outer)
         {
-            _levels = new List<TR2CombinedLevel>();
-            _deduplicator = new TR2LevelTextureDeduplicator();
+            _levels = new();
         }
 
         internal void AddLevel(TR2CombinedLevel level)
@@ -69,11 +71,32 @@ protected override void ProcessImpl()
         {
             foreach (TR2CombinedLevel level in _levels)
             {
-                string dedupPath = _outer.GetResourcePath(@"TR2\Textures\Deduplication\" + level.JsonID + "-TextureRemap.json");
+                string dedupPath = _outer.GetResourcePath($@"TR2\Textures\Deduplication\{level.JsonID}-TextureRemap.json");
                 if (File.Exists(dedupPath))
                 {
-                    _deduplicator.Level = level.Data;
-                    _deduplicator.Deduplicate(dedupPath);
+                    TR2TexturePacker levelPacker = new(level.Data);
+                    Dictionary<TRTextile, List<TRTextileRegion>> allTextures = new();
+                    foreach (TRTextile tile in levelPacker.Tiles)
+                    {
+                        allTextures[tile] = new List<TRTextileRegion>(tile.Rectangles);
+                    }
+
+                    TR2TextureRemapGroup remapGroup = JsonConvert.DeserializeObject<TR2TextureRemapGroup>(File.ReadAllText(dedupPath));
+                    TRTextureDeduplicator<TR2Type> deduplicator = new()
+                    {
+                        UpdateGraphics = true,
+                        SegmentMap = allTextures,
+                        PrecompiledRemapping = remapGroup.Remapping,
+                    };
+
+                    deduplicator.Deduplicate();
+
+                    levelPacker.AllowEmptyPacking = true;
+                    levelPacker.Pack(true);
+
+                    TR2TextureRemapper remapper = new(level.Data);
+                    remapper.ResetUnusedTextures();
+                    remapper.Remap();
 
                     _outer.SaveLevel(level);
                 }