mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-19 03:39:09 +00:00
Merge branch 'Greenhouse' of https://github.com/ForestryMC/ForestryMC into Greenhouse
This commit is contained in:
commit
45e18af1d3
2 files changed
+4
-4
No files matched your search
@@ -80,7 +80,7 @@ public class StackFilter implements IStackFilter {
|
||||
};
|
||||
}
|
||||
|
||||
private static StackFilter buildAnd(@Nonnull final Predicate<? super ItemStack>... filters) {
|
||||
public static StackFilter buildAnd(@Nonnull final Predicate<? super ItemStack>... filters) {
|
||||
return new StackFilter() {
|
||||
@Override
|
||||
public boolean apply(ItemStack stack) {
|
||||
@@ -95,7 +95,7 @@ public class StackFilter implements IStackFilter {
|
||||
};
|
||||
}
|
||||
|
||||
private static StackFilter buildOr(@Nonnull final Predicate<? super ItemStack>... filters) {
|
||||
public static StackFilter buildOr(@Nonnull final Predicate<? super ItemStack>... filters) {
|
||||
return new StackFilter() {
|
||||
@Override
|
||||
public boolean apply(ItemStack stack) {
|
||||
@@ -110,7 +110,7 @@ public class StackFilter implements IStackFilter {
|
||||
};
|
||||
}
|
||||
|
||||
private static StackFilter invert(@Nonnull final Predicate<? super ItemStack> filter) {
|
||||
public static StackFilter invert(@Nonnull final Predicate<? super ItemStack> filter) {
|
||||
return new StackFilter() {
|
||||
@Override
|
||||
public boolean apply(ItemStack stack) {
|
||||
|
||||
@@ -76,7 +76,7 @@ public class ItemHandlerInventoryIterator extends InventoryIterator<IInvSlot> {
|
||||
|
||||
@Override
|
||||
public ItemStack decreaseStackInSlot() {
|
||||
return inv.extractItem(slot, 1, true);
|
||||
return inv.extractItem(slot, 1, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user