src/diveengine2d/Engine.java

@@ -12,7 +12,7 @@ import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.List;
 
-import javax.swing.*;
+import javax.swing.JFrame;
 
 public class Engine extends Canvas {
 	public static String gameFolder = null;
@@ -20,12 +20,11 @@ public class Engine extends Canvas {
 	public static String startScene = null;
 	public static String name = null;
 	public static BufferStrategy bs = null;
-	public static boolean running = true;
 
 	public Engine(String gameFolder) {
 
 		// setup the folder
-		Engine.gameFolder = gameFolder;
+		this.gameFolder = gameFolder;
 
 		System.out.println("Engine started with folder " + gameFolder + " ...");
 
@@ -58,7 +57,7 @@ public class Engine extends Canvas {
 		this.setPreferredSize(new Dimension(WIDTH, HEIGHT));
 		frame.pack();
 		frame.setVisible(true);
-		frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+		frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 		this.requestFocus();
 		this.addKeyListener(new Input());
 		this.addMouseMotionListener(new Input());
@@ -69,7 +68,8 @@ public class Engine extends Canvas {
 		
 		Time.nanos = System.nanoTime();
 		
-		while(running) {
+		
+		while(true) {
 			
 			Time.startTime = System.currentTimeMillis();
 			if (System.currentTimeMillis() > Time.nextSecond) {
@@ -111,8 +111,9 @@ public class Engine extends Canvas {
 
 	private void loadConfig() throws Exception {
 
+		File configFile = null;
 		try {
-			new File(gameFolder + File.separatorChar + "build.config");
+			configFile = new File(gameFolder + File.separatorChar + "build.config");
 		} catch (Exception e) {
 			throw new Exception("Configuration File not found");
 		}

src/diveengine2d/Input.java

@@ -13,7 +13,6 @@ public class Input implements KeyListener, MouseListener, MouseMotionListener{
 	private static boolean[] keys = new boolean[512];
 	private static List<KeyListener> listeners = new ArrayList<KeyListener>();
 	public static int mouseX, mouseY;
-	public static boolean mouse = false;
 	
 	public static void addKeyListener(KeyListener listener) {
 		listeners.add(listener);
@@ -62,12 +61,14 @@ public class Input implements KeyListener, MouseListener, MouseMotionListener{
 
 	@Override
 	public void mousePressed(MouseEvent e) {
-		mouse = true;
+		// TODO Auto-generated method stub
+		
 	}
 
 	@Override
 	public void mouseReleased(MouseEvent e) {
-		mouse = false;
+		// TODO Auto-generated method stub
+		
 	}
 
 	@Override

src/diveengine2d/RectRenderer.java

@@ -1,6 +1,4 @@
-package diveengine2d.components;
-
-import diveengine2d.DiveScript;
+package diveengine2d;
 
 import java.awt.Color;
 import java.awt.Graphics2D;

src/diveengine2d/RigidBody.java

@@ -1,8 +1,4 @@
-package diveengine2d.components;
-
-import diveengine2d.DebugSettings;
-import diveengine2d.DiveScript;
-import diveengine2d.Time;
+package diveengine2d;
 
 import java.awt.Color;
 import java.awt.Graphics2D;

src/diveengine2d/SceneManager.java

@@ -93,15 +93,12 @@ public class SceneManager {
 						int intValue;
 						try{
 							intValue = Integer.parseInt(value);
-							scopeObject.peek().getClass().getField(key).set(scopeObject.peek(), intValue);
-						}catch(NoSuchFieldException e) {
-							System.out.println(value + " isnt a property of " + ((DiveScript)scopeObject.peek()).name + "(" + scopeObject.peek() + ")");
-							continue;
-						}catch(NumberFormatException  e) {
+						}catch(Exception e) {
 							System.out.println(value + " is not an int");
 							continue;
 						}
 						
+						scopeObject.peek().getClass().getField(key).set(scopeObject.peek(), intValue);
 					}else if(value.endsWith("F") || value.endsWith("f")) {
 						value = value.substring(0, value.length() - 1);
 						
@@ -140,7 +137,7 @@ public class SceneManager {
 						}
 					} catch( ClassNotFoundException e) {
 						try {
-							Object maybeComponent = Class.forName("diveengine2d.components." + componentClass).newInstance();
+							Object maybeComponent = Class.forName("diveengine2d." + componentClass).newInstance();
 							if(maybeComponent instanceof DiveScript) {
 								component = (DiveScript)maybeComponent;
 							}else {
@@ -171,7 +168,7 @@ public class SceneManager {
 			}
 		}catch(Exception e) {
 			System.out.println(e.getMessage());
-
+			return null;
 		}
 		
 		return entities;

src/diveengine2d/Tests.java

@@ -6,8 +6,8 @@ import java.awt.Graphics2D;
 public class Tests {
 
 	public static void run(Graphics2D g) {
-		//triangleTest(g);
-		//coordinateTest(g);
+		triangleTest(g);
+		coordinateTest(g);
 	}
 
 	private static void coordinateTest(Graphics2D g) {

src/diveengine2d/components/ui/Button.java

@@ -1,41 +0,0 @@
-package diveengine2d.components.ui;
-
-import diveengine2d.DiveScript;
-
-import java.lang.reflect.Method;
-
-/**
- * Created by Marcus on 3/10/2016.
- */
-public class Button extends DiveScript {
-
-    private static final int NONE = 0;
-    private static final int HOVER = 0;
-    private static final int DOWN = 0;
-
-    public String eventClass = null;
-    public String eventName = null;
-    private Method event;
-    private boolean linked = false;
-    private DiveScript eventListener;
-    private int state = NONE;
-
-
-    public void create() {
-        try {
-            Class<?> eventListenerClass = Class.forName(eventClass);
-            eventListener = entity.getComponent((Class<? extends DiveScript>)eventListenerClass);
-            event = eventListenerClass.getMethod(eventName);
-            linked = true;
-
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        } catch (NoSuchMethodException e) {
-
-        }
-    }
-
-    public void update() {
-
-    }
-}