Upstream/ChestsPlusPlus
1
0
Fork 0
mirror of https://github.com/JamesPeters98/ChestsPlusPlus.git synced 2025-01-25 09:41:32 +01:00
Code Issues Projects Releases Wiki Activity

Fixed Filters - Again.

Browse Source
This commit is contained in:
jameslfc19 2020-07-26 22:15:00 +01:00
parent cc18166743
commit b8119d6286
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/filters/Filter.java
View File

@ -33,7 +33,11 @@ public class Filter {
if(isFilteredByMeta(itemStack)) return Type.REJECT; if(isFilteredByMeta(itemStack)) return Type.REJECT;
else return Type.ACCEPT; else return Type.ACCEPT;
} }
if(isFilteredByMeta(itemStack)) return Type.ACCEPT; if(filterByItemMeta) {
if (isFilteredByMeta(itemStack)) return Type.ACCEPT;
} else {
if (filter.isSimilar(itemStack)) return Type.ACCEPT;
}
return Type.NONE; return Type.NONE;
} }

8
ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/filters/HopperFilter.java
View File

@ -9,15 +9,19 @@ import org.bukkit.inventory.ItemStack;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
public class HopperFilter { public class HopperFilter {
public static boolean isInFilter(List<Filter> filters, ItemStack item){ public static boolean isInFilter(List<Filter> filters, ItemStack item){
if(filters == null) return true; if(filters == null) return true;
if(filters.size() == 0) return true; if(filters.size() == 0) return true;
boolean hasAcceptFilter = filters.stream().filter(filter -> filter.getFilteringMethod() == Filter.Type.ACCEPT).anyMatch(filter -> filter.getFilterType(item).equals(Filter.Type.ACCEPT)); List<Filter> acceptFilters = filters.stream().filter(filter -> filter.getFilteringMethod() == Filter.Type.ACCEPT).collect(Collectors.toList());
boolean hasAcceptFilter = acceptFilters.stream().anyMatch(filter -> filter.getFilterType(item).equals(Filter.Type.ACCEPT));
boolean isRejected = filters.stream().filter(filter -> filter.getFilteringMethod() == Filter.Type.REJECT).anyMatch(filter -> filter.getFilterType(item).equals(Filter.Type.REJECT)); boolean isRejected = filters.stream().filter(filter -> filter.getFilteringMethod() == Filter.Type.REJECT).anyMatch(filter -> filter.getFilterType(item).equals(Filter.Type.REJECT));
return hasAcceptFilter && !isRejected; if(acceptFilters.size() > 0) return hasAcceptFilter && !isRejected;
else return !isRejected;
} }
public static List<Filter> getHopperFilters(Block block){ public static List<Filter> getHopperFilters(Block block){