Merge branch 'develop' - Alpha 1.8.4 merge

Author: redomar

.gitignore

@@ -58,7 +58,6 @@ local.properties
 *.tlb
 *.tli
 *.tlh
-*.tmp
 *.vspscc
 .builds
 *.dotCover
@@ -182,10 +181,12 @@ JavaGame.ipr
 JavaGame.iws
 JavaGame.iml
 out/
+.idea/
 
 ###############
 ## Debugging ##
 ###############
 
 .log.txt
 /.gradle/
+Package game.png

build.gradle

@@ -6,11 +6,11 @@ apply plugin: 'java'
 
 sourceSets{
     main{
-        java.srcDir 'src'
-        resources.srcDir 'res'
+        java.srcDirs = ['src']
+        resources.srcDirs = ['res']
     }
     test{
-        java.srcDir 'test'
+        java.srcDirs = ['test']
     }
 }
 

jar-in-jar-loader.zip

@@ -1,14 +1,40 @@
 package com.redomar.game.audio;
 
+import com.redomar.game.script.PrintTypes;
+import com.redomar.game.script.Printing;
+
 import javax.sound.sampled.*;
+import java.io.File;
 
 
 public class AudioHandler {
 
 	private Clip clip;
 	private boolean active = false;
+	private Printing p = new Printing();
 
 	public AudioHandler(String path){
+		check(path);
+	}
+
+	public AudioHandler(File file){
+		check(file.toString());
+	}
+
+	private void check(String path){
+		try {
+			if(path != ""){
+				initiate(path);
+			} else {
+				throw new NullPointerException();
+			}
+		} catch (NullPointerException e){
+			p.print("Destination Cannot be empty", PrintTypes.ERROR);
+			throw e;
+		}
+	}
+
+	private void initiate(String path){
 		try{
 			AudioInputStream audioInputStream = AudioSystem.getAudioInputStream(getClass().getResourceAsStream(path));
 			AudioFormat baseformat = audioInputStream.getFormat();
@@ -26,15 +52,21 @@ public AudioHandler(String path){
 			clip.open(decodedAudioInputStream);
 		} catch (Exception e){
 			System.err.println(e.getStackTrace());
+			p.print("Audio Failed to initiate", PrintTypes.ERROR);
 		}
 	}
 
 	public void play(){
-		if(clip == null) return;
-		stop();
-		clip.setFramePosition(0);
-		clip.start();
-		active = true;
+		try{
+			if(clip == null) return;
+			stop();
+			clip.setFramePosition(0);
+			clip.start();
+			active = true;
+		} catch (Exception e) {
+			p.print("Audio Failed to play", PrintTypes.ERROR);
+			throw e;
+		}
 	}
 
 	public void setVolume(float velocity){

jar/javagame.jar

@@ -2,7 +2,6 @@
 
 import com.redomar.game.Game;
 import com.redomar.game.InputHandler;
-import com.redomar.game.audio.AudioEffect;
 import com.redomar.game.entities.efx.Swim;
 import com.redomar.game.entities.projectiles.Medium;
 import com.redomar.game.entities.projectiles.Projectile;