From b3636fe12fbf5ed6181a67745bef1cb970515f97 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Fri, 19 Feb 2016 19:47:58 -0500 Subject: [PATCH] Fixed filters so that they would send a block update to the inventories when updated. Also nerfed the bound sword. --- .../WayofTime/bloodmagic/item/ItemBoundSword.java | 5 +++-- .../bloodmagic/routing/DefaultItemFilter.java | 13 +++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java index 25a14cc0..94cde5a6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java @@ -40,7 +40,7 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable setRegistryName(Constants.BloodMagicItem.BOUND_SWORD.getRegName()); setCreativeTab(BloodMagic.tabBloodMagic); - this.attackDamage = 4.0F + ModItems.boundToolMaterial.getDamageVsEntity(); + this.attackDamage = 1.0F + ModItems.boundToolMaterial.getDamageVsEntity(); } @Override @@ -95,7 +95,8 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable } @Override - public Multimap getAttributeModifiers(ItemStack stack) { + public Multimap getAttributeModifiers(ItemStack stack) + { Multimap multimap = super.getAttributeModifiers(stack); double damage = getActivated(stack) ? this.attackDamage : 1.0D; multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(itemModifierUUID, "Weapon modifier", damage, 0)); diff --git a/src/main/java/WayofTime/bloodmagic/routing/DefaultItemFilter.java b/src/main/java/WayofTime/bloodmagic/routing/DefaultItemFilter.java index f98e8375..0b46b745 100644 --- a/src/main/java/WayofTime/bloodmagic/routing/DefaultItemFilter.java +++ b/src/main/java/WayofTime/bloodmagic/routing/DefaultItemFilter.java @@ -5,7 +5,10 @@ import java.util.List; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; import WayofTime.bloodmagic.util.Utils; /** @@ -72,6 +75,11 @@ public class DefaultItemFilter implements IItemFilter testStack = inputStack.copy(); testStack.stackSize -= changeAmount; + TileEntity tile = (TileEntity) accessedInventory; + World world = tile.getWorld(); + BlockPos pos = tile.getPos(); + world.markBlockForUpdate(pos); + return testStack; } @@ -124,6 +132,11 @@ public class DefaultItemFilter implements IItemFilter continue; } + TileEntity tile = (TileEntity) accessedInventory; + World world = tile.getWorld(); + BlockPos pos = tile.getPos(); + world.markBlockForUpdate(pos); + inputStack.stackSize -= changeAmount; maxTransfer -= changeAmount;