Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 15:18:34 +01:00
Code Issues Projects Releases Wiki Activity

Made crafter not randomly create stacks with 0 items in them

Browse source 
Closes #127
This commit is contained in:
Ellpeck 2016-06-17 13:03:57 +02:00
parent f97ba2d31c
commit bfd5311512
1 changed files with 31 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCrafter.java
View file

@ -50,44 +50,55 @@ public class ContainerCrafter extends Container{
} }
@Override @Override
public ItemStack transferStackInSlot(EntityPlayer player, int slot){ public ItemStack transferStackInSlot(EntityPlayer player, int index){
ItemStack stack = null; ItemStack itemstack = null;
Slot theSlot = this.inventorySlots.get(slot); Slot slot = this.inventorySlots.get(index);
if(theSlot != null && theSlot.getHasStack()){ if(slot != null && slot.getHasStack()){
ItemStack savedStack = theSlot.getStack(); ItemStack itemstack1 = slot.getStack();
stack = savedStack.copy(); itemstack = itemstack1.copy();
if(slot == 0){ if(index == 0){
if(!this.mergeItemStack(savedStack, 10, 46, true)){ if(!this.mergeItemStack(itemstack1, 10, 46, true)){
return null; return null;
} }
theSlot.onSlotChange(savedStack, stack);
slot.onSlotChange(itemstack1, itemstack);
} }
else if(slot >= 10 && slot < 37 && !this.mergeItemStack(savedStack, 37, 46, false)){ else if(index >= 10 && index < 37){
return null; if(!this.mergeItemStack(itemstack1, 37, 46, false)){
return null;
}
} }
else if(slot >= 37 && slot < 46 && !this.mergeItemStack(savedStack, 10, 37, false)){ else if(index >= 37 && index < 46){
return null; if(!this.mergeItemStack(itemstack1, 10, 37, false)){
return null;
}
} }
else if(!this.mergeItemStack(savedStack, 10, 46, false)){ else if(!this.mergeItemStack(itemstack1, 10, 46, false)){
return null; return null;
} }
if(savedStack.stackSize <= 0){ if(itemstack1.stackSize <= 0){
theSlot.putStack(null); slot.putStack(null);
} }
else{ else{
theSlot.onSlotChanged(); slot.onSlotChanged();
} }
if(savedStack.stackSize == stack.stackSize){ if(itemstack1.stackSize == itemstack.stackSize){
return null; return null;
} }
theSlot.onPickupFromSlot(player, savedStack); slot.onPickupFromSlot(player, itemstack1);
} }
return stack;
return itemstack;
}
@Override
public boolean canMergeSlot(ItemStack stack, Slot slotIn){
return slotIn.inventory != this.craftResult && super.canMergeSlot(stack, slotIn);
} }
@Override @Override