flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

denotch map converter works! :D

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@36 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
admin@omencraft.com 2011-10-31 22:02:04 +00:00
parent c2b43f33da
commit dda41a0406
3 changed files with 56 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
converter/cConvert.cpp
View File

@ -2,18 +2,51 @@
#include <fstream> #include <fstream>
#include <string> #include <string>
#include <stdio.h> #include <stdio.h>
#include <string.h> //#include <string.h>
#include <ctype.h> #include <ctype.h>
#include "zlib.h" #include "zlib.h"
#include "cNBTData.h" #include "cNBTData.h"
#include "timer.h" #include "timer.h"
#include "quicksort.h" #include "quicksort.h"
#include <dirent.h>
//#include "dircont.h"
using namespace std; using namespace std;
int main () { int main () {
string dir;
DIR* dp;
struct dirent *entry;
int found;
string entrys;
string str2;
string str3;
string filexPos;
string filezPos;
string pak_name;
//string* dir_array;
int dir_num_files = 0;
int ctr = 0;
if(dp = opendir("region/")){
while(entry = readdir(dp)){
entrys = entry->d_name;
found = entrys.find(".mcr");
if ( (found!=string::npos) && (entry->d_type==8) ) {
str2 = entrys.substr (2,sizeof(entrys));
filexPos = str2.substr (0,(int)str2.find("."));
str3 = str2.substr ((int)str2.find(".")+1, sizeof(str2));
filezPos = str3.substr (0,(int)str3.find("."));
pak_name = "X" + filexPos + "_Z" + filezPos + ".pak";
//printf ("pak_name: %s\n", pak_name.c_str());
// } //moving down to test
// } //mvong down to test
// closedir(dp); //moving down to test
//} //moving down to test
char SourceFile[128]; char SourceFile[128];
char OutputFile[128]; char OutputFile[128];
//ifstream file ("region/r.0.0.mcr", ios::in|ios::binary|ios::ate); //ifstream file ("region/r.0.0.mcr", ios::in|ios::binary|ios::ate);
@ -25,16 +58,17 @@ int main () {
FILE* f = 0; FILE* f = 0;
FILE* wf = 0; FILE* wf = 0;
#ifdef _WIN32 #ifdef _WIN32
sprintf_s(SourceFile, 128, "region/%s","r.0.0.mcr"); //replace hard coded file with file array variable sprintf_s(SourceFile, 128, "region/%s",entrys.c_str()); //replace hard coded file with file array variable
sprintf_s(OutputFile, 128, "world/%s","X0_Z0.pak"); //parce x and z from file array variable and place into pak file format sprintf_s(OutputFile, 128, "world/%s",pak_name.c_str()); //parce x and z from file array variable and place into pak file format
if( fopen_s(&wf, OutputFile, "wb" ) == 0 ) {} else { cout << "uhoh!" << endl; return 0; } //open new pak file for writing if( fopen_s(&wf, OutputFile, "wb" ) == 0 ) {} else { cout << "uhoh!" << endl; return 0; } //open new pak file for writing
#else #else
sprintf(SourceFile, "region/%s","r.0.0.mcr"); //same as above but for linux sprintf(SourceFile, "region/%s",entrys.c_str()); //same as above but for linux
sprintf(OutputFile, "world/%s","X0_Z0.pak"); sprintf(OutputFile, "world/%s",pak_name.c_str());
if( (wf = fopen(OutputFile, "wb" )) != 0 ) {} else { cout << "uhoh!" << endl; return 0; } if( (wf = fopen(OutputFile, "wb" )) != 0 ) {} else { cout << "uhoh!" << endl; return 0; }
#endif #endif
printf ("Now Converting %s to %s\n", entrys.c_str(), pak_name.c_str() );
if( (f = fopen(SourceFile, "rb" )) != 0 ) { // no error if( (f = fopen(SourceFile, "rb" )) != 0 ) { // no error
char* t_FakeHeader; char* t_FakeHeader;
@ -222,7 +256,7 @@ int main () {
} }
printf("Coord(X,Z):ChunkSize: %i,%i:%i\n", NBTData->GetInteger("xPos"), NBTData->GetInteger("zPos"), (int)CompressedSize ); //printf("Coord(X,Z):ChunkSize: %i,%i:%i\n", NBTData->GetInteger("xPos"), NBTData->GetInteger("zPos"), (int)CompressedSize );
NBTData->CloseCompound();// Close the compounds after you're done NBTData->CloseCompound();// Close the compounds after you're done
NBTData->CloseCompound(); NBTData->CloseCompound();
@ -257,6 +291,13 @@ int main () {
clock_t end=clock(); clock_t end=clock();
cout << "Time elapsed: " << double(diffclock(end,begin)) << " ms"<< endl; cout << "Time elapsed: " << double(diffclock(end,begin)) << " ms"<< endl;
} //moving down to test
} //mvong down to test
closedir(dp); //moving down to test
} //moving down to test
return 0; return 0;

BIN
converter/denotch
View File

Binary file not shown.

17
source/cChunkMap.cpp
View File

@ -652,13 +652,13 @@ cChunkMap::cChunkLayer* cChunkMap::LoadLayer(int a_LayerX, int a_LayerZ )
{ {
char PakVersion = 0; char PakVersion = 0;
char ChunkVersion = 0; char ChunkVersion = 0;
if( fread( &PakVersion, sizeof(PakVersion), 1, f) != 1 ) { LOGERROR("ERROR READING FROM FILE %s", SourceFile); fclose(f); return false; } if( fread( &PakVersion, sizeof(PakVersion), 1, f) != 1 ) { LOGERROR("ERROR 1 READING FROM FILE %s", SourceFile); fclose(f); return false; }
if( PakVersion != 1 ) { LOGERROR("WRONG PAK VERSION!"); fclose(f); return 0; } if( PakVersion != 1 ) { LOGERROR("WRONG PAK VERSION!"); fclose(f); return 0; }
if( fread( &ChunkVersion, sizeof(ChunkVersion), 1, f) != 1 ) { LOGERROR("ERROR READING FROM FILE %s", SourceFile); fclose(f); return false; } if( fread( &ChunkVersion, sizeof(ChunkVersion), 1, f) != 1 ) { LOGERROR("ERROR 2 READING FROM FILE %s", SourceFile); fclose(f); return false; }
if( PakVersion != 1 ) { LOGERROR("WRONG CHUNK VERSION!"); fclose(f); return 0; } if( PakVersion != 1 ) { LOGERROR("WRONG CHUNK VERSION!"); fclose(f); return 0; }
short NumChunks = 0; short NumChunks = 0;
if( fread( &NumChunks, sizeof(NumChunks), 1, f) != 1 ) { LOGERROR("ERROR READING FROM FILE %s", SourceFile); fclose(f); return false; } if( fread( &NumChunks, sizeof(NumChunks), 1, f) != 1 ) { LOGERROR("ERROR 3 READING FROM FILE %s", SourceFile); fclose(f); return false; }
LOG("Num chunks: %i", NumChunks ); LOG("Num chunks: %i", NumChunks );
cChunkLayer* Layer = new cChunkLayer( LAYER_SIZE*LAYER_SIZE ); cChunkLayer* Layer = new cChunkLayer( LAYER_SIZE*LAYER_SIZE );
@ -670,13 +670,13 @@ cChunkMap::cChunkLayer* cChunkMap::LoadLayer(int a_LayerX, int a_LayerZ )
{ {
int ChunkX = 0; int ChunkX = 0;
int ChunkZ = 0; int ChunkZ = 0;
if( fread( &ChunkX, sizeof(ChunkX), 1, f) != 1 ) { LOGERROR("ERROR READING FROM FILE %s", SourceFile); fclose(f); return false; } if( fread( &ChunkX, sizeof(ChunkX), 1, f) != 1 ) { LOGERROR("ERROR 4 READING FROM FILE %s", SourceFile); fclose(f); return false; }
if( fread( &ChunkZ, sizeof(ChunkZ), 1, f) != 1 ) { LOGERROR("ERROR READING FROM FILE %s", SourceFile); fclose(f); return false; } if( fread( &ChunkZ, sizeof(ChunkZ), 1, f) != 1 ) { LOGERROR("ERROR 5 READING FROM FILE %s", SourceFile); fclose(f); return false; }
cChunkData* Data = Layer->GetChunk( ChunkX, ChunkZ ); cChunkData* Data = Layer->GetChunk( ChunkX, ChunkZ );
if( Data ) if( Data )
{ {
if( fread( &Data->m_CompressedSize, sizeof(Data->m_CompressedSize), 1, f) != 1 ) { LOGERROR("ERROR READING FROM FILE %s", SourceFile); fclose(f); return false; } if( fread( &Data->m_CompressedSize, sizeof(Data->m_CompressedSize), 1, f) != 1 ) { LOGERROR("ERROR 6 READING FROM FILE %s", SourceFile); fclose(f); return false; }
if( fread( &Data->m_UncompressedSize, sizeof(Data->m_UncompressedSize), 1, f) != 1 ) { LOGERROR("ERROR READING FROM FILE %s", SourceFile); fclose(f); return false; } if( fread( &Data->m_UncompressedSize, sizeof(Data->m_UncompressedSize), 1, f) != 1 ) { LOGERROR("ERROR 7 READING FROM FILE %s", SourceFile); fclose(f); return false; }
} }
else else
{ {
@ -693,7 +693,8 @@ cChunkMap::cChunkLayer* cChunkMap::LoadLayer(int a_LayerX, int a_LayerZ )
{ {
cChunkData* Data = OrderedData[i]; cChunkData* Data = OrderedData[i];
Data->m_Compressed = new char[ Data->m_CompressedSize ]; Data->m_Compressed = new char[ Data->m_CompressedSize ];
if( fread( Data->m_Compressed, Data->m_CompressedSize, 1, f) != 1 ) { LOGERROR("ERROR READING FROM FILE %s", SourceFile); fclose(f); return false; } //printf("Compressed chunk size: %i\n",Data->m_CompressedSize);
if( fread( Data->m_Compressed, Data->m_CompressedSize, 1, f) != 1 ) { LOGERROR("ERROR 8 READING FROM FILE %s", SourceFile); fclose(f); return false; }
/* // Some testing... /* // Some testing...
uLongf DestSize = Data->m_UncompressedSize; uLongf DestSize = Data->m_UncompressedSize;