restructure project

32 files changed, 95 insertions, 74 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 3284e76..fd875c5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2976,34 +2976,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "o3launcher"
-version = "0.1.0"
-dependencies = [
- "cfg-if",
- "chrono",
- "const_format",
- "futures",
- "indexmap",
- "lazy_static",
- "log",
- "lzma-rs",
- "multimap",
- "oauth2",
- "regex",
- "reqwest",
- "serde",
- "serde_json",
- "sha1_smol",
- "simple_logger",
- "sysinfo",
- "tokio",
- "tokio-stream",
- "uuid",
- "walkdir",
- "zip",
-]
-
-[[package]]
 name = "oauth2"
 version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3401,17 +3373,49 @@ dependencies = [
 ]
 
 [[package]]
+name = "ozone"
+version = "0.1.0"
+dependencies = [
+ "cfg-if",
+ "chrono",
+ "const_format",
+ "futures",
+ "indexmap",
+ "lazy_static",
+ "log",
+ "lzma-rs",
+ "multimap",
+ "oauth2",
+ "regex",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "sha1_smol",
+ "simple_logger",
+ "sysinfo",
+ "tokio",
+ "tokio-stream",
+ "uuid",
+ "walkdir",
+ "zip",
+]
+
+[[package]]
 name = "ozone-cli"
 version = "0.1.0"
 dependencies = [
  "log",
- "o3launcher",
+ "ozone",
  "simple_logger",
  "sysinfo",
  "tokio",
 ]
 
 [[package]]
