lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix Alchemy Table overwriting output each time it crafts (#1119)

Browse source
This commit is contained in:
Nicholas Ignoffo 2017-04-03 16:56:21 -07:00
parent de0fd9d719
commit 78a71e47e0
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java
View file

@ -14,6 +14,7 @@ import net.minecraft.util.ITickable;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.ItemHandlerHelper;
import net.minecraftforge.items.wrapper.SidedInvWrapper; import net.minecraftforge.items.wrapper.SidedInvWrapper;
import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.saving.SoulNetwork; import WayofTime.bloodmagic.api.saving.SoulNetwork;
@ -295,11 +296,10 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory,
return false; return false;
if (currentOutputStack.isEmpty()) if (currentOutputStack.isEmpty())
return true; return true;
if (!currentOutputStack.isItemEqual(outputStack)) if (!ItemHandlerHelper.canItemStacksStack(outputStack, currentOutputStack))
return false; return false;
int result = currentOutputStack.getCount() + outputStack.getCount(); int result = currentOutputStack.getCount() + outputStack.getCount();
return result <= getInventoryStackLimit() && result <= currentOutputStack.getMaxStackSize(); return result <= getInventoryStackLimit() && result <= currentOutputStack.getMaxStackSize();
} }
public int getTierOfOrb() public int getTierOfOrb()
@ -356,9 +356,9 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory,
if (currentOutputStack.isEmpty()) if (currentOutputStack.isEmpty())
{ {
setInventorySlotContents(outputSlot, outputStack); setInventorySlotContents(outputSlot, outputStack);
} else if (currentOutputStack.getItem() == currentOutputStack.getItem()) } else if (ItemHandlerHelper.canItemStacksStack(outputStack, currentOutputStack))
{ {
currentOutputStack.setCount(outputStack.getCount()); currentOutputStack.grow(outputStack.getCount());
} }
consumeInventory(recipe); consumeInventory(recipe);