Merge remote-tracking branch 'origin/aside'

Author: redomar

res/music/Towards The End.mp3

@@ -34,7 +34,8 @@ public class Game extends Canvas implements Runnable {
 	public static final String NAME = "Game";
 	public static Game game;
 	private static int Jdata_Host;
-	private static String Jdata_UserName = "";	
+	private static String Jdata_UserName = "";
+	private static String Jdata_IP = "127.0.0.1";
 
 	private JFrame frame;
 
@@ -53,6 +54,9 @@ public class Game extends Canvas implements Runnable {
 	private LevelHandler level;
 	private Player player;
 	private Music music = new Music();
+	public Thread musicThread = new Thread(music);
+	
+	public boolean notActive = true;
 
 	private GameClient socketClient;
 	private GameServer socketServer;
@@ -108,15 +112,14 @@ public void init() {
 
 	public synchronized void start() {
 		running = true;
-		new Thread(music).start();
 		new Thread(this).start();
 
 		if (Jdata_Host == 0) {
 			socketServer = new GameServer(this);
 			socketServer.start();
 		}
 
-		setSocketClient(new GameClient(this, "127.0.0.1"));
+		setSocketClient(new GameClient(this, Jdata_IP));
 		getSocketClient().start();
 	}
 
@@ -204,6 +207,18 @@ public void render() {
 				}
 			}
 		}
+		
+		if (input.PlayMusic == true && notActive == true){
+			int musicOption = JOptionPane.showConfirmDialog(this, "You are about to turn on music and can be VERY loud", "Music Options", 2, 2);
+			if (musicOption == 0){
+				musicThread.start();
+				notActive = false;				
+			} else {
+				System.out.println("Canceled");
+				input.PlayMusic = false;
+			}
+		}
+		
 
 		Graphics g = bs.getDrawGraphics();
 
@@ -237,6 +252,9 @@ public static void main(String[] args) {
 			splash.setProgress(92, "Aquring data: Multiplayer");
 			Thread.sleep(200);
 			Jdata_Host = JOptionPane.showConfirmDialog(game, "Do you want to be the HOST?");
+			if (Jdata_Host == 1){
+				Jdata_IP = JOptionPane.showInputDialog(game, "Enter the name \nleave blank for local");
+			}
 			Thread.sleep(200);
 			splash.setProgress(95, "Aquring data: Username");
 			Thread.sleep(200);

src/com/redomar/game/Game.java

@@ -33,6 +33,7 @@ public void toggle(boolean isPressed) {
 	public Key down = new Key();
 	public Key left = new Key();
 	public Key right = new Key();
+	public boolean PlayMusic = false;
 
 	public void keyPressed(KeyEvent e) {
 		toggleKey(e.getKeyCode(), true);
@@ -59,6 +60,9 @@ public void toggleKey(int keyCode, boolean isPressed) {
 		if (keyCode == KeyEvent.VK_D || keyCode == KeyEvent.VK_RIGHT) {
 			right.toggle(isPressed);
 		}
+		if (keyCode == KeyEvent.VK_M){
+			this.PlayMusic = true;
+		}
 	}
 
 }

src/com/redomar/game/InputHandler.java

@@ -2,6 +2,7 @@
 
 import java.io.BufferedInputStream;
 import java.io.InputStream;
+import java.util.Random;
 
 import com.redomar.game.Game;
 
@@ -11,6 +12,10 @@ public class Music implements Runnable{
 
 	private InputStream file;
 	private Player musicPlayer;
+	private String songName[] = {"/music/yoshi.mp3", "/music/Towards The End.mp3"};
+	private int songNumber;
+	
+	private static Random rand = new Random();
 
 	public Music(InputStream url){
 		this.file =  url;
@@ -33,18 +38,25 @@ public void Play(){
 
 	@Override
 	public void run() {
-		Music music = new Music(Game.class.getResourceAsStream("/music/yoshi.mp3"));
-		while(true){
+		try {
+			Thread.sleep(300);
+			initSongNumber();
+			System.out.println("[MUSIC] loading song: " + songName[songNumber].substring(7, (songName[songNumber].length() - 4)));
+			Music music = new Music(Game.class.getResourceAsStream(songName[songNumber]));
+			Thread.sleep(100);
+			System.out.println("[MUSIC] playing song: " + songName[songNumber].substring(7, (songName[songNumber].length() - 4)));
 			music.Play();
+			this.run();
+		} catch (InterruptedException e) {
+			System.out.println("[ERROR][MUSIC] Could not stop, nothing currenly playing");
 		}
 	}
 
 	public void stop() {
-		Music music = new Music(Game.class.getResourceAsStream("/music/yoshi.mp3"));
-		while(true){
-			music.stop();
-		}
+		
+	}
+
+	private void initSongNumber() {
+		this.songNumber = rand.nextInt(2);
 	}
-	
-	
 }