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

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

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

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

@ -204,9 +204,12 @@ public class BlockCrate extends BlockMachine
{ {
boolean filterValid = true; boolean filterValid = true;
if (tileEntity.getFilter() != null) if (tileEntity.getFilter() != null)
{
if (ItemImprinter.getFilters(tileEntity.getFilter()).size() > 0)
{ {
filterValid = itemStack.isItemEqual(ItemImprinter.getFilters(tileEntity.getFilter()).get(0)); filterValid = itemStack.isItemEqual(ItemImprinter.getFilters(tileEntity.getFilter()).get(0));
} }
}
if (containingStack.isStackable() && containingStack.isItemEqual(itemStack) && filterValid) if (containingStack.isStackable() && containingStack.isItemEqual(itemStack) && filterValid)
{ {
int newStackSize = containingStack.stackSize + itemStack.stackSize; int newStackSize = containingStack.stackSize + itemStack.stackSize;
@ -229,9 +232,12 @@ public class BlockCrate extends BlockMachine
{ {
boolean filterValid = true; boolean filterValid = true;
if (tileEntity.getFilter() != null) if (tileEntity.getFilter() != null)
{
if (ItemImprinter.getFilters(tileEntity.getFilter()).size() > 0)
{ {
filterValid = itemStack.isItemEqual(ItemImprinter.getFilters(tileEntity.getFilter()).get(0)); filterValid = itemStack.isItemEqual(ItemImprinter.getFilters(tileEntity.getFilter()).get(0));
} }
}
if (filterValid) if (filterValid)
{ {
tileEntity.setInventorySlotContents(0, itemStack.copy()); tileEntity.setInventorySlotContents(0, itemStack.copy());

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 net.minecraftforge.common.ISidedInventory;
import universalelectricity.prefab.network.IPacketReceiver; import universalelectricity.prefab.network.IPacketReceiver;
import universalelectricity.prefab.network.PacketManager; import universalelectricity.prefab.network.PacketManager;
import assemblyline.common.machine.imprinter.ItemImprinter;
import assemblyline.common.machine.imprinter.TileEntityImprintable; import assemblyline.common.machine.imprinter.TileEntityImprintable;
public class TileEntityCrate extends TileEntityImprintable implements ISidedInventory, IPacketReceiver public class TileEntityCrate extends TileEntityImprintable implements ISidedInventory, IPacketReceiver
@ -122,6 +123,14 @@ public class TileEntityCrate extends TileEntityImprintable implements ISidedInve
{ {
if (stack != null) 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()) if (stack.isStackable())
{ {
this.containingItems[slot] = stack; this.containingItems[slot] = stack;