diff --git a/.gitignore b/.gitignore index c77f95a..d4e8f2e 100644 --- a/.gitignore +++ b/.gitignore @@ -130,6 +130,8 @@ session.lock version.json eula.txt +src/server.properties + # macOS files .DS_Store diff --git a/src/fs_manager/mod.rs b/src/fs_manager/mod.rs index 2060215..d331da5 100644 --- a/src/fs_manager/mod.rs +++ b/src/fs_manager/mod.rs @@ -183,7 +183,7 @@ pub fn write_ops_json( .read(true) .write(true) .truncate(true) - .open(consts::file_paths::OPERATORS)?; + .open(filename)?; let mut content = String::new(); file.read_to_string(&mut content)?; diff --git a/src/net/packet/mod.rs b/src/net/packet/mod.rs index 811439d..6d4d8df 100644 --- a/src/net/packet/mod.rs +++ b/src/net/packet/mod.rs @@ -5,11 +5,10 @@ pub mod data_types; pub mod utils; use core::fmt; -use std::{collections::VecDeque, fmt::Debug, io::Read, vec}; +use std::{collections::VecDeque, fmt::Debug}; use bytes::BytesMut; use data_types::varint; -use image::error; use log::warn; use thiserror::Error; @@ -48,12 +47,12 @@ pub struct Packet { impl Packet { /// Initalizes a new `Packet` by parsing the `data` buffer. - pub fn new(data: &[u8]) -> Result { - let parsed = Self::parse_packet(&data)?; + pub fn new>(data: T) -> Result { + let parsed = Self::parse_packet(data.as_ref())?; Ok(Self { length: parsed.0, id: parsed.1, - data: data.into(), + data: data.as_ref().into(), payload: parsed.2.into(), }) } diff --git a/src/server.properties b/src/server.properties deleted file mode 100644 index dcf9b0c..0000000 --- a/src/server.properties +++ /dev/null @@ -1,63 +0,0 @@ -# Minecraft server properties -# Mon Dec 09 20:52:39 2024 -accepts-transfers=false -allow-flight=false -allow-nether=true -broadcast-console-to-ops=true -broadcast-rcon-to-ops=true -bug-report-link= -difficulty=easy -enable-command-block=false -enable-jmx-monitoring=false -enable-query=false -enable-rcon=false -enable-status=true -enforce-secure-profile=true -enforce-whitelist=false -entity-broadcast-range-percentage=100 -force-gamemode=false -function-permission-level=2 -gamemode=survival -generate-structures=true -generator-settings={} -hardcore=false -hide-online-players=false -initial-disabled-packs= -initial-enabled-packs=vanilla -level-name=world -level-seed= -level-type=minecraft\:normal -log-ips=true -max-chained-neighbor-updates=1000000 -max-players=20 -max-tick-time=60000 -max-world-size=29999984 -motd=A Minecraft Server -network-compression-threshold=256 -online-mode=true -op-permission-level=4 -player-idle-timeout=0 -prevent-proxy-connections=false -pvp=true -query.port=25565 -rate-limit=0 -rcon.password= -rcon.port=25575 -region-file-compression=deflate -require-resource-pack=false -resource-pack= -resource-pack-id= -resource-pack-prompt= -resource-pack-sha1= -server-ip= -server-port=25565 -simulation-distance=10 -spawn-animals=true -spawn-monsters=true -spawn-npcs=true -spawn-protection=16 -sync-chunk-writes=true -text-filtering-config= -use-native-transport=true -view-distance=10 -white-list=false \ No newline at end of file