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

Made it so that, in the advanced ESD, both filters filter for both pulling and putting

Browse source
This commit is contained in:
Ellpeck 2015-08-04 10:14:23 +02:00
parent 494628481b
commit 5f71b411b1
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/ellpeck/actuallyadditions/PLANNED.txt
View file

@ -124,3 +124,6 @@
-Only move when you don't look -Only move when you don't look
-Teleport you away -Teleport you away
-ESD Change
-Have a Button in the ESD that toggles if its slot is getting used or if the Items are just moved directly
-Makes it so that if you have multiple Items to be moved, one can't get stuck in the slot blocking the others

16
src/main/java/ellpeck/actuallyadditions/tile/TileEntityInputter.java
View file

@ -165,7 +165,7 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt
else maxSize = this.getInventoryStackLimit(); else maxSize = this.getInventoryStackLimit();
} }
//If ESD has enough Space & Item in question is on whitelist //If ESD has enough Space & Item in question is on whitelist
if(tempStack != null && (this.slots[0] == null || (tempStack.isItemEqual(this.slots[0]) && this.slots[0].stackSize < maxSize)) && this.checkFilters(tempStack, true, isPullWhitelist)){ if(tempStack != null && (this.slots[0] == null || (tempStack.isItemEqual(this.slots[0]) && this.slots[0].stackSize < maxSize)) && this.checkBothFilters(tempStack)){
//Deal with ISided //Deal with ISided
if(theSided != null){ if(theSided != null){
//Check if Item can be inserted from any Side (Because Sidedness gets ignored!) //Check if Item can be inserted from any Side (Because Sidedness gets ignored!)
@ -240,7 +240,7 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt
if(tempStack.getMaxStackSize() < theInventory.getInventoryStackLimit()) maxSize = tempStack.getMaxStackSize(); if(tempStack.getMaxStackSize() < theInventory.getInventoryStackLimit()) maxSize = tempStack.getMaxStackSize();
else maxSize = theInventory.getInventoryStackLimit(); else maxSize = theInventory.getInventoryStackLimit();
} }
if(theInventory.isItemValidForSlot(i, this.slots[0]) && (tempStack == null || (tempStack.isItemEqual(this.slots[0]) && tempStack.stackSize < maxSize)) && this.checkFilters(this.slots[0], false, isPutWhitelist)){ if(theInventory.isItemValidForSlot(i, this.slots[0]) && (tempStack == null || (tempStack.isItemEqual(this.slots[0]) && tempStack.stackSize < maxSize)) && this.checkBothFilters(this.slots[0])){
if(theSided != null){ if(theSided != null){
for(int j = 0; j < 5; j++){ for(int j = 0; j < 5; j++){
if(theSided.canInsertItem(i, this.slots[0], j)){ if(theSided.canInsertItem(i, this.slots[0], j)){
@ -284,6 +284,16 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt
} }
} }
/**
* Checks if one of the filters contains the ItemStack
* (Whitelist or empty Blacklist in one of them always lets the Item through!)
* @param stack The ItemStack
* @return If the Item is filtered correctly
*/
private boolean checkBothFilters(ItemStack stack){
return this.checkFilter(stack, true, isPullWhitelist) || this.checkFilter(stack, false, isPutWhitelist);
}
/** /**
* Checks the Whitelist/Blacklist to see if Item fits * Checks the Whitelist/Blacklist to see if Item fits
* @param stack The Stack to check for * @param stack The Stack to check for
@ -291,7 +301,7 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt
* @param isWhitelist If it's set to white- or Blacklist * @param isWhitelist If it's set to white- or Blacklist
* @return Is Item on White-/Blacklist? * @return Is Item on White-/Blacklist?
*/ */
public boolean checkFilters(ItemStack stack, boolean isPull, boolean isWhitelist){ private boolean checkFilter(ItemStack stack, boolean isPull, boolean isWhitelist){
if(!this.isAdvanced) return true; if(!this.isAdvanced) return true;
int slotStart = isPull ? PULL_FILTER_START : PUT_FILTER_START; int slotStart = isPull ? PULL_FILTER_START : PUT_FILTER_START;