update 3.5.3.230

4 files changed, 43 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8a9e99141ae1..23e6e6bfa4e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = hmcl-new
 	pkgdesc = An unofficial build of HMCL that trying to compile and run HMCL with the latest LTS version of java. (with HMCL-Clean changes)
-	pkgver = 3.5.3.229
+	pkgver = 3.5.3.230
 	pkgrel = 1
 	url = https://github.com/huanghongxun/HMCL
 	arch = any
@@ -13,14 +13,14 @@ pkgbase = hmcl-new
 	source = hmcl.desktop
 	source = hmcl-launch-script
 	source = craft_table.png
-	source = hmcl-new-3.5.3.229.tar.gz::https://github.com/huanghongxun/HMCL/archive/refs/tags/v3.5.3.229.tar.gz
+	source = hmcl-new-3.5.3.230.tar.gz::https://github.com/huanghongxun/HMCL/archive/refs/tags/v3.5.3.230.tar.gz
 	source = 0001-Target-java-17.patch
 	source = 0002-Cleanup.patch
 	sha256sums = b4e8aa0f349bb3f5dd15a31c5a13ac3e10e5a5bcd2f97cf390041924275e43ef
 	sha256sums = 858b5082bc58ddc44fe74625937876e78442fdf5ff948d1e91cddbf170af9eeb
 	sha256sums = 2989a1b5301b8c7b9afdae5696c6a4e5246afa2d4f1f3d3dad5c192f036a9b4c
-	sha256sums = 3e818e881b4a5b2d54182d12ea61e68dc75b870afe4d1fc2dbf4df464a8b4669
-	sha256sums = b8e2cd7a4072e4df29237ac3662bb0deb51adf098601ab52b32e98c2ee33565f
-	sha256sums = 881332dbdb0f437ef7a030bfdafe40e573a0153e49be0a513276762bf097ae9e
+	sha256sums = d4bffd51e4ae99d431563d81bcf490ac81ce4dea8850e3800321f6bf76d07b01
+	sha256sums = d3650f183dd8a95da90eb4537594068f01ea02b114a9d3ec6ccba5eec73d2d19
+	sha256sums = 53b75b1804fd7c4bdc8715b15e96ac9f95bdbecaea9a7098c8dc5623699f8432
 
 pkgname = hmcl-new
diff --git a/0001-Target-java-17.patch b/0001-Target-java-17.patch
index 4460a6ba627d..9ba436055044 100644
--- a/0001-Target-java-17.patch
+++ b/0001-Target-java-17.patch
@@ -1,4 +1,4 @@
-From 42fd6b1db051a7b600ab917b51f7d7d023ba1b50 Mon Sep 17 00:00:00 2001
+From c686e5d7760c24f1c57318ad4350fa3e2d0023eb Mon Sep 17 00:00:00 2001
 From: Aviana Cruz <gwencroft@proton.me>
 Date: Sun, 6 Nov 2022 13:28:59 +0800
 Subject: [PATCH 1/2] Target java 17
diff --git a/0002-Cleanup.patch b/0002-Cleanup.patch
index 71d96c54fc7b..9f2b4a008b63 100644
--- a/0002-Cleanup.patch
+++ b/0002-Cleanup.patch
@@ -1,7 +1,7 @@
-From 65cd4f0bea509989fd93258bee62769cd00b5ef1 Mon Sep 17 00:00:00 2001
+From 5d788ca53658aa41cb76589b42664a7392f4ea2d Mon Sep 17 00:00:00 2001
 From: Aviana Cruz <gwencroft@proton.me>
 Date: Sun, 6 Nov 2022 13:33:14 +0800
-Subject: [PATCH] Cleanup
+Subject: [PATCH 2/2] Cleanup
 
 Co-authored-by: zhaose <weiliang1503@outlook.com>
 Signed-off-by: Aviana Cruz <gwencroft@proton.me>
@@ -16,7 +16,7 @@ Signed-off-by: Aviana Cruz <gwencroft@proton.me>
  .../hmcl/ui/account/CreateAccountPane.java    |  16 --
  .../jackhuang/hmcl/ui/main/FeedbackPage.java  |  80 ------
  .../hmcl/ui/main/LauncherSettingsPage.java    |  22 +-
- .../org/jackhuang/hmcl/ui/main/MainPage.java  | 117 +-------
+ .../org/jackhuang/hmcl/ui/main/MainPage.java  | 121 +--------
  .../org/jackhuang/hmcl/ui/main/RootPage.java  |  17 --
  .../jackhuang/hmcl/ui/main/SettingsPage.java  |  60 ----
  .../jackhuang/hmcl/ui/main/SettingsView.java  |  58 ----
