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 #39 - Fix various issues with the client

Browse Source
This commit is contained in:
lax1dude
2024-09-26 21:47:56 -07:00
parent c0eddc3dfd
commit 82a70b7649
24 changed files with 314 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sources/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/EaglerFolderResourcePack.java
View File

@ -271,6 +271,7 @@ public class EaglerFolderResourcePack extends AbstractResourcePack {
public static void loadRemoteResourcePack(String url, String hash, Consumer<EaglerFolderResourcePack> cb, Consumer<Runnable> ast, Runnable loading) {
if (!isSupported || !hash.matches("^[a-f0-9]{40}$")) {
logger.error("Invalid character in resource pack hash! (is it lowercase?)");
cb.accept(null);
return;
}
@ -292,8 +293,9 @@ public class EaglerFolderResourcePack extends AbstractResourcePack {
digest.update(arr, 0, arr.length);
byte[] hashOut = new byte[20];
digest.doFinal(hashOut, 0);
if(!hash.equals(ArrayUtils.hexString(hashOut))) {
logger.error("Downloaded resource pack hash does not equal expected resource pack hash!");
String hashOutStr = ArrayUtils.hexString(hashOut);
if(!hash.equals(hashOutStr)) {
logger.error("Downloaded resource pack hash does not equal expected resource pack hash! ({} != {})", hashOutStr, hash);
cb.accept(null);
return;
}