Vastly condense directional cache

62832 · Dec 29, 2023 · fb3fc91 · fb3fc91
1 parent fda4df4
commit fb3fc91
Showing 1 changed file with 4 additions and 19 deletions.
diff --git a/src/main/java/gripe/_90/aecapfix/misc/DirectionalCapabilityCache.java b/src/main/java/gripe/_90/aecapfix/misc/DirectionalCapabilityCache.java
@@ -6,29 +6,14 @@
 import net.minecraftforge.common.util.LazyOptional;
 
 public class DirectionalCapabilityCache<C> {
- private final Map<Direction, LazyOptional<C>> directional = new HashMap<>();
- private LazyOptional<C> nullDirection = LazyOptional.empty();
+ private final Map<String, LazyOptional<C>> holders = new HashMap<>();
 
  public LazyOptional<C> getOrCache(Direction side, LazyOptional<?> toCache) {
- if (toCache.isPresent()) {
- if (side == null) {
- if (!nullDirection.isPresent()) {
- nullDirection = toCache.cast();
- }
-
- return nullDirection;
- } else {
- directional.putIfAbsent(side, toCache.cast());
- return directional.get(side);
- }
- } else {
- return LazyOptional.empty();
- }
+ return holders.computeIfAbsent(side == null ? "null" : side.getName(), k -> toCache.cast());
  }
 
  public void invalidate() {
- directional.forEach((direction, holder) -> holder.invalidate());
- directional.clear();
- nullDirection.invalidate();
+ holders.forEach((side, holder) -> holder.invalidate());
+ holders.clear();
  }
 }