Skip to content

[Chores] 将 fabric & quilt & legacy-fabric 相关类转换为记录类 #6357

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

Closed
ToobLac wants to merge 1 commit into from
Closed

[Chores] 将 fabric & quilt & legacy-fabric 相关类转换为记录类 #6357

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
27 changes: 2 additions & 25 deletions HMCLCore/src/main/java/org/jackhuang/hmcl/addon/meta/QuiltModMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,31 +35,8 @@

@Immutable
public final class QuiltModMetadata {
private static final class QuiltLoader {
private static final class Metadata {
private final String name;
private final String description;
private final JsonObject contributors;
private final String icon;
private final JsonObject contact;

public Metadata(String name, String description, JsonObject contributors, String icon, JsonObject contact) {
this.name = name;
this.description = description;
this.contributors = contributors;
this.icon = icon;
this.contact = contact;
}
}

private final String id;
private final String version;
private final Metadata metadata;

public QuiltLoader(String id, String version, Metadata metadata) {
this.id = id;
this.version = version;
this.metadata = metadata;
private record QuiltLoader(String id, String version, Metadata metadata) {
private record Metadata(String name, String description, JsonObject contributors, String icon, JsonObject contact) {
}
}

Expand Down
81 changes: 3 additions & 78 deletions HMCLCore/src/main/java/org/jackhuang/hmcl/download/fabric/FabricInstallTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,89 +129,14 @@ private Version getPatch(FabricInfo fabricInfo, String gameVersion, String loade
}

@JsonSerializable
public static class FabricInfo {
private final LoaderInfo loader;
private final IntermediaryInfo intermediary;
private final JsonObject launcherMeta;

public FabricInfo(LoaderInfo loader, IntermediaryInfo intermediary, JsonObject launcherMeta) {
this.loader = loader;
this.intermediary = intermediary;
this.launcherMeta = launcherMeta;
}

public LoaderInfo getLoader() {
return loader;
}

public IntermediaryInfo getIntermediary() {
return intermediary;
}

public JsonObject getLauncherMeta() {
return launcherMeta;
}
public record FabricInfo(LoaderInfo loader, IntermediaryInfo intermediary, JsonObject launcherMeta) {
}

@JsonSerializable
public static class LoaderInfo {
private final String separator;
private final int build;
private final String maven;
private final String version;
private final boolean stable;

public LoaderInfo(String separator, int build, String maven, String version, boolean stable) {
this.separator = separator;
this.build = build;
this.maven = maven;
this.version = version;
this.stable = stable;
}

public String getSeparator() {
return separator;
}

public int getBuild() {
return build;
}

public String getMaven() {
return maven;
}

public String getVersion() {
return version;
}

public boolean isStable() {
return stable;
}
public record LoaderInfo(String separator, int build, String maven, String version, boolean stable) {
}

@JsonSerializable
public static class IntermediaryInfo {
private final String maven;
private final String version;
private final boolean stable;

public IntermediaryInfo(String maven, String version, boolean stable) {
this.maven = maven;
this.version = version;
this.stable = stable;
}

public String getMaven() {
return maven;
}

public String getVersion() {
return version;
}

public boolean isStable() {
return stable;
}
public record IntermediaryInfo(String maven, String version, boolean stable) {
}
}
30 changes: 4 additions & 26 deletions HMCLCore/src/main/java/org/jackhuang/hmcl/download/fabric/FabricVersionList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,39 +68,17 @@ public Task<?> refreshAsync() {
private List<String> getGameVersions(String metaUrl) throws IOException {
String json = NetworkUtils.doGet(downloadProvider.injectURLWithCandidates(metaUrl));
return JsonUtils.GSON.fromJson(json, listTypeOf(GameVersion.class))
.stream().map(GameVersion::getVersion).collect(Collectors.toList());
.stream().map(GameVersion::version).collect(Collectors.toList());
}

private static String getLaunchMetaUrl(String gameVersion, String loaderVersion) {
return String.format("https://meta.fabricmc.net/v2/versions/loader/%s/%s", gameVersion, loaderVersion);
}

private static class GameVersion {
private final String version;
private final String maven;
private final boolean stable;
private record GameVersion(String version, @Nullable String maven, boolean stable) {

public GameVersion() {
this("", null, false);
}

public GameVersion(String version, String maven, boolean stable) {
this.version = version;
this.maven = maven;
this.stable = stable;
}

public String getVersion() {
return version;
}

@Nullable
public String getMaven() {
return maven;
}

public boolean isStable() {
return stable;
GameVersion {
if (version == null) version = "";
}
}
}
6 changes: 3 additions & 3 deletions HMCLCore/src/main/java/org/jackhuang/hmcl/download/legacyfabric/LegacyFabricInstallTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public void execute() {
}

private Version getPatch(FabricInstallTask.FabricInfo legacyFabricInfo, String gameVersion, String loaderVersion) {
JsonObject launcherMeta = legacyFabricInfo.getLauncherMeta();
JsonObject launcherMeta = legacyFabricInfo.launcherMeta();
Arguments arguments = new Arguments();

String mainClass;
Expand All @@ -107,8 +107,8 @@ private Version getPatch(FabricInstallTask.FabricInfo legacyFabricInfo, String g
}

// libraries.add(new Library(Artifact.fromDescriptor(legacyFabricInfo.hashed.maven), getMavenRepositoryByGroup(legacyFabricInfo.hashed.maven), null));
libraries.add(new Library(Artifact.fromDescriptor(legacyFabricInfo.getIntermediary().getMaven()), getMavenRepositoryByGroup(legacyFabricInfo.getIntermediary().getMaven()), null));
libraries.add(new Library(Artifact.fromDescriptor(legacyFabricInfo.getLoader().getMaven()), getMavenRepositoryByGroup(legacyFabricInfo.getLoader().getMaven()), null));
libraries.add(new Library(Artifact.fromDescriptor(legacyFabricInfo.intermediary().maven()), getMavenRepositoryByGroup(legacyFabricInfo.intermediary().maven()), null));
libraries.add(new Library(Artifact.fromDescriptor(legacyFabricInfo.loader().maven()), getMavenRepositoryByGroup(legacyFabricInfo.loader().maven()), null));

return new Version(LibraryAnalyzer.LibraryType.LEGACY_FABRIC.getPatchId(), loaderVersion, Version.PRIORITY_LOADER, arguments, mainClass, libraries);
}
Expand Down
30 changes: 4 additions & 26 deletions HMCLCore/src/main/java/org/jackhuang/hmcl/download/legacyfabric/LegacyFabricVersionList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public Task<?> refreshAsync() {
private List<String> getGameVersions(String metaUrl) throws IOException {
String json = NetworkUtils.doGet(downloadProvider.injectURLWithCandidates(metaUrl));
return JsonUtils.GSON.fromJson(json, listTypeOf(GameVersion.class))
.stream().map(GameVersion::getVersion).collect(Collectors.toList());
.stream().map(GameVersion::version).collect(Collectors.toList());
}

private static String normalizeVersion(String version) {
Expand All @@ -84,32 +84,10 @@ private static String getLaunchMetaUrl(String gameVersion, String loaderVersion)
return String.format("https://meta.legacyfabric.net/v2/versions/loader/%s/%s", gameVersion, loaderVersion);
}

private static class GameVersion {
private final String version;
private final String maven;
private final boolean stable;
private record GameVersion(String version, @Nullable String maven, boolean stable) {

public GameVersion() {
this("", null, false);
}

public GameVersion(String version, String maven, boolean stable) {
this.version = version;
this.maven = maven;
this.stable = stable;
}

public String getVersion() {
return version;
}

@Nullable
public String getMaven() {
return maven;
}

public boolean isStable() {
return stable;
GameVersion {
if (version == null) version = "";
}
}
}
81 changes: 3 additions & 78 deletions HMCLCore/src/main/java/org/jackhuang/hmcl/download/quilt/QuiltInstallTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,89 +137,14 @@ private static String getMavenRepositoryByGroup(String maven) {
}

@JsonSerializable
public static class QuiltInfo {
private final LoaderInfo loader;
private final IntermediaryInfo hashed;
private final IntermediaryInfo intermediary;
private final JsonObject launcherMeta;

public QuiltInfo(LoaderInfo loader, IntermediaryInfo hashed, IntermediaryInfo intermediary, JsonObject launcherMeta) {
this.loader = loader;
this.hashed = hashed;
this.intermediary = intermediary;
this.launcherMeta = launcherMeta;
}

public LoaderInfo getLoader() {
return loader;
}

public IntermediaryInfo getHashed() {
return hashed;
}

public IntermediaryInfo getIntermediary() {
return intermediary;
}

public JsonObject getLauncherMeta() {
return launcherMeta;
}
public record QuiltInfo(LoaderInfo loader, IntermediaryInfo hashed, IntermediaryInfo intermediary, JsonObject launcherMeta) {
}

@JsonSerializable
public static class LoaderInfo {
private final String separator;
private final int build;
private final String maven;
private final String version;
private final boolean stable;

public LoaderInfo(String separator, int build, String maven, String version, boolean stable) {
this.separator = separator;
this.build = build;
this.maven = maven;
this.version = version;
this.stable = stable;
}

public String getSeparator() {
return separator;
}

public int getBuild() {
return build;
}

public String getMaven() {
return maven;
}

public String getVersion() {
return version;
}

public boolean isStable() {
return stable;
}
public record LoaderInfo(String separator, int build, String maven, String version, boolean stable) {
}

@JsonSerializable
public static class IntermediaryInfo {
private final String maven;
private final String version;

public IntermediaryInfo(String maven, String version) {
this.maven = maven;
this.version = version;
}

public String getMaven() {
return maven;
}

public String getVersion() {
return version;
}
public record IntermediaryInfo(String maven, String version) {
}
}
30 changes: 4 additions & 26 deletions HMCLCore/src/main/java/org/jackhuang/hmcl/download/quilt/QuiltVersionList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,39 +68,17 @@ public Task<?> refreshAsync() {
private List<String> getGameVersions(String metaUrl) throws IOException {
String json = NetworkUtils.doGet(downloadProvider.injectURLWithCandidates(metaUrl));
return JsonUtils.GSON.fromJson(json, listTypeOf(GameVersion.class))
.stream().map(GameVersion::getVersion).collect(Collectors.toList());
.stream().map(GameVersion::version).collect(Collectors.toList());
}

private static String getLaunchMetaUrl(String gameVersion, String loaderVersion) {
return String.format("https://meta.quiltmc.org/v3/versions/loader/%s/%s", gameVersion, loaderVersion);
}

private static class GameVersion {
private final String version;
private final String maven;
private final boolean stable;
private record GameVersion(String version, @Nullable String maven, boolean stable) {

public GameVersion() {
this("", null, false);
}

public GameVersion(String version, String maven, boolean stable) {
this.version = version;
this.maven = maven;
this.stable = stable;
}

public String getVersion() {
return version;
}

@Nullable
public String getMaven() {
return maven;
}

public boolean isStable() {
return stable;
GameVersion {
if (version == null) version = "";
}
}
}