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

Option to skip empty slots in Sigil of Holding (#807)

Browse source 
* Option to skip empty slots in Sigil of Holding
This commit is contained in:
Arcaratus 2016-06-17 18:46:33 -04:00 • committed by Nick Ignoffo
parent 466f26d80b
commit 6680e8be49
3 changed files with 45 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java
View file

@ -219,15 +219,14 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable
}
}
public static ItemStack getCurrentSigil(ItemStack itemStack)
public static ItemStack getItemStackInSlot(ItemStack itemStack, int slot)
{
if (itemStack.getItem() instanceof ItemSigilHolding)
{
ItemStack[] itemStacks = getInternalInventory(itemStack);
if (itemStacks != null)
{
return itemStacks[getCurrentItemOrdinal(itemStack)];
}
return itemStacks[slot == 5 ? 4 : slot];
else return null;
}
return null;
@ -279,12 +278,41 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable
return inv;
}
public static void cycleSigil(ItemStack itemStack, int mode)
public static void cycleToNextSigil(ItemStack itemStack, int mode)
{
if (itemStack.getItem() instanceof ItemSigilHolding)
{
initModeTag(itemStack);
itemStack.getTagCompound().setInteger(Constants.NBT.CURRENT_SIGIL, mode);
int index;
int currentIndex = getCurrentItemOrdinal(itemStack);
ItemStack currentItemStack = getItemStackInSlot(itemStack, currentIndex);
if (currentItemStack == null)
return;
if (mode < 0)
{
index = next(currentIndex);
currentItemStack = getItemStackInSlot(itemStack, index);
while (currentItemStack == null)
{
index = next(index);
currentItemStack = getItemStackInSlot(itemStack, index);
}
}
else
{
index = prev(currentIndex);
currentItemStack = getItemStackInSlot(itemStack, index);
while (currentItemStack == null)
{
index = prev(index);
currentItemStack = getItemStackInSlot(itemStack, index);
}
}
itemStack.getTagCompound().setInteger(Constants.NBT.CURRENT_SIGIL, index);
}
}