Add loot finding (#86)

* [WIP] Add loot finding

* Add multistructure loot search

* Add enchantments filtering

* Fix enchantment querying (for end cities)

* Fix structure iteration

* Update Cubiomes

* Change error handling

* Update Cubiomes

* Add /sm:stoptask command

* Update README

* Update Cubiomes

* Exclude structures that do not have the desired loot

* infinity_enchantment -> infinity

* Change Cubiomes branch to master

Author: xpple

.github/workflows/build.yml

@@ -14,6 +14,8 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
+    env:
+      SRC_FILES: noise.c biomes.c layers.c biomenoise.c generator.c finders.c util.c quadbase.c loot/items.c loot/loot_functions.c loot/loot_tables.c loot/loot_table_context.c loot/loot_table_parser.c loot/loot_tables/buried_treasure_1_13.c loot/loot_tables/buried_treasure_1_18.c loot/loot_tables/desert_pyramid_1_13.c loot/loot_tables/desert_pyramid_1_20.c loot/loot_tables/end_city_treasure_1_13.c loot/loot_tables/end_city_treasure_1_20.c loot/loot_tables/igloo_chest_1_13.c loot/loot_tables/nether_bridge_1_13.c loot/loot_tables/nether_bridge_1_20.c loot/loot_tables/ruined_portal_1_16_1.c loot/loot_tables/ruined_portal_1_21_5.c loot/cjson/cJSON.c
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -22,16 +24,21 @@ jobs:
 
       - name: Compile shared library (ubuntu-latest)
         if: matrix.os == 'ubuntu-latest'
-        run: gcc -shared -o src/main/resources/libcubiomes.so src/main/c/noise.c src/main/c/biomes.c src/main/c/layers.c src/main/c/biomenoise.c src/main/c/generator.c src/main/c/finders.c src/main/c/util.c src/main/c/quadbase.c -O3 -fPIC
+        working-directory: src/main/c/cubiomes
+        run: gcc -shared -o ../../resources/libcubiomes.so $SRC_FILES -O3 -fPIC
       - name: Compile shared library (macos-latest)
         if: matrix.os == 'macos-latest'
+        working-directory: src/main/c/cubiomes
         run: |
-          gcc -shared -o src/main/resources/libcubiomes_arm64.dylib -arch arm64 src/main/c/noise.c src/main/c/biomes.c src/main/c/layers.c src/main/c/biomenoise.c src/main/c/generator.c src/main/c/finders.c src/main/c/util.c src/main/c/quadbase.c -O3 -fPIC
-          gcc -shared -o src/main/resources/libcubiomes_x86_64.dylib -arch x86_64 src/main/c/noise.c src/main/c/biomes.c src/main/c/layers.c src/main/c/biomenoise.c src/main/c/generator.c src/main/c/finders.c src/main/c/util.c src/main/c/quadbase.c -O3 -fPIC
-          lipo -create -output src/main/resources/libcubiomes.dylib src/main/resources/libcubiomes_arm64.dylib src/main/resources/libcubiomes_x86_64.dylib
+          gcc -shared -o ../../resources/libcubiomes_arm64.dylib -arch arm64 $SRC_FILES -O3 -fPIC
+          gcc -shared -o ../../resources/libcubiomes_x86_64.dylib -arch x86_64 $SRC_FILES -O3 -fPIC
+          lipo -create -output ../../resources/libcubiomes.dylib ../../resources/libcubiomes_arm64.dylib ../../resources/libcubiomes_x86_64.dylib
       - name: Compile shared library (windows-latest)
         if: matrix.os == 'windows-latest'
-        run: gcc -shared -o src/main/resources/cubiomes.dll src/main/c/noise.c src/main/c/biomes.c src/main/c/layers.c src/main/c/biomenoise.c src/main/c/generator.c src/main/c/finders.c src/main/c/util.c src/main/c/quadbase.c -O3
+        working-directory: src/main/c/cubiomes
+        run: |
+          $src = $env:SRC_FILES.Split(" ")
+          gcc -shared -o ../../resources/cubiomes.dll $src -O3
 
       - name: Compute SHA256 hash (ubuntu-latest)
         if: matrix.os == 'ubuntu-latest'

.gitmodules

@@ -1,5 +1,5 @@
-[submodule "src/main/c"]
-	path = src/main/c
+[submodule "src/main/c/cubiomes"]
+	path = src/main/c/cubiomes
 	url = https://github.com/xpple/cubiomes
 [submodule "jextract"]
 	path = jextract

README.md

@@ -39,6 +39,11 @@ Usage: `/sm:locate orevein`.
 
 Locates an [ore vein](https://minecraft.wiki/w/Ore_vein) closest to the player. The coordinates of the first ore vein block found will be returned. After this, you can use [`/sm:highlight orevein [chunks]`](#ore-vein-highlighting) to highlight the other ores.
 
+### Loot locating
+Usage: `/sm:locate loot <amount> <item> [<enchantment conditions>]`.
+
+Locates chest loot closest to the player. All versions from 1.13 onwards are supported. SeedMapper will search through the chest loot of structures to find loot that matches the item and enchantment conditions. Note that queries for unobtainable loot and illegal enchantment combinations are not prevented by the command. If a search is taking too long, you should probably cancel it using `/sm:stoptask`.
+
 ### Ore highlighting
 Usage: `/sm:highlight block <block> [chunks]`.
 

build.gradle

@@ -76,10 +76,12 @@ processResources {
 		rename {"${it}_${project.base.archivesName.get()}"}
 	}
 
-	from("src/main/c/LICENSE") {
+	from("src/main/c/cubiomes/LICENSE") {
 		rename {"${it}_cubiomes"}
 	}
 
+	from("src/main/c/cubiomes/loot/LICENSE_loot_library.h.txt")
+
 	from generateBuildInfo
 }
 

buildSrc/src/main/java/dev/xpple/seedmapper/buildscript/CreateJavaBindingsTask.java

@@ -13,6 +13,6 @@ public abstract class CreateJavaBindingsTask extends Exec {
 
         this.setWorkingDir(this.getProject().getRootDir());
         this.setStandardOutput(System.out);
-        this.commandLine("./jextract/build/jextract/bin/jextract" + EXTENSION, "--include-dir", "src/main/c", "--output", "src/main/java", "--use-system-load-library", "--target-package", "com.github.cubiomes", "--header-class-name", "Cubiomes", "@includes.txt", "src/main/c/tables/btree18.h", "tables/btree19.h", "tables/btree20.h", "tables/btree192.h", "tables/btree21wd.h", "biomenoise.h", "biomes.h", "finders.h", "generator.h", "layers.h", "noise.h", "quadbase.h", "rng.h", "util.h");
+        this.commandLine("./jextract/build/jextract/bin/jextract" + EXTENSION, "--include-dir", "src/main/c/cubiomes", "--output", "src/main/java", "--use-system-load-library", "--target-package", "com.github.cubiomes", "--header-class-name", "Cubiomes", "@includes.txt", "biomenoise.h", "biomes.h", "finders.h", "generator.h", "layers.h", "noise.h", "quadbase.h", "rng.h", "util.h", "loot/items.h", "loot/logging.h", "loot/loot_functions.h", "loot/loot_table_context.h", "loot/loot_table_parser.h", "loot/loot_tables.h", "loot/mc_loot.h");
     }
 }