Pause MCMusic when "Ping" packet is received

This prevents Minecraft's music from playing at the same time as
user-provided battle/silly music.

diff --git a/src/main/java/com/burnedkirby/TurnBasedMinecraft/client/BattleMusic.java b/src/main/java/com/burnedkirby/TurnBasedMinecraft/client/BattleMusic.java
index 035d87746a8e457b764a3fd4faa4f8df73b0d08b..1d6f45010d80c2958f78c52a3d4da7584288d264 100644 (file)
--- a/src/main/java/com/burnedkirby/TurnBasedMinecraft/client/BattleMusic.java
+++ b/src/main/java/com/burnedkirby/TurnBasedMinecraft/client/BattleMusic.java
@@ -180,7 +180,7 @@ public class BattleMusic
         if(initialized && next != null)
         {
             logger.debug("play called with file " + next.getName() + " and vol " + volume);
-               Minecraft.getInstance().getSoundManager().pause();
+            TurnBasedMinecraftMod.proxy.pauseMCMusic();
             String suffix = next.getName().substring(next.getName().length() - 3).toLowerCase();
             if(suffix.equals("mid") && sequencer != null)
             {
@@ -362,7 +362,7 @@ public class BattleMusic
         }
         if(resumeMCSounds)
         {
-            Minecraft.getInstance().getSoundManager().resume();
+            TurnBasedMinecraftMod.proxy.resumeMCMusic();
         }
         isPlaying = false;
     }

diff --git a/src/main/java/com/burnedkirby/TurnBasedMinecraft/client/ClientProxy.java b/src/main/java/com/burnedkirby/TurnBasedMinecraft/client/ClientProxy.java
index baaa74f34483b7a65cb7a3e44562039c48a5a905..ed078613573ac6dd59fd7948624a7b292708b533 100644 (file)
--- a/src/main/java/com/burnedkirby/TurnBasedMinecraft/client/ClientProxy.java
+++ b/src/main/java/com/burnedkirby/TurnBasedMinecraft/client/ClientProxy.java
@@ -1483,4 +1483,14 @@ public class ClientProxy extends CommonProxy {
     public void showClientConfigGui() {
         Minecraft.getInstance().setScreen(new ClientConfigGui());
     }
-}
\ No newline at end of file
+
+    @Override
+    public void pauseMCMusic() {
+        Minecraft.getInstance().getSoundManager().pause();
+    }
+
+    @Override
+    public void resumeMCMusic() {
+        Minecraft.getInstance().getSoundManager().resume();
+    }
+}

diff --git a/src/main/java/com/burnedkirby/TurnBasedMinecraft/common/CommonProxy.java b/src/main/java/com/burnedkirby/TurnBasedMinecraft/common/CommonProxy.java
index 1ef973b5e204cec9229c6350806b3c81dda3b682..8d19927c42fd82cc4739b0be9e5a8402adaba0c3 100644 (file)
--- a/src/main/java/com/burnedkirby/TurnBasedMinecraft/common/CommonProxy.java
+++ b/src/main/java/com/burnedkirby/TurnBasedMinecraft/common/CommonProxy.java
@@ -175,4 +175,7 @@ public class CommonProxy
     public <MSG> void handlePacket(MSG msg,CustomPayloadEvent.Context ctx) {}
 
     public void showClientConfigGui() {}
-}
\ No newline at end of file
+
+    public void pauseMCMusic() {}
+    public void resumeMCMusic() {}
+}

diff --git a/src/main/java/com/burnedkirby/TurnBasedMinecraft/common/networking/PacketBattlePing.java b/src/main/java/com/burnedkirby/TurnBasedMinecraft/common/networking/PacketBattlePing.java
index d640f0bb041dfd837acca4ac68448f7e75c7a0ac..c9f057b2dabbb458e4e9573a92b81174e9ce4e78 100644 (file)
--- a/src/main/java/com/burnedkirby/TurnBasedMinecraft/common/networking/PacketBattlePing.java
+++ b/src/main/java/com/burnedkirby/TurnBasedMinecraft/common/networking/PacketBattlePing.java
@@ -52,8 +52,9 @@ public class PacketBattlePing {
                 TurnBasedMinecraftMod.proxy.setBattleGuiAsGui();
                 TurnBasedMinecraftMod.proxy.setBattleGuiBattleChanged();
                 TurnBasedMinecraftMod.proxy.setBattleGuiTime(pkt.decisionSeconds);
+                TurnBasedMinecraftMod.proxy.pauseMCMusic();
             });
             ctx.setPacketHandled(true);
         }
     }
-}
\ No newline at end of file
+}