track

.gitignore

@@ -1,2 +1,4 @@
 /target
-/blockworld-client/assets/minecraft/
+/assets
+assets
+

blockworld-client/Cargo.toml

@@ -6,6 +6,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+blockworld-utils = { path = "../blockworld-utils" }
+
 anyhow = "1.0.83"
 bytemuck = { version = "1.15.0", features = ["derive"] }
 clap = { version = "4.5.4", features = ["derive"] }

blockworld-client/block/block.rs

@@ -0,0 +1,70 @@
+use crate::io::atlas_helper::UV;
+use blockworld_utils::resource_location::str;
+
+pub type BlockID = u32;
+
+pub trait Block {
+    fn texture_name() -> String;
+    fn hardness() -> f32;
+    fn material() -> Material;
+}
+
+pub struct Air;
+impl Block for Air {
+    fn texture_name() -> String {
+        "block/air".to_string()
+    }
+    fn hardness() -> f32 {
+        0.0
+    }
+    fn material() -> Material {
+        Material::Air
+    }
+}
+
+pub struct Stone;
+impl Block for Stone {
+    fn texture_name() -> String {
+        "block/stone".to_string()
+    }
+    fn hardness() -> f32 {
+        1.5
+    }
+    fn material() -> Material {
+        Material::Solid
+    }
+}
+
+pub struct Grass;
+impl Block for Grass {
+    fn texture_name() -> String {
+        "block/grass".to_string()
+    }
+    fn hardness() -> f32 {
+        0.6
+    }
+    fn material() -> Material {
+        Material::Solid
+    }
+}
+
+pub struct Dirt;
+impl Block for Dirt {
+    fn texture_name() -> String {
+        "block/dirt".to_string()
+    }
+    fn hardness() -> f32 {
+        0.5
+    }
+    fn material() -> Material {
+        Material::Solid
+    }
+}
+
+#[derive(Debug, Default, Clone, Copy)]
+pub enum Material {
+    #[default]
+    Solid,
+    Glass,
+    Air,
+}

blockworld-client/block/mod.rs

@@ -0,0 +1,2 @@
+mod block;
+pub use block::*;

blockworld-client/game/mod.rs

@@ -1,15 +1,8 @@
+use self::player_state::PlayerState;
+use crate::io::input_helper::InputState;
 use std::rc::Rc;
-
-use chunk_provider::ClientChunkProvider;
 use world::ClientWorld;
 
-use crate::io::input_helper::InputState;
-
-use self::player_state::PlayerState;
-
-pub mod block;
-pub mod chunk;
-pub mod chunk_provider;
 pub mod console_instr;
 pub mod player_state;
 pub mod register;
@@ -21,17 +14,6 @@ pub struct Game {
     pub client_world: Rc<ClientWorld>,
     pub chunk_provider: ClientChunkProvider,
 }
-impl Default for Game {
-    fn default() -> Self {
-        let client_world = Rc::new(ClientWorld);
-        Self {
-            player_state: Default::default(),
-            client_world: client_world.clone(),
-            // ! TEMP
-            chunk_provider: ClientChunkProvider::new(client_world.clone(), 16),
-        }
-    }
-}
 
 impl Game {
     /// update all entity states in game (except for camera)

blockworld-client/game/register.rs

@@ -1,13 +1,10 @@
-use std::collections::HashMap;
-
+use crate::block::*;
 use anyhow::Error;
-
 use block::{BlockID, BlockMeta};
-
-use super::block;
+use std::collections::HashMap;
 
 #[derive(Debug)]
-pub struct RegisterTable {
+pub struct BlockRegisterTable {
     table_block: HashMap<BlockID, BlockMeta>,
 }
 

blockworld-client/io/mod.rs

@@ -1,2 +1,5 @@
 pub mod atlas_helper;
+
 pub mod input_helper;
+pub mod nbt;
+

blockworld-client/io/nbt.rs

@@ -0,0 +1,2 @@
+use std::io::Cursor;
+struct a;