Uplandustries/Eaglercraft-1.8
1
0
Fork 0
mirror of https://github.com/Eaglercraft-Archive/Eaglercraftx-1.8.8-src.git synced 2025-06-27 18:38:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update #24 - 1000s of optimizations, shared worlds on desktop

Browse Source
This commit is contained in:
lax1dude
2024-03-02 20:51:44 -08:00
parent a50c93cb75
commit 8ab65942c5
624 changed files with 8091 additions and 3620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sources/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateCheckerOverlay.java
View File

@ -1,6 +1,5 @@
package net.lax1dude.eaglercraft.v1_8.update;
import net.lax1dude.eaglercraft.v1_8.EagRuntime;
import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
import net.lax1dude.eaglercraft.v1_8.sp.lan.LANServerController;

2
sources/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateVersionList.java
View File

@ -1,8 +1,6 @@
package net.lax1dude.eaglercraft.v1_8.update;
import java.io.IOException;
import java.util.List;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;

8
sources/main/java/net/lax1dude/eaglercraft/v1_8/update/RelayUpdateChecker.java
View File

@ -1,7 +1,5 @@
package net.lax1dude.eaglercraft.v1_8.update;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
@ -9,6 +7,8 @@ import java.util.ArrayList;
import java.util.List;
import net.lax1dude.eaglercraft.v1_8.EagRuntime;
import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
import net.lax1dude.eaglercraft.v1_8.internal.PlatformApplication;
import net.lax1dude.eaglercraft.v1_8.internal.PlatformWebRTC;
import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayManager;
@ -67,7 +67,7 @@ public class RelayUpdateChecker {
byte[] b = PlatformApplication.getLocalStorage("lastRelayUpdate");
if(b != null) {
try {
lastUpdateCheck = (new DataInputStream(new ByteArrayInputStream(b))).readLong();
lastUpdateCheck = (new DataInputStream(new EaglerInputStream(b))).readLong();
} catch (IOException e) {
}
}
@ -77,7 +77,7 @@ public class RelayUpdateChecker {
if((mc.theWorld == null || mc.isSingleplayer()) && millis - lastUpdateCheck > updateCheckRate) {
lastUpdateCheck = millis;
try {
ByteArrayOutputStream bao = new ByteArrayOutputStream(8);
EaglerOutputStream bao = new EaglerOutputStream(8);
(new DataOutputStream(bao)).writeLong(lastUpdateCheck);
PlatformApplication.setLocalStorage("lastRelayUpdate", bao.toByteArray());
} catch (IOException e) {

17
sources/main/java/net/lax1dude/eaglercraft/v1_8/update/UpdateCertificate.java
View File

@ -1,6 +1,5 @@
package net.lax1dude.eaglercraft.v1_8.update;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.IOException;
import java.io.InputStream;
@ -11,8 +10,10 @@ import java.util.Objects;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.MultimapBuilder.ListMultimapBuilder;
import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
import net.lax1dude.eaglercraft.v1_8.EaglerZLIB;
import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion;
import net.lax1dude.eaglercraft.v1_8.IOUtils;
import net.lax1dude.eaglercraft.v1_8.crypto.SHA256Digest;
/**
@ -78,7 +79,7 @@ public class UpdateCertificate {
public final DLSource[] bundleDataSources;
public static UpdateCertificate parseAndVerifyCertificate(byte[] certData) throws IOException, CertificateInvalidException {
InputStream is = new ByteArrayInputStream(certData);
InputStream is = new EaglerInputStream(certData);
if(is.read() != 'E' || is.read() != 'A' || is.read() != 'G' || is.read() != 'S' || is.read() != 'I' || is.read() != 'G') {
throw new IOException("Data is not a certificate!");
}
@ -90,7 +91,7 @@ public class UpdateCertificate {
}
byte[] rsa2048sum = new byte[256];
is.read(rsa2048sum);
IOUtils.readFully(is, rsa2048sum);
byte[] rsa2048sumDec = (new BigInteger(rsa2048sum)).modPow(new BigInteger("65537"), EaglercraftVersion.updateSignatureModulus).toByteArray();
@ -108,7 +109,7 @@ public class UpdateCertificate {
payloadLen |= is.read();
byte[] signaturePayload = new byte[payloadLen];
is.read(signaturePayload);
IOUtils.readFully(is, signaturePayload);
SHA256Digest sha256 = new SHA256Digest();
sha256.update(new byte[] { (byte) 170, (byte) 191, (byte) 203, (byte) 188, (byte) 47, (byte) 37, (byte) 17,
@ -147,7 +148,7 @@ public class UpdateCertificate {
throw new CertificateInvalidException("SHA256 checksum of signature payload is invalid!");
}
return new UpdateCertificate(certData, EaglerZLIB.newGZIPInputStream(new ByteArrayInputStream(signaturePayload)), vers);
return new UpdateCertificate(certData, EaglerZLIB.newGZIPInputStream(new EaglerInputStream(signaturePayload)), vers);
}
private UpdateCertificate(byte[] certData, InputStream is, int sigVers) throws IOException {
@ -157,18 +158,18 @@ public class UpdateCertificate {
this.sigTimestamp = dis.readLong();
this.bundleDataLength = dis.readInt();
this.bundleDataHash = new byte[32];
dis.read(bundleDataHash);
IOUtils.readFully(dis, bundleDataHash);
this.bundlePackageName = dis.readUTF();
this.bundleDisplayName = dis.readUTF();
this.bundleAuthorName = dis.readUTF();
this.bundleVersionInteger = dis.readInt();
this.bundleDisplayVersion = dis.readUTF();
this.bundleVersionComment = dis.readUTF();
dis.skip(dis.read());
IOUtils.skipFully(dis, dis.read());
int sourceCount = dis.readInt();
this.bundleDataSources = new DLSource[sourceCount];
for(int i = 0; i < sourceCount; ++i) {
dis.skip(4);
IOUtils.skipFully(dis, 4);
bundleDataSources[i] = new DLSource(dis.readUTF(), dis.readUTF());
}
}