From a67ed507ec2c17a29683d74e6e757c9436fa23e0 Mon Sep 17 00:00:00 2001 From: 33 Date: Wed, 27 Jul 2022 20:32:55 +0800 Subject: [PATCH] Fix: CurseForge metadata json --- .../gradle/util/ConfigUtil.java | 2 +- .../gradle/util/CurseForgeUtil.java | 40 +++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/buildSrc/src/main/java/customskinloader/gradle/util/ConfigUtil.java b/buildSrc/src/main/java/customskinloader/gradle/util/ConfigUtil.java index 9a0fc35..12b003a 100644 --- a/buildSrc/src/main/java/customskinloader/gradle/util/ConfigUtil.java +++ b/buildSrc/src/main/java/customskinloader/gradle/util/ConfigUtil.java @@ -21,7 +21,7 @@ public class ConfigUtil { ConfigObject config = getConfig(project); Object o = config.get(key); if (o == null) { - System.out.printf("Config '%s' not found in '%s'", key, project.getName()); + //System.out.printf("Config '%s' not found in '%s'", key, project.getName()); return null; } if (!(o instanceof String)) { diff --git a/buildSrc/src/main/java/customskinloader/gradle/util/CurseForgeUtil.java b/buildSrc/src/main/java/customskinloader/gradle/util/CurseForgeUtil.java index 16724a3..ea3dbe3 100644 --- a/buildSrc/src/main/java/customskinloader/gradle/util/CurseForgeUtil.java +++ b/buildSrc/src/main/java/customskinloader/gradle/util/CurseForgeUtil.java @@ -28,26 +28,26 @@ public class CurseForgeUtil { task.setApiKey(System.getenv("CURSEFORGE_API_KEY")); task.setProjectId("286924"); - task.setMainArtifact(new CurseArtifact() { - { - this.setArtifact(project.getTasks().getByName("jar")); - List gameVersionStrings = new ArrayList<>(); - Optional.ofNullable(ConfigUtil.getConfigString(project, "minecraft_full_versions")) - .ifPresent(versions -> Collections.addAll(gameVersionStrings, versions.split(","))); // Minecraft Versions - Optional.ofNullable(ConfigUtil.getConfigString(project, "java_full_versions")) - .ifPresent(versions -> { - for (String javaVersion : versions.split(",")) { - gameVersionStrings.add("Java " + javaVersion); // Java Versions - } - }); - gameVersionStrings.add(project.getName().split("/")[0]); // Loader Version - this.setGameVersionStrings(gameVersionStrings); - this.setChangelogType("text"); - this.setChangelog(System.getenv("GIT_COMMIT_DESC")); - this.setDisplayName(project.getConvention().getPlugin(BasePluginConvention.class).getArchivesBaseName() + "-" + VersionUtil.getShortVersion(project.getRootProject())); - this.setReleaseType(VersionUtil.isSnapshot(project.getRootProject()) ? "beta" : "release"); - } - }); + + CurseArtifact artifact = new CurseArtifact(); + artifact.setArtifact(project.getTasks().getByName("jar")); + List gameVersionStrings = new ArrayList<>(); + Optional.ofNullable(ConfigUtil.getConfigString(project, "minecraft_full_versions")) + .ifPresent(versions -> Collections.addAll(gameVersionStrings, versions.split(","))); // Minecraft Versions + Optional.ofNullable(ConfigUtil.getConfigString(project, "java_full_versions")) + .ifPresent(versions -> { + for (String javaVersion : versions.split(",")) { + gameVersionStrings.add("Java " + javaVersion); // Java Versions + } + }); + gameVersionStrings.add(project.getName().split("/")[0]); // Loader Version + artifact.setGameVersionStrings(gameVersionStrings); + artifact.setChangelogType("text"); + artifact.setChangelog(System.getenv("GIT_COMMIT_DESC")); + artifact.setDisplayName(project.getConvention().getPlugin(BasePluginConvention.class).getArchivesBaseName() + "-" + VersionUtil.getShortVersion(project.getRootProject())); + artifact.setReleaseType(VersionUtil.isSnapshot(project.getRootProject()) ? "beta" : "release"); + task.setMainArtifact(artifact); + task.setAdditionalArtifacts(new ArrayList<>()); TaskUtil.withTask(project.getRootProject(), "upload", task0 -> task0.finalizedBy(task));