8372250

src/net/bowmap/server/core.clj modified (view file)

@@ -1,12 +1,12 @@ (ns net.bowmap.server.core   (:require    [clojure.tools.logging :as log]-   [net.bowmap.server.network.minecraft-server :as mc]-   [net.bowmap.server.runtime.server :as server]+   [net.bowmap.server.network.server :as server]+   [net.bowmap.server.runtime.connections :as conns]    [nrepl.server :as nrepl]))  (defn -main [& _args]   (spit ".nrepl-port" (req! (nrepl/start-server) :port))-  (let [server (mc/server :port 25565)]+  (let [server (server/start-server! :port 25565)]     (log/info "Server Started!")-    (server/run-server! server)))+    (conns/handle-connections! server)))

src/net/bowmap/server/network/server.clj renamed from src/net/bowmap/server/network/minecraft_server.clj (view file)

@@ -1,11 +1,11 @@-(ns net.bowmap.server.network.minecraft-server+(ns net.bowmap.server.network.server   (:require    [clojure.core.async :refer [>!! chan close! io-thread]]    [net.bowmap.server.network.connection :as connection])   (:import    [java.net ServerSocket])) -(defn server+(defn start-server!   "Starts a Minecraft server at the supplied port and optional bind address.    Returns a channel of connections that is coupled to the server's lifecycle."   [& {:keys! [port] :keys [bind-addr backlog] :or {:backlog 50}}]

src/net/bowmap/server/runtime/connections.clj renamed from src/net/bowmap/server/runtime/server.clj (view file)

@@ -1,4 +1,4 @@-(ns net.bowmap.server.runtime.server+(ns net.bowmap.server.runtime.connections   (:require    [clojure.core.async :refer [<!! alts!! chan io-thread put!]]    [net.bowmap.server.network.connection :as connection]@@ -36,11 +36,11 @@                 (put! clientbound-packets packet))               (recur client')))))))) -(defn run-server!-  "Starts running the given server, where server is a channel of connections.-   Blocks until the server closes."-  [server]+(defn handle-connections!+  "Handles connections from a channel of connections.+   Blocks until the channel closes."+  [connection-chan]   (loop []-    (when-some [connection (<!! server)]+    (when-some [connection (<!! connection-chan)]       (handle-connection! connection)       (recur))))