From 8dfe5dfd32efb55587c64c5678f83dba8625bfc6 Mon Sep 17 00:00:00 2001 From: Brady Date: Fri, 9 Nov 2018 22:43:00 -0600 Subject: [PATCH] Fix jce.jar not being included as library jar in proguard config --- buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java b/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java index 028874fd8..251508f9d 100644 --- a/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java +++ b/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java @@ -30,6 +30,7 @@ import java.io.*; import java.net.URL; import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.Paths; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -110,8 +111,8 @@ public class ProguardTask extends BaritoneGradleTask { // Acquire the RT jar using "java -verbose". This doesn't work on Java 9+ Process p = new ProcessBuilder("java", "-verbose").start(); String out = IOUtils.toString(p.getInputStream(), "UTF-8").split("\n")[0].split("Opened ")[1].replace("]", ""); - // TODO Add jce.jar too template.add(2, "-libraryjars '" + out + "'"); + template.add(3, "-libraryjars '" + Paths.get(out).resolveSibling("jce.jar") + "'"); // API config doesn't require any changes from the changes that we made to the template Files.write(getTemporaryFile(PROGUARD_API_CONFIG), template);