WIP: Improve Instrument and MusicVenueTool overlays.

AeronicaMC · Feb 29, 2024 · 8cffcfa · 8cffcfa
1 parent cedc5b2
commit 8cffcfa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/main/java/aeronicamc/mods/mxtune/render/ActiveAudioOverlay.java b/src/main/java/aeronicamc/mods/mxtune/render/ActiveAudioOverlay.java
@@ -21,18 +21,21 @@ public static void render(RenderGameOverlayEvent.Post event) {
         // Display basic info about the instrument and tune. Optionally, displays some debug info depending on MXTune.isDevEnv flag.
         // Based on the toast renderer for testing some ideas.
         if (isPlacardInHotBar()) {
-            ITextComponent infoText = new StringTextComponent("")
-                    .append(String.format("%s %s", mc.getSoundManager().getDebugString(), ClientAudio.getDebugString())).withStyle(TextFormatting.WHITE);
             final MatrixStack pPoseStack = event.getMatrixStack();
             RenderSystem.color3f(1.0F, 1.0F, 1.0F);
 
+            final ITextComponent infoText = new StringTextComponent("")
+                    .append(String.format("%s, %s", mc.getSoundManager().getDebugString(), ClientAudio.getDebugString())).withStyle(TextFormatting.WHITE);
             final int[] posY = { 0 };
             posY[0] = (25);
             mc.font.drawShadow(pPoseStack, infoText, 5.0F, posY[0] += 10, -11534256);
             ClientAudio.getAudioData().forEach(audioData -> mc.font.drawShadow(pPoseStack, audioData.getInfo(), 5, posY[0] += 10, -11534256));
         }
     }
 
+    /**
+     * @return true if mxtune:placard_item is on the hot-bar, and the player is not in a portal.
+     */
     private static boolean isPlacardInHotBar() {
         int slot = getPlayer().inventory.findSlotMatchingItem(PLACARD_ITEM);
         return slot >= 0 && slot < 9 && !(getPlayer().portalTime > 0);

diff --git a/src/main/java/aeronicamc/mods/mxtune/sound/ClientAudio.java b/src/main/java/aeronicamc/mods/mxtune/sound/ClientAudio.java
@@ -66,7 +66,7 @@ private ClientAudio() { /* NOP */ }
 
     public static String getDebugString()
     {
-        return String.format("AudioData %d/%d/%d", ActiveAudio.getDistanceSortedSources().size(), ActiveAudio.getDeleteQueueSize(), ActiveAudio.getCachedMidiSequenceCount());
+        return String.format("AudioData numSources: %d, deleteQ: %d, seqQ: %d", ActiveAudio.getDistanceSortedSources().size(), ActiveAudio.getDeleteQueueSize(), ActiveAudio.getCachedMidiSequenceCount());
     }
 
     public static List<AudioData> getAudioData()