LazyOptional fucking sucks

62832 · Jun 2, 2024 · ff1ccbe · ff1ccbe
1 parent 06e8dfb
commit ff1ccbe
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/main/java/gripe/_90/appliede/me/misc/EMCInterfaceLogic.java b/src/main/java/gripe/_90/appliede/me/misc/EMCInterfaceLogic.java
@@ -56,7 +56,6 @@ public class EMCInterfaceLogic implements IActionHost, IGridTickable, IUpgradeab
     private final IActionSource source = IActionSource.ofMachine(this);
 
     private final LazyOptional<IItemHandler> storageHolder;
-    private final LazyOptional<MEStorage> localInvHolder;
 
     @Nullable
     private WrappedEMCStorage emcStorage;
@@ -85,7 +84,6 @@ public EMCInterfaceLogic(IManagedGridNode node, EMCInterfaceLogicHost host, Item
         storage.useRegisteredCapacities();
 
         storageHolder = LazyOptional.of(() -> storage).lazyMap(GenericStackItemStorage::new);
-        localInvHolder = LazyOptional.of(this::getInventory);
     }
 
     public ConfigInventory getConfig() {
@@ -298,8 +296,8 @@ private void readConfig() {
     }
 
     private void onConfigRowChanged() {
-        readConfig();
         host.saveChanges();
+        readConfig();
     }
 
     private void onStorageChanged() {
@@ -354,15 +352,14 @@ public <T> LazyOptional<T> getCapability(Capability<T> cap) {
         if (cap == ForgeCapabilities.ITEM_HANDLER) {
             return storageHolder.cast();
         } else if (cap == Capabilities.STORAGE) {
-            return localInvHolder.cast();
+            return LazyOptional.of(this::getInventory).cast();
         } else {
             return LazyOptional.empty();
         }
     }
 
     public void invalidateCaps() {
         storageHolder.invalidate();
-        localInvHolder.invalidate();
     }
 
     private class WrappedEMCStorage implements MEStorage {