Update sqlx requirement from 0.7 to 0.8

Updates the requirements on [sqlx](https://github.com/launchbadge/sqlx) to permit the latest version.
- [Changelog](https://github.com/launchbadge/sqlx/blob/main/CHANGELOG.md)
- [Commits](https://github.com/launchbadge/sqlx/compare/v0.7.0...v0.8.0)

---
updated-dependencies:
- dependency-name: sqlx
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Cargo.toml

@@ -2,9 +2,11 @@
 members = [
     "schemsearch-cli",
     "schemsearch-lib",
+    "schemsearch-faster",
     "schemsearch-files",
     "schemsearch-sql",
-    "schemsearch-ocl-matcher"]
+    "schemsearch-java"
+]
 resolver = "2"
 
 [profile.small]
@@ -15,4 +17,4 @@ opt-level = "z"
 codegen-units = 1
 
 [profile.release]
-debug = true
+lto = true

schemsearch-cli/Cargo.toml

@@ -7,14 +7,13 @@ license = "AGPL-3.0-or-later"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-schemsearch-common = { path = "../schemsearch-common" }
 schemsearch-lib = { path = "../schemsearch-lib" }
 schemsearch-files = { path = "../schemsearch-files" }
 schemsearch-sql = { path = "../schemsearch-sql", optional = true }
 
 clap = { version = "4.1.8", features = ["cargo"] }
 futures = { version = "0.3", optional = true }
-sqlx = { version = "0.7", features = [ "runtime-async-std-native-tls" , "mysql" ], optional = true }
+sqlx = { version = "0.8", features = [ "runtime-async-std-native-tls" , "mysql" ], optional = true }
 rayon = "1.7.0"
 indicatif = { version = "0.17.3", features = ["rayon"] }
 serde = "1.0.157"

schemsearch-cli/src/json_output.rs

@@ -1,5 +1,5 @@
 use serde::{Deserialize, Serialize};
-use schemsearch_common::{Match, SearchBehavior};
+use schemsearch_lib::{Match, SearchBehavior};
 
 #[derive(Serialize, Deserialize, Debug)]
 #[serde(tag = "event")]

schemsearch-cli/src/main.rs

@@ -15,35 +15,35 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+mod types;
 mod json_output;
 mod sinks;
 mod stderr;
-mod types;
 
-use crate::sinks::{OutputFormat, OutputSink};
+use std::fmt::Debug;
-use crate::stderr::MaschineStdErr;
+use std::io::Write;
-#[cfg(feature = "sql")]
-use crate::types::SqlSchematicSupplier;
-use crate::types::{PathSchematicSupplier, SchematicSupplier, SchematicSupplierType};
-use clap::error::ErrorKind;
 use clap::{command, Arg, ArgAction, ValueHint};
+use std::path::PathBuf;
+use std::str::FromStr;
+use clap::error::ErrorKind;
+use schemsearch_lib::{Match, SearchBehavior};
+use crate::types::{PathSchematicSupplier, SchematicSupplier, SchematicSupplierType};
 #[cfg(feature = "sql")]
 use futures::executor::block_on;
-use indicatif::*;
 use rayon::prelude::*;
 use rayon::ThreadPoolBuilder;
-use schemsearch_common::{Match, SearchBehavior};
-use schemsearch_files::SpongeSchematic;
-use schemsearch_lib::nbt_search::has_invalid_nbt;
-use schemsearch_lib::search::search;
 #[cfg(feature = "sql")]
 use schemsearch_sql::filter::SchematicFilter;
 #[cfg(feature = "sql")]
 use schemsearch_sql::load_all_schematics;
-use std::fmt::Debug;
+#[cfg(feature = "sql")]
-use std::io::Write;
+use crate::types::SqlSchematicSupplier;
-use std::path::PathBuf;
+use indicatif::*;
-use std::str::FromStr;
+use schemsearch_files::SpongeSchematic;
+use crate::sinks::{OutputFormat, OutputSink};
+use crate::stderr::MaschineStdErr;
+use schemsearch_lib::nbt_search::has_invalid_nbt;
+use schemsearch_lib::search::search;
 
 fn main() {
     #[allow(unused_mut)]
@@ -168,18 +168,11 @@ fn main() {
                 .default_value("50")
                 .value_parser(|s: &str| s.parse::<usize>().map_err(|e| e.to_string())),
         )
-        .arg(
-            Arg::new("opencl")
-                .help("Use OpenCL Checker")
-                .short('c')
-                .long("opencl")
-                .action(ArgAction::SetTrue),
-        )
         .about("Searches for a pattern in a schematic")
         .bin_name("schemsearch");
 
     #[cfg(feature = "sql")]
-    let mut cmd = cmd
+        let mut cmd = cmd
         .arg(
             Arg::new("sql")
                 .help("Use the SteamWar SQL Database")
@@ -219,22 +212,15 @@ fn main() {
         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
+        threshold: *matches.get_one::<f32>("threshold").expect("Couldn't get threshold"),
-            .get_one::<f32>("threshold")
-            .expect("Couldn't get threshold"),
         invalid_nbt: matches.get_flag("invalid-nbt"),
-        opencl: matches.get_flag("opencl"),
     };
 
     let pattern = match matches.get_one::<String>("pattern") {
         Some(p) => match SpongeSchematic::load(&PathBuf::from(p)) {
             Ok(x) => Some(x),
             Err(e) => {
-                cmd.error(
+                cmd.error(ErrorKind::Io, format!("Error while loading Pattern: {}", e.to_string())).exit();
-                    ErrorKind::Io,
-                    format!("Error while loading Pattern: {}", e.to_string()),
-                )
-                .exit();
             }
         },
         None => None,
@@ -275,103 +261,60 @@ fn main() {
         }
         for schem in block_on(load_all_schematics(filter)) {
             schematics.push(SchematicSupplierType::SQL(SqlSchematicSupplier {
-                node: schem,
+                node: schem
             }))
-        }
+        };
     }
 
     if schematics.is_empty() {
-        cmd.error(
+        cmd.error(ErrorKind::MissingRequiredArgument, "No schematics specified").exit();
-            ErrorKind::MissingRequiredArgument,
-            "No schematics specified",
-        )
-        .exit();
     }
 
-    let output: Vec<&(OutputFormat, OutputSink)> = matches
+    let output: Vec<&(OutputFormat, OutputSink)> = matches.get_many::<(OutputFormat, OutputSink)>("output").expect("Error").collect();
-        .get_many::<(OutputFormat, OutputSink)>("output")
+    let mut output: Vec<(OutputFormat, Box<dyn Write>)> = output.into_iter().map(|x| (x.0.clone(), x.1.output())).collect();
-        .expect("Error")
-        .collect();
-    let mut output: Vec<(OutputFormat, Box<dyn Write>)> = output
-        .into_iter()
-        .map(|x| (x.0.clone(), x.1.output()))
-        .collect();
 
     for x in &mut output {
-        write!(
+        write!(x.1, "{}", x.0.start(schematics.len() as u32, &search_behavior, start.elapsed().as_millis())).unwrap();
-            x.1,
-            "{}",
-            x.0.start(
-                schematics.len() as u32,
-                &search_behavior,
-                start.elapsed().as_millis()
-            )
-        )
-        .unwrap();
     }
 
-    ThreadPoolBuilder::new()
+    ThreadPoolBuilder::new().num_threads(*matches.get_one::<usize>("threads").expect("Could not get threads")).build_global().unwrap();
-        .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(
+    bar.set_style(ProgressStyle::with_template("[{elapsed}, ETA: {eta}] {wide_bar} {pos}/{len} {per_sec}").unwrap());
-        ProgressStyle::with_template("[{elapsed}, ETA: {eta}] {wide_bar} {pos}/{len} {per_sec}")
+    let term_size = *matches.get_one::<u16>("machine").expect("Could not get machine");
-            .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 {
+        bar.set_draw_target(ProgressDrawTarget::term_like(Box::new(MaschineStdErr { size: term_size })))
-            size: term_size,
-        })))
     }
 
