update 3.5.4.234

4 files changed, 24 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index abf9dc70c3ad..4edf595c6265 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.4.233
+	pkgver = 3.5.4.234
 	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.4.233.tar.gz::https://github.com/huanghongxun/HMCL/archive/refs/tags/v3.5.4.233.tar.gz
+	source = hmcl-new-3.5.4.234.tar.gz::https://github.com/huanghongxun/HMCL/archive/refs/tags/v3.5.4.234.tar.gz
 	source = 0001-Target-java-17.patch
 	source = 0002-Cleanup.patch
 	sha256sums = b4e8aa0f349bb3f5dd15a31c5a13ac3e10e5a5bcd2f97cf390041924275e43ef
 	sha256sums = 858b5082bc58ddc44fe74625937876e78442fdf5ff948d1e91cddbf170af9eeb
 	sha256sums = 2989a1b5301b8c7b9afdae5696c6a4e5246afa2d4f1f3d3dad5c192f036a9b4c
-	sha256sums = e8780109a4756c280ca70c8d23ec0824933be0e837fc875a66f06288c26ef865
-	sha256sums = 244e98d10309d8021a3c47b22354dad5ca62258add70ea4278458858ed1253ac
-	sha256sums = 00042e280ec45acf1c389e41188d542a66cf07d050451e433e9c6da7a845866f
+	sha256sums = 69680efbdb9dc18ab8d6973ee4be442671133641a61602608084fb7fe67c3082
+	sha256sums = 7b9511c0f0eceef29577e879a00e0ab341fddeed6e9e33f54cefbaca11ae9354
+	sha256sums = 5df53d14eda958ca6eb236732308171895516813e9b666681b810eb8d3d294e0
 
 pkgname = hmcl-new
diff --git a/0001-Target-java-17.patch b/0001-Target-java-17.patch
index a797de046c78..132fa6cf9c34 100644
--- a/0001-Target-java-17.patch
+++ b/0001-Target-java-17.patch
@@ -1,4 +1,4 @@
-From 3efb8dac01d7b9cb0ee26ee72987844e70df6582 Mon Sep 17 00:00:00 2001
+From 3dd83c5aef7e2909c8cefe2aa5d713fc5d379f5b 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 1ae1ee239fff..749f9d3e4a86 100644
--- a/0002-Cleanup.patch
+++ b/0002-Cleanup.patch
@@ -1,4 +1,4 @@
-From f6f24ab3a9f5b46ae87c7a9677c8a63cc940fc91 Mon Sep 17 00:00:00 2001
+From f66e92cc679e0739fd99d6e60b3dd589522df414 Mon Sep 17 00:00:00 2001
 From: Aviana Cruz <gwencroft@proton.me>
 Date: Sun, 6 Nov 2022 13:33:14 +0800
 Subject: [PATCH 2/2] Cleanup
@@ -43,10 +43,10 @@ Signed-off-by: Aviana Cruz <gwencroft@proton.me>
  delete mode 100644 HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateHandler.java
 
 diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java b/HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java
-index 292393f4b..d050f6694 100644
+index 83ece3db7..456126897 100644
 --- a/HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java
 +++ b/HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java
-@@ -29,8 +29,6 @@ import org.jackhuang.hmcl.setting.SambaException;
+@@ -30,8 +30,6 @@ import org.jackhuang.hmcl.setting.SambaException;
  import org.jackhuang.hmcl.task.AsyncTaskExecutor;
  import org.jackhuang.hmcl.task.Schedulers;
  import org.jackhuang.hmcl.ui.Controllers;
@@ -55,7 +55,7 @@ index 292393f4b..d050f6694 100644
  import org.jackhuang.hmcl.util.CrashReporter;
  import org.jackhuang.hmcl.util.Lang;
  import org.jackhuang.hmcl.util.StringUtils;
