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

This commit is contained in:
Zoe Gidiere committed 2024-10-29 16:05:01 -06:00
commit ef1c9c125f
2 files changed
+5

No files matched your search

@@ -7,7 +7,10 @@ import com.dfsek.terra.addons.noise.samplers.CacheSampler;
import com.dfsek.terra.addons.noise.samplers.LinearHeightmapSampler; import com.dfsek.terra.addons.noise.samplers.LinearHeightmapSampler;
import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.noise.NoiseSampler;
import org.jetbrains.annotations.ApiStatus.Experimental;
@Experimental
public class CacheSamplerTemplate extends SamplerTemplate<CacheSampler> { public class CacheSamplerTemplate extends SamplerTemplate<CacheSampler> {
@Value("sampler") @Value("sampler")
@Default @Default
@@ -11,10 +11,12 @@ import com.dfsek.terra.api.util.generic.pair.Pair.Mutable;
import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.Caffeine;
import com.github.benmanes.caffeine.cache.LoadingCache; import com.github.benmanes.caffeine.cache.LoadingCache;
import com.github.benmanes.caffeine.cache.Scheduler; import com.github.benmanes.caffeine.cache.Scheduler;
import org.jetbrains.annotations.ApiStatus.Experimental;
import static com.dfsek.terra.api.util.cache.CacheUtils.CACHE_EXECUTOR; import static com.dfsek.terra.api.util.cache.CacheUtils.CACHE_EXECUTOR;
@Experimental
public class CacheSampler implements NoiseSampler { public class CacheSampler implements NoiseSampler {
private final NoiseSampler sampler; private final NoiseSampler sampler;