Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f549f6d185 |
No files matched your search
@@ -141,9 +141,9 @@ public final class Metadata {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Default client Server Modpack fileApi (CDN mirror of Pack's `tdlm-client/latest` layout).
|
/// Default client Server Modpack fileApi: the Nexus raw repository `tdlm-client` read through the CDN host.
|
||||||
public static final String DEFAULT_CLIENT_FILE_API =
|
public static final String DEFAULT_CLIENT_FILE_API =
|
||||||
"https://packages.dandanton.com/tdlm-client/latest";
|
"https://maven.dandanton.com/repository/tdlm-client";
|
||||||
|
|
||||||
/// Stable client update root (`server-manifest.json` and `overrides/` live under this URL).
|
/// Stable client update root (`server-manifest.json` and `overrides/` live under this URL).
|
||||||
///
|
///
|
||||||
|
|||||||
@@ -398,12 +398,22 @@ public final class Controllers {
|
|||||||
.whenComplete(Schedulers.javafx(), (result, exception) -> {
|
.whenComplete(Schedulers.javafx(), (result, exception) -> {
|
||||||
if (exception != null) {
|
if (exception != null) {
|
||||||
LOG.warning("Failed to fetch client Server Modpack manifest", exception);
|
LOG.warning("Failed to fetch client Server Modpack manifest", exception);
|
||||||
|
Controllers.dialog(
|
||||||
|
manifestUrl + "\n" + exception.getMessage(),
|
||||||
|
i18n("message.error"),
|
||||||
|
MessageType.ERROR);
|
||||||
|
Instances.importModpack();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ServerModpackManifest manifest =
|
ServerModpackManifest manifest =
|
||||||
JsonUtils.fromMaybeMalformedJson(result, ServerModpackManifest.class);
|
JsonUtils.fromMaybeMalformedJson(result, ServerModpackManifest.class);
|
||||||
if (manifest == null) {
|
if (manifest == null) {
|
||||||
LOG.warning("Malformed client Server Modpack manifest from " + manifestUrl);
|
LOG.warning("Malformed client Server Modpack manifest from " + manifestUrl);
|
||||||
|
Controllers.dialog(
|
||||||
|
i18n("modpack.type.server.malformed"),
|
||||||
|
i18n("message.error"),
|
||||||
|
MessageType.ERROR);
|
||||||
|
Instances.importModpack();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Controllers.getDecorator().startWizard(
|
Controllers.getDecorator().startWizard(
|
||||||
|
|||||||
Reference in new issue
Block a user