Merge remote-tracking branch 'origin/aside'

Author: redomar

res/music/jl1.0.1.jar

@@ -17,6 +17,7 @@
 import com.redomar.game.gfx.Screen;
 import com.redomar.game.gfx.SpriteSheet;
 import com.redomar.game.level.LevelHandler;
+import com.redomar.game.lib.Music;
 import com.redomar.game.net.GameClient;
 import com.redomar.game.net.GameServer;
 import com.redomar.game.net.packets.Packet00Login;
@@ -108,6 +109,9 @@ public synchronized void start() {
 		running = true;
 		new Thread(this).start();
 
+		Music music = new Music();
+		new Thread(music).start();
+		
 		if (Jdata_Host == 0) {
 			socketServer = new GameServer(this);
 			socketServer.start();
@@ -213,6 +217,7 @@ public void render() {
 	public static void main(String[] args) {
 		try {
 			JSplash splash = new JSplash(Game.class.getResource("/splash/splash.png"), true, true, false, "v1.4 Alpha", null, Color.RED, Color.ORANGE);
+			splash.setAlwaysOnTop(true);
 			splash.splashOn();
 			splash.setProgress(10, "Initializing Game");
 			Thread.sleep(750);

res/music/yoshi.mp3

@@ -0,0 +1,50 @@
+package com.redomar.game.lib;
+
+import java.io.BufferedInputStream;
+import java.io.InputStream;
+
+import com.redomar.game.Game;
+
+import javazoom.jl.player.Player;
+
+public class Music implements Runnable{
+
+	private InputStream file;
+	private Player musicPlayer;
+	
+	public Music(InputStream url){
+		this.file =  url;
+	}
+	
+	public Music() {
+		
+	}
+
+	public void Play(){
+		try {
+            BufferedInputStream buffered = new BufferedInputStream(file);  
+            musicPlayer = new Player(buffered);  
+            musicPlayer.play();
+		} catch (Exception e) {
+			System.out.println("Problem playing file " + file);  
+            System.out.println(e);
+		}
+	}
+
+	@Override
+	public void run() {
+		Music music = new Music(Game.class.getResourceAsStream("/music/yoshi.mp3"));
+		while(true){
+			music.Play();
+		}
+	}
+	
+	public void stop() {
+		Music music = new Music(Game.class.getResourceAsStream("/music/yoshi.mp3"));
+		while(true){
+			music.stop();
+		}
+	}
+	
+	
+}