More changes to incoming packets

Author: phase

Diff for: dist/hypercube.exe

@@ -11,18 +11,23 @@ hc_help() {
 hc_build() {
     rm -rf dist/
     #TODO: Use other compilers
-    dmd src/*.d -of./dist/hypercube.exe -v
+    dmd src/*.d -of./dist/hypercube.exe #-v
 }
 
 hc_run() {
-    if [ ! -f "/dist/hypercube.exe" ]; then
+    if [ -f "/dist/hypercube.exe" ]; then
         hc_build
     fi
-    if [ -f "/dist/hypercube.exe" ]; then
+    if [ ! -f "/dist/hypercube.exe" ]; then
         dist/hypercube -debug -h=localhost -p=25565
     fi
 }
 
+hc_reboot() {
+    hc_build
+    hc_run
+}
+
 if [ -z $1 ]; then
     hc_help
     exit

Diff for: hypercube

@@ -51,7 +51,8 @@ void setupSockets() {
         ubyte[1024] buffer;
         int ptr = 0;
         s.receive(buffer);
-        int size = readVarInt(buffer, &ptr); /// size of packet
+        new IncomingPacket(buffer);
+        /*int size = readVarInt(buffer, &ptr); /// size of packet
         int id = readVarInt(buffer, &ptr); /// packet id
         int protocolVersion = readVarInt(buffer, &ptr); /// protocol version
         string address = readString(buffer, &ptr); /// the client is stupid and sends the address to the address
@@ -65,7 +66,7 @@ void setupSockets() {
             "\nPort: " ~ to!string(port) ~
             "\nState: " ~ to!string(state)
             );
-        }
+        }*/
         /*ptr = 0;
         while(ptr <= buffer.length) {
             write(to!string(readVarInt(buffer, &ptr)) ~ " ");

Diff for: src/hypercube.d

@@ -31,11 +31,11 @@ class PacketField {
 }  
 
 class Packet {
-    enum To : string{
+    enum To : string {
         Server = "Server",
         Client = "Client",
     }
-    enum State : string{
+    enum State : string {
         HandShake = "HandShake",
         Status = "Status",
         Login = "Login",
@@ -76,11 +76,12 @@ class Packet {
     }
 }
 
-Packet[] allPackets;
+Packet[] allPackets = void;
 
 Packet getPacketById(ubyte id) {
     foreach(p; allPackets) {
-        if(p.getId()) {
+        log(to!string(p.getId()));
+        if(p.getId() == id) {
             return p;
         }
     }
@@ -98,9 +99,10 @@ void parseProtocol(char[] s) {
     packets ~= parsePackets(p["states"]["login"]["toServer"], Packet.State.Login, Packet.To.Server);
     packets ~= parsePackets(p["states"]["play"]["toClient"], Packet.State.Play, Packet.To.Client);
     packets ~= parsePackets(p["states"]["play"]["toServer"], Packet.State.Play, Packet.To.Server);
-
+    
+    log("Packets Found: " ~ to!string(packets.length));
     allPackets = packets;
-
+    
     foreach(packet; packets) {
         log(packet.toString());
     }
@@ -137,10 +139,10 @@ class IncomingPacket {
 
     this(ubyte[] buffer) {
         this.data = buffer;
+        this.ptr = 0;
         int size = readVarInt(data, &ptr); /// size of packet
         int id = readVarInt(data, &ptr); /// packet id
         Packet p = getPacketById(cast(ubyte)id);
-        switch(id) {
-        }
+        log("Incoming Packet: " ~ to!string(id) ~ ":" ~ p.toString());
     }
 }