-@@ -105,8 +103,6 @@ public final class Launcher extends Application {
+@@ -112,8 +110,6 @@ public final class Launcher extends Application {
                  Platform.setImplicitExit(false);
                  Controllers.initialize(primaryStage);
  
@@ -64,7 +64,7 @@ index 292393f4b..d050f6694 100644
                  primaryStage.show();
              });
          } catch (Throwable e) {
-@@ -207,10 +203,6 @@ public final class Launcher extends Application {
+@@ -213,10 +209,6 @@ public final class Launcher extends Application {
      }
  
      public static void main(String[] args) {
@@ -527,7 +527,7 @@ index d6c11595c..d75862829 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 461d05c15..33fddb4db 100644
+index d619d6762..1ad15d811 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
 @@ -54,9 +54,6 @@ import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
@@ -540,7 +540,7 @@ index 461d05c15..33fddb4db 100644
  import org.jackhuang.hmcl.util.javafx.BindingMapping;
  import org.jackhuang.hmcl.util.javafx.MappedObservableList;
  import org.jackhuang.hmcl.util.platform.JavaVersion;
-@@ -78,14 +75,10 @@ public final class MainPage extends StackPane implements DecoratorPage {
+@@ -80,14 +77,10 @@ public final class MainPage extends StackPane implements DecoratorPage {
      private final JFXPopup popup = new JFXPopup(menu);
  
      private final StringProperty currentGame = new SimpleStringProperty(this, "currentGame");
@@ -555,11 +555,11 @@ index 461d05c15..33fddb4db 100644
      private final JFXButton menuButton;
  
      {
-@@ -113,54 +106,6 @@ public final class MainPage extends StackPane implements DecoratorPage {
+@@ -115,54 +108,6 @@ public final class MainPage extends StackPane implements DecoratorPage {
  
          setPadding(new Insets(20));
  
--        if (Metadata.isNightly() || (Metadata.isDev() && !Objects.equals(Metadata.VERSION, config().getHideAnnouncementVersion()))) {
+-        if (Metadata.isNightly() || (Metadata.isDev() && !Objects.equals(Metadata.VERSION, config().getShownTips().get(ANNOUNCEMENT)))) {
 -            announcementPane = new VBox(16);
 -            if (Metadata.isNightly()) {
 -                announcementPane.getChildren().add(new AnnouncementCard(i18n("update.channel.nightly.title"), i18n("update.channel.nightly.hint")));
@@ -610,7 +610,7 @@ index 461d05c15..33fddb4db 100644
          StackPane launchPane = new StackPane();
          launchPane.getStyleClass().add("launch-pane");
          launchPane.setMaxWidth(230);
-@@ -230,7 +175,7 @@ public final class MainPage extends StackPane implements DecoratorPage {
+@@ -232,7 +177,7 @@ public final class MainPage extends StackPane implements DecoratorPage {
              launchPane.getChildren().setAll(launchButton, separator, menuButton);
          }
  
@@ -619,7 +619,7 @@ index 461d05c15..33fddb4db 100644
  
          menu.setMaxHeight(365);
          menu.setMaxWidth(545);
-@@ -243,37 +188,6 @@ public final class MainPage extends StackPane implements DecoratorPage {
+@@ -245,37 +190,6 @@ public final class MainPage extends StackPane implements DecoratorPage {
          });
          Bindings.bindContent(menu.getContent(), versionNodes);
      }
@@ -657,7 +657,7 @@ index 461d05c15..33fddb4db 100644
      private void launch() {
          Versions.launch(Profiles.getSelectedProfile());
      }
-@@ -282,29 +196,6 @@ public final class MainPage extends StackPane implements DecoratorPage {
+@@ -284,29 +198,6 @@ public final class MainPage extends StackPane implements DecoratorPage {
          popup.show(menuButton, JFXPopup.PopupVPosition.BOTTOM, JFXPopup.PopupHPosition.RIGHT, 0, -menuButton.getHeight());
      }
  
@@ -676,7 +676,7 @@ index 461d05c15..33fddb4db 100644
 -
 -    public void hideAnnouncementPane() {
 -        if (announcementPane != null) {
--            config().setHideAnnouncementVersion(Metadata.VERSION);
+-            config().getShownTips().put(ANNOUNCEMENT, Metadata.VERSION);
 -            Pane parent = (Pane) announcementPane.getParent();
 -            if (parent != null)
 -                parent.getChildren().remove(announcementPane);
@@ -687,7 +687,7 @@ index 461d05c15..33fddb4db 100644
      @Override
      public ReadOnlyObjectWrapper<State> stateProperty() {
          return state;
-@@ -322,30 +213,6 @@ public final class MainPage extends StackPane implements DecoratorPage {
+@@ -324,30 +215,6 @@ public final class MainPage extends StackPane implements DecoratorPage {
          this.currentGame.set(currentGame);
      }
  
diff --git a/PKGBUILD b/PKGBUILD
index 3d73dbd6f471..83a04d3d2d44 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=hmcl-new
 _pkgname=HMCL
 _ver=3.5.4
-_build=233
+_build=234
 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'
-  'e8780109a4756c280ca70c8d23ec0824933be0e837fc875a66f06288c26ef865'
-  '244e98d10309d8021a3c47b22354dad5ca62258add70ea4278458858ed1253ac'
-  '00042e280ec45acf1c389e41188d542a66cf07d050451e433e9c6da7a845866f')
+  '69680efbdb9dc18ab8d6973ee4be442671133641a61602608084fb7fe67c3082'
+  '7b9511c0f0eceef29577e879a00e0ab341fddeed6e9e33f54cefbaca11ae9354'
+  '5df53d14eda958ca6eb236732308171895516813e9b666681b810eb8d3d294e0')
 
 prepare() {
   cd "$_pkgname-$pkgver"