feat: upgrade items change based on XP

Author: andrewgazelka

crates/hyperion-item/src/builder.rs

@@ -115,6 +115,11 @@ impl ItemBuilder {
         self
     }
 
+    pub const fn kind(mut self, kind: ItemKind) -> Self {
+        self.kind = kind;
+        self
+    }
+
     /// Sets a custom name for the item
     pub fn name(mut self, name: impl Into<String>) -> Self {
         let nbt = self.nbt.get_or_insert_with(nbt::Compound::new);
@@ -127,7 +132,13 @@ impl ItemBuilder {
 
         // Create a new display compound with the name
         let mut new_display = display;
-        new_display.insert("Name", Value::String(name.into()));
+
+        let name = name.into();
+
+        // '{"text":"Your Custom Name"}'
+        let name = format!(r#"{{"text":"{name}"}}"#);
+
+        new_display.insert("Name", Value::String(name));
 
         // Insert the updated display compound
         nbt.insert("display", Value::Compound(new_display));

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

@@ -32,6 +32,7 @@ impl Rank {
         inventory: &mut PlayerInventory,
         world: &World,
         build_count: i8,
+        extra_levels: u8,
     ) {
         inventory.clear();
         let upgrade_not_available = ItemBuilder::new(ItemKind::GrayDye);
@@ -75,16 +76,33 @@ impl Rank {
 
         inventory.set_boots(boots);
 
-        let upgrades = ["Speed", "Health", "Armor", "Damage"];
+        let upgrades = ["Speed", "Health", "Armor", "Damage"]
+            .into_iter()
+            .map(|title| match extra_levels {
+                0 => format!("§6§l{title}"),
+                _ => format!("§6§l{title}§e §c({extra_levels})"),
+            });
+
+        let upgrade_available = [
+            ItemKind::BlueDye,   // Speed
+            ItemKind::RedDye,    // Health
+            ItemKind::YellowDye, // Armor
+            ItemKind::GreenDye,  // Damage
+        ];
 
         world.get::<&Handles>(|handles| {
-            for (i, upgrade) in upgrades.into_iter().enumerate() {
+            for ((i, upgrade), available_item) in upgrades.enumerate().zip(upgrade_available) {
                 let slot = u16::try_from(i).unwrap() + UPGRADE_START_SLOT;
-                let item = upgrade_not_available
+                let mut item = upgrade_not_available
                     .clone()
                     .name(upgrade)
-                    .handler(handles.speed)
-                    .build();
+                    .handler(handles.speed);
+
+                if extra_levels > 0 {
+                    item = item.kind(available_item);
+                }
+
+                let item = item.build();
                 inventory.set_hotbar(slot, item);
             }
         });

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

@@ -1,20 +1,24 @@
 use clap::ValueEnum;
 use flecs_ecs::{
-    core::{Entity, IdOperations, World},
+    core::{flecs, Entity, IdOperations, World},
     macros::Component,
     prelude::Module,
 };
-use hyperion::storage::{ClickEvent, EventFn};
+use hyperion::{
+    simulation::Player,
+    storage::{ClickEvent, EventFn},
+};
 
 pub mod inventory;
 pub mod skin;
 
-#[derive(Copy, Clone, Debug, ValueEnum, PartialEq, Eq, Component)]
+#[derive(Copy, Clone, Debug, ValueEnum, PartialEq, Eq, Component, Default)]
 #[repr(C)]
 pub enum Rank {
     /// ![Widget Example](https://i.imgur.com/pW7v0Xn.png)
     ///
     /// The stick is the starting rank.
+    #[default]
     Stick, // -> [Pickaxe | Sword | Bow ]
 
     Archer,
@@ -28,8 +32,11 @@ pub enum Rank {
     Builder,
 }
 
-#[derive(Copy, Clone, Debug, PartialEq, Eq, ValueEnum, PartialOrd, Ord)]
+#[derive(
+    Copy, Clone, Debug, PartialEq, Eq, ValueEnum, PartialOrd, Ord, Component, Default
+)]
 pub enum Team {
+    #[default]
     Blue,
     Green,
     Red,
@@ -47,9 +54,18 @@ pub struct Handles {
 impl Module for RankTree {
     fn module(world: &World) {
         world.import::<hyperion_item::ItemModule>();
+        world.component::<Team>();
         world.component::<Rank>();
         world.component::<Handles>();
 
+        world
+            .component::<Player>()
+            .add_trait::<(flecs::With, Team)>();
+
+        world
+            .component::<Player>()
+            .add_trait::<(flecs::With, Rank)>();
+
         let handler: EventFn<ClickEvent> = |query, _| {
             let cursor = query.inventory.get_cursor();
             println!("clicked {cursor:?}");

events/tag/src/command/rank.rs

@@ -52,7 +52,7 @@ impl MinecraftCommand for ClassCommand {
                 |(stream, uuid, inventory, position, yaw, pitch, main_block_count)| {
                     inventory.clear();
 
-                    rank.apply_inventory(team, inventory, world, **main_block_count);
+                    rank.apply_inventory(team, inventory, world, **main_block_count, 0);
 
                     let minecraft_id = caller.minecraft_id();
                     let mut bundle = DataBundle::new(compose);

events/tag/src/component.rs

@@ -17,11 +17,11 @@ use hyperion::{
 use hyperion_clap::hyperion_command::CommandRegistry;
 use module::block::BlockModule;
 
-mod component;
 mod module;
 
 use derive_more::{Deref, DerefMut};
 use hyperion::glam::IVec3;
+use hyperion_rank_tree::Team;
 use module::{attack::AttackModule, level::LevelModule, regeneration::RegenerationModule};
 
 use crate::{
@@ -57,15 +57,14 @@ impl Module for ProofOfConceptModule {
             .component::<Player>()
             .add_trait::<(flecs::With, MainBlockCount)>();
 
-        world.component::<component::team::Team>();
         world.import::<hyperion_rank_tree::RankTree>();
 
         world.component::<OreVeins>();
         world.set(OreVeins::default());
 
         world
             .component::<Player>()
-            .add_trait::<(flecs::With, component::team::Team)>();
+            .add_trait::<(flecs::With, Team)>();
 
         world.import::<SpawnModule>();
         world.import::<ChatModule>();

events/tag/src/component/team.rs

@@ -1,25 +1,68 @@
 use flecs_ecs::{
-    core::{World, flecs},
+    core::{SystemAPI, World, WorldProvider, flecs},
     macros::Component,
     prelude::Module,
 };
-use hyperion::simulation::Player;
+use hyperion::{
+    Prev,
+    simulation::{Player, Xp},
+};
+use hyperion_inventory::PlayerInventory;
+use hyperion_rank_tree::{Rank, Team};
+
+use crate::MainBlockCount;
 
 #[derive(Component)]
 pub struct LevelModule;
 
 #[derive(Component, Default, Copy, Clone, Debug)]
 #[meta]
-pub struct Level {
-    pub value: usize,
+pub struct UpgradedTo {
+    pub value: u8,
 }
 
 impl Module for LevelModule {
     #[allow(clippy::excessive_nesting)]
     fn module(world: &World) {
-        world.component::<Level>().meta();
+        world.component::<UpgradedTo>().meta();
         world
             .component::<Player>()
-            .add_trait::<(flecs::With, Level)>(); // todo: how does this even call Default? (IndraDb)
+            .add_trait::<(flecs::With, UpgradedTo)>(); // todo: how does this even call Default? (IndraDb)
+
+        // on Xp gain,
+        world
+            .system_named::<(
+                &(Prev, Xp),
+                &Xp,
+                &UpgradedTo,
+                &Rank,
+                &Team,
+                &MainBlockCount,
+                &mut PlayerInventory,
+            )>("level_up")
+            .multi_threaded()
+            .kind::<flecs::pipeline::PreStore>()
+            .each_entity(
+                |entity, (prev, xp, upgraded_to, rank, team, main_block_count, inventory)| {
+                    if *xp <= *prev {
+                        // we are only considering gains
+                        return;
+                    }
+
+                    let prev_level = prev.get_visual().level;
+                    let new_level = xp.get_visual().level;
+
+                    if new_level <= prev_level {
+                        // only considering our level increasing
+                        return;
+                    }
+
+                    let world = entity.world();
+
+                    let level_diff = new_level - upgraded_to.value;
+
+                    rank.apply_inventory(*team, inventory, &world, **main_block_count, level_diff);
+                },
+            );
     }
 }