Initial 1.11-pre1 update

This commit is contained in:
cpw committed 2016-11-13 17:09:55 -05:00
1 parent c177219ff3
commit 4e6a774075
294 files changed
+3099 -2846

No files matched your search

@@ -25,6 +25,8 @@ import net.minecraft.inventory.InventoryBasic;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import javax.annotation.Nonnull;
public class SlotItemHandler extends Slot
{
private static IInventory emptyInventory = new InventoryBasic("[Null]", true, 0);
@@ -39,9 +41,9 @@ public class SlotItemHandler extends Slot
}
@Override
public boolean isItemValid(ItemStack stack)
public boolean isItemValid(@Nonnull ItemStack stack)
{
if (stack == null)
if (stack.func_190926_b())
return false;
IItemHandler handler = this.getItemHandler();
@@ -51,7 +53,7 @@ public class SlotItemHandler extends Slot
IItemHandlerModifiable handlerModifiable = (IItemHandlerModifiable) handler;
ItemStack currentStack = handlerModifiable.getStackInSlot(index);
handlerModifiable.setStackInSlot(index, null);
handlerModifiable.setStackInSlot(index, ItemStack.field_190927_a);
remainder = handlerModifiable.insertItem(index, stack, true);
@@ -61,10 +63,11 @@ public class SlotItemHandler extends Slot
{
remainder = handler.insertItem(index, stack, true);
}
return remainder == null || remainder.stackSize < stack.stackSize;
return remainder == null || remainder.func_190916_E() < stack.func_190916_E();
}
@Override
@Nonnull
public ItemStack getStack()
{
return this.getItemHandler().getStackInSlot(index);
@@ -72,44 +75,44 @@ public class SlotItemHandler extends Slot
// Override if your IItemHandler does not implement IItemHandlerModifiable
@Override
public void putStack(ItemStack stack)
public void putStack(@Nonnull ItemStack stack)
{
((IItemHandlerModifiable) this.getItemHandler()).setStackInSlot(index, stack);
this.onSlotChanged();
}
@Override
public void onSlotChange(ItemStack p_75220_1_, ItemStack p_75220_2_)
public void onSlotChange(@Nonnull ItemStack p_75220_1_, @Nonnull ItemStack p_75220_2_)
{
}
@Override
public int getItemStackLimit(ItemStack stack)
public int getItemStackLimit(@Nonnull ItemStack stack)
{
ItemStack maxAdd = stack.copy();
int maxInput = stack.getMaxStackSize();
maxAdd.stackSize = maxInput;
maxAdd.func_190920_e(maxInput);
IItemHandler handler = this.getItemHandler();
ItemStack currentStack = handler.getStackInSlot(index);
if (handler instanceof IItemHandlerModifiable) {
IItemHandlerModifiable handlerModifiable = (IItemHandlerModifiable) handler;
handlerModifiable.setStackInSlot(index, null);
handlerModifiable.setStackInSlot(index, ItemStack.field_190927_a);
ItemStack remainder = handlerModifiable.insertItem(index, maxAdd, true);
handlerModifiable.setStackInSlot(index, currentStack);
return maxInput - (remainder != null ? remainder.stackSize : 0);
return maxInput - remainder.func_190916_E();
}
else
{
ItemStack remainder = handler.insertItem(index, maxAdd, true);
int current = currentStack == null ? 0 : currentStack.stackSize;
int added = maxInput - (remainder != null ? remainder.stackSize : 0);
int current = currentStack.func_190916_E();
int added = maxInput - remainder.func_190916_E();
return current + added;
}
}
@@ -117,10 +120,11 @@ public class SlotItemHandler extends Slot
@Override
public boolean canTakeStack(EntityPlayer playerIn)
{
return this.getItemHandler().extractItem(index, 1, true) != null;
return !this.getItemHandler().extractItem(index, 1, true).func_190926_b();
}
@Override
@Nonnull
public ItemStack decrStackSize(int amount)
{
return this.getItemHandler().extractItem(index, amount, false);