R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve emulation of various model maps

Browse Source
This commit is contained in:
embeddedt 2026-06-09 21:15:44 -04:00
parent e753953cba
commit 3eaf157365
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/org/embeddedt/modernfix/dynresources/DynamicModelSystem.java
View File

@ -38,6 +38,7 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.function.BiFunction; import java.util.function.BiFunction;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -57,19 +58,32 @@ public class DynamicModelSystem {
FileToIdConverter converter, FileToIdConverter converter,
String debugName, String debugName,
ResultLoader<RESOURCE, RESULT> loader) { ResultLoader<RESOURCE, RESULT> loader) {
LoadingCache<Identifier, RESULT> resultCache = CacheBuilder.newBuilder().softValues().maximumSize(1000).build(new CacheLoader<>() { LoadingCache<Identifier, Optional<RESULT>> resultCache = CacheBuilder.newBuilder().softValues().maximumSize(1000).build(new CacheLoader<>() {
@Override @Override
public RESULT load(Identifier id) throws Exception { public Optional<RESULT> load(Identifier id) throws Exception {
var file = converter.idToFile(id); var file = converter.idToFile(id);
var resource = resourceMap.get(file); var resource = resourceMap.get(file);
if (resource == null) {
return Optional.empty();
}
if (DEBUG_DYNAMIC_MODEL_LOADING) { if (DEBUG_DYNAMIC_MODEL_LOADING) {
ModernFix.LOGGER.info("Loading {} {}", debugName, id); ModernFix.LOGGER.info("Loading {} {}", debugName, id);
} }
return loader.load(file, resource); return Optional.of(loader.load(file, resource));
} }
}); });
Set<Identifier> idSet = resourceMap.keySet().stream().map(converter::fileToId).collect(Collectors.toUnmodifiableSet()); Set<Identifier> idSet = resourceMap.keySet().stream().map(converter::fileToId).collect(Collectors.toUnmodifiableSet());
return Maps.asMap(idSet, key -> key != null ? resultCache.getUnchecked(key) : null); return new DynamicRegistryMap<>(idSet, key -> {
if (key == null) {
return null;
}
try {
return resultCache.getUnchecked(key).orElse(null);
} catch (RuntimeException e) {
ModernFix.LOGGER.error("Error loading {} {} from cache", debugName, key);
throw e;
}
});
} }
public static Map<Identifier, UnbakedModel> createDynamicUnbakedModelMap(Map<Identifier, Resource> resourceMap) { public static Map<Identifier, UnbakedModel> createDynamicUnbakedModelMap(Map<Identifier, Resource> resourceMap) {