X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fnet%2Fnet.cpp;h=1f4e0a951edd655d08547ad1b4dfad7f696a7503;hb=b4e5dad2ed5c7e77573de413f3bf5be88577856d;hp=9fe282f5138b4c7a115819834c3a2b0a44373c16;hpb=13e676a6e49128ebc6c63b8dd08bef51d360e8e9;p=blank.git

diff --git a/src/net/net.cpp b/src/net/net.cpp
index 9fe282f..1f4e0a9 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -1,17 +1,15 @@
-#include "Client.hpp"
-#include "ClientConnection.hpp"
+#include "CongestionControl.hpp"
 #include "Connection.hpp"
 #include "ConnectionHandler.hpp"
 #include "io.hpp"
 #include "Packet.hpp"
-#include "Server.hpp"
 
 #include "../app/init.hpp"
-#include "../world/World.hpp"
+#include "../model/Model.hpp"
+#include "../world/Entity.hpp"
+#include "../world/EntityState.hpp"
 
 #include <cstring>
-#include <iostream>
-#include <glm/gtx/io.hpp>
 
 using namespace std;
 
@@ -26,305 +24,174 @@ constexpr size_t Packet::PlayerUpdate::MAX_LEN;
 constexpr size_t Packet::SpawnEntity::MAX_LEN;
 constexpr size_t Packet::DespawnEntity::MAX_LEN;
 constexpr size_t Packet::EntityUpdate::MAX_LEN;
