implemented Gamemode

Author: Stivais

server/src/constants/gamemode.rs

@@ -0,0 +1,18 @@
+use crate::network::packets::packet_serialize::PacketSerializable;
+use bytes::BytesMut;
+
+#[repr(i8)]
+#[derive(Copy, Clone)]
+pub enum Gamemode {
+    Survival,
+    Creative,
+}
+
+impl PacketSerializable for Gamemode {
+    fn write_size(&self) -> usize {
+        (*self as i8).write_size()
+    }
+    fn write(&self, buf: &mut BytesMut) {
+        (*self as i8).write(buf)
+    }
+}

server/src/constants/mod.rs

@@ -2,9 +2,11 @@ pub mod particle;
 pub mod potions;
 pub mod sounds;
 pub mod entity_variants;
+pub mod gamemode;
 
 pub use entity_variants::EntityVariant;
 pub use entity_variants::ObjectVariant;
+pub use gamemode::Gamemode;
 pub use particle::Particle;
 pub use potions::PotionEffect;
 pub use sounds::Sound;

server/src/network/protocol/play/clientbound.rs

@@ -1,6 +1,6 @@
 use crate::constants::particle::Particle;
 use crate::constants::potions::PotionEffect;
-use crate::constants::{EntityVariant, ObjectVariant, Sound};
+use crate::constants::{EntityVariant, Gamemode, ObjectVariant, Sound};
 use crate::entity::entity_metadata::{EntityMetadata, PlayerMetadata};
 use crate::inventory::item_stack::ItemStack;
 use crate::network::binary::var_int::{var_int_size, write_var_int, VarInt};
