Better Datapack Handling

Author: cev-api

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

@@ -13,6 +13,17 @@ 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", "@src/main/c/cubiomes/includes.txt", "biomenoise.h", "biomes.h", "finders.h", "generator.h", "layers.h", "noise.h", "terrainnoise.h", "rng.h", "util.h", "quadbase.h", "xrms.h", "features/stronghold.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/jextract-compat",
+            "--include-dir", "src/main/c/cubiomes",
+            "--output", "src/main/java",
+            "--use-system-load-library",
+            "-l", "cubiomes",
+            "--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", "noise.h", "terrainnoise.h", "rng.h", "util.h", "quadbase.h", "xrms.h", "features/stronghold.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"
+        );
     }
 }

src/main/java/dev/xpple/seedmapper/datapack/DatapackStructureManager.java

@@ -248,6 +248,12 @@ private static String summarizeImportFailure(Throwable throwable) {
         if (joined.contains("c:has_wolf_variant/")) {
             return "Datapack references unresolved wolf variant biome tags.";
         }
+        if (joined.contains("Datapack URL must end with .zip")) {
+            return "Datapack URL must be a .zip file. Please use a .zip datapack URL.";
+        }
+        if (joined.contains("Datapack has no structures")) {
+            return "Datapack world generation is not supported, only structures.";
+        }
         for (int i = messages.size() - 1; i >= 0; i--) {
             String message = sanitizeImportFailureMessage(messages.get(i));
             if (!message.equalsIgnoreCase("Registry Loading") && !message.equalsIgnoreCase("Failed to load registries due to errors")) {
@@ -271,7 +277,7 @@ private static void loadDatapack(WorldIdentifier identifier, Path datapackRoot,
             } catch (Exception e) {
                 LOGGER.warn("Failed to close datapack worldgen", e);
             }
-            throw new IOException("No structures");
+            throw new IOException("Datapack has no structures");
         }
         DatapackStructureCollection collection = new DatapackStructureCollection(worldgen, sets);
         synchronized (COLLECTIONS) {
@@ -294,6 +300,9 @@ private static Path downloadDatapack(String urlString) throws IOException {
         } catch (MalformedURLException e) {
             throw new IOException("Invalid URL", e);
         }
+        if (!isZipUrl(url)) {
+            throw new IOException("Datapack URL must end with .zip");
+        }
         URLConnection connection = url.openConnection();
         connection.setRequestProperty("User-Agent", "SeedMapper/" + SeedMapper.MOD_ID);
         connection.setConnectTimeout(15000);
@@ -305,6 +314,11 @@ private static Path downloadDatapack(String urlString) throws IOException {
         return tempFile;
     }
 
+    private static boolean isZipUrl(URL url) {
+        String path = url.getPath();
+        return path != null && path.toLowerCase(Locale.ROOT).endsWith(".zip");
+    }
+
     private static Path prepareDatapack(Path zippedFile) throws IOException {
         Path cacheRoot = SeedMapper.modConfigPath.resolve("datapacks");
         Files.createDirectories(cacheRoot);

src/main/java/dev/xpple/seedmapper/util/CubiomesCompat.java

@@ -39,6 +39,9 @@ public static String biomeName(int version, int biome) {
     }
 
     public static String structureName(int structure) {
+        if (structure == Cubiomes.Stronghold()) {
+            return "Stronghold";
+        }
         return safeCString(Cubiomes.struct2str(structure), "structure:" + structure);
     }