From 01ff1327f7218905798c5d6813832912b146bbb8 Mon Sep 17 00:00:00 2001
From: huanghongxun <huanghongxun2008@126.com>
Date: Tue, 25 Sep 2018 12:30:21 +0800
Subject: [PATCH] Make head displayed more precisely

---
 .../java/org/jackhuang/hmcl/game/AccountHelper.java  |  2 +-
 .../jackhuang/hmcl/util/gson/UUIDTypeAdapter.java    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/AccountHelper.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/AccountHelper.java
index 193f036ce..e1ba4ef53 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/game/AccountHelper.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/AccountHelper.java
@@ -95,7 +95,7 @@ public final class AccountHelper {
 
     public static Image getHead(Image skin, int scaleRatio) {
         final int size = 8 * scaleRatio;
-        final int faceOffset = (int) Math.floor(scaleRatio * 4d / 9d);
+        final int faceOffset = (int) Math.round(scaleRatio * 4d / 9d);
         BufferedImage image = SwingFXUtils.fromFXImage(skin, null);
         BufferedImage head = new BufferedImage(size, size, BufferedImage.TYPE_INT_ARGB);
         Graphics2D g2d = head.createGraphics();
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/UUIDTypeAdapter.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/UUIDTypeAdapter.java
index dc73c79b1..d76a96914 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/UUIDTypeAdapter.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/UUIDTypeAdapter.java
@@ -43,7 +43,11 @@ public final class UUIDTypeAdapter extends TypeAdapter<UUID> {
 
     @Override
     public UUID read(JsonReader reader) throws IOException {
-        return fromString(reader.nextString());
+        try {
+            return fromString(reader.nextString());
+        } catch (IllegalArgumentException e) {
+            throw new JsonParseException("UUID malformed");
+        }
     }
 
     public static String fromUUID(UUID value) {
@@ -51,11 +55,7 @@ public final class UUIDTypeAdapter extends TypeAdapter<UUID> {
     }
 
     public static UUID fromString(String input) {
-        try {
-            return UUID.fromString(input.replaceFirst("(\\w{8})(\\w{4})(\\w{4})(\\w{4})(\\w{12})", "$1-$2-$3-$4-$5"));
-        } catch (IllegalArgumentException e) {
-            throw new JsonParseException("UUID malformed");
-        }
+        return UUID.fromString(input.replaceFirst("(\\w{8})(\\w{4})(\\w{4})(\\w{4})(\\w{12})", "$1-$2-$3-$4-$5"));
     }
 
 }