A very rude implementation for Tile-Entity Search

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,40 +0,0 @@
-name: Bug Report
-description: Create a report to fix a bug
-labels: [bug]
-title: "[BUG] <title>"
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: A clear and concise description of what the bug is.
-    validations:
-      required: true
-  - type: textarea
-    id: reproduction
-    attributes:
-      label: Reproduction
-      description: Steps to reproduce the behavior.
-    validations:
-      required: true
-  - type: textarea
-    id: expected-behavior
-    attributes:
-      label: Expected Behavior
-      description: A clear and concise description of what you expected to happen.
-    validations:
-      required: true
-  - type: textarea
-    id: actual-behavior
-    attributes:
-      label: Actual Behavior
-      description: A clear and concise description of what actually happened.
-    validations:
-      required: true
-  - type: textarea
-    id: additional-context
-    attributes:
-      label: Additional Context
-      description: Add any other context about the problem here.
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/feature.yml

@@ -1,35 +0,0 @@
-name: Feature Request
-description: Suggest an idea for this project
-
-title: "[FEATURE] <title>"
-labels: [enhancement]
-
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-    validations:
-      required: true
-  - type: textarea
-    id: solution
-    attributes:
-      label: Proposed Solution
-      description: A clear and concise description of what you want to happen.
-    validations:
-      required: true
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: Alternatives
-      description: A clear and concise description of any alternative solutions or features you've considered.
-    validations:
-      required: false
-  - type: textarea
-    id: additional-context
-    attributes:
-      label: Additional Context
-      description: Add any other context or screenshots about the feature request here.
-    validations:
-      required: false

.github/dependabot.yml

@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "cargo"
-    directory: "/"
-    schedule:
-      interval: "weekly"

.github/workflows/master-build.yml

@@ -19,38 +19,34 @@ jobs:
       - name: Cache Cargo modules
         id: cache-cargo
         uses: actions/cache@v3
-        continue-on-error: false
+        env:
+          cache-name: cache-cargo-target-debug
         with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          path: target
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
-            ${{ runner.os }}-cargo-
+            ${{ runner.os }}-${{ env.cache-name }}-
       - name: Build
-        run: make debug
+        run: cargo build --verbose
       - name: Run tests
         run: cargo test --verbose -p schemsearch-lib
 
   build-release:
-    needs:
-      - build
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Cache Cargo modules
         id: cache-cargo
         uses: actions/cache@v3
-        continue-on-error: false
+        env:
+          cache-name: cache-cargo-target-release
         with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          path: target
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
-            ${{ runner.os }}-cargo-
+            ${{ runner.os }}-${{ env.cache-name }}-
       - name: Build
-        run: make
+        run: cargo build --verbose --release -p schemsearch-cli
       - name: Upload a Build Artifact
         uses: actions/upload-artifact@v3.1.2
         with:

.github/workflows/release-build.yml

@@ -22,16 +22,15 @@ jobs:
       - name: Cache Cargo modules
         id: cache-cargo
         uses: actions/cache@v3
-        continue-on-error: false
+        env:
+          cache-name: cache-cargo-target-release
         with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          path: target
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
-            ${{ runner.os }}-cargo-
+            ${{ runner.os }}-${{ env.cache-name }}-
       - name: Build
-        run: make
+        run: cargo build --verbose --release -p schemsearch-cli
       - name: Create Tarball
         if: ${{ matrix.os != 'windows-latest' }}
         run: tar -czvf schemsearch-cli-${{ matrix.os }}.tar.gz -C target/release schemsearch-cli

CODE_OF_CONDUCT.md

