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

Fixed holding sigil internal interactions

Browse source 
It will no longer tick unbound sigils and checks binding of stored sigil
on right click..
This commit is contained in:
Nicholas Ignoffo 2018-04-07 12:24:28 -07:00
parent bf18c337e2
commit 03a2904bd1
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,6 +4,7 @@ import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.IMeshProvider;
import WayofTime.bloodmagic.client.key.IKeybindable; import WayofTime.bloodmagic.client.key.IKeybindable;
import WayofTime.bloodmagic.client.key.KeyBindings; import WayofTime.bloodmagic.client.key.KeyBindings;
import WayofTime.bloodmagic.core.data.Binding;
import WayofTime.bloodmagic.iface.IAltarReader; import WayofTime.bloodmagic.iface.IAltarReader;
import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.iface.IBindable;
import WayofTime.bloodmagic.iface.ISigil; import WayofTime.bloodmagic.iface.ISigil;
@ -92,7 +93,7 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl
List<ItemStack> inv = getInternalInventory(stack); List<ItemStack> inv = getInternalInventory(stack);
ItemStack itemUsing = inv.get(currentSlot); ItemStack itemUsing = inv.get(currentSlot);
if (itemUsing.isEmpty() || ((IBindable) itemUsing.getItem()).getBinding(stack) == null) if (itemUsing.isEmpty() || ((IBindable) itemUsing.getItem()).getBinding(itemUsing) == null)
return EnumActionResult.PASS; return EnumActionResult.PASS;
EnumActionResult result = itemUsing.getItem().onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ); EnumActionResult result = itemUsing.getItem().onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ);
@ -111,7 +112,7 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl
List<ItemStack> inv = getInternalInventory(stack); List<ItemStack> inv = getInternalInventory(stack);
ItemStack itemUsing = inv.get(currentSlot); ItemStack itemUsing = inv.get(currentSlot);
if (itemUsing.isEmpty() || ((IBindable) itemUsing.getItem()).getBinding(stack) == null) if (itemUsing.isEmpty() || ((IBindable) itemUsing.getItem()).getBinding(itemUsing) == null)
return ActionResult.newResult(EnumActionResult.PASS, stack); return ActionResult.newResult(EnumActionResult.PASS, stack);
itemUsing.getItem().onItemRightClick(world, player, hand); itemUsing.getItem().onItemRightClick(world, player, hand);
@ -149,20 +150,19 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl
} }
@Override @Override
public void onUpdate(ItemStack itemStack, World world, Entity entity, int itemSlot, boolean isSelected) { public void onUpdate(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected) {
if (itemStack.getTagCompound() != null) { if (stack.hasTagCompound())
this.tickInternalInventory(itemStack, world, entity, itemSlot, isSelected); tickInternalInventory(stack, world, entity, itemSlot, isSelected);
}
} }
public void tickInternalInventory(ItemStack itemStack, World world, Entity entity, int itemSlot, boolean isSelected) { public void tickInternalInventory(ItemStack itemStack, World world, Entity entity, int itemSlot, boolean isSelected) {
List<ItemStack> inv = getInternalInventory(itemStack); for (ItemStack stack : getInternalInventory(itemStack)) {
if (stack.isEmpty() || !(stack.getItem() instanceof IBindable) || !(stack.getItem() instanceof ISigil))
for (int i = 0; i < inventorySize; i++) { continue;
ItemStack stack = inv.get(i);
if (stack.isEmpty()) { Binding binding = ((IBindable) stack.getItem()).getBinding(stack);
if (binding == null)
continue; continue;
}
stack.getItem().onUpdate(stack, world, entity, itemSlot, isSelected); stack.getItem().onUpdate(stack, world, entity, itemSlot, isSelected);
} }