Update data and dependencies

Signed-off-by: trivernis <trivernis@protonmail.com>
pull/1/head
trivernis 3 years ago
parent 8e6c0b262d
commit 1bccbeeb33
Signed by: Trivernis
GPG Key ID: DFFFCC2C7A02DB45

@ -1,6 +1,6 @@
[package] [package]
name = "minecraft-data-rs" name = "minecraft-data-rs"
version = "0.3.0" version = "0.4.0"
authors = ["trivernis <trivernis@protonmail.com>"] authors = ["trivernis <trivernis@protonmail.com>"]
edition = "2018" edition = "2018"
readme = "README.md" readme = "README.md"
@ -11,10 +11,10 @@ repository = "https://github.com/Trivernis/minecraft-data-rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
thiserror = "1.0.24" thiserror = "1.0.30"
serde_json = "1.0.64" serde_json = "1.0.74"
serde_derive = "1.0.125" serde_derive = "1.0.133"
serde = "1.0.125" serde = "1.0.133"
include_dir = "0.6.0" include_dir = "0.7.2"
itertools = "0.10.0" itertools = "0.10.3"
lazy_static = "1.4.0" lazy_static = "1.4.0"

@ -1 +1 @@
Subproject commit 920d361e13351bbbd812c3bbd0ed05f4194b05fe Subproject commit dcbdb99f078a84fa34a1dd920de1e9fdda8ecb78

@ -2,7 +2,6 @@ use crate::data::{get_version_specific_file, BIOMES_FILE};
use crate::models::biome::Biome; use crate::models::biome::Biome;
use crate::models::version::Version; use crate::models::version::Version;
use crate::DataResult; use crate::DataResult;
use itertools::Itertools;
use std::collections::HashMap; use std::collections::HashMap;
use std::iter::FromIterator; use std::iter::FromIterator;
use std::sync::Arc; use std::sync::Arc;

@ -4,5 +4,5 @@ use std::collections::HashMap;
#[serde(rename_all(deserialize = "camelCase", serialize = "snake_case"))] #[serde(rename_all(deserialize = "camelCase", serialize = "snake_case"))]
pub(crate) struct Datapaths { pub(crate) struct Datapaths {
pub pc: HashMap<String, HashMap<String, String>>, pub pc: HashMap<String, HashMap<String, String>>,
pub pe: HashMap<String, HashMap<String, String>>, pub bedrock: HashMap<String, HashMap<String, String>>,
} }

@ -10,21 +10,29 @@ pub static MINECRAFT_DATA: Dir = include_dir::include_dir!("minecraft-data/data"
pub static BIOMES_FILE: &str = "biomes"; pub static BIOMES_FILE: &str = "biomes";
pub static BLOCK_LOOT_FILE: &str = "blockLoot"; pub static BLOCK_LOOT_FILE: &str = "blockLoot";
pub static BLOCKS_FILE: &str = "blocks"; pub static BLOCKS_FILE: &str = "blocks";
#[allow(unused)]
pub static COMMANDS_FILE: &str = "commands"; pub static COMMANDS_FILE: &str = "commands";
pub static ENTITIES_FILE: &str = "entities"; pub static ENTITIES_FILE: &str = "entities";
pub static ENTITY_LOOT_FILE: &str = "entityLoot"; pub static ENTITY_LOOT_FILE: &str = "entityLoot";
pub static FOODS_FILE: &str = "foods"; pub static FOODS_FILE: &str = "foods";
pub static ITEMS_FILE: &str = "items"; pub static ITEMS_FILE: &str = "items";
#[allow(unused)]
pub static LOGIN_PACKET_FILE: &str = "loginPacket"; pub static LOGIN_PACKET_FILE: &str = "loginPacket";
#[allow(unused)]
pub static MATERIALS_FILE: &str = "materials"; pub static MATERIALS_FILE: &str = "materials";
#[allow(unused)]
pub static PROTOCOL_FILE: &str = "protocol"; pub static PROTOCOL_FILE: &str = "protocol";
pub static RECIPES_FILE: &str = "recipes"; pub static RECIPES_FILE: &str = "recipes";
#[allow(unused)]
pub static TINTS_FILE: &str = "tints"; pub static TINTS_FILE: &str = "tints";
pub static ENCHANTMENTS_FILE: &str = "enchantments"; pub static ENCHANTMENTS_FILE: &str = "enchantments";
// pub static VERSION_FILE: &str = "version.json"; // pub static VERSION_FILE: &str = "version.json";
#[allow(unused)]
pub static MAP_ICONS_FILE: &str = "mapIcons"; pub static MAP_ICONS_FILE: &str = "mapIcons";
#[allow(unused)]
pub static PARTICLES_FILE: &str = "particles"; pub static PARTICLES_FILE: &str = "particles";
pub static PROTOCOL_VERSIONS_FILE: &str = "protocolVersions"; pub static PROTOCOL_VERSIONS_FILE: &str = "protocolVersions";
#[allow(unused)]
pub static VERSIONS_FILE: &str = "versions"; pub static VERSIONS_FILE: &str = "versions";
/// Returns the string encoded content of the common file /// Returns the string encoded content of the common file

@ -10,7 +10,7 @@ pub struct BlockLoot {
pub struct ItemDrop { pub struct ItemDrop {
pub item: String, pub item: String,
pub drop_chance: f32, pub drop_chance: f32,
pub stack_size_range: [Option<usize>; 2], pub stack_size_range: [Option<isize>; 2],
pub block_age: Option<usize>, pub block_age: Option<usize>,
pub silk_touch: Option<bool>, pub silk_touch: Option<bool>,
pub no_silk_touch: Option<bool>, pub no_silk_touch: Option<bool>,

@ -5,7 +5,7 @@ pub struct Food {
pub display_name: String, pub display_name: String,
pub stack_size: u8, pub stack_size: u8,
pub name: String, pub name: String,
pub food_points: u8, pub food_points: f32,
pub saturation: f32, pub saturation: f32,
pub effective_quality: f32, pub effective_quality: f32,
pub saturation_ratio: f32, pub saturation_ratio: f32,

Loading…
Cancel
Save