From 567a91f7d06f1af312cd090e0fc7fe3d95347a39 Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Thu, 30 Dec 2021 13:36:10 +0100
Subject: [PATCH] Don't use DigestUtils

---
 gradle.properties                                   |  8 ++++----
 .../dynres/mixin/ServerPropertiesHandlerMixin.java  | 13 ++++++++-----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 6fb89e7..e255d38 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -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
diff --git a/src/main/java/io/gitlab/jfronny/dynres/mixin/ServerPropertiesHandlerMixin.java b/src/main/java/io/gitlab/jfronny/dynres/mixin/ServerPropertiesHandlerMixin.java
index 92ea93d..b187605 100644
--- a/src/main/java/io/gitlab/jfronny/dynres/mixin/ServerPropertiesHandlerMixin.java
+++ b/src/main/java/io/gitlab/jfronny/dynres/mixin/ServerPropertiesHandlerMixin.java
@@ -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);
                 }
             }