Remove all remnants of Multiplayer

Author: redomar

src/com/redomar/game/Game.java

@@ -2,17 +2,13 @@
 
 import com.redomar.game.entities.Dummy;
 import com.redomar.game.entities.Player;
-import com.redomar.game.entities.PlayerMP;
 import com.redomar.game.entities.Vendor;
 import com.redomar.game.gfx.Screen;
 import com.redomar.game.gfx.SpriteSheet;
 import com.redomar.game.level.LevelHandler;
 import com.redomar.game.lib.Font;
 import com.redomar.game.lib.Music;
 import com.redomar.game.lib.Time;
-import com.redomar.game.net.GameClient;
-import com.redomar.game.net.GameServer;
-import com.redomar.game.net.packets.Packet00Login;
 import com.redomar.game.script.PrintTypes;
 import com.redomar.game.script.Printing;
 import org.apache.commons.lang3.text.WordUtils;
@@ -55,7 +51,6 @@ public class Game extends Canvas implements Runnable {
 	private static boolean running = false;
 	private static InputHandler input;
 	private static MouseHandler mouse;
-	private static GameClient socketClient;
 	private static InputContext context;
 	private int tickCount = 0;
 	private BufferedImage image = new BufferedImage(WIDTH, HEIGHT,
@@ -78,7 +73,6 @@ public class Game extends Canvas implements Runnable {
 	private boolean notActive = true;
 	private boolean noAudioDevice = false;
 	private int trigger = 0;
-	private GameServer socketServer;
 	private Printing print = new Printing();
 
 	/**
@@ -126,14 +120,6 @@ public static void setFrame(JFrame frame) {
 		Game.frame = frame;
 	}
 
-	public static GameClient getSocketClient() {
-		return socketClient;
-	}
-
-	public void setSocketClient(GameClient socketClient) {
-		Game.socketClient = socketClient;
-	}
-
 	public static Player getPlayer() {
 		return game.player;
 	}
@@ -186,25 +172,6 @@ public static int getMap() {
 		return map;
 	}
 
-	public void setMap(String Map_str) {
-		setLevel(new LevelHandler(Map_str));
-		if (alternateCols[0]) {
-			Game.setShirtCol(240);
-		}
-		if (!alternateCols[0]) {
-			Game.setShirtCol(111);
-		}
-		if (alternateCols[1]) {
-			Game.setFaceCol(310);
-		}
-		if (!alternateCols[1]) {
-			Game.setFaceCol(543);
-		}
-		setPlayer(new PlayerMP(level, 100, 100, input,
-				getJdata_UserName(), null, -1, shirtCol, faceCol));
-		level.addEntity(player);
-	}
-
 	public static void setMap(int map) {
 		Game.map = map;
 	}
@@ -317,6 +284,25 @@ public static void setClosing(boolean closing) {
 		Game.closingMode = closing;
 	}
 
+	public void setMap(String Map_str) {
+		setLevel(new LevelHandler(Map_str));
+		if (alternateCols[0]) {
+			Game.setShirtCol(240);
+		}
+		if (!alternateCols[0]) {
+			Game.setShirtCol(111);
+		}
+		if (alternateCols[1]) {
+			Game.setFaceCol(310);
+		}
+		if (!alternateCols[1]) {
+			Game.setFaceCol(543);
+		}
+		setPlayer(new Player(level, 100, 100, input,
+				getJdata_UserName(), shirtCol, faceCol));
+		level.addEntity(player);
+	}
+
 	public void init() {
 		setGame(this);
 		int index = 0;
@@ -337,15 +323,6 @@ public void init() {
 		setWindow(new WindowHandler(this));
 		setMap("/levels/custom_level.png");
 		setMap(1);
-		Packet00Login loginPacket = new Packet00Login(player.getUsername(),
-				(int) player.getX(), (int) player.getY());
-
-		if (socketServer != null) {
-			socketServer.addConnection((PlayerMP) getPlayer(), loginPacket);
-		}
-
-		// socketClient.sendData("ping".getBytes());
-		loginPacket.writeData(getSocketClient());
 
 		game.setVendor(new Vendor(level, "Vendor", 215, 215, 304, 543));
 		level.addEntity(getVendor());
@@ -354,14 +331,6 @@ public void init() {
 	public synchronized void start() {
 		Game.setRunning(true);
 		new Thread(this, "GAME").start();
-
-		if (getJdata_Host() == 0) {
-			socketServer = new GameServer(this);
-			socketServer.start();
-		}
-
-		setSocketClient(new GameClient(this, getJdata_IP()));
-		getSocketClient().start();
 	}
 
 	public synchronized void stop() {
@@ -455,8 +424,8 @@ public void render() {
 			}
 		}
 
-		if (noAudioDevice == false) {
-			if (input.isPlayMusic() == true && notActive == true) {
+		if (!noAudioDevice) {
+			if (input.isPlayMusic() && notActive == true) {
 				int musicOption = JOptionPane.showConfirmDialog(this,
 						"You are about to turn on music and can be VERY loud",
 						"Music Options", 2, 2);

src/com/redomar/game/WindowHandler.java

@@ -3,8 +3,6 @@
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
 
-import com.redomar.game.net.packets.Packet01Disconnect;
-
 public class WindowHandler implements WindowListener {
 
 	@SuppressWarnings("unused")
@@ -27,9 +25,7 @@ public void windowClosed(WindowEvent event) {
 
 	@Override
 	public void windowClosing(WindowEvent event) {
-		Packet01Disconnect packet = new Packet01Disconnect(Game.getPlayer()
-				.getUsername());
-		packet.writeData(Game.getSocketClient());
+
 	}
 
 	@Override

src/com/redomar/game/entities/Player.java

@@ -101,7 +101,6 @@ public void tick() {
 					(int) this.getX(), (int) this.getY(), this.numSteps, this.isMoving,
 					this.movingDir);
 			Game.getGame();
-			packet.writeData(Game.getSocketClient());
 
 		} else {
 			isMoving = false;

src/com/redomar/game/level/LevelHandler.java

@@ -1,13 +1,11 @@
 package com.redomar.game.level;
 
-import com.redomar.game.Game;
 import com.redomar.game.entities.Entity;
 import com.redomar.game.entities.Player;
 import com.redomar.game.entities.PlayerMP;
 import com.redomar.game.gfx.Screen;
 import com.redomar.game.level.tiles.Tile;
 import com.redomar.game.lib.utils.Vector2i;
-import com.redomar.game.net.packets.Packet01Disconnect;
 import com.redomar.game.scenes.Scene;
 import com.redomar.game.script.PrintTypes;
 import com.redomar.game.script.Printing;
@@ -210,15 +208,13 @@ public void removeProjectileEntities(Entity entity) {
 	public void removeEntity(String username) {
 		int index = 0;
 		for (Entity e : entities) {
-			if (e instanceof PlayerMP
-					&& ((PlayerMP) e).getUsername().equalsIgnoreCase(username)) {
+			if (e instanceof Player
+					&& ((Player) e).getUsername().equalsIgnoreCase(username)) {
 				break;
 			}
 			index++;
 		}
 		this.entities.remove(index);
-		Packet01Disconnect packet = new Packet01Disconnect(Game.getPlayer().getUsername());
-		packet.writeData(Game.getSocketClient());
 	}
 
 	private int getPlayerMPIndex(String username) {