03475ae

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

@@ -4,15 +4,15 @@    [net.bowmap.server.game.player :as player]    [net.bowmap.server.game.server :as server]    [net.bowmap.server.network.connection :as connection]-   [net.bowmap.server.protocol.clientbound-packets :as clientbound]-   [net.bowmap.server.protocol.component :as component]-   [net.bowmap.server.protocol.entity :as entity]-   [net.bowmap.server.protocol.gamemode :as gamemode]-   [net.bowmap.server.protocol.packet :as packet]-   [net.bowmap.server.protocol.registry :as registry]-   [net.bowmap.server.protocol.schema :as p]-   [net.bowmap.server.protocol.schema.minecraft :as mc]-   [net.bowmap.server.protocol.serverbound-packets :as serverbound]))+   [net.bowmap.server.packet.clientbound :as clientbound]+   [net.bowmap.server.packet.component :as component]+   [net.bowmap.server.packet.entity :as entity]+   [net.bowmap.server.packet.gamemode :as gamemode]+   [net.bowmap.server.packet.packet :as packet]+   [net.bowmap.server.packet.registry :as registry]+   [net.bowmap.server.packet.schema :as p]+   [net.bowmap.server.packet.schema.minecraft :as mc]+   [net.bowmap.server.packet.serverbound :as serverbound]))  (defmulti handle-packet   "Handles a packet from a player given their connection uuid. Takes the game

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

@@ -1,8 +1,8 @@ (ns net.bowmap.server.network.streams   "Functions for reading and writing frames to Input and OutputStreams"   (:require-   [net.bowmap.server.protocol.frame :as frame]-   [net.bowmap.server.protocol.readers :refer [max-varint-size]])+   [net.bowmap.server.packet.frame :as frame]+   [net.bowmap.server.packet.readers :refer [max-varint-size]])   (:import    [java.io IOException InputStream OutputStream])) 

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

