2022-10-06 03:28:08 +11:00
|
|
|
use anyhow::Ok;
|
|
|
|
use heck::ToPascalCase;
|
|
|
|
use proc_macro2::TokenStream;
|
|
|
|
use quote::quote;
|
|
|
|
use serde::Deserialize;
|
Reorganize Project (#321)
## Description
- `valence` and `valence_protocol` have been divided into smaller crates
in order to parallelize the build and improve IDE responsiveness. In the
process, code architecture has been made clearer by removing circular
dependencies between modules. `valence` is now just a shell around the
other crates.
- `workspace.packages` and `workspace.dependencies` are now used. This
makes dependency managements and crate configuration much easier.
- `valence_protocol` is no more. Most things from `valence_protocol`
ended up in `valence_core`. We won't advertise `valence_core` as a
general-purpose protocol library since it contains too much
valence-specific stuff. Closes #308.
- Networking code (login, initial TCP connection handling, etc.) has
been extracted into the `valence_network` crate. The API has been
expanded and improved with better defaults. Player counts and initial
connections to the server are now tracked separately. Player counts
function by default without any user configuration.
- Some crates like `valence_anvil`, `valence_network`,
`valence_player_list`, `valence_inventory`, etc. are now optional. They
can be enabled/disabled with feature flags and `DefaultPlugins` just
like bevy.
- Whole-server unit tests have been moved to `valence/src/tests` in
order to avoid [cyclic
dev-dependencies](https://github.com/rust-lang/cargo/issues/4242).
- Tools like `valence_stresser` and `packet_inspector` have been moved
to a new `tools` directory. Renamed `valence_stresser` to `stresser`.
Closes #241.
- Moved all benches to `valence/benches/` to make them easier to run and
organize.
Ignoring transitive dependencies and `valence_core`, here's what the
dependency graph looks like now:
```mermaid
graph TD
network --> client
client --> instance
biome --> registry
dimension --> registry
instance --> biome
instance --> dimension
instance --> entity
player_list --> client
inventory --> client
anvil --> instance
entity --> block
```
### Issues
- Inventory tests inspect many private implementation details of the
inventory module, forcing us to mark things as `pub` and
`#[doc(hidden)]`. It would be ideal if the tests only looked at
observable behavior.
- Consider moving packets in `valence_core` elsewhere. `Particle` wants
to use `BlockState`, but that's defined in `valence_block`, so we can't
use it without causing cycles.
- Unsure what exactly should go in `valence::prelude`.
- This could use some more tests of course, but I'm holding off on that
until I'm confident this is the direction we want to take things.
## TODOs
- [x] Update examples.
- [x] Update benches.
- [x] Update main README.
- [x] Add short READMEs to crates.
- [x] Test new schedule to ensure behavior is the same.
- [x] Update tools.
- [x] Copy lints to all crates.
- [x] Fix docs, clippy, etc.
2023-04-22 07:43:59 +10:00
|
|
|
use valence_build_utils::ident;
|
2022-10-06 03:28:08 +11:00
|
|
|
|
|
|
|
#[derive(Deserialize, Clone, Debug)]
|
|
|
|
struct Item {
|
|
|
|
id: u16,
|
|
|
|
name: String,
|
|
|
|
translation_key: String,
|
|
|
|
max_stack: u8,
|
|
|
|
max_durability: u16,
|
|
|
|
enchantability: u8,
|
|
|
|
fireproof: bool,
|
|
|
|
food: Option<FoodComponent>,
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Deserialize, Clone, Debug)]
|
|
|
|
struct FoodComponent {
|
|
|
|
hunger: u16,
|
|
|
|
saturation: f32,
|
|
|
|
always_edible: bool,
|
|
|
|
meat: bool,
|
|
|
|
snack: bool,
|
|
|
|
// TODO: effects
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn build() -> anyhow::Result<TokenStream> {
|
2022-12-30 11:51:05 +11:00
|
|
|
let items = serde_json::from_str::<Vec<Item>>(include_str!("../../../extracted/items.json"))?;
|
2022-10-06 03:28:08 +11:00
|
|
|
|
|
|
|
let item_kind_count = items.len();
|
|
|
|
|
|
|
|
let item_kind_from_raw_id_arms = items
|
|
|
|
.iter()
|
|
|
|
.map(|item| {
|
|
|
|
let id = &item.id;
|
2023-04-28 21:53:10 +10:00
|
|
|
let name = ident(item.name.replace('.', "_").to_pascal_case());
|
2022-10-06 03:28:08 +11:00
|
|
|
|
|
|
|
quote! {
|
|
|
|
#id => Some(Self::#name),
|
|
|
|
}
|
|
|
|
})
|
|
|
|
.collect::<TokenStream>();
|
|
|
|
|
|
|
|
let item_kind_to_raw_id_arms = items
|
|
|
|
.iter()
|
|
|
|
.map(|item| {
|
|
|
|
let id = &item.id;
|
2023-04-28 21:53:10 +10:00
|
|
|
let name = ident(item.name.replace('.', "_").to_pascal_case());
|
2022-10-06 03:28:08 +11:00
|
|
|
|
|
|
|
quote! {
|
|
|
|
Self::#name => #id,
|
|
|
|
}
|
|
|
|
})
|
|
|
|
.collect::<TokenStream>();
|
|
|
|
|
|
|
|
let item_kind_from_str_arms = items
|
|
|
|
.iter()
|
|
|
|
.map(|item| {
|
|
|
|
let str_name = &item.name;
|
2023-04-28 21:53:10 +10:00
|
|
|
let name = ident(str_name.replace('.', "_").to_pascal_case());
|
2022-10-06 03:28:08 +11:00
|
|
|
quote! {
|
|
|
|
#str_name => Some(Self::#name),
|
|
|
|
}
|
|
|
|
})
|
|
|
|
.collect::<TokenStream>();
|
|
|
|
|
|
|
|
let item_kind_to_str_arms = items
|
|
|
|
.iter()
|
|
|
|
.map(|item| {
|
|
|
|
let str_name = &item.name;
|
2023-04-28 21:53:10 +10:00
|
|
|
let name = ident(str_name.replace('.', "_").to_pascal_case());
|
2022-10-06 03:28:08 +11:00
|
|
|
quote! {
|
|
|
|
Self::#name => #str_name,
|
|
|
|
}
|
|
|
|
})
|
|
|
|
.collect::<TokenStream>();
|
|
|
|
|
|
|
|
let item_kind_to_translation_key_arms = items
|
|
|
|
.iter()
|
|
|
|
.map(|item| {
|
2023-04-28 21:53:10 +10:00
|
|
|
let name = ident(item.name.replace('.', "_").to_pascal_case());
|
2022-10-06 03:28:08 +11:00
|
|
|
let translation_key = &item.translation_key;
|
|
|
|
quote! {
|
|
|
|
Self::#name => #translation_key,
|
|
|
|
}
|
|
|
|
})
|
|
|
|
.collect::<TokenStream>();
|
|
|
|
|
|
|
|
let item_kind_variants = items
|
|
|
|
.iter()
|
2023-04-28 21:53:10 +10:00
|
|
|
.map(|item| ident(item.name.replace('.', "_").to_pascal_case()))
|
2022-10-06 03:28:08 +11:00
|
|
|
.collect::<Vec<_>>();
|
|
|
|
|
|
|
|
let item_kind_to_max_stack_arms = items
|
|
|
|
.iter()
|
|
|
|
.map(|item| {
|
2023-04-28 21:53:10 +10:00
|
|
|
let name = ident(item.name.replace('.', "_").to_pascal_case());
|
2022-10-06 03:28:08 +11:00
|
|
|
let max_stack = item.max_stack;
|
|
|
|
|
|
|
|
quote! {
|
|
|
|
Self::#name => #max_stack,
|
|
|
|
}
|
|
|
|
})
|
|
|
|
.collect::<TokenStream>();
|
|
|
|
|
|
|
|
let item_kind_to_food_component_arms = items
|
|
|
|
.iter()
|
|
|
|
.map(|item| match &item.food {
|
|
|
|
Some(food_component) => {
|
2023-04-28 21:53:10 +10:00
|
|
|
let name = ident(item.name.replace('.', "_").to_pascal_case());
|
2022-10-06 03:28:08 +11:00
|
|
|
let hunger = food_component.hunger;
|
|
|
|
let saturation = food_component.saturation;
|
|
|
|
let always_edible = food_component.always_edible;
|
|
|
|
let meat = food_component.meat;
|
|
|
|
let snack = food_component.snack;
|
|
|
|
|
|
|
|
quote! {
|
|
|
|
Self::#name => Some(FoodComponent {
|
|
|
|
hunger: #hunger,
|
|
|
|
saturation: #saturation,
|
|
|
|
always_edible: #always_edible,
|
|
|
|
meat: #meat,
|
|
|
|
snack: #snack,
|
|
|
|
}
|
|
|
|
),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
None => quote! {},
|
|
|
|
})
|
|
|
|
.collect::<TokenStream>();
|
|
|
|
|
|
|
|
let item_kind_to_max_durability_arms = items
|
|
|
|
.iter()
|
|
|
|
.filter(|item| item.max_durability != 0)
|
|
|
|
.map(|item| {
|
2023-04-28 21:53:10 +10:00
|
|
|
let name = ident(item.name.replace('.', "_").to_pascal_case());
|
2022-10-06 03:28:08 +11:00
|
|
|
let max_durability = item.max_durability;
|
|
|
|
|
|
|
|
quote! {
|
|
|
|
Self::#name => #max_durability,
|
|
|
|
}
|
|
|
|
})
|
|
|
|
.collect::<TokenStream>();
|
|
|
|
|
|
|
|
let item_kind_to_enchantability_arms = items
|
|
|
|
.iter()
|
|
|
|
.filter(|item| item.enchantability != 0)
|
|
|
|
.map(|item| {
|
2023-04-28 21:53:10 +10:00
|
|
|
let name = ident(item.name.replace('.', "_").to_pascal_case());
|
2022-10-06 03:28:08 +11:00
|
|
|
let ench = item.enchantability;
|
|
|
|
|
|
|
|
quote! {
|
|
|
|
Self::#name => #ench,
|
|
|
|
}
|
|
|
|
})
|
|
|
|
.collect::<TokenStream>();
|
|
|
|
|
|
|
|
let item_kind_to_fireproof_arms = items
|
|
|
|
.iter()
|
|
|
|
.filter(|item| item.fireproof)
|
|
|
|
.map(|item| {
|
2023-04-28 21:53:10 +10:00
|
|
|
let name = ident(item.name.replace('.', "_").to_pascal_case());
|
2022-10-06 03:28:08 +11:00
|
|
|
|
|
|
|
quote! {
|
|
|
|
Self::#name => true,
|
|
|
|
}
|
|
|
|
})
|
|
|
|
.collect::<TokenStream>();
|
|
|
|
|
|
|
|
Ok(quote! {
|
|
|
|
/// Represents an item from the game
|
|
|
|
#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
|
|
|
|
#[repr(u16)]
|
|
|
|
pub enum ItemKind {
|
|
|
|
#(#item_kind_variants,)*
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Contains food information about an item.
|
|
|
|
///
|
|
|
|
/// Only food items have a food component.
|
|
|
|
#[derive(Clone, Copy, PartialEq, PartialOrd, Debug)]
|
|
|
|
pub struct FoodComponent {
|
|
|
|
pub hunger: u16,
|
|
|
|
pub saturation: f32,
|
|
|
|
pub always_edible: bool,
|
|
|
|
pub meat: bool,
|
|
|
|
pub snack: bool,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl ItemKind {
|
|
|
|
/// Constructs a item kind from a raw item ID.
|
|
|
|
///
|
|
|
|
/// If the given ID is invalid, `None` is returned.
|
|
|
|
pub const fn from_raw(id: u16) -> Option<Self> {
|
|
|
|
match id {
|
|
|
|
#item_kind_from_raw_id_arms
|
|
|
|
_ => None
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Gets the raw item ID from the item kind
|
|
|
|
pub const fn to_raw(self) -> u16 {
|
|
|
|
match self {
|
|
|
|
#item_kind_to_raw_id_arms
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Construct an item kind for its snake_case name.
|
|
|
|
///
|
|
|
|
/// Returns `None` if the name is invalid.
|
|
|
|
#[allow(clippy::should_implement_trait)]
|
|
|
|
pub fn from_str(name: &str) -> Option<ItemKind> {
|
|
|
|
match name {
|
|
|
|
#item_kind_from_str_arms
|
|
|
|
_ => None
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Gets the snake_case name of this item kind.
|
|
|
|
pub const fn to_str(self) -> &'static str {
|
|
|
|
match self {
|
|
|
|
#item_kind_to_str_arms
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Gets the translation key of this item kind.
|
|
|
|
pub const fn translation_key(self) -> &'static str {
|
|
|
|
match self {
|
|
|
|
#item_kind_to_translation_key_arms
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns the maximum stack count.
|
|
|
|
pub const fn max_stack(self) -> u8 {
|
|
|
|
match self {
|
|
|
|
#item_kind_to_max_stack_arms
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns a food component which stores hunger, saturation etc.
|
|
|
|
///
|
|
|
|
/// If the item kind can't be eaten, `None` will be returned.
|
|
|
|
pub const fn food_component(self) -> Option<FoodComponent> {
|
|
|
|
match self {
|
|
|
|
#item_kind_to_food_component_arms
|
|
|
|
_ => None
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns the maximum durability before the item will break.
|
|
|
|
///
|
|
|
|
/// If the item doesn't have durability, `0` is returned.
|
|
|
|
pub const fn max_durability(self) -> u16 {
|
|
|
|
match self {
|
|
|
|
#item_kind_to_max_durability_arms
|
|
|
|
_ => 0,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns the enchantability of the item kind.
|
|
|
|
///
|
|
|
|
/// If the item doesn't have durability, `0` is returned.
|
|
|
|
pub const fn enchantability(self) -> u8 {
|
|
|
|
match self {
|
|
|
|
#item_kind_to_enchantability_arms
|
|
|
|
_ => 0,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns if the item can survive in fire/lava.
|
|
|
|
pub const fn fireproof(self) -> bool {
|
|
|
|
#[allow(clippy::match_like_matches_macro)]
|
|
|
|
match self {
|
|
|
|
#item_kind_to_fireproof_arms
|
|
|
|
_ => false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Reorganize Project (#321)
## Description
- `valence` and `valence_protocol` have been divided into smaller crates
in order to parallelize the build and improve IDE responsiveness. In the
process, code architecture has been made clearer by removing circular
dependencies between modules. `valence` is now just a shell around the
other crates.
- `workspace.packages` and `workspace.dependencies` are now used. This
makes dependency managements and crate configuration much easier.
- `valence_protocol` is no more. Most things from `valence_protocol`
ended up in `valence_core`. We won't advertise `valence_core` as a
general-purpose protocol library since it contains too much
valence-specific stuff. Closes #308.
- Networking code (login, initial TCP connection handling, etc.) has
been extracted into the `valence_network` crate. The API has been
expanded and improved with better defaults. Player counts and initial
connections to the server are now tracked separately. Player counts
function by default without any user configuration.
- Some crates like `valence_anvil`, `valence_network`,
`valence_player_list`, `valence_inventory`, etc. are now optional. They
can be enabled/disabled with feature flags and `DefaultPlugins` just
like bevy.
- Whole-server unit tests have been moved to `valence/src/tests` in
order to avoid [cyclic
dev-dependencies](https://github.com/rust-lang/cargo/issues/4242).
- Tools like `valence_stresser` and `packet_inspector` have been moved
to a new `tools` directory. Renamed `valence_stresser` to `stresser`.
Closes #241.
- Moved all benches to `valence/benches/` to make them easier to run and
organize.
Ignoring transitive dependencies and `valence_core`, here's what the
dependency graph looks like now:
```mermaid
graph TD
network --> client
client --> instance
biome --> registry
dimension --> registry
instance --> biome
instance --> dimension
instance --> entity
player_list --> client
inventory --> client
anvil --> instance
entity --> block
```
### Issues
- Inventory tests inspect many private implementation details of the
inventory module, forcing us to mark things as `pub` and
`#[doc(hidden)]`. It would be ideal if the tests only looked at
observable behavior.
- Consider moving packets in `valence_core` elsewhere. `Particle` wants
to use `BlockState`, but that's defined in `valence_block`, so we can't
use it without causing cycles.
- Unsure what exactly should go in `valence::prelude`.
- This could use some more tests of course, but I'm holding off on that
until I'm confident this is the direction we want to take things.
## TODOs
- [x] Update examples.
- [x] Update benches.
- [x] Update main README.
- [x] Add short READMEs to crates.
- [x] Test new schedule to ensure behavior is the same.
- [x] Update tools.
- [x] Copy lints to all crates.
- [x] Fix docs, clippy, etc.
2023-04-22 07:43:59 +10:00
|
|
|
/*
|
2022-10-06 03:28:08 +11:00
|
|
|
/// Constructs an item kind from a block kind.
|
|
|
|
///
|
|
|
|
/// [`ItemKind::Air`] is used to indicate the absence of an item.
|
|
|
|
pub const fn from_block_kind(kind: BlockKind) -> Self {
|
|
|
|
kind.to_item_kind()
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Constructs a block kind from an item kind.
|
|
|
|
///
|
|
|
|
/// If the given item kind doesn't have a corresponding block kind, `None` is returned.
|
|
|
|
pub const fn to_block_kind(self) -> Option<BlockKind> {
|
|
|
|
BlockKind::from_item_kind(self)
|
Reorganize Project (#321)
## Description
- `valence` and `valence_protocol` have been divided into smaller crates
in order to parallelize the build and improve IDE responsiveness. In the
process, code architecture has been made clearer by removing circular
dependencies between modules. `valence` is now just a shell around the
other crates.
- `workspace.packages` and `workspace.dependencies` are now used. This
makes dependency managements and crate configuration much easier.
- `valence_protocol` is no more. Most things from `valence_protocol`
ended up in `valence_core`. We won't advertise `valence_core` as a
general-purpose protocol library since it contains too much
valence-specific stuff. Closes #308.
- Networking code (login, initial TCP connection handling, etc.) has
been extracted into the `valence_network` crate. The API has been
expanded and improved with better defaults. Player counts and initial
connections to the server are now tracked separately. Player counts
function by default without any user configuration.
- Some crates like `valence_anvil`, `valence_network`,
`valence_player_list`, `valence_inventory`, etc. are now optional. They
can be enabled/disabled with feature flags and `DefaultPlugins` just
like bevy.
- Whole-server unit tests have been moved to `valence/src/tests` in
order to avoid [cyclic
dev-dependencies](https://github.com/rust-lang/cargo/issues/4242).
- Tools like `valence_stresser` and `packet_inspector` have been moved
to a new `tools` directory. Renamed `valence_stresser` to `stresser`.
Closes #241.
- Moved all benches to `valence/benches/` to make them easier to run and
organize.
Ignoring transitive dependencies and `valence_core`, here's what the
dependency graph looks like now:
```mermaid
graph TD
network --> client
client --> instance
biome --> registry
dimension --> registry
instance --> biome
instance --> dimension
instance --> entity
player_list --> client
inventory --> client
anvil --> instance
entity --> block
```
### Issues
- Inventory tests inspect many private implementation details of the
inventory module, forcing us to mark things as `pub` and
`#[doc(hidden)]`. It would be ideal if the tests only looked at
observable behavior.
- Consider moving packets in `valence_core` elsewhere. `Particle` wants
to use `BlockState`, but that's defined in `valence_block`, so we can't
use it without causing cycles.
- Unsure what exactly should go in `valence::prelude`.
- This could use some more tests of course, but I'm holding off on that
until I'm confident this is the direction we want to take things.
## TODOs
- [x] Update examples.
- [x] Update benches.
- [x] Update main README.
- [x] Add short READMEs to crates.
- [x] Test new schedule to ensure behavior is the same.
- [x] Update tools.
- [x] Copy lints to all crates.
- [x] Fix docs, clippy, etc.
2023-04-22 07:43:59 +10:00
|
|
|
}*/
|
2022-10-06 03:28:08 +11:00
|
|
|
|
|
|
|
/// An array of all item kinds.
|
|
|
|
pub const ALL: [Self; #item_kind_count] = [#(Self::#item_kind_variants,)*];
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|