From 1f8a05f18932d6856eecc6b8978bbf82cc9ddcd2 Mon Sep 17 00:00:00 2001 From: amyavi <144570677+amyavi@users.noreply.github.com> Date: Sun, 26 Jan 2025 02:59:36 -0300 Subject: [PATCH] refactor: use apache commons Hex instead of our own Hexadecimal class --- .../chipmunkmod/util/BotValidationUtilities.java | 3 ++- .../chipmunk/chipmunkmod/util/Hexadecimal.java | 15 --------------- 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 src/main/java/land/chipmunk/chipmunkmod/util/Hexadecimal.java diff --git a/src/main/java/land/chipmunk/chipmunkmod/util/BotValidationUtilities.java b/src/main/java/land/chipmunk/chipmunkmod/util/BotValidationUtilities.java index d3ba6dc..1d518da 100644 --- a/src/main/java/land/chipmunk/chipmunkmod/util/BotValidationUtilities.java +++ b/src/main/java/land/chipmunk/chipmunkmod/util/BotValidationUtilities.java @@ -8,6 +8,7 @@ import land.chipmunk.chipmunkmod.modules.custom_chat.CustomChat; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.client.network.ClientPlayerEntity; +import org.apache.commons.codec.binary.Hex; import java.math.BigInteger; import java.nio.ByteBuffer; @@ -85,7 +86,7 @@ public class BotValidationUtilities { String time = String.valueOf(System.currentTimeMillis() / 5_000); String input = client.player.getUuidAsString() + arguments[0] + time + key; byte[] hash = md.digest(input.getBytes(StandardCharsets.UTF_8)); - String stringHash = Hexadecimal.encode(hash).substring(0, 16); + String stringHash = new String(Hex.encodeHex(hash)).substring(0, 16); final boolean shouldSectionSign = CustomChat.INSTANCE.enabled && player.hasPermissionLevel(2) && player.isCreative(); diff --git a/src/main/java/land/chipmunk/chipmunkmod/util/Hexadecimal.java b/src/main/java/land/chipmunk/chipmunkmod/util/Hexadecimal.java deleted file mode 100644 index e71c25b..0000000 --- a/src/main/java/land/chipmunk/chipmunkmod/util/Hexadecimal.java +++ /dev/null @@ -1,15 +0,0 @@ -package land.chipmunk.chipmunkmod.util; - -public interface Hexadecimal { - static String encode (byte b) { - return "" + Character.forDigit((b >> 4) & 0xF, 16) + Character.forDigit((b & 0xF), 16); - } - - static String encode (byte[] array) { - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < array.length; i++) sb.append(encode(array[i])); - return sb.toString(); - } - - // TODO: Decode -}