amethyst/NBTExplorer
1
0
Fork 0
forked from mirrors/NBTExplorer
Code Pull requests Activity

Sort regions before enumerating (contrib. by Sukasa)

Browse source
This commit is contained in:
Justin Aquadro 2013-07-02 23:07:36 -04:00
parent 766f6447e0
commit d3954ef5dd
1 changed files with 34 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
SubstrateCS/Source/Core/RegionManager.cs
View file

@ -3,6 +3,7 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using Substrate.Core; using Substrate.Core;
using System.Text.RegularExpressions;
namespace Substrate.Core namespace Substrate.Core
{ {
@ -158,8 +159,10 @@ namespace Substrate.Core
throw new DirectoryNotFoundException(); throw new DirectoryNotFoundException();
} }
string[] files = Directory.GetFiles(rm.GetRegionPath()); List<string> files = new List<string>(Directory.GetFiles(rm.GetRegionPath()));
_regions.Capacity = files.Length; _regions.Capacity = files.Count;
files.Sort(RegionSort);
foreach (string file in files) { foreach (string file in files) {
try { try {
@ -213,6 +216,35 @@ namespace Substrate.Core
} }
} }
} }
private int RegionSort (string A, string B)
{
Regex R = new Regex(".+r\\.(?<x>-?\\d+)\\.(?<y>-?\\d+)\\.(mca|mcr)", RegexOptions.None);
Match MC = R.Match(A);
if (!MC.Success)
return 0;
int AX = int.Parse(MC.Groups["x"].Value);
int AZ = int.Parse(MC.Groups["y"].Value);
MC = R.Match(B);
if (!MC.Success)
return 0;
int BX = int.Parse(MC.Groups["x"].Value);
int BZ = int.Parse(MC.Groups["y"].Value);
if (AZ < BZ)
return -1;
if (AZ > BZ)
return 1;
if (AX < BX)
return -1;
if (AX > BX)
return 1;
return 0;
}
} }
} }