accessor fix 2

continuation of the first accessor fix.

Author: DylanMeeus

src/com/redomar/game/lib/Keys.java

@@ -47,7 +47,7 @@ public void keyTyped(KeyEvent arg0) {
 
 	public void toggleKey(int keyCode, boolean isPressed) {
 		if (keyCode == KeyEvent.VK_W || keyCode == KeyEvent.VK_UP) {
-			getUp().toggle(isPressed);
+			up.toggle(isPressed);
 		}
 		if (keyCode == KeyEvent.VK_S || keyCode == KeyEvent.VK_DOWN) {
 			getDown().toggle(isPressed);

src/com/redomar/game/lib/Name.java

@@ -13,7 +13,7 @@ public Name() {
 
 	public String setName(String name) {
 
-		String finalName = name + getName_ID();
+		String finalName = name + name_ID;
 		return finalName;
 	}
 

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

@@ -17,13 +17,13 @@ public DedicatedJFrame(int WIDTH, int HEIGHT, int SCALE, String NAME) {
 		setPreferredSize(new Dimension(WIDTH * SCALE, HEIGHT * SCALE));
 
 		setFrame(new JFrame(NAME));
-		//getFrame().setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		getFrame().setLayout(new BorderLayout());
-		getFrame().add(this, BorderLayout.CENTER);
-		getFrame().pack();
-		getFrame().setResizable(false);
-		getFrame().setLocationRelativeTo(null);
-		getFrame().setVisible(true);
+		//frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+		frame.setLayout(new BorderLayout());
+		frame.add(this, BorderLayout.CENTER);
+		frame.pack();
+		frame.setResizable(false);
+		frame.setLocationRelativeTo(null);
+		frame.setVisible(true);
 	}
 
 	public JFrame getFrame() {
@@ -39,7 +39,7 @@ public void setFrame(JFrame frame) {
 	}
 
 	public void stopFrame() {
-		getFrame().dispose();
+		frame.dispose();
 	}
 
 }

src/com/redomar/game/objects/InventoryWindow.java

@@ -38,7 +38,7 @@ public void run() {
 		long lastTimer = System.currentTimeMillis();
 		double delta = 0;
 
-		setWindow(new InventoryHandler(getFrame()));
+		setWindow(new InventoryHandler(frame));
 
 		while (running) {
 			long now = System.nanoTime();
@@ -65,7 +65,7 @@ public void run() {
 
 			if (System.currentTimeMillis() - lastTimer >= 1000) {
 				lastTimer += 1000;
-				getFrame().getFrame().setTitle(
+				frame.getFrame().setTitle(
 						"Frames: " + frames + " Ticks: " + ticks);
 				frames = 0;
 				ticks = 0;
@@ -74,9 +74,9 @@ public void run() {
 	}
 
 	private void render() {
-		BufferStrategy bs = getFrame().getBufferStrategy();
+		BufferStrategy bs = frame.getBufferStrategy();
 		if(bs == null){
-			getFrame().createBufferStrategy(3);
+			frame.createBufferStrategy(3);
 			return;
 		}
 

src/com/redomar/game/objects/Items.java

@@ -1,7 +1,6 @@
 package com.redomar.game.objects;
 
 public enum Items {
-
 	Stick,
 	Torch,
 	Sword,

src/com/redomar/game/script/PrintTypes.java

@@ -1,7 +1,6 @@
 package com.redomar.game.script;
 
 public enum PrintTypes {
-
 	GAME,
 	LEVEL,
 	MUSIC,

src/com/redomar/game/script/Printing.java

@@ -25,9 +25,9 @@ private void printOut(){
 		String msgTime = "[" + time.getTime() + "]";
 		String msgType = "[" + type.toString() + "]";
 		if(redMode == true){
-			System.err.println(msgType + msgTime + getMessage());
+			System.err.println(msgType + msgTime + message);
 		}else{
-			System.out.println(msgType + msgTime + getMessage());
+			System.out.println(msgType + msgTime + message);
 		}
 	}