From 787644181a20d96bbbf0e363d01ec9310fe0ac3b Mon Sep 17 00:00:00 2001 From: Wagyourtail Date: Sat, 18 Feb 2023 16:59:39 -0700 Subject: [PATCH] fix dist names to match previous versions --- .../gradle/task/BaritoneGradleTask.java | 33 +++++++++++++++++-- .../baritone/gradle/task/CreateDistTask.java | 1 + .../baritone/gradle/task/ProguardTask.java | 17 ++-------- fabric/build.gradle | 8 +++-- forge/build.gradle | 8 +++-- tweaker/build.gradle | 1 - 6 files changed, 44 insertions(+), 24 deletions(-) diff --git a/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java b/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java index b3bc93851..2dad551f2 100644 --- a/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java +++ b/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java @@ -19,6 +19,8 @@ package baritone.gradle.task; import org.gradle.api.DefaultTask; import org.gradle.api.tasks.Input; +import org.gradle.api.tasks.Optional; +import org.gradle.api.tasks.TaskAction; import java.io.File; import java.io.IOException; @@ -49,14 +51,35 @@ class BaritoneGradleTask extends DefaultTask { ARTIFACT_STANDALONE = "%s-standalone-%s.jar"; protected String artifactName, artifactVersion; - protected final Path + protected Path artifactPath, artifactUnoptimizedPath, artifactApiPath, artifactStandalonePath, // these are different for forge builds proguardOut; + + @Input + @Optional + protected String compType = null; + + public String getCompType() { + return compType; + } + + public void setCompType(String compType) { + this.compType = compType; + } + + public BaritoneGradleTask() { - this.artifactName = getProject().getProperties().get("archivesBaseName").toString(); - this.artifactVersion = getProject().getVersion().toString(); + this.artifactName = getProject().getRootProject().getProperties().get("archives_base_name").toString(); + } + + public void doFirst() { + if (compType != null) { + this.artifactVersion = compType + "-" + getProject().getVersion(); + } else { + this.artifactVersion = getProject().getVersion().toString(); + } this.artifactPath = this.getBuildFile(formatVersion(ARTIFACT_STANDARD)); @@ -99,4 +122,8 @@ class BaritoneGradleTask extends DefaultTask { protected Path getBuildFile(String file) { return getRelativeFile("libs/" + file); } + + protected String addCompTypeFirst(String string) { + return compType == null ? string : compType + "-" + string; + } } diff --git a/buildSrc/src/main/java/baritone/gradle/task/CreateDistTask.java b/buildSrc/src/main/java/baritone/gradle/task/CreateDistTask.java index c4332c8b5..48cd0a72a 100644 --- a/buildSrc/src/main/java/baritone/gradle/task/CreateDistTask.java +++ b/buildSrc/src/main/java/baritone/gradle/task/CreateDistTask.java @@ -41,6 +41,7 @@ public class CreateDistTask extends BaritoneGradleTask { @TaskAction protected void exec() throws Exception { + super.doFirst(); super.verifyArtifacts(); // Define the distribution file paths diff --git a/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java b/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java index 37270b607..5d80a65ea 100644 --- a/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java +++ b/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java @@ -63,15 +63,9 @@ public class ProguardTask extends BaritoneGradleTask { return extract; } - @Input - private String compType; - - public String getCompType() { - return compType; - } - @TaskAction protected void exec() throws Exception { + super.doFirst(); super.verifyArtifacts(); // "Haha brady why don't you make separate tasks" @@ -253,7 +247,7 @@ public class ProguardTask extends BaritoneGradleTask { Files.createDirectories(this.getRootRelativeFile(PROGUARD_MAPPING_DIR)); List api = new ArrayList<>(template); - api.add(2, "-printmapping " + new File(this.getRootRelativeFile(PROGUARD_MAPPING_DIR).toFile(), "mappings-" + compType + "-api.txt")); + api.add(2, "-printmapping " + new File(this.getRootRelativeFile(PROGUARD_MAPPING_DIR).toFile(), "mappings-" + addCompTypeFirst("api.txt"))); // API config doesn't require any changes from the changes that we made to the template Files.write(getTemporaryFile(compType+PROGUARD_API_CONFIG), api); @@ -261,7 +255,7 @@ public class ProguardTask extends BaritoneGradleTask { // For the Standalone config, don't keep the API package List standalone = new ArrayList<>(template); standalone.removeIf(s -> s.contains("# this is the keep api")); - standalone.add(2, "-printmapping " + new File(this.getRootRelativeFile(PROGUARD_MAPPING_DIR).toFile(), "mappings-" + compType + "-standalone.txt")); + standalone.add(2, "-printmapping " + new File(this.getRootRelativeFile(PROGUARD_MAPPING_DIR).toFile(), "mappings-" + addCompTypeFirst("standalone.txt"))); Files.write(getTemporaryFile(compType+PROGUARD_STANDALONE_CONFIG), standalone); } @@ -294,11 +288,6 @@ public class ProguardTask extends BaritoneGradleTask { public void setExtract(String extract) { this.extract = extract; } - - public void setCompType(String compType) { - this.compType = compType; - } - private void runProguard(Path config) throws Exception { // Delete the existing proguard output file. Proguard probably handles this already, but why not do it ourselves if (Files.exists(this.proguardOut)) { diff --git a/fabric/build.gradle b/fabric/build.gradle index b1e722126..8adf7571b 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -22,7 +22,7 @@ plugins { id "com.github.johnrengelman.shadow" version "7.0.0" } -archivesBaseName = archivesBaseName + "-" + project.name +archivesBaseName = archivesBaseName + "-fabric" minecraft { fabric() @@ -79,10 +79,12 @@ components.java { task proguard(type: ProguardTask) { url 'https://github.com/Guardsquare/proguard/releases/download/v7.2.1/proguard-7.2.1.zip' extract 'proguard-7.2.1/lib/proguard.jar' - compType "FABRIC" + compType "fabric" } -task createDist(type: CreateDistTask, dependsOn: proguard) +task createDist(type: CreateDistTask, dependsOn: proguard) { + compType "fabric" +} build.finalizedBy(createDist) diff --git a/forge/build.gradle b/forge/build.gradle index da2c4e570..bac8ca54a 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -22,7 +22,7 @@ plugins { id "com.github.johnrengelman.shadow" version "7.0.0" } -archivesBaseName = archivesBaseName + "-" + project.name +archivesBaseName = archivesBaseName + "-forge" minecraft { forge { @@ -98,10 +98,12 @@ components.java { task proguard(type: ProguardTask) { url 'https://github.com/Guardsquare/proguard/releases/download/v7.2.1/proguard-7.2.1.zip' extract 'proguard-7.2.1/lib/proguard.jar' - compType "FORGE" + compType "forge" } -task createDist(type: CreateDistTask, dependsOn: proguard) +task createDist(type: CreateDistTask, dependsOn: proguard) { + compType "forge" +} build.finalizedBy(createDist) diff --git a/tweaker/build.gradle b/tweaker/build.gradle index 3fc0ab3bd..ce623af6c 100644 --- a/tweaker/build.gradle +++ b/tweaker/build.gradle @@ -97,7 +97,6 @@ jar { task proguard(type: ProguardTask) { url 'https://github.com/Guardsquare/proguard/releases/download/v7.2.1/proguard-7.2.1.zip' extract 'proguard-7.2.1/lib/proguard.jar' - compType "OFFICIAL" } task createDist(type: CreateDistTask, dependsOn: proguard)