Removed Motvin.Collections

Zarbuz · Zarbuz · commit def18d7072cf · 2020-04-02T21:13:10.000+02:00
diff --git a/SchematicToVoxCore/Converter/BinvoxToSchematic.cs b/SchematicToVoxCore/Converter/BinvoxToSchematic.cs
@@ -1,17 +1,16 @@
-﻿using System.Collections.Generic;
+﻿using FileToVox.Schematics;
+using FileToVox.Schematics.Tools;
+using SchematicToVoxCore.Extensions;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
 using System.Globalization;
 using System.IO;
 using System.Text;
-using FileToVox.Schematics;
-using FileToVox.Schematics.Tools;
-using Motvin.Collections;
-using SchematicToVoxCore.Extensions;
 
 namespace FileToVox.Converter
 {
-    public class BinvoxToSchematic : AbstractToSchematic
+	public class BinvoxToSchematic : AbstractToSchematic
     {
         private bool _headerRead;
         private bool _voxelsRead;
diff --git a/SchematicToVoxCore/Converter/Image/FolderImageToSchematic.cs b/SchematicToVoxCore/Converter/Image/FolderImageToSchematic.cs
@@ -5,11 +5,10 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
-using Motvin.Collections;
 
 namespace FileToVox.Converter.Image
 {
-    public class FolderImageToSchematic : AbstractToSchematic
+	public class FolderImageToSchematic : AbstractToSchematic
     {
         private readonly bool _excavate;
         public FolderImageToSchematic(string path, bool excavate) : base(path)
diff --git a/SchematicToVoxCore/Converter/Image/PNGToSchematic.cs b/SchematicToVoxCore/Converter/Image/PNGToSchematic.cs
@@ -1,19 +1,16 @@
-﻿using System;
+﻿using FileToVox.Extensions;
+using FileToVox.Schematics;
+using FileToVox.Utils;
+using SchematicToVoxCore.Extensions;
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
-using System.Linq;
-using FileToVox.Extensions;
-using FileToVox.Schematics;
-using FileToVox.Utils;
-using Motvin.Collections;
-using nQuant;
-using SchematicToVoxCore.Extensions;
 
 namespace FileToVox.Converter.Image
 {
-    public class PNGToSchematic : ImageToSchematic
+	public class PNGToSchematic : ImageToSchematic
     {
         public PNGToSchematic(string path, string colorPath, int height, bool excavate, bool color, bool top, int colorLimit)
             : base(path, colorPath, height, excavate, color, top, colorLimit)
diff --git a/SchematicToVoxCore/Converter/Image/TIFtoSchematic.cs b/SchematicToVoxCore/Converter/Image/TIFtoSchematic.cs
@@ -1,19 +1,16 @@
-﻿using FileToVox.Schematics;
+﻿using BitMiracle.LibTiff.Classic;
+using FileToVox.Extensions;
+using FileToVox.Schematics;
+using FileToVox.Utils;
+using SchematicToVoxCore.Extensions;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
-using System.IO;
-using BitMiracle.LibTiff.Classic;
-using FileToVox.Extensions;
-using FileToVox.Utils;
-using Motvin.Collections;
-using nQuant;
-using SchematicToVoxCore.Extensions;
 
 namespace FileToVox.Converter.Image
 {
-    public class TIFtoSchematic : ImageToSchematic
+	public class TIFtoSchematic : ImageToSchematic
     {
         public TIFtoSchematic(string path, string colorPath, int height, bool excavate, bool color, bool top, int colorLimit) : base(path, colorPath, height, excavate, color, top, colorLimit)
         {
diff --git a/SchematicToVoxCore/Converter/ObjToSchematic.cs b/SchematicToVoxCore/Converter/ObjToSchematic.cs
@@ -1,16 +1,14 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using FileToVox.Schematics;
+﻿using FileToVox.Schematics;
 using FileToVox.Utils;
 using g3;
-using Motvin.Collections;
 using SchematicToVoxCore.Extensions;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
 
 namespace FileToVox.Converter
 {
-    public class OBJToSchematic : AbstractToSchematic
+	public class OBJToSchematic : AbstractToSchematic
     {
         private readonly int _gridSize;
         private readonly bool _excavate;
diff --git a/SchematicToVoxCore/Converter/PointCloud/CSVToSchematic.cs b/SchematicToVoxCore/Converter/PointCloud/CSVToSchematic.cs
@@ -1,19 +1,17 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Drawing;
-using FileToVox.Schematics;
-using System.Globalization;
-using System.IO;
-using FileToVox.Extensions;
+﻿using FileToVox.Schematics;
 using FileToVox.Schematics.Tools;
 using FileToVox.Utils;
 using MoreLinq;
-using Motvin.Collections;
 using SchematicToVoxCore.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Globalization;
+using System.IO;
 
 namespace FileToVox.Converter.PointCloud
 {
-    public class CSVToSchematic : PointCloudToSchematic
+	public class CSVToSchematic : PointCloudToSchematic
     {
         public CSVToSchematic(string path, float scale, int colorLimit, bool holes, bool flood) : base(path, scale, colorLimit, holes, flood)
         {
diff --git a/SchematicToVoxCore/Converter/PointCloud/PLYToSchematic.cs b/SchematicToVoxCore/Converter/PointCloud/PLYToSchematic.cs
@@ -10,7 +10,6 @@
 using FileToVox.Schematics.Tools;
 using FileToVox.Utils;
 using MoreLinq;
-using Motvin.Collections;
 using SchematicToVoxCore.Extensions;
 
 namespace FileToVox.Converter.PointCloud
diff --git a/SchematicToVoxCore/Converter/PointCloud/PointCloudToSchematic.cs b/SchematicToVoxCore/Converter/PointCloud/PointCloudToSchematic.cs
@@ -9,7 +9,6 @@
 using FileToVox.Schematics.Tools;
 using FileToVox.Utils;
 using MoreLinq;
-using Motvin.Collections;
 using SchematicToVoxCore.Extensions;
 
 namespace FileToVox.Converter.PointCloud
diff --git a/SchematicToVoxCore/Converter/PointCloud/XYZToSchematic.cs b/SchematicToVoxCore/Converter/PointCloud/XYZToSchematic.cs
@@ -1,19 +1,17 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Globalization;
-using System.IO;
-using FileToVox.Extensions;
-using FileToVox.Schematics;
+﻿using FileToVox.Schematics;
 using FileToVox.Schematics.Tools;
 using FileToVox.Utils;
 using MoreLinq;
-using Motvin.Collections;
 using SchematicToVoxCore.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Globalization;
+using System.IO;
 
 namespace FileToVox.Converter.PointCloud
 {
-    public class XYZToSchematic : PointCloudToSchematic
+	public class XYZToSchematic : PointCloudToSchematic
     {
         public XYZToSchematic(string path, float scale, int colorLimit, bool holes, bool flood) : base(path, scale, colorLimit, holes, flood)
         {
diff --git a/SchematicToVoxCore/Converter/QbToSchematic.cs b/SchematicToVoxCore/Converter/QbToSchematic.cs
@@ -1,17 +1,16 @@
-﻿using SchematicToVoxCore.Extensions;
+﻿using FileToVox.Schematics;
+using FileToVox.Utils;
+using SchematicToVoxCore.Extensions;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Text;
-using FileToVox.Schematics;
-using FileToVox.Utils;
-using Motvin.Collections;
 
 namespace FileToVox.Converter
 {
-    public class QBToSchematic : AbstractToSchematic
+	public class QBToSchematic : AbstractToSchematic
     {
         private const int CodeFlag = 2;
         private const int Nextsliceflag = 6;
diff --git a/SchematicToVoxCore/Converter/SchematicToSchematic.cs b/SchematicToVoxCore/Converter/SchematicToSchematic.cs
@@ -1,17 +1,16 @@
-﻿using System;
+﻿using FileToVox.Schematics;
+using fNbt;
+using SchematicToVoxCore.Extensions;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 using System.Threading.Tasks;
-using FileToVox.Schematics;
-using fNbt;
-using Motvin.Collections;
-using SchematicToVoxCore.Extensions;
 
 namespace FileToVox.Converter
 {
-    public class SchematicToSchematic : AbstractToSchematic
+	public class SchematicToSchematic : AbstractToSchematic
     {
         private readonly int _ignoreMinY;
         private readonly int _ignoreMaxY;
diff --git a/SchematicToVoxCore/Extensions/FctExtensions.cs b/SchematicToVoxCore/Extensions/FctExtensions.cs
@@ -1,13 +1,11 @@
-﻿using System;
+﻿using FileToVox.Schematics;
 using FileToVox.Schematics.Tools;
 using System.Collections.Generic;
 using System.Drawing;
-using FileToVox.Schematics;
-using Motvin.Collections;
 
 namespace SchematicToVoxCore.Extensions
 {
-    public static class FctExtensions
+	public static class FctExtensions
     {
         public static int GetColorIntensity(this Color color)
         {
@@ -37,9 +35,6 @@ public static Color UIntToColor(this uint color)
         public static HashSet<T> ToHashSet<T>(this IEnumerable<T> source, IEqualityComparer<T> comparer = null)
             => new HashSet<T>(source, comparer);
 
-        public static FastHashSet<T> ToHashSetFast<T>(this IEnumerable<T> source, IEqualityComparer<T> comparer = null)
-            => new FastHashSet<T>(source, comparer);
-
         public static List<Block> ApplyOffset(this List<Block> list, Vector3 vector)
         {
             for (int i = 0; i < list.Count; i++)
diff --git a/SchematicToVoxCore/Schematics/Schematic.cs b/SchematicToVoxCore/Schematics/Schematic.cs
@@ -1,9 +1,8 @@
 ﻿using System.Collections.Generic;
-using Motvin.Collections;
 
 namespace FileToVox.Schematics
 {
-    public class Schematic
+	public class Schematic
     {
         public ushort Width { get; set; }
         public ushort Heigth { get; set; }
diff --git a/SchematicToVoxCore/Vox/VoxWriter.cs b/SchematicToVoxCore/Vox/VoxWriter.cs
@@ -1,21 +1,19 @@
-﻿using System;
+﻿using FileToVox.Schematics;
+using FileToVox.Schematics.Tools;
+using FileToVox.Utils;
+using SchematicToVoxCore.Extensions;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
-using FileToVox.Schematics;
-using FileToVox.Schematics.Tools;
-using FileToVox.Utils;
-using Motvin.Collections;
-using SchematicToVoxCore.Extensions;
 
 namespace FileToVox.Vox
 {
-    public class VoxWriter : VoxParser
+	public class VoxWriter : VoxParser
     {
         private int _width;
         private int _length;

Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,10 @@`
`5`	`5`	`using System.Collections.Generic;`
`6`	`6`	`using System.Drawing;`
`7`	`7`	`using System.IO;`
`8`		`-using Motvin.Collections;`
`9`	`8`
`10`	`9`	`namespace FileToVox.Converter.Image`
`11`	`10`	`{`
`12`		`- public class FolderImageToSchematic : AbstractToSchematic`
	`11`	`+ public class FolderImageToSchematic : AbstractToSchematic`
`13`	`12`	`{`
`14`	`13`	`private readonly bool _excavate;`
`15`	`14`	`public FolderImageToSchematic(string path, bool excavate) : base(path)`