7e8eff1

deps.edn modified (view file)

@@ -1,5 +1,5 @@ {:aliases- {:run {:exec-fn net.bowmap.core/-main+ {:run {:exec-fn net.bowmap.server.core/-main         :extra-deps {nrepl/nrepl {:mvn/version "1.7.0"}}}}  :deps  {org.clojure/clojure {:mvn/version "1.13.0-alpha6"}

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

@@ -1,6 +1,6 @@-(ns net.bowmap.core+(ns net.bowmap.server.core   (:require-   [net.bowmap.network.server :as server]+   [net.bowmap.server.network.server :as server]    [nrepl.server :as nrepl]))  (defn -main [& _args]

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

@@ -1,8 +1,8 @@-(ns net.bowmap.network.connection+(ns net.bowmap.server.network.connection   "A connection to the Minecraft server."   (:require    [clojure.core.async :refer [<!! >!! chan close! io-thread]]-   [net.bowmap.network.streams :as streams])+   [net.bowmap.server.network.streams :as streams])   (:import    [java.io IOException]    [java.net Socket]))

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

@@ -1,10 +1,10 @@-(ns net.bowmap.network.server+(ns net.bowmap.server.network.server   (:require    [clojure.core.async :refer [<!! chan io-thread put!]]-   [net.bowmap.network.client :refer [apply-serverbound-frame]]-   [net.bowmap.network.connection :as connection]-   [net.bowmap.network.phase :as phase]-   [net.bowmap.network.socket :as socket]))+   [net.bowmap.server.protocol.client :refer [apply-serverbound-frame]]+   [net.bowmap.server.network.connection :as connection]+   [net.bowmap.server.protocol.phase :as phase]+   [net.bowmap.server.network.socket :as socket]))  (defn client-step   ([_] {::phase/phase ::phase/handshaking})

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

@@ -1,7 +1,7 @@-(ns net.bowmap.network.socket+(ns net.bowmap.server.network.socket   (:require    [clojure.core.async :refer [>!! chan close! io-thread]]-   [net.bowmap.network.connection :as connection])+   [net.bowmap.server.network.connection :as connection])   (:import    [java.net ServerSocket])) 

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

@@ -1,6 +1,6 @@-(ns net.bowmap.network.streams+(ns net.bowmap.server.network.streams   (:require-   [net.bowmap.network.frame.types :refer [max-varint-size]])+   [net.bowmap.server.protocol.types :refer [max-varint-size]])   (:import    [io.netty.buffer ByteBuf Unpooled]    [java.io

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

@@ -1,10 +1,10 @@-(ns net.bowmap.network.client+(ns net.bowmap.server.protocol.client   (:require    [medley.core :refer [assoc-some]]-   [net.bowmap.network.packet :as packet]-   [net.bowmap.network.packets :as packets]-   [net.bowmap.network.phase :as phase]-   [net.bowmap.network.serverbound-packets :as serverbound]))+   [net.bowmap.server.protocol.packet :as packet]+   [net.bowmap.server.protocol.packets :as packets]+   [net.bowmap.server.protocol.phase :as phase]+   [net.bowmap.server.protocol.serverbound-packets :as serverbound]))  (defn phase-transition   "Returns the phase a client should take on after parsing 'packet', or nil."

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

@@ -1,8 +1,8 @@-(ns net.bowmap.network.clientbound-packets+(ns net.bowmap.server.protocol.clientbound-packets   (:require-   [net.bowmap.network.frame.types :as t]-   [net.bowmap.network.frame.writers :refer :all]-   [net.bowmap.network.phase :as phase]))+   [net.bowmap.server.protocol.types :as t]+   [net.bowmap.server.protocol.writers :refer :all]+   [net.bowmap.server.protocol.phase :as phase]))  (defn ? [_] (throw (Exception. "Error while encoding packet: no packet definition for that packet id"))) 

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

@@ -1,4 +1,4 @@-(ns net.bowmap.network.packet+(ns net.bowmap.server.protocol.packet   "A Minecraft protocol packet sent either to the server (serverbound),    or to the client (clientbound).    See https://minecraft.wiki/w/Java_Edition_protocol/Packets"

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

@@ -1,12 +1,12 @@-(ns net.bowmap.network.packets+(ns net.bowmap.server.protocol.packets   (:require-   [net.bowmap.network.clientbound-packets :refer [clientbound-packets]]-   [net.bowmap.network.frame.readers :as readers]-   [net.bowmap.network.frame.types :refer [frame]]-   [net.bowmap.network.frame.writers :as writers]-   [net.bowmap.network.packet :as packet]-   [net.bowmap.network.phase :as phase]-   [net.bowmap.network.serverbound-packets :refer [serverbound-packets]]))+   [net.bowmap.server.protocol.clientbound-packets :refer [clientbound-packets]]+   [net.bowmap.server.protocol.readers :as readers]+   [net.bowmap.server.protocol.types :refer [frame]]+   [net.bowmap.server.protocol.writers :as writers]+   [net.bowmap.server.protocol.packet :as packet]+   [net.bowmap.server.protocol.phase :as phase]+   [net.bowmap.server.protocol.serverbound-packets :refer [serverbound-packets]]))  (defn- find-indexed   "Takes a seq of pairs and returns both the index of the first pair

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

@@ -1,4 +1,4 @@-(ns net.bowmap.network.phase+(ns net.bowmap.server.protocol.phase   "The phase of connection, also known as a connection state or protocol state in Minecraft."   (:require [clojure.spec.alpha :as s])) 

src/net/bowmap/server/protocol/readers.clj renamed from src/net/bowmap/network/frame/readers.clj (view file)

@@ -1,10 +1,10 @@-(ns net.bowmap.network.frame.readers+(ns net.bowmap.server.protocol.readers   "Functions for reading values from frames.    Functions look like ->type, where 'type' is a Minecraft protocol type.    See https://minecraft.wiki/w/Java_Edition_protocol/Packets#Data_types"   (:require    [medley.core :refer [assoc-some]]-   [net.bowmap.network.frame.types :refer [max-varint-size]])+   [net.bowmap.server.protocol.types :refer [max-varint-size]])   (:import    [io.netty.buffer ByteBuf]    [java.nio.charset Charset]))

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

@@ -1,8 +1,8 @@-(ns net.bowmap.network.serverbound-packets+(ns net.bowmap.server.protocol.serverbound-packets   (:require-   [net.bowmap.network.frame.readers :refer :all]-   [net.bowmap.network.frame.types :as t]-   [net.bowmap.network.phase :as phase]))+   [net.bowmap.server.protocol.readers :refer :all]+   [net.bowmap.server.protocol.types :as t]+   [net.bowmap.server.protocol.phase :as phase]))  (def serverbound-packets   "Map of connection phases to pairs of [serverbound-packet-id reader]"

src/net/bowmap/server/protocol/types.clj renamed from src/net/bowmap/network/frame/types.clj (view file)

@@ -1,4 +1,4 @@-(ns net.bowmap.network.frame.types+(ns net.bowmap.server.protocol.types   (:import    [io.netty.buffer Unpooled])) 

src/net/bowmap/server/protocol/writers.clj renamed from src/net/bowmap/network/frame/writers.clj (view file)

@@ -1,10 +1,10 @@-(ns net.bowmap.network.frame.writers+(ns net.bowmap.server.protocol.writers   "Functions for writing values into frames.    Functions look like type->, where 'type' is a Minecraft protocol type.    See https://minecraft.wiki/w/Java_Edition_protocol/Packets#Data_types"   (:require    [clojure.data.json :as json]-   [net.bowmap.network.frame.types :refer [max-varint-size]])+   [net.bowmap.server.protocol.types :refer [max-varint-size]])   (:import    [io.netty.buffer ByteBuf CompositeByteBuf Unpooled]    [java.nio.charset Charset]))