diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/LibraryDownloadTask.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/LibraryDownloadTask.java
index e9a3513a7..b31a65d9e 100644
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/LibraryDownloadTask.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/launch/LibraryDownloadTask.java
@@ -78,6 +78,7 @@ public class LibraryDownloadTask extends FileDownloadTask {
return super.executeTask();
}
+ @SuppressWarnings("UnusedAssignment")
public static void unpackLibrary(File output, File input)
throws IOException {
HMCLog.log("Unpacking " + input);
diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/MCUtils.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/MCUtils.java
index c5bbe54f2..c31f4e56a 100644
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/MCUtils.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/MCUtils.java
@@ -246,14 +246,11 @@ public final class MCUtils {
.addTask(new FileDownloadTask(vurl + id + ".json", IOUtils.tryGetCanonicalFile(mvt)).setTag(id + ".json"))
.addTask(new FileDownloadTask(vurl + id + ".jar", IOUtils.tryGetCanonicalFile(mvj)).setTag(id + ".jar"))
.start()) {
- MinecraftVersion mv;
try {
- mv = C.gson.fromJson(FileUtils.readFileToStringQuietly(mvt), MinecraftVersion.class);
+ return C.gson.fromJson(FileUtils.readFileToStringQuietly(mvt), MinecraftVersion.class);
} catch (JsonSyntaxException ex) {
HMCLog.err("Failed to parse minecraft version json.", ex);
- mv = null;
}
- return mv;
}
return null;
}
@@ -328,11 +325,6 @@ public final class MCUtils {
return false;
}
- public static MinecraftRemoteVersions getRemoteMinecraftVersions(DownloadType sourceType) throws IOException {
- String result = NetUtils.get(sourceType.getProvider().getVersionsListDownloadURL());
- return MinecraftRemoteVersions.fromJson(result);
- }
-
public static String profile = "{\"selectedProfile\": \"(Default)\",\"profiles\": {\"(Default)\": {\"name\": \"(Default)\"}},\"clientToken\": \"88888888-8888-8888-8888-888888888888\"}";
public static void tryWriteProfile(File gameDir) throws IOException {
diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.form b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.form
index 03924c0a9..3ddb9e3f3 100644
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.form
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.form
@@ -637,7 +637,7 @@
-
+
diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java
index 9c53061ba..bf9592878 100644
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/views/GameSettingsPanel.java
@@ -1134,6 +1134,7 @@ btnRefreshLiteLoader.addActionListener(new java.awt.event.ActionListener() {
if (isLoading)
return;
profile = getProfile();
+ if (profile == null) return;
if (profile.getMinecraftProvider().getVersionCount() <= 0)
versionChanged(profile, null);
prepare(profile);
@@ -1618,23 +1619,16 @@ btnRefreshLiteLoader.addActionListener(new java.awt.event.ActionListener() {
@Override
public boolean executeTask() {
- final MinecraftRemoteVersions v = MinecraftRemoteVersions.fromJson(tsk.getResult());
+ final MinecraftRemoteVersions v = C.gson.fromJson(tsk.getResult(), MinecraftRemoteVersions.class);
if (v == null || v.versions == null)
return true;
SwingUtilities.invokeLater(() -> {
DefaultTableModel model = (DefaultTableModel) lstDownloads.getModel();
while (model.getRowCount() > 0)
model.removeRow(0);
- for (MinecraftRemoteVersion ver : v.versions) {
- Object[] line = new Object[3];
- line[0] = ver.id;
- line[1] = ver.time;
- if (StrUtils.equalsOne(ver.type, "old_beta", "old_alpha", "release", "snapshot"))
- line[2] = C.i18n("versions." + ver.type);
- else
- line[2] = ver.type;
- model.addRow(line);
- }
+ for (MinecraftRemoteVersion ver : v.versions)
+ model.addRow(new Object[] {ver.id, ver.time,
+ StrUtils.equalsOne(ver.type, "old_beta", "old_alpha", "release", "snapshot") ? C.i18n("versions." + ver.type) : ver.type});
lstDownloads.updateUI();
});
return true;