JfMods/DynRes
JfMods
/
DynRes
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't use DigestUtils

This commit is contained in:
Johannes Frohnmeyer 2021-12-30 13:36:10 +01:00
parent d317e23c42
commit 567a91f7d0
Signed by: Johannes
GPG Key ID: E76429612C2929F4
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gradle.properties
View File

@ -2,14 +2,14 @@
org.gradle.jvmargs=-Xmx1G
# Fabric Properties
# check these on https://fabricmc.net/versions.html
minecraft_version=1.18
yarn_mappings=build.1
loader_version=0.12.6
minecraft_version=1.18.1
yarn_mappings=build.12
loader_version=0.12.12
# Mod Properties
maven_group=io.gitlab.jfronny
archives_base_name=dynres
#Dependencies
fabric_version=0.43.1+1.18
fabric_version=0.45.0+1.18
jfapi_version=2.2.0
modrinth_id=v3lfX2LD

13
src/main/java/io/gitlab/jfronny/dynres/mixin/ServerPropertiesHandlerMixin.java
View File

@ -5,7 +5,6 @@ import io.gitlab.jfronny.dynres.DynRes;
import io.gitlab.jfronny.libjf.web.api.WebServer;
import io.gitlab.jfronny.libjf.web.impl.util.WebPaths;
import net.minecraft.server.dedicated.ServerPropertiesHandler;
import org.apache.commons.codec.digest.DigestUtils;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Mutable;
@ -15,8 +14,10 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Base64;
@Mixin(ServerPropertiesHandler.class)
public class ServerPropertiesHandlerMixin {
@ -31,10 +32,12 @@ public class ServerPropertiesHandlerMixin {
DynRes.LOGGER.info("Pack link: " + resourcePack);
resourcePackSha1 = "";
if (Cfg.hashResources) {
try (InputStream fs = Files.newInputStream(DynRes.resFile)) {
resourcePackSha1 = DigestUtils.sha1Hex(fs);
try {
MessageDigest digest = MessageDigest.getInstance("SHA-256");
byte[] hash = digest.digest(Files.readAllBytes(DynRes.resFile));
resourcePackSha1 = Base64.getEncoder().encodeToString(hash);
DynRes.LOGGER.info("Set hash to " + resourcePackSha1);
} catch (IOException e) {
} catch (IOException | NoSuchAlgorithmException e) {
DynRes.LOGGER.error("Failed to get hash, continuing with empty", e);
}
}