Windcorp/JavaProgressia
Windcorp/JavaProgressia
Archived
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added file identification header

Browse Source 
-All files now start with a 16 byte header consisting of "PROG" followed
by the integer position of the region in region coordinates.
	-regionCoords is passed through some functions to allow for this to be
confirmed.
This commit is contained in:
opfromthestart 2021-09-10 22:19:18 -04:00
parent a633c8324e
commit 0c41350ae7
3 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/ru/windcorp/progressia/server/world/io/region/Region.java
View File

@ -52,16 +52,16 @@ public class Region {
private final ChunkMap<Integer> offsets = ChunkMaps.newHashMap();
public Region(RandomAccessFile file) throws IOException {
public Region(RandomAccessFile file, Vec3i regionCoords) throws IOException {
this.file = new RegionFile(file);
try {
this.file.confirmHeaderHealth(offsets);
this.file.confirmHeaderHealth(offsets, regionCoords);
} catch (IOException e) {
RegionWorldContainer.LOG.debug("Uh the file broke");
if (RESET_CORRUPTED) {
this.file.makeHeader();
this.file.makeHeader(regionCoords);
}
}

35
src/main/java/ru/windcorp/progressia/server/world/io/region/RegionFile.java
View File

@ -23,6 +23,8 @@ public class RegionFile {
private static final int SECTORS_BYTES = Short.BYTES;
private static final int SECTOR_SIZE = MAX_CHUNK_SIZE >> (SECTORS_BYTES * 8);
private static final int SECTOR_HEADER_SIZE = 1;
private static final int ID_HEADER_SIZE = 16;
private static final byte[] HEADER_ID = {'P','R','O','G'};
final byte endBytes[] = new byte[SECTOR_SIZE];
@ -42,7 +44,7 @@ public class RegionFile {
private static final int DEFINITION_SIZE = Integer.BYTES;
private static final int HEADER_SIZE = DEFINITION_SIZE * REGION_DIAMETER * REGION_DIAMETER * REGION_DIAMETER;
private static final int HEADER_SIZE = DEFINITION_SIZE * REGION_DIAMETER * REGION_DIAMETER * REGION_DIAMETER + ID_HEADER_SIZE;
private final RandomAccessFile file;
@ -50,7 +52,7 @@ public class RegionFile {
file = inFile;
}
public void confirmHeaderHealth(ChunkMap<Integer> offsets) throws IOException {
public void confirmHeaderHealth(ChunkMap<Integer> offsets, Vec3i regionCoords) throws IOException {
Set<Integer> used = new HashSet<Integer>();
int maxUsed = 0;
@ -60,8 +62,27 @@ public class RegionFile {
throw new IOException("File is too short to contain a header");
}
char prog;
for (int i=0;i<4;i++) {
prog = file.readChar();
if (prog != HEADER_ID[i])
{
throw new IOException("File is not a .progressia_chunk file");
}
}
int tempX = file.readInt();
int tempY = file.readInt();
int tempZ = file.readInt();
if (regionCoords.x != tempX || regionCoords.y != tempY || regionCoords.z != tempZ)
{
throw new IOException("Region file is in the wrong place/ has the wrong name.");
}
for (int i = 0; i < chunksPerRegion; i++) {
file.seek(i * DEFINITION_SIZE);
file.seek(i * DEFINITION_SIZE + ID_HEADER_SIZE);
int offset = file.readInt();
if (offset == 0) {
@ -109,8 +130,12 @@ public class RegionFile {
LogManager.getLogger("Region").debug("Efficiency of {}", (double) used.size() / maxUsed);
}
public void makeHeader() throws IOException {
public void makeHeader(Vec3i regionCoords) throws IOException {
file.seek(0);
file.write(HEADER_ID);
file.writeInt(regionCoords.x);
file.writeInt(regionCoords.y);
file.writeInt(regionCoords.z);
for (int i = 0; i < HEADER_SIZE; i++) {
file.write(0);
}
@ -163,7 +188,7 @@ public class RegionFile {
}
public int allocateChunk(Vec3i pos) throws IOException {
int definitionOffset = DEFINITION_SIZE * (pos.z + REGION_DIAMETER * (pos.y + REGION_DIAMETER * pos.x));
int definitionOffset = ID_HEADER_SIZE + DEFINITION_SIZE * (pos.z + REGION_DIAMETER * (pos.y + REGION_DIAMETER * pos.x));
int outputLen = (int) file.length();

2
src/main/java/ru/windcorp/progressia/server/world/io/region/RegionWorldContainer.java
View File

@ -185,7 +185,7 @@ public class RegionWorldContainer implements WorldContainer {
private Region openRegion(Path path, Vec3i regionCoords) throws IOException {
RandomAccessFile raf = new RandomAccessFile(path.toFile(), "rw");
Region region = new Region(raf);
Region region = new Region(raf, regionCoords);
regions.put(regionCoords, region);
return region;
}