AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-23 11:14:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

使用 java.util.HexFormat 替代 Hex (#4457)

Browse Source
This commit is contained in:
Glavo 2025-09-12 19:07:43 +08:00 committed by GitHub
parent cf5957ffd1
commit 962ee0d108
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 14 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HMCL/src/main/java/org/jackhuang/hmcl/java/JavaInstallTask.java
View File

@ -20,7 +20,6 @@ package org.jackhuang.hmcl.java;
import kala.compress.archivers.ArchiveEntry;
import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.util.DigestUtils;
import org.jackhuang.hmcl.util.Hex;
import org.jackhuang.hmcl.util.io.IOUtils;
import org.jackhuang.hmcl.util.tree.ArchiveFileTree;
@ -31,6 +30,7 @@ import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.security.MessageDigest;
import java.util.ArrayList;
import java.util.HexFormat;
import java.util.LinkedHashMap;
import java.util.Map;
@ -101,7 +101,7 @@ public final class JavaInstallTask extends Task<JavaManifest> {
//noinspection ResultOfMethodCallIgnored
path.toFile().setExecutable(true);
files.put(String.join("/", nameStack), new JavaLocalFiles.LocalFile(Hex.encodeHex(messageDigest.digest()), size));
files.put(String.join("/", nameStack), new JavaLocalFiles.LocalFile(HexFormat.of().formatHex(messageDigest.digest()), size));
}
nameStack.remove(nameStack.size() - 1);
}

2
HMCL/src/main/java/org/jackhuang/hmcl/util/SelfDependencyPatcher.java
View File

@ -387,7 +387,7 @@ public final class SelfDependencyPatcher {
}
}
String sha1 = Hex.encodeHex(digest.digest());
String sha1 = HexFormat.of().formatHex(digest.digest());
if (!dependency.sha1().equalsIgnoreCase(sha1))
throw new ChecksumMismatchException("SHA-1", dependency.sha1(), sha1);
}

4
HMCLCore/src/main/java/org/jackhuang/hmcl/auth/offline/Texture.java
View File