@@ -1,4 +1,4 @@-(ns net.bowmap.server.protocol.block+(ns net.bowmap.server.packet.block   (:require    [clojure.spec.alpha :as s])) 

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

@@ -1,10 +1,10 @@-(ns net.bowmap.server.protocol.clientbound-packets+(ns net.bowmap.server.packet.clientbound   (:require-   [net.bowmap.server.protocol.entity :as entity]-   [net.bowmap.server.protocol.gamemode :as gamemode]-   [net.bowmap.server.protocol.phase :as phase]-   [net.bowmap.server.protocol.schema :as p]-   [net.bowmap.server.protocol.writers :refer :all]))+   [net.bowmap.server.packet.entity :as entity]+   [net.bowmap.server.packet.gamemode :as gamemode]+   [net.bowmap.server.packet.phase :as phase]+   [net.bowmap.server.packet.schema :as p]+   [net.bowmap.server.packet.writers :refer :all]))  (def clientbound-packets   "Map of connection phases to pairs of clientbound packet IDs and writers.

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

@@ -1,4 +1,4 @@-(ns net.bowmap.server.protocol.component+(ns net.bowmap.server.packet.component   "The subset of the protocol text component format used by this server.    See https://minecraft.wiki/w/Text_component_format for the full format."   (:require

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

@@ -1,4 +1,4 @@-(ns net.bowmap.server.protocol.entity)+(ns net.bowmap.server.packet.entity)  (defonce highest-entity-id (atom 0)) 

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

@@ -1,4 +1,4 @@-(ns net.bowmap.server.protocol.frame+(ns net.bowmap.server.packet.frame   (:require    [clojure.spec.alpha :as s])   (:import

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

@@ -1,4 +1,4 @@-(ns net.bowmap.server.protocol.gamemode+(ns net.bowmap.server.packet.gamemode   (:require    [clojure.spec.alpha :as s])) 

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

@@ -1,7 +1,7 @@-(ns net.bowmap.server.protocol.identifier+(ns net.bowmap.server.packet.identifier   (:require    [clojure.string :as str]-   [net.bowmap.server.protocol.schema.minecraft :as mc]))+   [net.bowmap.server.packet.schema.minecraft :as mc]))  (def namespace-regex #"^[a-z0-9.\-_]+$") (def name-regex #"^#?[a-z0-9.\-_:]+$")

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

@@ -1,9 +1,9 @@-(ns net.bowmap.server.protocol.nbt+(ns net.bowmap.server.packet.nbt   "Minecraft's 'Named Binary Tag' format.    See https://minecraft.wiki/w/Minecraft_Wiki:Projects/wiki.vg_merge/NBT"   (:require    [clojure.spec.alpha :as s]-   [net.bowmap.server.protocol.identifier :refer [identifier?]])+   [net.bowmap.server.packet.identifier :refer [identifier?]])   (:refer-clojure :exclude [type]))  (declare type)

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

@@ -1,12 +1,12 @@-(ns net.bowmap.server.protocol.packet+(ns net.bowmap.server.packet.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"   (:require    [clojure.set :as set]    [clojure.spec.alpha :as s]-   [net.bowmap.server.protocol.clientbound-packets :as clientbound]-   [net.bowmap.server.protocol.serverbound-packets :as serverbound]))+   [net.bowmap.server.packet.clientbound :as clientbound]+   [net.bowmap.server.packet.serverbound :as serverbound]))  (s/def ::id (set/union clientbound/ids serverbound/ids)) (s/def ::packet (s/keys :opt [::id]))

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

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

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

@@ -1,4 +1,4 @@-(ns net.bowmap.server.protocol.readers+(ns net.bowmap.server.packet.readers   "Functions for reading values from io.netty.ByteBufs.    Buffers are assumed to be properly framed and contain exactly 1 packet.    Functions look like type<, where 'type' is a Minecraft protocol type.@@ -6,7 +6,7 @@   (:require    [clojure.spec.alpha :as s]    [medley.core :refer [assoc-some]]-   [net.bowmap.server.protocol.identifier :as identifier])+   [net.bowmap.server.packet.identifier :as identifier])   (:import    [io.netty.buffer ByteBuf]    [java.nio.charset StandardCharsets]

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

@@ -1,17 +1,17 @@-(ns net.bowmap.server.protocol.registry+(ns net.bowmap.server.packet.registry   "The set of registry and tags required by the client.    The registry is global to the server. Because clients depend on the registry    as it was sent to them, it is not REPL reloadable without reconfiguration."   (:require    [clojure.set :as set]    [clojure.spec.alpha :as s]-   [net.bowmap.server.protocol.clientbound-packets :as clientbound]-   [net.bowmap.server.protocol.identifier :as identifier]-   [net.bowmap.server.protocol.packet :as packet]-   [net.bowmap.server.protocol.schema :as p]-   [net.bowmap.server.protocol.schema.bowmap :as bowmap]-   [net.bowmap.server.protocol.schema.minecraft :as mc]-   [net.bowmap.server.protocol.world :as world]))+   [net.bowmap.server.packet.clientbound :as clientbound]+   [net.bowmap.server.packet.identifier :as identifier]+   [net.bowmap.server.packet.packet :as packet]+   [net.bowmap.server.packet.schema :as p]+   [net.bowmap.server.packet.schema.bowmap :as bowmap]+   [net.bowmap.server.packet.schema.minecraft :as mc]+   [net.bowmap.server.packet.world :as world]))  (def core-data-pack   "The minecraft:core datapack, known by the vanilla client."

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

@@ -1,8 +1,8 @@-(ns net.bowmap.server.protocol.schema+(ns net.bowmap.server.packet.schema   (:require    [clojure.spec.alpha :as s]-   [net.bowmap.server.protocol.identifier :refer [identifier?]]-   [net.bowmap.server.protocol.nbt :as nbt]))+   [net.bowmap.server.packet.identifier :refer [identifier?]]+   [net.bowmap.server.packet.nbt :as nbt]))  (s/def ::identifier identifier?) 

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

@@ -1,2 +1,2 @@-(ns net.bowmap.server.protocol.schema.bowmap+(ns net.bowmap.server.packet.schema.bowmap   "The default 'bowmap' namespace used in protocol identifiers.")

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

@@ -1,4 +1,4 @@-(ns net.bowmap.server.protocol.schema.minecraft+(ns net.bowmap.server.packet.schema.minecraft   "The default 'minecraft' namespace used in protocol identifiers.")  (def minecraft-namespace (str (ns-name *ns*)))

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

@@ -1,12 +1,12 @@-(ns net.bowmap.server.protocol.packet-serialization+(ns net.bowmap.server.packet.serialize   (:require-   [net.bowmap.server.protocol.clientbound-packets :as clientbound]-   [net.bowmap.server.protocol.frame :as frame]-   [net.bowmap.server.protocol.packet :as packet]-   [net.bowmap.server.protocol.phase :as phase]-   [net.bowmap.server.protocol.readers :as readers]-   [net.bowmap.server.protocol.serverbound-packets :as serverbound]-   [net.bowmap.server.protocol.writers :as writers])+   [net.bowmap.server.packet.clientbound :as clientbound]+   [net.bowmap.server.packet.frame :as frame]+   [net.bowmap.server.packet.packet :as packet]+   [net.bowmap.server.packet.phase :as phase]+   [net.bowmap.server.packet.readers :as readers]+   [net.bowmap.server.packet.serverbound :as serverbound]+   [net.bowmap.server.packet.writers :as writers])   (:import    [io.netty.buffer Unpooled])) 

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

@@ -1,8 +1,8 @@-(ns net.bowmap.server.protocol.serverbound-packets+(ns net.bowmap.server.packet.serverbound   (:require-   [net.bowmap.server.protocol.phase :as phase]-   [net.bowmap.server.protocol.readers :refer :all]-   [net.bowmap.server.protocol.schema :as p]))+   [net.bowmap.server.packet.phase :as phase]+   [net.bowmap.server.packet.readers :refer :all]+   [net.bowmap.server.packet.schema :as p]))  (def serverbound-packets   "Map of connection phases to pairs of serverbound packet IDs and readers.

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

@@ -1,6 +1,6 @@-(ns net.bowmap.server.protocol.state+(ns net.bowmap.server.packet.state   (:require    [clojure.spec.alpha :as s]-   [net.bowmap.server.protocol.phase :as phase]))+   [net.bowmap.server.packet.phase :as phase]))  (s/def ::state (s/keys :opt [::phase/phase]))

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

@@ -1,4 +1,4 @@-(ns net.bowmap.server.protocol.world)+(ns net.bowmap.server.packet.world)  (def world-height-chunk-sections 24) (def world-height (* world-height-chunk-sections 16))

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

@@ -1,4 +1,4 @@-(ns net.bowmap.server.protocol.writers+(ns net.bowmap.server.packet.writers   "Functions for writing values into write buffers.    Functions look like type>, where 'type' is a Minecraft protocol type.    See https://minecraft.wiki/w/Java_Edition_protocol/Packets#Data_types"@@ -6,10 +6,10 @@    [clojure.data.json :as json]    [clojure.set :as set]    [clojure.spec.alpha :as s]-   [net.bowmap.server.protocol.block :as block]-   [net.bowmap.server.protocol.identifier :as identifier]-   [net.bowmap.server.protocol.nbt :as nbt]-   [net.bowmap.server.protocol.schema :as p])+   [net.bowmap.server.packet.block :as block]+   [net.bowmap.server.packet.identifier :as identifier]+   [net.bowmap.server.packet.nbt :as nbt]+   [net.bowmap.server.packet.schema :as p])   (:import    [io.netty.buffer ByteBuf ByteBufOutputStream]    [java.nio.charset StandardCharsets]

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

@@ -5,10 +5,10 @@    [net.bowmap.server.game.server :as state]    [net.bowmap.server.network.connection :as connection]    [net.bowmap.server.network.server :as server]-   [net.bowmap.server.protocol.packet :as packet]-   [net.bowmap.server.protocol.packet-serialization :as serialize]-   [net.bowmap.server.protocol.phase :as phase]-   [net.bowmap.server.protocol.serverbound-packets :as serverbound]))+   [net.bowmap.server.packet.packet :as packet]+   [net.bowmap.server.packet.serialize :as serialize]+   [net.bowmap.server.packet.phase :as phase]+   [net.bowmap.server.packet.serverbound :as serverbound]))  (defn apply-packet   "Returns the value a client should take on when handling 'packet'."