+8

src/main/java/assets/AssetManager.java

reviewed

··· 257 257 Map<String, AssetHandle> fileMap = new HashMap<>(); 258 258 TreeSet<String> subdirSet = new TreeSet<>(); 259 259 260 260 + TreeSet<String> ignoredPaths = new TreeSet<>(); 261 261 + ignoredPaths.add(project.engine.Engine.PROJECT_ENGINE_PATH); 262 262 + 260 263 for (File stackDir : Environment.assetDirectories) { 261 264 Path dir = stackDir.toPath().resolve(relativePath); 262 265 ··· 266 269 try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir)) { 267 270 for (Path entry : stream) { 268 271 String name = entry.getFileName().toString(); 272 272 + if (name.startsWith(".")) 273 273 + continue; 269 274 270 275 String relPath = relativePath + name; 276 276 + if (ignoredPaths.contains(relPath)) 277 277 + continue; 278 278 + 271 279 AssetHandle ah = new AssetHandle(stackDir, relPath); 272 280 AssetHandle upgraded = AssetHandle.upgrade(ah); 273 281 if (upgraded != null)

+4 -1

src/main/java/project/engine/Engine.java

reviewed

··· 20 20 private static final String BASEROM_PATH = "ver/us/baserom.z64"; 21 21 private static final String DUMP_PATH = "ver/us/build/star-rod-dump"; 22 22 23 23 + /** If a project provides a custom engine, it should be a git repo at this directory. */ 24 24 + public static final String PROJECT_ENGINE_PATH = "papermario-dx"; 25 25 + 23 26 private final File directory; // the worktree or submodule directory 24 27 private final String ref; 25 28 private final boolean isSubmodule; ··· 56 59 String ref = project.getManifest().getEngineRef(); 57 60 58 61 // Check for submodule first 59 59 - File submoduleDir = new File(project.getDirectory(), "papermario-dx"); 62 62 + File submoduleDir = new File(project.getDirectory(), PROJECT_ENGINE_PATH); 60 63 if (isGitRepo(submoduleDir)) 61 64 return new Engine(submoduleDir, ref, true, buildEnv); 62 65