short circuit ejector component when nothing to eject

mekanism · Aug 18, 2024 · 5248e78 · 5248e78
1 parent a72b8bd
commit 5248e78
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 0 deletions.
diff --git a/src/main/java/mekanism/common/capabilities/holder/ConfigHolder.java b/src/main/java/mekanism/common/capabilities/holder/ConfigHolder.java
@@ -33,6 +33,11 @@ public boolean canOutput() {
             return true;
         }
 
+        @Override
+        public boolean isEmpty() {
+            return false;
+        }
+
         @Override
         public int hashCode() {
             return 0;

diff --git a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java
@@ -275,6 +275,9 @@ private void outputItems(Direction facing, ConfigInfo info) {
                 continue;
             }
             ISlotInfo slotInfo = info.getSlotInfo(dataType);
+            if (slotInfo != null && slotInfo.isEmpty()) {
+                continue;//don't even bother getting caps etc
+            }
             if (slotInfo instanceof InventorySlotInfo inventorySlotInfo) {
                 //Validate the slot info is of the correct type
                 Set<Direction> outputs = getSidesForData(info, facing, dataType);

diff --git a/src/main/java/mekanism/common/tile/component/config/slot/ChemicalSlotInfo.java b/src/main/java/mekanism/common/tile/component/config/slot/ChemicalSlotInfo.java
@@ -32,6 +32,16 @@ protected ChemicalSlotInfo(boolean canInput, boolean canOutput, List<TANK> tanks
         this.tanks = tanks;
     }
 
+    @Override
+    public boolean isEmpty() {
+        for (TANK tank : getTanks()) {
+            if (!tank.isEmpty()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     public List<TANK> getTanks() {
         return tanks;
     }

diff --git a/src/main/java/mekanism/common/tile/component/config/slot/EnergySlotInfo.java b/src/main/java/mekanism/common/tile/component/config/slot/EnergySlotInfo.java
@@ -16,6 +16,16 @@ public EnergySlotInfo(boolean canInput, boolean canOutput, List<IEnergyContainer
         this.containers = containers;
     }
 
+    @Override
+    public boolean isEmpty() {
+        for (IEnergyContainer container : getContainers()) {
+            if (!container.isEmpty()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     public List<IEnergyContainer> getContainers() {
         return containers;
     }

diff --git a/src/main/java/mekanism/common/tile/component/config/slot/FluidSlotInfo.java b/src/main/java/mekanism/common/tile/component/config/slot/FluidSlotInfo.java
@@ -19,4 +19,14 @@ public FluidSlotInfo(boolean canInput, boolean canOutput, List<IExtendedFluidTan
     public List<IExtendedFluidTank> getTanks() {
         return tanks;
     }
+
+    @Override
+    public boolean isEmpty() {
+        for (IExtendedFluidTank tank : getTanks()) {
+            if (!tank.isEmpty()) {
+                return false;
+            }
+        }
+        return true;
+    }
 }
diff --git a/src/main/java/mekanism/common/tile/component/config/slot/HeatSlotInfo.java b/src/main/java/mekanism/common/tile/component/config/slot/HeatSlotInfo.java
@@ -16,6 +16,11 @@ public HeatSlotInfo(boolean canInput, boolean canOutput, List<IHeatCapacitor> ca
         this.capacitors = capacitors;
     }
 
+    @Override
+    public boolean isEmpty() {
+        return false;
+    }
+
     public List<IHeatCapacitor> getHeatCapacitors() {
         return capacitors;
     }

diff --git a/src/main/java/mekanism/common/tile/component/config/slot/ISlotInfo.java b/src/main/java/mekanism/common/tile/component/config/slot/ISlotInfo.java
@@ -9,4 +9,11 @@ public interface ISlotInfo {
     default boolean isEnabled() {
         return canInput() || canOutput();
     }
+
+    /**
+     * Relevant to Output modes
+     *
+     * @return true if none of the slots contain anything to output, and ejecting can be skipped
+     */
+    boolean isEmpty();
 }
diff --git a/src/main/java/mekanism/common/tile/component/config/slot/InventorySlotInfo.java b/src/main/java/mekanism/common/tile/component/config/slot/InventorySlotInfo.java
@@ -24,6 +24,16 @@ public List<IInventorySlot> getSlots() {
         return inventorySlots;
     }
 
+    @Override
+    public boolean isEmpty() {
+        for (IInventorySlot slot : getSlots()) {
+            if (!slot.isEmpty()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     public boolean hasSlot(IInventorySlot slot) {
         return getSlots().contains(slot);
     }