Merge remote-tracking branch 'origin/aside'

Author: redomar

res/JSplashScreen.jar res/jars/JSplashScreen.jarres/JSplashScreen.jar renamed to res/jars/JSplashScreen.jar

@@ -12,6 +12,8 @@
 import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 
+import org.apache.commons.lang3.text.WordUtils;
+
 import com.redomar.game.entities.Player;
 import com.redomar.game.entities.PlayerMP;
 import com.redomar.game.gfx.Screen;
@@ -28,35 +30,37 @@ public class Game extends Canvas implements Runnable {
 	private static final long serialVersionUID = 1L;
 
 	// Setting the size and name of the frame/canvas
-	public static final int WIDTH = 160;
-	public static final int HEIGHT = (WIDTH / 3 * 2);
-	public static final int SCALE = 3;
-	public static final String NAME = "Game";
-	public static Game game;
+	private static final int WIDTH = 160;
+	private static final int HEIGHT = (WIDTH / 3 * 2);
+	private static final int SCALE = 3;
+	private static final String NAME = "Game";
+	private static Game game;
 	private static int Jdata_Host;
 	private static String Jdata_UserName = "";
 	private static String Jdata_IP = "127.0.0.1";
 
 	private JFrame frame;
 
-	public boolean running = false;
-	public int tickCount = 0;
+	private boolean running = false;
+	private int tickCount = 0;
 
 	private BufferedImage image = new BufferedImage(WIDTH, HEIGHT,
 			BufferedImage.TYPE_INT_RGB);
 	private int[] pixels = ((DataBufferInt) image.getRaster().getDataBuffer())
 			.getData();
 	private int[] colours = new int[6 * 6 * 6];
 
+	private BufferedImage image2 = new BufferedImage(WIDTH, HEIGHT - 30, BufferedImage.TYPE_INT_RGB);
 	private Screen screen;
 	private InputHandler input;
 	private WindowHandler window;
 	private LevelHandler level;
 	private Player player;
 	private Music music = new Music();
-	public Thread musicThread = new Thread(music);
+	private Thread musicThread = new Thread(music);
+	private String nowPlaying = "Playing Music";
 
-	public boolean notActive = true;
+	private boolean notActive = true;
 
 	private GameClient socketClient;
 	private GameServer socketServer;
@@ -78,7 +82,7 @@ public Game() {
 	}
 
 	public void init() {
-		game = this;
+		setGame(this);
 		int index = 0;
 		for (int r = 0; r < 6; r++) {
 			for (int g = 0; g < 6; g++) {
@@ -174,7 +178,7 @@ public void run() {
 	}
 
 	public void tick() {
-		tickCount++;
+		setTickCount(getTickCount() + 1);
 		getLevel().tick();
 	}
 
@@ -185,8 +189,8 @@ public void render() {
 			return;
 		}
 
-		int xOffset = getPlayer().x - (screen.width / 2);
-		int yOffset = getPlayer().y - (screen.height / 2);
+		int xOffset = getPlayer().x - (screen.getWidth() / 2);
+		int yOffset = getPlayer().y - (screen.getHeight() / 2);
 
 		getLevel().renderTiles(screen, xOffset, yOffset);
 
@@ -199,9 +203,9 @@ public void render() {
 
 		getLevel().renderEntities(screen);
 
-		for (int y = 0; y < screen.height; y++) {
-			for (int x = 0; x < screen.width; x++) {
-				int colourCode = screen.pixels[x + y * screen.width];
+		for (int y = 0; y < screen.getHeight(); y++) {
+			for (int x = 0; x < screen.getWidth(); x++) {
+				int colourCode = screen.getPixels()[x + y * screen.getWidth()];
 				if (colourCode < 255) {
 					pixels[x + y * WIDTH] = colours[colourCode];
 				}
@@ -212,18 +216,27 @@ public void render() {
 			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;				
+				notActive = false;
 			} else {
 				System.out.println("Canceled");
 				input.PlayMusic = false;
 			}
 		}
 
-
 		Graphics g = bs.getDrawGraphics();
 
 		g.drawRect(0, 0, getWidth(), getHeight());
-		g.drawImage(image, 0, 0, getWidth(), getHeight(), null);
+		g.drawImage(image, 0, 0, getWidth(), getHeight()-30, null);
+//		Font.render("Hi", screen, 0, 0, Colours.get(-1, -1, -1, 555), 1);
+		g.drawImage(image2, 0, getHeight()-30, getWidth(), getHeight(), null);
+		g.setColor(Color.WHITE);
+		g.drawString("Welcome "+WordUtils.capitalizeFully(player.getUsername()), 0, getHeight()-19);
+		if (notActive == true){			
+			g.drawString("MUSIC is OFF | press 'M' to start", 0, getHeight()-8);
+		} else{
+			g.drawString("MUSIC is ON | You cannot turn off the music", 0, getHeight()-8);
+			g.drawString(nowPlaying, (getWidth() - nowPlaying.length()) - (120 + nowPlaying.length()), getHeight() - 20 );
+		}
 		g.dispose();
 		bs.show();
 	}
@@ -251,15 +264,15 @@ public static void main(String[] args) {
 			Thread.sleep(750);
 			splash.setProgress(92, "Aquring data: Multiplayer");
 			Thread.sleep(200);
-			Jdata_Host = JOptionPane.showConfirmDialog(game, "Do you want to be the HOST?");
+			Jdata_Host = JOptionPane.showConfirmDialog(getGame(), "Do you want to be the HOST?");
 			if (Jdata_Host == 1){
-				Jdata_IP = JOptionPane.showInputDialog(game, "Enter the name \nleave blank for local");
+				Jdata_IP = JOptionPane.showInputDialog(getGame(), "Enter the name \nleave blank for local");
 			}
 			Thread.sleep(200);
 			splash.setProgress(95, "Aquring data: Username");
 			Thread.sleep(200);
 			splash.setProgress(96, "Initalizing as Server:Host");
-			Jdata_UserName = JOptionPane.showInputDialog(game, "Enter a name");
+			Jdata_UserName = JOptionPane.showInputDialog(getGame(), "Enter a name");
 			splash.setProgress(97, "Connecting as" + Jdata_UserName);
 			Thread.sleep(500);
 			splash.splashOff();
@@ -310,4 +323,28 @@ public void setWindow(WindowHandler window) {
 		this.window = window;
 	}
 
+	public String getNowPlaying() {
+		return nowPlaying;
+	}
+
+	public void setNowPlaying(String nowPlaying) {
+		this.nowPlaying = nowPlaying;
+	}
+
+	public int getTickCount() {
+		return tickCount;
+	}
+
+	public void setTickCount(int tickCount) {
+		this.tickCount = tickCount;
+	}
+
+	public static Game getGame() {
+		return game;
+	}
+
+	public static void setGame(Game game) {
+		Game.game = game;
+	}
+
 }

res/jars/commons-lang3-3.1.jar

@@ -46,7 +46,7 @@ public void tick() {
 			isMoving = true;
 
 			Packet02Move packet = new Packet02Move(this.getUsername(), this.x, this.y, this.numSteps, this.isMoving, this.movingDir);
-			packet.writeData(Game.game.getSocketClient());
+			packet.writeData(Game.getGame().getSocketClient());
 
 		} else {
 			isMoving = false;

res/music/jl1.0.1.jar res/jars/jl1.0.1.jarres/music/jl1.0.1.jar renamed to res/jars/jl1.0.1.jar

@@ -2,29 +2,29 @@
 
 public class Screen {
 
-	public static final int MAP_WIDTH = 64;
-	public static final int MAP_WIDTH_MASK = MAP_WIDTH - 1;
+	private static final int MAP_WIDTH = 64;
+	private static final int MAP_WIDTH_MASK = MAP_WIDTH - 1;
 
-	public static final byte BIT_MIRROR_X = 0x01;
-	public static final byte BIT_MIRROR_Y = 0x02;
+	private static final byte BIT_MIRROR_X = 0x01;
+	private static final byte BIT_MIRROR_Y = 0x02;
 
-	public int[] pixels;
+	private int[] pixels;
 
-	public int xOffset = 0;
-	public int yOffset = 0;
+	private int xOffset = 0;
+	private int yOffset = 0;
 
-	public int width;
-	public int height;
+	private int width;
+	private int height;
 
-	public SpriteSheet sheet;
+	private SpriteSheet sheet;
 
 	public Screen(int width, int height, SpriteSheet sheet) {
 
-		this.width = width;
-		this.height = height;
+		this.setWidth(width);
+		this.setHeight(height);
 		this.sheet = sheet;
 
-		pixels = new int[width * height];
+		setPixels(new int[width * height]);
 	}
 
 	public void render(int xPos, int yPos, int tile, int colour, int mirrorDir,
@@ -38,7 +38,7 @@ public void render(int xPos, int yPos, int tile, int colour, int mirrorDir,
 		int scaleMap = scale - 1;
 		int xTile = tile % 32;
 		int yTile = tile / 32;
-		int tileOffset = (xTile << 3) + (yTile << 3) * sheet.width;
+		int tileOffset = (xTile << 3) + (yTile << 3) * sheet.getWidth();
 
 		for (int y = 0; y < 8; y++) {
 			int ySheet = y;
@@ -59,23 +59,23 @@ public void render(int xPos, int yPos, int tile, int colour, int mirrorDir,
 				int xPixel = x + xPos + (x * scaleMap) - ((scaleMap << 3) / 2);
 
 				int col = (colour >> (sheet.pixels[xSheet + ySheet
-						* sheet.width + tileOffset] * 8)) & 255;
+						* sheet.getWidth() + tileOffset] * 8)) & 255;
 				if (col < 255) {
 
 					for (int yScale = 0; yScale < scale; yScale++) {
 
-						if (yPixel + yScale < 0 | yPixel + yScale >= height) {
+						if (yPixel + yScale < 0 | yPixel + yScale >= getHeight()) {
 							continue;
 						}
 
 						for (int xScale = 0; xScale < scale; xScale++) {
 
-							if (xPixel + xScale < 0 | xPixel + xScale >= width) {
+							if (xPixel + xScale < 0 | xPixel + xScale >= getWidth()) {
 								continue;
 							}
 
-							pixels[(xPixel + xScale) + (yPixel + yScale)
-									* width] = col;
+							getPixels()[(xPixel + xScale) + (yPixel + yScale)
+									* getWidth()] = col;
 						}
 					}
 
@@ -89,4 +89,32 @@ public void setOffset(int xOffset, int yOffset) {
 		this.xOffset = xOffset;
 		this.yOffset = yOffset;
 	}
+
+	public static int getMapWidthMask() {
+		return MAP_WIDTH_MASK;
+	}
+
+	public int getWidth() {
+		return width;
+	}
+
+	public void setWidth(int width) {
+		this.width = width;
+	}
+
+	public int[] getPixels() {
+		return pixels;
+	}
+
+	public void setPixels(int[] pixels) {
+		this.pixels = pixels;
+	}
+
+	public int getHeight() {
+		return height;
+	}
+
+	public void setHeight(int height) {
+		this.height = height;
+	}
 }

src/com/redomar/game/Game.java

@@ -7,9 +7,9 @@
 
 public class SpriteSheet {
 
-	public String path;
-	public int width;
-	public int height;
+	private String path;
+	private int width;
+	private int height;
 
 	public int[] pixels;
 
@@ -26,11 +26,11 @@ public SpriteSheet(String path) {
 			return;
 		}
 
-		this.path = path;
-		this.width = image.getWidth();
+		this.setPath(path);
+		this.setWidth(image.getWidth());
 		this.height = image.getHeight();
 
-		pixels = image.getRGB(0, 0, width, height, null, 0, width);
+		pixels = image.getRGB(0, 0, getWidth(), height, null, 0, getWidth());
 
 		for (int i = 0; i < pixels.length; i++) {
 			pixels[i] = (pixels[i] & 0xff) / 64; // removes alpha (transparency)
@@ -40,4 +40,20 @@ public SpriteSheet(String path) {
 			// System.out.println(pixels[i]);
 		}
 	}
+
+	public String getPath() {
+		return path;
+	}
+
+	public void setPath(String path) {
+		this.path = path;
+	}
+
+	public int getWidth() {
+		return width;
+	}
+
+	public void setWidth(int width) {
+		this.width = width;
+	}
 }