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

Updated the Alchemy Table recipe system so that it can provide better custom recipes

Browse source
This commit is contained in:
WayofTime 2016-05-04 16:44:32 -04:00
parent a5dee50984
commit 86efa8b1a3
12 changed files with 212 additions and 218 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java
View file

@ -379,7 +379,7 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory,
currentOutputStack.stackSize += outputStack.stackSize;
}
consumeInventory();
consumeInventory(recipe);
}
}
@ -401,26 +401,38 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory,
return 0;
}
public void consumeInventory()
public void consumeInventory(AlchemyTableRecipe recipe)
{
ItemStack[] input = new ItemStack[6];
for (int i = 0; i < 6; i++)
{
ItemStack inputStack = getStackInSlot(i);
if (inputStack != null)
{
if (inputStack.getItem().hasContainerItem(inputStack))
{
setInventorySlotContents(i, inputStack.getItem().getContainerItem(inputStack));
continue;
}
inputStack.stackSize--;
if (inputStack.stackSize <= 0)
{
setInventorySlotContents(i, null);
continue;
}
}
input[i] = getStackInSlot(i);
}
ItemStack[] result = recipe.getRemainingItems(input);
for (int i = 0; i < 6; i++)
{
setInventorySlotContents(i, result[i]);
}
// for (int i = 0; i < 6; i++)
// {
// ItemStack inputStack = getStackInSlot(i);
// if (inputStack != null)
// {
// if (inputStack.getItem().hasContainerItem(inputStack))
// {
// setInventorySlotContents(i, inputStack.getItem().getContainerItem(inputStack));
// continue;
// }
//
// inputStack.stackSize--;
// if (inputStack.stackSize <= 0)
// {
// setInventorySlotContents(i, null);
// continue;
// }
// }
// }
}
}

26
src/main/java/WayofTime/bloodmagic/tile/routing/TileInputRoutingNode.java
View file

@ -8,6 +8,8 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
public class TileInputRoutingNode extends TileFilteredRoutingNode implements IInputItemRoutingNode
{
@ -26,19 +28,23 @@ public class TileInputRoutingNode extends TileFilteredRoutingNode implements IIn
public IItemFilter getInputFilterForSide(EnumFacing side)
{
TileEntity tile = worldObj.getTileEntity(pos.offset(side));
if (tile instanceof IInventory)
if (tile != null)
{
ItemStack filterStack = this.getFilterStack(side);
if (filterStack == null || !(filterStack.getItem() instanceof IItemFilterProvider))
if (tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side.getOpposite()))
{
IItemFilter filter = new DefaultItemFilter();
filter.initializeFilter(null, (IInventory) tile, side.getOpposite(), false);
return filter;
}
IItemHandler handler = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side.getOpposite());
ItemStack filterStack = this.getFilterStack(side);
IItemFilterProvider filter = (IItemFilterProvider) filterStack.getItem();
return filter.getInputItemFilter(filterStack, (IInventory) tile, side.getOpposite());
if (filterStack == null || !(filterStack.getItem() instanceof IItemFilterProvider))
{
IItemFilter filter = new DefaultItemFilter();
filter.initializeFilter(null, tile, handler, false);
return filter;
}
IItemFilterProvider filter = (IItemFilterProvider) filterStack.getItem();
return filter.getInputItemFilter(filterStack, tile, handler);
}
}
return null;

27
src/main/java/WayofTime/bloodmagic/tile/routing/TileOutputRoutingNode.java
View file

@ -8,6 +8,8 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
public class TileOutputRoutingNode extends TileFilteredRoutingNode implements IOutputItemRoutingNode
{
@ -26,20 +28,23 @@ public class TileOutputRoutingNode extends TileFilteredRoutingNode implements IO
public IItemFilter getOutputFilterForSide(EnumFacing side)
{
TileEntity tile = worldObj.getTileEntity(pos.offset(side));
if (tile instanceof IInventory)
if (tile != null)
{
ItemStack filterStack = this.getFilterStack(side);
if (filterStack == null || !(filterStack.getItem() instanceof IItemFilterProvider))
if (tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side.getOpposite()))
{
IItemFilter filter = new DefaultItemFilter();
filter.initializeFilter(null, (IInventory) tile, side.getOpposite(), true);
return filter;
IItemHandler handler = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side.getOpposite());
ItemStack filterStack = this.getFilterStack(side);
if (filterStack == null || !(filterStack.getItem() instanceof IItemFilterProvider))
{
IItemFilter filter = new DefaultItemFilter();
filter.initializeFilter(null, tile, handler, true);
return filter;
}
IItemFilterProvider filter = (IItemFilterProvider) filterStack.getItem();
return filter.getOutputItemFilter(filterStack, tile, handler);
}
IItemFilterProvider filter = (IItemFilterProvider) filterStack.getItem();
return filter.getOutputItemFilter(filterStack, (IInventory) tile, side.getOpposite());
}
return null;