Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Potential fix for tubes not obeying filters

Browse source
This commit is contained in:
Brian Ricketts 2012-12-30 00:24:38 -06:00
parent d0131218d8
commit 788b325312
3 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/minecraft/assemblyline/client/render/RenderCrate.java
View file

@ -41,7 +41,10 @@ public class RenderCrate extends RenderImprintable
{
if (tileEntity.getFilter() != null)
{
itemStack = ItemImprinter.getFilters(tileEntity.getFilter()).get(0).splitStack(0); // see if it has a filter instead
if (ItemImprinter.getFilters(tileEntity.getFilter()).size() > 0)
{
itemStack = ItemImprinter.getFilters(tileEntity.getFilter()).get(0).splitStack(0); // see if it has a filter instead
}
}
}

10
src/minecraft/assemblyline/common/block/BlockCrate.java
View file

@ -205,7 +205,10 @@ public class BlockCrate extends BlockMachine
boolean filterValid = true;
if (tileEntity.getFilter() != null)
{
filterValid = itemStack.isItemEqual(ItemImprinter.getFilters(tileEntity.getFilter()).get(0));
if (ItemImprinter.getFilters(tileEntity.getFilter()).size() > 0)
{
filterValid = itemStack.isItemEqual(ItemImprinter.getFilters(tileEntity.getFilter()).get(0));
}
}
if (containingStack.isStackable() && containingStack.isItemEqual(itemStack) && filterValid)
{
@ -230,7 +233,10 @@ public class BlockCrate extends BlockMachine
boolean filterValid = true;
if (tileEntity.getFilter() != null)
{
filterValid = itemStack.isItemEqual(ItemImprinter.getFilters(tileEntity.getFilter()).get(0));
if (ItemImprinter.getFilters(tileEntity.getFilter()).size() > 0)
{
filterValid = itemStack.isItemEqual(ItemImprinter.getFilters(tileEntity.getFilter()).get(0));
}
}
if (filterValid)
{

9
src/minecraft/assemblyline/common/block/TileEntityCrate.java
View file

@ -8,6 +8,7 @@ import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.ISidedInventory;
import universalelectricity.prefab.network.IPacketReceiver;
import universalelectricity.prefab.network.PacketManager;
import assemblyline.common.machine.imprinter.ItemImprinter;
import assemblyline.common.machine.imprinter.TileEntityImprintable;
public class TileEntityCrate extends TileEntityImprintable implements ISidedInventory, IPacketReceiver
@ -122,6 +123,14 @@ public class TileEntityCrate extends TileEntityImprintable implements ISidedInve
{
if (stack != null)
{
boolean filterValid = true;
if (getFilter() != null)
{
if (ItemImprinter.getFilters(getFilter()).size() > 0)
{
filterValid = stack.isItemEqual(ItemImprinter.getFilters(getFilter()).get(0));
}
}
if (stack.isStackable())
{
this.containingItems[slot] = stack;