From a6acc30eea768878bc66619f06b0f3aef2522db6 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Wed, 14 Jul 2021 12:59:36 -0400 Subject: [PATCH] Actually support nested json files in folders up to 2 subfolders --- .../com/volmit/iris/manager/IrisProject.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/volmit/iris/manager/IrisProject.java b/src/main/java/com/volmit/iris/manager/IrisProject.java index e6043d4ed..6d59967a1 100644 --- a/src/main/java/com/volmit/iris/manager/IrisProject.java +++ b/src/main/java/com/volmit/iris/manager/IrisProject.java @@ -365,16 +365,16 @@ public class IrisProject { settings.put("json.maxItemsComputed", 30000); JSONArray schemas = new JSONArray(); IrisDataManager dm = new IrisDataManager(getPath()); - schemas.put(getSchemaEntry(IrisDimension.class, dm, "/dimensions/*.json")); - schemas.put(getSchemaEntry(IrisEntity.class, dm, "/entities/*.json")); - schemas.put(getSchemaEntry(IrisBiome.class, dm, "/biomes/*.json")); - schemas.put(getSchemaEntry(IrisRegion.class, dm, "/regions/*.json")); - schemas.put(getSchemaEntry(IrisGenerator.class, dm, "/generators/*.json")); - schemas.put(getSchemaEntry(IrisJigsawPiece.class, dm, "/jigsaw-pieces/*.json")); - schemas.put(getSchemaEntry(IrisJigsawPool.class, dm, "/jigsaw-pools/*.json")); - schemas.put(getSchemaEntry(IrisJigsawStructure.class, dm, "/jigsaw-structures/*.json")); - schemas.put(getSchemaEntry(IrisBlockData.class, dm, "/blocks/*.json")); - schemas.put(getSchemaEntry(IrisLootTable.class, dm, "/loot/*.json")); + schemas.put(getSchemaEntry(IrisDimension.class, dm, "/dimensions/*.json", "/dimensions/*/*.json","/dimensions/*/*/*.json")); + schemas.put(getSchemaEntry(IrisEntity.class, dm, "/entities/*.json", "/entities/*/*.json", "/entities/*/*/*.json")); + schemas.put(getSchemaEntry(IrisBiome.class, dm, "/biomes/*.json", "/biomes/*/*.json", "/biomes/*/*/*.json")); + schemas.put(getSchemaEntry(IrisRegion.class, dm, "/regions/*.json", "/regions/*/*.json", "/regions/*/*/*.json")); + schemas.put(getSchemaEntry(IrisGenerator.class, dm, "/generators/*.json", "/generators/*/*.json", "/generators/*/*/*.json")); + schemas.put(getSchemaEntry(IrisJigsawPiece.class, dm, "/jigsaw-pieces/*.json", "/jigsaw-pieces/*/*.json", "/jigsaw-pieces/*/*/*.json")); + schemas.put(getSchemaEntry(IrisJigsawPool.class, dm, "/jigsaw-pools/*.json", "/jigsaw-pools/*/*.json", "/jigsaw-pools/*/*/*.json")); + schemas.put(getSchemaEntry(IrisJigsawStructure.class, dm, "/jigsaw-structures/*.json", "/jigsaw-structures/*/*/*.json", "/jigsaw-structures/*/*.json")); + schemas.put(getSchemaEntry(IrisBlockData.class, dm, "/blocks/*.json", "/blocks/*/*.json", "/blocks/*/*/*.json")); + schemas.put(getSchemaEntry(IrisLootTable.class, dm, "/loot/*.json", "/loot/*/*.json", "/loot/*/*/*.json")); settings.put("json.schemas", schemas); ws.put("settings", settings);