mirrors/stevenarella
mirrors
/
stevenarella
mirror of https://github.com/iceiix/stevenarella.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Clean up

This commit is contained in:
Thinkofdeath 2016-03-16 18:01:33 +00:00
parent 479ba4f03e
commit f1b940fdd1
7 changed files with 119 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
src/esc.rs
View File

@ -1,121 +0,0 @@
use std::any::*;
use std::collections::HashMap;
use std::collections::hash_state::HashState;
use std::hash::Hasher;
use std::ptr;
use std::mem;
fn main() {
let mut c = Container::new();
{
c.put("Hello world");
println!("{}", c.get::<&str>());
}
{
c.put(55);
println!("{}", c.get::<i32>());
}
println!("{}", c.get::<&str>());
println!("{}", c.get::<i32>());
{
*c.get_mut::<i32>() = 82;
}
println!("{}", c.get::<&str>());
println!("{}", c.get::<i32>());
}
struct TypeIdState;
impl HashState for TypeIdState {
type Hasher = TypeIdHasher;
fn hasher(&self) -> TypeIdHasher {
TypeIdHasher { value: 0 }
}
}
struct TypeIdHasher {
value: u64,
}
impl Hasher for TypeIdHasher {
fn finish(&self) -> u64 {
self.value
}
fn write(&mut self, bytes: &[u8]) {
unsafe {
ptr::copy_nonoverlapping(&mut self.value, mem::transmute(&bytes[0]), 1)
}
}
}
pub struct Container {
elems: HashMap<TypeId, Box<Any>, TypeIdState>,
}
impl Container {
pub fn new() -> Container {
Container {
elems: HashMap::with_hash_state(TypeIdState),
}
}
pub fn put<T: Sized + Any>(&mut self, data: T) {
self.elems.insert(
TypeId::of::<T>(),
Box::new(data)
);
}
pub fn get<T: Sized + Any>(&self) -> &T {
self.elems.get(&TypeId::of::<T>()).unwrap().downcast_ref::<T>().unwrap()
}
pub fn get_mut<T: Sized + Any>(&mut self) -> & mut T {
self.elems.get_mut(&TypeId::of::<T>()).unwrap().downcast_mut::<T>().unwrap()
}
}
#[cfg(test)]
mod tests {
use super::*;
use test::Bencher;
use test;
#[bench]
fn bench_put(b: &mut Bencher) {
let mut c = Container::new();
b.iter(|| c.put("Hello world"));
}
#[bench]
fn bench_get(b: &mut Bencher) {
let mut c = Container::new();
c.put("Hello world");
c.put(55);
b.iter(|| c.get::<&str>());
}
#[bench]
fn bench_get_int(b: &mut Bencher) {
let mut c = Container::new();
c.put("Hello world");
c.put(55);
b.iter(|| c.get::<i32>());
}
#[bench]
fn bench_get_mut(b: &mut Bencher) {
let mut c = Container::new();
c.put("Hello world");
c.put(55);
b.iter(|| *c.get_mut::<i32>());
}
#[bench]
fn bench_alloc(b: &mut Bencher) {
b.iter(|| test::black_box(Container::new()));
}
}

1
src/item.rs
View File

@ -15,7 +15,6 @@
use nbt;
use protocol::Serializable;
use std::io;
use std::io::{Read, Write};
use byteorder::{BigEndian, WriteBytesExt, ReadBytesExt};
#[derive(Debug)]

5
src/main.rs
View File

@ -12,11 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#![feature(test)]
#![feature(hashmap_hasher)]
extern crate test;
mod esc;
pub mod protocol;
pub mod format;
pub mod nbt;

4
src/protocol/mod.rs
View File

