fix proguard to have proper loom 0.10.x minecraft jar locations

This commit is contained in:
wagyourtail 2021-09-23 19:10:52 -06:00
parent 202618a32a
commit 2e2e725eb3
2 changed files with 4 additions and 4 deletions

View File

@ -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

View File

@ -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;
})