Skip to content

Remove Shortcuts class #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Protonull merged 1 commit into from
Apr 14, 2026
Merged

Remove Shortcuts class #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions mapsync-mod/src/main/java/gjum/minecraft/mapsync/mod/sync/Cartography.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
16 changes: 0 additions & 16 deletions mapsync-mod/src/main/java/gjum/minecraft/mapsync/mod/utils/Shortcuts.java
View file
Open in desktop

This file was deleted.