From d86d4dc62eb2ad3b3765beff37410c471f58a298 Mon Sep 17 00:00:00 2001 From: jancoow Date: Fri, 19 Jun 2015 10:23:35 +0200 Subject: [PATCH] Remove some system outs --- audio/io/Main.java | 21 ------------ control/GameControl.java | 2 -- control/NetworkHandler.java | 38 +++++++--------------- data/io/.gitignore | 1 + model/gameState/GameOverState.java | 1 - model/gameState/MenuState.java | 1 - model/gameState/PlayState.java | 3 -- model/objects/highscore/HighscoreName.java | 1 - 8 files changed, 12 insertions(+), 56 deletions(-) delete mode 100644 audio/io/Main.java diff --git a/audio/io/Main.java b/audio/io/Main.java deleted file mode 100644 index 20ef6bd..0000000 --- a/audio/io/Main.java +++ /dev/null @@ -1,21 +0,0 @@ -package audio.io; - -import java.io.File; -import java.io.IOException; - -import audio.Song; - -public class Main { - - public static void main(String[] args) { - Song s = null; - try { - s = JSONReader.readSong(new File("C:\\Users\\Kenneth\\Development\\Java Development\\SimApplicatie\\Arcade\\songs\\NAME_OF_SONG\\NAME_OF_SONG.csf")); - } catch (IOException e) { - e.printStackTrace(); - } - System.out.println("---"); - System.out.println(s); - } - -} diff --git a/control/GameControl.java b/control/GameControl.java index 93e2c2c..bd87e45 100644 --- a/control/GameControl.java +++ b/control/GameControl.java @@ -32,13 +32,11 @@ public class GameControl implements JoystickListener, ButtonListener, ActionList @Override public void buttonPressed(ButtonEvent e) { -// System.out.println("Game control, button pressed: "+e.getButton().getButtonID()); gsm.buttonPressed(e); } @Override public void buttonReleased(ButtonEvent e) { -// System.out.println("Game control, button released: "+e.getButton().getButtonID()); gsm.buttonReleased(e); } diff --git a/control/NetworkHandler.java b/control/NetworkHandler.java index 21c058a..6a8675b 100644 --- a/control/NetworkHandler.java +++ b/control/NetworkHandler.java @@ -14,7 +14,6 @@ import control.joystick.JoystickHandler; public class NetworkHandler implements Runnable{ DatagramSocket udp; - DatagramSocket udpsend; String host; int port; @@ -28,8 +27,6 @@ public class NetworkHandler implements Runnable{ ButtonHandler bth; JoystickHandler jth; - InetAddress adr; - public NetworkHandler(String host, int port, ButtonHandler bth, JoystickHandler jth) { this.host = host; @@ -43,19 +40,8 @@ public class NetworkHandler implements Runnable{ send = new byte[1024]; receive = new byte[1024]; - try { - adr = InetAddress.getByName("192.168.1.5"); - } catch (UnknownHostException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } -// try { -// udp = new DatagramSocket(1112); -// } catch (SocketException e) { -// e.printStackTrace(); -// } - try { - udpsend = new DatagramSocket(); + try { + udp = new DatagramSocket(1113); } catch (SocketException e) { e.printStackTrace(); } @@ -78,12 +64,7 @@ public class NetworkHandler implements Runnable{ private void send(String str) { - send = str.getBytes(); - try { - udpsend.send(new DatagramPacket(send, send.length, adr, port)); - } catch (IOException e) { - e.printStackTrace(); - } + } public void close() @@ -100,19 +81,19 @@ public class NetworkHandler implements Runnable{ { DatagramPacket receivePacket = new DatagramPacket(receive, receive.length); try { - udpsend.receive(receivePacket); + udp.receive(receivePacket); } catch (IOException e) { e.printStackTrace(); } String sentence = new String( receivePacket.getData()); - - + sentence = sentence.trim(); + String[] controls = sentence.split("\\|"); int[] control = new int[controls.length]; - for(int i=0; i sh.getCurrentSongInstance().getEndTime() + Enemy.secondsToEnd*1000*2) endGame(); -// System.out.println(progress - oldProgress + " / " + area.paths.get(player.getIndex()).getEnemysInPath().size()); - oldProgress = progress; Enemy closedEnemy = null; @@ -120,7 +118,6 @@ public class PlayState extends GameState { while (enemyIterator.hasNext()) { Enemy e = enemyIterator.next(); -// System.out.println("Path: "+e.getIndex()+"\tDistance: "+(Enemy.distanceToOctagon-e.getDistanceFromStart())); if (e.getDistanceFromStart() > Enemy.distanceToOctagon + (sizeOfEnemy * 1.5)) { enemyIterator.remove(); lifePoints -= 5; diff --git a/model/objects/highscore/HighscoreName.java b/model/objects/highscore/HighscoreName.java index 9ab5920..88d4cfa 100644 --- a/model/objects/highscore/HighscoreName.java +++ b/model/objects/highscore/HighscoreName.java @@ -18,7 +18,6 @@ public class HighscoreName { int marge = (int) (Math.floor(nameLength/2)-1)*spacing; x -= (double)HighscoreLetter.charLength*(nameLength/2.0) + marge; - System.out.println(x); for(int i = 0; i < letters.length; i++){ letters[i] = new HighscoreLetter(characters, x+(HighscoreLetter.charLength*i)+(spacing*i), y); }