@@ -1,128 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, religion, or sexual identity
-and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
-  overall community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-chaoscaot@zohomail.eu.
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series
-of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or
-permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within
-the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.0, available at
-https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct
-enforcement ladder](https://github.com/mozilla/diversity).
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at
-https://www.contributor-covenant.org/translations.

Makefile

@@ -1,28 +0,0 @@
-default:
-	@echo "Building (Release)...";
-	cargo rustc --release --color=always -p schemsearch-cli -- -C target-feature=+avx2
-
-sql:
-	@echo "Building (Release)...";
-	cargo rustc --release --color=always -p schemsearch-cli --features sql -- -C target-feature=+avx2
-
-debug:
-	@echo "Building (Debug)...";
-	cargo build -p schemsearch-cli
-
-install: default
-	@echo "Installing...";
-	install -Dm755 target/release/schemsearch-cli /usr/bin/schemsearch
-
-uninstall:
-	@echo "Uninstalling...";
-	rm -f /usr/bin/schemsearch
-
-java:
-	@echo "Building Java...";
-	@echo "WARNING: This is WORK IN PROGRESS!";
-	javac SchemSearch.java
-
-clean:
-	@echo "Cleaning...";
-	cargo clean

README.md

@@ -5,10 +5,10 @@
 
 ## WARNING: This is a work in progress and is really simple right now. It will be improved in the future.
 | Feature                | Status |
-|---------------------------|--------|
+|------------------------|--------|
 | Block search           | ✅      |
 | Block data less search | ✅      |
-| Tile entities data search | ❌      |
+| Tile entities search   | ❌      |
 | Entities search        | ❌      |
 
 ---
@@ -41,12 +41,12 @@ schemsearch-cli --help
 ---
 
 ## Roadmap
-A list of features that are planned to be implemented in the future. In order of priority.
 
-- [ ] Use AVX2 for faster search
-- [ ] Tile entities data search
+- [ ] Tile entities search
 - [ ] Entities search
-- [ ] McEdit Schematic support
+- [ ] Better error handling
+- [ ] Web interface
+- [ ] McEdit search
 
 ---
 

schemsearch-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "schemsearch-cli"
-version = "0.1.3"
+version = "0.1.1"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 

schemsearch-cli/src/json_output.rs

@@ -1,5 +1,5 @@
 use serde::{Deserialize, Serialize};
-use schemsearch_lib::{Match, SearchBehavior};
+use schemsearch_lib::SearchBehavior;
 
 #[derive(Serialize, Deserialize, Debug)]
 #[serde(tag = "event")]
@@ -12,8 +12,10 @@ pub enum JsonEvent {
 #[derive(Serialize, Deserialize, Debug)]
 pub struct FoundEvent {
     pub name: String,
-    #[serde(flatten, rename = "match")]
-    pub match_: Match,
+    pub x: u16,
+    pub y: u16,
+    pub z: u16,
+    pub percent: f32,
 }
 
 #[derive(Serialize, Deserialize, Debug)]

schemsearch-cli/src/main.rs

@@ -18,7 +18,6 @@
 mod types;
 mod json_output;
 mod sinks;
-mod stderr;
 
 use std::fmt::Debug;
 use std::io::Write;
@@ -26,7 +25,7 @@ use clap::{command, Arg, ArgAction, ValueHint};
 use std::path::PathBuf;
 use std::str::FromStr;
 use clap::error::ErrorKind;
-use schemsearch_lib::{Match, search, SearchBehavior};
+use schemsearch_lib::{search, SearchBehavior};
 use crate::types::{PathSchematicSupplier, SchematicSupplierType};
 #[cfg(feature = "sql")]
 use futures::executor::block_on;
@@ -38,10 +37,9 @@ use schemsearch_sql::filter::SchematicFilter;
 use schemsearch_sql::load_all_schematics;
 #[cfg(feature = "sql")]
 use crate::types::SqlSchematicSupplier;
-use indicatif::*;
-use schemsearch_files::SpongeSchematic;
+use indicatif::{ParallelProgressIterator, ProgressStyle};
+use schemsearch_files::Schematic;
 use crate::sinks::{OutputFormat, OutputSink};
-use crate::stderr::MaschineStdErr;
 
 fn main() {
     #[allow(unused_mut)]
@@ -67,10 +65,17 @@ fn main() {
                 .action(ArgAction::SetTrue),
         )
         .arg(
-            Arg::new("ignore-block-entities")
-                .help("Ignores block entities when searching [Not Implemented]")
+            Arg::new("ignore-tile-entities")
+                .help("Ignores tile entities when searching [Not Implemented]")
                 .short('b')
-                .long("ignore-block-entities")
+                .long("ignore-tile-entities")
+                .action(ArgAction::SetTrue),
+        )
+        .arg(
+            Arg::new("ignore-tile-entity-data")
+                .help("Ignores tile entity data when searching [Not Implemented]")
+                .short('B')
+                .long("ignore-tile-entity-data")
                 .action(ArgAction::SetTrue),
         )
         .arg(
@@ -96,7 +101,7 @@ fn main() {
         )
         .arg(
             Arg::new("output")
-                .help("The output format and path [Format:Path] available formats: text, json, csv; available paths: std, err, (file path)")
+                .help("The output format and path [Format:Path] available formats: text, json, csv; available paths: std, (file path)")
                 .short('o')
                 .long("output")
                 .action(ArgAction::Append)
@@ -141,24 +146,6 @@ fn main() {
                 .default_value("0")
                 .value_parser(|s: &str| s.parse::<usize>().map_err(|e| e.to_string())),
         )
-        .arg(
-            Arg::new("machine")
-                .help("Output for machines")
-                .short('m')
-                .long("machine")
-                .action(ArgAction::Set)
-                .default_value("0")
-                .value_parser(|s: &str| s.parse::<u16>().map_err(|e| e.to_string()))
-        )
-        .arg(
-            Arg::new("limit")
-                .help("The maximum number of matches to return [0 = Unlimited]")
-                .short('l')
-                .long("limit")
-                .action(ArgAction::Set)
-                .default_value("50")
-                .value_parser(|s: &str| s.parse::<usize>().map_err(|e| e.to_string())),
-        )
         .about("Searches for a pattern in a schematic")
         .bin_name("schemsearch");
 
@@ -199,14 +186,15 @@ fn main() {
 
     let search_behavior = SearchBehavior {
         ignore_block_data: matches.get_flag("ignore-data"),
-        ignore_block_entities: matches.get_flag("ignore-block-entities"),
+        ignore_tile_entities: matches.get_flag("ignore-tile-entities"),
+        ignore_tile_entity_data: matches.get_flag("ignore-tile-entity-data"),
         ignore_air: matches.get_flag("ignore-air"),
         air_as_any: matches.get_flag("air-as-any"),
         ignore_entities: matches.get_flag("ignore-entities"),
         threshold: *matches.get_one::<f32>("threshold").expect("Couldn't get threshold"),
     };
 
-    let pattern = match SpongeSchematic::load(&PathBuf::from(matches.get_one::<String>("pattern").unwrap())) {
+    let pattern = match Schematic::load(&PathBuf::from(matches.get_one::<String>("pattern").unwrap())) {
         Ok(x) => x,
         Err(e) => {
             cmd.error(ErrorKind::Io, format!("Error while loading Pattern: {}", e.to_string())).exit();
@@ -266,23 +254,14 @@ fn main() {
 
     ThreadPoolBuilder::new().num_threads(*matches.get_one::<usize>("threads").expect("Could not get threads")).build_global().unwrap();
 
-    let bar = ProgressBar::new(schematics.len() as u64); // "maschine"
-    bar.set_style(ProgressStyle::with_template("[{elapsed}, ETA: {eta}] {wide_bar} {pos}/{len} {per_sec}").unwrap());
-    let term_size = *matches.get_one::<u16>("machine").expect("Could not get machine");
-    if term_size != 0 {
-        bar.set_draw_target(ProgressDrawTarget::term_like(Box::new(MaschineStdErr { size: term_size })))
-    }
-
-    let max_matching = *matches.get_one::<usize>("limit").expect("Could not get max-matching");
-
-    let matches: Vec<SearchResult> = schematics.par_iter().progress_with(bar).map(|schem| {
+    let matches: Vec<SearchResult> = schematics.par_iter().progress_with_style(ProgressStyle::with_template("[{elapsed}, ETA: {eta}] {wide_bar} {pos}/{len} {per_sec}").unwrap()).map(|schem| {
         match schem {
             SchematicSupplierType::PATH(schem) => {
                 let schematic = match load_schem(&schem.path) {
                     Some(x) => x,
                     None => return SearchResult {
                         name: schem.get_name(),
-                        matches: Vec::default()
+                        matches: vec![]
                     }
                 };
                 SearchResult {
@@ -300,10 +279,10 @@ fn main() {
                         }
                     }
                     Err(e) => {
-                        eprintln!("Error while loading schematic ({}): {}", schem.get_name(), e.to_string());
+                        println!("Error while loading schematic ({}): {}", schem.get_name(), e.to_string());
                         SearchResult {
                             name: schem.get_name(),
-                            matches: Vec::default()
+                            matches: vec![]
                         }
                     }
                 }
@@ -311,19 +290,13 @@ fn main() {
         }
     }).collect();
 
-    let mut matches_count = 0;
-
-    'outer: for matching in matches {
+    for matching in matches {
         let schem_name = matching.name;
         let matching = matching.matches;
         for x in matching {
             for out in &mut output {
                 write!(out.1, "{}", out.0.found_match(&schem_name, x)).unwrap();
             }
-            matches_count += 1;
-            if max_matching != 0 && matches_count >= max_matching {
-                break 'outer;
-            }
         }
     }
 
@@ -334,8 +307,8 @@ fn main() {
     }
 }
 
-fn load_schem(schem_path: &PathBuf) -> Option<SpongeSchematic> {
-    match SpongeSchematic::load(schem_path) {
+fn load_schem(schem_path: &PathBuf) -> Option<Schematic> {
+    match Schematic::load(schem_path) {
         Ok(x) => Some(x),
         Err(e) => {
             println!("Error while loading schematic ({}): {}", schem_path.to_str().unwrap(), e.to_string());
@@ -347,6 +320,6 @@ fn load_schem(schem_path: &PathBuf) -> Option<SpongeSchematic> {
 #[derive(Debug, Clone)]
 struct SearchResult {
     name: String,
-    matches: Vec<Match>,
+    matches: Vec<(u16, u16, u16, f32)>,
 }
 

schemsearch-cli/src/sinks.rs

@@ -2,15 +2,12 @@ use std::fs::File;
 use std::io::BufWriter;
 use std::str::FromStr;
 use std::io::Write;
-use std::time::Duration;
-use indicatif::HumanDuration;
-use schemsearch_lib::{Match, SearchBehavior};
+use schemsearch_lib::SearchBehavior;
 use crate::json_output::{EndEvent, FoundEvent, InitEvent, JsonEvent};
 
 #[derive(Debug, Clone)]
 pub enum OutputSink {
     Stdout,
-    Stderr,
     File(String),
 }
 
@@ -40,7 +37,6 @@ impl FromStr for OutputSink {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
             "std" => Ok(OutputSink::Stdout),
-            "err" => Ok(OutputSink::Stderr),
             _ => Ok(OutputSink::File(s.to_string()))
         }
     }
@@ -49,21 +45,23 @@ impl FromStr for OutputSink {
 impl OutputSink {
     pub fn output(&self) -> Box<dyn Write> {
         match self {
-            OutputSink::Stdout => Box::new(std::io::stdout()),
-            OutputSink::Stderr => Box::new(std::io::stderr()),
+            OutputSink::Stdout => Box::new(std::io::stdout().lock()),
             OutputSink::File(path) => Box::new(BufWriter::new(File::create(path).unwrap()))
         }
     }
 }
 
 impl OutputFormat {
-    pub fn found_match(&self, name: &String, pos: Match) -> String {
+    pub fn found_match(&self, name: &String, pos: (u16, u16, u16, f32)) -> String {
         match self {
-            OutputFormat::Text => format!("Found match in '{}' at x: {}, y: {}, z: {}, % = {}\n", name, pos.x, pos.y, pos.z, pos.percent),
-            OutputFormat::CSV => format!("{},{},{},{},{}\n", name, pos.x, pos.y, pos.z, pos.percent),
+            OutputFormat::Text => format!("Found match in '{}' at x: {}, y: {}, z: {}, % = {}\n", name, pos.0, pos.1, pos.2, pos.3),
+            OutputFormat::CSV => format!("{},{},{},{},{}\n", name, pos.0, pos.1, pos.2, pos.3),
             OutputFormat::JSON => format!("{}\n", serde_json::to_string(&JsonEvent::Found(FoundEvent {
                 name: name.clone(),
-                match_: pos,
+                x: pos.0,
+                y: pos.1,
+                z: pos.2,
+                percent: pos.3,
             })).unwrap())
         }
     }
@@ -82,7 +80,7 @@ impl OutputFormat {
 
     pub fn end(&self, end_time: u128) -> String {
         match self {
-            OutputFormat::Text => format!("Search complete in {}\n", HumanDuration(Duration::from_millis(end_time as u64))),
+            OutputFormat::Text => format!("Search complete in {}s\n", end_time / 1000),
             OutputFormat::CSV => format!("{}\n", end_time),
             OutputFormat::JSON => format!("{}\n", serde_json::to_string(&JsonEvent::End(EndEvent{ end_time })).unwrap())
         }

schemsearch-cli/src/stderr.rs

@@ -1,44 +0,0 @@
-use std::fmt::Debug;
-use std::io::Write;
-use indicatif::TermLike;
-
-#[derive(Debug)]
-pub struct MaschineStdErr { pub(crate) size: u16}
-
-impl TermLike for MaschineStdErr {
-    fn width(&self) -> u16 {
-        self.size
-    }
-
-    fn move_cursor_up(&self, _: usize) -> std::io::Result<()> {
-        Ok(())
-    }
-
-    fn move_cursor_down(&self, _: usize) -> std::io::Result<()> {
-        Ok(())
-    }
-
-    fn move_cursor_right(&self, _: usize) -> std::io::Result<()> {
-        Ok(())
-    }
-
-    fn move_cursor_left(&self, _: usize) -> std::io::Result<()> {
-        Ok(())
-    }
-
-    fn write_line(&self, s: &str) -> std::io::Result<()> {
-        writeln!(std::io::stderr(), "{}", s)
-    }
-
-    fn write_str(&self, s: &str) -> std::io::Result<()> {
-        write!(std::io::stderr(), "{}", s)
-    }
-
-    fn clear_line(&self) -> std::io::Result<()> {
-        Ok(())
-    }
-
-    fn flush(&self) -> std::io::Result<()> {
-        std::io::stderr().flush()
-    }
-}

schemsearch-cli/src/types.rs

@@ -15,14 +15,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#[cfg(feature = "sql")]
-use std::io::Cursor;
 use std::path::PathBuf;
 #[cfg(feature = "sql")]
 use futures::executor::block_on;
 #[cfg(feature = "sql")]
-use schemsearch_files::SpongeSchematic;
-#[cfg(feature = "sql")]
 use schemsearch_sql::{load_schemdata, SchematicNode};
 
 pub enum SchematicSupplierType {
@@ -48,9 +44,9 @@ pub struct SqlSchematicSupplier {
 
 #[cfg(feature = "sql")]
 impl SqlSchematicSupplier {
-    pub fn get_schematic(&self) -> Result<SpongeSchematic, String> {
-        let mut schemdata = block_on(load_schemdata(self.node.id));
-        SpongeSchematic::load_data(&mut Cursor::new(schemdata.as_mut_slice()))
+    pub fn get_schematic(&self) -> Result<Schematic, String> {
+        let schemdata = block_on(load_schemdata(self.node.id));
+        Schematic::load_data(schemdata.as_slice())
     }
 
     pub fn get_name(&self) -> String {

schemsearch-faster/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "schemsearch_faster"
-version = "0.1.3"
+version = "0.1.1"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 

schemsearch-faster/src/lib.rs

@@ -16,9 +16,9 @@
  */
 
 use nbt::Map;
-use schemsearch_files::SpongeV2Schematic;
+use schemsearch_files::Schematic;
 
-pub fn convert_to_search_space(schem: &SpongeV2Schematic, palette: &Vec<String>) -> Vec<Vec<u8>> {
+pub fn convert_to_search_space(schem: &Schematic, palette: &Vec<String>) -> Vec<Vec<u8>> {
     let mut data: Vec<Vec<u8>> = Vec::with_capacity(palette.len());
     let block_data = &schem.block_data;
     for name in palette {
@@ -48,26 +48,26 @@ pub fn unwrap_palette(palette: &Map<String, i32>) -> Vec<String> {
 #[cfg(test)]
 mod tests {
     use std::path::{Path, PathBuf};
-    use schemsearch_files::SpongeV2Schematic;
+    use schemsearch_files::Schematic;
     use crate::{convert_to_search_space, unwrap_palette};
 
     //#[test]
     pub fn test() {
-        let schematic = SpongeV2Schematic::load(&PathBuf::from("../tests/Pattern.schem")).unwrap();
+        let schematic = Schematic::load(&PathBuf::from("../tests/Pattern.schem")).unwrap();
         dbg!(convert_to_search_space(&schematic, &unwrap_palette(&schematic.palette)));
     }
 
     //#[test]
     pub fn test_2() {
-        let schematic = SpongeV2Schematic::load(&PathBuf::from("../tests/Pattern.schem")).unwrap();
-        let schematic2 = SpongeV2Schematic::load(&PathBuf::from("../tests/Random.schem")).unwrap();
+        let schematic = Schematic::load(&PathBuf::from("../tests/Pattern.schem")).unwrap();
+        let schematic2 = Schematic::load(&PathBuf::from("../tests/Random.schem")).unwrap();
         println!("{:?}", convert_to_search_space(&schematic2, &unwrap_palette(&schematic.palette)));
     }
 
     //#[test]
     pub fn test_big() {
-        let schematic = SpongeV2Schematic::load(&PathBuf::from("../tests/endstone.schem")).unwrap();
-        let schematic2 = SpongeV2Schematic::load(&PathBuf::from("../tests/simple.schem")).unwrap();
+        let schematic = Schematic::load(&PathBuf::from("../tests/endstone.schem")).unwrap();
+        let schematic2 = Schematic::load(&PathBuf::from("../tests/simple.schem")).unwrap();
         let _ = convert_to_search_space(&schematic2, &unwrap_palette(&schematic.palette));
     }
 }

schemsearch-files/Cargo.toml

@@ -1,11 +1,10 @@
 [package]
 name = "schemsearch-files"
-version = "0.1.3"
+version = "0.1.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-flate2 = "1.0.25"
-named-binary-tag = "0.6"
-
+hematite-nbt = "0.5.2"
+serde = "1.0.152"

schemsearch-files/src/lib.rs

@@ -15,166 +15,87 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-use std::collections::hash_map::HashMap;
 use std::io::Read;
 use std::path::PathBuf;
-use nbt::{CompoundTag, Tag};
+use nbt::{Map, Value};
+use serde::{Deserialize, Deserializer, Serialize};
 
-#[derive(Clone, Debug)]
-pub struct SpongeSchematic {
+#[derive(Serialize, Deserialize, Debug)]
+pub struct Schematic {
+    #[serde(rename = "Version")]
+    pub version: i32,
+    #[serde(rename = "DataVersion")]
     pub data_version: i32,
-    pub metadata: CompoundTag,
+    #[serde(rename = "Metadata")]
+    pub metadata: Map<String, Value>,
+    #[serde(rename = "Width")]
     pub width: u16,
+    #[serde(rename = "Height")]
     pub height: u16,
+    #[serde(rename = "Length")]
     pub length: u16,
+    #[serde(rename = "Offset")]
     pub offset: [i32; 3],
+    #[serde(rename = "PaletteMax")]
     pub palette_max: i32,
-    pub palette: HashMap<String, i32>,
+    #[serde(rename = "Palette")]
+    pub palette: Map<String, i32>,
+    #[serde(rename = "BlockData", deserialize_with = "read_blockdata")]
     pub block_data: Vec<i32>,
+    #[serde(rename = "BlockEntities")]
     pub block_entities: Vec<BlockEntity>,
+    #[serde(rename = "Entities")]
     pub entities: Option<Vec<Entity>>,
 }
 
-#[derive(Clone, Debug)]
-pub struct BlockContainer {
-    pub palette: HashMap<String, i32>,
-    pub block_data: Vec<i32>,
-    pub block_entities: Vec<BlockEntity>,
+fn read_blockdata<'de, D>(deserializer: D) -> Result<Vec<i32>, D::Error>
+    where
+        D: Deserializer<'de>,
+{
+    let s: Vec<i8> = Deserialize::deserialize(deserializer)?;
+    Ok(read_varint_array(&s))
 }
 
-#[derive(Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct BlockEntity {
+    #[serde(rename = "Id")]
     pub id: String,
+    #[serde(rename = "Pos")]
     pub pos: [i32; 3],
+
+    #[serde(flatten)]
+    pub data: Map<String, Value>,
 }
 
-#[derive(Debug, Clone)]
-pub struct BlockEntityV3 {
-    pub id: String,
-    pub pos: [i32; 3],
-    pub data: HashMap<String, Tag>,
-}
-
-#[derive(Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct Entity {
+    #[serde(rename = "Id")]
     pub id: String,
+    #[serde(rename = "Pos")]
     pub pos: [i32; 3],
+
+    #[serde(flatten)]
+    pub data: Map<String, Value>,
 }
 
-impl SpongeSchematic {
-    pub fn load_data<R>(data: &mut R) -> Result<SpongeSchematic, String> where R: Read {
-        let nbt: CompoundTag = nbt::decode::read_gzip_compound_tag(data).map_err(|e| e.to_string())?;
-        let version = nbt.get_i32("Version").map_err(|e| e.to_string())?;
-
-        match version {
-            1 => SpongeSchematic::from_nbt_1(nbt),
-            2 => SpongeSchematic::from_nbt_2(nbt),
-            3 => SpongeSchematic::from_nbt_3(nbt),
-            _ => Err("Invalid schematic: Unknown Version".to_string()),
-        }
-    }
-
-    pub fn load(path: &PathBuf) -> Result<SpongeSchematic, String> {
-        let mut file = std::fs::File::open(path).map_err(|e| e.to_string())?;
-        Self::load_data(&mut file)
-    }
-
-    pub fn from_nbt_1(nbt: CompoundTag) -> Result<Self, String> {
-        Ok(Self {
-            data_version: 0,
-            metadata: nbt.get_compound_tag("Metadata").map_err(|e| e.to_string())?.clone(),
-            width: nbt.get_i16("Width").map_err(|e| e.to_string())? as u16,
-            height: nbt.get_i16("Height").map_err(|e| e.to_string())? as u16,
-            length: nbt.get_i16("Length").map_err(|e| e.to_string())? as u16,
-            offset: read_offset(nbt.get_i32_vec("Offset").map_err(|e| e.to_string())?)?,
-            palette_max: nbt.get_i32("PaletteMax").map_err(|e| e.to_string())?,
-            palette: read_palette(nbt.get_compound_tag("Palette").map_err(|e| e.to_string())?),
-            block_data: read_blocks(nbt.get_i8_vec("BlockData").map_err(|e| e.to_string())?),
-            block_entities: read_tile_entities(nbt.get_compound_tag_vec("TileEntities").map_err(|e| e.to_string())?)?,
-            entities: None,
-        })
-    }
-
-    pub fn from_nbt_2(nbt: CompoundTag) -> Result<Self, String> {
-        Ok(Self{
-            data_version: nbt.get_i32("DataVersion").map_err(|e| e.to_string())?,
-            metadata: nbt.get_compound_tag("Metadata").map_err(|e| e.to_string())?.clone(),
-            width: nbt.get_i16("Width").map_err(|e| e.to_string())? as u16,
-            height: nbt.get_i16("Height").map_err(|e| e.to_string())? as u16,
-            length: nbt.get_i16("Length").map_err(|e| e.to_string())? as u16,
-            offset: read_offset(nbt.get_i32_vec("Offset").map_err(|e| e.to_string())?)?,
-            palette_max: nbt.get_i32("PaletteMax").map_err(|e| e.to_string())?,
-            palette: read_palette(nbt.get_compound_tag("Palette").map_err(|e| e.to_string())?),
-            block_data: read_blocks(nbt.get_i8_vec("BlockData").map_err(|e| e.to_string())?),
-            block_entities: read_tile_entities(nbt.get_compound_tag_vec("BlockEntities").map_err(|e| e.to_string())?)?,
-            entities: None,
-        })
-    }
-
-    pub fn from_nbt_3(nbt: CompoundTag) -> Result<Self, String> {
-        let blocks = nbt.get_compound_tag("Blocks").map_err(|e| e.to_string())?;
-        Ok(Self{
-            data_version: nbt.get_i32("DataVersion").map_err(|e| e.to_string())?,
-            metadata: nbt.get_compound_tag("Metadata").map_err(|e| e.to_string())?.clone(),
-            width: nbt.get_i16("Width").map_err(|e| e.to_string())? as u16,
-            height: nbt.get_i16("Height").map_err(|e| e.to_string())? as u16,
-            length: nbt.get_i16("Length").map_err(|e| e.to_string())? as u16,
-            offset: read_offset(nbt.get_i32_vec("Offset").map_err(|e| e.to_string())?)?,
-            palette_max: compute_palette_max(blocks.get_compound_tag("Palette").map_err(|e| e.to_string())?),
-            palette: read_palette(blocks.get_compound_tag("Palette").map_err(|e| e.to_string())?),
-            block_data: read_blocks(blocks.get_i8_vec("BlockData").map_err(|e| e.to_string())?),
-            block_entities: read_tile_entities(blocks.get_compound_tag_vec("BlockEntities").map_err(|e| e.to_string())?)?,
-            entities: None,
-        })
-    }
-
-}
-
-fn read_tile_entities(tag: Vec<&CompoundTag>) -> Result<Vec<BlockEntity>, String> {
-let mut tile_entities = Vec::new();
-    for t in tag {
-        tile_entities.push(BlockEntity {
-            id: t.get_str("Id").map_err(|e| e.to_string())?.to_string(),
-            pos: read_offset(t.get("Pos").map_err(|e| e.to_string())?)?,
-        });
-    }
-    Ok(tile_entities)
-}
-
-#[inline]
-fn read_offset(offset: &Vec<i32>) -> Result<[i32; 3], String> {
-    match offset.len() {
-        3 => Ok([offset[0], offset[1], offset[2]]),
-        _ => Err("Invalid schematic: read_offset wrong length".to_string()),
-    }
-}
-
-#[inline]
-fn read_palette(p: &CompoundTag) -> HashMap<String, i32> {
-    let mut palette = HashMap::new();
-    for (key, value) in p.iter() {
-        match value {
-            Tag::Int(n) => { palette.insert(key.clone(), *n); },
-            _ => {},
+impl Schematic {
+    pub fn load_data<R>(data: R) -> Result<Schematic, String> where R: Read {
+        let schematic: Schematic = match nbt::from_gzip_reader(data) {
+            Ok(schem) => schem,
+            Err(e) => return Err(format!("Failed to parse schematic: {}", e))
         };
-    }
-    palette
+        Ok(schematic)
     }
 
-#[inline]
-fn compute_palette_max(palette: &CompoundTag) -> i32 {
-    palette.iter().map(|(_, v)| v).filter_map(|v| match v {
-        Tag::Int(n) => Some(*n),
-        _ => None,
-    }).max().unwrap_or(0)
+    pub fn load(path: &PathBuf) -> Result<Schematic, String> {
+        let file = match std::fs::File::open(path) {
+            Ok(x) => x,
+            Err(_) => return Err(format!("Failed to open file: {}", path.to_str().unwrap()))
+        };
+        Schematic::load_data(file)
+    }
 }
 
-#[inline]
-fn read_blocks(blockdata: &Vec<i8>) -> Vec<i32> {
-    read_varint_array(blockdata)
-}
-
-#[inline]
 pub fn read_varint_array(read: &Vec<i8>) -> Vec<i32> {
     let mut data = Vec::new();
     let mut value: i32 = 0;

schemsearch-java/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "schemsearch-java"
-version = "0.1.3"
+version = "0.1.1"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 

schemsearch-java/src/lib.rs

@@ -21,7 +21,7 @@ use jni::JNIEnv;
 use jni::objects::{JClass, JString};
 
 use jni::sys::jstring;
-use schemsearch_files::SpongeV2Schematic;
+use schemsearch_files::Schematic;
 use schemsearch_lib::{search, SearchBehavior};
 
 #[no_mangle]
@@ -32,21 +32,14 @@ pub extern "system" fn Java_SchemSearch_search<'local>(mut env: JNIEnv<'local>,
     pattern_path: JString<'local>) -> jstring {
     let schematic_path: String = env.get_string(&schematic_path).expect("Couldn't get java string!").into();
     let pattern_path: String = env.get_string(&pattern_path).expect("Couldn't get java string!").into();
-    let schematic = SpongeV2Schematic::load(&PathBuf::from(&schematic_path)).unwrap();
-    let pattern = SpongeV2Schematic::load(&PathBuf::from(&pattern_path)).unwrap();
+    let schematic = Schematic::load(&PathBuf::from(&schematic_path)).unwrap();
+    let pattern = Schematic::load(&PathBuf::from(&pattern_path)).unwrap();
 
-    let matches = search(schematic, &pattern, SearchBehavior {
-        ignore_block_data: true,
-        ignore_block_entities: true,
-        ignore_entities: true,
-        ignore_air: false,
-        air_as_any: false,
-        threshold: 0.0,
-    });
+    let matches = search(schematic, &pattern, SearchBehavior::default());
 
     let mut result = String::new();
-    for m in matches {
-        result.push_str(&format!("{}, {}, {}, {};", m.x, m.y, m.z, m.percent));
+    for (x, y, z, p) in matches {
+        result.push_str(&format!("{}, {}, {}, {};", x, y, z, p));
     }
     result.remove(result.len() - 1);
     let output = env.new_string(result).expect("Couldn't create java string!");

schemsearch-lib/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "schemsearch-lib"
-version = "0.1.3"
+version = "0.1.1"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-serde = { version = "1.0.160", features = ["derive"] }
+hematite-nbt = "0.5.2"
+serde = "1.0.152"
 schemsearch-files = { path = "../schemsearch-files" }
-named-binary-tag = "0.6"

schemsearch-lib/src/lib.rs

@@ -17,26 +17,41 @@
 
 pub mod pattern_mapper;
 
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 use pattern_mapper::match_palette;
-use schemsearch_files::SpongeSchematic;
+use schemsearch_files::Schematic;
 use crate::pattern_mapper::match_palette_adapt;
 
 #[derive(Debug, Clone, Copy, Deserialize, Serialize)]
 pub struct SearchBehavior {
     pub ignore_block_data: bool,
-    pub ignore_block_entities: bool,
+    pub ignore_tile_entities: bool,
+    pub ignore_tile_entity_data: bool,
     pub ignore_air: bool,
     pub air_as_any: bool,
     pub ignore_entities: bool,
     pub threshold: f32,
 }
 
+impl Default for SearchBehavior {
+    fn default() -> Self {
+        SearchBehavior {
+            ignore_block_data: true,
+            ignore_tile_entities: true,
+            ignore_tile_entity_data: false,
+            ignore_entities: true,
+            ignore_air: false,
+            air_as_any: false,
+            threshold: 90.0,
+        }
+    }
+}
+
 pub fn search(
-    schem: SpongeSchematic,
-    pattern_schem: &SpongeSchematic,
+    schem: Schematic,
+    pattern_schem: &Schematic,
     search_behavior: SearchBehavior,
-) -> Vec<Match> {
+) -> Vec<(u16, u16, u16, f32)> {
     if schem.width < pattern_schem.width || schem.height < pattern_schem.height || schem.length < pattern_schem.length {
         return vec![];
     }
@@ -47,21 +62,21 @@ pub fn search(
 
     let pattern_schem = match_palette(&schem, &pattern_schem, search_behavior.ignore_block_data);
 
-    let mut matches: Vec<Match> = Vec::new();
+    let mut matches: Vec<(u16, u16, u16, f32)> = Vec::new();
 
     let pattern_data = pattern_schem.block_data.as_slice();
 
     let schem_data = if search_behavior.ignore_block_data {
         match_palette_adapt(&schem, &pattern_schem.palette, search_behavior.ignore_block_data)
     } else {
-        schem.block_data.clone()
+        schem.block_data
     };
 
     let schem_data = schem_data.as_slice();
 
     let air_id = if search_behavior.ignore_air || search_behavior.air_as_any { pattern_schem.palette.get("minecraft:air").unwrap_or(&-1) } else { &-1};
 
-    let pattern_blocks = pattern_data.len() as f32;
+    let pattern_blocks = (pattern_schem.width * pattern_schem.height * pattern_schem.length) as f32 + if search_behavior.ignore_tile_entities { 0.0 } else { pattern_schem.block_entities.len() as f32 };
 
     let pattern_width = pattern_schem.width as usize;
     let pattern_height = pattern_schem.height as usize;
@@ -88,14 +103,29 @@ pub fn search(
                         }
                     }
                 }
+                if !search_behavior.ignore_tile_entities {
+                    for tile_entity in &pattern_schem.block_entities {
+                        for entry in &schem.block_entities {
+                            if tile_entity.id.as_str() == entry.id.as_str() {
+                                let pos = tile_entity.pos;
+                                let schem_pos = [pos[0] + x as i32, pos[1] + y as i32, pos[2] + z as i32];
+                                if schem_pos == entry.pos {
+                                    if search_behavior.ignore_tile_entity_data {
+                                        matching += 1;
+                                    } else {
+                                        if tile_entity.data == entry.data {
+                                            matching += 1;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
                 let matching_percent = matching as f32 / pattern_blocks;
                 if matching_percent >= search_behavior.threshold {
-                    matches.push(Match {
-                        x: x as u16,
-                        y: y as u16,
-                        z: z as u16,
-                        percent: matching_percent,
-                    });
+                    matches.push((x as u16, y as u16, z as u16, matching_percent));
                 }
             }
         }
@@ -104,25 +134,6 @@ pub fn search(
     return matches;
 }
 
-#[derive(Debug, Clone, Copy, Deserialize, Serialize)]
-pub struct Match {
-    pub x: u16,
-    pub y: u16,
-    pub z: u16,
-    pub percent: f32,
-}
-
-impl Default for Match {
-    fn default() -> Self {
-        Self {
-            x: 0,
-            y: 0,
-            z: 0,
-            percent: 0.0,
-        }
-    }
-}
-
 #[inline]
 pub fn normalize_data(data: &str, ignore_data: bool) -> &str {
     if ignore_data {
@@ -132,115 +143,89 @@ pub fn normalize_data(data: &str, ignore_data: bool) -> &str {
     }
 }
 
+pub fn parse_schematic(data: &Vec<u8>) -> Schematic {
+    if data[0] == 0x1f && data[1] == 0x8b {
+        // gzip
+        nbt::from_gzip_reader(data.as_slice()).unwrap()
+    } else {
+        // uncompressed
+        nbt::from_reader(data.as_slice()).unwrap()
+    }
+}
+
 #[allow(unused_imports)]
 #[cfg(test)]
 mod tests {
     use std::path::{Path, PathBuf};
-    use schemsearch_files::SchematicVersioned::V2;
-    use schemsearch_files::SpongeV2Schematic;
+    use schemsearch_files::Schematic;
     use crate::pattern_mapper::strip_data;
     use super::*;
 
     #[test]
     fn read_schematic() {
-        let schematic = SchematicVersioned::load(&PathBuf::from("../tests/simple.schem")).unwrap();
-
-        let schematic = match schematic {
-            V2 (schematic) => schematic,
-            _ => panic!("Invalid schematic version"),
-        };
-
+        let schematic = Schematic::load(&PathBuf::from("../tests/simple.schem")).unwrap();
         assert_eq!(schematic.width as usize * schematic.height as usize * schematic.length as usize, schematic.block_data.len());
         assert_eq!(schematic.palette_max, schematic.palette.len() as i32);
     }
 
     #[test]
     fn test_parse_function() {
-        let schematic: SchematicVersioned = SchematicVersioned::load(&PathBuf::from("../tests/simple.schem")).unwrap();
-
-        let schematic = match schematic {
-            V2 (schematic) => schematic,
-            _ => panic!("Invalid schematic version"),
-        };
-
+        let file = std::fs::File::open("../tests/simple.schem").expect("Failed to open file");
+        let schematic: Schematic = parse_schematic(&std::io::Read::bytes(file).map(|b| b.unwrap()).collect());
         assert_eq!(schematic.width as usize * schematic.height as usize * schematic.length as usize, schematic.block_data.len());
         assert_eq!(schematic.palette_max, schematic.palette.len() as i32);
     }
 
     #[test]
     fn test_strip_schem() {
-        let schematic = SchematicVersioned::load(&PathBuf::from("../tests/simple.schem")).unwrap();
+        let schematic = Schematic::load(&PathBuf::from("../tests/simple.schem")).unwrap();
         let stripped = strip_data(&schematic);
 
-        assert_eq!(stripped.get_palette().keys().any(|k| k.contains('[')), false);
+        assert_eq!(stripped.palette.keys().any(|k| k.contains('[')), false);
     }
 
     #[test]
     fn test_match_palette() {
-        let schematic = SchematicVersioned::load(&PathBuf::from("../tests/simple.schem")).unwrap();
-        let endstone = SchematicVersioned::load(&PathBuf::from("../tests/endstone.schem")).unwrap();
+        let schematic = Schematic::load(&PathBuf::from("../tests/simple.schem")).unwrap();
+        let endstone = Schematic::load(&PathBuf::from("../tests/endstone.schem")).unwrap();
 
         let _ = match_palette(&schematic, &endstone, true);
     }
 
     #[test]
     fn test_match_palette_ignore_data() {
-        let schematic = SchematicVersioned::load(&PathBuf::from("../tests/simple.schem")).unwrap();
-        let endstone = SchematicVersioned::load(&PathBuf::from("../tests/endstone.schem")).unwrap();
+        let schematic = Schematic::load(&PathBuf::from("../tests/simple.schem")).unwrap();
+        let endstone = Schematic::load(&PathBuf::from("../tests/endstone.schem")).unwrap();
 
         let _ = match_palette(&schematic, &endstone, false);
     }
 
     #[test]
     pub fn test_big_search() {
-        let schematic = SchematicVersioned::load(&PathBuf::from("../tests/simple.schem")).unwrap();
-        let endstone = SchematicVersioned::load(&PathBuf::from("../tests/endstone.schem")).unwrap();
+        let schematic = Schematic::load(&PathBuf::from("../tests/simple.schem")).unwrap();
+        let endstone = Schematic::load(&PathBuf::from("../tests/endstone.schem")).unwrap();
 
-        let _ = search(schematic, &endstone, SearchBehavior {
-            ignore_block_data: true,
-            ignore_block_entities: true,
-            ignore_entities: true,
-            ignore_air: false,
-            air_as_any: false,
-            threshold: 0.9
-        });
+        let _ = search(schematic, &endstone, SearchBehavior::default());
     }
 
     #[test]
     pub fn test_search() {
-        let schematic = SchematicVersioned::load(&PathBuf::from("../tests/Random.schem")).unwrap();
-        let pattern = SchematicVersioned::load(&PathBuf::from("../tests/Pattern.schem")).unwrap();
+        let schematic = Schematic::load(&PathBuf::from("../tests/Random.schem")).unwrap();
+        let pattern = Schematic::load(&PathBuf::from("../tests/Pattern.schem")).unwrap();
 
-        let matches = search(schematic, &pattern, SearchBehavior {
-            ignore_block_data: true,
-            ignore_block_entities: true,
-            ignore_entities: true,
-            ignore_air: false,
-            air_as_any: false,
-            threshold: 0.9
-        });
+        let matches = search(schematic, &pattern, SearchBehavior::default());
 
         println!("{:?}", matches);
         assert_eq!(matches.len(), 1);
-        assert_eq!(matches[0].x, 1);
-        assert_eq!(matches[0].y, 0);
-        assert_eq!(matches[0].z, 3);
-        assert_eq!(matches[0].percent, 1.0);
+        assert_eq!(matches[0], (1, 0, 3, 1.0));
     }
 
     #[test]
     pub fn test_search_ws() {
-        let schematic = SchematicVersioned::load(&PathBuf::from("../tests/warships/GreyFly-by-Bosslar.schem")).unwrap();
-        let pattern = SchematicVersioned::load(&PathBuf::from("../tests/gray_castle_complex.schem")).unwrap();
+        let schematic = Schematic::load(&PathBuf::from("../tests/warships/GreyFly-by-Bosslar.schem")).unwrap();
+        let pattern = Schematic::load(&PathBuf::from("../tests/gray_castle_complex.schem")).unwrap();
 
-        let matches = search(schematic, &pattern, SearchBehavior {
-            ignore_block_data: false,
-            ignore_block_entities: false,
-            ignore_entities: false,
-            ignore_air: false,
-            air_as_any: false,
-            threshold: 0.9
-        });
+        let matches = search(schematic, &pattern, SearchBehavior::default());
 
         println!("{:?}", matches);
         assert_eq!(matches.len(), 1);

schemsearch-lib/src/pattern_mapper.rs

@@ -15,12 +15,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-use std::collections::HashMap;
-use nbt::CompoundTag;
-use schemsearch_files::SpongeSchematic;
+use nbt::Map;
+use schemsearch_files::Schematic;
 use crate::normalize_data;
 
-fn create_reverse_palette(schem: &SpongeSchematic) -> Vec<&str> {
+fn create_reverse_palette(schem: &Schematic) -> Vec<&str> {
     let mut reverse_palette = Vec::with_capacity(schem.palette_max as usize);
     (0..schem.palette_max).for_each(|_| reverse_palette.push(""));
     for (key, value) in schem.palette.iter() {
@@ -29,10 +28,10 @@ fn create_reverse_palette(schem: &SpongeSchematic) -> Vec<&str> {
     reverse_palette
 }
 
-pub fn strip_data(schem: &SpongeSchematic) -> SpongeSchematic {
+pub fn strip_data(schem: &Schematic) -> Schematic {
     let mut data: Vec<i32> = Vec::new();
 
-    let mut palette: HashMap<String, i32> = HashMap::new();
+    let mut palette: Map<String, i32> = Map::new();
     let mut palette_max: i32 = 0;
     let reverse_palette = create_reverse_palette(schem);
 
@@ -48,8 +47,9 @@ pub fn strip_data(schem: &SpongeSchematic) -> SpongeSchematic {
         data.push(*entry);
     }
 
-    SpongeSchematic {
-        data_version: 1,
+    Schematic {
+        version: schem.version,
+        data_version: schem.data_version,
         palette,
         palette_max,
         block_data: data,
@@ -57,19 +57,17 @@ pub fn strip_data(schem: &SpongeSchematic) -> SpongeSchematic {
         height: schem.height,
         length: schem.length,
         width: schem.width,
-        metadata: CompoundTag::new(),
-        offset: [0; 3],
+        metadata: schem.metadata.clone(),
+        offset: schem.offset.clone(),
         entities: None,
     }
-
-
 }
 
-pub fn match_palette_adapt(schem: &SpongeSchematic, matching_palette: &HashMap<String, i32>, ignore_data: bool) -> Vec<i32> {
+pub fn match_palette_adapt(schem: &Schematic, matching_palette: &Map<String, i32>, ignore_data: bool) -> Vec<i32> {
     let mut data: Vec<i32> = Vec::new();
     let reverse_palette = create_reverse_palette(schem);
 
-    for x in schem.block_data.iter() {
+    for x in &schem.block_data {
         let blockname = reverse_palette[*x as usize];
         let blockname = if ignore_data { normalize_data(blockname, ignore_data) } else { blockname };
         let block_id = match matching_palette.get(&*blockname) {
@@ -83,10 +81,10 @@ pub fn match_palette_adapt(schem: &SpongeSchematic, matching_palette: &HashMap<S
 }
 
 pub fn match_palette(
-    schem: &SpongeSchematic,
-    pattern: &SpongeSchematic,
+    schem: &Schematic,
+    pattern: &Schematic,
     ignore_data: bool,
-) -> SpongeSchematic {
+) -> Schematic {
     if ignore_data {
         match_palette_internal(&strip_data(schem), &strip_data(pattern), ignore_data)
     } else {
@@ -95,23 +93,24 @@ pub fn match_palette(
 }
 
 fn match_palette_internal(
-    schem: &SpongeSchematic,
-    pattern: &SpongeSchematic,
+    schem: &Schematic,
+    pattern: &Schematic,
     ignore_data: bool,
-) -> SpongeSchematic {
+) -> Schematic {
     let data_pattern: Vec<i32> = match_palette_adapt(&pattern, &schem.palette, ignore_data);
 
-    SpongeSchematic {
-        data_version: 0,
+    Schematic {
+        version: pattern.version.clone(),
+        data_version: pattern.data_version.clone(),
         palette: schem.palette.clone(),
         palette_max: schem.palette_max,
         block_data: data_pattern,
         block_entities: pattern.block_entities.clone(),
-        height: pattern.height,
-        length: pattern.length,
-        width: pattern.width,
-        metadata: CompoundTag::new(),
-        offset: [0; 3],
+        height: pattern.height.clone(),
+        length: pattern.length.clone(),
+        width: pattern.width.clone(),
+        metadata: pattern.metadata.clone(),
+        offset: pattern.offset.clone(),
         entities: None,
     }
 }

schemsearch-sql/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "schemsearch-sql"
-version = "0.1.3"
+version = "0.1.1"
 edition = "2021"
 license = "AGPL-3.0-or-later"