-    let max_matching = *matches
+    let max_matching = *matches.get_one::<usize>("limit").expect("Could not get max-matching");
-        .get_one::<usize>("limit")
-        .expect("Could not get max-matching");
 
-    let matches: Vec<SearchResult> = schematics
+    let matches: Vec<SearchResult> = schematics.par_iter().progress_with(bar).map(|schem| {
-        .par_iter()
+        match schem {
-        .progress_with(bar)
-        .map(|schem| match schem {
             SchematicSupplierType::PATH(schem) => {
                 let schematic = match load_schem(&schem.path) {
                     Some(x) => x,
-                    None => {
+                    None => return SearchResult {
-                        return SearchResult {
+                        name: schem.get_name(),
-                            name: schem.get_name(),
+                        matches: Vec::default(),
-                            matches: Vec::default(),
-                        }
                     }
                 };
                 search_in_schem(schematic, pattern.as_ref(), search_behavior, schem)
             }
             #[cfg(feature = "sql")]
-            SchematicSupplierType::SQL(schem) => match schem.get_schematic() {
+            SchematicSupplierType::SQL(schem) => {
-                Ok(schematic) => {
+                match schem.get_schematic() {
-                    search_in_schem(schematic, pattern.as_ref(), search_behavior, schem)
+                    Ok(schematic) => search_in_schem(schematic, pattern.as_ref(), search_behavior, schem),
-                }
+                    Err(e) => {
-                Err(e) => {
+                        eprintln!("Error while loading schematic ({}): {}", schem.get_name(), e.to_string());
-                    eprintln!(
+                        SearchResult {
-                        "Error while loading schematic ({}): {}",
+                            name: schem.get_name(),
-                        schem.get_name(),
+                            matches: Vec::default(),
-                        e.to_string()
+                        }
-                    );
-                    SearchResult {
-                        name: schem.get_name(),
-                        matches: Vec::default(),
                     }
                 }
-            },
+            }
-        })
+        }
-        .collect();
+    }).collect();
 
     let mut matches_count = 0;
 
@@ -389,18 +332,14 @@ fn main() {
         }
     }
 
+    let end = std::time::Instant::now();
     for x in &mut output {
-        write!(x.1, "{}", x.0.end(start.elapsed())).unwrap();
+        write!(x.1, "{}", x.0.end(end.duration_since(start).as_millis())).unwrap();
         x.1.flush().unwrap();
     }
 }
 
-fn search_in_schem(
+fn search_in_schem(schematic: SpongeSchematic, pattern: Option<&SpongeSchematic>, search_behavior: SearchBehavior, schem: &impl SchematicSupplier) -> SearchResult {
-    schematic: SpongeSchematic,
-    pattern: Option<&SpongeSchematic>,
-    search_behavior: SearchBehavior,
-    schem: &impl SchematicSupplier,
-) -> SearchResult {
     if search_behavior.invalid_nbt {
         if has_invalid_nbt(schematic) {
             SearchResult {
@@ -430,11 +369,7 @@ fn load_schem(schem_path: &PathBuf) -> Option<SpongeSchematic> {
     match SpongeSchematic::load(schem_path) {
         Ok(x) => Some(x),
         Err(e) => {
-            println!(
+            println!("Error while loading schematic ({}): {}", schem_path.to_str().unwrap(), e.to_string());
-                "Error while loading schematic ({}): {}",
-                schem_path.to_str().unwrap(),
-                e.to_string()
-            );
             None
         }
     }
@@ -445,3 +380,4 @@ struct SearchResult {
     name: String,
     matches: Vec<Match>,
 }
+

schemsearch-cli/src/sinks.rs

@@ -1,11 +1,11 @@
-use crate::json_output::{EndEvent, FoundEvent, InitEvent, JsonEvent};
-use indicatif::HumanDuration;
-use schemsearch_common::{Match, SearchBehavior};
 use std::fs::File;
 use std::io::BufWriter;
-use std::io::Write;
 use std::str::FromStr;
+use std::io::Write;
 use std::time::Duration;
+use indicatif::HumanDuration;
+use schemsearch_lib::{Match, SearchBehavior};
+use crate::json_output::{EndEvent, FoundEvent, InitEvent, JsonEvent};
 
 #[derive(Debug, Clone)]
 pub enum OutputSink {
@@ -18,7 +18,7 @@ pub enum OutputSink {
 pub enum OutputFormat {
     Text,
     CSV,
-    JSON,
+    JSON
 }
 
 impl FromStr for OutputFormat {
@@ -29,7 +29,7 @@ impl FromStr for OutputFormat {
             "text" => Ok(OutputFormat::Text),
             "csv" => Ok(OutputFormat::CSV),
             "json" => Ok(OutputFormat::JSON),
-            _ => Err(format!("'{}' is not a valid output format", s)),
+            _ => Err(format!("'{}' is not a valid output format", s))
         }
     }
 }
@@ -41,7 +41,7 @@ impl FromStr for OutputSink {
         match s {
             "std" => Ok(OutputSink::Stdout),
             "err" => Ok(OutputSink::Stderr),
-            _ => Ok(OutputSink::File(s.to_string())),
+            _ => Ok(OutputSink::File(s.to_string()))
         }
     }
 }
@@ -51,7 +51,7 @@ impl OutputSink {
         match self {
             OutputSink::Stdout => Box::new(std::io::stdout()),
             OutputSink::Stderr => Box::new(std::io::stderr()),
-            OutputSink::File(path) => Box::new(BufWriter::new(File::create(path).unwrap())),
+            OutputSink::File(path) => Box::new(BufWriter::new(File::create(path).unwrap()))
         }
     }
 }
@@ -59,21 +59,12 @@ impl OutputSink {
 impl OutputFormat {
     pub fn found_match(&self, name: &String, pos: Match) -> String {
         match self {
-            OutputFormat::Text => format!(
+            OutputFormat::Text => format!("Found match in '{}' at x: {}, y: {}, z: {}, % = {}\n", name, pos.x, pos.y, pos.z, pos.percent),
-                "Found match in '{}' at x: {}, y: {}, z: {}, % = {}\n",
+            OutputFormat::CSV => format!("{},{},{},{},{}\n", name, pos.x, pos.y, pos.z, pos.percent),
-                name, pos.x, pos.y, pos.z, pos.percent
+            OutputFormat::JSON => format!("{}\n", serde_json::to_string(&JsonEvent::Found(FoundEvent {
-            ),
+                name: name.clone(),
-            OutputFormat::CSV => {
+                match_: pos,
-                format!("{},{},{},{},{}\n", name, pos.x, pos.y, pos.z, pos.percent)
+            })).unwrap())
-            }
-            OutputFormat::JSON => format!(
-                "{}\n",
-                serde_json::to_string(&JsonEvent::Found(FoundEvent {
-                    name: name.clone(),
-                    match_: pos,
-                }))
-                .unwrap()
-            ),
         }
     }
 
@@ -81,29 +72,19 @@ impl OutputFormat {
         match self {
             OutputFormat::Text => format!("Starting search in {} schematics\n", total),
             OutputFormat::CSV => "Name,X,Y,Z,Percent\n".to_owned(),
-            OutputFormat::JSON => format!(
+            OutputFormat::JSON => format!("{}\n", serde_json::to_string(&JsonEvent::Init(InitEvent {
-                "{}\n",
+                total,
-                serde_json::to_string(&JsonEvent::Init(InitEvent {
+                search_behavior: search_behavior.clone(),
-                    total,
+                start_time,
-                    search_behavior: search_behavior.clone(),
+            })).unwrap())
-                    start_time,
-                }))
-                .unwrap()
-            ),
         }
     }
 
-    pub fn end(&self, end_time: Duration) -> String {
+    pub fn end(&self, end_time: u128) -> String {
         match self {
-            OutputFormat::Text => format!("Search complete in {:?}\n", end_time),
+            OutputFormat::Text => format!("Search complete in {}\n", HumanDuration(Duration::from_millis(end_time as u64))),
-            OutputFormat::CSV => format!("{:?}\n", end_time),
+            OutputFormat::CSV => format!("{}\n", end_time),
-            OutputFormat::JSON => format!(
+            OutputFormat::JSON => format!("{}\n", serde_json::to_string(&JsonEvent::End(EndEvent{ end_time })).unwrap())
-                "{}\n",
-                serde_json::to_string(&JsonEvent::End(EndEvent {
-                    end_time: end_time.as_millis()
-                }))
-                .unwrap()
-            ),
         }
     }
-}
+}

schemsearch-common/Cargo.toml

@@ -1,7 +0,0 @@
-[package]
-name = "schemsearch-common"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-serde = { version = "1.0.160", features = ["derive"] }

schemsearch-common/src/lib.rs

@@ -1,56 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Clone, Copy, Deserialize, Serialize)]
-pub struct SearchBehavior {
-    pub ignore_block_data: bool,
-    pub ignore_block_entities: bool,
-    pub ignore_air: bool,
-    pub air_as_any: bool,
-    pub ignore_entities: bool,
-    pub threshold: f32,
-    pub invalid_nbt: bool,
-    pub opencl: bool,
-}
-
-impl Default for SearchBehavior {
-    fn default() -> Self {
-        SearchBehavior {
-            ignore_block_data: false,
-            ignore_block_entities: false,
-            ignore_air: false,
-            air_as_any: false,
-            ignore_entities: false,
-            threshold: 0.9,
-            invalid_nbt: false,
-            opencl: false,
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, Default, Deserialize, Serialize)]
-pub struct Match {
-    pub x: u16,
-    pub y: u16,
-    pub z: u16,
-    pub percent: f32,
-}
-
-#[macro_export]
-macro_rules! time {
-    ($name:ident, $body:block) => {
-        {
-            #[cfg(debug_assertions)]
-            {
-                let start = std::time::Instant::now();
-                let result = $body;
-                let duration = start.elapsed();
-                println!("{} took {:?}", stringify!($name), duration);
-                result
-            }
-            #[cfg(not(debug_assertions))]
-            {
-                $body
-            }
-        }
-    };
-}

schemsearch-faster/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "schemsearch_faster"
+version = "0.1.3"
+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]
+schemsearch-lib = { path = "../schemsearch-lib" }
+schemsearch-files = { path = "../schemsearch-files" }
+hematite-nbt = "0.5.2"

schemsearch-faster/src/lib.rs

@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2023  Chaoscaot
+ *
+ * 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/>.
+ */
+
+use nbt::Map;
+use schemsearch_files::SpongeV2Schematic;
+
+pub fn convert_to_search_space(schem: &SpongeV2Schematic, 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 {
+        let mut output: Vec<u8> = Vec::with_capacity(block_data.len());
+        for block in block_data.iter() {
+            if schem.palette.get(name).unwrap_or(&-1) == block {
+                output.push(1);
+            } else {
+                output.push(0);
+            }
+        }
+        data.push(output);
+    }
+    data
+}
+
+pub fn unwrap_palette(palette: &Map<String, i32>) -> Vec<String> {
+    let mut output: Vec<String> = Vec::with_capacity(palette.len());
+    (0..palette.len()).for_each(|_| output.push(String::new()));
+    for (key, id) in palette.iter() {
+        output[*id as usize] = key.clone();
+    }
+    output
+}
+
+#[allow(unused_imports)]
+#[cfg(test)]
+mod tests {
+    use std::path::{Path, PathBuf};
+    use schemsearch_files::SpongeV2Schematic;
+    use crate::{convert_to_search_space, unwrap_palette};
+
+    //#[test]
+    pub fn test() {
+        let schematic = SpongeV2Schematic::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();
+        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 _ = convert_to_search_space(&schematic2, &unwrap_palette(&schematic.palette));
+    }
+}

schemsearch-files/src/lib.rs

@@ -65,7 +65,7 @@ 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").unwrap_or_else(|_| {
-            return if nbt.contains_key("Schematic") {
+            return if nbt.contains_key("Blocks") {
                 3
             } else if nbt.contains_key("BlockEntities") {
                 2
@@ -79,7 +79,7 @@ impl SpongeSchematic {
         match version {
             1 => SpongeSchematic::from_nbt_1(nbt),
             2 => SpongeSchematic::from_nbt_2(nbt),
-            3 => SpongeSchematic::from_nbt_3(nbt.get_compound_tag("Schematic").map_err(|e| e.to_string())?),
+            3 => SpongeSchematic::from_nbt_3(nbt),
             _ => Err("Invalid schematic: Unknown Version".to_string()),
         }
     }
@@ -121,7 +121,7 @@ impl SpongeSchematic {
         })
     }
 
-    pub fn from_nbt_3(nbt: &CompoundTag) -> Result<Self, String> {
+    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())?,
@@ -132,7 +132,7 @@ impl SpongeSchematic {
             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("Data").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").unwrap_or_else(|_| vec![]))?,
             entities: None,
         })

schemsearch-java/Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+name = "schemsearch-java"
+version = "0.1.3"
+edition = "2021"
+license = "AGPL-3.0-or-later"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+crate_type = ["cdylib"]
+
+[dependencies]
+jni = "0.21.0"
+
+schemsearch-lib = { path = "../schemsearch-lib" }
+schemsearch-files = { path = "../schemsearch-files" }

schemsearch-java/src/lib.rs

@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2023  Chaoscaot
+ *
+ * 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/>.
+ */
+
+use std::path::PathBuf;
+use jni::JNIEnv;
+
+use jni::objects::{JClass, JString};
+
+use jni::sys::jstring;
+use schemsearch_files::SpongeV2Schematic;
+use schemsearch_lib::{search, SearchBehavior};
+
+#[no_mangle]
+#[allow(unused_variables)]
+pub extern "system" fn Java_SchemSearch_search<'local>(mut env: JNIEnv<'local>,
+    class: JClass<'local>,
+    schematic_path: JString<'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 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 mut result = String::new();
+    for m in matches {
+        result.push_str(&format!("{}, {}, {}, {};", m.x, m.y, m.z, m.percent));
+    }
+    result.remove(result.len() - 1);
+    let output = env.new_string(result).expect("Couldn't create java string!");
+    output.into_raw()
+}

schemsearch-lib/Cargo.toml

@@ -7,9 +7,8 @@ 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"] }
 schemsearch-files = { path = "../schemsearch-files" }
-schemsearch-common = { path = "../schemsearch-common" }
-schemsearch-ocl-matcher = { path = "../schemsearch-ocl-matcher" }
 named-binary-tag = "0.6"
 libmath = "0.2.1"
-lazy_static = "1.4.0"
+lazy_static = "1.4.0"

schemsearch-lib/src/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/src.iml" filepath="$PROJECT_DIR$/.idea/src.iml" />
-    </modules>
-  </component>
-</project>

schemsearch-lib/src/.idea/src.iml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="CPP_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

schemsearch-lib/src/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
-  </component>
-</project>

schemsearch-lib/src/.idea/workspace.xml

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CMakeSettings">
-    <configurations>
-      <configuration PROFILE_NAME="Debug" ENABLED="true" CONFIG_NAME="Debug" />
-    </configurations>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="352451bc-b368-403e-b1be-bfdcb573471f" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/../../schemsearch-py/Cargo.toml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../../schemsearch-py/pyproject.toml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../../schemsearch-py/src/lib.rs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Cargo.toml" beforeDir="false" afterPath="$PROJECT_DIR$/../../Cargo.toml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../SchemSearch.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../SchemSearch.java" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="ClangdSettings">
-    <option name="formatViaClangd" value="false" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../.." />
-  </component>
-  <component name="ProjectColorInfo"><![CDATA[{
-  "customColor": "",
-  "associatedIndex": 8
-}]]></component>
-  <component name="ProjectId" id="2gFqSldpa6G5CPOKD9Sjp2GUcRW" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.cidr.known.project.marker": "true",
-    "RunOnceActivity.readMode.enableVisualFormatting": "true",
-    "cf.first.check.clang-format": "false",
-    "cidr.known.project.marker": "true",
-    "git-widget-placeholder": "master",
-    "nodejs_package_manager_path": "npm",
-    "vue.rearranger.settings.migration": "true"
-  }
-}]]></component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="352451bc-b368-403e-b1be-bfdcb573471f" name="Changes" comment="" />
-      <created>1715303674752</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1715303674752</updated>
-      <workItem from="1715303675811" duration="8000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-</project>

