Eradicated clones

client/src/lib.rs

@@ -896,8 +896,7 @@ impl Client {
             .write_storage::<Controller>()
             .get_mut(self.entity)
         {
-            // TODO: Undo this clone, somehow...
+            controller.actions.push(control_action);
-            controller.actions.push(control_action.clone());
         }
         self.send_msg(ClientGeneral::ControlAction(control_action));
     }

common/src/comp/character_state.rs

@@ -1,6 +1,6 @@
 use crate::{
     combat::Attack,
-    comp::{Energy, InventoryManip, Ori, Pos, Vel},
+    comp::{Energy, LoadoutManip, Ori, Pos, Vel},
     event::{LocalEvent, ServerEvent},
     states::{behavior::JoinData, *},
 };
@@ -17,7 +17,7 @@ pub struct StateUpdate {
     pub ori: Ori,
     pub energy: Energy,
     pub swap_loadout: bool,
-    pub modify_loadout: Option<InventoryManip>,
+    pub modify_loadout: Option<LoadoutManip>,
     pub local_events: VecDeque<LocalEvent>,
     pub server_events: VecDeque<ServerEvent>,
 }

common/src/comp/controller.rs

@@ -22,6 +22,31 @@ pub enum InventoryManip {
     CraftRecipe(String),
 }
 
