From 0540f3c9cd0a7d5a704778ee30cebd25052d4864 Mon Sep 17 00:00:00 2001
From: Glavo <zjx001202@gmail.com>
Date: Mon, 3 Mar 2025 02:12:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E4=B8=96=E7=95=8C=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E4=B8=96=E7=95=8C=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=20(#3689)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 在世界管理界面显示世界图标

* update

* update
---
 .../hmcl/ui/versions/WorldListItem.java       |   2 +-
 .../hmcl/ui/versions/WorldListItemSkin.java   |  10 +++++--
 .../resources/assets/img/unknown_server.png   | Bin 0 -> 6857 bytes
 .../java/org/jackhuang/hmcl/game/World.java   |  28 ++++++++++++++++++
 4 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 HMCL/src/main/resources/assets/img/unknown_server.png

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListItem.java
index 4a45486ce..b48de3bb2 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListItem.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListItem.java
@@ -48,8 +48,8 @@ public class WorldListItem extends Control {
         this.world = world;
 
         title.set(parseColorEscapes(world.getWorldName()));
-
         subtitle.set(i18n("world.description", world.getFileName(), formatDateTime(Instant.ofEpochMilli(world.getLastPlayed())), world.getGameVersion() == null ? i18n("message.unknown") : world.getGameVersion()));
+        image.set(world.getIcon());
 
         FXUtils.onClicked(this, this::showInfo);
     }
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListItemSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListItemSkin.java
index 27a8f3dbd..d7b7c51bf 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListItemSkin.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListItemSkin.java
@@ -19,9 +19,11 @@ package org.jackhuang.hmcl.ui.versions;
 
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXPopup;
+import javafx.beans.value.ChangeListener;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.SkinBase;
+import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
@@ -38,6 +40,9 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public class WorldListItemSkin extends SkinBase<WorldListItem> {
 
+    @SuppressWarnings({"FieldCanBeLocal", "unused"})
+    private final ChangeListener<Image> iconListener;
+
     public WorldListItemSkin(WorldListItem skinnable) {
         super(skinnable);
 
@@ -54,14 +59,15 @@ public class WorldListItemSkin extends SkinBase<WorldListItem> {
 
         ImageView imageView = new ImageView();
         FXUtils.limitSize(imageView, 32, 32);
-        imageView.imageProperty().bind(skinnable.imageProperty());
+        iconListener = FXUtils.onWeakChangeAndOperate(skinnable.imageProperty(), image ->
+                imageView.setImage(image == null ? FXUtils.newBuiltinImage("/assets/img/unknown_server.png") : image));
         imageViewContainer.getChildren().setAll(imageView);
 
         TwoLineListItem item = new TwoLineListItem();
         item.titleProperty().bind(skinnable.titleProperty());
         item.subtitleProperty().bind(skinnable.subtitleProperty());
         BorderPane.setAlignment(item, Pos.CENTER);
-        center.getChildren().setAll(imageView, item);
+        center.getChildren().setAll(imageViewContainer, item);
         root.setCenter(center);
 
         PopupMenu menu = new PopupMenu();
diff --git a/HMCL/src/main/resources/assets/img/unknown_server.png b/HMCL/src/main/resources/assets/img/unknown_server.png
new file mode 100644
index 0000000000000000000000000000000000000000..0de32741294a8bff1bc23d894a5f730938115f40
GIT binary patch
literal 6857
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
De^@9;

literal 0
HcmV?d00001

diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/World.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/World.java
index 2c6ed74c8..881f00fde 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/World.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/World.java
@@ -22,6 +22,7 @@ import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.LongTag;
 import com.github.steveice10.opennbt.tag.builtin.StringTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
+import javafx.scene.image.Image;
 import org.jackhuang.hmcl.util.io.CompressingUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.io.Unzipper;
@@ -46,6 +47,7 @@ public class World {
     private String worldName;
     private String gameVersion;
     private long lastPlayed;
+    private Image icon;
 
     public World(Path file) throws IOException {
         this.file = file;
@@ -62,6 +64,17 @@ public class World {
         fileName = FileUtils.getName(file);
         Path levelDat = file.resolve("level.dat");
         getWorldName(levelDat);
+
+        Path iconFile = file.resolve("icon.png");
+        if (Files.isRegularFile(iconFile)) {
+            try (InputStream inputStream = Files.newInputStream(iconFile)) {
+                icon = new Image(inputStream, 64, 64, true, false);
+                if (icon.isError())
+                    throw icon.getException();
+            } catch (Exception e) {
+                LOG.warning("Failed to load world icon", e);
+            }
+        }
     }
 
     public Path getFile() {
@@ -88,12 +101,27 @@ public class World {
         return gameVersion;
     }
 
+    public Image getIcon() {
+        return icon;
+    }
+
     private void loadFromZipImpl(Path root) throws IOException {
         Path levelDat = root.resolve("level.dat");
         if (!Files.exists(levelDat))
             throw new IOException("Not a valid world zip file since level.dat cannot be found.");
 
         getWorldName(levelDat);
+
+        Path iconFile = root.resolve("icon.png");
+        if (Files.isRegularFile(iconFile)) {
+            try (InputStream inputStream = Files.newInputStream(iconFile)) {
+                icon = new Image(inputStream, 64, 64, true, false);
+                if (icon.isError())
+                    throw icon.getException();
+            } catch (Exception e) {
+                LOG.warning("Failed to load world icon", e);
+            }
+        }
     }
 
     private void loadFromZip() throws IOException {