Skip to content

Remove Hasher class #119

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
Mar 19, 2026
Merged

Remove Hasher class #119

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
17 changes: 10 additions & 7 deletions mod/common/src/main/java/gjum/minecraft/mapsync/common/Cartography.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package gjum.minecraft.mapsync.common;

import gjum.minecraft.mapsync.common.data.*;
import gjum.minecraft.mapsync.common.utils.Hasher;
import gjum.minecraft.mapsync.common.utils.Shortcuts;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.security.MessageDigest;
import net.minecraft.client.Minecraft;
import net.minecraft.core.BlockPos;
import net.minecraft.tags.BlockTags;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.LightLayer;
import net.minecraft.world.level.chunk.LevelChunk;
Expand All @@ -31,11 +32,13 @@ public static ChunkTile chunkTileFromLevel(Level level, int cx, int cz) {
int dataVersion = 1;

// TODO speedup: don't serialize twice (once here, once later when writing to network)
var columnsBuf = Unpooled.buffer();
ChunkTile.writeColumns(columns, columnsBuf);
final byte[] dataHash = Hasher.sha1()
.update(columnsBuf)
.generateHash();
final byte[] dataHash; {
final ByteBuf columnsBuf = Unpooled.buffer();
ChunkTile.writeColumns(columns, columnsBuf);
final MessageDigest md = Shortcuts.shaHash();
md.update(columnsBuf.nioBuffer());
dataHash = md.digest();
}

return new ChunkTile(dimension, cx, cz, timestamp, dataVersion, dataHash, columns);
}
Expand Down
13 changes: 7 additions & 6 deletions mod/common/src/main/java/gjum/minecraft/mapsync/common/net/SyncClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import gjum.minecraft.mapsync.common.net.encryption.EncryptionDecoder;
import gjum.minecraft.mapsync.common.net.encryption.EncryptionEncoder;
import gjum.minecraft.mapsync.common.net.packet.*;
import gjum.minecraft.mapsync.common.utils.Hasher;
import gjum.minecraft.mapsync.common.utils.Shortcuts;
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.*;
import io.netty.channel.nio.NioEventLoopGroup;
Expand Down Expand Up @@ -247,11 +247,12 @@ void setUpEncryption(ChannelHandlerContext ctx, ClientboundEncryptionRequestPack

if (!MapSyncMod.getMod().isDevMode()) {
// note that this is different from minecraft (we get no negative hashes)
final String shaHex = HexFormat.of().formatHex(Hasher.sha1()
.update(sharedSecret)
.update(packet.publicKey.getEncoded())
.generateHash()
);
final String shaHex; {
final MessageDigest md = Shortcuts.shaHash();
md.update(sharedSecret);
md.update(packet.publicKey.getEncoded());
shaHex = HexFormat.of().formatHex(md.digest());
}

final User session = Minecraft.getInstance().getUser();
try {
Expand Down
116 changes: 0 additions & 116 deletions mod/common/src/main/java/gjum/minecraft/mapsync/common/utils/Hasher.java
View file
Open in desktop

This file was deleted.

16 changes: 16 additions & 0 deletions mod/common/src/main/java/gjum/minecraft/mapsync/common/utils/Shortcuts.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package gjum.minecraft.mapsync.common.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);
}
}
}
Loading