Fix computer running sound not stopping when stopped before initial delay expired.

Author: fnuecke

src/main/java/li/cil/oc2/client/audio/LoopingBlockEntitySound.java

@@ -18,6 +18,7 @@ public final class LoopingBlockEntitySound extends AbstractTickableSoundInstance
     ///////////////////////////////////////////////////////////////////
 
     private final BlockEntity blockEntity;
+    private boolean isCanceled;
 
     ///////////////////////////////////////////////////////////////////
 
@@ -36,6 +37,10 @@ public LoopingBlockEntitySound(final BlockEntity blockEntity, final SoundEvent s
 
     ///////////////////////////////////////////////////////////////////
 
+    public void cancel() {
+        isCanceled = true;
+    }
+
     @Override
     public void tick() {
         volume = Mth.clamp(volume + FADE_IN_PER_TICK, 0, 1);
@@ -44,4 +49,9 @@ public void tick() {
             stop();
         }
     }
+
+    @Override
+    public boolean canPlaySound() {
+        return !isCanceled;
+    }
 }

src/main/java/li/cil/oc2/client/audio/LoopingSoundManager.java

@@ -8,7 +8,7 @@
 import java.util.WeakHashMap;
 
 public final class LoopingSoundManager {
-    private static final WeakHashMap<BlockEntity, TickableSoundInstance> BLOCK_ENTITY_SOUNDS = new WeakHashMap<>();
+    private static final WeakHashMap<BlockEntity, LoopingBlockEntitySound> BLOCK_ENTITY_SOUNDS = new WeakHashMap<>();
 
     ///////////////////////////////////////////////////////////////////
 
@@ -21,14 +21,15 @@ public static void play(final BlockEntity blockEntity, final SoundEvent sound, f
     }
 
     public static void stop(final BlockEntity blockEntity) {
-        final TickableSoundInstance instance = BLOCK_ENTITY_SOUNDS.remove(blockEntity);
+        final LoopingBlockEntitySound instance = BLOCK_ENTITY_SOUNDS.remove(blockEntity);
         if (instance != null) {
+            instance.cancel();
             Minecraft.getInstance().getSoundManager().stop(instance);
         }
     }
 
     public static boolean isPlaying(final BlockEntity blockEntity) {
-        final TickableSoundInstance instance = BLOCK_ENTITY_SOUNDS.get(blockEntity);
+        final LoopingBlockEntitySound instance = BLOCK_ENTITY_SOUNDS.get(blockEntity);
         return instance != null && !instance.isStopped();
     }
 }