mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-06-19 15:20:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ver/6.6.0' into dev/7.0-2

Browse Source
This commit is contained in:
Zoe Gidiere
2024-10-12 15:42:47 -06:00
parent a82dcd579c 65d026a130
commit cd2421bb49
468 changed files with 931 additions and 554 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/image/ImageCache.java
+7 -2
View File
@@ -18,6 +18,10 @@ import com.dfsek.terra.api.config.ConfigPack;
import com.dfsek.terra.api.properties.Properties;
import com.dfsek.terra.api.util.generic.Lazy;
import com.github.benmanes.caffeine.cache.Scheduler;
import static com.dfsek.terra.api.util.cache.CacheUtils.CACHE_EXECUTOR;
/*
* Cache prevents configs from loading the same image multiple times into memory
@@ -27,8 +31,9 @@ record ImageCache(LoadingCache<String, Image> cache) implements Properties {
ImageLibraryPackConfigTemplate config = pack.getContext().get(ImageLibraryPackConfigTemplate.class);
ImageCache images;
if(!pack.getContext().has(ImageCache.class)) {
var cacheBuilder = Caffeine.newBuilder();
if(config.unloadOnTimeout()) cacheBuilder.expireAfterAccess(config.getCacheTimeout(), TimeUnit.SECONDS);
var cacheBuilder = Caffeine.newBuilder().executor(CACHE_EXECUTOR).scheduler(Scheduler.systemScheduler());
if(config.unloadOnTimeout()) cacheBuilder.expireAfterAccess(config.getCacheTimeout(), TimeUnit.SECONDS) .executor(CACHE_EXECUTOR)
.scheduler(Scheduler.systemScheduler());
images = new ImageCache(cacheBuilder.build(s -> loadImage(s, pack.getRootPath())));
pack.getContext().put(images);
} else images = pack.getContext().get(ImageCache.class);