-
-namespace {
-
-UDPsocket client_bind(Uint16 port) {
-	UDPsocket sock = SDLNet_UDP_Open(port);
-	if (!sock) {
-		throw NetError("SDLNet_UDP_Open");
-	}
-	return sock;
-}
-
-IPaddress client_resolve(const char *host, Uint16 port) {
-	IPaddress addr;
-	if (SDLNet_ResolveHost(&addr, host, port) != 0) {
-		throw NetError("SDLNet_ResolveHost");
+constexpr size_t Packet::PlayerCorrection::MAX_LEN;
+constexpr size_t Packet::ChunkBegin::MAX_LEN;
+constexpr size_t Packet::ChunkData::MAX_LEN;
+constexpr size_t Packet::BlockUpdate::MAX_LEN;
+constexpr size_t Packet::Message::MAX_LEN;
+constexpr size_t Packet::Message::MAX_MESSAGE_LEN;
+
+
+CongestionControl::CongestionControl()
+// I know, I know, it's an estimate (about 20 for IPv4, 48 for IPv6)
+: packet_overhead(20)
+// only sample every eighth packet for measuring RTT
+, sample_skip(8)
+, packets_lost(0)
+, packets_received(0)
+, packet_loss(0.0f)
+, stamp_cursor(15)
+, stamp_last(0)
+, rtt(64.0f)
+, next_sample(1000)
+, tx_bytes(0)
+, rx_bytes(0)
+, tx_kbps(0.0f)
+, rx_kbps(0.0f)
+, mode(GOOD)
+// rtt > 100ms or packet loss > 5% is BAD
+, bad_rtt(100.0f)
+, bad_loss(0.05f)
+// rtt > 250ms or packet loss > 15% is UGLY
+, ugly_rtt(250.0f)
+, ugly_loss(0.15f)
+, mode_keep_time(1000) {
+	Uint32 now = SDL_GetTicks();
+	for (Uint32 &s : stamps) {
+		s = now;
+	}
+	next_sample += now;
+	mode_entered = now;
+	mode_reset = now;
+	mode_step = now;
+}
+
+void CongestionControl::PacketSent(uint16_t seq) noexcept {
+	if (!SamplePacket(seq)) {
+		return;
 	}
-	return addr;
-}
-
+	stamp_cursor = (stamp_cursor + 1) % 16;
+	stamps[stamp_cursor] = SDL_GetTicks();
+	stamp_last = seq;
 }
 
-Client::Client(const Config &conf)
-: conn(client_resolve(conf.host.c_str(), conf.port))
-, client_sock(client_bind(0))
-, client_pack{ -1, nullptr, 0 } {
-	client_pack.data = new Uint8[sizeof(Packet)];
-	client_pack.maxlen = sizeof(Packet);
-	// establish connection
-	SendPing();
+void CongestionControl::PacketLost(uint16_t seq) noexcept {
+	++packets_lost;
+	UpdatePacketLoss();
+	UpdateRTT(seq);
 }
 
-Client::~Client() {
-	delete[] client_pack.data;
-	SDLNet_UDP_Close(client_sock);
+void CongestionControl::PacketReceived(uint16_t seq) noexcept {
+	++packets_received;
+	UpdatePacketLoss();
+	UpdateRTT(seq);
 }
 
-
-void Client::Handle() {
-	int result = SDLNet_UDP_Recv(client_sock, &client_pack);
-	while (result > 0) {
-		HandlePacket(client_pack);
-		result = SDLNet_UDP_Recv(client_sock, &client_pack);
-	}
-	if (result == -1) {
-		// a boo boo happened
-		throw NetError("SDLNet_UDP_Recv");
+void CongestionControl::UpdatePacketLoss() noexcept {
+	unsigned int packets_total = packets_lost + packets_received;
+	if (packets_total >= 256) {
+		packet_loss = float(packets_lost) / float(packets_total);
+		packets_lost = 0;
+		packets_received = 0;
 	}
 }
 
-void Client::HandlePacket(const UDPpacket &udp_pack) {
-	if (!conn.Matches(udp_pack.address)) {
-		// packet came from somewhere else, drop
+void CongestionControl::UpdateRTT(std::uint16_t seq) noexcept {
+	if (!SamplePacket(seq)) return;
+	int16_t diff = int16_t(seq) - int16_t(stamp_last);
+	diff /= sample_skip;
+	if (diff > 0 || diff < -15) {
+		// packet outside observed time frame
 		return;
 	}
-	const Packet &pack = *reinterpret_cast<const Packet *>(udp_pack.data);
-	if (pack.header.tag != Packet::TAG) {
-		// mistagged packet, drop
-		return;
-	}
-
-	conn.Received(udp_pack);
-}
-
-void Client::Update(int dt) {
-	conn.Update(dt);
-	if (conn.ShouldPing()) {
-		SendPing();
-	}
-}
-
-uint16_t Client::SendPing() {
-	return conn.SendPing(client_pack, client_sock);
+	int cur_rtt = SDL_GetTicks() - stamps[(stamp_cursor + diff + 16) % 16];
+	rtt += (cur_rtt - rtt) * 0.1f;
 }
 
-uint16_t Client::SendLogin(const string &name) {
-	auto pack = Packet::Make<Packet::Login>(client_pack);
-	pack.WritePlayerName(name);
-	return conn.Send(client_pack, client_sock);
+bool CongestionControl::SamplePacket(std::uint16_t seq) const noexcept {
+	return seq % sample_skip == 0;
 }
 
-uint16_t Client::SendPlayerUpdate(const Entity &player) {
-	auto pack = Packet::Make<Packet::PlayerUpdate>(client_pack);
-	pack.WritePlayer(player);
-	return conn.Send(client_pack, client_sock);
+void CongestionControl::PacketIn(const UDPpacket &pack) noexcept {
+	rx_bytes += pack.len + packet_overhead;
+	UpdateStats();
 }
 
-uint16_t Client::SendPart() {
-	Packet::Make<Packet::Part>(client_pack);
-	return conn.Send(client_pack, client_sock);
+void CongestionControl::PacketOut(const UDPpacket &pack) noexcept {
+	tx_bytes += pack.len + packet_overhead;
+	UpdateStats();
 }
 
-
-ClientConnection::ClientConnection(Server &server, const IPaddress &addr)
-: server(server)
-, conn(addr)
-, player(nullptr)
-, spawns()
-, confirm_wait(0) {
-	conn.SetHandler(this);
-}
-
-ClientConnection::~ClientConnection() {
-	DetachPlayer();
-}
-
-void ClientConnection::Update(int dt) {
-	conn.Update(dt);
-	if (Disconnected()) {
+void CongestionControl::UpdateStats() noexcept {
+	Uint32 now = SDL_GetTicks();
+	if (now < next_sample) {
+		// not yet
 		return;
 	}
-	if (HasPlayer()) {
-		// sync entities
-		auto global_iter = server.GetWorld().Entities().begin();
-		auto global_end = server.GetWorld().Entities().end();
-		auto local_iter = spawns.begin();
-		auto local_end = spawns.end();
-
-		while (global_iter != global_end && local_iter != local_end) {
-			if (global_iter->ID() == local_iter->entity->ID()) {
-				// they're the same
-				if (CanDespawn(*global_iter)) {
-					SendDespawn(*local_iter);
-				} else {
-					// update
-					SendUpdate(*local_iter);
-				}
-				++global_iter;
-				++local_iter;
-			} else if (global_iter->ID() < local_iter->entity->ID()) {
-				// global entity was inserted
-				if (CanSpawn(*global_iter)) {
-					auto spawned = spawns.emplace(local_iter, *global_iter);
-					SendSpawn(*spawned);
-				}
-				++global_iter;
-			} else {
-				// global entity was removed
-				SendDespawn(*local_iter);
-				++local_iter;
-			}
-		}
-
-		// leftover spawns
-		while (global_iter != global_end) {
-			if (CanSpawn(*global_iter)) {
-				spawns.emplace_back(*global_iter);
-				SendSpawn(spawns.back());
-			}
-			++global_iter;
-		}
-
-		// leftover despawns
-		while (local_iter != local_end) {
-			SendDespawn(*local_iter);
-			++local_iter;
-		}
-	}
-	if (conn.ShouldPing()) {
-		conn.SendPing(server.GetPacket(), server.GetSocket());
-	}
-}
-
-ClientConnection::SpawnStatus::SpawnStatus(Entity &e)
-: entity(&e)
-, spawn_pack(-1)
-, despawn_pack(-1) {
-	entity->Ref();
-}
-
-ClientConnection::SpawnStatus::~SpawnStatus() {
-	entity->UnRef();
-}
-
-bool ClientConnection::CanSpawn(const Entity &e) const noexcept {
-	return
-		&e != player &&
-		!e.Dead() &&
-		manhattan_radius(e.ChunkCoords() - Player().ChunkCoords()) < 7;
-}
-
-bool ClientConnection::CanDespawn(const Entity &e) const noexcept {
-	return
-		e.Dead() ||
-		manhattan_radius(e.ChunkCoords() - Player().ChunkCoords()) > 7;
-}
-
-void ClientConnection::SendSpawn(SpawnStatus &status) {
-	// don't double spawn
-	if (status.spawn_pack != -1) return;
-
-	auto pack = Packet::Make<Packet::SpawnEntity>(server.GetPacket());
-	pack.WriteEntity(*status.entity);
-	status.spawn_pack = conn.Send(server.GetPacket(), server.GetSocket());
-	++confirm_wait;
-}
-
-void ClientConnection::SendDespawn(SpawnStatus &status) {
-	// don't double despawn
-	if (status.despawn_pack != -1) return;
-
-	auto pack = Packet::Make<Packet::DespawnEntity>(server.GetPacket());
-	pack.WriteEntityID(status.entity->ID());
-	status.despawn_pack = conn.Send(server.GetPacket(), server.GetSocket());
-	++confirm_wait;
+	tx_kbps = float(tx_bytes) * (1.0f / 1024.0f);
+	rx_kbps = float(rx_bytes) * (1.0f / 1024.0f);
+	tx_bytes = 0;
+	rx_bytes = 0;
+	next_sample += 1000;
+	UpdateMode();
 }
 
-void ClientConnection::SendUpdate(SpawnStatus &status) {
-	// don't send updates while spawn not ack'd or despawn sent
-	if (status.spawn_pack != -1 || status.despawn_pack != -1) return;
-
-	// TODO: pack entity updates
-	auto pack = Packet::Make<Packet::EntityUpdate>(server.GetPacket());
-	pack.WriteEntityCount(1);
-	pack.WriteEntity(*status.entity, 0);
-	server.GetPacket().len = Packet::EntityUpdate::GetSize(1);
-	conn.Send(server.GetPacket(), server.GetSocket());
-}
-
-void ClientConnection::AttachPlayer(Entity &new_player) {
-	DetachPlayer();
-	player = &new_player;
-	player->Ref();
-	cout << "player \"" << player->Name() << "\" joined" << endl;
+void CongestionControl::UpdateMode() noexcept {
+	Mode now_mode = Conditions();
+	if (now_mode > mode) {
+		ChangeMode(now_mode);
+	} else if (now_mode < mode) {
+		CheckUpgrade(now_mode);
+	} else {
+		KeepMode();
+	}
 }
 
-void ClientConnection::DetachPlayer() {
-	if (!player) return;
-	player->Kill();
-	player->UnRef();
-	cout << "player \"" << player->Name() << "\" left" << endl;
-	player = nullptr;
+void CongestionControl::CheckUpgrade(Mode m) noexcept {
+	Uint32 now = SDL_GetTicks();
+	Uint32 time_in_mode = now - mode_entered;
+	if (time_in_mode < mode_keep_time) {
+		return;
+	}
+	ChangeMode(m);
 }
 
-void ClientConnection::OnPacketReceived(uint16_t seq) {
-	if (!confirm_wait) return;
-	for (auto iter = spawns.begin(), end = spawns.end(); iter != end; ++iter) {
-		if (seq == iter->spawn_pack) {
-			iter->spawn_pack = -1;
-			--confirm_wait;
-			return;
-		}
-		if (seq == iter->despawn_pack) {
-			spawns.erase(iter);
-			--confirm_wait;
-			return;
+void CongestionControl::ChangeMode(Mode m) noexcept {
+	Uint32 now = SDL_GetTicks();
+	if (m > mode) {
+		// changed to worse mode
+		// if we spent less than 10 seconds in better mode
+		// double keep time till up to 64 seconds
+		if (now - mode_entered < 10000) {
+			if (mode_keep_time < 64000) {
+				mode_keep_time *= 2;
+			}
 		}
 	}
+	mode = m;
+	mode_entered = now;
+	mode_reset = mode_entered;
 }
 
-void ClientConnection::OnPacketLost(uint16_t seq) {
-	if (!confirm_wait) return;
-	for (SpawnStatus &status : spawns) {
-		if (seq == status.spawn_pack) {
-			status.spawn_pack = -1;
-			--confirm_wait;
-			SendSpawn(status);
-			return;
-		}
-		if (seq == status.despawn_pack) {
-			status.despawn_pack = -1;
-			--confirm_wait;
-			SendDespawn(status);
-			return;
-		}
+void CongestionControl::KeepMode() noexcept {
+	mode_reset = SDL_GetTicks();
+	// if in good mode for 10 seconds, halve keep time till down to one second
+	if (mode == GOOD && mode_keep_time > 1000 && mode_step - mode_reset > 10000) {
+		mode_keep_time /= 2;
+		mode_step = mode_reset;
 	}
 }
 
-void ClientConnection::On(const Packet::Login &pack) {
-	string name;
-	pack.ReadPlayerName(name);
-
-	Entity *new_player = server.GetWorld().AddPlayer(name).entity;
-
-	if (new_player) {
-		// success!
-		AttachPlayer(*new_player);
-		cout << "accepted login from player \"" << name << '"' << endl;
-		auto response = Packet::Make<Packet::Join>(server.GetPacket());
-		response.WritePlayer(*new_player);
-		response.WriteWorldName(server.GetWorld().Name());
-		conn.Send(server.GetPacket(), server.GetSocket());
+CongestionControl::Mode CongestionControl::Conditions() const noexcept {
+	if (rtt > ugly_rtt || packet_loss > ugly_loss) {
+		return UGLY;
+	} else if (rtt > bad_rtt || packet_loss > bad_loss) {
+		return BAD;
 	} else {
-		// aw no :(
-		cout << "rejected login from player \"" << name << '"' << endl;
-		Packet::Make<Packet::Part>(server.GetPacket());
-		conn.Send(server.GetPacket(), server.GetSocket());
-		conn.Close();
+		return GOOD;
 	}
 }
 
-void ClientConnection::On(const Packet::Part &) {
-	conn.Close();
-}
-
-void ClientConnection::On(const Packet::PlayerUpdate &pack) {
-	if (!HasPlayer()) return;
-	pack.ReadPlayer(Player());
-}
-
 
 Connection::Connection(const IPaddress &addr)
 : handler(nullptr)
@@ -380,6 +247,11 @@ uint16_t Connection::Send(UDPpacket &udp_pack, UDPsocket sock) {
 		throw NetError("SDLNet_UDP_Send");
 	}
 
+	if (HasHandler()) {
+		Handler().PacketOut(udp_pack);
+		Handler().PacketSent(seq);
+	}
+
 	FlagSend();
 	return seq;
 }
@@ -407,6 +279,7 @@ void Connection::Received(const UDPpacket &udp_pack) {
 	}
 
 	Packet::TControl ctrl_new = pack.header.ctrl;
+	Handler().PacketIn(udp_pack);
 	Handler().Handle(udp_pack);
 
 	if (diff > 0) {
@@ -417,14 +290,14 @@ void Connection::Received(const UDPpacket &udp_pack) {
 		if (diff > 0) {
 			for (int i = 0; i < diff; ++i) {
 				if (i > 32 || (i < 32 && (ctrl_in.hist & (1 << (31 - i))) == 0)) {
-					Handler().OnPacketLost(ctrl_in.ack - 32 + i);
+					Handler().PacketLost(ctrl_in.ack - 32 + i);
 				}
 			}
 		}
 		// check for newly ack'd packets
-		for (uint16_t s = ctrl_new.AckBegin(); s != ctrl_new.AckEnd(); ++s) {
+		for (uint16_t s = ctrl_new.AckBegin(); s != ctrl_new.AckEnd(); --s) {
 			if (ctrl_new.Acks(s) && !ctrl_in.Acks(s)) {
-				Handler().OnPacketReceived(s);
+				Handler().PacketReceived(s);
 			}
 		}
 		ctrl_in = ctrl_new;
@@ -444,6 +317,34 @@ uint16_t Connection::SendPing(UDPpacket &udp_pack, UDPsocket sock) {
 }
 
 
+ConnectionHandler::ConnectionHandler()
+: cc() {
+
+}
+
+void ConnectionHandler::PacketSent(uint16_t seq) noexcept {
+	cc.PacketSent(seq);
+}
+
+void ConnectionHandler::PacketLost(uint16_t seq) {
+	OnPacketLost(seq);
+	cc.PacketLost(seq);
+}
+
+void ConnectionHandler::PacketReceived(uint16_t seq) {
+	OnPacketReceived(seq);
+	cc.PacketReceived(seq);
+}
+
+void ConnectionHandler::PacketIn(const UDPpacket &pack) noexcept {
+	cc.PacketIn(pack);
+}
+
+void ConnectionHandler::PacketOut(const UDPpacket &pack) noexcept {
+	cc.PacketOut(pack);
+}
+
+
 ostream &operator <<(ostream &out, const IPaddress &addr) {
 	const unsigned char *host = reinterpret_cast<const unsigned char *>(&addr.host);
 	out << int(host[0])
@@ -475,6 +376,16 @@ const char *Packet::Type2String(uint8_t t) noexcept {
 			return "DespawnEntity";
 		case EntityUpdate::TYPE:
 			return "EntityUpdate";
+		case PlayerCorrection::TYPE:
+			return "PlayerCorrection";
+		case ChunkBegin::TYPE:
+			return "ChunkBegin";
+		case ChunkData::TYPE:
+			return "ChunkData";
+		case BlockUpdate::TYPE:
+			return "BlockUpdate";
+		case Message::TYPE:
+			return "Message";
 		default:
 			return "Unknown";
 	}
@@ -518,6 +429,126 @@ void Packet::Payload::ReadString(string &dst, size_t off, size_t maxlen) const n
 	}
 }
 
+void Packet::Payload::Write(const glm::quat &val, size_t off) noexcept {
+	WritePackN(val.w, off);
+	WritePackN(val.x, off + 2);
+	WritePackN(val.y, off + 4);
+	WritePackN(val.z, off + 6);
+}
+
+void Packet::Payload::Read(glm::quat &val, size_t off) const noexcept {
+	ReadPackN(val.w, off);
+	ReadPackN(val.x, off + 2);
+	ReadPackN(val.y, off + 4);
+	ReadPackN(val.z, off + 6);
+	val = normalize(val);
+}
+
+void Packet::Payload::Write(const EntityState &state, size_t off) noexcept {
+	Write(state.chunk_pos, off);
+	WritePackU(state.block_pos * (1.0f / 16.0f), off + 12);
+	Write(state.velocity, off + 18);
+	Write(state.orient, off + 30);
+	WritePackN(state.pitch * PI_0p5_inv, off + 38);
+	WritePackN(state.yaw * PI_inv, off + 40);
+}
+
+void Packet::Payload::Read(EntityState &state, size_t off) const noexcept {
+	Read(state.chunk_pos, off);
+	ReadPackU(state.block_pos, off + 12);
+	Read(state.velocity, off + 18);
+	Read(state.orient, off + 30);
+	ReadPackN(state.pitch, off + 38);
+	ReadPackN(state.yaw, off + 40);
+	state.block_pos *= 16.0f;
+	state.pitch *= PI_0p5;
+	state.yaw *= PI;
+}
+
+void Packet::Payload::Write(const EntityState &state, const glm::ivec3 &base, size_t off) noexcept {
+	WritePackB(state.chunk_pos - base, off);
+	WritePackU(state.block_pos * (1.0f / 16.0f), off + 3);
+	Write(state.velocity, off + 9);
+	Write(state.orient, off + 21);
+	WritePackN(state.pitch * PI_0p5_inv, off + 29);
+	WritePackN(state.yaw * PI_inv, off + 31);
+}
+
+void Packet::Payload::Read(EntityState &state, const glm::ivec3 &base, size_t off) const noexcept {
+	ReadPackB(state.chunk_pos, off);
+	ReadPackU(state.block_pos, off + 3);
+	Read(state.velocity, off + 9);
+	Read(state.orient, off + 21);
+	ReadPackN(state.pitch, off + 29);
+	ReadPackN(state.yaw, off + 31);
+	state.chunk_pos += base;
+	state.block_pos *= 16.0f;
+	state.pitch *= PI_0p5;
+	state.yaw *= PI;
+}
+
+void Packet::Payload::WritePackB(const glm::ivec3 &val, size_t off) noexcept {
+	Write(int8_t(val.x), off);
+	Write(int8_t(val.y), off + 1);
+	Write(int8_t(val.z), off + 2);
+}
+
+void Packet::Payload::ReadPackB(glm::ivec3 &val, size_t off) const noexcept {
+	int8_t conv = 0;
+	Read(conv, off);
+	val.x = conv;
+	Read(conv, off + 1);
+	val.y = conv;
+	Read(conv, off + 2);
+	val.z = conv;
+}
+
+void Packet::Payload::WritePackN(float val, size_t off) noexcept {
+	int16_t raw = glm::clamp(glm::round(val * 32767.0f), -32767.0f, 32767.0f);
+	Write(raw, off);
+}
+
+void Packet::Payload::ReadPackN(float &val, size_t off) const noexcept {
+	int16_t raw = 0;
+	Read(raw, off);
+	val = raw * (1.0f/32767.0f);
+}
+
+void Packet::Payload::WritePackN(const glm::vec3 &val, size_t off) noexcept {
+	WritePackN(val.x, off);
+	WritePackN(val.y, off + 2);
+	WritePackN(val.z, off + 4);
+}
+
+void Packet::Payload::ReadPackN(glm::vec3 &val, size_t off) const noexcept {
+	ReadPackN(val.x, off);
+	ReadPackN(val.y, off + 2);
+	ReadPackN(val.z, off + 4);
+}
+
+void Packet::Payload::WritePackU(float val, size_t off) noexcept {
+	uint16_t raw = glm::clamp(glm::round(val * 65535.0f), 0.0f, 65535.0f);
+	Write(raw, off);
+}
+
+void Packet::Payload::ReadPackU(float &val, size_t off) const noexcept {
+	uint16_t raw = 0;
+	Read(raw, off);
+	val = raw * (1.0f/65535.0f);
+}
+
+void Packet::Payload::WritePackU(const glm::vec3 &val, size_t off) noexcept {
+	WritePackU(val.x, off);
+	WritePackU(val.y, off + 2);
+	WritePackU(val.z, off + 4);
+}
+
+void Packet::Payload::ReadPackU(glm::vec3 &val, size_t off) const noexcept {
+	ReadPackU(val.x, off);
+	ReadPackU(val.y, off + 2);
+	ReadPackU(val.z, off + 4);
+}
+
 
 void Packet::Login::WritePlayerName(const string &name) noexcept {
 	WriteString(name, 0, 32);
@@ -529,114 +560,94 @@ void Packet::Login::ReadPlayerName(string &name) const noexcept {
 
 void Packet::Join::WritePlayer(const Entity &player) noexcept {
 	Write(player.ID(), 0);
-	Write(player.ChunkCoords(), 4);
-	Write(player.Position(), 16);
-	Write(player.Velocity(), 28);
-	Write(player.Orientation(), 40);
-	Write(player.AngularVelocity(), 56);
+	Write(player.GetState(), 4);
 }
 
 void Packet::Join::ReadPlayerID(uint32_t &id) const noexcept {
 	Read(id, 0);
 }
 
-void Packet::Join::ReadPlayer(Entity &player) const noexcept {
-	glm::ivec3 chunk_coords(0);
-	glm::vec3 pos;
-	glm::vec3 vel;
-	glm::quat rot;
-	glm::vec3 ang;
-
-	Read(chunk_coords, 4);
-	Read(pos, 16);
-	Read(vel, 28);
-	Read(rot, 40);
-	Read(ang, 56);
-
-	player.Position(chunk_coords, pos);
-	player.Velocity(vel);
-	player.Orientation(rot);
-	player.AngularVelocity(ang);
+void Packet::Join::ReadPlayerState(EntityState &state) const noexcept {
+	Read(state, 4);
 }
 
 void Packet::Join::WriteWorldName(const string &name) noexcept {
-	WriteString(name, 68, 32);
+	WriteString(name, 46, 32);
 }
 
 void Packet::Join::ReadWorldName(string &name) const noexcept {
-	ReadString(name, 68, 32);
+	ReadString(name, 46, 32);
 }
 
-void Packet::PlayerUpdate::WritePlayer(const Entity &player) noexcept {
-	Write(player.ChunkCoords(), 0);
-	Write(player.Position(), 12);
-	Write(player.Velocity(), 24);
-	Write(player.Orientation(), 36);
-	Write(player.AngularVelocity(), 52);
+void Packet::PlayerUpdate::WritePredictedState(const EntityState &state) noexcept {
+	Write(state, 0);
 }
 
-void Packet::PlayerUpdate::ReadPlayer(Entity &player) const noexcept {
-	glm::ivec3 chunk_coords(0);
-	glm::vec3 pos;
-	glm::vec3 vel;
-	glm::quat rot;
-	glm::vec3 ang;
+void Packet::PlayerUpdate::ReadPredictedState(EntityState &state) const noexcept {
+	Read(state, 0);
+}
 
-	Read(chunk_coords, 0);
-	Read(pos, 12);
-	Read(vel, 24);
-	Read(rot, 36);
-	Read(ang, 52);
+void Packet::PlayerUpdate::WriteMovement(const glm::vec3 &mov) noexcept {
+	WritePackN(mov, 42);
+}
+
+void Packet::PlayerUpdate::ReadMovement(glm::vec3 &mov) const noexcept {
+	ReadPackN(mov, 42);
+}
 
-	player.Position(chunk_coords, pos);
-	player.Velocity(vel);
-	player.Orientation(rot);
-	player.AngularVelocity(ang);
+void Packet::PlayerUpdate::WriteActions(uint8_t actions) noexcept {
+	Write(actions, 48);
+}
+
+void Packet::PlayerUpdate::ReadActions(uint8_t &actions) const noexcept {
+	Read(actions, 48);
+}
+
+void Packet::PlayerUpdate::WriteSlot(uint8_t slot) noexcept {
+	Write(slot, 49);
+}
+
+void Packet::PlayerUpdate::ReadSlot(uint8_t &slot) const noexcept {
+	Read(slot, 49);
 }
 
 void Packet::SpawnEntity::WriteEntity(const Entity &e) noexcept {
 	Write(e.ID(), 0);
-	Write(e.ChunkCoords(), 4);
-	Write(e.Position(), 16);
-	Write(e.Velocity(), 28);
-	Write(e.Orientation(), 40);
-	Write(e.AngularVelocity(), 56);
-	Write(e.Bounds(), 68);
+	if (e.GetModel()) {
+		Write(e.GetModel().GetModel().ID(), 4);
+	} else {
+		Write(uint32_t(0), 4);
+	}
+	Write(e.GetState(), 8);
+	Write(e.Bounds(), 50);
 	uint32_t flags = 0;
 	if (e.WorldCollidable()) {
 		flags |= 1;
 	}
-	Write(flags, 92);
-	WriteString(e.Name(), 96, 32);
+	Write(flags, 74);
+	WriteString(e.Name(), 78, 32);
 }
 
 void Packet::SpawnEntity::ReadEntityID(uint32_t &id) const noexcept {
 	Read(id, 0);
 }
 
+void Packet::SpawnEntity::ReadModelID(uint32_t &id) const noexcept {
+	Read(id, 4);
+}
+
 void Packet::SpawnEntity::ReadEntity(Entity &e) const noexcept {
-	glm::ivec3 chunk_coords(0);
-	glm::vec3 pos;
-	glm::vec3 vel;
-	glm::quat rot;
-	glm::vec3 ang;
+	EntityState state;
 	AABB bounds;
 	uint32_t flags = 0;
 	string name;
 
-	Read(chunk_coords, 4);
-	Read(pos, 16);
-	Read(vel, 28);
-	Read(rot, 40);
-	Read(ang, 56);
-	Read(bounds, 68);
-	Read(flags, 92);
-	ReadString(name, 96, 32);
-
-	e.Position(chunk_coords, pos);
-	e.Velocity(vel);
-	e.Orientation(rot);
-	e.AngularVelocity(ang);
+	Read(state, 8);
+	Read(bounds, 50);
+	Read(flags, 74);
+	ReadString(name, 78, 32);
+
+	e.SetState(state);
 	e.Bounds(bounds);
 	e.WorldCollidable(flags & 1);
 	e.Name(name);
@@ -658,40 +669,171 @@ void Packet::EntityUpdate::ReadEntityCount(uint32_t &count) const noexcept {
 	Read(count, 0);
 }
 
-void Packet::EntityUpdate::WriteEntity(const Entity &entity, uint32_t num) noexcept {
-	uint32_t off = 4 + (num * 64);
+void Packet::EntityUpdate::WriteChunkBase(const glm::ivec3 &base) noexcept {
+	Write(base, 4);
+}
+
+void Packet::EntityUpdate::ReadChunkBase(glm::ivec3 &base) const noexcept {
+	Read(base, 4);
+}
+
+void Packet::EntityUpdate::WriteEntity(const Entity &entity, const glm::ivec3 &base, uint32_t num) noexcept {
+	uint32_t off = GetSize(num);
 
 	Write(entity.ID(), off);
-	Write(entity.ChunkCoords(), off + 4);
-	Write(entity.Position(), off + 16);
-	Write(entity.Velocity(), off + 28);
-	Write(entity.Orientation(), off + 40);
-	Write(entity.AngularVelocity(), off + 56);
+	Write(entity.GetState(), base, off + 4);
 }
 
 void Packet::EntityUpdate::ReadEntityID(uint32_t &id, uint32_t num) const noexcept {
-	Read(id, 4 + (num * 64));
+	uint32_t off = GetSize(num);
+	Read(id, off);
+}
+
+void Packet::EntityUpdate::ReadEntityState(EntityState &state, const glm::ivec3 &base, uint32_t num) const noexcept {
+	uint32_t off = GetSize(num);
+	Read(state, base, off + 4);
+}
+
+void Packet::PlayerCorrection::WritePacketSeq(std::uint16_t s) noexcept {
+	Write(s, 0);
+}
+
+void Packet::PlayerCorrection::ReadPacketSeq(std::uint16_t &s) const noexcept {
+	Read(s, 0);
+}
+
+void Packet::PlayerCorrection::WritePlayer(const Entity &player) noexcept {
+	Write(player.GetState(), 2);
+}
+
+void Packet::PlayerCorrection::ReadPlayerState(EntityState &state) const noexcept {
+	Read(state, 2);
+}
+
+void Packet::ChunkBegin::WriteTransmissionId(uint32_t id) noexcept {
+	Write(id, 0);
+}
+
+void Packet::ChunkBegin::ReadTransmissionId(uint32_t &id) const noexcept {
+	Read(id, 0);
+}
+
+void Packet::ChunkBegin::WriteFlags(uint32_t f) noexcept {
+	Write(f, 4);
+}
+
+void Packet::ChunkBegin::ReadFlags(uint32_t &f) const noexcept {
+	Read(f, 4);
+}
+
+void Packet::ChunkBegin::WriteChunkCoords(const glm::ivec3 &pos) noexcept {
+	Write(pos, 8);
+}
+
+void Packet::ChunkBegin::ReadChunkCoords(glm::ivec3 &pos) const noexcept {
+	Read(pos, 8);
+}
+
+void Packet::ChunkBegin::WriteDataSize(uint32_t s) noexcept {
+	Write(s, 20);
+}
+
+void Packet::ChunkBegin::ReadDataSize(uint32_t &s) const noexcept {
+	Read(s, 20);
+}
+
+void Packet::ChunkData::WriteTransmissionId(uint32_t id) noexcept {
+	Write(id, 0);
+}
+
+void Packet::ChunkData::ReadTransmissionId(uint32_t &id) const noexcept {
+	Read(id, 0);
+}
+
+void Packet::ChunkData::WriteDataOffset(uint32_t o) noexcept {
+	Write(o, 4);
+}
+
+void Packet::ChunkData::ReadDataOffset(uint32_t &o) const noexcept {
+	Read(o, 4);
+}
+
+void Packet::ChunkData::WriteDataSize(uint32_t s) noexcept {
+	Write(s, 8);
+}
+
+void Packet::ChunkData::ReadDataSize(uint32_t &s) const noexcept {
+	Read(s, 8);
+}
+
+void Packet::ChunkData::WriteData(const uint8_t *d, size_t l) noexcept {
+	size_t len = min(length - 12, l);
+	memcpy(&data[12], d, len);
 }
 
-void Packet::EntityUpdate::ReadEntity(Entity &entity, uint32_t num) const noexcept {
-	uint32_t off = 4 + (num * 64);
+void Packet::ChunkData::ReadData(uint8_t *d, size_t l) const noexcept {
+	size_t len = min(length - 12, l);
+	memcpy(d, &data[12], len);
+}
+
+void Packet::BlockUpdate::WriteChunkCoords(const glm::ivec3 &coords) noexcept {
+	Write(coords, 0);
+}
+
+void Packet::BlockUpdate::ReadChunkCoords(glm::ivec3 &coords) const noexcept {
+	Read(coords, 0);
+}
+
+void Packet::BlockUpdate::WriteBlockCount(uint32_t count) noexcept {
+	Write(count, 12);
+}
+
+void Packet::BlockUpdate::ReadBlockCount(uint32_t &count) const noexcept {
+	Read(count, 12);
+}
+
+void Packet::BlockUpdate::WriteIndex(uint16_t index, uint32_t num) noexcept {
+	uint32_t off = GetSize(num);
+	Write(index, off);
+}
+
+void Packet::BlockUpdate::ReadIndex(uint16_t &index, uint32_t num) const noexcept {
+	uint32_t off = GetSize(num);
+	Read(index, off);
+}
+
+void Packet::BlockUpdate::WriteBlock(const Block &block, uint32_t num) noexcept {
+	uint32_t off = GetSize(num) + 2;
+	Write(block, off);
+}
 
-	glm::ivec3 chunk_coords(0);
-	glm::vec3 pos;
-	glm::vec3 vel;
-	glm::quat rot;
-	glm::vec3 ang;
+void Packet::BlockUpdate::ReadBlock(Block &block, uint32_t num) const noexcept {
+	uint32_t off = GetSize(num) + 2;
+	Read(block, off);
+}
+
+void Packet::Message::WriteType(uint8_t type) noexcept {
+	Write(type, 0);
+}
+
+void Packet::Message::ReadType(uint8_t &type) const noexcept {
+	Read(type, 0);
+}
 
-	Read(chunk_coords, off + 4);
-	Read(pos, off + 16);
-	Read(vel, off + 28);
-	Read(rot, off + 40);
-	Read(ang, off + 56);
+void Packet::Message::WriteReferral(uint32_t ref) noexcept {
+	Write(ref, 1);
+}
 
-	entity.Position(chunk_coords, pos);
-	entity.Velocity(vel);
-	entity.Orientation(rot);
-	entity.AngularVelocity(ang);
+void Packet::Message::ReadReferral(uint32_t &ref) const noexcept {
+	Read(ref, 1);
+}
+
+void Packet::Message::WriteMessage(const string &msg) noexcept {
+	WriteString(msg, 5, MAX_MESSAGE_LEN);
+}
+
+void Packet::Message::ReadMessage(string &msg) const noexcept {
+	ReadString(msg, 5, MAX_MESSAGE_LEN);
 }
 
 
@@ -722,79 +864,25 @@ void ConnectionHandler::Handle(const UDPpacket &udp_pack) {
 		case Packet::EntityUpdate::TYPE:
 			On(Packet::As<Packet::EntityUpdate>(udp_pack));
 			break;
+		case Packet::PlayerCorrection::TYPE:
+			On(Packet::As<Packet::PlayerCorrection>(udp_pack));
+			break;
+		case Packet::ChunkBegin::TYPE:
+			On(Packet::As<Packet::ChunkBegin>(udp_pack));
+			break;
+		case Packet::ChunkData::TYPE:
+			On(Packet::As<Packet::ChunkData>(udp_pack));
+			break;
+		case Packet::BlockUpdate::TYPE:
+			On(Packet::As<Packet::BlockUpdate>(udp_pack));
+			break;
+		case Packet::Message::TYPE:
+			On(Packet::As<Packet::Message>(udp_pack));
+			break;
 		default:
 			// drop unknown or unhandled packets
 			break;
 	}
 }
 
-
-Server::Server(const Config &conf, World &world)
-: serv_sock(nullptr)
-, serv_pack{ -1, nullptr, 0 }
-, clients()
-, world(world) {
-	serv_sock = SDLNet_UDP_Open(conf.port);
-	if (!serv_sock) {
-		throw NetError("SDLNet_UDP_Open");
-	}
-
-	serv_pack.data = new Uint8[sizeof(Packet)];
-	serv_pack.maxlen = sizeof(Packet);
-}
-
-Server::~Server() {
-	delete[] serv_pack.data;
-	SDLNet_UDP_Close(serv_sock);
-}
-
-
-void Server::Handle() {
-	int result = SDLNet_UDP_Recv(serv_sock, &serv_pack);
-	while (result > 0) {
-		HandlePacket(serv_pack);
-		result = SDLNet_UDP_Recv(serv_sock, &serv_pack);
-	}
-	if (result == -1) {
-		// a boo boo happened
-		throw NetError("SDLNet_UDP_Recv");
-	}
-}
-
-void Server::HandlePacket(const UDPpacket &udp_pack) {
-	if (udp_pack.len < int(sizeof(Packet::Header))) {
-		// packet too small, drop
-		return;
-	}
-	const Packet &pack = *reinterpret_cast<const Packet *>(udp_pack.data);
-	if (pack.header.tag != Packet::TAG) {
-		// mistagged packet, drop
-		return;
-	}
-
-	ClientConnection &client = GetClient(udp_pack.address);
-	client.GetConnection().Received(udp_pack);
-}
-
-ClientConnection &Server::GetClient(const IPaddress &addr) {
-	for (ClientConnection &client : clients) {
-		if (client.Matches(addr)) {
-			return client;
-		}
-	}
-	clients.emplace_back(*this, addr);
-	return clients.back();
-}
-
-void Server::Update(int dt) {
-	for (list<ClientConnection>::iterator client(clients.begin()), end(clients.end()); client != end;) {
-		client->Update(dt);
-		if (client->Disconnected()) {
-			client = clients.erase(client);
-		} else {
-			++client;
-		}
-	}
-}
-
 }