Prevent repeated queries for the same model file if it's determined t…

…o not exist
MineLittlePony · Apr 20, 2023 · f8a353c · f8a353c
1 parent b75430f
commit f8a353c
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/main/java/com/minelittlepony/mson/impl/ModelFoundry.java b/src/main/java/com/minelittlepony/mson/impl/ModelFoundry.java
@@ -31,6 +31,8 @@ class ModelFoundry implements ModelLoader {
 
     private final MsonImpl mson;
 
+    private static final CompletableFuture<FileContent<?>> EMPTY_FILE = CompletableFuture.completedFuture(FileContent.empty());
+
     public ModelFoundry(MsonImpl mson) {
         this.mson = mson;
     }
@@ -95,7 +97,6 @@ public CompletableFuture<FileContent<?>> loadModel(Identifier id, Identifier fil
 
     public CompletableFuture<FileContent<?>> loadModel(Map.Entry<Identifier, Resource> entry) {
         String extension = Files.getFileExtension(entry.getKey().getPath());
-        System.out.println("Loading Model: " + entry.getKey());
         return loadModel(
                 entry.getKey().withPath(p -> p.replace("models/entity/", "").replace("." + extension, "")),
                 entry.getKey(),
@@ -105,6 +106,11 @@ public CompletableFuture<FileContent<?>> loadModel(Map.Entry<Identifier, Resourc
 
     @Override
     public CompletableFuture<FileContent<?>> loadModel(Identifier modelId, @Nullable ModelFormat<?> preferredFormat) {
+        synchronized (loadedFiles) {
+            if (loadedFiles.containsKey(modelId)) {
+                return loadedFiles.get(modelId);
+            }
+        }
         Identifier file = new Identifier(modelId.getNamespace(), "models/entity/" + modelId.getPath());
 
         Map<Identifier, Resource> resources = getResourceManager().findResources("models/entity", id -> {
@@ -115,7 +121,10 @@ public CompletableFuture<FileContent<?>> loadModel(Identifier modelId, @Nullable
             MsonImpl.LOGGER.warn("Ambiguous reference: {} could refer to [{}]", file, String.join(",", resources.keySet().stream().map(Identifier::toString).toArray(String[]::new)));
         }
         if (resources.isEmpty()) {
-            return CompletableFuture.completedFuture(FileContent.empty());
+            synchronized (loadedFiles) {
+                loadedFiles.put(modelId, EMPTY_FILE);
+                return EMPTY_FILE;
+            }
         }
         Identifier first = resources.keySet().stream().sorted().toList().get(0);
         if (preferredFormat != null) {