AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-08 22:59:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix bugs in UndoFileBin, also add new 'ReadUndoData' method to allow for converting between the formats.

Browse Source
This commit is contained in:
UnknownShadow200 2016-01-03 23:34:13 +11:00
parent 3075dc9221
commit ee720499b4
4 changed files with 190 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
Player/Undo/UndoFile.cs
View File

@ -25,10 +25,13 @@ namespace MCGalaxy.Util {
public abstract class UndoFile { public abstract class UndoFile {
protected const string undoDir = "extra/undo", prevUndoDir = "extra/undoPrevious"; protected const string undoDir = "extra/undo", prevUndoDir = "extra/undoPrevious";
public static UndoFile Instance = new UndoFileText(); public static UndoFile OldFormat = new UndoFileText();
public static UndoFile NewFormat = new UndoFileBin();
protected abstract void SaveUndoData(List<Player.UndoPos> buffer, string path); protected abstract void SaveUndoData(List<Player.UndoPos> buffer, string path);
protected abstract void ReadUndoData(List<Player.UndoPos> buffer, string path);
protected abstract bool UndoEntry(Player p, string path, long seconds); protected abstract bool UndoEntry(Player p, string path, long seconds);
protected abstract bool HighlightEntry(Player p, string path, long seconds); protected abstract bool HighlightEntry(Player p, string path, long seconds);
@ -39,9 +42,7 @@ namespace MCGalaxy.Util {
if( p == null || p.UndoBuffer == null || p.UndoBuffer.Count < 1) return; if( p == null || p.UndoBuffer == null || p.UndoBuffer.Count < 1) return;
CreateDefaultDirectories(); CreateDefaultDirectories();
if (Directory.GetDirectories(undoDir).Length >= Server.totalUndo) {
DirectoryInfo di = new DirectoryInfo(undoDir);
if (di.GetDirectories("*").Length >= Server.totalUndo) {
Directory.Delete(prevUndoDir, true); Directory.Delete(prevUndoDir, true);
Directory.Move(undoDir, prevUndoDir); Directory.Move(undoDir, prevUndoDir);
Directory.CreateDirectory(undoDir); Directory.CreateDirectory(undoDir);
@ -51,11 +52,9 @@ namespace MCGalaxy.Util {
if (!Directory.Exists(playerDir)) if (!Directory.Exists(playerDir))
Directory.CreateDirectory(playerDir); Directory.CreateDirectory(playerDir);
di = new DirectoryInfo(playerDir); int numFiles = Directory.GetFiles(playerDir).Length;
string ext = Instance.Extension; string path = Path.Combine(playerDir, numFiles + NewFormat.Extension);
int numFiles = di.GetFiles("*" + ext).Length; NewFormat.SaveUndoData(p.UndoBuffer, path);
string path = Path.Combine(playerDir, numFiles + ext);
Instance.SaveUndoData(p.UndoBuffer, path);
} }
public static void UndoPlayer(Player p, string targetName, long seconds, ref bool FoundUser) { public static void UndoPlayer(Player p, string targetName, long seconds, ref bool FoundUser) {
@ -74,26 +73,70 @@ namespace MCGalaxy.Util {
string path = Path.Combine(dir, name); string path = Path.Combine(dir, name);
if (!Directory.Exists(path)) if (!Directory.Exists(path))
return; return;
DirectoryInfo di = new DirectoryInfo(path); string[] files = Directory.GetFiles(path);
string ext = Instance.Extension; Array.Sort<string>(files, CompareFiles);
int numFiles = di.GetFiles("*" + ext).Length;
for (int i = numFiles - 1; i >= 0; i--) { for (int i = files.Length - 1; i >= 0; i--) {
string undoPath = Path.Combine(path, i + ext); path = files[i];
string file = Path.GetFileName(path);
if (file.Length == 0 || file[0] < '0' || file[0] > '9')
continue;
UndoFile format = null;
if (path.EndsWith(OldFormat.Extension)) format = OldFormat;
if (path.EndsWith(NewFormat.Extension)) format = NewFormat;
if (format == null) continue;
if (highlight) { if (highlight) {
if (!Instance.HighlightEntry(p, undoPath, seconds)) break; if (!format.HighlightEntry(p, path, seconds)) break;
} else { } else {
if (!Instance.UndoEntry(p, undoPath, seconds)) break; if (!format.UndoEntry(p, path, seconds)) break;
} }
} }
FoundUser = true; FoundUser = true;
} }
static int CompareFiles(string a, string b) {
int aNumEnd = a.IndexOf('.'), bNumEnd = b.IndexOf('.');
if (aNumEnd < 0 || bNumEnd < 0) return a.CompareTo(b);
int aNum, bNum;
if (!int.TryParse(a.Substring(0, aNumEnd), out aNum) ||
!int.TryParse(b.Substring(0, bNumEnd), out bNum))
return a.CompareTo(b);
return aNum.CompareTo(bNum);
}
public static void CreateDefaultDirectories() { public static void CreateDefaultDirectories() {
if (!Directory.Exists(undoDir)) if (!Directory.Exists(undoDir))
Directory.CreateDirectory(undoDir); Directory.CreateDirectory(undoDir);
if (!Directory.Exists(prevUndoDir)) if (!Directory.Exists(prevUndoDir))
Directory.CreateDirectory(prevUndoDir); Directory.CreateDirectory(prevUndoDir);
} }
public static void UpgradePlayerUndoFiles(string name) {
UpgradeFiles(undoDir, name);
UpgradeFiles(prevUndoDir, name);
}
static void UpgradeFiles(string dir, string name) {
string path = Path.Combine(dir, name);
if (!Directory.Exists(path))
return;
string[] files = Directory.GetFiles(path);
List<Player.UndoPos> buffer = new List<Player.UndoPos>();
for (int i = 0; i < files.Length; i++) {
path = files[i];
if (!path.EndsWith(OldFormat.Extension))
continue;
buffer.Clear();
OldFormat.ReadUndoData(buffer, path);
string newPath = Path.ChangeExtension(path, NewFormat.Extension);
NewFormat.SaveUndoData(buffer, newPath);
File.Delete(path);
}
}
} }
} }

57
Player/Undo/UndoFileBin.cs
View File

@ -52,8 +52,31 @@ namespace MCGalaxy.Util {
WriteChunkEntries(w, lastChunk.Entries, entriesPos); WriteChunkEntries(w, lastChunk.Entries, entriesPos);
} }
} }
// TODO: untested protected override void ReadUndoData(List<Player.UndoPos> buffer, string path) {
DateTime now = DateTime.Now;
Player.UndoPos Pos;
using (Stream fs = File.OpenRead(path))
using (BinaryReader r = new BinaryReader(fs))
{
int approxEntries = (int)(fs.Length / 12);
if (buffer.Capacity < approxEntries)
buffer.Capacity = approxEntries;
while (fs.Position < fs.Length) {
ChunkHeader chunk = ReadHeader(fs, r);
Pos.mapName = chunk.LevelName;
for (int j = 0; j < chunk.Entries; j++ ) {
Pos.timePlaced = chunk.BaseTime.AddSeconds(r.ReadUInt16());
Pos.x = r.ReadUInt16(); Pos.y = r.ReadUInt16(); Pos.z = r.ReadUInt16();
Pos.type = r.ReadByte(); r.ReadByte(); // block definitions placeholder
Pos.newtype = r.ReadByte(); r.ReadByte(); // block definitions placeholder
buffer.Add(Pos);
}
}
}
}
protected override bool UndoEntry(Player p, string path, long seconds) { protected override bool UndoEntry(Player p, string path, long seconds) {
List<ChunkHeader> list = new List<ChunkHeader>(); List<ChunkHeader> list = new List<ChunkHeader>();
DateTime now = DateTime.Now; DateTime now = DateTime.Now;
@ -70,17 +93,18 @@ namespace MCGalaxy.Util {
return false; return false;
if (lvl == null || lvl != p.level) continue; if (lvl == null || lvl != p.level) continue;
Pos.mapName = chunk.LevelName; Pos.mapName = chunk.LevelName;
fs.Seek(chunk.DataPosition, SeekOrigin.Begin);
for (int j = 0; j < chunk.Entries; j++ ) { for (int j = 0; j < chunk.Entries; j++ ) {
DateTime time = chunk.BaseTime.AddSeconds(r.ReadUInt16()); DateTime time = chunk.BaseTime.AddSeconds(r.ReadUInt16());
if (time >= now) return false; if (time.AddSeconds(seconds) < now) return false;
Pos.x = r.ReadUInt16(); Pos.y = r.ReadUInt16(); Pos.z = r.ReadUInt16(); Pos.x = r.ReadUInt16(); Pos.y = r.ReadUInt16(); Pos.z = r.ReadUInt16();
Pos.type = lvl.GetTile(Pos.x, Pos.y, Pos.z); Pos.type = lvl.GetTile(Pos.x, Pos.y, Pos.z);
byte oldType = r.ReadByte(); r.ReadByte(); // block definitions placeholder byte oldType = r.ReadByte(); r.ReadByte(); // block definitions placeholder
byte newType = r.ReadByte(); r.ReadByte(); // block definitions placeholder byte newType = r.ReadByte(); r.ReadByte(); // block definitions placeholder
if (Pos.type == newType || Block.Convert(Pos.type) == Block.water if (Pos.type == newType || Block.Convert(Pos.type) == Block.water
|| Block.Convert(Pos.type) == Block.lava || Pos.type == Block.grass) { || Block.Convert(Pos.type) == Block.lava || Pos.type == Block.grass) {
Pos.newtype = oldType; Pos.newtype = oldType;
@ -95,7 +119,6 @@ namespace MCGalaxy.Util {
return true; return true;
} }
// TODO: untested
protected override bool HighlightEntry(Player p, string path, long seconds) { protected override bool HighlightEntry(Player p, string path, long seconds) {
List<ChunkHeader> list = new List<ChunkHeader>(); List<ChunkHeader> list = new List<ChunkHeader>();
DateTime now = DateTime.Now; DateTime now = DateTime.Now;
@ -110,10 +133,11 @@ namespace MCGalaxy.Util {
if (!CheckChunk(chunk, now, seconds, p, out lvl)) if (!CheckChunk(chunk, now, seconds, p, out lvl))
return false; return false;
if (lvl == null || lvl != p.level) continue; if (lvl == null || lvl != p.level) continue;
fs.Seek(chunk.DataPosition, SeekOrigin.Begin);
for (int j = 0; j < chunk.Entries; j++ ) { for (int j = 0; j < chunk.Entries; j++ ) {
DateTime time = chunk.BaseTime.AddSeconds(r.ReadUInt16()); DateTime time = chunk.BaseTime.AddSeconds(r.ReadUInt16());
if (time >= now) return false; if (time.AddSeconds(seconds) < now) return false;
ushort x = r.ReadUInt16(), y = r.ReadUInt16(), z = r.ReadUInt16(); ushort x = r.ReadUInt16(), y = r.ReadUInt16(), z = r.ReadUInt16();
byte lvlTile = lvl.GetTile(x, y, z); byte lvlTile = lvl.GetTile(x, y, z);
@ -135,7 +159,7 @@ namespace MCGalaxy.Util {
static bool CheckChunk(ChunkHeader chunk, DateTime now, long seconds, Player p, out Level lvl) { static bool CheckChunk(ChunkHeader chunk, DateTime now, long seconds, Player p, out Level lvl) {
DateTime time = chunk.BaseTime; DateTime time = chunk.BaseTime;
lvl = null; lvl = null;
if (time.AddSeconds(65536).AddSeconds(seconds) >= now) if (time.AddSeconds(65536).AddSeconds(seconds) < now)
return false; // we can safely discard the entire chunk return false; // we can safely discard the entire chunk
lvl = Level.FindExact(chunk.LevelName); lvl = Level.FindExact(chunk.LevelName);
@ -153,18 +177,23 @@ namespace MCGalaxy.Util {
Stream s = r.BaseStream; Stream s = r.BaseStream;
long len = s.Length; long len = s.Length;
while (s.Position < len) { while (s.Position < len) {
ChunkHeader header = default(ChunkHeader); ChunkHeader header = ReadHeader(s, r);
byte[] mapNameData = r.ReadBytes(r.ReadUInt16());
header.LevelName = Encoding.UTF8.GetString(mapNameData);
header.BaseTime = new DateTime(r.ReadInt64(), DateTimeKind.Local);
header.Entries = r.ReadUInt16();
header.DataPosition = s.Position;
s.Seek(header.Entries * 12, SeekOrigin.Current); s.Seek(header.Entries * 12, SeekOrigin.Current);
list.Add(header); list.Add(header);
} }
} }
static ChunkHeader ReadHeader(Stream s, BinaryReader r) {
ChunkHeader header = default(ChunkHeader);
byte[] mapNameData = r.ReadBytes(r.ReadUInt16());
header.LevelName = Encoding.UTF8.GetString(mapNameData);
header.BaseTime = new DateTime(r.ReadInt64(), DateTimeKind.Local);
header.Entries = r.ReadUInt16();
header.DataPosition = s.Position;
return header;
}
static void WriteChunkEntries(BinaryWriter w, ushort entries, long entriesPos) { static void WriteChunkEntries(BinaryWriter w, ushort entries, long entriesPos) {
long curPos = w.BaseStream.Position; long curPos = w.BaseStream.Position;
w.BaseStream.Seek(entriesPos, SeekOrigin.Begin); w.BaseStream.Seek(entriesPos, SeekOrigin.Begin);

21
Player/Undo/UndoFileText.cs
View File

@ -38,6 +38,27 @@ namespace MCGalaxy.Util {
} }
} }
protected override void ReadUndoData(List<Player.UndoPos> buffer, string path) {
Player.UndoPos Pos;
string[] lines = File.ReadAllText(path).Split(' ');
int approxEntries = (int)(lines.Length / 7);
if (buffer.Capacity < approxEntries)
buffer.Capacity = approxEntries;
for (int i = 0; i < lines.Length; i += 7) {
if (lines[i].Length == 0) continue;
Pos.mapName = lines[i];
Pos.x = ushort.Parse(lines[i + 1]);
Pos.y = ushort.Parse(lines[i + 2]);
Pos.z = ushort.Parse(lines[i + 3]);
Pos.timePlaced = DateTime.Parse(lines[i + 4], CultureInfo.InvariantCulture);
Pos.type = byte.Parse(lines[i + 5]);
Pos.newtype = byte.Parse(lines[i + 6]);
buffer.Add(Pos);
}
}
protected override bool UndoEntry(Player p, string path, long seconds) { protected override bool UndoEntry(Player p, string path, long seconds) {
Player.UndoPos Pos; Player.UndoPos Pos;
string[] lines = File.ReadAllText(path).Split(' '); string[] lines = File.ReadAllText(path).Split(' ');

134
Starter.csproj
View File

@ -1,74 +1,74 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform> <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>8.0.30703</ProductVersion> <ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{63DCBB31-92CD-4464-A86C-A7E51A5FE9FE}</ProjectGuid> <ProjectGuid>{63DCBB31-92CD-4464-A86C-A7E51A5FE9FE}</ProjectGuid>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Starter</RootNamespace> <RootNamespace>Starter</RootNamespace>
<AssemblyName>MCGalaxy</AssemblyName> <AssemblyName>MCGalaxy</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile> <TargetFrameworkProfile>
</TargetFrameworkProfile> </TargetFrameworkProfile>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>x86</PlatformTarget>
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<UseVSHostingProcess>false</UseVSHostingProcess> <UseVSHostingProcess>false</UseVSHostingProcess>
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<StartupObject>Starter.Program</StartupObject> <StartupObject>Starter.Program</StartupObject>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ApplicationIcon>Galaxy.ico</ApplicationIcon> <ApplicationIcon>Galaxy.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Program.cs" /> <Compile Include="Program.cs" />
<Compile Include="properties\AssemblyInfo.cs" /> <Compile Include="properties\AssemblyInfo.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="app.config" /> <None Include="app.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="MCGalaxy_.csproj"> <ProjectReference Include="MCGalaxy_.csproj">
<Project>{12597DB0-7C34-4DE1-88EA-9250FF3372EB}</Project> <Project>{12597DB0-7C34-4DE1-88EA-9250FF3372EB}</Project>
<Name>MCGalaxy_</Name> <Name>MCGalaxy_</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="Galaxy.ico" /> <Content Include="Galaxy.ico" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">
</Target> </Target>
<Target Name="AfterBuild"> <Target Name="AfterBuild">
</Target> </Target>
--> -->
</Project> </Project>