dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add controller#getItem

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-06-09 17:12:22 +02:00
parent 6a9a319580
commit eae8cd442c
2 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/refinedstorage/tile/TileDetector.java
View File

@@ -51,29 +51,21 @@ public class TileDetector extends TileMachine implements ICompareConfig {
boolean wasPowered = powered;
if (slot != null) {
boolean foundAny = false;
ItemStack stack = controller.getItem(slot, compare);
for (ItemStack stack : controller.getItems()) {
if (RefinedStorageUtils.compareStack(slot, stack, compare)) {
foundAny = true;
switch (mode) {
case MODE_UNDER:
powered = stack.stackSize < amount;
break;
case MODE_EQUAL:
powered = stack.stackSize == amount;
break;
case MODE_ABOVE:
powered = stack.stackSize > amount;
break;
}
break;
if (stack != null) {
switch (mode) {
case MODE_UNDER:
powered = stack.stackSize < amount;
break;
case MODE_EQUAL:
powered = stack.stackSize == amount;
break;
case MODE_ABOVE:
powered = stack.stackSize > amount;
break;
}
}
if (!foundAny) {
} else {
if (mode == MODE_UNDER && amount != 0) {
powered = true;
} else if (mode == MODE_EQUAL && amount == 0) {

10
src/main/java/refinedstorage/tile/controller/TileController.java
View File

@@ -441,6 +441,16 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
return newStack;
}
public ItemStack getItem(ItemStack stack, int flags) {
for (ItemStack otherStack : items) {
if (RefinedStorageUtils.compareStack(otherStack, stack, flags)) {
return otherStack;
}
}
return null;
}
public void setEnergyStored(int amount) {
energy.setEnergyStored(amount);
}