Skip to content

Commit 17ae167

Browse files
committed
use data from submodule instead of asset
1 parent 06f8619 commit 17ae167

File tree

8 files changed

+95
-230
lines changed

8 files changed

+95
-230
lines changed

Cargo.lock

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,10 @@ indoc = "2.0.6"
2020
server = { path = "server" }
2121
replays = { path = "replays" }
2222
chrono = "0.4.42"
23-
base64 = "0.22.1"
2423
glam = "0.30.5"
25-
reqwest = "0.12.24"
26-
zip = "6.0.0"
2724
enumset = "1.1.10"
2825
fstr = { path = "crates/fstr" }
26+
include_dir = "0.7.4"
2927

3028
[profile.dev.package."*"]
3129
opt-level = 3

src/assets/assets.rs

Lines changed: 0 additions & 87 deletions
This file was deleted.

src/assets/load_asset.rs

Lines changed: 0 additions & 116 deletions
This file was deleted.

src/assets/mod.rs

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/dungeon/door/door.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ use rand::prelude::IndexedRandom;
66
use server::block::block_parameter::{Axis, BlockColor};
77
use server::block::rotatable::Rotate;
88
use server::block::Block;
9+
use server::utils::hasher::deterministic_hasher::DeterministicHashMap;
910
use server::world::chunk::chunk_grid::ChunkGrid;
1011
use server::World;
11-
use std::collections::HashMap;
1212

1313
#[derive(Hash, Eq, PartialEq)]
1414
pub enum DoorType {
@@ -60,7 +60,7 @@ impl Door {
6060
pub fn load_into_world(
6161
&self,
6262
chunk_grid: &mut ChunkGrid,
63-
door_blocks: &HashMap<DoorType, Vec<Vec<Block>>>
63+
door_blocks: &DeterministicHashMap<DoorType, Vec<Vec<Block>>>
6464
) {
6565
// Area to fill with air
6666
let (dx, dz) = match self.axis {

0 commit comments

Comments
 (0)