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

Recipe Fixes and mods.toml fix

Browse source 
Actually added the Blood lamp reagent to the recipes (oops). Also reduced the cost of the blank rune by one slate.
This commit is contained in:
WayofTime 2020-11-07 19:38:56 -05:00
parent d8ba32c412
commit eb1fb71f43
17 changed files with 534 additions and 457 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/main/java/wayoftime/bloodmagic/tile/TileAlchemyTable.java
View file

@ -32,15 +32,13 @@ import wayoftime.bloodmagic.core.data.Binding;
import wayoftime.bloodmagic.core.data.SoulNetwork;
import wayoftime.bloodmagic.core.data.SoulTicket;
import wayoftime.bloodmagic.iface.IBindable;
import wayoftime.bloodmagic.iface.ICustomAlchemyConsumable;
import wayoftime.bloodmagic.orb.BloodOrb;
import wayoftime.bloodmagic.orb.IBloodOrb;
import wayoftime.bloodmagic.tile.contailer.ContainerAlchemyTable;
import wayoftime.bloodmagic.util.Constants;
import wayoftime.bloodmagic.util.helper.NetworkHelper;
public class TileAlchemyTable extends TileInventory
implements ISidedInventory, ITickableTileEntity, INamedContainerProvider
public class TileAlchemyTable extends TileInventory implements ISidedInventory, ITickableTileEntity, INamedContainerProvider
{
@ObjectHolder("bloodmagic:alchemytable")
public static TileEntityType<TileAlchemyTable> TYPE;
@ -54,8 +52,7 @@ public class TileAlchemyTable extends TileInventory
public int ticksRequired = 1;
public BlockPos connectedPos = BlockPos.ZERO;
public boolean[] blockedSlots = new boolean[]
{ false, false, false, false, false, false };
public boolean[] blockedSlots = new boolean[] { false, false, false, false, false, false };
public TileAlchemyTable(TileEntityType<?> type)
{
@ -158,14 +155,11 @@ public class TileAlchemyTable extends TileInventory
switch (side)
{
case DOWN:
return new int[]
{ outputSlot };
return new int[] { outputSlot };
case UP:
return new int[]
{ orbSlot };
return new int[] { orbSlot };
default:
return new int[]
{ 0, 1, 2, 3, 4, 5 };
return new int[] { 0, 1, 2, 3, 4, 5 };
}
}
@ -299,16 +293,7 @@ public class TileAlchemyTable extends TileInventory
else
outputSlotStack.grow(event.getOutput().getCount());
for (int i = 0; i < 6; i++)
{
ItemStack currentStack = getStackInSlot(i);
if (currentStack.getItem().hasContainerItem(currentStack))
setInventorySlotContents(i, currentStack.getItem().getContainerItem(currentStack));
else if (currentStack.getItem() instanceof ICustomAlchemyConsumable)
setInventorySlotContents(i, ((ICustomAlchemyConsumable) currentStack.getItem()).drainUseOnAlchemyCraft(currentStack));
else
currentStack.shrink(1);
}
consumeInventory(recipeAlchemyTable);
burnTime = 0;
notifyUpdate();
@ -432,6 +417,14 @@ public class TileAlchemyTable extends TileInventory
{
setInventorySlotContents(i, inputStack.getItem().getContainerItem(inputStack));
continue;
} else if (inputStack.isDamageable())
{
inputStack.setDamage(inputStack.getDamage() + 1);
if (inputStack.getDamage() >= inputStack.getMaxDamage())
{
setInventorySlotContents(i, ItemStack.EMPTY);
}
continue;
}
inputStack.shrink(1);