diff --git a/build.gradle b/build.gradle index fe4a2279..9943ad3d 100755 --- a/build.gradle +++ b/build.gradle @@ -218,7 +218,7 @@ task createSrgMc(type: RenameJarInPlace) { // fork setMappingType(net.minecraftforge.gradle.common.util.MappingFile.Mapping.SEARGE) - setJarTask('trans alaskan pipeline') + setJarTask('trans alaska pipeline') } project.afterEvaluate { createSrgMc.dependsOn(extractSrg, copyMcJar) diff --git a/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java b/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java index 9549d7e7..b77889d7 100644 --- a/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java +++ b/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java @@ -41,10 +41,10 @@ class BaritoneGradleTask extends DefaultTask { PROGUARD_STANDALONE_CONFIG = "standalone.pro", PROGUARD_EXPORT_PATH = "proguard_out.jar", - ARTIFACT_STANDARD = "%s-%s.jar", - ARTIFACT_UNOPTIMIZED = "%s-unoptimized-%s.jar", - ARTIFACT_API = "%s-api-%s.jar", - ARTIFACT_STANDALONE = "%s-standalone-%s.jar", + 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-unoptimized-forge-%s.jar", ARTIFACT_FORGE_API = "%s-api-forge-%s.jar", ARTIFACT_FORGE_STANDALONE = "%s-standalone-forge-%s.jar"; diff --git a/buildSrc/src/main/java/baritone/gradle/task/CreateDistTask.java b/buildSrc/src/main/java/baritone/gradle/task/CreateDistTask.java index 6530830e..6b9f3bf9 100644 --- a/buildSrc/src/main/java/baritone/gradle/task/CreateDistTask.java +++ b/buildSrc/src/main/java/baritone/gradle/task/CreateDistTask.java @@ -23,9 +23,9 @@ import javax.xml.bind.DatatypeConverter; import java.nio.file.Files; import java.nio.file.Path; import java.security.MessageDigest; +import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import java.util.stream.Stream; import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; @@ -59,8 +59,8 @@ public class CreateDistTask extends BaritoneGradleTask { Files.copy(this.artifactUnoptimizedPath, unoptimized, REPLACE_EXISTING); // Calculate all checksums and format them like "shasum" - List shasum = Files.walk(getRelativeFile("dist"), 1) - .filter(p -> p.toString().endsWith(".jar")) + List shasum = getAllDistJars().stream() + .filter(Files::exists) .map(path -> sha1(path) + " " + path.getFileName().toString()) .collect(Collectors.toList()); @@ -74,6 +74,17 @@ public class CreateDistTask extends BaritoneGradleTask { return p.getFileName().toString(); } + private List getAllDistJars() { + return Arrays.asList( + getRelativeFile("dist/" + formatVersion(ARTIFACT_UNOPTIMIZED)), + getRelativeFile("dist/" + formatVersion(ARTIFACT_API)), + getRelativeFile("dist/" + formatVersion(ARTIFACT_STANDALONE)), + getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_UNOPTIMIZED)), + getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_API)), + getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_STANDALONE)) + ); + } + private static synchronized String sha1(Path path) { try { if (SHA1_DIGEST == null) { diff --git a/src/api/java/baritone/api/BaritoneAPI.java b/src/api/java/baritone/api/BaritoneAPI.java index 66875efe..4a87449c 100644 --- a/src/api/java/baritone/api/BaritoneAPI.java +++ b/src/api/java/baritone/api/BaritoneAPI.java @@ -35,7 +35,7 @@ public final class BaritoneAPI { SettingsUtil.readAndApply(settings); try { - provider = (IBaritoneProvider)Class.forName("baritone.BaritoneProvider").newInstance(); + provider = (IBaritoneProvider) Class.forName("baritone.BaritoneProvider").newInstance(); } catch (ReflectiveOperationException ex) { throw new RuntimeException(ex); }