@ -19,13 +19,13 @@ package org.jackhuang.hmcl.auth.offline;
import javafx.scene.image.Image;
import javafx.scene.image.PixelReader;
import org.jackhuang.hmcl.util.Hex;
import java.io.IOException;
import java.io.InputStream;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.HashMap;
import java.util.HexFormat;
import java.util.Map;
import static java.util.Objects.requireNonNull;
@ -90,7 +90,7 @@ public final class Texture {
digest.update(buf, 0, pos);
}
return Hex.encodeHex(digest.digest());
return HexFormat.of().formatHex(digest.digest());
}
private static void putInt(byte[] array, int offset, int x) {

9
HMCLCore/src/main/java/org/jackhuang/hmcl/task/FileDownloadTask.java
View File

@ -18,7 +18,6 @@
package org.jackhuang.hmcl.task;
import org.jackhuang.hmcl.util.DigestUtils;
import org.jackhuang.hmcl.util.Hex;
import org.jackhuang.hmcl.util.io.ChecksumMismatchException;
import org.jackhuang.hmcl.util.io.CompressingUtils;
import org.jackhuang.hmcl.util.io.FileUtils;
@ -33,11 +32,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.security.MessageDigest;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
import java.util.Optional;
import java.util.*;
import static java.util.Objects.requireNonNull;
import static org.jackhuang.hmcl.util.logging.Logger.LOG;
@ -250,7 +245,7 @@ public class FileDownloadTask extends FetchTask<Void> {
// Integrity check
if (checksum != null) {
String actualChecksum = Hex.encodeHex(digest.digest());
String actualChecksum = HexFormat.of().formatHex(digest.digest());
if (!checksum.equalsIgnoreCase(actualChecksum)) {
throw new ChecksumMismatchException(algorithm, checksum, actualChecksum);
}

7
HMCLCore/src/main/java/org/jackhuang/hmcl/util/DigestUtils.java
View File

@ -23,6 +23,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.HexFormat;
/**
* @author huangyuhui
@ -74,15 +75,15 @@ public final class DigestUtils {
}
public static String digestToString(String algorithm, byte[] data) throws IOException {
return Hex.encodeHex(digest(algorithm, data));
return HexFormat.of().formatHex(digest(algorithm, data));
}
public static String digestToString(String algorithm, Path path) throws IOException {
return Hex.encodeHex(digest(algorithm, path));
return HexFormat.of().formatHex(digest(algorithm, path));
}
public static String digestToString(String algorithm, InputStream data) throws IOException {
return Hex.encodeHex(digest(algorithm, data));
return HexFormat.of().formatHex(digest(algorithm, data));
}
private static final ThreadLocal<byte[]> threadLocalBuffer = ThreadLocal.withInitial(() -> new byte[STREAM_BUFFER_LENGTH]);

74
HMCLCore/src/main/java/org/jackhuang/hmcl/util/Hex.java
View File

@ -1,74 +0,0 @@
/*
* Hello Minecraft! Launcher
* Copyright (C) 2020 huangyuhui <huanghongxun2008@126.com> and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package org.jackhuang.hmcl.util;
import java.io.IOException;
public final class Hex {
private static final byte[] DIGITS_LOWER = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
private static int toDigit(char ch) throws IOException {
if (ch >= '0' && ch <= '9') {
return ch - '0';
}
if (ch >= 'a' && ch <= 'f') {
return ch - 'a' + 10;
}
if (ch >= 'A' && ch <= 'F') {
return ch - 'A' + 10;
}
throw new IOException("Illegal hexadecimal character " + ch);
}
public static byte[] decodeHex(String str) throws IOException {
if ((str.length() & 0x1) != 0)
throw new IOException("Odd number of characters.");
int len = str.length() >> 1;
byte[] out = new byte[len];
for (int i = 0; i < len; i++) {
int j = i << 1;
int f = (toDigit(str.charAt(j)) << 4) | toDigit(str.charAt(j + 1));
out[i] = (byte) f;
}
return out;
}
@SuppressWarnings("deprecation")
public static String encodeHex(byte[] data) {
int l = data.length;
byte[] out = new byte[l << 1];
for (int i = 0; i < l; i++) {
byte b = data[i];
int j = i << 1;
out[j] = DIGITS_LOWER[((0xF0 & b) >>> 4)];
out[j + 1] = DIGITS_LOWER[(0xF & b)];
}
return new String(out, 0, 0, out.length);
}
private Hex() {
}
}

6
HMCLCore/src/test/java/org/jackhuang/hmcl/util/ByteArrayTest.java
View File

@ -19,7 +19,7 @@ package org.jackhuang.hmcl.util;
import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.HexFormat;
import java.util.function.Consumer;
import static org.jackhuang.hmcl.util.ByteArray.*;
@ -123,8 +123,8 @@ public final class ByteArrayTest {
private static byte[] byteArray(String string) {
try {
return Hex.decodeHex(string);
} catch (IOException e) {
return HexFormat.of().parseHex(string);
} catch (IllegalArgumentException e) {
throw new AssertionError(e);
}
}

51
HMCLCore/src/test/java/org/jackhuang/hmcl/util/HexTest.java
View File

@ -1,51 +0,0 @@
/*
* Hello Minecraft! Launcher
* Copyright (C) 2023 huangyuhui <huanghongxun2008@126.com> and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package org.jackhuang.hmcl.util;
import org.junit.jupiter.api.Test;
import java.io.IOException;
import static org.junit.jupiter.api.Assertions.*;
public class HexTest {
@Test
public void testDecodeHex() throws IOException {
assertArrayEquals(new byte[0], Hex.decodeHex(""));
assertArrayEquals(new byte[1], Hex.decodeHex("00"));
assertArrayEquals(new byte[4], Hex.decodeHex("00000000"));
assertArrayEquals(
new byte[]{0x10, (byte) 0xa3, (byte) 0xd1, (byte) 0xff},
Hex.decodeHex("10a3D1Ff")
);
assertThrows(IOException.class, () -> Hex.decodeHex("1"));
assertThrows(IOException.class, () -> Hex.decodeHex("1a1"));
assertThrows(IOException.class, () -> Hex.decodeHex("1g"));
}
@Test
public void testEncodeHex() {
assertEquals("", Hex.encodeHex(new byte[0]));
assertEquals("00", Hex.encodeHex(new byte[1]));
assertEquals("00000000", Hex.encodeHex(new byte[4]));
assertEquals("10a3d1ff", Hex.encodeHex(new byte[]{0x10, (byte) 0xa3, (byte) 0xd1, (byte) 0xff}));
}
}