Merge branch 'master' of github.com:Stoozy/SML

Author: Stoozy

.github/workflows/rust.yml

@@ -0,0 +1,22 @@
+name: Rust
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build
+      run: cargo build --verbose
+    - name: Run tests
+      run: cargo test --verbose

.gitignore

@@ -1,2 +1,3 @@
 /target
 *.org
+*.log

LICENSE

@@ -0,0 +1,53 @@
+### SML
+
+![Build](https://github.com/Stoozy/SML/actions/workflows/rust.yml/badge.svg)
+[![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html)
+
+Welcome to stoozys minecraft launcher!
+
+## About
+
+This is a CLI program that allows you to install and launch curseforge modpacks. Currently it only supports forge only but soon it will have fabric and vanilla support.
+
+## Motivation
+
+I am working on this project purely for the learning experience, there are working minecraft modded launchers out there already, such as MultiMC. However, this project should benefit those who don't want a fully featured GUI program and would rather do things in a shell.
+
+
+## Usage
+
+```
+SML 0.1.0
+Stoozy <mahinsemail@gmail.com>
+A Minecraft Modded Launcher Command Line Interface
+
+USAGE:
+    sml [FLAGS] [OPTIONS]
+
+FLAGS:
+    -a, --auth       Log in through mojang
+    -c, --config     configures instance
+    -h, --help       Prints help information
+        --list       Lists all SML instances
+    -V, --version    Prints version information
+
+OPTIONS:
+    -i, --install <ID>    Searches for project in curseforge with given ID and installs it
+        --launch <ID>     Launches instance with specific ID
+    -r <ID>               Removes instance with the ID provided
+```
+
+## Forge Installer
+
+This launcher uses a wrapper class around the forge installer written by @xfl03 in order to automate the installation. See https://github.com/xfl03/ForgeInstallerHeadless
+
+## What doesn't work right now
+
+Fabric and Vanilla are not supported yet. 
+Forge packs with version less than 1.13.
+
+
+## Issues
+
+If you encounter any issues, feel free to open an (issue)[https://github.com/Stoozy/SML/issues, "issue"] on github
+

README.md

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+cp -v ./sml /usr/bin
+if [ $? -eq 0 ]; then
+   echo SML Successfully Installed!
+else
+   echo This script must be run with permissions
+fi

forge-1.16.5-36.0.10-installer.jar.log

@@ -98,20 +98,6 @@ impl Invoker {
     }
 
     pub fn invoke(&mut self) {
-        //let mut inovker_path = self.binpath.clone();
-        //// pop bin/
-        //invoker_path.pop();
-        //// push filename
-        //invoker_path.push_str("sml_invoker.json");
-        //let mut invoker_file = OpenOptions::new()
-        //                        .read(true)
-        //                        .write(false)
-        //                        .open(invoker_path)
-        //                        .expect("Unable to open sml invoker file");
-
-        //let mut invoker_json = serde_json::from_reader(invoker_file);
-        //let binarg = format!("-Djava.library.path=\"{}\"", self.binpath.display());
-
         let mut cps = "\"".to_string();
         for cp in &self.classpaths {
             cps.push_str(format!("{};", cp.display()).as_str());
@@ -128,20 +114,6 @@ impl Invoker {
             .cwd(cwd)
             .popen()
             .unwrap();
-
-        //let cmd = Command::new("java")
-        //    .arg("-cp")
-        //    .arg(cps)
-        //    .arg(self.main.clone())
-        //    .arg(self.args.clone())
-        //    .current_dir(cwd);
-
-        //cmd
-        //    .output()
-        //    .expect("Failed to launch instance");
-
-        //let adir = cmd.get_current_dir().unwrap();
-        //println!("{}", adir.display())
     }
 }
 

releases/linux-pre-alpha-0.1.0.tar.gz

@@ -1,3 +1,13 @@
+/*
+ * SML - A minecraft modded launcher CLI
+ *
+ *Copyright (C) 2021 Stoozy
+ *This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+ *This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
 extern crate clap;
 extern crate ftp;
 
@@ -11,28 +21,26 @@ pub mod invoker;
 pub mod util;
 
 use clap::*;
-use std::{
-    fs::{self},
-    ops::Deref,
-};
 
 use std::io::Write;
 
 use crate::ima::InstanceManager;
 use crate::invoker::Invoker;
+use std::fs::{self, OpenOptions};
 
 use ansi_term::Colour::*;
 
 fn main() -> () {
-    let mut ima = InstanceManager::new(util::get_instances_path().unwrap());
+    let mut instances_path = util::get_instances_path().unwrap();
+    let mut ima = InstanceManager::new(instances_path.clone());
 
-    let mut user_path = std::env::current_exe().unwrap();
-    user_path.pop(); // get rid of executable
+    let mut user_path = instances_path;
+    user_path.pop(); // get rid of instances dir
     user_path.push("userinfo.json");
 
     // create new app
     let app = App::new("SML")
-        .version("1.0")
+        .version("0.1.0")
         .author("Stoozy <mahinsemail@gmail.com>")
         .about("A Minecraft Modded Launcher Command Line Interface")
         .arg(
@@ -56,11 +64,18 @@ fn main() -> () {
                 .takes_value(true),
         )
         .arg(
-            Arg::with_name("id")
+            Arg::with_name("config")
+                .short("c")
+                .long("config")
+                .help("configures instance")
+                .takes_value(false),
+        )
+        .arg(
+            Arg::with_name("install")
                 .short("i")
-                .long("id")
+                .long("install")
                 .value_name("ID")
-                .help("Searches for project in curseforge with given ID")
+                .help("Searches for project in curseforge with given ID and installs it")
                 .takes_value(true),
         )
         .arg(
@@ -72,10 +87,53 @@ fn main() -> () {
         )
         .get_matches();
 
+    if app.is_present("list") {
+        ima.display_list();
+        return ();
+    }
+
+    if app.is_present("config") {
+        ima.display_list();
+        println!("Please enter which instance you would like to configure: ");
+
+        let instances = ima.get_list();
+        let id = util::get_u64().expect("Invalid number");
+        let invoker_file_path = &instances[id as usize];
+
+        dbg!(invoker_file_path.clone());
+        let invoker_file = OpenOptions::new()
+            .read(true)
+            .write(true)
+            .open(invoker_file_path.clone())
+            .expect("Unable to open sml invoker file");
+
+        let mut invoker_json: serde_json::Value =
+            serde_json::from_reader(invoker_file).expect("Invalid sml invoker json file");
+
+        let mut new_custom_args = String::new();
+
+        println!("Enter custom java flags: ");
+
+        std::io::stdin()
+            .read_line(&mut new_custom_args)
+            .expect("Unable to get user input");
+
+        // no need for newline characters
+        let len = new_custom_args.trim_end_matches(&['\r', '\n'][..]).len();
+        new_custom_args.truncate(len);
+
+        invoker_json["custom_args"] = serde_json::Value::String(new_custom_args);
+
+        std::fs::write(invoker_file_path, invoker_json.to_string())
+            .expect("Unable to write to sml invoker file");
+
+        println!("{}", Green.paint("Configuration complete!"))
+    }
+
     match app.value_of("remove") {
         Some(id) => {
             let id_num = id.parse::<u64>().expect("Not a valid id");
-            let mut instances = ima.get_list();
+            let instances = ima.get_list();
             let invoker_path = &instances[id_num as usize];
 
             let mut cwd = invoker_path.clone();
@@ -109,11 +167,6 @@ fn main() -> () {
         None => (),
     }
 
-    if app.is_present("list") {
-        ima.display_list();
-        return ();
-    }
-
     // authentication
     if app.is_present("authenticate") {
         let user = auth::handle_auth().expect("Failed authentication");
@@ -125,11 +178,11 @@ fn main() -> () {
         fs::write(user_path.clone(), user_data.as_bytes()).expect("Couldn't save user info");
     }
 
-    match app.value_of("id") {
+    match app.value_of("install") {
         Some(id) => {
             // if there is no userinfo, stop the setup process
             if !user_path.exists() {
-                println!("Please authenticate first!");
+                println!("{}", Red.paint("Please authenticate first!"));
                 return;
             }
             sml::forge_setup(ima, id.parse::<u64>().expect("Not a valid id"), user_path);