Almost finished netty implementation

- A few bugs left to straighten out.

src/main/java/eu/tankernn/chat/client/ChatClient.java

@@ -18,6 +18,7 @@ public class ChatClient {
 	static File confFile = new File("client.properties");
 	
 	public static void main(String[] arg) {
+		
 		try {
 			prop.load(new FileInputStream(confFile));
 		} catch (FileNotFoundException e) {
@@ -38,7 +39,6 @@ public class ChatClient {
 		};
 		
 		String host, username, portString;
-		
 		JOptionPane.showMessageDialog(null, inputs, "Chat settings", JOptionPane.PLAIN_MESSAGE);
 		
 		host = hostBox.getText();

src/main/java/eu/tankernn/chat/client/ChatClientHandler.java

@@ -5,7 +5,6 @@ import javax.swing.DefaultListModel;
 import eu.tankernn.chat.common.InfoPacket;
 import eu.tankernn.chat.common.MessagePacket;
 import eu.tankernn.chat.common.MessagePacket.MessageType;
-import eu.tankernn.chat.common.Packet;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 
@@ -35,6 +34,5 @@ public class ChatClientHandler extends ChannelInboundHandlerAdapter {
 		} else if (fromServer instanceof String) {
 			chatWindow.chat.log(new MessagePacket((String) fromServer, MessageType.NORMAL));
 		}
-	    ctx.close();
 	}
 }

src/main/java/eu/tankernn/chat/client/ChatWindow.java

@@ -9,10 +9,10 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
+import java.awt.event.WindowStateListener;
 import java.io.File;
-import java.io.ObjectInputStream;
-import java.io.PrintWriter;
-import java.net.Socket;
 import java.util.ArrayList;
 
 import javax.swing.DefaultListModel;
@@ -31,6 +31,7 @@ import eu.tankernn.chat.common.MessagePacket;
 import eu.tankernn.chat.common.MessagePacket.MessageType;
 import eu.tankernn.chat.common.Packet;
 import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelOption;
@@ -43,38 +44,35 @@ import io.netty.handler.codec.serialization.ObjectDecoder;
 import io.netty.handler.codec.string.StringEncoder;
 
 @SuppressWarnings("serial")
-public class ChatWindow extends JFrame implements ActionListener, KeyListener {
+public class ChatWindow extends JFrame implements ActionListener, KeyListener, WindowListener {
 	Thread getMessages;
 	static File confFile = new File("client.properties");
-
+	
 	EventLoopGroup workerGroup = new NioEventLoopGroup();
-
+	Channel c;
+	
 	String adress, username;
 	ArrayList<String> lastMess = new ArrayList<String>();
 	int port, messIndex = 0;
-
-	Socket so;
-	ObjectInputStream objIn;
-	PrintWriter out;
-
+	
 	GridBagLayout g = new GridBagLayout();
 	GridBagConstraints con = new GridBagConstraints();
-
+	
 	JPanel right = new JPanel();
 	JLabel infoLabel = new JLabel("Users online:");
 	DefaultListModel<String> model = new DefaultListModel<String>();
 	JList<String> userList = new JList<String>(model);
 	JButton reconnect = new JButton("Reconnect");
-
+	
 	Console chat = new Console();
 	JScrollPane scroll = new JScrollPane(chat);
 	JTextField write = new JTextField();
-
+	
 	public ChatWindow(String adress, int port, String username) {
 		this.adress = adress;
 		this.port = port;
 		this.username = username;
-
+		
 		// List config
 		userList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 		userList.setLayoutOrientation(JList.VERTICAL);
@@ -86,139 +84,96 @@ public class ChatWindow extends JFrame implements ActionListener, KeyListener {
 		con.fill = GridBagConstraints.HORIZONTAL;
 		con.weightx = 1;
 		con.gridx = 0;
-
+		
 		right.add(infoLabel, con);
-
+		
 		con.weighty = 1;
 		con.fill = GridBagConstraints.BOTH;
 		right.add(userList, con);
-
+		
 		con.weighty = 0;
 		con.fill = GridBagConstraints.HORIZONTAL;
 		right.add(reconnect, con);
-
+		
 		setLayout(new BorderLayout());
 		add(chat, BorderLayout.NORTH);
 		add(write, BorderLayout.SOUTH);
 		add(right, BorderLayout.EAST);
-
+		
 		// Scrollbar config
 		add(scroll);
 		scroll.setMinimumSize(new Dimension(100, 100));
 		scroll.setViewportView(chat);
 		scroll.setSize(500, 130);
-
+		
 		// Listener config
 		reconnect.addActionListener(this);
 		write.addKeyListener(this);
-
+		
 		// Window config
 		this.setLocation(new Point(100, 100));
 		setSize(600, 600);
 		setVisible(true);
 		setTitle("Chat on " + adress + " | Username: " + username);
-		setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
-
+		setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+		addWindowListener(this);
+		
 		connect(adress, port, username);
 	}
-
+	
 	public void send(String text) {
-		if (so.isConnected() && !so.isClosed()) {
-			out.println(text);
-			out.flush();
-		} else {
-			chat.log(new MessagePacket("Not connected to server!", MessageType.WARNING));
+		ChannelFuture cf = null;
+		try {
+			cf = c.writeAndFlush(text).sync();
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+		if (!cf.isSuccess()) {
+			chat.log(new MessagePacket(
+					"Error sending message.",
+					MessageType.WARNING));
+			cf.cause().printStackTrace();
 			write.setEnabled(false);
 		}
 	}
-
-	// void connect(String address, int port, String username) {
-	// chat.log(new MessagePacket("Connecting to " + address + " on port " +
-	// port + ".", MessageType.INFO));
-	// if (getMessages != null)
-	// getMessages.interrupt();
-	//
-	// try {
-	// so.close();
-	// objIn.close();
-	// out.close();
-	// } catch (NullPointerException ex) {
-	// // Nothing
-	// } catch (IOException ex) {
-	// chat.log(new MessagePacket(ex.toString(), MessageType.ERROR));
-	// }
-	//
-	// try {
-	// so = new Socket();
-	// so.connect(new InetSocketAddress(address, port));
-	// objIn = new ObjectInputStream(so.getInputStream());
-	// out = new PrintWriter(so.getOutputStream(), true);
-	// } catch (SocketTimeoutException ex) {
-	// chat.log(new MessagePacket("Could not connect to server. (Connection
-	// timed out!)", MessageType.ERROR));
-	// return;
-	// } catch (IOException e) {
-	// chat.log(new MessagePacket(e.toString(), MessageType.ERROR));
-	// return;
-	// }
-	//
-	// send(username); // First packet sent to server sets username
-	//
-	// getMessages = new Thread(this);
-	// getMessages.start();
-	//
-	// write.setEnabled(true);
-	// }
-
+	
 	protected void connect(String address, int port, String username) {
+		if (!workerGroup.isShutdown())
+			workerGroup.shutdownGracefully();
+		workerGroup = new NioEventLoopGroup();
+		
+		Bootstrap b = new Bootstrap();
+		b.group(workerGroup);
+		b.channel(NioSocketChannel.class);
+		b.option(ChannelOption.SO_KEEPALIVE, true);
+		b.handler(new ChannelInitializer<SocketChannel>() {
+			@Override
+			public void initChannel(SocketChannel ch) throws Exception {
+				ch.pipeline().addLast("decoder",
+						new ObjectDecoder(ClassResolvers.weakCachingResolver(
+								Packet.class.getClassLoader())));
+				ch.pipeline().addLast("encoder", new StringEncoder());
+				ch.pipeline().addLast("handler",
+						new ChatClientHandler(ChatWindow.this));
+			}
+		});
+		
+		// Start the client.
 		try {
-			Bootstrap b = new Bootstrap();
-			b.group(workerGroup);
-			b.channel(NioSocketChannel.class);
-			b.option(ChannelOption.SO_KEEPALIVE, true);
-			b.handler(new ChannelInitializer<SocketChannel>() {
-				@Override
-				public void initChannel(SocketChannel ch) throws Exception {
-					ch.pipeline().addLast("decoder",
-							new ObjectDecoder(ClassResolvers.weakCachingResolver(Packet.class.getClassLoader())));
-					ch.pipeline().addLast("encoder", new StringEncoder());
-					ch.pipeline().addLast("handler", new ChatClientHandler(ChatWindow.this));
-				}
-			});
-
-			// Start the client.
-			ChannelFuture f = b.connect(address, port).sync();
-
-			// Wait until the connection is closed.
-			f.channel().closeFuture().sync();
+			c = b.connect(address, port).sync().channel();
+			// Set username
+			send(username);
 		} catch (InterruptedException e) {
 			e.printStackTrace();
-		} finally {
-			workerGroup.shutdownGracefully();
 		}
 	}
-
+	
 	@Override
 	public void actionPerformed(ActionEvent e) {
 		if (e.getSource().equals(reconnect))
 			connect(adress, port, username);
 	}
-
-//	@Override
-//	public void run() {
-//		try {
-//			getMessages();
-//		} catch (EOFException eof) {
-//			chat.log(new MessagePacket(eof.toString() + " Disconnected from host.", MessageType.ERROR));
-//		} catch (ClassNotFoundException cnf) {
-//			chat.log(new MessagePacket(
-//					"The message recieved from the server could not be understood. Are you using the right version?",
-//					MessageType.ERROR));
-//		} catch (IOException e) {
-//			chat.log(new MessagePacket(e.toString(), MessageType.ERROR));
-//		}
-//	}
-
+	
 	@Override
 	public void keyPressed(KeyEvent eKey) {
 		int keyCode = eKey.getKeyCode();
@@ -249,16 +204,56 @@ public class ChatWindow extends JFrame implements ActionListener, KeyListener {
 			break;
 		}
 	}
+	
+	@Override
+	public void keyReleased(KeyEvent arg0) {}
+	
+	@Override
+	public void keyTyped(KeyEvent arg0) {}
+	
+	public boolean isConnected() {
+		return c.isActive();
+	}
 
 	@Override
-	public void keyReleased(KeyEvent arg0) {
+	public void windowOpened(WindowEvent e) {
+		// TODO Auto-generated method stub
+		
 	}
 
 	@Override
-	public void keyTyped(KeyEvent arg0) {
+	public void windowClosing(WindowEvent e) {
+		workerGroup.shutdownGracefully();
+		System.exit(0);
 	}
 
-	public boolean isConnected() {
-		return so.isConnected() && !so.isClosed();
+	@Override
+	public void windowClosed(WindowEvent e) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void windowIconified(WindowEvent e) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void windowDeiconified(WindowEvent e) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void windowActivated(WindowEvent e) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void windowDeactivated(WindowEvent e) {
+		// TODO Auto-generated method stub
+		
 	}
 }

src/main/java/eu/tankernn/chat/server/ChatServerHandler.java

@@ -1,18 +1,34 @@
 package eu.tankernn.chat.server;
 
-import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 
 public class ChatServerHandler extends ChannelInboundHandlerAdapter {
+	private Client c;
+	
 	@Override
-	public void channelRead(ChannelHandlerContext ctx, Object msg) { // (2)
-		// Discard the received data silently.
-		((ByteBuf) msg).release(); // (3)
+	public void channelRead(ChannelHandlerContext ctx, Object msg) {
+		if (c != null) {
+			// Existing client
+			c.handleMessage((String) msg);
+		} else {
+			// New client
+			c = new Client(ctx.channel(), (String) msg);
+			if (!c.validateUser()) {
+				ctx.close();
+				return;
+			} else
+				Server.addClient(c);
+		}
 	}
-
+	
+	@Override
+	public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+		c.disconnect();
+	}
+	
 	@Override
-	public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { // (4)
+	public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
 		// Close the connection when an exception is raised.
 		cause.printStackTrace();
 		ctx.close();

src/main/java/eu/tankernn/chat/server/Client.java

@@ -2,59 +2,44 @@ package eu.tankernn.chat.server;
 
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.ObjectOutputStream;
 import java.net.InetSocketAddress;
-import java.net.Socket;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.logging.Level;
 
 import eu.tankernn.chat.common.InfoPacket;
 import eu.tankernn.chat.common.MessagePacket;
 import eu.tankernn.chat.common.Packet;
+import io.netty.channel.ChannelFuture;
 
-public class Client implements Runnable {
-	protected Thread readuser = new Thread(this);
-
-	protected BufferedReader in;
-	private ObjectOutputStream objOut;
-	private Socket sock;
-
+public class Client {
+	io.netty.channel.Channel c;
+	
 	public final String username;
 	protected List<String> permissions = new ArrayList<>();
-
+	
 	private int messLastPeriod = 0;
 	private Timer timer = new Timer();
-
+	
 	private Channel primaryChannel = Server.getChannels().get(0);
-
-	public Client(Socket socket) {
-		sock = socket;
-
-		String line = null;
-		try {
-			objOut = new ObjectOutputStream(sock.getOutputStream());
-			in = new BufferedReader(new InputStreamReader(sock.getInputStream()));
-			line = in.readLine(); // First line contains username
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-
-		username = line;
-
+	
+	public Client(io.netty.channel.Channel c, String username) {
+		this.c = c;
+		this.username = username;
+		
 		if (!validateUser()) {
-			disconnect(false);
-			throw new IllegalArgumentException();
+			return;
 		}
-
+		
 		permissions.add("user.*");
-
-		send(new MessagePacket("Welcome to the server, " + username + "! Enjoy your stay!"));
-
-		readuser.start();
+		
+		send(new MessagePacket(
+				"Welcome to the server, " + username + "! Enjoy your stay!"));
+		
 		timer.schedule(new TimerTask() {
 			@Override
 			public void run() {
@@ -62,29 +47,27 @@ public class Client implements Runnable {
 			}
 		}, 800, 800);
 	}
-
+	
 	public Client(String username, List<String> permissions, BufferedReader in, ObjectOutputStream out) {
 		this.username = username;
 		this.permissions = permissions;
-		this.in = in;
-		this.objOut = out;
 	}
-
-	private boolean validateUser() {
+	
+	boolean validateUser() {
 		// No spaces
 		if (username.contains(" ")) {
 			send("No spaces in usernames please!");
 			return false;
 		}
-
+		
 		// Not same username as anyone else
 		if (Server.getClients().getClientByName(username).isPresent()) {
 			send("Username already taken!");
 			return false;
 		}
-
+		
 		// No connect if banned
-		for (BanNote note : Server.getBanned())
+		for (BanNote note: Server.getBanned())
 			try {
 				if (note.ip.equals(getIP())) {
 					if (note.expiry == null) {
@@ -103,114 +86,91 @@ public class Client implements Runnable {
 			}
 		return true;
 	}
-
+	
 	public void disconnect(boolean output) {
 		if (!isConnected()) // Already disconnected
 			return;
-
+		
 		timer.cancel();
-		readuser.interrupt();
-
-		try {
-			if (sock != null)
-				sock.close();
-			if (in != null)
-				in.close();
-			if (objOut != null)
-				objOut.close();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-
+		c.close();
+		Server.cleanUp();
+		
 		if (output)
-			Server.wideBroadcast(new MessagePacket(username + " has disconnected."));
+			Server.wideBroadcast(
+					new MessagePacket(username + " has disconnected."));
 	}
-
+	
 	public void disconnect() {
 		disconnect(true);
 	}
-
+	
 	public boolean isConnected() {
-		return sock.isConnected() && !sock.isClosed();
+		return c.isActive() && c.isWritable();
 	}
-
+	
 	public boolean hasPermission(String commandPermission) {
-		long correctPermissions = permissions.stream().filter(perm -> commandPermission.startsWith(perm.replace(".*", "."))
-				|| commandPermission.equalsIgnoreCase(perm) || perm.equalsIgnoreCase("*")).count();
+		long correctPermissions = permissions.stream()
+				.filter(perm -> commandPermission.startsWith(
+						perm.replace(".*", ".")) || commandPermission
+								.equalsIgnoreCase(
+										perm) || perm.equalsIgnoreCase("*"))
+				.count();
 		return correctPermissions > 0;
 	}
-
-	@Override
-	public void run() {
-		String mess;
-		while (!readuser.isInterrupted() && (mess = getNewMessage()) != null) {
-			if (mess.startsWith("/")) // Command handling
-				Server.getCommReg().executeCommand(mess, this);
-			else // Normal message handling
-			{
-				messLastPeriod++;
-				if (messLastPeriod > 1 && !hasPermission("mod.spam")) {
-					send("No spamming!");
-					disconnect(false);
-				} else
-					getPrimaryChannel().broadcast(new MessagePacket(Client.this.username, mess));
-			}
-		}
-		disconnect();
-	}
-
-	private String getNewMessage() {
-		try {
-			return in.readLine();
-		} catch (IOException e) {
-			disconnect();
-			return null;
+	
+	public void handleMessage(String message) {
+		if (message.startsWith("/")) // Command handling
+			Server.getCommReg().executeCommand(message, this);
+		else // Normal message handling
+		{
+			messLastPeriod++;
+			if (messLastPeriod > 1 && !hasPermission("mod.spam")) {
+				send("No spamming!");
+				disconnect(false);
+			} else
+				getPrimaryChannel().broadcast(
+						new MessagePacket(Client.this.username, message));
 		}
 	}
-
+	
 	/**
 	 * Sends a packet to the user.
 	 * 
-	 * @param pack
-	 *            Packet to send to the user
+	 * @param pack Packet to send to the user
 	 */
 	public void send(Packet pack) {
-		try {
-			objOut.writeObject(pack);
-			objOut.flush();
-			objOut.writeObject(InfoPacket.of(this));
-			objOut.flush();
-		} catch (IOException e) {
-			if (isConnected())
-				disconnect();
-		}
+		ChannelFuture cf = c.writeAndFlush(pack);
+		if (!cf.isSuccess())
+			Server.getLogger().log(Level.SEVERE, "Error sending packet.",
+					cf.cause());
+		c.writeAndFlush(InfoPacket.of(this));
 	}
-
+	
 	public void send(String message) {
 		send(new MessagePacket(message));
 	}
-
+	
 	public String getIP() throws IOException {
-		return ((InetSocketAddress) sock.getRemoteSocketAddress()).getAddress().getHostAddress();
+		return ((InetSocketAddress) c.remoteAddress()).getHostString();
 	}
-
+	
 	@Override
 	public String toString() {
 		return username;
 	}
-
+	
 	public Channel getPrimaryChannel() {
 		return primaryChannel;
 	}
-
+	
 	public List<String> getPermissions() {
 		return permissions;
 	}
-
+	
 	public void addPermission(String string) {
 		permissions.add(string);
 	}
-
+	
 	public void setPrimaryChannel(Channel primaryChannel) {
 		this.primaryChannel = primaryChannel;
 	}

src/main/java/eu/tankernn/chat/server/Server.java

@@ -5,14 +5,11 @@ import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.net.ServerSocket;
-import java.net.Socket;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.Properties;
 import java.util.logging.Level;
-import java.util.logging.LogManager;
 import java.util.logging.Logger;
 
 import eu.tankernn.chat.common.MessagePacket;
@@ -22,11 +19,13 @@ import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelOption;
 import io.netty.channel.EventLoopGroup;
+import io.netty.channel.ServerChannel;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
 import io.netty.handler.codec.serialization.ClassResolvers;
 import io.netty.handler.codec.serialization.ObjectDecoder;
+import io.netty.handler.codec.serialization.ObjectEncoder;
 import io.netty.handler.codec.string.StringDecoder;
 
 public class Server {
@@ -35,107 +34,88 @@ public class Server {
 	private static File propFile = new File("server.properties");
 	private static int port, maxUsers;
 	private static final String version = "4.0";
-
+	
 	private static ArrayList<BanNote> banNotes = new ArrayList<BanNote>();
 	private static ArrayList<Channel> channels = new ArrayList<Channel>();
 	private static ClientCollection clients;
-
-	private static ServerSocket so;
+	
+	private static ServerBootstrap bootstrap;
+	
 	private static LocalClient OPClient;
 	private static final Logger log = Logger.getGlobal();
 	private static CommandRegistry commandRegistry;
-
+	
 	public static void main(String[] arg) {
-		try {
-			LogManager.getLogManager().readConfiguration(Server.class.getResourceAsStream("/logger.properties"));
-		} catch (SecurityException | IOException e2) {
-			log.log(Level.SEVERE, e2.getMessage(), e2);
-		}
+		//		try {
+		//			LogManager.getLogManager().readConfiguration(Server.class.getResourceAsStream("/logger.properties"));
+		//		} catch (SecurityException | IOException e2) {
+		//			log.log(Level.SEVERE, e2.getMessage(), e2);
+		//		}
 		log.info("Starting ChatServer version " + version + "...");
-
+		
 		log.fine("Loadning properties file...");
 		try {
 			prop.load(new FileReader(propFile));
 		} catch (FileNotFoundException e1) {
 			try {
-				prop.load(Server.class.getResourceAsStream("/" + propFile.getName()));
+				prop.load(Server.class
+						.getResourceAsStream("/" + propFile.getName()));
 			} catch (IOException e) {
 				log.log(Level.SEVERE, e.getMessage(), e);
 			}
 		} catch (IOException e1) {
 			log.log(Level.SEVERE, e1.getMessage(), e1);
 		}
-
+		
 		log.fine("Reading numbers from properties object...");
 		port = Integer.parseInt(prop.getProperty("port"));
 		maxUsers = Integer.parseInt(prop.getProperty("maxUsers"));
-
-		log.fine("Setting up socket...");
-		try {
-			so = new ServerSocket(port);
-		} catch (IOException ex) {
-			log.log(Level.SEVERE, "Error setting up socket. Server already running?", ex);
-			return;
-		}
-
+		
 		clients = new ClientCollection();
 		getChannels().add(new Channel("Main"));
-
+		
 		log.fine("Starting commandhandler...");
 		commandRegistry = new CommandRegistry();
-
+		
 		log.fine("Creating virtual local client...");
 		OPClient = new LocalClient();
-
+		
 		log.fine("Starting client listener thread...");
 		clientListener = new Thread(Server::run);
 		clientListener.start();
-
+		
 		log.info("Server started successfully!");
 	}
-
-	static void listenClients() {
-		while (!so.isClosed()) {
-			Client newClient = null;
-			try {
-				Socket clientSock = so.accept();
-				clients.cleanUp(); // Free taken names
-				newClient = new Client(clientSock);
-				clients.add(newClient);
-				getChannels().get(0).add(newClient);
-				wideBroadcast(new MessagePacket(newClient.username + " has connected."));
-			} catch (IllegalArgumentException ex) {
-
-			} catch (ArrayIndexOutOfBoundsException ex) {
-				newClient.send(new MessagePacket("Server full!"));
-				newClient.disconnect(false);
-			} catch (IOException ex) {
-				if (so.isClosed())
-					return;
-			} catch (Exception ex) {
-				log.log(Level.WARNING, "Could not get new client!", ex);
-			}
-		}
+	
+	public static void addClient(Client c) {
+		clients.add(c);
+		getChannels().get(0).add(c);
+		wideBroadcast(new MessagePacket(c.username + " has connected."));
 	}
-
+	
 	private static void run() {
 		EventLoopGroup bossGroup = new NioEventLoopGroup();
 		EventLoopGroup workerGroup = new NioEventLoopGroup();
 		try {
-			ServerBootstrap b = new ServerBootstrap();
-			b.group(bossGroup, workerGroup).channel(NioServerSocketChannel.class)
+			bootstrap = new ServerBootstrap();
+			bootstrap.group(bossGroup, workerGroup)
+					.channel(NioServerSocketChannel.class)
 					.childHandler(new ChannelInitializer<SocketChannel>() {
 						@Override
 						public void initChannel(SocketChannel ch) throws Exception {
-							ch.pipeline().addLast("decoder", new StringDecoder());
-							ch.pipeline().addLast("encoder", new ObjectDecoder(ClassResolvers.weakCachingResolver(Packet.class.getClassLoader())));
-							ch.pipeline().addLast("handler", new ChatServerHandler());
+							ch.pipeline().addLast("decoder",
+									new StringDecoder());
+							ch.pipeline().addLast("encoder",
+									new ObjectEncoder());
+							ch.pipeline().addLast("handler",
+									new ChatServerHandler());
 						}
-					}).option(ChannelOption.SO_BACKLOG, 128).childOption(ChannelOption.SO_KEEPALIVE, true);
-
+					}).option(ChannelOption.SO_BACKLOG, 128)
+					.childOption(ChannelOption.SO_KEEPALIVE, true);
+			
 			// Bind and start to accept incoming connections.
-			ChannelFuture f = b.bind(port).sync();
-
+			ChannelFuture f = bootstrap.bind(port).sync();
+			
 			// Wait until the server socket is closed.
 			// In this example, this does not happen, but you can do that to
 			// gracefully
@@ -148,31 +128,32 @@ public class Server {
 			bossGroup.shutdownGracefully();
 		}
 	}
-
+	
 	public static Optional<Channel> getChannelByName(String name) throws NullPointerException {
-		return getChannels().stream().filter(c -> c.name.equals(name)).findFirst();
+		return getChannels().stream().filter(c -> c.name.equals(name))
+				.findFirst();
 	}
-
+	
 	public static void wideBroadcast(MessagePacket mess) {
 		getClients().broadcast(mess);
 	}
-
+	
 	public static String[] getUsersOnline() {
 		return getClients().getUsernameArray();
 	}
-
+	
 	public static String listClients(CharSequence c) {
 		return getClients().listClients(c);
 	}
-
+	
 	public static Optional<Client> getUserByName(String username) {
 		return getClients().getClientByName(username);
 	}
-
+	
 	public static void ban(BanNote ban) {
 		banNotes.add(ban);
 	}
-
+	
 	/**
 	 * Removes disconnected clients from all collections on the server.
 	 */
@@ -180,56 +161,51 @@ public class Server {
 		getClients().cleanUp();
 		getChannels().forEach(c -> c.cleanUp());
 	}
-
+	
 	/**
 	 * Disconnects all users and closes log and socket.
 	 */
 	public static void exit() {
 		wideBroadcast(new MessagePacket("Shutting down server!"));
-
-		try {
-			so.close();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
+		
 		clientListener.interrupt();
-
+		
 		clients.disconnectAll();
 		getLocalClient().disconnect();
-
+		
 		try {
 			prop.store(new PrintWriter(propFile), "ChatServer config file");
 		} catch (IOException e1) {
 			e1.printStackTrace();
 		}
 	}
-
+	
 	public static int getMaxUsers() {
 		return maxUsers;
 	}
-
+	
 	public static LocalClient getLocalClient() {
 		return OPClient;
 	}
-
+	
 	public static Logger getLogger() {
 		return log;
 	}
-
+	
 	public static ArrayList<Channel> getChannels() {
 		return channels;
 	}
-
+	
 	public static ClientCollection getClients() {
 		return clients;
 	}
-
+	
 	public static CommandRegistry getCommReg() {
 		return commandRegistry;
 	}
-
+	
 	public static List<BanNote> getBanned() {
 		return banNotes;
 	}
-
+	
 }