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

More progress

Browse source
This commit is contained in:
Nicholas Ignoffo 2017-01-01 21:43:34 -08:00
parent 00d6f8eb46
commit d80afb18f0
64 changed files with 410 additions and 976 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/WayofTime/bloodmagic/api/compress/CompressionRegistry.java
View file

@ -67,19 +67,19 @@ public class CompressionRegistry
for (int slot = 0; slot < itemHandler.getSlots(); slot++)
{
inventory[slot] = itemHandler.extractItem(slot, 64, true);
copyInventory[slot] = ItemStack.copyItemStack(inventory[slot]);
copyInventory[slot] = inventory[slot].copy();
}
for (CompressionHandler handler : compressionRegistry)
{
ItemStack stack = handler.compressInventory(copyInventory, world);
if (stack != null)
if (!stack.isEmpty())
{
for (int slot = 0; slot < itemHandler.getSlots(); slot++)
{
if (inventory[slot] != null && !ItemStack.areItemStacksEqual(inventory[slot], copyInventory[slot]))
{
itemHandler.extractItem(slot, inventory[slot].stackSize, false);
itemHandler.extractItem(slot, inventory[slot].getCount(), false);
if (copyInventory[slot] != null)
{
itemHandler.insertItem(slot, copyInventory[slot], false);
@ -92,7 +92,7 @@ public class CompressionRegistry
}
}
return Pair.of(null, false);
return Pair.of(ItemStack.EMPTY, false);
}
public static int getItemThreshold(ItemStack stack)
@ -110,6 +110,6 @@ public class CompressionRegistry
public static boolean areItemStacksEqual(ItemStack stack, ItemStack compressedStack)
{
return stack.isItemEqual(compressedStack) && (stack.getTagCompound() == null ? compressedStack.getTagCompound() == null : stack.getTagCompound().equals(compressedStack.getTagCompound()));
return stack.isItemEqual(compressedStack) && (stack.getTagCompound() == null ? !compressedStack.hasTagCompound() : stack.getTagCompound().equals(compressedStack.getTagCompound()));
}
}