eaglercraft/eaglercraft-1.5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fully functional export-to-vanilla

Browse Source
This commit is contained in:
ayunami2000 2022-08-02 14:37:13 -04:00
parent 254365783e
commit 7899127209
4 changed files with 14887 additions and 14856 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29696
javascript/classes_server.js
View File

File diff suppressed because it is too large Load Diff

2
javascript/classes_server.js.map
View File

File diff suppressed because one or more lines are too long

11
sp-server/src/main/java/net/lax1dude/eaglercraft/sp/IntegratedServer.java
View File

@ -302,6 +302,11 @@ public class IntegratedServer {
String currPath = i.path.substring(pfx.length()); String currPath = i.path.substring(pfx.length());
try { try {
byte[] b = i.getAllBytes(); byte[] b = i.getAllBytes();
if(currPath.equals("level.dat")) {
NBTTagCompound worldDatNBT = CompressedStreamTools.decompress(b);
worldDatNBT.getCompoundTag("Data").setInteger("version", 19133);
b = CompressedStreamTools.compress(worldDatNBT);
}
if (currPath.startsWith("level0/")) { if (currPath.startsWith("level0/")) {
regions.put(VFSChunkLoader.getChunkCoords(currPath.substring(7, currPath.length() - 4)), b); regions.put(VFSChunkLoader.getChunkCoords(currPath.substring(7, currPath.length() - 4)), b);
} else if (currPath.startsWith("level1/")) { } else if (currPath.startsWith("level1/")) {
@ -355,7 +360,7 @@ public class IntegratedServer {
byte[] b = regionsn1Out.get(path); byte[] b = regionsn1Out.get(path);
ZipEntry zipEntry = new ZipEntry(shortpfx + "DIM-1/region/" + path + ".mca"); ZipEntry zipEntry = new ZipEntry(shortpfx + "DIM-1/region/" + path + ".mca");
c.putNextEntry(zipEntry); c.putNextEntry(zipEntry);
c.write(b); // 12yee c.write(b);
c.closeEntry(); c.closeEntry();
bytesWritten[0] += b.length; bytesWritten[0] += b.length;
if (bytesWritten[0] - lastUpdate[0] > 10000) { if (bytesWritten[0] - lastUpdate[0] > 10000) {
@ -445,7 +450,7 @@ public class IntegratedServer {
if (folderNameFile.getName().contains("__MACOSX/")) continue; if (folderNameFile.getName().contains("__MACOSX/")) continue;
if (folderNameFile.isDirectory()) continue; if (folderNameFile.isDirectory()) continue;
String lowerName = folderNameFile.getName().toLowerCase(); String lowerName = folderNameFile.getName().toLowerCase();
if (!(lowerName.endsWith(".dat") || lowerName.endsWith(".dat_old") || lowerName.endsWith(".dat_mcr") || lowerName.endsWith(".mca") || lowerName.endsWith(".mcr"))) continue; if (!(lowerName.endsWith(".dat") || lowerName.endsWith(".mca") || lowerName.endsWith(".mcr"))) continue;
fileNames.add(folderNameFile.getName().toCharArray()); fileNames.add(folderNameFile.getName().toCharArray());
} }
final int[] i = new int[] { 0 }; final int[] i = new int[] { 0 };
@ -460,7 +465,7 @@ public class IntegratedServer {
if (f.getName().contains("__MACOSX/")) continue; if (f.getName().contains("__MACOSX/")) continue;
if (f.isDirectory()) continue; if (f.isDirectory()) continue;
String lowerName = f.getName().toLowerCase(); String lowerName = f.getName().toLowerCase();
if (!(lowerName.endsWith(".dat") || lowerName.endsWith(".dat_old") || lowerName.endsWith(".dat_mcr") || lowerName.endsWith(".mca") || lowerName.endsWith(".mcr"))) continue; if (!(lowerName.endsWith(".dat") || lowerName.endsWith(".mca") || lowerName.endsWith(".mcr"))) continue;
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
int len; int len;
while ((len = dc.read(bb)) != -1) { while ((len = dc.read(bb)) != -1) {

34
sp-server/src/main/java/net/lax1dude/eaglercraft/sp/MCAConverter.java
View File

@ -7,6 +7,7 @@ import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import com.jcraft.jzlib.DeflaterOutputStream; import com.jcraft.jzlib.DeflaterOutputStream;
import com.jcraft.jzlib.GZIPInputStream;
import com.jcraft.jzlib.GZIPOutputStream; import com.jcraft.jzlib.GZIPOutputStream;
import net.minecraft.src.ChunkCoordIntPair; import net.minecraft.src.ChunkCoordIntPair;
@ -73,6 +74,8 @@ public class MCAConverter {
if (regions.size() == 0) return regionsOut; if (regions.size() == 0) return regionsOut;
byte[] readBuffer = new byte[16000];
try { try {
int timestamp = (int) System.currentTimeMillis(); int timestamp = (int) System.currentTimeMillis();
@ -88,16 +91,17 @@ public class MCAConverter {
if (minZ > coords.chunkZPos) minZ = coords.chunkZPos; if (minZ > coords.chunkZPos) minZ = coords.chunkZPos;
} }
for (int x = minX + (minX % 32); x <= maxX + (maxX % 32); x += 32) { for (int z = minZ - (32 + (minZ % 32)); z <= maxZ + (32 + (maxZ % 32)); z += 32) {
for (int z = minZ + (minZ % 32); z <= maxZ + (maxZ % 32); z += 32) { for (int x = minX - (32 + (minX % 32)); x <= maxX + (32 + (maxX % 32)); x += 32) {
ByteArrayOutputStream offsets = new ByteArrayOutputStream(); ByteArrayOutputStream offsets = new ByteArrayOutputStream();
DataOutputStream offsetsDos = new DataOutputStream(offsets); DataOutputStream offsetsDos = new DataOutputStream(offsets);
ByteArrayOutputStream timestamps = new ByteArrayOutputStream(); ByteArrayOutputStream timestamps = new ByteArrayOutputStream();
DataOutputStream timestampsDos = new DataOutputStream(timestamps); DataOutputStream timestampsDos = new DataOutputStream(timestamps);
ByteArrayOutputStream chunks = new ByteArrayOutputStream(); ByteArrayOutputStream chunks = new ByteArrayOutputStream();
DataOutputStream chunksDos = new DataOutputStream(chunks); DataOutputStream chunksDos = new DataOutputStream(chunks);
for (int cx = 0; cx < 32; ++cx) { boolean anyChunks = false;
for (int cz = 0; cz < 32; ++cz) { for (int cz = 0; cz < 32; cz++) {
for (int cx = 0; cx < 32; cx++) {
int tx = x + cx; int tx = x + cx;
int tz = z + cz; int tz = z + cz;
@ -106,30 +110,46 @@ public class MCAConverter {
offsetsDos.writeInt(0); offsetsDos.writeInt(0);
timestampsDos.writeInt(0); timestampsDos.writeInt(0);
} else { } else {
anyChunks = true;
ByteArrayInputStream bais = new ByteArrayInputStream(region);
GZIPInputStream gis = new GZIPInputStream(bais);
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
DeflaterOutputStream dos = new DeflaterOutputStream(baos); DeflaterOutputStream dos = new DeflaterOutputStream(baos);
dos.write(region); int len;
while ((len = gis.read(readBuffer)) > 0) {
dos.write(readBuffer, 0, len);
}
dos.close(); dos.close();
baos.close();
bais.close();
gis.close();
byte[] zlibbed = baos.toByteArray(); byte[] zlibbed = baos.toByteArray();
int offset = chunksDos.size(); int offset = 2 + (chunksDos.size() / 4096);
offsetsDos.write((offset >> 16) & 0xff); offsetsDos.write((offset >> 16) & 0xff);
offsetsDos.write((offset >> 8) & 0xff); offsetsDos.write((offset >> 8) & 0xff);
offsetsDos.write(offset & 0xff); offsetsDos.write(offset & 0xff);
offsetsDos.write(5 + zlibbed.length); offsetsDos.write((int) Math.ceil((5 + zlibbed.length) / 4096.0));
timestampsDos.writeInt(timestamp); timestampsDos.writeInt(timestamp);
chunksDos.writeInt(region.length); chunksDos.writeInt(region.length);
chunksDos.write(2); chunksDos.write(2);
chunksDos.write(zlibbed); chunksDos.write(zlibbed);
int chunksSizeOff = chunksDos.size() % 4096;
if (chunksSizeOff != 0) chunksDos.write(new byte[4096 - chunksSizeOff]);
} }
} }
} }
offsetsDos.close(); offsetsDos.close();
timestampsDos.close(); timestampsDos.close();
chunksDos.close(); chunksDos.close();
if (!anyChunks) continue;
byte[] offsetsOut = offsets.toByteArray(); byte[] offsetsOut = offsets.toByteArray();
byte[] timestampsOut = timestamps.toByteArray(); byte[] timestampsOut = timestamps.toByteArray();
byte[] chunksOut = chunks.toByteArray(); byte[] chunksOut = chunks.toByteArray();