diff --git a/mapsync-mod/src/main/java/gjum/minecraft/mapsync/mod/sync/Cartography.java b/mapsync-mod/src/main/java/gjum/minecraft/mapsync/mod/sync/Cartography.java index d5d5a8e..c874fc4 100644 --- a/mapsync-mod/src/main/java/gjum/minecraft/mapsync/mod/sync/Cartography.java +++ b/mapsync-mod/src/main/java/gjum/minecraft/mapsync/mod/sync/Cartography.java @@ -4,7 +4,6 @@ import gjum.minecraft.mapsync.mod.data.BlockInfo; import gjum.minecraft.mapsync.mod.data.ChunkTile; import gjum.minecraft.mapsync.mod.net.buffers.BufferWriter; -import gjum.minecraft.mapsync.mod.utils.Shortcuts; import java.io.ByteArrayOutputStream; import java.security.MessageDigest; import java.util.ArrayList; @@ -34,13 +33,14 @@ public static ChunkTile chunkTileFromLevel(Level level, LevelChunk chunk) { int dataVersion = 1; // TODO speedup: don't serialize twice (once here, once later when writing to network) - final byte[] dataHash; { - final ByteArrayOutputStream os = new ByteArrayOutputStream(); - Failable.run(() -> ChunkTile.writeColumns(columns, new BufferWriter(os))); - final MessageDigest md = Shortcuts.shaHash(); - md.update(os.toByteArray()); - dataHash = md.digest(); - } + final byte[] dataHash = Failable.get(() -> { + final MessageDigest md = MessageDigest.getInstance("SHA-1"); + try (final var os = new ByteArrayOutputStream()) { + ChunkTile.writeColumns(columns, new BufferWriter(os)); + md.update(os.toByteArray()); + } + return md.digest(); + }); final ChunkPos chunkPos = chunk.getPos(); return new ChunkTile(dimension, chunkPos.x, chunkPos.z, timestamp, dataVersion, dataHash, columns); diff --git a/mapsync-mod/src/main/java/gjum/minecraft/mapsync/mod/utils/Shortcuts.java b/mapsync-mod/src/main/java/gjum/minecraft/mapsync/mod/utils/Shortcuts.java deleted file mode 100644 index 1f39f2a..0000000 --- a/mapsync-mod/src/main/java/gjum/minecraft/mapsync/mod/utils/Shortcuts.java +++ /dev/null @@ -1,16 +0,0 @@ -package gjum.minecraft.mapsync.mod.utils; - -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import org.jetbrains.annotations.NotNull; - -public final class Shortcuts { - public static @NotNull MessageDigest shaHash() { - try { - return MessageDigest.getInstance("SHA-1"); - } - catch (final NoSuchAlgorithmException e) { - throw new IllegalStateException("unreachable", e); - } - } -}