diff --git a/apps/app-frontend/src/assets/icons/index.js b/apps/app-frontend/src/assets/icons/index.js index 8694e3bea..256b61af2 100644 --- a/apps/app-frontend/src/assets/icons/index.js +++ b/apps/app-frontend/src/assets/icons/index.js @@ -2,9 +2,6 @@ export { default as AddProjectImage } from './add-project.svg' export { default as SwapIcon } from './arrow-left-right.svg' export { default as MenuIcon } from './menu.svg' export { default as ChatIcon } from './messages-square.svg' -export { default as Pirate } from './pirate.svg' -export { default as Microsoft } from './microsoft.svg' -export { default as PirateShip } from './pirate-ship.svg' export { default as VersionIcon } from './milestone.svg' export { default as NewInstanceImage } from './new-instance.svg' export { default as PackageIcon } from './package.svg' diff --git a/apps/app-frontend/src/assets/icons/pirate-ship.svg b/apps/app-frontend/src/assets/icons/pirate-ship.svg deleted file mode 100644 index 26857b89c..000000000 --- a/apps/app-frontend/src/assets/icons/pirate-ship.svg +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/apps/app-frontend/src/assets/icons/pirate.svg b/apps/app-frontend/src/assets/icons/pirate.svg deleted file mode 100644 index 486774dab..000000000 --- a/apps/app-frontend/src/assets/icons/pirate.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/apps/app/icons/icon (1).png b/apps/app/icons/icon.png similarity index 100% rename from apps/app/icons/icon (1).png rename to apps/app/icons/icon.png diff --git a/apps/app/src/api/utils.rs b/apps/app/src/api/utils.rs index c1fb7c742..8f08de308 100644 --- a/apps/app/src/api/utils.rs +++ b/apps/app/src/api/utils.rs @@ -10,7 +10,7 @@ use crate::api::{Result, TheseusSerializableError}; use dashmap::DashMap; use std::path::{Path, PathBuf}; use theseus::prelude::canonicalize; -use theseus::util::utils; +use theseus::util::astralrinth::utils; use url::Url; pub fn init() -> tauri::plugin::TauriPlugin { @@ -29,7 +29,7 @@ pub fn init() -> tauri::plugin::TauriPlugin { .build() } -// This code is modified by AstralRinth +// This code function is modified by AstralRinth #[tauri::command] pub async fn init_update_launcher( download_url: &str, diff --git a/packages/app-lib/src/api/astralrinth/mod.rs b/packages/app-lib/src/api/astralrinth/mod.rs new file mode 100644 index 000000000..f184f98c8 --- /dev/null +++ b/packages/app-lib/src/api/astralrinth/mod.rs @@ -0,0 +1,4 @@ +/// +/// This file is modified by AstralRinth +/// +pub mod update; diff --git a/packages/app-lib/src/api/update.rs b/packages/app-lib/src/api/astralrinth/update.rs similarity index 100% rename from packages/app-lib/src/api/update.rs rename to packages/app-lib/src/api/astralrinth/update.rs diff --git a/packages/app-lib/src/api/mod.rs b/packages/app-lib/src/api/mod.rs index d9f25e752..ef2f42981 100644 --- a/packages/app-lib/src/api/mod.rs +++ b/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::{ diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs index 5f6a0ed0f..a2bf35166 100644 --- a/packages/app-lib/src/launcher/mod.rs +++ b/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; diff --git a/packages/app-lib/src/lib.rs b/packages/app-lib/src/lib.rs index 369d589ac..a5069f895 100644 --- a/packages/app-lib/src/lib.rs +++ b/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; diff --git a/packages/app-lib/src/state/discord.rs b/packages/app-lib/src/state/discord.rs index 37de5458f..1d645189b 100644 --- a/packages/app-lib/src/state/discord.rs +++ b/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 { diff --git a/packages/app-lib/src/util/astralrinth/mod.rs b/packages/app-lib/src/util/astralrinth/mod.rs new file mode 100644 index 000000000..8d31ba727 --- /dev/null +++ b/packages/app-lib/src/util/astralrinth/mod.rs @@ -0,0 +1,4 @@ +/// +/// This file is modified by AstralRinth +/// +pub mod utils; diff --git a/packages/app-lib/src/util/utils.rs b/packages/app-lib/src/util/astralrinth/utils.rs similarity index 98% rename from packages/app-lib/src/util/utils.rs rename to packages/app-lib/src/util/astralrinth/utils.rs index 6df9f7930..4f84b9d5c 100644 --- a/packages/app-lib/src/util/utils.rs +++ b/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 { diff --git a/packages/app-lib/src/util/mod.rs b/packages/app-lib/src/util/mod.rs index 51771147e..3ee0003ad 100644 --- a/packages/app-lib/src/util/mod.rs +++ b/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; diff --git a/packages/assets/icons/astralrinth-logo.svg b/packages/assets/icons/astralrinth/astralrinth-logo.svg similarity index 100% rename from packages/assets/icons/astralrinth-logo.svg rename to packages/assets/icons/astralrinth/astralrinth-logo.svg diff --git a/packages/assets/icons/elyby-icon.svg b/packages/assets/icons/astralrinth/elyby-icon.svg similarity index 100% rename from packages/assets/icons/elyby-icon.svg rename to packages/assets/icons/astralrinth/elyby-icon.svg diff --git a/apps/app-frontend/src/assets/icons/microsoft.svg b/packages/assets/icons/astralrinth/microsoft.svg similarity index 100% rename from apps/app-frontend/src/assets/icons/microsoft.svg rename to packages/assets/icons/astralrinth/microsoft.svg diff --git a/packages/assets/icons/offline.svg b/packages/assets/icons/astralrinth/offline.svg similarity index 100% rename from packages/assets/icons/offline.svg rename to packages/assets/icons/astralrinth/offline.svg diff --git a/packages/assets/icons/microsoft.svg b/packages/assets/icons/microsoft.svg deleted file mode 100644 index d7b84e94f..000000000 --- a/packages/assets/icons/microsoft.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - diff --git a/packages/assets/index.ts b/packages/assets/index.ts index 9c42e8b34..61d6bee42 100644 --- a/packages/assets/index.ts +++ b/packages/assets/index.ts @@ -137,10 +137,10 @@ export const IntercomBubbleIcon = _IntercomBubbleIcon export const MinecraftServerIcon = _MinecraftServerIcon // This code is modified by AstralRinth -import _AstralRinthLogo from './icons/astralrinth-logo.svg?component' -import _ElyByIcon from './icons/elyby-icon.svg?component' -import _MicrosoftIcon from './icons/microsoft.svg?component' -import _OfflineIcon from './icons/offline.svg?component' +import _AstralRinthLogo from './icons/astralrinth/astralrinth-logo.svg?component' +import _ElyByIcon from './icons/astralrinth/elyby-icon.svg?component' +import _MicrosoftIcon from './icons/astralrinth/microsoft.svg?component' +import _OfflineIcon from './icons/astralrinth/offline.svg?component' export const OfflineIcon = _OfflineIcon export const MicrosoftIcon = _MicrosoftIcon export const AstralRinthLogo = _AstralRinthLogo