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

Removed filter code so that the CME would not occur until fixed.

Browse source
This commit is contained in:
WayofTime 2016-01-16 20:27:26 -05:00
parent 1a908d64c6
commit f1301f65d4
1 changed files with 50 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java
View file

@ -1,15 +1,7 @@
package WayofTime.bloodmagic.item.routing; package WayofTime.bloodmagic.item.routing;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.item.inventory.ItemInventory;
import WayofTime.bloodmagic.routing.IItemFilter;
import WayofTime.bloodmagic.routing.TestItemFilter;
import WayofTime.bloodmagic.util.GhostItemHelper;
import WayofTime.bloodmagic.util.helper.TextHelper;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
@ -18,6 +10,10 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.routing.IItemFilter;
import WayofTime.bloodmagic.util.helper.TextHelper;
public class ItemRouterFilter extends Item implements IItemFilterProvider public class ItemRouterFilter extends Item implements IItemFilterProvider
{ {
@ -58,55 +54,57 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider
@Override @Override
public IItemFilter getInputItemFilter(ItemStack filterStack, IInventory inventory, EnumFacing syphonDirection) public IItemFilter getInputItemFilter(ItemStack filterStack, IInventory inventory, EnumFacing syphonDirection)
{ {
IItemFilter testFilter = new TestItemFilter(); // IItemFilter testFilter = new TestItemFilter();
List<ItemStack> filteredList = new LinkedList<ItemStack>(); // List<ItemStack> filteredList = new LinkedList<ItemStack>();
ItemInventory inv = new ItemInventory(filterStack, 9, ""); // ItemInventory inv = new ItemInventory(filterStack, 9, "");
for (int i = 0; i < inv.getSizeInventory(); i++) // for (int i = 0; i < inv.getSizeInventory(); i++)
{ // {
ItemStack stack = inv.getStackInSlot(i); // ItemStack stack = inv.getStackInSlot(i);
if (stack == null) // if (stack == null)
{ // {
continue; // continue;
} // }
//
ItemStack ghostStack = GhostItemHelper.getStackFromGhost(stack); // ItemStack ghostStack = GhostItemHelper.getStackFromGhost(stack);
if (ghostStack.stackSize == 0) // if (ghostStack.stackSize == 0)
{ // {
ghostStack.stackSize = Integer.MAX_VALUE; // ghostStack.stackSize = Integer.MAX_VALUE;
} // }
//
filteredList.add(ghostStack); // filteredList.add(ghostStack);
} // }
//
testFilter.initializeFilter(filteredList, inventory, syphonDirection, false); // testFilter.initializeFilter(filteredList, inventory, syphonDirection, false);
return testFilter; // return testFilter;
return null;
} }
@Override @Override
public IItemFilter getOutputItemFilter(ItemStack filterStack, IInventory inventory, EnumFacing syphonDirection) public IItemFilter getOutputItemFilter(ItemStack filterStack, IInventory inventory, EnumFacing syphonDirection)
{ {
IItemFilter testFilter = new TestItemFilter(); // IItemFilter testFilter = new TestItemFilter();
List<ItemStack> filteredList = new LinkedList<ItemStack>(); // List<ItemStack> filteredList = new LinkedList<ItemStack>();
ItemInventory inv = new ItemInventory(filterStack, 9, ""); //TODO: Change to grab the filter from the Item later. // ItemInventory inv = new ItemInventory(filterStack, 9, ""); //TODO: Change to grab the filter from the Item later.
for (int i = 0; i < inv.getSizeInventory(); i++) // for (int i = 0; i < inv.getSizeInventory(); i++)
{ // {
ItemStack stack = inv.getStackInSlot(i); // ItemStack stack = inv.getStackInSlot(i);
if (stack == null) // if (stack == null)
{ // {
continue; // continue;
} // }
//
ItemStack ghostStack = GhostItemHelper.getStackFromGhost(stack); // ItemStack ghostStack = GhostItemHelper.getStackFromGhost(stack);
if (ghostStack.stackSize == 0) // if (ghostStack.stackSize == 0)
{ // {
ghostStack.stackSize = Integer.MAX_VALUE; // ghostStack.stackSize = Integer.MAX_VALUE;
} // }
//
filteredList.add(ghostStack); // filteredList.add(ghostStack);
} // }
//
testFilter.initializeFilter(filteredList, inventory, syphonDirection, true); // testFilter.initializeFilter(filteredList, inventory, syphonDirection, true);
return testFilter; // return testFilter;
return null;
} }
} }