Fix charging items that say they received negative energy (#23)

Swedz · Sep 27, 2024 · c450474 · c450474
1 parent c5171de
commit c450474
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/main/java/net/swedz/tesseract/neoforge/compat/mi/helper/ChargeInventoryHelper.java b/src/main/java/net/swedz/tesseract/neoforge/compat/mi/helper/ChargeInventoryHelper.java
@@ -11,18 +11,22 @@ public final class ChargeInventoryHelper
 	public static long charge(ItemStack stack, long maxEu, boolean simulate)
 	{
 		ILongEnergyStorage energy = stack.getCapability(EnergyApi.ITEM);
-		return energy != null ? energy.receive(Math.max(0, maxEu), simulate) : 0;
+		return energy != null ? Math.max(0, energy.receive(Math.max(0, maxEu), simulate)) : 0;
 	}
 
 	public static long charge(Collection<ItemStack> items, long maxEu, boolean simulate)
 	{
 		long eu = 0;
 		for(ItemStack stack : items)
 		{
-			eu += charge(stack, Math.max(0, maxEu - eu), simulate);
-			if(eu == maxEu)
+			long charged = charge(stack, Math.max(0, maxEu - eu), simulate);
+			if(charged > 0)
 			{
-				break;
+				eu += charged;
+				if(eu == maxEu)
+				{
+					break;
+				}
 			}
 		}
 		return eu;