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

Allow deleting chunks from region files.

Browse source
This commit is contained in:
Justin Aquadro 2015-04-18 14:23:41 -04:00
parent 5d456cf743
commit 27110539a8
3 changed files with 44 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
NBTExplorer/Controllers/NodeTreeController.cs
View file

@ -229,14 +229,14 @@ namespace NBTExplorer.Controllers
foreach (var item in FileTypeRegistry.RegisteredTypes) { foreach (var item in FileTypeRegistry.RegisteredTypes) {
if (item.Value.NamePatternTest(path)) if (item.Value.NamePatternTest(path))
node = item.Value.NodeCreate(path); node = item.Value.NodeCreate(path);
} }
if (node == null) if (node == null)
node = NbtFileDataNode.TryCreateFrom(path); node = NbtFileDataNode.TryCreateFrom(path);
if (node != null) if (node != null)
_nodeTree.Nodes.Add(CreateUnexpandedNode(node)); _nodeTree.Nodes.Add(CreateUnexpandedNode(node));
else else
failCount++; failCount++;
} }
} }

19
NBTModel/Data/Nodes/RegionChunkDataNode.cs
View file

@ -31,13 +31,19 @@ namespace NBTExplorer.Model
get { return _z; } get { return _z; }
} }
protected RegionFileDataNode RegionParent
{
get { return Parent as RegionFileDataNode; }
}
protected override NodeCapabilities Capabilities protected override NodeCapabilities Capabilities
{ {
get get
{ {
return NodeCapabilities.CreateTag return NodeCapabilities.CreateTag
| NodeCapabilities.PasteInto | NodeCapabilities.PasteInto
| NodeCapabilities.Search; | NodeCapabilities.Search
| NodeCapabilities.Delete;
} }
} }
@ -99,6 +105,17 @@ namespace NBTExplorer.Model
get { return true; } get { return true; }
} }
public override bool DeleteNode ()
{
if (CanDeleteNode && _regionFile.HasChunk(_x, _z)) {
RegionParent.QueueDeleteChunk(_x, _z);
IsParentModified = true;
return Parent.Nodes.Remove(this);
}
return false;
}
public bool IsNamedContainer public bool IsNamedContainer
{ {
get { return true; } get { return true; }

18
NBTModel/Data/Nodes/RegionFileDataNode.cs
View file

@ -10,6 +10,7 @@ namespace NBTExplorer.Model
{ {
private string _path; private string _path;
private RegionFile _region; private RegionFile _region;
private List<RegionKey> _deleteQueue = new List<RegionKey>();
private static Regex _namePattern = new Regex(@"^r\.(-?\d+)\.(-?\d+)\.(mcr|mca)$"); private static Regex _namePattern = new Regex(@"^r\.(-?\d+)\.(-?\d+)\.(mcr|mca)$");
@ -100,6 +101,16 @@ namespace NBTExplorer.Model
Nodes.Clear(); Nodes.Clear();
} }
protected override void SaveCore ()
{
foreach (RegionKey key in _deleteQueue) {
if (_region.HasChunk(key.X, key.Z))
_region.DeleteChunk(key.X, key.Z);
}
_deleteQueue.Clear();
}
public override bool RefreshNode () public override bool RefreshNode ()
{ {
Dictionary<string, object> expandSet = BuildExpandSet(this); Dictionary<string, object> expandSet = BuildExpandSet(this);
@ -108,5 +119,12 @@ namespace NBTExplorer.Model
return expandSet != null; return expandSet != null;
} }
public void QueueDeleteChunk (int rx, int rz)
{
RegionKey key = new RegionKey(rx, rz);
if (!_deleteQueue.Contains(key))
_deleteQueue.Add(key);
}
} }
} }