Reworks

- Fixed UnitSound, UnitHalo won't load before l2d installed - Replace boss3 with Theme 232(Chokmah's Theme)
WilloIzCitron · Dec 30, 2024 · 60585a7 · 60585a7
1 parent a0382f0
commit 60585a7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@ A mod that override the vanilla soundtrack into Blue Archive Soundtrack, and als
 ## Building
 
 To generate the mod jar, you can do this below with platform specified jar:
-- Android: `gradlew jarAndroid`
+- Android: `gradlew dex`
 - PC: `gradlew jar`
 
 for Build Deployment(desktop and android) you can do `gradlew build`

diff --git a/assets/music/boss3.ogg b/assets/music/boss3.ogg
diff --git a/src/bluearchive/ArchiveDustry.java b/src/bluearchive/ArchiveDustry.java
@@ -29,6 +29,9 @@ public void init(){
         //ArchivDStyles.load();
         ArchivDLoadingFragment.init();
         ArchivDSettings.loadSettings();
+        if(Core.settings.getBool("ba-addHalo", true)) UnitHalo.init();
+        UnitSound.init();
+        ArchivDMusic.load();
         if(Core.settings.getBool("enableL2D")) {
             dataDirectory.child("live2d").walk(f -> {
                 foundL2D++;
@@ -75,15 +78,13 @@ public void init(){
 //                    ArchivDBackground.buildL2D("nonomi");
 //                    recollectionMusic = tree.loadMusic("cat");
 //                    break;
-                    if(!Core.settings.getString("setL2D-new").isEmpty()) {
-                        ArchivDBackground.buildL2D(Core.settings.getString("setL2D-new"));
-                    } else {
-                        Core.settings.put("enableL2D", false); //fallback if setl2d is blank
-                        Core.settings.put("setSong", 1);
-                    }
-            if(Core.settings.getBool("ba-addHalo", true)) UnitHalo.init();
-            UnitSound.init();
-            ArchivDMusic.load();
+            if (!Core.settings.getString("setL2D-new").isEmpty()) {
+                ArchivDBackground.buildL2D(Core.settings.getString("setL2D-new"));
+            } else {
+                Core.settings.put("enableL2D", false); //fallback if setl2d is blank
+                Core.settings.put("setSong", 1);
+            }
+        }
             Events.on(EventType.ClientLoadEvent.class, event -> {
                 switch (Core.settings.getInt("setSong")) {
                     case 1:
@@ -165,7 +166,6 @@ public void init(){
                     Time.clear();
                 });
             });
-        }
     }
     public static Music soundControlPlaying() {
         if (state.isMenu()) {

diff --git a/src/bluearchive/ui/overrides/ArchivDLoadingFragment.java b/src/bluearchive/ui/overrides/ArchivDLoadingFragment.java
@@ -10,6 +10,7 @@
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.util.Nullable;
+import mindustry.Vars;
 import mindustry.graphics.*;
 import mindustry.ui.*;
 import mindustry.ui.fragments.*;
@@ -34,7 +35,7 @@ public static void init() {
         if(!mobile){
             scale = 45f;
         } else {
-            scale = 25f;
+            scale = 60f;
         }
     }
 
@@ -47,7 +48,7 @@ public void build(Group parent){
             });
             t.visible = false;
             t.touchable = Touchable.enabled;
-            t.add().height((Core.graphics.getHeight())/2f).row();
+            t.add().height((Core.graphics.getHeight())/ 2f).row();
             t.row();
             tooltipTitle = t.add("Lorem Ipsum").color(Pal.techBlue).fontScale(1.5f).style(Styles.techLabel).pad(10).left().get();
             t.row();