iterator for entity metadata

1 files changed, 44 insertions, 0 deletions

diff --git a/src/v1_15_2.rs b/src/v1_15_2.rs
index ec03dd4..a78cd17 100644
--- a/src/v1_15_2.rs
+++ b/src/v1_15_2.rs
@@ -3012,6 +3012,20 @@ impl EntityMetadata {
         })
     }
 
+    pub fn remove(&mut self, index: u8) -> bool {
+        for i in 0..self.fields.len() {
+            let field = self.fields
+                .get(i)
+                .expect("iterating through this vec, definitely have this index");
+            if field.index == index {
+                self.fields.remove(i);
+                return true;
+            }
+        }
+
+        false
+    }
+
     pub fn get(&self, index: u8) -> Option<&EntityMetadataFieldData> {
         for field in &self.fields {
             if field.index == index {
@@ -3023,6 +3037,36 @@ impl EntityMetadata {
     }
 }
 
+impl<'a> core::iter::IntoIterator for &'a EntityMetadata {
+    type Item = (u8, &'a EntityMetadataFieldData);
+    type IntoIter = FieldIter<'a>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        FieldIter {
+            data: self,
+            at: 0,
+        }
+    }
+}
+
+pub struct FieldIter<'a> {
+    data: &'a EntityMetadata,
+    at: usize
+}
+
+impl<'a> core::iter::Iterator for FieldIter<'a> {
+    type Item = (u8, &'a EntityMetadataFieldData);
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.data.fields.get(self.at).map(move |field| (field.index, &field.data))
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let len = self.data.fields.len();
+        (len, Some(len))
+    }
+}
+
 #[derive(Clone, Debug, PartialEq)]
 pub struct EntityMetadataField {
     pub index: u8,