split dungeon_items.rs between separate files

Author: Stivais

Cargo.lock

@@ -25,6 +25,7 @@ enumset = "1.1.10"
 fstr = { path = "crates/fstr" }
 include_dir = "0.7.4"
 bevy_ecs = "0.18.0"
+enum_dispatch = "0.3.13"
 
 [profile.dev.package."*"]
 opt-level = 3

Cargo.toml

@@ -1,7 +1,14 @@
 use crate::dungeon::door::door::{Door, DoorType};
 use crate::dungeon::door::door_positions::DOOR_POSITIONS;
 use crate::dungeon::dungeon_player::DungeonPlayer;
-use crate::dungeon::items::dungeon_items::DungeonItem;
+use crate::dungeon::items::aspect_of_the_void::AspectOfTheVoid;
+use crate::dungeon::items::ender_pearl::EnderPearl;
+use crate::dungeon::items::hyperion::Hyperion;
+use crate::dungeon::items::magical_map::MagicalMap;
+use crate::dungeon::items::pickaxe::Pickaxe;
+use crate::dungeon::items::skyblock_menu::SkyblockMenu;
+use crate::dungeon::items::spirit_sceptre::SpiritSceptre;
+use crate::dungeon::items::tactical_insertion::TacticalInsertion;
 use crate::dungeon::map::DungeonMap;
 use crate::dungeon::room::room::{Room, RoomNeighbour, RoomSegment, RoomStatus};
 use crate::dungeon::room::room_data::{get_random_data_with_type, RoomData, RoomShape, RoomType};
@@ -196,13 +203,13 @@ impl WorldExtension for Dungeon {
 
         player.extension.sidebar.write_init_packets(&mut player.packet_buffer);
 
-        player.inventory.set_slot(36, Some(DungeonItem::Hyperion));
-        player.inventory.set_slot(37, Some(DungeonItem::AspectOfTheVoid));
-        player.inventory.set_slot(38, Some(DungeonItem::EnderPearl));
-        player.inventory.set_slot(39, Some(DungeonItem::Pickaxe));
-        player.inventory.set_slot(41, Some(DungeonItem::SpiritSceptre));
-        player.inventory.set_slot(42, Some(DungeonItem::TacticalInsertion));
-        player.inventory.set_slot(44, Some(DungeonItem::SkyblockMenu));
+        player.inventory.set_slot(36, Some(Hyperion.into()));
+        player.inventory.set_slot(37, Some(AspectOfTheVoid.into()));
+        player.inventory.set_slot(38, Some(EnderPearl.into()));
+        player.inventory.set_slot(39, Some(Pickaxe.into()));
+        player.inventory.set_slot(41, Some(SpiritSceptre.into()));
+        player.inventory.set_slot(42, Some(TacticalInsertion.into()));
+        player.inventory.set_slot(44, Some(SkyblockMenu.into()));
         player.sync_inventory();
 
         let cmd = command!("tpr", |player: &mut Player<DungeonPlayer>, room_name: GreedyString| {
@@ -256,7 +263,7 @@ impl Dungeon {
             if let OpenContainer::Menu(_) = player.get_container() {
                 player.open_container(OpenContainer::None)
             }
-            player.inventory.set_slot(44, Some(DungeonItem::MagicalMap));
+            player.inventory.set_slot(44, Some(MagicalMap.into()));
             player.sync_inventory();
         }
 

src/dungeon/dungeon.rs

@@ -1,6 +1,6 @@
 use crate::dungeon::dungeon::{Dungeon, DungeonState};
 use crate::dungeon::items::ability::{Ability, ActiveAbility, Cooldown};
-use crate::dungeon::items::dungeon_items::DungeonItem;
+use crate::dungeon::items::dungeon_items::{DungeonItem, DungeonItems};
 use crate::dungeon::room::room::Room;
 use chrono::Local;
 use glam::IVec3;
@@ -28,13 +28,13 @@ pub struct DungeonPlayer {
     // maybe disallow multiple of the same,
     // however if you pair with cooldowns it should be fine
     pub active_abilities: Cell<Vec<ActiveAbility>>,
-    pub cooldowns: HashMap<DungeonItem, Cooldown>,
+    pub cooldowns: HashMap<DungeonItems, Cooldown>,
 
 }
 
 impl PlayerExtension for DungeonPlayer {
     type World = Dungeon;
-    type Item = DungeonItem;
+    type Item = DungeonItems;
 
     fn tick(player: &mut Player<Self>) {
         if player.ticks_existed.is_multiple_of(60) {
@@ -77,7 +77,7 @@ impl PlayerExtension for DungeonPlayer {
         match action {
             PlayerDiggingAction::StartDestroyBlock => {
                 if let Some(item) = *player.inventory.get_hotbar_slot(player.held_slot as usize) {
-                    if matches!(item, DungeonItem::Pickaxe) {
+                    if matches!(item, DungeonItems::Pickaxe(_)) {
                         restore_block = true;
                     }
                 }
@@ -101,7 +101,7 @@ impl PlayerExtension for DungeonPlayer {
     }
 
     fn interact(player: &mut Player<Self>, item: Option<ItemStack>, block: Option<BlockInteractResult>) {
-        if let Some(block) = block {
+        if let Some(block) = &block {
             {
                 let mut pos = block.position;
                 match block.direction {
@@ -130,18 +130,18 @@ impl PlayerExtension for DungeonPlayer {
             player.sync_inventory();
         }
         if let Some(held_item) = held_item {
-            held_item.on_right_click(player)
+            DungeonItem::on_interact(&held_item, player, block);
         }
     }
 }
 
 impl DungeonPlayer {
 
-    pub fn item_cooldown(&self, item: &DungeonItem) -> Option<&Cooldown> {
+    pub fn item_cooldown(&self, item: &DungeonItems) -> Option<&Cooldown> {
         self.cooldowns.get(item)
     }
 
-    pub fn add_item_cooldown(&mut self, item: &DungeonItem, cooldown: Cooldown) {
+    pub fn add_item_cooldown(&mut self, item: &DungeonItems, cooldown: Cooldown) {
         self.cooldowns.insert(*item, cooldown);
     }