Merge branch 'master' into nres

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.devcontainer/devcontainer.json

@@ -0,0 +1,15 @@
+{
+	"image": "mcr.microsoft.com/devcontainers/rust:latest",
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"rust-lang.rust-analyzer"
+			]
+		}
+	},
+	"runArgs": [
+		"--cap-add=SYS_PTRACE",
+		"--security-opt",
+		"seccomp=unconfined"
+	]
+}

.gitea/workflows/renovate.yml

@@ -1,26 +0,0 @@
-name: RenovateBot
-
-on:
-  schedule:
-    - cron: "@daily"
-  push:
-    branches:
-      - master
-
-jobs:
-  renovate:
-    container: ghcr.io/renovatebot/renovate:37
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Run renovate
-        run: |
-          renovate
-        env:
-          LOG_LEVEL: debug
-          RENOVATE_CONFIG_FILE: renovate.config.cjs
-          RENOVATE_REPOSITORIES: ${{ gitea.repository }}
-          RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }}

.github/dependabot.yml

@@ -0,0 +1,14 @@
+version: 2
+updates:
+  - package-ecosystem: "cargo"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "devcontainers"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/renovate.json

@@ -1,24 +1,30 @@
 {
-  "assignees": [
-    "valentineus"
-  ],
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "config:recommended",
     ":disableDependencyDashboard"
   ],
+  "assignees": [
+    "valentineus"
+  ],
+  "labels": [
+    "dependencies",
+    "automated"
+  ],
   "packageRules": [
     {
       "groupName": "all digest updates",
       "groupSlug": "all-digest",
-      "matchPackagePatterns": [
-        "*"
-      ],
       "matchUpdateTypes": [
         "minor",
         "patch",
         "pin",
         "digest"
-      ]
+      ],
+      "matchPackageNames": [
+        "*"
+      ],
+      "automerge": true
     }
   ]
-}
+}

.github/workflows/mirror.yml

@@ -0,0 +1,15 @@
+name: Mirror
+on: [push]
+
+jobs:
+  mirror:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+    - uses: yesolutions/mirror-action@master
+      with:
+        REMOTE: 'https://git.popov.link/fparkan.git'
+        GIT_USERNAME: ${{ secrets.GIT_USERNAME }}
+        GIT_PASSWORD: ${{ secrets.GIT_PASSWORD }}

.github/workflows/test.yml

@@ -0,0 +1,12 @@
+name: Test
+on: [push, pull_request]
+
+jobs:
+  test:
+    name: cargo test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+      - run: cargo check --all
+      - run: cargo test --all-features

Cargo.toml

@@ -1,12 +1,6 @@
 [workspace]
 resolver = "2"
-members = [
-    "libnres",
-    "nres-cli",
-    "packer",
-    "texture-decoder",
-    "unpacker",
-]
+members = ["libs/*", "tools/*"]
 
 [profile.release]
 codegen-units = 1

libnres/Cargo.toml

@@ -1,16 +0,0 @@
-[package]
-name = "libnres"
-version = "0.1.4"
-description = "Library for NRes files"
-authors = ["Valentin Popov <valentin@popov.link>"]
-homepage = "https://git.popov.link/valentineus/fparkan"
-repository = "https://git.popov.link/valentineus/fparkan.git"
-license = "GPL-2.0"
-edition = "2021"
-keywords = ["gamedev", "library", "nres"]
-
-[dependencies]
-byteorder = "1.4"
-log = "0.4"
-miette = "5.6"
-thiserror = "1.0"

libnres/README.md

@@ -1,25 +0,0 @@
-# Library for NRes files (Deprecated)
-
-Library for viewing and retrieving game resources of the game **"Parkan: Iron Strategy"**.
-All versions of the game are supported: Demo, IS, IS: Part 1, IS: Part 2.
-Supports files with `lib`, `trf`, `rlb` extensions.
-
-The files `gamefont.rlb` and `sprites.lib` are not supported.
-This files have an unknown signature.
-
-## Example
-
-Example of extracting game resources:
-
-```rust
-fn main() {
-    let file = std::fs::File::open("./voices.lib").unwrap();
-    // Extracting the list of files
-    let list = libnres::reader::get_list(&file).unwrap();
-
-    for element in list {
-        // Extracting the contents of the file
-        let data = libnres::reader::get_file(&file, &element).unwrap();
-    }
-}
-```

libs/nres/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+name = "libnres"
+version = "0.1.4"
+edition = "2021"
+
+[dependencies]
+byteorder = "1.4"
+log = "0.4"
+miette = "7.0"
+thiserror = "2.0"

nres-cli/Cargo.toml

@@ -1,20 +0,0 @@
-[package]
-name = "nres-cli"
-version = "0.2.3"
-description = "Console tool for NRes files"
-authors = ["Valentin Popov <valentin@popov.link>"]
-homepage = "https://git.popov.link/valentineus/fparkan"
-repository = "https://git.popov.link/valentineus/fparkan.git"
-license = "GPL-2.0"
-edition = "2021"
-keywords = ["cli", "gamedev", "nres"]
-
-[dependencies]
-byteorder = "1.4"
-clap = { version = "4.2", features = ["derive"] }
-console = "0.15"
-dialoguer = { version = "0.10", features = ["completion"] }
-indicatif = "0.17"
-libnres = { version = "0.1", path = "../libnres" }
-miette = { version = "5.6", features = ["fancy"] }
-tempdir = "0.3"

renovate.config.cjs

@@ -1,6 +0,0 @@
-module.exports = {
-	endpoint: "https://code.popov.link",
-	gitAuthor: "RenovateBot <renovatebot@noreply.localhost>",
-	optimizeForDisabled: true,
-	platform: "gitea",
-};

tools/nres-cli/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "nres-cli"
+version = "0.2.3"
+edition = "2021"
+
+[dependencies]
+byteorder = "1.4"
+clap = { version = "4.2", features = ["derive"] }
+console = "0.15"
+dialoguer = { version = "0.11", features = ["completion"] }
+indicatif = "0.17"
+libnres = { version = "0.1", path = "../../libs/nres" }
+miette = { version = "7.0", features = ["fancy"] }
+tempdir = "0.3"

tools/nres-cli/README.md

@@ -3,4 +3,4 @@
 ## Commands
 
 - `extract` - Extract game resources from a "NRes" file.
-- `ls` - Get a list of files in a "NRes" file.
+- `ls` - Get a list of files in a "NRes" file.

tools/texture-decoder/Cargo.toml

@@ -5,4 +5,4 @@ edition = "2021"
 
 [dependencies]
 byteorder = "1.4.3"
-image = "0.24.7"
+image = "0.25.0"

tools/unpacker/README.md

@@ -38,4 +38,4 @@ It is essential to preserve the file index for the game to function correctly, a
 
 Files can be replaced and packed back using the [packer](../packer).
 The newly obtained game resource files are correctly processed by the game engine.
-For example, sounds and 3D models of warbots' weapons were successfully replaced.
+For example, sounds and 3D models of warbots' weapons were successfully replaced.