@@ -100,7 +100,7 @@ register_packets! {
 packet_serializable! {
     pub struct JoinGame<'a> {
         pub entity_id: i32, // not VarInt,
-        pub gamemode: u8,
+        pub gamemode: Gamemode,
         pub dimension: u8,
         pub difficulty: u8,
         pub max_players: u8,

server/src/network/protocol/play/serverbound.rs

@@ -29,7 +29,7 @@ register_serverbound_packets! {
     CloseWindow = 0x0d;
     ClickWindow = 0x0e;
     ConfirmTransaction = 0x0f;
-    // CreativeInventoryAction = 0x10;
+    CreativeInventoryAction = 0x10;
     // EnchantItem = 0x11;
     // SetSign = 0x12;
     // ClientAbilities = 0x13;
@@ -239,6 +239,14 @@ packet_deserializable! {
     }
 }
 
+packet_deserializable! {
+    #[derive(Debug)]
+    pub struct CreativeInventoryAction {
+        pub slot_id: i16,
+        pub item_stack: Option<ItemStack>,
+    }
+}
+
 pub struct TabComplete {
     pub message: String,
     pub target_block: Option<IVec3>

server/src/player/packet_handling.rs

@@ -2,7 +2,7 @@ use crate::inventory::menu::OpenContainer;
 use crate::network::packets::packet::ProcessPacket;
 use crate::network::protocol::play::clientbound::Chat;
 use crate::network::protocol::play::serverbound;
-use crate::network::protocol::play::serverbound::{ArmSwing, ChatMessage, ClickWindow, ClientSettings, ClientStatus, HeldItemChange, PlayerAction, PlayerActionType, PlayerBlockPlacement, PlayerDigging, PlayerLook, PlayerPosition, PlayerPositionLook, PlayerUpdate, TabComplete, UseEntity};
+use crate::network::protocol::play::serverbound::{ArmSwing, ChatMessage, ClickWindow, ClientSettings, ClientStatus, CreativeInventoryAction, HeldItemChange, PlayerAction, PlayerActionType, PlayerBlockPlacement, PlayerDigging, PlayerLook, PlayerPosition, PlayerPositionLook, PlayerUpdate, TabComplete, UseEntity};
 use crate::player::player::{Player, PlayerExtension};
 use crate::types::chat_component::ChatComponent;
 use crate::types::direction::Direction;
@@ -156,6 +156,12 @@ impl ProcessPacket for serverbound::ConfirmTransaction {
     }
 }
 
+impl ProcessPacket for CreativeInventoryAction {
+    fn process<P: PlayerExtension>(&self, player: &mut Player<P>) {
+        // println!("{self:?}")
+    }
+}
+
 impl ProcessPacket for TabComplete {
     fn process<P: PlayerExtension>(&self, _: &mut Player<P>) {
         // for commands, we should have some tree system instead of recreating the mess that is mc 1.8.9 CommandBase

server/src/player/player.rs

@@ -1,4 +1,4 @@
-use crate::constants::Sound;
+use crate::constants::{Gamemode, Sound};
 use crate::entity::entity::EntityId;
 use crate::entity::entity_metadata::PlayerMetadata;
 use crate::inventory::item::{get_item_stack, Item};
@@ -69,6 +69,7 @@ pub struct Player<E : PlayerExtension> {
     pub client_id: ClientId,
     pub entity_id: EntityId,
 
+    pub gamemode: Gamemode,
     pub metadata: PlayerMetadata,
     pub dirty_metadata: bool,
 
@@ -108,6 +109,7 @@ impl<E : PlayerExtension> Player<E> {
         position: DVec3,
         yaw: f32,
         pitch: f32,
+        gamemode: Gamemode,
         extension: E,
     ) -> Self {
         Self {
@@ -116,6 +118,7 @@ impl<E : PlayerExtension> Player<E> {
             profile: game_profile,
             client_id,
             entity_id,
+            gamemode,
             metadata: PlayerMetadata { layers: Default::default() },
             dirty_metadata: false,
             position,

server/src/world/world.rs

@@ -1,4 +1,4 @@
-use crate::constants::Particle;
+use crate::constants::{Gamemode, Particle};
 use crate::entity::entity::{Entity, EntityExtension, EntityId};
 use crate::entity::entity_appearance::EntityAppearance;
 use crate::network::binary::var_int::VarInt;
@@ -70,16 +70,26 @@ impl<W: WorldExtension> World<W> {
         pitch: f32,
         profile: GameProfile,
         client_id: ClientId,
+        gamemode: Gamemode,
         extension: W::Player,
     ) -> &mut Player<W::Player> {
         let entity_id = self.new_entity_id();
+
         let mut player = Player::new(
-            self, profile, client_id, entity_id, position, yaw, pitch, extension,
+            self,
+            profile,
+            client_id,
+            entity_id,
+            position,
+            yaw,
+            pitch,
+            gamemode,
+            extension
         );
 
         player.write_packet(&JoinGame {
             entity_id: player.entity_id,
-            gamemode: 0,
+            gamemode,
             dimension: 0,
             difficulty: 0,
             max_players: 0,

src/dungeon/dungeon.rs

@@ -9,6 +9,7 @@ use anyhow::bail;
 use glam::{ivec3, DVec3, IVec2};
 use server::block::block_parameter::Axis;
 use server::block::rotatable::Rotatable;
+use server::constants::Gamemode;
 use server::inventory::menu::OpenContainer;
 use server::network::binary::var_int::VarInt;
 use server::network::protocol::play::clientbound::{Chat, EntityProperties, PlayerAbilities};
@@ -142,6 +143,7 @@ impl WorldExtension for Dungeon {
             0.0,
             profile,
             client_id,
+            Gamemode::Survival,
             DungeonPlayer { 
                 is_ready: false,
                 sidebar: Sidebar::new(),

src/dungeon/dungeon_player.rs

@@ -222,22 +222,22 @@ impl DungeonPlayer {
         if world.has_started() {
             if let Some(room_rc) = player.extension.get_current_room() {
                 for neighbour in room_rc.borrow().neighbours() {
-                    {
-                        let mut door = neighbour.door.borrow_mut();
+                    let mut door = neighbour.door.borrow_mut();
 
-                        if !door.contains(position) || door.is_open {
-                            continue;
-                        }
-                        if !door.can_open(world) {
-                            // todo: proper chat message and sound
-                            player.write_packet(&Chat {
-                                component: ChatComponent::new("no key"),
-                                chat_type: 0,
-                            });
-                            continue;
-                        }
-                        door.open(world);
+                    if !door.contains(position) || door.is_open {
+                        continue;
                     }
+                    if !door.can_open(world) {
+                        // todo: proper chat message and sound
+                        player.write_packet(&Chat {
+                            component: ChatComponent::new("no key"),
+                            chat_type: 0,
+                        });
+                        continue;
+                    }
+                    door.open(world);
+                    drop(door);
+
                     neighbour.room.borrow_mut().discovered = true;
                     world.map.draw_room(&neighbour.room.borrow());
                     return true;