remove "all" from InvTools addStack. (used only by tryAddStack)

This commit is contained in:
mezz committed 2015-03-23 23:35:05 -07:00
1 parent 5bc0f0156e
commit 97a96b8f3f
4 files changed
+16 -12

No files matched your search

@@ -43,7 +43,7 @@ public class TileSwarm extends TileEntity {
public TileSwarm setContained(ItemStack[] bees) {
for (ItemStack itemstack : bees) {
InvTools.addStack(contained, itemstack, false, true);
InvTools.addStack(contained, itemstack, true);
}
return this;
@@ -142,7 +142,7 @@ public class TileEscritoire extends TileBase implements ISidedInventory, IRender
}
for (ItemStack itemstack : individual.getGenome().getPrimary().getResearchBounty(worldObj, gameProfile, individual, game.getBountyLevel())) {
InvTools.addStack(getInternalInventory(), itemstack, SLOT_RESULTS_1, SLOTS_RESULTS_COUNT, false, true);
InvTools.addStack(getInternalInventory(), itemstack, SLOT_RESULTS_1, SLOTS_RESULTS_COUNT, true);
}
}
@@ -1073,7 +1073,11 @@ public abstract class InvTools {
}
public static boolean tryAddStack(IInventory inventory, ItemStack stack, boolean all) {
return tryAddStack(inventory, stack, 0, inventory.getSizeInventory(), all);
return tryAddStack(inventory, stack, 0, inventory.getSizeInventory(), all, true);
}
public static boolean tryAddStack(IInventory inventory, ItemStack stack, boolean all, boolean doAdd) {
return tryAddStack(inventory, stack, 0, inventory.getSizeInventory(), all, doAdd);
}
/**
@@ -1084,7 +1088,7 @@ public abstract class InvTools {
}
public static boolean tryAddStack(IInventory inventory, ItemStack stack, int startSlot, int slots, boolean all, boolean doAdd) {
int added = addStack(inventory, stack, startSlot, slots, all, doAdd);
int added = addStack(inventory, stack, startSlot, slots, doAdd);
if (all) {
return added == stack.stackSize;
} else {
@@ -1092,11 +1096,11 @@ public abstract class InvTools {
}
}
public static int addStack(IInventory inventory, ItemStack stack, boolean all, boolean doAdd) {
return addStack(inventory, stack, 0, inventory.getSizeInventory(), all, doAdd);
public static int addStack(IInventory inventory, ItemStack stack, boolean doAdd) {
return addStack(inventory, stack, 0, inventory.getSizeInventory(), doAdd);
}
public static int addStack(IInventory inventory, ItemStack stack, int startSlot, int slots, boolean all, boolean doAdd) {
public static int addStack(IInventory inventory, ItemStack stack, int startSlot, int slots, boolean doAdd) {
int added = 0;
// Add to existing stacks first
@@ -548,21 +548,21 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable
for (IFarmLogic logic : getFarmLogics()) {
// Germlings try to go into germling slots first.
if (logic.isAcceptedGermling(produce)) {
produce.stackSize -= InvTools.addStack(inventory, produce, SLOT_GERMLINGS_1, SLOT_GERMLINGS_COUNT, false, true);
produce.stackSize -= InvTools.addStack(inventory, produce, SLOT_GERMLINGS_1, SLOT_GERMLINGS_COUNT, true);
}
if (produce.stackSize <= 0) {
return;
}
if (logic.isAcceptedResource(produce)) {
produce.stackSize -= InvTools.addStack(inventory, produce, SLOT_RESOURCES_1, SLOT_RESOURCES_COUNT, false, true);
produce.stackSize -= InvTools.addStack(inventory, produce, SLOT_RESOURCES_1, SLOT_RESOURCES_COUNT, true);
}
if (produce.stackSize <= 0) {
return;
}
}
produce.stackSize -= InvTools.addStack(inventory, produce, SLOT_PRODUCTION_1, SLOT_PRODUCTION_COUNT, false, true);
produce.stackSize -= InvTools.addStack(inventory, produce, SLOT_PRODUCTION_1, SLOT_PRODUCTION_COUNT, true);
}
private boolean cullCrop(ICrop crop, IFarmLogic provider) {
@@ -610,7 +610,7 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable
// Special case germlings
for (IFarmLogic logic : farmLogics) {
if (logic.isAcceptedGermling(harvest)) {
harvest.stackSize -= InvTools.addStack(inventory, harvest, SLOT_GERMLINGS_1, SLOT_GERMLINGS_COUNT, false, true);
harvest.stackSize -= InvTools.addStack(inventory, harvest, SLOT_GERMLINGS_1, SLOT_GERMLINGS_COUNT, true);
break;
}
}
@@ -620,7 +620,7 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable
continue;
}
harvest.stackSize -= InvTools.addStack(inventory, harvest, SLOT_PRODUCTION_1, SLOT_PRODUCTION_COUNT, false, true);
harvest.stackSize -= InvTools.addStack(inventory, harvest, SLOT_PRODUCTION_1, SLOT_PRODUCTION_COUNT, true);
if (harvest.stackSize <= 0) {
continue;
}