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

Avoid optional wrapper

Browse Source
This commit is contained in:
embeddedt 2025-12-27 13:38:42 -05:00
parent 00de7e1c4a
commit fa1553e61a
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,6 @@ import org.embeddedt.modernfix.common.mixin.perf.dynamic_resources.ModelDiscover
import java.io.Reader; import java.io.Reader;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
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;
@ -155,22 +154,34 @@ public class DynamicModelSystem {
} }
} }
private static final Object NULL_BAKED = new Object();
public static <K, U, V> Map<K, V> createDynamicBakedRegistry(Map<K, U> input, BiFunction<K, U, V> baker) { public static <K, U, V> Map<K, V> createDynamicBakedRegistry(Map<K, U> input, BiFunction<K, U, V> baker) {
// TODO: support persistence of overrides // TODO: support persistence of overrides
LoadingCache<K, Optional<V>> bakedCache = CacheBuilder.newBuilder().softValues().maximumSize(1000).build(new CacheLoader<>() { LoadingCache<K, Object> bakedCache = CacheBuilder.newBuilder().softValues().maximumSize(1000).build(new CacheLoader<>() {
@Override @Override
public Optional<V> load(K key) throws Exception { public Object load(K key) throws Exception {
var unbaked = input.get(key); var unbaked = input.get(key);
if (unbaked != null) { if (unbaked != null) {
if (DEBUG_DYNAMIC_MODEL_LOADING) { if (DEBUG_DYNAMIC_MODEL_LOADING) {
ModernFix.LOGGER.info("Baking {}", key); ModernFix.LOGGER.info("Baking {}", key);
} }
return Optional.ofNullable(baker.apply(key, unbaked)); return baker.apply(key, unbaked);
} else { } else {
return Optional.empty(); return NULL_BAKED;
} }
} }
}); });
return Maps.asMap(input.keySet(), k -> k != null ? bakedCache.getUnchecked(k).orElse(null) : null); return Maps.asMap(input.keySet(), k -> {
if (k != null) {
Object value = bakedCache.getUnchecked(k);
if (value == NULL_BAKED) {
value = null;
}
return (V)value;
} else {
return null;
}
});
} }
} }