Upstream Merge and Icon Fixes

Author: cev-api

README.md

@@ -58,8 +58,9 @@ Change the datapack structure color scheme (applies immediately):
 - ```/sm:datapack colorscheme 3``` - third scheme
 
 Change the datapack structure icon style (applies immediately):
-- ```/sm:datapack iconstyle 1``` - flat colored squares (default)
-- ```/sm:datapack iconstyle 2``` - colored potion bottle icons
+- ```/sm:datapack iconstyle 1``` - small flat colored squares (default)
+- ```/sm:datapack iconstyle 2``` - large flat colored squares 
+- ```/sm:datapack iconstyle 3``` - colored potion bottle icons
 
 Enable or disable auto-loading on join:
 - ```/sm:datapack autoload true```

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/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", "biomenoise.h", "biomes.h", "noise.h", "terrainnoise.h", "rng.h", "util.h", "quadbase.h", "xrms.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");
+        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", "@src/main/c/cubiomes/includes.txt", "biomenoise.h", "biomes.h", "finders.h", "generator.h", "layers.h", "biomenoise.h", "biomes.h", "noise.h", "terrainnoise.h", "rng.h", "util.h", "quadbase.h", "xrms.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");
     }
 }

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G
 org.gradle.parallel=true
 
 # Mod Properties
-mod_version=2.20.0-CevAPI
+mod_version=2.21.0-CevAPI
 maven_group=dev.xpple
 archives_base_name=SeedMapper