@ -40,7 +40,7 @@ macro_rules! state_packets {
($($state:ident $stateName:ident {
$($dir:ident $dirName:ident {
$(
$name:ident => $id:expr {
$name:ident => id($id:expr) {
$($field:ident: $field_type:ty = $(when ($cond:expr))*, )+
})*
})+
@ -79,7 +79,7 @@ macro_rules! state_packets {
impl PacketType for $name {
fn packet_id(&self) -> i32{ $id }
fn packet_id(&self) -> i32 { $id }
fn write(self, buf: &mut io::Write) -> Result<(), io::Error> {
$(

226
src/protocol/packet.rs
View File

@ -32,7 +32,7 @@ state_packets!(
// than the hostname due to the protocol not providing
// any system for custom information to be transfered
// by the client to the server until after login.
Handshake => 0x00 {
Handshake => id(0x00) {
// The protocol version of the connecting client
protocol_version: VarInt =,
// The hostname the client connected to
@ -50,22 +50,22 @@ state_packets!(
serverbound Serverbound {
// TabComplete is sent by the client when the client presses tab in
// the chat box.
TabComplete => 0x00 {
TabComplete => id(0x00) {
text: String =,
has_target: bool =,
target: Option<types::Position> = when(|p: &TabComplete| p.has_target == true),
}
// ChatMessage is sent by the client when it sends a chat message or
// executes a command (prefixed by '/').
ChatMessage => 0x01 {
ChatMessage => id(0x01) {
message: String =,
}
// ClientStatus is sent to update the client's status
ClientStatus => 0x02 {
ClientStatus => id(0x02) {
action_id: VarInt =,
}
// ClientSettings is sent by the client to update its current settings.
ClientSettings => 0x03 {
ClientSettings => id(0x03) {
locale: String =,
view_distance: u8 =,
chat_mode: u8 =,
@ -74,18 +74,18 @@ state_packets!(
main_hand: VarInt =,
}
// ConfirmTransactionServerbound is a reply to ConfirmTransaction.
ConfirmTransactionServerbound => 0x04 {
ConfirmTransactionServerbound => id(0x04) {
id: u8 =,
action_number: i16 =,
accepted: bool =,
}
// EnchantItem is sent when the client enchants an item.
EnchantItem => 0x05 {
EnchantItem => id(0x05) {
id: u8 =,
enchantment: u8 =,
}
// ClickWindow is sent when the client clicks in a window.
ClickWindow => 0x06 {
ClickWindow => id(0x06) {
id: u8 =,
slot: i16 =,
button: u8 =,
@ -94,19 +94,19 @@ state_packets!(
clicked_item: Option<item::Stack> =,
}
// CloseWindow is sent when the client closes a window.
CloseWindow => 0x07 {
CloseWindow => id(0x07) {
id: u8 =,
}
// PluginMessageServerbound is used for custom messages between the client
// and server. This is mainly for plugins/mods but vanilla has a few channels
// registered too.
PluginMessageServerbound => 0x08 {
PluginMessageServerbound => id(0x08) {
channel: String =,
data: Vec<u8> =,
}
// UseEntity is sent when the user interacts (right clicks) or attacks
// (left clicks) an entity.
UseEntity => 0x09 {
UseEntity => id(0x09) {
target_id: VarInt =,
ty: VarInt =,
target_x: f32 = when(|p: &UseEntity| p.ty.0 == 2),
@ -117,11 +117,11 @@ state_packets!(
// KeepAliveServerbound is sent by a client as a response to a
// KeepAliveClientbound. If the client doesn't reply the server
// may disconnect the client.
KeepAliveServerbound => 0x0A {
KeepAliveServerbound => id(0x0A) {
id: VarInt =,
}
// PlayerPosition is used to update the player's position.
PlayerPosition => 0x0B {
PlayerPosition => id(0x0B) {
x: f64 =,
y: f64 =,
z: f64 =,
@ -129,7 +129,7 @@ state_packets!(
}
// PlayerPositionLook is a combination of PlayerPosition and
// PlayerLook.
PlayerPositionLook => 0x0C {
PlayerPositionLook => id(0x0C) {
x: f64 =,
y: f64 =,
z: f64 =,
@ -138,61 +138,61 @@ state_packets!(
on_ground: bool =,
}
// PlayerLook is used to update the player's rotation.
PlayerLook => 0x0D {
PlayerLook => id(0x0D) {
yaw: f32 =,
pitch: f32 =,
on_ground: bool =,
}
// Player is used to update whether the player is on the ground or not.
Player => 0x0E {
Player => id(0x0E) {
on_ground: bool =,
}
// ClientAbilities is used to modify the players current abilities.
// Currently flying is the only one
ClientAbilities => 0x0F {
ClientAbilities => id(0x0F) {
flags: u8 =,
flying_speed: f32 =,
walking_speed: f32 =,
}
// PlayerDigging is sent when the client starts/stops digging a block.
// It also can be sent for droppping items and eating/shooting.
PlayerDigging => 0x10 {
PlayerDigging => id(0x10) {
status: u8 =,
location: types::Position =,
face: u8 =,
}
// PlayerAction is sent when a player preforms various actions.
PlayerAction => 0x11 {
PlayerAction => id(0x11) {
entity_id: VarInt =,
action_id: VarInt =,
jump_boost: VarInt =,
}
// SteerVehicle is sent by the client when steers or preforms an action
// on a vehicle.
SteerVehicle => 0x12 {
SteerVehicle => id(0x12) {
sideways: f32 =,
forward: f32 =,
flags: u8 =,
}
// ResourcePackStatus informs the server of the client's current progress
// in activating the requested resource pack
ResourcePackStatus => 0x13 {
ResourcePackStatus => id(0x13) {
hash: String =,
result: VarInt =,
}
// HeldItemChange is sent when the player changes the currently active
// hotbar slot.
HeldItemChange => 0x14 {
HeldItemChange => id(0x14) {
slot: i16 =,
}
// CreativeInventoryAction is sent when the client clicks in the creative
// inventory. This is used to spawn items in creative.
CreativeInventoryAction => 0x15 {
CreativeInventoryAction => id(0x15) {
slot: i16 =,
clicked_item: Option<item::Stack> =,
}
// SetSign sets the text on a sign after placing it.
SetSign => 0x16 {
SetSign => id(0x16) {
location: types::Position =,
line1: String =,
line2: String =,
@ -201,15 +201,15 @@ state_packets!(
}
// ArmSwing is sent by the client when the player left clicks (to swing their
// arm).
ArmSwing => 0x17 {
ArmSwing => id(0x17) {
hand: VarInt =,
}
// SpectateTeleport is sent by clients in spectator mode to teleport to a player.
SpectateTeleport => 0x18 {
SpectateTeleport => id(0x18) {
target: UUID =,
}
// PlayerBlockPlacement is sent when the client tries to place a block.
PlayerBlockPlacement => 0x19 {
PlayerBlockPlacement => id(0x19) {
location: types::Position =,
face: VarInt =,
hand: VarInt =,
@ -218,14 +218,14 @@ state_packets!(
cursor_z: u8 =,
}
// UseItem is sent when the client tries to use an item.
UseItem => 0x1A {
UseItem => id(0x1A) {
hand: VarInt =,
}
}
clientbound Clientbound {
// SpawnObject is used to spawn an object or vehicle into the world when it
// is in range of the client.
SpawnObject => 0x00 {
SpawnObject => id(0x00) {
entity_id: VarInt =,
uuid: UUID =,
ty: u8 =,
@ -242,7 +242,7 @@ state_packets!(
// SpawnExperienceOrb spawns a single experience orb into the world when
// it is in range of the client. The count controls the amount of experience
// gained when collected.
SpawnExperienceOrb => 0x01 {
SpawnExperienceOrb => id(0x01) {
entity_id: VarInt =,
x: i32 =,
y: i32 =,
@ -251,7 +251,7 @@ state_packets!(
}
// SpawnGlobalEntity spawns an entity which is visible from anywhere in the
// world. Currently only used for lightning.
SpawnGlobalEntity => 0x02 {
SpawnGlobalEntity => id(0x02) {
entity_id: VarInt =,
ty: u8 =,
x: i32 =,
@ -260,7 +260,7 @@ state_packets!(
}
// SpawnMob is used to spawn a living entity into the world when it is in
// range of the client.
SpawnMob => 0x03 {
SpawnMob => id(0x03) {
entity_id: VarInt =,
uuid: UUID =,
ty: u8 =,
@ -277,7 +277,7 @@ state_packets!(
}
// SpawnPainting spawns a painting into the world when it is in range of
// the client. The title effects the size and the texture of the painting.
SpawnPainting => 0x04 {
SpawnPainting => id(0x04) {
entity_id: VarInt =,
title: String =,
location: types::Position =,
@ -286,7 +286,7 @@ state_packets!(
// SpawnPlayer is used to spawn a player when they are in range of the client.
// This packet alone isn't enough to display the player as the skin and username
// information is in the player information packet.
SpawnPlayer => 0x05 {
SpawnPlayer => id(0x05) {
entity_id: VarInt =,
uuid: UUID =,
x: i32 =,
@ -297,44 +297,44 @@ state_packets!(
metadata: types::Metadata =,
}
// Animation is sent by the server to play an animation on a specific entity.
Animation => 0x06 {
Animation => id(0x06) {
entity_id: VarInt =,
animation_id: u8 =,
}
// Statistics is used to update the statistics screen for the client.
Statistics => 0x07 {
Statistics => id(0x07) {
statistices: LenPrefixed<VarInt, packet::Statistic> =,
}
// BlockBreakAnimation is used to create and update the block breaking
// animation played when a player starts digging a block.
BlockBreakAnimation => 0x08 {
BlockBreakAnimation => id(0x08) {
entity_id: VarInt =,
location: types::Position =,
stage: i8 =,
}
// UpdateBlockEntity updates the nbt tag of a block entity in the
// world.
UpdateBlockEntity => 0x09 {
UpdateBlockEntity => id(0x09) {
location: types::Position =,
action: u8 =,
nbt: Option<nbt::NamedTag> =,
}
// BlockAction triggers different actions depending on the target block.
BlockAction => 0x0A {
BlockAction => id(0x0A) {
location: types::Position =,
byte1: u8 =,
byte2: u8 =,
block_type: VarInt =,
}
// BlockChange is used to update a single block on the client.
BlockChange => 0x0B {
BlockChange => id(0x0B) {
location: types::Position =,
block_id: VarInt =,
}
// BossBar displays and/or changes a boss bar that is displayed on the
// top of the client's screen. This is normally used for bosses such as
// the ender dragon or the wither.
BossBar => 0x0C {
BossBar => id(0x0C) {
uuid: UUID =,
action: VarInt =,
title: format::Component = when(|p: &BossBar| p.action.0 == 0 || p.action.0 == 3),
@ -345,45 +345,45 @@ state_packets!(
}
// ServerDifficulty changes the displayed difficulty in the client's menu
// as well as some ui changes for hardcore.
ServerDifficulty => 0x0D {
ServerDifficulty => id(0x0D) {
difficulty: u8 =,
}
// TabCompleteReply is sent as a reply to a tab completion request.
// The matches should be possible completions for the command/chat the
// player sent.
TabCompleteReply => 0x0E {
TabCompleteReply => id(0x0E) {
matches: LenPrefixed<VarInt, String> =,
}
// ServerMessage is a message sent by the server. It could be from a player
// or just a system message. The Type field controls the location the
// message is displayed at and when the message is displayed.
ServerMessage => 0x0F {
ServerMessage => id(0x0F) {
message: format::Component =,
// 0 - Chat message, 1 - System message, 2 - Action bar message
position: u8 =,
}
// MultiBlockChange is used to update a batch of blocks in a single packet.
MultiBlockChange => 0x10 {
MultiBlockChange => id(0x10) {
chunk_x: i32 =,
chunk_y: i32 =,
records: LenPrefixed<VarInt, packet::BlockChangeRecord> =,
}
// ConfirmTransaction notifies the client whether a transaction was successful
// or failed (e.g. due to lag).
ConfirmTransaction => 0x11 {
ConfirmTransaction => id(0x11) {
id: u8 =,
action_number: i16 =,
accepted: bool =,
}
// WindowClose forces the client to close the window with the given id,
// e.g. a chest getting destroyed.
WindowClose => 0x12 {
WindowClose => id(0x12) {
id: u8 =,
}
// WindowOpen tells the client to open the inventory window of the given
// type. The ID is used to reference the instance of the window in
// other packets.
WindowOpen => 0x13 {
WindowOpen => id(0x13) {
id: u8 =,
ty: String =,
title: format::Component =,
@ -391,48 +391,48 @@ state_packets!(
entity_id: i32 = when(|p: &WindowOpen| p.ty == "EntityHorse"),
}
// WindowItems sets every item in a window.
WindowItems => 0x14 {
WindowItems => id(0x14) {
id: u8 =,
items: LenPrefixed<i16, Option<item::Stack>> =,
}
// WindowProperty changes the value of a property of a window. Properties
// vary depending on the window type.
WindowProperty => 0x15 {
WindowProperty => id(0x15) {
id: u8 =,
property: i16 =,
value: i16 =,
}
// WindowSetSlot changes an itemstack in one of the slots in a window.
WindowSetSlot => 0x16 {
WindowSetSlot => id(0x16) {
id: u8 =,
property: i16 =,
item: Option<item::Stack> =,
}
// SetCooldown disables a set item (by id) for the set number of ticks
SetCooldown => 0x17 {
SetCooldown => id(0x17) {
item_id: VarInt =,
ticks: VarInt =,
}
// PluginMessageClientbound is used for custom messages between the client
// and server. This is mainly for plugins/mods but vanilla has a few channels
// registered too.
PluginMessageClientbound => 0x18 {
PluginMessageClientbound => id(0x18) {
channel: String =,
data: Vec<u8> =,
}
// Disconnect causes the client to disconnect displaying the passed reason.
Disconnect => 0x19 {
Disconnect => id(0x19) {
reason: format::Component =,
}
// EntityAction causes an entity to preform an action based on the passed
// id.
EntityAction => 0x1A {
EntityAction => id(0x1A) {
entity_id: i32 =,
action_id: u8 =,
}
// Explosion is sent when an explosion is triggered (tnt, creeper etc).
// This plays the effect and removes the effected blocks.
Explosion => 0x1B {
Explosion => id(0x1B) {
x: f32 =,
y: f32 =,
z: f32 =,
@ -444,17 +444,17 @@ state_packets!(
}
// ChunkUnload tells the client to unload the chunk at the specified
// position.
ChunkUnload => 0x1C {
ChunkUnload => id(0x1C) {
x: i32 =,
z: i32 =,
}
// SetCompression updates the compression threshold.
SetCompression => 0x1D {
SetCompression => id(0x1D) {
threshold: VarInt =,
}
// ChangeGameState is used to modify the game's state like gamemode or
// weather.
ChangeGameState => 0x1E {
ChangeGameState => id(0x1E) {
reason: u8 =,
value: f32 =,
}
@ -462,12 +462,12 @@ state_packets!(
// client is still responding and keep the connection open.
// The client should reply with the KeepAliveServerbound
// packet setting ID to the same as this one.
KeepAliveClientbound => 0x1F {
KeepAliveClientbound => id(0x1F) {
id: VarInt =,
}
// ChunkData sends or updates a single chunk on the client. If New is set
// then biome data should be sent too.
ChunkData => 0x20 {
ChunkData => id(0x20) {
chunk_x: i32 =,
chunk_z: i32 =,
new: bool =,
@ -477,7 +477,7 @@ state_packets!(
// Effect plays a sound effect or particle at the target location with the
// volume (of sounds) being relative to the player's position unless
// DisableRelative is set to true.
Effect => 0x21 {
Effect => id(0x21) {
effect_id: i32 =,
location: types::Position =,
data: i32 =,
@ -485,7 +485,7 @@ state_packets!(
}
// Particle spawns particles at the target location with the various
// modifiers.
Particle => 0x22 {
Particle => id(0x22) {
particle_id: i32 =,
long_distance: bool =,
x: f32 =,
@ -500,7 +500,7 @@ state_packets!(
data2: VarInt = when(|p: &Particle| p.particle_id == 36),
}
// SoundEffect plays the named sound at the target location.
SoundEffect => 0x23 {
SoundEffect => id(0x23) {
name: String =,
x: i32 =,
y: i32 =,
@ -510,7 +510,7 @@ state_packets!(
}
// JoinGame is sent after completing the login process. This
// sets the initial state for the client.
JoinGame => 0x24 {
JoinGame => id(0x24) {
// The entity id the client will be referenced by
entity_id: i32 =,
// The starting gamemode of the client
@ -528,7 +528,7 @@ state_packets!(
reduced_debug_info: bool =,
}
// Maps updates a single map's contents
Maps => 0x25 {
Maps => id(0x25) {
item_damage: VarInt =,
scale: i8 =,
tracking_position: bool =,
@ -540,7 +540,7 @@ state_packets!(
data: Option<LenPrefixedBytes<VarInt>> = when(|p: &Maps| p.columns > 0),
}
// EntityMove moves the entity with the id by the offsets provided.
EntityMove => 0x26 {
EntityMove => id(0x26) {
entity_id: VarInt =,
delta_x: i8 =,
delta_y: i8 =,
@ -548,7 +548,7 @@ state_packets!(
on_ground: bool =,
}
// EntityLookAndMove is a combination of EntityMove and EntityLook.
EntityLookAndMove => 0x27 {
EntityLookAndMove => id(0x27) {
entity_id: VarInt =,
delta_x: i8 =,
delta_y: i8 =,
@ -558,31 +558,31 @@ state_packets!(
on_ground: bool =,
}
// EntityLook rotates the entity to the new angles provided.
EntityLook => 0x28 {
EntityLook => id(0x28) {
entity_id: VarInt =,
yaw: i8 =,
pitch: i8 =,
on_ground: bool =,
}
// Entity does nothing. It is a result of subclassing used in Minecraft.
Entity => 0x29 {
Entity => id(0x29) {
entity_id: VarInt =,
}
// SignEditorOpen causes the client to open the editor for a sign so that
// it can write to it. Only sent in vanilla when the player places a sign.
SignEditorOpen => 0x2A {
SignEditorOpen => id(0x2A) {
location: types::Position =,
}
// PlayerAbilities is used to modify the players current abilities. Flying,
// creative, god mode etc.
PlayerAbilities => 0x2B {
PlayerAbilities => id(0x2B) {
flags: u8 =,
flying_speed: f32 =,
walking_speed: f32 =,
}
// CombatEvent is used for... you know, I never checked. I have no
// clue.
CombatEvent => 0x2C {
CombatEvent => id(0x2C) {
event: VarInt =,
direction: Option<VarInt> = when(|p: &CombatEvent| p.event.0 == 1),
player_id: Option<VarInt> = when(|p: &CombatEvent| p.event.0 == 2),
@ -591,13 +591,13 @@ state_packets!(
}
// PlayerInfo is sent by the server for every player connected to the server
// to provide skin and username information as well as ping and gamemode info.
PlayerInfo => 0x2D {
PlayerInfo => id(0x2D) {
inner: packet::PlayerInfoData =, // Ew but watcha gonna do?
}
// TeleportPlayer is sent to change the player's position. The client is expected
// to reply to the server with the same positions as contained in this packet
// otherwise will reject future packets.
TeleportPlayer => 0x2E {
TeleportPlayer => id(0x2E) {
x: f64 =,
y: f64 =,
z: f64 =,
@ -606,40 +606,40 @@ state_packets!(
flags: u8 =,
}
// EntityUsedBed is sent by the server when a player goes to bed.
EntityUsedBed => 0x2F {
EntityUsedBed => id(0x2F) {
entity_id: VarInt =,
location: types::Position =,
}
// EntityDestroy destroys the entities with the ids in the provided slice.
EntityDestroy => 0x30 {
EntityDestroy => id(0x30) {
entity_ids: LenPrefixed<VarInt, VarInt> =,
}
// EntityRemoveEffect removes an effect from an entity.
EntityRemoveEffect => 0x31 {
EntityRemoveEffect => id(0x31) {
entity_id: VarInt =,
effect_id: i8 =,
}
// ResourcePackSend causes the client to check its cache for the requested
// resource packet and download it if its missing. Once the resource pack
// is obtained the client will use it.
ResourcePackSend => 0x32 {
ResourcePackSend => id(0x32) {
url: String =,
hash: String =,
}
// Respawn is sent to respawn the player after death or when they move worlds.
Respawn => 0x33 {
Respawn => id(0x33) {
dimension: i32 =,
difficulty: u8 =,
gamemode: u8 =,
level_type: String =,
}
// EntityHeadLook rotates an entity's head to the new angle.
EntityHeadLook => 0x34 {
EntityHeadLook => id(0x34) {
entity_id: VarInt =,
head_yaw: i8 =,
}
// WorldBorder configures the world's border.
WorldBorder => 0x35 {
WorldBorder => id(0x35) {
action: VarInt =,
old_radius: Option<f64> = when(|p: &WorldBorder| p.action.0 == 3 || p.action.0 == 1),
new_radius: Option<f64> = when(|p: &WorldBorder| p.action.0 == 3 || p.action.0 == 1 || p.action.0 == 0),
@ -652,33 +652,33 @@ state_packets!(
}
// Camera causes the client to spectate the entity with the passed id.
// Use the player's id to de-spectate.
Camera => 0x36 {
Camera => id(0x36) {
target_id: VarInt =,
}
// SetCurrentHotbarSlot changes the player's currently selected hotbar item.
SetCurrentHotbarSlot => 0x37 {
SetCurrentHotbarSlot => id(0x37) {
slot: u8 =,
}
// ScoreboardDisplay is used to set the display position of a scoreboard.
ScoreboardDisplay => 0x38 {
ScoreboardDisplay => id(0x38) {
position: u8 =,
name: String =,
}
// EntityMetadata updates the metadata for an entity.
EntityMetadata => 0x39 {
EntityMetadata => id(0x39) {
entity_id: VarInt =,
metadata: types::Metadata =,
}
// EntityAttach attaches to entities together, either by mounting or leashing.
// -1 can be used at the EntityID to deattach.
EntityAttach => 0x3A {
EntityAttach => id(0x3A) {
entity_id: i32 =,
vehicle: i32 =,
leash: bool =,
}
// EntityVelocity sets the velocity of an entity in 1/8000 of a block
// per a tick.
EntityVelocity => 0x3B {
EntityVelocity => id(0x3B) {
entity_id: VarInt =,
velocity_x: i16 =,
velocity_y: i16 =,
@ -687,32 +687,32 @@ state_packets!(
// EntityEquipment is sent to display an item on an entity, like a sword
// or armor. Slot 0 is the held item and slots 1 to 4 are boots, leggings
// chestplate and helmet respectively.
EntityEquipment => 0x3C {
EntityEquipment => id(0x3C) {
entity_id: VarInt =,
slot: VarInt =,
item: Option<item::Stack> =,
}
// SetExperience updates the experience bar on the client.
SetExperience => 0x3D {
SetExperience => id(0x3D) {
experience_bar: f32 =,
level: VarInt =,
total_experience: VarInt =,
}
// UpdateHealth is sent by the server to update the player's health and food.
UpdateHealth => 0x3E {
UpdateHealth => id(0x3E) {
health: f32 =,
food: VarInt =,
food_saturation: f32 =,
}
// ScoreboardObjective creates/updates a scoreboard objective.
ScoreboardObjective => 0x3F {
ScoreboardObjective => id(0x3F) {
name: String =,
mode: u8 =,
value: String = when(|p: &ScoreboardObjective| p.mode == 0 || p.mode == 2),
ty: String = when(|p: &ScoreboardObjective| p.mode == 0 || p.mode == 2),
}
// Teams creates and updates teams
Teams => 0x40 {
Teams => id(0x40) {
name: String =,
mode: u8 =,
display_name: Option<String> = when(|p: &Teams| p.mode == 0 || p.mode == 2),
@ -726,7 +726,7 @@ state_packets!(
}
// UpdateScore is used to update or remove an item from a scoreboard
// objective.
UpdateScore => 0x41 {
UpdateScore => id(0x41) {
name: String =,
action: u8 =,
object_name: String =,
@ -734,19 +734,19 @@ state_packets!(
}
// SpawnPosition is sent to change the player's current spawn point. Currently
// only used by the client for the compass.
SpawnPosition => 0x42 {
SpawnPosition => id(0x42) {
location: types::Position =,
}
// TimeUpdate is sent to sync the world's time to the client, the client
// will manually tick the time itself so this doesn't need to sent repeatedly
// but if the server or client has issues keeping up this can fall out of sync
// so it is a good idea to sent this now and again
TimeUpdate => 0x43 {
TimeUpdate => id(0x43) {
world_age: i64 =,
time_of_day: i64 =,
}
// Title configures an on-screen title.
Title => 0x44 {
Title => id(0x44) {
action: VarInt =,
title: Option<format::Component> = when(|p: &Title| p.action.0 == 0),
sub_title: Option<format::Component> = when(|p: &Title| p.action.0 == 1),
@ -755,7 +755,7 @@ state_packets!(
fade_out: Option<format::Component> = when(|p: &Title| p.action.0 == 2),
}
// UpdateSign sets or changes the text on a sign.
UpdateSign => 0x45 {
UpdateSign => id(0x45) {
location: types::Position =,
line1: format::Component =,
line2: format::Component =,
@ -763,19 +763,19 @@ state_packets!(
line4: format::Component =,
}
// PlayerListHeaderFooter updates the header/footer of the player list.
PlayerListHeaderFooter => 0x46 {
PlayerListHeaderFooter => id(0x46) {
header: format::Component =,
footer: format::Component =,
}
// CollectItem causes the collected item to fly towards the collector. This
// does not destroy the entity.
CollectItem => 0x47 {
CollectItem => id(0x47) {
collected_entity_id: VarInt =,
collector_entity_id: VarInt =,
}
// EntityTeleport teleports the entity to the target location. This is
// sent if the entity moves further than EntityMove allows.
EntityTeleport => 0x48 {
EntityTeleport => id(0x48) {
entity_id: VarInt =,
x: i32 =,
y: i32 =,
@ -785,12 +785,12 @@ state_packets!(
on_ground: bool =,
}
// EntityProperties updates the properties for an entity.
EntityProperties => 0x49 {
EntityProperties => id(0x49) {
entity_id: VarInt =,
properties: LenPrefixed<i32, packet::EntityProperty> =,
}
// EntityEffect applies a status effect to an entity for a given duration.
EntityEffect => 0x4A {
EntityEffect => id(0x4A) {
entity_id: VarInt =,
effect_id: i8 =,
amplifier: i8 =,
@ -804,13 +804,13 @@ state_packets!(
// LoginStart is sent immeditately after switching into the login
// state. The passed username is used by the server to authenticate
// the player in online mode.
LoginStart => 0x00 {
LoginStart => id(0x00) {
username: String =,
}
// EncryptionResponse is sent as a reply to EncryptionRequest. All
// packets following this one must be encrypted with AES/CFB8
// encryption.
EncryptionResponse => 0x01 {
EncryptionResponse => id(0x01) {
// The key for the AES/CFB8 cipher encrypted with the
// public key
shared_secret: LenPrefixedBytes<VarInt> =,
@ -823,13 +823,13 @@ state_packets!(
// LoginDisconnect is sent by the server if there was any issues
// authenticating the player during login or the general server
// issues (e.g. too many players).
LoginDisconnect => 0x00 {
LoginDisconnect => id(0x00) {
reason: format::Component =,
}
// EncryptionRequest is sent by the server if the server is in
// online mode. If it is not sent then its assumed the server is
// in offline mode.
EncryptionRequest => 0x01 {
EncryptionRequest => id(0x01) {
// Generally empty, left in from legacy auth
// but is still used by the client if provided
server_id: String =,
@ -842,14 +842,14 @@ state_packets!(
// LoginSuccess is sent by the server if the player successfully
// authenicates with the session servers (online mode) or straight
// after LoginStart (offline mode).
LoginSuccess => 0x02 {
LoginSuccess => id(0x02) {
// String encoding of a uuid (with hyphens)
uuid: String =,
username: String =,
}
// SetInitialCompression sets the compression threshold during the
// login state.
SetInitialCompression => 0x03 {
SetInitialCompression => id(0x03) {
// Threshold where a packet should be sent compressed
threshold: VarInt =,
}
@ -861,14 +861,14 @@ state_packets!(
// switching to the Status protocol state and is used
// to signal the server to send a StatusResponse to the
// client
StatusRequest => 0x00 {
StatusRequest => id(0x00) {
empty: () =,
}
// StatusPing is sent by the client after recieving a
// StatusResponse. The client uses the time from sending
// the ping until the time of recieving a pong to measure
// the latency between the client and the server.
StatusPing => 0x01 {
StatusPing => id(0x01) {
ping: i64 =,
}
}
@ -894,13 +894,13 @@ state_packets!(
// "description": "Hello world",
// "favicon": "data:image/png;base64,<data>"
// }
StatusResponse => 0x00 {
StatusResponse => id(0x00) {
status: String =,
}
// StatusPong is sent as a reply to a StatusPing.
// The Time field should be exactly the same as the
// one sent by the client.
StatusPong => 0x01 {
StatusPong => id(0x01) {
ping: i64 =,
}
}

4
src/render/mod.rs
View File

@ -326,8 +326,8 @@ impl Renderer {
struct TransInfo {
main: gl::Framebuffer,
fbColor: gl::Texture,
fbDepth: gl::Texture,
fb_color: gl::Texture,
fb_depth: gl::Texture,
trans: gl::Framebuffer,
accum: gl::Texture,
revealage: gl::Texture,

4
src/types/metadata.rs
View File

@ -15,7 +15,7 @@
use std::collections::HashMap;
use std::marker::PhantomData;
use std::io;
use std::io::{Read, Write};
use std::io::Write;
use std::fmt;
use protocol;
use protocol::Serializable;
@ -191,7 +191,7 @@ impl Default for Metadata {
}
#[derive(Debug)]
enum Value {
pub enum Value {
Byte(i8),
Int(i32),
Float(f32),