From 66c502d424b85fb40cc5af56bb3bb8ecc7a5b8a1 Mon Sep 17 00:00:00 2001
From: unknown <黄昱珲>
Date: Sat, 2 Jan 2016 22:56:46 +0800
Subject: [PATCH] fix lookandfeel crash in windows

---
 HMCL/build.gradle                                          | 2 +-
 .../lookandfeel/HelloMinecraftLookAndFeel.java             | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/HMCL/build.gradle b/HMCL/build.gradle
index 4b8ce3dcb..56c1c4aed 100755
--- a/HMCL/build.gradle
+++ b/HMCL/build.gradle
@@ -26,7 +26,7 @@ if (!hasProperty('mainClass')) {
     ext.mainClass = 'org.jackhuang.hellominecraft.launcher.Main'
 }
 
-def buildnumber = System.getenv("BUILD_NUMBER") == null ? ".6" : "."+System.getenv("BUILD_NUMBER")
+def buildnumber = System.getenv("BUILD_NUMBER") == null ? ".7" : "."+System.getenv("BUILD_NUMBER")
 
 String mavenGroupId = 'HMCL'
 String mavenVersion = '2.3.5' + buildnumber
diff --git a/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/HelloMinecraftLookAndFeel.java b/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/HelloMinecraftLookAndFeel.java
index 775d6da9a..c0565eb13 100755
--- a/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/HelloMinecraftLookAndFeel.java
+++ b/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/HelloMinecraftLookAndFeel.java
@@ -19,14 +19,11 @@ package org.jackhuang.hellominecraft.lookandfeel;
 import java.awt.Color;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.lang.reflect.Field;
 import java.text.ParseException;
 import java.util.Map;
 import javax.swing.UIDefaults;
-import javax.swing.plaf.ColorUIResource;
 import javax.swing.plaf.synth.SynthLookAndFeel;
 import org.jackhuang.hellominecraft.utils.NetUtils;
-import sun.swing.DefaultLookup;
 
 /**
  *
@@ -48,10 +45,10 @@ public class HelloMinecraftLookAndFeel extends SynthLookAndFeel {
 
     public HelloMinecraftLookAndFeel(Map<String, String> settings) throws ParseException {
         try {
-            String s = NetUtils.getStreamContent(HelloMinecraftLookAndFeel.class.getResourceAsStream("/org/jackhuang/hellominecraft/lookandfeel/synth.xml"));
+            String s = NetUtils.getStreamContent(HelloMinecraftLookAndFeel.class.getResourceAsStream("/org/jackhuang/hellominecraft/lookandfeel/synth.xml"), "UTF-8");
             for (String ss : settings.keySet())
                 s = s.replace("${" + ss + "}", settings.get(ss));
-            load(new ByteArrayInputStream(s.getBytes()), HelloMinecraftLookAndFeel.class);
+            load(new ByteArrayInputStream(s.getBytes("UTF-8")), HelloMinecraftLookAndFeel.class);
         } catch (IOException ex) {
             ex.printStackTrace();
             throw new ParseException("FUCKING BUG", 0);