From 96776ef1bbf673368c44c275d5b371c93762501a Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sat, 6 Jan 2024 03:13:59 +0900 Subject: [PATCH] musicplayer: albumlist wip --- .../net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt | 9 ++++++++- src/net/torvald/terrarum/Principii.java | 5 ++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt b/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt index b570be73e..aa31d63a9 100644 --- a/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt +++ b/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt @@ -399,7 +399,7 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() { } } // make playlist clicking work - else if (!playControlButtonLatched && mouseOnList != null && Terrarum.mouseDown) { + else if (listViewPanelScroll == 1f && !playControlButtonLatched && mouseOnList != null && Terrarum.mouseDown) { playControlButtonLatched = true val index = playlistScroll + mouseOnList!! val list = songsInGovernor @@ -416,6 +416,13 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() { } } } + // make album list clicking work + else if (listViewPanelScroll == 0f && !playControlButtonLatched && mouseOnList != null && Terrarum.mouseDown) { + playControlButtonLatched = true + val index = albumlistScroll + mouseOnList!! + val list = albumsList//.map { albumPropCache[it] } + + } // unlatch the click latch else if (!Terrarum.mouseDown) { playControlButtonLatched = false diff --git a/src/net/torvald/terrarum/Principii.java b/src/net/torvald/terrarum/Principii.java index 486b9146f..aa330a59a 100644 --- a/src/net/torvald/terrarum/Principii.java +++ b/src/net/torvald/terrarum/Principii.java @@ -8,7 +8,10 @@ import java.io.IOException; import java.util.*; /** - * Bootstrapper that launches the bundled JVM and injects VM configs such as -Xmx + * The headless launcher for the game. + * + * The launcher retrieves the information about the host operating system, and reads the `config.json` + * to set up the flags for the JVM then launches the main game. * * Created by minjaesong on 2023-06-22. */