From 2e2e725eb393c72747eae9eba77ea509601d7001 Mon Sep 17 00:00:00 2001 From: wagyourtail Date: Thu, 23 Sep 2021 19:10:52 -0600 Subject: [PATCH] fix proguard to have proper loom 0.10.x minecraft jar locations --- .github/workflows/gradle_build.yml | 2 +- .../src/main/java/baritone/gradle/task/ProguardTask.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index 900cee060..c0b10b208 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -29,7 +29,7 @@ jobs: - name: Build (fabric) with Gradle run: ./gradlew build -Pbaritone.fabric_build - - name: Build (fabric) with Gradle + - name: Build (forge) with Gradle run: ./gradlew build -Pbaritone.forge_build -Ploom.platform=forge - name: Archive Artifacts diff --git a/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java b/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java index 53d7ca6bf..d31829384 100644 --- a/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java +++ b/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java @@ -92,11 +92,11 @@ public class ProguardTask extends BaritoneGradleTask { .map(f -> { switch (compType) { case "OFFICIAL": - return new File(f.getParentFile().getParentFile(), f.getName().toString().split("mapped")[0] + "merged.jar"); + return new File(f.getParentFile().getParentFile(), "minecraft-merged.jar"); case "FABRIC": - return new File(f.getParentFile().getParentFile(), f.getName().toString().replace("mapped", "intermediary")); + return new File(f.getParentFile(), "minecraft-intermediary.jar"); case "FORGE": - return new File(f.getParentFile().getParentFile(), f.getName().toString().replace("mapped", "srg")); + return new File(f.getParentFile(), "minecraft-srg.jar"); } return null; })