Improved master volume handling

Author: RaphiMC

src/main/java/net/raphimc/noteblocktool/audio/soundsystem/impl/JavaxSoundSystem.java

@@ -65,7 +65,7 @@ public synchronized void playSound(final String sound, final float pitch, final
             this.playingSounds.remove(0);
         }
 
-        this.playingSounds.add(new SoundInstance(this.sounds.get(sound), pitch, volume * this.masterVolume, panning));
+        this.playingSounds.add(new SoundInstance(this.sounds.get(sound), pitch, volume, panning));
     }
 
     @Override
@@ -123,6 +123,7 @@ protected byte[] writeNormalized(final long[] samples) {
             final float weight = (float) i / this.volumeDividers.length;
             div = Math.max(div, this.volumeDividers[i] * weight);
         }
+        div /= this.masterVolume;
         System.arraycopy(this.volumeDividers, 1, this.volumeDividers, 0, this.volumeDividers.length - 1);
         for (int i = 0; i < samples.length; i++) {
             final short conv = (short) (samples[i] / div);