lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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.

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

34
src/main/java/WayofTime/bloodmagic/tile/routing/TileInputRoutingNode.java
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.IInputItemRoutingNode;
import WayofTime.bloodmagic.routing.IItemFilter;
@ -20,20 +25,21 @@ public class TileInputRoutingNode extends TileFilteredRoutingNode implements IIn
@Override
public IItemFilter getInputFilterForSide(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.getInputItemFilter(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(), false);
return filter;
}
IItemFilterProvider filter = (IItemFilterProvider) filterStack.getItem();
return filter.getInputItemFilter(filterStack, (IInventory) tile, side.getOpposite());
}
return null;
}

8
src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java
View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.tile.routing;
import java.util.HashMap;
import java.util.TreeMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@ -31,7 +31,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti
}
// A list of connections
private HashMap<BlockPos, List<BlockPos>> connectionMap = new HashMap<BlockPos, List<BlockPos>>();
private TreeMap<BlockPos, List<BlockPos>> connectionMap = new TreeMap<BlockPos, List<BlockPos>>();
private List<BlockPos> generalNodeList = new LinkedList<BlockPos>();
private List<BlockPos> outputNodeList = new LinkedList<BlockPos>();
private List<BlockPos> inputNodeList = new LinkedList<BlockPos>();
@ -46,7 +46,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti
return;
}
Map<Integer, List<IItemFilter>> outputMap = new HashMap<Integer, List<IItemFilter>>();
Map<Integer, List<IItemFilter>> outputMap = new TreeMap<Integer, List<IItemFilter>>();
for (BlockPos outputPos : outputNodeList)
{
@ -80,7 +80,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti
}
}
Map<Integer, List<IItemFilter>> inputMap = new HashMap<Integer, List<IItemFilter>>();
Map<Integer, List<IItemFilter>> inputMap = new TreeMap<Integer, List<IItemFilter>>();
for (BlockPos inputPos : inputNodeList)
{

35
src/main/java/WayofTime/bloodmagic/tile/routing/TileOutputRoutingNode.java
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;
}

1
src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java
View file

@ -167,7 +167,6 @@ public class TileRoutingNode extends TileInventory implements IRoutingNode, IIte
if (connectionList.contains(pos1))
{
connectionList.remove(pos1);
System.out.println("Position: " + pos + ", remaining: " + connectionList.size());
worldObj.markBlockForUpdate(pos);
}
}