# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1308960947 14400
# Node ID a96c06febb533dc8cb10aa84e232122a6ca64218
# Parent  4d24dfe2cab15eb127811d5318fc6a2d14a34fc9
Holy shitcocks it works

diff -r 4d24dfe2cab1 -r a96c06febb53 src/clojurecraft/core.clj
--- a/src/clojurecraft/core.clj	Fri Jun 24 19:27:03 2011 -0400
+++ b/src/clojurecraft/core.clj	Fri Jun 24 20:15:47 2011 -0400
@@ -46,6 +46,6 @@
 
 
 ; Scratch --------------------------------------------------------------------------
-;(def server (connect minecraft-local))
+(def server (connect minecraft-local))
 ;(disconnect server)
 
diff -r 4d24dfe2cab1 -r a96c06febb53 src/clojurecraft/in.clj
--- a/src/clojurecraft/in.clj	Fri Jun 24 19:27:03 2011 -0400
+++ b/src/clojurecraft/in.clj	Fri Jun 24 20:15:47 2011 -0400
@@ -7,8 +7,9 @@
     b))
 
 (defn- -read-bytearray [conn size]
-  ; TODO: Implement this.
-  nil)
+  (let [ba (byte-array size)]
+    (.read (:in @conn) ba 0 size)
+    ba))
 
 (defn- -read-int [conn]
   (let [i (.readInt (:in @conn))]
@@ -23,8 +24,7 @@
     i))
 
 (defn- -read-shortarray [conn size]
-  ; TODO: Implement this.
-  nil)
+  (repeatedly size (-read-short conn)))
 
 (defn- -read-bool [conn]
   (let [b (.readBoolean (:in @conn))]
@@ -38,18 +38,32 @@
   (let [i (.readFloat (:in @conn))]
     i))
 
-(defn- -read-string8 [conn]
-  ; TODO: Implement this.
-  nil)
+(defn- -read-string-utf8 [conn]
+  (let [s (.readUTF (:in @conn))]
+    s))
 
-(defn- -read-string16 [conn]
+(defn- -read-string-ucs2 [conn]
   (let [str-len (.readShort (:in @conn))
                 s (apply str (repeatedly str-len #(.readChar (:in @conn))))]
     s))
 
 (defn- -read-metadata [conn]
-  ; TODO: Implement this.
-  nil)
+  (loop [data []]
+    (let [x (-read-byte conn)]
+      (if (= x 127)
+        nil
+        (case (bit-shift-right x 5)
+          0 (recur (conj data (-read-byte conn)))
+          1 (recur (conj data (-read-short conn)))
+          2 (recur (conj data (-read-int conn)))
+          3 (recur (conj data (-read-float conn)))
+          4 (recur (conj data (-read-string-ucs2 conn)))
+          5 (recur (conj data [(-read-short conn)
+                               (-read-byte conn)
+                               (-read-short conn)]))
+          6 (recur (conj data [(-read-int conn)
+                               (-read-int conn)
+                               (-read-int conn)])))))))
 
 
 ; Reading Packets ------------------------------------------------------------------
@@ -58,18 +72,18 @@
 
 (defn- read-packet-handshake [conn]
   (assoc {}
-    :hash (-read-string16 conn)))
+    :hash (-read-string-ucs2 conn)))
 
 (defn- read-packet-login [conn]
   (assoc {}
     :eid (-read-int conn)
-    :unknown (-read-string16 conn)
+    :unknown (-read-string-ucs2 conn)
     :seed (-read-long conn)
     :dimension (-read-byte conn)))
 
 (defn- read-packet-chat [conn]
   (assoc {}
-    :message (-read-string16 conn)))
+    :message (-read-string-ucs2 conn)))
 
 (defn- read-packet-timeupdate [conn]
   (assoc {}
@@ -155,7 +169,7 @@
 (defn- read-packet-namedentityspawn [conn]
   (assoc {}
     :eid (-read-int conn)
-    :playername (-read-string16 conn)
+    :playername (-read-string-ucs2 conn)
     :x (-read-int conn)
     :y (-read-int conn)
     :z (-read-int conn)
@@ -210,7 +224,7 @@
 (defn- read-packet-entitypainting [conn]
   (assoc {}
     :eid (-read-int conn)
-    :type (-read-string16 conn)
+    :type (-read-string-ucs2 conn)
     :x (-read-int conn)
     :y (-read-int conn)
     :z (-read-int conn)
@@ -366,7 +380,7 @@
   (assoc {}
     :windowid (-read-byte conn)
     :inventorytype (-read-byte conn)
-    :windowtitle (-read-string8 conn)
+    :windowtitle (-read-string-utf8 conn)
     :numberofslots (-read-byte conn)))
 
 (defn- read-packet-closewindow [conn]
@@ -383,7 +397,7 @@
 
 (defn- read-packet-windowitems [conn]
   (letfn [(-read-payload-item []
-             (let [payload (assoc :itemid (-read-short conn))]
+             (let [payload (assoc {} :itemid (-read-short conn))]
                (if (= (:itemid payload) -1)
                  payload
                  (assoc payload
@@ -412,10 +426,10 @@
     :x (-read-int conn)
     :y (-read-short conn)
     :z (-read-int conn)
-    :text1 (-read-string16 conn)
-    :text2 (-read-string16 conn)
-    :text3 (-read-string16 conn)
-    :text4 (-read-string16 conn)))
+    :text1 (-read-string-ucs2 conn)
+    :text2 (-read-string-ucs2 conn)
+    :text3 (-read-string-ucs2 conn)
+    :text4 (-read-string-ucs2 conn)))
 
 (defn- read-packet-mapdata [conn]
   (let [pretext (assoc {}
@@ -431,14 +445,14 @@
 
 (defn- read-packet-disconnectkick [conn]
   (assoc {}
-    :reason (-read-string16 conn)))
+    :reason (-read-string-ucs2 conn)))
 
 
 ; Reading Wrappers -----------------------------------------------------------------
 (defn read-packet [conn]
   (let [packet-id (int (-read-byte conn))
         packet-type (packet-types packet-id)]
-    (println "\n----->")
+    (println "\n--PACKET--> " packet-type)
     (println
       (case packet-type
         :keepalive                 (read-packet-keepalive conn)
diff -r 4d24dfe2cab1 -r a96c06febb53 src/clojurecraft/out.clj
--- a/src/clojurecraft/out.clj	Fri Jun 24 19:27:03 2011 -0400
+++ b/src/clojurecraft/out.clj	Fri Jun 24 20:15:47 2011 -0400
@@ -8,8 +8,9 @@
     (.writeByte (int i))))
 
 (defn- -write-bytearray [conn ba]
-  ; TODO: Implement this.
-  nil)
+  (println (str "-> BYTEARRAY: " ba))
+  (doto (:out @conn)
+    (.write ba 0 (count ba))))
 
 (defn- -write-short [conn i]
   (println (str "-> SHORT: " i))
@@ -17,8 +18,7 @@
     (.writeShort (int i))))
 
 (defn- -write-shortarray [conn sa]
-  ; TODO: Implement this.
-  nil)
+  (map #(-write-short %) sa))
 
 (defn- -write-int [conn i]
   (println (str "-> INT: " i))
@@ -40,11 +40,12 @@
   (doto (:out @conn)
     (.writeFloat (int i))))
 
-(defn- -write-string8 [conn s]
-  ; TODO: Implement this.
-  nil)
+(defn- -write-string-utf8 [conn s]
+  (println (str "-> STRING: " s))
+  (doto (:out @conn)
+    (.writeUTF s)))
 
-(defn- -write-string16 [conn s]
+(defn- -write-string-ucs2 [conn s]
   (-write-short conn (count s))
   (println (str "-> STRING: " s))
   (doto (:out @conn)
@@ -67,20 +68,20 @@
 (defn- write-packet-handshake [conn {username :username}]
   (-write-byte conn (:handshake packet-ids))
 
-  (-write-string16 conn username))
+  (-write-string-ucs2 conn username))
 
 (defn- write-packet-login [conn {version :version, username :username}]
   (-write-byte conn (:login packet-ids))
 
   (-write-int conn version)
-  (-write-string16 conn username)
+  (-write-string-ucs2 conn username)
   (-write-long conn 0)
   (-write-byte conn 0))
 
 (defn- write-packet-chat [conn {message :message}]
   (-write-byte conn (:chat packet-ids))
 
-  (-write-string16 conn message))
+  (-write-string-ucs2 conn message))
 
 (defn- write-packet-respawn [conn {world :world}]
   (-write-byte conn (:respawn packet-ids))
@@ -183,7 +184,7 @@
   (-write-byte conn (:entitypainting packet-ids))
 
   (-write-int conn eid)
-  (-write-string16 conn title)
+  (-write-string-ucs2 conn title)
   (-write-int conn x)
   (-write-int conn y)
   (-write-int conn x)
@@ -261,7 +262,7 @@
 
   (-write-byte conn windowid)
   (-write-byte conn inventorytype)
-  (-write-string8 conn windowtitle)
+  (-write-string-utf8 conn windowtitle)
   (-write-byte conn numberofslots))
 
 (defn- write-packet-closewindow [conn {windowid :windowid}]
@@ -294,10 +295,10 @@
   (-write-int conn x)
   (-write-short conn y)
   (-write-int conn z)
-  (-write-string16 conn text1)
-  (-write-string16 conn text2)
-  (-write-string16 conn text3)
-  (-write-string16 conn text4))
+  (-write-string-ucs2 conn text1)
+  (-write-string-ucs2 conn text2)
+  (-write-string-ucs2 conn text3)
+  (-write-string-ucs2 conn text4))
 
 (defn- write-packet-incrementstatistic [conn {statisticid :statisticid amount :amount}]
   (-write-byte conn (:incrementstatistic packet-ids))
@@ -308,7 +309,7 @@
 (defn- write-packet-disconnectkick [conn {reason :reason}]
   (-write-byte conn (:disconnectkick packet-ids))
 
-  (-write-string16 conn reason))
+  (-write-string-ucs2 conn reason))
 
 
 ; Writing Wrappers -----------------------------------------------------------------