schemsearch-lib/src/lib.rs

@@ -19,7 +19,26 @@ pub mod pattern_mapper;
 pub mod search;
 pub mod nbt_search;
 
-use schemsearch_common::SearchBehavior;
+use serde::{Serialize, Deserialize};
+
+#[derive(Debug, Clone, Copy, Deserialize, Serialize)]
+pub struct SearchBehavior {
+    pub ignore_block_data: bool,
+    pub ignore_block_entities: bool,
+    pub ignore_air: bool,
+    pub air_as_any: bool,
+    pub ignore_entities: bool,
+    pub threshold: f32,
+    pub invalid_nbt: bool,
+}
+
+#[derive(Debug, Clone, Copy, Default, Deserialize, Serialize)]
+pub struct Match {
+    pub x: u16,
+    pub y: u16,
+    pub z: u16,
+    pub percent: f32,
+}
 
 #[inline]
 pub fn normalize_data(data: &str, ignore_data: bool) -> &str {
@@ -84,7 +103,15 @@ mod tests {
         let schematic = SpongeSchematic::load(&PathBuf::from("../tests/simple.schem")).unwrap();
         let endstone = SpongeSchematic::load(&PathBuf::from("../tests/endstone.schem")).unwrap();
 
-        let _ = search(schematic, &endstone, SearchBehavior::default());
+        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,
+            invalid_nbt: false
+        });
     }
 
     #[test]
