Upstream/EpicHoppers
1
0
Fork 0
mirror of https://github.com/songoda/EpicHoppers.git synced 2024-11-26 20:26:19 +01:00
Code Issues Projects Releases Wiki Activity

respect filter in suction module

Browse Source
This commit is contained in:
jascotty2 2019-08-10 16:44:05 -05:00
parent 953cc14d65
commit 95027a9219
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleSuction.java
View File

@ -3,9 +3,9 @@ package com.songoda.epichoppers.hopper.levels.modules;
import com.bgsoftware.wildstacker.api.WildStackerAPI; import com.bgsoftware.wildstacker.api.WildStackerAPI;
import com.songoda.epichoppers.EpicHoppers; import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.hopper.Hopper; import com.songoda.epichoppers.hopper.Hopper;
import com.songoda.epichoppers.utils.Methods;
import com.songoda.epichoppers.utils.ServerVersion; import com.songoda.epichoppers.utils.ServerVersion;
import com.songoda.epichoppers.utils.StorageContainerCache; import com.songoda.epichoppers.utils.StorageContainerCache;
import com.songoda.ultimatestacker.utils.Methods;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
@ -53,6 +53,8 @@ public class ModuleSuction extends Module {
.map(entity -> (Item) entity) .map(entity -> (Item) entity)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
boolean filterEndpoint = hopper.getFilter().getEndPoint() != null;
for (Item item : itemsToSuck) { for (Item item : itemsToSuck) {
ItemStack itemStack = item.getItemStack(); ItemStack itemStack = item.getItemStack();
@ -72,6 +74,26 @@ public class ModuleSuction extends Module {
if (blacklist.contains(item.getUniqueId())) if (blacklist.contains(item.getUniqueId()))
return; return;
// respect filter if no endpoint
if (!filterEndpoint
&& !(hopper.getFilter().getWhiteList().isEmpty() && hopper.getFilter().getBlackList().isEmpty())) {
// this hopper has a filter with no rejection endpoint, so don't absorb disalowed items
// whitelist has priority
if (!hopper.getFilter().getWhiteList().isEmpty()) {
// is this item on the whitelist?
if (!hopper.getFilter().getWhiteList().stream().anyMatch(filterItem -> Methods.isSimilar(itemStack, filterItem))) {
// nope!
continue;
}
} else {
// check the blacklist
if (hopper.getFilter().getBlackList().stream().anyMatch(filterItem -> Methods.isSimilar(itemStack, filterItem))) {
// don't grab this, then
continue;
}
}
}
// try to add the items to the hopper // try to add the items to the hopper
int toAdd, added = hopperCache.addAny(itemStack, toAdd = getActualItemAmount(item)); int toAdd, added = hopperCache.addAny(itemStack, toAdd = getActualItemAmount(item));
if (added == 0) if (added == 0)
@ -101,7 +123,7 @@ public class ModuleSuction extends Module {
private int getActualItemAmount(Item item) { private int getActualItemAmount(Item item) {
if (ultimateStacker) { if (ultimateStacker) {
return Methods.getActualItemAmount(item); return com.songoda.ultimatestacker.utils.Methods.getActualItemAmount(item);
} else if (wildStacker) } else if (wildStacker)
return WildStackerAPI.getItemAmount(item); return WildStackerAPI.getItemAmount(item);
else else
@ -111,7 +133,7 @@ public class ModuleSuction extends Module {
private void updateAmount(Item item, int amount) { private void updateAmount(Item item, int amount) {
if (ultimateStacker) if (ultimateStacker)
Methods.updateItemAmount(item, amount); com.songoda.ultimatestacker.utils.Methods.updateItemAmount(item, amount);
else if (wildStacker) else if (wildStacker)
WildStackerAPI.getStackedItem(item).setStackAmount(amount, true); WildStackerAPI.getStackedItem(item).setStackAmount(amount, true);
else else