Replaced imports with require's.

muhuk · Jan 7, 2015 · a965ab138b888d3137742aa290be87d9e1528bd1 · a965ab1
1 parent ee20548
commit a965ab138b888d3137742aa290be87d9e1528bd1
diff --git a/clecs-example-rougelike/src/clecs_example_rougelike/entities.clj b/clecs-example-rougelike/src/clecs_example_rougelike/entities.clj
@@ -1,7 +1,6 @@
 (ns clecs-example-rougelike.entities
  (:require [clecs.world :as w]
-            [clecs-example-rougelike.components :refer :all])
-  (:import [clecs_example_rougelike.components Location]))
+            [clecs-example-rougelike.components :refer :all]))


 (def tagged-entities (atom {}))
diff --git a/clecs-example-rougelike/src/clecs_example_rougelike/systems/input.clj b/clecs-example-rougelike/src/clecs_example_rougelike/systems/input.clj
@@ -2,9 +2,12 @@
  (:require [clecs.world :as w]
            [clecs.component :refer [component-label]]
            [lanterna.screen :as s]
-            [clecs-example-rougelike.components :refer [->MoveIntent ->TakeIntent]]
-            [clecs-example-rougelike.entities :refer [tagged-entities]])
-  (:import [clecs_example_rougelike.components MoveIntent Renderable TakeIntent]))
+            [clecs-example-rougelike.components :refer [->MoveIntent
+                                                        ->TakeIntent
+                                                        MoveIntent
+                                                        Renderable
+                                                        TakeIntent]]
+            [clecs-example-rougelike.entities :refer [tagged-entities]]))


 (defn- get-inputs! [inputs screen]
diff --git a/clecs-example-rougelike/src/clecs_example_rougelike/systems/move.clj b/clecs-example-rougelike/src/clecs_example_rougelike/systems/move.clj
@@ -1,8 +1,10 @@
 (ns clecs-example-rougelike.systems.move
  (:require [clecs.component :refer [component-label]]
            [clecs.world :as w]
-            [clecs-example-rougelike.components :refer [->Location]])
-  (:import [clecs_example_rougelike.components Location MoveIntent Walkable]))
+            [clecs-example-rougelike.components :refer [->Location
+                                                        Location
+                                                        MoveIntent
+                                                        Walkable]]))


 (declare q-movers q-walkables walkable?)
diff --git a/clecs-example-rougelike/src/clecs_example_rougelike/systems/rendering.clj b/clecs-example-rougelike/src/clecs_example_rougelike/systems/rendering.clj
@@ -4,8 +4,7 @@
            [clecs.world :as w]
            [clecs-example-rougelike.components :refer :all]
            [clecs-example-rougelike.entities :refer [find-entities-at
-                                                      tagged-entities]])
-  (:import [clecs_example_rougelike.components Inventory Location Name Renderable Takeable]))
+                                                      tagged-entities]]))


 (def min-height 20)
diff --git a/clecs-example-rougelike/src/clecs_example_rougelike/systems/take.clj b/clecs-example-rougelike/src/clecs_example_rougelike/systems/take.clj
@@ -1,9 +1,11 @@
 (ns clecs-example-rougelike.systems.take
  (:require [clecs.component :refer [component-label]]
            [clecs.world :as w]
-            [clecs-example-rougelike.components :refer [->Inventory]]
-            [clecs-example-rougelike.entities :refer [find-entities-at]])
-  (:import [clecs_example_rougelike.components Location Takeable TakeIntent]))
+            [clecs-example-rougelike.components :refer [->Inventory
+                                                        Location
+                                                        Takeable
+                                                        TakeIntent]]
+            [clecs-example-rougelike.entities :refer [find-entities-at]]))


 (declare q-takeable q-takers)