Miko/baritone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

explicitly include mixin "properly", mavenpublish should work now

Browse Source
This commit is contained in:
Wagyourtail
2022-04-04 20:10:25 -07:00
parent 3cee66229a
commit 16f93ce769
6 changed files with 60 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,13 +53,6 @@ public class ProguardTask extends BaritoneGradleTask {
return url;
}
@Input
private String mixinUrl;
public String getMixinUrl() {
return mixinUrl;
}
@Input
private String extract;
@@ -93,7 +86,7 @@ public class ProguardTask extends BaritoneGradleTask {
}
private File getMcJar() throws IOException {
File mcClientJar = this.getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("main").getRuntimeClasspath().getFiles()
File mcClientJar = this.getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("main").getCompileClasspath().getFiles()
.stream()
.filter(this::isMcJar)
.map(f -> {
@@ -138,13 +131,6 @@ public class ProguardTask extends BaritoneGradleTask {
}
}
private void downloadMixin() throws Exception {
Path mixinJar = getTemporaryFile(MIXIN_JAR);
if (!Files.exists(mixinJar)) {
write(new URL(this.mixinUrl).openStream(), mixinJar);
}
}
private String getJavaBinPathForProguard() throws Exception {
String path;
try {
@@ -273,9 +259,6 @@ public class ProguardTask extends BaritoneGradleTask {
libraries.forEach(f -> {
template.add(2, "-libraryjars '" + f + "'");
});
downloadMixin();
template.add(2, "-libraryjars '" + this.getTemporaryFile(MIXIN_JAR) + "'");
}
Files.createDirectories(this.getRootRelativeFile(PROGUARD_MAPPING_DIR));
@@ -294,7 +277,7 @@ public class ProguardTask extends BaritoneGradleTask {
}
private Stream<File> acquireDependencies() {
return getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("main").getRuntimeClasspath().getFiles()
return getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("main").getCompileClasspath().getFiles()
.stream()
.filter(File::isFile);
}
@@ -319,10 +302,6 @@ public class ProguardTask extends BaritoneGradleTask {
this.url = url;
}
public void setMixinUrl(String mixinUrl) {
this.mixinUrl = mixinUrl;
}
public void setExtract(String extract) {
this.extract = extract;
}