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

The Importer now skips over empty slots. #1612

Browse Source
This commit is contained in:
raoulvdberge
2018-06-05 11:16:04 +02:00
parent fe4dcad44b
commit 5cf75eceac
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -18,6 +18,7 @@
- Made all IO blocks have a blacklist instead of a whitelist by default (raoulvdberge) - Made all IO blocks have a blacklist instead of a whitelist by default (raoulvdberge)
- An empty blacklist now means: accept any item. An empty whitelist now means: don't accept any item (an empty whitelist USED to mean: accept any item) (raoulvdberge) - An empty blacklist now means: accept any item. An empty whitelist now means: don't accept any item (an empty whitelist USED to mean: accept any item) (raoulvdberge)
- Any mod can now add JSON Solderer recipes without requiring the API, by putting the JSONs in their assets directory in a "solderer_recipes" directory (raoulvdberge) - Any mod can now add JSON Solderer recipes without requiring the API, by putting the JSONs in their assets directory in a "solderer_recipes" directory (raoulvdberge)
- The Importer now skips over empty slots (raoulvdberge)
- Updated Russian translation (kellixon) - Updated Russian translation (kellixon)
### 1.5.34 ### 1.5.34

6
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java
View File

@@ -72,9 +72,13 @@ public class NetworkNodeImporter extends NetworkNode implements IComparable, IFi
} }
if (handler.getSlots() > 0) { if (handler.getSlots() > 0) {
while (currentSlot + 1 < handler.getSlots() && handler.getStackInSlot(currentSlot).isEmpty()) {
currentSlot++;
}
ItemStack stack = handler.getStackInSlot(currentSlot); ItemStack stack = handler.getStackInSlot(currentSlot);
if (stack.isEmpty() || !IFilterable.canTake(itemFilters, mode, compare, stack)) { if (!IFilterable.canTake(itemFilters, mode, compare, stack)) {
currentSlot++; currentSlot++;
} else if (ticks % upgrades.getSpeed() == 0) { } else if (ticks % upgrades.getSpeed() == 0) {
ItemStack result = handler.extractItem(currentSlot, upgrades.getItemInteractCount(), true); ItemStack result = handler.extractItem(currentSlot, upgrades.getItemInteractCount(), true);