adjusted the way the server is receiving key presses to enable them be passed through to the game state #pair[ptg19, wmu16] #story[989]

src/main/java/seng302/gameServer/GameState.java

@@ -7,6 +7,7 @@ import seng302.models.Player;
 
 import java.util.ArrayList;
 import seng302.models.Yacht;
+import seng302.server.messages.BoatActionType;
 
 /**
  * A Static class to hold information about the current state of the game (model)
@@ -65,6 +66,22 @@ public class GameState {
         GameState.currentStage = currentStage;
     }
 
+    public static void updateBoat(Integer sourceId, BoatActionType actionType) {
+        switch (actionType) {
+            case VMG:
+                break;
+            case SAILS_IN:
+                break;
+            case SAILS_OUT:
+                break;
+            case TACK_GYBE:
+                break;
+            case UPWIND:
+                break;
+            case DOWNWIND:
+                break;
+        }
+    }
 
     public static void update() {
         Long timeInterval = System.currentTimeMillis() - previousUpdateTime;

src/main/java/seng302/gameServer/MainServerThread.java

@@ -1,8 +1,8 @@
 package seng302.gameServer;
 
+import seng302.client.ClientPacketParser;
 import seng302.models.Player;
 import seng302.models.stream.PacketBufferDelegate;
-import seng302.models.stream.StreamParser;
 import seng302.models.stream.packets.StreamPacket;
 
 import java.io.IOException;
@@ -77,7 +77,7 @@ public class MainServerThread extends Thread implements PacketBufferDelegate, Cl
                 System.out.println("WHATUPPP");
                 try {
                     StreamPacket packet = packetBuffer.take();
-                    StreamParser.parsePacket(packet);
+                    ClientPacketParser.parsePacket(packet);
                 } catch (InterruptedException e) {
                     continue;
                 }

src/main/java/seng302/gameServer/ServerPacketParser.java

@@ -0,0 +1,37 @@
+package seng302.gameServer;
+
+import java.util.Arrays;
+import seng302.models.stream.packets.StreamPacket;
+import seng302.server.messages.BoatActionType;
+
+
+public class ServerPacketParser {
+
+
+    public static BoatActionType extractBoatAction(StreamPacket packet) {
+        byte[] payload = packet.getPayload();
+        int messageVersionNo = payload[0];
+        long actionTypeValue = bytesToLong(Arrays.copyOfRange(payload, 0, 1));
+        return BoatActionType.getType((int) actionTypeValue);
+    }
+
+    /**
+     * takes an array of up to 7 bytes and returns a positive
+     * long constructed from the input bytes
+     *
+     * @return a positive long if there is less than 7 bytes -1 otherwise
+     */
+    private static long bytesToLong(byte[] bytes) {
+        long partialLong = 0;
+        int index = 0;
+        for (byte b : bytes) {
+            if (index > 6) {
+                return -1;
+            }
+            partialLong = partialLong | (b & 0xFFL) << (index * 8);
+            index++;
+        }
+        return partialLong;
+    }
+}
+

src/main/java/seng302/gameServer/ServerToClientThread.java

@@ -1,12 +1,13 @@
 package seng302.gameServer;
 
+
 import java.util.Random;
-import seng302.gameServer.GameState;
+import seng302.client.ClientPacketParser;
 import seng302.models.Player;
 import seng302.models.Yacht;
-import seng302.models.stream.PacketBufferDelegate;
-import seng302.models.stream.StreamParser;
+import seng302.models.stream.packets.PacketType;
 import seng302.models.stream.packets.StreamPacket;
+import seng302.server.messages.BoatActionType;
 import seng302.server.messages.Message;
 
 import java.io.*;
@@ -21,7 +22,6 @@ import seng302.utilities.GeoPoint;
  * Created by wmu16 on 13/07/17.
  */
 public class ServerToClientThread extends Thread {
-
     private static final Integer MAX_ID_ATTEMPTS = 10;
 
     private InputStream is;
@@ -34,7 +34,8 @@ public class ServerToClientThread extends Thread {
     private Boolean connected = true;
     private Boolean updateClient = true;
 
-    private Integer mockId = 100;
+    private Integer sourceId;
+
     public ServerToClientThread(Socket socket) {
         this.socket = socket;
         try {
@@ -45,8 +46,9 @@ public class ServerToClientThread extends Thread {
         }
 //                threeWayHandshake();
         GameState.addPlayer(new Player(socket));
-        GameState.addYacht(mockId, new Yacht("Kappa", "Kap", new GeoPoint(0.0, 0.0), 0.0));
-        mockId += 1;
+        Random rand = new Random();
+        sourceId = rand.nextInt(100000);
+        GameState.addYacht(sourceId, new Yacht("Kappa", "Kap", new GeoPoint(0.0, 0.0), 0.0));
     }
 
     public void run() {
@@ -85,8 +87,14 @@ public class ServerToClientThread extends Thread {
                     long packetCrc = Message.bytesToLong(getBytes(4));
                     if (computedCrc == packetCrc) {
                         //System.out.println("RECEIVED A PACKET");
-                        StreamParser.parsePacket(new StreamPacket(type, payloadLength, timeStamp, payload));
-                        // TODO: 17/07/17 wmu16 - Fix this or maybe we dont need to go through the main server at all!?!?
+                        switch (PacketType.assignPacketType(type)) {
+                            case BOAT_ACTION:
+                                BoatActionType actionType = ServerPacketParser
+                                    .extractBoatAction(
+                                        new StreamPacket(type, payloadLength, timeStamp, payload));
+                                GameState.updateBoat(sourceId, actionType);
+                                break;
+                        }
                     } else {
                         System.err.println("Packet has been dropped");
                     }