@@ -92,7 +119,15 @@ mod tests {
         let schematic = SpongeSchematic::load(&PathBuf::from("../tests/Random.schem")).unwrap();
         let pattern = SpongeSchematic::load(&PathBuf::from("../tests/Pattern.schem")).unwrap();
 
-        let matches = search(schematic, &pattern, SearchBehavior::default());
+        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,
+            invalid_nbt: false
+        });
 
         assert_eq!(matches.len(), 1);
         assert_eq!(matches[0].x, 1);
@@ -106,7 +141,15 @@ mod tests {
         let schematic = SpongeSchematic::load(&PathBuf::from("../tests/warships/GreyFly-by-Bosslar.schem")).unwrap();
         let pattern = SpongeSchematic::load(&PathBuf::from("../tests/gray_castle_complex.schem")).unwrap();
 
-        let matches = search(schematic, &pattern, SearchBehavior::default());
+        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,
+            invalid_nbt: false
+        });
 
         assert_eq!(matches.len(), 1);
     }

schemsearch-lib/src/search.rs

@@ -1,19 +1,14 @@
-use crate::pattern_mapper::{match_palette, match_palette_adapt};
 use math::round::ceil;
-use schemsearch_common::time;
-use schemsearch_common::{Match, SearchBehavior};
 use schemsearch_files::SpongeSchematic;
