RepoMirrors
/
baritone
mirror of https://github.com/cabaletta/baritone
1
0
Fork 1
Code Issues Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/gradle_build.yml vendored
View File

@ -29,7 +29,7 @@ jobs:
- name: Build (fabric) with Gradle - name: Build (fabric) with Gradle
run: ./gradlew build -Pbaritone.fabric_build 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 run: ./gradlew build -Pbaritone.forge_build -Ploom.platform=forge
- name: Archive Artifacts - name: Archive Artifacts

6
buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java
View File

@ -92,11 +92,11 @@ public class ProguardTask extends BaritoneGradleTask {
.map(f -> { .map(f -> {
switch (compType) { switch (compType) {
case "OFFICIAL": 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": case "FABRIC":
return new File(f.getParentFile().getParentFile(), f.getName().toString().replace("mapped", "intermediary")); return new File(f.getParentFile(), "minecraft-intermediary.jar");
case "FORGE": case "FORGE":
return new File(f.getParentFile().getParentFile(), f.getName().toString().replace("mapped", "srg")); return new File(f.getParentFile(), "minecraft-srg.jar");
} }
return null; return null;
}) })