Merge pull request #56 from eandr127/master

Use regular exception so logging is nicer
AstechzGO · Apr 27, 2015 · 67a905a · 67a905a
2 parents 7d26786 + 3b5833f
commit 67a905a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/Luminescent/src/astechzgo/luminescent/main/Luminescent.java b/Luminescent/src/astechzgo/luminescent/main/Luminescent.java
@@ -9,7 +9,6 @@
 import java.util.Date;
 
 import org.lwjgl.BufferUtils;
-import org.lwjgl.LWJGLException;
 import org.lwjgl.input.Cursor;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.Display;
@@ -47,7 +46,7 @@ public static void Init()
 			Cursor emptyCursor = new Cursor(1, 1, 0, 0, 1, BufferUtils.createIntBuffer(1), null);
 			Mouse.setNativeCursor(emptyCursor);
 		} 
-		catch (LWJGLException e)
+		catch (Exception e)
 		{
 			LoggingUtils.logException(LoggingUtils.LOGGER, e);
 		}
@@ -176,7 +175,7 @@ public static void Tick()
 			{
 				DisplayUtils.takeScreenshot(newFile("screenshots/" + S + ".png"));
 			} 
-			catch (LWJGLException e) 
+			catch (Exception e) 
 			{
 				LoggingUtils.logException(LoggingUtils.LOGGER, e);
 			}

diff --git a/Luminescent/src/astechzgo/luminescent/main/Main.java b/Luminescent/src/astechzgo/luminescent/main/Main.java
@@ -2,7 +2,6 @@
 
 import static astechzgo.luminescent.utils.DisplayUtils.setDisplayMode;
 
-import org.lwjgl.LWJGLException;
 import org.lwjgl.opengl.Display;
 
 import astechzgo.luminescent.utils.Constants;
@@ -47,7 +46,7 @@ public void Init()
 			);
 			Display.create();
 		}
-		catch (LWJGLException e)
+		catch (Exception e)
 		{
 			LoggingUtils.logException(LoggingUtils.LOGGER, e);
 			System.exit(0);

diff --git a/Luminescent/src/astechzgo/luminescent/utils/DisplayUtils.java b/Luminescent/src/astechzgo/luminescent/utils/DisplayUtils.java
@@ -10,7 +10,6 @@
 import javax.imageio.ImageIO;
 
 import org.lwjgl.BufferUtils;
-import org.lwjgl.LWJGLException;
 import org.lwjgl.opengl.Display;
 import org.lwjgl.opengl.DisplayMode;
 import org.lwjgl.opengl.GL11;
@@ -93,7 +92,7 @@ public static void setDisplayMode(int width, int height, boolean fullscreen) {
 			Display.setDisplayMode(targetDisplayMode);
 			Display.setFullscreen(fullscreen);
 
-		} catch (LWJGLException e) {
+		} catch (Exception e) {
 			System.out.println("Unable to setup mode " + width + "x" + height
 					+ " fullscreen=" + fullscreen + e);
 		}
@@ -116,9 +115,9 @@ public static void setIcons(String[] nIcon, Object c) {
 		Display.setIcon(icons.toArray(new ByteBuffer[icons.size()]));
 	}
 
-	public static void takeScreenshot(File file) throws LWJGLException {
+	public static void takeScreenshot(File file) throws Exception {
 		if(!Display.isFullscreen()) {
-			throw new LWJGLException("Must be fullscreen to take screenshot");
+			throw new Exception("Must be fullscreen to take screenshot");
 		}
 
 		GL11.glReadBuffer(GL11.GL_FRONT);