From f191e801003e5d4876d9f89ee8a14cd94cc6c030 Mon Sep 17 00:00:00 2001
From: Glavo <zjx001202@126.com>
Date: Mon, 17 May 2021 02:31:06 +0800
Subject: [PATCH] Fix #874: Remove the dependency on javafx.swing

---
 .../jackhuang/hmcl/game/TexturesLoader.java   | 30 +++++++++++++++----
 .../hmcl/util/SelfDependencyPatcher.java      |  3 +-
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/TexturesLoader.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/TexturesLoader.java
index d8738a38d..7e946e756 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/game/TexturesLoader.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/TexturesLoader.java
@@ -19,13 +19,13 @@ package org.jackhuang.hmcl.game;
 
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.ObjectBinding;
-import javafx.embed.swing.SwingFXUtils;
 import javafx.scene.image.Image;
+import javafx.scene.image.PixelWriter;
+import javafx.scene.image.WritableImage;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.ServerResponseMalformedException;
 import org.jackhuang.hmcl.auth.microsoft.MicrosoftAccount;
-import org.jackhuang.hmcl.auth.microsoft.MicrosoftService;
 import org.jackhuang.hmcl.auth.yggdrasil.Texture;
 import org.jackhuang.hmcl.auth.yggdrasil.TextureModel;
 import org.jackhuang.hmcl.auth.yggdrasil.TextureType;
@@ -39,6 +39,7 @@ import org.jackhuang.hmcl.util.javafx.BindingMapping;
 import javax.imageio.ImageIO;
 import java.awt.*;
 import java.awt.image.BufferedImage;
+import java.awt.image.WritableRaster;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -136,6 +137,7 @@ public final class TexturesLoader {
 
     // ==== Skins ====
     private final static Map<TextureModel, LoadedTexture> DEFAULT_SKINS = new EnumMap<>(TextureModel.class);
+
     static {
         loadDefaultSkin("/assets/img/steve.png", TextureModel.STEVE);
         loadDefaultSkin("/assets/img/alex.png", TextureModel.ALEX);
@@ -231,18 +233,34 @@ public final class TexturesLoader {
     public static ObjectBinding<Image> fxAvatarBinding(YggdrasilService service, UUID uuid, int size) {
         return BindingMapping.of(skinBinding(service, uuid))
                 .map(it -> toAvatar(it.image, size))
-                .map(img -> SwingFXUtils.toFXImage(img, null));
+                .map(TexturesLoader::toFXImage);
     }
 
     public static ObjectBinding<Image> fxAvatarBinding(Account account, int size) {
         if (account instanceof YggdrasilAccount || account instanceof MicrosoftAccount) {
             return BindingMapping.of(skinBinding(account))
                     .map(it -> toAvatar(it.image, size))
-                    .map(img -> SwingFXUtils.toFXImage(img, null));
+                    .map(TexturesLoader::toFXImage);
         } else {
             return Bindings.createObjectBinding(
-                    () -> SwingFXUtils.toFXImage(toAvatar(getDefaultSkin(TextureModel.detectUUID(account.getUUID())).image, size), null));
+                    () -> toFXImage(toAvatar(getDefaultSkin(TextureModel.detectUUID(account.getUUID())).image, size)));
         }
     }
     // ====
-}
+
+    // Based on https://stackoverflow.com/a/57552025
+    // Fix #874: Use it instead of SwingFXUtils.toFXImage
+    private static WritableImage toFXImage(BufferedImage image) {
+        WritableImage wr = new WritableImage(image.getWidth(), image.getHeight());
+        PixelWriter pw = wr.getPixelWriter();
+
+        final int iw = image.getWidth();
+        final int ih = image.getHeight();
+        for (int x = 0; x < iw; x++) {
+            for (int y = 0; y < ih; y++) {
+                pw.setArgb(x, y, image.getRGB(x, y));
+            }
+        }
+        return wr;
+    }
+}
\ No newline at end of file
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/SelfDependencyPatcher.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/SelfDependencyPatcher.java
index 76e226147..5754d072d 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/util/SelfDependencyPatcher.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/SelfDependencyPatcher.java
@@ -40,7 +40,8 @@ public class SelfDependencyPatcher {
         addJfxDependency("fxml");
         addJfxDependency("graphics");
         addJfxDependency("media");
-        addJfxDependency("swing");
+        // Fix #874: Remove the dependency on javafx.swing
+        // addJfxDependency("swing");
         addJfxDependency("web");
     }