Merge pull request #8 from Big-Dungeons/bloom

Bloom

Author: SubAt0m1c

src/dungeon/room/room.rs

@@ -111,10 +111,8 @@ impl Room {
 
         let mut num: u8 = 0;
         for i in 0..4 {
+            num <<= 1;
             num |= doors_opt[i] as u8;
-            if i < 3 {
-                num <<= 1;
-            }
         }
 
         // println!("{:04b} {:?}", num, doors_opt);
@@ -307,7 +305,15 @@ impl Room {
 
             world.set_block_at(block, corner.x + bp.x, y, corner.z + bp.z);
         }
+    }
+
+    pub fn get_world_pos(&self, room_pos: &BlockPos) -> BlockPos {
+        let corner = self.get_corner_pos();
 
+        room_pos.clone()
+            .rotate(self.rotation)
+            .add_x(corner.x)
+            .add_z(corner.z)
     }
 }
 

src/main.rs

@@ -6,7 +6,7 @@ mod utils;
 use crate::dungeon::door::DoorType;
 use crate::dungeon::dungeon::Dungeon;
 use crate::dungeon::dungeon_state::DungeonState;
-use crate::dungeon::room::room_data::RoomData;
+use crate::dungeon::room::room_data::{RoomData, RoomType};
 use crate::dungeon::room::secrets;
 use crate::dungeon::room::secrets::SecretType::WitherEssence;
 use crate::dungeon::room::secrets::{DungeonSecret, SecretType};
@@ -97,7 +97,8 @@ async fn main() -> Result<()> {
     let dungeon_strings = include_str!("dungeon_storage/dungeons.txt")
         .split("\n")
         .collect::<Vec<&str>>();
-
+    
+    // Check if a custom dungeon str has been given via cli args
     let dungeon_str = match args.len() {
         0..=1 => {
             let mut rng = rand::rng();
@@ -127,6 +128,17 @@ async fn main() -> Result<()> {
     for room in &dungeon.rooms {
         // println!("Room: {:?} type={:?} rotation={:?} shape={:?} corner={:?}", room.segments, room.room_data.room_type, room.rotation, room.room_data.shape, room.get_corner_pos());
         room.load_into_world(&mut server.world);
+
+        // Set the spawn point to be inside of the spawn room
+        if room.room_data.room_type == RoomType::Entrance {
+            server.world.set_spawn_point(
+                room.get_world_pos(&BlockPos {
+                    x: 15,
+                    y: 72,
+                    z: 18
+                })
+            );
+        }
     }
 
     for door in &dungeon.doors {

src/server/block/block_pos.rs

@@ -89,6 +89,22 @@ impl BlockPos {
             z: self.z + other.z
         }
     }
+
+    pub fn subtract(&self, other: &BlockPos) -> Self {
+        Self {
+            x: self.x - other.x,
+            y: self.y - other.y,
+            z: self.z - other.z
+        }
+    }
+
+    pub fn as_vec3f(&self) -> DVec3 {
+            DVec3 {
+                x: self.x as f64,
+                y: self.y as f64,
+                z: self.z as f64
+            }
+    }
 }
 
 impl PacketWrite for BlockPos {

src/server/items/mod.rs

@@ -18,6 +18,7 @@ pub enum Item {
     AspectOfTheVoid,
     DiamondPickaxe,
     SpiritSceptre,
+    SpeedBoots,
 }
 
 impl Item {
@@ -122,6 +123,30 @@ impl Item {
                 metadata: 0,
                 tag_compound: None,
             },
+            Item::SpeedBoots => ItemStack {
+                item: 301,
+                stack_size: 1,
+                metadata: 0,
+                tag_compound: Some(NBT::with_nodes(vec![
+                    NBT::compound("display", vec![
+                        NBT::int("color", 0),
+                        NBT::string("Name", "§bSpeedy Boots"),
+                        NBT::list_from_string("Lore", indoc! {r#"
+                            Why don't these work ):
+                        "#}),
+                    ]),
+                    NBT::list("AttributeModifiers", TAG_COMPOUND_ID, vec![
+                        NBTNode::Compound(vec![
+                            NBT::string("Name", "generic.movementSpeed"),
+                            NBT::string("AttributeName", "generic.movementSpeed"),
+                            NBT::double("Amount", 0.4),
+                            NBT::int("Operation", 0),
+                            NBT::long("UUIDLeast", 121742),
+                            NBT::long("UUIDMost", 38678),
+                        ]),
+                    ])
+                ])),
+            }
         };
         if let Some(ref mut tag) = stack.tag_compound {
             tag.nodes.push(NBT::byte("Unbreakable", 1));

src/server/server.rs

@@ -44,11 +44,7 @@ impl Server {
             MainThreadMessage::NewPlayer { client_id, username } => {
                 println!("added player with id {client_id}");
 
-                let spawn_point = DVec3 {
-                    x: 20.0,
-                    y: 69.0,
-                    z: 20.0,
-                };
+                let spawn_pos = self.world.spawn_point.as_vec3f();
 
                 let mut player = Player::new(
                     self,
@@ -57,7 +53,7 @@ impl Server {
                     GameProfile {
                         username
                     },
-                    spawn_point,
+                    spawn_pos,
                 );
                 println!("player entity id: {}", player.entity_id);
 

src/server/utils/nbt/mod.rs

@@ -56,6 +56,14 @@ impl NBT {
     pub fn long(name: &str, value: i64) -> (String, NBTNode) {
         (name.to_string(), NBTNode::Long(value))
     }
+
+    pub fn float(name: &str, value: f32) -> (String, NBTNode) {
+        (name.to_string(), NBTNode::Float(value))
+    }
+
+    pub fn double(name: &str, value: f64) -> (String, NBTNode) {
+        (name.to_string(), NBTNode::Double(value))
+    }
 
     /// takes a string,
     /// splits it into lines and creates a list nbt node representing strings.

src/server/world.rs

@@ -37,6 +37,7 @@ pub struct World {
     // pub commands: Vec<Command>
 
     // pub player_info: PlayerList,
+    pub spawn_point: BlockPos,
 }
 
 impl World {
@@ -53,9 +54,12 @@ impl World {
             next_entity_id: 1, // might have to start at 1
             players: HashMap::new(),
             entities: HashMap::new(),
+            spawn_point: BlockPos {
+                x: 20,
+                y: 69,
+                z: 20,
+            },
             entities_for_removal: VecDeque::new(),
-
-            // commands: Vec::new()
         }
     }
 
@@ -147,6 +151,10 @@ impl World {
         self.chunk_grid.get_block_at(x, y, z)
     }
 
+    pub fn set_spawn_point(&mut self, new_spawn: BlockPos) {
+        self.spawn_point = new_spawn;
+    }
+
     pub fn fill_blocks(&mut self, block: Blocks, start: BlockPos, end: BlockPos) {
         // should probably use a multi block change instead,
         // however it only applies to one chunk,