Modified AudioComponent

Author: EliasVahlberg

src/evhh/common/assetloading/AssetLoader.java

@@ -6,6 +6,8 @@
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Objects;
 
@@ -82,4 +84,38 @@ public static HashMap<String, BufferedImage> LoadImageAssets(String path, String
         }
         return map;
     }
+
+    public static File[] LoadFileAssetsFromDir(String path, String[] acceptedFileExtensions)
+    {
+        File dir = new File(path);
+        if (!dir.isDirectory())
+            return null;
+        File[] files = new File[Objects.requireNonNull(dir.listFiles()).length];
+        int i = 0;
+        for (File file : Objects.requireNonNull(dir.listFiles()))
+        {
+            String fileName = file.toString();
+
+            int index = fileName.lastIndexOf('.');
+            if(index > 0) {
+                String extension = fileName.substring(index + 1);
+                if(Arrays.asList(acceptedFileExtensions).contains(extension))
+                    files[i++]=file;
+            }
+        }
+        File[] shortened = new File[i+1];
+        System.arraycopy(files, 0, shortened, 0, i + 1);
+        return shortened;
+    }
+    public static File loadFileUsingJFileChooser()
+    {
+        JFileChooser fileChooser = new JFileChooser();
+        fileChooser.setCurrentDirectory(new File(System.getProperty("user.dir")));
+        fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
+        int response = fileChooser.showSaveDialog(null);
+        if (response == JFileChooser.APPROVE_OPTION)
+            return new File(fileChooser.getSelectedFile().getAbsolutePath());
+        else
+            return null;
+    }
 }

src/evhh/model/Grid.java

@@ -165,6 +165,7 @@ public void removeGameObject(int x, int y)
             return;
         }
         gameInstance.getFrameRenderer().getGridRenderer().removeSprite(grid[x][y].getSprite());
+        grid[x][y].onExit();
         grid[x][y] = null;
         numGameObjects--;
     }

src/evhh/model/gamecomponents/AudioComponent.java

@@ -25,13 +25,23 @@ public class AudioComponent extends GameComponent
     transient private AudioInputStream audioStream;
     transient private DataLine.Info info;
     transient private AudioFormat format;
+    private float volume = 0.5f;
+    private FloatControl volumeControl;
 
     public AudioComponent(GameObject parent, AudioListener audioListener, File[] audioFiles)
     {
         super(parent);
         this.audioListener = audioListener;
         this.audioFiles = audioFiles;
 
+    }
+    public AudioComponent(GameObject parent, AudioListener audioListener, File[] audioFiles,float volume)
+    {
+        super(parent);
+        this.audioListener = audioListener;
+        this.audioFiles = audioFiles;
+        this.volume = volume;
+
     }
 
     public boolean play(int index)
@@ -42,9 +52,13 @@ public boolean play(int index)
             format = audioStream.getFormat();
             info = new DataLine.Info(Clip.class, format);
             audioClip = (Clip) AudioSystem.getLine(info);
+
             audioClip.addLineListener(audioListener);
             audioClip.open(audioStream);
 
+            volumeControl = (FloatControl) audioClip.getControl(FloatControl.Type.MASTER_GAIN);
+            volumeControl.setValue(volume);
+
             audioClip.start();
         } catch (UnsupportedAudioFileException | IOException | LineUnavailableException | IndexOutOfBoundsException ignored)
         {
@@ -76,7 +90,17 @@ public boolean isPlaying()
             return false;
         return  audioClip.isRunning();
     }
+    public void setVolume(float gain)
+    {
+        volume = gain;
+        if(isPlaying()&&volumeControl!=null)
+            volumeControl.setValue(gain);
+    }
 
+    public float getVolume()
+    {
+        return volume;
+    }
 
     @Override
     public void onStart()