Simple Cleanup

This commit is contained in:
mezz committed 2014-12-20 03:59:31 -08:00
1 parent 09df969bcf
commit e2fff11ea8
141 files changed
+545 -859

No files matched your search

@@ -51,10 +51,7 @@ public class PickupHandlerStorage implements IPickupHandler {
backpack.tryStowing(player, pack, itemstack);
}
if (itemstack.stackSize <= 0)
return false;
else
return true;
return itemstack.stackSize > 0;
}
/**
@@ -85,7 +82,6 @@ public class PickupHandlerStorage implements IPickupHandler {
if (space > itemstack.stackSize) {
inventoryStack.stackSize += itemstack.stackSize;
itemstack.stackSize = 0;
itemstack = null;
break;
// Only part can be added
} else {
@@ -93,9 +93,6 @@ public class ResupplyHandler implements IResupplyHandler {
/**
* This tops off existing stacks in the player's inventory.
*
* @param player
* @param itemstack
*/
private boolean topOffPlayerInventory(EntityPlayer player, ItemStack itemstack) {
@@ -112,11 +109,8 @@ public class ResupplyHandler implements IResupplyHandler {
continue;
if (inventoryStack.isItemEqual(itemstack) && ItemStack.areItemStackTagsEqual(inventoryStack, itemstack)) {
inventoryStack.stackSize++;
itemstack.stackSize--;
if (itemstack.stackSize <= 0)
itemstack = null;
return true;
}
}
@@ -43,7 +43,7 @@ public class ContainerBackpack extends ContainerItemInventory {
for (int j = 0; j < lines; j++)
for (int k = 0; k < columns; k++) {
int slot = k + j * columns;
addSlot(new SlotForestry(inventory, slot, startX + k * 18, startY + j * 18) {
addSlotToContainer(new SlotForestry(inventory, slot, startX + k * 18, startY + j * 18) {
@Override
public boolean isItemValid(ItemStack stack) {
@@ -24,7 +24,7 @@ import net.minecraft.item.ItemStack;
public class ContainerNaturalistBackpack extends ContainerItemInventory implements IGuiSelectable {
private final PagedInventory inv;
private ISpeciesRoot speciesRoot;
private final ISpeciesRoot speciesRoot;
public ContainerNaturalistBackpack(ISpeciesRoot speciesRoot, InventoryPlayer player, PagedInventory inventory, int page, int pageSize) {
super(inventory, player.player);
@@ -35,7 +35,7 @@ public class ContainerNaturalistBackpack extends ContainerItemInventory implemen
// Inventory
for (int x = 0; x < 5; x++) {
for (int y = 0; y < 5; y++) {
addSlot(new SlotCustom(inventory, y + page * pageSize + x * 5, 100 + y * 18, 21 + x * 18, speciesRoot));
addSlotToContainer(new SlotCustom(inventory, y + page * pageSize + x * 5, 100 + y * 18, 21 + x * 18, speciesRoot));
}
}