@@ -29,7 +29,7 @@ Signed-off-by: Aviana Cruz <gwencroft@proton.me>
  .../jackhuang/hmcl/upgrade/UpdateChecker.java | 125 ---------
  .../jackhuang/hmcl/upgrade/UpdateHandler.java | 257 ------------------
  .../jackhuang/hmcl/util/CrashReporter.java    |   5 -
- 23 files changed, 3 insertions(+), 1615 deletions(-)
+ 23 files changed, 3 insertions(+), 1619 deletions(-)
  delete mode 100644 HMCL/src/main/java/org/jackhuang/hmcl/setting/ConfigUpgrader.java
  delete mode 100644 HMCL/src/main/java/org/jackhuang/hmcl/ui/UpgradeDialog.java
  delete mode 100644 HMCL/src/main/java/org/jackhuang/hmcl/ui/main/FeedbackPage.java
@@ -522,10 +522,10 @@ index d6c11595..d7586282 100644
      public ReadOnlyObjectProperty<State> stateProperty() {
          return state.getReadOnlyProperty();
 diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/MainPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/MainPage.java
-index 111fb82d..add45e23 100644
+index dc15b1d1..7cc36a80 100644
 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/MainPage.java
 +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/MainPage.java
-@@ -52,9 +52,6 @@ import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
+@@ -53,9 +53,6 @@ import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
  import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
  import org.jackhuang.hmcl.ui.versions.GameItem;
  import org.jackhuang.hmcl.ui.versions.Versions;
@@ -535,7 +535,7 @@ index 111fb82d..add45e23 100644
  import org.jackhuang.hmcl.util.javafx.BindingMapping;
  import org.jackhuang.hmcl.util.javafx.MappedObservableList;
  import org.jackhuang.hmcl.util.platform.JavaVersion;
-@@ -76,14 +73,11 @@ public final class MainPage extends StackPane implements DecoratorPage {
+@@ -77,14 +74,11 @@ public final class MainPage extends StackPane implements DecoratorPage {
      private final JFXPopup popup = new JFXPopup(menu);
  
      private final StringProperty currentGame = new SimpleStringProperty(this, "currentGame");
@@ -550,7 +550,7 @@ index 111fb82d..add45e23 100644
      private final JFXButton menuButton;
  
      {
-@@ -113,44 +107,6 @@ public final class MainPage extends StackPane implements DecoratorPage {
+@@ -114,44 +108,6 @@ public final class MainPage extends StackPane implements DecoratorPage {
  
          announcementPane = new VBox(16);
  
@@ -595,7 +595,7 @@ index 111fb82d..add45e23 100644
          StackPane launchPane = new StackPane();
          launchPane.getStyleClass().add("launch-pane");
          launchPane.setMaxWidth(230);
-@@ -220,7 +176,7 @@ public final class MainPage extends StackPane implements DecoratorPage {
+@@ -221,7 +177,7 @@ public final class MainPage extends StackPane implements DecoratorPage {
              launchPane.getChildren().setAll(launchButton, separator, menuButton);
          }
  
@@ -604,7 +604,7 @@ index 111fb82d..add45e23 100644
  
          menu.setMaxHeight(365);
          menu.setMaxWidth(545);
-@@ -234,40 +190,6 @@ public final class MainPage extends StackPane implements DecoratorPage {
+@@ -235,44 +191,6 @@ public final class MainPage extends StackPane implements DecoratorPage {
          Bindings.bindContent(menu.getContent(), versionNodes);
      }
  
@@ -628,24 +628,28 @@ index 111fb82d..add45e23 100644
 -    }
 -
 -    private void doAnimation(boolean show) {
--        Duration duration = Duration.millis(320);
--        Timeline nowAnimation = new Timeline();
--        nowAnimation.getKeyFrames().addAll(
--                new KeyFrame(Duration.ZERO,
--                        new KeyValue(updatePane.translateXProperty(), show ? 260 : 0, SINE)),
--                new KeyFrame(duration,
--                        new KeyValue(updatePane.translateXProperty(), show ? 0 : 260, SINE)));
--        if (show) nowAnimation.getKeyFrames().add(
--                new KeyFrame(Duration.ZERO, e -> updatePane.setVisible(true)));
--        else nowAnimation.getKeyFrames().add(
--                new KeyFrame(duration, e -> updatePane.setVisible(false)));
--        nowAnimation.play();
+-        if (AnimationUtils.isAnimationEnabled()) {
+-            Duration duration = Duration.millis(320);
+-            Timeline nowAnimation = new Timeline();
+-            nowAnimation.getKeyFrames().addAll(
+-                    new KeyFrame(Duration.ZERO,
+-                            new KeyValue(updatePane.translateXProperty(), show ? 260 : 0, SINE)),
+-                    new KeyFrame(duration,
+-                            new KeyValue(updatePane.translateXProperty(), show ? 0 : 260, SINE)));
+-            if (show) nowAnimation.getKeyFrames().add(
+-                    new KeyFrame(Duration.ZERO, e -> updatePane.setVisible(true)));
+-            else nowAnimation.getKeyFrames().add(
+-                    new KeyFrame(duration, e -> updatePane.setVisible(false)));
+-            nowAnimation.play();
+-        } else {
+-            updatePane.setVisible(show);
+-        }
 -    }
 -
      private void launch() {
          Versions.launch(Profiles.getSelectedProfile());
      }
-@@ -276,19 +198,6 @@ public final class MainPage extends StackPane implements DecoratorPage {
+@@ -281,19 +199,6 @@ public final class MainPage extends StackPane implements DecoratorPage {
          popup.show(menuButton, JFXPopup.PopupVPosition.BOTTOM, JFXPopup.PopupHPosition.RIGHT, 0, -menuButton.getHeight());
      }
  
@@ -665,7 +669,7 @@ index 111fb82d..add45e23 100644
      @Override
      public ReadOnlyObjectWrapper<State> stateProperty() {
          return state;
-@@ -306,30 +215,6 @@ public final class MainPage extends StackPane implements DecoratorPage {
+@@ -311,30 +216,6 @@ public final class MainPage extends StackPane implements DecoratorPage {
          this.currentGame.set(currentGame);
      }
  
@@ -924,7 +928,7 @@ index af9a3477..44b6dfed 100644
  }
 diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SponsorPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SponsorPage.java
 deleted file mode 100644
-index ff685971..00000000
+index 07716990..00000000
 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SponsorPage.java
 +++ /dev/null
 @@ -1,174 +0,0 @@
@@ -957,10 +961,10 @@ index ff685971..00000000
 -import javafx.scene.control.Label;
 -import javafx.scene.layout.*;
 -import javafx.scene.text.TextAlignment;
--import org.apache.commons.lang3.mutable.MutableObject;
 -import org.jackhuang.hmcl.task.Schedulers;
 -import org.jackhuang.hmcl.task.Task;
 -import org.jackhuang.hmcl.ui.FXUtils;
+-import org.jackhuang.hmcl.util.Holder;
 -import org.jackhuang.hmcl.util.io.HttpRequest;
 -
 -import java.math.BigDecimal;
@@ -1015,16 +1019,16 @@ index ff685971..00000000
 -            StackPane pane = new StackPane();
 -            pane.getStyleClass().add("card");
 -            listView = new JFXListView<>();
--            MutableObject<Object> lastCell = new MutableObject<>();
+-            Holder<Object> lastCell = new Holder<>();
 -            listView.setCellFactory((listView) -> new JFXListCell<Sponsor>() {
 -                @Override
 -                public void updateItem(Sponsor item, boolean empty) {
 -                    super.updateItem(item, empty);
 -
 -                    // https://mail.openjdk.org/pipermail/openjfx-dev/2022-July/034764.html
--                    if (this == lastCell.getValue() && !isVisible())
+-                    if (this == lastCell.value && !isVisible())
 -                        return;
--                    lastCell.setValue(this);
+-                    lastCell.value = this;
 -
 -                    if (!empty) {
 -                        setText(item.getName());
diff --git a/PKGBUILD b/PKGBUILD
index 65069edf69b1..1f2802c94cf3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=hmcl-new
 _pkgname=HMCL
 _ver=3.5.3
-_build=229
+_build=230
 pkgver=$_ver.$_build
 pkgrel=1
 pkgdesc='An unofficial build of HMCL that trying to compile and run HMCL with the latest LTS version of java. (with HMCL-Clean changes)'
@@ -27,9 +27,9 @@ source=('hmcl.desktop'
 sha256sums=('b4e8aa0f349bb3f5dd15a31c5a13ac3e10e5a5bcd2f97cf390041924275e43ef'
   '858b5082bc58ddc44fe74625937876e78442fdf5ff948d1e91cddbf170af9eeb'
   '2989a1b5301b8c7b9afdae5696c6a4e5246afa2d4f1f3d3dad5c192f036a9b4c'
-  '3e818e881b4a5b2d54182d12ea61e68dc75b870afe4d1fc2dbf4df464a8b4669'
-  'b8e2cd7a4072e4df29237ac3662bb0deb51adf098601ab52b32e98c2ee33565f'
-  '881332dbdb0f437ef7a030bfdafe40e573a0153e49be0a513276762bf097ae9e')
+  'd4bffd51e4ae99d431563d81bcf490ac81ce4dea8850e3800321f6bf76d07b01'
+  'd3650f183dd8a95da90eb4537594068f01ea02b114a9d3ec6ccba5eec73d2d19'
+  '53b75b1804fd7c4bdc8715b15e96ac9f95bdbecaea9a7098c8dc5623699f8432')
 
 prepare() {
   cd "$_pkgname-$pkgver"