Skip to content

转化 CurseMetaMod 为 Record #6822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Glavo merged 1 commit into from
Sep 6, 2026
+14 −29
Merged

转化 CurseMetaMod 为 Record #6822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 12 additions & 27 deletions HMCLCore/src/main/java/org/jackhuang/hmcl/modpack/curse/CurseMetaMod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,43 +26,28 @@
* https://addons-ecs.forgesvc.net/api/v2/addon/<projectID>/file/<fileID>
*/
@Immutable
public final class CurseMetaMod {
@SerializedName(value = "Id", alternate = "id")
private final int id;
public record CurseMetaMod(@SerializedName(value = "Id", alternate = "id") int id,
@SerializedName(value = "FileName", alternate = "fileName") String fileName,
@SerializedName(value = "FileNameOnDisk") String fileNameOnDisk,
@SerializedName(value = "DownloadURL", alternate = "downloadUrl") String downloadURL) {

@SerializedName(value = "FileName", alternate = "fileName")
private final String fileName;

@SerializedName(value = "FileNameOnDisk")
private final String fileNameOnDisk;

@SerializedName(value = "DownloadURL", alternate = "downloadUrl")
private final String downloadURL;

public CurseMetaMod() {
this(0, "", "", "");
}

public CurseMetaMod(int id, String fileName, String fileNameOnDisk, String downloadURL) {
this.id = id;
this.fileName = fileName;
this.fileNameOnDisk = fileNameOnDisk;
this.downloadURL = downloadURL;
}

public int getId() {
@Override
public int id() {
return id;
}

public String getFileName() {
@Override
public String fileName() {
return fileName;
}

public String getFileNameOnDisk() {
@Override
public String fileNameOnDisk() {
return fileNameOnDisk;
}

public String getDownloadURL() {
@Override
public String downloadURL() {
return downloadURL;
}
}
4 changes: 2 additions & 2 deletions HMCLCore/src/main/java/org/jackhuang/hmcl/modpack/mcbbs/McbbsModpackCompletionTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ public CompletableFuture<Void> getFuture(TaskCompletableFuture executor) {
try {
String result = NetworkUtils.doGet(String.format("https://cursemeta.dries007.net/%d/%d.json", file.getProjectID(), file.getFileID()));
CurseMetaMod mod = JsonUtils.fromNonNullJson(result, CurseMetaMod.class);
return file.withFileName(mod.getFileNameOnDisk()).withURL(mod.getDownloadURL());
return file.withFileName(mod.fileNameOnDisk()).withURL(mod.downloadURL());
} catch (FileNotFoundException fof) {
LOG.warning("Could not query cursemeta for deleted mods: " + file.getUrl(), fof);
notFound.set(true);
Expand All @@ -232,7 +232,7 @@ public CompletableFuture<Void> getFuture(TaskCompletableFuture executor) {
try {
String result = NetworkUtils.doGet(String.format("https://addons-ecs.forgesvc.net/api/v2/addon/%d/file/%d", file.getProjectID(), file.getFileID()));
CurseMetaMod mod = JsonUtils.fromNonNullJson(result, CurseMetaMod.class);
return file.withFileName(mod.getFileName()).withURL(mod.getDownloadURL());
return file.withFileName(mod.fileName()).withURL(mod.downloadURL());
} catch (FileNotFoundException fof) {
LOG.warning("Could not query forgesvc for deleted mods: " + file.getUrl(), fof);
notFound.set(true);
Expand Down