Implement survival mode by caelunshun · Pull Request #214 · feather-rs/feather · GitHub
Skip to content

Implement survival mode #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
caelunshun merged 14 commits into from
May 11, 2020
Merged

Implement survival mode #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ff4990b
Split gamemode components to use an idiomatic ECS approach
caelunshun May 7, 2020
07372c8
Generate hardness values for blocks
caelunshun May 7, 2020
0ff0fe9
Prototype feather-definitions
caelunshun May 7, 2020
7071d32
Get feather-definitions to work; integrate it into feather-blocks
caelunshun May 9, 2020
b3184e2
Transition feather-items to utilize feather-definitions
caelunshun May 9, 2020
48feca2
Fix gamemode not displaying correctly; fix block placement
caelunshun May 9, 2020
db0be65
Initial support for survival mode block breaking
caelunshun May 9, 2020
340dd42
Improve handling of digging: support tools, proper hardness
caelunshun May 10, 2020
e106a85
Initial work on survival mode inventory handling
caelunshun May 11, 2020
9fb3dac
Fix bugs in implementation of handle_single_click
caelunshun May 11, 2020
e5f595f
Implement stubs for other Click Window actions
caelunshun May 11, 2020
ef21971
Fix CI build on Windows (caused by path handling errors)
caelunshun May 11, 2020
c2a46f5
Use Result instead of Option for Inventory::item_at
caelunshun May 11, 2020
8c486b3
Switch feather-definitions to build manually
caelunshun May 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 56 additions & 4 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Cargo.toml
View file
Open in desktop
3 changes: 2 additions & 1 deletion core/blocks/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ authors = ["caelunshun <caelunshun@gmail.com>"]
edition = "2018"

[dependencies]
feather-definitions = { path = "../../definitions" }

bit-set = "0.5"
once_cell = { version = "1.3", features = ["parking_lot"] }
anyhow = "1.0"
thiserror = "1.0"
num-traits = "0.2"
num-derive = "0.3"
serde = { version = "1.0", features = ["derive"] }
bincode = "1.2"

Expand Down
4 changes: 1 addition & 3 deletions core/blocks/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,13 @@ fn main() {

let _ = std::fs::create_dir_all(base);

let kind = format!("{}/kind.rs", base);
let block_fns = format!("{}/block_fns.rs", base);
let table = format!("{}/table.rs", base);

write_to_file(&kind, &code.kind);
write_to_file(&block_fns, &code.block_fns);
write_to_file(&table, &code.block_table);

[kind, block_fns, table].iter().for_each(|path| {
[block_fns, table].iter().for_each(|path| {
Command::new("rustfmt").arg(path).output().unwrap();
});

Expand Down
20 changes: 0 additions & 20 deletions core/blocks/generator/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,6 @@ enum PropertyKind {

#[derive(Debug, Default)]
pub struct Output {
pub kind: String,
pub block_fns: String,
pub block_table: String,
pub block_table_serialized: Vec<u8>,
Expand All @@ -247,7 +246,6 @@ pub fn generate() -> anyhow::Result<Output> {

let mut output = Output::default();

output.kind.push_str(&generate_kind(&blocks).to_string());
let table_src = generate_table(&blocks);
output.block_table.push_str(&table_src.to_string());
let block_fns_src = generate_block_fns(&blocks);
Expand All @@ -259,24 +257,6 @@ pub fn generate() -> anyhow::Result<Output> {
Ok(output)
}

/// Generates the `BlockKind` enum.
fn generate_kind(blocks: &Blocks) -> TokenStream {
let mut variants = vec![];

for block in &blocks.blocks {
let name = &block.name_camel_case;
variants.push(quote! { #name });
}

quote! {
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ToPrimitive, FromPrimitive)]
#[repr(u16)]
pub enum BlockKind {
#(#variants,)*
}
}
}

/// Generates the `BlockTable` struct and its implementation.
fn generate_table(blocks: &Blocks) -> TokenStream {
let mut fields = vec![];
Expand Down
10 changes: 1 addition & 9 deletions core/blocks/src/categories.rs
View file
Open in desktop
Loading