Resolved issues with OpenJDK compatibility

OracleJDK no longer receiving updates, code compatible with OpenJDK8

Author: redomar

README.md

@@ -1,4 +1,4 @@
-JavaGame [![GitHub release](https://img.shields.io/github/release/redomar/JavaGame.svg?style=flat-square&label=Alpha)](https://github.com/redomar/JavaGame/releases/latest) [![Travis-CI Build Status](https://img.shields.io/travis/redomar/JavaGame.svg?style=flat-square)](https://travis-ci.org/redomar/JavaGame) [![GitHub license](https://img.shields.io/badge/license-AGPLv3-red.svg?style=flat-square)](https://raw.githubusercontent.com/Redomar/JavaGame/master/LICENSE)
+JavaGame [![GitHub release](https://img.shields.io/github/release/redomar/JavaGame.svg?style=flat-square&label=Alpha)](https://github.com/redomar/JavaGame/releases/latest) [![JDK version](https://img.shields.io/badge/JDK-OpenJDK%208-007396?style=flat-square&logo=Java)](https://openjdk.java.net/install/) [![Travis-CI Build Status](https://img.shields.io/travis/redomar/JavaGame.svg?style=flat-square)](https://travis-ci.org/redomar/JavaGame) [![GitHub license](https://img.shields.io/badge/license-AGPLv3-red.svg?style=flat-square)](https://raw.githubusercontent.com/Redomar/JavaGame/master/LICENSE):
 ==
 
 #### What is JavaGame?

src/com/redomar/game/Game.java

@@ -365,7 +365,11 @@ public void init() {
 		input = new InputHandler(this);                                         // Input begins to record key presses
 		setMouse(new MouseHandler(this));                                       // Mouse tracking and clicking is now recorded
 		setWindow(new WindowHandler(this));
-		setMap("/levels/custom_level.png");
+		try{
+			setMap("/levels/custom_level.png");
+		} catch (Exception e){
+			System.err.println(e);
+		}
 		setMap(1);                                                                     // 1 corresponds to custom_level
 
 		game.setVendor(new Vendor(level, "Vendor", 215, 215, 304, 543));

src/com/redomar/game/InputHandler.java

@@ -147,7 +147,7 @@ private void quitGame() {
 				Game.getPlayer().getSanitisedUsername());
 		Game.setRunning(false);
 		Game.getFrame().dispose();
-		System.exit(1);
+		System.exit(0);
 	}
 
 	public void untoggle(boolean toggle) {

src/com/redomar/game/menu/Menu.java

@@ -27,6 +27,7 @@ public class Menu implements Runnable {
 	private static boolean gameOver = false;
 
 	private static DedicatedJFrame frame;// = new DedicatedJFrame(WIDTH, HEIGHT,
+	private static final JDialog dialog = new JDialog();
 	// SCALE, NAME);
 	private Font font = new Font();
 	private MouseListener Mouse = new Mouse();
@@ -55,26 +56,27 @@ public static void play() {
 			Thread.sleep(125);
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 			String multiMsg = "Sorry but multiplayer has been disabled on this version.\nIf you would like multiplayer checkout Alpha 1.6";
-			JOptionPane.showMessageDialog(Game.getGame(), multiMsg,
+			dialog.setAlwaysOnTop(true);
+			JOptionPane.showMessageDialog(dialog, multiMsg,
 					"Multiplayer Warning", JOptionPane.WARNING_MESSAGE);
 			// Game.setJdata_Host(JOptionPane.showConfirmDialog(Game.getGame(),
 			// "Do you want to be the HOST?"));
 			Game.setJdata_Host(1);
 			if (Game.getJdata_Host() != 1) { // Game.getJdata_Host() == 1
-				Game.setJdata_IP(JOptionPane.showInputDialog(Game.getGame(),
+				Game.setJdata_IP(JOptionPane.showInputDialog(dialog,
 						"Enter the name \nleave blank for local"));
 			}
 			Thread.sleep(125);
 			splash.setProgress(70, "Acquiring data: Username");
-			String s = JOptionPane.showInputDialog(Game.getGame(),
+			String s = JOptionPane.showInputDialog(dialog,
 					"Enter a name");
 			if (s != null) {
 				Game.setJdata_UserName(s);
 			}
 			Thread.sleep(125);
 			splash.setProgress(90, "Collecting Player Data");
 			Object[] options = {"African", "Caucasian"};
-			int n = JOptionPane.showOptionDialog(frame,
+			int n = JOptionPane.showOptionDialog(dialog,
 					"Choose a race for the character to be", "Choose a race",
 					JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE,
 					null, options, options[0]);
@@ -85,7 +87,7 @@ public static void play() {
 			}
 			Thread.sleep(250);
 			Object[] options1 = {"Orange", "Black"};
-			int n1 = JOptionPane.showOptionDialog(frame,
+			int n1 = JOptionPane.showOptionDialog(dialog,
 					"Which Colour do you want the shirt to be?",
 					"Choose a shirt Colour", JOptionPane.YES_NO_OPTION,
 					JOptionPane.QUESTION_MESSAGE, null, options1, options1[0]);
@@ -245,33 +247,27 @@ private void paintButtons(boolean start, boolean exit, Graphics g) {
 			g.setColor(new Color(0xFFBB4400));
 			g.fillRect(35, 40, (frame.getWidth() - 67), 113);
 			g.setColor(getDeSelected());
-			g.fillRect(35, 40, (frame.getWidth() - 70), 110);
-			g.setColor(Color.BLACK);
-			g.drawString("Start", 220, 95);
 		} else {
 			g.setColor(new Color(0xFFDD6600));
 			g.fillRect(35, 40, (frame.getWidth() - 67), 113);
 			g.setColor(getSelected());
-			g.fillRect(35, 40, (frame.getWidth() - 70), 110);
-			g.setColor(Color.BLACK);
-			g.drawString("Start", 220, 95);
 		}
+		g.fillRect(35, 40, (frame.getWidth() - 70), 110);
+		g.setColor(Color.BLACK);
+		g.drawString("Start", 220, 95);
 		// EXIT
 		if (!exit) {
 			g.setColor(new Color(0xFFBB4400));
 			g.fillRect(35, 170, (frame.getWidth() - 67), 113);
 			g.setColor(getDeSelected());
-			g.fillRect(35, 170, (frame.getWidth() - 70), 110);
-			g.setColor(Color.BLACK);
-			g.drawString("Exit", 220, 220);
 		} else {
 			g.setColor(new Color(0xFFDD6600));
 			g.fillRect(35, 170, (frame.getWidth() - 67), 113);
 			g.setColor(getSelected());
-			g.fillRect(35, 170, (frame.getWidth() - 70), 110);
-			g.setColor(Color.BLACK);
-			g.drawString("Exit", 220, 220);
 		}
+		g.fillRect(35, 170, (frame.getWidth() - 70), 110);
+		g.setColor(Color.BLACK);
+		g.drawString("Exit", 220, 220);
 	}
 
 	public Color getSelected() {