From 6dd31df09ebac3b51b9e03577270ba41284cbe44 Mon Sep 17 00:00:00 2001 From: Gegy Date: Sun, 16 Jul 2023 12:25:47 +0200 Subject: [PATCH] Fix: don't reference Vanilla classes --- .../forge/serverpacklocator/client/SimpleHttpClient.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/cpw/mods/forge/serverpacklocator/client/SimpleHttpClient.java b/src/main/java/cpw/mods/forge/serverpacklocator/client/SimpleHttpClient.java index dae748f..8669432 100644 --- a/src/main/java/cpw/mods/forge/serverpacklocator/client/SimpleHttpClient.java +++ b/src/main/java/cpw/mods/forge/serverpacklocator/client/SimpleHttpClient.java @@ -1,11 +1,11 @@ package cpw.mods.forge.serverpacklocator.client; import com.google.common.hash.HashCode; +import com.mojang.serialization.DataResult; import cpw.mods.forge.serverpacklocator.FileChecksumValidator; import cpw.mods.forge.serverpacklocator.LaunchEnvironmentHandler; import cpw.mods.forge.serverpacklocator.ServerManifest; import cpw.mods.modlauncher.api.LamdbaExceptionUtils; -import net.minecraft.Util; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -66,7 +66,8 @@ protected void downloadManifest(final String serverHost) throws IOException var connection = url.openConnection(); try (BufferedInputStream in = new BufferedInputStream(connection.getInputStream())) { - this.serverManifest = Util.getOrThrow(ServerManifest.loadFromStream(in), error -> new IllegalStateException("Manifest was malformed: " + error)); + DataResult result = ServerManifest.loadFromStream(in); + this.serverManifest = result.result().orElseThrow(() -> new IllegalStateException("Manifest was malformed: " + result.error().orElseThrow())); } catch (IOException e) { throw new IllegalStateException("Failed to download manifest", e); }