Pretend I fixed the bin dupe.

Feather-Inc · May 3, 2021 · 00d8b41 · 00d8b41
1 parent 001dfbf
commit 00d8b41
Showing 1 changed file with 57 additions and 55 deletions.
diff --git a/src/main/java/mekanism/common/recipe/BinRecipe.java b/src/main/java/mekanism/common/recipe/BinRecipe.java
@@ -50,61 +50,63 @@ public ItemStack getCraftingResult(InventoryCrafting inv)
 
 	public ItemStack getResult(IInventory inv)
 	{
-		ItemStack bin = null;
-
-		for(int i = 0; i < inv.getSizeInventory(); i++)
-		{
-			ItemStack stack = inv.getStackInSlot(i);
-
-			if(isBin(stack))
-			{
-				if(bin != null)
-				{
-					return null;
-				}
-
-				bin = stack.copy();
-			}
-		}
-
-		if(bin == null || bin.stackSize > 1)
-		{
-			return null;
-		}
-
-		ItemStack addStack = null;
-
-		for(int i = 0; i < 9; i++)
-		{
-			ItemStack stack = inv.getStackInSlot(i);
-
-			if(stack != null && !isBin(stack))
-			{
-				if(addStack != null)
-				{
-					return null;
-				}
-
-				addStack = stack.copy();
-			}
-		}
-
-		InventoryBin binInv = new InventoryBin(bin);
-
-		if(addStack != null)
-		{
-			if(binInv.getItemType() != null && !binInv.getItemType().isItemEqual(addStack))
-			{
-				return null;
-			}
-
-			binInv.add(addStack);
-
-			return bin;
-		}
-		else {
-			return binInv.removeStack();
-		}
+//		ItemStack bin = null;
+//
+//		for(int i = 0; i < inv.getSizeInventory(); i++)
+//		{
+//			ItemStack stack = inv.getStackInSlot(i);
+//
+//			if(isBin(stack))
+//			{
+//				if(bin != null)
+//				{
+//					return null;
+//				}
+//
+//				bin = stack.copy();
+//			}
+//		}
+//
+//		if(bin == null || bin.stackSize > 1)
+//		{
+//			return null;
+//		}
+//
+//		ItemStack addStack = null;
+//
+//		for(int i = 0; i < 9; i++)
+//		{
+//			ItemStack stack = inv.getStackInSlot(i);
+//
+//			if(stack != null && !isBin(stack))
+//			{
+//				if(addStack != null)
+//				{
+//					return null;
+//				}
+//
+//				addStack = stack.copy();
+//			}
+//		}
+//
+//		InventoryBin binInv = new InventoryBin(bin);
+//
+//		if(addStack != null)
+//		{
+//			if(binInv.getItemType() != null && !binInv.getItemType().isItemEqual(addStack))
+//			{
+//				return null;
+//			}
+//
+//			binInv.add(addStack);
+//
+//			return bin;
+//		}
+//		else {
+//			return binInv.removeStack();
+//		}
+		//TODO: Actually fix this dupe.
+		return null;
 	}
 
 	@Override