mirror of
https://github.com/PolyhedralDev/Terra.git
synced 2026-06-18 14:50:56 +00:00
Merge branch 'ver/6.6.0' into dev/7.0-2
This commit is contained in:
+1
-2
@@ -32,8 +32,7 @@ record ImageCache(LoadingCache<String, Image> cache) implements Properties {
|
|||||||
ImageCache images;
|
ImageCache images;
|
||||||
if(!pack.getContext().has(ImageCache.class)) {
|
if(!pack.getContext().has(ImageCache.class)) {
|
||||||
var cacheBuilder = Caffeine.newBuilder().executor(CACHE_EXECUTOR).scheduler(Scheduler.systemScheduler());
|
var cacheBuilder = Caffeine.newBuilder().executor(CACHE_EXECUTOR).scheduler(Scheduler.systemScheduler());
|
||||||
if(config.unloadOnTimeout()) cacheBuilder.expireAfterAccess(config.getCacheTimeout(), TimeUnit.SECONDS) .executor(CACHE_EXECUTOR)
|
if(config.unloadOnTimeout()) cacheBuilder.expireAfterAccess(config.getCacheTimeout(), TimeUnit.SECONDS);
|
||||||
.scheduler(Scheduler.systemScheduler());
|
|
||||||
images = new ImageCache(cacheBuilder.build(s -> loadImage(s, pack.getRootPath())));
|
images = new ImageCache(cacheBuilder.build(s -> loadImage(s, pack.getRootPath())));
|
||||||
pack.getContext().put(images);
|
pack.getContext().put(images);
|
||||||
} else images = pack.getContext().get(ImageCache.class);
|
} else images = pack.getContext().get(ImageCache.class);
|
||||||
|
|||||||
Reference in New Issue
Block a user