From 4aa8be203d63a05b571b92baecf3b76c7d3d1251 Mon Sep 17 00:00:00 2001 From: caelunshun Date: Sat, 31 Aug 2019 19:01:13 -0600 Subject: [PATCH] Release v0.4.0 --- .azure-pipelines.yml | 4 +- Cargo.lock | 68 ++++++++++++------------------ Cargo.toml | 2 - README.md | 31 +++++++++----- blocks/Cargo.toml | 6 +-- client/core/Cargo.toml | 8 ---- client/core/src/lib.rs | 1 - client/wrapper/console/Cargo.toml | 8 ---- client/wrapper/console/src/main.rs | 1 - codegen/Cargo.toml | 4 +- core/Cargo.toml | 10 ++--- generator/Cargo.toml | 4 +- item_block/Cargo.toml | 8 ++-- items/Cargo.toml | 4 +- server/Cargo.toml | 11 +++-- 15 files changed, 72 insertions(+), 98 deletions(-) delete mode 100644 client/core/Cargo.toml delete mode 100644 client/core/src/lib.rs delete mode 100644 client/wrapper/console/Cargo.toml delete mode 100644 client/wrapper/console/src/main.rs diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index e2eabc28c..d3607d5cf 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -141,7 +141,7 @@ jobs: displayName: Copy assets inputs: sourceFolder: '$(Build.SourcesDirectory)/target/release' - contents: feather_server + contents: feather-server targetFolder: '$(Build.BinariesDirectory)/feather' condition: ne( variables['Agent.OS'], 'Windows_NT' ) @@ -149,7 +149,7 @@ jobs: displayName: Copy assets inputs: sourceFolder: '$(Build.SourcesDirectory)\target\release' - contents: feather_server.exe + contents: feather-server.exe targetFolder: '$(Build.BinariesDirectory)\feather' condition: eq( variables['Agent.OS'], 'Windows_NT' ) diff --git a/Cargo.lock b/Cargo.lock index 4dd8806b1..cd18cd5aa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -556,32 +556,21 @@ dependencies = [ ] [[package]] -name = "feather_api" -version = "0.1.0" - -[[package]] -name = "feather_blocks" -version = "0.3.0" +name = "feather-blocks" +version = "0.4.0" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "feather_codegen 0.3.0", + "feather-codegen 0.4.0", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-derive 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "feather_client_core" -version = "0.1.0" -dependencies = [ - "feather_core 0.3.0", -] - -[[package]] -name = "feather_codegen" -version = "0.3.0" +name = "feather-codegen" +version = "0.4.0" dependencies = [ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -593,15 +582,8 @@ dependencies = [ ] [[package]] -name = "feather_console_client" -version = "0.1.0" -dependencies = [ - "feather_client_core 0.1.0", -] - -[[package]] -name = "feather_core" -version = "0.3.0" +name = "feather-core" +version = "0.4.0" dependencies = [ "aes 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -609,9 +591,9 @@ dependencies = [ "cfb8 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "derive-new 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "feather_blocks 0.3.0", - "feather_codegen 0.3.0", - "feather_items 0.1.0", + "feather-blocks 0.4.0", + "feather-codegen 0.4.0", + "feather-items 0.4.0", "flate2 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", "hash32 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "hash32-derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -628,8 +610,8 @@ dependencies = [ ] [[package]] -name = "feather_generator" -version = "0.3.0" +name = "feather-generator" +version = "0.4.0" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -647,24 +629,24 @@ dependencies = [ ] [[package]] -name = "feather_item_block" -version = "0.1.0" +name = "feather-item-block" +version = "0.4.0" dependencies = [ - "feather_blocks 0.3.0", - "feather_items 0.1.0", + "feather-blocks 0.4.0", + "feather-items 0.4.0", ] [[package]] -name = "feather_items" -version = "0.1.0" +name = "feather-items" +version = "0.4.0" dependencies = [ "num-derive 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "feather_server" -version = "0.3.0" +name = "feather-server" +version = "0.4.0" dependencies = [ "backtrace 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -675,9 +657,9 @@ dependencies = [ "derive-new 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "derive_deref 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "feather_codegen 0.3.0", - "feather_core 0.3.0", - "feather_item_block 0.1.0", + "feather-codegen 0.4.0", + "feather-core 0.4.0", + "feather-item-block 0.4.0", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "hashbrown 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapless 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -710,6 +692,10 @@ dependencies = [ "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "feather_api" +version = "0.1.0" + [[package]] name = "fixedbitset" version = "0.1.9" diff --git a/Cargo.toml b/Cargo.toml index ce2e02bda..4c9bd66dd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,8 +7,6 @@ members = [ "items", "item_block", "codegen", - "client/core", - "client/wrapper/console", "generator", "util/rand-legacy", ] \ No newline at end of file diff --git a/README.md b/README.md index 26a5b51c3..33dc41c63 100644 --- a/README.md +++ b/README.md @@ -16,19 +16,28 @@ Many basic features are already implemented: - [x] Inventory handling - [x] Movement broadcasting -Obviously, key features are missing. However, development is currently -quite active, and features should be added at a fast pace over the next few months. +Development is currently quite active, and features should be added at a fast pace over the next few months. ### Running -If you want to try out the software, you currently have to compile Feather yourself. - -Run ```cargo build --release``` in the repository's root directory to compile the code. To start the server, -you will have to do the following: -- Move the binary ```target/release/feather_server``` to your desired server directory. -- Copy a **1.13.2** Minecraft world save to the server directory, under the directory name "world." +We offer precompiled binaries for Windows and Linux at [GitHub Releases](https://github.com/caelunshun/feather/releases). + +To run Feather: +* Extract the downloaded archive. +* Move a 1.13.2 Minecraft world save to the directory you extracted the archive to. Name the world save "world." +* Run the binary. + * On Linux and macOS: `./feather_server` in the server directory + * On Windows: double-click `feather_server.exe` + +The server will create a configuration file (`feather.toml`) which you can modify. -Then, simply run the binary: ```./feather_server```. +Feather currently only supports 1.13.2 clients and world saves. In the future, additional versions will be supported. -The server will create a configuration file (`feather.toml`) which you can modify. +### Compiling +If you are on another platform, compile the server yourself to try it out: +```bash +git clone https://github.com/caelunshun/feather +cd feather +cargo build --release +``` -The server currently only supports 1.13.2 clients and world saves. In the future, additional versions will be supported. +The server executable will be located in `target/release`. \ No newline at end of file diff --git a/blocks/Cargo.toml b/blocks/Cargo.toml index cb33b328f..0f03e7c80 100644 --- a/blocks/Cargo.toml +++ b/blocks/Cargo.toml @@ -1,11 +1,11 @@ [package] -name = "feather_blocks" -version = "0.3.0" +name = "feather-blocks" +version = "0.4.0" authors = ["caelunshun "] edition = "2018" [dependencies] -feather_codegen = { path = "../codegen" } +feather-codegen = { path = "../codegen" } lazy_static = "1.4.0" byteorder = "1.3.2" failure = "0.1.5" diff --git a/client/core/Cargo.toml b/client/core/Cargo.toml deleted file mode 100644 index 17f4e323a..000000000 --- a/client/core/Cargo.toml +++ /dev/null @@ -1,8 +0,0 @@ -[package] -name = "feather_client_core" -version = "0.1.0" -authors = ["caelunshun "] -edition = "2018" - -[dependencies] -feather_core = { path = "../../core" } \ No newline at end of file diff --git a/client/core/src/lib.rs b/client/core/src/lib.rs deleted file mode 100644 index 8b1378917..000000000 --- a/client/core/src/lib.rs +++ /dev/null @@ -1 +0,0 @@ - diff --git a/client/wrapper/console/Cargo.toml b/client/wrapper/console/Cargo.toml deleted file mode 100644 index aa9776760..000000000 --- a/client/wrapper/console/Cargo.toml +++ /dev/null @@ -1,8 +0,0 @@ -[package] -name = "feather_console_client" -version = "0.1.0" -authors = ["caelunshun "] -edition = "2018" - -[dependencies] -feather_client_core = { path = "../../core" } \ No newline at end of file diff --git a/client/wrapper/console/src/main.rs b/client/wrapper/console/src/main.rs deleted file mode 100644 index f328e4d9d..000000000 --- a/client/wrapper/console/src/main.rs +++ /dev/null @@ -1 +0,0 @@ -fn main() {} diff --git a/codegen/Cargo.toml b/codegen/Cargo.toml index f8ae70698..0fd037d68 100644 --- a/codegen/Cargo.toml +++ b/codegen/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "feather_codegen" -version = "0.3.0" +name = "feather-codegen" +version = "0.4.0" authors = ["caelunshun "] edition = "2018" diff --git a/core/Cargo.toml b/core/Cargo.toml index 5e3813e85..99fc02cf5 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -1,14 +1,14 @@ [package] -name = "feather_core" -version = "0.3.0" +name = "feather-core" +version = "0.4.0" authors = ["caelunshun "] edition = "2018" publish = false [dependencies] -feather_codegen = { path = "../codegen" } -feather_blocks = { path = "../blocks" } -feather_items = { path = "../items" } +feather-codegen = { path = "../codegen" } +feather-blocks = { path = "../blocks" } +feather-items = { path = "../items" } lazy_static = "1.4.0" derive-new = "0.5.8" uuid = "0.7.4" diff --git a/generator/Cargo.toml b/generator/Cargo.toml index 4c85dfa33..15bb3ae62 100644 --- a/generator/Cargo.toml +++ b/generator/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "feather_generator" -version = "0.3.0" +name = "feather-generator" +version = "0.4.0" authors = ["caelunshun "] edition = "2018" description = "Code generators for Feather" diff --git a/item_block/Cargo.toml b/item_block/Cargo.toml index d8bd5a461..180c80c8d 100644 --- a/item_block/Cargo.toml +++ b/item_block/Cargo.toml @@ -1,11 +1,11 @@ [package] -name = "feather_item_block" -version = "0.1.0" +name = "feather-item-block" +version = "0.4.0" authors = ["caelunshun "] edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -feather_blocks = { path = "../blocks" } -feather_items = { path = "../items" } \ No newline at end of file +feather-blocks = { path = "../blocks" } +feather-items = { path = "../items" } \ No newline at end of file diff --git a/items/Cargo.toml b/items/Cargo.toml index c7452bd02..392650400 100644 --- a/items/Cargo.toml +++ b/items/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "feather_items" -version = "0.1.0" +name = "feather-items" +version = "0.4.0" authors = ["caelunshun "] edition = "2018" diff --git a/server/Cargo.toml b/server/Cargo.toml index edb59d0ff..68769070e 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,13 +1,12 @@ [package] -name = "feather_server" -version = "0.3.0" +name = "feather-server" +version = "0.4.0" authors = ["caelunshun "] edition = "2018" -publish = false [dependencies] -feather_core = { path = "../core" } -feather_item_block = { path = "../item_block" } +feather-core = { path = "../core" } +feather-item-block = { path = "../item_block" } mio = "0.6.19" mio-extras = "2.0.5" crossbeam = "0.7.2" @@ -45,7 +44,7 @@ nalgebra-glm = "0.4.2" nalgebra = "0.18.1" ncollide3d = "0.20.1" derive_deref = "1.1.0" -feather_codegen = { path = "../codegen" } +feather-codegen = { path = "../codegen" } bitflags = "1.1.0" fnv = "1.0.6" base64 = "0.10.1"