add some nice helper functions

Snowiiii · Oct 23, 2024 · c4cbb7f · c4cbb7f
1 parent 28eae10
commit c4cbb7f
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 4 deletions.
diff --git a/pumpkin-core/src/math/position.rs b/pumpkin-core/src/math/position.rs
@@ -5,7 +5,7 @@ use crate::math::vector2::Vector2;
 use num_traits::Euclid;
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Copy)]
+#[derive(Clone, Copy, Default)]
 /// Aka Block Position
 pub struct WorldPosition(pub Vector3<i32>);
 

diff --git a/pumpkin-core/src/math/vector2.rs b/pumpkin-core/src/math/vector2.rs
@@ -8,6 +8,15 @@ pub struct Vector2<T> {
     pub z: T,
 }
 
+impl<T: Math + Default> Default for Vector2<T> {
+    fn default() -> Self {
+        Self {
+            x: T::default(),
+            z: T::default(),
+        }
+    }
+}
+
 impl<T: Math + Copy> Vector2<T> {
     pub fn new(x: T, z: T) -> Self {
         Vector2 { x, z }

diff --git a/pumpkin-core/src/math/vector3.rs b/pumpkin-core/src/math/vector3.rs
@@ -9,6 +9,16 @@ pub struct Vector3<T> {
     pub z: T,
 }
 
+impl<T: Math + Copy + Default> Default for Vector3<T> {
+    fn default() -> Self {
+        Vector3 {
+            x: T::default(),
+            y: T::default(),
+            z: T::default(),
+        }
+    }
+}
+
 impl<T: Math + Copy> Vector3<T> {
     pub const fn new(x: T, y: T, z: T) -> Self {
         Vector3 { x, y, z }

diff --git a/pumpkin-world/src/block/block_registry.rs b/pumpkin-world/src/block/block_registry.rs
@@ -1,8 +1,8 @@
 use std::{collections::HashMap, sync::LazyLock};
 
-use serde::Deserialize;
-
 use super::BlockState;
+use crate::item::get_item_protocol_id;
+use serde::Deserialize;
 
 pub static BLOCKS: LazyLock<HashMap<String, RegistryBlockType>> = LazyLock::new(|| {
     serde_json::from_str(include_str!("../../../assets/blocks.json"))
@@ -70,6 +70,15 @@ impl BlockId {
     pub fn get_id(&self) -> u16 {
         self.data
     }
+
+    pub fn get_as_item_id(&self) -> u32 {
+        let id = BLOCKS
+            .iter()
+            .find(|(_, val)| val.states.iter().any(|state| state.id == *self))
+            .map(|(key, _)| key.as_str())
+            .unwrap();
+        get_item_protocol_id(id)
+    }
 }
 
 impl From<BlockState> for BlockId {

diff --git a/pumpkin-world/src/item/item_registry.rs b/pumpkin-world/src/item/item_registry.rs
@@ -33,7 +33,6 @@ pub fn get_item_element(item_id: &str) -> &ItemComponents {
     &ITEMS.get(item_id).expect("Item not found").components
 }
 
-#[expect(dead_code)]
 pub fn get_item_protocol_id(item_id: &str) -> u32 {
     global_registry::get_protocol_id(ITEM_REGISTRY, item_id)
 }