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

Initial stab at 1.11

Browse source 
About halfway.
This commit is contained in:
Nicholas Ignoffo 2016-12-12 19:56:36 -08:00
parent ce52aea512
commit 00d6f8eb46
157 changed files with 1036 additions and 1554 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java
View file

@ -38,7 +38,7 @@ public class BaseCompressionHandler extends CompressionHandler
return this.getResultStack();
}
return null;
return ItemStack.EMPTY;
}
public int getRemainingNeeded(ItemStack[] inv)
@ -53,7 +53,7 @@ public class BaseCompressionHandler extends CompressionHandler
public int iterateThroughInventory(ItemStack[] inv, boolean doDrain)
{
int needed = this.required.stackSize;
int needed = this.required.getCount();
int kept = this.getLeftover();
int i = -1;
@ -68,7 +68,7 @@ public class BaseCompressionHandler extends CompressionHandler
if (invStack.isItemEqual(this.required) && (invStack.getTagCompound() == null ? this.required.getTagCompound() == null : invStack.getTagCompound().equals(this.required.getTagCompound())))
{
int stackSize = invStack.stackSize;
int stackSize = invStack.getCount();
int used = 0;
if (kept > 0)
{
@ -83,10 +83,10 @@ public class BaseCompressionHandler extends CompressionHandler
int remainingFromStack = Math.max(stackSize - used - needed, 0);
if (doDrain)
{
invStack.stackSize = remainingFromStack + used;
if (invStack.stackSize <= 0)
invStack.setCount(remainingFromStack + used);
if (invStack.isEmpty())
{
inv[i] = null;
inv[i] = ItemStack.EMPTY;
}
}