Merge branch 'main' of https://github.com/geode-sdk/cli into main

Author: camila314

src/sdk.rs

@@ -162,6 +162,11 @@ fn set_sdk_env(path: &Path) -> bool {
 		}
 	}
 
+	#[cfg(target_os = "linux")] {
+		warn!("set_sdk_env is uninmplemented on linux");
+		env_success = false;
+	}
+
 	#[cfg(target_os = "macos")] {
 		env_success = launchctl::set_sdk_env(path.to_str().unwrap());
 	}

src/util/bmfont.rs

@@ -73,7 +73,7 @@ fn gen_outline<T: DistanceStorage>(sdf: SignedDistanceField<T>, size: f32) -> im
 }*/
 
 fn generate_char(
-	_font: &BitmapFont,
+	font: &BitmapFont,
 	metrics: fontdue::Metrics,
 	data: Vec<u8>,
 ) -> Option<RgbaImage> {
@@ -104,7 +104,7 @@ fn generate_char(
 	let height = metrics.height as u32;
 
 	Some(RgbaImage::from_fn(width, height, |x, y| {
-		Rgba::<u8>([255, 255, 255, data[(x + width * y) as usize]])
+		Rgba::<u8>([font.color[0], font.color[1], font.color[2], data[(x + width * y) as usize]])
 	}))
 }
 

src/util/config.rs

@@ -87,15 +87,15 @@ impl OldConfig {
 pub fn geode_root() -> PathBuf {
 	// get data dir per-platform
 	let data_dir: PathBuf;
-	#[cfg(windows)]
+	#[cfg(any(windows, target_os = "linux"))]
 	{
 		data_dir = dirs::data_local_dir().unwrap().join("Geode");
 	};
 	#[cfg(target_os = "macos")]
 	{
 		data_dir = PathBuf::from("/Users/Shared/Geode");
 	};
-	#[cfg(not(any(windows, target_os = "macos")))]
+	#[cfg(not(any(windows, target_os = "macos", target_os = "linux")))]
 	{
 		use std::compile_error;
 		compile_error!("implement root directory");
@@ -144,7 +144,7 @@ impl Config {
 	pub fn new() -> Config {
 		if !geode_root().exists() {
 			warn!("It seems you don't have Geode installed. Some operations will not work");
-			info!("You can setup Geode using `geode config setup`");
+			warn!("You can setup Geode using `geode config setup`");
 
 			return Config {
 				current_profile: None,
@@ -189,7 +189,7 @@ impl Config {
 
 		if output.profiles.is_empty() {
 			warn!("No Geode profiles found! Some operations will be unavailable.");
-			info!("Setup Geode using `geode config setup`");
+			warn!("Setup Geode using `geode config setup`");
 		} else if output.get_profile(&output.current_profile).is_none() {
 			output.current_profile = Some(output.profiles[0].borrow().name.clone());
 		}

src/util/logging.rs

@@ -29,7 +29,7 @@ macro_rules! fatal {
 macro_rules! warn {
     ($x:expr $(, $more:expr)*) => {{
     	use ::colored::Colorize;
-        println!("{}{}", "| Warn | ".bright_yellow(), format!($x, $($more),*));
+        eprintln!("{}{}", "| Warn | ".bright_yellow(), format!($x, $($more),*));
     }}
 }
 

src/util/mod_file.rs

@@ -12,6 +12,7 @@ pub struct BitmapFont {
 	pub charset: Option<String>,
 	pub size: u32,
 	pub outline: u32,
+	pub color: [u8; 3],
 }
 
 pub struct ModResources {
@@ -145,6 +146,7 @@ fn get_mod_resources(root: &Value, root_path: &Path) -> ModResources {
 							charset: None,
 							size: 0,
 							outline: 0,
+							color: [255, 255, 255],
 						};
 
 						// Iterate font attributes
@@ -178,6 +180,23 @@ fn get_mod_resources(root: &Value, root_path: &Path) -> ModResources {
 									)) as u32;
 								}
 
+								"color" => {
+									let color = value
+										.as_str()
+										.nice_unwrap(format!("{}.color: Expected string", info_name));
+
+									let col = u32::from_str_radix(color, 16).nice_unwrap(format!(
+										"{}.color: Expected hexadecimal color",
+										info_name
+									));
+
+									font.color = [
+										((col >> 16) & 0xFF) as u8,
+										((col >> 8) & 0xFF) as u8,
+										(col & 0xFF) as u8,
+									];
+								}
+
 								"charset" => {
 									font.charset = Some(
 										value