only use valid handlers in contraption inventories

fix #965
Fabricators-of-Create · Jul 3, 2023 · 75a6748 · 75a6748
1 parent ad64c63
commit 75a6748
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/FABRIC_CHANGELOG.txt b/FABRIC_CHANGELOG.txt
@@ -9,3 +9,4 @@ Change logging starts below:
 - fix pipe ponder crashing (#987, #970)
 - added safety on train carriage loading (#985)
 - fix visibility in fluids (#967)
+- fix unsupported inventories on contraptions causing crashes (#965)
diff --git a/src/main/java/com/simibubi/create/content/contraptions/MountedStorage.java b/src/main/java/com/simibubi/create/content/contraptions/MountedStorage.java
@@ -55,7 +55,7 @@ public static boolean canUseAsStorage(BlockEntity be) {
  Storage<ItemVariant> handler = TransferUtil.getItemStorage(be);
  if (handler instanceof ItemStackHandler)
  return !(handler instanceof ProcessingInventory);
- return canUseModdedInventory(be, handler);
+ return handler != null && canUseModdedInventory(be, handler);
 
  } catch (Exception e) {
  return false;
@@ -216,7 +216,7 @@ public boolean isValid() {
  }
 
  public boolean canUseForFuel() {
- return !noFuel;
+ return isValid() && !noFuel;
  }
 
 }
diff --git a/src/main/java/com/simibubi/create/content/contraptions/MountedStorageManager.java b/src/main/java/com/simibubi/create/content/contraptions/MountedStorageManager.java
@@ -59,6 +59,7 @@ public void createHandlers() {
  Collection<MountedStorage> itemHandlers = storage.values();
 
  inventory = wrapItems(itemHandlers.stream()
+ .filter(MountedStorage::isValid)
  .map(MountedStorage::getItemHandler)
  .toList(), false);