Skip to content

Commit

Permalink
Merge pull request #78 from OmniacDev/proto_rework
Browse files Browse the repository at this point in the history
v662: impl ProtoCodec, big cleanup
  • Loading branch information
theaddonn authored Dec 10, 2024
2 parents e23ec74 + 79469ae commit d0ad3f4
Show file tree
Hide file tree
Showing 422 changed files with 3,827 additions and 2,736 deletions.
2 changes: 1 addition & 1 deletion crates/proto/src/compression.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use std::mem::size_of;
use bedrockrs_proto_core::error::CompressionError;
use byteorder::{ReadBytesExt, WriteBytesExt};
use flate2::Compression as CompressionLevel;
use flate2::{read::DeflateDecoder, write::DeflateEncoder};
use snap::{read::FrameDecoder as SnapDecoder, write::FrameEncoder as SnapEncoder};
use std::io::{Cursor, Read, Write};
use std::mem::size_of;

#[derive(Debug, Clone)]
pub enum Compression {
Expand Down
2 changes: 1 addition & 1 deletion crates/proto/src/connection/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pub mod shard;

use crate::codec::{encode_gamepackets, decode_gamepackets};
use crate::codec::{decode_gamepackets, encode_gamepackets};
use crate::compression::Compression;
use crate::encryption::Encryption;
use crate::error::ConnectionError;
Expand Down
2 changes: 1 addition & 1 deletion crates/proto/src/version/v662/enums/abilities_index.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use bedrockrs_macros::ProtoCodec;

#[derive(ProtoCodec)]
#[derive(ProtoCodec, Clone, Debug)]
#[enum_repr(i8)]
#[repr(i8)]
pub enum AbilitiesIndex {
Expand Down
13 changes: 0 additions & 13 deletions crates/proto/src/version/v662/enums/actor_block_sync_message.rs

This file was deleted.

12 changes: 12 additions & 0 deletions crates/proto/src/version/v662/enums/actor_block_sync_message_id.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
use bedrockrs_macros::ProtoCodec;

#[derive(ProtoCodec, Clone, Debug)]
#[enum_repr(i64)]
#[enum_endianness(var)]
#[repr(i64)]
pub enum ActorBlockSyncMessageID {
NONE = 0,
CREATE = 1,
DESTROY = 2,
}

2 changes: 1 addition & 1 deletion crates/proto/src/version/v662/enums/actor_damage_cause.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use bedrockrs_macros::ProtoCodec;

#[derive(ProtoCodec)]
#[derive(ProtoCodec, Clone, Debug)]
#[enum_repr(i32)]
#[enum_endianness(var)]
#[repr(i32)]
Expand Down
3 changes: 0 additions & 3 deletions crates/proto/src/version/v662/enums/actor_data_ids.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
use bedrockrs_macros::ProtoCodec;

#[derive(ProtoCodec)]
pub enum ActorDataIDs {
Reserved0 = 0,
StructuralIntegrity = 1,
Expand Down
2 changes: 1 addition & 1 deletion crates/proto/src/version/v662/enums/actor_event.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use bedrockrs_macros::ProtoCodec;

#[derive(ProtoCodec)]
#[derive(ProtoCodec, Clone, Debug)]
#[enum_repr(i8)]
#[repr(i8)]
pub enum ActorEvent {
Expand Down
3 changes: 0 additions & 3 deletions crates/proto/src/version/v662/enums/actor_flags.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
use bedrockrs_macros::ProtoCodec;

#[derive(ProtoCodec)]
pub enum ActorFlags {
Unknown = -1,
OnFire = 0,
Expand Down
4 changes: 3 additions & 1 deletion crates/proto/src/version/v662/enums/actor_link_type.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
use bedrockrs_macros::ProtoCodec;

#[derive(ProtoCodec)]
#[derive(ProtoCodec, Clone, Debug)]
#[enum_repr(i8)]
#[repr(i8)]
pub enum ActorLinkType {
None = 0,
Riding = 1,
Expand Down
Loading

0 comments on commit d0ad3f4

Please sign in to comment.