Refactor cargo config, add license, remove unused code (#49)

.cargo/config.toml

@@ -2,6 +2,8 @@
 rustflags = ["-C", "link-args=-Wl,--subsystem,windows"]
 
 [alias]
-brl = "build --release --lib"
-xtask = "run --package xtask --"
-r = "run --package xtask -- run"
+xtask = "run --package xtask --release --"
+t = "xwin test --target x86_64-pc-windows-msvc --"
+c = "xwin clippy --target x86_64-pc-windows-msvc"
+d = "xtask dist"
+r = "xtask run"

justfile

@@ -1,11 +1,5 @@
 set dotenv-load := true
 
-check:
- cargo +nightly xwin clippy --target x86_64-pc-windows-msvc --all
-
-test *args:
- cargo xwin test --target x86_64-pc-windows-msvc {{args}} -- --nocapture
-
 install:
  cargo xtask dist
  cp jdsd_dsiii_practice_tool.toml \

practice-tool/Cargo.toml

@@ -13,21 +13,23 @@ crate-type = ["cdylib", "rlib"]
 name = "libjdsd_dsiii_practice_tool"
 
 [dependencies]
-libds3 = { path = "../lib/libds3" }
+const_format = "0.2.26"
+hex = "0.4.3"
 log-panics = "2.0.0"
-toml = "0.5.6"
+open = "1.4.0"
+parking_lot = "0.11.2"
+pkg-version = "1.0.0"
+regex = "1"
+semver = "0.11.0"
 serde = { version = "1.0.130", features = ["derive"] }
 serde_json = "1.0.57"
-pkg-version = "1.0.0"
+toml = "0.5.6"
+tracing-subscriber = "0.3.17"
 ureq = { version = "2.8.0", features = ["json"] }
-open = "1.4.0"
-semver = "0.11.0"
-regex = "1"
 widestring = "0.5.1"
-parking_lot = "0.11.2"
-hex = "0.4.3"
-const_format = "0.2.26"
-tracing-subscriber = "0.3.17"
+
+libds3 = { path = "../lib/libds3" }
+
 hudhook.workspace = true
 imgui.workspace = true
 imgui-sys.workspace = true

practice-tool/src/config.rs

@@ -73,7 +73,7 @@ enum CfgCommand {
  CycleSpeed {
  #[serde(rename = "cycle_speed")]
  values: Vec<f32>,
- hotkey: Key,
+ hotkey: Option<Key>,
  },
  CharacterStats {
  #[serde(rename = "character_stats")]
@@ -82,7 +82,7 @@ enum CfgCommand {
  Souls {
  #[serde(rename = "souls")]
  amount: u32,
- hotkey: Key,
+ hotkey: Option<Key>,
  },
  OpenMenu {
  #[serde(rename = "open_menu")]

practice-tool/src/lib.rs

@@ -1,3 +1,19 @@
+// johndisandonato's Dark Souls III Practice Tool
+// Copyright (C) 2022-2024 johndisandonato <https://github.com/veeenu>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published
+// by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
 mod config;
 mod practice_tool;
 mod util;

practice-tool/src/widgets/cycle_speed.rs

@@ -50,6 +50,10 @@ impl ReadWrite for CycleSpeed {
  }
 }
 
-pub(crate) fn cycle_speed(values: &[f32], ptr: PointerChain<f32>, key: Key) -> Box<dyn Widget> {
- Box::new(StoreValue::new(CycleSpeed::new(values, ptr), Some(key)))
+pub(crate) fn cycle_speed(
+ values: &[f32],
+ ptr: PointerChain<f32>,
+ key: Option<Key>,
+) -> Box<dyn Widget> {
+ Box::new(StoreValue::new(CycleSpeed::new(values, ptr), key))
 }

practice-tool/src/widgets/souls.rs

@@ -35,6 +35,6 @@ impl ReadWrite for Souls {
  }
 }
 
-pub(crate) fn souls(amount: u32, ptr: PointerChain<u32>, key: Key) -> Box<dyn Widget> {
- Box::new(StoreValue::new(Souls::new(amount, ptr), Some(key)))
+pub(crate) fn souls(amount: u32, ptr: PointerChain<u32>, key: Option<Key>) -> Box<dyn Widget> {
+ Box::new(StoreValue::new(Souls::new(amount, ptr), key))
 }

xtask/src/dist.rs

@@ -1,4 +1,4 @@
-use std::fs::File;
+use std::fs::{self, File};
 use std::io::{Read, Write};
 use std::path::PathBuf;
 
@@ -28,8 +28,8 @@ pub(crate) fn dist() -> Result<()> {
  return Err("cargo build failed".into());
  }
 
- std::fs::remove_dir_all(dist_dir()).ok();
- std::fs::create_dir_all(dist_dir())?;
+ fs::remove_dir_all(dist_dir()).ok();
+ fs::create_dir_all(dist_dir())?;
 
  let mut zip = ZipWriter::new(File::create(dist_dir().join("jdsd_dsiii_practice_tool.zip"))?);
  let file_options = FileOptions::default().compression_method(CompressionMethod::Deflated);

xtask/src/main.rs

@@ -1,4 +1,5 @@
 mod codegen;
+mod dist;
 
 use std::ffi::OsStr;
 use std::fs::File;
@@ -7,8 +8,6 @@ use std::path::{Path, PathBuf};
 use std::process::Command;
 use std::{env, iter};
 
-mod dist;
-
 type DynError = Box<dyn std::error::Error>;
 type Result<T> = std::result::Result<T, DynError>;