Merge remote-tracking branch 'origin/aside'

Author: redomar

res/JSplashScreen.jar

@@ -2,6 +2,7 @@
 
 import java.awt.BorderLayout;
 import java.awt.Canvas;
+import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.image.BufferStrategy;
@@ -19,6 +20,7 @@
 import com.redomar.game.net.GameClient;
 import com.redomar.game.net.GameServer;
 import com.redomar.game.net.packets.Packet00Login;
+import com.thehowtotutorial.splashscreen.JSplash;
 
 public class Game extends Canvas implements Runnable {
 
@@ -30,6 +32,8 @@ public class Game extends Canvas implements Runnable {
 	public static final int SCALE = 3;
 	public static final String NAME = "Game";
 	public static Game game;
+	private static int Jdata_Host;
+	private static String Jdata_UserName;	
 
 	private JFrame frame;
 
@@ -50,7 +54,7 @@ public class Game extends Canvas implements Runnable {
 
 	private GameClient socketClient;
 	private GameServer socketServer;
-
+	
 	public Game() {
 		setMinimumSize(new Dimension(WIDTH * SCALE, HEIGHT * SCALE));
 		setMaximumSize(new Dimension(WIDTH * SCALE, HEIGHT * SCALE));
@@ -87,7 +91,7 @@ public void init() {
 		setLevel(new LevelHandler("/levels/water_level.png"));
 
 		setPlayer(new PlayerMP(getLevel(), 100, 100, input,
-				JOptionPane.showInputDialog(this, "Enter a name"), null, -1));
+				Jdata_UserName, null, -1));
 
 		level.addEntity(player);
 		Packet00Login loginPacket = new Packet00Login(player.getUsername(), player.x, player.y);
@@ -104,7 +108,7 @@ public synchronized void start() {
 		running = true;
 		new Thread(this).start();
 
-		if (JOptionPane.showConfirmDialog(this, "Do you want to be the HOST?") == 0) {
+		if (Jdata_Host == 0) {
 			socketServer = new GameServer(this);
 			socketServer.start();
 		}
@@ -207,7 +211,41 @@ public void render() {
 	}
 
 	public static void main(String[] args) {
-		new Game().start();
+		try {
+			JSplash splash = new JSplash(Game.class.getResource("/splash/splash.png"), true, true, false, "v1.3 Alpha", null, Color.RED, Color.ORANGE);
+			splash.splashOn();
+			splash.setProgress(10, "Initializing Game");
+			Thread.sleep(1500);
+			splash.setProgress(25, "Loading Classes");
+			Thread.sleep(1000);
+			splash.setProgress(35, "Applying Configurations");
+			Thread.sleep(1000);
+			splash.setProgress(40, "Loading Sprites");
+			Thread.sleep(1500);
+			splash.setProgress(50, "Loading Textures");
+			Thread.sleep(1000);
+			splash.setProgress(60, "Loading Map");
+			Thread.sleep(3000);
+			splash.setProgress(80, "Configuring Map");
+			Thread.sleep(1000);
+			splash.setProgress(90, "Pulling InputPanes");
+			Thread.sleep(1500);
+			splash.setProgress(92, "Aquring data: Multiplayer");
+			Thread.sleep(200);
+			Jdata_Host = JOptionPane.showConfirmDialog(game, "Do you want to be the HOST?");
+			Thread.sleep(200);
+			if(Jdata_Host == 0){
+				splash.setProgress(95, "Aquring data: Username");
+				Thread.sleep(200);
+				Jdata_UserName = JOptionPane.showInputDialog(game, "Enter a name");
+				Thread.sleep(200);
+			}
+			splash.splashOff();
+			new Game().start();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		
 	}
 
 	public JFrame getFrame() {

res/levels/water_level.png

@@ -18,6 +18,12 @@ public abstract class Tile {
 	public static final Tile WATER = new AnimatedTile(4, new int[][] {
 			{ 0, 5 }, { 1, 5 }, { 2, 5 }, { 1, 5 } }, Colours.get(-1, 004, 115,
 			-1), 0xFF0000FF, 1000);
+	public static final Tile FLOWER_rose = new BasicTile(5, 4, 0, Colours.get(
+			131, 151, 510, 553), 0xFFCCFF33);
+	public static final Tile FLOWER_dandelion = new BasicTile(6, 4, 0,
+			Colours.get(131, 151, 553, 510), 0xFFFFCC33);
+	public static final Tile SAND = new BasicTile(7, 5, 0, Colours.get(-1, 553,
+			554, 555), 0xFFFFFF99);
 
 	protected byte id;
 	protected boolean solid;