lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

polish 639bc58e84

Browse Source 
see 639bc58e84 (r32215378)
This commit is contained in:
yushijinhun
2019-02-08 14:55:58 +08:00
parent 0ff6ca18ed
commit 62c38482f6
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
HMCLCore/src/main/java/org/jackhuang/hmcl/game/GameVersion.java
View File

@@ -17,6 +17,8 @@
*/ */
package org.jackhuang.hmcl.game; package org.jackhuang.hmcl.game;
import static org.jackhuang.hmcl.util.Logging.LOG;
import com.google.gson.JsonParseException; import com.google.gson.JsonParseException;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
import org.jackhuang.hmcl.util.gson.JsonUtils; import org.jackhuang.hmcl.util.gson.JsonUtils;
@@ -27,7 +29,6 @@ import org.jenkinsci.constant_pool_scanner.ConstantPoolScanner;
import org.jenkinsci.constant_pool_scanner.ConstantType; import org.jenkinsci.constant_pool_scanner.ConstantType;
import org.jenkinsci.constant_pool_scanner.StringConstant; import org.jenkinsci.constant_pool_scanner.StringConstant;
import javax.swing.text.html.Option;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.nio.file.FileSystem; import java.nio.file.FileSystem;
@@ -35,6 +36,7 @@ import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.logging.Level;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.StreamSupport; import java.util.stream.StreamSupport;
@@ -45,8 +47,9 @@ public final class GameVersion {
private static Optional<String> getVersionFromJson(Path versionJson) { private static Optional<String> getVersionFromJson(Path versionJson) {
try { try {
MinecraftVersion version = JsonUtils.fromNonNullJson(FileUtils.readText(versionJson), MinecraftVersion.class); MinecraftVersion version = JsonUtils.fromNonNullJson(FileUtils.readText(versionJson), MinecraftVersion.class);
return Optional.of(version.name); return Optional.ofNullable(version.name);
} catch (IOException | JsonParseException | NullPointerException e) { } catch (IOException | JsonParseException e) {
LOG.log(Level.WARNING, "Failed to parse version.json", e);
return Optional.empty(); return Optional.empty();
} }
} }