Converted the Master Routing Node so that it would use a TreeMap instead of a HashMap for sorting. Modified TestItemFilter so it actually worked without exceptions.

Added default item filter which allows all items through.
This commit is contained in:
WayofTime 2016-01-21 10:45:45 -05:00
parent 8f17953b97
commit 8b6787b27c
8 changed files with 195 additions and 42 deletions

View file

@ -1,6 +1,11 @@
package WayofTime.bloodmagic.tile.routing;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import WayofTime.bloodmagic.item.routing.IItemFilterProvider;
import WayofTime.bloodmagic.routing.DefaultItemFilter;
import WayofTime.bloodmagic.routing.IItemFilter;
import WayofTime.bloodmagic.routing.IOutputItemRoutingNode;
@ -20,20 +25,22 @@ public class TileOutputRoutingNode extends TileFilteredRoutingNode implements IO
@Override
public IItemFilter getOutputFilterForSide(EnumFacing side)
{
// ItemStack filterStack = this.getFilterStack(side);
//
// if (filterStack == null || !(filterStack.getItem() instanceof IItemFilterProvider))
// {
// return null;
// }
//
// IItemFilterProvider filter = (IItemFilterProvider) filterStack.getItem();
//
// TileEntity tile = worldObj.getTileEntity(pos.offset(side));
// if (tile instanceof IInventory)
// {
// return filter.getOutputItemFilter(filterStack, (IInventory) tile, side.getOpposite());
// }
TileEntity tile = worldObj.getTileEntity(pos.offset(side));
if (tile instanceof IInventory)
{
ItemStack filterStack = this.getFilterStack(side);
if (filterStack == null || !(filterStack.getItem() instanceof IItemFilterProvider))
{
IItemFilter filter = new DefaultItemFilter();
filter.initializeFilter(null, (IInventory) tile, side.getOpposite(), true);
return filter;
}
IItemFilterProvider filter = (IItemFilterProvider) filterStack.getItem();
return filter.getOutputItemFilter(filterStack, (IInventory) tile, side.getOpposite());
}
return null;
}