99a4600a4575

--- a/project.clj	Tue Jan 31 19:11:29 2012 -0500
+++ b/project.clj	Tue Jan 31 19:33:57 2012 -0500
@@ -1,5 +1,6 @@
 (defproject clojurecraft "0.0.1-SNAPSHOT"
-  :description "TODO: add summary of your project"
-  :dependencies [[clojure "1.2.0"]
-                 [clojure-contrib "1.2.0"]]
+  :description "A framework for writing Minecraft bots in Clojure."
+  :dependencies [[clojure "1.3.0"]
+                 [org.clojure/math.combinatorics "0.0.2"]
+                 [org.clojure/math.numeric-tower "0.0.1"]]
   :jvm-opts ["-Xmx1g"])

--- a/src/clojurecraft/core.clj	Tue Jan 31 19:11:29 2012 -0500
+++ b/src/clojurecraft/core.clj	Tue Jan 31 19:33:57 2012 -0500
@@ -3,7 +3,7 @@
   (:use [clojurecraft.in])
   (:use [clojurecraft.out])
   (:use [clojurecraft.util])
-  (:use [clojure.contrib.pprint :only (pprint)])
+  (:use [clojure.pprint :only (pprint)])
   (:require [clojurecraft.chunks :as chunks])
   (:require [clojurecraft.physics :as physics])
   (:require [clojurecraft.actions :as actions])
@@ -16,7 +16,7 @@
 (def STARTING-LOC (Location. 0 0 0 0 0 0 false))
 
 ; Worlds ---------------------------------------------------------------------------
-(def *worlds* (ref {}))
+(def ^:dynamic *worlds* (ref {}))
 (defn get-world [server]
   (dosync
     (ensure *worlds*)

--- a/src/clojurecraft/physics.clj	Tue Jan 31 19:11:29 2012 -0500
+++ b/src/clojurecraft/physics.clj	Tue Jan 31 19:33:57 2012 -0500
@@ -1,7 +1,7 @@
 (ns clojurecraft.physics
   (:use [clojurecraft.mappings])
   (:use [clojurecraft.util])
-  (:use [clojure.contrib.combinatorics :only (cartesian-product)])
+  (:use [clojure.math.combinatorics :only (cartesian-product)])
   (:require [clojurecraft.chunks :as chunks]))
 
 ; TODO: Investigate these.  I'm not convinced.

--- a/src/examples/followbot.clj	Tue Jan 31 19:11:29 2012 -0500
+++ b/src/examples/followbot.clj	Tue Jan 31 19:33:57 2012 -0500
@@ -1,5 +1,5 @@
 (ns examples.followbot
-  (:use [clojure.contrib.math :only (abs)])
+  (:use [clojure.math.numeric-tower :only (abs)])
   (:require [clojurecraft.core :as core])
   (:require [clojurecraft.events :as events])
   (:require [clojurecraft.loops :as loops])

--- a/src/examples/givebot.clj	Tue Jan 31 19:11:29 2012 -0500
+++ b/src/examples/givebot.clj	Tue Jan 31 19:33:57 2012 -0500
@@ -1,5 +1,5 @@
 (ns examples.givebot
-  (:require [clojure.contrib.string :as s])
+  (:require [clojure.string :as s])
   (:require [clojurecraft.core :as core])
   (:require [clojurecraft.events :as events])
   (:require [clojurecraft.actions :as actions]))