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

Added SoulForgeRecipe (basically a modified ShapelessOreRecipe, so is compatible with the oredictionary), and worked on the shift-clicking into the inventory.

Browse source
This commit is contained in:
WayofTime 2016-01-08 09:12:31 -05:00
parent a9feeade13
commit 7b8646659a
7 changed files with 338 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

102
src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java
View file

@ -1,10 +1,23 @@
package WayofTime.bloodmagic.tile;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ITickable;
import WayofTime.bloodmagic.api.recipe.SoulForgeRecipe;
import WayofTime.bloodmagic.api.registry.SoulForgeRecipeRegistry;
import WayofTime.bloodmagic.api.soul.ISoul;
import WayofTime.bloodmagic.api.soul.ISoulGem;
public class TileSoulForge extends TileInventory implements ITickable
{
public static final int soulSlot = 4;
public static final int outputSlot = 5;
//Input slots are from 0 to 3.
public TileSoulForge()
{
super(6, "soulForge");
@ -25,6 +38,95 @@ public class TileSoulForge extends TileInventory implements ITickable
@Override
public void update()
{
if (!hasSoulGemOrSoul())
{
return;
}
double soulsInGem = getSouls();
List<ItemStack> inputList = new ArrayList<ItemStack>();
for (int i = 0; i < 4; i++)
{
if (getStackInSlot(i) != null)
{
inputList.add(getStackInSlot(i));
}
}
SoulForgeRecipe recipe = SoulForgeRecipeRegistry.getMatchingRecipe(inputList, getWorld(), getPos());
if (recipe != null && recipe.getMinimumSouls() <= soulsInGem)
{
ItemStack outputStack = recipe.getRecipeOutput();
if (getStackInSlot(outputSlot) == null)
{
setInventorySlotContents(outputSlot, outputStack);
consumeInventory();
} else
{
}
}
}
public boolean hasSoulGemOrSoul()
{
ItemStack soulStack = getStackInSlot(soulSlot);
if (soulStack != null)
{
if (soulStack.getItem() instanceof ISoul || soulStack.getItem() instanceof ISoulGem)
{
return true;
}
}
return false;
}
public double getSouls()
{
ItemStack soulStack = getStackInSlot(soulSlot);
if (soulStack != null)
{
if (soulStack.getItem() instanceof ISoul)
{
ISoul soul = (ISoul) soulStack.getItem();
return soul.getSouls(soulStack);
}
if (soulStack.getItem() instanceof ISoulGem)
{
ISoulGem soul = (ISoulGem) soulStack.getItem();
return soul.getSouls(soulStack);
}
}
return 0;
}
public void consumeInventory()
{
for (int i = 0; i < 4; 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;
}
}
}
}
}

85
src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java
View file

@ -8,7 +8,7 @@ import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import WayofTime.bloodmagic.api.soul.ISoul;
import WayofTime.bloodmagic.api.soul.ISoulGem;
import WayofTime.bloodmagic.item.ItemTelepositionFocus;
import WayofTime.bloodmagic.tile.TileSoulForge;
public class ContainerSoulForge extends Container
{
@ -17,7 +17,12 @@ public class ContainerSoulForge extends Container
public ContainerSoulForge(InventoryPlayer inventoryPlayer, IInventory tileForge)
{
this.tileForge = tileForge;
this.addSlotToContainer(new SlotSoul(tileForge, 0, 152, 51));
this.addSlotToContainer(new Slot(tileForge, 0, 8, 15));
this.addSlotToContainer(new Slot(tileForge, 1, 80, 15));
this.addSlotToContainer(new Slot(tileForge, 2, 80, 87));
this.addSlotToContainer(new Slot(tileForge, 3, 8, 87));
this.addSlotToContainer(new SlotSoul(tileForge, TileSoulForge.soulSlot, 152, 51));
this.addSlotToContainer(new SlotOutput(tileForge, TileSoulForge.outputSlot, 44, 51));
for (int i = 0; i < 3; i++)
{
@ -34,48 +39,58 @@ public class ContainerSoulForge extends Container
}
@Override
public ItemStack transferStackInSlot(EntityPlayer player, int slot)
public ItemStack transferStackInSlot(EntityPlayer playerIn, int index)
{
ItemStack stack = null;
Slot slotObject = inventorySlots.get(slot);
int slots = inventorySlots.size();
ItemStack itemstack = null;
Slot slot = (Slot) this.inventorySlots.get(index);
if (slotObject != null && slotObject.getHasStack())
if (slot != null && slot.getHasStack())
{
ItemStack stackInSlot = slotObject.getStack();
stack = stackInSlot.copy();
ItemStack itemstack1 = slot.getStack();
itemstack = itemstack1.copy();
if (stack.getItem() instanceof ItemTelepositionFocus)
if (index == 5)
{
if (slot <= slots)
{
if (!this.mergeItemStack(stackInSlot, 0, slots, false))
{
return null;
}
} else if (!this.mergeItemStack(stackInSlot, slots, 36 + slots, false))
if (!this.mergeItemStack(itemstack1, 6, 6 + 36, true))
{
return null;
}
}
if (stackInSlot.stackSize == 0)
slot.onSlotChange(itemstack1, itemstack);
} else if (index > 5)
{
slotObject.putStack(null);
} else
{
slotObject.onSlotChanged();
}
if (stackInSlot.stackSize == stack.stackSize)
if (itemstack1.getItem() instanceof ISoul || itemstack1.getItem() instanceof ISoulGem)
{
if (!this.mergeItemStack(itemstack1, 4, 5, false))
{
return null;
}
} else if (!this.mergeItemStack(itemstack1, 0, 4, false))
{
return null;
}
} else if (!this.mergeItemStack(itemstack1, 6, 42, false))
{
return null;
}
slotObject.onPickupFromSlot(player, stackInSlot);
if (itemstack1.stackSize == 0)
{
slot.putStack((ItemStack) null);
} else
{
slot.onSlotChanged();
}
if (itemstack1.stackSize == itemstack.stackSize)
{
return null;
}
slot.onPickupFromSlot(playerIn, itemstack1);
}
return stack;
return itemstack;
}
@Override
@ -97,4 +112,18 @@ public class ContainerSoulForge extends Container
return itemStack.getItem() instanceof ISoulGem || itemStack.getItem() instanceof ISoul;
}
}
private class SlotOutput extends Slot
{
public SlotOutput(IInventory inventory, int slotIndex, int x, int y)
{
super(inventory, slotIndex, x, y);
}
@Override
public boolean isItemValid(ItemStack stack)
{
return false;
}
}
}