From fd43dace702c1ea6a8b06fa0509abb3b1f803c14 Mon Sep 17 00:00:00 2001 From: Wagyourtail Date: Wed, 8 Jun 2022 10:16:09 -0600 Subject: [PATCH] rework this again and fix dist --- .../gradle/task/BaritoneGradleTask.java | 29 ++++--------------- .../baritone/gradle/task/CreateDistTask.java | 20 +++---------- 2 files changed, 10 insertions(+), 39 deletions(-) diff --git a/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java b/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java index dc5712a20..b3bc93851 100644 --- a/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java +++ b/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java @@ -46,13 +46,7 @@ class BaritoneGradleTask extends DefaultTask { ARTIFACT_STANDARD = "%s-%s.jar", ARTIFACT_UNOPTIMIZED = "%s-unoptimized-%s.jar", ARTIFACT_API = "%s-api-%s.jar", - ARTIFACT_STANDALONE = "%s-standalone-%s.jar", - ARTIFACT_FORGE_UNOPTIMIZED = "%s-forge-unoptimized-%s.jar", - ARTIFACT_FORGE_API = "%s-forge-api-%s.jar", - ARTIFACT_FORGE_STANDALONE = "%s-forge-standalone-%s.jar", - ARTIFACT_FABRIC_UNOPTIMIZED = "%s-fabric-standalone-%s.jar", - ARTIFACT_FABRIC_API = "%s-fabric-api-%s.jar", - ARTIFACT_FABRIC_STANDALONE = "%s-fabric-standalone-%s.jar"; + ARTIFACT_STANDALONE = "%s-standalone-%s.jar"; protected String artifactName, artifactVersion; protected final Path @@ -61,25 +55,14 @@ class BaritoneGradleTask extends DefaultTask { proguardOut; public BaritoneGradleTask() { - this.artifactName = getProject().getProperties().get("archives_base_name").toString(); + this.artifactName = getProject().getProperties().get("archivesBaseName").toString(); this.artifactVersion = getProject().getVersion().toString(); - String subprojectArtifactName = getProject().getProperties().get("archivesBaseName").toString(); - this.artifactPath = this.getBuildFile(String.format(ARTIFACT_STANDARD, subprojectArtifactName, artifactVersion)); + this.artifactPath = this.getBuildFile(formatVersion(ARTIFACT_STANDARD)); - if (getProject().hasProperty("baritone.forge_build")) { - this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_FORGE_UNOPTIMIZED)); - this.artifactApiPath = this.getBuildFile(formatVersion(ARTIFACT_FORGE_API)); - this.artifactStandalonePath = this.getBuildFile(formatVersion(ARTIFACT_FORGE_STANDALONE)); - } else if (getProject().hasProperty("baritone.fabric_build")) { - this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_FABRIC_UNOPTIMIZED)); - this.artifactApiPath = this.getBuildFile(formatVersion(ARTIFACT_FABRIC_API)); - this.artifactStandalonePath = this.getBuildFile(formatVersion(ARTIFACT_FABRIC_STANDALONE)); - } else { - this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_UNOPTIMIZED)); - this.artifactApiPath = this.getBuildFile(formatVersion(ARTIFACT_API)); - this.artifactStandalonePath = this.getBuildFile(formatVersion(ARTIFACT_STANDALONE)); - } + this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_UNOPTIMIZED)); + this.artifactApiPath = this.getBuildFile(formatVersion(ARTIFACT_API)); + this.artifactStandalonePath = this.getBuildFile(formatVersion(ARTIFACT_STANDALONE)); this.proguardOut = this.getTemporaryFile(PROGUARD_EXPORT_PATH); } diff --git a/buildSrc/src/main/java/baritone/gradle/task/CreateDistTask.java b/buildSrc/src/main/java/baritone/gradle/task/CreateDistTask.java index ca06dd6f8..c4332c8b5 100644 --- a/buildSrc/src/main/java/baritone/gradle/task/CreateDistTask.java +++ b/buildSrc/src/main/java/baritone/gradle/task/CreateDistTask.java @@ -21,7 +21,9 @@ import org.gradle.api.tasks.TaskAction; import java.nio.charset.StandardCharsets; import java.nio.file.Files; +import java.nio.file.OpenOption; import java.nio.file.Path; +import java.nio.file.StandardOpenOption; import java.security.MessageDigest; import java.util.Arrays; import java.util.List; @@ -59,8 +61,8 @@ public class CreateDistTask extends BaritoneGradleTask { Files.copy(this.artifactUnoptimizedPath, unoptimized, REPLACE_EXISTING); // Calculate all checksums and format them like "shasum" - List shasum = getAllDistJars().stream() - .filter(Files::exists) + List shasum = Files.list(getRootRelativeFile("dist/")) + .filter(e -> e.getFileName().toString().endsWith(".jar")) .map(path -> sha1(path) + " " + path.getFileName().toString()) .collect(Collectors.toList()); @@ -74,20 +76,6 @@ public class CreateDistTask extends BaritoneGradleTask { return p.getFileName().toString(); } - private List getAllDistJars() { - return Arrays.asList( - getRootRelativeFile("dist/" + formatVersion(ARTIFACT_API)), - getRootRelativeFile("dist/" + formatVersion(ARTIFACT_FABRIC_API)), - getRootRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_API)), - getRootRelativeFile("dist/" + formatVersion(ARTIFACT_STANDALONE)), - getRootRelativeFile("dist/" + formatVersion(ARTIFACT_FABRIC_STANDALONE)), - getRootRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_STANDALONE)), - getRootRelativeFile("dist/" + formatVersion(ARTIFACT_UNOPTIMIZED)), - getRootRelativeFile("dist/" + formatVersion(ARTIFACT_FABRIC_UNOPTIMIZED)), - getRootRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_UNOPTIMIZED)) - ); - } - private static synchronized String sha1(Path path) { try { if (SHA1_DIGEST == null) {