Make it fully work

Lea-fish · Mar 3, 2024 · 7634543 · 7634543
1 parent 3b0bb02
commit 7634543
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/install/src/install.rs b/install/src/install.rs
@@ -131,7 +131,7 @@ pub mod mojang {
             ty: "release".to_string(),
             libraries: vec![Library { name: "leafish:Leafish:Jar".to_string() }], // we need nobody, but ourselves ;)
             main_class: "de.leafish.Main".to_string(),
-            minecraft_arguments: "--username ${auth_player_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type}".to_string(),
+            minecraft_arguments: "--username ${auth_player_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type} --path ./versions/Leafish/".to_string(),
         })?.as_bytes())?;
 
         // FIXME: download the latest jar from github
@@ -296,16 +296,16 @@ pub mod prism {
             main_jar: MainJar {
                 downloads: Download {
                     artifact: Some(Artifact {
-                        sha1: "54d860c5e29e6197670d25725bee1f27e279fc7e".to_string(),
-                        size: 5118032,
-                        url: "https://github.com/Lea-fish/Releases/releases/download/alpha/wrapper.jar".to_string(),
+                        sha1: "fdfbab865254c28e67a6c4e7448583147db3a7f2".to_string(),
+                        size: 5118199,
+                        url: "https://github.com/Lea-fish/Releases/releases/download/alpha/bootstrap.jar".to_string(),
                     }),
                 },
                 name: "de.leafish:Leafish:v1.0.0".to_string(),
             },
-            minecraft_arguments: "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --versionType ${version_type}".to_string(),
+            minecraft_arguments: "--username ${auth_player_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type} --path ../".to_string(),
             name: "Leafish".to_string(),
-            order: -2,
+            order: 0,
             release_time: now.to_string(),
             requires: vec![],
             ty: "release".to_string(),

diff --git a/src/main.rs b/src/main.rs
@@ -32,19 +32,21 @@ use glutin::surface::GlSurface;
 use glutin::surface::SwapInterval;
 use glutin_winit::DisplayBuilder;
 use glutin_winit::GlWindow;
-#[cfg(target_os = "linux")]
-use instant::{Duration, Instant};
+use instant::Duration;
 use leafish_protocol::protocol::login::AccountType;
 use log::{debug, error, info, warn};
 use raw_window_handle::HasRawWindowHandle;
 use shared::Version;
 use std::fs;
 use std::num::NonZeroU32;
+use std::time::Instant;
 use winit::keyboard::Key;
 use winit::keyboard::ModifiersKeyState;
 use winit::keyboard::NamedKey;
 use winit::keyboard::SmolStr;
+#[cfg(target_os = "linux")]
 use winit::raw_window_handle::HasDisplayHandle;
+#[cfg(target_os = "linux")]
 use winit::raw_window_handle::RawDisplayHandle;
 use winit::window::Icon;
 extern crate leafish_shared as shared;