Move data code to own crate + general data refactor

1 files changed, 2 insertions, 21 deletions

diff --git a/server/src/entity/conveyor.rs b/server/src/entity/conveyor.rs
index 9c7f5e4d..e31410e3 100644
--- a/server/src/entity/conveyor.rs
+++ b/server/src/entity/conveyor.rs
@@ -18,14 +18,12 @@
 use super::{Entity, EntityContext};
 use crate::interaction::interact;
 use anyhow::{anyhow, bail, Result};
-use hurrycurry_protocol::{glam::IVec2, ItemIndex, ItemLocation};
+use hurrycurry_protocol::{glam::IVec2, ItemLocation};
 
 #[derive(Debug, Clone)]
 pub struct Conveyor {
     pub(super) from: IVec2,
     pub(super) to: IVec2,
-    pub(super) filter_tile: Option<IVec2>,
-    pub(super) filter_item: Option<ItemIndex>,
     pub(super) cooldown: f32,
     pub(super) max_cooldown: f32,
 }
@@ -38,24 +36,7 @@ impl Entity for Conveyor {
             .get(&self.from)
             .ok_or(anyhow!("conveyor from missing"))?;
 
-        if let Some(from_item) = from.item.as_ref() {
-            let filter = if let Some(t) = &self.filter_tile {
-                let filter_tile = c
-                    .game
-                    .tiles
-                    .get(t)
-                    .ok_or(anyhow!("conveyor filter missing"))?;
-                filter_tile.item.as_ref().map(|e| e.kind)
-            } else {
-                self.filter_item.as_ref().map(|i| *i)
-            };
-
-            if let Some(filter) = filter {
-                if from_item.kind != filter {
-                    return Ok(());
-                }
-            }
-
+        if from.item.is_some() {
             self.cooldown += c.dt;
             if self.cooldown < self.max_cooldown {
                 return Ok(());