From 2b792e73c9c3e0b8b34269a945465af7ab78d57e Mon Sep 17 00:00:00 2001
From: huanghongxun <huanghongxun2008@126.com>
Date: Sun, 25 Nov 2018 23:42:48 +0800
Subject: [PATCH] Fix Java 9 requirement

---
 HMCL/build.gradle                                        | 6 ++++--
 HMCL/src/main/java/org/jackhuang/hmcl/setting/Theme.java | 2 +-
 HMCL/src/main/resources/assets/css/root.css              | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/HMCL/build.gradle b/HMCL/build.gradle
index 23d57977c..07b47b545 100644
--- a/HMCL/build.gradle
+++ b/HMCL/build.gradle
@@ -111,13 +111,15 @@ def createExecutable(String suffix, String header) {
 }
 
 processResources {
-    ext.convertToBSS = { resource ->
+    ext.convertToBSS = { String resource ->
         exclude resource
         doFirst {
             def cssFile = new File(this.projectDir, "src/main/resources/" + resource)
             def bssFile = new File(this.projectDir, "build/compiled-resources/" + resource[0..-4] + "bss")
             bssFile.parentFile.mkdirs()
-            javafx.css.Stylesheet.convertToBinary cssFile, bssFile
+            exec {
+                commandLine 'javapackager', '-createbss', '-outdir', bssFile.parent, '-srcfiles', cssFile.path
+            }
         }
     }
     from "build/compiled-resources"
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Theme.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Theme.java
index 850da607a..fa432b838 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Theme.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Theme.java
@@ -84,7 +84,7 @@ public class Theme {
                     .replace("%base-color%", color)
                     .replace("%font-color%", getColorDisplayName(getForegroundColor())));
             css = temp.toURI().toString();
-        } catch (IOException e) {
+        } catch (IOException | NullPointerException e) {
             Logging.LOG.log(Level.SEVERE, "Unable to create theme stylesheet. Fallback to blue theme.", e);
             css = "/assets/css/blue.css";
         }
diff --git a/HMCL/src/main/resources/assets/css/root.css b/HMCL/src/main/resources/assets/css/root.css
index c16fbb22d..9d9c00081 100644
--- a/HMCL/src/main/resources/assets/css/root.css
+++ b/HMCL/src/main/resources/assets/css/root.css
@@ -1240,7 +1240,7 @@
 }
 
 .tree-table-row-cell .jfx-text-field {
-    -fx-focus-color: rgba(82, 100, 174);
+    -fx-focus-color: rgb(82, 100, 174);
 }
 
 .tree-table-row-cell .jfx-text-field:error {