Merge pull request #118 from ace10102/1.7.10

Improved Checks on energy items
Thorfusion · May 21, 2023 · 496d2b6 · 496d2b6
2 parents 3188564 + e2f8795
commit 496d2b6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/mekanism/common/util/ChargeUtils.java b/src/main/java/mekanism/common/util/ChargeUtils.java
@@ -143,7 +143,7 @@ public static boolean canBeOutputted(ItemStack itemstack, boolean chargeSlot)
 				return energized.getEnergy(itemstack) == 0;
 			}
 		}
-		else if(itemstack.getItem() instanceof IEnergyContainerItem)
+		else if(MekanismUtils.useRF() && itemstack.getItem() instanceof IEnergyContainerItem)
 		{
 			IEnergyContainerItem energyContainer = (IEnergyContainerItem)itemstack.getItem();
 
@@ -155,7 +155,7 @@ else if(itemstack.getItem() instanceof IEnergyContainerItem)
 				return energyContainer.extractEnergy(itemstack, 1, true) > 0;
 			}
 		}
-		else if(itemstack.getItem() instanceof ISpecialElectricItem)
+		else if(MekanismUtils.useIC2() && itemstack.getItem() instanceof ISpecialElectricItem)
 		{
 			IElectricItemManager manager = ((ISpecialElectricItem)itemstack.getItem()).getManager(itemstack);