refactor(astralrinth): isolate branded assets and update helpers

packages/app-lib/src/api/astralrinth/mod.rs

@@ -0,0 +1,4 @@
+///
+/// This file is modified by AstralRinth
+///
+pub mod update;

packages/app-lib/src/api/mod.rs

@@ -13,9 +13,9 @@ pub mod process;
 pub mod profile;
 pub mod server_address;
 pub mod settings;
-pub mod update; // This code is modified by AstralRinth
 pub mod tags;
 pub mod worlds;
+pub mod astralrinth;
 
 pub mod data {
     pub use crate::state::{

packages/app-lib/src/launcher/mod.rs

@@ -14,7 +14,8 @@ use crate::state::{
     AccountType, Credentials, JavaVersion, ProcessMetadata, ProfileInstallStage,
 };
 use crate::util::rpc::RpcServerBuilder;
-use crate::util::{io, utils};
+use crate::util::io;
+use crate::util::astralrinth::utils;
 use crate::{State, get_resource_file, process, state as st};
 use chrono::Utc;
 use daedalus as d;

packages/app-lib/src/lib.rs

@@ -8,7 +8,7 @@ and launching Modrinth mod packs
 #![deny(unused_must_use)]
 
 #[macro_use]
-pub mod util; // This code is modified by AstralRinth
+pub mod util;
 
 mod api;
 mod error;

packages/app-lib/src/state/discord.rs

@@ -11,7 +11,7 @@ use discord_rich_presence::{
 use rand::seq::SliceRandom; // This code is modified by AstralRinth
 use tokio::sync::RwLock;
 
-use crate::util::utils; // This code is modified by AstralRinth
+use crate::util::astralrinth::utils;
 use crate::State;
 
 pub struct DiscordGuard {

packages/app-lib/src/util/astralrinth/mod.rs

@@ -0,0 +1,4 @@
+///
+/// This file is modified by AstralRinth
+///
+pub mod utils;

packages/app-lib/src/util/astralrinth/utils.rs

@@ -1,10 +1,7 @@
 ///
-/// This code is modified by AstralRinth
+/// This file is modified by AstralRinth
 ///
-/// Version: 0.1.2
-///
-///
-use crate::api::update;
+use crate::api::astralrinth::update;
 use crate::event::emit::emit_info;
 use crate::{Result, State};
 
@@ -15,8 +12,8 @@ use std::time::SystemTime;
 use tokio::{fs, io};
 
 const PACKAGE_JSON_CONTENT: &str =
-    // include_str!("../../../../apps/app-frontend/package.json");
-    include_str!("../../../../apps/app/tauri.conf.json");
+    // include_str!("../../../../../apps/app-frontend/package.json");
+    include_str!("../../../../../apps/app/tauri.conf.json");
 
 /// Deserialize the content of package.json into a Launcher struct
 pub fn read_package_json() -> io::Result<Launcher> {

packages/app-lib/src/util/mod.rs

@@ -4,7 +4,7 @@ pub mod io;
 pub mod jre;
 pub mod network;
 pub mod platform;
-pub mod utils; // This code is modified by AstralRinth
 pub mod protocol_version;
 pub mod rpc;
 pub mod server_ping;
+pub mod astralrinth;