-use schemsearch_ocl_matcher::ocl_search;
+use crate::{Match, SearchBehavior};
+use crate::pattern_mapper::{match_palette, match_palette_adapt};
 
 pub fn search(
     schem: SpongeSchematic,
     pattern_schem: &SpongeSchematic,
     search_behavior: SearchBehavior,
 ) -> Vec<Match> {
-    if schem.width < pattern_schem.width
+    if schem.width < pattern_schem.width || schem.height < pattern_schem.height || schem.length < pattern_schem.length {
-        || schem.height < pattern_schem.height
-        || schem.length < pattern_schem.length
-    {
         return Vec::new();
     }
 
@@ -21,27 +16,21 @@ pub fn search(
         return Vec::new();
     }
 
-    let pattern_schem = time!(match_palette, {
+    let pattern_schem = match_palette(&schem, &pattern_schem, search_behavior.ignore_block_data);
-        match_palette(&schem, &pattern_schem, search_behavior.ignore_block_data)
-    });
 
     let mut matches: Vec<Match> = Vec::with_capacity(4);
 
+    let pattern_data = pattern_schem.block_data.as_ptr();
+
     let schem_data = if search_behavior.ignore_block_data {
-        match_palette_adapt(
+        match_palette_adapt(&schem, &pattern_schem.palette, search_behavior.ignore_block_data)
-            &schem,
-            &pattern_schem.palette,
-            search_behavior.ignore_block_data,
-        )
     } else {
         schem.block_data
     };
 
-    let air_id = if search_behavior.ignore_air || search_behavior.air_as_any {
+    let schem_data = schem_data.as_ptr();
-        pattern_schem.palette.get("minecraft:air").unwrap_or(&-1)
+
-    } else {
+    let air_id = if search_behavior.ignore_air || search_behavior.air_as_any { pattern_schem.palette.get("minecraft:air").unwrap_or(&-1) } else { &-1};
-        &-1
-    };
 
     let pattern_blocks = pattern_schem.block_data.len() as f32;
     let i_pattern_blocks = pattern_blocks as i32;
@@ -54,43 +43,22 @@ pub fn search(
     let schem_height = schem.height as usize;
     let schem_length = schem.length as usize;
 
-    if search_behavior.opencl {
+    let skip_amount = ceil((pattern_blocks * (1.0 - search_behavior.threshold)) as f64, 0) as i32;
-        return time!(ocl_search, {
-            ocl_search(
-                schem_data.as_slice(),
-                [schem_width, schem_height, schem_length],
-                pattern_schem.block_data.as_slice(),
-                [pattern_width, pattern_height, pattern_length],
-                *air_id,
-                search_behavior,
-            )
-            .unwrap()
-        });
-    }
-
-    let schem_data = schem_data.as_ptr();
-
-    let pattern_data = pattern_schem.block_data.as_ptr();
-
-    let skip_amount = ceil(
-        (pattern_blocks * (1.0 - search_behavior.threshold)) as f64,
-        0,
-    ) as i32;
 
     for y in 0..=schem_height - pattern_height {
         for z in 0..=schem_length - pattern_length {
             for x in 0..=schem_width - pattern_width {
                 let mut not_matching = 0;
-                'outer: for j in 0..pattern_height {
+                'outer:
+                for j in 0..pattern_height {
                     for k in 0..pattern_length {
-                        'inner: for i in 0..pattern_width {
+                        'inner:
+                        for i in 0..pattern_width {
                             let index = (x + i) + schem_width * ((z + k) + (y + j) * schem_length);
                             let pattern_index = i + pattern_width * (k + j * pattern_length);
                             let data = unsafe { *schem_data.add(index) };
                             let pattern_data = unsafe { *pattern_data.add(pattern_index) };
-                            if (search_behavior.ignore_air && data != *air_id)
+                            if (search_behavior.ignore_air && data != *air_id) || (search_behavior.air_as_any && pattern_data != *air_id) {
-                                || (search_behavior.air_as_any && pattern_data != *air_id)
-                            {
                                 continue 'inner;
                             }
                             if data != pattern_data {
@@ -116,4 +84,4 @@ pub fn search(
     }
 
     return matches;
-}
+}

schemsearch-ocl-matcher/Cargo.toml

@@ -1,9 +0,0 @@
-[package]
-name = "schemsearch-ocl-matcher"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-schemsearch-common = { path = "../schemsearch-common" }
-ocl = "0.19.7"
-libmath = "0.2.1"

schemsearch-ocl-matcher/src/kernel.cl

@@ -1,35 +0,0 @@
-// Use 3d_img
-// Weniger Allocs an Buffern
-// Pattern Parallelisieren mit Local Workern?
-// To Match on GPU
-// Weniger Worker, Mehr Parameter!
-// Pattern als Kernel Konstante
-
-__kernel void add(__global int *result, __global uint *schem,
-                  __constant uint *pattern, const int width, const int height,
-                  const int depth, const int p_width, const int p_height,
-                  const int p_depth, const uint air_id, const int ignore_air,
-                  const int air_as_any, const int skipamount) {
-  int x = get_global_id(0);
-  int y = get_global_id(2);
-  int z = get_global_id(1);
-
-  int wrong_blocks = 0;
-  for (int py = 0; py < p_height; py++) {
-    for (int pz = 0; pz < p_depth; pz++) {
-      for (int px = 0; px < p_width; px++) {
-        // if ((ignore_air && schem_block != air_id) || (air_as_any &&
-        // pattern_block != air_id)) {
-        //     continue; // TODO: PROBLEM!
-        // }
-
-        wrong_blocks +=
-            schem[(x + px) + width * ((z + pz) + (y + py) * depth)] !=
-            pattern[px + p_width * (pz + py * p_depth)];
-      }
-    }
-  }
-
-  int idx = x + z * width + y * width * depth;
-  result[idx] = wrong_blocks;
-}

schemsearch-ocl-matcher/src/lib.rs

@@ -1,133 +0,0 @@
-use math::round::ceil;
-use ocl::SpatialDims::Three;
-use ocl::{core, Buffer, CommandQueueProperties, Context, Image, MemFlags, ProQue};
-use schemsearch_common::{time, Match, SearchBehavior};
-use std::sync::OnceLock;
-use std::time;
-
-const KERNEL: &str = include_str!("kernel.cl");
-
-static PRO_QUEU_CELL: OnceLock<ProQue> = OnceLock::new();
-
-pub fn ocl_available() -> bool {
-    core::default_platform().is_ok()
-}
-
-pub fn ocl_search(
-    schem: &[i32],
-    schem_size: [usize; 3],
-    pattern: &[i32],
-    pattern_size: [usize; 3],
-    air_id: i32,
-    search_behavior: SearchBehavior,
-) -> Result<Vec<Match>, String> {
-    search_ocl(
-        schem,
-        schem_size,
-        pattern,
-        pattern_size,
-        air_id,
-        search_behavior,
-    )
-    .map_err(|e| e.to_string())
-}
-
-fn search_ocl(
-    schem: &[i32],
-    schem_size: [usize; 3],
-    pattern: &[i32],
-    pattern_size: [usize; 3],
-    air_id: i32,
-    search_behavior: SearchBehavior,
-) -> ocl::Result<Vec<Match>> {
-    let pattern_width = pattern_size[0];
-    let pattern_height = pattern_size[1];
-    let pattern_length = pattern_size[2];
-
-    let schem_width = schem_size[0];
-    let schem_height = schem_size[1];
-    let schem_length = schem_size[2];
-
-    let pattern_blocks = (pattern_width * pattern_height * pattern_length) as f32;
-
-    let skip_amount = ceil(
-        (pattern_blocks * (1.0 - search_behavior.threshold)) as f64,
-        0,
-    ) as i32;
-
-    let cell = &PRO_QUEU_CELL;
-    let mut pro_que = time!(get_pro_que, {
-        cell.get_or_init(|| ProQue::builder().src(KERNEL).build().unwrap())
-            .clone()
-    });
-
-    pro_que.set_dims(Three(schem_width, schem_length, schem_height));
-
-    let buffer = time!(create_result_buffer, {
-        Buffer::builder()
-            .queue(pro_que.queue().clone())
-            .flags(MemFlags::new().read_write())
-            .fill_val(-1)
-            .len(schem.len())
-            .build()
-    })?;
-
-    let schem_buffer = time!(create_schen_buffer, {
-        create_schem_buffer(schem, &pro_que)
-    })?;
-
-    let pattern_buffer = time!(create_pattern_buffer, {
-        create_schem_buffer(pattern, &pro_que)
-    })?;
-
-    let kernel = time!(create_kernel, {
-        pro_que
-            .kernel_builder("add")
-            .arg(&buffer)
-            .arg(&schem_buffer)
-            .arg(&pattern_buffer)
-            .arg(schem_width as i32)
-            .arg(schem_height as i32)
-            .arg(schem_length as i32)
-            .arg(pattern_width as i32)
-            .arg(pattern_height as i32)
-            .arg(pattern_length as i32)
-            .arg(air_id)
-            .arg(search_behavior.ignore_air as u32)
-            .arg(search_behavior.air_as_any as u32)
-            .arg(skip_amount)
-            .build()
-    })?;
-
-    unsafe {
-        time!(run_kernel, { kernel.enq() })?;
-    }
-
-    let mut vec = vec![0; buffer.len()];
-    time!(read_buffer, {
-        buffer.read(&mut vec).enq()?;
-    });
-
-    Ok(vec
-        .into_iter()
-        .enumerate()
-        .filter(|(_, v)| *v < skip_amount && *v != -1)
-        .map(|(i, v)| Match {
-            x: (i % schem_width) as u16,
-            y: ((i / (schem_width * schem_length)) % schem_height) as u16,
-            z: ((i / schem_width) % schem_length) as u16,
-
-            percent: (pattern_blocks - v as f32) / pattern_blocks,
-        })
-        .collect())
-}
-
-fn create_schem_buffer(pattern: &[i32], pro_que: &ProQue) -> ocl::Result<Buffer<i32>> {
-    Buffer::builder()
-        .queue(pro_que.queue().clone())
-        .flags(MemFlags::new().read_only())
-        .len(pattern.len())
-        // Host Memory Map?
-        .copy_host_slice(pattern)
-        .build()
-}

schemsearch-sql/Cargo.toml

@@ -7,7 +7,7 @@ license = "AGPL-3.0-or-later"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-sqlx = { version = "0.7", features = [ "runtime-async-std-native-tls" , "mysql" ] }
+sqlx = { version = "0.8", features = [ "runtime-async-std-native-tls" , "mysql" ] }
 
 schemsearch-lib = { path = "../schemsearch-lib" }
 schemsearch-files = { path = "../schemsearch-files" }