+#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
+pub enum LoadoutManip {
+    Swap(Slot, Slot),
+    Drop(Slot),
+}
+
+impl From<LoadoutManip> for InventoryManip {
+    fn from(loadout_manip: LoadoutManip) -> Self {
+        match loadout_manip {
+            LoadoutManip::Swap(slot1, slot2) => Self::Swap(slot1, slot2),
+            LoadoutManip::Drop(slot) => Self::Drop(slot),
+        }
+    }
+}
+
+impl From<InventoryManip> for Option<LoadoutManip> {
+    fn from(inv_manip: InventoryManip) -> Self {
+        match inv_manip {
+            InventoryManip::Swap(slot1, slot2) => Some(LoadoutManip::Swap(slot1, slot2)),
+            InventoryManip::Drop(slot) => Some(LoadoutManip::Drop(slot)),
+            _ => None,
+        }
+    }
+}
+
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub enum GroupManip {
     Invite(Uid),
@@ -46,10 +71,10 @@ pub enum ControlEvent {
     Respawn,
 }
 
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
 pub enum ControlAction {
     SwapLoadout,
-    ModifyLoadout(InventoryManip),
+    ModifyLoadout(Option<LoadoutManip>),
     Wield,
     GlideWield,
     Unwield,

common/src/comp/mod.rs

@@ -46,7 +46,7 @@ pub use chat::{
 };
 pub use controller::{
     Climb, ControlAction, ControlEvent, Controller, ControllerInputs, GroupManip, Input,
-    InventoryManip, MountState, Mounting,
+    InventoryManip, LoadoutManip, MountState, Mounting,
 };
 pub use energy::{Energy, EnergyChange, EnergySource};
 pub use group::Group;

common/src/states/behavior.rs

@@ -1,7 +1,7 @@
 use crate::{
     comp::{
         Beam, Body, CharacterState, ControlAction, Controller, ControllerInputs, Energy, Health,
-        Inventory, InventoryManip, Melee, Ori, PhysicsState, Pos, StateUpdate, Stats, Vel,
+        Inventory, LoadoutManip, Melee, Ori, PhysicsState, Pos, StateUpdate, Stats, Vel,
     },
     resources::DeltaTime,
     uid::Uid,
@@ -17,7 +17,7 @@ pub trait CharacterBehavior {
     fn behavior(&self, data: &JoinData) -> StateUpdate;
     // Impl these to provide behavior for these inputs
     fn swap_loadout(&self, data: &JoinData) -> StateUpdate { StateUpdate::from(data) }
-    fn modify_loadout(&self, data: &JoinData, _inv_manip: InventoryManip) -> StateUpdate {
+    fn modify_loadout(&self, data: &JoinData, _loadout_manip: Option<LoadoutManip>) -> StateUpdate {
         StateUpdate::from(data)
     }
     fn wield(&self, data: &JoinData) -> StateUpdate { StateUpdate::from(data) }
@@ -31,7 +31,7 @@ pub trait CharacterBehavior {
     fn handle_event(&self, data: &JoinData, event: ControlAction) -> StateUpdate {
         match event {
             ControlAction::SwapLoadout => self.swap_loadout(data),
-            ControlAction::ModifyLoadout(inv_manip) => self.modify_loadout(data, inv_manip),
+            ControlAction::ModifyLoadout(loadout_manip) => self.modify_loadout(data, loadout_manip),
             ControlAction::Wield => self.wield(data),
             ControlAction::GlideWield => self.glide_wield(data),
             ControlAction::Unwield => self.unwield(data),

common/src/states/dance.rs

@@ -1,6 +1,6 @@
 use super::utils::*;
 use crate::{
-    comp::{CharacterState, InventoryManip, StateUpdate},
+    comp::{CharacterState, LoadoutManip, StateUpdate},
     states::behavior::{CharacterBehavior, JoinData},
 };
 use serde::{Deserialize, Serialize};
@@ -42,9 +42,9 @@ impl CharacterBehavior for Data {
         update
     }
 
-    fn modify_loadout(&self, data: &JoinData, inv_manip: InventoryManip) -> StateUpdate {
+    fn modify_loadout(&self, data: &JoinData, loadout_manip: Option<LoadoutManip>) -> StateUpdate {
         let mut update = StateUpdate::from(data);
-        handle_modify_loadout(&mut update, inv_manip);
+        handle_modify_loadout(&mut update, loadout_manip);
         update
     }
 }

common/src/states/glide_wield.rs

@@ -1,6 +1,6 @@
 use super::utils::*;
 use crate::{
-    comp::{slot::EquipSlot, CharacterState, EnergySource, InventoryManip, StateUpdate},
+    comp::{slot::EquipSlot, CharacterState, EnergySource, LoadoutManip, StateUpdate},
     states::behavior::{CharacterBehavior, JoinData},
 };
 
@@ -69,9 +69,9 @@ impl CharacterBehavior for Data {
         update
     }
 
-    fn modify_loadout(&self, data: &JoinData, inv_manip: InventoryManip) -> StateUpdate {
+    fn modify_loadout(&self, data: &JoinData, loadout_manip: Option<LoadoutManip>) -> StateUpdate {
         let mut update = StateUpdate::from(data);
-        handle_modify_loadout(&mut update, inv_manip);
+        handle_modify_loadout(&mut update, loadout_manip);
         update
     }
 }

common/src/states/idle.rs

@@ -1,6 +1,6 @@
 use super::utils::*;
 use crate::{
-    comp::{InventoryManip, StateUpdate},
+    comp::{LoadoutManip, StateUpdate},
     states::behavior::{CharacterBehavior, JoinData},
 };
 
@@ -61,9 +61,9 @@ impl CharacterBehavior for Data {
         update
     }
 
-    fn modify_loadout(&self, data: &JoinData, inv_manip: InventoryManip) -> StateUpdate {
+    fn modify_loadout(&self, data: &JoinData, loadout_manip: Option<LoadoutManip>) -> StateUpdate {
         let mut update = StateUpdate::from(data);
-        handle_modify_loadout(&mut update, inv_manip);
+        handle_modify_loadout(&mut update, loadout_manip);
         update
     }
 }

common/src/states/sit.rs

@@ -1,6 +1,6 @@
 use super::utils::*;
 use crate::{
-    comp::{CharacterState, InventoryManip, StateUpdate},
+    comp::{CharacterState, LoadoutManip, StateUpdate},
     states::behavior::{CharacterBehavior, JoinData},
 };
 use serde::{Deserialize, Serialize};
@@ -42,9 +42,9 @@ impl CharacterBehavior for Data {
         update
     }
 
-    fn modify_loadout(&self, data: &JoinData, inv_manip: InventoryManip) -> StateUpdate {
+    fn modify_loadout(&self, data: &JoinData, loadout_manip: Option<LoadoutManip>) -> StateUpdate {
         let mut update = StateUpdate::from(data);
-        handle_modify_loadout(&mut update, inv_manip);
+        handle_modify_loadout(&mut update, loadout_manip);
         update
     }
 }

common/src/states/sneak.rs

@@ -1,6 +1,6 @@
 use super::utils::*;
 use crate::{
-    comp::{CharacterState, InventoryManip, StateUpdate},
+    comp::{CharacterState, LoadoutManip, StateUpdate},
     states::behavior::{CharacterBehavior, JoinData},
 };
 
@@ -60,9 +60,9 @@ impl CharacterBehavior for Data {
         update
     }
 
-    fn modify_loadout(&self, data: &JoinData, inv_manip: InventoryManip) -> StateUpdate {
+    fn modify_loadout(&self, data: &JoinData, loadout_manip: Option<LoadoutManip>) -> StateUpdate {
         let mut update = StateUpdate::from(data);
-        handle_modify_loadout(&mut update, inv_manip);
+        handle_modify_loadout(&mut update, loadout_manip);
         update
     }
 }

common/src/states/talk.rs

@@ -1,6 +1,6 @@
 use super::utils::*;
 use crate::{
-    comp::{CharacterState, InventoryManip, StateUpdate},
+    comp::{CharacterState, LoadoutManip, StateUpdate},
     states::behavior::{CharacterBehavior, JoinData},
 };
 use serde::{Deserialize, Serialize};
@@ -47,9 +47,9 @@ impl CharacterBehavior for Data {
         update
     }
 
-    fn modify_loadout(&self, data: &JoinData, inv_manip: InventoryManip) -> StateUpdate {
+    fn modify_loadout(&self, data: &JoinData, loadout_manip: Option<LoadoutManip>) -> StateUpdate {
         let mut update = StateUpdate::from(data);
-        handle_modify_loadout(&mut update, inv_manip);
+        handle_modify_loadout(&mut update, loadout_manip);
         update
     }
 }

common/src/states/utils.rs

@@ -4,7 +4,7 @@ use crate::{
         item::{Hands, ItemKind, Tool, ToolKind},
         quadruped_low, quadruped_medium,
         skills::{AxeSkill, BowSkill, HammerSkill, Skill, StaffSkill, SwordSkill},
-        theropod, Body, CharacterState, InventoryManip, StateUpdate,
+        theropod, Body, CharacterState, LoadoutManip, StateUpdate,
     },
     consts::{FRIC_GROUND, GRAVITY},
     event::LocalEvent,
@@ -360,8 +360,8 @@ pub fn attempt_swap_loadout(data: &JoinData, update: &mut StateUpdate) {
 }
 
 /// Handles inventory manipulations that affect the loadout
-pub fn handle_modify_loadout(update: &mut StateUpdate, inv_manip: InventoryManip) {
+pub fn handle_modify_loadout(update: &mut StateUpdate, loadout_manip: Option<LoadoutManip>) {
-    update.modify_loadout = Some(inv_manip);
+    update.modify_loadout = loadout_manip;
 }
 
 /// Checks that player can wield the glider and updates `CharacterState` if so

common/src/states/wielding.rs

@@ -1,6 +1,6 @@
 use super::utils::*;
 use crate::{
-    comp::{CharacterState, InventoryManip, StateUpdate},
+    comp::{CharacterState, LoadoutManip, StateUpdate},
     states::behavior::{CharacterBehavior, JoinData},
 };
 
@@ -57,9 +57,9 @@ impl CharacterBehavior for Data {
         update
     }
 
-    fn modify_loadout(&self, data: &JoinData, inv_manip: InventoryManip) -> StateUpdate {
+    fn modify_loadout(&self, data: &JoinData, loadout_manip: Option<LoadoutManip>) -> StateUpdate {
         let mut update = StateUpdate::from(data);
-        handle_modify_loadout(&mut update, inv_manip);
+        handle_modify_loadout(&mut update, loadout_manip);
         update
     }
 }

common/sys/src/character_behavior.rs

@@ -268,9 +268,9 @@ impl<'a> System<'a> for Sys {
                 };
                 local_emitter.append(&mut state_update.local_events);
                 server_emitter.append(&mut state_update.server_events);
-                if let Some(ref inv_manip) = state_update.modify_loadout {
+                if let Some(loadout_manip) = state_update.modify_loadout {
-                    // TODO: Delete this clone, somehow...
+                    server_emitter
-                    server_emitter.emit(ServerEvent::InventoryManip(j.entity, inv_manip.clone()));
+                        .emit(ServerEvent::InventoryManip(j.entity, loadout_manip.into()));
                 }
                 incorporate_update(&mut tuple, state_update);
             }

common/sys/src/controller.rs

@@ -105,7 +105,9 @@ impl<'a> System<'a> for Sys {
                             InventoryManip::Drop(Slot::Equip(_))
                             | InventoryManip::Swap(_, Slot::Equip(_))
                             | InventoryManip::Swap(Slot::Equip(_), _) => {
-                                controller.actions.push(ControlAction::ModifyLoadout(manip));
+                                controller
+                                    .actions
+                                    .push(ControlAction::ModifyLoadout(manip.into()));
                             },
                             _ => {
                                 server_emitter.emit(ServerEvent::InventoryManip(entity, manip));