fix(tag): block count when changing classes

Author: andrewgazelka

crates/hyperion-rank-tree/src/inventory.rs

@@ -25,7 +25,13 @@ pub const UPGRADE_START_SLOT: u16 = 3;
 pub const GUI_SLOT: u16 = 8;
 
 impl Rank {
-    pub fn apply_inventory(self, team: Team, inventory: &mut PlayerInventory, world: &World) {
+    pub fn apply_inventory(
+        self,
+        team: Team,
+        inventory: &mut PlayerInventory,
+        world: &World,
+        build_count: i8,
+    ) {
         let upgrade_not_available = ItemBuilder::new(ItemKind::GrayDye);
 
         inventory.clear();
@@ -60,7 +66,7 @@ impl Rank {
         let default_pickaxe = ItemBuilder::new(ItemKind::WoodenPickaxe).build();
         inventory.set_hotbar(PICKAXE_SLOT, default_pickaxe);
 
-        let default_build_item = team.build_item().count(16).build();
+        let default_build_item = team.build_item().count(build_count).build();
         inventory.set_hotbar(BLOCK_SLOT, default_build_item);
 
         match self {

events/tag/src/command/rank.rs

@@ -25,6 +25,8 @@ use hyperion_clap::{CommandPermission, MinecraftCommand};
 use hyperion_inventory::PlayerInventory;
 use hyperion_utils::EntityExt;
 
+use crate::MainBlockCount;
+
 #[derive(Parser, CommandPermission, Debug)]
 #[command(name = "class")]
 #[command_permission(group = "Normal")]
@@ -45,11 +47,12 @@ impl MinecraftCommand for ClassCommand {
                 &Position,
                 &Yaw,
                 &Pitch,
+                &MainBlockCount,
             )>(
-                |(stream, uuid, inventory, position, yaw, pitch)| {
+                |(stream, uuid, inventory, position, yaw, pitch, main_block_count)| {
                     inventory.clear();
 
-                    rank.apply_inventory(team, inventory, world);
+                    rank.apply_inventory(team, inventory, world, **main_block_count);
 
                     let minecraft_id = caller.minecraft_id();
                     let mut bundle = DataBundle::new(compose);

events/tag/src/lib.rs

@@ -40,8 +40,23 @@ struct OreVeins {
     ores: gxhash::HashSet<IVec3>,
 }
 
+#[derive(Component, Deref, DerefMut)]
+struct MainBlockCount(i8);
+
+impl Default for MainBlockCount {
+    fn default() -> Self {
+        Self(16)
+    }
+}
+
 impl Module for ProofOfConceptModule {
     fn module(world: &World) {
+        world.component::<MainBlockCount>();
+
+        world
+            .component::<Player>()
+            .add_trait::<(flecs::With, MainBlockCount)>();
+
         world.component::<component::team::Team>();
         world.import::<hyperion_rank_tree::RankTree>();
 

events/tag/src/module/block.rs

@@ -32,7 +32,7 @@ use hyperion_rank_tree::inventory;
 use hyperion_scheduled::Scheduled;
 use tracing::{error, info_span};
 
-use crate::OreVeins;
+use crate::{MainBlockCount, OreVeins};
 
 #[derive(Component)]
 pub struct BlockModule;
@@ -95,6 +95,7 @@ impl Module for BlockModule {
                             .send(&world)
                             .unwrap();
                     }
+
                     for destroy in pending_air.destroy_at.pop_until(&now) {
                         // Play particle effect for block destruction
                         let center_block = destroy.position.as_dvec3() + DVec3::splat(0.5);
@@ -126,12 +127,13 @@ impl Module for BlockModule {
 
                         destroy.from
                             .entity_view(world)
-                            .get::<&mut PlayerInventory>(|inventory| {
+                            .get::<(&mut PlayerInventory, &mut MainBlockCount)>(|(inventory, main_block_count)| {
                                 let stack = inventory
                                     .get_hand_slot_mut(inventory::BLOCK_SLOT)
                                     .unwrap();
 
                                 stack.count = stack.count.saturating_add(1);
+                                **main_block_count = main_block_count.saturating_add(1);
                             });
 
 
@@ -238,14 +240,19 @@ impl Module for BlockModule {
             });
 
         system!("handle_placed_blocks", world, &mut Blocks($), &mut EventQueue<event::PlaceBlock>($), &mut PendingDestruction($))
-            .each(move |(mc, event_queue, pending_air): (&mut Blocks, &mut EventQueue<event::PlaceBlock>, &mut PendingDestruction)| {
+            .each_iter(move |it, _, (mc, event_queue, pending_air): (&mut Blocks, &mut EventQueue<event::PlaceBlock>, &mut PendingDestruction)| {
+                let world = it.world();
                 let span = info_span!("handle_placed_blocks");
                 let _enter = span.enter();
                 for event in event_queue.drain() {
                     let position = event.position;
 
                     mc.set_block(position, event.block).unwrap();
 
+                    event.from.entity_view(world).get::<&mut MainBlockCount>(|main_block_count| {
+                        **main_block_count = (**main_block_count - 1).max(0);
+                    });
+
                     let destroy = DestroyValue {
                         position,
                         from: event.from,