Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@ jobs:
with:
targets: ${{ matrix.target }}

- name: Install JDK
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: '21'

- uses: Swatinem/rust-cache@v2

- name: Build
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ jobs:
with:
components: rustfmt, clippy

- name: Install JDK
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: '21'

- uses: Swatinem/rust-cache@v2

- name: Run cargo fmt
Expand Down Expand Up @@ -71,6 +77,12 @@ jobs:
with:
targets: ${{ matrix.target }}

- name: Install JDK
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: '21'

- uses: Swatinem/rust-cache@v2

- name: Build
Expand Down Expand Up @@ -105,6 +117,12 @@ jobs:
with:
targets: ${{ matrix.target }}

- name: Install JDK
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: '21'

- uses: Swatinem/rust-cache@v2

- name: Install cargo-nextest
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ Cargo.lock
config.toml
.temp

assets/generated/*

.etc/blocks.json

flame.svg
Expand Down
66 changes: 37 additions & 29 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,18 @@ members = [
"src/adapters/anvil",
"src/adapters/nbt",
"src/app",
"src/assets",
"src/base/general_purpose",
"src/base/logging",
"src/base/macros",
"src/base/profiling",
"src/base/threadpool",
"src/bin",
"src/blocks",
"src/blocks/crates/property",
"src/blocks/crates/generated",
"src/blocks/crates/build",
"src/blocks/crates/data",
"src/bin",
"src/blocks/crates/generated",
"src/blocks/crates/property",
"src/command-infra",
"src/components",
"src/core",
Expand All @@ -37,8 +38,8 @@ members = [
"src/game_systems/src/background",
"src/game_systems/src/interactions",
"src/game_systems/src/mobs",
"src/game_systems/src/pathfinding",
"src/game_systems/src/packets",
"src/game_systems/src/pathfinding",
"src/game_systems/src/physics",
"src/game_systems/src/player",
"src/game_systems/src/world",
Expand Down Expand Up @@ -121,47 +122,48 @@ debug = true
#=============== Dependencies ==============#
[workspace.dependencies]
# Workspace members
temper-app = { path = "src/app" }
interactions = { path = "src/game_systems/src/interactions" }
temper-anvil = { path = "src/adapters/anvil" }
temper-blocks = { path = "src/blocks" }
temper-block-properties = { path = "src/blocks/crates/property" }
temper-app = { path = "src/app" }
temper-assets = { path = "src/assets" }
temper-block-data = { path = "src/blocks/crates/data" }
temper-block-properties = { path = "src/blocks/crates/property" }
temper-blocks = { path = "src/blocks" }
temper-codec = { path = "src/net/codec" }
temper-command-infra = { path = "src/command-infra" }
temper-components = { path = "src/components" }
temper-config = { path = "src/config" }
temper-core = { path = "src/core" }
temper-dashboard = { path = "src/dashboard" }
temper-data = { path = "src/data" }
temper-default-commands = { path = "src/default_commands" }
temper-encryption = { path = "src/net/encryption" }
temper-entities = { path = "src/entities" }
temper-game-systems = { path = "src/game_systems" }
temper-general-purpose = { path = "src/base/general_purpose" }
temper-inventories = { path = "src/inventories" }
temper-logging = { path = "src/base/logging" }
temper-macros = { path = "src/base/macros" }
temper-messages = { path = "src/messages" }
temper-nbt = { path = "src/adapters/nbt" }
temper-net-runtime = { path = "src/net/runtime" }
temper-particles = { path = "src/particles" }
temper-performance = { path = "src/performance" }
temper-codec = { path = "src/net/codec" }
temper-command-infra = { path = "src/command-infra" }
temper-protocol = { path = "src/net/protocol" }
temper-encryption = { path = "src/net/encryption" }
temper-permissions = { path = "src/permissions" }
temper-physics = { path = "src/physics" }
temper-profiling = { path = "src/base/profiling" }
temper-protocol = { path = "src/net/protocol" }
temper-registry = { path = "src/registry" }
temper-resources = { path = "src/resources" }
temper-scheduler = { path = "src/scheduler" }
temper-state = { path = "src/state" }
temper-storage = { path = "src/storage" }
temper-text = { path = "src/text" }
temper-threadpool = { path = "src/base/threadpool" }
temper-utils = { path = "src/utils" }
temper-world = { path = "src/world" }
temper-world-gen = { path = "src/world/gen" }
temper-world-format = { path = "src/world/format" }
temper-inventories = { path = "src/inventories" }
temper-data = { path = "src/data" }
temper-components = { path = "src/components" }
temper-dashboard = { path = "src/dashboard" }
temper-messages = { path = "src/messages" }
temper-entities = { path = "src/entities" }
temper-physics = { path = "src/physics" }
temper-particles = { path = "src/particles" }
temper-resources = { path = "src/resources" }
temper-game-systems = { path = "src/game_systems" }
interactions = { path = "src/game_systems/src/interactions" }
temper-permissions = { path = "src/permissions" }
temper-world-gen = { path = "src/world/gen" }

# Asynchronous
tokio = { version = "1.52.3", features = [
Expand Down Expand Up @@ -216,7 +218,7 @@ base64 = "0.22.1"

bitcode = "0.6.9"
bitcode_derive = "0.6.9"
toml = "1.1.2+spec-1.1.0"
toml = "1.1.2"
craftflow-nbt = "2.1.0"
figment = { version = "0.10.19", features = ["toml", "env"] }
simd-json = "0.17.0"
Expand All @@ -231,7 +233,7 @@ dashmap = { version = "7.0.0-rc2", features = ["serde"] }
uuid = { version = "1.23.4", features = ["v4", "v3", "serde"] }
indexmap = { version = "2.14.0", features = ["serde"] }
bimap = "0.6.3"
arrayvec = "0.7.7"
arrayvec = "0.7.8"
fastcache = "0.1.7"

# Macros
Expand Down Expand Up @@ -268,18 +270,20 @@ num_cpus = "1.17.0"
typename = "0.1.2"
bevy_ecs = { version = "0.19.0", features = ["multi_threaded", "trace", "debug"], default-features = false }
bevy_math = { version = "0.19.0", features = ["serialize"] }
rustc-hash = "2.1.2"
rustc-hash = "2.1.3"
once_cell = "1.21.4"
mime_guess = "2.0.5"
which = "8.0.4"
semver = "1.0.28"

## TUI/CLI
crossterm = "0.29.0"
ratatui-core = "0.1.2"
tui-input = "0.15.3"
ratatui = "0.30.2"
tui-logger = { version = "0.18.2", features = ["tracing-support", "crossterm"] }
tui-logger = { version = "0.18.3", features = ["tracing-support", "crossterm"] }
clap = { version = "4.6.1", features = ["derive", "env"] }
indicatif = "0.18.4"
indicatif = "0.18.6"
colored = "3.1.1"
unicode-width = "0.2.2"
heck = "0.5.0"
Expand All @@ -293,8 +297,12 @@ include_dir = "0.7.4"
# Benchmarking
criterion = { version = "0.8.2", features = ["html_reports"] }


# Build
phf = { version = "0.14.0", features = ["macros"] }
phf_codegen = { version = "0.14.0" }
build-print = "1.0.1"
workspace_root = "0.2.0"

# Web server
axum = { version = "0.8.9", features = ["tokio", "ws"] }
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@ on our GitHub Actions.

### Compile from source

##### What you'll need
- The Rust compiler, plus it's build system Cargo
- A Java 21 (or higher) JDK installed and available in your
PATH so assets can be extracted from the vanilla server

##### Clone and build the project.

```bash
Expand Down
1 change: 0 additions & 1 deletion assets/data/blockstates.json

This file was deleted.

1 change: 0 additions & 1 deletion assets/data/item_to_block_mapping.json

This file was deleted.

Loading
Loading