From b1fb950975a485733747ce939a33f14c7ebbda91 Mon Sep 17 00:00:00 2001 From: floofymrow <124401935+ramen-cat-coder@users.noreply.github.com> Date: Tue, 16 Jun 2026 16:53:35 -0700 Subject: [PATCH 1/5] Update common --- src/main/java/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/common b/src/main/java/common index 6fea8205..8920447e 160000 --- a/src/main/java/common +++ b/src/main/java/common @@ -1 +1 @@ -Subproject commit 6fea82056d175ab61ebced95f8cc0bec976e0e1e +Subproject commit 8920447e73bea56289a2da5a2a9294e24ff08c67 From a11e9a20d4ed0b1d479b60f8faac740230c5ba54 Mon Sep 17 00:00:00 2001 From: floofymrow <124401935+ramen-cat-coder@users.noreply.github.com> Date: Tue, 16 Jun 2026 18:58:19 -0700 Subject: [PATCH 2/5] custom system --- src/main/java/io/BCJSON.java | 6 +++++- src/main/java/io/BCMusic.java | 26 +++++++++++++++++++++++++- src/main/java/main/MainBCU.java | 2 ++ src/main/java/page/view/MusicPage.java | 3 ++- 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/BCJSON.java b/src/main/java/io/BCJSON.java index 012a0141..33be04b4 100644 --- a/src/main/java/io/BCJSON.java +++ b/src/main/java/io/BCJSON.java @@ -28,7 +28,7 @@ public static void check() { UpdateJson json = Data.silent(UpdateCheck::checkUpdate); CommonStatic.Config cfg = CommonStatic.getConfig(); - List assets = null, musics = null, libs = null, lang; + List assets = null, musics = null, custMusics = null, libs = null, lang; UpdateJson.JarJson[] jars = null; try { for (UpdateJson.AnnouncementJson announce : json.pc_announcement) { @@ -57,6 +57,9 @@ public static void check() { } } else musics = UpdateCheck.checkNewMusic(count); + + int customCount = json.customMusic; + custMusics = UpdateCheck.checkNewCustomMusic(customCount); } ArrayList langList = new ArrayList<>(); @@ -74,6 +77,7 @@ public static void check() { clearList(libs, true); clearList(assets, true); clearList(musics, false); + clearList(custMusics, false); clearList(lang, false); Downloader font = UpdateCheck.checkFont(); diff --git a/src/main/java/io/BCMusic.java b/src/main/java/io/BCMusic.java index f8c57513..e9cf39da 100644 --- a/src/main/java/io/BCMusic.java +++ b/src/main/java/io/BCMusic.java @@ -15,13 +15,16 @@ public class BCMusic extends Data { private static final byte INVALID = 0, CANNON_CHARGE = 1, TOUCH = 2; private static final short TOT = 191; + private static final short BCU_TOT = 1; private static final byte[][] CACHE = new byte[TOT][]; + private static final byte[][] BCU_CACHE = new byte[BCU_TOT][]; public final static Map, byte[]> CACHE_CUSTOM = new LinkedHashMap<>(); public static boolean play = true; public static Identifier music = null; public static int VOL_BG = 20, VOL_SE = 20, VOL_UI = 20; private static boolean[] secall = new boolean[TOT]; + private static boolean[] bcu_secall = new boolean[BCU_TOT]; public static BCPlayer BG; private static BCPlayer End; @@ -214,6 +217,18 @@ public static synchronized void flush(boolean allow) { e.printStackTrace(); } secall = new boolean[TOT]; + + for (int i = 0; i < BCU_TOT; i++) + if (bcu_secall[i] && allow) + try { + if (BCU_CACHE[i] == null) + loadSound(i, UserProfile.getBCUData().musics.get(i), false, 0); + else + loadSound(i, BCU_CACHE[i]); + } catch (Exception e) { + e.printStackTrace(); + } + bcu_secall = new boolean[BCU_TOT]; } public static synchronized void play(Identifier mus) { @@ -255,6 +270,12 @@ public static synchronized void setSE(int ind) { secall[ind] = true; } + public static synchronized void setBCUSE(int ind) { + if (!play || VOL_SE == 0) + return; + bcu_secall[ind] = true; + } + public static synchronized void setSE(Identifier mus) { if (!play || VOL_SE == 0) return; @@ -266,14 +287,17 @@ public static synchronized void setSE(Identifier mus) { try { Music m = Identifier.get(mus); - if (m == null) + if (m == null) { + System.out.println("Sound does not exist"); return; + } if (CACHE_CUSTOM.containsKey(mus)) { loadSound(-1, CACHE_CUSTOM.get(mus)); } else { Clip c = openFile(m); if (c.getMicrosecondLength() < 10_000_000L) CACHE_CUSTOM.put(mus, m.data.getBytes()); + System.out.println("Attempting to load sound"); loadSound(-1, c); // TODO stop audio if battle is exited after } } catch (Exception e) { diff --git a/src/main/java/main/MainBCU.java b/src/main/java/main/MainBCU.java index 3f5f50d1..885f09ec 100644 --- a/src/main/java/main/MainBCU.java +++ b/src/main/java/main/MainBCU.java @@ -101,6 +101,8 @@ public void initProfile() { AssetLoader.load(LoadPage::prog); LoadPage.prog("reading BC data"); UserProfile.getBCData().load(LoadPage::prog, LoadPage::prog); + LoadPage.prog("reading BCU custom data"); + UserProfile.getBCUData().load(LoadPage::prog, LoadPage::prog); LoadPage.prog("reading backups"); Backup.loadBackups(); diff --git a/src/main/java/page/view/MusicPage.java b/src/main/java/page/view/MusicPage.java index 9edddc39..1eb559ae 100644 --- a/src/main/java/page/view/MusicPage.java +++ b/src/main/java/page/view/MusicPage.java @@ -29,8 +29,9 @@ public class MusicPage extends Page implements SupPage { public MusicPage(Page p) { super(p); List mus = new ArrayList<>(); - for (PackData pac : UserProfile.getAllPacks()) + for (PackData pac : UserProfile.getAllPacks()) { mus.addAll(pac.musics.getList()); + } jlf.setListData(mus.toArray(new Music[0])); ini(); From ae02586164b42f128db53c20966856215a0fab9e Mon Sep 17 00:00:00 2001 From: floofymrow <124401935+ramen-cat-coder@users.noreply.github.com> Date: Tue, 16 Jun 2026 18:58:39 -0700 Subject: [PATCH 3/5] Update common --- src/main/java/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/common b/src/main/java/common index 8920447e..c23b53ec 160000 --- a/src/main/java/common +++ b/src/main/java/common @@ -1 +1 @@ -Subproject commit 8920447e73bea56289a2da5a2a9294e24ff08c67 +Subproject commit c23b53ec53d76ef7529b4c4b2a83efb7d5d3694e From 872b592cf9868590ad514f085c44c92e71b1543c Mon Sep 17 00:00:00 2001 From: floofymrow <124401935+ramen-cat-coder@users.noreply.github.com> Date: Tue, 16 Jun 2026 20:31:46 -0700 Subject: [PATCH 4/5] Update common --- src/main/java/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/common b/src/main/java/common index c23b53ec..f0a5280b 160000 --- a/src/main/java/common +++ b/src/main/java/common @@ -1 +1 @@ -Subproject commit c23b53ec53d76ef7529b4c4b2a83efb7d5d3694e +Subproject commit f0a5280bfc093eee385575c30d27cbcd5496a0e1 From c3d17368f6d5ce3c0e919237280513e6d4d65e04 Mon Sep 17 00:00:00 2001 From: floofymrow <124401935+ramen-cat-coder@users.noreply.github.com> Date: Tue, 16 Jun 2026 20:35:47 -0700 Subject: [PATCH 5/5] Update common --- src/main/java/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/common b/src/main/java/common index f0a5280b..e8a5df8a 160000 --- a/src/main/java/common +++ b/src/main/java/common @@ -1 +1 @@ -Subproject commit f0a5280bfc093eee385575c30d27cbcd5496a0e1 +Subproject commit e8a5df8a1798f1c1770b96623cc545f3fb6f6c3d