+name = "ozone-helpers"
+version = "0.1.0"
+
+[[package]]
 name = "ozone-ui"
 version = "0.1.0"
 dependencies = [
diff --git a/Cargo.toml b/Cargo.toml
index 6b34197..5360866 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,33 +1,2 @@
-[package]
-name = "o3launcher"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-cfg-if = "1.0.0"
-chrono = { version = "0.4.39", default-features = false, features = ["std", "alloc", "clock", "now", "serde"] }
-const_format = "0.2.34"
-futures = "0.3.31"
-indexmap = { version = "2.7.1", features = ["serde"] }
-lazy_static = "1.5.0"
-log = "0.4.22"
-lzma-rs = { version = "0.3.0", features = ["stream"] }
-multimap = { version = "0.10.0", features = ["serde"] }
-oauth2 = "5.0.0"
-regex = "1.11.1"
-reqwest = { version = "0.12.12", features = ["json", "stream"] }
-serde = { version = "1.0.216", features = ["derive"] }
-serde_json = "1.0.133"
-sha1_smol = { version = "1.0.1", features = ["alloc", "std", "serde"] }
-sysinfo = { version = "0.33.1", features = ["system", "multithread"] }
-tokio = { version = "1.42.0", features = ["fs", "io-util", "sync", "rt", "macros"] }
-tokio-stream = { version = "0.1.17", features = ["fs"] }
-uuid = { version = "1.12.1", features = ["v4", "serde"] }
-walkdir = "2.5.0"
-zip = { version = "2.2.2", default-features = false, features = ["bzip2", "deflate", "deflate64", "lzma", "xz"] }
-
-[dev-dependencies]
-simple_logger = "5.0.0"
-
 [workspace]
-members = [ "ozone-cli", "ozone-ui" ]
+members = [ "ozone", "ozone-cli", "ozone-helpers", "ozone-ui" ]
diff --git a/ozone-cli/Cargo.toml b/ozone-cli/Cargo.toml
index bdcec85..61b7808 100644
--- a/ozone-cli/Cargo.toml
+++ b/ozone-cli/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 sysinfo = { version = "0.33.1", features = ["system", "multithread"] }
-o3launcher = { path = ".." }
+ozone = { path = "../ozone" }
 tokio = { version = "1.43.0", features = ["rt", "rt-multi-thread", "macros"] }
 simple_logger = { version = "5.0.0", features = ["colors"] }
 log = "0.4.25"
diff --git a/ozone-cli/src/main.rs b/ozone-cli/src/main.rs
index e36867a..a27cc98 100644
--- a/ozone-cli/src/main.rs
+++ b/ozone-cli/src/main.rs
@@ -2,7 +2,7 @@ use std::env::consts::{ARCH, OS};
 use std::error::Error;
 use log::{error, info};
 use sysinfo::System;
-use o3launcher::launcher::{Launcher, Settings};
+use ozone::launcher::{Launcher, Settings};
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error>> {
@@ -26,8 +26,8 @@ async fn main() -> Result<(), Box<dyn Error>> {
     
     dbg!(&launch);
     info!("ok");
-    
-    o3launcher::launcher::run_the_game(&launch)?;
+
+    ozone::launcher::run_the_game(&launch)?;
     
     Ok(())
 }
diff --git a/ozone-helpers/Cargo.toml b/ozone-helpers/Cargo.toml
new file mode 100644
index 0000000..d1d4c90
--- /dev/null
+++ b/ozone-helpers/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "ozone-helpers"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+proc-macro = true
+
+[dependencies]
diff --git a/ozone-helpers/src/lib.rs b/ozone-helpers/src/lib.rs
new file mode 100644
index 0000000..4412282
--- /dev/null
+++ b/ozone-helpers/src/lib.rs
@@ -0,0 +1,8 @@
+extern crate proc_macro;
+
+use proc_macro::TokenStream;
+
+#[proc_macro_attribute]
+pub fn ozone_special(attr: TokenStream, item: TokenStream) -> TokenStream {
+    todo!()
+}
\ No newline at end of file
diff --git a/ozone/Cargo.toml b/ozone/Cargo.toml
new file mode 100644
index 0000000..cd2f852
--- /dev/null
+++ b/ozone/Cargo.toml
@@ -0,0 +1,30 @@
+[package]
+name = "ozone"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+cfg-if = "1.0.0"
+chrono = { version = "0.4.39", default-features = false, features = ["std", "alloc", "clock", "now", "serde"] }
+const_format = "0.2.34"
+futures = "0.3.31"
+indexmap = { version = "2.7.1", features = ["serde"] }
+lazy_static = "1.5.0"
+log = "0.4.22"
+lzma-rs = { version = "0.3.0", features = ["stream"] }
+multimap = { version = "0.10.0", features = ["serde"] }
+oauth2 = "5.0.0"
+regex = "1.11.1"
+reqwest = { version = "0.12.12", features = ["json", "stream"] }
+serde = { version = "1.0.216", features = ["derive"] }
+serde_json = "1.0.133"
+sha1_smol = { version = "1.0.1", features = ["alloc", "std", "serde"] }
+sysinfo = { version = "0.33.1", features = ["system", "multithread"] }
+tokio = { version = "1.42.0", features = ["fs", "io-util", "sync", "rt", "macros"] }
+tokio-stream = { version = "0.1.17", features = ["fs"] }
+uuid = { version = "1.12.1", features = ["v4", "serde"] }
+walkdir = "2.5.0"
+zip = { version = "2.2.2", default-features = false, features = ["bzip2", "deflate", "deflate64", "lzma", "xz"] }
+
+[dev-dependencies]
+simple_logger = "5.0.0"
diff --git a/src/assets.rs b/ozone/src/assets.rs
index 15087c9..15087c9 100644
--- a/src/assets.rs
+++ b/ozone/src/assets.rs
diff --git a/src/auth.rs b/ozone/src/auth.rs
index 057cceb..057cceb 100644
--- a/src/auth.rs
+++ b/ozone/src/auth.rs
diff --git a/src/auth/mcservices.rs b/ozone/src/auth/mcservices.rs
index 45ef795..45ef795 100644
--- a/src/auth/mcservices.rs
+++ b/ozone/src/auth/mcservices.rs
diff --git a/src/auth/msa.rs b/ozone/src/auth/msa.rs
index add345c..add345c 100644
--- a/src/auth/msa.rs
+++ b/ozone/src/auth/msa.rs
diff --git a/src/auth/types.rs b/ozone/src/auth/types.rs
index b9cdaad..b9cdaad 100644
--- a/src/auth/types.rs
+++ b/ozone/src/auth/types.rs
diff --git a/src/auth/types/property_map.rs b/ozone/src/auth/types/property_map.rs
index ddfc9ce..ddfc9ce 100644
--- a/src/auth/types/property_map.rs
+++ b/ozone/src/auth/types/property_map.rs
diff --git a/src/launcher.rs b/ozone/src/launcher.rs
index 2836db5..2836db5 100644
--- a/src/launcher.rs
+++ b/ozone/src/launcher.rs
diff --git a/src/launcher/assets.rs b/ozone/src/launcher/assets.rs
index 7c5dcf3..aa7d42e 100644
--- a/src/launcher/assets.rs
+++ b/ozone/src/launcher/assets.rs
@@ -11,7 +11,7 @@ use sha1_smol::Sha1;
 use tokio::{fs, io};
 use tokio::fs::File;
 use crate::assets::{Asset, AssetIndex};
-use crate::launcher::download::{MultiDownloader, VerifiedDownload};
+use super::download::{MultiDownloader, VerifiedDownload};
 use crate::util;
 use crate::util::{FileVerifyError, IntegrityError};
 use crate::version::DownloadInfo;
diff --git a/src/launcher/constants.rs b/ozone/src/launcher/constants.rs
index 4506ab5..4506ab5 100644
--- a/src/launcher/constants.rs
+++ b/ozone/src/launcher/constants.rs
diff --git a/src/launcher/download.rs b/ozone/src/launcher/download.rs
index 132cd7f..132cd7f 100644
--- a/src/launcher/download.rs
+++ b/ozone/src/launcher/download.rs
diff --git a/src/launcher/extract.rs b/ozone/src/launcher/extract.rs
index 8c5f2b8..8c5f2b8 100644
--- a/src/launcher/extract.rs
+++ b/ozone/src/launcher/extract.rs
diff --git a/src/launcher/jre.rs b/ozone/src/launcher/jre.rs
index 31034b5..a5cc166 100644
--- a/src/launcher/jre.rs
+++ b/ozone/src/launcher/jre.rs
@@ -14,9 +14,9 @@ mod download;
 use arch::JRE_ARCH;
 use manifest::JavaRuntimesManifest;
 use manifest::JavaRuntimeManifest;
-use crate::launcher::download::MultiDownloader;
-use crate::launcher::jre::download::{LzmaDownloadError, LzmaDownloadJob};
-use crate::launcher::jre::manifest::JavaRuntimeFile;
+use super::download::MultiDownloader;
+use super::jre::download::{LzmaDownloadError, LzmaDownloadJob};
+use super::jre::manifest::JavaRuntimeFile;
 use crate::util;
 use crate::util::{EnsureFileError, IntegrityError};
 use crate::version::DownloadInfo;
diff --git a/src/launcher/jre/arch.rs b/ozone/src/launcher/jre/arch.rs
index e984171..e984171 100644
--- a/src/launcher/jre/arch.rs
+++ b/ozone/src/launcher/jre/arch.rs
diff --git a/src/launcher/jre/download.rs b/ozone/src/launcher/jre/download.rs
index ddf1ff6..ddf1ff6 100644
--- a/src/launcher/jre/download.rs
+++ b/ozone/src/launcher/jre/download.rs
diff --git a/src/launcher/jre/manifest.rs b/ozone/src/launcher/jre/manifest.rs
index 3fd6484..3fd6484 100644
--- a/src/launcher/jre/manifest.rs
+++ b/ozone/src/launcher/jre/manifest.rs
diff --git a/src/launcher/rules.rs b/ozone/src/launcher/rules.rs
index 29a36d1..29a36d1 100644
--- a/src/launcher/rules.rs
+++ b/ozone/src/launcher/rules.rs
diff --git a/src/launcher/runner.rs b/ozone/src/launcher/runner.rs
index afdfc7f..afdfc7f 100644
--- a/src/launcher/runner.rs
+++ b/ozone/src/launcher/runner.rs
diff --git a/src/launcher/settings.rs b/ozone/src/launcher/settings.rs
index 8453653..8453653 100644
--- a/src/launcher/settings.rs
+++ b/ozone/src/launcher/settings.rs
diff --git a/src/launcher/strsub.rs b/ozone/src/launcher/strsub.rs
index 5764405..5764405 100644
--- a/src/launcher/strsub.rs
+++ b/ozone/src/launcher/strsub.rs
diff --git a/src/launcher/version.rs b/ozone/src/launcher/version.rs
index 0f55223..f6cdd58 100644
--- a/src/launcher/version.rs
+++ b/ozone/src/launcher/version.rs
@@ -7,7 +7,7 @@ use std::path::{Path, PathBuf};
 use log::{debug, info, warn};
 use sha1_smol::Digest;
 use tokio::{fs, io};
-use crate::launcher::settings::ProfileVersion;
+use super::settings::ProfileVersion;
 use crate::util;
 use crate::version::{*, manifest::*};
 
diff --git a/src/lib.rs b/ozone/src/lib.rs
index 0d2233b..a523091 100644
--- a/src/lib.rs
+++ b/ozone/src/lib.rs
@@ -2,4 +2,5 @@ mod util;
 pub mod version;
 pub mod assets;
 pub mod launcher;
-pub mod auth; // temporarily public
+pub mod auth;
+// temporarily public
diff --git a/src/util.rs b/ozone/src/util.rs
index 7510a33..7510a33 100644
--- a/src/util.rs
+++ b/ozone/src/util.rs
diff --git a/src/util/progress.rs b/ozone/src/util/progress.rs
index e8bdde1..46983c9 100644
--- a/src/util/progress.rs
+++ b/ozone/src/util/progress.rs
@@ -1,3 +1,3 @@
 struct Progress {
     
-}
\ No newline at end of file
+}
diff --git a/src/version.rs b/ozone/src/version.rs
index 6e9ad3f..ed5f95f 100644
--- a/src/version.rs
+++ b/ozone/src/version.rs
@@ -463,7 +463,7 @@ mod tests {
 
     #[test]
     fn test_it() {
-        let s = fs::read_to_string("./test_stuff/versions/1.7.10.json");
+        let s = fs::read_to_string("test_stuff/versions/1.7.10.json");
 
         let arg: CompleteVersion = serde_json::from_str(s.unwrap().as_str()).unwrap();
         dbg!(arg);
@@ -471,7 +471,7 @@ mod tests {
     
     #[test]
     fn test_it2() {
-        let s = fs::read_to_string("./test_stuff/version_manifest_v2.json");
+        let s = fs::read_to_string("test_stuff/version_manifest_v2.json");
 
         let arg: VersionManifest = serde_json::from_str(s.unwrap().as_str()).unwrap();
         dbg!(arg);
diff --git a/src/version/manifest.rs b/ozone/src/version/manifest.rs
index b2b8524..b2b8524 100644
--- a/src/version/manifest.rs
+++ b/ozone/src/version/manifest.rs